diff --git a/.astyle b/.astyle
new file mode 100644
index 00000000..6580ce7e
--- /dev/null
+++ b/.astyle
@@ -0,0 +1,16 @@
+style=vtk
+indent=spaces=2
+extra-headers=foreach;foreach_iter;foreach_child;QTE_FOREACH_ITER
+
+break-closing-brackets
+keep-one-line-blocks
+keep-one-line-statements
+
+indent-preprocessor
+max-instatement-indent=50
+min-conditional-indent=0
+
+pad-oper
+unpad-paren
+pad-header
+align-pointer=type
diff --git a/Applications/CMakeLists.txt b/Applications/CMakeLists.txt
new file mode 100644
index 00000000..d6f2f80c
--- /dev/null
+++ b/Applications/CMakeLists.txt
@@ -0,0 +1,12 @@
+include(${qtExtensions_SOURCE_DIR}/CMake/Modules/UseQtExtensions.cmake)
+
+# NOTE: We descend into all directories in order to allow them to define
+# application-specific options alongside the application (as opposed to having
+# to define the options here, where they would be less closely located to the
+# code they effect). However, no other processing shall be done unless the
+# condition(s) noted after the directory are met.
+
+add_subdirectory(VpView) # if(VISGUI_ENABLE_VPVIEW)
+add_subdirectory(VsPlay) # if(VISGUI_ENABLE_VSPLAY)
+add_subdirectory(Viqui)  # if(VISGUI_ENABLE_VIQUI)
+add_subdirectory(Web)    # if(VISGUI_ENABLE_WEB)
diff --git a/Applications/Viqui/Backends/vqExporter.h b/Applications/Viqui/Backends/vqExporter.h
new file mode 100644
index 00000000..142908e3
--- /dev/null
+++ b/Applications/Viqui/Backends/vqExporter.h
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqExporter_h
+#define __vqExporter_h
+
+#include <vvQueryResult.h>
+
+class vqExporter
+{
+public:
+  vqExporter() {}
+  virtual ~vqExporter() {}
+
+  virtual bool exportResults(const QList<vvQueryResult>& results) = 0;
+};
+
+#endif // __vqExporter_h
diff --git a/Applications/Viqui/Backends/vqExporterFactory.cxx b/Applications/Viqui/Backends/vqExporterFactory.cxx
new file mode 100644
index 00000000..67fe910d
--- /dev/null
+++ b/Applications/Viqui/Backends/vqExporterFactory.cxx
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqExporterFactory.h"
+
+#include "vqVqrExporter.h"
+
+//-----------------------------------------------------------------------------
+QList<vqExporterFactory::Identifier> vqExporterFactory::exporters()
+{
+  QList<vqExporterFactory::Identifier> list;
+  list.append(Identifier("file-vqr", "VisGUI Query Results"));
+  return list;
+}
+
+//-----------------------------------------------------------------------------
+vqExporter* vqExporterFactory::createExporter(QString type)
+{
+  if (type == "file-vqr")
+    return new vqVqrExporter();
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vqExporter* vqExporterFactory::createNativeFileExporter()
+{
+  return new vqVqrExporter();
+}
diff --git a/Applications/Viqui/Backends/vqExporterFactory.h b/Applications/Viqui/Backends/vqExporterFactory.h
new file mode 100644
index 00000000..7a99efcf
--- /dev/null
+++ b/Applications/Viqui/Backends/vqExporterFactory.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqExporterFactory_h
+#define __vqExporterFactory_h
+
+#include <QList>
+#include <QString>
+
+#include "vqExporter.h"
+
+class vqExporterFactory
+{
+public:
+  struct Identifier
+    {
+    Identifier(QString id_, QString displayString_)
+      : id(id_), displayString(displayString_) {}
+    QString id;
+    QString displayString;
+    };
+
+  static QList<Identifier> exporters();
+  static vqExporter* createExporter(QString id);
+  static vqExporter* createNativeFileExporter();
+};
+
+#endif // __vqExporterFactory_h
diff --git a/Applications/Viqui/Backends/vqVqrExporter.cxx b/Applications/Viqui/Backends/vqVqrExporter.cxx
new file mode 100644
index 00000000..75a7ef05
--- /dev/null
+++ b/Applications/Viqui/Backends/vqVqrExporter.cxx
@@ -0,0 +1,54 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QFile>
+#include <QMessageBox>
+
+#include <vgFileDialog.h>
+
+#include <vvWriter.h>
+
+#include "vqVqrExporter.h"
+
+//-----------------------------------------------------------------------------
+bool vqVqrExporter::exportResults(const QList<vvQueryResult>& results)
+{
+  // Get name of file to which results should be written
+  QString selectedFilter;
+  QString fileName = vgFileDialog::getSaveFileName(
+                       0, "Save results...", QString(),
+                       "VisGUI Query Results (*.vqr *.vqrx);;"
+                       "VisGUI Query Results - KST (*.vqr);;"
+                       "VisGUI Query Results - XML (*.vqrx *.xml);;"
+                       "All files (*)", &selectedFilter);
+  if (fileName.isEmpty())
+    return false;
+
+  // Open output file
+  QFile file(fileName);
+  if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+    QString msg = "Unable to open file \"%1\" for writing: %2";
+    QMessageBox::critical(0, "Error writing file",
+                          msg.arg(fileName).arg(file.errorString()));
+    return false;
+    }
+
+  // Choose format from extension
+  const QString ext = QFileInfo(fileName).suffix();
+  const bool saveAsXml =
+    (ext == "xml" || ext == "vqrx" || selectedFilter.contains("XML"));
+  vvWriter::Format format = (saveAsXml ? vvWriter::Xml : vvWriter::Kst);
+
+  // Write results
+  vvWriter writer(file, format);
+  writer << vvHeader::QueryResults;
+  foreach (const vvQueryResult& result, results)
+    writer << result;
+
+  // Done
+  return true;
+}
diff --git a/Applications/Viqui/Backends/vqVqrExporter.h b/Applications/Viqui/Backends/vqVqrExporter.h
new file mode 100644
index 00000000..e472552f
--- /dev/null
+++ b/Applications/Viqui/Backends/vqVqrExporter.h
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqVqrExporter_h
+#define __vqVqrExporter_h
+
+#include "vqExporter.h"
+
+class vqVqrExporter : public vqExporter
+{
+public:
+  vqVqrExporter() {}
+  ~vqVqrExporter() {}
+
+  virtual bool exportResults(const QList<vvQueryResult>& results);
+};
+
+#endif // __vqVqrExporter_h
diff --git a/Applications/Viqui/CMakeLists.txt b/Applications/Viqui/CMakeLists.txt
new file mode 100644
index 00000000..3b28d4d6
--- /dev/null
+++ b/Applications/Viqui/CMakeLists.txt
@@ -0,0 +1,192 @@
+project(viqui)
+
+###############################################################################
+
+# BEGIN user configurable build options
+
+if(NOT VISGUI_ENABLE_VIQUI)
+  # If viqui is disabled, we are only here to declare our options (there are
+  # none, currently), so leave now
+  return()
+endif()
+
+# END user configurable build options
+
+###############################################################################
+
+# BEGIN core libraries and includes
+
+if(QtTesting_FOUND)
+  include_directories(${qtTestingSupport_SOURCE_DIR})
+  add_definitions(-DENABLE_QTTESTING)
+  set(QT_TESTING_SUPPORT_LIBRARIES qtTestingSupport ${QtTesting_LIBRARIES})
+endif()
+
+# Use the include path and library for Qt that is used by VTK.
+include_directories(SYSTEM
+  ${KML_INCLUDE_DIRS}
+  ${QtTesting_INCLUDE_DIRS}
+  ${VTK_INCLUDE_DIRS}
+  ${GeographicLib_INCLUDE_DIRS}
+  ${PROJ4_INCLUDE_DIR}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(vgSdkTargets
+  vvVtkWidgets
+  qtExtensions
+  qtVgCommon
+  qtVgWidgets
+  vgVtkVideo
+  vtkVgCore
+  vtkVgSceneGraph
+  vtkVgModelView
+  vtkVgQtUtil
+  vgVideo
+  vvIO
+  vvWidgets
+)
+
+vg_include_library_sdk_directories(${vgSdkTargets})
+
+# Configure file here
+include(vqVersion.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vqVersion.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/vqVersion.h @ONLY)
+
+# END core libraries and includes
+
+###############################################################################
+
+# BEGIN core program code
+
+set(vqSources
+    main.cxx
+    vqApplication.cxx
+    vqArchiveVideoSource.cxx
+    vqClassifierQueryDialog.cxx
+    vqConfigureDialog.cxx
+    vqContour.cxx
+    vqCore.cxx
+    vqDebug.cxx
+    vqEventInfo.cxx
+    vqPredefinedQueryCache.cxx
+    vqPredefinedQueryDialog.cxx
+    vqQueryDialog.cxx
+    vqQueryParser.cxx
+    vqQueryVideoPlayer.cxx
+    vqRegionEditDialog.cxx
+    vqResultFilter.cxx
+    vqResultFilterDialog.cxx
+    vqResultInfo.cxx
+    vqSettings.cxx
+    vqTimeline.cxx
+    vqTrackingClipViewer.cxx
+    vqTreeView.cxx
+    vqUserActions.cxx
+    vqUtil.cxx
+    vqVideoPlayer.cxx
+    vqVideoQueryDialog.cxx
+    vtkVQBlastLayoutNode.cxx
+    vtkVQCoordinateTransform.cxx
+    vtkVQTerrainSource.cxx
+    vtkVQTrackingClip.cxx
+    Backends/vqExporterFactory.cxx
+    Backends/vqVqrExporter.cxx
+)
+
+set(vqUI
+    classifierQuery.ui
+    configure.ui
+    predefinedQuery.ui
+    query.ui
+    regionEdit.ui
+    resultFilter.ui
+    resultInfo.ui
+    viqui.ui
+)
+
+set(vqMocHeaders
+    vqApplication.h
+    vqArchiveVideoSource.h
+    vqClassifierQueryDialog.h
+    vqConfigureDialog.h
+    vqCore.h
+    vqPredefinedQueryCache.h
+    vqPredefinedQueryCachePrivate.h
+    vqPredefinedQueryDialog.h
+    vqQueryDialog.h
+    vqQueryParser.h
+    vqQueryVideoPlayer.h
+    vqRegionEditDialog.h
+    vqResultFilterDialog.h
+    vqResultInfo.h
+    vqTimeline.h
+    vqTrackingClipBuilder.h
+    vqTrackingClipViewer.h
+    vqTreeView.h
+    vqUserActions.h
+    vqVideoPlayer.h
+    vqVideoQueryDialog.h
+    vtkVQBlastLayoutNode.h
+)
+
+set(vqResources ../../Icons/stdbutton.qrc ../../Icons/viqui.qrc ../../Icons/vgvideo.qrc)
+
+# END core program code
+
+###############################################################################
+
+# BEGIN build rules
+
+qt4_wrap_ui(uiSources ${vqUI})
+qt4_wrap_cpp(mocSources ${vqMocHeaders})
+qt4_add_resources(resSources ${vqResources})
+
+source_group("User Interface" FILES
+  ${vqUI}
+)
+
+source_group("Resources" FILES
+  ${vqUI}
+  ${EXE_ICON}
+)
+
+source_group("Generated" FILES
+  ${uiSources}
+  ${mocSources}
+  ${resSources}
+)
+
+set_source_files_properties(${vqSources}
+  PROPERTIES OBJECT_DEPENDS "${uiSources}"
+)
+
+add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
+  ${vqSources} ${uiSources} ${mocSources} ${resSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  # Internal libraries
+  ${vgSdkTargets}
+  # OPTIONAL external libraries
+  ${QT_TESTING_SUPPORT_LIBRARIES}
+  # Required external libraries
+  vtkChartsCore
+  vtkGUISupportQt
+  vtkRenderingCore
+  vtkRenderingFreeType
+  vtkViewsContext2D
+  vil_io
+  vnl_io
+  vgl_algo
+  ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}
+)
+
+install_executable_target(${PROJECT_NAME} ${PROJECT_NAME})
+
+# END build rules
diff --git a/Applications/Viqui/classifierQuery.ui b/Applications/Viqui/classifierQuery.ui
new file mode 100644
index 00000000..fc22fffc
--- /dev/null
+++ b/Applications/Viqui/classifierQuery.ui
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vqClassifierQueryDialog</class>
+ <widget class="QDialog" name="vqClassifierQueryDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>443</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Classifiers</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Descriptor Modules</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <item>
+       <widget class="QScrollArea" name="eventDescriptors">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="frameShadow">
+         <enum>QFrame::Plain</enum>
+        </property>
+        <property name="widgetResizable">
+         <bool>true</bool>
+        </property>
+        <widget class="QWidget" name="eventDescriptorsWidget">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>372</width>
+           <height>79</height>
+          </rect>
+         </property>
+        </widget>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Event Types</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QScrollArea" name="scrollArea">
+        <property name="frameShape">
+         <enum>QFrame::NoFrame</enum>
+        </property>
+        <property name="widgetResizable">
+         <bool>true</bool>
+        </property>
+        <widget class="QWidget" name="scrollAreaWidgetContents">
+         <property name="geometry">
+          <rect>
+           <x>0</x>
+           <y>0</y>
+           <width>372</width>
+           <height>247</height>
+          </rect>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <widget class="vgMixerWidget" name="classifierFilter" native="true"/>
+          </item>
+          <item>
+           <spacer name="verticalSpacer">
+            <property name="orientation">
+             <enum>Qt::Vertical</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>20</width>
+              <height>40</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vgMixerWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">vgMixerWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/viqui.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vqClassifierQueryDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>179</x>
+     <y>280</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>179</x>
+     <y>149</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vqClassifierQueryDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>179</x>
+     <y>280</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>179</x>
+     <y>149</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/Viqui/configure.ui b/Applications/Viqui/configure.ui
new file mode 100644
index 00000000..7e8740bc
--- /dev/null
+++ b/Applications/Viqui/configure.ui
@@ -0,0 +1,714 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ConfigureDialog</class>
+ <widget class="QDialog" name="ConfigureDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>582</width>
+    <height>415</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Configure - VisGUI Query Interface</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" rowspan="2">
+    <widget class="QListWidget" name="pageChooser">
+     <property name="maximumSize">
+      <size>
+       <width>100</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="flow">
+      <enum>QListView::LeftToRight</enum>
+     </property>
+     <property name="gridSize">
+      <size>
+       <width>92</width>
+       <height>72</height>
+      </size>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::IconMode</enum>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <item>
+      <property name="text">
+       <string>Data Providers</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../../Icons/viqui.qrc">
+        <normaloff>:/icons/32x32/data-providers</normaloff>:/icons/32x32/data-providers</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Display</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../../Icons/viqui.qrc">
+        <normaloff>:/icons/32x32/display</normaloff>:/icons/32x32/display</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Query Formulation</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../../Icons/viqui.qrc">
+        <normaloff>:/icons/32x32/qf</normaloff>:/icons/32x32/qf</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>IQR</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../../Icons/viqui.qrc">
+        <normaloff>:/icons/32x32/iqr</normaloff>:/icons/32x32/iqr</iconset>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <layout class="QHBoxLayout" name="sectionLayout">
+     <item>
+      <widget class="QLabel" name="sectionPrefix">
+       <property name="font">
+        <font>
+         <pointsize>11</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Configure</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="section">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>11</pointsize>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="sectionIcon">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="pixmap">
+        <pixmap resource="../../Icons/viqui.qrc">:/icons/22x22/configure</pixmap>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="1">
+    <widget class="QStackedWidget" name="settingsPager">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="pageDataProviders">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupQueryServer">
+         <property name="title">
+          <string>Query Server</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::ExpandingFieldsGrow</enum>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label">
+            <property name="toolTip">
+             <string>The URI of the query server.</string>
+            </property>
+            <property name="text">
+             <string>Server URI:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="queryServerUriLayout">
+            <property name="spacing">
+             <number>2</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="queryServerUri"/>
+            </item>
+            <item>
+             <widget class="QToolButton" name="queryServerUriEdit">
+              <property name="icon">
+               <iconset resource="../../Icons/viqui.qrc">
+                <normaloff>:/icons/16x16/edit-location</normaloff>:/icons/16x16/edit-location</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_4">
+            <property name="toolTip">
+             <string>The location where query formulation will place video output.</string>
+            </property>
+            <property name="text">
+             <string>Video URI:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <layout class="QHBoxLayout" name="queryVideoUriLayout">
+            <property name="spacing">
+             <number>2</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="queryVideoUri"/>
+            </item>
+            <item>
+             <widget class="QToolButton" name="queryVideoUriPickLocalDir">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/viqui.qrc">
+                <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupVideoProviders">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>List of URI's that will be used to access video for query results.</string>
+         </property>
+         <property name="title">
+          <string>Video Providers</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_3">
+          <item row="0" column="0" rowspan="4" colspan="3">
+           <widget class="QListWidget" name="videoProviders">
+            <property name="selectionMode">
+             <enum>QAbstractItemView::ExtendedSelection</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="3">
+           <widget class="QToolButton" name="videoProviderUp">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="icon">
+             <iconset resource="../../Icons/viqui.qrc">
+              <normaloff>:/icons/22x22/arrow-up</normaloff>:/icons/22x22/arrow-up</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>22</width>
+              <height>22</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="3">
+           <widget class="QToolButton" name="videoProviderDown">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="icon">
+             <iconset resource="../../Icons/viqui.qrc">
+              <normaloff>:/icons/22x22/arrow-down</normaloff>:/icons/22x22/arrow-down</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>22</width>
+              <height>22</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="3">
+           <widget class="QToolButton" name="videoProviderDelete">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="icon">
+             <iconset resource="../../Icons/viqui.qrc">
+              <normaloff>:/icons/22x22/delete</normaloff>:/icons/22x22/delete</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>22</width>
+              <height>22</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QPushButton" name="videoProviderAddUri">
+            <property name="text">
+             <string>Add &amp;URI...</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QPushButton" name="videoProviderAddLocalArchive">
+            <property name="text">
+             <string>Add Local &amp;Archive...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../Icons/viqui.qrc">
+              <normaloff>:/icons/16x16/load-video</normaloff>:/icons/16x16/load-video</iconset>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="pageDisplay">
+      <layout class="QFormLayout" name="formLayout_3">
+       <property name="fieldGrowthPolicy">
+        <enum>QFormLayout::ExpandingFieldsGrow</enum>
+       </property>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="toolTip">
+          <string>Number of results to display at a time.</string>
+         </property>
+         <property name="text">
+          <string>Results per Page:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QSpinBox" name="resultsPerPage">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>70</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="minimum">
+          <number>5</number>
+         </property>
+         <property name="maximum">
+          <number>9999</number>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="toolTip">
+          <string>When viewing results, also show this much video (seconds) before and after the result.</string>
+         </property>
+         <property name="text">
+          <string>Result Clip Padding:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QDoubleSpinBox" name="resultClipPadding">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>70</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="maximum">
+          <double>30.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.500000000000000</double>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QGroupBox" name="groupResultColoring">
+         <property name="title">
+          <string>Result Coloring</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="vvScoreGradientWidget" name="resultColoring" native="true"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="pageQueryFormulation">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <layout class="QFormLayout" name="formLayout_6">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label_5">
+           <property name="toolTip">
+            <string>The location where descriptors from query formulation will be cached.</string>
+           </property>
+           <property name="text">
+            <string>Cache URI:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <layout class="QHBoxLayout" name="queryCacheUriLayout">
+           <property name="spacing">
+            <number>2</number>
+           </property>
+           <item>
+            <widget class="QLineEdit" name="queryCacheUri"/>
+           </item>
+           <item>
+            <widget class="QToolButton" name="queryCacheUriPickLocalDir">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>...</string>
+             </property>
+             <property name="icon">
+              <iconset resource="../../Icons/viqui.qrc">
+               <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupPredefinedQueries">
+         <property name="title">
+          <string>Predefined Queries</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_4">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_8">
+            <property name="toolTip">
+             <string>The directory containing query plans for the Predefined Query option.</string>
+            </property>
+            <property name="text">
+             <string>Location:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="predefinedQueryLayout">
+            <property name="spacing">
+             <number>2</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="predefinedQueryUri"/>
+            </item>
+            <item>
+             <widget class="QToolButton" name="predefinedQueryUriPickLocalDir">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/viqui.qrc">
+                <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupDescriptorTypes">
+         <property name="title">
+          <string>Registered Descriptors</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_2">
+          <item row="0" column="0" colspan="3">
+           <widget class="QTreeWidget" name="descriptors">
+            <property name="editTriggers">
+             <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+            </property>
+            <property name="selectionMode">
+             <enum>QAbstractItemView::ExtendedSelection</enum>
+            </property>
+            <property name="rootIsDecorated">
+             <bool>false</bool>
+            </property>
+            <property name="uniformRowHeights">
+             <bool>true</bool>
+            </property>
+            <property name="sortingEnabled">
+             <bool>true</bool>
+            </property>
+            <property name="columnCount">
+             <number>2</number>
+            </property>
+            <column>
+             <property name="text">
+              <string>Name</string>
+             </property>
+            </column>
+            <column>
+             <property name="text">
+              <string>Groups</string>
+             </property>
+            </column>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QPushButton" name="addDescriptor">
+            <property name="text">
+             <string>&amp;Add Descriptor</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../Icons/viqui.qrc">
+              <normaloff>:/icons/16x16/add</normaloff>:/icons/16x16/add</iconset>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QPushButton" name="removeDescriptors">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>&amp;Remove Descriptor(s)</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../Icons/viqui.qrc">
+              <normaloff>:/icons/16x16/delete</normaloff>:/icons/16x16/delete</iconset>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="pageIqr">
+      <layout class="QFormLayout" name="formLayout_2">
+       <property name="fieldGrowthPolicy">
+        <enum>QFormLayout::ExpandingFieldsGrow</enum>
+       </property>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="toolTip">
+          <string>Number of results to request per query (IQR will be limited to this set).</string>
+         </property>
+         <property name="text">
+          <string>Working Set Size:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QSpinBox" name="iqrWorkingSetSize">
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="minimum">
+          <number>100</number>
+         </property>
+         <property name="maximum">
+          <number>999999999</number>
+         </property>
+         <property name="singleStep">
+          <number>100</number>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="toolTip">
+          <string>Number of results for which IQR should request feedback.</string>
+         </property>
+         <property name="text">
+          <string>Refinement Set Size:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QSpinBox" name="iqrRefinementSetSize">
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>999999999</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttons">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vvScoreGradientWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">vvScoreGradientWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/viqui.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttons</sender>
+   <signal>accepted()</signal>
+   <receiver>ConfigureDialog</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>buttons</sender>
+   <signal>rejected()</signal>
+   <receiver>ConfigureDialog</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>
+  <connection>
+   <sender>pageChooser</sender>
+   <signal>currentRowChanged(int)</signal>
+   <receiver>settingsPager</receiver>
+   <slot>setCurrentIndex(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>43</x>
+     <y>201</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>325</x>
+     <y>201</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pageChooser</sender>
+   <signal>currentTextChanged(QString)</signal>
+   <receiver>section</receiver>
+   <slot>setText(QString)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>55</x>
+     <y>180</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>329</x>
+     <y>17</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/Viqui/main.cxx b/Applications/Viqui/main.cxx
new file mode 100644
index 00000000..d6230861
--- /dev/null
+++ b/Applications/Viqui/main.cxx
@@ -0,0 +1,139 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QtCore>
+#include <QApplication>
+#include <QList>
+#include <QMainWindow>
+#include <QScopedPointer>
+
+#include <qtCliArgs.h>
+#include <qtMap.h>
+#include <qtStlUtil.h>
+
+#include <vgCheckArg.h>
+
+#include <vvQuery.h>
+#include <vvQueryResult.h>
+#include <vvQueryService.h>
+#include <vvQuerySession.h>
+
+#ifdef ENABLE_QTTESTING
+#include <pqCoreTestUtility.h>
+#endif
+
+#include "vqApplication.h"
+#include "vqPredefinedQueryCache.h"
+#include "vqVersion.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void parseConfigFile(const QString& filename, bool replace, bool organization)
+{
+  CHECK_ARG(QFileInfo(filename).exists());
+
+  QSettings loadSettings(filename, QSettings::IniFormat);
+
+  QScopedPointer<QSettings> saveSettings(organization
+    ? new QSettings(QApplication::organizationName())
+    : new QSettings);
+
+  if (replace)
+    saveSettings->clear();
+
+  foreach (QString key, loadSettings.allKeys())
+    {
+    const QVariant value = loadSettings.value(key);
+    saveSettings->setValue(key, value);
+    }
+  saveSettings->sync();
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  // Set application information
+  QApplication::setApplicationName("VisGUI Query Interface");
+  QApplication::setOrganizationName("Kitware");
+  QApplication::setOrganizationDomain("kitware.com");
+  QApplication::setApplicationVersion(VIQUI_VERSION_STR);
+
+  // Set up command line options
+  qtCliArgs args(argc, argv);
+
+#ifdef ENABLE_QTTESTING
+  pqCoreTestUtility::AddCommandLineOptions(args);
+#endif
+
+  qtCliOptions options;
+  options.add("ui <mode>", "Set user interface mode (analyst, engineering)");
+  options.add("add-layer <uri>", "Add context layer from 'uri' on startup");
+  options.add("import-config <file>", "Append settings from 'file'"
+              " to the application's configuration space");
+  options.add("import-config-org <file>", "Append settings from 'file'"
+              " to the organization's configuration space");
+  options.add("replace-config <file>", "Replace settings in the"
+              " application's configuration space with those from 'file'");
+  options.add("replace-config-org <file>", "Replace settings in the"
+              " organization's configuration space with those from 'file'");
+  args.addOptions(options);
+
+  // Parse arguments
+  args.parseOrDie();
+
+  // Handle various config-related options
+  qtUtil::map(args.values("import-config"),
+              &parseConfigFile, false, false);
+  qtUtil::map(args.values("import-config-org"),
+              &parseConfigFile, false, true);
+  qtUtil::map(args.values("replace-config"),
+              &parseConfigFile, true, false);
+  qtUtil::map(args.values("replace-config-org"),
+              &parseConfigFile, true, true);
+
+  // Create application instance and set copyright information
+  QApplication app(args.qtArgc(), args.qtArgv());
+
+  app.setProperty("COPY_YEAR", VIQUI_COPY_YEAR);
+  app.setProperty("COPY_ORGANIZATION", "Kitware, Inc.");
+
+  // Register metatypes
+  QTE_REGISTER_METATYPE(vvProcessingRequest);
+  QTE_REGISTER_METATYPE(vvQueryInstance);
+  QTE_REGISTER_METATYPE(QList<vvDescriptor>);
+  QTE_REGISTER_METATYPE(QList<vvTrack>);
+  QTE_REGISTER_METATYPE(vvQueryResult);
+  QTE_REGISTER_METATYPE(vvIqr::ScoringClassifiers);
+  QTE_REGISTER_METATYPE(const qtCliArgs*);
+
+  vqApplication mainWindow(args.value("ui") == "analyst" ?
+                           vqApplication::UI_Analyst :
+                           vqApplication::UI_Engineering);
+  mainWindow.show();
+
+  // Pre-load plans for pre-defined query formulation
+  vqPredefinedQueryCache::reload();
+
+  // Load requested layer(s)
+  foreach (const QString& layer, args.values("add-layer"))
+    {
+    mainWindow.addLayer(QUrl::fromUserInput(layer));
+    }
+
+#ifdef ENABLE_QTTESTING
+  // If given testing arguments, run tests on the main window; invoke by queued
+  // connection so this doesn't execute until the event loop is up and running
+  QMetaObject::invokeMethod(&mainWindow, "initializeTesting",
+                            Qt::QueuedConnection,
+                            Q_ARG(const qtCliArgs*, &args));
+#endif
+
+  return app.exec();
+}
diff --git a/Applications/Viqui/predefinedQuery.ui b/Applications/Viqui/predefinedQuery.ui
new file mode 100644
index 00000000..ca9d93e5
--- /dev/null
+++ b/Applications/Viqui/predefinedQuery.ui
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vqPredefinedQueryDialog</class>
+ <widget class="QDialog" name="vqPredefinedQueryDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>419</width>
+    <height>391</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Predefined Query</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="contentWidget">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>407</width>
+        <height>346</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="classifierGroup">
+         <property name="title">
+          <string>Classifiers</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="vgMixerWidget" name="classifierFilter" native="true"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QWidget" name="groupsWidget" native="true"/>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vgMixerWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">vgMixerWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/viqui.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vqPredefinedQueryDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>188</x>
+     <y>271</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>179</x>
+     <y>149</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vqPredefinedQueryDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>139</x>
+     <y>261</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>139</x>
+     <y>140</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/Viqui/query.ui b/Applications/Viqui/query.ui
new file mode 100644
index 00000000..a4ed9f5a
--- /dev/null
+++ b/Applications/Viqui/query.ui
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vqQueryDialog</class>
+ <widget class="QDialog" name="vqQueryDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>415</width>
+    <height>440</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>New Query...</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_5">
+   <item row="0" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Query Type</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QComboBox" name="queryType">
+        <item>
+         <property name="text">
+          <string>(Select a query type)</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QToolButton" name="editQuery">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="vvQueryInfoLabel" name="queryInfo">
+        <property name="text">
+         <string>(no descriptors)</string>
+        </property>
+        <property name="indent">
+         <number>2</number>
+        </property>
+        <property name="errorText" stdset="0">
+         <string>(no descriptors)</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>328</width>
+       <height>22</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0">
+    <widget class="QPushButton" name="buttonLoad">
+     <property name="text">
+      <string>Load</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../Icons/viqui.qrc">
+       <normaloff>:/icons/16x16/load</normaloff>:/icons/16x16/load</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QPushButton" name="buttonSave">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Save</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../Icons/viqui.qrc">
+       <normaloff>:/icons/16x16/save</normaloff>:/icons/16x16/save</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Query Options</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_4">
+      <item row="0" column="0">
+       <widget class="QLabel" name="labelRelevancy">
+        <property name="text">
+         <string>Relevancy Threshold:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSlider" name="relevancySlider">
+        <property name="maximum">
+         <number>100</number>
+        </property>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QSpinBox" name="relevancySpin">
+        <property name="suffix">
+         <string>%</string>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="3">
+       <widget class="QGroupBox" name="timeLimit">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="title">
+         <string>Restrict to Time</string>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QLabel" name="labelTimeLower">
+           <property name="text">
+            <string>Lower Limit (UTC):</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QDateTimeEdit" name="timeLower">
+           <property name="displayFormat">
+            <string>yyyy-MM-dd hh:mm</string>
+           </property>
+           <property name="calendarPopup">
+            <bool>true</bool>
+           </property>
+           <property name="timeSpec">
+            <enum>Qt::UTC</enum>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="labelTimeUpper">
+           <property name="text">
+            <string>Upper Limit (UTC):</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QDateTimeEdit" name="timeUpper">
+           <property name="displayFormat">
+            <string>yyyy-MM-dd hh:mm</string>
+           </property>
+           <property name="calendarPopup">
+            <bool>true</bool>
+           </property>
+           <property name="timeSpec">
+            <enum>Qt::UTC</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="3">
+       <widget class="QGroupBox" name="regionLimit">
+        <property name="title">
+         <string>Restrict to Region</string>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <property name="spacing">
+            <number>2</number>
+           </property>
+           <item>
+            <widget class="QLineEdit" name="region">
+             <property name="readOnly">
+              <bool>true</bool>
+             </property>
+             <property name="placeholderText">
+              <string>(no region is defined)</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="pickRegionNumeric">
+             <property name="toolTip">
+              <string>Define region by entering a location numerically</string>
+             </property>
+             <property name="text">
+              <string>...</string>
+             </property>
+             <property name="icon">
+              <iconset resource="../../Icons/viqui.qrc">
+               <normaloff>:/icons/16x16/edit-number</normaloff>:/icons/16x16/edit-number</iconset>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QToolButton" name="pickRegionGraphic">
+             <property name="toolTip">
+              <string>Define region by drawing on the context view</string>
+             </property>
+             <property name="text">
+              <string>...</string>
+             </property>
+             <property name="icon">
+              <iconset resource="../../Icons/viqui.qrc">
+               <normaloff>:/icons/16x16/path-draw</normaloff>:/icons/16x16/path-draw</iconset>
+             </property>
+             <property name="popupMode">
+              <enum>QToolButton::InstantPopup</enum>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QRadioButton" name="anyEvent">
+             <property name="toolTip">
+              <string>Select all results for which the event occurs within (or intersecst) the region</string>
+             </property>
+             <property name="text">
+              <string>Any</string>
+             </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="enterEvent">
+             <property name="toolTip">
+              <string>Limit results to events for which the tracked object is crossing into the region</string>
+             </property>
+             <property name="text">
+              <string>Entering</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="exitEvent">
+             <property name="toolTip">
+              <string>Limit results to events for which the tracked object is crossing out of the region</string>
+             </property>
+             <property name="text">
+              <string>Exiting</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QRadioButton" name="crossEvent">
+             <property name="toolTip">
+              <string>Limit results to events which intersect the region</string>
+             </property>
+             <property name="text">
+              <string>Crossing</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item row="3" column="0" colspan="3">
+       <widget class="QGroupBox" name="useIqrModel">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="title">
+         <string>Use Saved Refinement Model</string>
+        </property>
+        <property name="flat">
+         <bool>true</bool>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
+        </property>
+        <property name="checked">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vvQueryInfoLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">vvQueryInfoLabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/viqui.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vqQueryDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vqQueryDialog</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>
+  <connection>
+   <sender>relevancySlider</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>relevancySpin</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>207</x>
+     <y>117</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>294</x>
+     <y>117</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>relevancySpin</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>relevancySlider</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>294</x>
+     <y>117</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>207</x>
+     <y>117</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/Viqui/regionEdit.ui b/Applications/Viqui/regionEdit.ui
new file mode 100644
index 00000000..583df938
--- /dev/null
+++ b/Applications/Viqui/regionEdit.ui
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vqRegionEditDialog</class>
+ <widget class="QDialog" name="vqRegionEditDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>374</width>
+    <height>198</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Edit Region</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QRadioButton" name="vicinity">
+     <property name="toolTip">
+      <string>Define a region by providing a center coordinate and region size.</string>
+     </property>
+     <property name="text">
+      <string>&amp;Vicinity</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QWidget" name="widget" native="true">
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="crsLabel">
+        <property name="text">
+         <string>Coordinate System:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="crs"/>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="location"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="locationLabel">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;Specify the region center, in latitude/longitude or UTM coordinates. See example coordinate specifications below.&lt;/p&gt;
+&lt;p&gt;&lt;b&gt;Good:&lt;/b&gt;
+&lt;table&gt;
+&lt;tr&gt;&lt;td&gt;13:20:22W 45:12:59N&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;13d20'22&quot;W,45d12'59&quot;N&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;13.339444W 45.216389N&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;+13d20'22&quot; -45d12'59&quot;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;17N 12345.43 67890.98&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;&lt;/p&gt;
+&lt;p&gt;&lt;b&gt;Bad:&lt;/b&gt;
+&lt;table&gt;
+&lt;tr&gt;&lt;td&gt;13:20W 45:12N&lt;/td&gt;&lt;td&gt;&lt;i&gt;Must specify seconds&lt;/i&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;13d22sW 45d59sN&lt;/td&gt;&lt;td&gt;&lt;i&gt;Must specify minutes&lt;/i&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;13d20'22&quot;W 45d12'59&quot;N (WGS '84)&lt;/td&gt;&lt;td&gt;&lt;i&gt;Do not include coordinate system&lt;/i&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;/table&gt;&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Location Center:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="diameterLabel">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Define the size of the region. The region will be an approximate square whose sides are equal to this number, centered around the specified point.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Location Diameter:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QComboBox" name="diameterPreset">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QDoubleSpinBox" name="diameter">
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="decimals">
+           <number>0</number>
+          </property>
+          <property name="minimum">
+           <double>1.000000000000000</double>
+          </property>
+          <property name="maximum">
+           <double>9999.000000000000000</double>
+          </property>
+          <property name="value">
+           <double>10.000000000000000</double>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="diameterUnits">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QRadioButton" name="mgrs">
+     <property name="toolTip">
+      <string>Define a region by giving its MGRS specification.</string>
+     </property>
+     <property name="text">
+      <string>&amp;MGRS</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>76</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QLineEdit" name="mgrsLocation">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vqRegionEditDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vqRegionEditDialog</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>
+  <connection>
+   <sender>mgrs</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>mgrsLocation</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>74</x>
+     <y>156</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>75</x>
+     <y>185</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>vicinity</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>widget</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>70</x>
+     <y>22</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>238</x>
+     <y>93</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/Viqui/resultFilter.ui b/Applications/Viqui/resultFilter.ui
new file mode 100644
index 00000000..09ae9eef
--- /dev/null
+++ b/Applications/Viqui/resultFilter.ui
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vqResultFilterDialog</class>
+ <widget class="QDialog" name="vqResultFilterDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>337</width>
+    <height>162</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Result Filters</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
+     <item row="0" column="0">
+      <widget class="QCheckBox" name="threshold">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>&amp;Threshold</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QComboBox" name="thresholdPreset">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QDoubleSpinBox" name="thresholdValue">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+         <property name="maximum">
+          <double>1.000000000000000</double>
+         </property>
+         <property name="singleStep">
+          <double>0.010000000000000</double>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0">
+    <widget class="QPushButton" name="clear">
+     <property name="text">
+      <string>&amp;Clear</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../Icons/viqui.qrc">
+       <normaloff>:/icons/16x16/clear</normaloff>:/icons/16x16/clear</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../Icons/viqui.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vqResultFilterDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>310</x>
+     <y>143</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>161</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vqResultFilterDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>330</x>
+     <y>149</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>161</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>threshold</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>thresholdPreset</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>54</x>
+     <y>24</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>142</x>
+     <y>28</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>threshold</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>thresholdValue</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>75</x>
+     <y>13</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>246</x>
+     <y>21</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/Viqui/resultInfo.ui b/Applications/Viqui/resultInfo.ui
new file mode 100644
index 00000000..f8c336e7
--- /dev/null
+++ b/Applications/Viqui/resultInfo.ui
@@ -0,0 +1,310 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>resultInfo</class>
+ <widget class="QWidget" name="resultInfo">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>260</width>
+    <height>301</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QScrollArea" name="scrollArea">
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="scrollAreaWidgetContents">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>260</width>
+         <height>301</height>
+        </rect>
+       </property>
+       <layout class="QFormLayout" name="formLayout">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::ExpandingFieldsGrow</enum>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="idLabel">
+          <property name="text">
+           <string>Id:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="id">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="relevancyLabel">
+          <property name="text">
+           <string>Relevancy:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="relevancy">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="classificationLabel">
+          <property name="text">
+           <string>Rating:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="classification">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="noteLabel">
+          <property name="text">
+           <string>Note:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="qtSqueezedLabel" name="note">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="textFormat">
+           <enum>Qt::PlainText</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="vvQueryInfoLabel" name="descriptorInfo">
+          <property name="text">
+           <string>(no descriptors)</string>
+          </property>
+          <property name="errorText" stdset="0">
+           <string>(no descriptors)</string>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="qtExpander" name="showDetails">
+          <property name="text">
+           <string>Details</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="0">
+         <widget class="QLabel" name="missionIdLabel">
+          <property name="text">
+           <string>Mission Id:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="1">
+         <widget class="QLineEdit" name="missionId">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="0">
+         <widget class="QLabel" name="streamIdLabel">
+          <property name="text">
+           <string>Stream Id:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="7" column="1">
+         <widget class="QLineEdit" name="streamId">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="8" column="0">
+         <widget class="QLabel" name="startTimeLabel">
+          <property name="text">
+           <string>Start:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="8" column="1">
+         <widget class="QLineEdit" name="startTime">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="9" column="0">
+         <widget class="QLabel" name="endTimelabel">
+          <property name="text">
+           <string>End:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="9" column="1">
+         <widget class="QLineEdit" name="endTime">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="10" column="0">
+         <widget class="QLabel" name="durationLabel">
+          <property name="text">
+           <string>Duration:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="10" column="1">
+         <widget class="QLineEdit" name="duration">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="11" column="0">
+         <widget class="QLabel" name="locationLabel">
+          <property name="text">
+           <string>Location:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="11" column="1">
+         <widget class="QLineEdit" name="location">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="helpWidget">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="notice">
+         <property name="text">
+          <string>Notice</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="helpLabel">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="text">
+          <string>Select a single result to view detailed information.</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vvQueryInfoLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">vvQueryInfoLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>qtExpander</class>
+   <extends>QToolButton</extends>
+   <header location="global">qtExpander.h</header>
+  </customwidget>
+  <customwidget>
+   <class>qtSqueezedLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">qtSqueezedLabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/Viqui/viqui.ui b/Applications/Viqui/viqui.ui
new file mode 100644
index 00000000..ad494698
--- /dev/null
+++ b/Applications/Viqui/viqui.ui
@@ -0,0 +1,1008 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>909</width>
+    <height>795</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>VisGUI Query Interface</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <item row="0" column="0">
+     <widget class="QVTKWidget" name="renderFrame" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>909</width>
+     <height>23</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuQuery">
+    <property name="title">
+     <string>&amp;Query</string>
+    </property>
+    <widget class="QMenu" name="menuQueryExportResults">
+     <property name="title">
+      <string>E&amp;xport Results</string>
+     </property>
+    </widget>
+    <addaction name="actionQueryNew"/>
+    <addaction name="actionQueryEdit"/>
+    <addaction name="actionQueryRefine"/>
+    <addaction name="separator"/>
+    <addaction name="actionQueryOpen"/>
+    <addaction name="actionGroundTruthOpen"/>
+    <addaction name="actionQuerySave"/>
+    <addaction name="separator"/>
+    <addaction name="actionFindResult"/>
+    <addaction name="actionQuerySaveResults"/>
+    <addaction name="menuQueryExportResults"/>
+    <addaction name="actionGenerateReport"/>
+    <addaction name="separator"/>
+    <addaction name="actionQuit"/>
+   </widget>
+   <widget class="QMenu" name="menuLayers">
+    <property name="title">
+     <string>&amp;Layers</string>
+    </property>
+    <widget class="QMenu" name="menuProjectMru">
+     <property name="title">
+      <string>&amp;Recent Projects</string>
+     </property>
+     <addaction name="separator"/>
+     <addaction name="actionProjectMruClear"/>
+    </widget>
+    <addaction name="actionLayerManagerShow"/>
+    <addaction name="separator"/>
+    <addaction name="actionProjectOpen"/>
+    <addaction name="menuProjectMru"/>
+    <addaction name="actionProjectSave"/>
+    <addaction name="separator"/>
+    <addaction name="actionLayerAddFile"/>
+   </widget>
+   <widget class="QMenu" name="menuSettings">
+    <property name="title">
+     <string>&amp;Settings</string>
+    </property>
+    <widget class="QMenu" name="menuItemColoring">
+     <property name="title">
+      <string>Item Coloring</string>
+     </property>
+     <addaction name="actionColorByRank"/>
+     <addaction name="actionColorByRelativeScore"/>
+     <addaction name="actionColorByAbsoluteScore"/>
+     <addaction name="separator"/>
+     <addaction name="actionColorShadeDiscrete"/>
+     <addaction name="actionColorShadeLinear"/>
+     <addaction name="actionColorShadeCubic"/>
+    </widget>
+    <widget class="QMenu" name="menuToolViews">
+     <property name="title">
+      <string>&amp;Tool Views</string>
+     </property>
+     <addaction name="actionViewResults"/>
+     <addaction name="actionViewResultInfo"/>
+     <addaction name="actionViewScore"/>
+     <addaction name="actionViewGroundTruth"/>
+     <addaction name="actionViewTimeline"/>
+     <addaction name="actionViewVideo"/>
+     <addaction name="actionViewQueryClip"/>
+    </widget>
+    <addaction name="menuToolViews"/>
+    <addaction name="actionConfigure"/>
+    <addaction name="separator"/>
+    <addaction name="menuItemColoring"/>
+    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="menuView">
+    <property name="title">
+     <string>&amp;View</string>
+    </property>
+    <addaction name="actionShowVideoClipsOnContext"/>
+    <addaction name="actionShowOutlinesOnContext"/>
+    <addaction name="actionShowTracksOnContext"/>
+    <addaction name="separator"/>
+    <addaction name="actionShowQueryRegion"/>
+    <addaction name="separator"/>
+    <addaction name="actionFilterResults"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+   </widget>
+   <addaction name="menuQuery"/>
+   <addaction name="menuLayers"/>
+   <addaction name="menuView"/>
+   <addaction name="menuSettings"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="queryToolBar">
+   <property name="windowTitle">
+    <string>Query Tool Bar</string>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonFollowStyle</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionQueryNew"/>
+   <addaction name="actionQueryEdit"/>
+   <addaction name="actionQueryRefine"/>
+   <addaction name="separator"/>
+   <addaction name="actionQueryOpen"/>
+   <addaction name="actionQuerySaveResults"/>
+   <addaction name="separator"/>
+   <addaction name="actionViewBestResults"/>
+  </widget>
+  <widget class="QToolBar" name="layerToolBar">
+   <property name="windowTitle">
+    <string>Layer Tool Bar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionProjectOpen"/>
+   <addaction name="actionProjectSave"/>
+   <addaction name="separator"/>
+   <addaction name="actionLayerAddFile"/>
+  </widget>
+  <widget class="QDockWidget" name="videoPlayerDock">
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>200</width>
+     <height>200</height>
+    </size>
+   </property>
+   <property name="windowTitle">
+    <string>Video Player</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="videoPlayerContents">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vqVideoPlayer" name="videoPlayer" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="resultDock">
+   <property name="windowTitle">
+    <string>Results</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="resultContents">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vqTreeView" name="resultView">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>50</height>
+        </size>
+       </property>
+       <property name="editTriggers">
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+       <property name="allColumnsShowFocus">
+        <bool>true</bool>
+       </property>
+       <attribute name="headerVisible">
+        <bool>false</bool>
+       </attribute>
+       <column>
+        <property name="text">
+         <string notr="true">1</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolBar" name="resultToolBar">
+       <addaction name="actionFilterResults"/>
+       <addaction name="actionViewResultsHideAll"/>
+       <addaction name="actionViewResultsShowAll"/>
+       <addaction name="actionViewResultsShowHidden"/>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="scoreDock">
+   <property name="windowTitle">
+    <string>Feedback Requests</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="scoreContents">
+    <layout class="QVBoxLayout" name="verticalLayout_4">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vqTreeView" name="scoreView">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>50</height>
+        </size>
+       </property>
+       <property name="editTriggers">
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+       <property name="allColumnsShowFocus">
+        <bool>true</bool>
+       </property>
+       <attribute name="headerVisible">
+        <bool>false</bool>
+       </attribute>
+       <column>
+        <property name="text">
+         <string notr="true">1</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolBar" name="scoreToolBar">
+       <addaction name="actionViewRefinementHideAll"/>
+       <addaction name="actionViewRefinementShowAll"/>
+       <addaction name="actionViewRefinementShowHidden"/>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="groundTruthDock">
+   <property name="windowTitle">
+    <string>Ground Truth</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="groundTruthContents">
+    <layout class="QVBoxLayout" name="verticalLayout_5">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vqTreeView" name="groundTruthView">
+       <property name="minimumSize">
+        <size>
+         <width>100</width>
+         <height>50</height>
+        </size>
+       </property>
+       <property name="editTriggers">
+        <set>QAbstractItemView::NoEditTriggers</set>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+       <property name="allColumnsShowFocus">
+        <bool>true</bool>
+       </property>
+       <attribute name="headerVisible">
+        <bool>false</bool>
+       </attribute>
+       <column>
+        <property name="text">
+         <string notr="true">1</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="text">
+          <string>Event Type:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="groundTruthEventType">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <item>
+          <property name="text">
+           <string>All</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QToolBar" name="groundTruthToolBar">
+       <addaction name="actionViewGroundTruthHideAll"/>
+       <addaction name="actionViewGroundTruthShowAll"/>
+       <addaction name="actionViewGroundTruthShowHidden"/>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="timelineDock">
+   <property name="windowTitle">
+    <string>Timeline</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>8</number>
+   </attribute>
+   <widget class="QWidget" name="timelineContents">
+    <layout class="QVBoxLayout" name="verticalLayout_3">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vqTimeline" name="timeline" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="queryClipDock">
+   <property name="windowTitle">
+    <string>Query Clip</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="vqQueryVideoPlayer" name="queryClip"/>
+  </widget>
+  <widget class="QDockWidget" name="resultInfoDock">
+   <property name="windowTitle">
+    <string>Result Info</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents">
+    <layout class="QVBoxLayout" name="verticalLayout_6">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vqResultInfo" name="resultInfo" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QToolBar" name="viewToolBar">
+   <property name="windowTitle">
+    <string>View Tool Bar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionShowVideoClipsOnContext"/>
+   <addaction name="actionShowOutlinesOnContext"/>
+   <addaction name="actionShowTracksOnContext"/>
+   <addaction name="actionAutoZoomOnPlay"/>
+  </widget>
+  <action name="actionQuit">
+   <property name="text">
+    <string>&amp;Quit</string>
+   </property>
+   <property name="toolTip">
+    <string>Exit the application</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="actionQueryNew">
+   <property name="text">
+    <string>&amp;New...</string>
+   </property>
+   <property name="toolTip">
+    <string>Create a new query</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+  <action name="actionQuerySaveResults">
+   <property name="text">
+    <string>&amp;Save Results...</string>
+   </property>
+   <property name="toolTip">
+    <string>Save the current query result set</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="actionQueryOpen">
+   <property name="text">
+    <string>&amp;Open...</string>
+   </property>
+   <property name="toolTip">
+    <string>Open a saved query</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+  </action>
+  <action name="actionQueryRefine">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Refine</string>
+   </property>
+   <property name="toolTip">
+    <string>Refine the current query</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+R</string>
+   </property>
+  </action>
+  <action name="actionProjectSave">
+   <property name="text">
+    <string>&amp;Save Project</string>
+   </property>
+   <property name="toolTip">
+    <string>Save layers to a project</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+P, S</string>
+   </property>
+  </action>
+  <action name="actionProjectMruClear">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Clear List</string>
+   </property>
+   <property name="toolTip">
+    <string>Clear list of recently opened projects</string>
+   </property>
+  </action>
+  <action name="actionProjectOpen">
+   <property name="text">
+    <string>&amp;Open Project</string>
+   </property>
+   <property name="toolTip">
+    <string>Load layers from a saved project</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+P, O</string>
+   </property>
+  </action>
+  <action name="actionLayerAddFile">
+   <property name="text">
+    <string>Add File...</string>
+   </property>
+   <property name="toolTip">
+    <string>Add a layer from a file</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+L, F</string>
+   </property>
+  </action>
+  <action name="actionLayerManagerShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Show Layer Manager</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the Layer Manager</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, L</string>
+   </property>
+  </action>
+  <action name="actionConfigure">
+   <property name="text">
+    <string>&amp;Configure...</string>
+   </property>
+   <property name="toolTip">
+    <string>View or change configuration settings</string>
+   </property>
+  </action>
+  <action name="actionQuerySave">
+   <property name="text">
+    <string>S&amp;ave Query...</string>
+   </property>
+   <property name="toolTip">
+    <string>Save the current query</string>
+   </property>
+  </action>
+  <action name="actionViewResults">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Results</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the results list</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, R</string>
+   </property>
+  </action>
+  <action name="actionViewTimeline">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Timeline</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the timeline view</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, T</string>
+   </property>
+  </action>
+  <action name="actionViewScore">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Feedback Requests</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the refinement window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, F</string>
+   </property>
+  </action>
+  <action name="actionColorByRank">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>By &amp;Rank</string>
+   </property>
+  </action>
+  <action name="actionColorByRelativeScore">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>By R&amp;elative Score</string>
+   </property>
+  </action>
+  <action name="actionColorShadeDiscrete">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Discrete Colors</string>
+   </property>
+  </action>
+  <action name="actionColorShadeLinear">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Continuous Shade (&amp;Linear)</string>
+   </property>
+  </action>
+  <action name="actionViewVideo">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Video Player</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the video player window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, V</string>
+   </property>
+  </action>
+  <action name="actionViewQueryClip">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Query Clip</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, Q</string>
+   </property>
+  </action>
+  <action name="actionViewResultsHideAll">
+   <property name="text">
+    <string>Hide All</string>
+   </property>
+   <property name="toolTip">
+    <string>Turn off visibility flag of all result items</string>
+   </property>
+  </action>
+  <action name="actionViewResultsShowAll">
+   <property name="text">
+    <string>Show All</string>
+   </property>
+   <property name="toolTip">
+    <string>Turn on visibility flag of all result items</string>
+   </property>
+  </action>
+  <action name="actionViewResultsShowHidden">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Hidden Items</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of result items whose visibility flag is off</string>
+   </property>
+  </action>
+  <action name="actionViewRefinementHideAll">
+   <property name="text">
+    <string>Hide All</string>
+   </property>
+   <property name="toolTip">
+    <string>Turn off visibility flag of all refinement items</string>
+   </property>
+  </action>
+  <action name="actionViewRefinementShowAll">
+   <property name="text">
+    <string>Show All</string>
+   </property>
+   <property name="toolTip">
+    <string>Turn on visibility flag of all refinement items</string>
+   </property>
+  </action>
+  <action name="actionViewRefinementShowHidden">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Hidden Items</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of refinement items whose visibility flag is off</string>
+   </property>
+  </action>
+  <action name="actionViewBestResults">
+   <property name="text">
+    <string>View Best Results</string>
+   </property>
+   <property name="toolTip">
+    <string>Show clips of the top 10 results</string>
+   </property>
+  </action>
+  <action name="actionShowQueryRegion">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Query Region</string>
+   </property>
+  </action>
+  <action name="actionViewGroundTruthShowHidden">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Hidden Items</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of result items whose visibility flag is off</string>
+   </property>
+  </action>
+  <action name="actionViewGroundTruthShowAll">
+   <property name="text">
+    <string>Show All</string>
+   </property>
+   <property name="toolTip">
+    <string>Turn on visibility flag of all result items</string>
+   </property>
+  </action>
+  <action name="actionViewGroundTruthHideAll">
+   <property name="text">
+    <string>Hide All</string>
+   </property>
+   <property name="toolTip">
+    <string>Turn off visibility flag of all result items</string>
+   </property>
+  </action>
+  <action name="actionViewGroundTruth">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Ground Truth</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide ground truth results</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, G</string>
+   </property>
+  </action>
+  <action name="actionGroundTruthOpen">
+   <property name="text">
+    <string>Open &amp;Ground Truth...</string>
+   </property>
+  </action>
+  <action name="actionQueryEdit">
+   <property name="text">
+    <string>&amp;Edit Last...</string>
+   </property>
+  </action>
+  <action name="actionViewResultInfo">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Result &amp;Info</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, I</string>
+   </property>
+  </action>
+  <action name="actionShowVideoClipsOnContext">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Video &amp;Clips</string>
+   </property>
+  </action>
+  <action name="actionShowOutlinesOnContext">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Video &amp;Outlines</string>
+   </property>
+  </action>
+  <action name="actionShowTracksOnContext">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show &amp;Tracks</string>
+   </property>
+  </action>
+  <action name="actionColorByAbsoluteScore">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>By &amp;Absolute Score</string>
+   </property>
+  </action>
+  <action name="actionFilterResults">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Filter Results...</string>
+   </property>
+   <property name="iconText">
+    <string>Filter</string>
+   </property>
+   <property name="toolTip">
+    <string>Add or change result filters</string>
+   </property>
+  </action>
+  <action name="actionColorShadeCubic">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Continuous Shade (&amp;Cubic)</string>
+   </property>
+  </action>
+  <action name="actionAutoZoomOnPlay">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>AutoZoom on Play</string>
+   </property>
+  </action>
+  <action name="actionGenerateReport">
+   <property name="text">
+    <string>Generate Report...</string>
+   </property>
+  </action>
+  <action name="actionFindResult">
+   <property name="text">
+    <string>&amp;Find Result...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+F</string>
+   </property>
+  </action>
+  <action name="actionExportKml">
+   <property name="text">
+    <string>KML</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QVTKWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vqVideoPlayer</class>
+   <extends>QWidget</extends>
+   <header>vqVideoPlayer.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vqTreeView</class>
+   <extends>QTreeWidget</extends>
+   <header>vqTreeView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vqTimeline</class>
+   <extends>QWidget</extends>
+   <header>vqTimeline.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vqQueryVideoPlayer</class>
+   <extends>QWidget</extends>
+   <header>vqQueryVideoPlayer.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vqResultInfo</class>
+   <extends>QWidget</extends>
+   <header>vqResultInfo.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>actionQuit</sender>
+   <signal>triggered()</signal>
+   <receiver>MainWindow</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>446</x>
+     <y>303</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/Viqui/vqApplication.cxx b/Applications/Viqui/vqApplication.cxx
new file mode 100644
index 00000000..8349cc29
--- /dev/null
+++ b/Applications/Viqui/vqApplication.cxx
@@ -0,0 +1,1076 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqApplication.h"
+
+#include <QActionGroup>
+#include <QIcon>
+#include <QInputDialog>
+#include <QLabel>
+#include <QMenu>
+#include <QMessageBox>
+#include <QProgressBar>
+#include <QSettings>
+#include <QSignalMapper>
+#include <QToolButton>
+#include <QUrl>
+
+#include <qtCliArgs.h>
+#include <qtDockController.h>
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vgCheckArg.h>
+
+#include <vgFileDialog.h>
+
+#include <vgAboutAction.h>
+
+#include <vvGenerateReportDialog.h>
+#include <vvQueryFormulation.h>
+
+#include "vtkVgVideoNode.h"
+#include "vtkVgViewerBase.h"
+
+#include "vqCore.h"
+#include "vqVersion.h"
+
+#include "vqConfigureDialog.h"
+#include "vqEventInfo.h"
+#include "vqPredefinedQueryCache.h"
+#include "vqQueryDialog.h"
+#include "vqResultFilterDialog.h"
+#include "vqSettings.h"
+#include "vqTrackingClipViewer.h"
+#include "vqUserActions.h"
+#include "vqVideoQueryDialog.h"
+
+#include "Backends/vqExporterFactory.h"
+
+#ifdef ENABLE_QTTESTING
+#include "pqCoreTestUtility.h"
+#endif
+
+//-----------------------------------------------------------------------------
+#define connectCoreDisplayToggle(_a_, _s_) do { \
+  connect(_a_, SIGNAL(toggled(bool)), this->Core, SLOT(_s_(bool))); \
+  this->Core->_s_(_a_->isChecked()); \
+  } while (0)
+
+#define connectDisplayToggle(_a_, _o2_, _s_) do { \
+  connect(_a_, SIGNAL(toggled(bool)), _o2_, SLOT(_s_(bool))); \
+  _o2_->_s_(_a_->isChecked()); \
+  } while (0)
+
+//-----------------------------------------------------------------------------
+void vqApplication::connectTreeWidget(vqTreeView* tree)
+{
+  connect(tree, SIGNAL(NodesSelected(QList<vtkVgNodeBase*>)),
+          this->Core, SLOT(selectNodes(QList<vtkVgNodeBase*>)));
+  connect(tree, SIGNAL(NodeActivated(vtkVgNodeBase&)),
+          this->Core, SLOT(activateNode(vtkVgNodeBase&)));
+
+  connect(this->Core, SIGNAL(selected(QList<vtkVgNodeBase*>)),
+          tree, SLOT(SelectNodes(QList<vtkVgNodeBase*>)));
+
+  connect(tree, SIGNAL(ItemsChanged()),
+          this->Core, SLOT(updateResultScoreIndicators()));
+  connect(tree, SIGNAL(ItemsChanged()),
+          this->Core, SLOT(updateLayoutStacks()));
+  connect(tree, SIGNAL(ItemsChanged()),
+          this->Core, SLOT(updateTrackVisibility()));
+  connect(tree, SIGNAL(ItemsChanged()),
+          this->UI.timeline, SLOT(Update()));
+  connect(tree, SIGNAL(ShowTrackingClips(QList<vtkVgVideoNode*>)),
+          this, SLOT(showTrackingClips(QList<vtkVgVideoNode*>)));
+
+  connect(tree, SIGNAL(UserScoreChanged(long long, int)),
+          this, SLOT(setUserScore(long long, int)));
+  connect(tree, SIGNAL(NoteChanged(long long, const QString&)),
+          this, SLOT(setResultNote(long long, const QString&)));
+  connect(tree, SIGNAL(StarredChanged(long long, bool)),
+          this, SLOT(setResultStarred(long long, bool)));
+
+  // Only update activated when we are playing a video node.
+  connect(this->UserActions, SIGNAL(Play(vtkVgVideoNode&)),
+          tree, SLOT(UpdateActivated(vtkVgVideoNode&)));
+
+  connect(this->Core, SIGNAL(displayResultsReset()),
+          tree, SLOT(Reset()));
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::setEnabledSignal(
+  QAction* action, QObject* sender, const char* signal, bool initiallyEnabled)
+{
+  connect(sender, signal, action, SLOT(setEnabled(bool)));
+  action->setEnabled(initiallyEnabled);
+}
+
+//-----------------------------------------------------------------------------
+vqApplication::vqApplication(UIMode uiMode)
+  : InterfaceMode(uiMode), Core(new vqCore), NewQueryDialog(0),
+    TestUtility(0)
+{
+  this->UI.setupUi(this);
+  this->Core->setupUi(this->UI.renderFrame);
+
+  // Hide some UI if not in engineering mode
+  if (!this->useAdvancedUI())
+    {
+    this->UI.actionLayerManagerShow->setVisible(false);
+    this->UI.actionProjectOpen->setVisible(false);
+    this->UI.actionProjectSave->setVisible(false);
+
+    // This seems to be the only way to hide the submenu...
+    delete this->UI.menuProjectMru;
+    this->UI.menuProjectMru = 0;
+
+    // Remove toolbar separator
+    this->UI.layerToolBar->clear();
+    this->UI.layerToolBar->addAction(this->UI.actionLayerAddFile);
+    }
+
+  // Set window title (i.e. add version number) and icon
+  QString title("%1 %3");
+  title = title.arg(this->windowTitle()).arg(VIQUI_VERSION_STR);
+  this->setWindowTitle(title);
+  qtUtil::setApplicationIcon("viqui", this);
+
+  // Set up About dialog
+  this->UI.menuHelp->addAction(new vgAboutAction(this));
+
+  // Set up dock toggle actions
+  this->DockController = new qtDockController(this);
+  this->DockController->addToggleAction(this->UI.actionViewResults,
+                                        this->UI.resultDock);
+  this->DockController->addToggleAction(this->UI.actionViewResultInfo,
+                                        this->UI.resultInfoDock);
+  this->DockController->addToggleAction(this->UI.actionViewScore,
+                                        this->UI.scoreDock);
+  this->DockController->addToggleAction(this->UI.actionViewGroundTruth,
+                                        this->UI.groundTruthDock);
+  this->DockController->addToggleAction(this->UI.actionViewTimeline,
+                                        this->UI.timelineDock);
+  this->DockController->addToggleAction(this->UI.actionViewVideo,
+                                        this->UI.videoPlayerDock);
+  this->DockController->addToggleAction(this->UI.actionViewQueryClip,
+                                        this->UI.queryClipDock);
+
+  // Set default dock visibility (previous state, if saved, will override this)
+  this->UI.queryClipDock->setVisible(false);
+  this->UI.timelineDock->setVisible(false);
+
+  this->UI.queryClip->initialize();
+  this->UI.videoPlayer->initialize();
+
+  // Set up status bar
+  QLabel* statusLabel = new QLabel;
+  QProgressBar* statusProgress = new QProgressBar;
+  statusProgress->setMinimumWidth(170);
+  this->UI.statusbar->addWidget(statusLabel, 1);
+  this->UI.statusbar->addWidget(statusProgress);
+
+  this->Core->registerStatusWidget(statusLabel);
+  this->Core->registerStatusWidget(statusProgress);
+
+  // Set up Export menu
+  QSignalMapper* mapper = new QSignalMapper(this);
+  foreach (vqExporterFactory::Identifier e, vqExporterFactory::exporters())
+    {
+    QString text = e.displayString + "...";
+    QAction* action = this->UI.menuQueryExportResults->addAction(text);
+    connect(action, SIGNAL(triggered(bool)), mapper, SLOT(map()));
+    mapper->setMapping(action, e.id);
+    }
+  connect(mapper, SIGNAL(mapped(const QString&)),
+          this, SLOT(exportResults(const QString&)));
+  this->UI.menuQueryExportResults->addAction(this->UI.actionExportKml);
+
+  // Set up Export tool button
+  QWidget* spacer = new QWidget;
+  spacer->setMinimumSize(0, 0);
+  spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+  QToolButton* button = new QToolButton;
+  button->setText("Export");
+  button->setPopupMode(QToolButton::MenuButtonPopup);
+  button->setMenu(this->UI.menuQueryExportResults);
+  this->UI.resultToolBar->addWidget(spacer);
+  this->UI.resultToolBar->addWidget(button);
+  connect(button, SIGNAL(pressed()), button, SLOT(showMenu()));
+
+  // Set up action icons
+  // FIXME should be using qtAmc, which would do this for us...
+  using qtUtil::standardActionIcon;
+  this->UI.actionQuit->setIcon(standardActionIcon("quit"));
+  this->UI.actionQueryNew->setIcon(standardActionIcon("new-query"));
+  this->UI.actionQueryEdit->setIcon(standardActionIcon("edit-query"));
+  this->UI.actionQueryOpen->setIcon(standardActionIcon("load-query"));
+  this->UI.actionQuerySave->setIcon(standardActionIcon("save-query"));
+  this->UI.actionConfigure->setIcon(standardActionIcon("configure"));
+
+  // Query region visibility
+  connect(this->UI.actionShowQueryRegion, SIGNAL(triggered(bool)),
+          this->Core, SLOT(setShowQueryRegion(bool)));
+
+  // Make coloring options mutually exclusive
+  QActionGroup* colorScoringGroup = new QActionGroup(this);
+  colorScoringGroup->addAction(this->UI.actionColorByRank);
+  colorScoringGroup->addAction(this->UI.actionColorByRelativeScore);
+  colorScoringGroup->addAction(this->UI.actionColorByAbsoluteScore);
+
+  QActionGroup* colorMappingGroup = new QActionGroup(this);
+  colorMappingGroup->addAction(this->UI.actionColorShadeDiscrete);
+  colorMappingGroup->addAction(this->UI.actionColorShadeLinear);
+  colorMappingGroup->addAction(this->UI.actionColorShadeCubic);
+
+  // Set up coloring option connections
+  connect(this->UI.actionColorByRank, SIGNAL(triggered(bool)),
+          this->Core, SLOT(setColorByRank()));
+  connect(this->UI.actionColorByAbsoluteScore, SIGNAL(triggered(bool)),
+          this->Core, SLOT(setColorByAbsoluteScore()));
+  connect(this->UI.actionColorByRelativeScore, SIGNAL(triggered(bool)),
+          this->Core, SLOT(setColorByRelativeScore()));
+  connect(this->UI.actionColorShadeDiscrete, SIGNAL(triggered(bool)),
+          this->Core, SLOT(setColorShadingDiscrete()));
+  connect(this->UI.actionColorShadeLinear, SIGNAL(triggered(bool)),
+          this->Core, SLOT(setColorShadingLinear()));
+  connect(this->UI.actionColorShadeCubic, SIGNAL(triggered(bool)),
+          this->Core, SLOT(setColorShadingCubic()));
+
+  // Update colors after an option changes
+  connect(this->Core, SIGNAL(coloringChanged()),
+          this->Core, SLOT(updateResultScoreIndicators()));
+  connect(this->Core, SIGNAL(coloringChanged()),
+          this->UI.resultView, SLOT(Refresh()));
+  connect(this->Core, SIGNAL(coloringChanged()),
+          this->UI.scoreView, SLOT(Refresh()));
+  connect(this->Core, SIGNAL(coloringChanged()),
+          this->UI.timeline, SLOT(UpdateColors()));
+
+  // Set up UI action signal/slot connections
+  connect(this->UI.actionQueryNew, SIGNAL(triggered(bool)),
+          this, SLOT(showQueryNewDialog()));
+  connect(this->UI.actionQueryEdit, SIGNAL(triggered(bool)),
+          this, SLOT(showQueryEditDialog()));
+  connect(this->UI.actionQueryOpen, SIGNAL(triggered(bool)),
+          this, SLOT(showQueryOpenDialog()));
+  connect(this->UI.actionQuerySave, SIGNAL(triggered(bool)),
+          this->Core, SLOT(saveQueryPlan()));
+  connect(this->UI.actionFindResult, SIGNAL(triggered(bool)),
+          this, SLOT(findResult()));
+  connect(this->UI.actionQuerySaveResults, SIGNAL(triggered(bool)),
+          this->Core, SLOT(saveResults()));
+  connect(this->UI.actionGroundTruthOpen, SIGNAL(triggered(bool)),
+          this, SLOT(showGroundTruthOpenDialog()));
+  connect(this->UI.actionQueryRefine, SIGNAL(triggered(bool)),
+          this, SLOT(refineResults()));
+  connect(this->UI.actionViewBestResults, SIGNAL(triggered(bool)),
+          this, SLOT(showBestClips()));
+  connect(this->UI.actionGenerateReport, SIGNAL(triggered(bool)),
+          this, SLOT(generateReport()));
+  connect(this->UI.actionExportKml, SIGNAL(triggered(bool)),
+          this, SLOT(exportKml()));
+
+  this->setEnabledSignal(this->UI.actionQuerySave, this->Core,
+                         SIGNAL(queryPlanAvailabilityChanged(bool)));
+  this->setEnabledSignal(this->UI.actionQuerySaveResults, this->Core,
+                         SIGNAL(queryResultsAvailabilityChanged(bool)));
+  this->setEnabledSignal(this->UI.actionViewBestResults, this->Core,
+                         SIGNAL(queryResultsAvailabilityChanged(bool)));
+
+  connect(this->UI.actionLayerAddFile, SIGNAL(triggered(bool)),
+          this, SLOT(showLayerAddFileDialog()));
+  connect(this->UI.actionConfigure, SIGNAL(triggered(bool)),
+          this, SLOT(showConfigureDialog()));
+
+  // Set up core->UI notification signal/slot connections
+  connect(this->Core, SIGNAL(processingQuery(vvQueryInstance)),
+          this, SLOT(showQueryClip(vvQueryInstance)));
+  connect(this->Core, SIGNAL(resultsUpdated()),
+          this, SLOT(refreshResults()));
+  connect(this->Core, SIGNAL(resultSetComplete(bool, bool)),
+          this, SLOT(acceptResultSet(bool, bool)));
+
+  // Set up user actions
+  this->UserActions = new vqUserActions(this->Core);
+
+  connect(this->Core, SIGNAL(selected(QList<vtkVgNodeBase*>)),
+          this->UserActions, SLOT(Select(QList<vtkVgNodeBase*>)));
+  connect(this->Core, SIGNAL(activated(vtkVgNodeBase&)),
+          this->UserActions, SLOT(Activate(vtkVgNodeBase&)));
+
+  // Since the user actions object maintains pointers into the scene graph
+  // for selection purposes, it must be told those pointers are no longer
+  // valid when we finish a query and the old scene graph gets thrown away
+  connect(this->Core, SIGNAL(displayResultsReset()),
+          this->UserActions, SLOT(Reset()));
+
+  // Node picking via tree view
+  this->connectTreeWidget(this->UI.resultView);
+  this->connectTreeWidget(this->UI.scoreView);
+  this->connectTreeWidget(this->UI.groundTruthView);
+
+  // Hook up tree visibility controls
+  connect(this->UI.actionViewResultsHideAll, SIGNAL(triggered(bool)),
+          this->UI.resultView, SLOT(HideAllItems()));
+  connect(this->UI.actionViewResultsShowAll, SIGNAL(triggered(bool)),
+          this->UI.resultView, SLOT(ShowAllItems()));
+  connect(this->UI.actionViewResultsShowHidden, SIGNAL(toggled(bool)),
+          this->UI.resultView, SLOT(SetShowHiddenItems(bool)));
+
+  connect(this->UI.actionViewRefinementHideAll, SIGNAL(triggered(bool)),
+          this->UI.scoreView, SLOT(HideAllItems()));
+  connect(this->UI.actionViewRefinementShowAll, SIGNAL(triggered(bool)),
+          this->UI.scoreView, SLOT(ShowAllItems()));
+  connect(this->UI.actionViewRefinementShowHidden, SIGNAL(toggled(bool)),
+          this->UI.scoreView, SLOT(SetShowHiddenItems(bool)));
+
+  connect(this->UI.actionViewGroundTruthHideAll, SIGNAL(triggered(bool)),
+          this->UI.groundTruthView, SLOT(HideAllItems()));
+  connect(this->UI.actionViewGroundTruthShowAll, SIGNAL(triggered(bool)),
+          this->UI.groundTruthView, SLOT(ShowAllItems()));
+  connect(this->UI.actionViewGroundTruthShowHidden, SIGNAL(toggled(bool)),
+          this->UI.groundTruthView, SLOT(SetShowHiddenItems(bool)));
+
+  // Keep the trees in sync
+  connect(this->UI.resultView, SIGNAL(ItemsChanged()),
+          this->UI.scoreView, SLOT(Refresh()));
+  connect(this->UI.scoreView, SIGNAL(ItemsChanged()),
+          this->UI.resultView, SLOT(Refresh()));
+
+  connect(this->UserActions, SIGNAL(UpdateView()),
+          this->Core, SLOT(updateSources()));
+  connect(this->UserActions, SIGNAL(UpdateView()),
+          this->Core, SLOT(updateLOD()));
+  connect(this->UserActions, SIGNAL(UpdateView()),
+          this->Core, SLOT(updateLayoutStackBarLocations()));
+
+  // Result info
+  connect(this->Core, SIGNAL(selected(QList<vtkVgNodeBase*>)),
+          this, SLOT(showResultDetails(QList<vtkVgNodeBase*>)));
+
+  // Result filter
+  connect(this->UI.actionFilterResults, SIGNAL(triggered(bool)),
+          this, SLOT(setResultFilters()));
+
+  // Timeline selection
+  connect(this->Core, SIGNAL(selected(QList<vtkVgNodeBase*>)),
+          this->UI.timeline, SLOT(SelectNodes(QList<vtkVgNodeBase*>)));
+
+  connect(this->UI.timeline, SIGNAL(SelectedNodes(QList<vtkVgNodeBase*>)),
+          this->Core, SLOT(selectNodes(QList<vtkVgNodeBase*>)));
+  connect(this->UI.timeline, SIGNAL(ActivatedNode(vtkVgNodeBase&)),
+          this->Core, SLOT(activateNode(vtkVgNodeBase&)));
+
+  // Video player
+  connect(this->Core, SIGNAL(selected(QList<vtkVgNodeBase*>)),
+          this->UI.videoPlayer,
+          SLOT(onExternalSelect(QList<vtkVgNodeBase*>)));
+
+  connect(this->UserActions, SIGNAL(Play(vtkVgVideoNode&)),
+          this->UI.videoPlayer, SLOT(onExternalPlay(vtkVgVideoNode&)));
+  connect(this->UserActions, SIGNAL(Stop(vtkVgVideoNode&)),
+          this->UI.videoPlayer, SLOT(onExternalStop(vtkVgVideoNode&)));
+  connect(this->UserActions, SIGNAL(Pause(vtkVgVideoNode&)),
+          this->UI.videoPlayer, SLOT(onExternalPause(vtkVgVideoNode&)));
+
+  connect(this->Core, SIGNAL(scrolledForward(vtkVgNodeBase&, bool*)),
+          this->UserActions, SLOT(ScrollForward(vtkVgNodeBase&, bool*)));
+  connect(this->Core, SIGNAL(scrolledBackward(vtkVgNodeBase&, bool*)),
+          this->UserActions, SLOT(ScrollBackward(vtkVgNodeBase&, bool*)));
+
+  connect(this->Core, SIGNAL(FocusChanged(vtkVgNodeBase&)),
+          this->UserActions, SLOT(FocusTo(vtkVgNodeBase&)));
+  connect(this->Core, SIGNAL(FocusChanged(vtkVgVideoNode&)),
+          this->UserActions, SLOT(FocusTo(vtkVgVideoNode&)));
+
+  connect(this->UserActions, SIGNAL(Prev(vtkVgVideoNode&)),
+          this->UI.videoPlayer, SLOT(onActionPrev()));
+  connect(this->UserActions, SIGNAL(Next(vtkVgVideoNode&)),
+          this->UI.videoPlayer, SLOT(onActionNext()));
+  connect(this->UserActions, SIGNAL(Prev(vtkVgVideoNode&)),
+          this->Core, SLOT(update()));
+  connect(this->UserActions, SIGNAL(Next(vtkVgVideoNode&)),
+          this->Core, SLOT(update()));
+
+  connect(this->Core, SIGNAL(displayResultsReset()),
+          this->UI.videoPlayer, SLOT(reset()));
+
+  connect(this->UserActions, SIGNAL(Play(vtkVgVideoNode&)),
+          this->Core, SIGNAL(playedOrStopped(vtkVgVideoNode&)));
+  connect(this->UserActions, SIGNAL(Stop(vtkVgVideoNode&)),
+          this->Core, SIGNAL(playedOrStopped(vtkVgVideoNode&)));
+
+  connect(this->UserActions, SIGNAL(Play(vtkVgVideoNode&)),
+          this->Core, SLOT(update()));
+  connect(this->UserActions, SIGNAL(Play(vtkVgVideoNode&)),
+          this->Core, SLOT(renderLoopOn()));
+  connect(this->UserActions, SIGNAL(Stop(vtkVgVideoNode&)),
+          this->Core, SLOT(update()));
+  connect(this->UserActions, SIGNAL(Stop(vtkVgVideoNode&)),
+          this->Core, SLOT(renderLoopOff()));
+  connect(this->UserActions, SIGNAL(Pause(vtkVgVideoNode&)),
+          this->Core, SLOT(update()));
+  connect(this->UserActions, SIGNAL(Pause(vtkVgVideoNode&)),
+          this->Core, SLOT(renderLoopOff()));
+
+  connect(this->UserActions, SIGNAL(Play(vtkVgVideoNode&)),
+          this->UserActions, SLOT(CenterAndZoomTo(vtkVgVideoNode&)));
+  connect(this->UserActions, SIGNAL(Stop(vtkVgVideoNode&)),
+          this->UserActions, SLOT(UnZoom()));
+
+  connect(this->UI.videoPlayer, SIGNAL(played(vtkVgVideoNode&)),
+          this->Core, SIGNAL(playedOrStopped(vtkVgVideoNode&)));
+  connect(this->UI.videoPlayer, SIGNAL(stopped(vtkVgVideoNode&)),
+          this->Core, SIGNAL(playedOrStopped(vtkVgVideoNode&)));
+
+  connect(this->UI.videoPlayer, SIGNAL(played(vtkVgVideoNode&)),
+          this->Core, SLOT(update()));
+  connect(this->UI.videoPlayer, SIGNAL(played(vtkVgVideoNode&)),
+          this->Core, SLOT(renderLoopOn()));
+  connect(this->UI.videoPlayer, SIGNAL(paused(vtkVgVideoNode&)),
+          this->Core, SLOT(update()));
+  connect(this->UI.videoPlayer, SIGNAL(paused(vtkVgVideoNode&)),
+          this->Core, SLOT(renderLoopOff()));
+  connect(this->UI.videoPlayer, SIGNAL(stopped(vtkVgVideoNode&)),
+          this->Core, SLOT(update()));
+  connect(this->UI.videoPlayer, SIGNAL(stopped(vtkVgVideoNode&)),
+          this->Core, SLOT(renderLoopOff()));
+
+  connect(this->UI.videoPlayer, SIGNAL(played(vtkVgVideoNode&)),
+          this->UserActions, SLOT(CenterAndZoomTo(vtkVgVideoNode&)));
+  connect(this->UI.videoPlayer, SIGNAL(stopped(vtkVgVideoNode&)),
+          this->UserActions, SLOT(UnZoom()));
+
+  connect(this->UI.videoPlayer, SIGNAL(videoPlaying(vtkVgNodeBase&)),
+          this->Core,
+          SLOT(updateStackLayoutForVideoPlaying(vtkVgNodeBase&)));
+  connect(this->UI.videoPlayer, SIGNAL(videoStopped(vtkVgNodeBase&)),
+          this->Core, SLOT(videoStopped(vtkVgNodeBase&)));
+
+  connect(this->UI.videoPlayer,
+          SIGNAL(externalOpenRequested(QUrl, QString, double)),
+          this->Core, SLOT(openExternal(QUrl, QString, double)));
+
+  // Fill ground truth event type combo (0 == all types)
+  foreach (const vqEventInfo& ei, vqEventInfo::types())
+    this->UI.groundTruthEventType->addItem(ei.Name, ei.Type);
+
+  connect(this->UI.groundTruthEventType,
+          SIGNAL(currentIndexChanged(int)),
+          this, SLOT(setGroundTruthEventType(int)));
+
+  connect(this->Core, SIGNAL(queryResultsAvailabilityChanged(bool)),
+          this, SLOT(updateTrackingClipViewer(bool)));
+
+  // Control visibility of items in context view.
+  connectCoreDisplayToggle(this->UI.actionShowVideoClipsOnContext,
+                           setShowVideoClipsOnContext);
+  connectCoreDisplayToggle(this->UI.actionShowOutlinesOnContext,
+                           setShowVideoOutlinesOnContext);
+  // Visibility of tracks on context
+  connectCoreDisplayToggle(this->UI.actionShowTracksOnContext,
+                           setShowTracksOnContext);
+
+  // Set if we should zoom when playing a video clip
+  connectDisplayToggle(this->UI.actionAutoZoomOnPlay,
+                       this->UserActions, SetAutoZoom);
+
+  // Update video player title.
+  connect(this->UI.videoPlayer, SIGNAL(currentVideoChanged(vtkVgVideoNode*)),
+          this, SLOT(updateVideoPlayerTitle(vtkVgVideoNode*)));
+
+  connect(this->Core, SIGNAL(initialRefinementRequested()),
+          this->UI.actionQueryRefine, SIGNAL(triggered()));
+
+  // Connect video player Qf
+  connect(this->UI.videoPlayer,
+          SIGNAL(queryFormulationRequested(vvProcessingRequest, long long)),
+          this, SLOT(formulateQuery(vvProcessingRequest, long long)));
+
+  this->reloadConfiguration();
+  this->loadWindowState();
+  this->Core->start();
+}
+
+//-----------------------------------------------------------------------------
+vqApplication::~vqApplication()
+{
+#ifdef ENABLE_QTTESTING
+  delete this->TestUtility;
+#endif
+  delete this->Core;
+  delete this->UserActions;
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::closeEvent(QCloseEvent* event)
+{
+  this->saveWindowState();
+  QMainWindow::closeEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+#define SET_DOCK_CORNER(_c, _d) do { \
+  const int v = settings.value(#_c, _d).toInt(); \
+  this->setCorner(Qt::_c##Corner, static_cast<Qt::DockWidgetArea>(v)); \
+  } while (0)
+void vqApplication::loadWindowState()
+{
+  QSettings settings;
+  settings.beginGroup("Window");
+  this->restoreGeometry(settings.value("geometry").toByteArray());
+  this->restoreState(settings.value("state").toByteArray());
+
+  settings.beginGroup("DockCorners");
+  SET_DOCK_CORNER(TopLeft, Qt::TopDockWidgetArea);
+  SET_DOCK_CORNER(TopRight, Qt::TopDockWidgetArea);
+  SET_DOCK_CORNER(BottomLeft, Qt::BottomDockWidgetArea);
+  SET_DOCK_CORNER(BottomRight, Qt::BottomDockWidgetArea);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::saveWindowState()
+{
+  QSettings settings;
+  settings.beginGroup("Window");
+  settings.setValue("geometry", this->saveGeometry());
+  settings.setValue("state",    this->saveState());
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::refreshResults()
+{
+  this->UI.resultView->SetLookupTable(this->Core->getLookupTable());
+  this->UI.resultView->Initialize(this->Core->queryResultNodes(),
+                                  false, true, true);
+
+  // always update score view (in case score results have been cleared)
+  this->UI.scoreView->SetLookupTable(this->Core->getLookupTable());
+  this->UI.scoreView->Initialize(this->Core->scoringRequestNodes(),
+                                 true, true);
+
+  this->UI.groundTruthView->SetLookupTable(this->Core->getLookupTable());
+  this->UI.groundTruthView->Initialize(this->Core->groundTruthNodes(),
+                                       false, false, false, true);
+
+  QList<vtkVgVideoNode*> nodes;
+  nodes.append(this->Core->queryResultNodes());
+  nodes.append(this->Core->groundTruthNodes());
+  this->UI.timeline->SetLookupTable(this->Core->getLookupTable());
+  this->UI.timeline->Initialize(nodes);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::acceptResultSet(bool haveSession,
+                                    bool scoreRequestedResults)
+{
+  this->refreshResults();
+
+  if (scoreRequestedResults)
+    {
+    this->UI.actionQueryRefine->setEnabled(true);
+    }
+  else if (haveSession)
+    {
+    // Go ahead and request refinement; we don't need to actually do so
+    int resultsToScore = vqSettings().iqrRefinementSetSize();
+    this->Core->requestRefinement(resultsToScore);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::reloadConfiguration()
+{
+  vqSettings settings;
+  this->Core->setVideoProviders(settings.videoProviders());
+  this->Core->setQueryServer(settings.queryServerUri());
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showQueryNewDialog()
+{
+  if (!this->Core->canIssueQuery())
+    return;
+
+  this->cancelNewQuery();
+  this->NewQueryDialog.reset(
+    new vqQueryDialog(this->Core, this->useAdvancedUI(), this));
+  connect(this->NewQueryDialog.data(), SIGNAL(accepted()),
+          this, SLOT(executeNewQuery()));
+  connect(this->NewQueryDialog.data(), SIGNAL(rejected()),
+          this, SLOT(cancelNewQuery()));
+  connect(this->NewQueryDialog.data(),
+          SIGNAL(readyToProcessDatabaseVideoQuery(vvQueryInstance)),
+          this->Core, SLOT(processDatabaseVideoQuery(vvQueryInstance)));
+
+  this->NewQueryDialog->open();
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showQueryEditDialog()
+{
+  if (!this->Core->canIssueQuery())
+    return;
+
+  this->cancelNewQuery();
+  this->NewQueryDialog.reset(
+    new vqQueryDialog(this->Core, this->useAdvancedUI(), this));
+  connect(this->NewQueryDialog.data(), SIGNAL(accepted()),
+          this, SLOT(executeNewQuery()));
+  connect(this->NewQueryDialog.data(), SIGNAL(rejected()),
+          this, SLOT(cancelNewQuery()));
+
+  this->NewQueryDialog->loadPersistentQuery();
+  this->NewQueryDialog->open();
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showQueryClip(vvQueryInstance query)
+{
+  const vvSimilarityQuery* sq = query.similarityQuery();
+  if (!sq || sq->StreamIdLimit.empty())
+    return;
+
+  QList<vvDescriptor> descriptors;
+
+  double startTime = -1;
+  double endTime = -1;
+
+  for (size_t n = 0; n < sq->Descriptors.size(); ++n)
+    {
+    if (sq->Descriptors[n].Region.empty())
+      {
+      continue;
+      }
+
+    double sTime = (*sq->Descriptors[n].Region.begin()).TimeStamp.Time;
+    double eTime = (*sq->Descriptors[n].Region.rbegin()).TimeStamp.Time;
+
+    if (n == 0 || sTime < startTime)
+      {
+      startTime = sTime;
+      }
+    if (n == 0 || eTime > endTime)
+      {
+      endTime = eTime;
+      }
+
+    descriptors.append(sq->Descriptors[n]);
+    }
+
+  if (startTime != -1)
+    {
+    vqSettings settings;
+    startTime -= (1e06 * settings.resultClipPadding());
+    endTime += (1e06 * settings.resultClipPadding());
+    }
+
+  if (this->UI.queryClip->setVideoUri(qtUrl(sq->StreamIdLimit)))
+    {
+    this->UI.queryClip->setDefaultEventColor(Qt::green);
+    this->UI.queryClip->setTimeRange(startTime, endTime);
+
+    this->UI.queryClip->setDescriptors(descriptors, false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::executeNewQuery()
+{
+  vvQueryInstance query = this->NewQueryDialog->query();
+
+  // Clear query clip and user region, and release dialog
+  this->UI.queryClip->reset();
+  this->Core->setRegion(vgGeocodedPoly());
+  this->NewQueryDialog.reset();
+
+  // Execute the query
+  this->UI.actionQueryRefine->setEnabled(false);
+  this->Core->processQuery(query);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::cancelNewQuery()
+{
+  // Clear user region and release dialog
+  this->Core->setRegion(vgGeocodedPoly());
+  this->NewQueryDialog.reset();
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::formulateQuery(
+  vvProcessingRequest request, long long initialTime)
+
+{
+  // Is there an active query session?
+  if (this->Core->isQuerySessionActive())
+    {
+    // Due to current limitations in one of our VVQS back-ends, we do not allow
+    // concurrent query sessions. Therefore, in order to proceed, we will have
+    // to shut down any currently active query session. Before doing so,
+    // confirm with the user that this is okay...
+    const QString msg =
+      "In order to proceed with query formulation, the current query session "
+      "must be ended. Further refinement of the current query results will "
+      "not be possible.\n\nDo you want to continue?";
+
+    int returnVal =
+      QMessageBox::warning(this, qAppName(), msg,
+                           QMessageBox::Yes | QMessageBox::No);
+    CHECK_ARG(returnVal == QMessageBox::Yes);
+    }
+
+  this->showQueryNewDialog();
+  this->NewQueryDialog->initiateDatabaseQuery(
+    request.VideoUri, request.StartTime, request.EndTime, initialTime);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showQueryOpenDialog()
+{
+  if (!this->Core->canIssueQuery())
+    return;
+
+  QString fileName = vgFileDialog::getOpenFileName(
+    this, "Select saved query results to open...", QString(),
+    "VisGUI saved queries (*.vqr *.vqp *.vqpx *.vqrx);;"
+    "VisGUI Query Plans (*.vqp *.vqpx);;"
+    "VisGUI Query Results (*.vqr *.vqrx);;"
+    "All files (*)");
+  if (!fileName.isEmpty())
+    {
+    QUrl uri = QUrl::fromLocalFile(fileName);
+    this->UI.actionQueryRefine->setEnabled(false);
+    this->UI.queryClip->reset();
+    this->Core->loadQuery(uri, vqCore::SavePersistent);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showGroundTruthOpenDialog()
+{
+  if (!this->Core->canIssueQuery())
+    return;
+
+  QString fileName = vgFileDialog::getOpenFileName(
+                       this, "Select ground truth results to open...",
+                       QString(), "VisGUI Query Results (*.vqr);;"
+                                  "All files (*)");
+  if (!fileName.isEmpty())
+    {
+    QUrl uri = QUrl::fromLocalFile(fileName);
+    this->Core->loadQuery(uri, vqCore::GroundTruth);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::setGroundTruthEventType(int index)
+{
+  int type = this->UI.groundTruthEventType->itemData(index).toInt();
+  this->Core->setGroundTruthEventType(type);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::setResultFilters()
+{
+  vqResultFilterDialog dlg;
+
+  dlg.setFilter(this->Core->resultFilter());
+
+  if (dlg.exec() == QDialog::Accepted)
+    {
+    vqResultFilter filter = dlg.filter();
+    this->Core->setResultFilter(filter);
+    this->UI.actionFilterResults->setChecked(!filter.isNoop());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::refineResults()
+{
+  this->UI.actionQueryRefine->setEnabled(false);
+  this->Core->refineQuery();
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showLayerAddFileDialog()
+{
+  QString fileName = vgFileDialog::getOpenFileName(
+                       this, "Layer file to add...", QString(),
+                       "Kitware Structured Text (*.kst);;"
+                       "Georegistered TIFF (*.tif *.tiff);;"
+                       "All files (*)");
+  if (!fileName.isEmpty())
+    {
+    QUrl uri = QUrl::fromLocalFile(fileName);
+    this->Core->addRasterLayer(uri);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showConfigureDialog()
+{
+  vqConfigureDialog dialog(this);
+
+  connect(&dialog, SIGNAL(scoreGradientChanged()),
+          this->Core, SLOT(reloadColorGradient()));
+  connect(&dialog, SIGNAL(predefinedQueryUriChanged()),
+          this, SLOT(reloadPredefinedQueryCache()));
+
+  if (dialog.exec() == QDialog::Accepted)
+    this->reloadConfiguration();
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::setupTrackingClipViewer()
+{
+  if (this->TrackingClipViewer)
+    {
+    return;
+    }
+
+  this->TrackingClipViewer.reset(new vqTrackingClipViewer(this));
+
+  connect(this->TrackingClipViewer.data(),
+          SIGNAL(rejected()),
+          SLOT(trackingClipViewerClosed()));
+
+  connect(this->TrackingClipViewer.data(),
+          SIGNAL(ClipSelected(int)),
+          SLOT(selectedClip(int)));
+
+  connect(this->TrackingClipViewer.data(),
+          SIGNAL(ClipActivated(int)),
+          SLOT(activatedClip(int)));
+
+  connect(this->TrackingClipViewer.data(),
+          SIGNAL(ClipRatingChanged(int, int)),
+          SLOT(setClipRating(int, int)));
+
+  connect(this->TrackingClipViewer.data(),
+          SIGNAL(RequestNextClips(vtkIdType, int)),
+          SLOT(showNextTrackingClips(vtkIdType, int)));
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showTrackingClips(QList<vtkVgVideoNode*> nodes)
+{
+  this->setupTrackingClipViewer();
+  this->Core->showTrackingClips(nodes, this->TrackingClipViewer.data());
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showNextTrackingClips(vtkIdType previousId, int count)
+{
+  this->Core->showNextTrackingClips(previousId, count,
+                                    this->TrackingClipViewer.data());
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::setClipRating(int id, int rating)
+{
+  this->setUserScore(id, rating);
+  this->UI.resultView->Refresh();
+  this->UI.scoreView->Refresh();
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::setUserScore(long long iid, int score)
+{
+  this->Core->setUserScore(iid, score);
+
+  QList<const vvQueryResult*> results;
+  results.append(this->Core->getResult(iid));
+
+  this->UI.resultInfo->setResults(results);
+
+  if (this->TrackingClipViewer)
+    {
+    this->TrackingClipViewer->RefreshClips();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::setResultNote(long long iid, const QString& note)
+{
+  this->Core->setResultNote(iid, note);
+
+  QList<const vvQueryResult*> results;
+  results.append(this->Core->getResult(iid));
+
+  this->UI.resultInfo->setResults(results);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::setResultStarred(long long iid, bool starred)
+{
+  // Need this trampoline signal to work around cognitive dissonance between
+  // vqTreeView's 'long long' and vqCore's 'ResultId' data types for the
+  // Instance ID
+  this->Core->setResultStarred(iid, starred);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showBestClips()
+{
+  this->setupTrackingClipViewer();
+  this->Core->showBestClips(this->TrackingClipViewer.data());
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::updateTrackingClipViewer(bool keepResults)
+{
+  if (!this->TrackingClipViewer)
+    {
+    return;
+    }
+
+  if (keepResults)
+    {
+    // Remove any looping clips that aren't in the new result set, and update
+    // the rank labels if the result rankings have changed.
+    this->TrackingClipViewer->UpdateClips(this->Core);
+    }
+  else
+    {
+    // Clear all tracking clips.
+    this->TrackingClipViewer->close();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::selectedClip(int id)
+{
+  this->Core->selectResult(id);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::activatedClip(int id)
+{
+  this->Core->activateResult(id);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::trackingClipViewerClosed()
+{
+  this->TrackingClipViewer.reset();
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::addLayer(QUrl uri)
+{
+  this->Core->addRasterLayer(uri);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::initializeTesting(const qtCliArgs* args)
+{
+#ifdef ENABLE_QTTESTING
+  this->TestUtility = new pqCoreTestUtility(this, this->UI.renderFrame);
+  this->TestUtility->SetDataRootEnvironment("VISGUI_DATA_ROOT");
+  this->TestUtility->AddTestingMenu(this->menuBar());
+
+  this->TestUtility->ParseCommandLine(*args);
+  this->TestUtility->ProcessCommandLine();
+#endif
+
+  Q_UNUSED(args);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::exportResults(const QString& exporterId)
+{
+  this->Core->exportResults(this->UI.resultView->GetSelectedNodes(),
+                            exporterId);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::showResultDetails(QList<vtkVgNodeBase*> nodes)
+{
+  QList<const vvQueryResult*> results;
+
+  // Get list of results corresponding to these nodes
+  foreach (vtkVgNodeBase* node, nodes)
+    {
+    if (vtkVgVideoNode* vnode = vtkVgVideoNode::SafeDownCast(node))
+      {
+      if (vnode->GetIsNormalResult() || vnode->GetIsRefinementResult())
+        {
+        results << this->Core->getResult(vnode->GetInstanceId());
+        }
+      else
+        {
+        // Not a normal or refinement result - must be ground truth
+        results << this->Core->getGroundTruthResult(vnode->GetInstanceId());
+        }
+      }
+    }
+
+  // Update result info
+  this->UI.resultInfo->setResults(results);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::updateVideoPlayerTitle(vtkVgVideoNode* videoNode)
+{
+  QString title("Video Player");
+
+  if (!videoNode)
+    {
+    this->UI.videoPlayerDock->setWindowTitle(title);
+    return;
+    }
+
+  title += QString(" - Result %1").arg(
+             QString::number(videoNode->GetInstanceId()));
+  this->UI.videoPlayerDock->setWindowTitle(title);
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::findResult()
+{
+  bool ok = false;
+  int id = QInputDialog::getInt(this, "Find Result", "Instance Id:",
+                                0, 0, INT_MAX, 1, &ok);
+  if (ok)
+    {
+    if (!this->Core->findResult(id))
+      {
+      QMessageBox::information(0, QString(), "No results found.");
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::reloadPredefinedQueryCache()
+{
+  vqPredefinedQueryCache::reload();
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::generateReport()
+{
+  vvGenerateReportDialog dlg(this);
+  if (dlg.exec() == QDialog::Accepted)
+    {
+    this->Core->generateReport(dlg.outputPath(), dlg.generateVideo());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqApplication::exportKml()
+{
+  QString path =
+    vgFileDialog::getSaveFileName(
+      this, "Location of KML export", QString(), "KML File (*.kml);;");
+
+  if (!path.isEmpty())
+    {
+    this->Core->exportKml(path);
+    }
+}
diff --git a/Applications/Viqui/vqApplication.h b/Applications/Viqui/vqApplication.h
new file mode 100644
index 00000000..d7e2f466
--- /dev/null
+++ b/Applications/Viqui/vqApplication.h
@@ -0,0 +1,136 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqApplication_h
+#define __vqApplication_h
+
+#include <QMainWindow>
+#include <QScopedPointer>
+
+#include <vvQueryInstance.h>
+
+#include "ui_viqui.h"
+
+class QSignalMapper;
+
+class pqCoreTestUtility;
+
+class qtCliArgs;
+class qtDockController;
+
+class vqCore;
+class vqUserActions;
+class vqQueryDialog;
+class vqTrackingClipViewer;
+
+struct vvSimilarityQuery;
+
+class vqApplication : public QMainWindow
+{
+  Q_OBJECT
+
+public:
+  enum UIMode
+    {
+    UI_Engineering,
+    UI_Analyst
+    };
+
+public:
+  vqApplication(UIMode uiMode);
+  virtual ~vqApplication();
+
+  bool useAdvancedUI()
+    {
+    return this->InterfaceMode == UI_Engineering;
+    }
+
+  Ui::MainWindow UI;
+
+public slots:
+  void initializeTesting(const qtCliArgs*);
+  void addLayer(QUrl);
+
+protected slots:
+  void showQueryNewDialog();
+  void showQueryEditDialog();
+  void showQueryOpenDialog();
+  void showGroundTruthOpenDialog();
+  void showLayerAddFileDialog();
+  void showConfigureDialog();
+  void refineResults();
+
+  void setResultFilters();
+
+  void showQueryClip(vvQueryInstance query);
+
+  void showTrackingClips(QList<vtkVgVideoNode*> nodes);
+  void showNextTrackingClips(vtkIdType previousId, int count);
+
+  void setUserScore(long long iid, int score);
+  void setResultNote(long long iid, const QString& note);
+  void setResultStarred(long long iid, bool starred);
+
+  void setClipRating(int id, int rating);
+
+  void showBestClips();
+
+  void updateTrackingClipViewer(bool clear);
+  void selectedClip(int id);
+  void activatedClip(int id);
+  void trackingClipViewerClosed();
+
+  void refreshResults();
+  void acceptResultSet(bool haveSession, bool scoreRequestedResults);
+
+  void executeNewQuery();
+  void cancelNewQuery();
+  void formulateQuery(vvProcessingRequest request, long long initialTime);
+
+  void exportResults(const QString& exporterId);
+
+  void setGroundTruthEventType(int index);
+
+  void showResultDetails(QList<vtkVgNodeBase*> nodes);
+
+  void updateVideoPlayerTitle(vtkVgVideoNode* node);
+
+  void findResult();
+
+  void reloadPredefinedQueryCache();
+
+  void generateReport();
+
+  void exportKml();
+
+protected:
+  virtual void closeEvent(QCloseEvent*);
+
+  void loadWindowState();
+  void saveWindowState();
+
+  void reloadConfiguration();
+  void connectDockToggleAction(QAction* action, QDockWidget* dock);
+  void connectTreeWidget(vqTreeView*);
+  void setEnabledSignal(QAction* action, QObject* sender, const char* signal,
+                        bool initiallyEnabled = false);
+
+  void setupTrackingClipViewer();
+
+  UIMode InterfaceMode;
+
+  vqCore* Core;
+  vqUserActions* UserActions;
+
+  QScopedPointer<vqQueryDialog> NewQueryDialog;
+  QScopedPointer<vqTrackingClipViewer> TrackingClipViewer;
+
+  qtDockController* DockController;
+
+  pqCoreTestUtility* TestUtility;
+};
+
+#endif
diff --git a/Applications/Viqui/vqArchiveVideoSource.cxx b/Applications/Viqui/vqArchiveVideoSource.cxx
new file mode 100644
index 00000000..2d97f5a7
--- /dev/null
+++ b/Applications/Viqui/vqArchiveVideoSource.cxx
@@ -0,0 +1,516 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqArchiveVideoSource.h"
+
+// QtExtensions includes.
+#include <qtStlUtil.h>
+
+// VG includes.
+#include <vgKwaArchive.h>
+#include <vgKwaFrameMetadata.h>
+#include <vgKwaVideoClip.h>
+
+#include <vtkVgAdaptImage.h>
+#include <vtkVgVideoFrameMetaData.h>
+
+// vtkVgCore includes
+#include <vtkVgAdapt.h>
+
+// vtkVgModelView includes
+#include <vtkVgVideoFrameData.h>
+#include <vtkVgVideoMetadata.h>
+
+// STL includes.
+#include <algorithm>
+
+// VTK includes.
+#include <vtkObjectFactory.h>
+#include <vtkMatrix4x4.h>
+
+vtkStandardNewMacro(vqArchiveVideoSource);
+
+//-----------------------------------------------------------------------------
+vqArchiveVideoSource::vqArchiveVideoSource() : vtkVgVideoProviderBase(),
+  LastLoopingState(Looping),
+  CurrentClip(0)
+{
+  this->CurrentVideoFrameData = new vtkVgVideoFrameData();
+
+  // Is this a valid assumption?
+  this->SetTimeInterval(1.0);
+}
+
+//-----------------------------------------------------------------------------
+vqArchiveVideoSource::~vqArchiveVideoSource()
+{
+  delete this->CurrentVideoFrameData;
+  this->CurrentVideoFrameData = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vqArchiveVideoSource::PrintSelf(ostream& os, vtkIndent indent)
+{
+  // \TODO: Implement this later.
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::AcquireVideoClip(vgKwaArchive* videoArchive)
+{
+  // Get clip
+  vgKwaArchive::Request request;
+  request.MissionId = QString::fromLocal8Bit(this->MissionId);
+  request.StreamId = QString::fromLocal8Bit(this->StreamId);
+  request.StartTime = this->TimeRange[0];
+  request.EndTime = this->TimeRange[1];
+  request.Padding = this->RequestedPadding;
+
+  QUrl clipUri;
+  vgKwaVideoClip* clip = videoArchive->getClip(request, &clipUri);
+
+  if (!clip)
+    {
+    this->SetVideoClip(0, QUrl());
+    return VTK_ERROR; // no clip found
+    }
+
+  clipUri.setEncodedQuery(QByteArray());
+  return this->SetVideoClip(clip, clipUri);
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::AcquireVideoClip(QUrl clipUri)
+{
+  // Not expecting limits in URI, but strip query just in case...
+  clipUri.setEncodedQuery(QByteArray());
+
+  // Obtain full clip
+  QScopedPointer<vgKwaVideoClip> clip(new vgKwaVideoClip(clipUri));
+  if (clip->frameCount() == 0)
+    {
+    this->SetVideoClip(0, QUrl());
+    return VTK_ERROR; // failed to load clip
+    }
+
+  // If a time range is set, obtain the appropriate sub-clip
+  if (this->TimeRange[0] != -1 || this->TimeRange[1] != -1)
+    {
+    vgKwaVideoClip* subClip =
+      clip->subClip(this->TimeRange[0], this->TimeRange[1],
+                    this->RequestedPadding);
+    if (!subClip)
+      {
+      this->SetVideoClip(0, QUrl());
+      return VTK_ERROR; // failed to obtain sub-clip
+      }
+    clip.reset(subClip);
+    }
+
+  return this->SetVideoClip(clip.take(), clipUri);
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::SetVideoClip(
+  vgKwaVideoClip* clip, const QUrl& clipUri)
+{
+  this->CurrentClip = QSharedPointer<vgKwaVideoClip>(clip);
+  this->CurrentClipUri = clipUri;
+
+  if (!clip)
+    {
+    return VTK_OK;
+    }
+
+  // If a time range was requested...
+  if (this->TimeRange[0] != -1 || this->TimeRange[1] != -1)
+    {
+    // ...save the original time as time mark
+    this->AddTimeMark(this->TimeRange[0], this->TimeRange[1]);
+    }
+
+  // Set time range to be what we actually get back
+  this->SetTimeRange(this->CurrentClip->firstTime().Time,
+                     this->CurrentClip->lastTime().Time);
+
+  // Save the actual time as time mark
+  this->AddTimeMark(this->TimeRange[0], this->TimeRange[1]);
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::GetFrame(vtkVgVideoFrameData* frameData, double time)
+{
+  if (this->CurrentClip)
+    {
+    this->LastLoopingState = this->Looping;
+
+    // Prevent seeking outside of clip range, which could happen 'by accident'
+    // due to floating point round-off error
+    const double firstTime = this->CurrentClip->firstTime().Time;
+    const double lastTime = this->CurrentClip->lastTime().Time;
+    time = qBound(firstTime, time, lastTime);
+
+    const vgTimeStamp newTimeStamp =
+      this->CurrentClip->seek(vgTimeStamp::fromTime(time), vg::SeekLowerBound);
+    if (newTimeStamp.IsValid())
+      {
+      this->CopyFrameData(frameData);
+
+      emit this->frameAvailable();
+
+      return VTK_OK;
+      }
+    }
+
+  return VTK_ERROR;
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::GetFrame(vtkVgVideoFrameData* vtkNotUsed(frameData),
+                                   int vtkNotUsed(frameNumber))
+{
+  // \TODO: Need to implement this.
+  return VTK_ERROR;
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::GetNextFrame(vtkVgVideoFrameData* frameData)
+{
+  if (this->CurrentClip)
+    {
+    this->LastLoopingState = this->Looping;
+
+    // Advance the clip first.
+    if (this->Advance())
+      {
+      this->CopyFrameData(frameData);
+
+      emit this->frameAvailable();
+
+      return VTK_OK;
+      }
+    }
+
+  return VTK_ERROR;
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::GetCurrentFrame(vtkVgVideoFrameData* frameData)
+{
+  frameData->TimeStamp = this->CurrentVideoFrameData->TimeStamp;
+  frameData->VideoImage->ShallowCopy(this->CurrentVideoFrameData->VideoImage);
+  frameData->VideoMatrix = this->CurrentVideoFrameData->VideoMatrix;
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::GetPreviousFrame(vtkVgVideoFrameData* frameData)
+{
+  if (this->CurrentClip)
+    {
+    this->LastLoopingState = this->Looping;
+
+    // Recede the clip first.
+    this->Recede();
+
+    this->CopyFrameData(frameData);
+
+    emit this->frameAvailable();
+
+    return VTK_OK;
+    }
+  else
+    {
+    return VTK_ERROR;
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::GetNumberOfFrames()
+{
+  if (this->CurrentClip)
+    {
+    unsigned int firstFrameNumber = this->CurrentClip->firstTime().FrameNumber;
+    unsigned int lastFrameNumber = this->CurrentClip->lastTime().FrameNumber;
+    return ((lastFrameNumber - firstFrameNumber) + 1);
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::GetCurrentMetadata(vtkVgVideoMetadata* metadata)
+{
+  if (!this->CurrentClip)
+    {
+    return VTK_ERROR;
+    }
+
+  vgKwaFrameMetadata fmd = this->CurrentClip->currentMetadata();
+  if (!fmd.timestamp().IsValid())
+    {
+    return VTK_ERROR;
+    }
+
+  this->CopyMetadata(metadata, fmd);
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+std::map<vtkVgTimeStamp, vtkVgVideoMetadata> vqArchiveVideoSource::GetMetadata()
+{
+  if (!this->CurrentClip)
+    {
+    return std::map<vtkVgTimeStamp, vtkVgVideoMetadata>();
+    }
+
+  vgKwaVideoClip::MetadataMap src = this->CurrentClip->metadata();
+  std::map<vtkVgTimeStamp, vtkVgVideoMetadata> dst;
+
+  // Build new map containing metadata in VTK types
+  foreach (const vgKwaFrameMetadata& fmd, src)
+    {
+    vtkVgVideoMetadata vtkMetaData;
+    this->CopyMetadata(&vtkMetaData, fmd);
+    dst.insert(std::make_pair(fmd.timestamp(), vtkMetaData));
+    }
+
+  return dst;
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::GetVideoHeight()
+{
+  static const int bestGuess = 480;
+
+  if (!this->CurrentClip)
+    {
+    return bestGuess;
+    }
+
+  vgKwaFrameMetadata frameMetaData =
+    this->CurrentClip->metadataAt(this->CurrentClip->firstTime());
+  int heightFromMetaData = frameMetaData.imageSize().height();
+  return (heightFromMetaData > 0 ? heightFromMetaData : bestGuess);
+}
+
+//-----------------------------------------------------------------------------
+const vgKwaVideoClip* vqArchiveVideoSource::GetCurrentVideoClip() const
+{
+  return this->CurrentClip.data();
+}
+
+//-----------------------------------------------------------------------------
+void vqArchiveVideoSource::Update()
+{
+  // Do nothing.
+}
+
+//-----------------------------------------------------------------------------
+int vqArchiveVideoSource::Reset()
+{
+  if (!this->CurrentClip)
+    {
+    return VTK_ERROR;
+    }
+
+  this->CurrentClip->seek(vgTimeStamp::fromTime(this->TimeRange[0]));
+  this->LastLoopingState = this->Looping;
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+bool vqArchiveVideoSource::SeekNearestEarlier(double time)
+{
+  // Prevent seeking before start of clip, which could happen 'by accident' due
+  // to floating point round-off error
+  time = qMin(time, this->CurrentClip->firstTime().Time);
+
+  const vgTimeStamp newTimeStamp =
+    this->CurrentClip->seek(vgTimeStamp::fromTime(time), vg::SeekPrevious);
+  return newTimeStamp.IsValid();
+}
+
+//-----------------------------------------------------------------------------
+bool vqArchiveVideoSource::Advance()
+{
+  // Advance to next time
+  vgTimeStamp newTime = this->CurrentClip->advance();
+
+  // If at end of video, and looping is enabled...
+  if (!newTime.IsValid() && this->Looping)
+    {
+    // ...reset to start of video
+    this->CurrentClip->rewind();
+    }
+
+  return this->CurrentClip->currentTimeStamp().IsValid();
+}
+
+//-----------------------------------------------------------------------------
+bool vqArchiveVideoSource::Recede()
+{
+  // Recede to previous time
+  vgTimeStamp newTime = this->CurrentClip->recede();
+
+  // If at start of video, and looping is enabled...
+  if (!newTime.IsValid() && this->Looping)
+    {
+    // ...reset to end of video
+    this->CurrentClip->seek(this->CurrentClip->lastTime());
+    }
+
+  return this->CurrentClip->currentTimeStamp().IsValid();
+}
+
+//-----------------------------------------------------------------------------
+void vqArchiveVideoSource::ShallowCopy(vtkVgDataSourceBase& other)
+{
+  this->Superclass::ShallowCopy(other);
+
+  vqArchiveVideoSource* otherDerived =
+    vqArchiveVideoSource::SafeDownCast(&other);
+
+  if (otherDerived)
+    {
+    this->LastLoopingState = otherDerived->LastLoopingState;
+    this->CurrentClipUri = otherDerived->CurrentClipUri;
+    this->CurrentClip = otherDerived->CurrentClip;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqArchiveVideoSource::DeepCopy(vtkVgDataSourceBase& other)
+{
+  vqArchiveVideoSource* otherDerived =
+    vqArchiveVideoSource::SafeDownCast(&other);
+
+  otherDerived ? this->DeepCopy(*otherDerived, CopyClipShared)
+  : this->Superclass::DeepCopy(other);
+}
+
+//-----------------------------------------------------------------------------
+void vqArchiveVideoSource::DeepCopy(vqArchiveVideoSource& other,
+                                    DeepCopyMode mode)
+{
+  this->Superclass::DeepCopy(other);
+
+  this->LastLoopingState = other.LastLoopingState;
+  this->CurrentClipUri = other.CurrentClipUri;
+
+  // Drop old clip and frame
+  this->CurrentClip.clear();
+  delete this->CurrentVideoFrameData;
+  this->CurrentVideoFrameData = new vtkVgVideoFrameData();
+
+  // Deep copy clip and frame from other
+  if (other.CurrentClip)
+    {
+    vgKwaVideoClip* clonedClip;
+    if (mode == CopyClipDetached)
+      {
+      clonedClip = new vgKwaVideoClip(this->CurrentClipUri);
+      }
+    else
+      {
+      clonedClip = other.CurrentClip->subClip(-1, -1, 0);
+      }
+    this->CurrentClip = QSharedPointer<vgKwaVideoClip>(clonedClip);
+    this->CopyFrameData(0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqArchiveVideoSource::CopyFrameData(vtkVgVideoFrameData* frameData)
+{
+  if (!this->CurrentClip)
+    {
+    return;
+    }
+
+  const vgVideoFramePtr videoFrame = this->CurrentClip->currentFrame();
+  const vgKwaFrameMetadata metaData = this->CurrentClip->currentMetadata();
+
+  this->CurrentVideoFrameData->TimeStamp.SetTime(
+    static_cast<double>(videoFrame.time().Time));
+  this->CurrentVideoFrameData->VideoImage->ShallowCopy(
+    vtkVgAdapt(videoFrame.image()));
+
+  if (frameData)
+    {
+    frameData->TimeStamp = this->CurrentVideoFrameData->TimeStamp;
+    frameData->VideoImage->ShallowCopy(this->CurrentVideoFrameData->VideoImage);
+    }
+
+  const vgKwaWorldBox srcCorners = metaData.worldCornerPoints();
+  vtkVgVideoFrameMetaData frameMetaData;
+
+  if (!metaData.imageSize().isEmpty())
+    {
+    frameMetaData.Width = metaData.imageSize().width();
+    frameMetaData.Height = metaData.imageSize().height();
+    }
+
+  bool cornersValid = srcCorners.GCS != -1;
+  double* bounds = 0;
+
+  if (cornersValid)
+    {
+    vtkVgVideoFrameCorners& dstCorners = frameMetaData.WorldLocation;
+    dstCorners.GCS = srcCorners.GCS;
+    dstCorners.UpperLeft.Latitude   = srcCorners.UpperLeft.Latitude;
+    dstCorners.UpperLeft.Longitude  = srcCorners.UpperLeft.Longitude;
+    dstCorners.LowerLeft.Latitude   = srcCorners.LowerLeft.Latitude;
+    dstCorners.LowerLeft.Longitude  = srcCorners.LowerLeft.Longitude;
+    dstCorners.UpperRight.Latitude  = srcCorners.UpperRight.Latitude;
+    dstCorners.UpperRight.Longitude = srcCorners.UpperRight.Longitude;
+    dstCorners.LowerRight.Latitude  = srcCorners.LowerRight.Latitude;
+    dstCorners.LowerRight.Longitude = srcCorners.LowerRight.Longitude;
+
+    cornersValid = frameMetaData.AreCornerPointsValid();
+    }
+
+  if (cornersValid)
+    {
+    this->CurrentVideoFrameData->VideoMatrix =
+      frameMetaData.MakeImageToLatLonMatrix();
+    }
+  else
+    {
+    vtkErrorMacro("Corner pts are NOT valid!");
+    this->CurrentVideoFrameData->VideoMatrix = 0;
+    }
+
+  if (frameData)
+    {
+    frameData->VideoMatrix = this->CurrentVideoFrameData->VideoMatrix;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqArchiveVideoSource::CopyMetadata(vtkVgVideoMetadata* dst,
+                                        const vgKwaFrameMetadata& src)
+{
+  const QMatrix3x3 hmSrc = src.homography();
+  vtkMatrix4x4* hmDst = dst->Homography;
+  hmDst->Identity();
+  hmDst->SetElement(0, 0, hmSrc(0, 0));
+  hmDst->SetElement(0, 1, hmSrc(0, 1));
+  hmDst->SetElement(0, 3, hmSrc(0, 2));
+  hmDst->SetElement(1, 0, hmSrc(1, 0));
+  hmDst->SetElement(1, 1, hmSrc(1, 1));
+  hmDst->SetElement(1, 3, hmSrc(1, 2));
+  hmDst->SetElement(3, 0, hmSrc(2, 0));
+  hmDst->SetElement(3, 1, hmSrc(2, 1));
+  hmDst->SetElement(3, 3, hmSrc(2, 2));
+
+  dst->Gsd = src.gsd();
+  dst->HomographyReferenceFrame = src.homographyReferenceFrameNumber();
+  dst->Time = src.timestamp();
+}
diff --git a/Applications/Viqui/vqArchiveVideoSource.h b/Applications/Viqui/vqArchiveVideoSource.h
new file mode 100644
index 00000000..5622cf67
--- /dev/null
+++ b/Applications/Viqui/vqArchiveVideoSource.h
@@ -0,0 +1,135 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqArchiveVideoSource_h
+#define __vqArchiveVideoSource_h
+
+// VG includes.
+#include <vtkVgMacros.h>
+#include <vtkVgVideoProviderBase.h>
+
+// VV includes.
+#include <vvIqr.h>
+
+// STL includes.
+#include <vector>
+
+// QT includes.
+#include <QObject>
+#include <QSharedPointer>
+#include <QUrl>
+
+class vgKwaArchive;
+class vgKwaFrameMetadata;
+class vgKwaVideoClip;
+
+class vqArchiveVideoSource : public QObject, public vtkVgVideoProviderBase
+{
+  Q_OBJECT
+
+public:
+  enum DeepCopyMode
+    {
+    // Description:
+    // Permit sharing with the source instance's video clip. The clip will be
+    // copied such that its state is independent of the source clip, but it may
+    // share resources with the source clip. This is more efficient and uses
+    // fewer system resources, but is not safe if the objects will be used in
+    // different threads.
+    CopyClipShared,
+    // Description:
+    // Do not allow sharing with the source instance's video clip. A new clip
+    // will be created using the source clip's URI.
+    CopyClipDetached
+    };
+
+  vtkVgClassMacro(vqArchiveVideoSource);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vqArchiveVideoSource, vtkVgVideoProviderBase);
+
+  static vqArchiveVideoSource* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Get and store a clip from a given ::vgKwaArchive.
+  int AcquireVideoClip(vgKwaArchive* videoArchive);
+
+  // Description:
+  // Get and store a clip from a given URI.
+  int AcquireVideoClip(QUrl);
+
+  QUrl GetClipUri() const
+    {
+    return this->CurrentClipUri;
+    }
+
+  bool HasVideoClip() const
+    {
+    return !this->CurrentClip.isNull();
+    }
+
+  // Description:
+  // Functions overridden.
+  virtual int GetFrame(vtkVgVideoFrameData* frameData, double time);
+  virtual int GetFrame(vtkVgVideoFrameData* frameData, int frameNumber);
+
+  virtual int GetNextFrame(vtkVgVideoFrameData* frameData);
+  virtual int GetCurrentFrame(vtkVgVideoFrameData* frameData);
+  virtual int GetPreviousFrame(vtkVgVideoFrameData* frameData);
+
+  virtual int GetNumberOfFrames();
+
+  virtual int GetCurrentMetadata(vtkVgVideoMetadata* metadata);
+  virtual std::map<vtkVgTimeStamp, vtkVgVideoMetadata> GetMetadata();
+
+  virtual int GetVideoHeight();
+
+  virtual const vgKwaVideoClip* GetCurrentVideoClip() const;
+
+  virtual void Update();
+
+  virtual int  Reset();
+
+  virtual bool SeekNearestEarlier(double);
+
+  virtual bool Advance();
+
+  virtual bool Recede();
+
+  virtual void ShallowCopy(vtkVgDataSourceBase& other);
+  virtual void DeepCopy(vqArchiveVideoSource& other, DeepCopyMode);
+
+signals:
+
+  void frameAvailable();
+
+protected:
+  vqArchiveVideoSource();
+  virtual  ~vqArchiveVideoSource();
+
+  virtual void DeepCopy(vtkVgDataSourceBase& other);
+
+  int SetVideoClip(vgKwaVideoClip*, const QUrl&);
+
+  void CopyFrameData(vtkVgVideoFrameData* frameData);
+  void CopyMetadata(vtkVgVideoMetadata* dst, const vgKwaFrameMetadata& src);
+
+  int LastLoopingState;
+
+  QUrl CurrentClipUri;
+  QSharedPointer<vgKwaVideoClip> CurrentClip;
+
+  vtkVgVideoFrameData* CurrentVideoFrameData;
+
+private:
+  vqArchiveVideoSource(const vqArchiveVideoSource&); // Not implemented.
+  void operator= (const vqArchiveVideoSource&);      // Not implemented.
+};
+
+#endif // __vqArchiveVideoSource_h
diff --git a/Applications/Viqui/vqClassifierQueryDialog.cxx b/Applications/Viqui/vqClassifierQueryDialog.cxx
new file mode 100644
index 00000000..19f96b06
--- /dev/null
+++ b/Applications/Viqui/vqClassifierQueryDialog.cxx
@@ -0,0 +1,218 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqClassifierQueryDialog.h"
+#include "ui_classifierQuery.h"
+
+#include <QCheckBox>
+#include <QHash>
+#include <QSettings>
+
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vvDescriptor.h>
+
+#include "vqEventInfo.h"
+
+QTE_IMPLEMENT_D_FUNC(vqClassifierQueryDialog)
+
+//-----------------------------------------------------------------------------
+class vqClassifierQueryDialogPrivate
+{
+public:
+  void populateGroup(const QString& groupName, vqEventInfo::Groups typeGroups,
+                     const QSet<int>& searchableTypes);
+
+  void populateDescriptors();
+
+  void addDescriptor(std::vector<vvDescriptor>& dest,
+                     int type, const QString& moduleName,
+                     const QString& descriptorName) const;
+  void addDescriptors(std::vector<vvDescriptor>& dest, int type) const;
+
+  struct DescriptorData
+    {
+    DescriptorData(const QString& moduleName, const QString& descriptorName)
+      : ModuleName(moduleName), DescriptorName(descriptorName) {}
+
+    QString ModuleName;
+    QString DescriptorName;
+
+    bool operator==(const DescriptorData& other) const
+      {
+      return this->ModuleName == other.ModuleName &&
+             this->DescriptorName == other.DescriptorName;
+      }
+    };
+
+  QHash<QCheckBox*, DescriptorData> DescriptorMap;
+  QHash<DescriptorData, QCheckBox*> DescriptorWidgets;
+
+  Ui::vqClassifierQueryDialog UI;
+};
+
+//-----------------------------------------------------------------------------
+uint qHash(const vqClassifierQueryDialogPrivate::DescriptorData& dd)
+{
+  return qHash(dd.DescriptorName) ^ qHash(dd.ModuleName);
+}
+
+//-----------------------------------------------------------------------------
+void vqClassifierQueryDialogPrivate::populateGroup(
+  const QString& groupName, vqEventInfo::Groups typeGroups,
+  const QSet<int>& searchableTypes)
+{
+  int group = this->UI.classifierFilter->beginGroup(groupName, true);
+  foreach (const vqEventInfo& ei, vqEventInfo::types(typeGroups))
+    {
+    if (searchableTypes.contains(ei.Type))
+      {
+      this->UI.classifierFilter->addItem(ei.Type, ei.Name);
+      this->UI.classifierFilter->setValue(ei.Type, 0.1);
+      }
+    }
+  this->UI.classifierFilter->endGroup();
+  this->UI.classifierFilter->setExpanded(group);
+  this->UI.classifierFilter->setGroupState(group, false);
+}
+
+//-----------------------------------------------------------------------------
+void vqClassifierQueryDialogPrivate::populateDescriptors()
+{
+  QVBoxLayout* layout = new QVBoxLayout();
+
+  QSettings settings;
+  int size = settings.beginReadArray("EventDescriptors");
+
+  for (int i = 0; i < size; ++i)
+    {
+    settings.setArrayIndex(i);
+
+    QString displayName     = settings.value("DisplayName").toString();
+    QString moduleName      = settings.value("ModuleName").toString();
+    QString descriptorName  = settings.value("DescriptorName").toString();
+
+    QCheckBox* item = new QCheckBox(displayName);
+    const DescriptorData dd(moduleName, descriptorName);
+    this->DescriptorMap.insert(item, dd);
+    this->DescriptorWidgets.insert(dd, item);
+    layout->addWidget(item);
+    }
+
+  settings.endArray();
+
+  this->UI.eventDescriptorsWidget->setLayout(layout);
+}
+
+//-----------------------------------------------------------------------------
+void vqClassifierQueryDialogPrivate::addDescriptor(
+  std::vector<vvDescriptor>& dest, int type, const QString& moduleName,
+  const QString& descriptorName) const
+{
+  vvDescriptor desc;
+
+  desc.DescriptorName = stdString(descriptorName);
+  desc.Values.clear();
+
+  int minSize = qMax(vqEventInfo::staticTypeArraySize(), type + 1);
+  desc.Values.push_back(std::vector<float>());
+  desc.Values[0].assign(minSize, -1.0);
+
+  desc.Values[0][type] = this->UI.classifierFilter->value(type);
+
+  desc.ModuleName = stdString(moduleName);
+  dest.push_back(desc);
+}
+
+//-----------------------------------------------------------------------------
+void vqClassifierQueryDialogPrivate::addDescriptors(
+  std::vector<vvDescriptor>& dest, int type) const
+{
+  typedef QHash<QCheckBox*, DescriptorData>::const_iterator Iterator;
+  foreach_iter (Iterator, iter, this->DescriptorMap)
+    {
+    if (iter.key()->isChecked())
+      {
+      this->addDescriptor(dest, type, iter.value().ModuleName,
+                          iter.value().DescriptorName);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vqClassifierQueryDialog::vqClassifierQueryDialog(QWidget* parent,
+                                                 Qt::WindowFlags flags)
+  : vvAbstractSimilarityQueryDialog(parent, flags),
+    d_ptr(new vqClassifierQueryDialogPrivate)
+{
+  QTE_D(vqClassifierQueryDialog);
+
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  d->populateDescriptors();
+
+  QSet<int> searchableTypes = vqEventInfo::searchableTypes();
+  d->populateGroup("Person", vqEventInfo::Person, searchableTypes);
+  d->populateGroup("Vehicle", vqEventInfo::Vehicle, searchableTypes);
+}
+
+//-----------------------------------------------------------------------------
+vqClassifierQueryDialog::~vqClassifierQueryDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vvDescriptor> vqClassifierQueryDialog::selectedDescriptors() const
+{
+  QTE_D_CONST(vqClassifierQueryDialog);
+
+  std::vector<vvDescriptor> result;
+
+  foreach (int type, d->UI.classifierFilter->keys())
+    {
+    if (d->UI.classifierFilter->state(type))
+      {
+      d->addDescriptors(result, type);
+      }
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+void vqClassifierQueryDialog::setSelectedDescriptors(
+  const std::vector<vvDescriptor>& descriptors)
+{
+  QTE_D(vqClassifierQueryDialog);
+
+  size_t n = descriptors.size();
+  while (n--)
+    {
+    const vvDescriptor& di = descriptors[n];
+    if (di.Values.size() == 1)
+      {
+      vqClassifierQueryDialogPrivate::DescriptorData dd(
+        qtString(di.ModuleName), qtString(di.DescriptorName));
+      if (d->DescriptorWidgets.contains(dd))
+        {
+        d->DescriptorWidgets[dd]->setChecked(true);
+        }
+
+      size_t j = di.Values[0].size();
+      while (j--)
+        {
+        double p = di.Values[0][j];
+        if (p >= 0.0)
+          {
+          d->UI.classifierFilter->setState(static_cast<int>(j), true);
+          d->UI.classifierFilter->setValue(static_cast<int>(j), p);
+          }
+        }
+      }
+    }
+}
diff --git a/Applications/Viqui/vqClassifierQueryDialog.h b/Applications/Viqui/vqClassifierQueryDialog.h
new file mode 100644
index 00000000..54297c5a
--- /dev/null
+++ b/Applications/Viqui/vqClassifierQueryDialog.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqClassifierQueryDialog_h
+#define __vqClassifierQueryDialog_h
+
+#include <qtGlobal.h>
+
+#include <vvAbstractSimilarityQueryDialog.h>
+
+struct vvDescriptor;
+
+class vqClassifierQueryDialogPrivate;
+
+class vqClassifierQueryDialog : public vvAbstractSimilarityQueryDialog
+{
+  Q_OBJECT
+
+public:
+  vqClassifierQueryDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vqClassifierQueryDialog();
+
+  virtual std::vector<vvDescriptor> selectedDescriptors() const;
+  virtual void setSelectedDescriptors(const std::vector<vvDescriptor>&);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vqClassifierQueryDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vqClassifierQueryDialog)
+  Q_DISABLE_COPY(vqClassifierQueryDialog)
+};
+
+#endif
diff --git a/Applications/Viqui/vqConfigureDialog.cxx b/Applications/Viqui/vqConfigureDialog.cxx
new file mode 100644
index 00000000..c06ae7f2
--- /dev/null
+++ b/Applications/Viqui/vqConfigureDialog.cxx
@@ -0,0 +1,476 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqConfigureDialog.h"
+
+#include <QSettings>
+#include <QUrl>
+
+#include <qtUtil.h>
+
+#include <vgFileDialog.h>
+
+#include <vvQueryService.h>
+
+#include <vvDescriptorStyleDelegate.h>
+#include <vvQueryServerDialog.h>
+
+#include "vqSettings.h"
+
+//-----------------------------------------------------------------------------
+vqConfigureDialog::vqConfigureDialog(QWidget* parent) : QDialog(parent)
+{
+  this->settings_ = new vqSettings;
+  this->UI.setupUi(this);
+  qtUtil::setStandardIcons(this->UI.buttons);
+  this->UI.pageChooser->item(0)->setSelected(true);
+
+  // Data Sources page
+  connect(this->UI.queryServerUri, SIGNAL(textChanged(QString)),
+          this, SLOT(queryServerUriChanged(QString)));
+  connect(this->UI.queryVideoUri, SIGNAL(textChanged(QString)),
+          this, SLOT(queryVideoUriChanged(QString)));
+  connect(this->UI.queryServerUriEdit, SIGNAL(clicked()),
+          this, SLOT(showQueryServerEditUriDialog()));
+  connect(this->UI.queryVideoUriPickLocalDir, SIGNAL(clicked()),
+          this, SLOT(showQueryVideoPickLocalDirDialog()));
+  connect(this->UI.videoProviderAddLocalArchive, SIGNAL(clicked()),
+          this, SLOT(showVideoProviderAddLocalArchiveDialog()));
+  connect(this->UI.videoProviders, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateVideoProviderButtons()));
+  connect(this->UI.videoProviderUp, SIGNAL(clicked()),
+          this, SLOT(videoProvidersSelectionMoveUp()));
+  connect(this->UI.videoProviderDown, SIGNAL(clicked()),
+          this, SLOT(videoProvidersSelectionMoveDown()));
+  connect(this->UI.videoProviderDelete, SIGNAL(clicked()),
+          this, SLOT(videoProvidersSelectionDelete()));
+
+  // Display page
+  connect(this->UI.resultsPerPage, SIGNAL(valueChanged(int)),
+          this, SLOT(resultsPerPageChanged(int)));
+  connect(this->UI.resultClipPadding, SIGNAL(valueChanged(double)),
+          this, SLOT(resultClipPaddingChanged(double)));
+  connect(this->UI.resultColoring, SIGNAL(stopsChanged(vvScoreGradient)),
+          this, SLOT(resultColoringChanged(vvScoreGradient)));
+
+  // QF page
+  connect(this->UI.queryCacheUri, SIGNAL(textChanged(QString)),
+          this, SLOT(queryCacheUriChanged(QString)));
+  connect(this->UI.queryCacheUriPickLocalDir, SIGNAL(clicked()),
+          this, SLOT(showQueryCachePickLocalDirDialog()));
+  connect(this->UI.predefinedQueryUriPickLocalDir, SIGNAL(clicked()),
+          this, SLOT(showPredefinedQueryPickLocalDirDialog()));
+  connect(this->UI.predefinedQueryUri, SIGNAL(textChanged(QString)),
+          this, SLOT(predefinedQueryUriChanged(QString)));
+  connect(this->UI.descriptors, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateDescriptorButtons()));
+  connect(this->UI.descriptors, SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(descriptorsChanged()));
+  connect(this->UI.addDescriptor, SIGNAL(clicked()),
+          this, SLOT(addDescriptor()));
+  connect(this->UI.removeDescriptors, SIGNAL(clicked()),
+          this, SLOT(removeDescriptors()));
+
+  // IQR page
+  connect(this->UI.iqrWorkingSetSize, SIGNAL(valueChanged(int)),
+          this, SLOT(iqrWorkingSetSizeChanged(int)));
+  connect(this->UI.iqrRefinementSetSize, SIGNAL(valueChanged(int)),
+          this, SLOT(iqrRefinementSetSizeChanged(int)));
+
+  vvDescriptorStyleDelegate* delegate = new vvDescriptorStyleDelegate;
+  this->UI.descriptors->setItemDelegateForColumn(1, delegate);
+
+  // Dialog
+  connect(this->UI.buttons->button(QDialogButtonBox::Apply),
+          SIGNAL(pressed()), this, SLOT(apply()));
+  connect(this->UI.buttons->button(QDialogButtonBox::Reset),
+          SIGNAL(pressed()), this, SLOT(reset()));
+
+  this->reset();
+}
+
+//-----------------------------------------------------------------------------
+vqConfigureDialog::~vqConfigureDialog()
+{
+  QAbstractItemDelegate* delegate =
+    this->UI.descriptors->itemDelegateForColumn(1);
+  this->UI.descriptors->setItemDelegateForColumn(1, 0);
+  delete delegate;
+
+  delete this->settings_;
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::accept()
+{
+  this->apply();
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::reject()
+{
+  if (this->settings_->wasCommitted())
+    QDialog::accept();
+  else
+    QDialog::reject();
+}
+
+//-----------------------------------------------------------------------------
+#define MARK_CHANGED(_n) \
+  const bool _n##Modified = vqSettings()._n() != this->settings_->_n()
+#define EMIT_CHANGED(_n) \
+  if (_n##Modified) emit this->_n##Changed()
+void vqConfigureDialog::apply()
+{
+  // Mark changed settings so we know what to emit later
+  MARK_CHANGED(scoreGradient);
+  MARK_CHANGED(predefinedQueryUri);
+
+  // Commit new settings and clear modified flag
+  this->settings_->commit();
+  this->setModified();
+
+  // Emit notification signals for settings that changed
+  EMIT_CHANGED(scoreGradient);
+  EMIT_CHANGED(predefinedQueryUri);
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::reset()
+{
+  this->settings_->discard();
+  this->UI.queryServerUri->setText(
+    this->settings_->queryServerUri().toString());
+  this->UI.queryVideoUri->setText(
+    this->settings_->queryVideoUri().toString());
+  this->UI.queryCacheUri->setText(
+    this->settings_->queryCacheUri().toString());
+  this->UI.videoProviders->clear();
+  foreach (QUrl uri, this->settings_->videoProviders())
+    this->UI.videoProviders->addItem(uri.toString());
+  this->UI.predefinedQueryUri->setText(
+    this->settings_->predefinedQueryUri().toString());
+  this->UI.resultsPerPage->setValue(
+    this->settings_->resultPageCount());
+  this->UI.resultClipPadding->setValue(
+    this->settings_->resultClipPadding());
+  this->UI.resultColoring->setStops(
+    this->settings_->scoreGradient());
+  this->UI.iqrWorkingSetSize->setValue(
+    this->settings_->iqrWorkingSetSize());
+  this->UI.iqrRefinementSetSize->setValue(
+    this->settings_->iqrRefinementSetSize());
+
+  this->UI.descriptors->clear();
+  vvDescriptorStyle::Map groupings = this->settings_->descriptorStyles();
+  foreach_iter (vvDescriptorStyle::Map::const_iterator, iter, groupings)
+    {
+    QStringList sl;
+    sl.append(iter.key());
+    sl.append(vvDescriptorStyle::string(iter.value()));
+    QVariant data =
+      QVariant::fromValue<vvDescriptorStyle::Styles>(iter.value());
+    QTreeWidgetItem* item = new QTreeWidgetItem(sl);
+    item->setData(1, Qt::UserRole, data);
+    item->setFlags(item->flags() | Qt::ItemIsEditable);
+    this->UI.descriptors->addTopLevelItem(item);
+    }
+  this->UI.descriptors->sortByColumn(0, Qt::AscendingOrder);
+  qtUtil::resizeColumnsToContents(this->UI.descriptors);
+
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::setModified()
+{
+  bool modified = this->settings_->hasUncommittedChanges();
+  this->UI.buttons->button(QDialogButtonBox::Apply)->setEnabled(modified);
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::queryServerUriChanged(QString newUri)
+{
+  this->settings_->setQueryServerUri(newUri);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::showQueryServerEditUriDialog()
+{
+  vvQueryServerDialog dialog;
+  vvQueryService::registerChoosers(&dialog);
+  int result = dialog.exec(this->settings_->queryServerUri());
+  if (result == QDialog::Accepted)
+    this->UI.queryServerUri->setText(dialog.uri().toString());
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::queryVideoUriChanged(QString newUri)
+{
+  this->settings_->setQueryVideoUri(newUri);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::predefinedQueryUriChanged(QString newUri)
+{
+  this->settings_->setPredefinedQueryUri(newUri);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::showQueryVideoPickLocalDirDialog()
+{
+  QString path = vgFileDialog::getExistingDirectory(
+                   this, "Local Directory for Query Videos...",
+                   this->settings_->queryVideoUri().toLocalFile());
+  if (!path.isEmpty())
+    this->UI.queryVideoUri->setText(QUrl::fromLocalFile(path).toString());
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::showPredefinedQueryPickLocalDirDialog()
+{
+  QString path = vgFileDialog::getExistingDirectory(
+                   this, "Local Directory for Predefined Queries...",
+                   this->settings_->predefinedQueryUri().toLocalFile());
+  if (!path.isEmpty())
+    {
+    this->UI.predefinedQueryUri->setText(
+      QUrl::fromLocalFile(path).toString());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::queryCacheUriChanged(QString newUri)
+{
+  this->settings_->setQueryCacheUri(newUri);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::showQueryCachePickLocalDirDialog()
+{
+  QString path = vgFileDialog::getExistingDirectory(
+                   this, "Local Directory for Query Cache...",
+                   this->settings_->queryCacheUri().toLocalFile());
+  if (!path.isEmpty())
+    this->UI.queryCacheUri->setText(QUrl::fromLocalFile(path).toString());
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::showVideoProviderAddLocalArchiveDialog()
+{
+  QStringList fileNames = vgFileDialog::getOpenFileNames(
+                            this, "Video provider to add...", QString(),
+                            "KWA Video (*.index *.archive);;"
+                            "KWA Video Indices (*.index);;"
+                            "KWA Video Archives (*.archive);;"
+                            "All files (*)");
+  if (!fileNames.isEmpty())
+    {
+    foreach (QString fileName, fileNames)
+      {
+      QUrl uri = QUrl::fromLocalFile(fileName);
+      this->UI.videoProviders->addItem(uri.toString());
+      }
+    this->settings_->setVideoProviders(this->videoProviders());
+    this->setModified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+QList<QUrl> vqConfigureDialog::videoProviders()
+{
+  QList<QUrl> providers;
+  for (int n = 0; n < this->UI.videoProviders->count(); ++n)
+    providers.append(QUrl(this->UI.videoProviders->item(n)->text()));
+  return providers;
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::updateVideoProviderButtons()
+{
+  QListWidget* list = this->UI.videoProviders;
+  QList<QListWidgetItem*> selection = list->selectedItems();
+
+  bool enableUp = !selection.isEmpty();
+  bool enableDown = !selection.isEmpty();
+  bool enableDelete = !selection.isEmpty();
+  if (!selection.isEmpty())
+    {
+    enableUp = !list->isItemSelected(list->item(0));
+    enableDown = !list->isItemSelected(list->item(list->count() - 1));
+    }
+
+  this->UI.videoProviderUp->setEnabled(enableUp);
+  this->UI.videoProviderDown->setEnabled(enableDown);
+  this->UI.videoProviderDelete->setEnabled(enableDelete);
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::videoProvidersSelectionMoveUp()
+{
+  QListWidget* list = this->UI.videoProviders;
+  QList<QListWidgetItem*> selection = list->selectedItems();
+
+  if (selection.isEmpty())
+    return;
+  if (list->isItemSelected(list->item(0)))
+    return;
+
+  foreach (QListWidgetItem* item, list->selectedItems())
+    {
+    int row = list->row(item);
+    item = list->takeItem(row);
+    list->insertItem(row - 1, item);
+    }
+  foreach (QListWidgetItem* item, selection)
+    list->setItemSelected(item, true);
+
+  this->settings_->setVideoProviders(this->videoProviders());
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::videoProvidersSelectionMoveDown()
+{
+  QListWidget* list = this->UI.videoProviders;
+  QList<QListWidgetItem*> selection = list->selectedItems();
+
+  if (selection.isEmpty())
+    return;
+  if (list->isItemSelected(list->item(list->count() - 1)))
+    return;
+
+  int n = selection.count();
+  while (n--)
+    {
+    int row = list->row(selection[n]);
+    QListWidgetItem* item = list->takeItem(row);
+    list->insertItem(row + 1, item);
+    }
+  foreach (QListWidgetItem* item, selection)
+    list->setItemSelected(item, true);
+
+  this->settings_->setVideoProviders(this->videoProviders());
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::videoProvidersSelectionDelete()
+{
+  QListWidget* list = this->UI.videoProviders;
+  QList<QListWidgetItem*> selection = list->selectedItems();
+
+  foreach (QListWidgetItem* item, list->selectedItems())
+    delete list->takeItem(list->row(item));
+
+  this->settings_->setVideoProviders(this->videoProviders());
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::resultsPerPageChanged(int newValue)
+{
+  this->settings_->setResultPageCount(newValue);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::resultClipPaddingChanged(double newValue)
+{
+  this->settings_->setResultClipPadding(newValue);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::resultColoringChanged(vvScoreGradient newGradient)
+{
+  this->settings_->setScoreGradient(newGradient);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::iqrWorkingSetSizeChanged(int newSize)
+{
+  this->settings_->setIqrWorkingSetSize(newSize);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::iqrRefinementSetSizeChanged(int newSize)
+{
+  this->settings_->setIqrRefinementSetSize(newSize);
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptorStyle::Map vqConfigureDialog::descriptorStyles()
+{
+  vvDescriptorStyle::Map styles;
+  for (int n = 0; n < this->UI.descriptors->topLevelItemCount(); ++n)
+    {
+    QString key = this->UI.descriptors->topLevelItem(n)->text(0);
+    QVariant data =
+      this->UI.descriptors->topLevelItem(n)->data(1, Qt::UserRole);
+    styles.insert(key, data.value<vvDescriptorStyle::Styles>());
+    }
+  return styles;
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::updateDescriptorButtons()
+{
+  QList<QTreeWidgetItem*> selection = this->UI.descriptors->selectedItems();
+  this->UI.removeDescriptors->setEnabled(!selection.isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::descriptorsChanged()
+{
+  this->settings_->setDescriptorStyles(this->descriptorStyles());
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::addDescriptor()
+{
+  // Create new tree item
+  QStringList sl;
+  sl.append("Descriptor");
+  sl.append("All");
+
+  QTreeWidgetItem* item = new QTreeWidgetItem(sl);
+  item->setFlags(item->flags() | Qt::ItemIsEditable);
+  QVariant data = // FIXME shouldn't use all, maybe need DefaultStyle?
+    QVariant::fromValue<vvDescriptorStyle::Styles>(vvDescriptorStyle::All);
+  item->setData(1, Qt::UserRole, data);
+
+  // Add to tree
+  this->UI.descriptors->addTopLevelItem(item);
+  this->UI.descriptors->setCurrentItem(item);
+
+  // Mark as modified
+  this->descriptorsChanged();
+
+  // Edit the name
+  this->UI.descriptors->editItem(item);
+}
+
+//-----------------------------------------------------------------------------
+void vqConfigureDialog::removeDescriptors()
+{
+  QTreeWidget* tree = this->UI.descriptors;
+  QList<QTreeWidgetItem*> selection = tree->selectedItems();
+
+  foreach (QTreeWidgetItem* item, selection)
+    delete tree->takeTopLevelItem(tree->indexOfTopLevelItem(item));
+
+  this->descriptorsChanged();
+}
diff --git a/Applications/Viqui/vqConfigureDialog.h b/Applications/Viqui/vqConfigureDialog.h
new file mode 100644
index 00000000..d5994e03
--- /dev/null
+++ b/Applications/Viqui/vqConfigureDialog.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqConfigureDialog_h
+#define __vqConfigureDialog_h
+
+#include <QDialog>
+
+#include <vvDescriptorStyle.h>
+#include <vvScoreGradient.h>
+
+#include "vqSettings.h"
+
+#include "ui_configure.h"
+
+class vqConfigureDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vqConfigureDialog(QWidget* parent);
+  virtual ~vqConfigureDialog();
+
+  Ui::ConfigureDialog UI;
+
+signals:
+  void scoreGradientChanged();
+  void predefinedQueryUriChanged();
+
+public slots:
+  void accept();
+  void reject();
+  void apply();
+  void reset();
+
+protected slots:
+  void queryServerUriChanged(QString newUri);
+  void queryVideoUriChanged(QString newUri);
+  void queryCacheUriChanged(QString newUri);
+  void predefinedQueryUriChanged(QString newUri);
+  void showQueryServerEditUriDialog();
+  void showQueryVideoPickLocalDirDialog();
+  void showQueryCachePickLocalDirDialog();
+  void showVideoProviderAddLocalArchiveDialog();
+  void showPredefinedQueryPickLocalDirDialog();
+  void updateVideoProviderButtons();
+  void videoProvidersSelectionMoveUp();
+  void videoProvidersSelectionMoveDown();
+  void videoProvidersSelectionDelete();
+  void resultsPerPageChanged(int newValue);
+  void resultClipPaddingChanged(double newValue);
+  void resultColoringChanged(vvScoreGradient newGradient);
+  void iqrWorkingSetSizeChanged(int newSize);
+  void iqrRefinementSetSizeChanged(int newSize);
+  void updateDescriptorButtons();
+  void descriptorsChanged();
+  void addDescriptor();
+  void removeDescriptors();
+
+protected:
+  void setModified();
+  QList<QUrl> videoProviders();
+  vvDescriptorStyle::Map descriptorStyles();
+
+  vqSettings* settings_;
+};
+
+#endif
diff --git a/Applications/Viqui/vqContour.cxx b/Applications/Viqui/vqContour.cxx
new file mode 100644
index 00000000..2b78ecd7
--- /dev/null
+++ b/Applications/Viqui/vqContour.cxx
@@ -0,0 +1,148 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqContour.h"
+
+#include <vtkContourWidget.h>
+#include <vtkLinearContourLineInterpolator.h>
+#include <vtkOrientedGlyphContourRepresentation.h>
+#include <vtkPolyData.h>
+#include <vtkPropCollection.h>
+#include <vtkProperty.h>
+#include <vtkRenderWindowInteractor.h>
+
+#include "vtkVgGeode.h"
+#include "vtkVgGroupNode.h"
+
+//-----------------------------------------------------------------------------
+vqContour::vqContour(vtkRenderWindowInteractor* iren)
+  : Visible(1)
+{
+  this->ContourWidget = vtkSmartPointer<vtkContourWidget>::New();
+  this->ContourWidget->SetInteractor(iren);
+  this->Interactor = iren;
+
+  vtkOrientedGlyphContourRepresentation* rep = this->GetRepresentation();
+  rep->SetLineColor(1.0, 1.0, 0.0);
+  rep->AlwaysOnTopOn();
+
+  vtkLinearContourLineInterpolator* interpolator =
+    vtkLinearContourLineInterpolator::New();
+  rep->SetLineInterpolator(interpolator);
+  interpolator->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+vqContour::~vqContour()
+{
+  if (this->SceneParent)
+    {
+    this->SceneParent->RemoveChild(this->SceneNode);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqContour::Initialize()
+{
+  this->ContourWidget->On();
+  this->ContourWidget->Initialize();
+}
+
+//-----------------------------------------------------------------------------
+void vqContour::Initialize(vtkPolyData* pd)
+{
+  this->ContourWidget->On();
+  this->ContourWidget->Initialize(pd);
+}
+
+//-----------------------------------------------------------------------------
+void vqContour::Begin()
+{
+  this->ContourWidget->FollowCursorOn();
+  this->ContourWidget->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vqContour::End()
+{
+  // don't auto-add a 'dangling' mouse cursor node
+  if (!this->GetRepresentation()->GetClosedLoop())
+    {
+    this->GetRepresentation()->DeleteLastNode();
+    }
+  this->ContourWidget->CloseLoop();
+  this->DisableInteraction();
+}
+
+//-----------------------------------------------------------------------------
+void vqContour::Finalize()
+{
+  this->GetRepresentation()->SetLineColor(1.0, 0.8, 0.0);
+}
+
+//-----------------------------------------------------------------------------
+void vqContour::AddToScene(vtkVgGroupNode* parent)
+{
+  this->SceneNode = vtkSmartPointer<vtkVgGeode>::New();
+  this->SceneParent = parent;
+
+  vtkPropCollection* pc = vtkPropCollection::New();
+  this->GetRepresentation()->GetActors(pc);
+
+  pc->InitTraversal();
+  while (vtkProp* prop = pc->GetNextProp())
+    {
+    this->SceneNode->AddDrawable(prop);
+    }
+
+  pc->Delete();
+
+  this->SceneParent->AddChild(this->SceneNode);
+  if (!this->Visible)
+    {
+    this->SceneNode->SetVisible(0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqContour::SetVisible(int visible)
+{
+  if (visible != this->Visible)
+    {
+    this->Visible = visible;
+    if (this->SceneNode)
+      {
+      this->SceneNode->SetVisible(visible);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkPolyData* vqContour::GetPolyData()
+{
+  vtkOrientedGlyphContourRepresentation* rep = this->GetRepresentation();
+  return rep->GetContourRepresentationAsPolyData();
+}
+
+//-----------------------------------------------------------------------------
+void vqContour::DisableInteraction()
+{
+  this->ContourWidget->ProcessEventsOff();
+
+  vtkOrientedGlyphContourRepresentation* rep = this->GetRepresentation();
+  rep->GetProperty()->SetOpacity(0.0);
+  rep->GetActiveProperty()->SetOpacity(0.0);
+}
+
+//-----------------------------------------------------------------------------
+vtkOrientedGlyphContourRepresentation* vqContour::GetRepresentation()
+{
+  vtkOrientedGlyphContourRepresentation* rep =
+    vtkOrientedGlyphContourRepresentation::SafeDownCast(
+      this->ContourWidget->GetRepresentation());
+
+  return rep;
+}
diff --git a/Applications/Viqui/vqContour.h b/Applications/Viqui/vqContour.h
new file mode 100644
index 00000000..d947ea99
--- /dev/null
+++ b/Applications/Viqui/vqContour.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqContour_h
+#define __vqContour_h
+
+#include <vtkSmartPointer.h>
+
+class vtkContourWidget;
+class vtkOrientedGlyphContourRepresentation;
+class vtkPolyData;
+class vtkRenderWindowInteractor;
+class vtkVgGeode;
+class vtkVgGroupNode;
+
+class vqContour
+{
+public:
+  vqContour(vtkRenderWindowInteractor* iren);
+  ~vqContour();
+
+  void Initialize();
+  void Initialize(vtkPolyData* pd);
+
+  void Begin();
+  void End();
+
+  void Finalize();
+  void AddToScene(vtkVgGroupNode* parent);
+
+  vtkPolyData* GetPolyData();
+
+  void SetVisible(int visible);
+  int  GetVisible() { return this->Visible; }
+
+protected:
+  vtkOrientedGlyphContourRepresentation* GetRepresentation();
+
+  void DisableInteraction();
+
+private:
+  int Visible;
+
+  vtkSmartPointer<vtkVgGeode> SceneNode;
+  vtkSmartPointer<vtkVgGroupNode> SceneParent;
+  vtkSmartPointer<vtkContourWidget> ContourWidget;
+  vtkSmartPointer<vtkRenderWindowInteractor> Interactor;
+};
+
+#endif // __vqContour_h
diff --git a/Applications/Viqui/vqCore.cxx b/Applications/Viqui/vqCore.cxx
new file mode 100644
index 00000000..c1103b4e
--- /dev/null
+++ b/Applications/Viqui/vqCore.cxx
@@ -0,0 +1,4079 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqCore.h"
+
+// Qt includes
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QMenu>
+#include <QMessageBox>
+#include <QProcess>
+#include <QProgressDialog>
+#include <QSettings>
+#include <QTemporaryFile>
+#include <QTimer>
+#include <QTimerEvent>
+
+// QtExtensions includes
+#include <qtMap.h>
+#include <qtStatusManager.h>
+#include <qtStlUtil.h>
+
+// VTK includes
+#include <vtkActor.h>
+#include <vtkAreaPicker.h>
+#include <vtkCellArray.h>
+#include <vtkContourWidget.h>
+#include <vtkImageActor.h>
+#include <vtkImageData.h>
+#include <vtkInteractorStyle.h>
+#include <vtkLookupTable.h>
+#include <vtkLinearContourLineInterpolator.h>
+#include <vtkMath.h>
+#include <vtkOrientedGlyphContourRepresentation.h>
+#include <vtkPoints.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProp3D.h>
+#include <vtkProp3DCollection.h>
+#include <vtkProperty.h>
+#include <vtkRenderedAreaPicker.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkSphereSource.h>
+#include <vtkTimerLog.h>
+
+// VISGUI includes
+#include <vtkVgSelectionWidget.h> // will be moved to VTK in future
+#include <vtkVgContourOperatorManager.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventBase.h>
+#include <vtkVgInteractorStyleRubberBand2D.h>
+#include <vtkVgSelectionListRepresentation.h>
+#include <vtkVgSpaceConversion.h>
+#include <vtkVgTimeStamp.h>
+#include <vtkVgTrack.h>
+#include <vtkVgUtil.h>
+
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+#include <vtkVgTripWireManager.h>
+#include <vtkVgVideoModel0.h>
+#include <vtkVgVideoRepresentation0.h>
+
+#include <vtkVgFindNode.h>
+#include <vtkVgFindNodeVisitor.h>
+#include <vtkVgGeode.h>
+#include <vtkVgGroupNode.h>
+#include <vtkVgTerrain.h>
+#include <vtkVgTrackNode.h>
+#include <vtkVgTransformNode.h>
+#include <vtkVgVideoNode.h>
+#include <vtkVgVideoViewer.h>
+#include <vtkVgViewerBase.h>
+
+#include <vtkVgQtUtil.h>
+
+// VgCommon includes
+#include <vgCheckArg.h>
+
+#include <vgGeoUtil.h>
+
+// VgVideo includes
+#include <vgKwaArchive.h>
+#include <vgKwaFrameMetadata.h>
+#include <vgKwaVideoClip.h>
+
+// VV includes
+#include <vvQueryResult.h>
+
+#include <vvKmlLine.h>
+#include <vvKmlWriter.h>
+#include <vvKstWriter.h>
+#include <vvUtil.h>
+
+#include <vvReportWriter.h>
+
+// Viqui includes
+#include "Backends/vqExporterFactory.h"
+#include "vqArchiveVideoSource.h"
+#include "vqContour.h"
+#include "vqDebug.h"
+#include "vqQueryDialog.h"
+#include "vqQueryParser.h"
+#include "vqScopedOverrideCursor.h"
+#include "vqSettings.h"
+#include "vqTrackingClipViewer.h"
+#include "vqVideoNodeVisitor.h"
+#include "vtkVQCoordinateTransform.h"
+#include "vtkVQTrackingClip.h"
+#include "vtkVQInteractionCallback.h"
+#include "vtkVQBlastLayoutNode.h"
+#include "vtkVQInteractionCallback.h"
+#include "vtkVQTerrainSource.h"
+
+// C/C++ includes
+#include <algorithm>
+#include <cassert>
+#include <exception>
+#include <map>
+#include <sstream>
+#include <vector>
+#include <string>
+
+namespace // anonymous
+{
+
+double SelectedTrackColor[] = { 1.0, 0.08, 0.58 };
+
+//-----------------------------------------------------------------------------
+bool CompareByScore(vtkVgVideoNode* a, vtkVgVideoNode* b)
+{
+  return (a->GetRelevancyScore() == b->GetRelevancyScore())
+         ? a->GetInstanceId() < b->GetInstanceId()
+         : a->GetRelevancyScore() > b->GetRelevancyScore();
+}
+
+//-----------------------------------------------------------------------------
+bool CompareByRank(vtkVgVideoNode* a, vtkVgVideoNode* b)
+{
+  return (a->GetRank() == b->GetRank())
+         ? CompareByScore(a, b)
+         : a->GetRank() < b->GetRank();
+}
+
+//-----------------------------------------------------------------------------
+class RenderWidgetEventFilter : public QObject
+{
+public:
+  RenderWidgetEventFilter(QObject* parent, vqCore* core) :
+    QObject(parent), Core(core) {}
+
+  virtual bool eventFilter(QObject* /*sender*/, QEvent* e)
+    {
+    if (e->type() == QEvent::Resize)
+      {
+      // Update terrain source in order to update context tile visible extents,
+      // and repaint; must invoke queued so that the resize completes first!
+      QMetaObject::invokeMethod(this->Core, "updateSources",
+                                Qt::QueuedConnection);
+      }
+    return false;
+    }
+
+private:
+  vqCore* Core;
+};
+
+//-----------------------------------------------------------------------------
+vvQueryResult stripResult(vvQueryResult result)
+{
+  const size_t i = vvUtil::findMergedRegions(result.Descriptors);
+  const size_t k = result.Descriptors.size();
+  if (i < k)
+    {
+    vvDescriptor mergedRegionsDescriptor = result.Descriptors[i];
+
+    // Generate set of used tracks
+    QSet<vvTrackId> tracks;
+    for (size_t n = 0; n < k; ++n)
+      {
+      const vvDescriptor& descriptor = result.Descriptors[n];
+      for (size_t tn = 0, tk = descriptor.TrackIds.size(); tn < tk; ++tn)
+        {
+        tracks.insert(descriptor.TrackIds[tn]);
+        }
+      }
+
+    // Assign track ID's to merged region descriptor, so that they aren't
+    // dropped (okay to clear its tracks first, as we would have included its
+    // tracks, if any, when building the set)
+    mergedRegionsDescriptor.TrackIds.clear();
+    foreach (const vvTrackId& tid, tracks)
+      {
+      mergedRegionsDescriptor.TrackIds.push_back(tid);
+      }
+
+    // Replace the result descriptor set with just the merged descriptor
+    result.Descriptors.clear();
+    result.Descriptors.push_back(mergedRegionsDescriptor);
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+bool computeImageToLatLon(
+  vtkSmartPointer<vtkMatrix4x4>& out,
+  const vgKwaFrameMetadata& frameMetaData)
+{
+  CHECK_ARG(frameMetaData.worldCornerPoints().GCS != -1, false);
+
+  vtkVQCoordinateTransform::SmartPtr imageToLatLon(
+    vtkVQCoordinateTransform::SmartPtr::New());
+
+  imageToLatLon->SetToPoints(
+    frameMetaData.worldCornerPoints().UpperLeft.Easting,
+    frameMetaData.worldCornerPoints().UpperLeft.Northing,
+    frameMetaData.worldCornerPoints().UpperRight.Easting,
+    frameMetaData.worldCornerPoints().UpperRight.Northing,
+    frameMetaData.worldCornerPoints().LowerRight.Easting,
+    frameMetaData.worldCornerPoints().LowerRight.Northing,
+    frameMetaData.worldCornerPoints().LowerLeft.Easting,
+    frameMetaData.worldCornerPoints().LowerLeft.Northing);
+
+  double iw = frameMetaData.imageSize().width();
+  double ih = frameMetaData.imageSize().height();
+  imageToLatLon->SetFromPoints(0.0,  ih - 1.0,
+                               iw - 1.0,  ih - 1.0,
+                               iw - 1.0,       0.0,
+                               0.0,       0.0);
+
+  out = imageToLatLon->GetHomographyMatrix();
+  return true;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vqCore::vqCore()
+  : QObject(), SavePersistentQuery(false),
+    InteractionStatusSource(this), QuerySessionDummyObject(),
+    QuerySessionStatusSource(&this->QuerySessionDummyObject)
+{
+  this->StatusManager           = new qtStatusManager(this);
+  this->StatusManager->setDebugArea(vqdStatusManager);
+
+  this->QuerySessionStatusSource.setName(this);
+
+  // Create viewer.
+  this->ContextViewer = vtkSmartPointer<vtkVgVideoViewer>::New();
+  this->ContextViewer->SetSceneRoot(this->createScene());
+
+  this->ContextInteractorStyle  = vtkSmartPointer<vtkVgInteractorStyleRubberBand2D>::New();
+
+  this->TerrainSource           = 0;
+
+  this->ContextVideoRoot        = 0;
+
+  this->TimerLog = vtkSmartPointer<vtkTimerLog>::New();
+  this->ApplicationStartTime = this->TimerLog->GetUniversalTime();
+
+  this->ApplicationTimeStamp.SetTime(0.0);
+
+  this->ActiveQueryParser       = 0;
+
+  this->LastEventViewScale      = 0.0;
+  this->LastMarkerViewScale     = 0.0;
+
+  this->NodeColorMappingMode   = ColorByAbsoluteScore;
+  this->NodeColorShadingMode   = qtGradient::InterpolateDiscrete;
+
+  this->ItemColorLUT            = vtkSmartPointer<vtkLookupTable>::New();
+
+  this->ViewScaleFactor         = 3.5;
+
+  // Set callbacks.
+  vtkSmartPointer<vtkVQInteractionCallback> interactionCallback
+  (vtkSmartPointer<vtkVQInteractionCallback>::New());
+  interactionCallback->SetCore(this);
+
+  this->ContextInteractorStyle->AddObserver(
+    vtkCommand::InteractionEvent, interactionCallback);
+  this->ContextInteractorStyle->AddObserver(
+    vtkVgInteractorStyleRubberBand2D::ZoomCompleteEvent, interactionCallback);
+
+  vtkMath::UninitializeBounds(this->TerrainBounds);
+
+  this->CachedLayoutNode = 0;
+
+  this->QueryResultNodesDirty = false;
+  this->ScoringRequestNodesDirty = false;
+  this->GroundTruthNodesDirty = false;
+
+  this->Contour = 0;
+  this->QueryRegionContour = 0;
+  this->QueryRegionVisible = true;
+  this->DrawingContour = false;
+
+  this->SkipInitialDisplayCounter = 0;
+
+  // Approximately 15 FPS.
+  this->UpdateIntervalMSec = 60;
+
+  this->UpdateTimer = 0;
+
+  // Defaults unless loaded from file
+  this->SpatialFilterActive = false;
+  this->QueryResultSelector = vtkSmartPointer<vtkVgContourOperatorManager>::New();
+  this->QueryTripWireManager = vtkSmartPointer<vtkVgTripWireManager>::New();
+  this->QueryTripWireManager->SetTripWireId(-3000);
+  this->QueryTripWireManager->SetEnteringRegionId(-3001);
+  this->QueryTripWireManager->SetExitingRegionId(-3002);
+
+  this->ReceivingGroundTruthResults = false;
+  this->GroundTruthEventType = -1; // show all types
+
+  this->RenderPending = false;
+
+  this->ContinuousRender = false;
+
+  this->TrackNode = vtkSmartPointer<vtkVgTrackNode>::New();
+  this->ContextSceneRoot->AddChild(this->TrackNode);
+
+  this->ShowVideoClipsOnContext = true;
+  this->ShowVideoOutlinesOnContext = true;
+  this->ShowTracksOnContext = false;
+
+  this->ProcessingDatabaseQuery = false;
+
+  this->ContextTracksSelector
+    = vtkSmartPointer<vtkVgContourOperatorManager>::New();
+
+  this->setupTracksOnContext();
+}
+
+//-----------------------------------------------------------------------------
+vqCore::~vqCore()
+{
+  this->unregisterAllNodes();
+
+  delete this->ActiveQueryParser;
+  this->ActiveQueryParser = 0;
+
+  delete this->Contour;
+  this->Contour = 0;
+
+  delete this->QueryRegionContour;
+  this->QueryRegionContour = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setupUi(QVTKWidget* renderWidget)
+{
+  if (renderWidget)
+    {
+    this->RenderWidget = renderWidget;
+    this->ContextViewer->SetRenderWindowInteractor(
+      renderWidget->GetInteractor());
+
+    renderWidget->SetRenderWindow(this->ContextViewer->GetRenderWindow());
+    renderWidget->GetInteractor()->SetInteractorStyle(
+      this->ContextInteractorStyle);
+
+    this->ContextInteractorStyle->SetRenderer(
+      this->ContextViewer->GetSceneRenderer());
+    this->ContextInteractorStyle->RubberBandSelectionWithCtrlKeyOn();
+
+    renderWidget->installEventFilter(
+      new RenderWidgetEventFilter(renderWidget, this));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkVgInteractorStyleRubberBand2D::LeftClickEvent,
+               this, SLOT(onLeftClick()));
+
+    vtkConnect(renderWidget->GetInteractor(),
+               vtkCommand::RightButtonPressEvent,
+               this, SLOT(onRightButtonPress()));
+
+    vtkConnect(renderWidget->GetInteractor(),
+               vtkCommand::RightButtonReleaseEvent,
+               this, SLOT(onRightButtonRelease()));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkCommand::MouseWheelForwardEvent,
+               this, SLOT(onMouseWheelForward()));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkCommand::MouseWheelBackwardEvent,
+               this, SLOT(onMouseWheelBackward()));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkVgInteractorStyleRubberBand2D::KeyPressEvent_P,
+               this, SLOT(onPKeyPress()));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkVgInteractorStyleRubberBand2D::KeyPressEvent_R,
+               this, SLOT(resetView()));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkVgInteractorStyleRubberBand2D::KeyPressEvent_A,
+               this, SLOT(resetViewToQueryResults()));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkCommand::InteractionEvent,
+               this, SLOT(updateLayoutStackBarLocations()));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkVgInteractorStyleRubberBand2D::ZoomCompleteEvent,
+               this, SLOT(updateLayoutStackBarLocations()));
+
+    vtkConnect(renderWidget->GetInteractor()->GetInteractorStyle(),
+               vtkVgInteractorStyleRubberBand2D::SelectionCompleteEvent,
+               this, SLOT(selectItemsOnContext()));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::registerStatusWidget(QLabel* widget)
+{
+  this->StatusManager->addStatusLabel(widget);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::registerStatusWidget(QProgressBar* widget)
+{
+  this->StatusManager->addProgressBar(widget);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgViewerBase* vqCore::getContextViewer()
+{
+  return this->ContextViewer.GetPointer();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgInteractorStyleRubberBand2D* vqCore::getContextInteractorStyle()
+{
+  return this->ContextInteractorStyle;
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkVgVideoNode*> vqCore::queryResultNodes()
+{
+  if (this->QueryResultNodesDirty)
+    {
+    this->QueryResultNodeList = this->QueryResultNodes.values();
+
+    qSort(this->QueryResultNodeList.begin(),
+          this->QueryResultNodeList.end(),
+          &CompareByRank);
+
+    this->QueryResultNodesDirty = false;
+    }
+
+  return this->QueryResultNodeList;
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkVgVideoNode*> vqCore::scoringRequestNodes()
+{
+  if (this->ScoringRequestNodesDirty || this->QueryResultNodesDirty)
+    {
+    this->ScoringRequestNodeList = this->ScoringRequestNodes.values();
+
+    qSort(this->ScoringRequestNodeList.begin(),
+          this->ScoringRequestNodeList.end(),
+          &CompareByRank);
+
+    this->ScoringRequestNodesDirty = false;
+    }
+
+  return this->ScoringRequestNodeList;
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkVgVideoNode*> vqCore::groundTruthNodes()
+{
+  if (this->GroundTruthNodesDirty)
+    {
+    this->GroundTruthNodeList = this->GroundTruthNodes.values();
+
+    qSort(this->GroundTruthNodeList.begin(),
+          this->GroundTruthNodeList.end(),
+          &CompareByScore);
+
+    ResultRank rank = 1;
+    foreach (vtkVgVideoNode* node, this->GroundTruthNodeList)
+      {
+      node->SetRank(rank++);
+      }
+
+    this->GroundTruthNodesDirty = false;
+    }
+
+  return this->GroundTruthNodeList;
+}
+
+//-----------------------------------------------------------------------------
+vtkLookupTable* vqCore::getLookupTable()
+{
+  return this->ItemColorLUT;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::resetQueryResults(bool clearResults, bool clearDisplayResults)
+{
+  if (clearResults)
+    {
+    // Clear out entire result list; usually means we are starting a new query.
+    this->QueryResults.clear();
+    this->QueryScoreMap.clear();
+    emit this->queryResultsAvailabilityChanged(false);
+    }
+  else if (clearDisplayResults)
+    {
+    // Clear out display results but not the full result set; usually means we
+    // are going to display a different subset due to IQR or a change in the
+    // display offset.
+    this->QueryScoreMap.clear();
+    }
+
+  // Record results that have been starred.
+  this->StarResults.clear();
+  if (!clearResults)
+    {
+    QHash<ResultId, vtkVgVideoNode*>::iterator itr;
+    QHash<ResultId, vtkVgVideoNode*>::iterator end;
+    for (itr = this->QueryResultNodes.begin(),
+         end = this->QueryResultNodes.end(); itr != end; ++itr)
+      {
+      if (itr.value()->GetIsStarResult())
+        {
+        this->StarResults.insert(itr.key());
+        }
+      }
+    }
+
+  // Clear out scene elements.
+  this->unregisterAllNodes();
+
+  this->QueryResultNodes.clear();
+  this->ScoringRequestNodes.clear();
+  this->GroundTruthNodes.clear();
+  this->QueryResultNodeList.clear();
+  this->ScoringRequestNodeList.clear();
+  this->GroundTruthNodeList.clear();
+
+  this->QueryResultNodesDirty = true;
+  this->ScoringRequestNodesDirty = true;
+  this->GroundTruthNodesDirty = true;
+
+  // Remove the last result.
+  if (this->ContextVideoRoot)
+    {
+    this->ContextSceneRoot->RemoveChild(this->ContextVideoRoot);
+    }
+
+  this->ContextVideoRoot = vtkVgTransformNode::SmartPtr::New();
+  this->ContextVideoRoot->SetName("ContextVideoRoot");
+
+  // \NOTE: Setting the matrix at the root of video context.
+  if (this->ContextVideoRoot)
+    {
+    this->ContextVideoRoot->SetMatrix(
+      this->TerrainSource->GetCoordinateTransformMatrix());
+    }
+
+  this->ContextSceneRoot->AddChild(this->ContextVideoRoot);
+
+  // Clear the track model
+  this->TrackNode->GetTrackModel()->Initialize();
+
+  emit this->displayResultsReset();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::registerStatusSource(qtStatusNotifier* source)
+{
+  // \TODO remove this method when video query can use its own parser
+  source->addReceiver(this->StatusManager);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::connectParser(vqQueryParser* parser)
+{
+  connect(parser, SIGNAL(resultAvailable(vvQueryResult, bool)),
+          this, SLOT(acceptQueryResult(vvQueryResult, bool)));
+  connect(parser, SIGNAL(resultSetComplete(bool)),
+          this, SLOT(queryFinished(bool)));
+
+  parser->addReceiver(this->StatusManager);
+
+  connect(parser, SIGNAL(error(qtStatusSource, QString)),
+          this->StatusManager, SLOT(setStatusText(qtStatusSource, QString)));
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::canIssueQuery()
+{
+  // Context must be loaded before we can issue queries
+  if (!this->TerrainSource)
+    {
+    QMessageBox::warning(0, "Viqui", "Load context first");
+    return false;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkMatrix4x4> vqCore::getLatLonToContextMatrix() const
+{
+  return this->TerrainSource->GetCoordinateTransformMatrix();
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkMatrix4x4> vqCore::getContextToLatLonMatrix() const
+{
+  vtkSmartPointer<vtkMatrix4x4> invertMat = vtkSmartPointer<vtkMatrix4x4>::New();
+  invertMat->DeepCopy(this->TerrainSource->GetCoordinateTransformMatrix());
+  invertMat->Invert();
+
+  return invertMat;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::getCurrentPointerPosition(int& x, int& y)
+{
+  int* pointerPosition = this->ContextInteractorStyle->GetEndPosition();
+  x = pointerPosition[0];
+  y = pointerPosition[1];
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::transformDisplayToLatLon(int x, int y, double& lat, double& lon) const
+{
+  double pt[3] = { static_cast<double>(x), static_cast<double>(y), 0.0 };
+
+  vtkVgSpaceConversion::DisplayToWorldNormalized(
+    this->ContextViewer->GetSceneRenderer(), pt, pt);
+
+  vtkSmartPointer<vtkMatrix4x4> contextToLatLon =
+    this->getContextToLatLonMatrix();
+
+  vtkVgApplyHomography(pt, contextToLatLon, lon, lat);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::transformContextToLatLon(
+  double x, double y, double& lat, double& lon) const
+{
+  vtkSmartPointer<vtkMatrix4x4> contextToLatLon =
+    this->getContextToLatLonMatrix();
+
+  vtkVgApplyHomography(x, y, contextToLatLon, lon, lat);
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::startQuerySession(bool formulate)
+{
+  if (!this->canIssueQuery())
+    return false;
+
+  // Terminate any currently-active query
+  this->endQuerySession(!formulate);
+
+  this->ActiveQueryParser = new vqQueryParser(this->QueryServer);
+
+  connectParser(this->ActiveQueryParser);
+
+  // TODO: Formulate should use a stand-alone parser when we can trust all of
+  //       out back-ends to support simultaneous requests, at which point these
+  //       connections (and the formulationComplete signal itself in vqCore,
+  //       and our parameter) should go away
+  if (formulate)
+    {
+    connect(this->ActiveQueryParser,
+            SIGNAL(formulationComplete(QList<vvDescriptor>, QList<vvTrack>)),
+            this,
+            SIGNAL(formulationComplete(QList<vvDescriptor>, QList<vvTrack>)));
+    connect(this->ActiveQueryParser,
+            SIGNAL(formulationComplete(QList<vvDescriptor>, QList<vvTrack>)),
+            this, SLOT(formulationFinished()));
+    connect(this->ActiveQueryParser, SIGNAL(error(qtStatusSource, QString)),
+            this, SIGNAL(formulationFailed()));
+    connect(this->ActiveQueryParser, SIGNAL(error(qtStatusSource, QString)),
+            this, SLOT(formulationFinished()));
+    }
+  else
+    {
+    connect(this->ActiveQueryParser, SIGNAL(error(qtStatusSource, QString)),
+            this, SLOT(transferQueryStatus()));
+    connect(this->ActiveQueryParser, SIGNAL(finished()),
+            this, SLOT(releaseQuery()));
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::endQuerySession(bool clearResults)
+{
+  if (this->ActiveQueryParser)
+    {
+    this->StatusManager->setStatusText(this->QuerySessionStatusSource,
+                                       "Shutting down query session...");
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    delete this->ActiveQueryParser;
+    }
+
+  this->ReceivingGroundTruthResults = false;
+
+  // clear out any tracks in our track model
+  this->TrackNode->GetTrackModel()->Initialize();
+
+  // \TODO remove parameter (always true) when formulate doesn't use
+  //       ActiveQueryParser
+  if (clearResults)
+    {
+    this->resetQueryResults(true);
+    }
+  this->SavedQueryPlan.clear();
+  emit this->queryPlanAvailabilityChanged(false);
+
+  if (this->ActiveQueryParser)
+    {
+    QApplication::restoreOverrideCursor();
+    }
+
+  this->StatusManager->setStatusText(this->QuerySessionStatusSource);
+  this->ActiveQueryParser = 0;
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::loadQuery(QUrl query, LoadQueryFlags flags)
+{
+  // \NOTE: We only support queries from a file at this moment.
+  if (query.scheme().toLower() != "file")
+    {
+    QMessageBox::critical(0, "Viqui",
+                          "Must load queries from local files for now");
+    return false;
+    }
+
+  if (!this->canIssueQuery())
+    return false;
+
+  bool isGroundTruth = flags.testFlag(vqCore::GroundTruth);
+  this->SavePersistentQuery = flags.testFlag(vqCore::SavePersistent);
+
+  // Stop any existing session and clear out any old results
+  this->endQuerySession(!isGroundTruth || !this->ContextVideoRoot);
+
+  this->ReceivingGroundTruthResults = isGroundTruth;
+
+  // File loading doesn't involve a session or need a query server, so do it
+  // from a stand-alone parser
+  vqQueryParser parser;
+  this->connectParser(&parser);
+  connect(&parser, SIGNAL(planAvailable(vvQueryInstance)),
+          this, SLOT(processQuery(vvQueryInstance)));
+  connect(&parser, SIGNAL(finished()),
+          this, SLOT(finalizeQueryLoading()));
+
+  bool result = parser.loadQuery(query);
+  this->StatusManager->transferOwnership(&parser,
+                                         this->QuerySessionStatusSource);
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::finalizeQueryLoading()
+{
+  // Done (for better or worse) trying to load a query; clear flag to save the
+  // next query as the edit dialog persistent query so we don't stuff some
+  // random other query in there
+  this->SavePersistentQuery = false;
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::formulateQuery(
+  vvProcessingRequest request, bool bypassCache/*= false*/,
+  qtStatusManager* statusTarget/*= 0*/)
+{
+  if (!this->startQuerySession(true))
+    return false;
+
+  if (statusTarget)
+    this->ActiveQueryParser->addReceiver(statusTarget);
+
+  return this->ActiveQueryParser->formulateQuery(request, bypassCache);
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::processQuery(vvQueryInstance mutableQuery)
+{
+  // Query is passed by-value because this is a slot, but we shouldn't modify
+  // it; alias it here as a const reference so the compiler will enforce that
+  const vvQueryInstance& query = mutableQuery;
+  if (!(query.isValid() && this->startQuerySession(false)))
+    return false;
+
+  if (this->SavePersistentQuery)
+    {
+    vqQueryDialog::savePersistentQuery(mutableQuery);
+    this->SavePersistentQuery = false;
+    }
+
+  this->SpatialFilterActive = false;
+  this->QueryResultSelector->RemoveAllSelectors();
+  this->QueryTripWireManager->RemoveAllTripWires();
+
+  // remove any old contours
+  delete this->QueryRegionContour;
+  delete this->Contour;
+  this->QueryRegionContour = 0;
+  this->Contour = 0;
+
+  if (query.constAbstractQuery()->SpatialLimit.Coordinate.size() > 0)
+    {
+    this->SpatialFilterActive = true;
+
+    // create a contour based on the query region
+    this->QueryRegionContour =
+      this->createStaticContour(query.constAbstractQuery()->SpatialLimit, true);
+
+    // filter
+    this->QueryResultSelector->AddSelector(
+      this->QueryRegionContour->GetPolyData()->GetPoints());
+
+    // trip wire
+    bool useTripwire;
+    switch (query.constAbstractQuery()->SpatialFilter)
+      {
+      case vvDatabaseQuery::Intersects:
+        this->FilterOnEnterTripEvents = true;
+        this->FilterOnExitTripEvents = true;
+        useTripwire = true;
+        break;
+      case vvDatabaseQuery::IntersectsInbound:
+        this->FilterOnEnterTripEvents = true;
+        this->FilterOnExitTripEvents = false;
+        useTripwire = true;
+        break;
+      case vvDatabaseQuery::IntersectsOutbound:
+        this->FilterOnEnterTripEvents = false;
+        this->FilterOnExitTripEvents = true;
+        useTripwire = true;
+        break;
+      default:
+        this->FilterOnEnterTripEvents = false;
+        this->FilterOnExitTripEvents = false;
+        useTripwire = false;
+        break;
+      }
+    if (useTripwire)
+      {
+      this->QueryTripWireManager->AddTripWire(
+        this->QueryRegionContour->GetPolyData()->GetPoints(), true);
+      }
+    }
+
+  // Note:  This is temporary code to facilitate doing Refine in presence of an
+  // IQR model in the submitted query, without teasing the user with the
+  // initial result set; see commit for necessary code to remove when the
+  // the system supports IQR modified results on initial query
+  if (query.constSimilarityQuery() &&
+      query.constSimilarityQuery()->IqrModel.size())
+    {
+    this->SkipInitialDisplayCounter = 2;
+    }
+  else
+    {
+    this->SkipInitialDisplayCounter = 0;
+    }
+
+  if (!this->ActiveQueryParser->processQuery(query))
+    {
+    delete this->ActiveQueryParser;
+    this->ActiveQueryParser = 0;
+    return false;
+    }
+
+  // Remember query plan so we can (potentially) save it later
+  this->SavedQueryPlan = query;
+  emit this->queryPlanAvailabilityChanged(true);
+
+  emit this->processingQuery(query);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::processDatabaseVideoQuery(vvQueryInstance queryInstance)
+{
+  if (!this->startQuerySession(true))
+    {
+    return false;
+    }
+
+  if (!this->ActiveQueryParser->processQuery(queryInstance))
+    {
+    delete this->ActiveQueryParser;
+    this->ActiveQueryParser = 0;
+    return false;
+    }
+
+  this->ProcessingDatabaseQuery = true;
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::requestRefinement(int resultsToScore)
+{
+  if (!this->ActiveQueryParser)
+    {
+    QMessageBox::warning(0, "Viqui", "There is no active query session");
+    return false;
+    }
+
+  return this->ActiveQueryParser->requestScoring(resultsToScore);
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::refineQuery()
+{
+  if (!this->ActiveQueryParser)
+    {
+    QMessageBox::warning(0, "Viqui", "There is no active query session");
+    return false;
+    }
+
+  vvIqr::ScoringClassifiers feedback;
+  foreach (ResultId iid, this->ScoringRequestNodes.keys())
+    {
+    feedback.insert(iid, this->QueryResults[iid].UserScore);
+    }
+
+  foreach (ResultId iid, this->QueryResultNodes.keys())
+    {
+    vvIqr::Classification status = this->QueryResults[iid].UserScore;
+    if (status == vvIqr::PositiveExample || status == vvIqr::NegativeExample)
+      {
+      feedback.insert(iid, status);
+      }
+    }
+
+  if (feedback.isEmpty())
+    {
+    QMessageBox::warning(0, "Viqui", "There is no feedback to provide");
+    return false;
+    }
+
+  this->resetQueryResults(false);
+
+  this->ActiveQueryParser->refineQuery(feedback);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::acceptQueryResult(vvQueryResult queryResult, bool requestScoring)
+{
+
+  if (this->ProcessingDatabaseQuery)
+    {
+    this->CacheDatabaseQueryResults(queryResult);
+    return;
+    }
+
+  if (this->ReceivingGroundTruthResults)
+    {
+    this->addGroundTruthResult(queryResult);
+    return;
+    }
+
+  if (!requestScoring)
+    {
+    // If this is part of the query results, just add it (or update the score,
+    // if this is a refinement iteration)
+    this->addQueryResult(queryResult);
+    }
+  else
+    {
+    ResultId iid = queryResult.InstanceId;
+    // Requesting refinement on a result should not change the score...
+    if (!this->QueryResults.contains(iid))
+      {
+      // Haven't seen this result? Not expected to happen, but just in case...
+      this->addQueryResult(queryResult);
+      }
+    else // do, however, update the preference score
+      {
+      this->QueryResults[iid].PreferenceScore = queryResult.PreferenceScore;
+      // Since this was a main query result, may have created a QueryResultNode
+      // that we need to update
+      if (this->QueryResultNodes.contains(iid))
+        {
+        this->QueryResultNodes[iid]->
+        SetPreferenceScore(queryResult.PreferenceScore);
+        }
+      }
+
+    // Now create the node if it doesn't already exist
+    this->createScoringRequestNode(iid);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::formulationFinished()
+{
+  // Release active query, but keep last status message
+  this->transferQueryStatus();
+  this->releaseQuery();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::transferQueryStatus()
+{
+  this->StatusManager->transferOwnership(this->ActiveQueryParser,
+                                         this->QuerySessionStatusSource);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::releaseQuery()
+{
+  if (this->ActiveQueryParser)
+    this->ActiveQueryParser->deleteLater();
+  this->ActiveQueryParser = 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkVgGroupNode> vqCore::createScene()
+{
+  this->ContextSceneRoot  =  vtkVgTransformNode::SmartPtr::New();
+  this->ContextSceneRoot->SetName("ContextSceneRoot");
+  return this->ContextSceneRoot;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::start()
+{
+  this->reloadColorGradient();
+  this->ContextViewer->Run();
+
+  if (!this->UpdateTimer)
+    {
+    this->UpdateTimer = new QTimer(this);
+    connect(this->UpdateTimer, SIGNAL(timeout()), this, SLOT(update()));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::update()
+{
+  // Microseconds is what we are using
+  this->ApplicationTimeStamp.SetTime
+  (1e6 * (this->TimerLog->GetUniversalTime() - this->ApplicationStartTime));
+
+  this->ContextViewer->Frame(this->ApplicationTimeStamp);
+  this->postRender();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::postRender()
+{
+  if (!this->RenderPending)
+    {
+    // Render at the end of the event loop, which is when everything should
+    // be done updating and we will be ready to render of the scene.
+    this->RenderPending = true;
+    QMetaObject::invokeMethod(this, "forceRender", Qt::QueuedConnection);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::timerEvent(QTimerEvent* event)
+{
+  if (event->timerId() == this->ClickTimer.timerId())
+    {
+    this->ClickTimer.stop();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setupTracksOnContext()
+{
+  assert(this->TrackNode);
+
+  vtkVgTrackRepresentation::SmartPtr trackRepresentation(
+    vtkVgTrackRepresentation::SmartPtr::New());
+  vtkVgTrackModel::SmartPtr trackModel(
+    vtkVgTrackModel::SmartPtr::New());
+  trackModel->ShowTracksBeforeStartOn();
+  trackModel->ShowTracksAfterExpirationOn();
+
+  // Initially not visible
+  this->TrackNode->SetVisible(true);
+  trackRepresentation->SetVisible(false);
+  trackRepresentation->SetTrackModel(trackModel);
+
+  this->TrackNode->SetTrackModel(trackModel);
+  this->TrackNode->SetTrackRepresentation(trackRepresentation);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::selectClipsOnContext(
+  int* startScreenPosition, int* endScreenPosition)
+{
+  if (!startScreenPosition || !endScreenPosition)
+    {
+    return;
+    }
+
+  vtkRenderer* ren = this->ContextViewer->GetSceneRenderer();
+  vtkSmartPointer<vtkRenderedAreaPicker> area =
+    vtkSmartPointer<vtkRenderedAreaPicker>::New();
+  int picked = area->AreaPick(
+    startScreenPosition[0], startScreenPosition[1],
+    endScreenPosition[0],   endScreenPosition[1], ren);
+
+  if (picked != 1)
+    {
+    return;
+    }
+
+  vtkProp3DCollection* propCollection = area->GetProp3Ds();
+  this->ContextViewer->GetRenderWindowInteractor()->SetPicker(area);
+
+  propCollection->InitTraversal();
+  vtkProp3D* prop = propCollection->GetNextProp3D();
+
+  vtkVgFindNodeVisitor findNodeVisitor;
+  QList<vtkVgNodeBase*> selectedNodes;
+  while (prop)
+    {
+    findNodeVisitor.SetUsingProp3D(prop);
+
+    this->ContextVideoRoot->Accept(findNodeVisitor);
+
+    vtkVgNodeBase* node = findNodeVisitor.GetNode();
+    vtkVgVideoNode* videoNode = dynamic_cast<vtkVgVideoNode*>(node);
+
+    // If this is a video node and not already existed in list.
+    if (videoNode && !selectedNodes.contains(node))
+      {
+      selectedNodes.push_back(node);
+      }
+
+    prop = propCollection->GetNextProp3D();
+    }
+
+  this->selectNodes(selectedNodes);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::selectTracksOnContext(
+  int* startScreenPosition, int* endScreenPosition)
+{
+  if (!startScreenPosition || !endScreenPosition)
+    {
+    return;
+    }
+
+  if (!this->TrackNode)
+    {
+    return;
+    }
+
+  double startPoint[3] =
+    {
+    static_cast<double>(startScreenPosition[0]),
+    static_cast<double>(startScreenPosition[1]),
+    static_cast<double>(1)
+    };
+
+  double endPoint[3] =
+    {
+    static_cast<double>(endScreenPosition[0]),
+    static_cast<double>(endScreenPosition[1]),
+    static_cast<double>(1)
+    };
+
+  vtkVgSpaceConversion::DisplayToWorldNormalized(
+    this->ContextViewer->GetSceneRenderer(),
+    startPoint, startPoint);
+  vtkVgSpaceConversion::DisplayToWorldNormalized(
+    this->ContextViewer->GetSceneRenderer(),
+    endPoint, endPoint);
+
+  double targetExtents[4] =
+    {
+    startPoint[0] < endPoint[0] ? startPoint[0] : endPoint[0],
+    startPoint[1] < endPoint[1] ? startPoint[1] : endPoint[1],
+    startPoint[0] > endPoint[0] ? startPoint[0] : endPoint[0],
+    startPoint[1] > endPoint[1] ? startPoint[1] : endPoint[1],
+    };
+
+  vtkSmartPointer<vtkPoints> rectangularRegionPoints
+    = vtkSmartPointer<vtkPoints>::New();
+  rectangularRegionPoints->SetNumberOfPoints(5);
+  rectangularRegionPoints->InsertPoint(0, targetExtents[0], targetExtents[1], 1.0);
+  rectangularRegionPoints->InsertPoint(1, targetExtents[2], targetExtents[1], 1.0);
+  rectangularRegionPoints->InsertPoint(2, targetExtents[2], targetExtents[3], 1.0);
+  rectangularRegionPoints->InsertPoint(3, targetExtents[0], targetExtents[3], 1.0);
+  rectangularRegionPoints->InsertPoint(4, targetExtents[0], targetExtents[1], 1.0);
+
+  this->ContextTracksSelector->RemoveAllSelectors();
+  this->ContextTracksSelector->AddSelector(rectangularRegionPoints);
+
+  vtkVgTrackModel* trackModel = this->TrackNode->GetTrackModel();
+  trackModel->InitTrackTraversal();
+
+  QList<vtkVgNodeBase*> nodes;
+  while (vtkVgTrack* track = trackModel->GetNextTrack().GetTrack())
+    {
+    bool passes = this->ContextTracksSelector->EvaluatePath(
+                    track->GetPoints(), track->GetPointIds());
+
+    if (passes)
+      {
+      vtkIdType id = track->GetId();
+
+      // Look up the node corresponding to the picked track.
+      vtkVgNodeBase* node = this->findNodeByTrackId(id);
+
+      if (node)
+        {
+        nodes << node;
+        }
+      }
+    }
+
+  this->selectNodes(nodes);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgNodeBase* vqCore::findNodeByTrackId(vtkIdType id)
+{
+  QHash<ResultId, vtkVgVideoNode*>::iterator itr;
+  itr = this->QueryResultNodes.find(id);
+  if (itr == this->QueryResultNodes.end())
+    {
+    itr = this->ScoringRequestNodes.find(id);
+    if (itr == this->ScoringRequestNodes.end())
+      {
+      itr = this->GroundTruthNodes.find(id);
+      if (itr == this->GroundTruthNodes.end())
+        {
+        // Should never get here.
+        return 0x0;
+        }
+      }
+    }
+
+  vtkVgNodeBase* node = *itr;
+
+  return node;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::CacheDatabaseQueryResults(vvQueryResult result)
+{
+  this->DatabaseQueryResultsCache.append(result);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::ExtractTracksAndDescriptorsFromCache()
+{
+  QList<vvDescriptor> descriptors;
+  QList<vvTrack> tracks;
+
+  foreach (vvQueryResult result, this->DatabaseQueryResultsCache)
+    {
+    for (size_t i = 0; i < result.Descriptors.size(); ++i)
+      {
+      descriptors.append(result.Descriptors[i]);
+      }
+    for (size_t i = 0; i < result.Tracks.size(); ++i)
+      {
+      tracks.append(result.Tracks[i]);
+      }
+    }
+
+  this->DatabaseQueryResultsCache.clear();
+
+  emit this->formulationComplete(descriptors, tracks);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::onLeftClick()
+{
+  if (this->DrawingContour)
+    {
+    return;
+    }
+
+  int* pointerPosition = this->ContextInteractorStyle->GetEndPosition();
+
+  // Check if a video node has been picked at this position.
+  vtkVgNodeBase* node = this->ContextViewer->Pick(pointerPosition[0],
+                                                  pointerPosition[1],
+                                                  0.0);
+  // Check for track pick.
+  if (!vtkVgVideoNode::SafeDownCast(node))
+    {
+    vtkIdType picktype;
+    vtkRenderer* ren = this->ContextViewer->GetSceneRenderer();
+    vtkVgTrackRepresentation* rep
+      = this->TrackNode->GetTrackRepresentation();
+
+    int id = rep->Pick(pointerPosition[0], pointerPosition[1], ren, picktype);
+    if (id == -1)
+      {
+      this->selectNodes(QList<vtkVgNodeBase*>());
+      return;
+      }
+
+    // Look up the node corresponding to the picked track.
+    node = this->findNodeByTrackId(id);
+    if (!node)
+      {
+      qDebug() << "No result for picked track!";
+      return;
+      }
+    }
+
+  if (this->ClickTimer.isActive())
+    {
+    if (abs(pointerPosition[0] - this->LastClickPosition[0]) < 5 &&
+        abs(pointerPosition[1] - this->LastClickPosition[1]) < 5)
+      {
+      this->activateNode(*node);
+      this->ClickTimer.stop();
+      return;
+      }
+    }
+
+  this->ClickTimer.start(400, this);  // double-click time
+
+  this->LastClickPosition[0] = pointerPosition[0];
+  this->LastClickPosition[1] = pointerPosition[1];
+
+  QList<vtkVgNodeBase*> nodes;
+  nodes << node;
+  this->selectNodes(nodes);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::addRasterLayer(QUrl uri)
+{
+  if (uri.scheme().toLower() == "file")
+    {
+    // Now initialize the terrain source as currently we are using
+    // raster to generate a terrain.
+    this->TerrainSource = vtkVQTerrainSource::SmartPtr::New();
+    this->TerrainSource->SetDataSource(uri.toEncoded().constData());
+
+    // Add the context to the main viewer scene.
+    vtkSmartPointer<vtkVgTerrain> terrain
+      = this->TerrainSource->CreateTerrain();
+    if (!terrain)
+      {
+      QMessageBox::warning(0, "viqui",
+                           "A problem occurred trying to load the layer file.");
+
+      return;
+      }
+
+    terrain->SetNodeReferenceFrame(vtkVgNodeBase::ABSOLUTE);
+
+    this->ContextSceneRoot->AddChild(terrain);
+
+    // \NOTE: Setting the matrix on context video root.
+    if (this->ContextVideoRoot)
+      {
+      this->ContextVideoRoot->SetMatrix(
+        this->TerrainSource->GetCoordinateTransformMatrix());
+      }
+
+    this->update();
+
+    this->ContextViewer->ResetView();
+
+    // cache the bounds of the terrain (context) for future use (resetting view)
+    static_cast<vtkVgNodeBase*>(terrain)->GetBounds(this->TerrainBounds);
+
+    this->resetView();
+
+    // Might (in the future?) want to do updateSources() instead, if have some
+    // other data already loaded/rendered by the time we add context data,
+    // perhaps other context data?  But for now, would result in another load
+    // and render immediately after having just done so for the context.
+    this->postRender();
+    }
+  else
+    {
+    QMessageBox::critical(0, "viqui",
+      tr("Supporting adding context layer using local file only."));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateSources()
+{
+  if (this->updateTerrainSource())
+    {
+    this->postRender();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::updateTerrainSource()
+{
+  if (this->TerrainSource)
+    {
+    this->TerrainSource->SetImageLevel(-1);
+
+    // Update terrain source.
+    this->TerrainSource->SetVisibleScale(this->ViewScaleFactor
+      * this->ContextViewer->GetCurrentScale());
+
+    // \TODO: We need to convert these extents to world space.
+    // works for now because we work in the coordinates of the terrain
+    double viewExtents[4];
+    this->ContextViewer->GetCurrentViewExtents(viewExtents);
+    int extents[4] =
+      {
+      static_cast<int>(floor(viewExtents[0])),
+      static_cast<int>(ceil(viewExtents[1])),
+      static_cast<int>(floor(viewExtents[2])),
+      static_cast<int>(ceil(viewExtents[3]))
+      };
+
+    this->TerrainSource->SetVisibleExtents(extents);
+    this->TerrainSource->Update();
+
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setVideoProviders(const QList<QUrl>& providers)
+{
+  this->VideoArchive.reset(new vgKwaArchive);
+  qtUtil::mapBound(providers, this->VideoArchive.data(),
+                   &vgKwaArchive::addSource);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setQueryServer(const QUrl& server)
+{
+  this->QueryServer = server;
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::isQuerySessionActive() const
+{
+  return this->ActiveQueryParser;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::addQueryResult(const vvQueryResult& queryResult)
+{
+  if (this->QueryResults.contains(queryResult.InstanceId))
+    {
+    // If we have already seen this result, just update its score
+    vvQueryResult& existingResult = this->QueryResults[queryResult.InstanceId];
+    this->QueryScoreMap.remove(existingResult.Rank,
+                               existingResult.InstanceId);
+    existingResult.Rank = queryResult.Rank;
+    existingResult.RelevancyScore = queryResult.RelevancyScore;
+    existingResult.PreferenceScore = queryResult.PreferenceScore;
+    this->QueryScoreMap.insert(existingResult.Rank,
+                               existingResult.InstanceId);
+    return;
+    }
+
+  this->QueryScoreMap.insert(queryResult.Rank,
+                             queryResult.InstanceId);
+  this->QueryResults.insert(queryResult.InstanceId, queryResult);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::addGroundTruthResult(const vvQueryResult& queryResult)
+{
+  this->GroundTruthScoreMap.insert(queryResult.RelevancyScore,
+                                   queryResult.InstanceId);
+  this->GroundTruthResults.insert(queryResult.InstanceId, queryResult);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::displayResults(int count, int first)
+{
+  this->StatusManager->setStatusText(this->InteractionStatusSource,
+                                     "Updating result display...");
+
+  QMultiMap<ResultRank, ResultId>::const_iterator
+  iter = this->QueryScoreMap.begin(),
+  end = this->QueryScoreMap.end();
+
+  // Skip to start
+  while (first && iter != end)
+    {
+    ++iter;
+    --first;
+    }
+
+  count -= this->QueryResultNodes.size();
+
+  // Add all starred results - they will count against the total only if they
+  // are in the top count results
+  for (QSet<ResultId>::iterator itr = this->StarResults.begin(),
+       end = this->StarResults.end();
+       itr != end; ++itr)
+    {
+    if (vtkVgVideoNode* node = this->addResult(*itr, false))
+      {
+      node->SetIsStarResult(true);
+      }
+    }
+
+  // Add nodes
+  while (count > 0 && iter != end)
+    {
+    ResultId iid = iter.value();
+    if (this->QueryResultNodes.contains(iid))
+      {
+      if (this->QueryResultNodes[iid]->GetIsStarResult())
+        {
+        --count; // Starred result, so counts against our total
+        }
+      }
+    else if (this->addResult(iid, true))
+      {
+      --count;
+      }
+    ++iter;
+    }
+
+  this->updateResultScoreIndicators();
+
+  emit this->StatusManager->setStatusText(this->InteractionStatusSource);
+  emit this->resultsUpdated();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoNode* vqCore::addResult(ResultId iid, bool useSpatialFilter)
+{
+  if (!this->QueryResultNodes.contains(iid) && this->resultPassesFilters(iid))
+    {
+    vtkVgVideoNode* node = 0;
+    if (this->ScoringRequestNodes.contains(iid))
+      {
+      node = this->ScoringRequestNodes[iid];
+      }
+    else
+      {
+      vtkSmartPointer<vtkVgNodeBase> transformNode =
+        this->addResultNode(this->QueryResults[iid], node, useSpatialFilter);
+      if (transformNode)
+        {
+        this->ContextVideoRoot->AddChild(transformNode);
+        }
+      }
+    if (node)
+      {
+      node->SetIsNormalResult(true);
+      this->QueryResultNodes.insert(iid, node);
+      this->QueryResultNodesDirty = true;
+      return node;
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::displayGroundTruthResults(int count, int first)
+{
+  this->StatusManager->setStatusText(this->InteractionStatusSource,
+                                     "Updating result display...");
+
+  QMultiMap<double, ResultId>::const_iterator
+  iter = this->GroundTruthScoreMap.end(),
+  end = this->GroundTruthScoreMap.begin();
+
+  // Skip to start
+  while (first && iter != end)
+    {
+    --iter;
+    --first;
+    }
+
+  count -= this->GroundTruthNodes.size();
+
+  // Add nodes
+  while (count > 0 && iter != end)
+    {
+    ResultId iid = (--iter).value();
+    if (!this->GroundTruthNodes.contains(iid))
+      {
+      vtkVgVideoNode* node = 0;
+      vtkSmartPointer<vtkVgNodeBase> transformNode =
+        this->addResultNode(this->GroundTruthResults[iid], node, true,
+                            true, this->GroundTruthEventType);
+
+      if (transformNode)
+        {
+        this->ContextVideoRoot->AddChild(transformNode);
+        }
+
+      if (node)
+        {
+        this->GroundTruthNodes.insert(iid, node);
+        this->GroundTruthNodesDirty = true;
+        --count;
+        }
+      }
+    }
+
+  emit this->StatusManager->setStatusText(this->InteractionStatusSource);
+  emit this->resultsUpdated();
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::findResult(ResultId iid)
+{
+  QHash<ResultId, vvQueryResult>::iterator itr = this->QueryResults.find(iid);
+  if (itr == this->QueryResults.end())
+    {
+    return false;
+    }
+
+  // Look up in the currently displayed set of nodes
+  vtkVgVideoNode* node = this->QueryResultNodes.value(itr.key());
+  bool changed = false;
+
+  // Add a new node if the result exists, but is not displayed
+  if (!node)
+    {
+    node = this->addResult(itr.key(), false);
+    if (!node)
+      {
+      return false; // Result does not pass filters?
+      }
+    changed = true;
+    }
+
+  // Update
+  if (changed)
+    {
+    emit this->resultsUpdated();
+    this->queryFinished(false); // hack...
+    }
+
+  QList<vtkVgNodeBase*> nodes;
+  nodes << node;
+  this->selectNodes(nodes);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkVgNodeBase>
+vqCore::addResultNode(const vvQueryResult& queryResult, vtkVgVideoNode*& node,
+                      bool /*useSpatialFilter*/,
+                      bool isGroundTruth, int eventTypeFilter)
+{
+  // \TODO: Here we need to connect to video api and fetch the first frame too.
+  // That means that we would need to make a video node at some point with a
+  // query data source.
+
+  // Create a new video archive source.
+  vtkVgVideoModel0::SmartPtr
+  videoModel(vtkVgVideoModel0::SmartPtr::New());
+  vtkVgVideoRepresentation0::SmartPtr
+  videoRep(vtkVgVideoRepresentation0::SmartPtr::New());
+  vqArchiveVideoSource::SmartPtr
+  arVideoSource(vqArchiveVideoSource::SmartPtr::New());
+
+  vtkVgVideoNode* videoNode = vtkVgVideoNode::New();
+
+  vtkVgEventModel::SmartPtr
+  eventModel(vtkVgEventModel::SmartPtr::New());
+  vtkVgEventRegionRepresentation::SmartPtr
+  eventRep(vtkVgEventRegionRepresentation::SmartPtr::New());
+
+  videoNode->SetNodeReferenceFrame(vtkVgNodeBase::RELATIVE);
+  std::string missionId = queryResult.MissionId;
+  if (missionId == "-undefined-")
+    {
+    missionId.clear();
+    }
+  arVideoSource->SetMissionId(missionId.c_str());
+  arVideoSource->SetStreamId(queryResult.StreamId.c_str());
+
+  arVideoSource->SetTimeRange(queryResult.StartTime, queryResult.EndTime);
+  arVideoSource->SetRequestedPadding(1.0e6 * vqSettings().resultClipPadding());
+
+  if (arVideoSource->AcquireVideoClip(this->VideoArchive.data()) == VTK_OK)
+    {
+    videoNode->SetHasVideoData(true);
+    }
+
+  // For now, we are only using the spatial filtering provided by the back-end
+  /*
+  if (useSpatialFilter && !this->filterSpatially(arVideoSource,
+                                                 queryResult.Descriptors))
+    {
+    qtDebug(vqdFilterResults)
+      << "(spatially) filtered out query result"
+      << queryResult.InstanceId;
+    node = 0;
+    return videoNode;
+    }
+  */
+
+  // setup the eventModel, merging the all descriptors into a single event
+  if (queryResult.Descriptors.size() > 0)
+    {
+    if (isGroundTruth)
+      {
+      // ground truth results should have a single event type classifier
+      if (queryResult.Descriptors[0].Values.size() != 1)
+        {
+        std::cout << "Ground truth result has multiple or zero classifiers: "
+                  << queryResult.InstanceId << '\n';
+        node = 0;
+        return videoNode;
+        }
+
+      if (queryResult.Descriptors[0].Values[0].size() != 2)
+        {
+        std::cout << "Ground truth result with unknown classifier structure: "
+                  << queryResult.InstanceId << '\n';
+        node = 0;
+        return videoNode;
+        }
+
+      if (queryResult.Descriptors[0].Values[0][1] != 1.0f)
+        {
+        std::cout << "Warning: Ground truth classifier probability is not "
+                  << "1.0: " << queryResult.InstanceId << '\n';
+        }
+
+      int at = static_cast<int>(queryResult.Descriptors[0].Values[0][0]);
+      videoNode->SetActivityType(at);
+
+      // check against filter
+      if (eventTypeFilter != -1 && eventTypeFilter != at)
+        {
+        node = 0;
+        return videoNode;
+        }
+      }
+
+    vtkSmartPointer<vtkVgEventBase> eventBase =
+      vtkSmartPointer<vtkVgEventBase>::New();
+
+    vtkVgTimeStamp startFrame(true);  // initialize to MaxTime
+    vtkVgTimeStamp endFrame(false);   // initialize to MinTime
+
+    const double yDim = arVideoSource->GetVideoHeight();
+    foreach (vvDescriptor descriptor, queryResult.Descriptors)
+      {
+      vvDescriptorRegionMap::const_iterator regionIter;
+      for (regionIter = descriptor.Region.begin();
+           regionIter != descriptor.Region.end(); regionIter++)
+        {
+        if (regionIter->TimeStamp < startFrame)
+          {
+          startFrame = regionIter->TimeStamp;
+          }
+        if (endFrame < regionIter->TimeStamp)
+          {
+          endFrame = regionIter->TimeStamp;
+          }
+        double region[8];
+        // clockwise from top left
+        region[0] = regionIter->ImageRegion.TopLeft.X;
+        region[1] = yDim - regionIter->ImageRegion.TopLeft.Y - 1;
+        region[2] = regionIter->ImageRegion.BottomRight.X;
+        region[3] = region[1];
+        region[4] = region[2];
+        region[5] = yDim - regionIter->ImageRegion.BottomRight.Y - 1;
+        region[6] = region[0];
+        region[7] = region[5];
+
+        eventBase->AddRegion(regionIter->TimeStamp, 4, region);
+        }
+      // If "MergedDescriptors" descriptor, no need to process any other
+      // regions; also, not that we expect this to have been the 1st descriptor
+      if (descriptor.ModuleName == "MergedDescriptors")
+        {
+        break;
+        }
+      }
+
+    eventBase->SetId(queryResult.InstanceId);
+    eventBase->SetStartFrame(startFrame);
+    eventBase->SetEndFrame(endFrame);
+
+    eventModel->AddEvent(eventBase);
+    }
+
+  videoModel->SetVideoSource(arVideoSource);
+  videoModel->SetUseInternalTimeStamp(1);
+  videoModel->SetLooping(1);
+
+  videoModel->SetId(queryResult.InstanceId);
+
+  eventRep->SetEventModel(eventModel);
+  videoRep->SetVideoModel(videoModel);
+  videoModel->SetEventModel(eventModel);
+  videoRep->SetEventRepresentation(eventRep);
+
+  // Set the meta data.
+  videoNode->SetVideoRepresentation(videoRep);
+  videoNode->SetStreamId(queryResult.StreamId.c_str());
+  videoNode->SetMissionId(missionId.c_str());
+  videoNode->SetInstanceId(queryResult.InstanceId);
+  videoNode->SetRank(queryResult.Rank);
+  videoNode->SetRelevancyScore(queryResult.RelevancyScore);
+  videoNode->SetPreferenceScore(queryResult.PreferenceScore);
+  videoNode->SetUserScore(queryResult.UserScore);
+  videoNode->SetTimeRange(queryResult.StartTime, queryResult.EndTime);
+  videoNode->SetIsStarResult(queryResult.UserData.Flags.testFlag(
+                               vvUserData::Starred));
+  videoNode->SetNote(queryResult.UserData.Notes.c_str());
+
+  if (!videoNode->GetHasVideoData())
+    {
+    node = videoNode;
+    return 0;
+    }
+
+  vtkVgTransformNode::SmartPtr videoTransformNode(
+    vtkVgTransformNode::SmartPtr::New());
+  videoTransformNode->SetName("VideoTransform");
+  videoTransformNode->AddChild(videoNode);
+
+  this->addTrackToContextTrackModel(videoNode);
+
+  node = videoNode;
+  return videoTransformNode;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::createScoringRequestNode(ResultId iid)
+{
+  // Create result node, if we don't have one already
+  if (!this->ScoringRequestNodes.contains(iid))
+    {
+    // Create the node
+    vtkVgVideoNode* node = 0;
+    if (this->QueryResultNodes.contains(iid))
+      {
+      node = this->QueryResultNodes[iid];
+      }
+    else
+      {
+      vtkSmartPointer<vtkVgNodeBase> transformNode =
+        this->addResultNode(this->QueryResults[iid], node, false);
+      if (transformNode)
+        {
+        this->ContextVideoRoot->AddChild(transformNode);
+        }
+      }
+    if (node)
+      {
+      node->SetIsRefinementResult(true);
+      this->ScoringRequestNodes.insert(iid, node);
+      this->ScoringRequestNodesDirty = true;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::unregisterAllNodes()
+{
+  foreach (vtkVgVideoNode* node, this->ScoringRequestNodes)
+    {
+    // Make sure we don't double-delete a node.
+    if (!this->QueryResultNodes.contains(node->GetInstanceId()))
+      {
+      node->Delete();
+      }
+    }
+  foreach (vtkVgVideoNode* node, this->QueryResultNodes)
+    {
+    node->Delete();
+    }
+  foreach (vtkVgVideoNode* node, this->GroundTruthNodes)
+    {
+    node->Delete();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void  vqCore::layoutResults()
+{
+  // Make sure that videos are sorted and rank has been updated.
+  this->queryResultNodes();
+  this->scoringRequestNodes();
+
+  int numberOfChildren = this->ContextVideoRoot->GetNumberOfChildren();
+
+  this->LayoutNodes.clear();
+  std::vector<vtkVgNodeBase::SmartPtr>        videoTransformNodes;
+  std::vector<vtkVQBlastLayoutNode::SmartPtr> overlappingLayoutNodes;
+
+  // Make sure the tracks are updated *after* video nodes.
+  disconnect(this, SIGNAL(playedOrStopped(vtkVgVideoNode&)),
+             this, SLOT(updateTrackVisibility()));
+
+  // Here is how the algorithm works...
+  // Pick a node, test overlap with all the nodes of other layout nodes.
+  // First overlap decide which layout node this node will belong to.
+  // If none found then create a new layout node and add this node as child.
+
+  // First we need to gather the layout nodes and video transform nodes attached
+  // to the context video root. If we remove any children from context video
+  // root the iterator gets invalid.
+  for (int i = 0; i < numberOfChildren; ++i)
+    {
+    vtkVgNodeBase* node = this->ContextVideoRoot->GetChild(i);
+
+    if (!node)
+      {
+      continue;
+      }
+
+    // Do not consider layout nodes.
+    if (vtkVQBlastLayoutNode::SmartPtr layoutNode =
+          vtkVQBlastLayoutNode::SafeDownCast(node))
+      {
+      this->LayoutNodes.push_back(layoutNode);
+      continue;
+      }
+    else if (vtkVgTransformNode::SmartPtr transformNode =
+               vtkVgTransformNode::SafeDownCast(node))
+      {
+      videoTransformNodes.push_back(transformNode);
+      }
+    else if (vtkVgVideoNode::SafeDownCast(node))
+      {
+      std::cout << "WARNING: A video node should not exist without "
+                << "having a transform node as its parent.";
+      continue;
+      }
+    else
+      {
+      continue;
+      }
+    }
+
+  const int numberOfVideoTransforms
+    = static_cast<int>(videoTransformNodes.size());
+  for (int i = 0; i < numberOfVideoTransforms; ++i)
+    {
+    // For each video transform.
+    overlappingLayoutNodes.clear();
+
+    const double* nodeBounds = videoTransformNodes[i]->GetBounds();
+
+    int numberOfLayoutNodes = static_cast<int>(this->LayoutNodes.size());
+
+    for (int j = 0; j < numberOfLayoutNodes; ++j)
+      {
+      int numberOfLayoutChildren = this->LayoutNodes[j]->GetNumberOfChildren();
+
+      for (int k = 0; k < numberOfLayoutChildren; ++k)
+        {
+        const double* otherBounds
+          = this->LayoutNodes[j]->GetChild(k)->GetBounds();
+
+        // As soon as we find a children of a layout node overlapping with current
+        // node we assign the group to this video transform node.
+        if (!((nodeBounds[0] > otherBounds[1]) ||
+              (nodeBounds[3] < otherBounds[2]) ||
+              (nodeBounds[1] < otherBounds[0]) ||
+              (nodeBounds[2] > otherBounds[3])))
+          {
+          // As soon as we hit one of the children of this layout node
+          // look for collision with other layout nodes.
+          overlappingLayoutNodes.push_back(this->LayoutNodes[j]);
+          break;
+          }
+        }
+      }
+
+    if (overlappingLayoutNodes.size() >= 1)
+      {
+      // If just one, add this video transform to the this one layout node.
+      if (overlappingLayoutNodes.size() == 1)
+        {
+        overlappingLayoutNodes[0]->AddChild(videoTransformNodes[i]);
+        }
+      else
+        {
+        // We would have to merge all the overlapping nodes into one.
+        // For simplicity we can just collapse all other layout nodes to
+        // the first one then add this video transform node to the first one.
+        for (size_t n = 1; n < overlappingLayoutNodes.size(); ++n)
+          {
+          std::vector<vtkVgNodeBase::SmartPtr> transferNodes =
+            overlappingLayoutNodes[n]->GetChildren();
+
+          for (size_t m = 0; m < transferNodes.size(); ++m)
+            {
+            // \NOTE: We should probably remove these nodes as scene nodes from
+            // this layout node.
+            overlappingLayoutNodes[0]->AddChild(transferNodes[m]);
+            }
+
+          // Now remove this layout node from the scene.
+          this->ContextVideoRoot->RemoveChild(overlappingLayoutNodes[n]);
+
+          // But now we have to update layoutNodes as well since we took out the other
+          // layout nodes.
+          this->LayoutNodes.erase(std::remove(this->LayoutNodes.begin(),
+            this->LayoutNodes.end(), overlappingLayoutNodes[n]),
+            this->LayoutNodes.end());
+          }
+
+        overlappingLayoutNodes[0]->AddChild(videoTransformNodes[i]);
+        }
+
+
+      int currentNumberOfLayoutNodes
+        = static_cast<int>(this->LayoutNodes.size());
+      for (int ii = 0; ii < currentNumberOfLayoutNodes; ++ii)
+        {
+        this->LayoutNodes[ii]->AddSceneNode(videoTransformNodes[i]);
+
+        // TODO: Get rid of this hack once the layout node manages layout updates
+        // updates automatically.
+        this->LayoutNodes[ii]->SetLayoutMode(
+          this->LayoutNodes[ii]->GetLayoutMode());
+        }
+
+      }
+    else
+      {
+      vtkVQBlastLayoutNode::SmartPtr newLayoutNode =
+        vtkVQBlastLayoutNode::SmartPtr::New();
+      newLayoutNode->AddChild(videoTransformNodes[i]);
+
+      connect(this, SIGNAL(playedOrStopped(vtkVgVideoNode&)),
+              newLayoutNode.GetPointer(),
+              SLOT(OnPlayStop(vtkVgVideoNode&)));
+
+      connect(this, SIGNAL(NextInStack(vtkVgNodeBase&)),
+              newLayoutNode.GetPointer(),
+              SLOT(OnNextInStack(vtkVgNodeBase&)));
+      connect(newLayoutNode.GetPointer(),
+              SIGNAL(VisibilityChanged(vtkVgNodeBase&)),
+              this, SIGNAL(FocusChanged(vtkVgNodeBase&)));
+
+      connect(this, SIGNAL(updatedResultScoreIndicators()),
+              newLayoutNode.GetPointer(),
+              SLOT(BuildStackRepresentationBar()));
+
+      vtkConnect(newLayoutNode->GetStackSelectionWidget(),
+                 vtkCommand::WidgetActivateEvent,
+                 this, SLOT(onSelectInStackLayoutWidget(vtkObject*)));
+
+      // set actor and colormap for StackSelectionWidget
+      newLayoutNode->GetStackSelectionWidget()->SetInteractor(
+        this->ContextViewer->GetRenderWindowInteractor());
+      vtkVgSelectionListRepresentation::SafeDownCast(
+        newLayoutNode->GetStackSelectionWidget()->
+          GetSelectionRepresentation())->SetLookupTable(this->getLookupTable());
+
+      for (int j = 0; j < numberOfLayoutNodes; ++j)
+        {
+        int numberOfLayoutChildren
+          = this->LayoutNodes[j]->GetNumberOfChildren();
+
+        for (int k = 0; k < numberOfLayoutChildren; ++k)
+          {
+          newLayoutNode->AddSceneNode(this->LayoutNodes[j]->GetChild(k));
+          }
+
+        // Also add this video transform to all other.
+        this->LayoutNodes[j]->AddSceneNode(videoTransformNodes[i]);
+        }
+
+      this->LayoutNodes.push_back(newLayoutNode);
+      this->ContextVideoRoot->AddChild(newLayoutNode);
+      }
+
+    if (!videoTransformNodes[i]->GetParent())
+      {
+      std::cerr << "WARNING: Every video transform should belong to a"
+        << " layout node. Application may not work correctly. " << std::endl;
+      }
+    } // for (int i=0; i <numberOfVideoTransforms; ++i)
+
+  // Update track visibility for nodes that have been hidden or shown
+  // due to the playing or stopping of a video.
+  connect(this, SIGNAL(playedOrStopped(vtkVgVideoNode&)),
+          this, SLOT(updateTrackVisibility()));
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateScene()
+{
+  // Check for overlapping nodes and move nodes around if necessary.
+  this->update();
+  this->layoutResults();
+  this->update();
+
+  static bool first = true;
+  if (first)
+    {
+    first = false;
+    this->resetView();
+    }
+  this->updateSources();
+
+  // color outline
+  this->updateResultScoreIndicators();
+
+  this->updateLOD(true);
+
+  // Update visibility.
+  this->setShowVideoClipsOnContext(this->ShowVideoClipsOnContext);
+  this->setShowVideoOutlinesOnContext(this->ShowVideoOutlinesOnContext);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::queryFinished(bool requestScoring)
+{
+  if (this->ProcessingDatabaseQuery)
+    {
+    this->ProcessingDatabaseQuery = false;
+    this->ExtractTracksAndDescriptorsFromCache();
+    return;
+    }
+
+  // Note:  This is temporary code to facilitate doing Refine in presence of an
+  // IQR model in the submitted query, without teasing the user with the
+  // initial result set; see commit for necessary code to remove when the
+  // the system supports IQR modified results on initial query
+  if (this->SkipInitialDisplayCounter > 0)
+    {
+    this->SkipInitialDisplayCounter--;
+    if (this->SkipInitialDisplayCounter == 1)
+      {
+      this->requestRefinement(vqSettings().iqrRefinementSetSize());
+      }
+    else if (this->SkipInitialDisplayCounter == 0)
+      {
+      emit initialRefinementRequested();
+      }
+    this->StatusManager->setStatusText(this->QuerySessionStatusSource,
+                                       "Refining query based on IQR Model...");
+    return;
+    }
+
+  // Apparently we are waiting longer than expected hence show busy wait
+  vqScopedOverrideCursor busy;
+
+  if (!this->ReceivingGroundTruthResults)
+    {
+    this->displayResults(vqSettings().resultPageCount());
+    }
+
+  if (!this->GroundTruthResults.empty())
+    {
+    this->displayGroundTruthResults(vqSettings().resultPageCount());
+    }
+
+  // If this is a result set (not a score-request set), transfer the status
+  // ownership. This will allow the session to display other, transient messages
+  // (e.g. IQR related), while we will preserve the most recent completion
+  // message.
+  if (!requestScoring)
+    {
+    this->transferQueryStatus();
+    }
+
+  this->updateScene();
+
+  if (!requestScoring)
+    {
+    emit this->queryResultsAvailabilityChanged(true);
+    }
+
+  if (this->QueryResults.isEmpty())
+    {
+    QMessageBox::information(0, "Sorry",
+                             "No results were found for your query");
+    }
+
+  emit this->resultSetComplete(!!this->ActiveQueryParser, requestScoring);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateResultScoreIndicators()
+{
+  this->recomputeNodeColors();
+  this->updateTrackColors();
+
+  this->update();
+
+  emit this->updatedResultScoreIndicators();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setUserScore(ResultId iid, int score)
+{
+  if (this->QueryResults.contains(iid))
+    {
+    vvIqr::Classification c = vvIqr::UnclassifiedExample;
+    if (score == vvIqr::PositiveExample)
+      c = vvIqr::PositiveExample;
+    if (score == vvIqr::NegativeExample)
+      c = vvIqr::NegativeExample;
+    this->QueryResults[iid].UserScore = c;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setResultNote(ResultId iid, const QString& note)
+{
+  if (this->QueryResults.contains(iid))
+    {
+    this->QueryResults[iid].UserData.Notes = stdString(note);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setResultStarred(ResultId iid, bool starred)
+{
+  if (this->QueryResults.contains(iid))
+    {
+    if (starred)
+      {
+      this->QueryResults[iid].UserData.Flags |= vvUserData::Starred;
+      }
+    else
+      {
+      this->QueryResults[iid].UserData.Flags &= ~vvUserData::Starred;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vvQueryResult* vqCore::getResult(ResultId iid)
+{
+  QHash<ResultId, vvQueryResult>::iterator itr = this->QueryResults.find(iid);
+  if (itr != this->QueryResults.end())
+    {
+    return &itr.value();
+    }
+
+  // result not found
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vvQueryResult* vqCore::getGroundTruthResult(ResultId iid)
+{
+  QHash<ResultId, vvQueryResult>::iterator itr =
+    this->GroundTruthResults.find(iid);
+
+  if (itr != this->QueryResults.end())
+    {
+    return &itr.value();
+    }
+
+  // result not found
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoNode* vqCore::getResultNode(ResultId iid)
+{
+  if (vtkVgVideoNode* node = this->QueryResultNodes.value(iid))
+    {
+    return node;
+    }
+  // return null if there is no node for the id
+  return this->ScoringRequestNodes.value(iid);
+}
+
+
+//-----------------------------------------------------------------------------
+void vqCore::selectResult(ResultId iid)
+{
+  if (vtkVgVideoNode* node = this->getResultNode(iid))
+    {
+    QList<vtkVgNodeBase*> list;
+    list << node;
+    this->selectNodes(list);
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+void vqCore::activateResult(ResultId iid)
+{
+  if (vtkVgVideoNode* node = this->getResultNode(iid))
+    {
+    this->activateNode(*node);
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+void vqCore::updateLayoutStacks()
+{
+  std::vector<vtkVQBlastLayoutNode::SmartPtr>::const_iterator layoutIter;
+  for (layoutIter = this->LayoutNodes.begin();
+       layoutIter != this->LayoutNodes.end(); layoutIter++)
+    {
+    layoutIter->GetPointer()->UpdateStackLayout();
+    }
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateLayoutStackBarLocations()
+{
+  std::vector<vtkVQBlastLayoutNode::SmartPtr>::const_iterator layoutIter;
+  for (layoutIter = this->LayoutNodes.begin();
+       layoutIter != this->LayoutNodes.end(); layoutIter++)
+    {
+    layoutIter->GetPointer()->UpdateStackRepresentationBarLocation();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateStackLayoutForVideoPlaying(vtkVgNodeBase& videoNode)
+{
+  if (videoNode.GetParent())
+    {
+    vtkVQBlastLayoutNode* blastLayoutNode =
+      vtkVQBlastLayoutNode::SafeDownCast(videoNode.GetParent()->GetParent());
+    if (blastLayoutNode->GetLayoutMode() == vtkVQBlastLayoutNode::STACK)
+      {
+      blastLayoutNode->GetStackSelectionWidget()->EnabledOff();
+      }
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+void vqCore::videoStopped(vtkVgNodeBase& videoNode)
+{
+  // is this a node in a layout AND, is the layout in stack mode;
+  // if no, do nothing
+  if (videoNode.GetParent())
+    {
+    vtkVQBlastLayoutNode* blastLayoutNode =
+      vtkVQBlastLayoutNode::SafeDownCast(videoNode.GetParent()->GetParent());
+    if (blastLayoutNode &&
+        blastLayoutNode->GetLayoutMode() == vtkVQBlastLayoutNode::STACK)
+      {
+      this->CachedLayoutNode = blastLayoutNode;
+      connect(this, SIGNAL(forcedRender()),
+              this, SLOT(updateStackLayoutForVideoStopped()));
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateStackLayoutForVideoStopped()
+{
+  // should just have to renable the bar, as we're returning to the
+  // camera we were at when we decided to "play"
+  this->CachedLayoutNode->UpdateStackRepresentationBarLocation();
+  this->CachedLayoutNode->GetStackSelectionWidget()->EnabledOn();
+
+  // disconnet so we don't repeat this until needed again
+  disconnect(this, SIGNAL(forcedRender()),
+             this, SLOT(updateStackLayoutForVideoStopped()));
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::onSelectInStackLayoutWidget(vtkObject* caller)
+{
+  // find the layout node that with widget == caller (ugly, but will do for now)
+  std::vector<vtkVQBlastLayoutNode::SmartPtr>::const_iterator layoutIter;
+  for (layoutIter = this->LayoutNodes.begin();
+       layoutIter != this->LayoutNodes.end(); layoutIter++)
+    {
+    if (layoutIter->GetPointer()->GetStackSelectionWidget() == caller)
+      {
+      layoutIter->GetPointer()->MoveToSelectedStackItem();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::onRightButtonPress()
+{
+  // record the right click position for future reference
+  this->ContextInteractorStyle->GetInteractor()
+  ->GetEventPosition(this->LastRightClickPosition);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::onRightButtonRelease()
+{
+  if (this->DrawingContour)
+    {
+    this->completeRegion();
+    return;
+    }
+
+  this->onContextMenuEvent();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::onMouseWheelForward()
+{
+  int pointerPosition[2];
+  this->ContextInteractorStyle->GetInteractor()->GetEventPosition(pointerPosition);
+
+  vtkVgNodeBase* node = this->ContextViewer->Pick(pointerPosition[0],
+                                                  pointerPosition[1], 0.0);
+  bool eventHandled = false;
+  if (node)
+    {
+    emit this->scrolledForward(*node, &eventHandled);
+    }
+
+  // allow the interactor style to see the event if no one intercepted it
+  if (!eventHandled)
+    {
+    this->ContextInteractorStyle->OnMouseWheelForward();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::onMouseWheelBackward()
+{
+  int pointerPosition[2];
+  this->ContextInteractorStyle->GetInteractor()->GetEventPosition(pointerPosition);
+
+  vtkVgNodeBase* node = this->ContextViewer->Pick(pointerPosition[0],
+                                                  pointerPosition[1], 0.0);
+  bool eventHandled = false;
+  if (node)
+    {
+    emit this->scrolledBackward(*node, &eventHandled);
+    }
+
+  // allow the interactor style to see the event if no one intercepted it
+  if (!eventHandled)
+    {
+    this->ContextInteractorStyle->OnMouseWheelBackward();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::onPKeyPress()
+{
+  int pointerPosition[2];
+  this->ContextInteractorStyle->GetInteractor()->GetEventPosition(pointerPosition);
+
+  // Check if a node has been picked at this position.
+  vtkVgNodeBase* node = this->ContextViewer->Pick(pointerPosition[0],
+                                                  pointerPosition[1], 0.0);
+
+  if (node)
+    {
+    emit this->NextInStack(*node);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::onContextMenuEvent()
+{
+  int pos[2];
+  this->ContextInteractorStyle->GetInteractor()->GetEventPosition(pos);
+
+  // don't show a context menu at the end of a drag
+  if (abs(pos[0] - this->LastRightClickPosition[0]) > 5 ||
+      abs(pos[1] - this->LastRightClickPosition[1]) > 5)
+    {
+    return;
+    }
+
+  vtkVgNodeBase* node = this->ContextViewer->Pick(pos[0], pos[1], 0.0);
+  if (!node)
+    {
+    return;
+    }
+
+  // Register a menu now
+  QMenu menu(this->RenderWidget);
+  QAction* picked = 0;
+  const int height = this->ContextInteractorStyle->GetInteractor()->GetSize()[1];
+
+  // Get screen mouse position (adjusted for zero-based value)
+  const QPoint menuLocation =
+    this->RenderWidget->mapToGlobal(QPoint(pos[0], height - pos[1] - 1));
+
+  QAction* copyLocation = menu.addAction("&Copy Location");
+
+  // search for a parent layout node
+  vtkVgNodeBase* origNode = node;
+  for (; node != 0; node = node->GetParent())
+    {
+    if (vtkVQBlastLayoutNode* blastNode = vtkVQBlastLayoutNode::SafeDownCast(node))
+      {
+      // don't attempt to change layouts on a 'zoomed' node
+      if (blastNode->GetNodeFocused())
+        {
+        return;
+        }
+
+      int layoutMode = blastNode->GetLayoutMode();
+
+      menu.addSeparator();
+      QAction* zSortLayout = menu.addAction("Z Sort");
+      zSortLayout->setCheckable(true);
+      zSortLayout->setChecked(layoutMode == vtkVQBlastLayoutNode::Z_SORT);
+
+      QAction* stackLayout = menu.addAction("Stack");
+      stackLayout->setCheckable(true);
+      stackLayout->setChecked(layoutMode == vtkVQBlastLayoutNode::STACK);
+
+      QAction* blastLayout = menu.addAction("Blast");
+      blastLayout->setCheckable(true);
+      blastLayout->setChecked(layoutMode == vtkVQBlastLayoutNode::BLAST);
+
+      // go back to Qt widget coords
+      pos[1] = this->ContextInteractorStyle->GetInteractor()->GetSize()[1] -
+               pos[1] - 1;
+
+      // show the menu
+      picked = menu.exec(menuLocation);
+
+      int newLayoutMode;
+      if (picked == zSortLayout)
+        {
+        newLayoutMode = vtkVQBlastLayoutNode::Z_SORT;
+        }
+      else if (picked == stackLayout)
+        {
+        newLayoutMode = vtkVQBlastLayoutNode::STACK;
+        }
+      else if (picked == blastLayout)
+        {
+        newLayoutMode = vtkVQBlastLayoutNode::BLAST;
+        }
+      else
+        {
+        // nothing picked
+        return;
+        }
+
+      if (vtkVgGroupNode::SmartPtr parent = origNode->GetParent())
+        {
+        if (vtkVQBlastLayoutNode::SmartPtr layoutNode = vtkVQBlastLayoutNode::SafeDownCast(
+                                                          parent->GetParent()))
+          {
+          layoutNode->SetLayoutMode(newLayoutMode);
+          this->update();
+          }
+        }
+      return;
+      }
+    }
+
+  // show the menu
+  picked = menu.exec(menuLocation);
+  if (picked == copyLocation)
+    {
+    vgGeocodedCoordinate coord;
+    coord.GCS = 4326;
+    this->transformDisplayToLatLon(pos[0], pos[1],
+                                   coord.Latitude, coord.Longitude);
+
+    QString coordString = vgGeodesy::coordString(coord);
+    QApplication::clipboard()->setText(
+      coordString.left(coordString.indexOf('(') - 1));
+    return;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateLOD(bool override)
+{
+  this->lodToggleVisibility(0.20, 1, true, false, override);
+  this->lodToggleVisibility(0.50, 0, false, true, override);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::activateNode(vtkVgNodeBase& node)
+{
+  emit this->activated(node);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::selectNodes(QList<vtkVgNodeBase*> nodes)
+{
+  // Restore normal colors.
+  this->updateTrackColors();
+
+  // Set a different color for selected tracks.
+  vtkVgTrackModel* trackModel = this->TrackNode->GetTrackModel();
+  foreach (vtkVgNodeBase* node, nodes)
+    {
+    if (vtkVgVideoNode* vnode = vtkVgVideoNode::SafeDownCast(node))
+      {
+      trackModel->SetTrackColor(vnode->GetInstanceId(), SelectedTrackColor);
+      }
+    }
+  trackModel->Modified();
+
+  emit this->selected(nodes);
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setColorMappingMode(vqCore::NodeColorMode mode)
+{
+  if (this->NodeColorMappingMode != mode)
+    {
+    this->NodeColorMappingMode = mode;
+    emit this->coloringChanged();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setColorShadingMode(qtGradient::InterpolationMode mode)
+{
+  if (this->NodeColorShadingMode != mode)
+    {
+    this->NodeColorShadingMode = mode;
+    this->reloadColorGradient();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setLutValue(int index, const QColor& color)
+{
+  double c[] = { color.redF(), color.greenF(), color.blueF(), color.alphaF() };
+  this->ItemColorLUT->SetTableValue(index, c);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::reloadColorGradient()
+{
+  qtGradient gradient = vqSettings().scoreGradient().gradient();
+  gradient.setInterpolationMode(this->NodeColorShadingMode);
+
+  // Build first half of LUT from gradient
+  this->ItemColorLUT->SetNumberOfTableValues(200);
+  this->ItemColorLUT->SetRange(0.0, 2.0);
+
+  QList<QColor> colors = gradient.render(100);
+  for (int i = 0; i < 125; ++i)
+    this->setLutValue(i, colors[(i < 100 ? i : 99)]);
+
+  // Fill remainder of table with score-request and ground-truth colors
+  // Score-requests blue, ground truth gray (translucent in timelime)
+  // \TODO get from user preferences
+  const QColor gtColor = QColor::fromRgbF(0.9, 0.9, 0.9, 0.75);
+  const QColor srColor = Qt::blue;
+  for (int i = 125; i < 200; ++i)
+    this->setLutValue(i, (i < 175 ? gtColor : srColor));
+
+  emit this->coloringChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setViewToExtents(double extents[4])
+{
+  // Sources and LOD will be updated via vtkVQInteractorCallback
+  this->ContextInteractorStyle->ZoomToExtents(
+    this->ContextViewer->GetSceneRenderer(), extents);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateNodeColor(vtkVgVideoNode* node)
+{
+  double color[3];
+  this->ItemColorLUT->GetColor(node->GetColorScalar(), color);
+
+  vtkVgVideoRepresentation0* videoRep =
+    vtkVgVideoRepresentation0::SafeDownCast(node->GetVideoRepresentation());
+
+  videoRep->SetOutlineColor(color);
+  videoRep->SetOutlineStippled(node->GetIsRefinementResult());
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::colorNodesByRank()
+{
+  QList<vtkVgVideoNode*> queryResultNodes = this->queryResultNodes();
+
+  // calculate size of visible result set
+  int totalVisible = 0;
+  int numResultNodes = queryResultNodes.size();
+  for (int i = 0; i < numResultNodes; ++i)
+    {
+    if (queryResultNodes[i]->GetVisibleNodeMask() ==
+        vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      ++totalVisible;
+      }
+    }
+  // second pass to compute rank-based node colors
+  for (int i = 0, count = 0; i < numResultNodes; ++i)
+    {
+    vtkVgVideoNode* node = queryResultNodes[i];
+    if (node->GetVisibleNodeMask() == vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      double x = static_cast<double>(count++) / totalVisible;
+      node->SetColorScalar(x);
+      this->updateNodeColor(node);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::colorNodesByRelativeScore()
+{
+  QList<vtkVgVideoNode*> queryResultNodes = this->queryResultNodes();
+
+  double minScore = -1;
+  double maxScore = -1;
+
+  int numResultNodes = queryResultNodes.size();
+
+  if (numResultNodes != 0)
+    {
+    minScore = maxScore = queryResultNodes.front()->GetRelevancyScore();
+    }
+
+  // calculate the range of scores in the visible result set
+  for (int i = 0; i < numResultNodes; ++i)
+    {
+    vtkVgVideoNode* node = queryResultNodes[i];
+    if (node->GetVisibleNodeMask() == vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      minScore = std::min(minScore, node->GetRelevancyScore());
+      maxScore = std::max(maxScore, node->GetRelevancyScore());
+      }
+    }
+
+  // compute score-based relevancy and update node colors
+  for (int i = 0; i < numResultNodes; ++i)
+    {
+    vtkVgVideoNode* node = queryResultNodes[i];
+    if (node->GetVisibleNodeMask() == vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      double x = maxScore == minScore
+                 ? 1.0
+                 : (node->GetRelevancyScore() - minScore) / (maxScore - minScore);
+
+      node->SetColorScalar(1.0 - x);
+      this->updateNodeColor(node);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::colorNodesByAbsoluteScore()
+{
+  QList<vtkVgVideoNode*> queryResultNodes = this->queryResultNodes();
+
+  int numResultNodes = queryResultNodes.size();
+
+  for (int i = 0; i < numResultNodes; ++i)
+    {
+    vtkVgVideoNode* node = queryResultNodes[i];
+    if (node->GetVisibleNodeMask() == vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      node->SetColorScalar(1 - node->GetRelevancyScore());
+      this->updateNodeColor(node);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::recomputeNodeColors()
+{
+  // ground truth results are all the same color
+  QList<vtkVgVideoNode*> groundTruthNodes = this->groundTruthNodes();
+  for (int i = 0, end = groundTruthNodes.size(); i < end; ++i)
+    {
+    vtkVgVideoNode* node = groundTruthNodes[i];
+    node->SetColorScalar(1.5);
+    this->updateNodeColor(node);
+    }
+
+  if (this->ReceivingGroundTruthResults)
+    {
+    return;
+    }
+
+  QList<vtkVgVideoNode*> scoringResultNodes = this->scoringRequestNodes();
+
+  switch (this->NodeColorMappingMode)
+    {
+    case ColorByAbsoluteScore:
+      this->colorNodesByAbsoluteScore();
+      break;
+    case ColorByRelativeScore:
+      this->colorNodesByRelativeScore();
+      break;
+    default:
+      this->colorNodesByRank();
+      break;
+    }
+
+  // feedback results are given the special color scalar value
+  int numRefinementResults = scoringResultNodes.size();
+  for (int i = 0; i < numRefinementResults; ++i)
+    {
+    vtkVgVideoNode* node = scoringResultNodes[i];
+
+    // only override color if not part of normal results
+    if (!node->GetIsNormalResult())
+      {
+      node->SetColorScalar(2.0);
+      this->updateNodeColor(node);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::resetView()
+{
+  double bounds[6];
+  this->ContextViewer->GetSceneRenderer()->ComputeVisiblePropBounds(bounds);
+
+  // need to include full terrain, as we may be zoomed in to see only a portion
+  if (vtkMath::AreBoundsInitialized(this->TerrainBounds))
+    {
+    if (this->TerrainBounds[0] < bounds[0])
+      {
+      bounds[0] = this->TerrainBounds[0];
+      }
+    if (this->TerrainBounds[1] > bounds[1])
+      {
+      bounds[1] = this->TerrainBounds[1];
+      }
+    if (this->TerrainBounds[2] < bounds[2])
+      {
+      bounds[2] = this->TerrainBounds[2];
+      }
+    if (this->TerrainBounds[3] > bounds[3])
+      {
+      bounds[3] = this->TerrainBounds[3];
+      }
+    }
+
+  this->setViewToExtents(bounds);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::resetViewToQueryResults()
+{
+  if (!this->ContextVideoRoot)
+    {
+    return;
+    }
+  double* bounds = this->ContextVideoRoot->GetBounds();
+  if (!vtkMath::AreBoundsInitialized(bounds))
+    {
+    return;
+    }
+  this->setViewToExtents(bounds);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::drawRegion()
+{
+  this->DrawingContour = true;
+
+  this->StatusManager->setStatusText(this->InteractionStatusSource,
+                                     "Drawing region (right-click when done)");
+
+  delete this->Contour;
+  this->Contour = new vqContour(this->ContextViewer->GetRenderWindowInteractor());
+  this->Contour->Initialize();
+  this->Contour->Begin();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setRegion(vgGeocodedPoly region)
+{
+  delete this->Contour;
+  if (region.Coordinate.size())
+    this->Contour = this->createStaticContour(region, false);
+  else
+    this->Contour = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::completeRegion()
+{
+  this->StatusManager->setStatusText(this->InteractionStatusSource);
+  this->DrawingContour = false;
+  this->Contour->End();
+
+  vtkSmartPointer<vtkMatrix4x4> invertMat = vtkSmartPointer<vtkMatrix4x4>::New();
+  invertMat->DeepCopy(this->TerrainSource->GetCoordinateTransformMatrix());
+  invertMat->Invert();
+
+  // Transform the points to lat-lon
+  vtkPoints* points = this->Contour->GetPolyData()->GetPoints();
+  vgGeocodedPoly region;
+  region.GCS = 4269;
+  for (vtkIdType i = 0; i < points->GetNumberOfPoints(); ++i)
+    {
+    double point[4];
+    points->GetPoint(i, point);
+    vgGeoRawCoordinate gcp;
+    vtkVgApplyHomography(point, invertMat, gcp.Longitude, gcp.Latitude);
+    region.Coordinate.push_back(gcp);
+    }
+
+  emit this->regionComplete(region);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::forceRender()
+{
+  this->RenderPending = false;
+  this->ContextViewer->ForceRender(false);
+  emit this->forcedRender();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::renderLoopOn()
+{
+  if (!this->ContinuousRender)
+    {
+    this->UpdateTimer->start(this->UpdateIntervalMSec);
+    this->ContinuousRender = true;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::renderLoopOff()
+{
+  if (this->ContinuousRender)
+    {
+    this->UpdateTimer->stop();
+    this->ContinuousRender = false;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::selectItemsOnContext()
+{
+  vtkVgInteractorStyleRubberBand2D* style =
+    vtkVgInteractorStyleRubberBand2D::SafeDownCast(
+      this->RenderWidget->GetInteractor()->GetInteractorStyle());
+
+  int* startPosition = style->GetStartPosition();
+  int* endPosition =  style->GetEndPosition();
+
+  if (this->ShowVideoClipsOnContext)
+    {
+    this->selectClipsOnContext(startPosition, endPosition);
+    }
+  else if (this->ShowTracksOnContext)
+    {
+    this->selectTracksOnContext(startPosition, endPosition);
+    }
+  else
+    {
+    // Do nothing.
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::saveQueryPlan()
+{
+  if (!this->SavedQueryPlan.isValid())
+    {
+    QMessageBox::warning(0, "Viqui", "Unable to save query;"
+                         " query is unset or invalid");
+    return;
+    }
+
+  // request updated IQR model before saving
+  // \TODO keep track of any refinement; if none, than no need to get update
+  if (this->ActiveQueryParser) // might this be 0?
+    {
+    this->ActiveQueryParser->updateIqrModel(this->SavedQueryPlan);
+    }
+
+  vqQueryDialog::saveQuery(this->SavedQueryPlan);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::saveResults()
+{
+  if (this->QueryResults.isEmpty())
+    {
+    QMessageBox::warning(0, "Viqui", "Unable to save results;"
+                         " result set is empty");
+    return;
+    }
+
+  vqExporter* exporter = vqExporterFactory::createNativeFileExporter();
+  if (exporter)
+    {
+    exporter->exportResults(this->QueryResults.values());
+    delete exporter;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::exportResults(QList<vtkVgVideoNode*> results, QString exporterId)
+{
+  QList<vvQueryResult> exportResults;
+  for (int i = 0; i < results.count(); ++i)
+    {
+    vtkIdType sid = results[i]->GetInstanceId();
+    if (this->QueryResults.contains(sid))
+      {
+      exportResults.append(this->QueryResults[sid]);
+      }
+    }
+
+  if (exportResults.isEmpty())
+    {
+    QMessageBox::warning(0, "Viqui", "Unable to export;"
+                         " selected result set is empty");
+    }
+  else
+    {
+    vqExporter* exporter = vqExporterFactory::createExporter(exporterId);
+    if (exporter)
+      {
+      exporter->exportResults(exportResults);
+      delete exporter;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::openExternal(QUrl clipUri, QString streamId, double time)
+{
+  // Get external player application
+  QSettings settings;
+  settings.beginGroup("ExternalPlayer");
+  const QString externalPlayer =
+    settings.value("Program", "vsPlay").toString();
+  if (externalPlayer.isEmpty())
+    {
+    QMessageBox::information(qApp->activeWindow(), "Sorry",
+                             "External player has not been configured.");
+    return;
+    }
+
+  // Get options for running external player
+  QStringList args = settings.value("Args").toStringList();
+  const QString extractClassifiers =
+    settings.value("ExtractClassifiers", "no").toString();
+  const bool stripResults = settings.value("StripResults", true).toBool();
+
+  // Get query server URI (for building database source)
+  QUrl dataUri = vqSettings().queryServerUri();
+  dataUri.addQueryItem("Stream", streamId);
+  dataUri.addQueryItem("ExtractClassifiers", extractClassifiers);
+
+  // Generate argument list
+  args << "--video-file" << clipUri.toLocalFile()
+       << "--query-database" << dataUri.toString()
+       << "--seek" << QString::number(time, 'f', 3);
+
+  // Extract results with same stream ID
+  QList<vvQueryResult> results;
+  double visibleThreshold = 1.0;
+  const std::string stdStreamId = stdString(streamId);
+  foreach (const vvQueryResult& result, this->QueryResults)
+    {
+    if (result.StreamId == stdStreamId)
+      {
+      results.append(stripResults ? stripResult(result) : result);
+      if (this->QueryResultNodes.contains(result.InstanceId) &&
+          !this->QueryResultNodes[result.InstanceId]->GetIsStarResult())
+        {
+        // Try to determine threshold so that external player will only display
+        // results that are in our top <page size> initially
+        visibleThreshold = qMin(visibleThreshold, result.RelevancyScore);
+        }
+      }
+    }
+
+  if (!results.isEmpty())
+    {
+    // Create temporary file for results
+    const QString tmpDir =
+      settings.value("TmpDir", QDir::tempPath()).toString();
+    QTemporaryFile resultFile;
+    resultFile.setFileTemplate(tmpDir + "/results_XXXXXX.vsr");
+    resultFile.setAutoRemove(false);
+    if (resultFile.open())
+      {
+      // \TODO event set information should be configurable
+      vvEventSetInfo info;
+      info.Name = "Query Results";
+      info.PenColor = Qt::green;
+      info.BackgroundColor = Qt::darkGreen;
+      info.ForegroundColor = Qt::white;
+      info.DisplayThreshold = visibleThreshold;
+
+      // Write results to temporary file
+      vvKstWriter writer(resultFile);
+      writer << vvHeader::EventSetInfo << info
+             << vvHeader::QueryResults << results;
+
+      // Add to argument list
+      args << "--descriptors-file" << resultFile.fileName();
+      }
+    }
+
+  // Start external player
+  QProcess process;
+  if (!process.startDetached(externalPlayer, args))
+    {
+    // Something went wrong
+    QMessageBox::warning(qApp->activeWindow(), "Sorry",
+                         "Failed to start external player.");
+    }
+}
+
+//-----------------------------------------------------------------------------
+static bool eventEarlierThan(vtkVgVideoNode* a, vtkVgVideoNode* b)
+{
+  return a->GetTimeRange()[0] < b->GetTimeRange()[0];
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::generateReport(QString path, bool generateVideo)
+{
+  QFile file(path + '/' + "report.xml");
+  if (!file.open(QIODevice::WriteOnly |
+                 QIODevice::Text |
+                 QIODevice::Truncate))
+    {
+    qDebug() << file.errorString();
+    QMessageBox::warning(0, QString(), "Unable to write report file.");
+    return;
+    }
+
+  vvReportWriter writer(file);
+
+  vtkSmartPointer<vqArchiveVideoSource> video =
+    vtkSmartPointer<vqArchiveVideoSource>::New();
+
+  vtkSmartPointer<vtkVQTerrainSource> terrainSrc;
+  vtkSmartPointer<vtkVgTerrain> terrain;
+
+  // Terrain source doesn't support deep copy at the moment
+  if (this->TerrainSource && this->TerrainSource->GetDataSource())
+    {
+    terrainSrc = vtkSmartPointer<vtkVQTerrainSource>::New();
+    terrainSrc->SetDataSource(this->TerrainSource->GetDataSource());
+    terrain = terrainSrc->CreateTerrain();
+    writer.setContext(terrain, terrainSrc,
+                      terrainSrc->GetCoordinateTransformMatrix());
+    }
+
+  // Sort by start time
+  QList<vtkVgVideoNode*> nodes = this->QueryResultNodes.values();
+  qSort(nodes.begin(), nodes.end(), eventEarlierThan);
+
+  // Try to estimate the amount of work that we'll be doing
+  int total = 0;
+  foreach (vtkVgVideoNode* node, nodes)
+    {
+    if (node->GetIsStarResult())
+      {
+      vtkVgVideoModel0* vm = node->GetVideoRepresentation()->GetVideoModel();
+      vtkVgEventModel* em = vm->GetEventModel();
+
+      if (vtkVgEvent* event = em->GetEvent(node->GetInstanceId()))
+        {
+        if (!generateVideo)
+          {
+          ++total;
+          }
+        else if (event->GetStartFrame().HasFrameNumber() &&
+                 event->GetEndFrame().HasFrameNumber())
+          {
+          total += event->GetEndFrame().GetFrameNumber() -
+                   event->GetStartFrame().GetFrameNumber() + 1;
+          }
+        else
+          {
+          total += 100;
+          }
+        }
+      }
+    }
+
+  QProgressDialog progress("Generating report...", "Cancel", 1, total);
+  progress.setWindowModality(Qt::ApplicationModal);
+  progress.setMinimumDuration(0);
+  progress.setAutoClose(false);
+  progress.setAutoReset(false);
+  progress.setValue(0);
+
+  QApplication::processEvents();
+
+  vtkVgVideoFrameData frame;
+
+  vtkSmartPointer<vtkMatrix4x4> trackModelToImage =
+    vtkSmartPointer<vtkMatrix4x4>::New();
+
+  int count = 0;
+  int currId = 1;
+  foreach (vtkVgVideoNode* node, nodes)
+    {
+    if (!node->GetIsStarResult())
+      {
+      continue;
+      }
+
+    vtkVgVideoModel0* vm = node->GetVideoRepresentation()->GetVideoModel();
+    vtkVgEventModel* em = vm->GetEventModel();
+
+    if (vqArchiveVideoSource* src =
+          vqArchiveVideoSource::SafeDownCast(vm->GetVideoSource()))
+      {
+      video->DeepCopy(*src, vqArchiveVideoSource::CopyClipShared);
+      video->SetLooping(0);
+      }
+    else
+      {
+      qDebug() << "Unknown video source.";
+      continue;
+      }
+
+    vtkVgEvent* event = em->GetEvent(node->GetInstanceId());
+    if (!event)
+      {
+      qDebug() << "No event found.";
+      continue;
+      }
+
+    writer.setEvent(event, currId++, node->GetNote(), 0,
+                    node->GetRank(), node->GetRelevancyScore(),
+                    node->GetMissionId(), node->GetStreamId());
+
+    vtkVgTimeStamp start = event->GetStartFrame();
+    vtkVgTimeStamp end = event->GetEndFrame();
+
+    // Compute timestamp halfway through the event
+    vtkVgTimeStamp mid(0.5 * (start.GetTime() + end.GetTime()));
+    if (start.HasFrameNumber() && end.HasFrameNumber())
+      {
+      unsigned frame = (start.GetFrameNumber() + end.GetFrameNumber()) / 2;
+      mid.SetFrameNumber(frame);
+      }
+
+    // Set timestamp to the next closest frame with a valid region
+    vtkIdType npts;
+    vtkIdType* ids;
+    vtkVgTimeStamp prev =  mid;
+    if (!event->GetRegionAtOrAfter(mid, npts, ids) && mid == prev)
+      {
+      qDebug() << "Could not get event midpoint region.";
+      continue;
+      }
+
+    if (video->GetFrame(&frame, mid.GetTime()) == VTK_OK)
+      {
+      writer.setImageData(frame.VideoImage,
+                          frame.TimeStamp, 0,
+                          frame.VideoMatrix);
+
+      vtkVgTrack* track =
+        this->TrackNode->GetTrackModel()->GetTrack(event->GetId());
+      if (track && frame.VideoMatrix)
+        {
+        // Compute the image-to-context matrix then invert it to get the
+        // track-to-image transform (track points are in context space).
+        vtkMatrix4x4::Multiply4x4(
+          this->TerrainSource->GetCoordinateTransformMatrix(),
+          frame.VideoMatrix, trackModelToImage);
+        trackModelToImage->Invert();
+
+        writer.setTrack(track, trackModelToImage);
+        }
+      else
+        {
+        writer.setTrack(0);
+        }
+
+      writer.writeEventSummary();
+      }
+    else
+      {
+      qDebug() << "Could not get midpoint frame.";
+      continue;
+      }
+
+    // If not generating video, we're done
+    if (!generateVideo)
+      {
+      progress.setValue(++count);
+      continue;
+      }
+
+    // Write video images
+    video->GetFrame(&frame, start.GetTime());
+    int framenum = 0;
+    do
+      {
+      writer.setImageData(frame.VideoImage,
+                          frame.TimeStamp, 0,
+                          frame.VideoMatrix);
+      writer.writeEventVideoImage(++framenum);
+      if (progress.wasCanceled())
+        {
+        break;
+        }
+      progress.setValue(++count);
+      }
+    while (video->GetNextFrame(&frame) == VTK_OK && frame.TimeStamp <= end);
+
+    // Encode video from images
+    writer.writeEventVideo();
+    }
+
+  writer.writeOverview();
+
+  // Now export KML
+  this->exportKml(path);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::exportKml(QString path)
+{
+  QString filePath;
+  QFileInfo fileInfo(path);
+  if (fileInfo.isDir())
+    {
+    filePath = QString(fileInfo.canonicalFilePath() + '/' + "viqui.kml");
+    }
+  else
+    {
+    filePath = fileInfo.absoluteFilePath();
+    }
+
+  QFile file(filePath);
+  if (!file.open(QIODevice::WriteOnly |
+                 QIODevice::Text |
+                 QIODevice::Truncate))
+    {
+    qDebug() << file.errorString();
+    QMessageBox::warning(0, QString(), "Unable to write KML file.");
+    return;
+    }
+
+  // Sort by start time
+  QList<vtkVgVideoNode*> nodes = this->QueryResultNodes.values();
+  qSort(nodes.begin(), nodes.end(), eventEarlierThan);
+
+  vvKmlWriter kmlWriter;
+
+  vtkVgTrackModel* trModel = this->TrackNode->GetTrackModel();
+  if (!trModel)
+    {
+    QString err = QString("Invalid track model.")
+                  + QString("Unable to write KML file.");
+    QMessageBox::warning(0, QString(), err);
+    }
+
+  // Loop over each node, find associated events and finally tracks
+  foreach (vtkVgVideoNode* node, nodes)
+    {
+    if (node->GetIsStarResult())
+      {
+      vtkVgVideoModel0* vm = node->GetVideoRepresentation()->GetVideoModel();
+      vtkVgEventModel* em = vm->GetEventModel();
+
+      if (vtkVgEvent* event = em->GetEvent(node->GetInstanceId()))
+        {
+        vtkIdType evId = event->GetId();
+        vtkVgTrack* track = trModel->GetTrack(evId);
+        if (!track)
+          {
+          continue;
+          }
+
+        vtkIdList* ids = track->GetPointIds();
+        vtkPoints* points = track->GetPoints();
+
+        double trackColor[3];
+        track->GetColor(trackColor);
+
+        vvKmlLine* line = kmlWriter.createLine();
+        line->setId(QString("Result_%1").arg(track->GetId()));
+        line->setDescription(QString::fromLocal8Bit(node->GetNote()));
+        line->setColor(trackColor[0], trackColor[1], trackColor[2], 1.0);
+
+        double loc[3];
+        double lat, lon;
+        for (int i = 0; i < ids->GetNumberOfIds(); ++i)
+          {
+          points->GetPoint(ids->GetId(i), loc);
+          this->transformContextToLatLon(loc[0], loc[1], lat, lon);
+
+          // Ignoring altitude for now
+          line->addPoint(lat, lon, 0.0);
+          }
+        }
+      }
+    }
+
+  if (kmlWriter.isEmpty())
+    {
+    qDebug() << "Nothing to export to KML format.";
+    }
+
+  kmlWriter.write(file);
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::showTrackingClips(QList<vtkVgVideoNode*> nodes,
+                               vqTrackingClipViewer* viewer, int limit)
+{
+  vqTrackingClipViewer::ClipVector clips;
+  clips.reserve(nodes.size());
+
+  if (limit == 0)
+    {
+    limit = nodes.size();
+    }
+
+  foreach (vtkVgVideoNode* node, nodes)
+    {
+    if (limit-- == 0)
+      {
+      break;
+      }
+
+    if (!node->GetHasVideoData())
+      {
+      continue;
+      }
+
+    vtkVgVideoModel0* VM = node->GetVideoRepresentation()->GetVideoModel();
+    vtkVgEventModel* EM = VM->GetEventModel();
+
+    // create a copy of the event
+    EM->InitEventTraversal();
+    vtkVgEvent* event = EM->GetNextEvent().GetEvent();
+    vtkVgEvent* clonedEvent = vtkVgEvent::New();
+    clonedEvent->DeepCopy(event);
+
+    // we must 'deep copy' the video source
+    vqArchiveVideoSource::SmartPtr video =
+      vtkSmartPointer<vqArchiveVideoSource>::New();
+    if (vqArchiveVideoSource* src =
+          vqArchiveVideoSource::SafeDownCast(VM->GetVideoSource()))
+      {
+      video->DeepCopy(*src, vqArchiveVideoSource::CopyClipDetached);
+      }
+
+    // construct the tracking clip
+    vtkVQTrackingClip* TC = vtkVQTrackingClip::New();
+    TC->SetRank(node->GetRank());
+    TC->SetVideo(video);
+    TC->SetVideoNode(node);
+    TC->SetEvent(clonedEvent);
+    clips.push_back(std::make_pair(0, TC));
+    clonedEvent->FastDelete();
+    TC->FastDelete();
+    }
+
+  if (!clips.empty())
+    {
+    viewer->InsertClips(clips);
+    viewer->show();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vqContour* vqCore::createStaticContour(vgGeocodedPoly region, bool finalized)
+{
+  vtkMatrix4x4* mat = this->TerrainSource->GetCoordinateTransformMatrix();
+
+  vtkIdList* ids = vtkIdList::New();
+  vtkPoints* pts = vtkPoints::New();
+  vtkPolyData* pd = vtkPolyData::New();
+  vtkCellArray* ca = vtkCellArray::New();
+
+  vtkIdType size = static_cast<vtkIdType>(region.Coordinate.size());
+
+  ids->SetNumberOfIds(size + 1);
+  pts->SetNumberOfPoints(size);
+
+  // construct a polydata
+  for (vtkIdType i = 0; i < size; ++i)
+    {
+    double pt[] =
+      {
+      region.Coordinate[i].Longitude,
+      region.Coordinate[i].Latitude,
+      0.0,
+      1.0
+      };
+
+    // lat-lon -> world
+    vtkVgApplyHomography(pt, mat, pt);
+    pt[2] = 0.0;
+    pts->SetPoint(i, pt);
+    ids->SetId(i, i);
+    }
+  ids->SetId(size, 0);
+
+  ca->InsertNextCell(ids);
+  pd->SetPoints(pts);
+  pd->SetLines(ca);
+
+  // create contour
+  vqContour* contour =
+    new vqContour(this->ContextViewer->GetRenderWindowInteractor());
+
+  contour->Initialize(pd);
+  contour->AddToScene(this->ContextSceneRoot);
+
+  if (finalized)
+    {
+    contour->SetVisible(this->QueryRegionVisible);
+    contour->Finalize();
+    }
+
+  contour->End();
+
+  ids->FastDelete();
+  pts->FastDelete();
+  pd->FastDelete();
+  ca->FastDelete();
+
+  return contour;
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::filterSpatially(vqArchiveVideoSource* arVideoSource,
+                             const std::vector<vvDescriptor>& descriptors)
+{
+  if (!this->SpatialFilterActive)
+    {
+    return true;
+    }
+
+  bool resultSelected = false;
+
+  // Get the clip meta data
+  const vgKwaVideoClip* videoClip = arVideoSource->GetCurrentVideoClip();
+  if (!videoClip)
+    {
+    std::cerr << "Corresponding video clip not found. Returning." << std::endl;
+    return false;
+    }
+  const vgKwaVideoClip::MetadataMap clipMetaData = videoClip->metadata();
+
+  vtkMatrix4x4* latLonToContext =
+    this->TerrainSource->GetCoordinateTransformMatrix();
+
+  vtkSmartPointer<vtkMatrix4x4> imageToContext(
+    vtkSmartPointer<vtkMatrix4x4>::New());
+
+  vtkSmartPointer<vtkPoints> trackPoints;
+  bool checkForTripEvents = false;
+  if (this->FilterOnEnterTripEvents || this->FilterOnExitTripEvents)
+    {
+    checkForTripEvents = true;
+    trackPoints = vtkSmartPointer<vtkPoints>::New();
+    // 60+ second track (at 30fps); should be enough for vast majority of descriptors
+    trackPoints->Allocate(2000);
+    }
+
+  std::vector<vvDescriptor>::const_iterator iter;
+  for (iter = descriptors.begin(); iter != descriptors.end(); iter++)
+    {
+    vtkSmartPointer<vtkVgTrack> tempTrack;
+    if (checkForTripEvents)
+      {
+      tempTrack = vtkSmartPointer<vtkVgTrack>::New();
+      tempTrack->SetPoints(trackPoints);
+      trackPoints->Reset();
+      }
+
+    vvDescriptorRegionMap::const_iterator regionIter;
+    for (regionIter = iter->Region.begin();
+         !resultSelected && regionIter != iter->Region.end(); regionIter++)
+      {
+      vgKwaVideoClip::MetadataMap::const_iterator hi =
+        clipMetaData.find(regionIter->TimeStamp);
+
+      if (hi == clipMetaData.end())
+        {
+        continue;
+        }
+
+      vtkSmartPointer<vtkMatrix4x4> imageToLatLonHomographyMatrix;
+      if (!computeImageToLatLon(imageToLatLonHomographyMatrix, *hi))
+        {
+        qDebug() << "Homography matrix computation failed;"
+                 " frame ignored for spatial filtering";
+        continue;
+        }
+
+      vtkMatrix4x4::Multiply4x4(latLonToContext,
+                                imageToLatLonHomographyMatrix, imageToContext);
+
+      double yDim = hi->imageSize().height();
+      if (yDim <= 0)
+        {
+        // Image dimensions not available; use 'most likely' guess
+        yDim = 480.0;
+        }
+
+      if (!checkForTripEvents)
+        {
+        // clockwise from top left
+        double regionPtTransformed[4], regionCornerPts[4][4];
+        regionCornerPts[0][0] = regionIter->ImageRegion.TopLeft.X;
+        regionCornerPts[1][0] = regionIter->ImageRegion.BottomRight.X;
+        regionCornerPts[2][0] = regionIter->ImageRegion.BottomRight.X;
+        regionCornerPts[3][0] = regionIter->ImageRegion.TopLeft.X;
+        regionCornerPts[0][1] = yDim - regionIter->ImageRegion.TopLeft.Y;
+        regionCornerPts[1][1] = yDim - regionIter->ImageRegion.TopLeft.Y;
+        regionCornerPts[2][1] = yDim - regionIter->ImageRegion.BottomRight.Y;
+        regionCornerPts[3][1] = yDim - regionIter->ImageRegion.BottomRight.Y;
+
+        for (int i = 0; i < 4; i++)
+          {
+          regionCornerPts[i][2] = 0.0;
+          regionCornerPts[i][3] = 1.0;
+          imageToContext->MultiplyPoint(regionCornerPts[i], regionPtTransformed);
+          if (regionPtTransformed[3])
+            {
+            regionPtTransformed[0] /= regionPtTransformed[3];
+            regionPtTransformed[1] /= regionPtTransformed[3];
+            regionPtTransformed[2] /= regionPtTransformed[3];
+            if (this->QueryResultSelector->EvaluatePoint(regionPtTransformed))
+              {
+              resultSelected = true;
+              break;
+              }
+            }
+          }
+        }
+      else
+        {
+        double trackPtTransformed[4], bottomCenterRegionPt[4] =
+          {
+          (regionIter->ImageRegion.BottomRight.X + regionIter->ImageRegion.TopLeft.X) / 2.0,
+          yDim - regionIter->ImageRegion.BottomRight.Y - 1,
+          0.0,
+          1.0
+          };
+        imageToContext->MultiplyPoint(bottomCenterRegionPt, trackPtTransformed);
+        if (trackPtTransformed[3])
+          {
+          trackPtTransformed[0] /= trackPtTransformed[3];
+          trackPtTransformed[1] /= trackPtTransformed[3];
+          tempTrack->InsertNextPoint(regionIter->TimeStamp, trackPtTransformed,
+                                     vtkVgGeoCoord());
+          }
+        }
+      }
+    if (checkForTripEvents)
+      {
+      bool myCheckForTripEvent = false, myCheckForEnterEvent = this->FilterOnEnterTripEvents,
+           myCheckForExitEvent = this->FilterOnExitTripEvents;
+      this->QueryTripWireManager->CheckTrackForTripWireEvents(tempTrack, myCheckForTripEvent,
+          myCheckForEnterEvent, myCheckForExitEvent);
+      if (myCheckForTripEvent || myCheckForEnterEvent || myCheckForExitEvent)
+        {
+        resultSelected = true;
+        }
+      }
+    }
+
+  return resultSelected;
+}
+
+//-----------------------------------------------------------------------------
+bool vqCore::resultPassesFilters(vqCore::ResultId iid) const
+{
+  CHECK_ARG(this->QueryResults.contains(iid), false);
+
+  const vvQueryResult& result = this->QueryResults[iid];
+  return (result.RelevancyScore >= this->ResultFilter.Threshold);
+}
+
+//-----------------------------------------------------------------------------
+vqResultFilter vqCore::resultFilter() const
+{
+  return this->ResultFilter;
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setResultFilter(vqResultFilter filter)
+{
+  this->ResultFilter = filter;
+  if (!this->QueryResults.isEmpty())
+    {
+    vqScopedOverrideCursor busy;
+
+    QList<ResultId> scoringRequestIds = this->ScoringRequestNodes.keys();
+
+    // Clear and recalculate result display list
+    this->resetQueryResults(false, false);
+    this->displayResults(vqSettings().resultPageCount());
+
+    qtUtil::mapBound(scoringRequestIds, this,
+                     &vqCore::createScoringRequestNode);
+
+    // Update scene
+    this->updateScene();
+
+    // Must notify that results have changed, due to scoring-request list being
+    // recreated (after updateScene, so colors have been recalculated)
+    emit this->resultsUpdated();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::showBestClips(vqTrackingClipViewer* viewer)
+{
+  QList<vtkVgVideoNode*> queryResults = this->queryResultNodes();
+  if (!queryResults.empty())
+    {
+    this->showTrackingClips(queryResults, viewer, 10);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::showNextTrackingClips(vtkIdType previousId, int count,
+                                   vqTrackingClipViewer* viewer)
+{
+  // really want to get the next "count" nodes given the current sorting, but
+  // I'm not sure how to get that from the tree.  Thus, for now, get the next
+  // next items assuming rank order (and that they're visible in the tree)
+  QList<vtkVgVideoNode*> rankSortedQueryResults = this->queryResultNodes();
+
+  QList<vtkVgVideoNode*> subList;
+  QList<vtkVgNodeBase*> nodeBaseList;
+
+  bool previousFound = false;
+  foreach (vtkVgVideoNode* node, rankSortedQueryResults)
+    {
+    if (!previousFound)
+      {
+      if (node->GetInstanceId() == previousId)
+        {
+        previousFound = true;
+        }
+      continue;
+      }
+
+    // ony add those that have video data
+    if (!node->GetHasVideoData())
+      {
+      continue;
+      }
+
+    if (count-- == 0)
+      {
+      break;
+      }
+
+    subList.push_back(node);
+    nodeBaseList.push_back(node);
+    }
+
+  // if we founnd additional/next items to show, update the track viewer
+  if (!subList.empty())
+    {
+    viewer->RemoveAllClips();
+    this->selectNodes(nodeBaseList);
+    this->showTrackingClips(subList, viewer);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setShowQueryRegion(bool enable)
+{
+  this->QueryRegionVisible = enable;
+  if (this->QueryRegionContour)
+    {
+    this->QueryRegionContour->SetVisible(enable);
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setShowTracksOnContext(bool enable)
+{
+  if (this->ShowTracksOnContext != enable)
+    {
+    this->ShowTracksOnContext = enable;
+
+    this->TrackNode->GetTrackRepresentation()->SetVisible(enable ? 1 : 0);
+    this->TrackNode->GetTrackRepresentation()->Update();
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setGroundTruthEventType(int type)
+{
+  if (type != this->GroundTruthEventType)
+    {
+    this->GroundTruthEventType = type;
+
+    // refresh results
+    this->ReceivingGroundTruthResults = false;
+    this->resetQueryResults(false, false);
+    this->queryFinished(false); // hack...
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setShowVideoClipsOnContext(bool enable)
+{
+  this->ShowVideoClipsOnContext = enable;
+
+  if (!this->ContextVideoRoot)
+    {
+    return;
+    }
+
+  vqVideoNodeVisitor visitor;
+  visitor.VideoClipVisible = enable;
+  visitor.UpdateVideoClipVisibility = true;
+  visitor.UpdateVideoOutlineVisibility = false;
+
+  visitor.Visit(*this->ContextVideoRoot.GetPointer());
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::setShowVideoOutlinesOnContext(bool enable)
+{
+  this->ShowVideoOutlinesOnContext = enable;
+
+  if (!this->ContextVideoRoot)
+    {
+    return;
+    }
+
+  vqVideoNodeVisitor visitor;
+  visitor.VideoOutlineVisible = enable;
+  visitor.UpdateVideoClipVisibility = false;
+  visitor.UpdateVideoOutlineVisibility = true;
+
+  visitor.Visit(*this->ContextVideoRoot.GetPointer());
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::addTrackToContextTrackModel(vtkVgVideoNode* node)
+{
+  vtkVgEventModel* eventModel = node->GetVideoRepresentation()->
+                                GetEventRepresentation()->GetEventModel();
+
+  if (eventModel->GetNumberOfEvents() != 1)
+    {
+    return;
+    }
+
+  vtkPoints* points = eventModel->GetSharedRegionPoints();
+  eventModel->InitEventTraversal();
+  vtkVgEventBase* theEvent = eventModel->GetNextEvent().GetEvent();
+
+  // See if track already in the model.
+  if (this->TrackNode->GetTrackModel()->GetTrack(theEvent->GetId()))
+    {
+    return;
+    }
+
+  // Basic setup of track, and add to model.
+  vtkVgTrack* newTrack = vtkVgTrack::New();
+  newTrack->SetPoints(this->TrackNode->GetTrackModel()->GetPoints());
+  newTrack->SetId(theEvent->GetId());
+
+  this->TrackNode->GetTrackModel()->AddTrack(newTrack);
+  newTrack->FastDelete();
+
+  vqArchiveVideoSource* arVideoSource = vqArchiveVideoSource::SafeDownCast(
+                                          node->GetVideoRepresentation()->GetVideoModel()->GetVideoSource());
+
+  const vgKwaVideoClip* videoClip = arVideoSource->GetCurrentVideoClip();
+  if (!videoClip)
+    {
+    std::cerr << "Corresponding video clip not found. Returning." << std::endl;
+    return;
+    }
+  const vgKwaVideoClip::MetadataMap clipMetaData = videoClip->metadata();
+
+  vtkMatrix4x4* latLonToContext =
+    this->TerrainSource->GetCoordinateTransformMatrix();
+  vtkSmartPointer<vtkMatrix4x4> imageToContext(
+    vtkSmartPointer<vtkMatrix4x4>::New());
+
+  // now add the points making up the track
+  vtkVgTimeStamp timeStamp;
+  vtkIdType npts, *pts;
+  for (theEvent->InitRegionTraversal();
+       theEvent->GetNextRegion(timeStamp, npts, pts);)
+    {
+    const vgTimeStamp ts = timeStamp.GetRawTimeStamp();
+    if (!clipMetaData.contains(ts))
+      {
+      continue;
+      }
+
+    // Know we add region starting from top left, and moving clockwise,
+    // thus center of region bottom is x average of 3rd and 4th points
+    double pt0[3], pt1[3];
+    points->GetPoint(pts[2], pt0);
+    points->GetPoint(pts[3], pt1);
+
+    // Now transform from image to context coordinates
+    vtkSmartPointer<vtkMatrix4x4> imageToLatLonHomographyMatrix;
+    if (!computeImageToLatLon(imageToLatLonHomographyMatrix,
+                              clipMetaData[ts]))
+      {
+      qDebug() << "Homography matrix computation failed, track point not added!";
+      continue;
+      }
+
+    vtkMatrix4x4::Multiply4x4(latLonToContext,
+                              imageToLatLonHomographyMatrix, imageToContext);
+
+    double tp[2];
+    vtkVgApplyHomography(0.5 * (pt0[0] + pt1[0]), pt0[1], imageToContext, tp);
+    newTrack->InsertNextPoint(timeStamp, tp, vtkVgGeoCoord());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateTrackVisibility()
+{
+  vtkVgTrackModel* tm = this->TrackNode->GetTrackModel();
+  bool changed = false;
+
+  // Update the visibility of tracks to match the visibility of the
+  // corresponding results.
+  tm->InitTrackTraversal();
+  vtkVgTrackInfo info;
+  while ((info = tm->GetNextTrack()).GetTrack())
+    {
+    vtkIdType id = info.GetTrack()->GetId();
+
+    QHash<ResultId, vtkVgVideoNode*>::iterator itr;
+    itr = this->QueryResultNodes.find(id);
+    if (itr == this->QueryResultNodes.end())
+      {
+      itr = this->ScoringRequestNodes.find(id);
+      if (itr == this->ScoringRequestNodes.end())
+        {
+        itr = this->GroundTruthNodes.find(id);
+        if (itr == this->GroundTruthNodes.end())
+          {
+          // Should never get here.
+          continue;
+          }
+        }
+      }
+
+    bool nodeVisible = itr.value()->GetVisible();
+    if (info.GetDisplayTrack() != nodeVisible)
+      {
+      changed = true;
+      tm->SetTrackDisplayState(id, nodeVisible);
+      }
+    }
+
+  if (changed)
+    {
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::updateTrackColors()
+{
+  vtkVgTrackModel* trackModel = this->TrackNode->GetTrackModel();
+  trackModel->InitTrackTraversal();
+  while (vtkVgTrack* track = trackModel->GetNextTrack().GetTrack())
+    {
+    vtkVgVideoNode* node = this->getResultNode(track->GetId());
+    if (node)
+      {
+      double color[3];
+      this->ItemColorLUT->GetColor(node->GetColorScalar(), color);
+      trackModel->SetTrackColor(track->GetId(), color);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::lodToggleVisibility(double scaleBoundary, int stateUnder,
+                                 bool events, bool markers, bool override)
+{
+  // \NOTE: factor of 3.5 is hard coded for now.
+  double currentViewScale =
+    this->ContextViewer->GetCurrentScale() / this->ViewScaleFactor;
+
+  bool toggled = true;
+
+  if (!override)
+    {
+    toggled = (this->LastEventViewScale > scaleBoundary)
+              || (this->LastMarkerViewScale > scaleBoundary);
+    }
+
+  if ((currentViewScale <= scaleBoundary) && (toggled))
+    {
+    this->LastEventViewScale
+      = events ? currentViewScale : this->LastEventViewScale;
+    this->LastMarkerViewScale
+      = markers ? currentViewScale : this->LastMarkerViewScale;
+
+    this->toggleVisibility(this->QueryResultNodes, stateUnder, events, markers);
+    this->toggleVisibility(this->ScoringRequestNodes, stateUnder, events, markers);
+    }
+
+  if (!override)
+    {
+    toggled = (this->LastEventViewScale <= scaleBoundary)
+              || (this->LastMarkerViewScale <= scaleBoundary);
+    }
+
+  if ((currentViewScale > scaleBoundary) && (toggled))
+    {
+    this->LastEventViewScale
+      = events ? currentViewScale : this->LastEventViewScale;
+    this->LastMarkerViewScale
+      = markers ? currentViewScale : this->LastMarkerViewScale;
+
+    this->toggleVisibility(this->QueryResultNodes, !stateUnder, events, markers);
+    this->toggleVisibility(this->ScoringRequestNodes, !stateUnder, events, markers);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqCore::toggleVisibility(QHash<ResultId, vtkVgVideoNode*>& nodes,
+                              int value, bool events, bool markers)
+{
+  foreach (vtkVgVideoNode* node, nodes)
+    {
+    if (vtkVgVideoRepresentation0* videoRepresentation =
+          vtkVgVideoRepresentation0::SafeDownCast(node->GetVideoRepresentation()))
+      {
+      if (events)  { videoRepresentation->SetEventVisible(value); }
+      if (markers) { videoRepresentation->SetMarkerVisible(value); }
+      }
+    }
+}
diff --git a/Applications/Viqui/vqCore.h b/Applications/Viqui/vqCore.h
new file mode 100644
index 00000000..b9a00b0d
--- /dev/null
+++ b/Applications/Viqui/vqCore.h
@@ -0,0 +1,464 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqCore_h
+#define __vqCore_h
+
+// Qt includes
+#include <QVTKWidget.h>
+#include <QBasicTimer>
+#include <QString>
+#include <QList>
+#include <QHash>
+#include <QMultiMap>
+#include <QSet>
+#include <QSharedPointer>
+#include <QUrl>
+
+// QtExtensions includes
+#include <qtGradient.h>
+#include <qtStatusSource.h>
+
+// VTK includes
+#include <vtkSmartPointer.h>
+
+// VISGUI includes
+#include <vtkVgTimeStamp.h>
+#include <vvQueryFormulation.h>
+#include <vvQueryInstance.h>
+#include <vvQueryResult.h>
+
+// Viqui includes
+#include "vqResultFilter.h"
+#include "vtkVQBlastLayoutNode.h"
+
+// Forward declarations.
+class QLabel;
+class QProgressBar;
+
+class qtStatusManager;
+class qtStatusNotifier;
+
+class vtkLookupTable;
+class vtkPolyData;
+class vtkRenderWindow;
+class vtkTimerLog;
+
+class vtkVgContourOperatorManager;
+class vtkVgGeode;
+class vtkVgGroupNode;
+class vtkVgInteractorStyleRubberBand2D;
+class vtkVgNodeBase;
+class vtkVgTrackNode;
+class vtkVgTransformNode;
+class vtkVgTripWireManager;
+class vtkVgViewerBase;
+class vtkVQTerrainSource;
+class vtkVQTrackingClip;
+class vtkVgVideoNode;
+
+class vgKwaArchive;
+
+struct vvQueryResult;
+
+class vqArchiveVideoSource;
+class vqContour;
+class vqQueryParser;
+class vqTrackingClipViewer;
+class vtkVgVideoViewer;
+
+class vqCore : public QObject
+{
+  Q_OBJECT
+
+public:
+  typedef long long ResultId;
+  typedef long long ResultRank;
+
+  enum LoadQueryFlag
+    {
+    GroundTruth = 0x1,
+    SavePersistent = 0x2
+    };
+  Q_DECLARE_FLAGS(LoadQueryFlags, LoadQueryFlag)
+
+  enum NodeColorMode
+    {
+    ColorByRank = 0x0,
+    ColorByRelativeScore = 0x1,
+    ColorByAbsoluteScore = 0x2
+    };
+
+  vqCore();
+  virtual ~vqCore();
+
+  void setupUi(QVTKWidget*);
+
+  vtkVgViewerBase* getContextViewer();
+  vtkVgInteractorStyleRubberBand2D* getContextInteractorStyle();
+
+  void setVideoProviders(const QList<QUrl>&);
+  void setQueryServer(const QUrl&);
+
+  bool isQuerySessionActive() const;
+
+  QList<vtkVgVideoNode*> queryResultNodes();
+  QList<vtkVgVideoNode*> scoringRequestNodes();
+  QList<vtkVgVideoNode*> groundTruthNodes();
+
+  vvQueryResult* getResult(ResultId iid);
+  vvQueryResult* getGroundTruthResult(ResultId iid);
+
+  vtkVgVideoNode* getResultNode(ResultId iid);
+
+  vtkLookupTable* getLookupTable();
+
+  vqResultFilter resultFilter() const;
+
+  bool canIssueQuery();
+
+  vtkSmartPointer<vtkMatrix4x4> getLatLonToContextMatrix() const;
+  vtkSmartPointer<vtkMatrix4x4> getContextToLatLonMatrix() const;
+
+  void getCurrentPointerPosition(int& x, int& y);
+  void transformDisplayToLatLon(int x, int y, double& lat, double& lon) const;
+  void transformContextToLatLon(double x, double y, double& lat, double& lon) const;
+
+signals:
+  void displayResultsReset();
+  void resultsUpdated();
+  void resultSetComplete(bool haveSession, bool requestScoring);
+
+  void queryPlanAvailabilityChanged(bool isAvailable);
+  void queryResultsAvailabilityChanged(bool isAvailable);
+
+  void processingQuery(vvQueryInstance);
+
+  void formulationComplete(QList<vvDescriptor>,
+                           QList<vvTrack> = QList<vvTrack>());
+  void formulationFailed();
+
+  void regionComplete(vgGeocodedPoly region);
+
+  void FocusChanged(vtkVgVideoNode& node);
+  void FocusChanged(vtkVgNodeBase& node);
+
+  void NextInStack(vtkVgNodeBase& node);
+
+  void coloringChanged();
+  void updatedResultScoreIndicators();
+
+  void forcedRender();
+
+  void playedOrStopped(vtkVgVideoNode& videoNode);
+
+  void scrolledForward(vtkVgNodeBase& node, bool* eventHandled);
+  void scrolledBackward(vtkVgNodeBase& node, bool* eventHandled);
+
+  void selected(QList<vtkVgNodeBase*> nodes);
+  void activated(vtkVgNodeBase& node);
+
+  void initialRefinementRequested();
+
+public slots:
+  void registerStatusWidget(QLabel*);
+  void registerStatusWidget(QProgressBar*);
+
+  void registerStatusSource(qtStatusNotifier*);
+
+  bool loadQuery(QUrl, LoadQueryFlags = 0);
+  bool formulateQuery(vvProcessingRequest, bool bypassCache = false,
+                      qtStatusManager* statusTarget = 0);
+  bool processQuery(vvQueryInstance);
+  bool processDatabaseVideoQuery(vvQueryInstance);
+  bool requestRefinement(int resultsToScore);
+  bool refineQuery();
+
+  void displayResults(int count, int first = 0);
+  void displayGroundTruthResults(int count, int first = 0);
+
+  bool findResult(ResultId iid);
+
+  void setResultFilter(vqResultFilter);
+
+  void showBestClips(vqTrackingClipViewer* viewer);
+  void showNextTrackingClips(vtkIdType previousId, int count,
+                             vqTrackingClipViewer* viewer);
+
+  void saveQueryPlan();
+  void saveResults();
+  void exportResults(QList<vtkVgVideoNode*> results, QString exporterId);
+
+  void openExternal(QUrl clipUri, QString streamId, double time);
+
+  void generateReport(QString path, bool generateVideo);
+  void exportKml(QString path);
+
+  void setUserScore(ResultId iid, int score);
+
+  void setResultNote(ResultId iid, const QString& note);
+  void setResultStarred(ResultId iid, bool starred);
+
+  vtkSmartPointer<vtkVgGroupNode> createScene();
+
+  void start();
+  void update();
+  void postRender();
+
+  void onLeftClick();
+  void onRightButtonPress();
+  void onRightButtonRelease();
+  void onMouseWheelForward();
+  void onMouseWheelBackward();
+  void onPKeyPress();
+
+  void onContextMenuEvent();
+
+  void addRasterLayer(QUrl uri);
+
+  void drawRegion();
+  void setRegion(vgGeocodedPoly region);
+
+  void updateScene();
+  void updateSources();
+  void updateLOD(bool override = false);
+  void updateResultScoreIndicators();
+  void updateLayoutStacks();
+  void updateLayoutStackBarLocations();
+  void updateStackLayoutForVideoPlaying(vtkVgNodeBase& videoNode);
+  void updateTrackVisibility();
+
+  void videoStopped(vtkVgNodeBase& videoNode);
+
+
+  void updateStackLayoutForVideoStopped();
+  void onSelectInStackLayoutWidget(vtkObject* caller);
+
+  void activateNode(vtkVgNodeBase& node);
+  void selectNodes(QList<vtkVgNodeBase*> nodes);
+
+  void activateResult(ResultId iid);
+  void selectResult(ResultId iid);
+
+  void setColorMappingMode(NodeColorMode);
+  void setColorShadingMode(qtGradient::InterpolationMode);
+  void reloadColorGradient();
+
+  void setColorByRank()
+    { this->setColorMappingMode(ColorByRank); }
+  void setColorByRelativeScore()
+    { this->setColorMappingMode(ColorByRelativeScore); }
+  void setColorByAbsoluteScore()
+    { this->setColorMappingMode(ColorByAbsoluteScore); }
+
+  void setColorShadingDiscrete()
+    { this->setColorShadingMode(qtGradient::InterpolateDiscrete); }
+  void setColorShadingLinear()
+    { this->setColorShadingMode(qtGradient::InterpolateLinear); }
+  void setColorShadingCubic()
+    { this->setColorShadingMode(qtGradient::InterpolateCubic); }
+
+  void resetView();
+  void resetViewToQueryResults();
+
+  void setViewToExtents(double extents[4]);
+
+  void showTrackingClips(QList<vtkVgVideoNode*> nodes,
+                         vqTrackingClipViewer* viewer, int limit = 0);
+
+  void setShowQueryRegion(bool enable);
+
+  void setGroundTruthEventType(int type);
+
+  void setShowVideoClipsOnContext(bool enable);
+  void setShowVideoOutlinesOnContext(bool enable);
+  void setShowTracksOnContext(bool enable);
+
+protected slots:
+  void finalizeQueryLoading();
+
+  void formulationFinished();
+  void transferQueryStatus();
+
+  void acceptQueryResult(vvQueryResult queryResult, bool requestScoring);
+  void releaseQuery();
+
+  void queryFinished(bool requestScoring);
+
+  void completeRegion();
+
+  void forceRender();
+
+  void renderLoopOn();
+  void renderLoopOff();
+
+  void selectItemsOnContext();
+
+protected:
+  bool startQuerySession(bool formulate);
+  void endQuerySession(bool clearResults);
+  void connectParser(vqQueryParser*);
+
+  void addQueryResult(const vvQueryResult& queryResult);
+  void addGroundTruthResult(const vvQueryResult& queryResult);
+
+  void resetQueryResults(bool clearResults, bool clearDisplayResults = true);
+  void layoutResults();
+  vtkSmartPointer<vtkVgNodeBase> addResultNode(const vvQueryResult& queryResult,
+                                               vtkVgVideoNode*& node,
+                                               bool useSpatialFilter,
+                                               bool isGroundTruth = false,
+                                               int eventTypeFilter = -1);
+  void createScoringRequestNode(ResultId iid);
+  void unregisterAllNodes();
+
+  bool updateTerrainSource();
+
+  void colorNodesByRank();
+  void colorNodesByRelativeScore();
+  void colorNodesByAbsoluteScore();
+  void recomputeNodeColors();
+  void updateNodeColor(vtkVgVideoNode* node);
+  void updateTrackColors();
+
+  void setLutValue(int index, const QColor& color);
+
+  vqContour* createStaticContour(vgGeocodedPoly region, bool finalized);
+
+  bool filterSpatially(vqArchiveVideoSource* arVideoSource,
+                       const std::vector<vvDescriptor>& descriptors);
+  bool resultPassesFilters(ResultId iid) const;
+
+  void addTrackToContextTrackModel(vtkVgVideoNode* node);
+
+  virtual void timerEvent(QTimerEvent* event);
+
+  void setupTracksOnContext();
+
+  void selectClipsOnContext(int* startScreenPosition, int* endScreenPosition);
+  void selectTracksOnContext(int* startScreenPosition, int* endScreenPosition);
+
+  vtkVgNodeBase* findNodeByTrackId(vtkIdType id);
+
+  void CacheDatabaseQueryResults(vvQueryResult result);
+  void ExtractTracksAndDescriptorsFromCache();
+
+  vtkVgVideoNode* addResult(ResultId iid, bool useSpatialFilter);
+
+  void lodToggleVisibility(double scaleBoundary, int stateUnder,
+                           bool events, bool markers, bool override);
+  void toggleVisibility(QHash<ResultId, vtkVgVideoNode*>& nodes,
+                        int value, bool events, bool markers);
+
+  double                                            TerrainBounds[6];
+
+  vtkSmartPointer<vtkVgVideoViewer>                 ContextViewer;
+  vtkSmartPointer<vtkVgInteractorStyleRubberBand2D> ContextInteractorStyle;
+
+  double                                            ApplicationStartTime;
+  vtkSmartPointer<vtkTimerLog>                      TimerLog;
+  vtkVgTimeStamp                                    ApplicationTimeStamp;
+
+  vtkSmartPointer<vtkVQTerrainSource>               TerrainSource;
+
+  vtkSmartPointer<vtkVgTransformNode>               ContextSceneRoot;
+  vtkSmartPointer<vtkVgTransformNode>               ContextVideoRoot;
+
+  std::vector<vtkVQBlastLayoutNode::SmartPtr>       LayoutNodes;
+
+  vvQueryInstance                                   SavedQueryPlan;
+  bool                                              SavePersistentQuery;
+
+  QHash<ResultId, vvQueryResult>                    QueryResults;
+  QMultiMap<ResultRank, ResultId>                   QueryScoreMap;
+
+  QHash<ResultId, vvQueryResult>                    GroundTruthResults;
+  QMultiMap<double, ResultId>                       GroundTruthScoreMap;
+
+  QHash<ResultId, vtkVgVideoNode*>                  QueryResultNodes;
+  QHash<ResultId, vtkVgVideoNode*>                  ScoringRequestNodes;
+  QHash<ResultId, vtkVgVideoNode*>                  GroundTruthNodes;
+
+  vqResultFilter                                    ResultFilter;
+  QSet<ResultId>                                    StarResults;
+
+  QList<vtkVgVideoNode*>                            QueryResultNodeList;
+  QList<vtkVgVideoNode*>                            ScoringRequestNodeList;
+  QList<vtkVgVideoNode*>                            GroundTruthNodeList;
+
+  bool                                              QueryResultNodesDirty;
+  bool                                              ScoringRequestNodesDirty;
+  bool                                              GroundTruthNodesDirty;
+
+  QScopedPointer<vgKwaArchive>                      VideoArchive;
+  QUrl                                              QueryServer;
+  QBasicTimer                                       ClickTimer;
+
+  vqQueryParser*                                    ActiveQueryParser;
+
+  double                                            ViewScaleFactor;
+  double                                            LastEventViewScale;
+  double                                            LastMarkerViewScale;
+
+  NodeColorMode                                     NodeColorMappingMode;
+  qtGradient::InterpolationMode                     NodeColorShadingMode;
+
+  vtkSmartPointer<vtkLookupTable>                   ItemColorLUT;
+
+  vqContour*                                         Contour;
+  vqContour*                                         QueryRegionContour;
+
+  bool                                              DrawingContour;
+  bool                                              QueryRegionVisible;
+
+  vtkVQBlastLayoutNode*                             CachedLayoutNode;
+
+  bool                                              SpatialFilterActive;
+  bool                                              FilterOnEnterTripEvents;
+  bool                                              FilterOnExitTripEvents;
+
+  bool                                              ProcessingDatabaseQuery;
+
+  int LastClickPosition[2];
+  int LastRightClickPosition[2];
+
+  qtStatusManager* StatusManager;
+  qtStatusSource InteractionStatusSource;
+
+  QObject QuerySessionDummyObject;
+  qtStatusSource QuerySessionStatusSource;
+
+  QVTKWidget* RenderWidget;
+
+  vtkSmartPointer<vtkVgContourOperatorManager>      QueryResultSelector;
+  vtkSmartPointer<vtkVgTripWireManager>             QueryTripWireManager;
+
+  int                                               UpdateIntervalMSec;
+  QTimer*                                           UpdateTimer;
+
+  bool ReceivingGroundTruthResults;
+  int  GroundTruthEventType;
+
+  bool RenderPending;
+
+  bool ContinuousRender;
+
+  vtkSmartPointer<vtkVgTrackNode>                   TrackNode;
+
+  bool ShowVideoClipsOnContext;
+  bool ShowVideoOutlinesOnContext;
+  bool ShowTracksOnContext;
+
+  int SkipInitialDisplayCounter;
+
+  vtkSmartPointer<vtkVgContourOperatorManager>     ContextTracksSelector;
+
+  QList<vvQueryResult>                           DatabaseQueryResultsCache;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vqCore::LoadQueryFlags)
+
+#endif
diff --git a/Applications/Viqui/vqDebug.cxx b/Applications/Viqui/vqDebug.cxx
new file mode 100644
index 00000000..67a26d8e
--- /dev/null
+++ b/Applications/Viqui/vqDebug.cxx
@@ -0,0 +1,9 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtDebugImpl.h>
+
+#include "vqDebug.h"
diff --git a/Applications/Viqui/vqDebug.h b/Applications/Viqui/vqDebug.h
new file mode 100644
index 00000000..6259ceef
--- /dev/null
+++ b/Applications/Viqui/vqDebug.h
@@ -0,0 +1,16 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqDebug_h
+#define __vqDebug_h
+
+#include <qtDebug.h>
+
+QTE_DEBUG_AREA(vqd, StatusManager,             false);
+QTE_DEBUG_AREA(vqd, QueryParserCache,          false);
+QTE_DEBUG_AREA(vqd, FilterResults,             true);
+
+#endif
diff --git a/Applications/Viqui/vqEventInfo.cxx b/Applications/Viqui/vqEventInfo.cxx
new file mode 100644
index 00000000..f153a953
--- /dev/null
+++ b/Applications/Viqui/vqEventInfo.cxx
@@ -0,0 +1,101 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqEventInfo.h"
+
+#include <QSettings>
+#include <QStringList>
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+vqEventInfo eventFromSettings(QSettings& settings, int type)
+{
+  vqEventInfo ei;
+  ei.Type = type;
+
+  const QString defaultName = QString("Unknown type %1").arg(type);
+
+  settings.beginGroup(QString::number(type));
+  ei.Name = settings.value("Name", defaultName).toString();
+  settings.endGroup();
+
+  return ei;
+}
+
+//-----------------------------------------------------------------------------
+QList<vqEventInfo> eventsFromGroup(QSettings& settings,
+                                   const QString& settingsGroup)
+{
+  // Load event types
+  settings.beginGroup(settingsGroup);
+  QList<vqEventInfo> events;
+  foreach (QVariant v, settings.value("Types").toList())
+    events.append(eventFromSettings(settings, v.toInt()));
+  settings.endGroup();
+
+  return events;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+QList<vqEventInfo> vqEventInfo::types(vqEventInfo::Groups groups)
+{
+  QSettings settings;
+  settings.beginGroup("EventTypes");
+
+  QList<vqEventInfo> events;
+
+  if (groups.testFlag(vqEventInfo::Person))
+    events += eventsFromGroup(settings, "Person");
+  if (groups.testFlag(vqEventInfo::Vehicle))
+    events += eventsFromGroup(settings, "Vehicle");
+
+  return events;
+}
+
+//-----------------------------------------------------------------------------
+QSet<int> vqEventInfo::searchableTypes()
+{
+  // Generate default value
+  QVariantList allTypes;
+  foreach (const vqEventInfo& ei, vqEventInfo::types())
+    allTypes.append(ei.Type);
+
+  // Get value from settings
+  QSettings settings;
+  settings.beginGroup("EventTypes");
+  QVariantList values = settings.value("SearchableTypes", allTypes).toList();
+
+  // Convert to set
+  QSet<int> result;
+  foreach (const QVariant& value, values)
+    result.insert(value.toInt());
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+int vqEventInfo::staticTypeArraySize()
+{
+  // Return the size of the fixed-size array containing threshold values for
+  // all known event types... really should be a better way to do this!
+  QSettings settings;
+  settings.beginGroup("EventTypes");
+  return settings.value("FixedSize", 0).toInt();
+}
+
+//-----------------------------------------------------------------------------
+QString vqEventInfo::name(int type)
+{
+  foreach (const vqEventInfo& ei, vqEventInfo::types())
+    {
+    if (ei.Type == type)
+      return ei.Name;
+    }
+  return QString("Unknown type %1").arg(type);
+}
diff --git a/Applications/Viqui/vqEventInfo.h b/Applications/Viqui/vqEventInfo.h
new file mode 100644
index 00000000..6420016c
--- /dev/null
+++ b/Applications/Viqui/vqEventInfo.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqEventInfo_h
+#define __vqEventInfo_h
+
+#include <QList>
+#include <QSet>
+#include <QString>
+
+struct vqEventInfo
+{
+  int Type;
+  QString Name;
+
+  enum Group
+    {
+    Person      = 0x1,
+    Vehicle     = 0x2,
+    All         = 0xff
+    };
+  Q_DECLARE_FLAGS(Groups, Group)
+
+  static QList<vqEventInfo> types(Groups = All);
+  static QSet<int> searchableTypes();
+  static int staticTypeArraySize();
+
+  static QString name(int type);
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vqEventInfo::Groups)
+
+#endif
diff --git a/Applications/Viqui/vqPredefinedQueryCache.cxx b/Applications/Viqui/vqPredefinedQueryCache.cxx
new file mode 100644
index 00000000..ce2ed044
--- /dev/null
+++ b/Applications/Viqui/vqPredefinedQueryCache.cxx
@@ -0,0 +1,251 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqPredefinedQueryCache.h"
+#include "vqPredefinedQueryCachePrivate.h"
+
+#include <QApplication>
+#include <QDebug>
+#include <QDir>
+#include <QHBoxLayout>
+#include <QLabel>
+
+#include <qtOverlayWidget.h>
+#include <qtThrobber.h>
+
+#include "vqQueryParser.h"
+#include "vqScopedOverrideCursor.h"
+#include "vqSettings.h"
+
+QTE_IMPLEMENT_D_FUNC(vqPredefinedQueryCache)
+
+//-----------------------------------------------------------------------------
+class vqPredefinedQueryCacheWaitDialog : public QDialog
+{
+public:
+  explicit vqPredefinedQueryCacheWaitDialog(
+    QWidget* parent = 0, Qt::WindowFlags f = 0) : QDialog(parent, f) {}
+  virtual ~vqPredefinedQueryCacheWaitDialog() {}
+
+  virtual void reject() { /* disallow */ }
+};
+
+//-----------------------------------------------------------------------------
+vqPredefinedQueryCachePrivate::vqPredefinedQueryCachePrivate()
+  : PlansReady(false), Running(false), Interrupt(false)
+{
+  QTE_REGISTER_METATYPE(vqPredefinedQueryList);
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryCachePrivate::run()
+{
+  QString path = vqSettings().predefinedQueryUri().toLocalFile();
+  if (path.isEmpty())
+    {
+    // No plans available; return immediately
+    emit this->loadingComplete(vqPredefinedQueryList());
+    return;
+    }
+
+  QDir dir(path);
+
+  QStringList filters;
+  filters << "*.vqp";
+  dir.setNameFilters(filters);
+  dir.setFilter(QDir::Readable | QDir::Files);
+
+  QStringList files = dir.entryList();
+
+  // Loop over files
+  foreach (QString fileName, files)
+    {
+    if (this->Interrupt)
+      {
+      // We were interrupted; die immediately (parent will be waiting on our
+      // thread, not a signal)
+      return;
+      }
+
+    if (fileName.startsWith('.'))
+      {
+      // Ignore hidden files
+      continue;
+      }
+
+    // Load the query plan
+    this->loadQuery(path, fileName);
+    }
+
+  // Done
+  emit this->loadingComplete(this->LoadedPlans);
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryCachePrivate::loadQuery(
+  const QString& path, const QString& fileName)
+{
+  this->CurrentlyLoadingPlan = fileName;
+  const QString filePath = QString("%1/%2").arg(path, fileName);
+
+  // Set up query parser to load query
+  vqQueryParser parser;
+  connect(&parser, SIGNAL(planAvailable(vvQueryInstance)),
+          this, SLOT(acceptLoadedQuery(vvQueryInstance)),
+          Qt::QueuedConnection);
+  connect(&parser, SIGNAL(error(qtStatusSource, QString)),
+          this, SLOT(abortQueryLoading(qtStatusSource, QString)),
+          Qt::QueuedConnection);
+
+  // Fire off query load, and wait on parser to finish
+  parser.loadQuery(QUrl::fromLocalFile(filePath));
+  qtThread::run();
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryCachePrivate::acceptLoadedQuery(vvQueryInstance query)
+{
+  // For the moment at least, predefined retrieval queries don't really make
+  // sense, since they don't have any options we would want to pass along (i.e.
+  // they are not interesting compared to just selecting the respective query
+  // type)... and also, they have no descriptors, which would work out rather
+  // poorly given that our user, vqPredefinedQueryDialog, is a subclass of
+  // vvAbstractSimilarityQueryDialog... so we only accept similarity queries
+  if (query.isSimilarityQuery())
+    {
+    // Add query to internal list
+    const QFileInfo fi(this->CurrentlyLoadingPlan);
+    this->LoadedPlans.insert(fi.completeBaseName(), query);
+    }
+
+  // Interrupt wait loop to continue to next file
+  this->quit();
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryCachePrivate::abortQueryLoading(
+  qtStatusSource, QString error)
+{
+  qDebug() << "vqPredefinedQueryCache: Error loading query from"
+           << this->CurrentlyLoadingPlan << '-' << qPrintable(error);
+  this->quit();
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryCachePrivate::reload()
+{
+  vqScopedOverrideCursor oc(Qt::BusyCursor);
+
+  // Interrupt running thread (if any)
+  this->Interrupt = true;
+  this->wait();
+
+  // Reset and reload
+  this->Interrupt = false;
+  this->PlansReady = false;
+  this->start();
+  this->Running = true;
+}
+
+//-----------------------------------------------------------------------------
+vqPredefinedQueryList vqPredefinedQueryCachePrivate::getAvailableQueryPlans()
+{
+  // Wait for plans to become available
+  if (!this->PlansReady)
+    {
+    vqPredefinedQueryCacheWaitDialog waitDialog;
+    this->WaitDialog = &waitDialog;
+
+    qtOverlayWidget* widget = new qtOverlayWidget(&waitDialog);
+
+    qtThrobber* throbber = new qtThrobber(widget);
+    throbber->setMinimumSize(64, 64);
+    throbber->setActive(true);
+
+    QLabel* label = new QLabel(widget);
+    label->setText("Loading query plans;\nPlease be patient...");
+
+    widget->addWidget(throbber);
+    widget->addWidget(label);
+
+    QHBoxLayout* layout = new QHBoxLayout;
+    layout->addWidget(widget);
+
+    waitDialog.setLayout(layout);
+    waitDialog.resize(layout->minimumSize());
+
+    if (!this->Running)
+      {
+      // If for some reason we are not already loading the plans, do so now
+      this->reload();
+      }
+
+    // Show wait dialog until plans are ready
+    waitDialog.exec();
+    }
+
+  return this->AvailableQueryPlans;
+}
+
+//-----------------------------------------------------------------------------
+vqPredefinedQueryCache* vqPredefinedQueryCache::instance()
+{
+  static vqPredefinedQueryCache* theInstance = 0;
+  if (!theInstance)
+    {
+    // If our singleton has not yet been created, create it now, parented to
+    // the QApplication so that it will get cleaned up
+    theInstance = new vqPredefinedQueryCache(qApp);
+    }
+  return theInstance;
+}
+
+//-----------------------------------------------------------------------------
+vqPredefinedQueryCache::vqPredefinedQueryCache(QObject* parent)
+  : QObject(parent), d_ptr(new vqPredefinedQueryCachePrivate)
+{
+  QTE_D(vqPredefinedQueryCache);
+  connect(d, SIGNAL(loadingComplete(vqPredefinedQueryList)),
+          this, SLOT(setAvailableQueryPlans(vqPredefinedQueryList)));
+}
+
+//-----------------------------------------------------------------------------
+vqPredefinedQueryCache::~vqPredefinedQueryCache()
+{
+  QTE_D(vqPredefinedQueryCache);
+  d->Interrupt = true;
+  d->quit();
+  d->wait();
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryCache::reload()
+{
+  vqPredefinedQueryCache::instance()->d_func()->reload();
+}
+
+//-----------------------------------------------------------------------------
+vqPredefinedQueryList vqPredefinedQueryCache::getAvailableQueryPlans()
+{
+  return vqPredefinedQueryCache::instance()->d_func()->getAvailableQueryPlans();
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryCache::setAvailableQueryPlans(
+  vqPredefinedQueryList plans)
+{
+  QTE_D(vqPredefinedQueryCache);
+  d->PlansReady = true;
+  d->AvailableQueryPlans = plans;
+  d->wait();
+  d->Running = false;
+
+  if (d->WaitDialog)
+    {
+    // We're done; close wait dialog
+    d->WaitDialog.data()->accept();
+    }
+}
diff --git a/Applications/Viqui/vqPredefinedQueryCache.h b/Applications/Viqui/vqPredefinedQueryCache.h
new file mode 100644
index 00000000..351b15d4
--- /dev/null
+++ b/Applications/Viqui/vqPredefinedQueryCache.h
@@ -0,0 +1,45 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqPredefinedQueryCache_h
+#define __vqPredefinedQueryCache_h
+
+#include <QHash>
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vvQueryInstance.h>
+
+typedef QHash<QString, vvQueryInstance> vqPredefinedQueryList;
+
+class vqPredefinedQueryCachePrivate;
+
+class vqPredefinedQueryCache : public QObject
+{
+  Q_OBJECT
+
+public:
+  virtual ~vqPredefinedQueryCache();
+
+  static void reload();
+  static QHash<QString, vvQueryInstance> getAvailableQueryPlans();
+
+protected slots:
+  void setAvailableQueryPlans(vqPredefinedQueryList);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vqPredefinedQueryCache)
+  vqPredefinedQueryCache(QObject* parent);
+
+  static vqPredefinedQueryCache* instance();
+
+private:
+  QTE_DECLARE_PRIVATE(vqPredefinedQueryCache)
+  Q_DISABLE_COPY(vqPredefinedQueryCache)
+};
+
+#endif
diff --git a/Applications/Viqui/vqPredefinedQueryCachePrivate.h b/Applications/Viqui/vqPredefinedQueryCachePrivate.h
new file mode 100644
index 00000000..18dad148
--- /dev/null
+++ b/Applications/Viqui/vqPredefinedQueryCachePrivate.h
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqPredefinedQueryCachePrivate_h
+#define __vqPredefinedQueryCachePrivate_h
+
+#include <QDialog>
+#include <QWeakPointer>
+
+#include <qtStatusSource.h>
+#include <qtThread.h>
+
+#include "vqPredefinedQueryCache.h"
+
+class vqPredefinedQueryCachePrivate : public qtThread
+{
+  Q_OBJECT
+
+public:
+  vqPredefinedQueryCachePrivate();
+  virtual ~vqPredefinedQueryCachePrivate() {}
+
+  void reload();
+  vqPredefinedQueryList getAvailableQueryPlans();
+
+  bool PlansReady;
+  bool Running;
+  vqPredefinedQueryList AvailableQueryPlans;
+  QWeakPointer<QDialog> WaitDialog;
+
+  volatile bool Interrupt;
+
+signals:
+  void loadingComplete(vqPredefinedQueryList);
+
+protected slots:
+  void acceptLoadedQuery(vvQueryInstance);
+  void abortQueryLoading(qtStatusSource, QString);
+
+protected:
+  virtual void run();
+
+  void loadQuery(const QString& path, const QString& fileName);
+
+  QString CurrentlyLoadingPlan;
+  vqPredefinedQueryList LoadedPlans;
+
+private:
+  Q_DISABLE_COPY(vqPredefinedQueryCachePrivate)
+};
+
+#endif
diff --git a/Applications/Viqui/vqPredefinedQueryDialog.cxx b/Applications/Viqui/vqPredefinedQueryDialog.cxx
new file mode 100644
index 00000000..4dddedc5
--- /dev/null
+++ b/Applications/Viqui/vqPredefinedQueryDialog.cxx
@@ -0,0 +1,552 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqPredefinedQueryDialog.h"
+#include "ui_predefinedQuery.h"
+
+#include <QButtonGroup>
+#include <QDesktopWidget>
+#include <QGroupBox>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QSettings>
+#include <QStringList>
+#include <QVBoxLayout>
+
+#include <qtMap.h>
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include "vqEventInfo.h"
+#include "vqPredefinedQueryCache.h"
+#include "vqSettings.h"
+
+QTE_IMPLEMENT_D_FUNC(vqPredefinedQueryDialog)
+
+//-----------------------------------------------------------------------------
+static inline bool operator==(const vvDescriptor& a, const vvDescriptor& b)
+{
+  return vvDescriptor::compare(a, b, vvDescriptor::CompareDetection);
+}
+
+//-----------------------------------------------------------------------------
+class vqPredefinedQueryDialogPrivate
+{
+public:
+  vqPredefinedQueryDialogPrivate(vqPredefinedQueryDialog* q) : q_ptr(q) {}
+
+  bool loadQueries();
+  bool setupClassifierGroup();
+  void addClassifierDescriptors(std::vector<vvDescriptor>& dest,
+                                int type, double value) const;
+
+  Ui::vqPredefinedQueryDialog UI;
+  QButtonGroup* Buttons;
+
+  struct PredefinedClassifierInfo
+    {
+    QStringList ModuleNames;
+    QString DescriptorName;
+    };
+
+  QHash<int, vvQueryInstance> Queries;
+  QHash<int, PredefinedClassifierInfo> PredefinedClassifiers;
+
+  vvQueryInstance CurrentQuery;
+  QString LastError;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vqPredefinedQueryDialog)
+
+
+  struct Group
+    {
+    Group() {}
+    Group(const QString& name) : Name(name) {}
+
+    QString Name;
+    QList<QRadioButton*> Buttons;
+    };
+
+  int populateGroup(QSettings& settings, const QString& groupName);
+  void addClassifierDescriptor(std::vector<vvDescriptor>& dest,
+                               int type, const QString& moduleName,
+                               const QString& descriptorName,
+                               double value) const;
+
+private:
+  QTE_DECLARE_PUBLIC(vqPredefinedQueryDialog)
+};
+
+//-----------------------------------------------------------------------------
+bool vqPredefinedQueryDialogPrivate::loadQueries()
+{
+  QString path = vqSettings().predefinedQueryUri().toLocalFile();
+  if (path.isEmpty())
+    {
+    this->LastError = "Location for predefined queries has not been set.";
+    return false;
+    }
+
+  // Get predefined query plans from cache
+  vqPredefinedQueryList plans =
+    vqPredefinedQueryCache::getAvailableQueryPlans();
+  if (plans.isEmpty())
+    {
+    this->LastError = "No valid query plans found in configured location.";
+    return false;
+    }
+
+  QList<Group> groups;
+  groups.append(Group("Ungrouped"));
+  Group* ungroupedGroup = &groups.first();
+  Group* lastGroup = 0;
+  int currentId = 0;
+
+  // Get sorted query names
+  QStringList queryNames = qtUtil::localeSort(plans.keys());
+
+  // Loop over queries
+  foreach (QString queryName, queryNames)
+    {
+    // Get plan now, before we start monkeying with the name
+    vvQueryInstance plan = plans[queryName];
+
+    // Extract group for item, treating '.' as a group separator (i.e. file
+    // names look like 'group.child.vqp')
+    Group* group = 0;
+    int n = queryName.indexOf('.');
+    if (n < 0)
+      {
+      // Query has no group
+      group = ungroupedGroup;
+      }
+    else
+      {
+      // Split name into group name and query name
+      QString groupName = queryName.left(n);
+      queryName = queryName.mid(n + 1);
+
+      // Check if this belongs to the current group
+      if (!(lastGroup && groupName == lastGroup->Name))
+        {
+        // No; must make new group
+        groups.append(Group(groupName));
+        lastGroup = &groups.last();
+        }
+      group = lastGroup;
+      }
+
+    // Create radio button for this query
+    QRadioButton* button = new QRadioButton(this->UI.buttonBox);
+    button->setText(queryName);
+    group->Buttons.append(button);
+    this->Buttons->addButton(button, currentId);
+
+    // Add query to map
+    this->Queries.insert(currentId, plan);
+    ++currentId;
+    }
+
+  // Create group boxes for each group
+  QVBoxLayout* topLayout = new QVBoxLayout();
+  topLayout->setMargin(0);
+  foreach (Group group, groups)
+    {
+    if (!group.Buttons.isEmpty())
+      {
+      QGroupBox* groupBox = new QGroupBox();
+      QVBoxLayout* groupLayout = new QVBoxLayout();
+      groupBox->setLayout(groupLayout);
+      groupBox->setTitle(group.Name);
+
+      qtUtil::mapBound(group.Buttons, groupLayout,
+                       &QVBoxLayout::addWidget, 0, Qt::Alignment(0));
+      topLayout->addWidget(groupBox);
+      }
+    }
+  this->UI.groupsWidget->setLayout(topLayout);
+
+  // Success
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vqPredefinedQueryDialogPrivate::setupClassifierGroup()
+{
+  QSettings settings;
+  settings.beginGroup("PredefinedClassifiers");
+  int count = this->populateGroup(settings, "Person");
+  count += this->populateGroup(settings, "Vehicle");
+  settings.endGroup();
+
+  if (count == 0)
+    {
+    this->UI.classifierGroup->setVisible(false);
+    return false;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+int vqPredefinedQueryDialogPrivate::populateGroup(QSettings& settings,
+                                                  const QString& groupName)
+{
+  settings.beginGroup(groupName);
+
+  int numAdded = 0;
+  int group = this->UI.classifierFilter->beginGroup(groupName, true);
+  QStringList childGroupList = settings.childGroups();
+  foreach (QString childGroup, childGroupList)
+    {
+    settings.beginGroup(childGroup);
+    if (settings.contains("DisplayName") &&
+        settings.contains("ClassifierIndex") &&
+        settings.contains("DescriptorName") &&
+        settings.contains("ModuleName"))
+      {
+      int type = settings.value("ClassifierIndex").toInt();
+      this->UI.classifierFilter->addItem(type,
+                                         settings.value("DisplayName").toString());
+      this->UI.classifierFilter->setValue(type, 0.1);
+      PredefinedClassifierInfo info;
+      info.DescriptorName = settings.value("DescriptorName").toString();
+      info.ModuleNames = settings.value("ModuleName").toStringList();
+      this->PredefinedClassifiers.insert(type, info);
+      numAdded++;
+      }
+    settings.endGroup();
+    }
+  this->UI.classifierFilter->endGroup();
+  this->UI.classifierFilter->setExpanded(group);
+  this->UI.classifierFilter->setGroupState(group, false);
+
+  settings.endGroup();
+
+  return numAdded;
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryDialogPrivate::addClassifierDescriptors(
+  std::vector<vvDescriptor>& dest, int type, double value) const
+{
+  QHash<int, PredefinedClassifierInfo>::const_iterator infoIter =
+    this->PredefinedClassifiers.find(type);
+  foreach (QString moduleName, infoIter->ModuleNames)
+    {
+    this->addClassifierDescriptor(dest, type, moduleName,
+                                  infoIter->DescriptorName, value);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryDialogPrivate::addClassifierDescriptor(
+  std::vector<vvDescriptor>& dest, int type, const QString& moduleName,
+  const QString& descriptorName, double value) const
+{
+  vvDescriptor desc;
+
+  desc.DescriptorName = stdString(descriptorName);
+  desc.Values.clear();
+
+  int minSize = qMax(vqEventInfo::staticTypeArraySize(), type + 1);
+  desc.Values.push_back(std::vector<float>());
+  desc.Values[0].assign(minSize, -1.0);
+
+  desc.Values[0][type] = value;
+
+  desc.ModuleName = stdString(moduleName);
+  dest.push_back(desc);
+}
+
+//-----------------------------------------------------------------------------
+vqPredefinedQueryDialog::vqPredefinedQueryDialog(QWidget* parent,
+                                                 Qt::WindowFlags flags)
+  : vvAbstractSimilarityQueryDialog(parent, flags),
+    d_ptr(new vqPredefinedQueryDialogPrivate(this))
+{
+  QTE_D(vqPredefinedQueryDialog);
+
+  d->Buttons = new QButtonGroup(this);
+  connect(d->Buttons, SIGNAL(buttonPressed(int)),
+          SLOT(selectQuery(int)));
+
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  // Disallow accept with nothing selected
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+  // Load queries (must do now so setSelectedDescriptors can work)
+  d->loadQueries();
+
+  if (d->setupClassifierGroup())
+    {
+    connect(d->UI.classifierGroup, SIGNAL(toggled(bool)),
+            SLOT(toggleClassifierGroup(bool)));
+    connect(d->UI.classifierFilter, SIGNAL(stateChanged(int, bool)),
+            SLOT(enableAcceptIfClassifiersSelected()));
+
+    }
+}
+
+//-----------------------------------------------------------------------------
+vqPredefinedQueryDialog::~vqPredefinedQueryDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vqPredefinedQueryDialog::similarity() const
+{
+  QTE_D_CONST(vqPredefinedQueryDialog);
+  if (d->UI.classifierGroup->isChecked())
+    {
+    return 10.0;  // 0.1 * 100
+    }
+  else if (d->CurrentQuery.isSimilarityQuery())
+    {
+    const double s =
+      d->CurrentQuery.constSimilarityQuery()->SimilarityThreshold;
+    return qRound(s * 100.0);
+    }
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vvTrack> vqPredefinedQueryDialog::selectedTracks() const
+{
+  QTE_D_CONST(vqPredefinedQueryDialog);
+  return (!d->UI.classifierGroup->isChecked() &&
+          d->CurrentQuery.isSimilarityQuery()
+          ? d->CurrentQuery.constSimilarityQuery()->Tracks
+          : std::vector<vvTrack>());
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vvDescriptor> vqPredefinedQueryDialog::selectedDescriptors() const
+{
+  QTE_D_CONST(vqPredefinedQueryDialog);
+  if (d->UI.classifierGroup->isChecked())
+    {
+    // build up vector of classifier descriptors and return them
+    std::vector<vvDescriptor> classifierDescriptors;
+
+    foreach (int type, d->UI.classifierFilter->keys())
+      {
+      if (d->UI.classifierFilter->state(type))
+        {
+        d->addClassifierDescriptors(classifierDescriptors, type,
+                                    d->UI.classifierFilter->value(type));
+        }
+      }
+    return classifierDescriptors;
+    }
+  return (d->CurrentQuery.isSimilarityQuery()
+          ? d->CurrentQuery.constSimilarityQuery()->Descriptors
+          : std::vector<vvDescriptor>());
+}
+
+//-----------------------------------------------------------------------------
+std::vector<unsigned char> vqPredefinedQueryDialog::iqrModel() const
+{
+  QTE_D_CONST(vqPredefinedQueryDialog);
+  return (!d->UI.classifierGroup->isChecked() &&
+          d->CurrentQuery.isSimilarityQuery()
+          ? d->CurrentQuery.constSimilarityQuery()->IqrModel
+          : std::vector<unsigned char>());
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryDialog::setSelectedDescriptors(
+  const std::vector<vvDescriptor>& descriptors)
+{
+  QTE_D(vqPredefinedQueryDialog);
+
+  typedef QHash<int, vvQueryInstance>::const_iterator QueryIterator;
+  foreach_iter (QueryIterator, iter, d->Queries)
+    {
+    const vvSimilarityQuery* sq = iter.value().constSimilarityQuery();
+    if (sq && sq->Descriptors == descriptors)
+      {
+      d->Buttons->button(iter.key())->setChecked(true);
+      this->selectQuery(iter.key());
+      return;
+      }
+    }
+
+
+  // Try to get exact match against Classifiers (if present)
+  if (d->UI.classifierGroup->isHidden())
+    {
+    return;
+    }
+
+  bool fullMatch = true;
+  std::vector<vvDescriptor> testDescriptors = descriptors;
+  foreach (int type, d->UI.classifierFilter->keys())
+    {
+    std::vector<vvDescriptor> classifierDescriptors;
+    d->addClassifierDescriptors(classifierDescriptors, type,
+                                d->UI.classifierFilter->value(type));
+
+    // see if EVERY descriptor in classifierDescriptors is in
+    // testDescriptors (remove when match found)
+    bool classifierMatched = true, partialMatch = false;
+    std::vector<vvDescriptor>::iterator classifierIter, testIter;
+    for (classifierIter = classifierDescriptors.begin();
+         classifierIter != classifierDescriptors.end(); classifierIter++)
+      {
+      bool matchFound = false;
+      for (testIter = testDescriptors.begin();
+           testIter != testDescriptors.end(); testIter++)
+        {
+        if (*testIter == *classifierIter)
+          {
+          testDescriptors.erase(testIter);
+          matchFound = true;
+          partialMatch = true;
+          break;
+          }
+        }
+      if (!matchFound)
+        {
+        classifierMatched = false;
+        break;
+        }
+      }
+
+    // if completely matched, check the item; if partially matched, can't
+    // exactly match incoming, thus clear all'
+    if (classifierMatched)
+      {
+      d->UI.classifierFilter->setState(type, true);
+      }
+    else if (partialMatch)
+      {
+      fullMatch = false;
+      break;
+      }
+
+    if (testDescriptors.empty())
+      {
+      break;
+      }
+    }
+
+  // wasn't able to get exact mtching set - clear all
+  if (!fullMatch || !testDescriptors.empty())
+    {
+    foreach (int type, d->UI.classifierFilter->keys())
+      {
+      d->UI.classifierFilter->setState(type, false);
+      }
+    }
+  else // make sure Classifiers is checked (found exact match)
+    {
+    d->UI.classifierGroup->setChecked(true);
+    d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vqPredefinedQueryDialog::exec()
+{
+  QTE_D(vqPredefinedQueryDialog);
+
+  if (d->Queries.isEmpty() && d->PredefinedClassifiers.isEmpty())
+    {
+    QMessageBox::warning(this, QString(), d->LastError);
+    return QDialog::Rejected;
+    }
+
+  // Qt does not allow a visible widget to become modal, so we must explicitly
+  // set modality before calling show()
+  const bool wasModal = this->isModal();
+  this->setModal(true);
+  this->show();
+
+  // Calculate minimum or fixed size, depending on contents
+  const QSize contentSize = d->UI.contentWidget->layout()->minimumSize();
+  const QSize screenSize = QDesktopWidget().availableGeometry(this).size();
+  d->UI.scrollArea->setMinimumWidth(contentSize.width());
+  d->UI.scrollArea->setMaximumHeight(contentSize.height());
+  if (contentSize.height() < 0.6 * screenSize.height())
+    {
+    d->UI.scrollArea->setMinimumSize(contentSize);
+    this->setFixedSize(this->layout()->minimumSize());
+    }
+  else
+    {
+    const int wPad = this->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
+    const int width = this->layout()->minimumSize().width() + wPad;
+    const int height = qRound(0.6 * screenSize.height());
+    d->UI.scrollArea->setMinimumHeight(height >> 1);
+    this->setMaximumSize(this->layout()->maximumSize());
+    this->setFixedWidth(width);
+    this->resize(width, height);
+    }
+
+  const int result = QDialog::exec();
+  this->setModal(wasModal);
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryDialog::selectQuery(int id)
+{
+  QTE_D(vqPredefinedQueryDialog);
+  d->CurrentQuery = d->Queries[id];
+  QPushButton* acceptButton = d->UI.buttonBox->button(QDialogButtonBox::Ok);
+  acceptButton->setEnabled(d->CurrentQuery.isValid());
+  if (d->UI.classifierGroup->isChecked())
+    {
+    // if a radio button is selected, make sure Classifier GroupBox is not
+    d->UI.classifierGroup->blockSignals(true);
+    d->UI.classifierGroup->setChecked(false);
+    d->UI.classifierGroup->blockSignals(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryDialog::toggleClassifierGroup(bool state)
+{
+  QTE_D(vqPredefinedQueryDialog);
+  if (state && d->Buttons->checkedButton())
+    {
+    // radio button was checked; need to clear it as now Classifiers is checked
+    d->Buttons->setExclusive(false);
+    d->Buttons->checkedButton()->setChecked(false);
+    d->Buttons->setExclusive(true);
+    this->enableAcceptIfClassifiersSelected();
+    }
+  else
+    {
+    // don't allow unchecking of Classifiers by clicking on checkbox (must
+    // select a radio button to do so)
+    d->UI.classifierGroup->blockSignals(true);
+    d->UI.classifierGroup->setChecked(true);
+    d->UI.classifierGroup->blockSignals(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqPredefinedQueryDialog::enableAcceptIfClassifiersSelected()
+{
+  QTE_D(vqPredefinedQueryDialog);
+  QPushButton* acceptButton = d->UI.buttonBox->button(QDialogButtonBox::Ok);
+  bool classifierChecked = false;
+  foreach (int type, d->UI.classifierFilter->keys())
+    {
+    if (d->UI.classifierFilter->state(type))
+      {
+      classifierChecked = true;
+      break;
+      }
+    }
+  acceptButton->setEnabled(classifierChecked);
+}
diff --git a/Applications/Viqui/vqPredefinedQueryDialog.h b/Applications/Viqui/vqPredefinedQueryDialog.h
new file mode 100644
index 00000000..e7a18413
--- /dev/null
+++ b/Applications/Viqui/vqPredefinedQueryDialog.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqPredefinedQueryDialog_h
+#define __vqPredefinedQueryDialog_h
+
+#include <qtGlobal.h>
+#include <qtStatusSource.h>
+
+#include <vvQueryInstance.h>
+
+#include <vvAbstractSimilarityQueryDialog.h>
+
+class QUrl;
+
+class vqPredefinedQueryDialogPrivate;
+
+class vqPredefinedQueryDialog : public vvAbstractSimilarityQueryDialog
+{
+  Q_OBJECT
+
+public:
+  vqPredefinedQueryDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vqPredefinedQueryDialog();
+
+  int similarity() const;
+  virtual std::vector<vvTrack> selectedTracks() const;
+  virtual std::vector<vvDescriptor> selectedDescriptors() const;
+  std::vector<unsigned char> iqrModel() const;
+
+  virtual void setSelectedDescriptors(const std::vector<vvDescriptor>&);
+
+
+public slots:
+  virtual int exec();
+
+protected slots:
+  void selectQuery(int id);
+  void toggleClassifierGroup(bool state);
+  void enableAcceptIfClassifiersSelected();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vqPredefinedQueryDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vqPredefinedQueryDialog)
+  Q_DISABLE_COPY(vqPredefinedQueryDialog)
+};
+
+#endif
diff --git a/Applications/Viqui/vqQueryDialog.cxx b/Applications/Viqui/vqQueryDialog.cxx
new file mode 100644
index 00000000..d6639d51
--- /dev/null
+++ b/Applications/Viqui/vqQueryDialog.cxx
@@ -0,0 +1,1050 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqQueryDialog.h"
+#include "ui_query.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QSettings>
+#include <QTextStream>
+
+#include <qtKstReader.h>
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vgGeodesy.h>
+
+#include <vgFileDialog.h>
+#include <vgGeoUtil.h>
+#include <vgUnixTime.h>
+
+#include <vvMakeId.h>
+#include <vvKstReader.h>
+#include <vvKstWriter.h>
+
+#include <vvAbstractSimilarityQueryDialog.h>
+
+#include <cmath>
+
+#include "vqClassifierQueryDialog.h"
+#include "vqCore.h"
+#include "vqPredefinedQueryDialog.h"
+#include "vqQueryParser.h"
+#include "vqRegionEditDialog.h"
+#include "vqUtil.h"
+#include "vqVideoQueryDialog.h"
+
+QTE_IMPLEMENT_D_FUNC(vqQueryDialog)
+
+//BEGIN vqQueryDialogPrivate
+
+//-----------------------------------------------------------------------------
+class vqQueryDialogPrivate
+{
+public:
+  enum QueryType
+    {
+    Unspecified         = 0,
+    ImageQuery          = 0x10,
+    VideoQuery          = 0x11,
+    DatabaseQuery       = 0x1e,
+    ExemplarQuery       = 0x1f,
+    ClassifierQuery     = 0x20,
+    TrackQuery          = 0x40,
+    SavedQuery          = 0x80,
+    PredefinedQuery     = 0x81
+    };
+
+  struct Exemplar
+    {
+    std::string Uri;
+    std::vector<vvDescriptor> Descriptors;
+    };
+
+  vqQueryDialogPrivate(vqQueryDialog* q) : q_ptr(q) {}
+
+  void savePersistentQuery();
+
+  void setLastQuery(const std::string& uri,
+                    const std::vector<vvDescriptor>& descriptors);
+  void clearLastQuery();
+
+  bool editSimilarityQuery(vvAbstractSimilarityQueryDialog* dialog,
+                           int forceSimilarity,
+                           std::vector<vvDescriptor>& selectedDescriptors);
+
+  void editExemplarQuery(Exemplar&, vvQueryFormulationType);
+  void editPredefinedQuery();
+  void editClassifierQuery();
+  void editTrackQuery();
+
+  void setQueryRegion(vgGeocodedPoly region);
+
+  void updateQuery();
+  void fixupQuery();
+
+  static QString dmsString(double coord, char dp, char dn);
+
+  Ui::vqQueryDialog UI;
+  vqCore* core_;
+  vvQueryInstance query_;
+  QString error_;
+
+  Exemplar LastVideoQuery;
+  Exemplar LastImageQuery;
+  Exemplar LastDatabaseQuery;
+  Exemplar LastExemplarQuery;
+  std::vector<vvDescriptor> LastPredefinedQueryDescriptors;
+  std::vector<vvDescriptor> LastClassifierQueryDescriptors;
+
+  QueryType queryType_;
+  bool editTypeOnIndexChange_;
+
+  bool UseAdvancedUi;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vqQueryDialog)
+
+private:
+  QTE_DECLARE_PUBLIC(vqQueryDialog)
+};
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::setLastQuery(
+  const std::string& uri, const std::vector<vvDescriptor>& descriptors)
+{
+  this->LastImageQuery.Uri = uri;
+  this->LastImageQuery.Descriptors = descriptors;
+  this->LastVideoQuery.Uri = uri;
+  this->LastVideoQuery.Descriptors = descriptors;
+  this->LastExemplarQuery.Uri = uri;
+  this->LastExemplarQuery.Descriptors = descriptors;
+  this->LastPredefinedQueryDescriptors = descriptors;
+  this->LastClassifierQueryDescriptors = descriptors;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::clearLastQuery()
+{
+  this->LastImageQuery.Uri.clear();
+  this->LastImageQuery.Descriptors.clear();
+  this->LastVideoQuery.Uri.clear();
+  this->LastVideoQuery.Descriptors.clear();
+  this->LastExemplarQuery.Uri.clear();
+  this->LastExemplarQuery.Descriptors.clear();
+  this->LastPredefinedQueryDescriptors.clear();
+  this->LastClassifierQueryDescriptors.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::savePersistentQuery()
+{
+  QSettings settings;
+  settings.beginGroup("Query");
+
+  // Save query type
+  settings.setValue("Type", this->queryType_);
+
+  // Save query
+  QString data;
+  QTextStream stream(&data, QIODevice::WriteOnly);
+  vvKstWriter writer(stream, false);
+  stream << vvKstWriter::QueryPlanVersion << ';';
+  writer << this->query_;
+  settings.setValue("Data", data);
+
+  // Save relevancy (in case the query is a retrieval query)
+  settings.setValue("Relevancy", this->UI.relevancySpin->value());
+
+  // Save spatial limit enabled/disabled state (since we store the filter mode
+  // in the query data, above, regardless of enabled/disabled)
+  settings.setValue("UseSpatialLimit", this->UI.regionLimit->isChecked());
+
+  // Save if the IQR model (if present) should be used
+  settings.setValue("UseIqrModel", this->UI.useIqrModel->isChecked());
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryDialogPrivate::editSimilarityQuery(
+  vvAbstractSimilarityQueryDialog* dialog, int forceSimilarity,
+  std::vector<vvDescriptor>& selectedDescriptors)
+{
+  QTE_Q(vqQueryDialog);
+
+  dialog->setSelectedDescriptors(selectedDescriptors);
+  if (dialog->exec())
+    {
+    this->query_ = vvSimilarityQuery(*this->query_.abstractQuery());
+    vvSimilarityQuery& query = *this->query_.similarityQuery();
+    query.StreamIdLimit.clear();
+    query.Tracks = dialog->selectedTracks();
+    query.Descriptors = dialog->selectedDescriptors();
+    selectedDescriptors = query.Descriptors;
+    q->resetQueryId();
+
+    // \TODO: remove when user set relevancy is functional
+    this->UI.relevancySpin->setValue(forceSimilarity);
+    this->UI.relevancySlider->setEnabled(true);
+    this->UI.relevancySpin->setEnabled(true);
+
+    this->updateQuery();
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::editExemplarQuery(
+  Exemplar& exemplar, vvQueryFormulationType type)
+{
+  QTE_Q(vqQueryDialog);
+
+  vqVideoQueryDialog vqDialog(this->UseAdvancedUi, q);
+  vqDialog.initialize();
+
+  QObject::connect(this->core_,
+                   SIGNAL(formulationComplete(QList<vvDescriptor>,
+                                              QList<vvTrack>)),
+                   &vqDialog,
+                   SLOT(setQueryTracksAndDescriptors(QList<vvDescriptor>,
+                        QList<vvTrack>)));
+
+  QObject::connect(this->core_,
+                   SIGNAL(formulationFailed()),
+                   &vqDialog,
+                   SLOT(clearQueryDescriptors()));
+
+  QObject::connect(&vqDialog,
+                   SIGNAL(queryFormulationRequested(vvProcessingRequest,
+                                                    bool,
+                                                    qtStatusManager*)),
+                   this->core_,
+                   SLOT(formulateQuery(vvProcessingRequest,
+                                       bool, qtStatusManager*)));
+
+  // \TODO ideally this if () should not be needed...
+  if (type == vvQueryFormulation::FromDatabase)
+    {
+    const QUrl uri = qtUrl(this->LastDatabaseQuery.Uri);
+
+    // \TODO need to pass limits as part of URI
+    QUrl bareUri = uri;
+    bareUri.setEncodedQuery(QByteArray());
+    vqDialog.setExemplarUri(stdString(bareUri), type);
+
+    // \TODO all of this should be done in the QF dialog
+    vvQueryInstance qi(vvDatabaseQuery::Retrieval);
+    vvRetrievalQuery* query = qi.retrievalQuery();
+
+    query->QueryId = vvMakeId("VIQUI-QF");
+    query->StreamIdLimit = stdString(bareUri);
+    query->TemporalLowerLimit = uri.queryItemValue("StartTime").toLongLong();
+    query->TemporalUpperLimit = uri.queryItemValue("EndTime").toLongLong();
+    query->RequestedEntities = vvRetrievalQuery::TracksAndDescriptors;
+
+    emit q->readyToProcessDatabaseVideoQuery(qi);
+
+    vqDialog.setTimeRange(query->TemporalLowerLimit,
+                          query->TemporalUpperLimit,
+                          uri.queryItemValue("InitialTime").toDouble());
+    }
+  else
+    {
+    vqDialog.setExemplarUri(exemplar.Uri, type);
+    }
+
+  if (this->editSimilarityQuery(&vqDialog, 0, exemplar.Descriptors))
+    {
+    vvSimilarityQuery& query = *this->query_.similarityQuery();
+    query.StreamIdLimit = vqDialog.exemplarUri();
+    exemplar.Uri = query.StreamIdLimit;
+    this->updateQuery();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::editPredefinedQuery()
+{
+  QTE_Q(vqQueryDialog);
+
+  vqPredefinedQueryDialog pqDialog(q);
+
+  std::vector<vvDescriptor>& descriptors =
+    this->LastPredefinedQueryDescriptors;
+  if (this->editSimilarityQuery(&pqDialog, 0, descriptors))
+    {
+    vvSimilarityQuery& query = *this->query_.similarityQuery();
+    query.IqrModel = pqDialog.iqrModel();
+    // \TODO: remove when user set relevancy is functional
+    this->UI.relevancySpin->setValue(pqDialog.similarity());
+    this->updateQuery();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::editClassifierQuery()
+{
+  QTE_Q(vqQueryDialog);
+
+  vqClassifierQueryDialog cqDialog(q);
+  this->editSimilarityQuery(&cqDialog, 10,
+                            this->LastClassifierQueryDescriptors);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::editTrackQuery()
+{
+  QTE_Q(vqQueryDialog);
+
+  this->query_ = vvRetrievalQuery(*this->query_.abstractQuery());
+  vvRetrievalQuery& query = *this->query_.retrievalQuery();
+  query.StreamIdLimit.clear();
+  query.RequestedEntities = vvRetrievalQuery::Tracks;
+  q->resetQueryId();
+
+  this->UI.relevancySlider->setEnabled(false);
+  this->UI.relevancySpin->setEnabled(false);
+  this->updateQuery();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::setQueryRegion(vgGeocodedPoly region)
+{
+  QTE_Q(vqQueryDialog);
+
+  const vgGeocodedCoordinate coord = vgGeodesy::regionCenter(region);
+  this->UI.region->setText(vgGeodesy::coordString(coord));
+
+  this->query_.abstractQuery()->SpatialLimit = region;
+  q->resetQueryId();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::updateQuery()
+{
+  const vvSimilarityQuery* sq = this->query_.constSimilarityQuery();
+  const bool enable =
+    this->query_.isRetrievalQuery() || (sq && sq->Descriptors.size());
+  const bool haveIqrModel = sq && !sq->IqrModel.empty();
+
+  this->UI.queryInfo->setQuery(this->query_);
+  this->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enable);
+  this->UI.buttonSave->setEnabled(enable);
+  this->UI.useIqrModel->setEnabled(haveIqrModel);
+  this->UI.useIqrModel->setChecked(haveIqrModel);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialogPrivate::fixupQuery()
+{
+  vvDatabaseQuery* query = this->query_.abstractQuery();
+  vvSimilarityQuery* squery = this->query_.similarityQuery();
+
+  // Set query ID if invalid
+  if (query->QueryId.empty())
+    {
+    query->QueryId = vvMakeId("VIQUI");
+    }
+
+  // Set relevancy threshold
+  if (squery)
+    {
+    squery->SimilarityThreshold = 0.01 * this->UI.relevancySpin->value();
+    }
+
+  // Set geospatial filter mode
+  if (this->UI.enterEvent->isChecked())
+    {
+    query->SpatialFilter = vvDatabaseQuery::IntersectsInbound;
+    }
+  else if (this->UI.exitEvent->isChecked())
+    {
+    query->SpatialFilter = vvDatabaseQuery::IntersectsOutbound;
+    }
+  else if (this->UI.crossEvent->isChecked())
+    {
+    query->SpatialFilter = vvDatabaseQuery::Intersects;
+    }
+  else
+    {
+    query->SpatialFilter = vvDatabaseQuery::ContainsAny;
+    }
+
+  // Set temporal limit
+  query->TemporalLowerLimit =
+    vgUnixTime(this->UI.timeLower->dateTime()).toInt64();
+  query->TemporalUpperLimit =
+    vgUnixTime(this->UI.timeUpper->dateTime()).toInt64();
+
+  if (this->UI.timeLimit->isChecked())
+    {
+    query->TemporalFilter = vvDatabaseQuery::ContainsAny;
+    }
+  else
+    {
+    query->TemporalFilter = vvDatabaseQuery::Ignore;
+    }
+}
+
+//END vqQueryDialogPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vqQueryDialog
+
+//-----------------------------------------------------------------------------
+vqQueryDialog::vqQueryDialog(vqCore* core, bool useAdvancedUi,
+                             QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags), d_ptr(new vqQueryDialogPrivate(this))
+{
+  QTE_D(vqQueryDialog);
+
+  d->core_ = core;
+  d->queryType_ = vqQueryDialogPrivate::Unspecified;
+  d->editTypeOnIndexChange_ = false;
+  d->UseAdvancedUi = useAdvancedUi;
+
+  d->UI.setupUi(this);
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  // Set default min/max values for temporal limit, and default initial value
+  QDateTime epoch = QDateTime::fromMSecsSinceEpoch(0).toUTC();
+  d->UI.timeLower->setMinimumDateTime(epoch.addYears(-40));
+  d->UI.timeUpper->setMinimumDateTime(epoch.addYears(-40));
+  d->UI.timeLower->setMaximumDateTime(epoch.addYears(530).addSecs(-1));
+  d->UI.timeUpper->setMaximumDateTime(epoch.addYears(530).addSecs(-1));
+  QDateTime now = QDateTime::currentDateTime();
+  d->UI.timeUpper->setDateTime(now);
+  d->UI.timeLower->setDateTime(now.addMonths(-1));
+
+  // Add primary query types
+  d->UI.queryType->addItem("Video Exemplar",
+                           vqQueryDialogPrivate::VideoQuery);
+  d->UI.queryType->addItem("Image Exemplar",
+                           vqQueryDialogPrivate::ImageQuery);
+  d->UI.queryType->addItem("System Predefined",
+                           vqQueryDialogPrivate::PredefinedQuery);
+  d->UI.queryType->addItem("User Saved",
+                           vqQueryDialogPrivate::SavedQuery);
+
+  // Connect primary UI actions
+  connect(d->UI.queryType, SIGNAL(highlighted(int)),
+          this, SLOT(preSetQueryType()));
+  connect(d->UI.queryType, SIGNAL(activated(int)),
+          this, SLOT(setQueryType(int)));
+  connect(d->UI.pickRegionGraphic, SIGNAL(clicked()),
+          this, SLOT(requestRegion()));
+  connect(d->UI.pickRegionNumeric, SIGNAL(clicked()),
+          this, SLOT(editRegionNumeric()));
+
+  connect(d->UI.editQuery, SIGNAL(clicked()),
+          this, SLOT(editQuery()));
+
+  connect(d->UI.buttonLoad, SIGNAL(clicked()),
+          this, SLOT(loadQuery()));
+  connect(d->UI.buttonSave, SIGNAL(clicked()),
+          this, SLOT(saveQuery()));
+
+  // Connect correlated UI controls
+  connect(d->UI.timeLower, SIGNAL(editingFinished()),
+          this, SLOT(updateTimeUpperFromLower()));
+  connect(d->UI.timeUpper, SIGNAL(editingFinished()),
+          this, SLOT(updateTimeLowerFromUpper()));
+
+  // Reset query ID when query changed, for UI controls that directly manipulate
+  // the query
+  connect(d->UI.relevancySpin, SIGNAL(valueChanged(int)),
+          this, SLOT(resetQueryId()));
+
+  connect(d->UI.timeLower, SIGNAL(dateTimeChanged(const QDateTime&)),
+          this, SLOT(resetQueryId()));
+  connect(d->UI.timeUpper, SIGNAL(dateTimeChanged(const QDateTime&)),
+          this, SLOT(resetQueryId()));
+  connect(d->UI.timeLimit, SIGNAL(toggled(bool)),
+          this, SLOT(resetQueryId()));
+
+  connect(d->UI.regionLimit, SIGNAL(toggled(bool)),
+          this, SLOT(resetQueryId()));
+  connect(d->UI.enterEvent, SIGNAL(toggled(bool)),
+          this, SLOT(resetQueryId()));
+  connect(d->UI.exitEvent, SIGNAL(toggled(bool)),
+          this, SLOT(resetQueryId()));
+  connect(d->UI.crossEvent, SIGNAL(toggled(bool)),
+          this, SLOT(resetQueryId()));
+  connect(d->UI.anyEvent, SIGNAL(toggled(bool)),
+          this, SLOT(resetQueryId()));
+
+  // GUI spatial filtering options disabled for now
+  d->UI.enterEvent->setVisible(false);
+  d->UI.exitEvent->setVisible(false);
+  d->UI.crossEvent->setVisible(false);
+  d->UI.anyEvent->setVisible(false);
+
+  // Set up initial query
+  d->query_ = vvDatabaseQuery();
+  d->updateQuery();
+
+  // Set up UI for Analyst/Engineering mode
+  if (useAdvancedUi)
+    {
+    // ENGINEERING mode
+    // Add advanced query types
+    d->UI.queryType->addItem("Track Retrieval",
+                             vqQueryDialogPrivate::TrackQuery);
+    d->UI.queryType->addItem("Exemplar (Advanced)",
+                             vqQueryDialogPrivate::ExemplarQuery);
+    d->UI.queryType->addItem("Classifier (Advanced)",
+                             vqQueryDialogPrivate::ClassifierQuery);
+    }
+  else
+    {
+    // ANALYST mode
+    // Hide load/save controls in Analyst mode
+    d->UI.buttonLoad->hide();
+    d->UI.buttonSave->hide();
+    }
+
+  // \TODO: remove when user set relevancy is functional
+  // Right now, the relevancy score is not meaningful, except that it must be
+  // within a certain value that is NOT [0,1]. So, hide the UI for now. We will
+  // still use the UI controls for internal synchronization.
+  d->UI.relevancySlider->hide();
+  d->UI.relevancySpin->hide();
+  d->UI.labelRelevancy->hide();
+  this->resize(this->layout()->minimumSize());
+}
+
+//-----------------------------------------------------------------------------
+vqQueryDialog::~vqQueryDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::accept()
+{
+  QTE_D(vqQueryDialog);
+
+  d->fixupQuery();
+  d->savePersistentQuery();
+
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::initiateDatabaseQuery(
+  std::string videoUri, long long startTimeLimit, long long endTimeLimit,
+  long long initialTime)
+{
+  QTE_D(vqQueryDialog);
+
+  QUrl uri = qtUrl(videoUri);
+  uri.addQueryItem("StartTime",   QString::number(startTimeLimit));
+  uri.addQueryItem("EndTime",     QString::number(endTimeLimit));
+  uri.addQueryItem("InitialTime", QString::number(initialTime));
+
+  d->LastDatabaseQuery.Descriptors.clear();
+  d->LastDatabaseQuery.Uri = stdString(uri);
+
+  d->queryType_ = vqQueryDialogPrivate::DatabaseQuery;
+
+  // \NOTE Disabled for now... \TODO revisit this decision in future
+  // \TODO Add this functionality in general from query type drop down?
+  d->UI.editQuery->setEnabled(false);
+  d->UI.queryType->setEnabled(false);
+
+  this->editQuery();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::loadPersistentQuery()
+{
+  QTE_D(vqQueryDialog);
+
+  vvKstReader reader;
+  QString data;
+
+  QSettings settings;
+  settings.beginGroup("Query");
+
+  // Reload query type
+  QVariant queryType =
+    d->UI.queryType->itemData(d->UI.queryType->currentIndex());
+  queryType = settings.value("Type", queryType);
+  d->UI.queryType->setCurrentIndex(d->UI.queryType->findData(queryType));
+  this->setQueryType(d->UI.queryType->currentIndex());
+
+  // Clear old descriptors and exemplar URI's
+  d->clearLastQuery();
+
+  // Reload query
+  vvQueryInstance query;
+  data = settings.value("Data").toString();
+  if (!data.isEmpty())
+    {
+    qtKstReader kst(data);
+    int version;
+    if (kst.readInt(version) && kst.nextRecord()
+        && reader.readQueryPlan(kst, query, version))
+      {
+      this->setQuery(query, false);
+      }
+    }
+
+  // Reload relevancy
+  d->UI.relevancySpin->setValue(
+    settings.value("Relevancy", d->UI.relevancySpin->value()).toInt());
+
+  // Reload spatial limit toggle
+  d->UI.regionLimit->setChecked(
+    settings.value("UseSpatialLimit", false).toBool());
+
+  // Reload IQR model toggle
+  d->UI.useIqrModel->setChecked(
+    settings.value("UseIqrModel", false).toBool());
+
+  // Reset query ID (will have been cleared by setting UI controls to new query)
+  if (query.isValid())
+    {
+    d->query_.abstractQuery()->QueryId = query.abstractQuery()->QueryId;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::savePersistentQuery(const vvQueryInstance& query)
+{
+  QSettings settings;
+  settings.beginGroup("Query");
+
+  // Save query type
+  settings.setValue("Type", vqQueryDialogPrivate::SavedQuery);
+
+  // Save query
+  QString data;
+  QTextStream stream(&data, QIODevice::WriteOnly);
+  vvKstWriter writer(stream, false);
+  stream << vvKstWriter::QueryPlanVersion << ';';
+  writer << query;
+  settings.setValue("Data", data);
+
+  // Don't store independent relevancy, as it isn't available
+  settings.remove("Relevancy");
+
+  // Spatial limit option is persisted separate from the filter mode in the
+  // query, but for this purpose, if the query did not enable filtering, that
+  // information is unfortunately lost... therefore, if the query had a spatial
+  // filter mode, use it
+  const vvDatabaseQuery* q = query.constAbstractQuery();
+  settings.setValue("UseSpatialLimit",
+                    q && q->SpatialFilter != vvDatabaseQuery::Ignore);
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance vqQueryDialog::query()
+{
+  QTE_D(vqQueryDialog);
+
+  d->fixupQuery();
+  vvQueryInstance query = d->query_;
+
+  // Set geospatial limit (actually, clear if disabled; it is already set)
+  if (!d->UI.regionLimit->isChecked())
+    {
+    query.abstractQuery()->SpatialLimit.GCS = -1;
+    query.abstractQuery()->SpatialLimit.Coordinate.clear();
+    query.abstractQuery()->SpatialFilter = vvDatabaseQuery::Ignore;
+    }
+
+  // Set temporal limit (actually, clear if disabled; it is already set)
+  if (!d->UI.timeLimit->isChecked())
+    {
+    query.abstractQuery()->TemporalLowerLimit = -1;
+    query.abstractQuery()->TemporalUpperLimit = -1;
+    query.abstractQuery()->TemporalFilter = vvDatabaseQuery::Ignore;
+    }
+
+  // Clear IqrModel if there is one (useIqrModel enabled) but don't want to use
+  if (d->UI.useIqrModel->isEnabled() && !d->UI.useIqrModel->isChecked())
+    {
+    query.similarityQuery()->IqrModel.clear();
+    }
+
+  // Done
+  return query;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::preSetQueryType()
+{
+  QTE_D(vqQueryDialog);
+  d->editTypeOnIndexChange_ = true;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::setQueryType(int index)
+{
+  QTE_D(vqQueryDialog);
+
+  const int newType = d->UI.queryType->itemData(index).toInt();
+
+  bool edit = d->editTypeOnIndexChange_;
+  d->editTypeOnIndexChange_ = false;
+
+  if (newType == vqQueryDialogPrivate::Unspecified)
+    {
+    d->UI.queryType->blockSignals(true);
+    index = d->UI.queryType->findData(d->queryType_);
+    d->UI.queryType->setCurrentIndex(index);
+    d->UI.queryType->blockSignals(false);
+    return;
+    }
+
+  if (newType != d->queryType_)
+    {
+    if (newType == vqQueryDialogPrivate::TrackQuery)
+      {
+      d->UI.editQuery->setEnabled(false);
+      d->editTrackQuery();
+      }
+    else
+      {
+      d->query_ = vvSimilarityQuery(*d->query_.abstractQuery());
+      vvSimilarityQuery& query = *d->query_.similarityQuery();
+      switch (newType)
+        {
+        case vqQueryDialogPrivate::ImageQuery:
+          query.StreamIdLimit = d->LastImageQuery.Uri;
+          query.Descriptors = d->LastImageQuery.Descriptors;
+          break;
+        case vqQueryDialogPrivate::VideoQuery:
+          query.StreamIdLimit = d->LastVideoQuery.Uri;
+          query.Descriptors = d->LastVideoQuery.Descriptors;
+          break;
+        case vqQueryDialogPrivate::ExemplarQuery:
+          query.StreamIdLimit = d->LastExemplarQuery.Uri;
+          query.Descriptors = d->LastExemplarQuery.Descriptors;
+          break;
+        case vqQueryDialogPrivate::PredefinedQuery:
+          query.StreamIdLimit.clear();
+          query.Descriptors = d->LastPredefinedQueryDescriptors;
+        case vqQueryDialogPrivate::ClassifierQuery:
+          query.StreamIdLimit.clear();
+          query.Descriptors = d->LastClassifierQueryDescriptors;
+        default:
+          query.StreamIdLimit.clear();
+          break;
+        }
+      this->resetQueryId();
+      d->UI.editQuery->setEnabled(true);
+      }
+    d->queryType_ = static_cast<vqQueryDialogPrivate::QueryType>(newType);
+    d->updateQuery();
+    }
+
+  if (edit)
+    this->editQuery();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::editQuery()
+{
+  QTE_D(vqQueryDialog);
+
+  switch (d->queryType_)
+    {
+    case vqQueryDialogPrivate::ImageQuery:
+      d->editExemplarQuery(d->LastImageQuery, vvQueryFormulation::FromImage);
+      break;
+    case vqQueryDialogPrivate::VideoQuery:
+      d->editExemplarQuery(d->LastVideoQuery, vvQueryFormulation::FromVideo);
+      break;
+    case vqQueryDialogPrivate::DatabaseQuery:
+      d->editExemplarQuery(d->LastDatabaseQuery,
+                           vvQueryFormulation::FromDatabase);
+      break;
+    case vqQueryDialogPrivate::ExemplarQuery:
+      d->editExemplarQuery(d->LastExemplarQuery,
+                           vvQueryFormulation::UserDefined);
+      break;
+    case vqQueryDialogPrivate::ClassifierQuery:
+      d->editClassifierQuery();
+      break;
+    case vqQueryDialogPrivate::TrackQuery:
+      d->editTrackQuery();
+      break;
+    case vqQueryDialogPrivate::PredefinedQuery:
+      d->editPredefinedQuery();
+      break;
+    case vqQueryDialogPrivate::SavedQuery:
+      this->loadQuery();
+      break;
+    default:
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::loadQuery()
+{
+  QString fileName = vgFileDialog::getOpenFileName(
+                       this, "Load saved query...", QString(),
+                       "VisGUI Query Plans (*.vqp *.vqpx);;"
+                       "All files (*)");
+
+  if (!fileName.isEmpty())
+    {
+    QTE_D(vqQueryDialog);
+
+    vqQueryParser parser;
+    connect(&parser, SIGNAL(planAvailable(vvQueryInstance)),
+            this, SLOT(setQuery(vvQueryInstance)));
+    connect(&parser, SIGNAL(error(qtStatusSource, QString)),
+            this, SLOT(setError(qtStatusSource, QString)));
+    d->error_.clear();
+
+    if (!parser.loadQuery(QUrl::fromLocalFile(fileName)))
+      {
+      QString msg = "A problem occurred while reading the query file.\n\n"
+                    "Parser output:\n" + d->error_;
+      QMessageBox::critical(this, "Error loading query", msg);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::setQuery(vvQueryInstance query, bool setType)
+{
+  QTE_D(vqQueryDialog);
+
+  d->query_ = query;
+
+  const vvDatabaseQuery& aq = *d->query_.constAbstractQuery();
+  const vvRetrievalQuery* rq = d->query_.constRetrievalQuery();
+  const vvSimilarityQuery* sq = d->query_.constSimilarityQuery();
+
+  // May load a query from QueryDialog that already has a loaded query (which
+  // had an IQR model, thus disabling editQuery and queryType)
+  d->UI.editQuery->setEnabled(true);
+  d->UI.queryType->setEnabled(true);
+
+  // Set UI query type (if loading from file, i.e. not persistent query)
+  if (setType)
+    {
+    if (rq && rq->RequestedEntities == vvRetrievalQuery::Tracks)
+      {
+      d->queryType_ = vqQueryDialogPrivate::TrackQuery;
+      const int index = d->UI.queryType->findData(d->queryType_);
+      d->UI.queryType->setCurrentIndex(index);
+      d->UI.editQuery->setEnabled(false);
+      }
+    else
+      {
+      d->queryType_ = vqQueryDialogPrivate::SavedQuery;
+      const int index = d->UI.queryType->findData(d->queryType_);
+      d->UI.queryType->setCurrentIndex(index);
+      // Try to use this query's descriptors to preset query type descriptors
+      d->setLastQuery(sq->StreamIdLimit, sq->Descriptors);
+      }
+    }
+  else if (sq)
+    {
+    // If loading persistent query, since we know the query type, only set
+    // query descriptors for the type of query this actually is
+    switch (d->queryType_)
+      {
+      case vqQueryDialogPrivate::ImageQuery:
+        d->LastImageQuery.Uri = sq->StreamIdLimit;
+        d->LastImageQuery.Descriptors = sq->Descriptors;
+        break;
+      case vqQueryDialogPrivate::VideoQuery:
+        d->LastVideoQuery.Uri = sq->StreamIdLimit;
+        d->LastVideoQuery.Descriptors = sq->Descriptors;
+        break;
+      case vqQueryDialogPrivate::ExemplarQuery:
+        d->LastExemplarQuery.Uri = sq->StreamIdLimit;
+        d->LastExemplarQuery.Descriptors = sq->Descriptors;
+        break;
+      case vqQueryDialogPrivate::PredefinedQuery:
+        d->LastPredefinedQueryDescriptors = sq->Descriptors;
+      case vqQueryDialogPrivate::ClassifierQuery:
+        d->LastClassifierQueryDescriptors = sq->Descriptors;
+      default:
+        break;
+      }
+    }
+  d->updateQuery();
+
+  // Set UI similarity
+  if (sq)
+    {
+    d->UI.relevancySpin->setValue(100.0 * sq->SimilarityThreshold);
+    }
+
+  // Set UI temporal limit
+  d->UI.timeLimit->setChecked(
+    aq.TemporalFilter != vvDatabaseQuery::Ignore);
+  QDateTime temporalLower = vgUnixTime(aq.TemporalLowerLimit).toDateTime();
+  QDateTime temporalUpper = vgUnixTime(aq.TemporalUpperLimit).toDateTime();
+  d->UI.timeLower->setDateTime(temporalLower.toUTC());
+  d->UI.timeUpper->setDateTime(temporalUpper.toUTC());
+
+  // Set UI geospatial limit and intersect option
+  if (aq.SpatialLimit.Coordinate.size())
+    {
+    d->core_->setRegion(aq.SpatialLimit);
+    d->setQueryRegion(aq.SpatialLimit);
+    }
+  d->UI.regionLimit->setChecked(true);
+  switch (aq.SpatialFilter)
+    {
+    case vvDatabaseQuery::Ignore:
+      d->UI.regionLimit->setChecked(false);
+      break;
+    case vvDatabaseQuery::Intersects:
+      d->UI.crossEvent->setChecked(true);
+      break;
+    case vvDatabaseQuery::IntersectsInbound:
+      d->UI.enterEvent->setChecked(true);
+      break;
+    case vvDatabaseQuery::IntersectsOutbound:
+      d->UI.exitEvent->setChecked(true);
+      break;
+    default:
+      d->UI.anyEvent->setChecked(true);
+      break;
+    }
+
+  // Reset query ID (will have been cleared by setting UI controls to new query)
+  d->query_.abstractQuery()->QueryId = query.abstractQuery()->QueryId;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::setError(qtStatusSource, QString msg)
+{
+  QTE_D(vqQueryDialog);
+  if (!d->error_.isEmpty())
+    {
+    d->error_ += '\n';
+    }
+  d->error_ += msg;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::saveQuery()
+{
+  QTE_D(vqQueryDialog);
+
+  d->fixupQuery();
+  vvQueryInstance query = d->query_;
+
+  if (!d->UI.regionLimit->isChecked())
+    {
+    query.abstractQuery()->SpatialFilter = vvDatabaseQuery::Ignore;
+    }
+
+  this->saveQuery(query, this);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::saveQuery(const vvQueryInstance& query, QWidget* parent)
+{
+  QString selectedFilter;
+  QString fileName = vgFileDialog::getSaveFileName(
+                       parent, "Saved query...", QString(),
+                       "VisGUI Query Plans (*.vqp *.vqpx);;"
+                       "VisGUI Query Plans - KST (*.vqp);;"
+                       "VisGUI Query Plans - XML (*.vqpx *.xml);;"
+                       "All files (*)", &selectedFilter);
+  if (fileName.isEmpty())
+    {
+    return;
+    }
+
+  // Open output file
+  QFile file(fileName);
+  if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+    QString msg = "Unable to open file \"%1\" for writing: %2";
+    QMessageBox::critical(parent, "Error writing file",
+                          msg.arg(fileName).arg(file.errorString()));
+    return;
+    }
+
+  // Choose format from extension
+  const QString ext = QFileInfo(fileName).suffix();
+  const bool saveAsXml =
+    (ext == "xml" || ext == "vqpx" || selectedFilter.contains("XML"));
+  vvWriter::Format format = (saveAsXml ? vvWriter::Xml : vvWriter::Kst);
+
+  // Write the query plan
+  vvWriter writer(file, format);
+  writer << vvHeader::QueryPlan << query;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::resetQueryId()
+{
+  QTE_D(vqQueryDialog);
+
+  // Make the query ID empty, so we don't have to generate a new one every time
+  // the user touches something; we'll generate an ID when it becomes needed
+  d->query_.abstractQuery()->QueryId.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::updateTimeUpperFromLower()
+{
+  QTE_D(vqQueryDialog);
+  const QDateTime value = d->UI.timeLower->dateTime();
+  if (d->UI.timeUpper->dateTime() < value)
+    d->UI.timeUpper->setDateTime(value);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::updateTimeLowerFromUpper()
+{
+  QTE_D(vqQueryDialog);
+  const QDateTime value = d->UI.timeUpper->dateTime();
+  if (d->UI.timeLower->dateTime() > value)
+    d->UI.timeLower->setDateTime(value);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::requestRegion()
+{
+  QTE_D(vqQueryDialog);
+  this->hide();
+  connect(d->core_, SIGNAL(regionComplete(vgGeocodedPoly)),
+          this, SLOT(acceptDrawnRegion(vgGeocodedPoly)));
+  d->core_->drawRegion();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::acceptDrawnRegion(vgGeocodedPoly region)
+{
+  QTE_D(vqQueryDialog);
+  d->setQueryRegion(region);
+  this->show();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryDialog::editRegionNumeric()
+{
+  QTE_D(vqQueryDialog);
+
+  vqRegionEditDialog erDialog;
+  erDialog.setRegion(d->query_.abstractQuery()->SpatialLimit);
+
+  if (erDialog.exec() == QDialog::Accepted)
+    {
+    d->setQueryRegion(erDialog.region());
+    }
+}
+
+//END vqQueryDialog
diff --git a/Applications/Viqui/vqQueryDialog.h b/Applications/Viqui/vqQueryDialog.h
new file mode 100644
index 00000000..072bb6c1
--- /dev/null
+++ b/Applications/Viqui/vqQueryDialog.h
@@ -0,0 +1,75 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqQueryDialog_h
+#define __vqQueryDialog_h
+
+#include <QDateTime>
+#include <QDialog>
+
+#include <qtStatusSource.h>
+
+#include <vvQueryInstance.h>
+
+class vqCore;
+
+class vqQueryDialogPrivate;
+
+class vqQueryDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vqQueryDialog(vqCore* core, bool useAdvancedUi,
+                QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  virtual ~vqQueryDialog();
+
+  void loadPersistentQuery();
+
+  vvQueryInstance query();
+
+  void initiateDatabaseQuery(std::string videoUri, long long startTimeLimit,
+                             long long endTimeLimit, long long initialTime);
+
+  static void saveQuery(const vvQueryInstance& query, QWidget* parent = 0);
+  static void savePersistentQuery(const vvQueryInstance& query);
+
+signals:
+  void readyToProcessDatabaseVideoQuery(vvQueryInstance);
+
+public slots:
+  virtual void accept();
+
+protected slots:
+  void updateTimeUpperFromLower();
+  void updateTimeLowerFromUpper();
+
+  void preSetQueryType();
+  void setQueryType(int);
+
+  void requestRegion();
+  void acceptDrawnRegion(vgGeocodedPoly region);
+
+  void editRegionNumeric();
+
+  void editQuery();
+
+  void loadQuery();
+  void saveQuery();
+
+  void setQuery(vvQueryInstance, bool setType = true);
+  void setError(qtStatusSource, QString);
+
+  void resetQueryId();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vqQueryDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vqQueryDialog)
+};
+
+#endif
diff --git a/Applications/Viqui/vqQueryParser.cxx b/Applications/Viqui/vqQueryParser.cxx
new file mode 100644
index 00000000..0934adc8
--- /dev/null
+++ b/Applications/Viqui/vqQueryParser.cxx
@@ -0,0 +1,510 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqQueryParser.h"
+
+#include <QDir>
+#include <QFileInfo>
+
+#include <qtKstReader.h>
+#include <qtStlUtil.h>
+
+#include <vvKstReader.h>
+#include <vvKstWriter.h>
+
+#include <vgCheckArg.h>
+
+#include <vvQueryService.h>
+
+#include "vqDebug.h"
+#include "vqScopedOverrideCursor.h"
+#include "vqSettings.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+bool checkCacheDir(const QDir& cacheDir)
+{
+  // Try to create cache directory if it does not exist
+  if (!cacheDir.exists())
+    {
+    if (!cacheDir.mkpath(cacheDir.absolutePath()))
+      {
+      qtDebug(vqdQueryParserCache)
+          << "unable to update cache; cache directory" << cacheDir.path()
+          << "does not exist, and we were unable to create it";
+      return false;
+      }
+    }
+
+  return true;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+struct vqQueryParser::Internal
+{
+  Internal();
+  ~Internal();
+
+  QUrl server_;
+  QUrl cacheLocation_;
+  QUrl DescriptorCacheFile;
+  QUrl TrackCacheFile;
+  QScopedPointer<vvQuerySession> session_;
+};
+
+//-----------------------------------------------------------------------------
+vqQueryParser::Internal::Internal()
+  : session_(0)
+{
+  vqSettings settings;
+  this->cacheLocation_ = settings.queryCacheUri();
+}
+
+//-----------------------------------------------------------------------------
+vqQueryParser::Internal::~Internal()
+{
+  if (this->session_)
+    {
+    this->session_->shutdown();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vqQueryParser::vqQueryParser(const QUrl& queryServer, const QUrl& cacheUri)
+  : internal_(new vqQueryParser::Internal)
+{
+  this->internal_->server_ = queryServer;
+  if (!cacheUri.isEmpty())
+    {
+    this->internal_->cacheLocation_ = cacheUri;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vqQueryParser::~vqQueryParser()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::loadQuery(const QUrl& queryUri)
+{
+  if (queryUri.scheme().toLower() == "file")
+    {
+    // Open saved query file
+    vvReader reader;
+    vvHeader header;
+
+    if (!(reader.open(queryUri) && reader.readHeader(header)))
+      {
+      return this->syncAbort("Unable to read file " + queryUri.toString());
+      }
+
+    if (header.type == vvHeader::QueryResults)
+      {
+      // Read results from file
+      int count = 0;
+      while (!reader.atEnd())
+        {
+        vvQueryResult qre;
+
+        // vvReader (by design) won't set fields that don't exist (i.e. due to
+        // the file being an old format version), so set them up front... for
+        // now, instance ID is the only one that needs a value other than what
+        // is set by the vvQueryResult default ctor
+        qre.InstanceId = count;
+
+        // Read result
+        if (!reader.readQueryResult(qre))
+          {
+          return this->asyncAbort(reader.error());
+          }
+
+        emit this->resultAvailable(qre);
+        ++count;
+        }
+      this->postStatus("Successfully read " + QString::number(count) +
+                       " saved results");
+      emit this->resultSetComplete();
+      emit this->finished();
+      return true;
+      }
+    else if (header.type == vvHeader::QueryPlan)
+      {
+      // Read query plan
+      vvQueryInstance query;
+      if (!reader.readQueryPlan(query))
+        {
+        return this->syncAbort(reader.error());
+        }
+
+      emit this->planAvailable(query);
+      emit this->finished();
+      return true;
+      }
+    return this->syncAbort("Unsupported file format");
+    }
+  else
+    {
+    return this->syncAbort("Unsupported scheme for URI "
+                           + queryUri.toString());
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::formulateQuery(
+  vvProcessingRequest request, bool bypassCache)
+{
+  if (!this->internal_->cacheLocation_.isEmpty())
+    {
+    // Limit override cursor only for this scope (using RAII)
+    vqScopedOverrideCursor overrideCursor;
+
+    // Get the path where we expect to find the cache; even if bypassCache is
+    // enabled, we will use it later to write out the new results
+    // \TODO something more robust against duplicate names, version changes,
+    //       etc.
+    QUrl videoUri = qtUrl(request.VideoUri);
+    qtDebug(vqdQueryParserCache)
+        << "determining cache file URI for cache"
+        << this->internal_->cacheLocation_
+        << "video" << videoUri;
+
+    QFileInfo vfi(videoUri.encodedPath());
+    QUrl cf;
+    QByteArray query;
+    if (videoUri.queryItems().count())
+      {
+      typedef QPair<QString, QString> QueryItem;
+      QList<QByteArray> queryItems;
+      foreach (const QueryItem& qi, videoUri.queryItems())
+        {
+        QByteArray key = QUrl::toPercentEncoding(qi.first);
+        QByteArray value = QUrl::toPercentEncoding(qi.second);
+        queryItems.append(key + '=' + value);
+        }
+      char sep = '?';
+      do
+        {
+        query += sep + queryItems.takeFirst();
+        sep = '&';
+        }
+      while (queryItems.count());
+      }
+    cf.setEncodedPath('/' + vfi.fileName().toAscii() + query + ".vsd");
+    this->internal_->DescriptorCacheFile.setEncodedPath(
+      this->internal_->cacheLocation_.encodedPath() + cf.encodedPath());
+    qtDebug(vqdQueryParserCache)
+        << "descriptor cache file base name" << cf
+        << "final URI" << this->internal_->DescriptorCacheFile;
+    cf.setEncodedPath('/' + vfi.fileName().toAscii() + query + ".vst");
+    this->internal_->TrackCacheFile.setEncodedPath(
+      this->internal_->cacheLocation_.encodedPath() + cf.encodedPath());
+    qtDebug(vqdQueryParserCache)
+        << "track cache file base name" << cf
+        << "final URI" << this->internal_->TrackCacheFile;
+
+    while (!bypassCache)
+      {
+      qtDebug(vqdQueryParserCache) << "attempting cache load";
+
+      qtKstReader kst(this->internal_->DescriptorCacheFile);
+      vvKstReader reader;
+      vvHeader header;
+
+      // Open file with video descriptors
+      if (!(kst.isValid() && reader.readHeader(kst, header)
+            && header.type == vvHeader::Descriptors))
+        {
+        this->postStatus("Unable to read file "
+                         + this->internal_->DescriptorCacheFile.toString()
+                         + "; cache will not be used");
+        break;
+        }
+
+      // Read descriptors
+      QList<vvDescriptor> descriptors;
+      if (!reader.readDescriptors(kst, descriptors,
+                                  header.version))
+        {
+        this->postStatus("Error reading descriptors from file "
+                         + this->internal_->DescriptorCacheFile.toString()
+                         + "; cache will not be used");
+        break;
+        }
+
+      // Success; next see if we have a track cache
+      qtDebug(vqdQueryParserCache) << "descriptor cache load successful";
+
+      qtKstReader trackKst(this->internal_->TrackCacheFile);
+      bool trackCacheSucceeded = true;
+
+      // Open file with tracks
+      if (!(trackKst.isValid() && reader.readHeader(trackKst, header)
+            && header.type == vvHeader::Tracks))
+        {
+        this->postStatus("Unable to read file "
+                         + this->internal_->TrackCacheFile.toString()
+                         + "; track cache will not be used");
+        trackCacheSucceeded = false;
+        }
+
+      // Read tracks
+      QList<vvTrack> tracks;
+      if (trackCacheSucceeded && !reader.readTracks(trackKst, tracks,
+                                                    header.version))
+        {
+        this->postStatus("Error reading tracks from file "
+                         + this->internal_->TrackCacheFile.toString()
+                         + "; track cache will not be used");
+        trackCacheSucceeded = false;
+        }
+
+      if (trackCacheSucceeded)
+        {
+        this->postStatus("Cache retrieval successful", true);
+        emit this->formulationComplete(descriptors, tracks);
+        }
+      else
+        {
+        this->postStatus("Cache retrieval partially successful"
+                         " (unable to read tracks)", true);
+        emit this->formulationComplete(descriptors);
+        }
+      return true;
+      }
+    }
+
+  if (!this->beginSession())
+    {
+    return false;
+    }
+
+  return this->internal_->session_->formulateQuery(request);
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::processQuery(vvQueryInstance query)
+{
+  if (!this->beginSession())
+    {
+    return false;
+    }
+
+  query.abstractQuery()->StreamIdLimit.clear();
+  const int wss = vqSettings().iqrWorkingSetSize();
+  return this->internal_->session_->processQuery(query, wss);
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::requestScoring(int resultsToScore)
+{
+  if (!this->internal_->session_)
+    {
+    return false;
+    }
+  return this->internal_->session_->requestRefinement(resultsToScore);
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::refineQuery(vvIqr::ScoringClassifiers feedback)
+{
+  if (!this->internal_->session_)
+    {
+    return false;
+    }
+  return this->internal_->session_->refineQuery(feedback);
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::updateIqrModel(vvQueryInstance& query)
+{
+  // must be a SimilarityQuery to have IQR model to update
+  if (!this->internal_->session_ || !query.isSimilarityQuery())
+    {
+    return false;
+    }
+
+  return this->internal_->session_->updateIqrModel(query);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryParser::forwardSignal(const char* signal)
+{
+  connect(this->internal_->session_.data(), signal, this, signal);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryParser::forwardStatusMessage(qtStatusSource, QString msg)
+{
+  emit this->statusMessageAvailable(this->statusSource(), msg);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryParser::forwardProgress(qtStatusSource, bool available,
+                                    qreal value)
+{
+  emit this->progressAvailable(this->statusSource(), available, value);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryParser::forwardProgress(qtStatusSource, bool available,
+                                    int value, int steps)
+{
+  emit this->progressAvailable(this->statusSource(), available, value, steps);
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryParser::forwardError(qtStatusSource, QString msg)
+{
+  emit this->error(this->statusSource(), msg);
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::beginSession()
+{
+  if (this->internal_->session_)
+    {
+    return true;
+    }
+
+  this->internal_->session_.reset(
+    vvQueryService::createSession(this->internal_->server_));
+  if (!this->internal_->session_)
+    {
+    return this->syncAbort("No handler available for query server URI scheme "
+                           + this->internal_->server_.scheme());
+    }
+
+  this->statusSource().setName(this->internal_->session_.data());
+
+  this->forwardSignal(SIGNAL(formulationComplete(QList<vvDescriptor>,
+                                                 QList<vvTrack>)));
+  this->forwardSignal(SIGNAL(resultAvailable(vvQueryResult, bool)));
+  this->forwardSignal(SIGNAL(resultSetComplete(bool)));
+
+  connect(this->internal_->session_.data(),
+          SIGNAL(statusMessageAvailable(qtStatusSource, QString)),
+          this, SLOT(forwardStatusMessage(qtStatusSource, QString)));
+  connect(this->internal_->session_.data(),
+          SIGNAL(progressAvailable(qtStatusSource, bool, qreal)),
+          this, SLOT(forwardProgress(qtStatusSource, bool, qreal)));
+  connect(this->internal_->session_.data(),
+          SIGNAL(progressAvailable(qtStatusSource, bool, int, int)),
+          this, SLOT(forwardProgress(qtStatusSource, bool, int, int)));
+  connect(this->internal_->session_.data(),
+          SIGNAL(error(qtStatusSource, QString)),
+          this, SLOT(forwardError(qtStatusSource, QString)));
+
+  connect(this->internal_->session_.data(),
+          SIGNAL(formulationComplete(QList<vvDescriptor>,
+                                     QList<vvTrack>)),
+          this,
+          SLOT(updateTrackAndDescriptorCache(QList<vvDescriptor>,
+                                             QList<vvTrack>)));
+  connect(this->internal_->session_.data(), SIGNAL(finished()),
+          this, SLOT(queryFinished()));
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::syncAbort(const QString& message)
+{
+  this->postError(message);
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::asyncAbort(const QString& message)
+{
+  this->postError(message);
+  emit this->finished();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::updateDescriptorCache(QList<vvDescriptor> descriptors)
+{
+  // Anything to do?
+  CHECK_ARG(!this->internal_->DescriptorCacheFile.isEmpty(), true);
+
+  // Ensure cache directory exists
+  const QString cacheFileName =
+    this->internal_->DescriptorCacheFile.toLocalFile();
+  CHECK_ARG(checkCacheDir(QFileInfo(cacheFileName).dir()), false);
+
+  // Try to open cache file for writing
+  QFile file(cacheFileName);
+  if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+    qtDebug(vqdQueryParserCache)
+        << "unable to open descriptor cache file"
+        << this->internal_->DescriptorCacheFile
+        << "-" << file.errorString();
+    return false;
+    }
+
+  // Write descriptors to file
+  vvKstWriter writer(file);
+  writer << vvHeader::Descriptors << descriptors;
+
+  qtDebug(vqdQueryParserCache)
+      << "updated descriptor cache written to"
+      << this->internal_->DescriptorCacheFile;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryParser::updateTrackAndDescriptorCache(
+  QList<vvDescriptor> descriptors, QList<vvTrack> tracks)
+{
+  // First write the descriptors; if that fails, don't bother with the tracks
+  CHECK_ARG(this->updateDescriptorCache(descriptors), false);
+
+  // Anything to do?
+  CHECK_ARG(!this->internal_->TrackCacheFile.isEmpty(), true);
+
+  // Ensure cache directory exists
+  const QString cacheFileName =
+    this->internal_->TrackCacheFile.toLocalFile();
+  CHECK_ARG(checkCacheDir(QFileInfo(cacheFileName).dir()), false);
+
+  // Try to open cache file for writing
+  QFile file(cacheFileName);
+  if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+    qtDebug(vqdQueryParserCache)
+        << "unable to open track cache file" << this->internal_->TrackCacheFile
+        << "-" << file.errorString();
+    return false;
+    }
+
+  // Write tracks to file
+  vvKstWriter writer(file);
+  writer << vvHeader::Tracks << tracks;
+
+  qtDebug(vqdQueryParserCache)
+      << "updated track cache written to" << this->internal_->TrackCacheFile;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryParser::queryFinished()
+{
+  if (this->internal_->session_)
+    {
+    this->internal_->session_->shutdown();
+    this->internal_->session_.reset();
+    this->statusSource().setName(this);
+    }
+  emit this->finished();
+}
diff --git a/Applications/Viqui/vqQueryParser.h b/Applications/Viqui/vqQueryParser.h
new file mode 100644
index 00000000..97d19ff4
--- /dev/null
+++ b/Applications/Viqui/vqQueryParser.h
@@ -0,0 +1,58 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqQueryParser_h
+#define __vqQueryParser_h
+
+#include <QUrl>
+#include <QObject>
+
+#include <vvQueryNotifier.h>
+#include <vvQueryResult.h>
+#include <vvQuerySession.h>
+
+class vqQueryParser : public vvQueryNotifier
+{
+  Q_OBJECT
+
+public:
+  vqQueryParser(const QUrl& queryServerUri = QUrl(),
+                const QUrl& cacheUri = QUrl());
+  ~vqQueryParser();
+
+  bool loadQuery(const QUrl& queryUri);
+  bool formulateQuery(vvProcessingRequest request, bool bypassCache = false);
+  bool processQuery(vvQueryInstance query);
+  bool requestScoring(int resultsToScore);
+  bool refineQuery(vvIqr::ScoringClassifiers feedback);
+  bool updateIqrModel(vvQueryInstance& query);
+
+signals:
+  void planAvailable(vvQueryInstance plan);
+
+protected slots:
+  bool updateDescriptorCache(QList<vvDescriptor>);
+  bool updateTrackAndDescriptorCache(QList<vvDescriptor>, QList<vvTrack>);
+  void queryFinished();
+
+  void forwardStatusMessage(qtStatusSource, QString);
+  void forwardProgress(qtStatusSource, bool, qreal);
+  void forwardProgress(qtStatusSource, bool, int, int);
+  void forwardError(qtStatusSource, QString);
+
+protected:
+  void forwardSignal(const char* signal);
+
+  bool beginSession();
+  bool syncAbort(const QString&);
+  bool asyncAbort(const QString&);
+
+  struct Internal;
+  QScopedPointer<Internal> internal_;
+};
+
+
+#endif // __vqQueryParser_h
diff --git a/Applications/Viqui/vqQueryVideoPlayer.cxx b/Applications/Viqui/vqQueryVideoPlayer.cxx
new file mode 100644
index 00000000..7c122f34
--- /dev/null
+++ b/Applications/Viqui/vqQueryVideoPlayer.cxx
@@ -0,0 +1,136 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// Qt includes
+#include <QFileInfo>
+#include <QHash>
+#include <QMap>
+#include <QMultiHash>
+#include <QScopedPointer>
+
+// QtExtensions includes
+#include <qtUtil.h>
+
+// visgui includes
+#include <vtkVgAdapt.h>
+#include <vtkVgCompositeEventRepresentation.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+#include <vtkVgVideoModel0.h>
+#include <vtkVgVideoNode.h>
+
+// VTK includes
+#include <vtkIdList.h>
+#include <vtkPoints.h>
+
+#include <vvClipVideoRepresentation.h>
+
+// viqui includes
+#include "vqArchiveVideoSource.h"
+#include "vqQueryVideoPlayer.h"
+#include "vqSettings.h"
+
+#include <vvQueryVideoPlayerPrivate.h>
+
+struct vqQueryVideoPlayer::qvpInternal
+{
+  qvpInternal() :
+    StartTime(-1),
+    EndTime(-1)
+    {
+    }
+
+  vtkSmartPointer<vqArchiveVideoSource> VideoSource;
+
+  double StartTime;
+  double EndTime;
+};
+
+//-----------------------------------------------------------------------------
+vqQueryVideoPlayer::vqQueryVideoPlayer(QWidget* parent)
+  : vvQueryVideoPlayer(parent), MyInternal(new qvpInternal)
+{
+}
+
+//-----------------------------------------------------------------------------
+vqQueryVideoPlayer::~vqQueryVideoPlayer()
+{
+  delete MyInternal;
+}
+
+//-----------------------------------------------------------------------------
+bool vqQueryVideoPlayer::setVideoUri(QUrl uri)
+{
+  if (uri.isEmpty())
+    {
+    // Clear video source
+    this->MyInternal->VideoSource = 0;
+    return true;
+    }
+
+  // Find archive files associated with this video
+  QFileInfo vfi(uri.encodedPath());
+  QUrl archiveUri = vqSettings().queryVideoUri();
+  archiveUri.setEncodedPath(archiveUri.encodedPath() + "/"
+                            + vfi.completeBaseName().toAscii() + ".index");
+
+  this->MyInternal->VideoSource =
+    vtkSmartPointer<vqArchiveVideoSource>::New();
+  this->MyInternal->VideoSource->SetMissionId("");
+  this->MyInternal->VideoSource->SetStreamId("");
+  this->MyInternal->VideoSource->SetTimeRange(this->MyInternal->StartTime,
+                                              this->MyInternal->EndTime);
+  if (this->MyInternal->VideoSource->AcquireVideoClip(archiveUri) != VTK_OK)
+    {
+    // Not successful
+    this->MyInternal->VideoSource = 0;
+    return false;
+    }
+
+  // Load was successful; return archive
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryVideoPlayer::buildVideoModel()
+{
+  this->Internal->VideoModel = vtkSmartPointer<vtkVgVideoModel0>::New();
+  this->Internal->VideoModel->SetVideoSource(this->MyInternal->VideoSource);
+  this->Internal->VideoModel->SetUseInternalTimeStamp(1);
+  this->Internal->VideoModel->SetLooping(1);
+  this->Internal->VideoModel->SetId(0);
+}
+
+//-----------------------------------------------------------------------------
+int vqQueryVideoPlayer::videoHeight()
+{
+  static const int bestGuess = 480;
+  if (!this->Internal->VideoModel)
+    {
+    return bestGuess;
+    }
+
+  return static_cast<vqArchiveVideoSource*>(
+           this->Internal->VideoModel->GetVideoSource())->GetVideoHeight();
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryVideoPlayer::setTimeRange(double startTime, double endTime)
+{
+  this->MyInternal->StartTime = startTime;
+  this->MyInternal->EndTime = endTime;
+}
+
+//-----------------------------------------------------------------------------
+void vqQueryVideoPlayer::reset()
+{
+  this->MyInternal->VideoSource = 0;
+  vvQueryVideoPlayer::reset();
+}
diff --git a/Applications/Viqui/vqQueryVideoPlayer.h b/Applications/Viqui/vqQueryVideoPlayer.h
new file mode 100644
index 00000000..ea8f1570
--- /dev/null
+++ b/Applications/Viqui/vqQueryVideoPlayer.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqQueryVideoPlayer_h
+#define __vqQueryVideoPlayer_h
+
+#include <QUrl>
+
+#include <vvQueryVideoPlayer.h>
+
+class vqQueryVideoPlayer : public vvQueryVideoPlayer
+{
+  Q_OBJECT
+
+public:
+  vqQueryVideoPlayer(QWidget* parent = 0);
+  ~vqQueryVideoPlayer();
+
+  bool setVideoUri(QUrl uri);
+
+  virtual int videoHeight();
+
+  void setTimeRange(double startTime, double endTime);
+
+public slots:
+  virtual void reset();
+
+protected:
+  virtual void buildVideoModel();
+
+protected:
+  struct qvpInternal;
+  qvpInternal* MyInternal;
+};
+
+#endif
diff --git a/Applications/Viqui/vqRegionEditDialog.cxx b/Applications/Viqui/vqRegionEditDialog.cxx
new file mode 100644
index 00000000..ec30d912
--- /dev/null
+++ b/Applications/Viqui/vqRegionEditDialog.cxx
@@ -0,0 +1,208 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqRegionEditDialog.h"
+#include "ui_regionEdit.h"
+
+#include <QMessageBox>
+
+#include <cmath>
+
+#include <vgGeodesy.h>
+#include <vgGeoTypes.h>
+
+#include <vgGeoUtil.h>
+
+QTE_IMPLEMENT_D_FUNC(vqRegionEditDialog)
+
+static const char* MGRS_REGEXP =
+  "([1-9]|[1-5][0-9]|60)[CDEFGHJKLMNPQRSTUVWX]" // Grid designation
+  "([ABCDEFGHJKLMNPQRSTUVWXYZ][ABCDEFGHJKLMNPQRSTUV]" // Square designation
+  "([0-9][0-9]){0,5})?"; // Refinement
+
+//-----------------------------------------------------------------------------
+class vqRegionEditDialogPrivate
+{
+public:
+  double diameter() const;
+
+  Ui::vqRegionEditDialog UI;
+  vgGeocodedPoly Region;
+
+  double LastDiameter;
+};
+
+//-----------------------------------------------------------------------------
+double vqRegionEditDialogPrivate::diameter() const
+{
+  const int unitIndex = this->UI.diameterUnits->currentIndex();
+  const double scale = this->UI.diameterUnits->itemData(unitIndex).toDouble();
+  return this->UI.diameter->value() * scale;
+}
+
+//-----------------------------------------------------------------------------
+vqRegionEditDialog::vqRegionEditDialog(QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags), d_ptr(new vqRegionEditDialogPrivate)
+{
+  QTE_D(vqRegionEditDialog);
+  d->UI.setupUi(this);
+
+  connect(d->UI.diameterPreset, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(setDiameterPreset(int)));
+  connect(d->UI.diameterUnits, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(setDiameterUnits(int)));
+  connect(d->UI.diameter, SIGNAL(valueChanged(double)),
+          this, SLOT(updateDiameter()));
+
+  d->UI.crs->addItem("WGS '84", vgGeodesy::LatLon_Wgs84);
+  d->UI.crs->addItem("NAD '83", vgGeodesy::LatLon_Nad83);
+  d->UI.crs->setCurrentIndex(0);
+
+  d->UI.diameterPreset->addItem("Small (NFOV)", 10);
+  d->UI.diameterPreset->addItem("Medium (MFOV)", 50);
+  d->UI.diameterPreset->addItem("Large (WFOV)", 100);
+  d->UI.diameterPreset->addItem("Custom", -1);
+
+  d->UI.diameterUnits->addItem("m", 1.0);
+  d->UI.diameterUnits->addItem("km", 1000.0);
+  d->UI.diameterUnits->addItem("ft", 0.3048);
+  d->UI.diameterUnits->addItem("yd", 0.9144);
+  d->UI.diameterUnits->addItem("mi", 1609.344);
+
+  d->UI.diameterPreset->setCurrentIndex(1);
+  d->UI.diameterUnits->setCurrentIndex(0);
+
+  this->updateDiameter();
+}
+
+//-----------------------------------------------------------------------------
+vqRegionEditDialog::~vqRegionEditDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedPoly vqRegionEditDialog::region() const
+{
+  QTE_D_CONST(vqRegionEditDialog);
+  return d->Region;
+}
+
+//-----------------------------------------------------------------------------
+void vqRegionEditDialog::setRegion(const vgGeocodedPoly& region)
+{
+  QTE_D(vqRegionEditDialog);
+
+  // Get region CRS
+  int crsIndex = d->UI.crs->findData(region.GCS);
+  if (crsIndex >= 0)
+    d->UI.crs->setCurrentIndex(crsIndex);
+
+  // Get region center
+  const QString loc =
+    vgGeodesy::coordString(vgGeodesy::regionCenter(region));
+  d->UI.location->setText(loc.left(loc.indexOf('(')));
+
+  // Estimate region diameter
+  // \TODO
+
+  // Determine best-fit MGRS
+  // \TODO
+}
+
+//-----------------------------------------------------------------------------
+void vqRegionEditDialog::accept()
+{
+  QTE_D(vqRegionEditDialog);
+
+  if (d->UI.mgrs->isChecked())
+    {
+    // Get the location in simplified form
+    QString mgrs = d->UI.mgrsLocation->text().toUpper();
+    mgrs.replace(QRegExp("\\s"), "");
+
+    // Check that the location is valid
+    if (!QRegExp(MGRS_REGEXP).exactMatch(mgrs))
+      {
+      const QString msg =
+        "The MGRS location you have specified is not valid. Please try again.";
+      QMessageBox::critical(this, "Error", msg);
+      return;
+      }
+
+    // Generate the region
+    d->Region = vgGeodesy::convertGcs(vgGeodesy::regionFromMgrs(mgrs),
+                                      vgGeodesy::LatLon_Wgs84);
+    }
+  else
+    {
+    // Parse location center
+    const int crs = d->UI.crs->itemData(d->UI.crs->currentIndex()).toInt();
+    QString error;
+    vgGeocodedCoordinate center =
+      vgGeodesy::parseCoordinate(d->UI.location->text(), crs, &error);
+
+    // Check for error
+    if (center.GCS < 0)
+      {
+      QString msg =
+        "The location you have specified is not valid. Please try again.";
+      if (!error.isEmpty())
+        msg += "\n\nAdditional information:\n" + error;
+      QMessageBox::critical(this, "Error", msg);
+      return;
+      }
+
+    // Generate the region
+    const vgGeocodedPoly r = vgGeodesy::generateRegion(center, d->diameter());
+    d->Region = vgGeodesy::convertGcs(r, crs);
+    }
+
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+void vqRegionEditDialog::setDiameterPreset(int presetIndex)
+{
+  QTE_D(vqRegionEditDialog);
+  const int value = d->UI.diameterPreset->itemData(presetIndex).toInt();
+  if (value < 0)
+    {
+    d->UI.diameter->setReadOnly(false);
+    d->UI.diameterUnits->setEnabled(true);
+    }
+  else
+    {
+    d->UI.diameter->setReadOnly(true);
+    d->UI.diameterUnits->setCurrentIndex(0);
+    d->UI.diameterUnits->setEnabled(false);
+    d->UI.diameter->setValue(value);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqRegionEditDialog::setDiameterUnits(int unitIndex)
+{
+  QTE_D(vqRegionEditDialog);
+
+  const double scale = d->UI.diameterUnits->itemData(unitIndex).toDouble();
+  const double value = d->LastDiameter;
+
+  const int decimals = scale >= 100.0 ? 2 : scale >= 10.0 ? 1 : 0;
+  const double min = pow(10.0, -decimals);
+  d->UI.diameter->setDecimals(decimals);
+  d->UI.diameter->setRange(min, 10000.0 - min);
+  d->UI.diameter->setSingleStep(decimals ? 0.1 : 1.0);
+
+  d->UI.diameter->setValue(value / scale);
+  this->updateDiameter();
+}
+
+//-----------------------------------------------------------------------------
+void vqRegionEditDialog::updateDiameter()
+{
+  QTE_D(vqRegionEditDialog);
+  d->LastDiameter = d->diameter();
+}
diff --git a/Applications/Viqui/vqRegionEditDialog.h b/Applications/Viqui/vqRegionEditDialog.h
new file mode 100644
index 00000000..f684ceb3
--- /dev/null
+++ b/Applications/Viqui/vqRegionEditDialog.h
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqRegionEditDialog_h
+#define __vqRegionEditDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+struct vgGeocodedPoly;
+
+class vqRegionEditDialogPrivate;
+
+class vqRegionEditDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vqRegionEditDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  virtual ~vqRegionEditDialog();
+
+  vgGeocodedPoly region() const;
+  void setRegion(const vgGeocodedPoly&);
+
+  virtual void accept();
+
+protected slots:
+  void setDiameterPreset(int presetIndex);
+  void setDiameterUnits(int unitIndex);
+  void updateDiameter();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vqRegionEditDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vqRegionEditDialog)
+  Q_DISABLE_COPY(vqRegionEditDialog)
+};
+
+#endif
diff --git a/Applications/Viqui/vqResultFilter.cxx b/Applications/Viqui/vqResultFilter.cxx
new file mode 100644
index 00000000..046ca099
--- /dev/null
+++ b/Applications/Viqui/vqResultFilter.cxx
@@ -0,0 +1,18 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqResultFilter.h"
+
+//-----------------------------------------------------------------------------
+vqResultFilter::vqResultFilter() : Threshold(-1.0)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vqResultFilter::isNoop()
+{
+  return this->Threshold < 0.0;
+}
diff --git a/Applications/Viqui/vqResultFilter.h b/Applications/Viqui/vqResultFilter.h
new file mode 100644
index 00000000..f05cc50e
--- /dev/null
+++ b/Applications/Viqui/vqResultFilter.h
@@ -0,0 +1,19 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqResultFilter_h
+#define __vqResultFilter_h
+
+struct vqResultFilter
+{
+  vqResultFilter();
+
+  bool isNoop();
+
+  double Threshold;
+};
+
+#endif
diff --git a/Applications/Viqui/vqResultFilterDialog.cxx b/Applications/Viqui/vqResultFilterDialog.cxx
new file mode 100644
index 00000000..cd08195d
--- /dev/null
+++ b/Applications/Viqui/vqResultFilterDialog.cxx
@@ -0,0 +1,120 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqResultFilterDialog.h"
+#include "ui_resultFilter.h"
+
+#include <qtUtil.h>
+
+#include "vqSettings.h"
+
+QTE_IMPLEMENT_D_FUNC(vqResultFilterDialog)
+
+//-----------------------------------------------------------------------------
+class vqResultFilterDialogPrivate
+{
+public:
+  Ui::vqResultFilterDialog UI;
+};
+
+//-----------------------------------------------------------------------------
+vqResultFilterDialog::vqResultFilterDialog(
+  QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags), d_ptr(new vqResultFilterDialogPrivate)
+{
+  QTE_D(vqResultFilterDialog);
+
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  // Connect signals/slots
+  connect(d->UI.clear, SIGNAL(clicked(bool)),
+          this, SLOT(clearFilters()));
+  connect(d->UI.thresholdPreset, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(setThresholdFromPreset(int)));
+
+  // Load threshold filter presets
+  foreach (vvScoreGradient::Stop stop, vqSettings().scoreGradient().stops())
+    d->UI.thresholdPreset->addItem(stop.text, stop.threshold);
+
+  d->UI.thresholdPreset->addItem("Custom", -1.0);
+  d->UI.thresholdPreset->setCurrentIndex(0);
+
+  // Adjust checkbox alignment for style
+  if (d->UI.formLayout->labelAlignment().testFlag(Qt::AlignRight))
+    {
+    d->UI.threshold->setLayoutDirection(Qt::RightToLeft);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vqResultFilterDialog::~vqResultFilterDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+vqResultFilter vqResultFilterDialog::filter() const
+{
+  QTE_D_CONST(vqResultFilterDialog);
+
+  vqResultFilter result;
+
+  result.Threshold =
+    (d->UI.threshold->isChecked() ? d->UI.thresholdValue->value() : -1.0);
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+void vqResultFilterDialog::setFilter(const vqResultFilter& filter)
+{
+  QTE_D(vqResultFilterDialog);
+
+  if (filter.Threshold >= 0.0)
+    {
+    d->UI.threshold->setChecked(true);
+    const int presetIndex = d->UI.thresholdPreset->findData(filter.Threshold);
+    if (presetIndex >= 0)
+      {
+      d->UI.thresholdPreset->setCurrentIndex(presetIndex);
+      }
+    else
+      {
+      d->UI.thresholdPreset->setCurrentIndex(
+        d->UI.thresholdPreset->count() - 1);
+      d->UI.thresholdValue->setValue(filter.Threshold);
+      }
+    }
+  else
+    {
+    d->UI.threshold->setChecked(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqResultFilterDialog::clearFilters()
+{
+  QTE_D(vqResultFilterDialog);
+
+  d->UI.threshold->setChecked(false);
+}
+
+//-----------------------------------------------------------------------------
+void vqResultFilterDialog::setThresholdFromPreset(int index)
+{
+  QTE_D(vqResultFilterDialog);
+
+  const double value = d->UI.thresholdPreset->itemData(index).toDouble();
+  if (value >= 0.0)
+    {
+    d->UI.thresholdValue->setValue(value);
+    d->UI.thresholdValue->setReadOnly(true);
+    }
+  else
+    {
+    d->UI.thresholdValue->setReadOnly(false);
+    }
+}
diff --git a/Applications/Viqui/vqResultFilterDialog.h b/Applications/Viqui/vqResultFilterDialog.h
new file mode 100644
index 00000000..90595219
--- /dev/null
+++ b/Applications/Viqui/vqResultFilterDialog.h
@@ -0,0 +1,41 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqResultFilterDialog_h
+#define __vqResultFilterDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+#include "vqResultFilter.h"
+
+class vqResultFilterDialogPrivate;
+
+class vqResultFilterDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vqResultFilterDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  virtual ~vqResultFilterDialog();
+
+  vqResultFilter filter() const;
+  void setFilter(const vqResultFilter&);
+
+protected slots:
+  void clearFilters();
+
+  void setThresholdFromPreset(int);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vqResultFilterDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vqResultFilterDialog)
+};
+
+#endif
diff --git a/Applications/Viqui/vqResultInfo.cxx b/Applications/Viqui/vqResultInfo.cxx
new file mode 100644
index 00000000..b24c69be
--- /dev/null
+++ b/Applications/Viqui/vqResultInfo.cxx
@@ -0,0 +1,206 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqResultInfo.h"
+#include "ui_resultInfo.h"
+
+#include <vgUnixTime.h>
+
+#include <vvQueryResult.h>
+
+#include <qtMath.h>
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vgGeoUtil.h>
+
+#include "vqUtil.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void setText(QLineEdit* widget, const QString& text, bool isValid)
+{
+  QPalette p = widget->palette();
+  QPalette::ColorRole scr = widget->foregroundRole();
+  QPalette::ColorRole dcr = QPalette::Text;
+
+  // Copy desired color from parent's palette to widget's palette... to both
+  // the foregroundRole() and QPalette::Text, because some styles do not
+  // respect foregroundRole() :-(
+  if (isValid)
+    {
+    QWidget* parent = widget->parentWidget();
+    QPalette sp = (parent ? parent->palette() : QPalette());
+    p.setBrush(QPalette::Active,   scr, sp.brush(QPalette::Active,   scr));
+    p.setBrush(QPalette::Active,   dcr, sp.brush(QPalette::Active,   scr));
+    p.setBrush(QPalette::Inactive, scr, sp.brush(QPalette::Inactive, scr));
+    p.setBrush(QPalette::Inactive, dcr, sp.brush(QPalette::Inactive, scr));
+    }
+  else
+    {
+    p.setBrush(QPalette::Active,   scr, p.brush(QPalette::Disabled, scr));
+    p.setBrush(QPalette::Active,   dcr, p.brush(QPalette::Disabled, scr));
+    p.setBrush(QPalette::Inactive, scr, p.brush(QPalette::Disabled, scr));
+    p.setBrush(QPalette::Inactive, dcr, p.brush(QPalette::Disabled, scr));
+    }
+
+  widget->setText(text);
+  widget->setPalette(p);
+}
+
+//-----------------------------------------------------------------------------
+void setText(
+  QLineEdit* widget, const QString& text, const QString& emptyText = "(none)")
+{
+  (text.isEmpty()
+   ? setText(widget, emptyText, false)
+   : setText(widget, text, true));
+}
+
+//-----------------------------------------------------------------------------
+void setDateTime(QLineEdit* widget, long long ts)
+{
+  QString format("%1T%2Z");   // ISO 8601
+  vgUnixTime t(ts);
+  widget->setText(format.arg(t.dateString()) .arg(t.timeString()));
+}
+
+//-----------------------------------------------------------------------------
+void setText(QLineEdit* widget, const vgGeocodedCoordinate& location)
+{
+  bool isValid;
+  QString text = vgGeodesy::coordString(location, &isValid);
+  setText(widget, text, isValid);
+}
+
+//-----------------------------------------------------------------------------
+void makeTransparent(QLineEdit* widget)
+{
+  widget->setForegroundRole(QPalette::WindowText);
+  qtUtil::makeTransparent(widget);
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vqResultInfo::vqResultInfo(QWidget* parent) : QWidget(parent)
+{
+  this->UI = new Ui::resultInfo;
+  this->UI->setupUi(this);
+
+  connect(this->UI->showDetails, SIGNAL(toggled(bool)),
+          this, SLOT(setDetailsVisible(bool)));
+  this->setDetailsVisible(this->UI->showDetails->isChecked());
+
+  // Note: The 2 is QLineEditPrivate::horizontalMargin
+  this->UI->descriptorInfo->setIndent(
+    2 + this->style()->pixelMetric(QStyle::PM_DefaultFrameWidth));
+
+  makeTransparent(this->UI->id);
+  makeTransparent(this->UI->relevancy);
+  makeTransparent(this->UI->classification);
+
+  makeTransparent(this->UI->missionId);
+  makeTransparent(this->UI->streamId);
+
+  makeTransparent(this->UI->startTime);
+  makeTransparent(this->UI->endTime);
+  makeTransparent(this->UI->duration);
+
+  makeTransparent(this->UI->location);
+
+  this->clear();
+}
+
+//-----------------------------------------------------------------------------
+vqResultInfo::~vqResultInfo()
+{
+  delete this->UI;
+}
+
+//-----------------------------------------------------------------------------
+void vqResultInfo::setResults(QList<const vvQueryResult*> results)
+{
+  if (results.count() != 1)
+    {
+    this->clear();
+    if (results.count())
+      {
+      this->UI->notice->setText("Multiple results selected");
+      }
+    return;
+    }
+
+  const vvQueryResult& result = *results.first();
+
+  this->UI->stackedWidget->setCurrentWidget(this->UI->scrollArea);
+
+  this->UI->id->setText(QString::number(result.InstanceId));
+  this->UI->relevancy->setText(QString::number(result.RelevancyScore));
+  this->UI->classification->setText(
+    vqUtil::uiIqrClassificationString(result.UserScore));
+  this->UI->descriptorInfo->setResult(result);
+
+  const std::string noteData = result.UserData.Notes;
+  const QString note =
+    (noteData.empty() ? "(no note set)" : qtString(noteData));
+  this->UI->note->setText(note, qtSqueezedLabel::SetFullText |
+                          qtSqueezedLabel::SimplifyText);
+  this->UI->note->setToolTip(note, qtSqueezedLabel::PlainText |
+                             qtSqueezedLabel::AutoWrap);
+
+  setText(this->UI->missionId, qtString(result.MissionId));
+  setText(this->UI->streamId, qtString(result.StreamId));
+
+  setDateTime(this->UI->startTime, result.StartTime);
+  setDateTime(this->UI->endTime,   result.EndTime);
+  vgUnixTime duration(result.EndTime - result.StartTime);
+  this->UI->duration->setText(duration.timeString());
+
+  setText(this->UI->location, result.Location);
+}
+
+//-----------------------------------------------------------------------------
+void vqResultInfo::clear()
+{
+  this->UI->notice->setText("No result selected");
+  this->UI->stackedWidget->setCurrentWidget(this->UI->helpWidget);
+
+  this->UI->id->clear();
+  this->UI->relevancy->clear();
+  this->UI->classification->clear();
+  this->UI->descriptorInfo->clearData();
+
+  this->UI->missionId->clear();
+  this->UI->streamId->clear();
+
+  this->UI->startTime->clear();
+  this->UI->endTime->clear();
+  this->UI->duration->clear();
+
+  this->UI->location->clear();
+}
+
+//-----------------------------------------------------------------------------
+void vqResultInfo::setDetailsVisible(bool visible)
+{
+  this->UI->missionIdLabel->setVisible(visible);
+  this->UI->missionId->setVisible(visible);
+  this->UI->streamIdLabel->setVisible(visible);
+  this->UI->streamId->setVisible(visible);
+
+  this->UI->startTimeLabel->setVisible(visible);
+  this->UI->startTime->setVisible(visible);
+  this->UI->endTimelabel->setVisible(visible);
+  this->UI->endTime->setVisible(visible);
+  this->UI->durationLabel->setVisible(visible);
+  this->UI->duration->setVisible(visible);
+
+  this->UI->locationLabel->setVisible(visible);
+  this->UI->location->setVisible(visible);
+}
diff --git a/Applications/Viqui/vqResultInfo.h b/Applications/Viqui/vqResultInfo.h
new file mode 100644
index 00000000..83e3e8da
--- /dev/null
+++ b/Applications/Viqui/vqResultInfo.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqResultInfo_h
+#define __vqResultInfo_h
+
+#include <QWidget>
+
+namespace Ui
+{
+class resultInfo;
+}
+
+struct vvQueryResult;
+
+class vqResultInfo : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vqResultInfo(QWidget* parent = 0);
+  ~vqResultInfo();
+
+public slots:
+  void clear();
+  void setResults(QList<const vvQueryResult*> results);
+
+protected slots:
+  void setDetailsVisible(bool);
+
+private:
+  Ui::resultInfo* UI;
+};
+
+#endif // __vqResultInfo_h
diff --git a/Applications/Viqui/vqScopedOverrideCursor.h b/Applications/Viqui/vqScopedOverrideCursor.h
new file mode 100644
index 00000000..5982f4ed
--- /dev/null
+++ b/Applications/Viqui/vqScopedOverrideCursor.h
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqScopedOverrideCursor_h
+#define __vqScopedOverrideCursor_h
+
+#include <QApplication>
+#include <QCursor>
+
+struct vqScopedOverrideCursor
+{
+  vqScopedOverrideCursor(const QCursor& cursor = QCursor(Qt::WaitCursor))
+    {
+    QApplication::setOverrideCursor(cursor);
+    }
+
+  ~vqScopedOverrideCursor()
+    {
+    QApplication::restoreOverrideCursor();
+    }
+};
+
+#endif // __vqScopedOverrideCursor_h
diff --git a/Applications/Viqui/vqSettings.cxx b/Applications/Viqui/vqSettings.cxx
new file mode 100644
index 00000000..5527fc53
--- /dev/null
+++ b/Applications/Viqui/vqSettings.cxx
@@ -0,0 +1,93 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqSettings.h"
+
+#define QTSETTINGS_SUBCLASS_NAME vqSettings
+#include <qtSettingsImpl.h>
+
+#include <vvDescriptorStyleSetting.h>
+#include <vvScoreGradientSetting.h>
+
+static const char* const keyQueryServerUri         = "QueryServerUri";
+static const char* const keyQueryVideoUri          = "QueryVideoUri";
+static const char* const keyQueryCacheUri          = "QueryCacheUri";
+static const char* const keyVideoProviderUris      = "VideoProviderUris";
+static const char* const keyPredefinedQueryUri     = "PredefinedQueryUri";
+static const char* const keyResultPageCount        = "ResultPageCount";
+static const char* const keyResultClipPadding      = "ResultClipPadding";
+static const char* const keyScoreGradient          = "ScoreGradient";
+static const char* const keyIqrWorkingSetSize      = "IqrWorkingSetSize";
+static const char* const keyIqrRefinementSetSize   = "IqrRefinementSetSize";
+static const char* const keyDescriptorStyles       = "DescriptorStyles";
+
+//-----------------------------------------------------------------------------
+vqSettings::vqSettings()
+{
+  this->declareSetting(keyQueryServerUri);
+  this->declareSetting(keyQueryVideoUri);
+  this->declareSetting(keyQueryCacheUri);
+  this->declareSetting(keyVideoProviderUris);
+  this->declareSetting(keyPredefinedQueryUri);
+  this->declareSetting(keyResultPageCount, 100);
+  this->declareSetting(keyResultClipPadding, 2.0);
+  this->declareSetting(keyScoreGradient, new vvScoreGradientSetting);
+  this->declareSetting(keyIqrWorkingSetSize, 1500);
+  this->declareSetting(keyIqrRefinementSetSize, 10);
+  this->declareSetting(keyDescriptorStyles, new vvDescriptorStyle::Setting);
+}
+
+//-----------------------------------------------------------------------------
+qtSettings_implement(queryServerUri, QueryServerUri, QUrl)
+qtSettings_implement(queryVideoUri, QueryVideoUri, QUrl)
+qtSettings_implement(queryCacheUri, QueryCacheUri, QUrl)
+qtSettings_implement(predefinedQueryUri, PredefinedQueryUri, QUrl)
+qtSettings_implement(resultPageCount, ResultPageCount, int)
+qtSettings_implement(resultClipPadding, ResultClipPadding, double)
+qtSettings_implement(scoreGradient, ScoreGradient, vvScoreGradient)
+qtSettings_implement(iqrWorkingSetSize, IqrWorkingSetSize, int)
+qtSettings_implement(iqrRefinementSetSize, IqrRefinementSetSize, int)
+
+//-----------------------------------------------------------------------------
+QList<QUrl> vqSettings::videoProviders() const
+{
+  QList<QUrl> result;
+  QVariant value = this->value(keyVideoProviderUris);
+  if (value.canConvert(QVariant::List))
+    {
+    foreach (const QVariant& v, value.toList())
+      result.append(v.toUrl());
+    }
+  else if (value.canConvert(QVariant::Url))
+    {
+    result.append(value.toUrl());
+    }
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+void vqSettings::setVideoProviders(QList<QUrl> providers)
+{
+  QList<QVariant> list;
+  foreach (const QUrl& uri, providers)
+    list.append(uri);
+  this->setValue(keyVideoProviderUris, list);
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptorStyle::Map vqSettings::descriptorStyles() const
+{
+  QVariant value = this->value(keyDescriptorStyles);
+  if (value.canConvert(QVariant::Hash))
+    return vvDescriptorStyle::Map(value.toHash());
+  return vvDescriptorStyle::Map();
+}
+
+//-----------------------------------------------------------------------------
+void vqSettings::setDescriptorStyles(vvDescriptorStyle::Map styles)
+{
+  this->setValue(keyDescriptorStyles, styles.serializable());
+}
diff --git a/Applications/Viqui/vqSettings.h b/Applications/Viqui/vqSettings.h
new file mode 100644
index 00000000..9095ca5e
--- /dev/null
+++ b/Applications/Viqui/vqSettings.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqSettings_h
+#define __vqSettings_h
+
+#include <QUrl>
+#include <QList>
+
+#include <qtSettings.h>
+
+#include <vvDescriptorStyle.h>
+#include <vvScoreGradient.h>
+
+class vqSettings : public qtSettings
+{
+public:
+  vqSettings();
+
+  qtSettings_declare(QUrl, queryServerUri, setQueryServerUri);
+  qtSettings_declare(QUrl, queryVideoUri, setQueryVideoUri);
+  qtSettings_declare(QUrl, queryCacheUri, setQueryCacheUri);
+  qtSettings_declare(QUrl, predefinedQueryUri, setPredefinedQueryUri);
+  qtSettings_declare(QList<QUrl>, videoProviders, setVideoProviders);
+  qtSettings_declare(int, resultPageCount, setResultPageCount);
+  qtSettings_declare(double, resultClipPadding, setResultClipPadding);
+  qtSettings_declare(vvScoreGradient, scoreGradient, setScoreGradient);
+  qtSettings_declare(int, iqrWorkingSetSize, setIqrWorkingSetSize);
+  qtSettings_declare(int, iqrRefinementSetSize, setIqrRefinementSetSize);
+  qtSettings_declare(vvDescriptorStyle::Map,
+                     descriptorStyles, setDescriptorStyles);
+};
+
+#endif
diff --git a/Applications/Viqui/vqTimeline.cxx b/Applications/Viqui/vqTimeline.cxx
new file mode 100644
index 00000000..2a634474
--- /dev/null
+++ b/Applications/Viqui/vqTimeline.cxx
@@ -0,0 +1,704 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqTimeline.h"
+
+#include <vtkVgChartTimeline.h>
+#include <vtkVgGroupNode.h>
+#include <vtkVgNodeVisitor.h>
+#include <vtkVgPlotTimeline.h>
+#include <vtkVgSceneManager.h>
+#include <vtkVgVideoModel0.h>
+#include <vtkVgVideoNode.h>
+#include <vtkVgVideoRepresentationBase0.h>
+
+#include <vtkVgQtUtil.h>
+
+#include <vgUnixTime.h>
+
+#include <QVTKWidget.h>
+
+#include <vtkAxis.h>
+#include <vtkChartXY.h>
+#include <vtkColorSeries.h>
+#include <vtkContextMapper2D.h>
+#include <vtkContextScene.h>
+#include <vtkContextView.h>
+#include <vtkDoubleArray.h>
+#include <vtkFloatArray.h>
+#include <vtkIdTypeArray.h>
+#include <vtkIntArray.h>
+#include <vtkInteractorObserver.h>
+#include <vtkLookupTable.h>
+#include <vtkObjectFactory.h>
+#include <vtkPlot.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkRenderer.h>
+#include <vtkTable.h>
+#include <vtkTextProperty.h>
+#include <vtkVariantArray.h>
+
+#include <QTime>
+
+#include <algorithm>
+#include <vector>
+
+namespace TimelineInternal
+{
+
+enum TableColumns
+{
+  TC_X = 0,
+  TC_Y,
+  TC_XD,
+  TC_Id,
+  TC_Object,
+  TC_Color
+};
+
+struct NodeInfo
+{
+  vtkVgVideoNode* Node;
+  double StartTime;
+  double EndTime;
+  bool IsGroundTruth;
+
+  bool operator<(const NodeInfo& other) const
+    {
+    return this->StartTime < other.StartTime;
+    }
+};
+
+typedef std::vector<NodeInfo> NodeVector;
+
+//-----------------------------------------------------------------------------
+struct SceneVisitor : public vtkVgNodeVisitor
+{
+  SceneVisitor()
+    : minTime(-1), maxTime(-1) {}
+
+  void Reset()
+    {
+    this->VideoNodeInfos.clear();
+    this->minTime = this->maxTime = -1;
+    }
+
+  using vtkVgNodeVisitor::Visit;
+
+  virtual void Visit(vtkVgVideoNode* node)
+    {
+    NodeInfo NI;
+    NI.Node = node;
+    NI.StartTime = this->Timeline->GetUnixEpochTime(node->GetTimeRange()[0]);
+    NI.EndTime = this->Timeline->GetUnixEpochTime(node->GetTimeRange()[1]);
+    NI.IsGroundTruth = !(node->GetIsNormalResult() ||
+                         node->GetIsRefinementResult());
+
+    // keep running min of start times
+    if (this->minTime < 0.0f)
+      {
+      this->minTime = NI.StartTime;
+      }
+    else
+      {
+      if (NI.StartTime < this->minTime)
+        {
+        this->minTime = NI.StartTime;
+        }
+      }
+
+    // keep running max of end times
+    if (this->maxTime < 0.0f)
+      {
+      this->maxTime = NI.EndTime;
+      }
+    else
+      {
+      if (NI.EndTime > this->maxTime)
+        {
+        this->maxTime = NI.EndTime;
+        }
+      }
+
+    this->VideoNodeInfos.push_back(NI);
+    }
+
+  vqTimeline* Timeline;
+
+  QList<vtkVgVideoNode*> VideoNodes;
+  NodeVector VideoNodeInfos;
+
+  QList<vtkVgNodeBase*> Selected;
+
+  double minTime, maxTime;
+};
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void addTableColumn(vtkTable* table, const char* label)
+{
+  vtkSmartPointer<T> column = vtkSmartPointer<T>::New();
+  column->SetName(label);
+
+  table->AddColumn(column);
+}
+
+} // namespace TimelineInternal
+
+using namespace TimelineInternal;
+
+//-----------------------------------------------------------------------------
+struct vqTimeline::SelectionGuard
+{
+  vqTimeline* Widget;
+
+  SelectionGuard(vqTimeline* d)
+    {
+    this->Widget = d;
+    this->Widget->IsSelecting = true;
+    }
+
+  ~SelectionGuard()
+    {
+    this->Widget->IsSelecting = false;
+    }
+};
+
+//-----------------------------------------------------------------------------
+class vqTimeline::TimelineSelectionCallback : public vtkCommand
+{
+  vqTimeline*  Parent;
+
+  vtkPlot*     LastPlot;
+  vtkIdType    LastSelectedIndex;
+  vtkIdType    LastSelectionSize;
+  vtkIdType    LastSelectionFirstVal;
+  vtkIdType    LastSelectionLastVal;
+
+  TimelineSelectionCallback()
+    : Parent(0),
+      LastPlot(0),
+      LastSelectedIndex(-1),
+      LastSelectionSize(0),
+      LastSelectionFirstVal(-1),
+      LastSelectionLastVal(-1)
+    {}
+
+public:
+  static TimelineSelectionCallback* New()
+    {
+    return new TimelineSelectionCallback;
+    }
+
+  void SetParent(vqTimeline* parent)
+    {
+    this->Parent = parent;
+    }
+
+  virtual void Execute(vtkObject* vtkNotUsed(caller),
+                       unsigned long vtkNotUsed(eventId), void* callData)
+    {
+    if (this->Parent->IsSelecting)
+      {
+      return;
+      }
+
+    if (callData)
+      {
+      vtkVgChartTimeline::SelectionData* sd =
+        static_cast<vtkVgChartTimeline::SelectionData*>(callData);
+
+      vtkPlot* plot = sd->Plot;
+      if (!plot)
+        {
+        return;
+        }
+
+      // single-click selection
+      vtkIdTypeArray* selection = plot->GetSelection();
+      vtkIdType size = selection->GetNumberOfTuples();
+
+      if (size == 0)
+        {
+        emit this->Parent->SelectedNodes(QList<vtkVgNodeBase*>());
+        return;
+        }
+
+      vtkIdType index;
+      vtkIdType firstVal = selection->GetValue(0);
+      vtkIdType lastVal = selection->GetValue(size - 1);
+
+      // Try to determine if this is the same as the last selection. If so,
+      // cycle through the items in the group. This allows us to cycle through
+      // overlapping points when the user clicks the same cluster multiple times.
+      if (this->LastPlot == plot &&
+          this->LastSelectionSize == size &&
+          this->LastSelectionFirstVal == firstVal &&
+          this->LastSelectionLastVal == lastVal)
+        {
+        index = (this->LastSelectedIndex + 1) % size;
+        }
+      else
+        {
+        // just pick the first item if this is a different selection group
+        index = 0;
+        }
+
+      vtkIdType selectedVal = selection->GetValue(index);
+
+      // remember selection group info for next time
+      this->LastPlot = plot;
+      this->LastSelectedIndex = index;
+      this->LastSelectionSize = size;
+      this->LastSelectionFirstVal = firstVal;
+      this->LastSelectionLastVal = lastVal;
+
+      // modify the selection
+      selection->SetNumberOfTuples(0);
+      selection->InsertNextValue(selectedVal);
+
+      if (sd->IsActivation)
+        {
+        vtkObjectBase* obj =
+          plot->GetInput()->GetValue(selectedVal, TC_Object).ToVTKObject();
+        vtkVgNodeBase* node = vtkVgNodeBase::SafeDownCast(obj);
+        emit this->Parent->ActivatedNode(*node);
+        }
+      else
+        {
+        std::vector<int> rows(1);
+        rows[0] = selectedVal;
+        this->SelectionChangeNotify(plot, rows);
+        }
+      }
+    else
+      {
+      // rubberband selection
+      this->LastPlot = 0;
+
+      vtkPlotLine* linePlot =
+        vtkPlotLine::SafeDownCast(this->Parent->TimelineChart->GetPlot(0));
+
+      vtkIdTypeArray* selection = linePlot->GetSelection();
+      vtkIdType size = selection->GetNumberOfTuples();
+
+      std::vector<int> rows(size);
+
+      for (vtkIdType i = 0; i != size; ++i)
+        {
+        rows[i] = selection->GetValue(i);
+        }
+
+      this->SelectionChangeNotify(linePlot, rows);
+      }
+    }
+
+  void SelectionChangeNotify(vtkPlot* plot, const std::vector<int>& rows)
+    {
+    SelectionGuard sg(this->Parent);
+    vtkTable* table = plot->GetInput();
+
+    QList<vtkVgNodeBase*> nodes;
+    nodes.reserve(static_cast<int>(rows.size()));
+
+    for (size_t i = 0, end = rows.size(); i != end; ++i)
+      {
+      vtkObjectBase* obj = table->GetValue(rows[i], TC_Object).ToVTKObject();
+      vtkVgNodeBase* node = vtkVgNodeBase::SafeDownCast(obj);
+      nodes << node;
+      }
+
+    emit this->Parent->SelectedNodes(nodes);
+    }
+};
+
+//-----------------------------------------------------------------------------
+vqTimeline::vqTimeline(QWidget* parent) :
+  QVTKWidget(parent), SceneManager(0), LookupTable(0)
+{
+  this->Visitor = new SceneVisitor();
+  this->Visitor->Timeline = this;
+
+  this->IsSelecting = false;
+
+  // Set up the context view
+  this->TimelineView = vtkSmartPointer<vtkContextView>::New();
+  this->TimelineView->SetInteractor(this->GetInteractor());
+  this->TimelineView->GetRenderer()->SetBackground(1.0, 1.0, 1.0);
+  this->SetRenderWindow(this->TimelineView->GetRenderWindow());
+
+  vtkConnect(this->TimelineView->GetInteractor()->GetInteractorStyle(),
+             vtkCommand::KeyPressEvent, this, SLOT(OnKeyPressed()));
+
+  this->TimelineChart = vtkSmartPointer<vtkVgChartTimeline>::New();
+  this->TimelineChart->SetAutoAxes(false);
+  this->TimelineChart->SetShowLegend(false);
+  this->TimelineChart->SetNormalizeInput(true);
+  this->TimelineChart->SetHiddenAxisBorder(15);
+
+  vtkAxis* const yAxisL = this->TimelineChart->GetAxis(vtkAxis::LEFT);
+  vtkAxis* const yAxisR = this->TimelineChart->GetAxis(vtkAxis::RIGHT);
+  vtkAxis* const xAxis = this->TimelineChart->GetAxis(vtkAxis::BOTTOM);
+
+  xAxis->SetTitle(vtkStdString());
+
+  yAxisL->SetTitle(vtkStdString());
+  yAxisL->SetBehavior(vtkAxis::CUSTOM);
+  yAxisL->SetNumberOfTicks(0);
+
+  yAxisR->SetTitle(vtkStdString());
+  yAxisR->SetBehavior(vtkAxis::CUSTOM);
+  yAxisR->SetNumberOfTicks(0);
+  yAxisR->SetVisible(true);
+
+  this->TimelineView->GetScene()->AddItem(this->TimelineChart);
+
+  // Build timeline table
+  this->TimelineTable = vtkSmartPointer<vtkTable>::New();
+  addTableColumn<vtkFloatArray>  (this->TimelineTable.GetPointer(), "X");
+  addTableColumn<vtkFloatArray>  (this->TimelineTable.GetPointer(), "Y");
+  addTableColumn<vtkDoubleArray> (this->TimelineTable.GetPointer(), "XD");
+  addTableColumn<vtkIntArray>    (this->TimelineTable.GetPointer(), "Id");
+  addTableColumn<vtkVariantArray>(this->TimelineTable.GetPointer(), "Object");
+  addTableColumn<vtkFloatArray>  (this->TimelineTable.GetPointer(), "Colors");
+
+  // Register selection callback
+  TimelineSelectionCallback* cb = TimelineSelectionCallback::New();
+  cb->SetParent(this);
+  this->TimelineChart->AddObserver(vtkCommand::SelectionChangedEvent, cb);
+  cb->Delete();
+}
+
+//-----------------------------------------------------------------------------
+vqTimeline::~vqTimeline()
+{
+  delete this->Visitor;
+  this->Visitor = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::Initialize(QList<vtkVgVideoNode*> nodes)
+{
+  this->Visitor->VideoNodes = nodes;
+
+  if (this->isVisible())
+    {
+    this->UpdateTimelineChart();
+    this->ResetView();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::SelectNodes(QList<vtkVgNodeBase*> nodes)
+{
+  // avoid recursion
+  if (this->IsSelecting)
+    {
+    return;
+    }
+
+  this->Visitor->Selected = nodes;
+  this->UpdateSelection();
+  this->TimelineView->GetRenderWindow()->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::UpdateColors()
+{
+  if (!this->TimelineChart)
+    {
+    return;
+    }
+
+  // update color scalars in the table
+  int row = 0;
+  for (NodeVector::iterator itr = this->Visitor->VideoNodeInfos.begin(),
+       end = this->Visitor->VideoNodeInfos.end();
+       itr != end; ++itr, ++row)
+    {
+    double color = itr->Node->GetColorScalar();
+    this->TimelineTable->SetValue(row, TC_Color, color);
+    this->TimelineTable->SetValue(++row, TC_Color, color);
+    }
+
+  this->TimelineTable->Modified();
+  this->TimelineView->GetRenderWindow()->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::Update()
+{
+  if (!this->TimelineChart)
+    {
+    return;
+    }
+
+  // Rebuild the table
+  this->UpdateTimelineTable();
+  this->UpdateSelection();
+
+  this->TimelineTable->Modified();
+  this->TimelineView->GetRenderWindow()->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::OnFrameChanged(int frame)
+{
+  this->TimelineChart->GetAxis(1)->SetRange(frame - 1, frame + 50);
+  this->TimelineChart->RecalculateBounds();
+  this->TimelineView->GetRenderWindow()->Render();
+}
+
+//-----------------------------------------------------------------------------
+int vqTimeline::FindFreeY(const TimelineInternal::NodeInfo& info,
+                          std::vector<std::pair<bool, double> >& used,
+                          double padding)
+{
+  for (size_t i = 0, end = used.size(); i < end; ++i)
+    {
+    if (used[i].first && (used[i].second + padding) < info.StartTime)
+      {
+      used[i].second = info.EndTime;
+      return static_cast<int>(i);
+      }
+    else if (!used[i].first)
+      {
+      used[i].first = true;
+      used[i].second = info.EndTime;
+      return static_cast<int>(i);
+      }
+    }
+
+  // should never get here
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vqTimeline::SetRows(int row,
+                        const TimelineInternal::NodeInfo& info,
+                        std::vector<std::pair<bool, double> >& used,
+                        double padding)
+{
+  // find the next available y position that we can place this interval
+  // ground truth nodes are allowed to overlap with normal result nodes
+  int i = this->FindFreeY(info, used, padding);
+  if (i == -1)
+    {
+    std::cerr << "No available y?\n";
+    return row;
+    }
+
+  double x1 = info.StartTime;
+  double x2 = info.EndTime;
+
+  // alternate y at integral values above and below y = 0
+  int y = (i % 2 == 0) ? -(i + 1) / 2 : (i + 1) / 2;
+
+  this->MinX = std::min(this->MinX, x1);
+  this->MaxX = std::max(this->MaxX, x2);
+
+  this->MinY = std::min(this->MinY, y);
+  this->MaxY = std::max(this->MaxY, y);
+
+  // don't add intervals for invisible nodes (only use them for layout purposes)
+  if (info.Node->GetVisibleNodeMask() != vtkVgNodeBase::VISIBLE_NODE_MASK)
+    {
+    return row;
+    }
+
+  // set row data for interval start
+  vtkIdType id = info.Node->GetInstanceId();
+  double color = info.Node->GetColorScalar();
+  this->TimelineTable->SetValue(row, TC_X, 0); // filled by chart
+  this->TimelineTable->SetValue(row, TC_Y, y);
+  this->TimelineTable->SetValue(row, TC_XD, x1);
+  this->TimelineTable->SetValue(row, TC_Id, id);
+  this->TimelineTable->SetValue(row, TC_Object, info.Node);
+  this->TimelineTable->SetValue(row++, TC_Color, color);
+
+  // set row data for interval end
+  this->TimelineTable->SetValue(row, TC_X, 0); // filled by chart
+  this->TimelineTable->SetValue(row, TC_Y, y);
+  this->TimelineTable->SetValue(row, TC_XD, x2);
+  this->TimelineTable->SetValue(row, TC_Id, id);
+  this->TimelineTable->SetValue(row, TC_Object, info.Node);
+  this->TimelineTable->SetValue(row++, TC_Color, color);
+  return row;
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::UpdateTimelineTable()
+{
+  // traverse the node list and collect video nodes
+  int visibleCount = 0;
+  this->Visitor->Reset();
+  foreach (vtkVgVideoNode* node, this->Visitor->VideoNodes)
+    {
+    this->Visitor->Visit(node);
+    if (node->GetVisibleNodeMask() == vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      ++visibleCount;
+      }
+    }
+
+  // sort all video nodes in the graph by the start time of their sources
+  std::sort(this->Visitor->VideoNodeInfos.begin(),
+            this->Visitor->VideoNodeInfos.end());
+
+  int numNodes = static_cast<int>(this->Visitor->VideoNodeInfos.size());
+
+  std::vector<std::pair<bool, double> > used(numNodes);
+  std::vector<std::pair<bool, double> > usedGT(numNodes);
+
+  this->TimelineTable->SetNumberOfRows(2 * visibleCount);
+
+  this->MinX = VTK_DOUBLE_MAX;
+  this->MaxX = VTK_DOUBLE_MIN;
+  this->MinY = 0;
+  this->MaxY = 0;
+
+  double timeRange = this->Visitor->maxTime - this->Visitor->minTime;
+  double xPadding = timeRange * 0.005;
+
+  // If the range of data is large (spanning multiple days), our computed
+  // padding may cause the graph to vertically spread too far at higher zoom
+  // levels. In that case, clamp the maximum padding to improve the layout at
+  // the "interesting" zoom levels (on the order of seconds, the length of a
+  // typical event). This may cause results to overlap when viewing time spans
+  // of several days, but it seems to be an acceptable tradeoff.
+  if (xPadding > 3.0e6)
+    {
+    xPadding = 3.0e6;
+    }
+
+  // Points are added to the table in two passes: first we add all
+  // non-ground truth items, then all ground truth items. This ensures that
+  // the (translucent) ground truth timeline intervals will blend correctly.
+
+  // set rows for non-ground truth items
+  int row = 0;
+  for (NodeVector::iterator itr = this->Visitor->VideoNodeInfos.begin(),
+       end = this->Visitor->VideoNodeInfos.end();
+       itr != end; ++itr)
+    {
+    if (!itr->IsGroundTruth)
+      {
+      row = this->SetRows(row, *itr, used, xPadding);
+      }
+    }
+
+  // set rows for ground truth items
+  for (NodeVector::iterator itr = this->Visitor->VideoNodeInfos.begin(),
+       end = this->Visitor->VideoNodeInfos.end();
+       itr != end; ++itr)
+    {
+    if (itr->IsGroundTruth)
+      {
+      row = this->SetRows(row, *itr, usedGT, xPadding);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::UpdateSelection()
+{
+  SelectionGuard sg(this);
+  this->TimelineChart->ClearSelection();
+
+  vtkIdTypeArray* selection = vtkIdTypeArray::New();
+  selection->SetNumberOfTuples(0);
+
+  vtkTable* table = this->TimelineTable.GetPointer();
+  vtkIdType numRows = table->GetNumberOfRows();
+
+  foreach (vtkVgNodeBase* node, this->Visitor->Selected)
+    {
+    // don't try to select things that aren't being shown
+    if (node->GetVisibleNodeMask() != vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      continue;
+      }
+
+    // find the index of the item within the table
+    for (vtkIdType i = 0; i < numRows; ++i)
+      {
+      vtkObjectBase* obj = table->GetValue(i, TC_Object).ToVTKObject();
+      if (vtkVgNodeBase::SafeDownCast(obj) == node)
+        {
+        selection->InsertNextValue(i);
+        break;
+        }
+      }
+    }
+
+  this->TimelineChart->SetSelection(0, selection);
+  selection->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::AddTimelinePlots()
+{
+  int numRows = this->TimelineTable->GetNumberOfRows();
+  if (numRows > 0)
+    {
+    vtkVgPlotTimeline* plot = vtkVgPlotTimeline::New();
+    plot->SetInputData(this->TimelineTable, 0, 1);
+    plot->SetIsIntervalPlot(true);
+    plot->SetScalarVisibility(1);
+    plot->SelectColorArray("Colors");
+    plot->SetLookupTable(this->LookupTable);
+
+    this->TimelineChart->AddPlot(plot);
+    plot->FastDelete();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::UpdateTimelineChart()
+{
+  this->UpdateTimelineTable();
+  this->AddTimelinePlots();
+
+  vtkAxis* const yAxis = this->TimelineChart->GetAxis(vtkAxis::LEFT);
+  yAxis->SetRange(this->MinY - 0.5, this->MaxY + 0.5);
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::showEvent(QShowEvent* /*event*/)
+{
+  this->UpdateTimelineChart();
+}
+
+//-----------------------------------------------------------------------------
+double vqTimeline::GetUnixEpochTime(double useconds)
+{
+  return vgUnixTime(useconds).toInt64();
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::OnKeyPressed()
+{
+  switch (this->TimelineView->GetInteractor()->GetKeyCode())
+    {
+    case 'r':
+    case 'R':
+      this->ResetView();
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTimeline::ResetView()
+{
+  if (this->TimelineChart)
+    {
+    vtkAxis* y = this->TimelineChart->GetAxis(vtkAxis::LEFT);
+    y->SetRange(this->MinY - 0.5, this->MaxY + 0.5);
+    this->TimelineChart->ResetExtents();
+    this->TimelineChart->RecalculateBounds();
+    }
+}
diff --git a/Applications/Viqui/vqTimeline.h b/Applications/Viqui/vqTimeline.h
new file mode 100644
index 00000000..b2ff43e5
--- /dev/null
+++ b/Applications/Viqui/vqTimeline.h
@@ -0,0 +1,109 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqTimeline_h
+#define __vqTimeline_h
+
+#include <QVTKWidget.h>
+
+#include <vtkSmartPointer.h>
+
+class vtkChartXY;
+class vtkContextView;
+class vtkLookupTable;
+class vtkPlot;
+class vtkTable;
+
+class vtkVgChartTimeline;
+class vtkVgNodeBase;
+class vtkVgSceneManager;
+class vtkVgVideoModel0;
+class vtkVgVideoNode;
+
+namespace TimelineInternal
+{
+struct SceneVisitor;
+struct NodeInfo;
+}
+
+class vqTimeline : public QVTKWidget
+{
+  Q_OBJECT
+
+public:
+  vqTimeline(QWidget* parent = NULL);
+  virtual ~vqTimeline();
+
+  void SetLookupTable(vtkLookupTable* lut)
+    { this->LookupTable = lut; }
+
+  void Initialize(QList<vtkVgVideoNode*> nodes);
+
+  virtual QSize sizeHint() const
+    { return QSize(500, 200); }
+
+  virtual QSize minimumSizeHint() const
+    { return QSize(300, 100); }
+
+  virtual void showEvent(QShowEvent* event);
+
+signals:
+  void ActivatedNode(vtkVgNodeBase& node);
+  void SelectedNodes(QList<vtkVgNodeBase*> nodes);
+
+public slots:
+  void SelectNodes(QList<vtkVgNodeBase*> node);
+  void UpdateColors();
+  void Update();
+  void ResetView();
+  void OnKeyPressed();
+
+private slots:
+  void OnFrameChanged(int frame);
+
+private:
+  void UpdateTimelineChart();
+  void UpdateTimelineTable();
+  void UpdateSelection();
+
+  void AddTimelinePlots();
+
+  double GetUnixEpochTime(double useconds);
+
+  int FindFreeY(const TimelineInternal::NodeInfo& info,
+                std::vector<std::pair<bool, double> >& used,
+                double padding);
+
+  int SetRows(int row,
+              const TimelineInternal::NodeInfo& info,
+              std::vector<std::pair<bool, double> >& used,
+              double padding);
+
+private:
+  class TimelineSelectionCallback;
+
+  QPoint LastWindowPosition;
+
+  vtkVgSceneManager* SceneManager;
+
+  TimelineInternal::SceneVisitor* Visitor;
+  friend struct TimelineInternal::SceneVisitor;
+
+  bool IsSelecting;
+  struct SelectionGuard;
+
+  vtkSmartPointer<vtkContextView> TimelineView;
+
+  vtkSmartPointer<vtkVgChartTimeline> TimelineChart;
+  vtkSmartPointer<vtkTable> TimelineTable;
+
+  double MinX, MaxX;
+  int    MinY, MaxY;
+
+  vtkLookupTable* LookupTable;
+};
+
+#endif
diff --git a/Applications/Viqui/vqTrackingClipBuilder.h b/Applications/Viqui/vqTrackingClipBuilder.h
new file mode 100644
index 00000000..75d4a6b8
--- /dev/null
+++ b/Applications/Viqui/vqTrackingClipBuilder.h
@@ -0,0 +1,167 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqTrackingClipBuilder_h
+#define __vqTrackingClipBuilder_h
+
+#include "vtkVQTrackingClip.h"
+
+#include <vtkImageData.h>
+
+#include <QMutexLocker>
+#include <QThread>
+
+#include <algorithm>
+#include <vector>
+
+typedef std::pair< int, vtkSmartPointer<vtkVQTrackingClip> > ClipElement;
+typedef std::vector<ClipElement> ClipVector;
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+struct CompareClipDuration
+{
+  bool operator()(const ClipElement& c1, const ClipElement& c2)
+    {
+    return c1.second->GetDuration() < c2.second->GetDuration();
+    }
+};
+
+}
+
+//-----------------------------------------------------------------------------
+class vqTrackingClipBuilder : public QThread
+{
+  Q_OBJECT
+
+public:
+  vqTrackingClipBuilder()
+    : QThread(), ShutdownRequested(false)
+    { }
+
+  ~vqTrackingClipBuilder()
+    {
+    this->disconnect();
+    this->Shutdown();
+    this->wait();
+    }
+
+  void BuildClips(ClipVector::iterator start, ClipVector::iterator end)
+    {
+    // Note: Clips may not become available in the order they were submitted.
+    // Shorter clips will be processed before longer ones.
+
+    // If the build thread has the first vector locked, put incoming clips into
+    // the 'backup'. Since the build thread only holds one of these locks at
+    // a time, we can acquire one here without blocking. This is the only
+    // function that modifies the clip vectors.
+    if (this->ClipsMutex[0].tryLock())
+      {
+      this->Clips[0].insert(this->Clips[0].end(), start, end);
+      std::sort(this->Clips[0].begin(), this->Clips[0].end(), CompareClipDuration());
+      this->ClipsMutex[0].unlock();
+      }
+    else
+      {
+      QMutexLocker x(&this->ClipsMutex[1]);
+      this->Clips[1].insert(this->Clips[1].end(), start, end);
+      std::sort(this->Clips[1].begin(), this->Clips[1].end(), CompareClipDuration());
+      }
+
+    this->start();
+    }
+
+  void SkipClip(int id)
+    {
+    // Search for the clip and mark it to be skipped if found. There is no
+    // race here since this function is called from the same thread as
+    // BuildClips().
+    for (int i = 0; i < 2; ++i)
+      {
+      for (ClipVector::iterator itr = this->Clips[i].begin(),
+           end = this->Clips[i].end(); itr != end; ++itr)
+        {
+        if (itr->first == id)
+          {
+          QMutexLocker x(&this->ClipIdMutex);
+          itr->first = -1;
+          break;
+          }
+        }
+      }
+    }
+
+  void Shutdown()
+    {
+    QMutexLocker x(&this->ShutdownMutex);
+    this->ShutdownRequested = true;
+    }
+
+signals:
+  void ClipAvailable(vtkImageData* clip, int index);
+
+protected:
+  virtual void run()
+    {
+    // Keep switching between the two input vectors until there are no new clips
+    // left to process. This will usually complete in one iteration, but will
+    // require more if new clips get added before processing completes.
+    for (int i = 0; ; i = !i)
+      {
+      QMutexLocker x(&this->ClipsMutex[i]);
+
+      if (this->Clips[i].empty())
+        {
+        break;
+        }
+
+      for (ClipVector::const_iterator itr = this->Clips[i].begin(),
+           end = this->Clips[i].end(); itr != end; ++itr)
+        {
+          {
+          QMutexLocker x(&this->ShutdownMutex);
+          if (this->ShutdownRequested)
+            {
+            return;
+            }
+          }
+
+        int id;
+          {
+          QMutexLocker x(&this->ClipIdMutex);
+          id = itr->first;
+          }
+
+        if (id >= 0)
+          {
+          vtkImageData* output = itr->second->GetOutputImageData();
+
+          // Caller will need to Delete() the image data once it has been
+          // received. This is to ensure the data keeps a reference count> 0
+          // between the time when the signal is emitted until it is received.
+          output->Register(0);
+
+          emit this->ClipAvailable(output, id);
+          }
+        }
+      this->Clips[i].clear();
+      }
+    }
+
+private:
+  bool ShutdownRequested;
+
+  ClipVector Clips[2];
+
+  QMutex ShutdownMutex;
+  QMutex ClipIdMutex;
+
+  QMutex ClipsMutex[2];
+};
+
+#endif // __vqTrackingClipBuilder_h
diff --git a/Applications/Viqui/vqTrackingClipViewer.cxx b/Applications/Viqui/vqTrackingClipViewer.cxx
new file mode 100644
index 00000000..8b325373
--- /dev/null
+++ b/Applications/Viqui/vqTrackingClipViewer.cxx
@@ -0,0 +1,1139 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqTrackingClipViewer.h"
+
+#include "vqCore.h"
+#include "vqTrackingClipBuilder.h"
+#include "vqUtil.h"
+#include "vtkVQTrackingClip.h"
+
+#include <vtkVgVideoNode.h>
+
+#include <vgFileDialog.h>
+
+#include <QVTKWidget.h>
+
+#include <vtkCamera.h>
+#include <vtkDoubleArray.h>
+#include <vtkFieldData.h>
+#include <vtkImageActor.h>
+#include <vtkImageData.h>
+#include <vtkPNMWriter.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkTextActor.h>
+#include <vtkTextProperty.h>
+#include <vtkWindowToImageFilter.h>
+
+#include <QMenu>
+#include <QSettings>
+#include <QThread>
+#include <QTime>
+#include <QVBoxLayout>
+
+#include <algorithm>
+#include <sstream>
+#include <vector>
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+enum
+{
+  MaxClips    = 20,
+  ClipsPerRow = 5,
+  Padding     = 5,
+  VideoSize   = 100,
+  UpdateInterval = 16  // ~60Hz
+};
+
+struct CompareByRank
+{
+  bool operator()(const ClipElement& c1, const ClipElement& c2)
+    {
+    return c1.second->GetRank() < c2.second->GetRank();
+    }
+};
+
+} // end anonymous namespace
+
+//-----------------------------------------------------------------------------
+struct vqTrackingClipViewer::Cell
+{
+  vtkSmartPointer<vtkRenderer>   Renderer;
+  vtkSmartPointer<vtkImageActor> Image;
+  vtkSmartPointer<vtkTextActor>  Label;
+  bool RendererInitialized;
+  bool Used;
+  int  Id;
+
+  QTime StartTime;
+  QTime LastUpdate;
+
+  Cell() : RendererInitialized(false), Used(false), Id(-1)
+    {
+    }
+};
+
+//-----------------------------------------------------------------------------
+class vtkInteractorCallback : public vtkCommand
+{
+  vqTrackingClipViewer* TrackingClipViewer;
+  QTime TimeBetweenRenders;
+  QTime LastClick;
+  int LastClickPos[2];
+
+  vtkWindowToImageFilter* WindowToImageFilter;
+  vtkPNMWriter* PNMWriter;
+  QString ImageOutputDirectory;
+  vtkIdType ImageCounter;
+  bool WriteRenderedImages;
+
+public:
+  static vtkInteractorCallback* New()
+    {
+    return new vtkInteractorCallback;
+    }
+
+  vtkInteractorCallback()
+    {
+    this->WindowToImageFilter = vtkWindowToImageFilter::New();
+    this->PNMWriter = vtkPNMWriter::New();
+    this->ImageCounter = 0;
+    this->WriteRenderedImages = false;
+    }
+  ~vtkInteractorCallback()
+    {
+    this->WindowToImageFilter->Delete();
+    this->PNMWriter->Delete();
+    }
+
+  void SetTrackingClipViewer(vqTrackingClipViewer* tcv)
+    {
+    this->TrackingClipViewer = tcv;
+    this->WindowToImageFilter->SetInput(tcv->GetWidget()->GetRenderWindow());
+    this->PNMWriter->SetInputConnection(this->WindowToImageFilter->GetOutputPort());
+    }
+
+  virtual void Execute(vtkObject* vtkNotUsed(caller), unsigned long eventId,
+                       void* vtkNotUsed(callData))
+    {
+    switch (eventId)
+      {
+      case vtkCommand::TimerEvent:
+        this->UpdateEvent();
+        break;
+
+      case vtkCommand::LeftButtonPressEvent:
+        this->LeftClickEvent();
+        break;
+
+      case vtkCommand::MiddleButtonPressEvent:
+        this->MiddleClickEvent();
+        break;
+
+      case vtkCommand::RightButtonReleaseEvent:
+        this->RightClickEvent();
+        break;
+
+      case vtkCommand::KeyPressEvent:
+        vtkRenderWindowInteractor* rwi =
+          this->TrackingClipViewer->GetWidget()->GetInteractor();
+
+        // toggle frame skip mode
+        if (rwi->GetKeyCode() == 's')
+          {
+          bool prev = this->TrackingClipViewer->GetAllowFrameSkip();
+          this->TrackingClipViewer->SetAllowFrameSkip(!prev);
+
+          if (this->TrackingClipViewer->GetAllowFrameSkip())
+            {
+            std::cout << "Frame skipping enabled.\n";
+            }
+          else
+            {
+            std::cout << "Frame skipping disabled.\n";
+            }
+          }
+        else if (rwi->GetKeyCode() == 'n')
+          {
+          this->TrackingClipViewer->RequestNextClips();
+          }
+        break;
+      }
+    }
+
+private:
+  void UpdateEvent()
+    {
+    // For some reason, setting the update timer interval to 33ms causes VTK/Qt
+    // to only update the timer every 50-60ms. So we set the timer interval to
+    // 16 and throw out half the updates, as a hack/workaround.
+    if (!this->TimeBetweenRenders.isNull() &&
+        this->TimeBetweenRenders.elapsed() < 33)
+      {
+      return;
+      }
+
+    // update clips
+    bool clipChanged = false;
+    size_t numCells = this->TrackingClipViewer->GetCellCount();
+    for (size_t i = 0; i < numCells; ++i)
+      {
+      vqTrackingClipViewer::Cell& cell = this->TrackingClipViewer->GetCell(i);
+      vtkImageActor* IA = cell.Image;
+      if (!IA)
+        {
+        continue;
+        }
+
+      int fd;
+      vtkDoubleArray* timeStamps =
+        vtkDoubleArray::SafeDownCast(IA->GetInput()->GetFieldData()
+                                     ->GetArray("TimeStampData", fd));
+      if (!timeStamps)
+        {
+        std::cout << "Clip is missing timestamp data.\n";
+        continue;
+        }
+
+      int slice = IA->GetZSlice();
+      int maxSlice = IA->GetWholeZMax();
+      int prevSlice = slice;
+
+      // in the case of single-frame clip, do nothing
+      if (maxSlice == 0)
+        {
+        continue;
+        }
+
+      // compute the frame to show for this update
+      if (this->TrackingClipViewer->GetAllowFrameSkip())
+        {
+        int et = cell.StartTime.elapsed();
+        double clipStart = timeStamps->GetValue(0);
+
+        // most of the time, showing the same frame or the very next frame
+        bool search = true;
+        if (slice < maxSlice - 1)
+          {
+          if (et < 1.0e-3 * (timeStamps->GetValue(slice + 1) - clipStart))
+            {
+            continue; // still showing same frame
+            }
+          if (et < 1.0e-3 * (timeStamps->GetValue(slice + 2) - clipStart))
+            {
+            ++slice;  // next frame
+            search = false;
+            }
+          }
+
+        // search for the last frame with an elapsed time less than our start time
+        if (search)
+          {
+          int min = slice;
+          int max = maxSlice;
+          while (min <= max)
+            {
+            int mid = min + (max - min) / 2;
+            double t = (timeStamps->GetValue(mid) - clipStart) * 1.0e-3;
+            if (et > t)
+              {
+              min = mid + 1;
+              }
+            else
+              {
+              max = mid - 1;
+              }
+            }
+          slice = min - 1;
+          if (slice < 0)
+            {
+            slice = 0; // this shouldn't happen, unless there is something wrong
+            }
+          }
+
+        // handle looping when reaching the end of the clip
+        if (slice == maxSlice)
+          {
+          double maxTime = timeStamps->GetValue(maxSlice);
+          if (et > (2 * maxTime -
+                    timeStamps->GetValue(maxSlice - 1) - clipStart) * 1.0e-3)
+            {
+            slice = 0;
+            cell.StartTime.restart();
+            }
+          }
+        }
+      else // not skipping frames
+        {
+        // compute the amount of time to show this frame
+        int tts;
+        if (slice == maxSlice)
+          {
+          tts = 1.0e-3 * (timeStamps->GetValue(slice) -
+                          timeStamps->GetValue(slice - 1));
+          }
+        else
+          {
+          tts = 1.0e-3 * (timeStamps->GetValue(slice + 1) -
+                          timeStamps->GetValue(slice));
+          }
+
+        // has this frame been displayed long enough?
+        int dt = cell.LastUpdate.elapsed();
+        if (dt >= tts - UpdateInterval / 2)
+          {
+          slice += 1;
+          if (slice > maxSlice)
+            {
+            slice = 0;
+            }
+          }
+        //std::cout << "dt: " << dt << " tts: " << tts
+        //          << " skew: " << dt - tts << " ms\n";
+        }
+
+      // update slice
+      if (slice != prevSlice)
+        {
+        IA->Update();
+        int* e = IA->GetInput()->GetExtent();
+        IA->SetDisplayExtent(e[0], e[1], e[2], e[3], slice, slice);
+
+        // adjust the clipping range - this assumes an input z-spacing of one
+        // and origin at 0,0,0
+        vtkCamera* camera = cell.Renderer->GetActiveCamera();
+        int zdist = camera->GetPosition()[2] - slice;
+        cell.Renderer->GetActiveCamera()->SetClippingRange(zdist - 1, zdist + 1);
+        cell.LastUpdate.restart();
+        clipChanged = true;
+
+        int framesSkipped = slice < prevSlice ? slice + (maxSlice - prevSlice)
+                            : slice - (prevSlice + 1);
+        if (framesSkipped)
+          {
+          std::cout << "Skipped " << framesSkipped << " frame(s).\n";
+          }
+        }
+      }
+
+    // render
+    if (clipChanged)
+      {
+      this->TrackingClipViewer->GetWidget()->GetRenderWindow()->Render();
+      this->TimeBetweenRenders.restart();
+
+      if (this->WriteRenderedImages)
+        {
+        this->WindowToImageFilter->Modified();
+        const QChar zero('0');
+        const QString outputFileName =
+          this->ImageOutputDirectory +
+          QString("/TrackingClipImage%1.pnm")
+            .arg(this->ImageCounter++, 6, 10, zero);
+        this->PNMWriter->SetFileName(qPrintable(outputFileName));
+        this->PNMWriter->Write();
+        }
+      }
+    }
+
+  void LeftClickEvent()
+    {
+    int x, y;
+    this->TrackingClipViewer->GetWidget()->GetInteractor()->GetEventPosition(x, y);
+
+    // activate the clip if this is a double-click
+    bool activate = false;
+    if (this->LastClick.isNull())
+      {
+      this->LastClick.start();
+      }
+    else if (this->LastClick.restart() < 400)
+      {
+      if (abs(x - this->LastClickPos[0]) < 5 &&
+          abs(y - this->LastClickPos[1]) < 5)
+        {
+        activate = true;
+        }
+      }
+
+    this->LastClickPos[0] = x;
+    this->LastClickPos[1] = y;
+    this->TrackingClipViewer->SelectClipAt(x, y, activate);
+    }
+
+  void MiddleClickEvent()
+    {
+    int x, y;
+    this->TrackingClipViewer->GetWidget()->GetInteractor()->GetEventPosition(x, y);
+    this->TrackingClipViewer->RemoveClipAt(x, y);
+    }
+
+  void RightClickEvent()
+    {
+    int x, y;
+    QVTKWidget* widget = this->TrackingClipViewer->GetWidget();
+    widget->GetInteractor()->GetEventPosition(x, y);
+
+    vtkVQTrackingClip* clip = this->TrackingClipViewer->SelectClipAt(x, y);
+    if (!clip)
+      {
+      return;
+      }
+
+    vtkVgVideoNode* node = clip->GetVideoNode();
+
+    // go back to Qt widget coords
+    y = widget->GetInteractor()->GetSize()[1] - y - 1;
+
+    QMenu menu(widget);
+
+    QAction* good = menu.addAction(
+                      vqUtil::uiIqrClassificationString(vvIqr::PositiveExample));
+    good->setCheckable(true);
+    good->setChecked(node->GetUserScore() == vvIqr::PositiveExample);
+
+    QAction* bad = menu.addAction(
+                     vqUtil::uiIqrClassificationString(vvIqr::NegativeExample));
+    bad->setCheckable(true);
+    bad->setChecked(node->GetUserScore() == vvIqr::NegativeExample);
+
+    QAction* none = menu.addAction(
+                      vqUtil::uiIqrClassificationString(vvIqr::UnclassifiedExample));
+    none->setCheckable(true);
+    none->setChecked(node->GetUserScore() == vvIqr::UnclassifiedExample);
+
+    menu.addSeparator();
+
+    QAction* write = menu.addAction("&Write Rendered Images");
+    write->setCheckable(true);
+    write->setChecked(this->WriteRenderedImages);
+
+    QAction* picked = menu.exec(widget->mapToGlobal(QPoint(x, y)));
+
+    if (picked == write)
+      {
+      // If currently off, turn it on once we have a directory from the user
+      if (!this->WriteRenderedImages)
+        {
+        this->ImageOutputDirectory =
+          vgFileDialog::getExistingDirectory(
+            this->TrackingClipViewer->GetWidget()->window(),
+            "Image Output Directory");
+        if (!this->ImageOutputDirectory.isEmpty())
+          {
+          this->WriteRenderedImages = true;
+          }
+        }
+      else  // Was writing, turn writing off
+        {
+        this->WriteRenderedImages = false;
+        }
+      }
+    else // (picked == good || picked == bad || picked == none)
+      {
+      vvIqr::Classification c;
+      if (picked == good)
+        {
+        c = vvIqr::PositiveExample;
+        }
+      else if (picked == bad)
+        {
+        c = vvIqr::NegativeExample;
+        }
+      else
+        {
+        c = vvIqr::UnclassifiedExample;
+        }
+      node->SetUserScore(c);
+      emit this->TrackingClipViewer->ClipRatingChanged(node->GetInstanceId(), c);
+      }
+    }
+};
+
+//-----------------------------------------------------------------------------
+class vqTrackingClipViewer::vqInternal
+{
+public:
+  std::vector<Cell>        Cells;
+  std::vector<ClipElement> Clips;
+
+  vqTrackingClipBuilder ClipBuilder;
+};
+
+//-----------------------------------------------------------------------------
+vqTrackingClipViewer::vqTrackingClipViewer(QWidget* parent)
+  : QDialog(parent), Widget(0), HasBeenShown(false), AllowFrameSkip(true),
+    NumRows(0), NumColumns(0), VideoScale(1.0), CurrentId(0)
+{
+  this->Widget = new QVTKWidget(this);
+  QVBoxLayout* layout = new QVBoxLayout;
+  layout->addWidget(this->Widget);
+  layout->setSpacing(0);
+  layout->setMargin(0);
+  this->setLayout(layout);
+
+  this->Internal = new vqInternal;
+  this->InteractorCallback = vtkSmartPointer<vtkInteractorCallback>::New();
+  this->InteractorCallback->SetTrackingClipViewer(this);
+}
+
+//-----------------------------------------------------------------------------
+vqTrackingClipViewer::~vqTrackingClipViewer()
+{
+  delete this->Internal;
+  delete this->Widget;
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::showEvent(QShowEvent*)
+{
+  if (this->Internal->Clips.empty())
+    {
+    std::cerr << "No clips added.\n";
+    return;
+    }
+
+  if (this->HasBeenShown)
+    {
+    this->Widget->GetInteractor()->AddObserver(vtkCommand::TimerEvent,
+                                               this->InteractorCallback);
+    return;
+    }
+
+  // disable interaction since the default behavior is not very useful
+  this->Widget->GetInteractor()->SetInteractorStyle(0);
+
+  this->Widget->GetInteractor()->AddObserver(vtkCommand::KeyPressEvent,
+                                             this->InteractorCallback);
+  this->Widget->GetInteractor()->AddObserver(vtkCommand::LeftButtonPressEvent,
+                                             this->InteractorCallback);
+  this->Widget->GetInteractor()->AddObserver(vtkCommand::MiddleButtonPressEvent,
+                                             this->InteractorCallback);
+  this->Widget->GetInteractor()->AddObserver(vtkCommand::RightButtonReleaseEvent,
+                                             this->InteractorCallback);
+  this->Widget->GetInteractor()->AddObserver(vtkCommand::TimerEvent,
+                                             this->InteractorCallback);
+
+  // restore position
+  QSettings settings;
+  settings.beginGroup("Clip Viewer Window");
+  this->move(settings.value("position").toPoint());
+
+  // start the update timer
+  this->Widget->GetInteractor()->CreateRepeatingTimer(UpdateInterval);
+
+  this->UpdateGridDimensions();
+  this->UpdateIdealSize();
+
+  this->resize(this->GetMinWindowSize());
+
+  // Add a single renderer that covers the entire window - otherwise, the
+  // padding regions may not be "cleared" since they are outside the bounds
+  // of the clip renderers.
+  vtkRenderer* ren = vtkRenderer::New();
+  ren->SetLayer(0);
+  this->Widget->GetRenderWindow()->AddRenderer(ren);
+  ren->FastDelete();
+
+  // initialize and lay out clip renderers
+  for (size_t i = 0, end = this->GetCellCount(); i < end; ++i)
+    {
+    if (!this->Internal->Cells[i].RendererInitialized)
+      {
+      this->InitializeRenderer(this->Internal->Cells[i]);
+      }
+    }
+  this->LayoutRenderers();
+
+  connect(&this->Internal->ClipBuilder, SIGNAL(ClipAvailable(vtkImageData*, int)),
+          this, SLOT(ClipAvailable(vtkImageData*, int)));
+
+  // build the clip data in a background thread
+  this->Internal->ClipBuilder.BuildClips(this->Internal->Clips.begin(),
+                                         this->Internal->Clips.end());
+
+  this->Widget->GetRenderWindow()->SetNumberOfLayers(2);
+  this->Widget->GetRenderWindow()->Render();
+  this->Widget->show();
+  this->HasBeenShown = true;
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::hideEvent(QHideEvent*)
+{
+  // stop updating the clips
+  this->Widget->GetInteractor()->RemoveObserver(this->InteractorCallback);
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::closeEvent(QCloseEvent* event)
+{
+  QSettings settings;
+  settings.beginGroup("Clip Viewer Window");
+  settings.setValue("position", this->pos());
+  this->QDialog::closeEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::resizeEvent(QResizeEvent*)
+{
+  if (!this->HasBeenShown)
+    {
+    return;
+    }
+  double width = this->width();
+  double height = this->height();
+
+  this->VideoScale = std::min(width / this->IdealSize.width(),
+                              height / this->IdealSize.height());
+  this->LayoutRenderers();
+}
+
+//-----------------------------------------------------------------------------
+size_t vqTrackingClipViewer::GetClipCount()
+{
+  return this->Internal->Clips.size();
+}
+
+//-----------------------------------------------------------------------------
+size_t vqTrackingClipViewer::GetCellCount()
+{
+  return this->Internal->Cells.size();
+}
+
+//-----------------------------------------------------------------------------
+vqTrackingClipViewer::Cell& vqTrackingClipViewer::GetCell(size_t index)
+{
+  return this->Internal->Cells[index];
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::InsertClips(const ClipVector& clips,
+                                       bool allowDuplicates)
+{
+  // sort input by rank
+  ClipVector clipsCopy(clips);
+  std::sort(clipsCopy.begin(), clipsCopy.end(), CompareByRank());
+
+  // crop to max size
+  if (clipsCopy.size() > MaxClips)
+    {
+    clipsCopy.resize(MaxClips);
+    }
+  size_t inputSize = clipsCopy.size();
+
+  if (!allowDuplicates && this->Internal->Clips.size() != 0)
+    {
+    // add new clips to the front of the vector
+    this->Internal->Clips.insert(this->Internal->Clips.begin(),
+                                 clipsCopy.begin(), clipsCopy.end());
+    this->Internal->Cells.insert(this->Internal->Cells.begin(),
+                                 clipsCopy.size(), Cell());
+
+    // Move any duplicate clips to the end of the vector, replacing them with
+    // their previously loaded (or load-in-progress) twin.
+    int numDupes = 0;
+    for (size_t i = 0; i < inputSize; ++i)
+      {
+      for (size_t j = inputSize, end = this->Internal->Clips.size();
+           j < end; ++j)
+        {
+        if (this->Internal->Clips[i].second->GetEventId() ==
+            this->Internal->Clips[j].second->GetEventId())
+          {
+          ++numDupes;
+          this->Internal->Clips[i] = this->Internal->Clips[j];
+          this->Internal->Cells[i] = this->Internal->Cells[j];
+          this->Internal->Cells[j].Renderer = 0;
+
+          if (j + 1 != end)
+            {
+            // shift the 'hole' from the moved clip to the end of the vector
+            ClipVector::iterator begin = this->Internal->Clips.begin();
+            std::rotate(begin + j, begin + (j + 1), this->Internal->Clips.end());
+
+            std::vector<Cell>::iterator begin2 = this->Internal->Cells.begin();
+            std::rotate(begin2 + j, begin2 + (j + 1), this->Internal->Cells.end());
+            }
+
+          // shift input duplicates to the end
+          if (i + 1 != inputSize)
+            {
+            ClipVector::iterator begin = clipsCopy.begin();
+            std::rotate(begin + i, begin + (i + 1), clipsCopy.end());
+            }
+
+          break;
+          }
+        }
+      }
+
+    // remove duplicate clips, which are now at the end of the vector
+    if (numDupes != 0)
+      {
+      size_t uniques = this->Internal->Clips.size() - numDupes;
+      this->Internal->Clips.resize(uniques);
+
+      // if we will be removing cells, make sure to clean up their renderers
+      for (size_t i = uniques, end = this->Internal->Cells.size(); i < end; ++i)
+        {
+        Cell& cell = this->Internal->Cells[i];
+        if (cell.Renderer && cell.RendererInitialized)
+          {
+          this->Widget->GetRenderWindow()->RemoveRenderer(cell.Renderer);
+          }
+        }
+
+      this->Internal->Cells.resize(uniques);
+      clipsCopy.resize(inputSize - numDupes);
+      }
+    }
+  else  // allow duplicates
+    {
+    this->Internal->Clips.insert(this->Internal->Clips.begin(),
+                                 clipsCopy.begin(), clipsCopy.end());
+    this->Internal->Cells.insert(this->Internal->Cells.begin(),
+                                 inputSize, Cell());
+    }
+
+  // drop the 'oldest' clips if there are too many
+  if (this->Internal->Clips.size() > MaxClips)
+    {
+    std::cerr << "Maximum number of clips exceeded - only the first "
+              << MaxClips << " will be shown.\n";
+    this->Internal->Clips.resize(MaxClips);
+    }
+
+  // assign ids to the new clips
+  for (size_t i = 0, j = 0; i < inputSize; ++i)
+    {
+    if (!this->Internal->Cells[i].Used)
+      {
+      unsigned id = this->CurrentId++;
+      this->Internal->Clips[i].first = id;
+      this->Internal->Cells[i].Id = id;
+      clipsCopy[j++].first = id;
+      }
+    }
+
+  bool dimensionsChanged = this->UpdateGridDimensions();
+
+  // init new cells or remove excess cells
+  size_t numCells = this->GetCellCount();
+  size_t numCellsNeeded = this->NumRows * this->NumColumns;
+  if (numCellsNeeded != numCells)
+    {
+    // if we will be removing cells, make sure to clean up their renderers
+    for (size_t i = numCellsNeeded; i < numCells; ++i)
+      {
+      Cell& cell = this->Internal->Cells[i];
+      if (cell.RendererInitialized)
+        {
+        this->Widget->GetRenderWindow()->RemoveRenderer(cell.Renderer);
+        }
+      }
+
+    this->Internal->Cells.resize(numCellsNeeded);
+    for (size_t i = numCells; i < numCellsNeeded; ++i)
+      {
+      Cell& cell = this->Internal->Cells[i];
+      cell.Renderer = vtkSmartPointer<vtkRenderer>::New();
+      if (this->HasBeenShown)
+        {
+        this->InitializeRenderer(cell);
+        }
+      }
+    }
+
+  // update the cells where the input clips will go
+  for (size_t i = 0; i < inputSize; ++i)
+    {
+    // skip duplicates that have already been loaded
+    Cell& cell = this->Internal->Cells[i];
+    if (cell.Used)
+      {
+      continue;
+      }
+
+    // create renderer
+    cell.Used = true;
+    cell.Renderer = vtkSmartPointer<vtkRenderer>::New();
+    if (this->HasBeenShown)
+      {
+      this->InitializeRenderer(cell);
+      }
+
+    // construct label
+    vtkTextActor* TA = vtkTextActor::New();
+    TA->GetTextProperty()->SetVerticalJustificationToBottom();
+    TA->SetPosition(Padding, Padding);
+    cell.Label = TA;
+    cell.Renderer->AddViewProp(cell.Label);
+    TA->FastDelete();
+
+    // set label text
+    this->UpdateCellLabel(cell, this->Internal->Clips[i].second);
+    }
+
+  QSize size = this->GetBestSizeAtCurrentScale();
+  this->UpdateIdealSize();
+
+  // go ahead and process the clips if the dialog's already visible
+  if (this->isVisible())
+    {
+    // resize the window if the grid size has changed
+    if (dimensionsChanged)
+      {
+      this->resize(this->size().expandedTo(size));
+      }
+
+    this->LayoutRenderers();
+
+    if (!clipsCopy.empty())
+      {
+      this->Internal->ClipBuilder.BuildClips(clipsCopy.begin(), clipsCopy.end());
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::ClipAvailable(vtkImageData* clip, int id)
+{
+  // find the destination cell
+  for (size_t i = 0, end = this->Internal->Cells.size(); i < end; ++i)
+    {
+    Cell& cell = this->Internal->Cells[i];
+    if (cell.Id == id)
+      {
+      vtkSmartPointer<vtkImageActor> imageActor = vtkSmartPointer<vtkImageActor>::New();
+      imageActor->SetInputData(clip);
+      clip->Delete();
+
+      vtkRenderer* renderer = cell.Renderer;
+      renderer->AddViewProp(imageActor);
+      renderer->ResetCamera();
+      double* position = renderer->GetActiveCamera()->GetPosition();
+      renderer->GetActiveCamera()->SetPosition(position[0], position[1],
+                                               clip->GetDimensions()[2] + 2);
+      renderer->GetActiveCamera()->SetParallelScale(VideoSize * 0.5);
+
+      cell.Image = imageActor;
+      cell.StartTime.start();
+      cell.LastUpdate.start();
+      this->Widget->GetRenderWindow()->Render();
+      return;
+      }
+    }
+  // the target cell has been removed - the clip is DOA
+  clip->Delete();
+  std::cerr << "Destination cell was removed.\n";
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::LayoutRenderers()
+{
+  double vidSize = VideoSize * this->VideoScale;
+
+  double w = this->width();
+  double h = this->height();
+
+  double xPadding = w - vidSize * this->NumColumns;
+  xPadding /= this->NumColumns + 1;
+
+  double yPadding = h - vidSize * this->NumRows;
+  yPadding /= this->NumRows + 1;
+
+  int count = 0;
+  for (int i = 0; i < this->NumRows; ++i)
+    {
+    for (int j = 0; j < this->NumColumns; ++j)
+      {
+      // display first clip in the upper left corner, last in bottom right
+      double x0 = xPadding + (vidSize + xPadding) * j;
+      double y0 = yPadding + (vidSize + yPadding) * (this->NumRows - 1 - i);
+      double x1 = x0 + vidSize;
+      double y1 = y0 + vidSize;
+
+      double minViewX = x0 / w;
+      double maxViewX = x1 / w;
+      double minViewY = y0 / h;
+      double maxViewY = y1 / h;
+
+      vtkRenderer* renderer = this->Internal->Cells[count++].Renderer;
+      renderer->SetViewport(minViewX, minViewY, maxViewX, maxViewY);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vqTrackingClipViewer::UpdateGridDimensions()
+{
+  int prevNumRows = this->NumRows;
+  int prevNumColumns = this->NumColumns;
+  int numClips = static_cast<int>(this->GetClipCount());
+  this->NumRows = (numClips - 1) / ClipsPerRow + 1;
+  this->NumColumns = numClips > ClipsPerRow ? ClipsPerRow : numClips;
+  return this->NumRows != prevNumRows || this->NumColumns != prevNumColumns;
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::UpdateIdealSize()
+{
+  this->IdealSize = this->GetMinWindowSize(1.0, 0);
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::UpdateCellLabel(Cell& cell, vtkVQTrackingClip* clip)
+{
+  // set label text
+  std::ostringstream ostr;
+  ostr << clip->GetRank();
+
+  vtkTextProperty* tp = cell.Label->GetTextProperty();
+
+  switch (clip->GetVideoNode()->GetUserScore())
+    {
+    case vvIqr::PositiveExample:     tp->SetColor(0.3, 1.0, 0.3); break;
+    case vvIqr::NegativeExample:     tp->SetColor(1.0, 0.3, 0.3); break;
+    case vvIqr::UnclassifiedExample: tp->SetColor(1.0, 1.0, 1.0); break;
+    }
+
+  cell.Label->SetInput(ostr.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+QSize vqTrackingClipViewer::GetMinWindowSize(double videoScale, int minWidth)
+{
+  int w = VideoSize * this->NumColumns +
+          2 * Padding + Padding * (this->NumColumns - 1);
+  int h = VideoSize * this->NumRows +
+          2 * Padding + Padding * (this->NumRows - 1);
+
+  return QSize(std::max<double>(w * videoScale, minWidth), h * videoScale);
+}
+
+//-----------------------------------------------------------------------------
+QSize vqTrackingClipViewer::GetBestSizeAtCurrentScale()
+{
+  return this->GetMinWindowSize(this->VideoScale);
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::InitializeRenderer(Cell& cell)
+{
+  vtkCamera* camera = cell.Renderer->GetActiveCamera();
+  camera->ParallelProjectionOn();
+  camera->SetParallelScale(VideoSize * 0.5);
+
+  // center the video bounds
+  double videoCenter = (VideoSize - 1) * 0.5;
+  camera->SetPosition(videoCenter, videoCenter, 1.0);
+  camera->SetFocalPoint(videoCenter, videoCenter, 0.0);
+
+  cell.Renderer->SetLayer(1);
+  this->Widget->GetRenderWindow()->AddRenderer(cell.Renderer);
+  cell.RendererInitialized = true;
+}
+
+//-----------------------------------------------------------------------------
+vtkVQTrackingClip* vqTrackingClipViewer::SelectClipAt(int x, int y,
+    bool activate)
+{
+  vtkRenderer* renderer = this->Widget->GetInteractor()->FindPokedRenderer(x, y);
+  if (!renderer)
+    {
+    return 0;
+    }
+
+  // find the cell corresponding to that renderer
+  for (size_t i = 0, size = this->Internal->Cells.size(); i < size; ++i)
+    {
+    Cell& cell = this->Internal->Cells[i];
+    if (renderer == cell.Renderer)
+      {
+      return this->SelectClipInCell(i, activate);
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::RemoveClipAt(int x, int y)
+{
+  if (this->GetClipCount() < 2)
+    {
+    return;
+    }
+
+  vtkRenderer* renderer = this->Widget->GetInteractor()->FindPokedRenderer(x, y);
+  if (!renderer)
+    {
+    return;
+    }
+
+  // find the cell corresponding to that renderer
+  for (size_t i = 0, size = this->Internal->Cells.size(); i < size; ++i)
+    {
+    Cell& cell = this->Internal->Cells[i];
+    if (renderer == cell.Renderer)
+      {
+      this->RemoveClipInCell(i);
+      return;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::UpdateClips(vqCore* core)
+{
+  for (size_t i = 0; i < this->Internal->Clips.size();)
+    {
+    vtkVgVideoNode* node =
+      core->getResultNode(this->Internal->Clips[i].second->GetEventId());
+
+    // remove clip if the result is no longer available
+    if (!node)
+      {
+      this->RemoveClipInCell(i);
+      continue;
+      }
+
+    // node for this id has probably changed
+    this->Internal->Clips[i].second->SetVideoNode(node);
+
+    // update the cell label if the rank of this result has changed
+    int rank = node->GetRank();
+    if (rank != this->Internal->Clips[i].second->GetRank())
+      {
+      this->Internal->Clips[i].second->SetRank(rank);
+
+      this->UpdateCellLabel(this->Internal->Cells[i],
+                            this->Internal->Clips[i].second);
+      }
+
+    ++i;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::RefreshClips()
+{
+  for (size_t i = 0; i < this->Internal->Clips.size(); ++i)
+    {
+    this->UpdateCellLabel(this->Internal->Cells[i],
+                          this->Internal->Clips[i].second);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVQTrackingClip* vqTrackingClipViewer::SelectClipInCell(size_t cellIndex,
+    bool activate)
+{
+  Cell& cell = this->Internal->Cells[cellIndex];
+
+  // find and select the corresponding clip
+  for (ClipVector::iterator itr = this->Internal->Clips.begin();
+       itr != this->Internal->Clips.end();
+       ++itr)
+    {
+    if (itr->first == cell.Id)
+      {
+      emit ClipSelected(itr->second->GetEventId());
+      if (activate)
+        {
+        emit ClipActivated(itr->second->GetEventId());
+        }
+      return itr->second;
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::RemoveClipInCell(size_t cellIndex)
+{
+  Cell& cell = this->Internal->Cells[cellIndex];
+
+  // find and delete the corresponding clip
+  for (ClipVector::iterator itr = this->Internal->Clips.begin();
+       itr != this->Internal->Clips.end();
+       ++itr)
+    {
+    if (itr->first == cell.Id)
+      {
+      // tell the clip builder not to process this clip if it hasn't already
+      this->Internal->ClipBuilder.SkipClip(itr->first);
+      this->Internal->Clips.erase(itr);
+      break;
+      }
+    }
+
+  // 'clear' the cell
+  if (cell.Image)
+    {
+    cell.Renderer->RemoveViewProp(cell.Image);
+    cell.Image = 0;
+    }
+  if (cell.Label)
+    {
+    cell.Renderer->RemoveViewProp(cell.Label);
+    cell.Label = 0;
+    }
+  cell.Id = -1;
+  cell.StartTime = QTime();
+  cell.LastUpdate = QTime();
+
+  // move the erased cell to the last position
+  if (cellIndex + 1 != this->Internal->Cells.size())
+    {
+    std::rotate(this->Internal->Cells.begin() + cellIndex,
+                this->Internal->Cells.begin() + cellIndex + 1,
+                this->Internal->Cells.end());
+    }
+
+  if (this->UpdateGridDimensions())
+    {
+    // remove dead renderers
+    size_t gridSize = this->NumRows * this->NumColumns;
+    for (size_t i = gridSize, end = this->Internal->Cells.size(); i < end; ++i)
+      {
+      this->Widget->GetRenderWindow()
+      ->RemoveRenderer(this->Internal->Cells[i].Renderer);
+      }
+    this->Internal->Cells.resize(gridSize);
+
+    // shrink the window
+    QSize size = this->GetBestSizeAtCurrentScale();
+    this->UpdateIdealSize();
+    this->resize(size);
+    }
+
+  this->LayoutRenderers();
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::RequestNextClips()
+{
+  emit this->RequestNextClips(
+    this->Internal->Clips.back().second->GetVideoNode()->GetInstanceId(),
+    static_cast<int>(this->GetClipCount()));
+}
+
+//-----------------------------------------------------------------------------
+void vqTrackingClipViewer::RemoveAllClips()
+{
+  size_t numClips = this->GetClipCount();
+  for (size_t i = 0; i < numClips; ++i)
+    {
+    this->RemoveClipInCell(0);
+    }
+}
diff --git a/Applications/Viqui/vqTrackingClipViewer.h b/Applications/Viqui/vqTrackingClipViewer.h
new file mode 100644
index 00000000..a1bc365f
--- /dev/null
+++ b/Applications/Viqui/vqTrackingClipViewer.h
@@ -0,0 +1,112 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqTrackingClipViewer_h
+#define __vqTrackingClipViewer_h
+
+#include <vtkSmartPointer.h>
+
+#include <QDialog>
+
+class QVTKWidget;
+class vqCore;
+class vtkImageActor;
+class vtkImageData;
+class vtkRenderer;
+class vtkInteractorCallback;
+class vtkVQTrackingClip;
+
+class vqTrackingClipViewer : public QDialog
+{
+  Q_OBJECT
+
+public:
+  // id, clip pair
+  typedef std::pair< int, vtkSmartPointer<vtkVQTrackingClip> > ClipElement;
+  typedef std::vector<ClipElement> ClipVector;
+
+public:
+  vqTrackingClipViewer(QWidget* parent = 0);
+  virtual ~vqTrackingClipViewer();
+
+  void InsertClips(const ClipVector& clips, bool allowDuplicates = false);
+
+  vtkVQTrackingClip* SelectClipAt(int x, int y, bool activate = false);
+  void RemoveClipAt(int x, int y);
+
+  void RemoveAllClips();
+  void UpdateClips(vqCore* core);
+  void RefreshClips();
+  void RequestNextClips();
+
+  virtual void showEvent(QShowEvent* event);
+  virtual void hideEvent(QHideEvent* event);
+  virtual void closeEvent(QCloseEvent* event);
+  virtual void resizeEvent(QResizeEvent* event);
+
+  QVTKWidget* GetWidget()  { return this->Widget; }
+
+  void SetAllowFrameSkip(bool enable)
+    { this->AllowFrameSkip = enable; }
+
+  bool GetAllowFrameSkip()
+    { return this->AllowFrameSkip; }
+
+signals:
+  void ClipSelected(int id);
+  void ClipActivated(int id);
+  void ClipRatingChanged(int id, int rating);
+  void RequestNextClips(vtkIdType previousId, int count);
+
+public slots:
+  void ClipAvailable(vtkImageData* clip, int id);
+
+protected:
+  struct Cell;
+
+  size_t GetClipCount();
+  size_t GetCellCount();
+  Cell&  GetCell(size_t index);
+
+  void LayoutRenderers();
+  void InitializeRenderer(Cell& cell);
+
+  bool UpdateGridDimensions();
+  void UpdateIdealSize();
+  void UpdateCellLabel(Cell& cell, vtkVQTrackingClip* clip);
+
+  QSize GetMinWindowSize(double videoScale = 1.0, int minWidth = 150);
+  QSize GetBestSizeAtCurrentScale();
+
+  vtkVQTrackingClip* SelectClipInCell(size_t cellIndex, bool activate);
+  void RemoveClipInCell(size_t cellIndex);
+
+private:
+  vqTrackingClipViewer(const vqTrackingClipViewer&); // Not implemented.
+  void operator=(const vqTrackingClipViewer&);       // Not implemented.
+
+  vtkSmartPointer<vtkInteractorCallback> InteractorCallback;
+
+  QVTKWidget* Widget;
+
+  bool HasBeenShown;
+  bool AllowFrameSkip;
+
+  int NumRows, NumColumns;
+
+  QSize IdealSize;
+
+  double VideoScale;
+
+  class vqInternal;
+  vqInternal* Internal;
+
+  unsigned CurrentId;
+
+  friend class vtkInteractorCallback;
+};
+
+#endif // __vqTrackingClipViewer_h
diff --git a/Applications/Viqui/vqTreeView.cxx b/Applications/Viqui/vqTreeView.cxx
new file mode 100644
index 00000000..22b49b86
--- /dev/null
+++ b/Applications/Viqui/vqTreeView.cxx
@@ -0,0 +1,1098 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqTreeView.h"
+
+#include <QActionGroup>
+#include <QApplication>
+#include <QContextMenuEvent>
+#include <QHeaderView>
+#include <QIcon>
+#include <QMenu>
+#include <QPalette>
+#include <QSignalMapper>
+#include <QTreeWidget>
+
+#include <qtUtil.h>
+
+#include <vtkLookupTable.h>
+#include <vtkObjectFactory.h>
+
+#include <vtkVgGroupNode.h>
+#include <vtkVgVideoModel0.h>
+#include <vtkVgVideoNode.h>
+#include <vtkVgVideoRepresentationBase0.h>
+
+#include <vgTextEditDialog.h>
+#include <vgUnixTime.h>
+
+#include <algorithm>
+
+#include "vqEventInfo.h"
+#include "vqUtil.h"
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+enum TreeColumn
+{
+  TC_RatingIcon,
+  TC_Id,
+  TC_Rank,
+  TC_Star,
+  TC_Score,
+  TC_Type,
+  TC_Color,
+  TC_MissionId,
+  TC_StartTime,
+  TC_EndTime,
+  TC_Duration,
+  TC_Date,
+  TC_Rating,
+  TC_Source,
+  TC_EventType,
+  TC_Note,
+  TC_NumColumnTypes
+};
+
+//-----------------------------------------------------------------------------
+struct ColumnInfo
+{
+  TreeColumn Id;
+  const char* Name;
+  const char* ToolTip;
+};
+
+//-----------------------------------------------------------------------------
+struct BlockSignals
+{
+  vqTreeView* User;
+
+  BlockSignals(vqTreeView* user)
+    : User(user)
+    {
+    this->User->blockSignals(true);
+    }
+
+  ~BlockSignals()
+    {
+    this->User->blockSignals(false);
+    }
+};
+
+} // end anonymous namespace
+
+//-----------------------------------------------------------------------------
+struct vqTreeView::TreeInternal
+{
+  QIcon YesIcon, NoIcon, BlankIcon, StarIcon, StarOffIcon;
+
+  std::vector<ColumnInfo> Columns;
+  int ColumnMap[TC_NumColumnTypes];
+
+  void ResetColumns()
+    {
+    this->Columns.clear();
+    std::fill(this->ColumnMap, this->ColumnMap + TC_NumColumnTypes, -1);
+    }
+
+  void AddColumn(TreeColumn id, const char* name, const char* tooltip = 0)
+    {
+    this->ColumnMap[id] = static_cast<int>(this->Columns.size());
+
+    ColumnInfo ci;
+    ci.Id = id;
+    ci.Name = name;
+    ci.ToolTip = tooltip ? tooltip : name;
+    this->Columns.push_back(ci);
+    }
+
+  int GetColumn(TreeColumn id)
+    {
+    return this->ColumnMap[id];
+    }
+};
+
+//-----------------------------------------------------------------------------
+class vqTreeView::TreeWidgetItem : public QTreeWidgetItem
+{
+  vqTreeView* Tree;
+
+public:
+  TreeWidgetItem(vqTreeView* parent, const QStringList& strings)
+    : QTreeWidgetItem(strings), Tree(parent)
+    {}
+
+private:
+  virtual bool operator<(const QTreeWidgetItem& other) const
+    {
+    if (Tree->sortColumn() == Tree->Internal->GetColumn(TC_RatingIcon))
+      {
+      return Tree->GetVideoNode(this)->GetUserScore() <
+             Tree->GetVideoNode(&other)->GetUserScore();
+      }
+    if (Tree->sortColumn() == Tree->Internal->GetColumn(TC_Star))
+      {
+      return Tree->GetVideoNode(this)->GetIsStarResult() <
+             Tree->GetVideoNode(&other)->GetIsStarResult();
+      }
+    return QTreeWidgetItem::operator<(other);
+    }
+
+  virtual QVariant data(int column, int role) const
+    {
+    if (role == Qt::ToolTipRole)
+      {
+      if (column == Tree->Internal->GetColumn(TC_RatingIcon))
+        {
+        return vqUtil::uiIqrClassificationString(
+                 static_cast<vvIqr::Classification>(
+                   Tree->GetVideoNode(this)->GetUserScore()));
+        }
+      if (char* note = Tree->GetVideoNode(this)->GetNote())
+        {
+        return QString(note);
+        }
+      if (!Tree->GetVideoNode(this)->GetHasVideoData())
+        {
+        return "No video data available";
+        }
+      }
+
+    return QTreeWidgetItem::data(column, role);
+    }
+};
+
+//-----------------------------------------------------------------------------
+vqTreeView::vqTreeView(QWidget* p)
+  : QTreeWidget(p)
+{
+  this->Internal = new TreeInternal;
+
+  this->IsFeedbackList = false;
+  this->AllowRefinement = false;
+  this->AllowStarToggle = false;
+  this->ShowHiddenItems = true;
+  this->LookupTable = 0;
+  this->IgnoreActivation = false;
+
+  this->LastActivated = 0;
+
+  // setup status icons to be used later
+  this->Internal->YesIcon = qtUtil::standardIcon("okay", 16);
+  this->Internal->NoIcon = qtUtil::standardIcon("cancel", 16);
+  this->Internal->BlankIcon = qtUtil::standardIcon("blank", 16);
+  this->Internal->StarIcon = qtUtil::standardIcon("star", 16);
+  this->Internal->StarOffIcon = qtUtil::standardIcon("star-off", 16);
+
+  this->SetStatusMapper = new QSignalMapper;
+
+  connect(this->SetStatusMapper, SIGNAL(mapped(int)),
+          this, SLOT(SetRating(int)));
+
+  connect(this,
+          SIGNAL(itemActivated(QTreeWidgetItem*, int)),
+          SLOT(ItemActivated(QTreeWidgetItem*)));
+
+  connect(this,
+          SIGNAL(itemSelectionChanged()),
+          SLOT(ItemSelectionChanged()));
+
+  // set up IQR status actions with keyboard shortcuts N,G,B
+  this->SetStatusActions = new QActionGroup(this);
+  this->SetStatusGood = this->CreateStatusAction(
+                          vqUtil::uiIqrClassificationString(vvIqr::PositiveExample,
+                              vqUtil::UI_IncludeAccelerator),
+                          Qt::Key_Plus, Qt::Key_Equal, vvIqr::PositiveExample);
+  this->SetStatusBad = this->CreateStatusAction(
+                         vqUtil::uiIqrClassificationString(vvIqr::NegativeExample,
+                             vqUtil::UI_IncludeAccelerator),
+                         Qt::Key_Minus, Qt::Key_Underscore, vvIqr::NegativeExample);
+  this->SetStatusNone = this->CreateStatusAction(
+                          vqUtil::uiIqrClassificationString(vvIqr::UnclassifiedExample,
+                              vqUtil::UI_IncludeAccelerator),
+                          Qt::Key_Slash, Qt::Key_Backslash, vvIqr::UnclassifiedExample);
+}
+
+//-----------------------------------------------------------------------------
+vqTreeView::~vqTreeView()
+{
+  this->LastActivated = 0;
+
+  delete this->SetStatusMapper;
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+QAction* vqTreeView::CreateStatusAction(QString text, Qt::Key shortcut,
+                                        Qt::Key otherShortcut, int mapValue)
+{
+  QAction* action = new QAction(text, this);
+  action->setCheckable(true);
+  QList<QKeySequence> shortcuts;
+  shortcuts << shortcut << otherShortcut;
+  action->setShortcuts(shortcuts);
+  action->setShortcutContext(Qt::WidgetShortcut);
+  this->SetStatusMapper->setMapping(action, mapValue);
+  connect(action, SIGNAL(triggered(bool)), this->SetStatusMapper, SLOT(map()));
+  this->addAction(action);
+  this->SetStatusActions->addAction(action);
+  return action;
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::Initialize(QList<vtkVgVideoNode*> nodes,
+                            bool isFeedbackList,
+                            bool allowRefinement,
+                            bool allowStarToggle,
+                            bool showEventType)
+{
+  this->Internal->ResetColumns();
+
+  this->Internal->AddColumn(TC_RatingIcon,  "", "Rating");
+  this->Internal->AddColumn(TC_Id,        "Id", "Result Id");
+  this->Internal->AddColumn(TC_Rank,    "Rank", "Result Rank");
+
+  if (allowStarToggle)
+    {
+    this->Internal->AddColumn(TC_Star, "", "Starred");
+    }
+
+  if (showEventType)
+    {
+    this->Internal->AddColumn(TC_EventType, "Event Type");
+    }
+  else
+    {
+    if (isFeedbackList)
+      {
+      this->Internal->AddColumn(TC_Score, "Preference",
+                                "Feedback Preference Score");
+      }
+    else
+      {
+      this->Internal->AddColumn(TC_Score, "Score", "Relevancy Score");
+      }
+
+    this->Internal->AddColumn(TC_Type,  "*", "Feedback Requested");
+    }
+
+  this->Internal->AddColumn(TC_Color,     "Color");
+  this->Internal->AddColumn(TC_MissionId, "Mission Id");
+  this->Internal->AddColumn(TC_StartTime, "Start Time");
+  this->Internal->AddColumn(TC_EndTime,   "End Time");
+  this->Internal->AddColumn(TC_Duration,  "Duration");
+  this->Internal->AddColumn(TC_Date,      "Date",   "Start Date");
+  this->Internal->AddColumn(TC_Rating,    "Rating");
+  this->Internal->AddColumn(TC_Source,    "Source", "Source Clip Location");
+  this->Internal->AddColumn(TC_Note,      "Note");
+
+  this->setColumnCount(static_cast<int>(this->Internal->Columns.size()));
+
+  if (!showEventType)
+    {
+    // center the "*"
+    this->model()->setHeaderData(this->Internal->GetColumn(TC_Type),
+                                 Qt::Horizontal,
+                                 Qt::AlignHCenter, Qt::TextAlignmentRole);
+    }
+
+  QStringList labels;
+  for (size_t i = 0, end = this->Internal->Columns.size(); i < end; ++i)
+    {
+    ColumnInfo& ci = this->Internal->Columns[i];
+    labels.append(ci.Name);
+
+    // set tooltip for column header
+    this->model()->setHeaderData(static_cast<int>(i), Qt::Horizontal,
+                                 ci.ToolTip, Qt::ToolTipRole);
+    }
+  this->setHeaderLabels(labels);
+  this->setHeaderHidden(false);
+
+  // some columns get icons for their header
+  this->headerItem()->setIcon(this->Internal->GetColumn(TC_RatingIcon),
+                              this->Internal->YesIcon);
+  if (allowStarToggle)
+    {
+    this->headerItem()->setIcon(this->Internal->GetColumn(TC_Star),
+                                this->Internal->StarIcon);
+    }
+
+  this->IsFeedbackList = isFeedbackList;
+  this->AllowRefinement = allowRefinement;
+  this->AllowStarToggle = allowStarToggle;
+
+  this->setSortingEnabled(false);
+  this->clear();
+
+  // the node list should already be sorted by score, giving us implicit ranks
+  foreach (vtkVgVideoNode* node, nodes)
+    this->AddItemForNode(node);
+
+  for (int i = 0; i < labels.count(); ++i)
+    this->resizeColumnToContents(i);
+
+  if (isFeedbackList)
+    {
+    this->header()->setSortIndicator(this->Internal->GetColumn(TC_Score),
+                                     Qt::DescendingOrder);
+    }
+  else
+    {
+    this->header()->setSortIndicator(this->Internal->GetColumn(TC_Rank),
+                                     Qt::AscendingOrder);
+    }
+
+  this->setSortingEnabled(true);
+
+  // Resize the id column again, since resizeColumnToContents doesn't seem to
+  // work correctly when sorting is disabled *and* an icon is present.
+  this->resizeColumnToContents(this->Internal->GetColumn(TC_Id));
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::AddItemForNode(vtkVgVideoNode* node)
+{
+  QStringList strings;
+  for (size_t i = 0, end = this->Internal->Columns.size(); i < end; ++i)
+    {
+    switch (this->Internal->Columns[i].Id)
+      {
+      default:
+        Q_ASSERT_X(0, __FUNCTION__, "unknown column id");
+        break;
+      case TC_RatingIcon:
+      case TC_Id:
+      case TC_Rank:
+      case TC_Star:
+      case TC_Color:
+      case TC_Rating:
+      case TC_Note:
+        strings.append(QString());
+        break;
+      case TC_Score:
+        {
+        double score = this->IsFeedbackList ? node->GetPreferenceScore() :
+                       node->GetRelevancyScore();
+        strings.append(QString("%1").arg(score, 0, 'f', 6));
+        break;
+        }
+      case TC_Type:
+        strings.append(node->GetIsRefinementResult() ? "*" : QString());
+        break;
+      case TC_MissionId:
+        strings.append(node->GetMissionId());
+        break;
+      case TC_StartTime:
+        strings.append(vgUnixTime(node->GetTimeRange()[0]).timeString());
+        break;
+      case TC_EndTime:
+        strings.append(vgUnixTime(node->GetTimeRange()[1]).timeString());
+        break;
+      case TC_Duration:
+        strings.append(vgUnixTime(node->GetTimeRange()[1] -
+                                  node->GetTimeRange()[0]).timeString());
+        break;
+      case TC_Date:
+        strings.append(vgUnixTime(node->GetTimeRange()[0]).dateString());
+        break;
+      case TC_Source:
+        strings.append(node->GetStreamId());
+        break;
+      case TC_EventType:
+        int at = node->GetActivityType();
+        strings.append(at >= 0 ? vqEventInfo::name(at) : QString());
+        break;
+      }
+    }
+
+  TreeWidgetItem* item = new TreeWidgetItem(this, strings);
+  item->setData(0, Qt::UserRole, QVariant::fromValue((void*) node));
+
+  // prevent row height from changing
+  item->setData(0, Qt::SizeHintRole, 10);
+
+  item->setData(this->Internal->GetColumn(TC_Id),
+                Qt::DisplayRole,
+                node->GetInstanceId());
+  item->setData(this->Internal->GetColumn(TC_Rank),
+                Qt::DisplayRole,
+                node->GetRank());
+
+  int typeCol = this->Internal->GetColumn(TC_Type);
+  if (typeCol >= 0)
+    {
+    item->setTextAlignment(typeCol, Qt::AlignHCenter);
+    }
+
+  this->UpdateItem(item);
+
+  this->addTopLevelItem(item);
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::UpdateItem(QTreeWidgetItem* item)
+{
+  vtkVgVideoNode* node = this->GetVideoNode(item);
+  if (!node)
+    {
+    return;
+    }
+
+  // are we showing hidden items in the list?
+  if (!this->ShowHiddenItems &&
+      node->GetVisibleNodeMask() != vtkVgNodeBase::VISIBLE_NODE_MASK)
+    {
+    item->setHidden(true);
+    return;
+    }
+  else
+    {
+    item->setHidden(false);
+    }
+
+  if (this->AllowStarToggle)
+    {
+    item->setIcon(this->Internal->GetColumn(TC_Star),
+                  node->GetIsStarResult() ? this->Internal->StarIcon :
+                  this->Internal->StarOffIcon);
+    }
+
+  vvIqr::Classification rating =
+    static_cast<vvIqr::Classification>(node->GetUserScore());
+
+  int ratingCol = this->Internal->GetColumn(TC_RatingIcon);
+  switch (rating)
+    {
+    case vvIqr::UnclassifiedExample:
+      item->setIcon(ratingCol, this->Internal->BlankIcon);
+      break;
+    case vvIqr::PositiveExample:
+      item->setIcon(ratingCol, this->Internal->YesIcon);
+      break;
+    case vvIqr::NegativeExample:
+      item->setIcon(ratingCol, this->Internal->NoIcon);
+      break;
+    }
+  item->setText(this->Internal->GetColumn(TC_Rating),
+                vqUtil::uiIqrClassificationString(rating));
+
+  item->setText(this->Internal->GetColumn(TC_Note), node->GetNote());
+
+  // show indicator color
+  if (this->LookupTable)
+    {
+    if (node->GetVisibleNodeMask() == vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      unsigned char* c = this->LookupTable->MapValue(node->GetColorScalar());
+      QColor color(c[0], c[1], c[2]);
+      item->setBackground(this->Internal->GetColumn(TC_Color), QBrush(color));
+      }
+    else
+      {
+      item->setBackground(this->Internal->GetColumn(TC_Color), QBrush());
+      }
+    }
+
+  QPalette palette;
+  if (node->GetVisibleNodeMask() != vtkVgNodeBase::VISIBLE_NODE_MASK)
+    {
+    palette.setCurrentColorGroup(QPalette::Disabled);
+    }
+  else if (!node->GetHasVideoData())
+    {
+    palette.setColor(QPalette::WindowText, Qt::red);
+    }
+
+  const QBrush& brush = palette.windowText();
+  for (int i = 0; i < item->columnCount(); ++i)
+    item->setForeground(i, brush);
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::contextMenuEvent(QContextMenuEvent* event)
+{
+  vtkVgVideoNode* vidNode = 0;
+  int numSelectedItems = this->selectedItems().size();
+  if (numSelectedItems == 1)
+    {
+    vidNode = this->GetVideoNode(this->selectedItems().front());
+    if (!vidNode)
+      {
+      return;
+      }
+    }
+
+  QMenu menu(this);
+
+  // add menu items for controlling clip visibility
+  menu.addAction("Hide All Except", this, SLOT(HideAllExcept()));
+  if (numSelectedItems != 1
+      || vidNode->GetVisibleNodeMask() == vtkVgNodeBase::VISIBLE_NODE_MASK)
+    {
+    menu.addAction("Hide", this, SLOT(Hide()));
+    }
+  if (numSelectedItems != 1
+      || vidNode->GetVisibleNodeMask() != vtkVgNodeBase::VISIBLE_NODE_MASK)
+    {
+    menu.addAction("Show", this, SLOT(Show()));
+    }
+
+  if (this->AllowRefinement)
+    {
+    menu.addSeparator();
+
+    // add menu for setting IQR status
+    QMenu* submenu = menu.addMenu("Rate As");
+    submenu->addAction(this->SetStatusGood);
+    submenu->addAction(this->SetStatusBad);
+    submenu->addAction(this->SetStatusNone);
+
+    this->SetStatusNone->setChecked(
+      vidNode && vidNode->GetUserScore() == vvIqr::UnclassifiedExample);
+    this->SetStatusGood->setChecked(
+      vidNode && vidNode->GetUserScore() == vvIqr::PositiveExample);
+    this->SetStatusBad->setChecked(
+      vidNode && vidNode->GetUserScore() == vvIqr::NegativeExample);
+    }
+
+  if (numSelectedItems != 0)
+    {
+    if (this->AllowStarToggle)
+      {
+      bool allStar = true;
+      foreach (QTreeWidgetItem* item, this->selectedItems())
+        {
+        vtkVgVideoNode* node = this->GetVideoNode(item);
+        if (node && !node->GetIsStarResult())
+          {
+          allStar = false;
+          break;
+          }
+        }
+
+      QAction* a = menu.addAction("Star", this, SLOT(ToggleStar()));
+      a->setCheckable(true);
+      a->setChecked(allStar);
+      }
+
+    menu.addSeparator();
+    menu.addAction("View Tracking Clip(s)", this, SLOT(ShowTrackingClips()));
+    menu.addSeparator();
+    QAction* a = menu.addAction("Edit Note...", this, SLOT(EditNote()));
+    a->setEnabled(numSelectedItems == 1);
+    }
+
+  // allow someone else to add items to the menu
+  emit this->ContextMenuOpened(menu);
+
+  menu.exec(event->globalPos());
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::leaveEvent(QEvent* event)
+{
+  QTreeWidget::leaveEvent(event);
+  emit this->MouseLeft();
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::mousePressEvent(QMouseEvent* event)
+{
+  if (event->button() == Qt::LeftButton)
+    {
+    if (this->ToggleStar(event))
+      ;
+    else if (this->CycleRating(event))
+      {
+      emit this->ItemsChanged();
+      }
+    }
+
+  this->QTreeWidget::mousePressEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::mouseDoubleClickEvent(QMouseEvent* event)
+{
+  if (event->button() == Qt::LeftButton)
+    {
+    if (this->ToggleStar(event))
+      {
+      this->IgnoreActivation = true;
+      }
+    else if (this->CycleRating(event))
+      {
+      emit this->ItemsChanged();
+      this->IgnoreActivation = true;
+      }
+    }
+
+  this->QTreeWidget::mouseDoubleClickEvent(event);
+  this->IgnoreActivation = false;
+}
+
+//-----------------------------------------------------------------------------
+bool vqTreeView::CycleRating(QMouseEvent* event)
+{
+  // Cycle through IQR states if there was a click in the IQR column.
+  QModelIndex indexClicked = indexAt(event->pos());
+  if (indexClicked.isValid() &&
+      indexClicked.column() == this->Internal->GetColumn(TC_RatingIcon))
+    {
+    if (QTreeWidgetItem* item = this->itemFromIndex(indexClicked))
+      {
+      if (vtkVgVideoNode* vidNode = this->GetVideoNode(item))
+        {
+        int status = vidNode->GetUserScore();
+        status = (status + 1) % 3;
+        this->SetItemRating(item,
+                            static_cast<vvIqr::Classification>(status));
+        return true;
+        }
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vqTreeView::ToggleStar(QMouseEvent* event)
+{
+  if (!this->AllowStarToggle)
+    {
+    return false;
+    }
+
+  QModelIndex indexClicked = indexAt(event->pos());
+  if (indexClicked.isValid() &&
+      indexClicked.column() == this->Internal->GetColumn(TC_Star))
+    {
+    if (QTreeWidgetItem* item = this->itemFromIndex(indexClicked))
+      {
+      if (vtkVgVideoNode* vidNode = this->GetVideoNode(item))
+        {
+        vidNode->SetIsStarResult(!vidNode->GetIsStarResult());
+        this->UpdateItem(item);
+        emit this->StarredChanged(vidNode->GetInstanceId(),
+                                  vidNode->GetIsStarResult());
+        return true;
+        }
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::SetItemRating(
+  QTreeWidgetItem* item, vvIqr::Classification rating)
+{
+  if (!item)
+    {
+    return;
+    }
+
+  if (vtkVgVideoNode* vidNode = this->GetVideoNode(item))
+    {
+    vidNode->SetUserScore(rating);
+    this->UpdateItem(item);
+    emit this->UserScoreChanged(vidNode->GetInstanceId(), rating);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::SetRating(int rating)
+{
+  QList<QTreeWidgetItem*> items = this->selectedItems();
+  foreach (QTreeWidgetItem* item, items)
+    {
+    this->SetItemRating(item, static_cast<vvIqr::Classification>(rating));
+    }
+  emit this->ItemsChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::ToggleStar()
+{
+  bool star = static_cast<QAction*>(this->sender())->isChecked();
+
+  foreach (QTreeWidgetItem* item, this->selectedItems())
+    {
+    if (vtkVgVideoNode* vidNode = this->GetVideoNode(item))
+      {
+      vidNode->SetIsStarResult(star);
+      this->UpdateItem(item);
+      emit this->StarredChanged(vidNode->GetInstanceId(), star);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::SelectNodes(QList<vtkVgNodeBase*> nodes)
+{
+  QTreeWidgetItem* root = this->invisibleRootItem();
+  if (!root)
+    {
+    return;
+    }
+
+  QItemSelection selection;
+  foreach (vtkVgNodeBase* node, nodes)
+    {
+    if (QTreeWidgetItem* item = this->FindItem(root, node))
+      {
+      QModelIndex idx = this->indexFromItem(item);
+      selection.select(idx, idx);
+      }
+    }
+
+  BlockSignals bs(this);
+
+  if (selection.empty())
+    {
+    this->selectionModel()->clear();
+    return;
+    }
+
+  this->selectionModel()->select(selection,
+                                 QItemSelectionModel::ClearAndSelect |
+                                 QItemSelectionModel::Rows);
+
+  this->selectionModel()->setCurrentIndex(
+    selection.front().topLeft(),
+    QItemSelectionModel::Rows | QItemSelectionModel::NoUpdate);
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::Refresh()
+{
+  for (int i = 0; i < this->topLevelItemCount(); ++i)
+    {
+    this->UpdateItem(this->topLevelItem(i));
+    }
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vqTreeView::FindItem(QTreeWidgetItem* root, vtkVgNodeBase* node)
+{
+  vtkVgVideoNode* vidNode = dynamic_cast<vtkVgVideoNode*>(node);
+  if (!vidNode)
+    {
+    return 0;
+    }
+
+  int numChildren = root->childCount();
+  for (int i = 0; i < numChildren; ++i)
+    {
+    // look at this child
+    QTreeWidgetItem* item = root->child(i);
+    if (item->data(0, Qt::UserRole).value<void*>() == static_cast<void*>(node))
+      {
+      return item;
+      }
+    // recurse
+    if (QTreeWidgetItem* child = this->FindItem(item, node))
+      {
+      return child;
+      }
+    }
+  return 0; // not found
+}
+
+//-----------------------------------------------------------------------------
+inline vtkVgVideoNode* vqTreeView::GetVideoNode(const QTreeWidgetItem* item)
+{
+  vtkVgNodeBase* node =
+    static_cast<vtkVgNodeBase*>(item->data(0, Qt::UserRole).value<void*>());
+
+  return dynamic_cast<vtkVgVideoNode*>(node);
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::ItemActivated(QTreeWidgetItem* item)
+{
+  if (this->IgnoreActivation)
+    {
+    return;
+    }
+
+  if (vtkVgVideoNode::SmartPtr videoNode = this->GetVideoNode(item))
+    {
+    // If this node is hidden don't activate it.
+    if (videoNode->GetVisibleNodeMask() == ~vtkVgNodeBase::VISIBLE_NODE_MASK)
+      {
+      return;
+      }
+    else
+      {
+      // Nothing to do.
+      }
+    }
+  else
+    {
+    return;
+    }
+
+  // NOTE: This may need to be commented out.
+  this->ShowVideoItem(item);
+
+  vtkVgNodeBase* node =
+    static_cast<vtkVgNodeBase*>(item->data(0, Qt::UserRole).value<void*>());
+
+  if (!this->LastActivated || this->LastActivated != node)
+    {
+    this->LastActivated = node;
+    }
+  else
+    {
+    this->LastActivated = 0;
+    }
+
+  emit this->NodeActivated(*node);
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::ItemSelectionChanged()
+{
+  QList<vtkVgNodeBase*> nodes;
+  QList<QTreeWidgetItem*> items = this->selectedItems();
+  foreach (QTreeWidgetItem* item, items)
+    {
+    nodes.append(
+      static_cast<vtkVgNodeBase*>(item->data(0, Qt::UserRole).value<void*>()));
+    }
+
+  emit this->NodesSelected(nodes);
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::HideUnselectedShowSelected(QTreeWidgetItem* root)
+{
+  // recursively hide all the unselected objects and show the selected ones
+  for (int i = 0; i < root->childCount(); ++i)
+    {
+    QTreeWidgetItem* child = root->child(i);
+    if (child->isSelected())
+      {
+      this->ShowVideoItem(child);
+      }
+    else
+      {
+      this->HideVideoItem(child);
+      }
+    this->HideUnselectedShowSelected(child);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::HideAllExcept()
+{
+  this->HideUnselectedShowSelected(this->invisibleRootItem());
+  emit this->ItemsChanged();
+  this->Refresh();
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::Hide()
+{
+  // hide all selected objects
+  QList<QTreeWidgetItem*> selected = this->selectedItems();
+  foreach (QTreeWidgetItem* item, selected)
+    {
+    this->HideVideoItem(item);
+    }
+  emit this->ItemsChanged();
+  this->Refresh();
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::Show()
+{
+  // show all selected objects
+  QList<QTreeWidgetItem*> selected = this->selectedItems();
+  foreach (QTreeWidgetItem* item, selected)
+    {
+    this->ShowVideoItem(item);
+    }
+  emit this->ItemsChanged();
+  this->Refresh();
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::HideVideoItem(QTreeWidgetItem* item)
+{
+  vtkVgVideoNode* vidNode = this->GetVideoNode(item);
+  if (vidNode)
+    {
+
+    // Check if a video is playing, disallow hiding.
+    if (vtkVgVideoRepresentationBase0::SmartPtr vidRep =
+          vidNode->GetVideoRepresentation())
+      {
+      vtkVgVideoModel0::SmartPtr vidModel = vidRep->GetVideoModel();
+      if (vidModel->IsPlaying())
+        {
+        return;
+        }
+      }
+
+    vidNode->SetVisible(0);
+    vidNode->SetVisibleNodeMask(~vtkVgNodeBase::VISIBLE_NODE_MASK);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::ShowVideoItem(QTreeWidgetItem* item)
+{
+  bool someVideoPlayingOrPaused = false;
+
+  // Make sure that we are not playing any video. If we are,
+  // we cannot change visibility of any video nodes in the scene.
+  vtkVgVideoNode* lastPlayed =
+    vtkVgVideoNode::SafeDownCast(this->LastActivated);
+  if (lastPlayed && lastPlayed->GetVideoRepresentation())
+    {
+    vtkVgVideoModel0* vidModel =
+      lastPlayed->GetVideoRepresentation()->GetVideoModel();
+    if (vidModel)
+      {
+      if (vidModel->IsPlaying() || vidModel->IsPaused())
+        {
+        someVideoPlayingOrPaused = true;
+        }
+      }
+    }
+
+  vtkVgVideoNode* vidNode = this->GetVideoNode(item);
+  if (vidNode)
+    {
+    if (someVideoPlayingOrPaused)
+      {
+      vidNode->SetVisibleNodeMask(vtkVgNodeBase::VISIBLE_NODE_MASK);
+      return;
+      }
+
+    vidNode->SetVisibleNodeMask(vtkVgNodeBase::VISIBLE_NODE_MASK);
+    vidNode->SetVisible(1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::HideAllItems()
+{
+  for (int i = 0; i < this->topLevelItemCount(); ++i)
+    {
+    this->HideVideoItem(this->topLevelItem(i));
+    }
+  emit this->ItemsChanged();
+  this->Refresh();
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::ShowAllItems()
+{
+  for (int i = 0; i < this->topLevelItemCount(); ++i)
+    {
+    this->ShowVideoItem(this->topLevelItem(i));
+    }
+  emit this->ItemsChanged();
+  this->Refresh();
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::SetShowHiddenItems(bool enable)
+{
+  if (enable == this->ShowHiddenItems)
+    {
+    return;
+    }
+  this->ShowHiddenItems = enable;
+  this->Refresh();
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkVgVideoNode*> vqTreeView::GetSelectedNodes()
+{
+  QList<vtkVgVideoNode*> nodeList;
+
+  QList<QTreeWidgetItem*> items = this->selectedItems();
+  foreach (QTreeWidgetItem* item, items)
+    {
+    nodeList.append(this->GetVideoNode(item));
+    }
+
+  return nodeList;
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::ShowTrackingClips()
+{
+  if (this->selectedItems().empty())
+    {
+    return;
+    }
+
+  QList<QTreeWidgetItem*> items = this->selectedItems();
+  QList<vtkVgVideoNode*> nodes;
+
+  foreach (QTreeWidgetItem* item, items)
+    {
+    nodes.append(this->GetVideoNode(item));
+    }
+
+  emit this->ShowTrackingClips(nodes);
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::EditNote()
+{
+  if (this->selectedItems().empty())
+    {
+    return;
+    }
+
+  vtkVgVideoNode* node = this->GetVideoNode(this->selectedItems().front());
+
+  bool ok = false;
+  QString s =
+    vgTextEditDialog::getText(this, "Edit Result Note", node->GetNote(), &ok);
+
+  if (!ok)
+    {
+    return;
+    }
+
+  // Make sure we still have an item for the node, which may not be the case
+  // if Initialize() happened to be called while the note edit dialog was open.
+  if (QTreeWidgetItem* item = this->FindItem(this->invisibleRootItem(), node))
+    {
+    node->SetNote(s.isEmpty() ? 0 : qPrintable(s));
+    this->UpdateItem(item);
+    emit this->ItemsChanged();
+    emit this->NoteChanged(node->GetInstanceId(), s);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::UpdateActivated(vtkVgVideoNode& node)
+{
+  vtkVgNodeBase* nodeBase = static_cast<vtkVgNodeBase*>(&node);
+
+  if (this->LastActivated != nodeBase)
+    {
+    this->LastActivated = nodeBase;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqTreeView::Reset()
+{
+  this->LastActivated = 0;
+  this->clear();
+}
diff --git a/Applications/Viqui/vqTreeView.h b/Applications/Viqui/vqTreeView.h
new file mode 100644
index 00000000..547833be
--- /dev/null
+++ b/Applications/Viqui/vqTreeView.h
@@ -0,0 +1,138 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqTreeView_h
+#define __vqTreeView_h
+
+#include <QTreeWidget>
+#include <vvIqr.h>
+
+class QAction;
+class QActionGroup;
+class QSignalMapper;
+class QString;
+class QTreeWidgetItem;
+class vtkLookupTable;
+class vtkVgNodeBase;
+class vtkVgSceneManager;
+class vtkVgVideoNode;
+
+class vqTreeView : public QTreeWidget
+{
+  Q_OBJECT
+
+public:
+  vqTreeView(QWidget* parent = 0);
+  virtual ~vqTreeView();
+
+  void SetLookupTable(vtkLookupTable* lut)
+    { this->LookupTable = lut; }
+
+  void Initialize(QList<vtkVgVideoNode*> nodes,
+                  bool isFeedbackList,
+                  bool allowRefinement = false,
+                  bool allowStarToggle = false,
+                  bool showEventType = false);
+
+  QList<vtkVgVideoNode*> GetSelectedNodes();
+
+  // reimplemented from QWidget
+  virtual void contextMenuEvent(QContextMenuEvent* event);
+  virtual void leaveEvent(QEvent* event);
+
+  virtual void mousePressEvent(QMouseEvent* event);
+  virtual void mouseDoubleClickEvent(QMouseEvent* event);
+
+  virtual QSize sizeHint() const
+    { return QSize(500, 300); }
+
+  virtual QSize minimumSizeHint() const
+    { return QSize(300, 200); }
+
+signals:
+  void NodesSelected(QList<vtkVgNodeBase*> nodes);
+  void NodeActivated(vtkVgNodeBase& node);
+  void MouseLeft();
+  void ContextMenuOpened(QMenu& menu);
+  void ItemsChanged();
+
+  void UserScoreChanged(long long iid, int score);
+  void NoteChanged(long long iid, const QString& note);
+  void StarredChanged(long long iid, bool starred);
+
+  void ShowTrackingClips(QList<vtkVgVideoNode*> nodes);
+
+public slots:
+  void SelectNodes(QList<vtkVgNodeBase*> nodes);
+  void Refresh();
+
+  void HideAllItems();
+  void ShowAllItems();
+  void SetShowHiddenItems(bool enable);
+
+protected slots:
+  void SetRating(int rating);
+  void ItemActivated(QTreeWidgetItem* item);
+  void ItemSelectionChanged();
+
+  void ToggleStar();
+
+  void HideAllExcept();
+  void Hide();
+  void Show();
+
+  void ShowTrackingClips();
+  void EditNote();
+
+  void UpdateActivated(vtkVgVideoNode& node);
+
+  void Reset();
+
+protected:
+  QAction* CreateStatusAction(QString, Qt::Key, Qt::Key, int);
+
+  void AddItemForNode(vtkVgVideoNode* node);
+  void UpdateItem(QTreeWidgetItem* item);
+
+  QTreeWidgetItem* FindItem(QTreeWidgetItem* root, vtkVgNodeBase* node);
+  vtkVgVideoNode* GetVideoNode(const QTreeWidgetItem* item);
+
+  void HideUnselectedShowSelected(QTreeWidgetItem* root);
+
+  void HideVideoItem(QTreeWidgetItem* item);
+  void ShowVideoItem(QTreeWidgetItem* item);
+
+  void SetItemRating(QTreeWidgetItem* item, vvIqr::Classification rating);
+
+  bool CycleRating(QMouseEvent* event);
+  bool ToggleStar(QMouseEvent* event);
+
+private:
+  struct TreeInternal;
+  TreeInternal* Internal;
+
+  class TreeWidgetItem;
+
+  QSignalMapper* SetStatusMapper;
+
+  bool IsFeedbackList;
+  bool AllowRefinement;
+  bool AllowStarToggle;
+  bool ShowHiddenItems;
+
+  vtkLookupTable* LookupTable;
+
+  vtkVgNodeBase* LastActivated;
+
+  QActionGroup* SetStatusActions;
+  QAction* SetStatusGood;
+  QAction* SetStatusBad;
+  QAction* SetStatusNone;
+
+  bool IgnoreActivation;
+};
+
+#endif
diff --git a/Applications/Viqui/vqUserActions.cxx b/Applications/Viqui/vqUserActions.cxx
new file mode 100644
index 00000000..f6a53acd
--- /dev/null
+++ b/Applications/Viqui/vqUserActions.cxx
@@ -0,0 +1,448 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqUserActions.h"
+
+#include "vqCore.h"
+
+// VG includes.
+#include "vtkVgGroupNode.h"
+#include "vtkVgSceneManager.h"
+#include "vtkVgSpaceConversion.h"
+#include "vtkVgVideoModel0.h"
+#include "vtkVgVideoNode.h"
+#include "vtkVgVideoRepresentation0.h"
+#include "vtkVgViewerBase.h"
+
+#include <vtkCamera.h>
+#include <vtkRenderer.h>
+
+#include <QList>
+
+//-----------------------------------------------------------------------------
+vqUserActions::vqUserActions(vqCore* core)
+  : QObject(),
+    CoreInstance(core),
+    LastActiveVideoNode(0),
+    LastZoomedNode(0),
+    PreZoomCamera(0),
+    IsZoomed(false),
+    AutoZoom(true)
+{
+  this->PreZoomCamera = vtkCamera::New();
+}
+
+//-----------------------------------------------------------------------------
+vqUserActions::~vqUserActions()
+{
+  this->PreZoomCamera->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::TogglePlayPause(vtkVgVideoNode& node)
+{
+  vtkVgVideoRepresentationBase0* videoRepresentation =
+    node.GetVideoRepresentation();
+  if (!videoRepresentation)
+    {
+    return;
+    }
+
+  // toggle between playing and paused
+  if (vtkVgVideoModel0* videoModel = videoRepresentation->GetVideoModel())
+    {
+    if (videoModel->IsPaused())
+      {
+      videoModel->Play();
+      emit this->Play(node);
+      }
+    else if (videoModel->IsPlaying())
+      {
+      videoModel->Pause();
+      emit this->Pause(node);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::DeselectRecursive(vtkVgNodeBase* root)
+{
+  if (vtkVgVideoNode* videoNode = dynamic_cast<vtkVgVideoNode*>(root))
+    {
+    if (vtkVgVideoRepresentation0* rep =
+          dynamic_cast<vtkVgVideoRepresentation0*>(
+            videoNode->GetVideoRepresentation()))
+      {
+      rep->SetSelectionVisible(0);
+      rep->Update();
+      }
+    return;
+    }
+
+  if (vtkVgGroupNode* groupNode = dynamic_cast<vtkVgGroupNode*>(root))
+    {
+    int numChildren = groupNode->GetNumberOfChildren();
+    for (int i = 0; i < numChildren; ++i)
+      {
+      if (vtkVgNodeBase* child = groupNode->GetChild(i))
+        {
+        this->DeselectRecursive(child);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::Select(QList<vtkVgNodeBase*> nodes)
+{
+  // remember the selection state of the active video
+  bool activeVideoAlreadySelected = false;
+  if (this->LastActiveVideoNode)
+    {
+    if (vtkVgVideoRepresentation0* rep =
+          dynamic_cast<vtkVgVideoRepresentation0*>(
+            this->LastActiveVideoNode->GetVideoRepresentation()))
+      {
+      activeVideoAlreadySelected = rep->GetSelectionVisible() != 0;
+      }
+    }
+
+  // deselect all nodes in the graph
+  this->DeselectRecursive(
+    this->CoreInstance->getContextViewer()->GetSceneRoot());
+
+  // highlight new selections
+  foreach (vtkVgNodeBase* node, nodes)
+    {
+    vtkVgVideoNode* videoNode = dynamic_cast<vtkVgVideoNode*>(node);
+    if (videoNode && videoNode->GetHasVideoData())
+      {
+      if (vtkVgVideoRepresentation0* rep =
+            dynamic_cast<vtkVgVideoRepresentation0*>(
+              videoNode->GetVideoRepresentation()))
+        {
+        rep->SetSelectionVisible(1);
+        rep->Update();
+        }
+
+      // toggle play state if this video is selected and currently active
+      if (activeVideoAlreadySelected &&
+          videoNode == this->LastActiveVideoNode)
+        {
+        this->TogglePlayPause(*videoNode);
+        }
+      }
+    }
+
+  this->CoreInstance->postRender();
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::Activate(vtkVgNodeBase& node)
+{
+  vtkVgVideoNode* videoNode = dynamic_cast<vtkVgVideoNode*>(&node);
+  if (!videoNode || !videoNode->GetHasVideoData())
+    {
+    return;
+    }
+
+  // First get the representation.
+  vtkVgVideoRepresentationBase0* videoRepresentation =
+    videoNode->GetVideoRepresentation();
+  if (videoRepresentation)
+    {
+    if (vtkVgVideoModel0* videoModel = videoRepresentation->GetVideoModel())
+      {
+      // Play only when video is stopped or its in neutral state.
+      if (videoModel->IsStopped() ||
+          (!videoModel->IsPlaying() && !videoModel->IsPaused()))
+        {
+        videoModel->Play();
+        emit this->Play(*videoNode);
+        }
+      else
+        {
+        if (!videoModel->IsStopped())
+          {
+          videoModel->Stop();
+          emit this->Stop(*videoNode);
+          }
+        }
+      }
+
+    // Stop previously playing video on a different node.
+    if (this->LastActiveVideoNode && this->LastActiveVideoNode != videoNode)
+      {
+      vtkVgVideoRepresentationBase0* videoRepresentation =
+        this->LastActiveVideoNode->GetVideoRepresentation();
+
+      vtkVgVideoModel0* videoModel = videoRepresentation->GetVideoModel();
+
+      if (!videoModel->IsStopped())
+        {
+        videoModel->Stop();
+        }
+      }
+    }
+
+  this->LastActiveVideoNode = videoNode;
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::CalculateBoundsAndCenter(vtkVgNodeBase& node,
+                                             double bounds[6],
+                                             double center[6])
+{
+  if (!bounds || !center)
+    {
+    // Do nothing if null.
+    return;
+    }
+
+  // Make sure bounds are up to date.
+  node.ComputeBounds();
+  node.GetBounds(bounds);
+
+  double width =  bounds[1] - bounds[0];
+  double height = bounds[3] - bounds[2];
+
+  // pad out the bounds a small amount
+  double padScale = 0.1;
+  bounds[0] -= width * padScale;
+  bounds[1] += width * padScale;
+  bounds[2] -= height * padScale;
+  bounds[3] += height * padScale;
+
+  // center the extents
+  center[0] = 0.5 * (bounds[0] + bounds[1]);
+  center[1] = 0.5 * (bounds[2] + bounds[3]);
+}
+
+//-----------------------------------------------------------------------------
+bool vqUserActions::CheckIfFullyContained2D(double nodeBounds[6],
+                                            double worldBounds[6])
+{
+  // Ignoring Z dimension
+  if ((nodeBounds[0] < worldBounds[0]) || (nodeBounds[1] > worldBounds[1])
+      || (nodeBounds[2] < worldBounds[2]) || (nodeBounds[3] > worldBounds[3]))
+    {
+    return false;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vqUserActions::CheckIfFullyContained(
+  double nodeBounds[6], vtkRenderer* renderer)
+{
+  double topLeft[3]      = { -1.0,  1.0, 0.0 };
+  double bottomRight[3]  = { 1.0, -1.0, 0.0 };
+
+  // View to world conversion
+  vtkVgSpaceConversion::ViewToWorldNormalized
+  (renderer, topLeft, topLeft);
+
+  vtkVgSpaceConversion::ViewToWorldNormalized(
+    renderer, bottomRight, bottomRight);
+
+  double worldBounds[6] =
+    {
+    topLeft[0], bottomRight[0],
+    bottomRight[1], topLeft[1],
+    0.0, 0.0
+    };
+
+  return this->CheckIfFullyContained2D(nodeBounds, worldBounds);
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::Reset()
+{
+  this->LastActiveVideoNode = 0;
+  this->LastZoomedNode  = 0;
+  this->UnZoom();
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::UnZoom()
+{
+  if (this->IsZoomed)
+    {
+    this->CoreInstance->getContextViewer()->GetSceneRenderer()
+    ->GetActiveCamera()->DeepCopy(this->PreZoomCamera);
+    this->IsZoomed = false;
+    this->LastZoomedNode = 0;
+
+    emit this->UpdateView();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::FocusTo(vtkVgVideoNode& node)
+{
+  this->FocusTo(*static_cast<vtkVgNodeBase*>(&node));
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::FocusTo(vtkVgNodeBase& node)
+{
+  double center[2];
+  double nodeBounds[6];
+  double lastFocalPt[3];
+  double lastPos[3];
+
+  vtkVgVideoNode* videoNode = vtkVgVideoNode::SafeDownCast(&node);
+  if (videoNode)
+    {
+    vtkVgVideoRepresentation0* videoRep =
+      vtkVgVideoRepresentation0::SafeDownCast(
+        videoNode->GetVideoRepresentation());
+    if (videoRep && videoRep->GetModelError())
+      {
+      return;
+      }
+    }
+  this->CalculateBoundsAndCenter(node, nodeBounds, center);
+
+  vtkRenderer* renderer =
+    this->CoreInstance->getContextViewer()->GetSceneRenderer();
+
+  // Do not center / focus if the node is completely contained
+  // within the view area
+  if (this->CheckIfFullyContained(nodeBounds, renderer))
+    {
+    return;
+    }
+
+  vtkCamera* camera = renderer->GetActiveCamera();
+
+  camera->GetFocalPoint(lastFocalPt);
+  camera->GetPosition(lastPos);
+
+  camera->SetFocalPoint(center[0], center[1], lastFocalPt[2]);
+  camera->SetPosition(center[0], center[1], lastPos[2]);
+
+  emit this->UpdateView();
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::CenterAndZoomTo(vtkVgNodeBase& node, bool alwaysZoom)
+{
+  // Just set view center to node center when auto zoom
+  // is disabled
+  if (!alwaysZoom && !this->AutoZoom)
+    {
+    return this->FocusTo(node);
+    }
+
+  // Do not zoom if the incoming node is same as the last time
+  // or if it is not visible currently.
+  if (this->LastZoomedNode == &node || !node.GetVisible())
+    {
+    return;
+    }
+  this->LastZoomedNode = &node;
+
+  double center[2];
+  double itemBounds[6];
+  vtkRenderer* ren = this->CoreInstance->getContextViewer()->GetSceneRenderer();
+
+  // Get the calculated bounds and center.
+  this->CalculateBoundsAndCenter(node, itemBounds, center);
+
+  vtkCamera* camera = ren->GetActiveCamera();
+
+  // save pre-zoom camera setup
+  if (!this->IsZoomed)
+    {
+    this->PreZoomCamera->DeepCopy(camera);
+    this->IsZoomed = true;
+    }
+
+  double lastFocalPt[3], lastPos[3];
+  camera->GetFocalPoint(lastFocalPt);
+  camera->GetPosition(lastPos);
+  camera->SetFocalPoint(center[0], center[1], lastFocalPt[2]);
+  camera->SetPosition(center[0], center[1], lastPos[2]);
+
+  // compute the bounds of the item in display coordinates
+  double itemMin[] = { itemBounds[0], itemBounds[2], 0.0, 1.0 };
+  double itemDisplayMin[4];
+  ren->SetWorldPoint(itemMin);
+  ren->WorldToDisplay();
+  ren->GetDisplayPoint(itemDisplayMin);
+
+  double itemMax[] = { itemBounds[1], itemBounds[3], 0.0, 1.0 };
+  double itemDisplayMax[4];
+  ren->SetWorldPoint(itemMax);
+  ren->WorldToDisplay();
+  ren->GetDisplayPoint(itemDisplayMax);
+
+  double width =  itemDisplayMax[0] - itemDisplayMin[0];
+  double height = itemDisplayMax[1] - itemDisplayMin[1];
+
+  // zoom to make the item fill the window
+  double xZoom = ren->GetSize()[0] / width;
+  double yZoom = ren->GetSize()[1] / height;
+  camera->Zoom(std::min(xZoom, yZoom));
+
+  emit this->UpdateView();
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::CenterAndZoomTo(vtkVgVideoNode& videoNode, bool alwaysZoom)
+{
+  this->CenterAndZoomTo(*static_cast<vtkVgNodeBase*>(&videoNode), alwaysZoom);
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::ScrollForward(vtkVgNodeBase& node, bool* eventHandled)
+{
+  // go to next frame if scrolling forward on a paused and selected video
+  if (&node == this->LastActiveVideoNode)
+    {
+    vtkVgVideoRepresentation0* rep =
+      dynamic_cast<vtkVgVideoRepresentation0*>(
+        this->LastActiveVideoNode->GetVideoRepresentation());
+
+    if (rep && rep->GetSelectionVisible() && rep->GetVideoModel()->IsPaused())
+      {
+      emit this->Next(*this->LastActiveVideoNode);
+      *eventHandled = true;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::ScrollBackward(vtkVgNodeBase& node, bool* eventHandled)
+{
+  // go to previous frame if scrolling backward on a paused and selected video
+  if (&node == this->LastActiveVideoNode)
+    {
+    vtkVgVideoRepresentation0* rep =
+      dynamic_cast<vtkVgVideoRepresentation0*>(
+        this->LastActiveVideoNode->GetVideoRepresentation());
+
+    if (rep && rep->GetSelectionVisible() && rep->GetVideoModel()->IsPaused())
+      {
+      emit this->Prev(*this->LastActiveVideoNode);
+      *eventHandled = true;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqUserActions::SetAutoZoom(bool enable)
+{
+  this->AutoZoom = enable;
+}
+
+//-----------------------------------------------------------------------------
+bool vqUserActions::GetAutoZoom() const
+{
+  return this->AutoZoom;
+}
diff --git a/Applications/Viqui/vqUserActions.h b/Applications/Viqui/vqUserActions.h
new file mode 100644
index 00000000..d4f7166f
--- /dev/null
+++ b/Applications/Viqui/vqUserActions.h
@@ -0,0 +1,77 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqUserActions_h
+#define __vqUserActions_h
+
+// QT includes.
+#include <QObject>
+
+// Forward declarations.
+class vqCore;
+
+class vtkCamera;
+class vtkRenderer;
+
+class vtkVgNodeBase;
+class vtkVgVideoNode;
+
+class vqUserActions : public QObject
+{
+  Q_OBJECT
+public:
+  vqUserActions(vqCore* core);
+  virtual ~vqUserActions();
+
+signals:
+  void UpdateView();
+  void Play(vtkVgVideoNode&);
+  void Pause(vtkVgVideoNode&);
+  void Stop(vtkVgVideoNode&);
+  void Prev(vtkVgVideoNode&);
+  void Next(vtkVgVideoNode&);
+  void Select(vtkVgVideoNode&);
+
+public slots:
+  void Select(QList<vtkVgNodeBase*> nodes);
+  void Activate(vtkVgNodeBase& node);
+  void Reset();
+
+  void FocusTo(vtkVgNodeBase& node);
+  void FocusTo(vtkVgVideoNode& node);
+
+  void CenterAndZoomTo(vtkVgNodeBase& node,  bool alwaysZoom = false);
+  void CenterAndZoomTo(vtkVgVideoNode& node, bool alwaysZoom = false);
+  void UnZoom();
+
+  void ScrollForward(vtkVgNodeBase& node, bool* eventHandled);
+  void ScrollBackward(vtkVgNodeBase& node, bool* eventHandled);
+
+  void SetAutoZoom(bool enable);
+  bool GetAutoZoom() const;
+
+private:
+
+  void CalculateBoundsAndCenter(
+    vtkVgNodeBase& node, double bounds[6], double center[2]);
+
+  bool CheckIfFullyContained2D(double nodeBounds[6], double worldBounds[6]);
+  bool CheckIfFullyContained(double nodeBounds[6], vtkRenderer* renderer);
+
+  void DeselectRecursive(vtkVgNodeBase* root);
+  void TogglePlayPause(vtkVgVideoNode& node);
+
+private:
+  vqCore*         CoreInstance;
+  vtkVgVideoNode* LastActiveVideoNode;
+  vtkVgNodeBase*  LastZoomedNode;
+  vtkCamera*      PreZoomCamera;
+
+  bool IsZoomed;
+  bool AutoZoom;
+};
+
+#endif // __vqUserActions_h
diff --git a/Applications/Viqui/vqUtil.cxx b/Applications/Viqui/vqUtil.cxx
new file mode 100644
index 00000000..4bd55b04
--- /dev/null
+++ b/Applications/Viqui/vqUtil.cxx
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqUtil.h"
+
+//-----------------------------------------------------------------------------
+QString vqUtil::uiIqrClassificationString(
+  vvIqr::Classification classification, vqUtil::UiStringFlags flags)
+{
+  const char* bareResult = 0;
+  const char* resultWithAccel = 0;
+
+  switch (classification)
+    {
+    case vvIqr::PositiveExample:
+      bareResult = "Relevant";
+      resultWithAccel = "&Relevant";
+      break;
+    case vvIqr::NegativeExample:
+      bareResult = "Not Relevant";
+      resultWithAccel = "&Not Relevant";
+      break;
+    default:
+      bareResult = "Unrated";
+      resultWithAccel = "&Unrated";
+      break;
+    }
+
+  return (flags.testFlag(vqUtil::UI_IncludeAccelerator)
+          ? QString(resultWithAccel)
+          : QString(bareResult));
+}
diff --git a/Applications/Viqui/vqUtil.h b/Applications/Viqui/vqUtil.h
new file mode 100644
index 00000000..9f234efd
--- /dev/null
+++ b/Applications/Viqui/vqUtil.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqUtil_h
+#define __vqUtil_h
+
+#include <QString>
+
+#include <vvIqr.h>
+
+namespace vqUtil
+{
+enum UiStringFlag
+{
+  UI_Default = 0,
+  UI_IncludeAccelerator = 0x1
+};
+Q_DECLARE_FLAGS(UiStringFlags, UiStringFlag)
+
+QString uiIqrClassificationString(vvIqr::Classification,
+                                  UiStringFlags flags = UI_Default);
+}
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vqUtil::UiStringFlags)
+
+#endif
diff --git a/Applications/Viqui/vqVersion.cmake b/Applications/Viqui/vqVersion.cmake
new file mode 100644
index 00000000..1f3b74e8
--- /dev/null
+++ b/Applications/Viqui/vqVersion.cmake
@@ -0,0 +1,8 @@
+SET(VIQUI_VERSION_MAJOR ${VISGUI_VERSION_MAJOR})
+SET(VIQUI_VERSION_MINOR ${VISGUI_VERSION_MINOR})
+SET(VIQUI_VERSION_PATCH ${VISGUI_VERSION_PATCH})
+SET(VIQUI_VERSION_BUILD ${VISGUI_VERSION_BUILD})
+
+SET(VIQUI_VERSION_STR "${VIQUI_VERSION_MAJOR}.${VIQUI_VERSION_MINOR}.${VIQUI_VERSION_PATCH}-${VIQUI_VERSION_BUILD}")
+
+SET(VIQUI_COPY_YEAR ${VISGUI_COPY_YEAR})
diff --git a/Applications/Viqui/vqVersion.h.in b/Applications/Viqui/vqVersion.h.in
new file mode 100644
index 00000000..0658213e
--- /dev/null
+++ b/Applications/Viqui/vqVersion.h.in
@@ -0,0 +1,7 @@
+#ifndef __vqVersion_h
+#define __vqVersion_h
+
+#define VIQUI_VERSION_STR "@VIQUI_VERSION_STR@"
+#define VIQUI_COPY_YEAR @VIQUI_COPY_YEAR@
+
+#endif // __vqVersion_h
diff --git a/Applications/Viqui/vqVideoNodeVisitor.h b/Applications/Viqui/vqVideoNodeVisitor.h
new file mode 100644
index 00000000..35120afb
--- /dev/null
+++ b/Applications/Viqui/vqVideoNodeVisitor.h
@@ -0,0 +1,65 @@
+#ifndef VQVIDEONODEVISITOR_H
+#define VQVIDEONODEVISITOR_H
+
+#include <vtkVgNodeVisitor.h>
+#include <vtkVgVideoNode.h>
+#include <vtkVgVideoRepresentation0.h>
+
+//-----------------------------------------------------------------------------
+struct vqVideoNodeVisitor : public vtkVgNodeVisitor
+{
+  vqVideoNodeVisitor() : vtkVgNodeVisitor(),
+    VideoClipVisible(true),
+    UpdateVideoClipVisibility(true),
+    VideoOutlineVisible(true),
+    UpdateVideoOutlineVisibility(true)
+    {
+    }
+
+  virtual void Visit(vtkVgGeode& geode)
+    {
+    vtkVgNodeVisitor::Visit(geode);
+    }
+
+  virtual void Visit(vtkVgGroupNode&  groupNode)
+    {
+    vtkVgNodeVisitor::Visit(groupNode);
+    }
+
+  virtual void Visit(vtkVgTransformNode& transformNode)
+    {
+    vtkVgNodeVisitor::Visit(transformNode);
+    }
+
+
+  virtual void Visit(vtkVgLeafNodeBase&  leafNode)
+    {
+    vtkVgNodeVisitor::Visit(leafNode);
+    }
+
+
+  virtual void Visit(vtkVgVideoNode& videoNode)
+    {
+    vtkVgVideoRepresentation0::SmartPtr videoRepresentation =
+      dynamic_cast<vtkVgVideoRepresentation0*>(videoNode.GetVideoRepresentation());
+    if (videoRepresentation)
+      {
+      if (this->UpdateVideoClipVisibility)
+        {
+        videoRepresentation->SetVideoVisible(this->VideoClipVisible);
+        }
+
+      if (this->UpdateVideoOutlineVisibility)
+        {
+        videoRepresentation->SetOutlineVisible(this->VideoOutlineVisible);
+        }
+      }
+    }
+
+  bool VideoClipVisible;
+  bool UpdateVideoClipVisibility;
+  bool VideoOutlineVisible;
+  bool UpdateVideoOutlineVisibility;
+};
+
+#endif // VQVIDEONODEVISITOR_H
diff --git a/Applications/Viqui/vqVideoPlayer.cxx b/Applications/Viqui/vqVideoPlayer.cxx
new file mode 100644
index 00000000..220f35f1
--- /dev/null
+++ b/Applications/Viqui/vqVideoPlayer.cxx
@@ -0,0 +1,161 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqVideoPlayer.h"
+
+#include <QIcon>
+
+#include <qtUtil.h>
+
+#include <vgCheckArg.h>
+
+#include <vtkVgVideoNode.h>
+#include <vtkVgVideoRepresentation0.h>
+
+#include <vvMakeId.h>
+
+#include <vvClipVideoRepresentation.h>
+#include <vvVideoPlayerModel.h>
+#include <vvVideoPlayerPrivate.h>
+
+// viqui includes
+#include "vqArchiveVideoSource.h"
+
+//-----------------------------------------------------------------------------
+class vqVideoPlayerPrivate : public vvVideoPlayerPrivate
+{
+public:
+  QAction* actionFormulateQuery;
+  QAction* actionOpenInExternal;
+};
+
+QTE_IMPLEMENT_D_FUNC(vqVideoPlayer)
+
+//-----------------------------------------------------------------------------
+vqVideoPlayer::vqVideoPlayer(QWidget* parent)
+  : vvVideoPlayer(new vqVideoPlayerPrivate, parent)
+{
+  QTE_D(vqVideoPlayer);
+
+  d->actionFormulateQuery =
+    new QAction(qtUtil::standardActionIcon("new-query"),
+                "Formulate Query from Result...", this);
+  d->actionOpenInExternal =
+    new QAction(qtUtil::standardActionIcon("open-video-external"),
+                "Open in External Player", this);
+  d->actionOpenInExternal->setToolTip(
+    "Open result video in external video player application");
+
+  d->UI.toolBar->addSeparator();
+  d->UI.toolBar->addAction(d->actionFormulateQuery);
+  d->UI.toolBar->addAction(d->actionOpenInExternal);
+
+  connect(d->actionFormulateQuery, SIGNAL(triggered()),
+          this, SLOT(formulateQuery()));
+  connect(d->actionOpenInExternal, SIGNAL(triggered()),
+          this, SLOT(openExternally()));
+}
+
+//-----------------------------------------------------------------------------
+vqVideoPlayer::~vqVideoPlayer()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoRepresentationBase0* vqVideoPlayer::buildVideoRepresentation(
+  vtkVgVideoNode& videoNode)
+{
+  vvClipVideoRepresentation* videoRepresentation =
+    vvClipVideoRepresentation::New();
+  vvVideoPlayerModel* videoModel =
+    vvVideoPlayerModel::New();
+
+  // Enable the auto center mode.
+  videoRepresentation->SetAutoCenter(1);
+  connect(videoRepresentation, SIGNAL(areaOfInterest(double*, double, double)),
+          this, SLOT(onAreaOfInterest(double*, double, double)));
+
+  vqArchiveVideoSource* videoSource  = vqArchiveVideoSource::SafeDownCast(
+                                         videoNode.GetVideoRepresentation()->GetVideoModel()->GetVideoSource());
+  videoModel->SetVideoSource(videoSource);
+  connect(videoSource, SIGNAL(frameAvailable()),
+          videoModel, SLOT(OnFrameAvailable()));
+  connect(videoModel, SIGNAL(FrameAvailable()),
+          this, SLOT(onFrameAvailable()));
+  videoModel->SetUseInternalTimeStamp(1);
+  videoModel->SetLooping(1);
+  videoModel->SetSharingSource(1);
+  videoModel->SetId(videoNode.GetInstanceId());
+
+  videoRepresentation->SetVideoModel(videoModel);
+  videoModel->FastDelete();
+  return videoRepresentation;
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoPlayer::forceUpdateVideoRepresentation()
+{
+  if (!this->d_ptr->CurrentVideo)
+    {
+    return;
+    }
+
+  vtkVgVideoModel0* model =
+    this->d_ptr->CurrentVideo->GetVideoRepresentation()->GetVideoModel();
+
+  vvVideoPlayerModel::SafeDownCast(model)->OnFrameAvailable();
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoPlayer::setAnalysisToolsEnabled(bool enable)
+{
+  QTE_D(vqVideoPlayer);
+  d->actionFormulateQuery->setEnabled(enable);
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoPlayer::formulateQuery()
+{
+  // No need to anything if we don't have a video selected
+  CHECK_ARG(this->currentPickedVideoModel());
+
+  QTE_D(vqVideoPlayer);
+
+  double timeRange[2];
+  this->currentPickedVideoModel()->GetVideoSource()->GetTimeRange(timeRange);
+  const double start = timeRange[0];
+  const double end = timeRange[1];
+  const double currentTime = d->CurrentTime;
+
+  // Construct the formulation query
+  vvProcessingRequest request;
+  request.QueryId = vvMakeId("VIQUI-QF");
+  request.StartTime = start;
+  request.EndTime = end;
+  request.VideoUri = std::string(d->CurrentVideoPicked->GetStreamId());
+
+  emit this->queryFormulationRequested(request, qRound64(currentTime));
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoPlayer::openExternally()
+{
+  // No need to anything if we don't have a video selected
+  CHECK_ARG(this->currentPickedVideoModel());
+  vqArchiveVideoSource* videoSource  = vqArchiveVideoSource::SafeDownCast(
+                                         this->currentPickedVideoModel()->GetVideoSource());
+  CHECK_ARG(videoSource);
+
+  QTE_D(vqVideoPlayer);
+
+  // Get clip URI and video source URI
+  const QUrl clipUri = videoSource->GetClipUri();
+  const QString streamId =
+    QString::fromLocal8Bit(d->CurrentVideoPicked->GetStreamId());
+
+  // Ask for external player to be launched
+  emit this->externalOpenRequested(clipUri, streamId, d->CurrentTime);
+}
diff --git a/Applications/Viqui/vqVideoPlayer.h b/Applications/Viqui/vqVideoPlayer.h
new file mode 100644
index 00000000..209de4de
--- /dev/null
+++ b/Applications/Viqui/vqVideoPlayer.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqVideoPlayer_h
+#define __vqVideoPlayer_h
+
+#include <QUrl>
+
+#include <vvQueryFormulation.h>
+
+#include <vvVideoPlayer.h>
+
+class vtkVgVideoNode;
+class vtkVgVideoRepresentationBase0;
+
+class vqVideoPlayerPrivate;
+
+class vqVideoPlayer : public vvVideoPlayer
+{
+  Q_OBJECT
+
+public:
+  explicit vqVideoPlayer(QWidget* parent = 0);
+  ~vqVideoPlayer();
+
+signals:
+  void queryFormulationRequested(vvProcessingRequest, long long initialTime);
+  void externalOpenRequested(QUrl clipUri, QString streamId, double time);
+
+public slots:
+  void setAnalysisToolsEnabled(bool);
+
+protected slots:
+  virtual void formulateQuery();
+  virtual void openExternally();
+
+protected:
+  explicit vqVideoPlayer(vqVideoPlayerPrivate*, QWidget* parent = 0);
+  virtual vtkVgVideoRepresentationBase0* buildVideoRepresentation(
+    vtkVgVideoNode& videoNode);
+
+  virtual void forceUpdateVideoRepresentation();
+
+private:
+  QTE_DECLARE_PRIVATE(vqVideoPlayer)
+};
+
+#endif // __vqVideoPlayer_h
diff --git a/Applications/Viqui/vqVideoQueryDialog.cxx b/Applications/Viqui/vqVideoQueryDialog.cxx
new file mode 100644
index 00000000..06f61d5c
--- /dev/null
+++ b/Applications/Viqui/vqVideoQueryDialog.cxx
@@ -0,0 +1,327 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vqVideoQueryDialog.h"
+
+#include <vvVideoQueryDialogPrivate.h>
+
+#include <QMessageBox>
+
+// Qt Extensions includes
+#include <qtStatusManager.h>
+#include <qtStlUtil.h>
+
+// Qt includes
+#include <QList>
+
+// visgui includes
+#include <vgFileDialog.h>
+#include <vgUnixTime.h>
+
+// VV includes
+#include <vvMakeId.h>
+#include <vvQuery.h>
+#include <vvQueryService.h>
+#include <vvQuerySession.h>
+
+// viqui includes
+#include "vqDebug.h"
+#include "vqQueryVideoPlayer.h"
+#include "vqSettings.h"
+
+//-----------------------------------------------------------------------------
+class vqVideoQueryDialogPrivate : public vvVideoQueryDialogPrivate
+{
+public:
+  vqVideoQueryDialogPrivate(vvVideoQueryDialog* q) :
+    vvVideoQueryDialogPrivate(q, new vqQueryVideoPlayer),
+    StartTime(-1),
+    EndTime(-1)
+    {}
+
+  void disableVideoSelectionAndProcessing()
+    {
+    this->UI.chooseVideo->setEnabled(false);
+    this->UI.videoLocation->setEnabled(false);
+    this->UI.reprocessVideo->setEnabled(false);
+    }
+
+  QUrl ExemplarUri;
+  vvQueryFormulationType FormulationType;
+
+  double StartTime;
+  double EndTime;
+};
+
+QTE_IMPLEMENT_D_FUNC(vqVideoQueryDialog)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vqVideoQueryDialog public interface
+
+//-----------------------------------------------------------------------------
+vqVideoQueryDialog::vqVideoQueryDialog(bool useAdvancedUi,
+                                       QWidget* parent, Qt::WindowFlags flags)
+  : vvVideoQueryDialog(new vqVideoQueryDialogPrivate(this),
+                       useAdvancedUi, parent, flags)
+{
+}
+
+//-----------------------------------------------------------------------------
+vqVideoQueryDialog::~vqVideoQueryDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+std::string vqVideoQueryDialog::exemplarUri() const
+{
+  QTE_D_CONST(vqVideoQueryDialog);
+  return stdString(d->ExemplarUri);
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoQueryDialog::setExemplarUri(
+  const std::string& uri, vvQueryFormulationType formulationType)
+{
+  QTE_D(vqVideoQueryDialog);
+
+  d->FormulationType = formulationType;
+
+  if (!uri.empty())
+    {
+    const QUrl server = vqSettings().queryServerUri();
+    QScopedPointer<vvQuerySession> session(
+      vvQueryService::createSession(server));
+    if (!session)
+      {
+      QMessageBox::warning(
+        this, "Failed to create session",
+        "No handler available for query server URI scheme " +
+        server.scheme() + ". Please check your configuration.");
+      return;
+      }
+
+    QUrl qUri = qtUrl(uri);
+    d->ExemplarUri =
+      session->fixupFormulationSourceUri(qUri, formulationType);
+    }
+  else
+    {
+    d->ExemplarUri.clear();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoQueryDialog::setTimeRange(
+  double startTime, double endTime, double initialTime)
+{
+  QTE_D(vqVideoQueryDialog);
+
+  d->StartTime = startTime;
+  d->EndTime = endTime;
+  d->InitialTime = vgTimeStamp::fromTime(initialTime);
+}
+
+//-----------------------------------------------------------------------------
+int vqVideoQueryDialog::exec()
+{
+  QTE_D(vqVideoQueryDialog);
+
+  if (d->ExemplarUri.isEmpty())
+    {
+    // If we don't have a video yet, ask for one to process
+    this->chooseQueryVideo();
+
+    // Abort if user did not pick a video
+    if (d->ExemplarUri.isEmpty())
+      {
+      this->reject();
+      return QDialog::Rejected;
+      }
+    }
+
+  return vvVideoQueryDialog::exec();
+}
+
+//END vqVideoQueryDialog public interface
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vqVideoQueryDialog query formulation handling
+
+//-----------------------------------------------------------------------------
+void vqVideoQueryDialog::chooseQueryVideo()
+{
+  QTE_D(vqVideoQueryDialog);
+
+  const QUrl server = vqSettings().queryServerUri();
+  QScopedPointer<vvQuerySession> session(
+    vvQueryService::createSession(server));
+  if (!session)
+    {
+    QMessageBox::warning(
+      this, "Failed to create session",
+      "No handler available for query server URI scheme " +
+      server.scheme() + ". Please check your configuration.");
+    return;
+    }
+
+  const QUrl uri = session->getFormulationSourceUri(
+                     d->ExemplarUri, d->FormulationType, this);
+  if (!uri.isEmpty())
+    {
+    d->ExemplarUri = uri;
+    this->processQueryVideo(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoQueryDialog::reprocessQueryVideo()
+{
+  this->processQueryVideo(true);
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoQueryDialog::setSelectedDescriptors(
+  const std::vector<vvDescriptor>& descriptors)
+{
+  QTE_D(vqVideoQueryDialog);
+
+  vvVideoQueryDialog::setSelectedDescriptors(descriptors);
+
+  if (!d->ExemplarUri.isEmpty())
+    {
+    switch (d->FormulationType)
+      {
+      case vvQueryFormulation::FromDatabase:
+        // \TODO not only do we need to process the query, but there is a lot
+        //       of stuff done by processQueryVideo that probably needs to be
+        //       done as well
+        break;
+      default:
+        this->processQueryVideo(false);
+        break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoQueryDialog::setQueryTracksAndDescriptors(
+  QList<vvDescriptor> descriptors, QList<vvTrack> tracks)
+{
+  QTE_D(vqVideoQueryDialog);
+
+  // Load video
+  // \TODO: If this is a database query, find the video in the vgKwaArchive
+  //        (might need to build a private instance?), NOT relative to the QF
+  //        KWA location
+  vqQueryVideoPlayer* player = static_cast<vqQueryVideoPlayer*>(d->Player);
+  player->setTimeRange(d->StartTime, d->EndTime);
+  if (!player->setVideoUri(d->ExemplarUri))
+    {
+    // Treat missing archive as QF failure
+    d->StatusManager.setStatusText(
+      d->StatusSource, "Failed to load processed video data");
+    this->clearQueryDescriptors();
+    return;
+    }
+
+  if (d->FormulationType == vvQueryFormulation::FromDatabase)
+    {
+    descriptors = this->filterDescriptors(descriptors);
+    vvVideoQueryDialog::setQueryTracksAndDescriptors(descriptors, tracks);
+
+    d->disableVideoSelectionAndProcessing();
+    }
+  else
+    {
+    vvVideoQueryDialog::setQueryTracksAndDescriptors(descriptors, tracks);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoQueryDialog::clearQueryDescriptors()
+{
+  QTE_D(vqVideoQueryDialog);
+
+  vqQueryVideoPlayer* player = static_cast<vqQueryVideoPlayer*>(d->Player);
+  player->setVideoUri(QUrl());
+
+  vvVideoQueryDialog::clearQueryDescriptors();
+}
+
+//-----------------------------------------------------------------------------
+void vqVideoQueryDialog::processQueryVideo(bool bypassCache)
+{
+  QTE_D(vqVideoQueryDialog);
+
+  if (!this->isVisible())
+    {
+    // \NOTE: We are explicitly calling show() here as this forces Qt to create
+    //        and initialize render context; needed so that setting the initial
+    //        view / camera will work
+    this->show();
+    this->hide();
+    }
+
+  d->StatusManager.setStatusText(d->StatusSource);
+
+  // Clear old results
+  d->SelectedDescriptors.clear();
+  d->UI.trackDescriptors->clear();
+  d->UI.selectedDescriptors->clear();
+  d->UI.regionDescriptors->clear();
+
+  // Disable UI while processing video
+  this->setSelectionControlsEnabled(false);
+
+  // Disallow accept with nothing selected
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+  // Construct the formulation query
+  vvProcessingRequest request;
+  request.QueryId = vvMakeId("VIQUI-QF");
+  request.VideoUri = stdString(d->ExemplarUri);
+  d->UI.videoLocation->setText(d->ExemplarUri.toString());
+
+  // Request results from the core
+  // TODO: We should be using a private parser for this, once we trust all of
+  //       our back-ends to tolerate multiple concurrent users, and get rid of
+  //       needing to know about vqCore at all
+  emit this->queryFormulationRequested(request, bypassCache,
+                                       &d->StatusManager);
+}
+
+//-----------------------------------------------------------------------------
+QList<vvDescriptor> vqVideoQueryDialog::filterDescriptors(
+  QList<vvDescriptor> descriptors)
+{
+  QTE_D(vqVideoQueryDialog);
+
+  QList<vvDescriptor> filteredDescriptors;
+
+  foreach (vvDescriptor descriptor, descriptors)
+    {
+    if (descriptor.ModuleName == "MergedDescriptors")
+      {
+      filteredDescriptors.append(descriptor);
+      continue;
+      }
+
+    vgTimeStamp startTime = descriptor.Region.begin()->TimeStamp;
+    vgTimeStamp endTime = descriptor.Region.rbegin()->TimeStamp;
+
+    if ((startTime.Time >= d->StartTime)
+        && (endTime.Time <= d->EndTime))
+      {
+      filteredDescriptors.append(descriptor);
+      }
+    }
+
+  return filteredDescriptors;
+}
+
+//END vqVideoQueryDialog query formulation handling
diff --git a/Applications/Viqui/vqVideoQueryDialog.h b/Applications/Viqui/vqVideoQueryDialog.h
new file mode 100644
index 00000000..38645c88
--- /dev/null
+++ b/Applications/Viqui/vqVideoQueryDialog.h
@@ -0,0 +1,63 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vqVideoQueryDialog_h
+#define __vqVideoQueryDialog_h
+
+#include <qtGlobal.h>
+
+#include <vvDescriptor.h>
+#include <vvQueryFormulation.h>
+
+#include <vvVideoQueryDialog.h>
+
+class vqVideoQueryDialogPrivate;
+
+class vqVideoQueryDialog : public vvVideoQueryDialog
+{
+  Q_OBJECT
+
+public:
+  vqVideoQueryDialog(bool useAdvancedUi, QWidget* parent = 0,
+                     Qt::WindowFlags flags = 0);
+  ~vqVideoQueryDialog();
+
+  virtual void setSelectedDescriptors(const std::vector<vvDescriptor>&);
+
+  std::string exemplarUri() const;
+
+  void setExemplarUri(const std::string& uri, vvQueryFormulationType type);
+
+  void setTimeRange(double startTime, double endTime, double initialTime);
+
+signals:
+  void queryFormulationRequested(vvProcessingRequest,
+                                 bool bypassCache,
+                                 qtStatusManager* statusTarget);
+
+public slots:
+  virtual int exec();
+
+protected slots:
+  virtual void chooseQueryVideo();
+  virtual void reprocessQueryVideo();
+
+  virtual void setQueryTracksAndDescriptors(
+    QList<vvDescriptor> descriptors, QList<vvTrack> tracks);
+
+  virtual void clearQueryDescriptors();
+
+protected:
+  void processQueryVideo(bool bypassCache);
+
+  QList<vvDescriptor> filterDescriptors(
+    QList<vvDescriptor> descriptors);
+
+private:
+  QTE_DECLARE_PRIVATE(vqVideoQueryDialog)
+};
+
+#endif
diff --git a/Applications/Viqui/vtkVQBlastLayoutNode.cxx b/Applications/Viqui/vtkVQBlastLayoutNode.cxx
new file mode 100644
index 00000000..19908d96
--- /dev/null
+++ b/Applications/Viqui/vtkVQBlastLayoutNode.cxx
@@ -0,0 +1,1464 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVQBlastLayoutNode.h"
+
+// VTK includes.
+#include <vtkActor.h>
+#include <vtkActor2D.h>
+#include <vtkBoundingBox.h>
+#include <vtkCellArray.h>
+#include <vtkCommand.h>
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkPoints.h>
+#include <vtkPropCollection.h>
+#include <vtkProperty.h>
+#include <vtkProperty2D.h>
+#include <vtkRendererCollection.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+
+// VG includes.
+#include "vtkVgSelectionWidget.h"  // will be move to VTK in the future
+#include "vtkVgEventRepresentationBase.h"
+#include "vtkVgFindNode.h"
+#include "vtkVgGeode.h"
+#include "vtkVgSelectionListRepresentation.h"
+#include "vtkVgTransformNode.h"
+#include "vtkVgVideoModel0.h"
+#include "vtkVgVideoNode.h"
+#include "vtkVgVideoRepresentation0.h"
+
+// STL includes.
+#include <vector>
+#include <algorithm>
+#include <map>
+#include <sstream>
+
+vtkStandardNewMacro(vtkVQBlastLayoutNode);
+
+
+const double vtkVQBlastLayoutNode::MinDelta  = 10.0;
+
+//-----------------------------------------------------------------------------
+class vtkVQBlastLayoutNode::vtkInternal
+{
+public:
+  vtkInternal();
+  ~vtkInternal();
+
+  struct NewNodeBoundData
+    {
+    vtkVgNodeBase::SmartPtr Node;
+    std::vector<double>     NodeBounds;
+    };
+
+  bool                                  Repeat;
+
+  int                                   InstanceColorIndex;
+
+  static int                            ColorIndex;
+
+  static const int                      MaxNumberOfColors = 5;
+
+  static double                         Colors[MaxNumberOfColors][3];
+
+  vtkSmartPointer<vtkMatrix4x4>         CachedMatrix;
+  vtkVgVideoNode::SmartPtr              CachedVideoNode;
+
+  std::vector<vtkVgGeode::SmartPtr>     ConnectingNodes;
+  std::vector<vtkVgNodeBase::SmartPtr>  SceneNodes;
+  std::vector<std::vector<double> >     OriginalNodeBounds;
+  std::vector<NewNodeBoundData>         NewNodeBounds;
+
+  std::multimap<long long, vtkVgVideoNode*>
+  SortedStack;
+  std::multimap<long long, vtkVgVideoNode*>::iterator
+  StackPositionIter;
+
+  // NOTE: We could use same sorted list of video nodes in the future.
+  std::multimap<long long, vtkVgVideoNode::SmartPtr>
+  SortedZSortStack;
+  int                                   PrevNumberOfChildren;
+
+
+  // Description:
+  // Helper functions.
+  void MakeNonIntersectBounds(double delta[3], vtkBoundingBox& bb1,
+                              vtkBoundingBox& bb2, double newNodeBounds[6],
+                              double translation[3], bool& newBounds);
+
+  void DoBlast(vtkVgNodeBase::SmartPtr node,
+               std::vector<vtkVgTransformNode*>& otherNodes, int index,
+               double delta[3], double nodeBounds[6], double translation[3]);
+
+  void DoBlast(vtkVgNodeBase::SmartPtr node,
+               std::vector<vtkVgNodeBase::SmartPtr>& otherNodes, double delta[3],
+               double nodeBounds[6], double translation[3]);
+
+  void DoBlast(vtkVgNodeBase::SmartPtr node,
+               std::vector< std::vector<double> >& otherNodeBounds,
+               double delta[3], double nodeBounds[6], double translation[3]);
+
+  void DoBlast(vtkVgNodeBase::SmartPtr node,
+               std::vector<NewNodeBoundData>& otherNodeBounds, double delta[3],
+               double nodeBounds[6], double translation[3]);
+
+
+  vtkVgGeode::SmartPtr
+  CreateConnectingNodes(
+    vtkMatrix4x4* matrix, vtkVgNodeBase* node, vtkVgGroupNode* parent);
+
+  static double* GetColor(int index);
+
+  void   ApplyZSort(vtkIdType videoInstanceId,
+                    vtkPropCollection* propCollection, double zValue);
+  void   RemoveZSort(vtkIdType videoInstanceId,
+                     vtkPropCollection* propCollection);
+};
+
+int vtkVQBlastLayoutNode::vtkInternal::ColorIndex = -1.0;
+
+//var. 1 = #FF7400 = rgb(255,116,0)
+//var. 2 = #BF7130 = rgb(191,113,48)
+//var. 3 = #A64B00 = rgb(166,75,0)
+//var. 4 = #FF9640 = rgb(255,150,64)
+//var. 5 = #FFB273 = rgb(255,178,115)
+
+double vtkVQBlastLayoutNode::vtkInternal::Colors [MaxNumberOfColors][3] =
+{
+    {255.0 / 255.0, 116.0 / 255.0, 0.0 / 255.0},
+    {191.0 / 255.0, 113.0 / 255.0, 48.0 / 255.0},
+    {166.0 / 255.0, 75.0 / 255.0, 0.0 / 255.0},
+    {255.0 / 255.0, 150.0 / 255.0, 64.0 / 255.0},
+    {255.0 / 255.0, 178.0 / 255.0, 115.0 / 255.0}
+};
+
+//-----------------------------------------------------------------------------
+vtkVQBlastLayoutNode::vtkInternal::vtkInternal()
+{
+  this->Repeat          = false;
+
+  this->InstanceColorIndex  = (++this->ColorIndex) % MaxNumberOfColors;
+
+  this->CachedMatrix    = 0;
+  this->CachedVideoNode = 0;
+
+  this->PrevNumberOfChildren = -1;
+
+  this->StackPositionIter = this->SortedStack.end();
+}
+
+//-----------------------------------------------------------------------------
+vtkVQBlastLayoutNode::vtkInternal::~vtkInternal()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::vtkInternal::MakeNonIntersectBounds(double delta[3],
+    vtkBoundingBox& bb1,
+    vtkBoundingBox& bb2,
+    double newNodeBounds[6],
+    double translation[3],
+    bool& newBounds)
+
+{
+  newBounds = false;
+
+  while (bb1.Intersects(bb2))
+    {
+    newNodeBounds[0] += delta[0];
+    newNodeBounds[1] += delta[0];
+    newNodeBounds[2] += delta[1];
+    newNodeBounds[3] += delta[1];
+
+    bb1.SetBounds(&newNodeBounds[0]);
+
+    translation[0] += delta[0];
+    translation[1] += delta[1];
+
+    newBounds = true;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::vtkInternal::DoBlast(
+  vtkVgNodeBase::SmartPtr vtkNotUsed(node),
+  std::vector<vtkVgTransformNode*>& otherNodes,
+  int index, double delta[3], double nodeBounds[6], double translation[3])
+{
+  // Check if this node is colliding against other nodes.
+  // If it is move the node until its not colliding.
+  int numberOfOtherNodes = static_cast<int>(otherNodes.size());
+
+  vtkBoundingBox bb1;
+  bb1.SetBounds(nodeBounds[0], nodeBounds[1], nodeBounds[2], nodeBounds[3], 0, 0);
+
+  for (int j = (index + 1); j < numberOfOtherNodes; ++j)
+    {
+    bool newBounds = false;
+
+    vtkBoundingBox bb2;
+    double* bounds = otherNodes[j]->GetBounds();
+    bb2.SetBounds(bounds[0], bounds[1], bounds[2], bounds[3], 0, 0);
+
+    this->MakeNonIntersectBounds(delta,
+                                 bb1,
+                                 bb2,
+                                 nodeBounds,
+                                 translation,
+                                 newBounds);
+
+    if (newBounds)
+      {
+      this->Repeat = true;
+      bb1.SetBounds(nodeBounds);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::vtkInternal::DoBlast(
+  vtkVgNodeBase::SmartPtr vtkNotUsed(node),
+  std::vector<vtkVgNodeBase::SmartPtr>& otherNodes,
+  double delta[3], double nodeBounds[6], double translation[3])
+{
+  // Check if this node is colliding against other nodes.
+  // If it is move the node until its not colliding.
+  int numberOfOtherNodes = static_cast<int>(otherNodes.size());
+
+  vtkBoundingBox bb1;
+  bb1.SetBounds(nodeBounds[0], nodeBounds[1], nodeBounds[2], nodeBounds[3], 0, 0);
+
+  for (int j = 0; j < numberOfOtherNodes; ++j)
+    {
+    bool newBounds = false;
+
+    vtkBoundingBox bb2;
+    double* bounds = otherNodes[j]->GetBounds();
+    bb2.SetBounds(bounds[0], bounds[1], bounds[2], bounds[3], 0, 0);
+
+    this->MakeNonIntersectBounds(delta,
+                                 bb1,
+                                 bb2,
+                                 nodeBounds,
+                                 translation,
+                                 newBounds);
+
+    if (newBounds)
+      {
+      this->Repeat = true;
+      bb1.SetBounds(nodeBounds);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::vtkInternal::DoBlast(
+  vtkVgNodeBase::SmartPtr vtkNotUsed(node),
+  std::vector< std::vector<double> >& otherNodeBounds,
+  double delta[3], double nodeBounds[3], double translation[3])
+{
+  // Check if this node is colliding against other nodes.
+  // If it is move the node until its not colliding.
+  int numberOfOtherBounds = static_cast<int>(otherNodeBounds.size());
+
+  vtkBoundingBox bb1;
+  bb1.SetBounds(nodeBounds[0], nodeBounds[1], nodeBounds[2], nodeBounds[3], 0, 0);
+
+  for (int j = 0; j < numberOfOtherBounds; ++j)
+    {
+    bool newBounds = false;
+
+    vtkBoundingBox bb2;
+    bb2.SetBounds(otherNodeBounds[j][0], otherNodeBounds[j][1],
+                  otherNodeBounds[j][2], otherNodeBounds[j][3], 0, 0);
+
+    this->MakeNonIntersectBounds(delta,
+                                 bb1,
+                                 bb2,
+                                 nodeBounds,
+                                 translation,
+                                 newBounds);
+
+    if (newBounds)
+      {
+      this->Repeat = true;
+      bb1.SetBounds(nodeBounds);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::vtkInternal::DoBlast(vtkVgNodeBase::SmartPtr node,
+                                                std::vector<NewNodeBoundData>& otherNodeBounds, double delta[3],
+                                                double nodeBounds[3], double translation[3])
+{
+  // Check if this node is colliding against other nodes.
+  // If it is move the node until its not colliding.
+  int numberOfOtherBounds = static_cast<int>(otherNodeBounds.size());
+
+  vtkBoundingBox bb1;
+  bb1.SetBounds(nodeBounds[0], nodeBounds[1], nodeBounds[2], nodeBounds[3], 0, 0);
+
+//  bool addNewBound = false;
+
+  for (int j = 0; j < numberOfOtherBounds; ++j)
+    {
+    if (node == otherNodeBounds[j].Node)
+      {
+      continue;
+      }
+
+    bool newBounds = false;
+
+    vtkBoundingBox bb2;
+    bb2.SetBounds(otherNodeBounds[j].NodeBounds[0], otherNodeBounds[j].NodeBounds[1],
+                  otherNodeBounds[j].NodeBounds[2], otherNodeBounds[j].NodeBounds[3], 0, 0);
+
+    this->MakeNonIntersectBounds(delta,
+                                 bb1,
+                                 bb2,
+                                 nodeBounds,
+                                 translation,
+                                 newBounds);
+
+    if (newBounds)
+      {
+      this->Repeat = true;
+      bb1.SetBounds(nodeBounds);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGeode::SmartPtr vtkVQBlastLayoutNode::vtkInternal::CreateConnectingNodes(
+  vtkMatrix4x4* transformationMatrix, vtkVgNodeBase* node,
+  vtkVgGroupNode* vtkNotUsed(parent))
+{
+  vtkVgGeode::SmartPtr                lineGeode(vtkVgGeode::SmartPtr::New());
+  vtkSmartPointer<vtkActor>           lineActor(vtkSmartPointer<vtkActor>::New());
+  vtkSmartPointer<vtkPolyDataMapper>  lineMapper(vtkSmartPointer<vtkPolyDataMapper>::New());
+  vtkSmartPointer<vtkPolyData>        linePolyData(vtkSmartPointer<vtkPolyData>::New());
+  vtkSmartPointer<vtkCellArray>       lineCells(vtkSmartPointer<vtkCellArray>::New());
+  vtkSmartPointer<vtkPoints>          linePoints(vtkSmartPointer<vtkPoints>::New());
+
+  double* nodeBounds = node->GetBounds();
+  double point1[4] = {(nodeBounds[1] + nodeBounds[0]) / 2.0,
+                      (nodeBounds[3] + nodeBounds[2]) / 2.0,
+                      0.0,
+                      1.0
+                     };
+  double point2[4];
+  transformationMatrix->MultiplyPoint(point1, point2);
+  linePoints->InsertNextPoint(point1);
+  linePoints->InsertNextPoint(point2);
+
+  vtkIdType ptIds[2] = {0, 1};
+  lineCells->InsertNextCell(2, ptIds);
+
+  linePolyData->SetPoints(linePoints);
+  linePolyData->SetLines(lineCells);
+  lineMapper->SetInputData(linePolyData);
+  lineActor->SetMapper(lineMapper);
+
+  lineActor->GetProperty()->SetLineWidth(2.0);
+  lineActor->GetProperty()->SetColor(this->GetColor(this->InstanceColorIndex));
+
+  lineGeode->AddDrawable(lineActor);
+  lineGeode->SetName("LineGeode");
+
+  this->ConnectingNodes.push_back(lineGeode);
+
+  return lineGeode;
+}
+
+//-----------------------------------------------------------------------------
+double* vtkVQBlastLayoutNode::vtkInternal::GetColor(int index)
+{
+  if (index >= MaxNumberOfColors)
+    {
+    return 0;
+    }
+
+  return Colors[index];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::vtkInternal::ApplyZSort(
+  vtkIdType vtkNotUsed(videoInstanceId),
+  vtkPropCollection* propCollection,
+  double zValue)
+{
+  if (propCollection)
+    {
+    propCollection->InitTraversal();
+
+    vtkProp3D* prop3d;
+    while ((prop3d = vtkProp3D::SafeDownCast(propCollection->GetNextProp())))
+      {
+      vtkVgRepresentationBase::SetZOffset(prop3d, zValue);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::vtkInternal::RemoveZSort(
+  vtkIdType vtkNotUsed(videoInstanceId), vtkPropCollection* propCollection)
+{
+  if (propCollection)
+    {
+    propCollection->InitTraversal();
+
+    vtkProp3D* prop3d;
+    while ((prop3d = vtkProp3D::SafeDownCast(propCollection->GetNextProp())))
+      {
+      vtkVgRepresentationBase::SetZOffset(prop3d, 0);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVQBlastLayoutNode::vtkVQBlastLayoutNode() : vtkVgGroupNode(),
+  LayoutMode(Z_SORT),
+  Blast(1),
+  ZSort(1),
+  Stack(1),
+  NodeFocused(0),
+  ZSortOffsetFactor(100.0)
+{
+  this->Implementation = new vtkInternal();
+
+  this->StackSelectionWidget = vtkVgSelectionWidget::New();
+  this->StackSelectionWidget->EnabledOff(); // make sure off initially
+  vtkVgSelectionListRepresentation* rep = vtkVgSelectionListRepresentation::New();
+  rep->GetMarkerActor()->GetProperty()->SetColor(1.0, 0.08, 0.58);
+  rep->SetOrientationToVertical();
+  this->StackSelectionWidget->SetRepresentation(rep);
+  rep->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+vtkVQBlastLayoutNode::~vtkVQBlastLayoutNode()
+{
+  delete this->Implementation;
+  this->Implementation = 0;
+  this->StackSelectionWidget->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::PrintSelf(ostream& vtkNotUsed(os),
+                                     vtkIndent vtkNotUsed(indent))
+{
+  // \TODO: Implement this.
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::SetLayoutMode(int mode)
+{
+  // Check if incoming mode is valid.
+  if (mode != Z_SORT &&
+      mode != STACK  &&
+      mode != BLAST)
+    {
+    // Do nothing.
+    return;
+    }
+
+  if (this->LayoutMode == STACK)
+    {
+    this->UndoStackLayout();
+
+    // DoStackOn()...
+    this->StackOff();
+    }
+  else if (this->LayoutMode == Z_SORT)
+    {
+    this->UndoZSortLayout();
+
+    this->ZSortOff();
+    }
+  else
+    {
+    this->UndoBlastLayout();
+
+    this->BlastOff();
+    }
+
+  if (mode == STACK)
+    {
+    this->StackOn();
+    }
+  else if (mode == Z_SORT)
+    {
+    this->ZSortOn();
+    }
+  else
+    {
+    this->BlastOn();
+    }
+
+  this->LayoutMode = mode;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::AddSceneNode(vtkVgNodeBase* node)
+{
+  if (!node)
+    {
+    return;
+    }
+
+  // Check if the node exist as a children to this layout node.
+  if (!vtkVgFindNode::ContainsNode(this, node))
+    {
+    std::vector<double> bounds(6, 0.0);
+    node->ComputeBounds();
+    node->GetBounds(&bounds[0]);
+
+    this->Implementation->SceneNodes.push_back(node);
+    this->Implementation->OriginalNodeBounds.push_back(bounds);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::FocusNode(vtkVgVideoNode* node)
+{
+  if (!node)
+    {
+    return;
+    }
+
+  // NOTE: I believe we don't need to rely on this now.
+  if (!node->GetVideoRepresentation()->GetVideoModel()->IsPlaying())
+    {
+    return;
+    }
+
+  if (vtkVgTransformNode* parent =
+        static_cast<vtkVgTransformNode*>(node->GetParent()))
+    {
+    this->Implementation->CachedVideoNode = node;
+    this->Implementation->CachedMatrix = parent->GetMatrix();
+    parent->SetMatrix(vtkSmartPointer<vtkMatrix4x4>::New());
+
+    this->NodeFocused = 1;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::RestoreFocusedNodePosition()
+{
+  if (vtkVgVideoNode* prevPickedNode = this->Implementation->CachedVideoNode)
+    {
+    if (prevPickedNode->GetVideoRepresentation()->GetVideoModel()->IsPlaying())
+      {
+      std::cerr << "Video still playing. Inconsistent state." << std::endl;
+      return;
+      }
+
+    if (vtkVgTransformNode* parent =
+          static_cast<vtkVgTransformNode*>(prevPickedNode->GetParent()))
+      {
+      parent->SetMatrix(this->Implementation->CachedMatrix, true);
+      this->NodeFocused = 0;
+      }
+    this->Implementation->CachedVideoNode = 0;
+    this->Implementation->CachedMatrix = 0;
+
+    this->SetChildrenVisible(1);
+    this->UpdateStackLayout();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::SetChildrenVisible(int visible)
+{
+  int numberOfChildren = this->GetNumberOfChildren();
+  for (int i = 0; i < numberOfChildren; ++i)
+    {
+    if (vtkVgNodeBase* node = this->GetChild(i))
+      {
+      node->SetVisible(visible);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::OnPlayStop(vtkVgVideoNode& node)
+{
+  // Do nothing if the incoming node is not visible, this could be the case
+  // where the node is not visible on context but is shown in video player.
+  if (!node.GetVisible())
+    {
+    return;
+    }
+
+  vtkVgVideoNode* videoNode = dynamic_cast<vtkVgVideoNode*>(&node);
+  if (!videoNode)
+    {
+    return;
+    }
+
+  vtkVgVideoNode* prevPickedNode = this->Implementation->CachedVideoNode;
+
+  bool isContained = false;
+
+  isContained = vtkVgFindNode::ContainsNode(this, videoNode);
+
+  // if the selected node belongs to someone else and we had picked a node previously
+  // return after storing the state.
+  if ((!isContained && prevPickedNode))
+    {
+    this->RestoreFocusedNodePosition();
+
+    return;
+    }
+
+  // If we have picked the same node twice, restore the state and return.
+  if (prevPickedNode && prevPickedNode == videoNode)
+    {
+    this->RestoreFocusedNodePosition();
+
+    return;
+    }
+
+  // Node picked is one of its own children but different than last one.
+  if (isContained && prevPickedNode && prevPickedNode != videoNode)
+    {
+    this->RestoreFocusedNodePosition();
+    }
+
+  // Swap the focused node if we are not re-picking the same node as before
+  if (prevPickedNode && prevPickedNode != videoNode)
+    {
+    if (vtkVgTransformNode* parent =
+          static_cast<vtkVgTransformNode*>(videoNode->GetParent()))
+      {
+      this->FocusNode(videoNode);
+
+      if (this->NodeFocused)
+        {
+        parent->SetVisible(1);
+
+        if (vtkVgNodeBase* prevParent = prevPickedNode->GetParent())
+          {
+          prevParent->SetVisible(0);
+          }
+        }
+      }
+    return;
+    }
+
+  // If we are picking for the first time.
+  if (isContained)
+    {
+    // focus picked node
+    if (vtkVgTransformNode* parent =
+          static_cast<vtkVgTransformNode*>(videoNode->GetParent()))
+      {
+      this->FocusNode(videoNode);
+      if (this->NodeFocused)
+        {
+        this->SetChildrenVisible(0);
+        parent->SetVisible(1);
+        }
+      }
+    }
+  else
+    {
+    // If the incoming node does not belong to this and is playing then
+    // we have to make sure that we make this layout visible again
+    // but then since it will make all the children visible and hence
+    // will break the stack layout we would have to call update on stack layout.
+    if (!videoNode->GetVideoRepresentation()->GetVideoModel()->IsPlaying())
+      {
+      this->SetVisible(1);
+      this->UpdateStackLayout();
+      }
+    else
+      {
+      // Else make this node not visible.
+      this->SetVisible(0);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::Update(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  this->Superclass::Update(nodeVisitor);
+
+  if ((this->LayoutMode == BLAST) && this->Blast)
+    {
+    this->SetLayoutToBlast(nodeVisitor);
+
+    this->BlastOff();
+    }
+  else if (this->LayoutMode == Z_SORT && this->ZSort)
+    {
+    this->SetLayoutToZSort(nodeVisitor);
+
+    this->ZSortOff();
+    }
+  else if (this->LayoutMode == STACK && this->Stack)
+    {
+    this->SetLayoutToStack(nodeVisitor);
+
+    this->StackOff();
+    }
+  else
+    {
+    // Do nothing.
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::Traverse(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  this->Superclass::Traverse(nodeVisitor);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVQBlastLayoutNode::IsCoincidental(double bounds1[6], double bounds2[6])
+{
+  const double EPS = 0.00000000001;
+  if (fabs(bounds1[0] - bounds2[0]) <= EPS &&
+      fabs(bounds1[1] - bounds2[1]) <= EPS &&
+      fabs(bounds1[2] - bounds2[2]) <= EPS &&
+      fabs(bounds1[3] - bounds2[3]) <= EPS)
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::SetLayoutToBlast(vtkVgNodeVisitorBase& nodeVisitor)
+{
+// First find all the video with exact same bound center as this node.
+  std::vector<vtkVgTransformNode*> coincidentalNodes;
+  std::vector<vtkVgTransformNode*> overlappingNodes;
+
+  this->Implementation->NewNodeBounds.clear();
+  this->Implementation->Repeat = false;
+  this->Implementation->ConnectingNodes.clear();
+
+  int numberOfChildren = this->GetNumberOfChildren();
+
+  this->Superclass::TraverseChildren(nodeVisitor);
+
+  if (this->GetBoundsDirty())
+    {
+    this->ComputeBounds();
+    }
+
+  for (int i = 0; i < numberOfChildren; ++i)
+    {
+    vtkVgTransformNode* transformNode1 =
+      dynamic_cast<vtkVgTransformNode*>(this->GetChild(i));
+
+    // If the video transform or its video is not visible ignore it.
+    if (!transformNode1->GetVisible() || (transformNode1->GetChild(0)
+                                          && !transformNode1->GetChild(0)->GetVisible()))
+      {
+      continue;
+      }
+
+    double* bounds1 = transformNode1->GetBounds();
+
+    for (int j = (i + 1); j < this->GetNumberOfChildren(); ++j)
+      {
+      vtkVgTransformNode* transformNode2 =
+        dynamic_cast<vtkVgTransformNode*>(this->GetChild(j));
+
+      double* bounds2 = transformNode2->GetBounds();
+
+      if (this->IsCoincidental(bounds1, bounds2))
+        {
+        if (std::find(coincidentalNodes.begin(), coincidentalNodes.end(),
+                      transformNode1) == coincidentalNodes.end())
+          {
+          coincidentalNodes.push_back(transformNode1);
+          }
+        if (std::find(coincidentalNodes.begin(),
+                      coincidentalNodes.end(), transformNode2) == coincidentalNodes.end())
+          {
+          coincidentalNodes.push_back(transformNode2);
+          }
+        }
+      }
+
+    if (std::find(coincidentalNodes.begin(),
+                  coincidentalNodes.end(), transformNode1) == coincidentalNodes.end())
+      {
+      overlappingNodes.push_back(transformNode1);
+      }
+    }
+// Now we have exact overlapping nodes and just overlapping nodes,
+// we need to find a random distance seed.
+  const double someFactor = 1.2;
+
+  double blastDistnace = MinDelta;
+
+  int totalNumberOfChildren = this->GetNumberOfChildren();
+  for (int ll = 0; ll < totalNumberOfChildren; ++ll)
+    {
+    vtkVgTransformNode::SmartPtr videoTransform =
+      dynamic_cast<vtkVgTransformNode*>(this->GetChild(ll));
+    if (videoTransform && videoTransform->GetNumberOfChildren())
+      {
+      double* nodeBounds = videoTransform->GetChild(0)->GetBounds();
+      double distance = (nodeBounds[1] - nodeBounds[0]) * someFactor;
+
+      if (distance > 0.0)
+        {
+        blastDistnace = distance;
+        break;
+        }
+      }
+    }
+
+  double coinAngleSeparation = 0.0;
+
+  if (!coincidentalNodes.empty())
+    {
+    coinAngleSeparation =
+      360.0 / static_cast<double>(coincidentalNodes.size());
+    }
+
+  double coinAngle = 0.0;
+
+  double ovrAngleSeparation = 0.0;
+
+  if (!overlappingNodes.empty())
+    {
+    ovrAngleSeparation = 360.0 / static_cast<double>(overlappingNodes.size());
+    }
+
+  double ovrAngle = 0.0;
+
+// First deal with the just overlapping nodes.
+  int numberOfOverlappingNodes  = static_cast<int>(overlappingNodes.size());
+  int numberOfCoincidentalNodes = static_cast<int>(coincidentalNodes.size());
+
+// NOTE: Commented out for now.
+// Get center of this blast node.
+//double *overallBounds = this->GetBounds();
+//double overallCenter[3] =
+//  {
+//  overallBounds[1] - overallBounds[0] / 2.0,
+//  overallBounds[3] - overallBounds[2] / 2.0,
+//  overallBounds[5] - overallBounds[4] / 2.0,
+//  };
+
+// Deal with just overlapping nodes.
+//-------------------------------------------------------------------------
+  for (int i = 0; i < numberOfOverlappingNodes; ++i)
+    {
+    double translation[3] = {0.0, 0.0, 0.0};
+    double* bounds = overlappingNodes[i]->GetBounds();
+
+    std::vector<double> newBounds(bounds, bounds + 6);
+
+    // NOTE: Commented out for now.
+//  double nodeCenter[3] =
+//    {
+//    bounds[1] - bounds[0] / 2.0,
+//    bounds[3] - bounds[2] / 2.0,
+//    bounds[5] - bounds[4] / 2.0,
+//    };
+
+//  double direction[3] = {
+//    nodeCenter[0] - overallCenter[0],
+//    nodeCenter[1] - overallCenter[1],
+//    0.0};
+//  vtkMath::Normalize(direction);
+
+//  double delta[3] = {
+//    blastDistnace * direction[0],
+//    blastDistnace * direction[1],
+//    0.0};
+
+    double delta [3] =
+      {
+      blastDistnace * cos(ovrAngle *  3.14 / 180.0),
+      blastDistnace * sin(ovrAngle *  3.14 / 180.0),
+      0.0
+      };
+
+    // This is to make sure that during blast even the last node moves out.
+    this->Implementation->OriginalNodeBounds.push_back(std::vector<double>(bounds, bounds + 6));
+    \
+    do
+      {
+      this->Implementation->Repeat = false;
+
+      // Do blast against overlapping nodes.
+      this->Implementation->DoBlast(overlappingNodes[i], overlappingNodes,
+                                    i, delta, &newBounds[0], translation);
+
+      // Do blast against exactOverlapping  nodes.
+      if (coincidentalNodes.size() > 0)
+        {
+        std::vector<vtkVgTransformNode*> anyCoincidentalNode(
+          1, coincidentalNodes[0]);
+        this->Implementation->DoBlast(overlappingNodes[i], anyCoincidentalNode,
+                                      -1, delta, &newBounds[0], translation);
+        }
+
+      // Do blast against scene  nodes.
+      this->Implementation->DoBlast(overlappingNodes[i],
+                                    this->Implementation->SceneNodes, delta, &newBounds[0], translation);
+
+      // Do blast against original bounds.
+      this->Implementation->DoBlast(overlappingNodes[i],
+                                    this->Implementation->OriginalNodeBounds, delta, &newBounds[0], translation);
+
+      // Do blast against the new node bounds if any.
+      this->Implementation->DoBlast(overlappingNodes[i],
+                                    this->Implementation->NewNodeBounds, delta, &newBounds[0], translation);
+
+      }
+    while (this->Implementation->Repeat);
+
+    if (fabs(translation[0]) > 0.0 || fabs(translation [1]) > 0.0)
+      {
+      vtkInternal::NewNodeBoundData newNodeBoundData;
+      newNodeBoundData.Node = overlappingNodes[i];
+      newNodeBoundData.NodeBounds = newBounds;
+      this->Implementation->NewNodeBounds.push_back(newNodeBoundData);
+
+      vtkSmartPointer<vtkMatrix4x4> translationMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+      translationMatrix->SetElement(0, 3, translation[0]);
+      translationMatrix->SetElement(1, 3, translation[1]);
+
+      overlappingNodes[i]->SetMatrix(translationMatrix, true);
+
+      vtkSmartPointer<vtkMatrix4x4> invertMat = vtkSmartPointer<vtkMatrix4x4>::New();
+      invertMat->DeepCopy(overlappingNodes[i]->GetFinalMatrix());
+      invertMat->Invert();
+
+      vtkVgTransformNode::SmartPtr lineTransformNode(vtkVgTransformNode::SmartPtr::New());
+      lineTransformNode->SetMatrix(invertMat);
+      lineTransformNode->SetName("lineTransformNode");
+      lineTransformNode->AddChild(this->Implementation->CreateConnectingNodes(
+                                    translationMatrix, overlappingNodes[i], this));
+      this->AddChild(lineTransformNode);
+      }
+
+    ovrAngle += ovrAngleSeparation;
+    }
+
+// Now deal with coincidental nodes.
+// ---------------------------------------------------------------------------------
+  for (int i = 0; i < numberOfCoincidentalNodes; ++i)
+    {
+    double translation[3] = {0.0, 0.0, 0.0};
+    double* bounds = coincidentalNodes[i]->GetBounds();
+    std::vector<double> newBounds(bounds, bounds + 6);
+    double delta [3] =
+      {
+      blastDistnace * cos(coinAngle *  3.14 / 180.0),
+      blastDistnace * sin(coinAngle *  3.14 / 180.0),
+      0.0
+      };
+
+    // This is to make sure that during blast even the last node moves out.
+    this->Implementation->OriginalNodeBounds.push_back(std::vector<double>(bounds, bounds + 6));
+
+    do
+      {
+      this->Implementation->Repeat = false;
+
+
+      // Do blast against the coincidental nodes.
+      this->Implementation->DoBlast(coincidentalNodes[i], coincidentalNodes, i,
+                                    delta, &newBounds[0], translation);
+
+      // Do blast against the just overlapping nodes.
+      this->Implementation->DoBlast(coincidentalNodes[i], overlappingNodes, -1,
+                                    delta, &newBounds[0], translation);
+
+      // Do blast against the scene nodes.
+      // If these are coincidental with this node
+      // then we have to make sure we test blast
+      // against this node itself.
+      if (IsCoincidental(bounds, this->GetBounds()))
+        {
+        this->Implementation->OriginalNodeBounds.push_back(std::vector<double>(bounds, (bounds + 6)));
+        }
+      this->Implementation->DoBlast(coincidentalNodes[i],
+                                    this->Implementation->SceneNodes, delta, &newBounds[0], translation);
+
+      // Do blast against the original node bounds.
+      this->Implementation->DoBlast(coincidentalNodes[i],
+                                    this->Implementation->OriginalNodeBounds, delta, &newBounds[0], translation);
+
+      // Do blast against the new node bounds if any.
+      this->Implementation->DoBlast(coincidentalNodes[i],
+                                    this->Implementation->NewNodeBounds, delta, &newBounds[0], translation);
+
+      }
+    while (this->Implementation->Repeat);
+
+    if (fabs(translation[0]) > 0.0 || fabs(translation [1]) > 0.0)
+      {
+      vtkInternal::NewNodeBoundData newNodeBoundData;
+      newNodeBoundData.Node = coincidentalNodes[i];
+      newNodeBoundData.NodeBounds = newBounds;
+      this->Implementation->NewNodeBounds.push_back(newNodeBoundData);
+
+      vtkSmartPointer<vtkMatrix4x4> translationMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+      translationMatrix->SetElement(0, 3, translation[0]);
+      translationMatrix->SetElement(1, 3, translation[1]);
+
+      coincidentalNodes[i]->SetMatrix(translationMatrix, true);
+
+      vtkSmartPointer<vtkMatrix4x4> invertMat = vtkSmartPointer<vtkMatrix4x4>::New();
+      invertMat->DeepCopy(coincidentalNodes[i]->GetFinalMatrix());
+      invertMat->Invert();
+
+      vtkVgTransformNode::SmartPtr lineTransformNode(vtkVgTransformNode::SmartPtr::New());
+      lineTransformNode->SetMatrix(invertMat);
+      lineTransformNode->SetName("lineTransformNode");
+      lineTransformNode->AddChild(this->Implementation->CreateConnectingNodes(
+                                    translationMatrix, coincidentalNodes[i], this));
+      this->AddChild(lineTransformNode);
+      }
+
+    coinAngle += coinAngleSeparation;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::OnNextInStack(vtkVgNodeBase& node)
+{
+  // no further procesing required if not in stack mode OR the node passed in
+  // doesn't match the one on top (then must not be in this stack)
+  if (this->LayoutMode != STACK ||
+      this->Implementation->StackPositionIter == this->Implementation->SortedStack.end() ||
+      this->Implementation->StackPositionIter->second != &node)
+    {
+    return;
+    }
+
+  if (this->NodeFocused)
+    {
+    return;
+    }
+
+  this->MoveToNextVisibleNodeInStack();
+
+  // update bar location
+  this->UpdateStackRepresentationBarLocation();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::SetLayoutToZSort(
+  vtkVgNodeVisitorBase& vtkNotUsed(nodeVisitor))
+{
+  int numberOfChildren = this->GetNumberOfChildren();
+
+  // If this is the first time or if there has been a change in the number of children.
+  // (though in the current case it will build the stack again and again as we are adding
+  // addition nodes for the blast).
+  if (this->Implementation->PrevNumberOfChildren == -1 ||
+      numberOfChildren != this->Implementation->PrevNumberOfChildren)
+    {
+    this->Implementation->SortedZSortStack.clear();
+
+    for (int i = 0; i < numberOfChildren; ++i)
+      {
+      // Get the trasnform node.
+      vtkVgTransformNode::SmartPtr transformNode =
+        vtkVgTransformNode::SafeDownCast(this->GetChild(i));
+      if (transformNode)
+        {
+        vtkVgVideoNode::SmartPtr currentVideoNode =
+          vtkVgVideoNode::SafeDownCast(transformNode->GetChild(0));
+
+        if (currentVideoNode)
+          {
+          this->Implementation->SortedZSortStack.insert(std::pair<double, vtkVgVideoNode::SmartPtr>(
+                                                          currentVideoNode->GetRank(), currentVideoNode));
+          }
+        }
+      }
+
+    this->Implementation->PrevNumberOfChildren = numberOfChildren;
+    }
+
+  double zValue = 1.0;
+
+  // Now apply zsort.
+  std::multimap<long long, vtkVgVideoNode::SmartPtr>::reverse_iterator stackIter;
+  for (stackIter = this->Implementation->SortedZSortStack.rbegin();
+       stackIter != this->Implementation->SortedZSortStack.rend(); stackIter++)
+    {
+    vtkVgVideoRepresentation0::SmartPtr videoRepresentation =
+      vtkVgVideoRepresentation0::SafeDownCast(stackIter->second->GetVideoRepresentation());
+
+    if (videoRepresentation)
+      {
+      this->Implementation->ApplyZSort(stackIter->second->GetInstanceId(),
+                                       videoRepresentation->GetActiveRenderObjects(), zValue);
+
+      vtkVgEventRepresentationBase* eventRepresentation =
+        videoRepresentation->GetEventRepresentation();
+      if (eventRepresentation)
+        {
+        this->Implementation->ApplyZSort(stackIter->second->GetInstanceId(),
+                                         eventRepresentation->GetActiveRenderObjects(), zValue);
+        }
+
+      zValue += 1.0;
+
+      // Since model has not changed we need to manually force update representations.
+      videoRepresentation->Update();
+      }
+    }
+}
+
+///////////////////////////////////////////////////////////////////////////////
+void vtkVQBlastLayoutNode::UndoZSortLayout()
+{
+  // Now undo zsort.
+  std::multimap<long long, vtkVgVideoNode::SmartPtr>::iterator stackIter;
+  for (stackIter = this->Implementation->SortedZSortStack.begin();
+       stackIter != this->Implementation->SortedZSortStack.end(); stackIter++)
+    {
+    vtkVgVideoRepresentation0::SmartPtr videoRepresentation =
+      vtkVgVideoRepresentation0::SafeDownCast(stackIter->second->GetVideoRepresentation());
+
+    if (videoRepresentation)
+      {
+      this->Implementation->RemoveZSort(stackIter->second->GetInstanceId(),
+                                        videoRepresentation->GetActiveRenderObjects());
+
+      vtkVgEventRepresentationBase* eventRepresentation =
+        videoRepresentation->GetEventRepresentation();
+      if (eventRepresentation)
+        {
+        this->Implementation->RemoveZSort(stackIter->second->GetInstanceId(),
+                                          eventRepresentation->GetActiveRenderObjects());
+        }
+
+      videoRepresentation->Update();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::SetLayoutToStack(
+  vtkVgNodeVisitorBase& vtkNotUsed(nodeVisitor))
+{
+  // Z Sort likely to use this as well, but for now just create for our needs
+  if (this->Implementation->SortedStack.size() == 0)
+    {
+    int numberOfChildren = this->GetNumberOfChildren();
+    for (int i = 0; i < numberOfChildren; ++i)
+      {
+      // Get the trasnform node.
+      vtkVgTransformNode* transformNode =
+        vtkVgTransformNode::SafeDownCast(this->GetChild(i));
+      if (transformNode)
+        {
+        vtkVgVideoNode* currentVideoNode =
+          vtkVgVideoNode::SafeDownCast(transformNode->GetChild(0));
+
+        if (currentVideoNode)
+          {
+          this->Implementation->SortedStack.insert(std::pair<double, vtkVgVideoNode*>(
+                                                     currentVideoNode->GetRank(), currentVideoNode));
+          }
+        }
+      }
+    }
+
+  bool firstVisible = true;
+  std::multimap<long long, vtkVgVideoNode*>::iterator stackIter;
+  for (stackIter = this->Implementation->SortedStack.begin();
+       stackIter != this->Implementation->SortedStack.end(); stackIter++)
+    {
+    if (stackIter->second->GetVisibleNodeMask() == VISIBLE_NODE_MASK)
+      {
+      if (firstVisible)
+        {
+        this->Implementation->StackPositionIter = stackIter;
+        // should already be visible, but just in case
+        stackIter->second->SetVisible(1);
+        emit this->VisibilityChanged(*stackIter->second);
+        firstVisible = false;
+        }
+      else
+        {
+        stackIter->second->SetVisible(0);
+        }
+      }
+    }
+  this->BuildStackRepresentationBar();
+  this->UpdateStackRepresentationBarLocation();
+
+  this->StackSelectionWidget->EnabledOn();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::UndoStackLayout()
+{
+  // make all the nodes visible
+  // (VISIBLE_NODE_MASK will prevent us from turning on those user turned off)
+  std::multimap<long long, vtkVgVideoNode*>::iterator stackIter;
+  for (stackIter = this->Implementation->SortedStack.begin();
+       stackIter != this->Implementation->SortedStack.end(); stackIter++)
+    {
+    stackIter->second->SetVisible(1);
+    }
+
+  this->StackSelectionWidget->EnabledOff();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::UndoBlastLayout()
+{
+  int numberOfChildren = this->GetNumberOfChildren();
+
+  // Remove blast connection lines.
+  std::vector<vtkVgTransformNode::SmartPtr> lineTransforms;
+  for (int i = 0; i < numberOfChildren; ++i)
+    {
+    vtkVgTransformNode::SmartPtr transformNode =
+      vtkVgTransformNode::SafeDownCast(this->GetChild(i));
+
+    if (transformNode)
+      {
+      // Set the matrix to identity.
+      transformNode->SetMatrix(vtkSmartPointer<vtkMatrix4x4>::New(), true);
+
+      vtkVgGeode::SmartPtr lineGeode = vtkVgGeode::SafeDownCast(transformNode->GetChild(0));
+      if (lineGeode)
+        {
+        lineTransforms.push_back(transformNode);
+        }
+      }
+    }
+
+  int numberOfLineTransforms = static_cast<int>(lineTransforms.size());
+  for (int i = 0; i < numberOfLineTransforms; ++i)
+    {
+    this->RemoveChild(lineTransforms[i]);
+    }
+  lineTransforms.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::UpdateStackLayout()
+{
+  if (this->LayoutMode != STACK)
+    {
+    return;
+    }
+  // in case items in the stack were turned on that aren't the top,
+  // make sure evrything is "not visible" other than the top of our stack
+  std::multimap<long long, vtkVgVideoNode*>::iterator stackIter;
+  for (stackIter = this->Implementation->SortedStack.begin();
+       stackIter != this->Implementation->SortedStack.end(); stackIter++)
+    {
+    if (stackIter != this->Implementation->StackPositionIter)
+      {
+      stackIter->second->SetVisible(0);
+      }
+    }
+
+  if (this->Implementation->StackPositionIter != this->Implementation->SortedStack.end() &&
+      this->Implementation->StackPositionIter->second->GetVisibleNodeMask() == VISIBLE_NODE_MASK)
+    {
+    return; // current top of stack is still visible; nothing to do
+    }
+  // current top of stack must no longer be visible, so find next visible item
+  this->MoveToNextVisibleNodeInStack();
+
+  // ok, not most efficient, but let's just rebuild the bar, even if it may
+  // not have changed
+  this->BuildStackRepresentationBar();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::MoveToNextVisibleNodeInStack()
+{
+  std::multimap<long long, vtkVgVideoNode*>::iterator startIter;
+  if (this->Implementation->StackPositionIter != this->Implementation->SortedStack.end())
+    {
+    // make current invisble
+    this->Implementation->StackPositionIter->second->SetVisible(0);
+    startIter = ++this->Implementation->StackPositionIter;
+    this->Implementation->StackPositionIter = this->Implementation->SortedStack.end();
+    }
+  else
+    {
+    startIter = this->Implementation->SortedStack.begin();
+    }
+
+  // look for next possible clip to make visible
+  std::multimap<long long, vtkVgVideoNode*>::iterator stackIter = startIter;
+  for (; stackIter != this->Implementation->SortedStack.end(); stackIter++)
+    {
+    if (stackIter->second->GetVisibleNodeMask() == VISIBLE_NODE_MASK)
+      {
+      stackIter->second->SetVisible(1);
+      this->Implementation->StackPositionIter = stackIter;
+      this->UpdateStackCurrentItemIndicator();
+      emit this->VisibilityChanged(*stackIter->second);
+      return;
+      }
+    }
+
+  // loop around and check the rest of the list (from begin), but only if we
+  // didn't already begin from begin.
+  if (startIter != this->Implementation->SortedStack.begin())
+    {
+    for (stackIter = this->Implementation->SortedStack.begin();
+         stackIter != startIter; stackIter++)
+      {
+      if (stackIter->second->GetVisibleNodeMask() == VISIBLE_NODE_MASK)
+        {
+        stackIter->second->SetVisible(1);
+        emit this->VisibilityChanged(*stackIter->second);
+        this->Implementation->StackPositionIter = stackIter;
+        break;
+        }
+      }
+    }
+  this->UpdateStackCurrentItemIndicator();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::BuildStackRepresentationBar()
+{
+  if (this->LayoutMode != STACK)
+    {
+    return;
+    }
+
+  vtkVgSelectionListRepresentation* stackListRep =
+    vtkVgSelectionListRepresentation::SafeDownCast(
+      this->StackSelectionWidget->GetRepresentation());
+  stackListRep->RemoveAllItems();
+  std::multimap<long long, vtkVgVideoNode*>::const_iterator stackIter;
+  for (stackIter = this->Implementation->SortedStack.begin();
+       stackIter != this->Implementation->SortedStack.end(); stackIter++)
+    {
+    if (stackIter->second->GetVisibleNodeMask() == VISIBLE_NODE_MASK)
+      {
+      std::ostringstream oss;
+      oss << stackIter->second->GetInstanceId();
+      stackListRep->AddItem(
+        stackIter->second->GetInstanceId(),
+        stackIter->second->GetColorScalar(), oss.str().c_str(), NULL);
+      }
+    }
+  this->UpdateStackCurrentItemIndicator();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::UpdateStackRepresentationBarLocation()
+{
+  if (this->LayoutMode != STACK)
+    {
+    return;
+    }
+
+  vtkVgVideoNode* placementNode = 0;
+  if (this->Implementation->StackPositionIter !=
+      this->Implementation->SortedStack.end())
+    {
+    placementNode = this->Implementation->StackPositionIter->second;
+    }
+  else if (this->Implementation->SortedStack.size() > 0)
+    {
+    placementNode = this->Implementation->SortedStack.begin()->second;
+    }
+
+  if (placementNode)
+    {
+    if (placementNode->GetBoundsDirty())
+      {
+      placementNode->ComputeBounds();
+      }
+    double* bounds = placementNode->GetBounds();
+
+    vtkVgSelectionListRepresentation* stackListRep =
+      vtkVgSelectionListRepresentation::SafeDownCast(
+        this->StackSelectionWidget->GetRepresentation());
+
+    vtkRenderer* renderer = this->StackSelectionWidget->GetInteractor()->
+                            GetRenderWindow()->GetRenderers()->GetFirstRenderer();
+
+    // vertical (axis aligned) bar (a bit) to the right of the clip,
+    // same height as the clip
+    renderer->SetWorldPoint(bounds[0], bounds[2], bounds[4], 1.0);
+    renderer->WorldToDisplay();
+    double minY = renderer->GetDisplayPoint()[1];
+    renderer->SetWorldPoint(bounds[0], bounds[3], bounds[4], 1.0);
+    renderer->WorldToDisplay();
+    double maxY = renderer->GetDisplayPoint()[1];
+
+    double barAspectRatio = 20;
+    double height = maxY - minY;
+    double width = height / barAspectRatio;
+    stackListRep->SetListPosition(
+      bounds[1] + (bounds[1] - bounds[0]) / 20.0, bounds[2], 100);
+    stackListRep->SetListSize(width, height);
+    stackListRep->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::MoveToSelectedStackItem()
+{
+  vtkIdType instanceID =
+    this->StackSelectionWidget->GetSelectionRepresentation()->GetCurrentItemId();
+
+  // if we have a visible one (not necessarily?), hide it
+  if (this->Implementation->StackPositionIter != this->Implementation->SortedStack.end())
+    {
+    // make current invisble
+    this->Implementation->StackPositionIter->second->SetVisible(0);
+    this->Implementation->StackPositionIter = this->Implementation->SortedStack.end();
+    }
+
+  // if we can find the node that has this id, switch to it;  assumption is that
+  // the list only shows visble clips, thus don't need to check VISIBLE_NODE_MASK
+  std::multimap<long long, vtkVgVideoNode*>::iterator stackIter;
+  for (stackIter = this->Implementation->SortedStack.begin();
+       stackIter != this->Implementation->SortedStack.end(); stackIter++)
+    {
+    if (stackIter->second->GetInstanceId() == instanceID)
+      {
+      stackIter->second->SetVisible(1);
+      emit this->VisibilityChanged(*stackIter->second);
+      this->Implementation->StackPositionIter = stackIter;
+      break;
+      }
+    }
+  this->UpdateStackRepresentationBarLocation();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQBlastLayoutNode::UpdateStackCurrentItemIndicator()
+{
+  if (this->Implementation->StackPositionIter != this->Implementation->SortedStack.end())
+    {
+    vtkVgSelectionListRepresentation::SafeDownCast(
+      this->StackSelectionWidget->GetRepresentation())->SetSelectedItemId(
+        this->Implementation->StackPositionIter->second->GetInstanceId());
+    }
+}
diff --git a/Applications/Viqui/vtkVQBlastLayoutNode.h b/Applications/Viqui/vtkVQBlastLayoutNode.h
new file mode 100644
index 00000000..c3faf457
--- /dev/null
+++ b/Applications/Viqui/vtkVQBlastLayoutNode.h
@@ -0,0 +1,162 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVQBlastLayoutNode_h
+#define __vtkVQBlastLayoutNode_h
+
+// QT includes.
+#include <QObject>
+
+// VG includes.
+#include "vtkVgMacros.h"
+#include "vtkVgGroupNode.h"
+
+class vtkVgVideoNode;
+class vtkVgSelectionWidget;
+
+class vtkVQBlastLayoutNode : public QObject, public vtkVgGroupNode
+{
+  Q_OBJECT
+
+public:
+  enum LayoutModeType
+    {
+    Z_SORT = 0,
+    BLAST,
+    STACK
+    };
+
+  vtkVgClassMacro(vtkVQBlastLayoutNode);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVQBlastLayoutNode, vtkVgGroupNode)
+
+  static vtkVQBlastLayoutNode* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get layout mode.
+  void SetLayoutMode(int);
+  vtkGetMacro(LayoutMode, int);
+
+  // Description:
+  // Set/Get blast flag that will move the children away from each other.
+  vtkSetMacro(Blast, int);
+  vtkGetMacro(Blast, int);
+  vtkBooleanMacro(Blast, int);
+
+  // Description:
+  vtkSetMacro(Stack, int);
+  vtkGetMacro(Stack, int);
+  vtkBooleanMacro(Stack, int);
+
+  // Description:
+  vtkSetMacro(ZSort, int);
+  vtkGetMacro(ZSort, int);
+  vtkBooleanMacro(ZSort, int);
+
+  // Description:
+  // Set/Get factor to offset node based on their relevancy score (for ZSort).
+  // Defaults to 1.1.
+  vtkSetMacro(ZSortOffsetFactor, double);
+  vtkGetMacro(ZSortOffsetFactor, double);
+
+  // Description:
+  // Add nodes that are present in the scene and needs to be
+  // considered for the layout (eg. to avoid collision).
+  void AddSceneNode(vtkVgNodeBase* node);
+
+  // Description:
+  // Overridden functions.
+  virtual void Update(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void Traverse(vtkVgNodeVisitorBase& nodeVisitor);
+
+  void UpdateStackLayout();
+
+  vtkGetObjectMacro(StackSelectionWidget, vtkVgSelectionWidget);
+
+  void MoveToSelectedStackItem();
+
+  vtkGetMacro(NodeFocused, int);
+
+signals:
+
+  void VisibilityChanged(vtkVgNodeBase&);
+
+
+public slots:
+
+  // Description:
+  // Handle node picking.
+  void OnPlayStop(vtkVgVideoNode& node);
+
+  // Description:
+  // Handle node selection... if STACK, change to next in stack
+  void OnNextInStack(vtkVgNodeBase& node);
+
+  // Description:
+  // Check if two bounds are exactly* overlapping.
+  bool IsCoincidental(double bounds1[6], double bounds2[6]);
+
+  // Description:
+  // If current representation is STACK, build (rebuild) the bar
+  void BuildStackRepresentationBar();
+
+  // Description:
+  // If current representation is STACK, update the location (and size) of the bar
+  void UpdateStackRepresentationBarLocation();
+
+protected:
+  vtkVQBlastLayoutNode();
+  ~vtkVQBlastLayoutNode();
+
+  void FocusNode(vtkVgVideoNode* node);
+  void RestoreFocusedNodePosition();
+  void SetChildrenVisible(int visible);
+
+
+  void SetLayoutToBlast(vtkVgNodeVisitorBase& nodeVisitor);
+  void SetLayoutToStack(vtkVgNodeVisitorBase& nodeVisitor);
+  void SetLayoutToZSort(vtkVgNodeVisitorBase& nodeVisitor);
+
+  void UndoZSortLayout();
+  void UndoStackLayout();
+  void UndoBlastLayout();
+
+  void MoveToNextVisibleNodeInStack();
+
+  void UpdateStackCurrentItemIndicator();
+
+
+  int             LayoutMode;
+
+  int             Blast;
+
+  int             ZSort;
+
+  int             Stack;
+
+  int             NodeFocused;
+
+  double          ZSortOffsetFactor;
+
+  static const double
+  MinDelta;
+
+  class vtkInternal;
+  vtkInternal* Implementation;
+
+  vtkVgSelectionWidget* StackSelectionWidget;
+
+private:
+  vtkVQBlastLayoutNode(const vtkVQBlastLayoutNode&); // Not implemented.
+  void operator=(const vtkVQBlastLayoutNode&);       // Not implemented.
+};
+
+#endif // __vtkVQBlastLayoutNode_h
diff --git a/Applications/Viqui/vtkVQCoordinateTransform.cxx b/Applications/Viqui/vtkVQCoordinateTransform.cxx
new file mode 100644
index 00000000..e9ad6cbe
--- /dev/null
+++ b/Applications/Viqui/vtkVQCoordinateTransform.cxx
@@ -0,0 +1,130 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVQCoordinateTransform.h"
+
+// VTK includes.
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+
+// VXL includes.
+#include <vgl/vgl_homg_point_2d.h>
+#include <vgl/algo/vgl_h_matrix_2d.h>
+#include <vgl/algo/vgl_h_matrix_2d_compute_linear.h>
+
+#include "vtkVgAdapt.h"
+
+vtkStandardNewMacro(vtkVQCoordinateTransform);
+
+//-----------------------------------------------------------------------------
+vtkVQCoordinateTransform::vtkVQCoordinateTransform()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVQCoordinateTransform::~vtkVQCoordinateTransform()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQCoordinateTransform::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQCoordinateTransform::SetFromPoints(double pt1[], double pt2[],
+                                             double pt3[], double pt4[])
+{
+  this->FromPoint[0][0] = pt1[0];
+  this->FromPoint[0][1] = pt1[1];
+  this->FromPoint[1][0] = pt2[0];
+  this->FromPoint[1][1] = pt2[1];
+  this->FromPoint[2][0] = pt3[0];
+  this->FromPoint[2][1] = pt3[1];
+  this->FromPoint[3][0] = pt4[0];
+  this->FromPoint[3][1] = pt4[1];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQCoordinateTransform::SetFromPoints(double x1, double y1,
+                                             double x2, double y2,
+                                             double x3, double y3,
+                                             double x4, double y4)
+{
+  this->FromPoint[0][0] = x1;
+  this->FromPoint[0][1] = y1;
+  this->FromPoint[1][0] = x2;
+  this->FromPoint[1][1] = y2;
+  this->FromPoint[2][0] = x3;
+  this->FromPoint[2][1] = y3;
+  this->FromPoint[3][0] = x4;
+  this->FromPoint[3][1] = y4;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQCoordinateTransform::SetToPoints(double pt1[], double pt2[],
+                                           double pt3[], double pt4[])
+{
+  this->ToPoint[0][0] = pt1[0];
+  this->ToPoint[0][1] = pt1[1];
+  this->ToPoint[1][0] = pt2[0];
+  this->ToPoint[1][1] = pt2[1];
+  this->ToPoint[2][0] = pt3[0];
+  this->ToPoint[2][1] = pt3[1];
+  this->ToPoint[3][0] = pt4[0];
+  this->ToPoint[3][1] = pt4[1];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQCoordinateTransform::SetToPoints(double x1, double y1,
+                                           double x2, double y2,
+                                           double x3, double y3,
+                                           double x4, double y4)
+{
+  this->ToPoint[0][0] = x1;
+  this->ToPoint[0][1] = y1;
+  this->ToPoint[1][0] = x2;
+  this->ToPoint[1][1] = y2;
+  this->ToPoint[2][0] = x3;
+  this->ToPoint[2][1] = y3;
+  this->ToPoint[3][0] = x4;
+  this->ToPoint[3][1] = y4;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkMatrix4x4> vtkVQCoordinateTransform::GetHomographyMatrix()
+{
+  vcl_vector< vgl_homg_point_2d<double> > fromPoints;
+  vcl_vector< vgl_homg_point_2d<double> > toPoints;
+
+  // Add world coordinates to worldPoints
+  for (int i = 0; i < 4; ++i)
+    {
+    vgl_homg_point_2d<double> vglPt2d(this->FromPoint[i][0], this->FromPoint[i][1], 1);
+    fromPoints.push_back(vglPt2d);
+    }
+
+  // Add image coordinates to imagePoints
+  for (int i = 0; i < 4; ++i)
+    {
+    vgl_homg_point_2d<double> vglPt2d(this->ToPoint[i][0], this->ToPoint[i][1], 1);
+    toPoints.push_back(vglPt2d);
+    }
+
+  vgl_h_matrix_2d_compute_linear algo;
+  vgl_h_matrix_2d<double> homography;
+  bool success = algo.compute(fromPoints, toPoints, homography);
+
+  if (success)
+    {
+    return vtkVgAdapt(homography.get_matrix());
+    }
+  else
+    {
+    return 0;
+    }
+}
diff --git a/Applications/Viqui/vtkVQCoordinateTransform.h b/Applications/Viqui/vtkVQCoordinateTransform.h
new file mode 100644
index 00000000..56631808
--- /dev/null
+++ b/Applications/Viqui/vtkVQCoordinateTransform.h
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVQCoordinateTransform_h
+#define __vtkVQCoordinateTransform_h
+
+// VTK includes.
+#include <vtkObject.h>
+
+// VG includes.
+#include "vtkVgMacros.h"
+
+// Forward declarations.
+class vtkMatrix4x4;
+
+class vtkVQCoordinateTransform : public vtkObject
+{
+public:
+  vtkVgClassMacro(vtkVQCoordinateTransform);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVQCoordinateTransform, vtkObject);
+
+  static vtkVQCoordinateTransform* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  void SetFromPoints(double pt1[2], double pt2[2], double pt3[2], double pt4[2]);
+  void SetFromPoints(double x1, double y1,
+                     double x2, double y2,
+                     double x3, double y3,
+                     double x4, double y4);
+
+  void SetToPoints(double pt1[2], double pt2[2], double pt3[2], double pt4[2]);
+  void SetToPoints(double x1, double y1,
+                   double x2, double y2,
+                   double x3, double y3,
+                   double x4, double y4);
+
+  vtkSmartPointer<vtkMatrix4x4> GetHomographyMatrix();
+
+protected:
+  vtkVQCoordinateTransform();
+  virtual  ~vtkVQCoordinateTransform();
+
+  double FromPoint[4][2];
+  double ToPoint[4][2];
+
+
+private:
+  vtkVQCoordinateTransform(const vtkVQCoordinateTransform&); // Not implemented.
+  void operator=(const vtkVQCoordinateTransform&);           // Not implemented.
+};
+
+#endif // __vtkVQCoordinateTransform_h
diff --git a/Applications/Viqui/vtkVQInteractionCallback.h b/Applications/Viqui/vtkVQInteractionCallback.h
new file mode 100644
index 00000000..57e98925
--- /dev/null
+++ b/Applications/Viqui/vtkVQInteractionCallback.h
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVQInteractionCallback_h
+#define __vtkVQInteractionCallback_h
+
+// VTK includes.
+#include <vtkCamera.h>
+#include <vtkCommand.h>
+
+// VQ includes.
+#include "vqCore.h"
+
+// VG includes.
+
+// VG VTK includes.
+#include "vtkVgInteractorStyleRubberBand2D.h"
+
+class vtkVQInteractionCallback : public vtkCommand
+{
+public:
+
+  static vtkVQInteractionCallback* New()
+    {
+    vtkVQInteractionCallback* cmcb = new vtkVQInteractionCallback();
+    return cmcb;
+    }
+
+  void SetCore(vqCore* core)
+    {
+    this->CoreInstance = core;
+    }
+
+  void UpdateCore()
+    {
+    this->CoreInstance->updateSources();
+    this->CoreInstance->updateLOD();
+    }
+
+  virtual void Execute(vtkObject* caller, unsigned long eventId,
+                       void* vtkNotUsed(callData))
+    {
+    if (!vtkVgInteractorStyleRubberBand2D::SafeDownCast(caller))
+      {
+      return;
+      }
+
+    if (eventId == vtkCommand::InteractionEvent)
+      {
+      int interaction =
+        this->CoreInstance->getContextInteractorStyle()->GetInteraction();
+
+      if (interaction == vtkVgInteractorStyleRubberBand2D::ZOOMING ||
+          interaction == vtkVgInteractorStyleRubberBand2D::PANNING)
+        {
+        this->UpdateCore();
+        }
+      }
+    else if (eventId == vtkVgInteractorStyleRubberBand2D::ZoomCompleteEvent)
+      {
+      this->UpdateCore();
+      }
+    }
+
+private:
+  vqCore* CoreInstance;
+};
+
+#endif // __vtkVQInteractionCallback_h
diff --git a/Applications/Viqui/vtkVQLayoutManagerBase.cxx b/Applications/Viqui/vtkVQLayoutManagerBase.cxx
new file mode 100644
index 00000000..c6e6d10e
--- /dev/null
+++ b/Applications/Viqui/vtkVQLayoutManagerBase.cxx
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVQLayoutManagerBase.h"
+
+vtkVQLayoutManagerBase::vtkVQLayoutManagerBase() : vtkObject()
+{
+}
+
+
+vtkVQLayoutManagerBase::~vtkVQLayoutManagerBase()
+{
+}
+
+
+void vtkVQLayoutManagerBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+
+const vtkVgGroupNode* vtkVQLayoutManagerBase::GetScene() const
+{
+}
+
+
+vtkVgGroupNode* vtkVQLayoutManagerBase::GetScene()
+{
+}
+
+
+void vtkVQLayoutManagerBase::SetScene(vtkVgGroupNode* root)
+{
+}
diff --git a/Applications/Viqui/vtkVQLayoutManagerBase.h b/Applications/Viqui/vtkVQLayoutManagerBase.h
new file mode 100644
index 00000000..250ccd5c
--- /dev/null
+++ b/Applications/Viqui/vtkVQLayoutManagerBase.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVQLayoutManagerBase_h
+#define __vtkVQLayoutManagerBase_h
+
+// Description:
+// This class will resolve position / orient nodes in some unique way.
+// Depending upon whether a video is playing / stopped, area overlap
+// with other vidoes, a concrete implementation would provide ways to
+// locate the videos in some sensible way according to the specific algorithm.
+
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+
+// Forware declarations.
+class vtkVgGroupNode;
+class vtkVgTimeStamp;
+
+class vtkVQLayoutManagerBase : public vtkObject
+{
+public:
+
+  // Description:
+  typedef vtkSmartPointer<vtkVQLayoutManagerBase> Ref;
+
+  vtkTypeMacro(vtkVQLayoutManagerBase, vtkObject);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  const vtkVgGroupNode* GetScene() const;
+  vtkVgGroupNode* GetScene();
+  void SetScene(vtkVgGroupNode* root);
+
+  // Description:
+  virtual void Update(vtkVgTimeStamp* timestamp) {;}
+
+
+protected:
+  vtkVQLayoutManagerBase();
+  virtual ~vtkVQLayoutManagerBase();
+
+private:
+  vtkVQLayoutManagerBase(const vtkVQLayoutManagerBase&); // Not implemented.
+  void operator= (const vtkVQLayoutManagerBase&);        // Not implemented.
+};
+
+
+#endif // __vtkVQLayoutManagerBase_h
diff --git a/Applications/Viqui/vtkVQTerrainSource.cxx b/Applications/Viqui/vtkVQTerrainSource.cxx
new file mode 100644
index 00000000..a6c1fa58
--- /dev/null
+++ b/Applications/Viqui/vtkVQTerrainSource.cxx
@@ -0,0 +1,410 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QDir>
+#include <QFileInfo>
+
+#include <qtKstReader.h>
+#include <qtStlUtil.h>
+
+#include "vtkVQTerrainSource.h"
+
+// VTK includes.
+#include <vtkImageData.h>
+#include <vtkImageActor.h>
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtksys/SystemTools.hxx>
+
+// VG includes.
+#include <vgGeodesy.h>
+#include <vgGeoTypes.h>
+#include <vtkVgTerrain.h>
+#include <vtkVgBaseImageSource.h>
+#include <vtkVgMultiResJpgImageReader2.h>
+#include <vtkVgUtil.h>
+
+// VQ includes.
+#include "vtkVQCoordinateTransform.h"
+
+vtkStandardNewMacro(vtkVQTerrainSource);
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+inline double min(double a, double b, double c, double d)
+{
+#if __cplusplus >= 201103L
+  return std::min({ a, b, c, d });
+#else
+  return std::min(std::min(a, b), std::min(c, d));
+#endif
+}
+
+//-----------------------------------------------------------------------------
+inline double max(double a, double b, double c, double d)
+{
+#if __cplusplus >= 201103L
+  return std::max({ a, b, c, d });
+#else
+  return std::max(std::max(a, b), std::max(c, d));
+#endif
+}
+
+//-----------------------------------------------------------------------------
+inline double dist(const vgPoint2d& a, const vgPoint2d b)
+{
+  const double dx = a.X - b.X;
+  const double dy = a.Y - b.Y;
+  return sqrt((dx * dx) + (dy * dy));
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vtkVQTerrainSource::vtkVQTerrainSource() : vtkVgDataSourceBase()
+{
+  this->BaseTile = NULL;
+  this->BaseTileData   = NULL;
+  this->CoordinateTransformMatrix = NULL;
+  this->ImageLevel = 4;
+}
+
+//-----------------------------------------------------------------------------
+vtkVQTerrainSource::~vtkVQTerrainSource()
+{
+
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTerrainSource::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "DataSource: " << (this->DataSource ? "NULL" : this->DataSource) << "\n";
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkVgTerrain> vtkVQTerrainSource::CreateTerrain()
+{
+  if (!this->DataSource)
+    {
+    vtkErrorMacro(<< "Invalid data source.\n");
+    return 0;
+    }
+
+  QUrl uri = QUrl::fromEncoded(this->GetDataSource());
+  qtKstReader reader(uri);
+
+  vtkVgTerrain::SmartPtr terrain = vtkVgTerrain::SmartPtr::New();
+
+  // \NOTE: Assuming that base tile is the first tile listed.
+  int index = 0;
+
+  if (reader.isValid())
+    {
+    while (!reader.isEndOfFile())
+      {
+      QString imageFile;
+      double  gsd;
+      vgGeocodedTile geoTile;
+
+      if (!reader.readString(imageFile, 0))
+        return 0;
+
+      // Get image absolute path.
+      // \TODO: handle non-local files?
+      QFileInfo fi(uri.toLocalFile());
+      QDir sourceDir(fi.canonicalPath());
+      QFileInfo ifi(sourceDir, imageFile);
+      if (!ifi.exists())
+        return 0;
+
+      imageFile = ifi.canonicalFilePath();
+
+      // Ignore for now.
+      if (!reader.readReal(gsd, 1))
+        return 0;
+
+      // Read bounds.
+      if (!reader.readInt(geoTile.GCS, 2))
+        return 0;
+      if (!reader.readReal(geoTile.Coordinate[0].Longitude, 3))
+        return 0;
+      if (!reader.readReal(geoTile.Coordinate[0].Latitude, 4))
+        return 0;
+      if (!reader.readReal(geoTile.Coordinate[1].Longitude, 5))
+        return 0;
+      if (!reader.readReal(geoTile.Coordinate[1].Latitude, 6))
+        return 0;
+      if (!reader.readReal(geoTile.Coordinate[3].Longitude, 7))
+        return 0;
+      if (!reader.readReal(geoTile.Coordinate[3].Latitude, 8))
+        return 0;
+      if (!reader.readReal(geoTile.Coordinate[2].Longitude, 9))
+        return 0;
+      if (!reader.readReal(geoTile.Coordinate[2].Latitude, 10))
+        return 0;
+
+      // Convert bounds to WGS84 lat/lon, as we generally assume that world
+      // coordinates are in this system.
+      for (int n = 0; n < 4; ++n)
+        {
+        const vgGeocodedCoordinate coord(geoTile.Coordinate[n], geoTile.GCS);
+        geoTile.Coordinate[n] =
+          vgGeodesy::convertGcs(coord, vgGeodesy::LatLon_Wgs84);
+        }
+
+      vtkSmartPointer<vtkImageActor> prop;
+      std::string ext = vtksys::SystemTools::LowerCase(
+                          vtksys::SystemTools::GetFilenameLastExtension(stdString(imageFile)));
+      if (ext.compare(".mrj") == 0)
+        {
+        prop = vtkSmartPointer<vtkImageActor>::New();
+
+        // Base tile.
+        if (index == 0)
+          {
+          this->BaseTile = vtkSmartPointer<vtkVgMultiResJpgImageReader2>::New();
+          this->BaseTile->SetFileName(qPrintable(imageFile));
+          this->BaseTile->SetLevel(this->ImageLevel);
+          this->BaseTile->Update();
+
+          this->BaseTileData = vtkSmartPointer<vtkImageData>::New();
+          this->BaseTileData->ShallowCopy(this->BaseTile->GetOutput());
+
+          prop->SetInputData(this->BaseTileData);
+          }
+        else
+          {
+          this->OtherTiles.push_back(vtkSmartPointer<vtkVgMultiResJpgImageReader2>::New());
+          this->OtherTiles.back()->SetFileName(qPrintable(imageFile));
+          this->OtherTiles.back()->SetLevel(this->ImageLevel);
+          this->OtherTiles.back()->Update();
+
+          this->OtherTilesData.push_back(vtkSmartPointer<vtkImageData>::New());
+          this->OtherTilesData.back()->ShallowCopy(this->OtherTiles.back()->GetOutput());
+
+          prop->SetInputData(this->OtherTilesData.back());
+          }
+        }
+      else
+        {
+        return 0;
+        }
+
+      // Coordinate transform is wrt to base tile only.
+      if (index == 0)
+        {
+        vtkVQCoordinateTransform::SmartPtr coordinateTransform(vtkVQCoordinateTransform::SmartPtr::New());
+        coordinateTransform->SetFromPoints(geoTile.Coordinate[0].Longitude, geoTile.Coordinate[0].Latitude,
+                                           geoTile.Coordinate[1].Longitude, geoTile.Coordinate[1].Latitude,
+                                           geoTile.Coordinate[2].Longitude, geoTile.Coordinate[2].Latitude,
+                                           geoTile.Coordinate[3].Longitude, geoTile.Coordinate[3].Latitude);
+
+
+        double bounds[6];
+        this->BaseTileData->GetBounds(bounds);
+        coordinateTransform->SetToPoints(bounds[0], bounds[3],
+                                         bounds[1], bounds[3],
+                                         bounds[1], bounds[2],
+                                         bounds[0], bounds[2]);
+
+        this->CoordinateTransformMatrix = coordinateTransform->GetHomographyMatrix();
+        }
+      else
+        {
+        // Move other tiles into the reference frame of base tile.
+        vtkVQCoordinateTransform::SmartPtr coordinateTransform(vtkVQCoordinateTransform::SmartPtr::New());
+        coordinateTransform->SetToPoints(geoTile.Coordinate[0].Longitude, geoTile.Coordinate[0].Latitude,
+                                         geoTile.Coordinate[1].Longitude, geoTile.Coordinate[1].Latitude,
+                                         geoTile.Coordinate[2].Longitude, geoTile.Coordinate[2].Latitude,
+                                         geoTile.Coordinate[3].Longitude, geoTile.Coordinate[3].Latitude);
+
+
+        double bounds[6];
+        this->OtherTilesData.back()->GetBounds(bounds);
+        coordinateTransform->SetFromPoints(bounds[0], bounds[3],
+                                           bounds[1], bounds[3],
+                                           bounds[1], bounds[2],
+                                           bounds[0], bounds[2]);
+        vtkSmartPointer<vtkMatrix4x4> imageToLatLonMatrix = coordinateTransform->GetHomographyMatrix();
+        vtkSmartPointer<vtkMatrix4x4> transformMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+        vtkMatrix4x4::Multiply4x4(this->CoordinateTransformMatrix, imageToLatLonMatrix, transformMatrix);
+
+        vtkSmartPointer<vtkMatrix4x4> newMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+        newMatrix->DeepCopy(transformMatrix);
+
+        if (prop)
+          {
+          double w = transformMatrix->Element[3][3];
+          for (int i = 0; i < 4; ++i)
+            {
+            for (int j = 0; j < 4; ++j)
+              {
+              transformMatrix->Element[i][j] /= w;
+              }
+            }
+          transformMatrix->Element[2][2] = 1.0;
+          prop->SetUserMatrix(transformMatrix);
+
+          newMatrix->Invert();
+
+//          w = newMatrix->Element[3][3];
+//          for (int i = 0; i <4; ++i)
+//            {
+//            for (int j = 0; j <4; ++j)
+//              {
+//              newMatrix->Element[i][j] /= w;
+//              }
+//            }
+          OtherTileTileToBaseMatrices.push_back(transformMatrix);
+          OtherTileBaseToTileMatrices.push_back(newMatrix);
+          }
+        }
+
+      if (prop)
+        {
+        terrain->AddDrawable(prop);
+        }
+      else
+        {
+        return 0;
+        }
+
+      ++index;
+      reader.nextRecord();
+      }
+
+    return terrain;
+    }
+  else
+    {
+    return 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTerrainSource::SetImageLevel(const int level)
+{
+  if (this->ImageLevel != level)
+    {
+    this->ImageLevel = level;
+    this->Modified();
+    }
+  if (this->BaseTile)
+    {
+    this->BaseTile->SetLevel(level);
+    }
+
+  size_t numberOfOtherTiles = this->OtherTiles.size();
+  for (size_t i = 0; i < numberOfOtherTiles; ++i)
+    {
+    this->OtherTiles[i]->SetLevel(level);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTerrainSource::SetVisibleScale(const double& scale)
+{
+  if (this->BaseTile)
+    {
+    this->BaseTile->SetScale(scale);
+    }
+
+  size_t numberOfOtherTiles = this->OtherTiles.size();
+  for (size_t i = 0; i < numberOfOtherTiles; ++i)
+    {
+    vtkVgBaseImageSource* tile = this->OtherTiles[i];
+
+    int dim[2];
+    tile->GetDimensions(dim);
+
+    // Get the transformation matrix for the tile
+    vtkMatrix4x4* mat = this->OtherTileTileToBaseMatrices[i];
+
+    // Get the transformed the tile corners
+    const vgPoint2d pt1 = vtkVgApplyHomography(0,      0,      mat);
+    const vgPoint2d pt2 = vtkVgApplyHomography(0,      dim[1], mat);
+    const vgPoint2d pt3 = vtkVgApplyHomography(dim[0], dim[1], mat);
+    const vgPoint2d pt4 = vtkVgApplyHomography(dim[0], 0,      mat);
+
+    // Compute the relative scale of each edge of the tile
+    // TODO: This ignores the fact that, depending on how the tile is warped,
+    //       the ideal scale may not be uniform across the entire tile... for
+    //       now, we're just using the highest LOD required
+    const double k1 = dim[1] / dist(pt1, pt2);
+    const double k2 = dim[0] / dist(pt2, pt3);
+    const double k3 = dim[1] / dist(pt3, pt4);
+    const double k4 = dim[0] / dist(pt4, pt1);
+
+    // Set the tile scale to the reference scale adjusted by the smallest
+    // relative scale
+    tile->SetScale(scale * min(k1, k2, k3, k4));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTerrainSource::SetVisibleExtents(const int extents[4])
+{
+  if (this->BaseTile)
+    {
+    this->BaseTile->SetReadExtents(const_cast<int*>(extents));
+    }
+
+  size_t numberOfOtherTiles = this->OtherTiles.size();
+  for (size_t i = 0; i < numberOfOtherTiles; ++i)
+    {
+    const vtkMatrix4x4* const mat = this->OtherTileBaseToTileMatrices[i];
+    const vgPoint2d pt1 = vtkVgApplyHomography(extents[0], extents[2], mat);
+    const vgPoint2d pt2 = vtkVgApplyHomography(extents[0], extents[3], mat);
+    const vgPoint2d pt3 = vtkVgApplyHomography(extents[1], extents[2], mat);
+    const vgPoint2d pt4 = vtkVgApplyHomography(extents[1], extents[3], mat);
+
+    int newExtents[6] =
+      {
+      static_cast<int>(floor(min(pt1.X, pt2.X, pt3.X, pt4.X))),
+      static_cast<int>( ceil(max(pt1.X, pt2.X, pt3.X, pt4.X))),
+      static_cast<int>(floor(min(pt1.Y, pt2.Y, pt3.Y, pt4.Y))),
+      static_cast<int>( ceil(max(pt1.Y, pt2.Y, pt3.Y, pt4.Y))),
+      0, 0
+      };
+
+    this->OtherTiles[i]->SetReadExtents(const_cast<int*>(newExtents));
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkMatrix4x4* vtkVQTerrainSource::GetCoordinateTransformMatrix() const
+{
+  return this->CoordinateTransformMatrix;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTerrainSource::Update()
+{
+  // Steps:
+  // Update image source.
+  // update image data.
+
+  if (this->BaseTile)
+    {
+    this->BaseTile->Update();
+
+    this->BaseTileData->ShallowCopy(this->BaseTile->GetOutput());
+    }
+
+  size_t numberOfOtherTiles = this->OtherTiles.size();
+  for (size_t i = 0; i < numberOfOtherTiles; ++i)
+    {
+    this->OtherTiles[i]->Update();
+    this->OtherTilesData[i]->ShallowCopy(this->OtherTiles[i]->GetOutput());
+    }
+}
+
+
diff --git a/Applications/Viqui/vtkVQTerrainSource.h b/Applications/Viqui/vtkVQTerrainSource.h
new file mode 100644
index 00000000..8d1e081c
--- /dev/null
+++ b/Applications/Viqui/vtkVQTerrainSource.h
@@ -0,0 +1,85 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVQTerrainSource_h
+#define __vtkVQTerrainSource_h
+
+// VG includes.
+#include "vtkVgMacros.h"
+#include "vtkVgDataSourceBase.h"
+
+// VTK includes.
+#include <vtkMatrix4x4.h>
+#include <vtkSmartPointer.h>
+
+// STL includes.
+#include <vector>
+
+// Forward declarations.
+class vtkProp;
+class vtkImageData;
+class vtkVgTerrain;
+class vtkVgBaseImageSource;
+
+class vtkVQTerrainSource : public vtkVgDataSourceBase
+{
+public:
+  vtkVgClassMacro(vtkVQTerrainSource);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVQTerrainSource, vtkVgDataSourceBase);
+
+  static vtkVQTerrainSource* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Given a data source generate a terrain.
+  vtkSmartPointer<vtkVgTerrain> CreateTerrain();
+
+  // Description:
+  // Overridden functions.
+  virtual void SetVisibleExtents(const int extents[4]);
+  virtual void SetVisibleScale(const double& scale);
+
+  // Description:
+  // Get coodinate system transformation. Currently this will transform
+  // points in lat / lon space to image space.
+  vtkMatrix4x4* GetCoordinateTransformMatrix() const;
+
+  // Description:
+  // Update data produced by this source.
+  virtual void Update();
+
+  // Description:
+  // Control the LOD that will be read from the context.  Use -1 to autocompute.
+  // autocompute.  Defaults to 4 (should do for initial read, because extents
+  // and scale not yet set).
+  virtual void SetImageLevel(int level);
+  vtkGetMacro(ImageLevel, int);
+
+protected:
+  vtkVQTerrainSource();
+  virtual ~vtkVQTerrainSource();
+
+  vtkSmartPointer<vtkVgBaseImageSource> BaseTile;
+  std::vector<vtkSmartPointer<vtkVgBaseImageSource> > OtherTiles;
+
+  vtkSmartPointer<vtkImageData> BaseTileData;
+  std::vector<vtkSmartPointer<vtkImageData> > OtherTilesData;
+
+  vtkSmartPointer<vtkMatrix4x4> CoordinateTransformMatrix;
+  std::vector<vtkSmartPointer<vtkMatrix4x4> > OtherTileBaseToTileMatrices;
+  std::vector<vtkSmartPointer<vtkMatrix4x4> > OtherTileTileToBaseMatrices;
+  int ImageLevel;
+
+private:
+  vtkVQTerrainSource(const vtkVQTerrainSource&);
+  void operator= (const vtkVQTerrainSource&);
+};
+
+#endif // __vtkVQTerrainSource_h
diff --git a/Applications/Viqui/vtkVQTrackingClip.cxx b/Applications/Viqui/vtkVQTrackingClip.cxx
new file mode 100644
index 00000000..f11fd6c2
--- /dev/null
+++ b/Applications/Viqui/vtkVQTrackingClip.cxx
@@ -0,0 +1,306 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVQTrackingClip.h"
+
+#include "vtkVgEvent.h"
+#include "vtkVgVideoNode.h"
+#include "vtkVgVideoProviderBase.h"
+#include "vtkVgVideoFrameData.h"
+
+#include <vtkDoubleArray.h>
+#include <vtkExtractVOI.h>
+#include <vtkFieldData.h>
+#include <vtkImageAppend.h>
+#include <vtkImageChangeInformation.h>
+#include <vtkImageData.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+
+vtkStandardNewMacro(vtkVQTrackingClip);
+
+//-----------------------------------------------------------------------------
+vtkVQTrackingClip::vtkVQTrackingClip()
+  : Rank(-1)
+{
+  this->Dimensions[0] = 100;
+  this->Dimensions[1] = 100;
+  this->OutputImageData = vtkSmartPointer<vtkImageData>::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVQTrackingClip::~vtkVQTrackingClip()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTrackingClip::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTrackingClip::SetVideo(vtkVgVideoProviderBase* vs)
+{
+  this->Video = vs;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTrackingClip::SetEvent(vtkVgEvent* event)
+{
+  this->Event = event;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTrackingClip::SetVideoNode(vtkVgVideoNode* node)
+{
+  this->VideoNode = node;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoNode* vtkVQTrackingClip::GetVideoNode()
+{
+  return this->VideoNode;
+}
+
+//-----------------------------------------------------------------------------
+vtkImageData* vtkVQTrackingClip::GetOutputImageData()
+{
+  if (!this->Video)
+    {
+    vtkErrorMacro("Source video not set.");
+    return 0;
+    }
+
+  if (!this->Event)
+    {
+    vtkErrorMacro("Event to track not set.");
+    return 0;
+    }
+
+  if (this->UpdateTime < this->GetMTime())
+    {
+    this->Update();
+    }
+
+  return this->OutputImageData;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVQTrackingClip::GetDuration()
+{
+  return this->Video->GetTimeRange()[1] - this->Video->GetTimeRange()[0];
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVQTrackingClip::GetEventId()
+{
+  if (this->Event)
+    {
+    return this->Event->GetId();
+    }
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVQTrackingClip::Update()
+{
+  this->UpdateTime.Modified();
+
+  vtkVgTimeStamp timestamp;
+  vtkIdType numIds;
+  vtkIdType* ids;
+
+  vtkPoints* points = this->Event->GetRegionPoints();
+
+  double maxDim = 0.0;
+
+  // first pass - figure out the biggest region in the event
+  this->Event->InitRegionTraversal();
+  while (this->Event->GetNextRegion(timestamp, numIds, ids))
+    {
+    double ul[3], lr[3];
+    points->GetPoint(ids[0], ul);
+    points->GetPoint(ids[2], lr);
+
+    double longestSide = std::max(lr[0] - ul[0], ul[1] - lr[1]);
+    maxDim = std::max(maxDim, longestSide);
+    }
+
+  int sampleRate = 1;
+  if (maxDim > Dimensions[0] || maxDim > Dimensions[1])
+    {
+    std::cout << "Event region bounds exceed tracking clip dimensions - "
+              << "downsampling will occur.\n";
+
+    int minDim = std::min(Dimensions[0], Dimensions[1]);
+    int div = maxDim / minDim;
+    while (++sampleRate < 4 && (div >>= 1));
+    }
+
+  int regionDim[] = { this->Dimensions[0]* sampleRate,
+                      this->Dimensions[1]* sampleRate
+                    };
+
+  double videoTimeRange[2];
+  this->Video->GetTimeRange(videoTimeRange);
+
+  vtkVgTimeStamp eventStart = this->Event->GetStartFrame();
+  vtkVgTimeStamp eventEnd = this->Event->GetEndFrame();
+
+  // sanity checks
+  if (eventStart.GetTime() < videoTimeRange[0])
+    {
+    vtkErrorMacro("Event starts outside of video source time range.");
+    eventStart.SetTime(videoTimeRange[0]);
+    eventStart.SetFrameNumber(this->Video->GetFrameRange()[0]);
+    }
+  if (eventEnd.GetTime() > videoTimeRange[1])
+    {
+    vtkErrorMacro("Event ends outside of video source time range.");
+    eventEnd.SetTime(videoTimeRange[1]);
+    eventEnd.SetFrameNumber(this->Video->GetFrameRange()[1]);
+    }
+
+  this->Video->SetLooping(0);
+
+  // seek to the start of the event
+  vtkVgVideoFrameData frameData;
+  this->Video->GetFrame(&frameData, eventStart.GetTime());
+
+  int dim[3];
+  frameData.VideoImage->GetDimensions(dim);
+  if (regionDim[0] > dim[0] || regionDim[1] > dim[1])
+    {
+    vtkErrorMacro("Tracking clip extents exceed input video dimensions.")
+    }
+
+  vtkImageAppend* IAInput = vtkImageAppend::New();
+  IAInput->SetNumberOfThreads(1);
+  IAInput->SetAppendAxis(2);
+
+  vtkImageAppend* IA = vtkImageAppend::New();
+  IA->SetNumberOfThreads(1);
+  IA->SetAppendAxis(2);
+
+  vtkDoubleArray* timeStampData = vtkDoubleArray::New();
+  timeStampData->SetName("TimeStampData");
+
+  // loop over the video
+  do
+    {
+    // past end of event?
+    if (eventEnd < frameData.TimeStamp)
+      {
+      break;
+      }
+
+    double center[2];
+    bool interpolated = false;
+    bool found = this->Event->GetRegionCenter(frameData.TimeStamp,
+                                              center, interpolated);
+
+    // this should never happen, unless no region exists!
+    if (!found)
+      {
+      std::cout << "Missing region - interpolating tracking position.\n";
+      center[0] = dim[0] / 2;
+      center[1] = dim[1] / 2;
+      }
+
+    int ll[] =
+      {
+      static_cast<int>(center[0] - regionDim[0] / 2),
+      static_cast<int>(center[1] - regionDim[1] / 2)
+      };
+
+    int ur[] =
+      {
+      ll[0] + regionDim[0] - 1,
+      ll[1] + regionDim[1] - 1
+      };
+
+    // keep the clipping region within the bounds of the video
+    if (ll[0] < 0)
+      {
+      ur[0] += -ll[0];
+      ll[0] = 0;
+      }
+    if (ll[1] < 0)
+      {
+      ur[1] += -ll[1];
+      ll[1] = 0;
+      }
+    if (ur[0] > dim[0] - 1)
+      {
+      ll[0] -= ur[0] - (dim[0] - 1);
+      ur[0] = dim[0] - 1;
+      }
+    if (ur[1] > dim[1] - 1)
+      {
+      ll[1] -= ur[1] - (dim[1] - 1);
+      ur[1] = dim[1] - 1;
+      }
+
+    int wholeExtent[6] =
+      {
+      ll[0], ur[0],
+      ll[1], ur[1],
+      0,     0
+      };
+
+    // crop to the area of interest
+    vtkExtractVOI* IC = vtkExtractVOI::New();
+    IC->SetInputData(frameData.VideoImage);
+    IC->SetVOI(wholeExtent);
+    IC->SetSampleRate(sampleRate, sampleRate, 1);
+
+    // make sure cropped images are aligned
+    vtkImageChangeInformation* ICI = vtkImageChangeInformation::New();
+    ICI->SetInputConnection(IC->GetOutputPort());
+    ICI->SetOutputExtentStart(0, 0, 0);
+    ICI->SetOutputSpacing(1.0, 1.0, 1.0);
+    IC->FastDelete();
+
+    IAInput->AddInputConnection(ICI->GetOutputPort());
+    ICI->FastDelete();
+
+    // process input frames in small batches to achieve fast execution
+    // while limiting the number of input frames in memory at any given time
+    if (IAInput->GetNumberOfInputConnections(0) == 8)
+      {
+      IAInput->Update();
+      vtkImageData* copy = vtkImageData::New();
+      copy->DeepCopy(IAInput->GetOutput());
+      IAInput->Delete();
+      IAInput = vtkImageAppend::New();
+      IAInput->SetNumberOfThreads(1);
+      IAInput->SetAppendAxis(2);
+      IA->AddInputData(copy);
+      copy->FastDelete();
+      }
+
+    // embed the timestamp
+    timeStampData->InsertNextValue(frameData.TimeStamp.GetTime());
+
+    // prevent the GetNextFrame call from de-registering our data
+    frameData.VideoImage = vtkSmartPointer<vtkImageData>::New();
+    }
+  while (this->Video->GetNextFrame(&frameData) == VTK_OK);
+
+  // add any remaining input frames
+  if (IAInput->GetNumberOfInputs() > 0)
+    {
+    IA->AddInputConnection(IAInput->GetOutputPort());
+    }
+
+  IA->Update();
+  this->OutputImageData->DeepCopy(IA->GetOutput());
+  this->OutputImageData->GetFieldData()->AddArray(timeStampData);
+  timeStampData->FastDelete();
+  IAInput->Delete();
+  IA->Delete();
+}
diff --git a/Applications/Viqui/vtkVQTrackingClip.h b/Applications/Viqui/vtkVQTrackingClip.h
new file mode 100644
index 00000000..0d3c3b8f
--- /dev/null
+++ b/Applications/Viqui/vtkVQTrackingClip.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVQTrackingClip_h
+#define __vtkVQTrackingClip_h
+
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+#include <vtkTimeStamp.h>
+
+class vtkImageData;
+class vtkVgEvent;
+class vtkVgVideoNode;
+class vtkVgVideoProviderBase;
+
+class vtkVQTrackingClip : public vtkObject
+{
+public:
+  vtkTypeMacro(vtkVQTrackingClip, vtkObject);
+  static vtkVQTrackingClip* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  void SetVideo(vtkVgVideoProviderBase* vs);
+  void SetEvent(vtkVgEvent* event);
+
+  void SetVideoNode(vtkVgVideoNode* node);
+  vtkVgVideoNode* GetVideoNode();
+
+  vtkSetMacro(Rank, int);
+  vtkGetMacro(Rank, int);
+
+  vtkSetVectorMacro(Dimensions, int, 2);
+  vtkGetVectorMacro(Dimensions, int, 2);
+
+  vtkImageData* GetOutputImageData();
+
+  double GetDuration();
+
+  vtkIdType GetEventId();
+
+  void Update();
+
+protected:
+  vtkVQTrackingClip();
+  virtual ~vtkVQTrackingClip();
+
+private:
+  vtkVQTrackingClip(const vtkVQTrackingClip&); // Not implemented.
+  void operator=(const vtkVQTrackingClip&);    // Not implemented.
+
+  vtkSmartPointer<vtkVgVideoProviderBase> Video;
+  vtkSmartPointer<vtkVgVideoNode>       VideoNode;
+  vtkSmartPointer<vtkVgEvent>           Event;
+
+  int Rank;
+
+  vtkSmartPointer<vtkImageData>         OutputImageData;
+
+  int Dimensions[2];
+
+  vtkTimeStamp UpdateTime;
+};
+
+#endif // __vtkVQTrackingClip_h
diff --git a/Applications/VpView/CMakeLists.txt b/Applications/VpView/CMakeLists.txt
new file mode 100644
index 00000000..883676aa
--- /dev/null
+++ b/Applications/VpView/CMakeLists.txt
@@ -0,0 +1,282 @@
+project(vpView)
+
+###############################################################################
+
+# BEGIN user configurable build options
+
+vg_option(VPVIEW_ASSIGN_FAKE_TRACK_ATTRIBUTES OFF
+  "Assign fake track state attributes ***FOR TESTING ONLY***"
+  "VISGUI_ENABLE_VPVIEW;VISGUI_ENABLE_VIDTK"
+)
+mark_as_advanced(VPVIEW_ASSIGN_FAKE_TRACK_ATTRIBUTES)
+
+if(NOT VISGUI_ENABLE_VPVIEW)
+  # If vpView is disabled, we are only here to declare our options, so leave
+  # now
+  return()
+endif()
+
+# END user configurable build options
+
+###############################################################################
+
+# BEGIN core libraries and includes
+
+if(QtTesting_FOUND)
+  include_directories(${qtTestingSupport_SOURCE_DIR})
+  add_definitions(-DENABLE_QTTESTING)
+  set(QT_TESTING_SUPPORT_LIBRARIES qtTestingSupport ${QtTesting_LIBRARIES})
+endif()
+
+if(VPVIEW_ASSIGN_FAKE_TRACK_ATTRIBUTES)
+  add_definitions(-DVPVIEW_ASSIGN_FAKE_TRACK_ATTRIBUTES)
+endif()
+
+include_directories(SYSTEM
+  ${Boost_INCLUDE_DIRS}
+  ${LIBJSON_INCLUDE_DIR}
+  ${VTK_INCLUDE_DIRS}
+  ${GeographicLib_INCLUDE_DIRS}
+)
+
+if(VISGUI_ENABLE_VIDTK)
+  include_directories(SYSTEM
+    ${VIDTK_INCLUDE_DIRS}
+    ${VIDTK_INCLUDE_DIRS}/..
+  )
+endif()
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${QtTesting_INCLUDE_DIRS}
+)
+
+set(vgSdkTargets
+  vgCommon
+  vgVtkVideo
+  qtExtensions
+  qtVgCommon
+  qtVgWidgets
+  vtkVgCore
+  vtkVgModelView
+  vtkVgQtUtil
+)
+
+# If this is true, boost is required
+if(VIDTK_IS_UUIDABLE)
+  link_directories(${Boost_LIBRARY_DIRS})
+endif()
+
+# Needed for GDAL readers
+if(VISGUI_ENABLE_GDAL)
+  list(APPEND vgSdkTargets vtkVgIO)
+endif()
+
+vg_include_library_sdk_directories(${vgSdkTargets})
+
+# Configure version file
+include(vpVersion.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vpVersion.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/vpVersion.h @ONLY)
+
+# END core libraries and includes
+
+###############################################################################
+
+# BEGIN core program code
+
+set(vpViewSources
+  main.cxx
+  vpActivityConfig.cxx
+  vpActivityIO.cxx
+  vpAnnotation.cxx
+  vpAttributeConfig.cxx
+  vpBox.cxx
+  vpConfigUtils.cxx
+  vpConfigureDialog.cxx
+  vpContour.cxx
+  vpCreateEventDialog.cxx
+  vpEditTrackTypesDialog.cxx
+  vpEntityConfigWidget.cxx
+  vpEventConfig.cxx
+  vpEventIO.cxx
+  vpEventTypeRegistry.cxx
+  vpExternalProcessDialog.cxx
+  vpFileDataSource.cxx
+  vpFileEventIO.cxx
+  vpFileEventIOImpl.cxx
+  vpFileTrackIO.cxx
+  vpFileTrackIOImpl.cxx
+  vpFilterTypeDelegate.cxx
+  vpGraphModelHelper.cxx
+  vpGraphModelView.cxx
+  vpFseTrackIO.cxx
+  vpGraphModelWidget.cxx
+  vpFrameMap.cxx
+  vpFseIO.cxx
+  vpImageSourceFactory.cxx
+  vpInformaticsDialog.cxx
+  vpMergeTracksDialog.cxx
+  vpModelIO.cxx
+  vpMultiGraphModel.cxx
+  vpMultiGraphRepresentation.cxx
+  vpNormalcyMaps.cxx
+  vpObjectInfoPanel.cxx
+  vpObjectSelectionPanel.cxx
+  vpPrimitiveConfig.cxx
+  vpProject.cxx
+  vpProjectList.cxx
+  vpProjectParser.cxx
+  vpQtSceneUtils.cxx
+  vpQtViewer3d.cxx
+  vpQtViewer3dDialog.cxx
+  vpQtViewer3dWidget.cxx
+  vpSelectTimeIntervalDialog.cxx
+  vpSessionView.cxx
+  vpSettings.cxx
+  vpTimelineDialog.cxx
+  vpTrackColorDialog.cxx
+  vpTrackConfig.cxx
+  vpTrackIO.cxx
+  vpTreeView.cxx
+  vpUtils.cxx
+  vpVideoAnimation.cxx
+  vpView.cxx
+  vpViewCore.cxx
+)
+
+set(vpViewUI
+  qtInformaticsDialog.ui
+  qtNormalcyDialog.ui
+  qtRenderWindowDialog.ui
+  vpConfigure.ui
+  vpCreateEventDialog.ui
+  vpEditTrackTypesDialog.ui
+  vpExternalProcessDialog.ui
+  vpGraphModelWidget.ui
+  vpMergeTracksDialog.ui
+  vpObjectInfoPanel.ui
+  vpObjectSelectionPanel.ui
+  vpQtViewer3dDialog.ui
+  vpQtViewer3dWidget.ui
+  vpSelectTimeIntervalDialog.ui
+  vpTimelineDialog.ui
+  vpTrackAttributeColorDialog.ui
+  vpTrackColorDialog.ui
+  vpView.ui
+)
+
+set(vpViewHeaders
+  vpApplication.h
+  vpConfigureDialog.h
+  vpCreateEventDialog.h
+  vpEditTrackTypesDialog.h
+  vpEntityConfigWidget.h
+  vpExternalProcessDialog.h
+  vpFileDataSource.h
+  vpGraphModelHelper.h
+  vpGraphModelView.h
+  vpGraphModelWidget.h
+  vpFrameMap.h
+  vpInformaticsDialog.h
+  vpMergeTracksDialog.h
+  vpObjectInfoPanel.h
+  vpObjectSelectionPanel.h
+  vpProjectList.h
+  vpQtViewer3d.h
+  vpQtViewer3dDialog.h
+  vpQtViewer3dWidget.h
+  vpSelectTimeIntervalDialog.h
+  vpSessionView.h
+  vpTimelineDialog.h
+  vpTabWidget.h
+  vpTrackColorDialog.h
+  vpTreeView.h
+  vpVideoAnimation.h
+  vpView.h
+  vpViewCore.h
+)
+
+set(vpViewResources ../../Icons/vpView.qrc)
+
+# END core program code
+
+###############################################################################
+
+# BEGIN OPTIONAL vidtk io
+
+if(VISGUI_ENABLE_VIDTK)
+  list(APPEND vpViewSources
+    vpVidtkActivityIO.cxx
+    vpVidtkEventIO.cxx
+    vpVidtkFileEventIO.cxx
+    vpVidtkFileIO.cxx
+    vpVidtkFileReader.cxx
+    vpVidtkFileTrackIO.cxx
+    vpVidtkIO.cxx
+    vpVidtkTrackIO.cxx
+  )
+endif()
+
+# END OPTIONAL vidtk io
+
+###############################################################################
+
+# BEGIN build rules
+
+qt4_wrap_ui(uiSources ${vpViewUI})
+qt4_wrap_cpp(mocSources ${vpViewHeaders})
+qt4_add_resources(resSources ${vpViewResources})
+
+source_group("Resources" FILES
+  ${vpViewUI}
+  ${EXE_ICON}
+)
+
+source_group("Generated" FILES
+  ${uiSources}
+  ${mocSources}
+  ${ResourceSources}
+)
+
+set_source_files_properties(${vpViewSources}
+  PROPERTIES OBJECT_DEPENDS "${uiSources}"
+)
+
+# Hide the console window on release builds
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
+  set(ExecProperties WIN32)
+endif()
+
+set(ExecProperties ${ExecProperties} MACOSX_BUNDLE)
+
+add_executable(${PROJECT_NAME} ${ExecProperties}
+  ${vpViewSources} ${uiSources} ${mocSources} ${resSources}
+)
+
+target_link_libraries(${PROJECT_NAME} LINK_PRIVATE
+  ${vgSdkTargets}
+  vgl vnl vul vil_io
+  ${GeographicLib_LIBRARIES}
+  vtkChartsCore vtkRenderingCore vtkGUISupportQt
+  vtkRenderingFreeTypeOpenGL vtkViewsInfovis vtkViewsContext2D
+  ${LIBJSON_LIBRARY}
+  ${QT_TESTING_SUPPORT_LIBRARIES}
+  ${QT_QTMAIN_LIBRARY} ${QT_LIBRARIES}
+)
+
+if(VISGUI_ENABLE_VIDTK)
+  target_link_libraries(${PROJECT_NAME} LINK_PRIVATE
+    vidtk_activity_detectors_lib
+    vidtk_events_lib
+    vidtk_tracking
+    vidtk_utilities
+  )
+endif()
+
+vg_add_test_subdirectory()
+
+install_executable_target(${PROJECT_NAME} ${PROJECT_NAME})
+
+# END build rules
diff --git a/Applications/VpView/Testing/3DView.xml b/Applications/VpView/Testing/3DView.xml
new file mode 100644
index 00000000..0129bce0
--- /dev/null
+++ b/Applications/VpView/Testing/3DView.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTracks" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTrackHeads" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="240" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="action3DView" />
+  <pqevent object="vpMainWindow/vpQtViewer3dDialog/viewer3dWidget/qvtkWidget" command="mousePress" arguments="(0.608997,0.774799,1,1,0)" />
+  <pqevent object="vpMainWindow/vpQtViewer3dDialog/viewer3dWidget/qvtkWidget" command="mouseMove" arguments="(0.482699,0.493298,1,0,0)" />
+  <pqevent object="vpMainWindow/vpQtViewer3dDialog/viewer3dWidget/qvtkWidget" command="mouseRelease" arguments="(0.482699,0.493298,1,0,0)" />
+  <pqevent object="vpMainWindow/vpQtViewer3dDialog/graphDisplayGroupBox/groupBox/edgeColorModeComboBox" command="set_string" arguments="RoleBased" />
+  <pqevent object="vpMainWindow/vpQtViewer3dDialog/graphDisplayGroupBox/groupBox/edgeThicknessModeComboBox" command="set_string" arguments="Thick" />
+  <pqevent object="vpMainWindow/vpQtViewer3dDialog/graphDisplayGroupBox/groupBox/edgeThicknessModeComboBox" command="set_string" arguments="Thicker" />
+  <pqevent object="vpMainWindow/vpQtViewer3dDialog/graphDisplayGroupBox/groupBox_2/nodeHeightComboBox" command="set_string" arguments="Start Time" />
+  <pqevent object="vpMainWindow/vpQtViewer3dDialog/graphDisplayGroupBox/groupBox/edgeThicknessModeComboBox" command="set_string" arguments="Thin" />
+</pqevents>
diff --git a/Applications/VpView/Testing/AboutDialog.xml b/Applications/VpView/Testing/AboutDialog.xml
new file mode 100644
index 00000000..53e06906
--- /dev/null
+++ b/Applications/VpView/Testing/AboutDialog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuHelp" />
+  <pqevent object="vpMainWindow/menubar/menuHelp" command="activate" arguments="&amp;About VisGUI View" />
+  <pqevent object="vgAboutDialog/label" command="mousePress" arguments="2,2,0,25,136" />
+  <pqevent object="vgAboutDialog/label" command="contextMenu" arguments="" />
+  <pqevent object="vgAboutDialog/1QMenu0" command="activate" arguments="&amp;Copy to clipboard" />
+  <pqevent object="vgAboutDialog/buttonBox/1QPushButton0" command="activate" arguments="" />
+</pqevents>
diff --git a/Applications/VpView/Testing/Bookmark.xml b/Applications/VpView/Testing/Bookmark.xml
new file mode 100644
index 00000000..611096d9
--- /dev/null
+++ b/Applications/VpView/Testing/Bookmark.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.488,0.322,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.592,0.41,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.592,0.41,1,0,0)" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView/menuCamera" command="activate" arguments="actionViewportBookmark" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView/menuCamera" command="activate" arguments="actionViewportZoomAOI" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView/menuCamera" command="activate" arguments="actionViewportRestore" />
+</pqevents>
diff --git a/Applications/VpView/Testing/CMakeLists.txt b/Applications/VpView/Testing/CMakeLists.txt
new file mode 100644
index 00000000..7ed37d8d
--- /dev/null
+++ b/Applications/VpView/Testing/CMakeLists.txt
@@ -0,0 +1,105 @@
+# Command line tests.
+vg_add_test(vpView-FileDataSource testFileDataSource
+  ARGS ${VISGUI_DATA_ROOT}/CLIF/images/*.png ${VISGUI_DATA_ROOT}/CLIF/images.txt
+  SOURCES testFileDataSource.cxx ../vpFileDataSource.cxx
+  MOC_HEADERS ../vpFileDataSource.h
+  LINK_LIBRARIES vtksys vtkFiltersGeneral vtkIOCore ${QT_LIBRARIES}
+)
+
+# GUI tests.
+set (project_input_files
+  demoFile.prj.in
+)
+
+# do path variable substitution on input files to create project files with correct paths
+foreach( filename ${project_input_files} )
+  string( REPLACE ".in" "" output_filename ${filename} )
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/${filename}
+    ${CMAKE_CURRENT_BINARY_DIR}/${output_filename}
+    ESCAPE_QUOTES)
+endforeach( filename )
+
+# specify what test scripts to run
+set(TESTS_WITHOUT_CONFIG
+  # Dialogs
+  AboutDialog.xml
+  FileOpenCancel.xml
+)
+
+set(TESTS_WITHOUT_BASELINES
+  # Dialogs
+  OptionsDialog.xml
+  # Child Windows
+  3DView.xml
+  Timeline.xml
+  # Misc Features
+  CopyImageExtents.xml
+)
+
+set(TESTS_WITH_BASELINES
+  # Main Features
+  OpenProject.xml
+  ImportProject.xml
+  StepForwardAndBack.xml
+  TrackSelect.xml
+  MultiProject.xml
+  MultiProjectImplicitAoi.xml
+  # Base Display
+  ShowTracks.xml
+  ShowTracksEvents.xml
+  ShowTracksEventsActivities.xml
+  ShowEvents.xml
+  ShowEventIcons.xml
+  ShowActivities.xml
+  TrackTrailLength.xml
+  TrackAttributeColors.xml
+  TrackOverrideColor.xml
+  HighlightTrack.xml
+  HighlightEvent.xml
+  # Filtering
+  FilteringActivitiesLongTermFollowing.xml
+  FilteringEventsStart.xml
+  FilteringEventsStationary.xml
+  FilteringEventsStop.xml
+  FilteringSpacial.xml
+  ProjectWithFilters.xml
+  SaveLoadFilters.xml
+  # Full Volume
+  FullVolumeNoIcons.xml
+  # Annotation
+  CreateTrack.xml
+  EditTrack.xml
+  MergeTracksReplace1.xml
+  MergeTracksReplace2.xml
+  MergeTracksNew.xml
+  MergeTracksMergeEvents.xml
+  MergeTracksExtendEvents.xml
+  # Misc Features
+  Bookmark.xml
+  FrameOffset.xml
+  Legend.xml
+  Overview.xml
+  # Specific Issues
+  ResetView.xml
+  SwappedMultiTrackEvent.xml
+)
+
+foreach(script ${TESTS_WITHOUT_CONFIG})
+  vg_add_scripted_test(vpView "${script}")
+endforeach()
+
+set(TEST_CONFIG "${VISGUI_DATA_ROOT}/Support/PerSEASEvents.ini")
+
+foreach(script ${TESTS_WITHOUT_BASELINES})
+  vg_add_scripted_test(vpView "${script}"
+    REQUIRED_FILES "${TEST_CONFIG}"
+    ARGS --reset-config --config "${TEST_CONFIG}"
+  )
+endforeach()
+
+foreach(script ${TESTS_WITH_BASELINES})
+  vg_add_scripted_test(vpView "${script}" WITH_BASELINE
+    REQUIRED_FILES "${TEST_CONFIG}"
+    ARGS --reset-config --config "${TEST_CONFIG}"
+  )
+endforeach()
diff --git a/Applications/VpView/Testing/CopyImageExtents.xml b/Applications/VpView/Testing/CopyImageExtents.xml
new file mode 100644
index 00000000..ddd72528
--- /dev/null
+++ b/Applications/VpView/Testing/CopyImageExtents.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuPlayback" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.29,0.382,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.574,0.52,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.574,0.52,1,0,0)" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView/menuCamera" command="activate" arguments="actionViewportCopyViewExtentsToClipboard" />
+</pqevents>
diff --git a/Applications/VpView/Testing/CreateTrack.xml b/Applications/VpView/Testing/CreateTrack.xml
new file mode 100644
index 00000000..80623c5f
--- /dev/null
+++ b/Applications/VpView/Testing/CreateTrack.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+ <pqevent command="set_int" arguments="20" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="mousePress" arguments="(0.36,0.394,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.588,0.604,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.588,0.604,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/hideAllButton"/>
+ <pqevent command="set_boolean" arguments="true" object="vpMainWindow/actionCreateTrack"/>
+ <pqevent command="activate" arguments="0x400" object="vpMainWindow/1QInputDialog0/1QDialogButtonBox0"/>
+ <pqevent command="mousePress" arguments="(0.142,0.43,1,1,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.248,0.492,1,0,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.248,0.492,1,0,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="keyEvent" arguments="7:16777249:0::0:1" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.572,0.524,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.572,0.524,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.572,0.524,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.572,0.53,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.572,0.53,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.572,0.53,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.59,0.544,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.59,0.544,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.59,0.544,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.588,0.538,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.588,0.538,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.588,0.538,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.592,0.54,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.592,0.54,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.592,0.54,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.622,0.532,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.622,0.532,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.622,0.532,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.668,0.49,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.668,0.49,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.668,0.49,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="keyEvent" arguments="6:16777249:67108864::0:1" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.548,0.362,1,1,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.628,0.454,1,0,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.628,0.454,1,0,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="keyEvent" arguments="7:16777249:0::0:1" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.564,0.49,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.564,0.49,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.564,0.49,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="keyEvent" arguments="6:16777249:67108864::0:1" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.486,0.372,1,1,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.548,0.468,1,0,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.548,0.468,1,0,67108864)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="keyEvent" arguments="7:16777249:0::0:1" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.518,0.604,2,2,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.518,0.604,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.518,0.604,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="set_tab" arguments="0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/EditTrack.xml b/Applications/VpView/Testing/EditTrack.xml
new file mode 100644
index 00000000..a61cb939
--- /dev/null
+++ b/Applications/VpView/Testing/EditTrack.xml
@@ -0,0 +1,114 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/hideAllButton"/>
+ <pqevent command="set_tab" arguments="2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="setCurrent" arguments="2.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="2.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewTrackHeads" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="mousePress" arguments="(0.334,0.408,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.538,0.58,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.538,0.58,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.596,0.228,2,2,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.596,0.228,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.596,0.228,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="keyEvent" arguments="6:16777223:0::0:1" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="keyEvent" arguments="7:16777223:0::0:1" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="mousePress" arguments="(0.602,0.196,4,4,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.108,0.556,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.108,0.556,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.128,0.616,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.184,0.6,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.184,0.6,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="mousePress" arguments="(0.584,0.216,4,4,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.198,0.602,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.198,0.602,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.236,0.65,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.282,0.628,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.282,0.628,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="mousePress" arguments="(0.784,0.534,4,4,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.344,0.624,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.344,0.624,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="mousePress" arguments="(0.586,0.49,4,4,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.4,0.648,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.4,0.648,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="set_string" arguments="Polygon" object="vpMainWindow/toolBar/editModeWidget/editModeCombo"/>
+ <pqevent command="mousePress" arguments="(0.322,0.616,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.352,0.608,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.352,0.608,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.324,0.672,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.324,0.646,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.324,0.646,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.458,0.672,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.404,0.704,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.404,0.704,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.458,0.616,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.434,0.666,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.434,0.666,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="mousePress" arguments="(0.404,0.656,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.424,0.644,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.424,0.644,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.372,0.712,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.382,0.682,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.382,0.682,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.442,0.752,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.432,0.734,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.432,0.734,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.472,0.702,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.472,0.698,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.472,0.698,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="mousePress" arguments="(0.514,0.748,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.534,0.798,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.534,0.798,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.444,0.708,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.502,0.73,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.502,0.73,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.426,0.742,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.43,0.746,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.43,0.746,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.436,0.766,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.458,0.75,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.458,0.75,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.482,0.806,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.482,0.818,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.482,0.818,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.526,0.798,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.528,0.806,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.528,0.806,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="mousePress" arguments="(0.486,0.826,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.486,0.872,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.486,0.872,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.512,0.772,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.468,0.782,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.468,0.782,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.548,0.806,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.51,0.796,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.51,0.796,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.48,0.794,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.478,0.816,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.478,0.816,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="set_string" arguments="Bounding Box" object="vpMainWindow/toolBar/editModeWidget/editModeCombo"/>
+ <pqevent command="mousePress" arguments="(0.544,0.86,4,4,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.512,0.894,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.512,0.894,4,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.756,0.586,2,2,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.756,0.586,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.756,0.586,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="set_tab" arguments="0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/FileOpenCancel.xml b/Applications/VpView/Testing/FileOpenCancel.xml
new file mode 100644
index 00000000..bc6e8b73
--- /dev/null
+++ b/Applications/VpView/Testing/FileOpenCancel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="cancelled" arguments="" />
+</pqevents>
diff --git a/Applications/VpView/Testing/FilteringActivitiesLongTermFollowing.xml b/Applications/VpView/Testing/FilteringActivitiesLongTermFollowing.xml
new file mode 100644
index 00000000..6fda92b3
--- /dev/null
+++ b/Applications/VpView/Testing/FilteringActivitiesLongTermFollowing.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="Filtering Options" />
+  <pqevent object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/saliencyGroupBox/saliencyFilter" command="mixer_set_value" arguments="1, 0.5" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/showExcludedItems" command="set_boolean" arguments="true" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewActivities" />
+  <pqevent object="vpMainWindow/actionDisplayFullVolume" command="set_boolean" arguments="true" />
+</pqevents>
diff --git a/Applications/VpView/Testing/FilteringEventsStart.xml b/Applications/VpView/Testing/FilteringEventsStart.xml
new file mode 100644
index 00000000..15a5b1a1
--- /dev/null
+++ b/Applications/VpView/Testing/FilteringEventsStart.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar" command="set_tab" arguments="1" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="Filtering Options" />
+  <pqevent object="vpMainWindow/toolBar/1QWidget0/1QComboBox0" command="set_string" arguments="Start" />
+  <pqevent object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter" command="mixer_set_value" arguments="4, 0.9" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+  <pqevent object="vpMainWindow/actionDisplayFullVolume" command="set_boolean" arguments="true" />
+</pqevents>
diff --git a/Applications/VpView/Testing/FilteringEventsStationary.xml b/Applications/VpView/Testing/FilteringEventsStationary.xml
new file mode 100644
index 00000000..e0909624
--- /dev/null
+++ b/Applications/VpView/Testing/FilteringEventsStationary.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar" command="set_tab" arguments="1" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="Filtering Options" />
+  <pqevent object="vpMainWindow/toolBar/1QWidget0/1QComboBox0" command="set_string" arguments="Stationary" />
+  <pqevent object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter" command="mixer_set_value" arguments="25, 0.5" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+  <pqevent object="vpMainWindow/actionDisplayFullVolume" command="set_boolean" arguments="true" />
+</pqevents>
diff --git a/Applications/VpView/Testing/FilteringEventsStop.xml b/Applications/VpView/Testing/FilteringEventsStop.xml
new file mode 100644
index 00000000..d8a0453b
--- /dev/null
+++ b/Applications/VpView/Testing/FilteringEventsStop.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar" command="set_tab" arguments="1" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="Filtering Options" />
+  <pqevent object="vpMainWindow/toolBar/1QWidget0/1QComboBox0" command="set_string" arguments="Stop" />
+  <pqevent object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter" command="mixer_set_value" arguments="3,0.05" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+  <pqevent object="vpMainWindow/actionDisplayFullVolume" command="set_boolean" arguments="true" />
+</pqevents>
diff --git a/Applications/VpView/Testing/FilteringSpacial.xml b/Applications/VpView/Testing/FilteringSpacial.xml
new file mode 100644
index 00000000..c91db623
--- /dev/null
+++ b/Applications/VpView/Testing/FilteringSpacial.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTracks" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="525" />
+  <pqevent command="set_boolean" arguments="true" object="vpMainWindow/actionSpatialFilterAdd"/>  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.682,0.594,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.682,0.594,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.682,0.594,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.94,0.626,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.94,0.626,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.94,0.626,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.89,0.764,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.89,0.764,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.89,0.764,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.674,0.708,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.674,0.708,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.674,0.708,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.686,0.602,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.686,0.602,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.686,0.602,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.626,0.57,2,2,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.626,0.57,2,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.626,0.57,2,0,0)" />
+</pqevents>
diff --git a/Applications/VpView/Testing/FrameOffset.xml b/Applications/VpView/Testing/FrameOffset.xml
new file mode 100644
index 00000000..f351434f
--- /dev/null
+++ b/Applications/VpView/Testing/FrameOffset.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219-frame-offset.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewEvents" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_string" arguments="Start" object="vpMainWindow/toolBar/1QWidget0/1QComboBox0"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionPreviousFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionNextFrame"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/FullVolumeNoIcons.xml b/Applications/VpView/Testing/FullVolumeNoIcons.xml
new file mode 100644
index 00000000..00b87618
--- /dev/null
+++ b/Applications/VpView/Testing/FullVolumeNoIcons.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTracks" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTrackHeads" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewActivities" />
+  <pqevent object="vpMainWindow/actionDisplayFullVolume" command="set_boolean" arguments="true" />
+</pqevents>
diff --git a/Applications/VpView/Testing/HighlightEvent.xml b/Applications/VpView/Testing/HighlightEvent.xml
new file mode 100644
index 00000000..eeb7327a
--- /dev/null
+++ b/Applications/VpView/Testing/HighlightEvent.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent command="set_int" arguments="20" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewTrackHeads" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewEvents" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+ <pqevent command="mixer_set_state" arguments="32,0" object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter"/>
+ <pqevent command="mixer_set_state" arguments="7,0" object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter"/>
+ <pqevent command="set_tab" arguments="1" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="expand" arguments="11.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="8.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="8.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="11.0.0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="11.0.0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="10.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="10.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="21.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="21.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="23.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="23.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="29.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="29.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="8.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="8.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="11.0.0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="11.0.0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="30.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="30.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/HighlightTrack.xml b/Applications/VpView/Testing/HighlightTrack.xml
new file mode 100644
index 00000000..1ade86ea
--- /dev/null
+++ b/Applications/VpView/Testing/HighlightTrack.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent command="set_int" arguments="20" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewTrackHeads" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewEvents" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+ <pqevent command="mixer_set_state" arguments="32,0" object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter"/>
+ <pqevent command="mixer_set_state" arguments="7,0" object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter"/>
+ <pqevent command="set_tab" arguments="1" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="expand" arguments="11.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="8.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="8.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="11.0.0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="11.0.0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="10.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="10.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="21.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="21.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="23.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="23.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="29.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="29.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="8.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="8.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="11.0.0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="11.0.0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/ImportProject.xml b/Applications/VpView/Testing/ImportProject.xml
new file mode 100644
index 00000000..228ca76d
--- /dev/null
+++ b/Applications/VpView/Testing/ImportProject.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionImportProject" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219-offset.prj" object="importProjectDialog"/>
+ <pqevent command="activate" arguments="0x400" object="1QInputDialog0/1QDialogButtonBox0"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/hideAllButton"/>
+ <pqevent command="set_tab" arguments="1" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="mousePress" arguments="1,1,0,9,25" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree/qt_scrollarea_vcontainer/1QScrollBar0"/>
+ <pqevent command="mouseMove" arguments="1,0,0,3,105" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree/qt_scrollarea_vcontainer/1QScrollBar0"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,3,105" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree/qt_scrollarea_vcontainer/1QScrollBar0"/>
+ <pqevent command="setCurrent" arguments="2460.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="2460.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="expand" arguments="2460.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="2460.0.0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="2460.0.0.0,0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="set_tab" arguments="2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="set_string" arguments="Sort By Name" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackSortType"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTrackHeads" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewEvents" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="mousePress" arguments="(0.424,0.404,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.484,0.464,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.484,0.464,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="mousePress" arguments="(0.524,0.5,2,2,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.524,0.5,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.524,0.5,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/Legend.xml b/Applications/VpView/Testing/Legend.xml
new file mode 100644
index 00000000..ed50f48b
--- /dev/null
+++ b/Applications/VpView/Testing/Legend.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayEventLegend" />
+</pqevents>
diff --git a/Applications/VpView/Testing/MergeTracksExtendEvents.xml b/Applications/VpView/Testing/MergeTracksExtendEvents.xml
new file mode 100644
index 00000000..85c35379
--- /dev/null
+++ b/Applications/VpView/Testing/MergeTracksExtendEvents.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+ <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+ <pqevent command="activate" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/hideAllButton"/>
+ <pqevent command="set_tab" arguments="2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="setCurrent" arguments="17.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="17.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="21.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="21.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="menuTools" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionMergeTracks" object="vpMainWindow/menubar/menuTools/menuAnnotation"/>
+ <pqevent command="set_int" arguments="90" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="mousePress" arguments="(0.578,0.47,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.578,0.47,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.578,0.47,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="setCurrent" arguments="17.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="mousePress" arguments="(0.522,0.456,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.522,0.456,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.522,0.456,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="setCurrent" arguments="21.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/vpMergeTracksDialog/groupTracks/advancedOptions"/>
+ <pqevent command="set_boolean" arguments="false" object="1QDialog0/1QCheckBox1"/>
+ <pqevent command="set_boolean" arguments="true" object="1QDialog0/1QCheckBox0"/>
+ <pqevent command="activate" arguments="0x400" object="1QDialog0/1QDialogButtonBox0"/>
+ <pqevent command="set_boolean" arguments="true" object="vpMainWindow/vpMergeTracksDialog/groupBox/replaceMergedTracks"/>
+ <pqevent command="activate" arguments="0x400" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="setCurrent" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="17.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x200000" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewEvents" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_tab" arguments="1" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="mousePress" arguments="1,1,0,8,27" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree/qt_scrollarea_vcontainer/1QScrollBar0"/>
+ <pqevent command="mouseMove" arguments="1,0,0,3,70" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree/qt_scrollarea_vcontainer/1QScrollBar0"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,3,70" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree/qt_scrollarea_vcontainer/1QScrollBar0"/>
+ <pqevent command="setCurrent" arguments="301.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="301.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCurrent" arguments="330.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="setCheckState" arguments="330.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree"/>
+ <pqevent command="set_int" arguments="87" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="mousePress" arguments="(0.512,0.414,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.724,0.524,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.724,0.524,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="set_tab" arguments="0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/MergeTracksMergeEvents.xml b/Applications/VpView/Testing/MergeTracksMergeEvents.xml
new file mode 100644
index 00000000..95f908f5
--- /dev/null
+++ b/Applications/VpView/Testing/MergeTracksMergeEvents.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+ <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+ <pqevent command="activate" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/hideAllButton"/>
+ <pqevent command="set_tab" arguments="2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="1.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="1.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="menuTools" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionMergeTracks" object="vpMainWindow/menubar/menuTools/menuAnnotation"/>
+ <pqevent command="set_int" arguments="10" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/vpMergeTracksDialog/groupTracks/advancedOptions"/>
+ <pqevent command="set_boolean" arguments="false" object="1QDialog0/1QCheckBox0"/>
+ <pqevent command="set_boolean" arguments="true" object="1QDialog0/1QCheckBox1"/>
+ <pqevent command="activate" arguments="0x400" object="1QDialog0/1QDialogButtonBox0"/>
+ <pqevent command="mousePress" arguments="(0.636,0.08,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.636,0.08,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.636,0.08,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.56,0.208,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.56,0.208,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.56,0.208,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x400" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="activate" arguments="0x4000" object="vpMainWindow/vpMergeTracksDialog/1QMessageBox0/qt_msgbox_buttonbox"/>
+ <pqevent command="setCurrent" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="107.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x200000" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewEvents" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_int" arguments="37" object="vpMainWindow/centralwidget/currentFrame/1ctkRangeSlider0"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionDisplayFullVolume" object="vpMainWindow/menubar/menuDisplay"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/MergeTracksNew.xml b/Applications/VpView/Testing/MergeTracksNew.xml
new file mode 100644
index 00000000..541a45ac
--- /dev/null
+++ b/Applications/VpView/Testing/MergeTracksNew.xml
@@ -0,0 +1,35 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+ <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+ <pqevent command="set_tab" arguments="2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/hideAllButton"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="0.0,0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="1.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="1.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="menuTools" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionMergeTracks" object="vpMainWindow/menubar/menuTools/menuAnnotation"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/vpMergeTracksDialog/groupTracks/advancedOptions"/>
+ <pqevent command="set_boolean" arguments="false" object="1QDialog0/1QCheckBox1"/>
+ <pqevent command="set_boolean" arguments="false" object="1QDialog0/1QCheckBox0"/>
+ <pqevent command="activate" arguments="0x400" object="1QDialog0/1QDialogButtonBox0"/>
+ <pqevent command="set_int" arguments="10" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="mousePress" arguments="(0.622,0.096,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.622,0.096,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.622,0.096,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.572,0.174,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.572,0.174,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.572,0.174,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x400" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="activate" arguments="0x4000" object="vpMainWindow/vpMergeTracksDialog/1QMessageBox0/qt_msgbox_buttonbox"/>
+ <pqevent command="setCurrent" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="107.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x200000" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="set_tab" arguments="0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/MergeTracksReplace1.xml b/Applications/VpView/Testing/MergeTracksReplace1.xml
new file mode 100644
index 00000000..67e9bc68
--- /dev/null
+++ b/Applications/VpView/Testing/MergeTracksReplace1.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+ <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+ <pqevent command="set_tab" arguments="2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/hideAllButton"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="1.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="1.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="set_int" arguments="10" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="activate" arguments="menuTools" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionMergeTracks" object="vpMainWindow/menubar/menuTools/menuAnnotation"/>
+ <pqevent command="set_boolean" arguments="true" object="vpMainWindow/vpMergeTracksDialog/groupBox/replaceMergedTracks"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/vpMergeTracksDialog/groupTracks/advancedOptions"/>
+ <pqevent command="set_boolean" arguments="false" object="1QDialog0/1QCheckBox1"/>
+ <pqevent command="set_boolean" arguments="false" object="1QDialog0/1QCheckBox0"/>
+ <pqevent command="activate" arguments="0x400" object="1QDialog0/1QDialogButtonBox0"/>
+ <pqevent command="mousePress" arguments="(0.62,0.092,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.62,0.092,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.62,0.092,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.57,0.17,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.57,0.172,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.57,0.172,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x400" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="setCurrent" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x200000" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="set_tab" arguments="0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/MergeTracksReplace2.xml b/Applications/VpView/Testing/MergeTracksReplace2.xml
new file mode 100644
index 00000000..7fe4310f
--- /dev/null
+++ b/Applications/VpView/Testing/MergeTracksReplace2.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+ <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+ <pqevent command="set_tab" arguments="2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/hideAllButton"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="0.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="1.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCheckState" arguments="1.0,2" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="set_int" arguments="10" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="activate" arguments="menuTools" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionMergeTracks" object="vpMainWindow/menubar/menuTools/menuAnnotation"/>
+ <pqevent command="set_boolean" arguments="true" object="vpMainWindow/vpMergeTracksDialog/groupBox/replaceMergedTracks"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/vpMergeTracksDialog/groupTracks/advancedOptions"/>
+ <pqevent command="set_boolean" arguments="false" object="1QDialog0/1QCheckBox1"/>
+ <pqevent command="set_boolean" arguments="false" object="1QDialog0/1QCheckBox0"/>
+ <pqevent command="activate" arguments="0x400" object="1QDialog0/1QDialogButtonBox0"/>
+ <pqevent command="mousePress" arguments="(0.62,0.092,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.62,0.092,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.62,0.092,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.57,0.17,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.57,0.172,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.57,0.172,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="setCurrent" arguments="0.1" object="vpMainWindow/vpMergeTracksDialog/groupTracks/trackList"/>
+ <pqevent command="setCheckState" arguments="0.1,0" object="vpMainWindow/vpMergeTracksDialog/groupTracks/trackList"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/vpMergeTracksDialog/groupTracks/trackDown"/>
+ <pqevent command="setCurrent" arguments="1.1" object="vpMainWindow/vpMergeTracksDialog/groupTracks/trackList"/>
+ <pqevent command="setCurrent" arguments="1.0" object="vpMainWindow/vpMergeTracksDialog/groupTracks/trackList"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x400" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="setCurrent" arguments="" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree"/>
+ <pqevent command="activate" arguments="0x200000" object="vpMainWindow/vpMergeTracksDialog/buttonBox"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="spin" arguments="up" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="set_tab" arguments="0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/MultiProject.xml b/Applications/VpView/Testing/MultiProject.xml
new file mode 100644
index 00000000..69b72e99
--- /dev/null
+++ b/Applications/VpView/Testing/MultiProject.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219_dark.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewEvents" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_int" arguments="61" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="mousePress" arguments="1,1,0,9,10,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,9,10,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,9,8,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseMove" arguments="1,0,0,10,8,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,8,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,7,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,7,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,9,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,9,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/MultiProjectImplicitAoi.xml b/Applications/VpView/Testing/MultiProjectImplicitAoi.xml
new file mode 100644
index 00000000..e9164140
--- /dev/null
+++ b/Applications/VpView/Testing/MultiProjectImplicitAoi.xml
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219_dark.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219_no_aoi.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewEvents" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_int" arguments="61" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="mousePress" arguments="1,1,0,9,10,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,9,10,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,9,8,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseMove" arguments="1,0,0,10,8,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,8,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,7,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,7,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,6,/1:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mousePress" arguments="1,1,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,10,10,/0:0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectList"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/OpenProject.xml b/Applications/VpView/Testing/OpenProject.xml
new file mode 100644
index 00000000..8f720834
--- /dev/null
+++ b/Applications/VpView/Testing/OpenProject.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+</pqevents>
diff --git a/Applications/VpView/Testing/OptionsDialog.xml b/Applications/VpView/Testing/OptionsDialog.xml
new file mode 100644
index 00000000..26b3ba8f
--- /dev/null
+++ b/Applications/VpView/Testing/OptionsDialog.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuTools" />
+  <pqevent object="vpMainWindow/menubar/menuTools" command="activate" arguments="actionConfigure" />
+  <pqevent object="vpMainWindow/vpConfigureDialog/pageChooser" command="mousePress" arguments="1,1,0,22,36,/1:0" />
+  <pqevent object="vpMainWindow/vpConfigureDialog/pageChooser" command="mouseRelease" arguments="1,0,0,22,36,/1:0" />
+  <pqevent object="vpMainWindow/vpConfigureDialog/buttons/1QPushButton1" command="activate" arguments="" />
+</pqevents>
diff --git a/Applications/VpView/Testing/Overview.xml b/Applications/VpView/Testing/Overview.xml
new file mode 100644
index 00000000..0f4ea13c
--- /dev/null
+++ b/Applications/VpView/Testing/Overview.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayOverview" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.252,0.176,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.422,0.402,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.422,0.402,1,0,0)" />
+</pqevents>
diff --git a/Applications/VpView/Testing/ProjectWithFilters.xml b/Applications/VpView/Testing/ProjectWithFilters.xml
new file mode 100644
index 00000000..51cb3a93
--- /dev/null
+++ b/Applications/VpView/Testing/ProjectWithFilters.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+ <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+ <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219-filters.prj" />
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="Spatial Filters" object="vpMainWindow/menubar/menuView"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+ <pqevent command="setCheckState" arguments="0.0,1" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+ <pqevent command="setCheckState" arguments="0.0,2" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+ <pqevent command="setCurrent" arguments="1.0" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+ <pqevent command="setCheckState" arguments="1.0,1" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+ <pqevent command="setCheckState" arguments="1.0,2" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+ <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_boolean" arguments="true" object="vpMainWindow/actionDisplayFullVolume"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/ResetView.xml b/Applications/VpView/Testing/ResetView.xml
new file mode 100644
index 00000000..7b3a9c8c
--- /dev/null
+++ b/Applications/VpView/Testing/ResetView.xml
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+ <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+ <pqevent command="mouseWheel" arguments="(0.298,0.542,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.298,0.542,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.298,0.542,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.298,0.542,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.298,0.542,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.298,0.542,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewportZoomAOI" object="vpMainWindow/menubar/menuView/menuCamera"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewportZoomExtents" object="vpMainWindow/menubar/menuView/menuCamera"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewTrackHeads" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_int" arguments="21" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="mousePress" arguments="(0.648,0.67,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.648,0.67,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.648,0.67,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.648,0.67,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.648,0.67,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.648,0.67,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.648,0.67,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.648,0.67,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseWheel" arguments="(0.648,0.67,120,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewportZoomExtents" object="vpMainWindow/menubar/menuView/menuCamera"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/SaveLoadFilters.xml b/Applications/VpView/Testing/SaveLoadFilters.xml
new file mode 100644
index 00000000..3a01dfd1
--- /dev/null
+++ b/Applications/VpView/Testing/SaveLoadFilters.xml
@@ -0,0 +1,48 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" object="QFileDialog"/>
+ <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+ <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="Spatial Filters" object="vpMainWindow/menubar/menuView"/>
+ <pqevent command="mousePress" arguments="1,1,0,1108,242" object="vpMainWindow"/>
+ <pqevent command="mouseMove" arguments="1,0,0,1111,356" object="vpMainWindow"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,1111,356" object="vpMainWindow"/>
+ <pqevent command="set_boolean" arguments="true" object="vpMainWindow/actionSpatialFilterAdd"/>
+ <pqevent command="mousePress" arguments="(0.68,0.64,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.68,0.64,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.68,0.64,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.68,0.754,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.68,0.754,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.68,0.754,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.856,0.754,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.858,0.752,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.858,0.752,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.942,0.642,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.942,0.642,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.942,0.642,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.678,0.64,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.678,0.64,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.678,0.64,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mousePress" arguments="(0.846,0.544,2,2,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.846,0.544,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.846,0.544,2,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="set_boolean" arguments="true" object="vpMainWindow/actionDisplayFullVolume"/>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionExportFilters" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$TEST_TEMP_ROOT/saved_filters_temp.txt" object="vpMainWindow/QFileDialog"/>
+ <pqevent command="mousePress" arguments="1,1,0,1093,269" object="vpMainWindow"/>
+ <pqevent command="mouseMove" arguments="1,0,0,963,273" object="vpMainWindow"/>
+ <pqevent command="mouseRelease" arguments="1,0,0,963,273" object="vpMainWindow"/>
+ <pqevent command="activate" arguments="" object="vpMainWindow/actionSpatialFilterRemoveAll"/>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionImportFilters" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$TEST_TEMP_ROOT/saved_filters_temp.txt" object="QFileDialog"/>
+ <pqevent command="setCurrent" arguments="0.0" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+ <pqevent command="setCheckState" arguments="0.0,1" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+ <pqevent command="setCheckState" arguments="0.0,2" object="vpMainWindow/spatialFiltersDock/dockWidgetContents/spatialFilterTree"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/ShowActivities.xml b/Applications/VpView/Testing/ShowActivities.xml
new file mode 100644
index 00000000..1ff90f4c
--- /dev/null
+++ b/Applications/VpView/Testing/ShowActivities.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="key" arguments="16777219" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="25" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="25" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewActivities" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/activityTab/activityTree" command="setCurrent" arguments="0.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/activityTab/activityTree" command="setCheckState" arguments="0.0,2" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="35" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="35" />
+</pqevents>
diff --git a/Applications/VpView/Testing/ShowEventIcons.xml b/Applications/VpView/Testing/ShowEventIcons.xml
new file mode 100644
index 00000000..ebe87ce1
--- /dev/null
+++ b/Applications/VpView/Testing/ShowEventIcons.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEventIcons" />
+  <pqevent object="vpMainWindow/toolBar/1QWidget0/1QComboBox0" command="set_string" arguments="Start" />
+  <pqevent object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter" command="mixer_set_state" arguments="3,1" />
+  <pqevent object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter" command="mixer_set_state" arguments="7,1" />
+  <pqevent object="vpMainWindow/eventOptionDock/eventOptionDockScrollArea/qt_scrollarea_viewport/eventOptionDockContents/normalcyGroupBox/normalcyFilter" command="mixer_set_state" arguments="8,1" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar" command="set_tab" arguments="1" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCurrent" arguments="1021.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCheckState" arguments="1021.0,0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCurrent" arguments="1022.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCheckState" arguments="1022.0,0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCurrent" arguments="1038.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCheckState" arguments="1038.0,0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCurrent" arguments="1230.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCheckState" arguments="1230.0,0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCurrent" arguments="1271.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCheckState" arguments="1271.0,0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCurrent" arguments="1273.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCheckState" arguments="1273.0,0" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="450" />
+</pqevents>
diff --git a/Applications/VpView/Testing/ShowEvents.xml b/Applications/VpView/Testing/ShowEvents.xml
new file mode 100644
index 00000000..67c8577e
--- /dev/null
+++ b/Applications/VpView/Testing/ShowEvents.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="25" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+</pqevents>
diff --git a/Applications/VpView/Testing/ShowTracks.xml b/Applications/VpView/Testing/ShowTracks.xml
new file mode 100644
index 00000000..54d67d62
--- /dev/null
+++ b/Applications/VpView/Testing/ShowTracks.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="25" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTracks" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTrackHeads" />
+</pqevents>
diff --git a/Applications/VpView/Testing/ShowTracksEvents.xml b/Applications/VpView/Testing/ShowTracksEvents.xml
new file mode 100644
index 00000000..efd5f60f
--- /dev/null
+++ b/Applications/VpView/Testing/ShowTracksEvents.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="25" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTracks" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTrackHeads" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+</pqevents>
diff --git a/Applications/VpView/Testing/ShowTracksEventsActivities.xml b/Applications/VpView/Testing/ShowTracksEventsActivities.xml
new file mode 100644
index 00000000..83316a26
--- /dev/null
+++ b/Applications/VpView/Testing/ShowTracksEventsActivities.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="35" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTracks" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTrackHeads" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewActivities" />
+</pqevents>
diff --git a/Applications/VpView/Testing/StepForwardAndBack.xml b/Applications/VpView/Testing/StepForwardAndBack.xml
new file mode 100644
index 00000000..cef03f17
--- /dev/null
+++ b/Applications/VpView/Testing/StepForwardAndBack.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTracks" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTrackHeads" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="20" />
+  <pqevent object="vpMainWindow/actionNextFrame" command="activate" arguments="" />
+  <pqevent object="vpMainWindow/actionNextFrame" command="activate" arguments="" />
+  <pqevent object="vpMainWindow/actionNextFrame" command="activate" arguments="" />
+  <pqevent object="vpMainWindow/actionNextFrame" command="activate" arguments="" />
+  <pqevent object="vpMainWindow/actionPreviousFrame" command="activate" arguments="" />
+  <pqevent object="vpMainWindow/actionPreviousFrame" command="activate" arguments="" />
+  <pqevent object="vpMainWindow/actionNextFrame" command="activate" arguments="" />
+</pqevents>
diff --git a/Applications/VpView/Testing/SwappedMultiTrackEvent.xml b/Applications/VpView/Testing/SwappedMultiTrackEvent.xml
new file mode 100644
index 00000000..cd70de7d
--- /dev/null
+++ b/Applications/VpView/Testing/SwappedMultiTrackEvent.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar" command="set_tab" arguments="1" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCurrent" arguments="634.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/hideAllButton" command="activate" arguments="" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/eventTab/eventTree" command="setCheckState" arguments="634.0,2" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/showUncheckedItems" command="set_boolean" arguments="false" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="210" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewEvents" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.308,0.54,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.536,0.994,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.536,0.994,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="spin" arguments="up" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="spin" arguments="up" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="spin" arguments="up" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="spin" arguments="up" />
+  <pqevent command="set_tab" arguments="0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/Timeline.xml b/Applications/VpView/Testing/Timeline.xml
new file mode 100644
index 00000000..4e38b9fe
--- /dev/null
+++ b/Applications/VpView/Testing/Timeline.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionShowHideTimelineView" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="2" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="65" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="186" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="286" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="321" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="389" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="410" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="460" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="509" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="558" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="609" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="680" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="721" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/TimelineTab/groupBox_2/frameSlider" command="set_int" arguments="762" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_tabbar" command="set_tab" arguments="1" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/plotTypeCombo" command="set_string" arguments="Line Plot" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/plotTypeCombo" command="set_string" arguments="Stacked Bars" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="20" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="10" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="5" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/plotTypeCombo" command="set_string" arguments="Line Plot" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="10" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="20" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="30" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="40" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="50" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="60" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/plotTypeCombo" command="set_string" arguments="Bar Plot" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="64" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="75" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="88" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/binSlider" command="set_int" arguments="100" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/plotTypeCombo" command="set_string" arguments="Line Plot" />
+  <pqevent object="vpMainWindow/vpTimelineDialog/tabWidget/qt_tabwidget_stackedwidget/HistogramTab/groupBox/plotTypeCombo" command="set_string" arguments="Stacked Bars" />
+</pqevents>
diff --git a/Applications/VpView/Testing/TrackAttributeColors.xml b/Applications/VpView/Testing/TrackAttributeColors.xml
new file mode 100644
index 00000000..70835b78
--- /dev/null
+++ b/Applications/VpView/Testing/TrackAttributeColors.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219+vsl.prj" object="QFileDialog"/>
+ <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="25" />
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionChangeTrackColors" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_boolean" arguments="true" object="vpTrackColorDialog/colorByStateAttribute"/>
+ <pqevent command="set_string" arguments="Interval" object="vpTrackColorDialog/groupBox_2/attributeGroup"/>
+ <pqevent command="activate" arguments="0x2000000" object="vpTrackColorDialog/buttonBox"/>
+ <pqevent command="activate" arguments="0x400" object="vpTrackColorDialog/buttonBox"/>
+ <pqevent command="mousePress" arguments="(0.322,0.378,1,1,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseMove" arguments="(0.616,0.836,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+ <pqevent command="mouseRelease" arguments="(0.616,0.836,1,0,0)" object="vpMainWindow/centralwidget/renderFrame"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/TrackOverrideColor.xml b/Applications/VpView/Testing/TrackOverrideColor.xml
new file mode 100644
index 00000000..9da0c516
--- /dev/null
+++ b/Applications/VpView/Testing/TrackOverrideColor.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219-track-color.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="activate" arguments="actionViewTrackHeads" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_int" arguments="21" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/TrackSelect.xml b/Applications/VpView/Testing/TrackSelect.xml
new file mode 100644
index 00000000..91e13b5f
--- /dev/null
+++ b/Applications/VpView/Testing/TrackSelect.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuFile" />
+  <pqevent object="vpMainWindow/menubar/menuFile" command="activate" arguments="actionOpenFile" />
+  <pqevent object="QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219.prj" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuView" />
+  <pqevent object="vpMainWindow/menubar/menuView" command="activate" arguments="actionDisplayAOIOutline" />
+  <pqevent object="vpMainWindow/menubar" command="activate" arguments="menuDisplay" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTracks" />
+  <pqevent object="vpMainWindow/menubar/menuDisplay" command="activate" arguments="actionViewTrackHeads" />
+  <pqevent object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0" command="set_int" arguments="65" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar" command="set_tab" arguments="2" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.356,0.8,1,1,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.356,0.8,1,0,0)" />
+  <pqevent object="vpMainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.356,0.8,1,0,0)" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCurrent" arguments="6.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/hideAllButton" command="activate" arguments="" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCheckState" arguments="6.0,2" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCurrent" arguments="5.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCheckState" arguments="5.0,2" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCheckState" arguments="5.0,0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCurrent" arguments="4.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCheckState" arguments="4.0,2" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCheckState" arguments="4.0,0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCurrent" arguments="3.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCheckState" arguments="3.0,2" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCheckState" arguments="3.0,0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree/qt_scrollarea_vcontainer/1QScrollBar0" command="mousePress" arguments="1,1,0,11,79" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree/qt_scrollarea_vcontainer/1QScrollBar0" command="mouseRelease" arguments="1,0,0,11,79" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCurrent" arguments="7.0" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/tabWidget/qt_tabwidget_stackedwidget/trackTab/trackTree" command="setCheckState" arguments="7.0,2" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/showExcludedItems" command="set_boolean" arguments="true" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/showExcludedItems" command="set_boolean" arguments="false" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/showUncheckedItems" command="set_boolean" arguments="false" />
+  <pqevent object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/1QSplitter0/1QStackedWidget0/vpObjectSelectionPanel/showAllButton" command="activate" arguments="" />
+  <pqevent command="set_tab" arguments="0" object="vpMainWindow/sessionViewDock/sessionViewDockContents/sessionView/projectSplitter/projectPanels/vpObjectSelectionPanel/tabWidget/qt_tabwidget_tabbar"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/TrackTrailLength.xml b/Applications/VpView/Testing/TrackTrailLength.xml
new file mode 100644
index 00000000..cf4dd338
--- /dev/null
+++ b/Applications/VpView/Testing/TrackTrailLength.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<pqevents>
+ <pqevent command="activate" arguments="menuFile" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionOpenFile" object="vpMainWindow/menubar/menuFile"/>
+ <pqevent command="filesSelected" arguments="$VISGUI_DATA_ROOT/CLIF/session23_CLIF_1160x1128+10200+8219+vsl.prj" object="QFileDialog"/>
+ <pqevent command="activate" arguments="menuView" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionViewTracks" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_int" arguments="25" object="vpMainWindow/centralwidget/currentFrame/1vgFrameSpinBox0"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionSetTrackTrailLength" object="vpMainWindow/menubar/menuDisplay"/>
+ <pqevent command="set_int" arguments="3" object="vpMainWindow/1QInputDialog0/1QInputDialogSpinBox0"/>
+ <pqevent command="activate" arguments="0x400" object="vpMainWindow/1QInputDialog0/1QDialogButtonBox0"/>
+ <pqevent command="activate" arguments="menuDisplay" object="vpMainWindow/menubar"/>
+ <pqevent command="activate" arguments="actionDisplayAOIOutline" object="vpMainWindow/menubar/menuView"/>
+</pqevents>
diff --git a/Applications/VpView/Testing/demoFile.prj.in b/Applications/VpView/Testing/demoFile.prj.in
new file mode 100644
index 00000000..efaebcd3
--- /dev/null
+++ b/Applications/VpView/Testing/demoFile.prj.in
@@ -0,0 +1,9 @@
+OverviewFile=@VISGUI_DATA_ROOT@/Demo/images/refined_im100008.png
+DataSetSpecifier=@VISGUI_DATA_ROOT@/Demo/images/refined_*.png
+OverviewSpacing=-1
+OverviewOrigin=0 0
+AnalysisDimensions=1161 1129
+TracksFile=@VISGUI_DATA_ROOT@/Demo/tracks_unfiltered.kw18
+EventsFile=@VISGUI_DATA_ROOT@/Demo/events.txt
+IconsFile=@VISGUI_DATA_ROOT@/Demo/demo_icons.txt
+ActivitiesFile=@VISGUI_DATA_ROOT@/Demo/activities.txt
diff --git a/Applications/VpView/Testing/testFileDataSource.cxx b/Applications/VpView/Testing/testFileDataSource.cxx
new file mode 100644
index 00000000..5197a67c
--- /dev/null
+++ b/Applications/VpView/Testing/testFileDataSource.cxx
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFileDataSource.h"
+
+#include <vector>
+#include <string>
+
+int main(int argc, char** argv)
+{
+  int retVal = 0;
+
+  if (argc < 3)
+    {
+    return VTK_ERROR;
+    }
+
+  vpFileDataSource* dataSource = new vpFileDataSource();
+  dataSource->setDataSetSpecifier(argv[1]);
+
+  if (dataSource->getFileCount() != 762)
+    {
+    retVal = VTK_ERROR;
+    }
+
+  dataSource->setDataSetSpecifier(argv[2]);
+
+  if (dataSource->getFileCount() != 762)
+    {
+    retVal = VTK_ERROR;
+    }
+
+  delete dataSource;
+
+  return retVal;
+}
diff --git a/Applications/VpView/main.cxx b/Applications/VpView/main.cxx
new file mode 100644
index 00000000..bc09be67
--- /dev/null
+++ b/Applications/VpView/main.cxx
@@ -0,0 +1,66 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// QT includes
+#include <QApplication>
+#include <QCleanlooksStyle>
+#include <QSettings>
+
+// QT Extensions includes
+#include <qtCliArgs.h>
+
+// QT Testing Support includes
+#ifdef ENABLE_QTTESTING
+#include <pqCoreTestUtility.h>
+#endif
+
+// VisGUI includes
+#include "vpApplication.h"
+#include "vpView.h"
+
+#include "vpVersion.h"
+
+extern int qInitResources_icons();
+
+int main(int argc, char** argv)
+{
+  // Force ini-style configuration files on Windows for easy editing.
+  QSettings::setDefaultFormat(QSettings::IniFormat);
+
+  QApplication::setApplicationName("VisGUI View");
+  QApplication::setOrganizationName("Kitware");
+  QApplication::setOrganizationDomain("kitware.com");
+  QApplication::setApplicationVersion(VPVIEW_VERSION_STR);
+
+  // Set up command line options
+  qtCliArgs args(argc, argv);
+
+#ifdef ENABLE_QTTESTING
+  pqCoreTestUtility::AddCommandLineOptions(args);
+#endif
+
+  qtCliOptions options;
+  options.add("project <file>").add("p", "Load project 'file'");
+  options.add("config <file>")
+         .add("c", "Use configuration information from 'file'");
+  options.add("reset-config").add("r", "Reset to default settings");
+  options.add("streaming").add("s", "Enable streaming mode");
+  args.addOptions(options);
+
+  // Parse arguments
+  args.parseOrDie();
+
+  // Create application instance and set copyright information
+  vpApplication app(args.qtArgc(), args.qtArgv());
+  app.setProperty("COPY_YEAR", VPVIEW_COPY_YEAR);
+  app.setProperty("COPY_ORGANIZATION", "Kitware, Inc.");
+
+  vpView myView;
+  myView.show();
+  myView.initialize(&args);
+
+  return app.exec();
+}
diff --git a/Applications/VpView/qtInformaticsDialog.ui b/Applications/VpView/qtInformaticsDialog.ui
new file mode 100644
index 00000000..a381a4e0
--- /dev/null
+++ b/Applications/VpView/qtInformaticsDialog.ui
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>qtInformaticsDialog</class>
+ <widget class="QDialog" name="qtInformaticsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Informatics View</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
+   <item>
+    <widget class="QVTKWidget" name="qvtkRenderWidget" native="true"/>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="layoutLabel">
+        <property name="text">
+         <string>Layout</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="layoutCombo"/>
+      </item>
+      <item>
+       <widget class="QLabel" name="iconSizeLabel">
+        <property name="text">
+         <string>Icon Size</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSlider" name="iconSizeSlider">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header>QVTKWidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/qtNormalcyDialog.ui b/Applications/VpView/qtNormalcyDialog.ui
new file mode 100644
index 00000000..bf76eb02
--- /dev/null
+++ b/Applications/VpView/qtNormalcyDialog.ui
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>qtNormalcyDialog</class>
+ <widget class="QDialog" name="qtNormalcyDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Normalcy View</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
+   <item>
+    <widget class="QVTKWidget" name="qvtkRenderWidget" native="true"/>
+   </item>
+   <item>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLabel" name="renderStyleLabel">
+        <property name="text">
+         <string>Render Style</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="renderStyleCombo">
+        <item>
+         <property name="text">
+          <string>Default</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="warpScaleLabel">
+        <property name="text">
+         <string>Warp Scale</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSlider" name="warpScaleSlider">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header>QVTKWidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/qtRenderWindowDialog.ui b/Applications/VpView/qtRenderWindowDialog.ui
new file mode 100644
index 00000000..72ffeb26
--- /dev/null
+++ b/Applications/VpView/qtRenderWindowDialog.ui
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>qtRenderWindowDialog</class>
+ <widget class="QDialog" name="qtRenderWindowDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QVTKWidget" name="qvtkRenderWidget"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header>QVTKWidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpActivityConfig.cxx b/Applications/VpView/vpActivityConfig.cxx
new file mode 100644
index 00000000..16a8e007
--- /dev/null
+++ b/Applications/VpView/vpActivityConfig.cxx
@@ -0,0 +1,289 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpActivityConfig.h"
+
+#include "vgActivityType.h"
+#include "vpConfigUtils.h"
+
+#include "vtkVgActivityTypeRegistry.h"
+
+#include <QColor>
+#include <QSettings>
+#include <QtDebug>
+
+#include <assert.h>
+#include <vector>
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+struct BuiltInActivityType
+{
+  const char* Id;
+  const char* Name;
+
+  double Color[3];
+
+  bool UseRandomColors;
+
+  int IconIndex;
+};
+
+//-----------------------------------------------------------------------------
+const BuiltInActivityType BuiltInTypes[] =
+{
+  { "ACTIVITY", "Unknown", { 1.00, 1.00, 1.00 }, false, -1 }
+};
+
+enum { NumBuiltInActivityTypes = sizeof(BuiltInTypes) / sizeof(BuiltInActivityType) };
+
+} // end anonymous namespace
+
+//-----------------------------------------------------------------------------
+class vpActivityConfig::vpActivityConfigInternal
+{
+public:
+  QSettings Settings;
+  bool Dirty;
+};
+
+//-----------------------------------------------------------------------------
+vpActivityConfig::vpActivityConfig(vtkVgActivityTypeRegistry* registry)
+{
+  this->Internal = new vpActivityConfigInternal;
+  this->Internal->Dirty = false;
+  this->Internal->Settings.beginGroup("ActivityTypes");
+
+  this->ActivityTypeRegistry = registry;
+  this->ActivityTypeRegistry->Register(0);
+
+  this->SetupBuiltInTypes();
+  this->ReadActivityTypes(this->Internal->Settings);
+  this->WriteActivityTypes();
+}
+
+//-----------------------------------------------------------------------------
+vpActivityConfig::~vpActivityConfig()
+{
+  // Write out any config changes made by the user.
+  if (this->Internal->Dirty)
+    {
+    this->WriteActivityTypes();
+    }
+
+  this->ActivityTypeRegistry->UnRegister(0);
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpActivityConfig::ReadActivityTypes(QSettings& settings)
+{
+  int size = settings.beginReadArray("ActivityTypes");
+
+  for (int i = 0; i < size; ++i)
+    {
+    settings.setArrayIndex(i);
+
+    vgActivityType type;
+    type.SetId(settings.value("Id").toString().toAscii());
+    type.SetName(settings.value("Name").toString().toAscii());
+
+    QColor color = vpConfigUtils::ReadColor("Color", settings);
+    type.SetColor(color.redF(), color.greenF(), color.blueF());
+
+    QColor colorSecondary = vpConfigUtils::ReadColor("SecondaryColor", settings);
+    if (colorSecondary.isValid())
+      {
+      type.SetHasSecondaryColor(true);
+      type.SetSecondaryColor(colorSecondary.redF(), colorSecondary.greenF(),
+                             colorSecondary.blueF());
+      }
+    else
+      {
+      type.SetHasSecondaryColor(false);
+      }
+
+    type.SetUseRandomColors(settings.value("UseRandomColors").toBool());
+    type.SetIconIndex(settings.value("IconIndex", -1).toInt());
+
+    type.SetDisplayMode(
+      this->GetDisplayModeFromString(
+        settings.value("DisplayMode", vgActivityType::GetDisplayModeString(0))
+        .toString().toAscii()));
+
+    int id = this->GetIdInternal(type.GetId());
+    if (id == -1)
+      {
+      this->ActivityTypeRegistry->AddType(type);
+      }
+    else
+      {
+      this->ActivityTypeRegistry->SetType(id, type);
+      }
+    }
+
+  settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+void vpActivityConfig::WriteActivityTypes()
+{
+  this->Internal->Settings.remove("");
+  this->Internal->Settings.beginWriteArray("ActivityTypes",
+                                           this->GetNumberOfTypes());
+
+  for (int i = 0, end = this->ActivityTypeRegistry->GetNumberOfTypes(); i < end;
+       ++i)
+    {
+    const vgActivityType& type = this->ActivityTypeRegistry->GetType(i);
+    this->Internal->Settings.setArrayIndex(i);
+
+    this->Internal->Settings.setValue("Id", type.GetId());
+    this->Internal->Settings.setValue("Name", type.GetName());
+
+    double c[3];
+    QColor color;
+    type.GetColor(c[0], c[1], c[2]);
+    color.setRgbF(c[0], c[1], c[2]);
+    vpConfigUtils::WriteColor("Color", color, this->Internal->Settings);
+
+    if (type.GetHasSecondaryColor())
+      {
+      type.GetSecondaryColor(c[0], c[1], c[2]);
+      color.setRgbF(c[0], c[1], c[2]);
+      vpConfigUtils::WriteColor("SecondaryColor", color, this->Internal->Settings);
+      }
+
+    this->Internal->Settings.setValue("UseRandomColors", type.GetUseRandomColors());
+    this->Internal->Settings.setValue("IconIndex", type.GetIconIndex());
+
+    if (type.GetDisplayMode() > 0)
+      {
+      this->Internal->Settings.setValue(
+        "DisplayMode", type.GetDisplayModeString(type.GetDisplayMode()));
+      }
+    }
+
+  this->Internal->Settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+void vpActivityConfig::SetupBuiltInTypes()
+{
+  assert(this->ActivityTypeRegistry->GetNumberOfTypes() == 0);
+
+  // Add information for 'built-in' event types. These settings may be
+  // overridden by the application event configuration.
+  for (int i = 0; i < NumBuiltInActivityTypes; ++i)
+    {
+    const BuiltInActivityType& baseType = BuiltInTypes[i];
+
+    vgActivityType type;
+    type.SetId(baseType.Id);
+    type.SetName(baseType.Name);
+    type.SetColor(baseType.Color[0],
+                  baseType.Color[1],
+                  baseType.Color[2]);
+
+    type.SetUseRandomColors(baseType.UseRandomColors);
+    type.SetIconIndex(baseType.IconIndex);
+
+    this->ActivityTypeRegistry->AddType(type);
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpActivityConfig::GetNumberOfTypes()
+{
+  return this->ActivityTypeRegistry->GetNumberOfTypes();
+}
+
+//-----------------------------------------------------------------------------
+const vgActivityType& vpActivityConfig::GetActivityType(int id)
+{
+  return this->ActivityTypeRegistry->GetType(id);
+}
+
+//-----------------------------------------------------------------------------
+void vpActivityConfig::SetActivityType(int id, const vgActivityType& type)
+{
+  this->ActivityTypeRegistry->SetType(id, type);
+  this->Internal->Dirty = true;
+}
+
+//-----------------------------------------------------------------------------
+const vgEntityType& vpActivityConfig::GetEntityType(int id)
+{
+  return this->ActivityTypeRegistry->GetEntityType(id);
+}
+
+//-----------------------------------------------------------------------------
+void vpActivityConfig::SetEntityType(int id, const vgEntityType& type)
+{
+  this->ActivityTypeRegistry->SetEntityType(id, type);
+  this->Internal->Dirty = true;
+}
+
+//-----------------------------------------------------------------------------
+void vpActivityConfig::LoadFromFile(const char* filename)
+{
+  QSettings settings(filename, QSettings::IniFormat);
+  settings.beginGroup("ActivityTypes");
+  this->ReadActivityTypes(settings);
+}
+
+//-----------------------------------------------------------------------------
+int vpActivityConfig::GetId(const char* str)
+{
+  int id = this->GetIdInternal(str);
+  if (id == -1)
+    {
+    qDebug() << "Activity type id is not registered:" << str;
+    return 0; // Unregistered types refer to "Unknown" dummy type.
+    }
+  return id;
+}
+
+//-----------------------------------------------------------------------------
+void vpActivityConfig::MarkTypeUsed(int index)
+{
+  this->ActivityTypeRegistry->MarkTypeUsed(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpActivityConfig::MarkAllTypesUnused()
+{
+  this->ActivityTypeRegistry->MarkAllTypesUnused();
+}
+
+//-----------------------------------------------------------------------------
+int vpActivityConfig::GetIdInternal(const char* str)
+{
+  for (int i = 0, end = this->ActivityTypeRegistry->GetNumberOfTypes(); i < end;
+       ++i)
+    {
+    if (strcmp(str, this->ActivityTypeRegistry->GetType(i).GetId()) == 0)
+      {
+      return static_cast<int>(i);
+      }
+    }
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vpActivityConfig::GetDisplayModeFromString(const char* str)
+{
+  for (int i = 0; i < vgActivityType::NumDisplayModes; ++i)
+    {
+    if (strcmp(str, vgActivityType::GetDisplayModeString(i)) == 0)
+      {
+      return i;
+      }
+    }
+  return -1;
+}
diff --git a/Applications/VpView/vpActivityConfig.h b/Applications/VpView/vpActivityConfig.h
new file mode 100644
index 00000000..9f49dce7
--- /dev/null
+++ b/Applications/VpView/vpActivityConfig.h
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpActivityConfig_h
+#define __vpActivityConfig_h
+
+#include "vpEntityConfig.h"
+
+class QSettings;
+
+class vgActivityType;
+class vtkVgActivityTypeRegistry;
+
+class vpActivityConfig : public vpEntityConfig
+{
+public:
+  vpActivityConfig(vtkVgActivityTypeRegistry* registry);
+  virtual ~vpActivityConfig();
+
+  virtual int GetNumberOfTypes();
+
+  virtual const vgEntityType& GetEntityType(int id);
+  virtual void SetEntityType(int id, const vgEntityType& type);
+
+  virtual void MarkTypeUsed(int index);
+  virtual void MarkAllTypesUnused();
+
+  const vgActivityType& GetActivityType(int id);
+  void SetActivityType(int id, const vgActivityType& type);
+
+  int GetId(const char* idString);
+
+  void LoadFromFile(const char* filename);
+
+  static int GetDisplayModeFromString(const char* str);
+
+protected:
+  void ReadActivityTypes(QSettings& settings);
+  void WriteActivityTypes();
+
+  void SetupBuiltInTypes();
+
+  int GetIdInternal(const char* idString);
+
+private:
+  class vpActivityConfigInternal;
+  vpActivityConfigInternal* Internal;
+
+  vtkVgActivityTypeRegistry* ActivityTypeRegistry;
+
+private:
+  vpActivityConfig(const vpActivityConfig& src);  // Not implemented.
+  void operator=(const vpActivityConfig& src);    // Not implemented.
+};
+
+#endif // __vpActivityConfig_h
diff --git a/Applications/VpView/vpActivityIO.cxx b/Applications/VpView/vpActivityIO.cxx
new file mode 100644
index 00000000..f1d79bd6
--- /dev/null
+++ b/Applications/VpView/vpActivityIO.cxx
@@ -0,0 +1,22 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpActivityIO.h"
+
+#include <vpActivityConfig.h>
+
+#include <vtkVgActivityManager.h>
+
+#include <assert.h>
+
+//-----------------------------------------------------------------------------
+vpActivityIO::vpActivityIO(vtkVgActivityManager* activityManager,
+                           vpActivityConfig* activityConfig) :
+  ActivityManager(activityManager), ActivityConfig(activityConfig)
+{
+  assert(activityManager);
+  assert(activityConfig);
+}
diff --git a/Applications/VpView/vpActivityIO.h b/Applications/VpView/vpActivityIO.h
new file mode 100644
index 00000000..b8d562fe
--- /dev/null
+++ b/Applications/VpView/vpActivityIO.h
@@ -0,0 +1,28 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpActivityIO_h
+#define __vpActivityIO_h
+
+class vpActivityConfig;
+class vtkVgActivityManager;
+
+class vpActivityIO
+{
+public:
+  vpActivityIO(vtkVgActivityManager* activityManager,
+               vpActivityConfig* activityConfig);
+
+  virtual ~vpActivityIO() {}
+
+  virtual bool ReadActivities() = 0;
+
+protected:
+  vtkVgActivityManager* ActivityManager;
+  vpActivityConfig* ActivityConfig;
+};
+
+#endif // __vpActivityIO_h
diff --git a/Applications/VpView/vpAnnotation.cxx b/Applications/VpView/vpAnnotation.cxx
new file mode 100644
index 00000000..5dd51f48
--- /dev/null
+++ b/Applications/VpView/vpAnnotation.cxx
@@ -0,0 +1,262 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpAnnotation.h"
+
+#include <vtkIdListCollection.h>
+#include <vtkMatrix4x4.h>
+#include <vtkPoints.h>
+
+#include "vpViewCore.h"
+#include "vtkVgAnnotationActor.h"
+#include "vtkVgTrack.h"
+#include "vtkVgEvent.h"
+#include "vtkVgActivity.h"
+#include "vtkVgTypeDefs.h"
+
+#include <sstream>
+
+//-----------------------------------------------------------------------------
+vpAnnotation::vpAnnotation()
+  : Visible(false), ObjectType(-1), ObjectId(-1)
+{
+  this->Actor = vtkVgAnnotationActor::New();
+  this->Actor->AutoCenterXOn();
+
+  this->RepresentationMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+}
+
+//-----------------------------------------------------------------------------
+vpAnnotation::~vpAnnotation()
+{
+  this->Actor->Delete();
+}
+
+//-----------------------------------------------------------------------------
+vtkProp* vpAnnotation::GetProp()
+{
+  return this->Actor;
+}
+
+//-----------------------------------------------------------------------------
+void vpAnnotation::SetAnnotatedTrack(vtkVgTrack* track)
+{
+  if (this->ObjectType == vgObjectTypeDefinitions::Track &&
+      this->Object.Track == track)
+    {
+    return;
+    }
+
+  this->ObjectType = vgObjectTypeDefinitions::Track;
+  this->Object.Track = track;
+  this->Update();
+}
+
+//-----------------------------------------------------------------------------
+void vpAnnotation::SetAnnotatedEvent(vtkVgEvent* event)
+{
+  if (this->ObjectType == vgObjectTypeDefinitions::Event &&
+      this->Object.Event == event)
+    {
+    return;
+    }
+
+  this->ObjectType = vgObjectTypeDefinitions::Event;
+  this->Object.Event = event;
+  this->ObjectId = event->GetId();
+  this->Update();
+}
+
+//-----------------------------------------------------------------------------
+void vpAnnotation::SetAnnotatedActivity(vtkVgActivity* activity)
+{
+  if (this->ObjectType == vgObjectTypeDefinitions::Activity &&
+      this->Object.Activity == activity)
+    {
+    return;
+    }
+
+  this->ObjectType = vgObjectTypeDefinitions::Activity;
+  this->Object.Activity = activity;
+  this->ObjectId = activity->GetId();
+  this->Update();
+}
+
+//-----------------------------------------------------------------------------
+void vpAnnotation::SetAnnotatedSceneElement(vtkVgTrack* track, vtkIdType id)
+{
+  if (this->ObjectType == vgObjectTypeDefinitions::SceneElement &&
+      this->Object.Track == track)
+    {
+    return;
+    }
+
+  this->ObjectType = vgObjectTypeDefinitions::SceneElement;
+  this->Object.Track = track;
+  this->ObjectId = id;
+  this->Update();
+}
+
+//-----------------------------------------------------------------------------
+void vpAnnotation::SetRepresentationMatrix(vtkMatrix4x4* matrix)
+{
+  if (!matrix || (this->RepresentationMatrix == matrix))
+    {
+    return;
+    }
+
+  this->RepresentationMatrix->DeepCopy(matrix);
+}
+
+//-----------------------------------------------------------------------------
+void vpAnnotation::Update()
+{
+  if (!this->Visible)
+    {
+    this->Actor->SetVisibility(0);
+    return;
+    }
+
+  bool visible;
+  switch (this->ObjectType)
+    {
+    case vgObjectTypeDefinitions::Track:
+      visible = this->UpdateTrackAnnotation(this->Object.Track, "T");
+      break;
+
+    case vgObjectTypeDefinitions::Event:
+      visible = this->UpdateEventAnnotation(this->Object.Event);
+      break;
+
+    case vgObjectTypeDefinitions::Activity:
+      visible = this->UpdateActivityAnnotation(this->Object.Activity);
+      break;
+
+    case vgObjectTypeDefinitions::SceneElement:
+      visible = this->UpdateTrackAnnotation(this->Object.Track, "SE");
+      break;
+
+    default:
+      return;
+    }
+
+  this->Actor->SetVisibility(visible ? 1 : 0);
+}
+
+//-----------------------------------------------------------------------------
+bool vpAnnotation::UpdateTrackAnnotation(vtkVgTrack* track, const char* prefix)
+{
+  vtkIdList* pointIds = track->GetPointIds();
+  if (pointIds->GetNumberOfIds() == 0)
+    {
+    return false;
+    }
+
+  std::ostringstream ostr;
+  ostr << prefix << this->ObjectId;
+  unsigned int currentFrame = this->ViewCoreInstance->getCurrentFrameIndex() +
+                              this->ViewCoreInstance->getFrameNumberOffset();
+
+  this->AddFrameDelta(ostr, currentFrame,
+                      track->GetStartFrame().GetFrameNumber(),
+                      track->GetEndFrame().GetFrameNumber());
+
+  double point[4];
+  track->GetClosestFramePt(this->ViewCoreInstance->getCoreTimeStamp(), point);
+  point[2] = 0.0;
+  point[3] = 1.0;
+
+  this->RepresentationMatrix->MultiplyPoint(point, point);
+  point[0] /= point[3];
+  point[1] /= point[3];
+
+  this->Actor->SetText(ostr.str().c_str());
+  this->Actor->SetPosition(point);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpAnnotation::UpdateEventAnnotation(vtkVgEvent* event)
+{
+  std::ostringstream ostr;
+  ostr << 'E' << event->GetId();
+  unsigned int currentFrame = this->ViewCoreInstance->getCurrentFrameIndex() +
+                              this->ViewCoreInstance->getFrameNumberOffset();
+
+  // show time delta to the period when event becomes / was active
+  this->AddFrameDelta(ostr, currentFrame,
+                      event->GetStartFrame().GetFrameNumber(),
+                      event->GetEndFrame().GetFrameNumber());
+
+  double point[4];
+  event->GetDisplayPosition(this->ViewCoreInstance->getCoreTimeStamp(), point);
+  point[2] = 0.0;
+  point[3] = 1.0;
+
+  this->RepresentationMatrix->MultiplyPoint(point, point);
+  point[0] /= point[3];
+  point[1] /= point[3];
+
+  this->Actor->SetText(ostr.str().c_str());
+  this->Actor->SetPosition(point);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpAnnotation::UpdateActivityAnnotation(vtkVgActivity* activity)
+{
+  double point[4] = { 0.0, 0.0, 0.0, 1.0 };
+  double bounds[4];
+
+  int numEvents = activity->GetNumberOfEvents();
+  for (int i = 0; i < numEvents; ++i)
+    {
+    vtkVgEvent* event = activity->GetEvent(i);
+    event->GetFullBounds(bounds);
+
+    point[0] += 0.5 * (bounds[0] + bounds[1]);
+    point[1] += 0.5 * (bounds[2] + bounds[3]);
+    }
+
+  // put the annotation near the "middle" of the activity
+  point[0] /= numEvents;
+  point[1] /= numEvents;
+
+  this->RepresentationMatrix->MultiplyPoint(point, point);
+  point[0] /= point[3];
+  point[1] /= point[3];
+
+  std::ostringstream ostr;
+  ostr << 'A' << activity->GetId();
+
+  vtkVgTimeStamp startFrame, endFrame;
+  activity->GetActivityFrameExtents(startFrame, endFrame);
+  unsigned int currentFrame = this->ViewCoreInstance->getCurrentFrameIndex() +
+                              this->ViewCoreInstance->getFrameNumberOffset();
+
+  this->AddFrameDelta(ostr, currentFrame,
+                      startFrame.GetFrameNumber(), endFrame.GetFrameNumber());
+
+  this->Actor->SetText(ostr.str().c_str());
+  this->Actor->SetPosition(point);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vpAnnotation::AddFrameDelta(std::ostream& os,
+                                 unsigned int currFrame,
+                                 unsigned int firstFrame,
+                                 unsigned int lastFrame)
+{
+  if (currFrame < firstFrame)
+    {
+    os << "\n(-" << firstFrame - currFrame << ')';
+    }
+  else if (currFrame > lastFrame)
+    {
+    os << "\n(+" << currFrame - lastFrame << ')';
+    }
+}
diff --git a/Applications/VpView/vpAnnotation.h b/Applications/VpView/vpAnnotation.h
new file mode 100644
index 00000000..347b4a6c
--- /dev/null
+++ b/Applications/VpView/vpAnnotation.h
@@ -0,0 +1,90 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpAnnotation_h
+#define __vpAnnotation_h
+
+class vtkMatrix4x4;
+class vtkProp;
+
+class vpViewCore;
+class vtkVgAnnotationActor;
+class vtkVgTrack;
+class vtkVgEvent;
+class vtkVgActivity;
+
+#include <vtkSmartPointer.h>
+
+// for std::ostream
+#include <iosfwd>
+
+class vpAnnotation
+{
+public:
+  // Description:
+  // Constructor / Destructor.
+  vpAnnotation();
+  ~vpAnnotation();
+
+  // Description:
+  // Get the annotation actor;
+  vtkProp* GetProp();
+
+  // Description:
+  // Set the object to be annotated.
+  void SetAnnotatedTrack(vtkVgTrack* track);
+  void SetAnnotatedEvent(vtkVgEvent* event);
+  void SetAnnotatedActivity(vtkVgActivity* activity);
+  void SetAnnotatedSceneElement(vtkVgTrack* track, vtkIdType id);
+
+  // Description:
+  // Set matrix used to transform object positions.
+  void SetRepresentationMatrix(vtkMatrix4x4* matrix);
+  vtkMatrix4x4* GetRepresentationMatrix();
+
+  void SetViewCoreInstance(vpViewCore* vc)    { this->ViewCoreInstance = vc; }
+
+  // Description:
+  // Update the annotation.
+  void Update();
+
+  // Description:
+  // Set whether annotation should be displayed.
+  void SetVisible(bool visible) { this->Visible = visible; }
+  bool GetVisible()             { return this->Visible; }
+
+private:
+  vpAnnotation(const vpAnnotation& src);    // Not implemented.
+  void operator=(const vpAnnotation& src);  // Not implemented.
+
+  bool UpdateTrackAnnotation(vtkVgTrack* track, const char* prefix);
+  bool UpdateEventAnnotation(vtkVgEvent* event);
+  bool UpdateActivityAnnotation(vtkVgActivity* event);
+
+  void AddFrameDelta(std::ostream& os,
+                     unsigned int currFrame,
+                     unsigned int firstFrame, unsigned int lastFrame);
+
+private:
+  bool Visible;
+  int ObjectType;
+  vtkIdType ObjectId;
+
+  union
+    {
+    vtkVgTrack*    Track;
+    vtkVgEvent*    Event;
+    vtkVgActivity* Activity;
+    } Object;
+
+  vpViewCore*        ViewCoreInstance;
+
+  vtkVgAnnotationActor* Actor;
+
+  vtkSmartPointer<vtkMatrix4x4> RepresentationMatrix;
+};
+
+#endif // __vpAnnotation_h
diff --git a/Applications/VpView/vpApplication.h b/Applications/VpView/vpApplication.h
new file mode 100644
index 00000000..ad24ea46
--- /dev/null
+++ b/Applications/VpView/vpApplication.h
@@ -0,0 +1,40 @@
+#ifndef __vpApplication_h
+#define __vpApplication_h
+
+// Qt includes.
+#include <QApplication>
+
+// VpView includes.
+#include <vpSettings.h>
+
+class vpApplication : public QApplication
+{
+  Q_OBJECT
+
+public:
+  vpApplication(int& argc, char** argv) : QApplication(argc, argv)
+    {
+    }
+
+  virtual ~vpApplication()
+    {
+    }
+
+signals:
+  void settingsChanged(vpSettings::SettingsKeys flag);
+
+public:
+  static vpApplication* instance()
+    {
+    return qobject_cast<vpApplication*>(QApplication::instance());
+    }
+
+  void notifySettingsChanged(vpSettings::SettingsKeys key)
+    {
+    emit this->settingsChanged(key);
+    }
+
+
+};
+
+#endif // __vpApplication_h
diff --git a/Applications/VpView/vpAttributeConfig.cxx b/Applications/VpView/vpAttributeConfig.cxx
new file mode 100644
index 00000000..c0eaf847
--- /dev/null
+++ b/Applications/VpView/vpAttributeConfig.cxx
@@ -0,0 +1,155 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpAttributeConfig.h"
+
+#include "vpConfigUtils.h"
+
+#include <QColor>
+#include <QSettings>
+#include <QtDebug>
+
+#include <assert.h>
+#include <vector>
+
+//-----------------------------------------------------------------------------
+class vpAttributeConfig::vpAttributeConfigInternal
+{
+public:
+  vpAttributeConfigInternal()
+    : Dirty(false)
+    {
+    }
+
+public:
+  QSettings Settings;
+  QVector<vpAttributeConfig::vpAttributeType> AttributeTypes;
+  QHash<int, int> IdToTypeMap;
+  bool Dirty;
+};
+
+//-----------------------------------------------------------------------------
+vpAttributeConfig::vpAttributeConfig()
+{
+  this->Internal = new vpAttributeConfigInternal;
+  this->Internal->Settings.beginGroup("AttributeTypes");
+  this->readAttributeTypes(this->Internal->Settings);
+  this->writeAttributeTypes();
+}
+
+//-----------------------------------------------------------------------------
+vpAttributeConfig::~vpAttributeConfig()
+{
+  // Write out any config changes made by the user.
+  if (this->Internal->Dirty)
+    {
+    this->writeAttributeTypes();
+    }
+
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpAttributeConfig::readAttributeTypes(QSettings& settings)
+{
+  int size = settings.beginReadArray("AttributeTypes");
+
+  for (int i = 0; i < size; ++i)
+    {
+    settings.setArrayIndex(i);
+
+    vpAttributeType type;
+    type.Id = settings.value("Id").toInt();
+    type.Name = settings.value("Name").toString();
+
+    int index = this->getAttributeTypeIndex(type.Id);
+    if (index == -1)
+      {
+      // Add new type
+      index = this->Internal->AttributeTypes.size();
+      this->Internal->AttributeTypes.push_back(type);
+      this->Internal->IdToTypeMap.insert(type.Id, index);
+      }
+    else
+      {
+      // Update existing type
+      this->Internal->AttributeTypes[index] = type;
+      }
+    }
+
+  settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+void vpAttributeConfig::writeAttributeTypes()
+{
+  this->Internal->Settings.remove("");
+  this->Internal->Settings.beginWriteArray(
+    "AttributeTypes", this->getNumberOfTypes());
+
+  for (int i = 0, end = this->Internal->AttributeTypes.size(); i < end; ++i)
+    {
+    const vpAttributeType& type = this->Internal->AttributeTypes[i];
+
+    this->Internal->Settings.setArrayIndex(i);
+    this->Internal->Settings.setValue("Id", type.Id);
+    this->Internal->Settings.setValue("Name", type.Name);
+    }
+
+  this->Internal->Settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+int vpAttributeConfig::getNumberOfTypes()
+{
+  return this->Internal->AttributeTypes.size();
+}
+
+//-----------------------------------------------------------------------------
+int vpAttributeConfig::getAttributeTypeIndex(int id)
+{
+  return this->Internal->IdToTypeMap.value(id, -1);
+}
+
+//-----------------------------------------------------------------------------
+vpAttributeConfig::vpAttributeType vpAttributeConfig::getAttributeTypeByIndex(
+  int index)
+{
+  if (index < this->Internal->AttributeTypes.size())
+    {
+    return this->Internal->AttributeTypes[index];
+    }
+  else
+    {
+    return vpAttributeType();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vpAttributeConfig::vpAttributeType vpAttributeConfig::getAttributeTypeByName(
+  const QString& name)
+
+{
+  int count = this->getNumberOfTypes();
+  for (int i = 0; i < count; ++i)
+    {
+    if (this->Internal->AttributeTypes[i].Name.compare(
+          name, Qt::CaseSensitive) == 0)
+      {
+      return this->Internal->AttributeTypes[i];
+      }
+    }
+  return vpAttributeType();
+}
+
+//-----------------------------------------------------------------------------
+void vpAttributeConfig::loadFromFile(const QString& filename)
+{
+  QSettings settings(filename, QSettings::IniFormat);
+  settings.beginGroup("AttributeTypes");
+  this->readAttributeTypes(settings);
+  this->writeAttributeTypes();
+}
diff --git a/Applications/VpView/vpAttributeConfig.h b/Applications/VpView/vpAttributeConfig.h
new file mode 100644
index 00000000..e1450224
--- /dev/null
+++ b/Applications/VpView/vpAttributeConfig.h
@@ -0,0 +1,57 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpAttributeConfig_h
+#define __vpAttributeConfig_h
+
+class QSettings;
+
+// Qt includes
+#include <QColor>
+#include <QString>
+
+class vpAttributeConfig
+{
+public:
+  struct vpAttributeType
+    {
+    vpAttributeType()
+      : Id(-1)
+      {
+      }
+
+    int Id;
+    QString Name;
+    };
+
+  vpAttributeConfig();
+  virtual ~vpAttributeConfig();
+
+  virtual int getNumberOfTypes();
+
+  int getAttributeTypeIndex(int id);
+  vpAttributeType getAttributeTypeByIndex(int index);
+  vpAttributeType getAttributeTypeByName(const QString& name);
+
+  void loadFromFile(const QString& filename);
+
+protected:
+  void readAttributeTypes(QSettings& settings);
+  void writeAttributeTypes();
+
+private:
+  class vpAttributeConfigInternal;
+  vpAttributeConfigInternal* Internal;
+
+private:
+  /// Not implemented
+  vpAttributeConfig(const vpAttributeConfig& src);
+
+  /// Not implemented
+  void operator=(const vpAttributeConfig& src);
+};
+
+#endif // __vpAttributeConfig_h
diff --git a/Applications/VpView/vpBoundingRegion.h b/Applications/VpView/vpBoundingRegion.h
new file mode 100644
index 00000000..d497a355
--- /dev/null
+++ b/Applications/VpView/vpBoundingRegion.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpBoundingRegion_h
+#define __vpBoundingRegion_h
+
+class vtkAbstractWidget;
+class vtkPolyData;
+
+// Abstract base class for bounding region editors
+class vpBoundingRegion
+{
+public:
+  virtual ~vpBoundingRegion() {};
+
+  virtual void Initialize(vtkPolyData* pd) = 0;
+
+  virtual vtkPolyData* GetPolyData() = 0;
+  virtual vtkAbstractWidget* GetWidget() = 0;
+
+  virtual void SetVisible(int visible) = 0;
+  virtual int  GetVisible() = 0;
+
+  virtual void SetLineColor(double r, double g, double b) = 0;
+
+  virtual bool CanInteract(int X, int Y) = 0;
+};
+
+#endif // __vpBoundingRegion_h
diff --git a/Applications/VpView/vpBox.cxx b/Applications/VpView/vpBox.cxx
new file mode 100644
index 00000000..da1a1552
--- /dev/null
+++ b/Applications/VpView/vpBox.cxx
@@ -0,0 +1,106 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpBox.h"
+
+#include <vtkBorderWidget.h>
+#include <vtkCellArray.h>
+#include <vtkPoints.h>
+#include <vtkPolyData.h>
+#include <vtkProperty2D.h>
+#include <vtkRenderWindowInteractor.h>
+
+#include "vtkVgBorderRepresentation.h"
+
+//-----------------------------------------------------------------------------
+vpBox::vpBox(vtkRenderWindowInteractor* iren)
+  : Visible(1), Interactor(iren)
+{
+  this->BorderRepresentation =
+    vtkSmartPointer<vtkVgBorderRepresentation>::New();
+  this->BorderWidget = vtkSmartPointer<vtkBorderWidget>::New();
+  this->BorderWidget->SetRepresentation(this->BorderRepresentation);
+  this->BorderWidget->SetInteractor(this->Interactor);
+
+  this->SetLineColor(1.0, 1.0, 0.0);
+
+  this->PolyData = vtkSmartPointer<vtkPolyData>::New();
+  vtkPoints* pts = vtkPoints::New();
+  vtkCellArray* ca = vtkCellArray::New();
+  pts->SetNumberOfPoints(4);
+
+  vtkIdType cell[] = { 0, 1, 2, 3, 0 };
+  ca->InsertNextCell(5, cell);
+  this->PolyData->SetPoints(pts);
+  this->PolyData->SetLines(ca);
+  pts->FastDelete();
+  ca->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+vpBox::~vpBox()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpBox::Initialize(vtkPolyData* pd)
+{
+  double bounds[6];
+  pd->GetBounds(bounds);
+
+  this->BorderRepresentation->SetPosition(bounds[0], bounds[2]);
+  this->BorderRepresentation->SetPosition2(bounds[1], bounds[3]);
+  this->BorderRepresentation->Modified();
+
+  this->BorderWidget->On();
+}
+
+//-----------------------------------------------------------------------------
+void vpBox::SetVisible(int visible)
+{
+  if (visible != this->Visible)
+    {
+    this->Visible = visible;
+    this->BorderWidget->SetProcessEvents(visible);
+    this->BorderRepresentation->SetVisibility(visible);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpBox::CanInteract(int X, int Y)
+{
+  return this->BorderRepresentation->ComputeInteractionState(X, Y) != 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpBox::SetLineColor(double r, double g, double b)
+{
+  this->BorderRepresentation->GetBorderProperty()->SetColor(r, g, b);
+}
+
+//-----------------------------------------------------------------------------
+vtkPolyData* vpBox::GetPolyData()
+{
+  double ll[3];
+  double ur[3];
+  this->BorderRepresentation->GetPositionCoordinate()->GetValue(ll);
+  this->BorderRepresentation->GetPosition2Coordinate()->GetValue(ur);
+
+  vtkPoints* pts = this->PolyData->GetPoints();
+  pts->SetPoint(0, ll[0], ur[1], 0.0);
+  pts->SetPoint(1, ll[0], ll[1], 0.0);
+  pts->SetPoint(2, ur[0], ll[1], 0.0);
+  pts->SetPoint(3, ur[0], ur[1], 0.0);
+  pts->Modified();
+
+  return this->PolyData;
+}
+
+//-----------------------------------------------------------------------------
+vtkAbstractWidget* vpBox::GetWidget()
+{
+  return this->BorderWidget;
+}
diff --git a/Applications/VpView/vpBox.h b/Applications/VpView/vpBox.h
new file mode 100644
index 00000000..c9f10343
--- /dev/null
+++ b/Applications/VpView/vpBox.h
@@ -0,0 +1,48 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpBox_h
+#define __vpBox_h
+
+#include "vpBoundingRegion.h"
+
+#include <vtkSmartPointer.h>
+
+class vtkVgBorderRepresentation;
+
+class vtkAbstractWidget;
+class vtkBorderWidget;
+class vtkPolyData;
+class vtkRenderWindowInteractor;
+
+class vpBox : public vpBoundingRegion
+{
+public:
+  explicit vpBox(vtkRenderWindowInteractor* iren);
+  virtual ~vpBox();
+
+  virtual void Initialize(vtkPolyData* pd);
+
+  virtual vtkPolyData* GetPolyData();
+  virtual vtkAbstractWidget* GetWidget();
+
+  virtual void SetVisible(int visible);
+  virtual int  GetVisible() { return this->Visible; }
+
+  virtual void SetLineColor(double r, double g, double b);
+
+  virtual bool CanInteract(int X, int Y);
+
+private:
+  int Visible;
+
+  vtkSmartPointer<vtkBorderWidget> BorderWidget;
+  vtkSmartPointer<vtkVgBorderRepresentation> BorderRepresentation;
+  vtkSmartPointer<vtkRenderWindowInteractor> Interactor;
+  vtkSmartPointer<vtkPolyData> PolyData;
+};
+
+#endif // __vpBox_h
diff --git a/Applications/VpView/vpConfigUtils.cxx b/Applications/VpView/vpConfigUtils.cxx
new file mode 100644
index 00000000..58fb591d
--- /dev/null
+++ b/Applications/VpView/vpConfigUtils.cxx
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpConfigUtils.h"
+
+#include <QColor>
+#include <QSettings>
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+QString ColorString(const QColor& color)
+{
+  return QString("%1,%2,%3").arg(color.red())
+                            .arg(color.green())
+                            .arg(color.blue());
+}
+
+} // end anonymous namespace
+
+namespace vpConfigUtils
+{
+
+//-----------------------------------------------------------------------------
+QColor ReadColor(const QString& key, QSettings& settings)
+{
+  QColor color;
+  QVariant val = settings.value(key);
+  if (!val.isValid())
+    {
+    return color;
+    }
+
+  QString vs = val.toString();
+  QStringList vsp = vs.split(",");
+  if (vsp.count() == 3)
+    {
+    color.setRed(vsp[0].toInt());
+    color.setGreen(vsp[1].toInt());
+    color.setBlue(vsp[2].toInt());
+    }
+
+  return color;
+}
+
+//-----------------------------------------------------------------------------
+void WriteColor(const QString& key, const QColor& color, QSettings& settings)
+{
+  if (color.isValid())
+    {
+    settings.setValue(key, ColorString(color));
+    }
+}
+
+} // end vpConfigUtils
diff --git a/Applications/VpView/vpConfigUtils.h b/Applications/VpView/vpConfigUtils.h
new file mode 100644
index 00000000..3d58ec28
--- /dev/null
+++ b/Applications/VpView/vpConfigUtils.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpConfigUtils_h
+#define __vpConfigUtils_h
+
+class QColor;
+class QSettings;
+class QString;
+
+namespace vpConfigUtils
+{
+QColor ReadColor(const QString& key, QSettings& settings);
+void  WriteColor(const QString& key, const QColor& color, QSettings& settings);
+};
+
+#endif // __vpConfigUtils_h
diff --git a/Applications/VpView/vpConfigure.ui b/Applications/VpView/vpConfigure.ui
new file mode 100644
index 00000000..3cccf0dc
--- /dev/null
+++ b/Applications/VpView/vpConfigure.ui
@@ -0,0 +1,802 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpConfigureDialog</class>
+ <widget class="QDialog" name="vpConfigureDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>519</width>
+    <height>448</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Configure - VisGUI View</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" rowspan="2">
+    <widget class="QListWidget" name="pageChooser">
+     <property name="maximumSize">
+      <size>
+       <width>80</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="flow">
+      <enum>QListView::LeftToRight</enum>
+     </property>
+     <property name="gridSize">
+      <size>
+       <width>72</width>
+       <height>72</height>
+      </size>
+     </property>
+     <property name="viewMode">
+      <enum>QListView::IconMode</enum>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <item>
+      <property name="text">
+       <string>Data Providers</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../../Icons/vpView.qrc">
+        <normaloff>:/icons/32x32/data-providers</normaloff>:/icons/32x32/data-providers</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Display</string>
+      </property>
+      <property name="icon">
+       <iconset resource="../../Icons/vpView.qrc">
+        <normaloff>:/icons/32x32/display</normaloff>:/icons/32x32/display</iconset>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>User Interface</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QStackedWidget" name="settingsPager">
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="currentIndex">
+      <number>2</number>
+     </property>
+     <widget class="QWidget" name="pageDataProviders">
+      <layout class="QGridLayout" name="gridLayout_2">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="QGroupBox" name="groupFileSystem">
+         <property name="title">
+          <string>File System</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelOverviewURI">
+            <property name="text">
+             <string>Overview URI:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLineEdit" name="overviewURI">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelAnalysisURI">
+            <property name="text">
+             <string>Analysis URI:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <layout class="QHBoxLayout" name="analysisURILayout">
+            <property name="spacing">
+             <number>2</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="analysisURI">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="analysisURIPickLocalDir">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/vpView.qrc">
+                <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelTrackerURI">
+            <property name="text">
+             <string>Tracker URI:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <layout class="QHBoxLayout" name="trackerURILayout">
+            <property name="spacing">
+             <number>2</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="trackerURI">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="trackerURIPickLocalDir">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/vpView.qrc">
+                <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupDatabase">
+         <property name="title">
+          <string>Database</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_2">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelDatabaseHostname">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Hostname:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <layout class="QHBoxLayout" name="hostnameLayout">
+            <item>
+             <widget class="QLineEdit" name="databaseHostname">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="placeholderText">
+               <string>hostname</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLabel" name="labelDatabaseServerPort">
+              <property name="text">
+               <string>Port:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="databaseServerPort">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>4</width>
+                <height>0</height>
+               </size>
+              </property>
+              <property name="maximum">
+               <number>100000</number>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelDatabaseName">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Database:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="databaseNameComboBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="labelDriver">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Driver:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QComboBox" name="databaseDriverComboBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+            <item>
+             <property name="text">
+              <string>postgresql</string>
+             </property>
+            </item>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="labelDatabaseUsername">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Username:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="databaseUsername">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="placeholderText">
+             <string>username</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="labelDatabasePassword">
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string>Password:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLineEdit" name="databasePassword">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>100</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="echoMode">
+             <enum>QLineEdit::Password</enum>
+            </property>
+            <property name="placeholderText">
+             <string>password</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0" colspan="2">
+           <widget class="QCheckBox" name="databaseUseSourceImages">
+            <property name="text">
+             <string>Use source images</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <widget class="QGroupBox" name="groupStreaming">
+         <property name="title">
+          <string>Streaming</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="labelStreamingUpdateInterval">
+            <property name="text">
+             <string>Minimum update interval:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QSpinBox" name="streamingUpdateInterval">
+            <property name="minimumSize">
+             <size>
+              <width>4</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="suffix">
+             <string> second(s)</string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>100000</number>
+            </property>
+            <property name="value">
+             <number>5</number>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="labelStreamingTrackUpdateChunkSize">
+            <property name="text">
+             <string>Track update chunk size:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QSpinBox" name="streamingTrackUpdateChunkSize">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>4</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="suffix">
+             <string> frame(s)</string>
+            </property>
+            <property name="minimum">
+             <number>1</number>
+            </property>
+            <property name="maximum">
+             <number>100000</number>
+            </property>
+            <property name="value">
+             <number>10</number>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="pageDisplay">
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0" colspan="2">
+        <widget class="QGroupBox" name="groupBox_5">
+         <property name="title">
+          <string>Time Handling</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QCheckBox" name="displayUseTimeStampData">
+            <property name="text">
+             <string>Use timestamp data if available</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="displayForceFrameBasedVideoControls">
+            <property name="text">
+             <string>Force frame-based video controls</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="2">
+        <widget class="QGroupBox" name="groupBox_6">
+         <property name="title">
+          <string>Video Playback</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_4">
+          <item row="0" column="0">
+           <widget class="QRadioButton" name="videoSequentialPlayback">
+            <property name="toolTip">
+             <string>Display each frame for a fixed period of time</string>
+            </property>
+            <property name="text">
+             <string>Sequential</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QRadioButton" name="videoRealTimePlayback">
+            <property name="toolTip">
+             <string>Playback at a rate determined by frame times (skipping frames if necessary)</string>
+            </property>
+            <property name="text">
+             <string>Real time</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Suggested video rate:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QDoubleSpinBox" name="videoSuggestedFps">
+            <property name="toolTip">
+             <string>&quot;Best guess&quot; fps rate of the input image data. This value is ignored in real time playback mode when image timestamps are being used.</string>
+            </property>
+            <property name="suffix">
+             <string> fps</string>
+            </property>
+            <property name="minimum">
+             <double>0.100000000000000</double>
+            </property>
+            <property name="singleStep">
+             <double>0.100000000000000</double>
+            </property>
+            <property name="value">
+             <double>2.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>Image Filtering</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_2">
+          <item>
+           <widget class="QRadioButton" name="displayNoImageFiltering">
+            <property name="text">
+             <string>None</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="displayLinearImageFiltering">
+            <property name="text">
+             <string>Linear</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="2">
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Image Corner Point Usage</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QCheckBox" name="displayEnableWorldIfAvailable">
+            <property name="text">
+             <string>World (lat/lon) if available</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="displayTranslateImage">
+            <property name="text">
+             <string>Translate image (ignored if &quot;World&quot; is enabled)</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="4" column="0">
+        <widget class="QPushButton" name="trackAttributeConfig">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Track Attribute Config...</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="pageInterface">
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
+          <string>General</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <item>
+           <widget class="QCheckBox" name="uiUseZeroBasedFrameNumbers">
+            <property name="text">
+             <string>Use zero-based frame numbers</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="uiRightClickToEdit">
+            <property name="text">
+             <string>Right-click to edit</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="uiAutoAdvanceFrameDuringCreation">
+            <property name="text">
+             <string>Auto change frame during track (or FSE) creation</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Coordinate Display</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <widget class="QRadioButton" name="displayAOIRelativeCoords">
+            <property name="text">
+             <string>AOI relative</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="displayImageRelativeCoords">
+            <property name="text">
+             <string>Image relative</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttons">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../Icons/vpView.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttons</sender>
+   <signal>accepted()</signal>
+   <receiver>vpConfigureDialog</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>buttons</sender>
+   <signal>rejected()</signal>
+   <receiver>vpConfigureDialog</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>
+  <connection>
+   <sender>pageChooser</sender>
+   <signal>currentRowChanged(int)</signal>
+   <receiver>settingsPager</receiver>
+   <slot>setCurrentIndex(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>43</x>
+     <y>201</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>325</x>
+     <y>201</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/VpView/vpConfigureDialog.cxx b/Applications/VpView/vpConfigureDialog.cxx
new file mode 100644
index 00000000..ab9063e4
--- /dev/null
+++ b/Applications/VpView/vpConfigureDialog.cxx
@@ -0,0 +1,476 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QListWidget>
+#include <QPushButton>
+#include <QSettings>
+#include <QUrl>
+
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vgAttributeSet.h>
+
+// VpView includes.
+#include "vpApplication.h"
+
+#include "vpConfigureDialog.h"
+#include "vpSettings.h"
+
+//-----------------------------------------------------------------------------
+vpConfigureDialog::vpConfigureDialog(QWidget* parent) :
+  QDialog(parent), TrackAttributes(0)
+{
+  this->Settings = new vpSettings;
+  this->UI.setupUi(this);
+  this->UI.settingsPager->setCurrentIndex(0);
+  this->UI.pageChooser->item(0)->setSelected(true);
+
+  qtUtil::setStandardIcons(this->UI.buttons);
+
+  connect(this->UI.databaseHostname, SIGNAL(textChanged(QString)),
+          this, SLOT(databaseHostnameChanged(QString)));
+  connect(this->UI.databaseServerPort, SIGNAL(valueChanged(QString)),
+          this, SLOT(databaseServerPortChanged(QString)));
+  connect(this->UI.databaseDriverComboBox, SIGNAL(editTextChanged(QString)),
+          this, SLOT(databaseDriverChanged(QString)));
+  connect(this->UI.databaseNameComboBox, SIGNAL(editTextChanged(QString)),
+          this, SLOT(databaseNameChanged(QString)));
+  connect(this->UI.databaseUsername, SIGNAL(textChanged(QString)),
+          this, SLOT(databaseUsernameChanged(QString)));
+  connect(this->UI.databasePassword, SIGNAL(textChanged(QString)),
+          this, SLOT(databasePasswordChanged(QString)));
+  connect(this->UI.databaseUseSourceImages, SIGNAL(toggled(bool)),
+          this, SLOT(databaseUseSourceImagesToggled(bool)));
+
+  connect(this->UI.buttons->button(QDialogButtonBox::Apply),
+          SIGNAL(pressed()), this, SLOT(apply()));
+  connect(this->UI.buttons->button(QDialogButtonBox::Reset),
+          SIGNAL(pressed()), this, SLOT(reset()));
+
+  connect(this->UI.displayUseTimeStampData, SIGNAL(toggled(bool)),
+          this, SLOT(displayUseTimeStampDataToggled(bool)));
+
+  connect(this->UI.displayForceFrameBasedVideoControls, SIGNAL(toggled(bool)),
+          this, SLOT(displayForceFrameBasedVideoControlsToggled(bool)));
+
+  connect(this->UI.displayAOIRelativeCoords, SIGNAL(toggled(bool)),
+          this, SLOT(displayAOIRelativeCoordinatesToggled(bool)));
+  connect(this->UI.displayNoImageFiltering, SIGNAL(toggled(bool)),
+          this, SLOT(displayNoImageFilteringToggled(bool)));
+
+  connect(this->UI.displayEnableWorldIfAvailable, SIGNAL(toggled(bool)),
+          this, SLOT(displayEnableWorldIfAvailableToggled(bool)));
+  connect(this->UI.displayTranslateImage, SIGNAL(toggled(bool)),
+          this, SLOT(displayTranslateImageToggled(bool)));
+
+  connect(this->UI.trackAttributeConfig, SIGNAL(clicked()),
+          this, SLOT(configureTrackAttributes()));
+
+  connect(this->UI.uiUseZeroBasedFrameNumbers, SIGNAL(toggled(bool)),
+          this, SLOT(uiUseZeroBasedFrameNumbersToggled(bool)));
+
+  connect(this->UI.uiRightClickToEdit, SIGNAL(toggled(bool)),
+          this, SLOT(uiRightClickToEditToggled(bool)));
+
+  connect(this->UI.uiAutoAdvanceFrameDuringCreation, SIGNAL(toggled(bool)),
+          this, SLOT(uiAutoAdvanceFrameDuringCreationToggled(bool)));
+
+  connect(this->UI.streamingUpdateInterval, SIGNAL(valueChanged(int)),
+          this, SLOT(streamingUpdateIntervalChanged(int)));
+  connect(this->UI.streamingTrackUpdateChunkSize, SIGNAL(valueChanged(int)),
+          this, SLOT(streamingTrackUpdateChunkSizeChanged(int)));
+
+  connect(this->UI.videoSequentialPlayback, SIGNAL(toggled(bool)),
+          this, SLOT(videoSequentialPlaybackToggled(bool)));
+  connect(this->UI.videoSuggestedFps, SIGNAL(valueChanged(double)),
+          this, SLOT(videoSuggestedFpsChanged(double)));
+
+  this->reset();
+}
+
+//-----------------------------------------------------------------------------
+vpConfigureDialog::~vpConfigureDialog()
+{
+  delete this->Settings; this->Settings = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::setTrackAttributes(vgAttributeSet* attribs)
+{
+  this->TrackAttributes = attribs;
+  this->UI.trackAttributeConfig->setEnabled(attribs != 0);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::accept()
+{
+  this->apply();
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::reject()
+{
+  if (this->Settings->wasCommitted() &&
+      this->AcquiredSettings.contains(this->RequiredSettings))
+    {
+    QDialog::accept();
+    }
+  else
+    {
+    QDialog::reject();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::apply()
+{
+  this->Settings->commit();
+  this->setModified();
+
+  // Notify settings changed.
+  vpApplication::instance()->notifySettingsChanged(vpSettings::DatabaseSettingsKey);
+
+  // Reload settings in case they were changed externally during the apply
+  delete this->Settings;
+  this->Settings = new vpSettings;
+  this->reset();
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::reset()
+{
+  this->Settings->discard();
+  this->UI.databaseHostname->setText(
+    this->Settings->databaseHostname().toString());
+
+  this->UI.databaseServerPort->setValue(
+    this->Settings->databaseServerPort().toInt());
+
+  this->UI.databaseDriverComboBox->setEditText(
+    this->Settings->databaseDriver());
+
+  this->UI.databaseNameComboBox->setEditText(
+    this->Settings->databaseName());
+
+  this->UI.databaseUsername->setText(
+    this->Settings->databaseUsername());
+
+  this->UI.databasePassword->setText(
+    vpSettings::databasePassword());
+
+  this->UI.databaseUseSourceImages->setChecked(
+    this->Settings->databaseUseSourceImages());
+
+  this->UI.displayUseTimeStampData->setChecked(
+    this->Settings->useTimeStampData());
+
+  this->UI.displayForceFrameBasedVideoControls->setChecked(
+    this->Settings->forceFrameBasedVideoControls());
+
+  this->UI.displayAOIRelativeCoords->setChecked(
+    this->Settings->coordinateDisplayMode() == vpSettings::AOIRelativeCoords);
+
+  this->UI.displayImageRelativeCoords->setChecked(
+    this->Settings->coordinateDisplayMode() == vpSettings::ImageRelativeCoords);
+
+  this->UI.displayNoImageFiltering->setChecked(
+    this->Settings->imageFilteringMode() == vpSettings::NoFiltering);
+
+  this->UI.displayLinearImageFiltering->setChecked(
+    this->Settings->imageFilteringMode() == vpSettings::LinearFiltering);
+
+  this->UI.displayEnableWorldIfAvailable->setChecked(
+    this->Settings->worldDisplayEnabled());
+
+  this->UI.displayTranslateImage->setChecked(
+    this->Settings->translateImageEnabled());
+
+  this->UI.uiUseZeroBasedFrameNumbers->setChecked(
+    this->Settings->useZeroBasedFrameNumbers());
+
+  this->UI.uiRightClickToEdit->setChecked(
+    this->Settings->rightClickToEdit());
+
+  this->UI.uiAutoAdvanceFrameDuringCreation->setChecked(
+    this->Settings->autoAdvanceDuringCreation());
+
+  this->UI.streamingUpdateInterval->setValue(
+    this->Settings->streamingUpdateInterval());
+
+  this->UI.streamingTrackUpdateChunkSize->setValue(
+    this->Settings->streamingTrackUpdateChunkSize());
+
+  this->UI.videoSequentialPlayback->setChecked(
+    this->Settings->videoPlaybackMode() == vpSettings::SequentialPlayback);
+
+  this->UI.videoRealTimePlayback->setChecked(
+    this->Settings->videoPlaybackMode() == vpSettings::RealTimePlayback);
+
+  this->UI.videoSuggestedFps->setValue(this->Settings->videoSuggestedFps());
+
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::setRequired(vpConfigureDialog::INPUT_KEY key)
+{
+  QWidget* focusWidget = 0;
+  switch (key)
+    {
+    case DATABASE_SETTINGS_KEY:
+      this->addRequiredSettings(this->UI.databaseHostname, focusWidget);
+      this->addRequiredSettings(this->UI.databaseServerPort, focusWidget);
+      this->addRequiredSettings(this->UI.databaseNameComboBox, focusWidget);
+      this->addRequiredSettings(this->UI.databaseUsername, focusWidget);
+      this->addRequiredSettings(this->UI.databasePassword, focusWidget);
+
+      if (focusWidget)
+        {
+        focusWidget->setFocus();
+        }
+      break;
+
+    default:
+      break;
+    }
+
+  // enable/disable okay button depending on required settings filled in
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::setModified(QObject* object, bool isValid)
+{
+  bool modified = this->Settings->hasUncommittedChanges();
+  this->UI.buttons->button(QDialogButtonBox::Apply)->setEnabled(modified);
+  if (object)
+    {
+    if (isValid)
+      {
+      this->AcquiredSettings.insert(object);
+      }
+    else
+      {
+      this->AcquiredSettings.remove(object);
+      }
+    }
+  bool haveRequired = this->AcquiredSettings.contains(this->RequiredSettings);
+  this->UI.buttons->button(QDialogButtonBox::Ok)->setEnabled(haveRequired);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::databaseHostnameChanged(QString hostname)
+{
+  this->Settings->setDatabaseHostname(hostname);
+  this->setModified(this->UI.databaseHostname, !hostname.isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::databaseServerPortChanged(QString port)
+{
+  this->Settings->setDatabaseServerPort(port);
+  this->setModified(this->UI.databaseServerPort, !port.isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::databaseDriverChanged(QString driver)
+{
+  this->Settings->setDatabaseDriver(driver);
+  this->setModified(this->UI.databaseDriverComboBox, !driver.isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::databaseNameChanged(QString databaseName)
+{
+  this->Settings->setDatabaseName(databaseName);
+  this->setModified(this->UI.databaseNameComboBox, !databaseName.isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::databaseUsernameChanged(QString username)
+{
+  this->Settings->setDatabaseUsername(username);
+  this->setModified(this->UI.databaseUsername, !username.isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::databasePasswordChanged(QString password)
+{
+  vpSettings::setDatabasePassword(password);
+  this->setModified(this->UI.databasePassword, !password.isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::databaseUseSourceImagesToggled(bool state)
+{
+  this->Settings->setDatabaseUseSourceImages(state);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::uiUseZeroBasedFrameNumbersToggled(bool state)
+{
+  this->Settings->setUseZeroBasedFrameNumbers(state);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::uiRightClickToEditToggled(bool state)
+{
+  this->Settings->setRightClickToEdit(state);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::uiAutoAdvanceFrameDuringCreationToggled(bool state)
+{
+  this->Settings->setAutoAdvanceDuringCreation(state);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::streamingUpdateIntervalChanged(int val)
+{
+  this->Settings->setStreamingUpdateInterval(val);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::streamingTrackUpdateChunkSizeChanged(int val)
+{
+  this->Settings->setStreamingTrackUpdateChunkSize(val);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::addRequiredSettings(QWidget* widget, QWidget*& focusWidget)
+{
+  this->RequiredSettings.insert(widget);
+
+  bool isValid = true;
+  QLineEdit* lineEdit(0);
+  QComboBox* comboBox(0);
+
+  if ((lineEdit = qobject_cast<QLineEdit*>(widget)))
+    {
+    isValid = !lineEdit->text().isEmpty();
+    }
+  else if ((comboBox = qobject_cast<QComboBox*>(widget)))
+    {
+    isValid = !comboBox->currentText().isEmpty();
+    }
+
+  if (!isValid)
+    {
+    focusWidget || (focusWidget = widget);
+    }
+  else
+    {
+    this->AcquiredSettings.insert(widget);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::displayUseTimeStampDataToggled(bool state)
+{
+  this->Settings->setUseTimeStampData(state);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::displayForceFrameBasedVideoControlsToggled(bool state)
+{
+  this->Settings->setForceFrameBasedVideoControls(state);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::displayAOIRelativeCoordinatesToggled(bool state)
+{
+  this->Settings->setCoordinateDisplayMode(
+    state ? vpSettings::AOIRelativeCoords : vpSettings::ImageRelativeCoords);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::displayNoImageFilteringToggled(bool state)
+{
+  this->Settings->setImageFilteringMode(
+    state ? vpSettings::NoFiltering : vpSettings::LinearFiltering);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::displayEnableWorldIfAvailableToggled(bool state)
+{
+  this->Settings->setWorldDisplayEnabled(state);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::displayTranslateImageToggled(bool state)
+{
+  this->Settings->setTranslateImageEnabled(state);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::configureTrackAttributes()
+{
+  QDialog dlg;
+  dlg.setWindowTitle("Set Enabled Attributes");
+
+  QVBoxLayout* layout = new QVBoxLayout;
+  QListWidget* attrList = new QListWidget;
+  QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok |
+                                                     QDialogButtonBox::Cancel);
+  layout->addWidget(attrList);
+  layout->addWidget(buttonBox);
+  dlg.setLayout(layout);
+
+  connect(buttonBox, SIGNAL(accepted()), &dlg, SLOT(accept()));
+  connect(buttonBox, SIGNAL(rejected()), &dlg, SLOT(reject()));
+
+  std::vector<std::string> groups = this->TrackAttributes->GetGroups();
+  for (size_t i = 0, size = groups.size(); i < size; ++i)
+    {
+    QListWidgetItem* item = new QListWidgetItem(qtString(groups[i]));
+    item->setCheckState(this->TrackAttributes->IsGroupEnabled(groups[i])
+                          ? Qt::Checked : Qt::Unchecked);
+    attrList->addItem(item);
+    }
+
+  if (dlg.exec() == QDialog::Accepted)
+    {
+    QSettings settings;
+    settings.beginGroup("ShowTrackAttribute");
+
+    for (int i = 0, count = attrList->count(); i < count; ++i)
+      {
+      QListWidgetItem* item = attrList->item(i);
+      bool enabled = item->checkState() == Qt::Checked;
+      this->TrackAttributes->SetGroupEnabled(stdString(item->text()), enabled);
+      settings.setValue(item->text(), enabled);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::videoSequentialPlaybackToggled(bool state)
+{
+  this->Settings->setVideoPlaybackMode(
+    state ? vpSettings::SequentialPlayback : vpSettings::RealTimePlayback);
+  this->setModified(0, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpConfigureDialog::videoSuggestedFpsChanged(double val)
+{
+  this->Settings->setVideoSuggestedFps(val);
+  this->setModified(0, true);
+}
diff --git a/Applications/VpView/vpConfigureDialog.h b/Applications/VpView/vpConfigureDialog.h
new file mode 100644
index 00000000..5e49702e
--- /dev/null
+++ b/Applications/VpView/vpConfigureDialog.h
@@ -0,0 +1,91 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpConfigureDialog_h
+#define __vpConfigureDialog_h
+
+#include <QDialog>
+#include <QSet>
+
+#include "vpSettings.h"
+
+#include "ui_vpConfigure.h"
+
+class vgAttributeSet;
+
+class vpConfigureDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  // Enumerations for input fields.
+  enum INPUT_KEY
+    {
+    HOSTNAME_KEY = 0,
+    PORT_KEY,
+    DATEBASE_KEY,
+    DATABASE_DRIVER_KEY,
+    USERNAME_KEY,
+    PASSWORD_KEY,
+    DATABASE_SETTINGS_KEY
+    };
+
+  vpConfigureDialog(QWidget* parent);
+  virtual ~vpConfigureDialog();
+
+  void setTrackAttributes(vgAttributeSet* attribs);
+
+  Ui::vpConfigureDialog UI;
+
+public slots:
+  void accept();
+  void reject();
+  void apply();
+  void reset();
+
+  void setRequired(vpConfigureDialog::INPUT_KEY key);
+
+protected slots:
+  void databaseHostnameChanged(QString);
+  void databaseServerPortChanged(QString);
+  void databaseDriverChanged(QString);
+  void databaseNameChanged(QString);
+  void databaseUsernameChanged(QString);
+  void databasePasswordChanged(QString);
+  void databaseUseSourceImagesToggled(bool);
+
+  void displayUseTimeStampDataToggled(bool);
+  void displayForceFrameBasedVideoControlsToggled(bool);
+  void displayAOIRelativeCoordinatesToggled(bool);
+  void displayNoImageFilteringToggled(bool);
+  void displayEnableWorldIfAvailableToggled(bool);
+  void displayTranslateImageToggled(bool);
+
+  void configureTrackAttributes();
+
+  void uiUseZeroBasedFrameNumbersToggled(bool);
+  void uiRightClickToEditToggled(bool);
+  void uiAutoAdvanceFrameDuringCreationToggled(bool);
+
+  void streamingUpdateIntervalChanged(int);
+  void streamingTrackUpdateChunkSizeChanged(int);
+
+  void videoSequentialPlaybackToggled(bool);
+  void videoSuggestedFpsChanged(double);
+
+protected:
+  void addRequiredSettings(QWidget* widget, QWidget*& focusWidget);
+  void setModified(QObject* object = 0, bool isValid = false);
+
+  vpSettings* Settings;
+
+  QSet<QObject*> RequiredSettings;
+  QSet<QObject*> AcquiredSettings;
+
+  vgAttributeSet* TrackAttributes;
+};
+
+#endif
diff --git a/Applications/VpView/vpContour.cxx b/Applications/VpView/vpContour.cxx
new file mode 100644
index 00000000..b0fa6d5f
--- /dev/null
+++ b/Applications/VpView/vpContour.cxx
@@ -0,0 +1,157 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpContour.h"
+
+#include <vtkLinearContourLineInterpolator.h>
+#include <vtkMatrix4x4.h>
+#include <vtkProperty.h>
+#include <vtkRenderWindowInteractor.h>
+
+#include "vtkVgContourRepresentation.h"
+#include "vtkVgContourWidget.h"
+
+
+//-----------------------------------------------------------------------------
+vpContour::vpContour(vtkRenderWindowInteractor* iren)
+  : Visible(1), InteractionDisabled(false), Interactor(iren)
+{
+  this->ContourRepresentation =
+    vtkSmartPointer<vtkVgContourRepresentation>::New();
+  this->ContourWidget = vtkSmartPointer<vtkVgContourWidget>::New();
+  this->ContourWidget->SetRepresentation(this->ContourRepresentation);
+  this->ContourWidget->SetInteractor(this->Interactor);
+
+  vtkLinearContourLineInterpolator* interpolator =
+    vtkLinearContourLineInterpolator::New();
+
+  this->FinalLineColor[0] = 0.8;
+  this->FinalLineColor[1] = 0.8;
+  this->FinalLineColor[2] = 0.8;
+
+  this->ContourRepresentation->SetLineColor(1.0, 1.0, 1.0);
+  this->ContourRepresentation->AlwaysOnTopOn();
+  this->ContourRepresentation->SetLineInterpolator(interpolator);
+
+  this->WorldToImageMatrix = vtkMatrix4x4::New();
+
+  interpolator->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+vpContour::~vpContour()
+{
+  this->WorldToImageMatrix->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::Initialize()
+{
+  this->ContourWidget->On();
+  this->ContourWidget->Initialize();
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::Initialize(vtkPolyData* pd)
+{
+  this->ContourWidget->On();
+  this->ContourWidget->Initialize(pd);
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::Begin()
+{
+  this->ContourWidget->FollowCursorOn();
+  this->ContourWidget->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::End()
+{
+  // don't auto-add a 'dangling' mouse cursor node
+  if (!this->ContourRepresentation->GetClosedLoop())
+    {
+    this->ContourRepresentation->DeleteLastNode();
+    }
+  this->ContourWidget->CloseLoop();
+  this->DisableInteraction();
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::Finalize()
+{
+  this->ContourRepresentation->SetLineColor(this->FinalLineColor[0],
+                                            this->FinalLineColor[1],
+                                            this->FinalLineColor[2]);
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::SetVisible(int visible)
+{
+  if (visible != this->Visible)
+    {
+    this->Visible = visible;
+    this->ContourWidget->SetProcessEvents(visible &&
+                                          !this->InteractionDisabled);
+    this->ContourRepresentation->SetVisibility(visible);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpContour::CanInteract(int X, int Y)
+{
+  double pos[3];
+  return this->ContourRepresentation->FindClosestPoint(X, Y, pos) != 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::SetLineColor(double r, double g, double b)
+{
+  this->ContourRepresentation->SetLineColor(r, g, b);
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::SetFinalLineColor(double r, double g, double b)
+{
+  this->FinalLineColor[0] = r;
+  this->FinalLineColor[1] = g;
+  this->FinalLineColor[2] = b;
+}
+
+//-----------------------------------------------------------------------------
+vtkPolyData* vpContour::GetPolyData()
+{
+  return this->ContourRepresentation->GetContourRepresentationAsPolyData();
+}
+
+//-----------------------------------------------------------------------------
+vtkAbstractWidget* vpContour::GetWidget()
+{
+  return this->ContourWidget;
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::DisableInteraction()
+{
+  this->InteractionDisabled = true;
+  this->ContourWidget->ProcessEventsOff();
+
+  this->ContourRepresentation->GetProperty()->SetOpacity(0.0);
+  this->ContourRepresentation->GetActiveProperty()->SetOpacity(0.0);
+}
+
+//-----------------------------------------------------------------------------
+void vpContour::SetWorldToImageMatrix(vtkMatrix4x4* matrix)
+{
+  if (matrix)
+    {
+    this->WorldToImageMatrix->DeepCopy(matrix);
+    }
+  else
+    {
+    this->WorldToImageMatrix->Identity();
+    }
+}
diff --git a/Applications/VpView/vpContour.h b/Applications/VpView/vpContour.h
new file mode 100644
index 00000000..8dc0ca9c
--- /dev/null
+++ b/Applications/VpView/vpContour.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpContour_h
+#define __vpContour_h
+
+#include "vpBoundingRegion.h"
+
+#include "vtkVgTimeStamp.h"
+
+#include <vtkSmartPointer.h>
+
+class vtkAbstractWidget;
+class vtkContourWidget;
+class vtkMatrix4x4;
+class vtkPolyData;
+class vtkRenderWindowInteractor;
+class vtkVgContourWidget;
+class vtkVgContourRepresentation;
+class vtkVgGeode;
+class vtkVgGroupNode;
+
+class vpContour : public vpBoundingRegion
+{
+public:
+  explicit vpContour(vtkRenderWindowInteractor* iren);
+  virtual ~vpContour();
+
+  void Initialize();
+  virtual void Initialize(vtkPolyData* pd);
+
+  void Begin();
+  void End();
+
+  void Finalize();
+
+  virtual vtkPolyData* GetPolyData();
+  virtual vtkAbstractWidget* GetWidget();
+
+  virtual void SetVisible(int visible);
+  virtual int  GetVisible() { return this->Visible; }
+
+  virtual void SetLineColor(double r, double g, double b);
+  void SetFinalLineColor(double r, double g, double b);
+
+  virtual bool CanInteract(int X, int Y);
+
+  void SetTimeStamp(vtkVgTimeStamp& timeStamp)
+    {
+    this->TimeStamp = timeStamp;
+    }
+  const vtkVgTimeStamp* GetTimeStampPtr()
+    {
+    return &this->TimeStamp;
+    }
+
+  void SetWorldToImageMatrix(vtkMatrix4x4* matrix);
+  vtkMatrix4x4* GetWorldToImageMatrix()
+    {
+    return this->WorldToImageMatrix;
+    }
+
+protected:
+  void DisableInteraction();
+
+private:
+  int Visible;
+  bool InteractionDisabled;
+  double FinalLineColor[3];
+
+  vtkVgTimeStamp TimeStamp;
+  vtkMatrix4x4* WorldToImageMatrix;
+
+  vtkSmartPointer<vtkVgContourWidget> ContourWidget;
+  vtkSmartPointer<vtkVgContourRepresentation> ContourRepresentation;
+  vtkSmartPointer<vtkRenderWindowInteractor> Interactor;
+};
+
+#endif // __vpContour_h
diff --git a/Applications/VpView/vpCreateEventDialog.cxx b/Applications/VpView/vpCreateEventDialog.cxx
new file mode 100644
index 00000000..a1832ee2
--- /dev/null
+++ b/Applications/VpView/vpCreateEventDialog.cxx
@@ -0,0 +1,476 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpCreateEventDialog.h"
+
+#include "ui_vpCreateEventDialog.h"
+
+#include "vpUtils.h"
+#include "vpViewCore.h"
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+
+#include <vtkIdList.h>
+
+//-----------------------------------------------------------------------------
+class vpCreateEventDialogPrivate
+{
+public:
+  Ui_vpCreateEventDialog UI;
+
+  int Session;
+
+  vpViewCore* ViewCore;
+  vtkSmartPointer<vtkVgEvent> Event;
+  vtkSmartPointer<vtkVgEventModel> EventModel;
+};
+
+QTE_IMPLEMENT_D_FUNC(vpCreateEventDialog)
+
+//-----------------------------------------------------------------------------
+vpCreateEventDialog::vpCreateEventDialog(vpViewCore* coreInstance, int session,
+                                         QWidget* parent,
+                                         Qt::WindowFlags flags)
+  : QDialog(parent, flags), d_ptr(new vpCreateEventDialogPrivate)
+{
+  QTE_D(vpCreateEventDialog);
+
+  d->UI.setupUi(this);
+
+  d->Session = session;
+  d->ViewCore = coreInstance;
+  d->EventModel = coreInstance->getEventModel(session);
+
+  // populate the event types combo
+  vtkVgEventTypeRegistry* eventTypes = d->ViewCore->getEventTypeRegistry();
+  for (int i = 0, end = eventTypes->GetNumberOfTypes(); i != end; ++i)
+    {
+    const vgEventType& type = eventTypes->GetType(i);
+    d->UI.comboBox->addItem(type.GetName(), type.GetId());
+    }
+
+  d->UI.status->setVisible(false);
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setText("Add Event");
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
+  d->UI.buttonBox->button(QDialogButtonBox::Cancel)->setText("Close");
+
+  // signal-slot connections
+  connect(d->ViewCore, SIGNAL(trackPicked(int, int)),
+          this, SLOT(addTrack(int, int)));
+
+  connect(d->UI.comboBox, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(setEventType(int)));
+
+  connect(d->UI.startHere, SIGNAL(clicked()), this, SLOT(startEventHere()));
+  connect(d->UI.endHere, SIGNAL(clicked()), this, SLOT(endEventHere()));
+
+  connect(d->UI.trackUp, SIGNAL(clicked()), this, SLOT(moveTrackUp()));
+  connect(d->UI.trackDown, SIGNAL(clicked()), this, SLOT(moveTrackDown()));
+  connect(d->UI.trackDelete, SIGNAL(clicked()), this, SLOT(removeTrack()));
+}
+
+//-----------------------------------------------------------------------------
+vpCreateEventDialog::~vpCreateEventDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::initialize()
+{
+  QTE_D(vpCreateEventDialog);
+
+  // create the event we will be showing in the main view
+  vtkSmartPointer<vtkIdList> trackIds = vtkSmartPointer<vtkIdList>::New();
+  int id = d->ViewCore->createEvent(
+             d->UI.comboBox->itemData(d->UI.comboBox->currentIndex()).toInt(),
+             trackIds, d->Session);
+
+  d->Event = d->EventModel->GetEvent(id);
+
+  if (d->Event)
+    {
+    d->Event->SetStartFrame(d->ViewCore->getCoreTimeStamp());
+    }
+
+  d->UI.trackList->clear();
+  this->updateEventTimeRange();
+  this->validate();
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::addTrack(int trackId, int session)
+{
+  QTE_D(vpCreateEventDialog);
+
+  if (!d->Event || session != d->Session)
+    {
+    return;
+    }
+
+  vtkVgTrack* track = d->EventModel->GetTrackModel()->GetTrack(trackId);
+
+  vtkVgTimeStamp trackStart = track->GetStartFrame();
+  vtkVgTimeStamp trackEnd = track->GetEndFrame();
+
+  // look for existing track with that id
+  QTreeWidgetItem* item = 0;
+  for (int i = 0, end = d->UI.trackList->topLevelItemCount(); i != end; ++i)
+    {
+    QTreeWidgetItem* current = d->UI.trackList->topLevelItem(i);
+    if (current->data(0, Qt::DisplayRole).toInt() == trackId)
+      {
+      item = current;
+      break;
+      }
+    }
+
+  // create new item if not already present
+  if (!item)
+    {
+    item = new QTreeWidgetItem;
+    item->setData(0, Qt::DisplayRole, trackId);
+    d->UI.trackList->addTopLevelItem(item);
+
+    // If the event start or end time haven't been defined, set the track start
+    // or end to the current frame. Otherwise set it to the event start or end
+    // time. This allows a user to rapidly create events by creating the event
+    // when the main view is on the desired start frame, then advancing to the
+    // last frame and clicking all the tracks that should be included.
+    vtkVgTimeStamp frame = d->ViewCore->getCoreTimeStamp();
+    vtkVgTimeStamp etStart = d->Event->GetStartFrame().IsMaxTime() ? frame :
+                             d->Event->GetStartFrame();
+    vtkVgTimeStamp etEnd = d->Event->GetEndFrame().IsMinTime() ? frame :
+                           d->Event->GetEndFrame();
+
+    // Make sure the end frame is not before the start. This may happen if the
+    // dialog is initialized, then the frame is moved back before a track is
+    // added.
+    if (etStart > etEnd)
+      {
+      etStart = etEnd;
+      }
+
+    d->Event->AddTrack(
+      track,
+      this->clamp(etStart, trackStart, trackEnd),
+      this->clamp(etEnd, trackStart, trackEnd));
+    }
+
+  // select it
+  d->UI.trackList->setCurrentItem(item);
+
+  this->updateEventTimeRange();
+  this->updateTrackTimeRanges();
+  this->validate();
+
+  d->EventModel->Modified();
+  d->ViewCore->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::accept()
+{
+  QTE_D(vpCreateEventDialog);
+
+  // "finalize" the event and we're done
+  d->Event->ClearFlags(vtkVgEvent::EF_Modifiable);
+
+  vtkIdType id = d->Event->GetId();
+  emit this->eventCreated(id);
+
+  this->initialize();
+  d->UI.status->setText(QString("(created event %1)").arg(id));
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::reject()
+{
+  QTE_D(vpCreateEventDialog);
+
+  // remove our temp event
+  if (d->Event)
+    {
+    d->EventModel->RemoveEvent(d->Event->GetId());
+    d->ViewCore->update();
+    }
+
+  this->QDialog::reject();
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::setEventType(int typeIndex)
+{
+  QTE_D(vpCreateEventDialog);
+
+  this->validate();
+
+  if (d->Event)
+    {
+    d->Event->ResetClassifiers();
+    d->Event->AddClassifier(d->UI.comboBox->itemData(typeIndex).toInt(), 1.0);
+    d->EventModel->Modified();
+    d->ViewCore->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::startEventHere()
+{
+  QTE_D(vpCreateEventDialog);
+
+  if (!d->Event)
+    {
+    return;
+    }
+
+  vtkVgTimeStamp frame = d->ViewCore->getCoreTimeStamp();
+  vtkVgTimeStamp endFrame = d->Event->GetEndFrame();
+
+  // If there are no tracks yet, set the start time on event directy. Otherwise,
+  // let the event adjust it's own time range based on the range of the parent
+  // tracks.
+  if (d->UI.trackList->topLevelItemCount() == 0)
+    {
+    if (!endFrame.IsMinTime() && endFrame < frame)
+      {
+      d->Event->SetEndFrame(frame);
+      }
+    d->Event->SetStartFrame(frame);
+    }
+  else
+    {
+    // propagate start time to tracks
+    for (int i = 0, size = d->UI.trackList->topLevelItemCount(); i < size; ++i)
+      {
+      // don't go outside the bounds of the full track
+      vtkVgTrack* track = d->Event->GetTrack(i);
+      vtkVgTimeStamp ts = this->clamp(frame, track->GetStartFrame(),
+                                      track->GetEndFrame());
+
+      if (ts > d->Event->GetTrackInfo(i)->EndFrame)
+        {
+        d->Event->SetTrackEndFrame(i, ts);
+        }
+      d->Event->SetTrackStartFrame(i, ts);
+      }
+    }
+
+  this->updateEventTimeRange();
+  this->updateTrackTimeRanges();
+
+  d->EventModel->Modified();
+  d->ViewCore->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::endEventHere()
+{
+  QTE_D(vpCreateEventDialog);
+
+  if (!d->Event)
+    {
+    return;
+    }
+
+  vtkVgTimeStamp frame = d->ViewCore->getCoreTimeStamp();
+  vtkVgTimeStamp startFrame = d->Event->GetStartFrame();
+
+  if (d->UI.trackList->topLevelItemCount() == 0)
+    {
+    if (!startFrame.IsMaxTime() && startFrame > frame)
+      {
+      d->Event->SetStartFrame(frame);
+      }
+    d->Event->SetEndFrame(frame);
+    }
+  else
+    {
+    // propagate end time to tracks
+    for (int i = 0, size = d->UI.trackList->topLevelItemCount(); i < size; ++i)
+      {
+      // don't go outside the bounds of the full track
+      vtkVgTrack* track = d->Event->GetTrack(i);
+      vtkVgTimeStamp ts = this->clamp(frame, track->GetStartFrame(),
+                                      track->GetEndFrame());
+
+      if (ts < d->Event->GetTrackInfo(i)->StartFrame)
+        {
+        d->Event->SetTrackStartFrame(i, ts);
+        }
+      d->Event->SetTrackEndFrame(i, ts);
+      }
+    }
+
+  this->updateEventTimeRange();
+  this->updateTrackTimeRanges();
+
+  d->EventModel->Modified();
+  d->ViewCore->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::moveTrackUp()
+{
+  QTE_D(vpCreateEventDialog);
+
+  QModelIndex index = d->UI.trackList->currentIndex();
+  if (!index.isValid() || index.row() == 0)
+    {
+    return;
+    }
+
+  d->Event->SwapTracks(index.row(), index.row() - 1);
+
+  QTreeWidgetItem* item = d->UI.trackList->takeTopLevelItem(index.row());
+  d->UI.trackList->insertTopLevelItem(index.row() - 1, item);
+  d->UI.trackList->setCurrentItem(item);
+
+  d->EventModel->Modified();
+  d->ViewCore->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::moveTrackDown()
+{
+  QTE_D(vpCreateEventDialog);
+
+  QModelIndex index = d->UI.trackList->currentIndex();
+  if (!index.isValid() ||
+      index.row() == d->UI.trackList->model()->rowCount() - 1)
+    {
+    return;
+    }
+
+  d->Event->SwapTracks(index.row(), index.row() + 1);
+
+  QTreeWidgetItem* item = d->UI.trackList->takeTopLevelItem(index.row());
+  d->UI.trackList->insertTopLevelItem(index.row() + 1, item);
+  d->UI.trackList->setCurrentItem(item);
+
+  d->EventModel->Modified();
+  d->ViewCore->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::removeTrack()
+{
+  QTE_D(vpCreateEventDialog);
+
+  QModelIndex index = d->UI.trackList->currentIndex();
+  if (!index.isValid())
+    {
+    return;
+    }
+
+  d->Event->RemoveTrack(index.row());
+  delete d->UI.trackList->takeTopLevelItem(index.row());
+  this->validate();
+  d->EventModel->Modified();
+  d->ViewCore->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::updateEventTimeRange()
+{
+  QTE_D(vpCreateEventDialog);
+
+  if (!d->Event)
+    {
+    d->UI.startTime->setText(QString());
+    d->UI.endTime->setText(QString());
+    return;
+    }
+
+  int frameOffset = d->ViewCore->getUseZeroBasedFrameNumbers() ? 0 : 1;
+  d->UI.startTime->setText(
+    vpUtils::GetTimeAndFrameNumberString(d->Event->GetStartFrame(), frameOffset));
+  d->UI.endTime->setText(
+    vpUtils::GetTimeAndFrameNumberString(d->Event->GetEndFrame(), frameOffset));
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::updateTrackTimeRanges()
+{
+  QTE_D(vpCreateEventDialog);
+
+  if (!d->Event)
+    {
+    return;
+    }
+
+  int frameOffset = d->ViewCore->getUseZeroBasedFrameNumbers() ? 0 : 1;
+
+  for (int i = 0, size = d->UI.trackList->topLevelItemCount(); i < size; ++i)
+    {
+    QTreeWidgetItem* item = d->UI.trackList->topLevelItem(i);
+    vtkVgEventTrackInfoBase* info = d->Event->GetTrackInfo(i);
+    item->setText(1, vpUtils::GetTimeAndFrameNumberString(info->StartFrame,
+                                                          frameOffset));
+    item->setText(2, vpUtils::GetTimeAndFrameNumberString(info->EndFrame,
+                                                          frameOffset));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpCreateEventDialog::validate()
+{
+  QTE_D(vpCreateEventDialog);
+
+  int typeIndex = d->UI.comboBox->currentIndex();
+  if (d->UI.comboBox->count() == 0 || typeIndex < 0)
+    {
+    d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+    d->UI.status->setText("(valid event type not selected)");
+    d->UI.status->setVisible(true);
+    return;
+    }
+
+  if (!d->Event)
+    {
+    d->UI.status->setText("(failed to create placeholder event)");
+    d->UI.status->setVisible(true);
+    return;
+    }
+
+  int minTracks =
+    d->ViewCore->getEventTypeRegistry()->GetType(typeIndex).GetMinTracks();
+  int maxTracks =
+    d->ViewCore->getEventTypeRegistry()->GetType(typeIndex).GetMaxTracks();
+
+  int numTracks = d->Event->GetNumberOfTracks();
+
+  if (numTracks < minTracks)
+    {
+    d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+    d->UI.status->setText("(not enough tracks for this type)");
+    d->UI.status->setVisible(true);
+    return;
+    }
+
+  if (maxTracks > 0 && numTracks > maxTracks)
+    {
+    d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+    d->UI.status->setText("(too many tracks for this type)");
+    d->UI.status->setVisible(true);
+    return;
+    }
+
+  // all good
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+  d->UI.status->setVisible(false);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vpCreateEventDialog::clamp(const vtkVgTimeStamp& val,
+                                          const vtkVgTimeStamp& a,
+                                          const vtkVgTimeStamp& b)
+{
+  return val < a ? a : val > b ? b : val;
+}
diff --git a/Applications/VpView/vpCreateEventDialog.h b/Applications/VpView/vpCreateEventDialog.h
new file mode 100644
index 00000000..c590de28
--- /dev/null
+++ b/Applications/VpView/vpCreateEventDialog.h
@@ -0,0 +1,65 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpCreateEventDialog_h
+#define __vpCreateEventDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class vpCreateEventDialogPrivate;
+class vpViewCore;
+
+class vtkVgTimeStamp;
+
+class vpCreateEventDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vpCreateEventDialog(vpViewCore* coreInstance, int session,
+                      QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vpCreateEventDialog();
+
+  void initialize();
+
+signals:
+  void eventCreated(int id);
+
+public slots:
+  void addTrack(int trackId, int session);
+
+  virtual void accept();
+  virtual void reject();
+
+protected slots:
+  void setEventType(int typeIndex);
+
+  void startEventHere();
+  void endEventHere();
+
+  void moveTrackUp();
+  void moveTrackDown();
+  void removeTrack();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vpCreateEventDialog)
+
+  void updateEventTimeRange();
+  void updateTrackTimeRanges();
+
+  void validate();
+
+  static vtkVgTimeStamp clamp(const vtkVgTimeStamp& val,
+                              const vtkVgTimeStamp& a,
+                              const vtkVgTimeStamp& b);
+
+private:
+  QTE_DECLARE_PRIVATE(vpCreateEventDialog)
+};
+
+#endif // __vpCreateEventDialog_h
diff --git a/Applications/VpView/vpCreateEventDialog.ui b/Applications/VpView/vpCreateEventDialog.ui
new file mode 100644
index 00000000..20f22350
--- /dev/null
+++ b/Applications/VpView/vpCreateEventDialog.ui
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpCreateEventDialog</class>
+ <widget class="QDialog" name="vpCreateEventDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>386</width>
+    <height>299</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Create Event</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="3" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupParentTracks">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Parent Tracks (add by picking in main view)</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="2">
+       <widget class="QToolButton" name="trackUp">
+        <property name="icon">
+         <iconset resource="../../Icons/vvwidgets.qrc">
+          <normaloff>:/icons/22x22/arrow-up</normaloff>:/icons/22x22/arrow-up</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QToolButton" name="trackDown">
+        <property name="icon">
+         <iconset resource="../../Icons/vvwidgets.qrc">
+          <normaloff>:/icons/22x22/arrow-down</normaloff>:/icons/22x22/arrow-down</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QToolButton" name="trackDelete">
+        <property name="icon">
+         <iconset resource="../../Icons/vvwidgets.qrc">
+          <normaloff>:/icons/22x22/delete</normaloff>:/icons/22x22/delete</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" rowspan="4" colspan="2">
+       <widget class="QTreeWidget" name="trackList">
+        <property name="rootIsDecorated">
+         <bool>false</bool>
+        </property>
+        <property name="allColumnsShowFocus">
+         <bool>true</bool>
+        </property>
+        <column>
+         <property name="text">
+          <string>Id</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>Start Time</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>End Time</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="5" column="1" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Event</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1,1">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Type:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" colspan="2">
+       <widget class="QComboBox" name="comboBox"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Start Time:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="startTime">
+        <property name="text">
+         <string>Start:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="startHere">
+        <property name="text">
+         <string>Start Here</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>End Time:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLabel" name="endTime">
+        <property name="text">
+         <string>End:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QPushButton" name="endHere">
+        <property name="text">
+         <string>End Here</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="status">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>()</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../Icons/vvwidgets.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vpCreateEventDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vpCreateEventDialog</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>
diff --git a/Applications/VpView/vpDBConnection.h b/Applications/VpView/vpDBConnection.h
new file mode 100644
index 00000000..2a4d5b10
--- /dev/null
+++ b/Applications/VpView/vpDBConnection.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpDBConnection_h
+#define __vpDBConnection_h
+
+struct vpDBConnection
+{
+  std::string DatabaseName;
+  std::string Driver;
+  std::string Password;
+  std::string Port;
+  std::string Hostname;
+  std::string Username;
+};
+
+#endif // __vpDBConnection_h
diff --git a/Applications/VpView/vpDBSessionMetaData.h b/Applications/VpView/vpDBSessionMetaData.h
new file mode 100644
index 00000000..a696dd07
--- /dev/null
+++ b/Applications/VpView/vpDBSessionMetaData.h
@@ -0,0 +1,21 @@
+#ifndef __vpDBSessionMetaData_h
+#define __vpDBSessionMetaData_h
+
+#include <map>
+#include <string>
+
+struct vpDBSessionMetaData
+{
+  long SessionId;
+
+  std::string SessionType;
+  int TracksSessionId;
+  int EventsSessionId;
+  int ActivitiesSessionId;
+  int AOIId;
+  std::string DateCreated;
+
+  std::map<std::string, std::string> Parameters;
+};
+
+#endif // __vpDBSessionMetaData_h
diff --git a/Applications/VpView/vpEditTrackTypesDialog.cxx b/Applications/VpView/vpEditTrackTypesDialog.cxx
new file mode 100644
index 00000000..76275bf7
--- /dev/null
+++ b/Applications/VpView/vpEditTrackTypesDialog.cxx
@@ -0,0 +1,123 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpEditTrackTypesDialog.h"
+
+#include "ui_vpEditTrackTypesDialog.h"
+
+#include <QInputDialog>
+#include <QMessageBox>
+
+#include "vpTrackConfig.h"
+
+#include <vgTrackType.h>
+
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+
+//-----------------------------------------------------------------------------
+class vpEditTrackTypesDialogPrivate
+{
+public:
+  Ui_vpEditTrackTypesDialog UI;
+
+  vpTrackConfig* TrackTypes;
+  vtkVgTrackModel* TrackModel;
+};
+
+QTE_IMPLEMENT_D_FUNC(vpEditTrackTypesDialog)
+
+//-----------------------------------------------------------------------------
+vpEditTrackTypesDialog::vpEditTrackTypesDialog(vpTrackConfig* trackTypes,
+                                               vtkVgTrackModel* trackModel,
+                                               QWidget* parent,
+                                               Qt::WindowFlags flags) :
+  QDialog(parent, flags), d_ptr(new vpEditTrackTypesDialogPrivate)
+{
+  QTE_D(vpEditTrackTypesDialog);
+
+  d->UI.setupUi(this);
+
+  d->TrackTypes = trackTypes;
+  d->TrackModel = trackModel;
+
+  connect(d->UI.remove, SIGNAL(clicked()), this, SLOT(remove()));
+
+  this->buildTypesList();
+}
+
+//-----------------------------------------------------------------------------
+vpEditTrackTypesDialog::~vpEditTrackTypesDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpEditTrackTypesDialog::remove()
+{
+  QTE_D(vpEditTrackTypesDialog);
+
+  QListWidgetItem* item = d->UI.types->currentItem();
+  if (!item)
+    {
+    return;
+    }
+
+  int idx = d->TrackTypes->GetTrackTypeIndex(qPrintable(item->text()));
+  if (idx == -1)
+    {
+    return;
+    }
+
+  vgTrackType type = d->TrackTypes->GetTrackTypeByIndex(idx);
+
+  // Make sure no tracks are using the type to be removed
+  vtkVgTrackInfo trackInfo;
+  d->TrackModel->InitTrackTraversal();
+  while ((trackInfo = d->TrackModel->GetNextTrack()).GetTrack())
+    {
+    if (trackInfo.GetTrack()->GetType() == idx)
+      {
+      QMessageBox::warning(this, QString(),
+                           QString("One or more tracks have the type \"%1\".")
+                           .arg(type.GetId()));
+      return;
+      }
+    }
+
+  if (QMessageBox::warning(this, QString(),
+                           QString("Are you sure you want to remove \"%1\"?")
+                           .arg(type.GetId()),
+                           QMessageBox::Ok | QMessageBox::Cancel) !=
+      QMessageBox::Ok)
+    {
+    return;
+    }
+
+  // For now, indicate the type is invalid by setting its name to the empty
+  // string. We can't remove the type altogether since tracks currently refer to
+  // types by index.
+  type.SetId("");
+  d->TrackTypes->SetType(idx, type);
+
+  this->buildTypesList();
+}
+
+//-----------------------------------------------------------------------------
+void vpEditTrackTypesDialog::buildTypesList()
+{
+  QTE_D(vpEditTrackTypesDialog);
+
+  d->UI.types->clear();
+  for (int i = 0, n = d->TrackTypes->GetNumberOfTypes(); i < n; ++i)
+    {
+    const vgTrackType& type = d->TrackTypes->GetTrackTypeByIndex(i);
+    const char *name = type.GetName();
+    if (*name)
+      {
+      d->UI.types->addItem(new QListWidgetItem(name));
+      }
+    }
+}
diff --git a/Applications/VpView/vpEditTrackTypesDialog.h b/Applications/VpView/vpEditTrackTypesDialog.h
new file mode 100644
index 00000000..719e68a1
--- /dev/null
+++ b/Applications/VpView/vpEditTrackTypesDialog.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpEditTrackTypesDialog_h
+#define __vpEditTrackTypesDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class vpEditTrackTypesDialogPrivate;
+class vpTrackConfig;
+class vtkVgTrackModel;
+
+class vpEditTrackTypesDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vpEditTrackTypesDialog(vpTrackConfig* trackTypes,
+                         vtkVgTrackModel* trackModel,
+                         QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vpEditTrackTypesDialog();
+
+private slots:
+  void remove();
+
+private:
+  void buildTypesList();
+
+private:
+  QTE_DECLARE_PRIVATE_RPTR(vpEditTrackTypesDialog)
+  QTE_DECLARE_PRIVATE(vpEditTrackTypesDialog)
+};
+
+#endif // __vpEditTrackTypesDialog_h
diff --git a/Applications/VpView/vpEditTrackTypesDialog.ui b/Applications/VpView/vpEditTrackTypesDialog.ui
new file mode 100644
index 00000000..d1d45392
--- /dev/null
+++ b/Applications/VpView/vpEditTrackTypesDialog.ui
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpEditTrackTypesDialog</class>
+ <widget class="QDialog" name="vpEditTrackTypesDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>371</width>
+    <height>244</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Edit Track Types</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QListWidget" name="types"/>
+   </item>
+   <item row="0" column="1">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QPushButton" name="remove">
+       <property name="text">
+        <string>Remove</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vpEditTrackTypesDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>227</x>
+     <y>226</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>243</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vpEditTrackTypesDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>232</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>243</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/VpView/vpEntityConfig.h b/Applications/VpView/vpEntityConfig.h
new file mode 100644
index 00000000..341ebdaf
--- /dev/null
+++ b/Applications/VpView/vpEntityConfig.h
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpEntityConfig_h
+#define __vpEntityConfig_h
+
+class vgEntityType;
+
+class vpEntityConfig
+{
+public:
+  virtual ~vpEntityConfig() {}
+
+  virtual int GetNumberOfTypes() = 0;
+
+  virtual const vgEntityType& GetEntityType(int id) = 0;
+  virtual void SetEntityType(int id, const vgEntityType& type) = 0;
+
+  virtual void MarkTypeUsed(int index) = 0;
+  virtual void MarkAllTypesUnused() = 0;
+};
+
+#endif // __vpEntityConfig_h
diff --git a/Applications/VpView/vpEntityConfigWidget.cxx b/Applications/VpView/vpEntityConfigWidget.cxx
new file mode 100644
index 00000000..4631c9e6
--- /dev/null
+++ b/Applications/VpView/vpEntityConfigWidget.cxx
@@ -0,0 +1,292 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpEntityConfigWidget.h"
+
+#include "vpEntityConfig.h"
+#include "vgEntityType.h"
+
+#include <QCheckBox>
+#include <QColorDialog>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QPushButton>
+
+#include <vector>
+
+class vpEntityConfigWidget::vgInternal
+{
+public:
+  QGridLayout* Layout;
+
+  struct RowWidgets;
+  std::vector<RowWidgets> Rows;
+
+  QCheckBox* ShowAll;
+
+  vpEntityConfig* EntityConfig;
+};
+
+struct vpEntityConfigWidget::vgInternal::RowWidgets
+{
+  QLabel* Name;
+  QComboBox* RenderStyle;
+  QCheckBox* HasSecondaryColor;
+  QPushButton* PrimaryColor;
+  QPushButton* SecondaryColor;
+};
+
+//-----------------------------------------------------------------------------
+vpEntityConfigWidget::vpEntityConfigWidget(QWidget* p)
+  : QWidget(p)
+{
+  this->Internal = new vgInternal;
+
+  this->Internal->Layout = new QGridLayout;
+  this->Internal->Layout->setContentsMargins(0, 0, 0, 0);
+  this->setLayout(this->Internal->Layout);
+
+  this->Internal->ShowAll = new QCheckBox;
+  this->Internal->ShowAll->setText("Show All");
+  connect(this->Internal->ShowAll, SIGNAL(stateChanged(int)),
+          SLOT(ShowAllTypes(int)));
+
+  this->Internal->Layout->addWidget(this->Internal->ShowAll, 0, 0);
+}
+
+//-----------------------------------------------------------------------------
+vpEntityConfigWidget::~vpEntityConfigWidget()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::Initialize(vpEntityConfig* config)
+{
+  this->Internal->EntityConfig = config;
+
+  for (int i = 0, end = config->GetNumberOfTypes(); i < end; ++i)
+    {
+    const vgEntityType& at = config->GetEntityType(i);
+    this->AddType(at);
+    this->UpdateRow(i);
+    }
+
+  this->Update();
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::AddType(const vgEntityType& type)
+{
+  vgInternal::RowWidgets widgets;
+
+  widgets.Name = new QLabel(type.GetName());
+
+  widgets.RenderStyle = new QComboBox;
+  widgets.RenderStyle->addItem("Random Colors");
+  widgets.RenderStyle->addItem("Role-Based Colors");
+  widgets.RenderStyle->setToolTip("Render Style");
+
+  widgets.PrimaryColor = new QPushButton;
+  widgets.PrimaryColor->setToolTip("Primary Color");
+
+  widgets.SecondaryColor = new QPushButton;
+  widgets.SecondaryColor->setToolTip("Secondary Color");
+
+  widgets.HasSecondaryColor = new QCheckBox;
+  widgets.HasSecondaryColor->setToolTip("Use Secondary Color");
+
+  int row = 1 + static_cast<int>(this->Internal->Rows.size());
+  this->Internal->Layout->addWidget(widgets.Name, row, 0);
+  this->Internal->Layout->addWidget(widgets.RenderStyle, row, 2);
+  this->Internal->Layout->addWidget(widgets.PrimaryColor, row, 3);
+  this->Internal->Layout->addWidget(widgets.HasSecondaryColor, row, 4);
+  this->Internal->Layout->addWidget(widgets.SecondaryColor, row, 5);
+
+  this->Internal->Layout->setColumnStretch(1, 1);
+
+  connect(widgets.RenderStyle, SIGNAL(currentIndexChanged(int)),
+          SLOT(RenderStyleChanged(int)));
+
+  connect(widgets.HasSecondaryColor, SIGNAL(stateChanged(int)),
+          SLOT(HasSecondaryColorChanged(int)));
+
+  connect(widgets.PrimaryColor, SIGNAL(clicked()),
+          SLOT(PrimaryColorClicked()));
+
+  connect(widgets.SecondaryColor, SIGNAL(clicked()),
+          SLOT(SecondaryColorClicked()));
+
+  this->Internal->Rows.push_back(widgets);
+
+  for (int i = 0, end = this->Internal->Layout->columnCount(); i < end; ++i)
+    {
+    if (QLayoutItem* item = this->Internal->Layout->itemAtPosition(row, i))
+      {
+      item->widget()->setProperty("Type Index", row - 1);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::UpdateRow(int row)
+{
+  const vgInternal::RowWidgets& widgets = this->Internal->Rows[row];
+  const vgEntityType& type = this->GetType(row);
+
+  if (type.GetUseRandomColors())
+    {
+    widgets.PrimaryColor->setDisabled(true);
+    widgets.PrimaryColor->setStyleSheet(QString());
+    widgets.HasSecondaryColor->setDisabled(true);
+    widgets.SecondaryColor->setDisabled(true);
+    widgets.SecondaryColor->setStyleSheet(QString());
+    widgets.RenderStyle->setCurrentIndex(0);
+    }
+  else
+    {
+    widgets.PrimaryColor->setDisabled(false);
+    widgets.HasSecondaryColor->setDisabled(false);
+    widgets.RenderStyle->setCurrentIndex(1);
+
+    const char* colorStyle = "QPushButton { background-color : %1 }";
+
+    QColor color = this->GetPrimaryColor(type);
+    widgets.PrimaryColor->setStyleSheet(QString(colorStyle).arg(color.name()));
+
+    if (type.GetHasSecondaryColor())
+      {
+      widgets.SecondaryColor->setDisabled(false);
+      widgets.HasSecondaryColor->setCheckState(Qt::Checked);
+
+      QColor color = this->GetSecondaryColor(type);
+      widgets.SecondaryColor->setStyleSheet(QString(colorStyle).arg(color.name()));
+      }
+    else
+      {
+      widgets.SecondaryColor->setStyleSheet(QString());
+      widgets.SecondaryColor->setDisabled(true);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpEntityConfigWidget::GetWidgetRow(QObject* obj)
+{
+  return obj->property("Type Index").toInt();
+}
+
+//-----------------------------------------------------------------------------
+const vgEntityType& vpEntityConfigWidget::GetType(int row)
+{
+  return this->Internal->EntityConfig->GetEntityType(row);
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::RenderStyleChanged(int index)
+{
+  int row = this->GetWidgetRow(this->sender());
+  vgEntityType at = this->GetType(row);
+
+  at.SetUseRandomColors(index == 0);
+
+  this->UpdateEntityType(row, at);
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::HasSecondaryColorChanged(int state)
+{
+  int row = this->GetWidgetRow(this->sender());
+  vgEntityType at = this->GetType(row);
+
+  at.SetHasSecondaryColor(state == Qt::Checked);
+
+  this->UpdateEntityType(row, at);
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::PrimaryColorClicked()
+{
+  int row = this->GetWidgetRow(this->sender());
+  vgEntityType at = this->GetType(row);
+
+  QColor color = QColorDialog::getColor(this->GetPrimaryColor(at), this);
+  if (!color.isValid())
+    {
+    return;
+    }
+  at.SetColor(color.redF(), color.greenF(), color.blueF());
+
+  this->UpdateEntityType(row, at);
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::SecondaryColorClicked()
+{
+  int row = this->GetWidgetRow(this->sender());
+  vgEntityType at = this->GetType(row);
+
+  QColor color = QColorDialog::getColor(this->GetSecondaryColor(at), this);
+  if (!color.isValid())
+    {
+    return;
+    }
+  at.SetSecondaryColor(color.redF(), color.greenF(), color.blueF());
+
+  this->UpdateEntityType(row, at);
+}
+
+//-----------------------------------------------------------------------------
+QColor vpEntityConfigWidget::GetPrimaryColor(const vgEntityType& type)
+{
+  double r, g, b;
+  type.GetColor(r, g, b);
+  QColor color;
+  color.setRgbF(r, g, b);
+  return color;
+}
+
+//-----------------------------------------------------------------------------
+QColor vpEntityConfigWidget::GetSecondaryColor(const vgEntityType& type)
+{
+  double r, g, b;
+  type.GetSecondaryColor(r, g, b);
+  QColor color;
+  color.setRgbF(r, g, b);
+  return color;
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::UpdateEntityType(int row,
+                                            const vgEntityType& type)
+{
+  this->Internal->EntityConfig->SetEntityType(row, type);
+  this->UpdateRow(row);
+  emit this->EntityTypeChanged(row);
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::ShowAllTypes(int state)
+{
+  for (size_t i = 0, end = this->Internal->Rows.size(); i < end; ++i)
+    {
+    bool show = this->GetType(static_cast<int>(i)).GetIsUsed() ||
+                state == Qt::Checked;
+
+    this->Internal->Rows[i].Name->setVisible(show);
+    this->Internal->Rows[i].RenderStyle->setVisible(show);
+    this->Internal->Rows[i].HasSecondaryColor->setVisible(show);
+    this->Internal->Rows[i].PrimaryColor->setVisible(show);
+    this->Internal->Rows[i].SecondaryColor->setVisible(show);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpEntityConfigWidget::Update()
+{
+  this->ShowAllTypes(this->Internal->ShowAll->checkState());
+}
diff --git a/Applications/VpView/vpEntityConfigWidget.h b/Applications/VpView/vpEntityConfigWidget.h
new file mode 100644
index 00000000..ff3be613
--- /dev/null
+++ b/Applications/VpView/vpEntityConfigWidget.h
@@ -0,0 +1,56 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpEntityConfigWidget_h
+#define __vpEntityConfigWidget_h
+
+#include <QWidget>
+
+class vpEntityConfig;
+class vgEntityType;
+
+class vpEntityConfigWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vpEntityConfigWidget(QWidget* parent = 0);
+  virtual ~vpEntityConfigWidget();
+
+  void Initialize(vpEntityConfig* config);
+
+  void Update();
+
+signals:
+  void EntityTypeChanged(int type);
+
+protected slots:
+  void RenderStyleChanged(int index);
+  void HasSecondaryColorChanged(int state);
+
+  void PrimaryColorClicked();
+  void SecondaryColorClicked();
+
+  void ShowAllTypes(int state);
+
+protected:
+  void AddType(const vgEntityType& type);
+
+  inline int GetWidgetRow(QObject* obj);
+  inline const vgEntityType& GetType(int row);
+
+  QColor GetPrimaryColor(const vgEntityType& type);
+  QColor GetSecondaryColor(const vgEntityType& type);
+
+  void UpdateRow(int row);
+  void UpdateEntityType(int row, const vgEntityType& type);
+
+private:
+  class vgInternal;
+  vgInternal* Internal;
+};
+
+#endif
diff --git a/Applications/VpView/vpEventConfig.cxx b/Applications/VpView/vpEventConfig.cxx
new file mode 100644
index 00000000..413dc459
--- /dev/null
+++ b/Applications/VpView/vpEventConfig.cxx
@@ -0,0 +1,313 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpEventConfig.h"
+
+#include "vpConfigUtils.h"
+#include "vgEventType.h"
+
+#include "vtkVgEventTypeRegistry.h"
+
+#ifdef VISGUI_USE_VIDTK
+#include <event_detectors/event_types.h>
+#endif
+
+#include <QColor>
+#include <QSettings>
+#include <QtDebug>
+
+#include <assert.h>
+#include <vector>
+
+namespace { enum { MaxEventTypes = 1 }; }
+
+//-----------------------------------------------------------------------------
+class vpEventConfig::vpEventConfigInternal
+{
+public:
+  vpEventConfigInternal()
+    : Dirty(false)
+    {
+    std::fill(this->IdToEventTypeIndex,
+              this->IdToEventTypeIndex + MaxEventTypes,
+              -1);
+    }
+
+public:
+  QSettings Settings;
+  int IdToEventTypeIndex[MaxEventTypes];
+
+  bool Dirty;
+};
+
+//-----------------------------------------------------------------------------
+vpEventConfig::vpEventConfig(vtkVgEventTypeRegistry* registry)
+{
+  this->Internal = new vpEventConfigInternal;
+  this->Internal->Settings.beginGroup("EventTypes");
+
+  this->Registry = registry;
+  this->Registry->Register(0);
+
+  this->ReadEventTypes(this->Internal->Settings);
+  this->WriteEventTypes();
+}
+
+//-----------------------------------------------------------------------------
+vpEventConfig::~vpEventConfig()
+{
+  // Write out any config changes made by the user.
+  if (this->Internal->Dirty)
+    {
+    this->WriteEventTypes();
+    }
+
+  this->Registry->UnRegister(0);
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpEventConfig::ReadEventTypes(QSettings& settings)
+{
+  int size = settings.beginReadArray("EventTypes");
+
+  for (int i = 0; i < size; ++i)
+    {
+    settings.setArrayIndex(i);
+    QString idStr = settings.value("Id").toString();
+
+    // Look up the numeric id based on the type id string.
+    int id = this->GetIdFromString(idStr.toAscii());
+    if (id == -1)
+      {
+      qDebug() << "Event type id not found:" << idStr;
+      continue;
+      }
+
+    vgEventType type;
+    type.SetId(id);
+    type.SetName(settings.value("Name").toString().toAscii());
+
+    type.SetMinTracks(settings.value("MinTracks", -1).toInt());
+    type.SetMaxTracks(settings.value("MaxTracks", -1).toInt());
+
+    // If min/max number of tracks was not given, assume a single-track event.
+    if (type.GetMinTracks() == -1)
+      {
+      type.SetMinTracks(1);
+      type.SetMaxTracks(1);
+      }
+
+    QColor color = vpConfigUtils::ReadColor("Color", settings);
+    type.SetColor(color.redF(), color.greenF(), color.blueF());
+
+    QColor colorSecondary = vpConfigUtils::ReadColor("SecondaryColor", settings);
+    if (colorSecondary.isValid())
+      {
+      type.SetHasSecondaryColor(true);
+      type.SetSecondaryColor(colorSecondary.redF(), colorSecondary.greenF(),
+                             colorSecondary.blueF());
+      }
+    else
+      {
+      type.SetHasSecondaryColor(false);
+      }
+
+    type.SetIconIndex(settings.value("IconIndex", -1).toInt());
+    type.SetSecondaryIconIndex(settings.value("SecondaryIconIndex", -1).toInt());
+
+    type.SetDisplayMode(
+      this->GetDisplayModeFromString(
+        settings.value("DisplayMode", vgEventType::GetDisplayModeString(0))
+        .toString().toAscii()));
+
+    // Add or assign to event type vector.
+    if (id < 0 || id >= MaxEventTypes)
+      {
+      qDebug() << "Event type id is out of range - ignoring.";
+      }
+    else if (this->Internal->IdToEventTypeIndex[id] == -1)
+      {
+      int end = this->Registry->GetNumberOfTypes();
+      this->Registry->AddType(type);
+      this->Internal->IdToEventTypeIndex[id] = end;
+      }
+    else
+      {
+      this->Registry->SetType(
+        static_cast<int>(this->Internal->IdToEventTypeIndex[id]), type);
+      }
+    }
+
+  settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+void vpEventConfig::WriteEventTypes()
+{
+  this->Internal->Settings.remove("");
+  this->Internal->Settings.beginWriteArray("EventTypes",
+                                           this->GetNumberOfTypes());
+
+  for (int i = 0, end = this->Registry->GetNumberOfTypes(); i < end; ++i)
+    {
+    const vgEventType& type = this->Registry->GetType(i);
+    this->Internal->Settings.setArrayIndex(i);
+
+#ifdef VISGUI_USE_VIDTK
+    this->Internal->Settings.setValue("Id",
+                                      vidtk::event_types::event_names
+                                      [type.GetId()]);
+#else
+    this->Internal->Settings.setValue("Id", "Unknown");
+#endif
+
+    this->Internal->Settings.setValue("Name", type.GetName());
+
+    if (type.GetMinTracks() != 1 || type.GetMaxTracks() != 1)
+      {
+      this->Internal->Settings.setValue("MinTracks", type.GetMinTracks());
+      if (type.GetMaxTracks() != -1)
+        {
+        this->Internal->Settings.setValue("MaxTracks", type.GetMaxTracks());
+        }
+      }
+
+    double c[3];
+
+    QColor color;
+    type.GetColor(c[0], c[1], c[2]);
+    color.setRgbF(c[0], c[1], c[2]);
+    vpConfigUtils::WriteColor("Color", color, this->Internal->Settings);
+
+    if (type.GetHasSecondaryColor())
+      {
+      type.GetSecondaryColor(c[0], c[1], c[2]);
+      color.setRgbF(c[0], c[1], c[2]);
+      vpConfigUtils::WriteColor("SecondaryColor", color,
+                                this->Internal->Settings);
+      }
+
+    this->Internal->Settings.setValue("IconIndex", type.GetIconIndex());
+    if (type.GetSecondaryIconIndex() != -1)
+      {
+      this->Internal->Settings.setValue("SecondaryIconIndex",
+                                        type.GetSecondaryIconIndex());
+      }
+
+    if (type.GetDisplayMode() > 0)
+      {
+      this->Internal->Settings.setValue(
+        "DisplayMode", type.GetDisplayModeString(type.GetDisplayMode()));
+      }
+    }
+
+  this->Internal->Settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+int vpEventConfig::GetNumberOfTypes()
+{
+  return this->Registry->GetNumberOfTypes();
+}
+
+//-----------------------------------------------------------------------------
+int vpEventConfig::GetEventTypeIndex(int id)
+{
+#ifdef VISGUI_USE_VIDTK
+  if (id < 0 || id >= MaxEventTypes)
+    {
+    return -1;
+    }
+  return static_cast<int>(this->Internal->IdToEventTypeIndex[id]);
+#else
+  return -1;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+const vgEventType& vpEventConfig::GetEventTypeByIndex(int index)
+{
+  return this->Registry->GetType(index);
+}
+
+//-----------------------------------------------------------------------------
+const vgEventType& vpEventConfig::GetEventTypeById(int id)
+{
+  return this->Registry->GetTypeById(id);
+}
+
+//-----------------------------------------------------------------------------
+const vgEntityType& vpEventConfig::GetEntityType(int id)
+{
+  return this->Registry->GetEntityType(id);
+}
+
+//-----------------------------------------------------------------------------
+void vpEventConfig::SetEntityType(int id, const vgEntityType& type)
+{
+  this->Registry->SetEntityType(id, type);
+  this->Internal->Dirty = true;
+}
+
+//-----------------------------------------------------------------------------
+void vpEventConfig::LoadFromFile(const char* filename)
+{
+  QSettings settings(filename, QSettings::IniFormat);
+  settings.beginGroup("EventTypes");
+  this->ReadEventTypes(settings);
+}
+
+//-----------------------------------------------------------------------------
+int vpEventConfig::GetIdFromString(const char* str)
+{
+#ifdef VISGUI_USE_VIDTK
+  for (size_t i = 0; i < MaxEventTypes; ++i)
+    {
+    if (strcmp(str, vidtk::event_types::event_names[i]) == 0)
+      {
+      return static_cast<int>(i);
+      }
+    }
+#endif
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+const char* vpEventConfig::GetStringFromId(int id)
+{
+#ifdef VISGUI_USE_VIDTK
+  assert(id >= 0 && id < MaxEventTypes);
+  return vidtk::event_types::event_names[id];
+#else
+  return "Unknown";
+#endif
+}
+
+//-----------------------------------------------------------------------------
+int vpEventConfig::GetDisplayModeFromString(const char* str)
+{
+  for (int i = 0; i < vgEventType::NumDisplayModes; ++i)
+    {
+    if (strcmp(str, vgEventType::GetDisplayModeString(i)) == 0)
+      {
+      return i;
+      }
+    }
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vpEventConfig::MarkTypeUsed(int index)
+{
+  this->Registry->MarkTypeUsed(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpEventConfig::MarkAllTypesUnused()
+{
+  this->Registry->MarkAllTypesUnused();
+}
diff --git a/Applications/VpView/vpEventConfig.h b/Applications/VpView/vpEventConfig.h
new file mode 100644
index 00000000..404a24d7
--- /dev/null
+++ b/Applications/VpView/vpEventConfig.h
@@ -0,0 +1,60 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpEventConfig_h
+#define __vpEventConfig_h
+
+#include "vpEntityConfig.h"
+
+class QColor;
+class QSettings;
+class QString;
+
+class vgEventType;
+
+class vtkVgEventTypeRegistry;
+
+class vpEventConfig : public vpEntityConfig
+{
+public:
+  vpEventConfig(vtkVgEventTypeRegistry* registry);
+  virtual ~vpEventConfig();
+
+  virtual int GetNumberOfTypes();
+
+  virtual const vgEntityType& GetEntityType(int id);
+  virtual void SetEntityType(int id, const vgEntityType& type);
+
+  virtual void MarkTypeUsed(int index);
+  virtual void MarkAllTypesUnused();
+
+  int GetEventTypeIndex(int id);
+  const vgEventType& GetEventTypeById(int id);
+  const vgEventType& GetEventTypeByIndex(int index);
+
+  static int GetIdFromString(const char* str);
+  static const char* GetStringFromId(int id);
+
+  static int GetDisplayModeFromString(const char* str);
+
+  void LoadFromFile(const char* filename);
+
+protected:
+  void ReadEventTypes(QSettings& settings);
+  void WriteEventTypes();
+
+private:
+  class vpEventConfigInternal;
+  vpEventConfigInternal* Internal;
+
+  vtkVgEventTypeRegistry* Registry;
+
+private:
+  vpEventConfig(const vpEventConfig& src);   // Not implemented.
+  void operator=(const vpEventConfig& src);  // Not implemented.
+};
+
+#endif // __vpEventConfig_h
diff --git a/Applications/VpView/vpEventIO.cxx b/Applications/VpView/vpEventIO.cxx
new file mode 100644
index 00000000..eada3db0
--- /dev/null
+++ b/Applications/VpView/vpEventIO.cxx
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpEventIO.h"
+
+#include <vtkVgEventModel.h>
+#include <vtkVgEventTypeRegistry.h>
+
+#include <assert.h>
+
+//-----------------------------------------------------------------------------
+vpEventIO::vpEventIO(vtkVgEventModel* eventModel,
+                     vtkVgEventTypeRegistry* eventTypes) :
+  EventModel(eventModel),
+  EventTypes(eventTypes)
+{
+  assert(eventModel);
+}
+
+//-----------------------------------------------------------------------------
+bool vpEventIO::ReadEventLinks()
+{
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpEventIO::ImportEvents(vtkIdType, float, float)
+{
+  return false;
+}
diff --git a/Applications/VpView/vpEventIO.h b/Applications/VpView/vpEventIO.h
new file mode 100644
index 00000000..7b8ea56d
--- /dev/null
+++ b/Applications/VpView/vpEventIO.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpEventIO_h
+#define __vpEventIO_h
+
+#include <vtkType.h>
+
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+
+class vpEventIO
+{
+public:
+  vpEventIO(vtkVgEventModel* eventModel,
+            vtkVgEventTypeRegistry* eventTypes);
+
+  virtual ~vpEventIO() {}
+
+  virtual bool ReadEvents() = 0;
+  virtual bool ReadEventLinks();
+
+  virtual bool ImportEvents(vtkIdType idsOffset, float offsetX, float offsetY);
+
+  virtual bool WriteEvents(const char* filename) const = 0;
+
+protected:
+  friend class vpFileEventIOImpl;
+
+  vtkVgEventModel* EventModel;
+  vtkVgEventTypeRegistry* EventTypes;
+};
+
+#endif // __vpEventIO_h
diff --git a/Applications/VpView/vpEventTypeRegistry.cxx b/Applications/VpView/vpEventTypeRegistry.cxx
new file mode 100644
index 00000000..a5405581
--- /dev/null
+++ b/Applications/VpView/vpEventTypeRegistry.cxx
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpEventTypeRegistry.h"
+
+#ifdef VISGUI_USE_VIDTK
+#include <event_detectors/event_types.h>
+#endif
+
+#include <vtkObjectFactory.h>
+
+vtkStandardNewMacro(vpEventTypeRegistry);
+
+//-----------------------------------------------------------------------------
+void vpEventTypeRegistry::WarnTypeNotFound(int id)
+{
+#ifdef VISGUI_USE_VIDTK
+  if (id < static_cast<int>(vidtk::event_types::events_size))
+    {
+    vtkErrorMacro("Event type id is not registered: " <<
+                  vidtk::event_types::event_names[id]);
+    }
+  else
+#endif
+    {
+    this->Superclass::WarnTypeNotFound(id);
+    }
+}
diff --git a/Applications/VpView/vpEventTypeRegistry.h b/Applications/VpView/vpEventTypeRegistry.h
new file mode 100644
index 00000000..3629a51c
--- /dev/null
+++ b/Applications/VpView/vpEventTypeRegistry.h
@@ -0,0 +1,24 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpEventTypeRegistry_h
+#define __vpEventTypeRegistry_h
+
+#include "vtkVgEventTypeRegistry.h"
+
+class vpEventTypeRegistry : public vtkVgEventTypeRegistry
+{
+public:
+  static vpEventTypeRegistry* New();
+
+  vtkTypeMacro(vpEventTypeRegistry, vtkVgEventTypeRegistry);
+
+protected:
+  // Provide a more descriptive warning using the VIDTK type name.
+  virtual void WarnTypeNotFound(int id);
+};
+
+#endif // __vpEventTypeRegistry_h
\ No newline at end of file
diff --git a/Applications/VpView/vpExternalProcessDialog.cxx b/Applications/VpView/vpExternalProcessDialog.cxx
new file mode 100644
index 00000000..3258803b
--- /dev/null
+++ b/Applications/VpView/vpExternalProcessDialog.cxx
@@ -0,0 +1,138 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpExternalProcessDialog.h"
+
+// QT includes.
+#include <QMessageBox>
+
+// VisGUI includes.
+#include "vpSettings.h"
+
+//----------------------------------------------------------------------------
+vpExternalProcessDialog::vpExternalProcessDialog(QWidget* parent) :
+  QDialog(parent)
+{
+  this->Settings = new vpSettings;
+  this->UI.setupUi(this);
+  this->UI.editArguments->setWordWrapMode(QTextOption::WrapAnywhere);
+
+  connect(this->UI.executeButton, SIGNAL(released()),
+          this, SLOT(executeProcess()));
+
+  connect(this->UI.saveButton, SIGNAL(released()),
+          this, SLOT(saveWithoutExecuting()));
+
+  connect(this->UI.cancelButton, SIGNAL(released()),
+          this, SLOT(cancel()));
+
+
+  this->restore();
+}
+
+//----------------------------------------------------------------------------
+vpExternalProcessDialog::~vpExternalProcessDialog()
+{
+  delete this->Settings;
+  this->Settings = 0;
+}
+
+//----------------------------------------------------------------------------
+void vpExternalProcessDialog::save()
+{
+  this->Settings->setExternalProcessProgram(this->UI.editProgram->text());
+  this->Settings->setExternalProcessArgs(
+    this->UI.editArguments->toPlainText().split(";"));
+  this->Settings->setExternalProcessIOPath(this->UI.editIOPath->text());
+
+  this->Settings->setExternalProcessThreshold(
+    this->UI.thresholdDoubleSpinBox->value());
+  this->Settings->setExternalProcessThresholdState(
+    this->UI.thresholdCheckBox->isChecked());
+
+  this->Settings->setExternalProcessCellSize(
+    this->UI.cellSizeDoubleSpinBox->value());
+  this->Settings->setExternalProcessCellSizeState(
+    this->UI.cellSizeCheckBox->isChecked());
+
+  // Now commit all of the changes
+  this->Settings->commit();
+}
+
+//----------------------------------------------------------------------------
+void vpExternalProcessDialog::restore()
+{
+  this->UI.editProgram->setText(this->Settings->externalProcessProgram());
+  this->UI.editArguments->setText(
+    this->Settings->externalProcessArgs().join(";"));
+  this->UI.editIOPath->setText(this->Settings->externalProcessIOPath());
+
+  this->UI.thresholdCheckBox->setChecked(
+    this->Settings->externalProcessThresholdState());
+  this->UI.thresholdDoubleSpinBox->setValue(
+      this->Settings->externalProcessThreshold());
+
+  this->UI.cellSizeCheckBox->setChecked(
+    this->Settings->externalProcessCellSizeState());
+  this->UI.cellSizeDoubleSpinBox->setValue(
+      this->Settings->externalProcessCellSize());
+}
+
+//----------------------------------------------------------------------------
+void vpExternalProcessDialog::executeProcess()
+{
+  if (this->UI.editProgram->text().isEmpty())
+    {
+    QMessageBox::warning(this, "Warning!",
+                         "No program specified; unable to execute!");
+    return;
+    }
+  this->save();
+
+  QDialog::accept();
+}
+
+//----------------------------------------------------------------------------
+void vpExternalProcessDialog::saveWithoutExecuting()
+{
+  this->save();
+  QDialog::reject();
+}
+
+//----------------------------------------------------------------------------
+void vpExternalProcessDialog::cancel()
+{
+  QDialog::reject();
+}
+
+//----------------------------------------------------------------------------
+QString vpExternalProcessDialog::getProgram() const
+{
+  return this->UI.editProgram->text();
+}
+
+//----------------------------------------------------------------------------
+QStringList vpExternalProcessDialog::getArguments() const
+{
+  QStringList args = this->UI.editArguments->toPlainText().split(";");
+  if (this->UI.cellSizeCheckBox->isChecked())
+    {
+    args.append(QString("-cellsize %1")
+                  .arg(this->UI.cellSizeDoubleSpinBox->value()));
+    }
+  if (this->UI.cellSizeCheckBox->isChecked())
+    {
+    args.append(QString("-threshold %1")
+              .arg(this->UI.thresholdDoubleSpinBox->value()));
+    }
+  return args;
+}
+
+//----------------------------------------------------------------------------
+QString vpExternalProcessDialog::getIOPath() const
+{
+  return this->UI.editIOPath->text();
+}
diff --git a/Applications/VpView/vpExternalProcessDialog.h b/Applications/VpView/vpExternalProcessDialog.h
new file mode 100644
index 00000000..48524c99
--- /dev/null
+++ b/Applications/VpView/vpExternalProcessDialog.h
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpExternalProcessDialog_h
+#define __vpExternalProcessDialog_h
+
+// QT includes.
+#include <QDialog>
+
+#include "ui_vpExternalProcessDialog.h"
+
+// Forward declarations.
+class vpSettings;
+
+class vpExternalProcessDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vpExternalProcessDialog(QWidget* parent);
+  ~vpExternalProcessDialog();
+
+  Ui::vpExternalProcessDialog UI;
+
+  QString getProgram() const;
+  QStringList getArguments() const;
+  QString getIOPath() const;
+
+public slots:
+  virtual void executeProcess();
+  virtual void saveWithoutExecuting();
+  virtual void cancel();
+
+private:
+  vpSettings* Settings;
+
+  void save();
+  void restore();
+};
+
+#endif // __vpExternalProcessDialog_h
diff --git a/Applications/VpView/vpExternalProcessDialog.ui b/Applications/VpView/vpExternalProcessDialog.ui
new file mode 100644
index 00000000..a6296cde
--- /dev/null
+++ b/Applications/VpView/vpExternalProcessDialog.ui
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpExternalProcessDialog</class>
+ <widget class="QDialog" name="vpExternalProcessDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>682</width>
+    <height>411</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>External Process</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Arguments</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="editProgram">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Arguments</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QTextEdit" name="editArguments">
+        <property name="html">
+         <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="baseSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>IO Path</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLineEdit" name="editIOPath"/>
+      </item>
+      <item row="4" column="1">
+       <widget class="QDoubleSpinBox" name="thresholdDoubleSpinBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>200</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximum">
+         <double>1000.000000000000000</double>
+        </property>
+        <property name="singleStep">
+         <double>0.100000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QDoubleSpinBox" name="cellSizeDoubleSpinBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimumSize">
+         <size>
+          <width>200</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="baseSize">
+         <size>
+          <width>0</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximum">
+         <double>1000.000000000000000</double>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QCheckBox" name="thresholdCheckBox">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Threshold for external process. If checked it will produce command like argument '-threshold &amp;lt;value&amp;gt;'. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Threshold</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QCheckBox" name="cellSizeCheckBox">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Cell size for external process. If checked it will produce command like argument '-cellsize &amp;lt;value&amp;gt;'. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>Cell Size</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="executeButton">
+       <property name="text">
+        <string>Execute</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="saveButton">
+       <property name="text">
+        <string>Save</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>editProgram</tabstop>
+  <tabstop>executeButton</tabstop>
+  <tabstop>saveButton</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpFileDataSource.cxx b/Applications/VpView/vpFileDataSource.cxx
new file mode 100644
index 00000000..94cd1b1f
--- /dev/null
+++ b/Applications/VpView/vpFileDataSource.cxx
@@ -0,0 +1,250 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFileDataSource.h"
+
+#include <vtksys/Glob.hxx>
+#include <vtksys/SystemTools.hxx>
+
+// C++ includes.
+#include <iostream>
+#include <fstream>
+
+// VTK includes.
+#include <vtkNew.h>
+#include <vtkSortFileNames.h>
+#include <vtkStringArray.h>
+
+// Qt includes.
+#include <QFileSystemWatcher>
+#include <QMutexLocker>
+#include <QStringList>
+
+#include <qtStlUtil.h>
+
+//-----------------------------------------------------------------------------
+vpFileDataSource::vpFileDataSource() :
+  MonitoringEnabled(false), DataFilesMutex(QMutex::Recursive)
+{
+  this->DataFiles = vtkSmartPointer<vtkStringArray>::New();
+}
+
+//-----------------------------------------------------------------------------
+vpFileDataSource::~vpFileDataSource()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpFileDataSource::setDataSetSpecifier(const std::string& source)
+{
+  this->DataSetSpecifier = source;
+  this->ModifiedTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+std::string vpFileDataSource::getDataSetSpecifier()
+{
+  return this->DataSetSpecifier;
+}
+
+//-----------------------------------------------------------------------------
+void vpFileDataSource::setDataFiles(const std::vector<std::string>& filenames)
+{
+  this->clear();
+  this->DataSetSpecifier.clear();
+
+  for (size_t i = 0, size = filenames.size(); i < size; ++i)
+    {
+    this->DataFiles->InsertNextValue(filenames[i]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpFileDataSource::getFileCount()
+{
+  QMutexLocker ml(&this->DataFilesMutex);
+  this->update();
+  return static_cast<int>(this->DataFiles->GetNumberOfValues());
+}
+
+//-----------------------------------------------------------------------------
+std::string vpFileDataSource::getDataFile(int index)
+{
+  QMutexLocker ml(&this->DataFilesMutex);
+  this->update();
+
+  if (index < 0 || index >= this->DataFiles->GetNumberOfValues())
+    {
+    return std::string();
+    }
+
+  return this->DataFiles->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpFileDataSource::setMonitoringEnabled(bool enable)
+{
+  QMutexLocker ml(&this->DataFilesMutex);
+  this->ModifiedTime.Modified();
+  this->MonitoringEnabled = enable;
+  if (!enable)
+    {
+    this->DataFilesWatcher.reset();
+    }
+  else
+    {
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpFileDataSource::update()
+{
+  QMutexLocker ml(&this->DataFilesMutex);
+  if (this->UpdateTime > this->ModifiedTime)
+    {
+    return;
+    }
+
+  this->UpdateTime.Modified();
+
+  if (this->DataSetSpecifier.empty())
+    {
+    return;
+    }
+
+  // First clear any data structure before we read new data source.
+  this->clear();
+
+  std::string line;
+  std::string watchPath;
+
+  if (vtksys::SystemTools::FileExists(this->DataSetSpecifier.c_str(), true))
+    {
+    std::string basePath =
+      vtksys::SystemTools::GetFilenamePath(this->DataSetSpecifier.c_str());
+    basePath.append("/");
+
+    std::string completePath;
+    watchPath = this->DataSetSpecifier;
+
+    std::ifstream file(this->DataSetSpecifier.c_str());
+
+    if (file.is_open())
+      {
+      while (!file.eof() || file.good())
+        {
+        std::getline(file, line);
+
+        if (line.empty())
+          {
+          continue;
+          }
+
+        // If each line is not a full path then append the base path or
+        // if the file is not found try finding the file using base path.
+        if (!vtksys::SystemTools::FileIsFullPath(line.c_str()) ||
+            !vtksys::SystemTools::FileExists(line.c_str(), true))
+          {
+          completePath = basePath + line;
+          }
+        else
+          {
+          completePath = line;
+          }
+
+        if (!vtksys::SystemTools::FileExists(completePath.c_str(), true))
+          {
+          std::cerr << "Image data file (" << completePath
+                    << ") does not exist. " << std::endl;
+          continue;
+          }
+
+        std::cerr << "Archiving (" << completePath << "). " << std::endl;
+
+        this->DataFiles->InsertNextValue(completePath);
+        }
+      }
+    else
+      {
+      std::cerr << "Unable to open this  (" << this->DataSetSpecifier
+                << ") data source. " << std::endl;
+      return;
+      }
+    }
+  else
+    {
+    // Interpret the specifier as a glob
+    vtksys::Glob glob;
+    glob.FindFiles(this->DataSetSpecifier);
+    glob.SetRecurse(true);
+    std::vector<std::string>& files = glob.GetFiles();
+    if (files.empty())
+      {
+      return;
+      }
+
+    int numFiles = static_cast<int>(files.size());
+    vtkNew<vtkStringArray> fileNames;
+    fileNames->SetNumberOfValues(numFiles);
+    for (int i = 0; i < numFiles; i++)
+      {
+      fileNames->SetValue(i, files[i].c_str());
+      }
+
+    vtkNew<vtkSortFileNames> sort;
+    sort->NumericSortOn();
+    sort->SetInputFileNames(fileNames.GetPointer());
+    this->DataFiles = sort->GetFileNames();
+
+    watchPath =
+     vtksys::SystemTools::GetFilenamePath(this->DataFiles->GetValue(0));
+    }
+
+  // Begin monitoring the parent directory or the text file containing the
+  // image filenames for changes. When a change is detected, we will update
+  // ourselves automatically.
+  if (this->MonitoringEnabled &&
+      !this->DataFilesWatcher && !watchPath.empty())
+    {
+    std::cout << "Starting image data monitoring.\n";
+    this->DataFilesWatcher.reset(new QFileSystemWatcher);
+
+    // Force watcher to use polling since the normal engine doesn't work
+    // with network shares.
+    this->DataFilesWatcher->setObjectName(
+      QLatin1String("_qt_autotest_force_engine_poller"));
+
+    connect(this->DataFilesWatcher.data(),
+            SIGNAL(directoryChanged(QString)),
+            this, SLOT(updateDataFiles()));
+
+    connect(this->DataFilesWatcher.data(),
+            SIGNAL(fileChanged(QString)),
+            this, SLOT(updateDataFiles()));
+
+    this->DataFilesWatcher->addPath(qtString(watchPath));
+    std::cout << "Image data monitoring started.\n";
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpFileDataSource::clear()
+{
+  QMutexLocker ml(&this->DataFilesMutex);
+  this->DataFiles->Reset();
+}
+
+//-----------------------------------------------------------------------------
+void vpFileDataSource::updateDataFiles()
+{
+    {
+    QMutexLocker ml(&this->DataFilesMutex);
+    this->ModifiedTime.Modified();
+    this->update();
+    }
+  emit this->dataFilesChanged();
+}
diff --git a/Applications/VpView/vpFileDataSource.h b/Applications/VpView/vpFileDataSource.h
new file mode 100644
index 00000000..13fa8861
--- /dev/null
+++ b/Applications/VpView/vpFileDataSource.h
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFileDataSource_h
+#define __vpFileDataSource_h
+
+// C++ STL includes.
+#include <string>
+#include <vector>
+
+#include <QMutex>
+#include <QObject>
+#include <QScopedPointer>
+
+#include <vtkSmartPointer.h>
+#include <vtkTimeStamp.h>
+
+// Forward declarations.
+class QFileSystemWatcher;
+
+class vtkStringArray;
+
+class vpFileDataSource : public QObject
+{
+  Q_OBJECT
+
+public:
+  // Description:
+  // Constructor / destructor
+  vpFileDataSource();
+  ~vpFileDataSource();
+
+  // Description:
+  // Set the data source. Currently it takes the filename
+  // or the Glob.
+  void setDataSetSpecifier(const std::string& source);
+  std::string getDataSetSpecifier();
+
+  // Description:
+  // Set the data set directly from an ordered vector of filenames
+  void setDataFiles(const std::vector<std::string>& filenames);
+
+  int getFileCount();
+
+  // Description:
+  // Return a specific file using the index [0, size - 1]
+  std::string getDataFile(int index);
+
+  // Description:
+  // Enable monitoring for data set changes
+  void setMonitoringEnabled(bool enable);
+
+signals:
+  void dataFilesChanged();
+
+protected:
+  void update();
+  void clear();
+
+protected slots:
+  void updateDataFiles();
+
+private:
+  std::string DataSetSpecifier;
+  vtkSmartPointer<vtkStringArray> DataFiles;
+
+  vtkTimeStamp ModifiedTime;
+  vtkTimeStamp UpdateTime;
+
+  bool MonitoringEnabled;
+  QScopedPointer<QFileSystemWatcher> DataFilesWatcher;
+  QMutex DataFilesMutex;
+};
+
+#endif // __vpFileDataSource_h
diff --git a/Applications/VpView/vpFileEventIO.cxx b/Applications/VpView/vpFileEventIO.cxx
new file mode 100644
index 00000000..ffd99857
--- /dev/null
+++ b/Applications/VpView/vpFileEventIO.cxx
@@ -0,0 +1,24 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFileEventIO.h"
+
+#include "vpFileEventIOImpl.h"
+#include "vpFileReader.h"
+
+//-----------------------------------------------------------------------------
+vpFileEventIO::vpFileEventIO(vpFileReader& reader,
+                             vtkVgEventModel* eventModel,
+                             vtkVgEventTypeRegistry* eventTypes) :
+  vpEventIO(eventModel, eventTypes), Reader(reader)
+{}
+
+//-----------------------------------------------------------------------------
+bool vpFileEventIO::ReadEventLinks()
+{
+  return vpFileEventIOImpl::ReadEventLinks(this,
+                                           this->Reader.GetEventLinksFileName());
+}
diff --git a/Applications/VpView/vpFileEventIO.h b/Applications/VpView/vpFileEventIO.h
new file mode 100644
index 00000000..43a7de2a
--- /dev/null
+++ b/Applications/VpView/vpFileEventIO.h
@@ -0,0 +1,27 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFileEventIO_h
+#define __vpFileEventIO_h
+
+#include "vpEventIO.h"
+
+class vpFileReader;
+
+class vpFileEventIO : public vpEventIO
+{
+public:
+  vpFileEventIO(vpFileReader& reader,
+                vtkVgEventModel* eventModel,
+                vtkVgEventTypeRegistry* eventTypes = 0);
+
+  bool ReadEventLinks();
+
+protected:
+  vpFileReader& Reader;
+};
+
+#endif // __vpFileEventIO_h
diff --git a/Applications/VpView/vpFileEventIOImpl.cxx b/Applications/VpView/vpFileEventIOImpl.cxx
new file mode 100644
index 00000000..ba3a4b4e
--- /dev/null
+++ b/Applications/VpView/vpFileEventIOImpl.cxx
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFileEventIOImpl.h"
+
+#include "vpEventIO.h"
+
+#include <vtkVgEventModel.h>
+
+//-----------------------------------------------------------------------------
+bool vpFileEventIOImpl::ReadEventLinks(vpEventIO* io,
+                                       const std::string& eventLinksFileName)
+{
+  std::ifstream file(eventLinksFileName.c_str());
+  if (!file)
+    {
+    return false;
+    }
+
+  EventLink link;
+  while (file >> link.Source >> link.Destination >> link.Probability)
+    {
+    // convert from log probability
+    link.Probability = exp(link.Probability);
+    io->EventModel->AddEventLink(link);
+    }
+
+  return true;
+}
diff --git a/Applications/VpView/vpFileEventIOImpl.h b/Applications/VpView/vpFileEventIOImpl.h
new file mode 100644
index 00000000..f857351b
--- /dev/null
+++ b/Applications/VpView/vpFileEventIOImpl.h
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFileEventIOImpl_h
+#define __vpFileEventIOImpl_h
+
+#include <string>
+
+class vpEventIO;
+
+class vpFileEventIOImpl
+{
+public:
+  static bool ReadEventLinks(vpEventIO* io,
+                             const std::string& eventLinksFileName);
+};
+
+#endif // __vpFileEventIOImpl_h
diff --git a/Applications/VpView/vpFileReader.h b/Applications/VpView/vpFileReader.h
new file mode 100644
index 00000000..75936582
--- /dev/null
+++ b/Applications/VpView/vpFileReader.h
@@ -0,0 +1,58 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFileReader_h
+#define __vpFileReader_h
+
+#include <string>
+
+class vpFileReader
+{
+public:
+  virtual ~vpFileReader() {}
+
+  void SetTracksFileName(const char* tracksFileName)
+    { this->TracksFileName = tracksFileName; }
+
+  void SetTrackTraitsFileName(const char* trackTraitsFileName)
+    { this->TrackTraitsFileName = trackTraitsFileName; }
+
+  void SetEventsFileName(const char* eventsFileName)
+    { this->EventsFileName = eventsFileName; }
+
+  void SetEventLinksFileName(const char* eventLinksFileName)
+    { this->EventLinksFileName = eventLinksFileName; }
+
+  void SetActivitiesFileName(const char* activitiesFileName)
+    { this->ActivitiesFileName = activitiesFileName; }
+
+  std::string GetTracksFileName() const
+    { return this->TracksFileName; }
+
+  std::string GetTrackTraitsFileName() const
+    { return this->TrackTraitsFileName; }
+
+  std::string GetEventsFileName() const
+    { return this->EventsFileName; }
+
+  std::string GetEventLinksFileName() const
+    { return this->EventLinksFileName; }
+
+  std::string GetActivitiesFileName() const
+    { return this->ActivitiesFileName; }
+
+  virtual void SetImageHeight(unsigned int imageHeight) = 0;
+  virtual unsigned int GetImageHeight() const = 0;
+
+protected:
+  std::string TracksFileName;
+  std::string TrackTraitsFileName;
+  std::string EventsFileName;
+  std::string EventLinksFileName;
+  std::string ActivitiesFileName;
+};
+
+#endif // __vpFileReader_h
diff --git a/Applications/VpView/vpFileTrackIO.cxx b/Applications/VpView/vpFileTrackIO.cxx
new file mode 100644
index 00000000..7f65f074
--- /dev/null
+++ b/Applications/VpView/vpFileTrackIO.cxx
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFileTrackIO.h"
+
+#include "vpFileReader.h"
+#include "vpFileTrackIOImpl.h"
+
+//-----------------------------------------------------------------------------
+vpFileTrackIO::vpFileTrackIO(vpFileReader& reader,
+                             vtkVgTrackModel* trackModel,
+                             TrackStorageMode storageMode,
+                             TrackTimeStampMode timeStampMode,
+                             vtkVgTrackTypeRegistry* trackTypes,
+                             vtkMatrix4x4* geoTransform,
+                             vpFrameMap* frameMap) :
+  vpTrackIO(trackModel, storageMode, timeStampMode, trackTypes,
+            geoTransform, frameMap),
+  Reader(reader)
+{}
+
+//-----------------------------------------------------------------------------
+bool vpFileTrackIO::ReadTrackTraits()
+{
+  return vpFileTrackIOImpl::ReadTrackTraits(this,
+                                            this->Reader.GetTrackTraitsFileName());
+}
diff --git a/Applications/VpView/vpFileTrackIO.h b/Applications/VpView/vpFileTrackIO.h
new file mode 100644
index 00000000..19d67d67
--- /dev/null
+++ b/Applications/VpView/vpFileTrackIO.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFileTrackIO_h
+#define __vpFileTrackIO_h
+
+#include "vpTrackIO.h"
+
+class vpFileReader;
+
+class vpFileTrackIO : public vpTrackIO
+{
+public:
+  vpFileTrackIO(vpFileReader& reader,
+                vtkVgTrackModel* trackModel,
+                TrackStorageMode storageMode,
+                TrackTimeStampMode timeStampMode,
+                vtkVgTrackTypeRegistry* trackTypes = 0,
+                vtkMatrix4x4* geoTransform = 0,
+                vpFrameMap* frameMap = 0);
+
+  bool ReadTrackTraits();
+
+protected:
+  vpFileReader& Reader;
+};
+
+#endif // __vpFileTrackIO_h
diff --git a/Applications/VpView/vpFileTrackIOImpl.cxx b/Applications/VpView/vpFileTrackIOImpl.cxx
new file mode 100644
index 00000000..560b1573
--- /dev/null
+++ b/Applications/VpView/vpFileTrackIOImpl.cxx
@@ -0,0 +1,182 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFileTrackIOImpl.h"
+
+#include "vpTrackIO.h"
+
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackTypeRegistry.h>
+
+#include <vtkPoints.h>
+#include <vtksys/SystemTools.hxx>
+
+#include <limits>
+
+//-----------------------------------------------------------------------------
+bool vpFileTrackIOImpl::ReadTrackTraits(vpTrackIO* io,
+                                        const std::string& trackTraitsFileName)
+{
+  std::ifstream file(trackTraitsFileName.c_str());
+  if (!file)
+    {
+    return false;
+    }
+
+  int id;
+  double normalcy;
+
+  while (file >> id >> normalcy)
+    {
+    vtkVgTrack* track = io->TrackModel->GetTrack(id);
+
+    if (!track)
+      {
+      std::cerr << "Unknown track id: " << id << '\n';
+      continue;
+      }
+
+    track->SetNormalcy(normalcy);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpFileTrackIOImpl::ReadSupplementalFiles(vpTrackIO* io,
+                                              const std::string& tracksFileName)
+{
+  return ImportSupplementalFiles(io, tracksFileName, 0.0f, 0.0f);
+}
+
+//-----------------------------------------------------------------------------
+bool vpFileTrackIOImpl::ImportSupplementalFiles(vpTrackIO* io,
+                                                const std::string& tracksFileName,
+                                                float offsetX, float offsetY)
+{
+  // Look for files containing supplemental track info
+  std::string trackTypes(tracksFileName);
+  trackTypes += ".types";
+
+  // Load track types
+  if (vtksys::SystemTools::FileExists(trackTypes.c_str(), true))
+    {
+    std::ifstream file(trackTypes.c_str());
+    int id;
+    std::string type;
+    double color[3];
+    while (file >> id >> type)
+      {
+      vtkVgTrack* track = io->TrackModel->GetTrack(io->GetModelTrackId(id));
+      if (!track)
+        {
+        std::cerr << trackTypes << ": track " << id << " does not exist!\n";
+        continue;
+        }
+
+      int typeIndex = io->TrackTypes->GetTypeIndex(type.c_str());
+      if (typeIndex == -1)
+        {
+        // Add a new type to the registry if it's not already defined
+        vgTrackType tt;
+        tt.SetId(type.c_str());
+        typeIndex = io->TrackTypes->GetNumberOfTypes();
+        io->TrackTypes->AddType(tt);
+        }
+      track->SetType(typeIndex);
+      const vgTrackType& type = io->TrackTypes->GetType(typeIndex);
+      type.GetColor(color[0], color[1], color[2]);
+      track->SetColor(color[0], color[1], color[2]);
+      }
+    }
+
+  std::string trackRegions(tracksFileName);
+  trackRegions += ".regions";
+
+  // Load polygonal bounding regions
+  if (vtksys::SystemTools::FileExists(trackRegions.c_str(), true))
+    {
+    if (io->TimeStampMode != vpTrackIO::TTM_FrameNumberOnly)
+      {
+      std::cerr << "Cannot load polygonal track regions "
+                   "in current timestamp mode\n";
+      return false;
+      }
+
+    std::ifstream file(trackRegions.c_str());
+    int id;
+    int frame;
+    int numPoints;
+    std::vector<float> points;
+    bool isKeyFrame;
+    while (file >> id >> frame >> isKeyFrame >> numPoints)
+      {
+      vtkVgTrack* track = io->TrackModel->GetTrack(io->GetModelTrackId(id));
+      if (!track)
+        {
+        std::cerr << trackRegions << ": track " << id
+                  << " does not exist!\n";
+        continue;
+        }
+
+      if (numPoints < 3)
+        {
+        std::cerr << trackRegions << ": region for track " << id
+                  << " has an invalid number of points (" << numPoints
+                  << ")\n";
+        continue;
+        }
+
+      vtkVgTimeStamp ts;
+      ts.SetFrameNumber(frame);
+
+      // "Delete" frames from the track that we now know are interpolated. The
+      // track code will re-generate the interpolated frames, which is
+      // inefficient, but this is the only way (currently) to preserve the
+      // information about which frames are true keyframes. We want to keep
+      // track of this info since it will make the annotators' lives easier.
+      if (!isKeyFrame)
+        {
+        track->DeletePoint(ts, true);
+        file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+        continue;
+        }
+
+      points.reserve(numPoints * 3);
+      std::back_insert_iterator<std::vector<float> > iter(points);
+
+      for (int i = 0; i < numPoints; ++i)
+        {
+        float x, y;
+        file >> x >> y;
+        if (io->StorageMode == vpTrackIO::TSM_InvertedImageCoords)
+          {
+          y = io->GetImageHeight() - y - 1;
+          }
+        *iter++ = x + offsetX;
+        *iter++ = y + offsetY;
+        *iter++ = 0.0f;
+        }
+
+      // Use the original point supplied in the track file (which should be the
+      // same whether using polygons or bounding boxes).
+      double point[2];
+      if (!track->GetPoint(ts, point, false))
+        {
+        std::cerr << trackRegions << ": region for track " << id
+                  << " does not have a point in track file at frame "
+                  << ts.GetFrameNumber() << '\n';
+        continue;
+        }
+
+      track->SetPoint(ts, point, track->GetGeoCoord(ts), numPoints, &points[0]);
+      points.clear();
+      }
+    }
+
+  return true;
+}
diff --git a/Applications/VpView/vpFileTrackIOImpl.h b/Applications/VpView/vpFileTrackIOImpl.h
new file mode 100644
index 00000000..9c143328
--- /dev/null
+++ b/Applications/VpView/vpFileTrackIOImpl.h
@@ -0,0 +1,28 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFileTrackIOImpl_h
+#define __vpFileTrackIOImpl_h
+
+#include <string>
+
+class vpTrackIO;
+
+class vpFileTrackIOImpl
+{
+public:
+  static bool ReadTrackTraits(vpTrackIO* io,
+                              const std::string& trackTraitsFileName);
+
+  static bool ReadSupplementalFiles(vpTrackIO* io,
+                                    const std::string& tracksFileName);
+
+  static bool ImportSupplementalFiles(vpTrackIO* io,
+                                      const std::string& tracksFileName,
+                                      float offsetX, float offsetY);
+};
+
+#endif // __vpFileTrackIOImpl_h
diff --git a/Applications/VpView/vpFilterTypeDelegate.cxx b/Applications/VpView/vpFilterTypeDelegate.cxx
new file mode 100644
index 00000000..b1c4c266
--- /dev/null
+++ b/Applications/VpView/vpFilterTypeDelegate.cxx
@@ -0,0 +1,43 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFilterTypeDelegate.h"
+
+#include "vtkVgTemporalFilters.h"
+
+#include <QComboBox>
+
+namespace
+{
+
+const vtkVgTemporalFilters::FilterType Types[] =
+{
+  vtkVgTemporalFilters::FT_Select,
+  vtkVgTemporalFilters::FT_Exclude
+};
+
+enum { NumTypes = sizeof(Types) / sizeof(Types[0]) };
+
+} // end anonymous namespace
+
+//-----------------------------------------------------------------------------
+vpFilterTypeDelegate::vpFilterTypeDelegate(QObject* parent)
+  : qtComboBoxDelegate(parent)
+{
+  QVariantList vl;
+  QStringList sl;
+  for (int i = 0; i < NumTypes; ++i)
+    {
+    vl << Types[i];
+    sl << vtkVgTemporalFilters::StringForType(Types[i]);
+    }
+  this->setMapping(sl, vl);
+}
+
+//-----------------------------------------------------------------------------
+vpFilterTypeDelegate::~vpFilterTypeDelegate()
+{
+}
diff --git a/Applications/VpView/vpFilterTypeDelegate.h b/Applications/VpView/vpFilterTypeDelegate.h
new file mode 100644
index 00000000..07c9791a
--- /dev/null
+++ b/Applications/VpView/vpFilterTypeDelegate.h
@@ -0,0 +1,22 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFilterTypeDelegate_h
+#define __vpFilterTypeDelegate_h
+
+#include <qtComboBoxDelegate.h>
+
+class vpFilterTypeDelegate : public qtComboBoxDelegate
+{
+public:
+  vpFilterTypeDelegate(QObject* parent = 0);
+  virtual ~vpFilterTypeDelegate();
+
+private:
+  Q_DISABLE_COPY(vpFilterTypeDelegate)
+};
+
+#endif
diff --git a/Applications/VpView/vpFrameMap.cxx b/Applications/VpView/vpFrameMap.cxx
new file mode 100644
index 00000000..784c32d1
--- /dev/null
+++ b/Applications/VpView/vpFrameMap.cxx
@@ -0,0 +1,402 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFrameMap.h"
+
+#include "vpFileDataSource.h"
+#include "vpImageSourceFactory.h"
+
+#include <vtkVgBaseImageSource.h>
+#include <vtkVgTimeStamp.h>
+
+#include <vgTimeMap.h>
+
+#include <qtDebug.h>
+
+#include <QAtomicInt>
+#include <QMutex>
+#include <QMutexLocker>
+
+#include <map>
+#include <string>
+
+QTE_IMPLEMENT_D_FUNC(vpFrameMap)
+
+class vpFrameMetaData
+{
+public:
+  vpFrameMetaData(double microseconds) : Time(microseconds), Homography(0)
+    {}
+  vpFrameMetaData(vtkMatrix4x4 *homography) : Time(vgTimeStamp::InvalidTime())
+    {
+    this->Homography = 0;
+    if (homography)
+      {
+      this->Homography = vtkMatrix4x4::New();
+      this->Homography->DeepCopy(homography);
+      }
+    }
+  vpFrameMetaData(const vpFrameMetaData& other) : Homography(0)
+    {
+    this->Time = other.Time;
+    if (other.Homography)
+      {
+      this->Homography = vtkMatrix4x4::New();
+      this->Homography->DeepCopy(other.Homography);
+      }
+    }
+  vpFrameMetaData& operator=(const vpFrameMetaData& other)
+    {
+    this->Time = other.Time;
+    vpFrameMetaData::SetHomography(this->Homography, other.Homography);
+
+    return *this;
+    }
+
+  ~vpFrameMetaData()
+    {
+    if (this->Homography)
+      {
+      this->Homography->UnRegister(0);
+      }
+    }
+
+  static void SetHomography(vtkMatrix4x4*& destination,
+                            const vtkMatrix4x4* source)
+    {
+    if (!source)
+      {
+      if (destination)
+        {
+        destination->Delete();
+        destination = 0;
+        }
+      }
+    else
+      {
+      if (!destination)
+        {
+        destination = vtkMatrix4x4::New();
+        }
+      destination->DeepCopy(source);
+      }
+    }
+
+  double Time; // (microseconds)
+  vtkMatrix4x4* Homography;
+};
+
+//-----------------------------------------------------------------------------
+class vpFrameMapPrivate
+{
+public:
+  vpFrameMapPrivate() : Progress(0), Stop(false)
+    {}
+
+  vpFileDataSource* DataSource;
+  vgTimeMap<unsigned int> TimeToImageMap;
+  std::map<std::string, vpFrameMetaData> ImageToMetaDataMap;
+
+  QAtomicInt Progress;
+  volatile bool Stop;
+
+  QMutex TimeToImageMapMutex;
+};
+
+//-----------------------------------------------------------------------------
+void vpFrame::set(unsigned int index, vgTimeStamp time,
+                  const vtkMatrix4x4* homography/* = 0*/)
+{
+  this->Index = index;
+  this->Time = time;
+  vpFrameMetaData::SetHomography(this->Homography, homography);
+}
+
+//-----------------------------------------------------------------------------
+vpFrameMap::vpFrameMap(vpFileDataSource* dataSource) :
+  d_ptr(new vpFrameMapPrivate)
+{
+  QTE_D(vpFrameMap);
+
+  d->DataSource = dataSource;
+  connect(this, SIGNAL(finished()), SIGNAL(updated()));
+}
+
+//-----------------------------------------------------------------------------
+vpFrameMap::~vpFrameMap()
+{
+  this->stop();
+}
+
+//-----------------------------------------------------------------------------
+bool vpFrameMap::find(const vtkVgTimeStamp& time, vpFrame& frame,
+                      vg::SeekMode seekMode)
+{
+  QTE_D(vpFrameMap);
+
+  QMutexLocker ml(&d->TimeToImageMapMutex);
+
+  vgTimeMap<unsigned int>::iterator itr =
+    d->TimeToImageMap.find(time.GetRawTimeStamp(), seekMode);
+
+  if (itr == d->TimeToImageMap.end())
+    {
+    return false;
+    }
+
+  // we need to find the entry in the image to metadata map - has to be there
+  // because we build the TimeToImageMap from ImageToMetaDataMap
+  std::map<std::string, vpFrameMetaData>::iterator image2DataItr =
+    d->ImageToMetaDataMap.find(d->DataSource->getDataFile(itr.value()));
+  frame.set(itr.value(), itr.key(), image2DataItr->second.Homography);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpFrameMap::isEmpty()
+{
+  QTE_D(vpFrameMap);
+
+  QMutexLocker ml(&d->TimeToImageMapMutex);
+  return d->TimeToImageMap.isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+bool vpFrameMap::first(vpFrame& frame)
+{
+  QTE_D(vpFrameMap);
+
+  QMutexLocker ml(&d->TimeToImageMapMutex);
+
+  if (d->TimeToImageMap.isEmpty())
+    {
+    return false;
+    }
+
+  vgTimeMap<unsigned int>::iterator itr = d->TimeToImageMap.begin();
+
+  // we need to find the entry in the image to metadata map - has to be there
+  // because we build the TimeToImageMap from ImageToMetaDataMap
+  std::map<std::string, vpFrameMetaData>::iterator image2DataItr =
+    d->ImageToMetaDataMap.find(d->DataSource->getDataFile(itr.value()));
+  frame.set(itr.value(), itr.key(), image2DataItr->second.Homography);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpFrameMap::last(vpFrame& frame)
+{
+  QTE_D(vpFrameMap);
+
+  QMutexLocker ml(&d->TimeToImageMapMutex);
+
+  if (d->TimeToImageMap.isEmpty())
+    {
+    return false;
+    }
+
+  vgTimeMap<unsigned int>::iterator itr = --d->TimeToImageMap.end();
+
+  // we need to find the entry in the image to metadata map - has to be there
+  // because we build the TimeToImageMap from ImageToMetaDataMap
+  std::map<std::string, vpFrameMetaData>::iterator image2DataItr =
+    d->ImageToMetaDataMap.find(d->DataSource->getDataFile(itr.value()));
+  frame.set(itr.value(), itr.key(), image2DataItr->second.Homography);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpFrameMap::getFrame(unsigned int frameIndex, vpFrame& frame)
+{
+  QTE_D(vpFrameMap);
+
+  QMutexLocker ml(&d->TimeToImageMapMutex);
+
+  if (frameIndex >= (unsigned int)d->DataSource->getFileCount())
+    {
+    return false;
+    }
+
+  std::map<std::string, vpFrameMetaData>::iterator image2DataItr =
+    d->ImageToMetaDataMap.find(d->DataSource->getDataFile(frameIndex));
+  if (image2DataItr == d->ImageToMetaDataMap.end())
+    {
+    return false;
+    }
+
+  frame.set(frameIndex, vgTimeStamp(image2DataItr->second.Time),
+            image2DataItr->second.Homography);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vpFrameMap::setImageTime(const std::string& filename, double microseconds)
+{
+  QTE_D(vpFrameMap);
+
+  Q_ASSERT(!this->isRunning());
+  std::map<std::string, vpFrameMetaData>::iterator itr =
+    d->ImageToMetaDataMap.find(filename);
+  if (itr != d->ImageToMetaDataMap.end())
+    {
+    itr->second.Time = microseconds;
+    return;
+    }
+  vpFrameMetaData metaData(microseconds);
+  d->ImageToMetaDataMap.insert(std::make_pair(filename, metaData));
+}
+
+//-----------------------------------------------------------------------------
+void vpFrameMap::setImageHomography(const std::string& filename,
+                                    vtkMatrix4x4 *homography)
+{
+  QTE_D(vpFrameMap);
+
+  Q_ASSERT(!this->isRunning());
+  std::map<std::string, vpFrameMetaData>::iterator itr =
+    d->ImageToMetaDataMap.find(filename);
+  if (itr != d->ImageToMetaDataMap.end())
+    {
+    vpFrameMetaData::SetHomography(itr->second.Homography, homography);
+    return;
+    }
+  vpFrameMetaData metaData(homography);
+  d->ImageToMetaDataMap.insert(std::make_pair(filename, metaData));
+}
+
+//-----------------------------------------------------------------------------
+void vpFrameMap::startUpdate()
+{
+  QTE_D(vpFrameMap);
+
+  if (this->isRunning())
+    {
+    qDebug() << "Frame map update has already started.";
+    return;
+    }
+
+  d->Stop = false;
+  d->Progress = 0;
+  this->start();
+}
+
+//-----------------------------------------------------------------------------
+void vpFrameMap::stop()
+{
+  QTE_D(vpFrameMap);
+
+  d->Stop = true;
+  this->wait();
+}
+
+//-----------------------------------------------------------------------------
+int vpFrameMap::progress()
+{
+  QTE_D(vpFrameMap);
+
+  return d->Progress;
+}
+
+//-----------------------------------------------------------------------------
+void vpFrameMap::exportImageTimes(
+  std::vector<std::pair<std::string, double> >& imageTimes)
+{
+  QTE_D(vpFrameMap);
+
+  // Stop updating momentarily to avoid any races on the image -> time map.
+  bool wasRunning = this->isRunning();
+  this->stop();
+
+  // iterate to extract time
+  std::map<std::string, vpFrameMetaData>::iterator itr =
+    d->ImageToMetaDataMap.begin();
+  for (; itr != d->ImageToMetaDataMap.end(); itr++)
+    {
+    imageTimes.push_back(
+      std::pair<std::string, double>(itr->first, itr->second.Time));
+    }
+
+  // Restart decoding thread.
+  if (wasRunning)
+    {
+    this->startUpdate();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpFrameMap::run()
+{
+  QTE_D(vpFrameMap);
+
+    {
+    QMutexLocker ml(&d->TimeToImageMapMutex);
+    d->TimeToImageMap.clear();
+    }
+
+  int numFiles = d->DataSource->getFileCount();
+  if (numFiles == 0)
+    {
+    return;
+    }
+
+  vtkSmartPointer<vtkVgBaseImageSource> imageSource;
+  imageSource.TakeReference(
+    vpImageSourceFactory::GetInstance()->Create(
+      d->DataSource->getDataFile(0)));
+
+  if (!imageSource)
+    {
+    return;
+    }
+
+  std::map<std::string, vpFrameMetaData>::iterator lastInsertPos =
+    d->ImageToMetaDataMap.begin();
+  for (int i = 0; i < numFiles; ++i, d->Progress = i)
+    {
+    if (d->Stop)
+      {
+      return;
+      }
+
+    // Look up the filename in our internal map to check if we've seen this
+    // image before. If so, we don't need to read the timestamp metadata again.
+    std::string filename = d->DataSource->getDataFile(i);
+    std::map<std::string, vpFrameMetaData>::iterator itr =
+      d->ImageToMetaDataMap.find(filename);
+
+    vtkVgTimeStamp ts;
+    if (itr != d->ImageToMetaDataMap.end())
+      {
+      ts.SetTime(itr->second.Time);
+      ts.SetFrameNumber(i);
+      }
+    else
+      {
+      imageSource->SetFileName(filename.c_str());
+      imageSource->UpdateInformation();
+      vtkVgTimeStamp imageTimeStamp = imageSource->GetImageTimeStamp();
+      if (!imageTimeStamp.IsValid())
+        {
+        qDebug() << "No timestamp data found for" << filename.c_str()
+                 << ", frame will be ignored";
+        continue;
+        }
+      ts.SetTime(imageTimeStamp.GetTime());
+      ts.SetFrameNumber(i);
+      vpFrameMetaData metaData(ts.GetTime());
+      lastInsertPos =
+        d->ImageToMetaDataMap.insert(lastInsertPos,
+                                     std::make_pair(filename, metaData));
+      }
+      {
+      QMutexLocker ml(&d->TimeToImageMapMutex);
+      d->TimeToImageMap.insert(ts.GetRawTimeStamp(), static_cast<unsigned>(i));
+      }
+    }
+}
diff --git a/Applications/VpView/vpFrameMap.h b/Applications/VpView/vpFrameMap.h
new file mode 100644
index 00000000..0c93cf34
--- /dev/null
+++ b/Applications/VpView/vpFrameMap.h
@@ -0,0 +1,92 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFrameMap_h
+#define __vpFrameMap_h
+
+#include <vtkMatrix4x4.h>
+
+#include <vtkVgTimeStamp.h>
+
+#include <vgNamespace.h>
+
+#include <qtGlobal.h>
+
+#include <QThread>
+
+#include <vector>
+
+// Forward declarations.
+class vtkMatrix4x4;
+
+class vpFileDataSource;
+class vpFrameMapPrivate;
+
+class vpFrame
+{
+public:
+  vpFrame() : Index(0), Homography(0)
+    {}
+
+  ~vpFrame()
+    {
+    if (this->Homography)
+      {
+      this->Homography->Delete();
+      }
+    }
+
+  void set(unsigned int index, vgTimeStamp time,
+           const vtkMatrix4x4* homography = 0);
+
+  unsigned int Index;
+  vtkVgTimeStamp Time;
+  vtkMatrix4x4* Homography;
+};
+
+class vpFrameMap : public QThread
+{
+  Q_OBJECT
+
+public:
+  vpFrameMap(vpFileDataSource* dataSource);
+  ~vpFrameMap();
+
+  bool find(const vtkVgTimeStamp& time, vpFrame& frame,
+            vg::SeekMode seekMode = vg::SeekNearest);
+
+  bool isEmpty();
+
+  bool first(vpFrame& frame);
+  bool last(vpFrame& frame);
+  bool getFrame(unsigned int frameIndex, vpFrame& frameValue);
+
+  void setImageTime(const std::string& filename, double microseconds);
+  void setImageHomography(const std::string& filename,
+                          vtkMatrix4x4 *homography);
+  void startUpdate();
+  void stop();
+
+  int progress();
+
+  void exportImageTimes(std::vector<std::pair<std::string, double> >&
+                          imageTimes);
+
+signals:
+  void updated();
+
+protected:
+  virtual void run();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vpFrameMap);
+
+private:
+  QTE_DECLARE_PRIVATE(vpFrameMap);
+  Q_DISABLE_COPY(vpFrameMap);
+};
+
+#endif
diff --git a/Applications/VpView/vpFseIO.cxx b/Applications/VpView/vpFseIO.cxx
new file mode 100644
index 00000000..4664ff4e
--- /dev/null
+++ b/Applications/VpView/vpFseIO.cxx
@@ -0,0 +1,76 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFseIO.h"
+
+#include "vpFseTrackIO.h"
+
+#include <assert.h>
+
+//-----------------------------------------------------------------------------
+vpFseIO::vpFseIO() :
+  ImageHeight(0)
+{}
+
+//-----------------------------------------------------------------------------
+vpFseIO::~vpFseIO()
+{
+  delete this->TrackIO;
+}
+
+//-----------------------------------------------------------------------------
+void vpFseIO::SetTrackModel(vtkVgTrackModel* trackModel,
+                            vpTrackIO::TrackStorageMode storageMode,
+                            vpTrackIO::TrackTimeStampMode timeStampMode,
+                            vtkVgTrackTypeRegistry* trackTypes,
+                            vtkMatrix4x4* geoTransform,
+                            vpFrameMap* frameMap)
+{
+  delete this->TrackIO;
+  vpFseTrackIO* io = new vpFseTrackIO(trackModel, storageMode, timeStampMode,
+                                      trackTypes, geoTransform, frameMap);
+  io->SetImageHeight(this->ImageHeight);
+  io->SetTracksFileName(this->TracksFilename.c_str());
+  this->TrackIO = io;
+}
+
+//-----------------------------------------------------------------------------
+void vpFseIO::SetEventModel(vtkVgEventModel*,
+                            vtkVgEventTypeRegistry*)
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpFseIO::SetActivityModel(vtkVgActivityManager*,
+                               vpActivityConfig*)
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpFseIO::SetTracksFileName(const char* tracksFileName)
+{
+  this->TracksFilename = tracksFileName;
+  if (this->TrackIO)
+    {
+    static_cast<vpFseTrackIO*>(this->TrackIO)->SetTracksFileName(tracksFileName);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpFseIO::SetImageHeight(unsigned int imageHeight)
+{
+  this->ImageHeight = imageHeight;
+  if (this->TrackIO)
+    {
+    static_cast<vpFseTrackIO*>(this->TrackIO)->SetImageHeight(imageHeight);
+    }
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpFseIO::GetImageHeight() const
+{
+  return this->ImageHeight;
+}
diff --git a/Applications/VpView/vpFseIO.h b/Applications/VpView/vpFseIO.h
new file mode 100644
index 00000000..ac4c25ed
--- /dev/null
+++ b/Applications/VpView/vpFseIO.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFseIO_h
+#define __vpFseIO_h
+
+#include "vpModelIO.h"
+
+class vtkVgTrack;
+class vtkVgEvent;
+
+class vpFseIO : public vpModelIO
+{
+public:
+  vpFseIO();
+  virtual ~vpFseIO();
+
+  virtual void SetTrackModel(vtkVgTrackModel* trackModel,
+                             vpTrackIO::TrackStorageMode storageMode,
+                             vpTrackIO::TrackTimeStampMode timeStampMode,
+                             vtkVgTrackTypeRegistry* trackTypes,
+                             vtkMatrix4x4* geoTransform,
+                             vpFrameMap* frameMap);
+
+  // not implemented
+  virtual void SetEventModel(vtkVgEventModel* eventModel,
+                             vtkVgEventTypeRegistry* eventTypes);
+
+  // not implemented
+  virtual void SetActivityModel(vtkVgActivityManager* activityManager,
+                                vpActivityConfig* activityConfig);
+
+  void SetTracksFileName(const char* tracksFileName);
+
+  virtual void SetImageHeight(unsigned int imageHeight);
+  virtual unsigned int GetImageHeight() const;
+
+protected:
+  unsigned int ImageHeight;
+  std::string TracksFilename;
+};
+
+#endif // __vpFseIO_h
diff --git a/Applications/VpView/vpFseTrackIO.cxx b/Applications/VpView/vpFseTrackIO.cxx
new file mode 100644
index 00000000..ff551e31
--- /dev/null
+++ b/Applications/VpView/vpFseTrackIO.cxx
@@ -0,0 +1,416 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpFseTrackIO.h"
+
+#include "vpFrameMap.h"
+
+#include <vtkVgScalars.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackTypeRegistry.h>
+#include <vtkVgTypeDefs.h>
+
+#include <vtkPoints.h>
+#include <vtksys/SystemTools.hxx>
+
+#include <assert.h>
+#include <limits>
+
+#include <json.h>
+
+//-----------------------------------------------------------------------------
+vpFseTrackIO::vpFseTrackIO(vtkVgTrackModel* trackModel,
+                           TrackStorageMode storageMode,
+                           TrackTimeStampMode timeStampMode,
+                           vtkVgTrackTypeRegistry* trackTypes,
+                           vtkMatrix4x4* geoTransform,
+                           vpFrameMap* frameMap) :
+  vpTrackIO(trackModel, storageMode, timeStampMode, trackTypes,
+            geoTransform, frameMap),
+  ImageHeight(0)
+{
+  // TSM_TransformedGeoCoords is equal to TSM_ImageCoords for FSEs; the
+  // "track head" is stored in non-inverted image coordinates
+  if (!(this->StorageMode == TSM_ImageCoords ||
+        this->StorageMode == TSM_InvertedImageCoords ||
+        this->StorageMode == TSM_TransformedGeoCoords))
+    {
+    std::cerr << "Current track storage mode is not supported for FSE io\n";
+    }
+}
+
+//-----------------------------------------------------------------------------
+vpFseTrackIO::~vpFseTrackIO()
+{}
+
+//-----------------------------------------------------------------------------
+bool vpFseTrackIO::ReadTracks()
+{
+  return this->ImportTracks(0, 0.0f, 0.0f);
+}
+
+//-----------------------------------------------------------------------------
+bool vpFseTrackIO::ImportTracks(vtkIdType idsOffset,
+                                float offsetX, float offsetY)
+{
+  assert(this->ImageHeight != 0);
+  assert(!this->TracksFileName.empty());
+
+  if (!vtksys::SystemTools::FileExists(this->TracksFileName.c_str(), true))
+    {
+    std::cerr << "Track file does not exist: " << this->TracksFileName << '\n';
+    return false;
+    }
+
+  // Must read fse tracks *after* regular tracks if ids might collide
+  if (this->TrackModel->GetSceneElementIdsOffset() == 0)
+    {
+    this->TrackModel->SetSceneElementIdsOffset(
+      this->TrackModel->GetNextAvailableId());
+    }
+
+  JSONNode root;
+  try
+    {
+    std::ifstream file(this->TracksFileName.c_str());
+    std::string str((std::istreambuf_iterator<char>(file)),
+                    std::istreambuf_iterator<char>());
+
+    root = libjson::parse(str);
+    }
+  catch (...)
+    {
+    std::cerr << "Error parsing track JSON\n";
+    return false;
+    }
+
+  JSONNode tracks;
+  try
+    {
+    tracks = root.at("tracks");
+    }
+  catch (...)
+    {
+    std::cerr << "No \"tracks\" element found\n";
+    return false;
+    }
+
+  std::vector<float> points;
+
+  try
+    {
+    for (unsigned int i = 0, size = tracks.size(); i < size; ++i)
+      {
+      const JSONNode& node = tracks[i];
+      int id = node.at("id").as_int() + idsOffset;
+
+      vtkIdType trackId = this->TrackModel->GetTrackIdForSceneElement(id);
+      if (this->TrackModel->GetTrack(trackId))
+        {
+        // There is already a track in the model with the desired id.
+        vtkIdType newId = this->TrackModel->GetNextAvailableId();
+        std::cout << "Track id " << trackId
+                  << " is not unique: changing id of imported track to "
+                  << newId << '\n';
+        trackId = newId;
+        }
+
+      vtkVgTrack* track = vtkVgTrack::New();
+      track->InterpolateMissingPointsOnInsertOn();
+      track->SetPoints(this->TrackModel->GetPoints());
+      track->SetDisplayFlags(vtkVgTrack::DF_SceneElement);
+      track->SetId(trackId);
+
+      // Get optional label
+      try
+        {
+        std::string type = node.at("label").as_string();
+        int typeIndex = this->TrackTypes->GetTypeIndex(type.c_str());
+        if (typeIndex == -1)
+          {
+          // Add a new type to the registry if it's not already defined
+          vgTrackType tt;
+          tt.SetId(type.c_str());
+          typeIndex = this->TrackTypes->GetNumberOfTypes();
+          this->TrackTypes->AddType(tt);
+          }
+        track->SetType(typeIndex);
+        }
+      catch (...) {}
+
+      // Get optional probability value
+      try
+        {
+        double probability = node.at("probability").as_float();
+        track->SetNormalcy(probability);
+        }
+      catch (...) {}
+
+      // Get status string
+      try
+        {
+        std::string status = node.at("status").as_string();
+        if (status == "positive")
+          {
+          track->SetStatus(vgObjectStatus::Positive);
+          }
+        else if (status == "negative")
+          {
+          track->SetStatus(vgObjectStatus::Negative);
+          }
+        }
+      catch (...) {}
+
+      // Get is_computed bit
+      try
+        {
+        track->SetUserCreated(!node.at("is_computed").as_bool());
+        }
+      catch (...) {}
+
+      const JSONNode& frames = node.at("frames");
+      for (unsigned int i = 0, size = frames.size(); i < size; ++i)
+        {
+        const JSONNode& frame = frames[i];
+
+        int frameNum = frame.at("frame_id").as_int();
+
+        vtkVgTimeStamp ts;
+        if (this->TimeStampMode & TSF_FrameNumber)
+          {
+          ts.SetFrameNumber(frameNum);
+          }
+        if (this->TimeStampMode & TSF_Time)
+          {
+          try
+            {
+            double seconds = frame.at("seconds").as_float();
+            ts.SetTime(seconds * 1e6);
+            }
+          catch (...)
+            {
+            std::cerr << "Track " << id
+                      << " has a frame with no time information in full "
+                      << "timestamp mode (" << frameNum << ")\n";
+            }
+          }
+
+        double img_x = frame.at("image_x").as_float();
+        double img_y = frame.at("image_y").as_float();
+
+        vtkVgGeoCoord geoCoord;
+        try
+          {
+          double latitude = frame.at("latitude").as_float();
+          double longitude = frame.at("longitude").as_float();
+          geoCoord = vtkVgGeoCoord(latitude, longitude);
+          }
+        catch (...) {}
+
+        unsigned int imageMaxY = this->GetImageHeight() - 1;
+
+        // Read the polygon points
+        JSONNode polygon = frame.at("polygon");
+        points.reserve(polygon.size() * 3);
+
+        for (unsigned int i = 0, size = polygon.size(); i < size; ++i)
+          {
+          const JSONNode& vert = polygon[i];
+          float x = vert.at("image_x").as_float();
+          float y = vert.at("image_y").as_float();
+          if (this->StorageMode == TSM_InvertedImageCoords)
+            {
+            y = imageMaxY - y;
+            }
+          points.push_back(x + offsetX);
+          points.push_back(y + offsetY);
+          points.push_back(0.0f);
+          }
+
+        if (this->StorageMode == TSM_InvertedImageCoords)
+          {
+          img_y = imageMaxY - img_y;
+          }
+
+        double point[] = { img_x + offsetX, img_y + offsetY, 0.0 };
+        track->SetPoint(ts, point, geoCoord, vtkIdType(polygon.size()),
+                        &points[0]);
+        points.clear();
+        }
+
+      if (this->HasOverrideColor)
+        {
+        track->SetColor(this->OverrideColor);
+        }
+      else
+        {
+        double color[3];
+        int typeIndex = track->GetType();
+        if (typeIndex != -1)
+          {
+          // If the track has a valid type, use that to look up a color
+          const vgTrackType& type = this->TrackTypes->GetType(typeIndex);
+          type.GetColor(color[0], color[1], color[2]);
+          track->SetColor(color[0], color[1], color[2]);
+          }
+        else
+          {
+          this->GetDefaultTrackColor(track->GetId(), color);
+          track->SetColor(color);
+          }
+        }
+      this->TrackModel->AddTrack(track);
+      track->FastDelete();
+      }
+    }
+  catch (...)
+    {
+    std::cerr << "Bad track element JSON\n";
+    return false;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpFseTrackIO::WriteTracks(const char* filename,
+                               bool writeSceneElements) const
+{
+  vtkPoints* points = this->TrackModel->GetPoints();
+  double imageYExtent = this->GetImageHeight() - 1;
+
+  // Not using this root node for anything now, but include it for future use
+  JSONNode root(JSON_NODE);
+  JSONNode tracks(JSON_ARRAY);
+  tracks.set_name("tracks");
+
+  this->TrackModel->InitTrackTraversal();
+  while (vtkVgTrack* track = this->TrackModel->GetNextTrack().GetTrack())
+    {
+    bool isSceneElement =
+      (track->GetDisplayFlags() & vtkVgTrack::DF_SceneElement) != 0;
+
+    if (isSceneElement != writeSceneElements)
+      {
+      continue;
+      }
+
+    JSONNode node(JSON_NODE);
+
+    vtkIdType id = track->GetId();
+    if (isSceneElement)
+      {
+      id = this->TrackModel->GetSceneElementIdForTrack(id);
+      }
+
+    node.push_back(JSONNode("id", id));
+
+    int trackType = track->GetType();
+    if (trackType != -1)
+      {
+      node.push_back(JSONNode("label",
+                              this->TrackTypes->GetType(trackType).GetId()));
+      }
+
+    node.push_back(JSONNode("probability", track->GetNormalcy()));
+
+    const char* status;
+    switch (track->GetStatus())
+      {
+      case vgObjectStatus::Positive: status = "positive"; break;
+      case vgObjectStatus::Negative: status = "negative"; break;
+      default: status = "none"; break;
+      }
+    node.push_back(JSONNode("status", status));
+
+    node.push_back(JSONNode("is_computed", !track->IsUserCreated()));
+
+    JSONNode frames(JSON_ARRAY);
+    frames.set_name("frames");
+
+    track->InitPathTraversal();
+    vtkVgTimeStamp ts;
+    for (;;)
+      {
+      vtkIdType ptId = track->GetNextPathPt(ts);
+      if (ptId == -1)
+        {
+        break;
+        }
+
+      vtkIdType nHeadPts;
+      vtkIdType trackPtId;
+      vtkIdType* headPts;
+      track->GetHeadIdentifier(ts, nHeadPts, headPts, trackPtId);
+
+      if (nHeadPts == 0 || track->GetFrameIsInterpolated(ts))
+        {
+        continue;
+        }
+
+      JSONNode frame;
+      frame.push_back(JSONNode("frame_id", ts.GetFrameNumber()));
+      if (ts.HasTime())
+        {
+        frame.push_back(JSONNode("seconds", ts.GetTime() * 1e-6));
+        }
+
+      // image coord
+      double pt[3];
+      points->GetPoint(ptId, pt);
+      if (this->StorageMode == TSM_InvertedImageCoords)
+        {
+        pt[1] = imageYExtent - pt[1];
+        }
+      frame.push_back(JSONNode("image_x", pt[0]));
+      frame.push_back(JSONNode("image_y", pt[1]));
+
+      // geo coord
+      vtkVgGeoCoord geoCoord = track->GetGeoCoord(ts);
+      if (geoCoord.IsValid())
+        {
+        frame.push_back(JSONNode("latitude", geoCoord.Latitude));
+        frame.push_back(JSONNode("longitude", geoCoord.Longitude));
+        }
+
+      // polygon
+      JSONNode polygon(JSON_ARRAY);
+      polygon.set_name("polygon");
+      for (int i = 0; i < nHeadPts - 1; ++i)
+        {
+        double point[3];
+        points->GetPoint(headPts[i], point);
+        if (this->StorageMode == TSM_InvertedImageCoords)
+          {
+          point[1] = imageYExtent - point[1];
+          }
+        JSONNode vertex(JSON_NODE);
+        vertex.push_back(JSONNode("image_x", point[0]));
+        vertex.push_back(JSONNode("image_y", point[1]));
+        polygon.push_back(vertex);
+        }
+
+      frame.push_back(polygon);
+      frames.push_back(frame);
+      }
+
+    node.push_back(frames);
+    tracks.push_back(node);
+    }
+  root.push_back(tracks);
+
+  std::ofstream file(filename, ios::out | ios::trunc | ios::binary);
+  if (!file.is_open())
+    {
+    std::cerr << "ERROR: Failed to write tracks to "
+              << filename << '\n';
+    return false;
+    }
+
+  file << root.write_formatted();
+  return true;
+}
diff --git a/Applications/VpView/vpFseTrackIO.h b/Applications/VpView/vpFseTrackIO.h
new file mode 100644
index 00000000..1cde8795
--- /dev/null
+++ b/Applications/VpView/vpFseTrackIO.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpFseTrackIO_h
+#define __vpFseTrackIO_h
+
+#include "vpTrackIO.h"
+
+#include <string>
+
+class vtkVgTrack;
+
+class vpFseTrackIO : public vpTrackIO
+{
+public:
+  vpFseTrackIO(vtkVgTrackModel* trackModel,
+               vpTrackIO::TrackStorageMode storageMode,
+               vpTrackIO::TrackTimeStampMode timeStampMode,
+               vtkVgTrackTypeRegistry* trackTypes = 0,
+               vtkMatrix4x4* geoTransform = 0,
+               vpFrameMap* frameMap = 0);
+
+  virtual ~vpFseTrackIO();
+
+  void SetTracksFileName(const char* tracksFileName)
+    { this->TracksFileName = tracksFileName; }
+
+  void SetImageHeight(unsigned int imageHeight)
+    {
+    this->ImageHeight = imageHeight;
+    }
+
+  unsigned int GetImageHeight() const
+    {
+    return this->ImageHeight;
+    }
+
+  virtual bool ReadTracks();
+  virtual bool ImportTracks(vtkIdType idsOffset, float offsetX, float offsetY);
+
+  virtual bool WriteTracks(const char* filename, bool writeSceneElements) const;
+
+private:
+  std::string TracksFileName;
+  unsigned int ImageHeight;
+};
+
+#endif // __vpFseTrackIO_h
diff --git a/Applications/VpView/vpGraphAnimateCallback.h b/Applications/VpView/vpGraphAnimateCallback.h
new file mode 100644
index 00000000..47d19c0d
--- /dev/null
+++ b/Applications/VpView/vpGraphAnimateCallback.h
@@ -0,0 +1,101 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpGraphAnimateCallback_h
+#define __vpGraphAnimateCallback_h
+
+// VisGUI includes
+#include "vpMultiGraphModel.h"
+#include "vpMultiGraphRepresentation.h"
+
+// VTK includes
+#include <vtkCommand.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+
+// C++ includes
+#include <vector>
+
+class vpGraphAnimateCallback : public vtkCommand
+{
+public:
+  vpGraphAnimateCallback() : vtkCommand(),
+    NoOfSteps(20),
+    CurrentStep(1)
+    {
+    }
+
+  static vpGraphAnimateCallback* New()
+    {
+    vpGraphAnimateCallback* vpcb = new vpGraphAnimateCallback();
+    return vpcb;
+    }
+
+  void Reset(vpMultiGraphModel* graphModel, vpMultiGraphRepresentation* rep,
+             vtkRenderer* ren,
+             const std::vector<vtkIdType>& ids,
+             const std::vector<double>& from,
+             const std::vector<double>& to,
+             vpMultiGraphModel::NodePositionType positionType)
+    {
+    this->CurrentStep = 1;
+    this->GraphModel = graphModel;
+    this->GraphRep = rep;
+    this->Renderer = ren;
+    this->RenderWindow = this->Renderer->GetRenderWindow();
+    this->Ids = ids;
+    this->ToXYZs = to;
+    this->FromXYZs = from;
+    this->PositionType = positionType;
+    }
+
+  virtual void Execute(vtkObject* vtkNotUsed(caller),
+                       unsigned long vtkNotUsed(eventId),
+                       void* vtkNotUsed(callData))
+    {
+    double transX, transY, transZ;
+    size_t ix, iy, iz;
+    int j = this->CurrentStep;
+    for (size_t i = 0; i < Ids.size(); ++i)
+      {
+      ix = i * 3;
+      iy = i * 3 + 1;
+      iz = i * 3 + 2;
+
+      transX = FromXYZs[ix] + j * (ToXYZs[ix] - FromXYZs[ix]) / NoOfSteps;
+      transY = FromXYZs[iy] + j * (ToXYZs[iy] - FromXYZs[iy]) / NoOfSteps;
+      transZ = FromXYZs[iz] + j * (ToXYZs[iz] - FromXYZs[iz]) / NoOfSteps;
+
+      this->GraphModel->MoveNode(this->PositionType, Ids[i], transX, transY,
+                                 transZ, true);
+      }
+
+    this->RenderWindow->Render();
+
+    if (this->CurrentStep < this->NoOfSteps)
+      {
+      this->RenderWindow->GetInteractor()->CreateOneShotTimer(30);
+      ++this->CurrentStep;
+      }
+    }
+
+ private:
+  int NoOfSteps;
+  int CurrentStep;
+
+  std::vector<vtkIdType> Ids;
+  std::vector<double> FromXYZs;
+  std::vector<double> ToXYZs;
+  vpMultiGraphModel::NodePositionType PositionType;
+
+  vpMultiGraphModel* GraphModel;
+  vpMultiGraphRepresentation* GraphRep;
+  vtkRenderer* Renderer;
+  vtkRenderWindow* RenderWindow;
+};
+
+#endif // __vpGraphAnimateCallback_h
diff --git a/Applications/VpView/vpGraphModelHelper.cxx b/Applications/VpView/vpGraphModelHelper.cxx
new file mode 100644
index 00000000..97699a64
--- /dev/null
+++ b/Applications/VpView/vpGraphModelHelper.cxx
@@ -0,0 +1,460 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpGraphModelHelper.h"
+
+#include "vpEventConfig.h"
+#include "vpGraphSortAlgorithms.h"
+#include "vpMultiGraphModel.h"
+#include "vpMultiGraphRepresentation.h"
+
+#include <qtStlUtil.h>
+
+#include <vtkVgEvent.h>
+
+#include <vtkIdTypeArray.h>
+#include <vtkVertexListIterator.h>
+
+#include <QDebug>
+
+#include <algorithm>
+#include <sstream>
+
+//-----------------------------------------------------------------------------
+vpGraphModelHelper::vpGraphModelHelper(vpMultiGraphModel* model) :
+  QObject(), GraphModel(model), ImportOrderIndex(0)
+{
+  this->NodeDefaultEdgeAttr = this->NodeStartAttr = this->NodeStopAttr = -1;
+}
+
+//-----------------------------------------------------------------------------
+int vpGraphModelHelper::createNode(double x, double y)
+{
+  std::string nodeType = stdString(this->NodeType);
+  int nodeId = this->GraphModel->CreateNode(nodeType,
+                                            x, y, 0.0,
+                                            this->getEdgeAttrForType(nodeType));
+
+  if (nodeId == -1)
+    {
+    qDebug() << "Failed to create node";
+    return -1;
+    }
+
+  emit this->nodeCreated(this->NodeType, nodeId);
+  return nodeId;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::createNodeExternal(int id,
+                                            double x, double y,
+                                            const std::string& type,
+                                            const std::string& label)
+{
+  double eventPositions[4] = {x, y, x, y};
+  id = this->GraphModel->CreateNode(id, type, label, x, y, 0.0, eventPositions);
+
+  if (id == -1)
+    {
+    qDebug() << "Failed to create node";
+    return;
+    }
+
+  emit this->nodeCreated(qtString(type), id);
+}
+
+//-----------------------------------------------------------------------------
+int vpGraphModelHelper::createNodeExternal(double x, double y,
+                                           const std::string& type,
+                                           const std::string& label)
+{
+  double eventPositions[4] = {x, y, x, y};
+  int id = this->GraphModel->CreateNode(type, label, x, y, 0.0, eventPositions);
+
+  if (id == -1)
+    {
+    qDebug() << "Failed to create node";
+    return id;
+    }
+
+  emit this->nodeCreated(qtString(type), id);
+  return id;
+}
+
+//-----------------------------------------------------------------------------
+int vpGraphModelHelper::createNodeExternal(double x, double y,
+  const std::string& type, const std::string& label,
+  double (&eventPositions)[4],
+  int defaultEdgeAttr,
+  unsigned int groupId,
+  double startTime, double endTime,
+  unsigned int startFrame, unsigned int endFrame,
+  double spatialX, double spatialY,
+  vtkIdType eventId)
+
+{
+  int id = this->GraphModel->CreateNode(type, label, x, y, 0.0,
+             eventPositions, defaultEdgeAttr, groupId, startTime,
+             endTime, startFrame, endFrame,
+             spatialX, spatialY, eventId);
+
+  if (id == -1)
+    {
+    qDebug() << "Failed to create node";
+    return id;
+    }
+
+  emit this->nodeCreated(qtString(type), id);
+  return id;
+}
+
+//-----------------------------------------------------------------------------
+int vpGraphModelHelper::createNodeExternal(int id,
+  double x, double y,
+  const std::string& type, const std::string& label,
+  double (&eventPositions)[4],
+  int defaultEdgeAttr,
+  unsigned int groupId,
+  double startTime, double endTime,
+  unsigned int startFrame, unsigned int endFrame,
+  double spatialX, double spatialY,
+  vtkIdType eventId)
+
+{
+  id = this->GraphModel->CreateNode(id, type, label, x, y, 0.0,
+         eventPositions, defaultEdgeAttr, groupId, startTime, endTime,
+         startFrame, endFrame, spatialX, spatialY, eventId);
+
+  if (id == -1)
+    {
+    qDebug() << "Failed to create node";
+    return id;
+    }
+
+  emit this->nodeCreated(qtString(type), id);
+  return id;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::createEdge(
+  int parent, int child, const std::string& domain,
+  vtkIntArray* parentAttrs, vtkIntArray* childAttrs)
+{
+  int edgeId
+    = this->GraphModel->CreateEdge(parent, child, domain,
+                                   parentAttrs, childAttrs);
+
+  if (edgeId < 0)
+    {
+    qDebug() << "Failed to create edge";
+    return;
+    }
+
+  emit this->edgeCreated(qtString(domain), edgeId);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::createEdgeExternal(
+  int edgeId, int parent, int child, const std::string& domain,
+  vtkIntArray* parentAttrs, vtkIntArray* childAttrs)
+{
+  edgeId
+    = this->GraphModel->CreateEdge(edgeId, parent, child, domain,
+                                   parentAttrs, childAttrs);
+
+  if (edgeId < 0)
+    {
+    qDebug() << "Failed to create edge";
+    return;
+    }
+
+  emit this->edgeCreated(qtString(domain), edgeId);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::setNodeType(int nodeId,
+                                     const std::string& nodeType,
+                                     const std::string& nodeLabel,
+                                     int defaultEdgeAttr)
+{
+  this->GraphModel->SetNodeType(nodeId, nodeType, nodeLabel, defaultEdgeAttr);
+
+  // Update the spatial position in case the default edge attr changed
+  std::map<int, vtkVgEvent*>::iterator itr = this->NodeIdToEvent.find(nodeId);
+  if (itr != this->NodeIdToEvent.end())
+    {
+    double x, y;
+    this->getEventSpatialPoint(itr->second, defaultEdgeAttr, x, y);
+    this->GraphModel->SetSpatialPosition(nodeId, x, y);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::setNodePosition(int nodeId,
+                                         vpMultiGraphModel::NodePositionType
+                                           positionType,
+                                         double x, double y)
+{
+  this->GraphModel->MoveNode(positionType, nodeId, x, y, 0.0);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::deleteNodes(vtkIdTypeArray* ids)
+{
+  this->GraphModel->DeleteNodes(ids);
+  emit this->nodesDeleted();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::deleteEdges(vtkIdTypeArray* ids,
+                                     const QString& domain)
+{
+  this->GraphModel->DeleteEdges(ids, stdString(domain));
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::selectNodes(vtkIdTypeArray* ids, bool append)
+{
+  if (append)
+    {
+    this->GraphModel->AddSelectedNodes(ids);
+    }
+  else
+    {
+    this->GraphModel->SetSelectedNodes(ids);
+    }
+  this->GraphModel->SetSelectedEdges(0, std::string());
+  emit this->selectedNodesChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::selectEdges(vtkIdTypeArray* ids,
+                                     const QString& domain, bool append)
+{
+  this->GraphModel->SetSelectedNodes(0);
+  if (append)
+    {
+    this->GraphModel->AddSelectedEdges(ids, stdString(domain));
+    }
+  else
+    {
+    this->GraphModel->SetSelectedEdges(ids, stdString(domain));
+    }
+  emit this->selectedEdgesChanged(domain);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::createEventNodes(
+  const std::vector<vtkVgEvent*>& events, double centerX, double y)
+{
+  if (events.empty())
+    {
+    return;
+    }
+
+  const double spacing = 0.3;
+
+  // Space the nodes evenly apart on a horizontal line
+  double width = (events.size() - 1) * spacing;
+  double x = centerX - 0.5 * width;
+
+  for (size_t i = 0, size = events.size(); i < size; ++i)
+    {
+    vtkVgEvent* event = events[i];
+    vtkIdType id = event->GetId();
+    std::string nodeType =
+      vpEventConfig::GetStringFromId(event->GetActiveClassifierType());
+
+    std::ostringstream ostr;
+    ostr << "Event: " << nodeType << '_' << id;
+
+    int attr = this->getEdgeAttrForType(nodeType);
+
+    double point[2];
+    this->getEventSpatialPoint(event, attr, point[0], point[1]);
+
+    double eventPositions[4];
+    event->GetDisplayPosition(event->GetStartFrame(), &eventPositions[0]);
+    event->GetDisplayPosition(event->GetEndFrame(), &eventPositions[2]);
+
+    int nodeId = this->createNodeExternal(x, y,
+                   nodeType, ostr.str(), eventPositions,
+                   attr, this->ImportOrderIndex,
+                   event->GetStartFrame().GetTime(),
+                   event->GetEndFrame().GetTime(),
+                   event->GetStartFrame().GetFrameNumber(),
+                   event->GetEndFrame().GetFrameNumber(),
+                   point[0], point[1], id);
+
+    this->NodeIdToEvent[nodeId] = event;
+    x += spacing;
+    }
+
+  this->ImportOrderIndex += 1;
+}
+
+//-----------------------------------------------------------------------------
+int vpGraphModelHelper::getNodeEventId(int nodeId)
+{
+  std::map<int, vtkVgEvent*>::iterator itr = this->NodeIdToEvent.find(nodeId);
+  if (itr == this->NodeIdToEvent.end())
+    {
+    return -1;
+    }
+  return itr->second->GetId();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::clear()
+{
+  this->GraphModel->Reset();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::setNewNodeType(const QString& type)
+{
+  this->NodeType = type;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::setNewNodeDefaultEdgeAttr(int attr)
+{
+  this->NodeDefaultEdgeAttr = attr;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::autoCreateEdges(const QString &domain, bool selected,
+                                         vpMultiGraphModel::NodePositionType
+                                           posType)
+{
+  std::string dom = stdString(domain);
+
+  if ((dom.compare("before") != 0) &&
+      (dom.compare("adjacent") != 0))
+    {
+    return;
+    }
+
+  vtkGraph* graph = this->GraphModel->GetGraph(dom);
+
+  if (!graph)
+    {
+    graph = this->GraphModel->CreateGraph(dom);
+    }
+
+  std::vector<vtkIdType> vertexIds;
+  std::map<vtkIdType, vtkIdType> vertexIdToIndex;
+
+  vtkSmartPointer<vtkVertexListIterator> vItr =
+    vtkSmartPointer<vtkVertexListIterator>::New();
+  graph->GetVertices(vItr);
+
+  if (!selected)
+    {
+    while (vItr->HasNext())
+      {
+      vtkIdType index = vItr->Next();
+      vtkIdType id = this->GraphModel->GetNodeId(index);
+
+      vertexIdToIndex[id] = index;
+      vertexIds.push_back(id);
+      }
+    }
+  else
+    {
+    vtkIdTypeArray* selectedNodes = this->GraphModel->GetSelectedNodes();
+    while (vItr->HasNext())
+      {
+      vtkIdType index = vItr->Next();
+      vtkIdType id = this->GraphModel->GetNodeId(index);
+
+      if (selectedNodes->LookupValue(id) != -1)
+        {
+        vertexIdToIndex[id] = index;
+        vertexIds.push_back(id);
+        }
+      }
+    }
+
+  if (dom.compare("before") == 0)
+    {
+    SortVerticesByXPosDesc sortAlg(this->GraphModel, posType);
+    std::sort(vertexIds.begin(), vertexIds.end(), sortAlg);
+
+    for (size_t i = 0; i < vertexIds.size(); ++i)
+      {
+      for (size_t j = i + 1; j < vertexIds.size(); ++j)
+        {
+        // If the edge exists between two nodes skip adding another edge.
+        if (graph->GetNumberOfEdges() &&
+            graph->GetEdgeId(vertexIdToIndex[vertexIds[j]],
+                             vertexIdToIndex[vertexIds[i]]) != -1)
+          {
+          continue;
+          }
+        int id = this->GraphModel->CreateEdge(vertexIds[j], vertexIds[i], dom);
+        emit this->edgeCreated(domain, id);
+        }
+      }
+    } // before
+  else if (dom.compare("adjacent") == 0)
+    {
+    for (size_t i = 0; i < vertexIds.size(); ++i)
+      {
+      for (size_t j = i + 1; j < vertexIds.size(); ++j)
+        {
+        // If the edge exists between two nodes skip adding another edge.
+        if (graph->GetNumberOfEdges() &&
+            graph->GetEdgeId(vertexIdToIndex[vertexIds[i]],
+                             vertexIdToIndex[vertexIds[j]]) != -1)
+          {
+          continue;
+          }
+        int id = this->GraphModel->CreateEdge(vertexIds[i], vertexIds[j], dom);
+        emit this->edgeCreated(domain, id);
+        }
+      }
+    } // adjacent
+  else
+    {
+    // Do nothing for now
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpGraphModelHelper::getEdgeAttrForType(const std::string& nodeType)
+{
+  if ((nodeType == "STARTING" || nodeType == "EXIT_VEHICLE") &&
+      this->NodeStartAttr != -1)
+    {
+    return this->NodeStartAttr;
+    }
+  if ((nodeType == "STOPPING" || nodeType == "ENTER_VEHICLE") &&
+      this->NodeStopAttr != -1)
+    {
+    return this->NodeStopAttr;
+    }
+  return this->NodeDefaultEdgeAttr;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelHelper::getEventSpatialPoint(vtkVgEvent* event,
+                                              int defaultEdgeAttr,
+                                              double& x, double& y)
+{
+  // Change the event point used depending on the default edge attribute type
+  double point[3];
+  if (defaultEdgeAttr != -1 && defaultEdgeAttr == this->NodeStopAttr)
+    {
+    event->GetDisplayPosition(event->GetEndFrame(), point);
+    }
+  else
+    {
+    event->GetDisplayPosition(event->GetStartFrame(), point);
+    }
+  x = point[0];
+  y = point[1];
+}
diff --git a/Applications/VpView/vpGraphModelHelper.h b/Applications/VpView/vpGraphModelHelper.h
new file mode 100644
index 00000000..ba869082
--- /dev/null
+++ b/Applications/VpView/vpGraphModelHelper.h
@@ -0,0 +1,128 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpGraphModelHelper_h
+#define __vpGraphModelHelper_h
+
+#include "vpMultiGraphModel.h"
+
+#include <QObject>
+
+#include <map>
+#include <vector>
+
+class vtkIdTypeArray;
+class vtkIntArray;
+class vtkVgEvent;
+
+//-----------------------------------------------------------------------------
+class vpGraphModelHelper : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit vpGraphModelHelper(vpMultiGraphModel* model);
+
+  void createEventNodes(const std::vector<vtkVgEvent*>& events,
+                        double centerX, double y);
+
+  int getNodeEventId(int nodeId);
+
+  int createNode(double x, double y);
+
+  void createNodeExternal(int id,
+                          double x, double y,
+                          const std::string& type,
+                          const std::string& label);
+
+  int createNodeExternal(double x, double y,
+                         const std::string& type,
+                         const std::string& label);
+
+  int createNodeExternal(double x, double y,
+                         const std::string& type, const std::string& label,
+                         double (&eventPositions)[4],
+                         int defaultEdgeAttr,
+                         unsigned int groupId,
+                         double startTime, double endTime,
+                         unsigned int startFrame, unsigned int endFrame,
+                         double spatialX, double spatialY,
+                         vtkIdType eventId);
+
+  int createNodeExternal(int id,
+                         double x, double y,
+                         const std::string& type, const std::string& label,
+                         double (&eventPositions)[4],
+                         int defaultEdgeAttr,
+                         unsigned int groupId,
+                         double startTime, double endTime,
+                         unsigned int startFrame, unsigned int endFrame,
+                         double spatialX, double spatialY,
+                         vtkIdType eventId);
+
+  void createEdge(int parent, int child, const std::string& domain,
+                  vtkIntArray* parentAttrs, vtkIntArray* childAttrs);
+
+  void createEdgeExternal(int edgeId, int parent, int child,
+                          const std::string& domain,
+                          vtkIntArray* parentAttrs, vtkIntArray* childAttrs);
+
+  void setNodeType(int nodeId, const std::string& nodeType,
+                   const std::string& nodeLabel, int nodeDefaultEdgeAttr);
+
+  void setNodePosition(int nodeId,
+                       vpMultiGraphModel::NodePositionType positionType,
+                       double x, double y);
+
+  void clear();
+
+  void autoCreateEdges(const QString& domain, bool selected,
+                       vpMultiGraphModel::NodePositionType posType);
+
+  // Temporary until have default attr config
+  void setStartAttr(int attr) { this->NodeStartAttr = attr; }
+  void setStopAttr(int attr)  { this->NodeStopAttr = attr; }
+
+signals:
+  void nodeCreated(QString nodeType, int);
+  void edgeCreated(QString domain, int);
+
+  void selectedNodesChanged();
+  void selectedEdgesChanged(const QString& domain);
+
+  void nodesDeleted();
+
+public slots:
+  void setNewNodeType(const QString& type);
+  void setNewNodeDefaultEdgeAttr(int attr);
+
+  void deleteNodes(vtkIdTypeArray* ids);
+  void deleteEdges(vtkIdTypeArray* ids, const QString& domain);
+
+  void selectNodes(vtkIdTypeArray* ids, bool append = false);
+  void selectEdges(vtkIdTypeArray* ids, const QString& domain,
+                   bool append = false);
+
+protected:
+  int getEdgeAttrForType(const std::string& nodeType);
+
+  void getEventSpatialPoint(vtkVgEvent* event,
+                            int defaultEdgeAttr,
+                            double& x, double& y);
+
+protected:
+  QString NodeType;
+  int NodeDefaultEdgeAttr;
+  int NodeStartAttr;
+  int NodeStopAttr;
+
+  vtkSmartPointer<vpMultiGraphModel> GraphModel;
+
+  std::map<int, vtkVgEvent*> NodeIdToEvent;
+  int ImportOrderIndex;
+};
+
+#endif // __vpGraphModelHelper_h
diff --git a/Applications/VpView/vpGraphModelRenderCallback.h b/Applications/VpView/vpGraphModelRenderCallback.h
new file mode 100644
index 00000000..e476d11b
--- /dev/null
+++ b/Applications/VpView/vpGraphModelRenderCallback.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// VTK includes
+#include <vtkCommand.h>
+
+// VisGUI includes
+#include "vpGraphModelView.h"
+
+class vpGraphModelRenderCallback : public vtkCommand
+{
+public:
+
+  static vpGraphModelRenderCallback* New()
+    {
+    return new vpGraphModelRenderCallback();
+    }
+
+  void SetView(vpGraphModelView* view)
+    {
+    this->View = view;
+    }
+
+  virtual void Execute(vtkObject* vtkNotUsed(caller),
+                       unsigned long vtkNotUsed(eventId),
+                       void* vtkNotUsed(callData))
+    {
+    this->View->update();
+    }
+
+  vpGraphModelView* View;
+};
diff --git a/Applications/VpView/vpGraphModelView.cxx b/Applications/VpView/vpGraphModelView.cxx
new file mode 100644
index 00000000..590d1554
--- /dev/null
+++ b/Applications/VpView/vpGraphModelView.cxx
@@ -0,0 +1,646 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpGraphModelView.h"
+
+#include "vpGraphModelRenderCallback.h"
+#include "vpMultiGraphModel.h"
+#include "vpMultiGraphRepresentation.h"
+
+#include <qtStlUtil.h>
+
+#include <vtkVgInteractorStyleRubberBand2D.h>
+#include <vtkVgSpaceConversion.h>
+
+#include <vtkVgQtUtil.h>
+
+#include <vtkCellArray.h>
+#include <vtkMatrix3x3.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+
+//-----------------------------------------------------------------------------
+vpGraphModelView::vpGraphModelView() :
+  QObject(),
+  GraphRepresentation(vtkSmartPointer<vpMultiGraphRepresentation>::New()),
+  RenderCallback(vtkSmartPointer<vpGraphModelRenderCallback>::New()),
+  LineActor(vtkSmartPointer<vtkActor>::New()),
+  LinePoints(vtkSmartPointer<vtkPoints>::New()),
+  HeldNode(-1), ConnectParentNode(-1), CurrentSelectionType(ST_None),
+  CreateNodeEnabled(false), RenderPending(false), DragStarted(false),
+  GraphRepNeedsUpdate(false), PrevRubberBandMode(-1)
+{
+  this->GraphRepresentation->UseAutoUpdateOff();
+
+  this->RenderCallback->SetView(this);
+
+  this->LinePoints->SetNumberOfPoints(2);
+
+  vtkPolyData* pd = vtkPolyData::New();
+  vtkCellArray* ca = vtkCellArray::New();
+  vtkPolyDataMapper* pdm = vtkPolyDataMapper::New();
+
+  vtkIdType ids[] = { 0, 1 };
+  ca->InsertNextCell(2, ids);
+  pd->SetPoints(this->LinePoints);
+  pd->SetLines(ca);
+  pdm->SetInputData(pd);
+
+  this->LineActor->SetMapper(pdm);
+  pd->FastDelete();
+  ca->FastDelete();
+  pdm->FastDelete();
+
+  this->LineActor->GetProperty()->SetLineWidth(3.0f);
+  this->LineActor->GetProperty()->SetColor(0.0, 0.0, 0.0);
+  this->LineActor->VisibilityOff();
+  this->LineActor->PickableOff();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::initialize(vpMultiGraphModel* model,
+                                  vtkRenderer* renderer,
+                                  vtkVgInteractorStyleRubberBand2D* istyle)
+{
+  this->GraphModel = model;
+  this->GraphRepresentation->SetGraphModel(model);
+  this->GraphRepresentation->SetVisible(0);
+  this->Renderer = renderer;
+  this->RenderWindow = this->Renderer->GetRenderWindow();
+  this->InteractorStyle = istyle;
+
+  this->Renderer->AddViewProp(this->LineActor);
+
+  // Instead of auto-updating the graph representation every time the model is
+  // changed, we listen for the update command and use it to set a flag which
+  // will lazily update the graph rep only after a render is requested.
+  vtkConnect(
+    this->GraphModel,
+    vtkCommand::UpdateDataEvent,
+    this, SLOT(setGraphRepNeedsUpdate()));
+
+  this->GraphRepNeedsUpdate = true;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setEventRegistry(vtkVgEventTypeRegistry* reg)
+{
+  this->GraphRepresentation->SetEventRegistry(reg);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setGraphLayout(int layout,
+                                      const vgRange<double>& xExtents,
+                                      const vgRange<double>& yExtents)
+{
+  this->GraphRepresentation->SetLayoutMode(layout, this->Renderer,
+                                           xExtents, yExtents);
+}
+
+//-----------------------------------------------------------------------------
+int vpGraphModelView::getGraphLayout()
+{
+  return this->GraphRepresentation->GetLayoutMode();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::copyCurrentLayout()
+{
+  this->GraphRepresentation->ResetCachedNodePositions();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::refreshGraphLayout()
+{
+  this->GraphRepresentation->RefreshLayout();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::getGraphBounds(vgRange<double>& xExtents,
+                                      vgRange<double>& yExtents)
+{
+  this->update();
+
+  double bounds[6];
+  this->Renderer->ComputeVisiblePropBounds(bounds);
+  xExtents.lower = bounds[0];
+  xExtents.upper = bounds[1];
+  yExtents.lower = bounds[2];
+  yExtents.upper = bounds[3];
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::getWorldPosition(double xDisplay, double yDisplay,
+                                        double& xWorld, double& yWorld)
+{
+  double pt[3] = { xDisplay, yDisplay, 0.0 };
+  vtkVgSpaceConversion::DisplayToWorldNormalized(this->Renderer, pt, pt);
+  xWorld = pt[0];
+  yWorld = pt[1];
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setZOffset(double zOffset)
+{
+  this->GraphRepresentation->SetZOffset(zOffset);
+  this->LineActor->SetPosition(0.0, 0.0, zOffset);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setVertexSize(double size)
+{
+  return this->GraphRepresentation->SetVertexSize(size);
+}
+
+//-----------------------------------------------------------------------------
+double vpGraphModelView::getVertexSize()
+{
+  return this->GraphRepresentation->GetVertexSize();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setVertexOpacity(double opacity)
+{
+  return this->GraphRepresentation->SetVertexOpacity(opacity);
+}
+
+//-----------------------------------------------------------------------------
+double vpGraphModelView::getVertexOpacity()
+{
+  return this->GraphRepresentation->GetVertexOpacity();
+}
+
+//-----------------------------------------------------------------------------
+vpMultiGraphModel::NodePositionType vpGraphModelView::getNodePositionType()
+{
+  return this->GraphRepresentation->GetNodePositionType();
+}
+
+//-----------------------------------------------------------------------------
+vtkMatrix3x3* vpGraphModelView::getGraphToSpatialMatrix()
+{
+  return this->GraphRepresentation->GetGraphToSpatialMatrix();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setActive(bool active)
+{
+  if (active)
+    {
+    vtkConnect(
+      this->RenderWindow->GetInteractor(),
+      vtkCommand::LeftButtonPressEvent,
+      this, SLOT(leftMousePress()));
+
+    vtkConnect(
+      this->RenderWindow->GetInteractor(),
+      vtkCommand::LeftButtonReleaseEvent,
+      this, SLOT(leftMouseRelease()));
+
+    vtkConnect(
+      this->RenderWindow->GetInteractor(),
+      vtkCommand::MouseMoveEvent,
+      this, SLOT(mouseMove()));
+
+    vtkConnect(
+      this->InteractorStyle,
+      vtkVgInteractorStyleRubberBand2D::SelectionCompleteEvent,
+      this, SLOT(updateSelection()));
+
+    // Connect the delete event observer at a higher-than-default priority so
+    // that we can "intercept" the event before other observers see it.
+    vtkConnect(
+      this->InteractorStyle,
+      vtkVgInteractorStyleRubberBand2D::KeyPressEvent_Delete,
+      this, SLOT(deleteSelected(vtkObject*, unsigned long, void*, void*,
+                                vtkCommand*)),
+      0, 1.0);
+
+    // Add an observer for the render start event that will ensure we have been
+    // updated before a render occurs. This is needed to prevent any renders
+    // happening before we've had a chance to remove expired props.
+    this->RenderWindow->AddObserver(vtkCommand::StartEvent,
+                                    this->RenderCallback);
+    }
+  else
+    {
+    vtkDisconnect(
+      this->RenderWindow->GetInteractor(),
+      vtkCommand::LeftButtonPressEvent,
+      this, SLOT(leftMousePress()));
+
+    vtkDisconnect(
+      this->RenderWindow->GetInteractor(),
+      vtkCommand::LeftButtonReleaseEvent,
+      this, SLOT(leftMouseRelease()));
+
+    vtkDisconnect(
+      this->RenderWindow->GetInteractor(),
+      vtkCommand::MouseMoveEvent,
+      this, SLOT(mouseMove()));
+
+    vtkDisconnect(
+      this->InteractorStyle,
+      vtkVgInteractorStyleRubberBand2D::SelectionCompleteEvent,
+      this, SLOT(updateSelection()));
+
+    vtkDisconnect(
+      this->InteractorStyle,
+      vtkVgInteractorStyleRubberBand2D::KeyPressEvent_Delete,
+      this, SLOT(deleteSelected(vtkObject*, unsigned long, void*, void*,
+                                vtkCommand*)));
+
+    this->RenderWindow->RemoveObserver(this->RenderCallback);
+    this->enableRubberBand();
+    }
+
+  this->GraphRepresentation->SetVisible(active ? 1 : 0);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::update()
+{
+  if (!this->GraphRepNeedsUpdate)
+    {
+    return;
+    }
+
+  this->GraphRepNeedsUpdate = false;
+  this->GraphRepresentation->Update();
+
+  vtkPropCollection* expProps
+    = this->GraphRepresentation->GetExpiredRenderObjects();
+  expProps->InitTraversal();
+  while (vtkProp* prop = expProps->GetNextProp())
+    {
+    this->Renderer->RemoveViewProp(prop);
+    }
+
+  vtkPropCollection* newProps
+    = this->GraphRepresentation->GetNewRenderObjects();
+  newProps->InitTraversal();
+  while (vtkProp* prop = newProps->GetNextProp())
+    {
+    this->Renderer->AddViewProp(prop);
+    }
+
+  this->GraphRepresentation->ResetTemporaryRenderObjects();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::render()
+{
+  if (!this->RenderPending)
+    {
+    this->RenderPending = true;
+    QMetaObject::invokeMethod(this, "forceRender", Qt::QueuedConnection);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::forceRender()
+{
+  this->RenderPending = false;
+  this->Renderer->GetRenderWindow()->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::deleteSelected(vtkObject*, unsigned long, void*, void*,
+                                      vtkCommand* command)
+{
+  if (this->CurrentSelectionType == ST_Nodes)
+    {
+    emit this->deleteSelectedNodesRequested();
+    }
+  else if (this->CurrentSelectionType == ST_Edges)
+    {
+    emit this->deleteSelectedEdgesRequested();
+    }
+  else
+    {
+    return;
+    }
+
+  // Don't let other observers see the event
+  command->SetAbortFlag(1);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::selectNodes(vtkIdTypeArray* ids, bool append)
+{
+  this->CurrentSelectionType = ids ? ST_Nodes : ST_None;
+  emit this->nodesSelected(ids, append);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::selectEdges(vtkIdTypeArray* ids, const QString& domain,
+                                   bool append)
+{
+  this->CurrentSelectionType = ids ? ST_Edges : ST_None;
+  emit this->edgesSelected(ids, domain, append);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::enableRubberBand()
+{
+  if (this->PrevRubberBandMode != -1)
+    {
+    this->InteractorStyle->SetRubberBandMode(this->PrevRubberBandMode);
+    this->PrevRubberBandMode = -1;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::disableRubberBand()
+{
+  this->PrevRubberBandMode = this->InteractorStyle->GetRubberBandMode();
+  this->InteractorStyle->SetRubberBandModeToDisabled();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setCreateNodeEnabled(bool enable)
+{
+  this->CreateNodeEnabled = enable;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setLightForegroundModeEnabled(bool enable)
+{
+  double fgColor[3];
+  fgColor[0] = fgColor[1] = fgColor[2] = enable ? 1.0 : 0.0;
+
+  this->GraphRepresentation->SetForegroundColor(fgColor);
+  this->LineActor->GetProperty()->SetColor(fgColor);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::setCurrentVisibleGraph(const QString& key)
+{
+  std::string kstr = stdString(key);
+  this->GraphRepresentation->SetCurrentVisibleGraph(kstr);
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::leftMousePress()
+{
+  if (this->CreateNodeEnabled)
+    {
+    int pos[2];
+    this->RenderWindow->GetInteractor()->GetEventPosition(pos);
+
+    double pt[3] = { double(pos[0]), double(pos[1]), 0.0 };
+    vtkVgSpaceConversion::DisplayToWorldNormalized(this->Renderer, pt, pt);
+    emit this->createNodeRequested(pt[0], pt[1]);
+    return;
+    }
+
+  int pos[2];
+  vtkIdType pickType;
+  this->RenderWindow->GetInteractor()->GetEventPosition(pos);
+  vtkIdType id = this->GraphRepresentation->Pick(pos[0], pos[1],
+                                                 this->Renderer, pickType);
+  if (id != -1)
+    {
+    if (pickType == vtkVgPickData::PickedGraphNode)
+      {
+      double nodeX, nodeY, nodeZ;
+      this->GraphModel->GetNodePosition(
+        this->GraphRepresentation->GetNodePositionType(), id,
+        nodeX, nodeY, nodeZ);
+
+      if (this->RenderWindow->GetInteractor()->GetControlKey())
+        {
+        // Node connection mode
+        this->LinePoints->SetPoint(0, nodeX, nodeY, -0.1);
+        this->LinePoints->SetPoint(1, nodeX, nodeY, -0.1);
+        this->LinePoints->Modified();
+        this->LineActor->VisibilityOn();
+        this->ConnectParentNode = static_cast<int>(id);
+        this->selectNodes(this->GraphRepresentation->GetPickedIds());
+        }
+      else
+        {
+        bool idIsSelected = false;
+        vtkIdTypeArray* selected = this->GraphModel->GetSelectedNodes();
+        for (vtkIdType i = 0, end = selected->GetNumberOfTuples(); i != end;
+             ++i)
+          {
+          if (id == selected->GetValue(i))
+            {
+            idIsSelected = true;
+            break;
+            }
+          }
+
+        // If the picked node is part of previous selection, don't clear the
+        // selection yet since the user may be starting a drag.
+        if (!idIsSelected)
+          {
+          if (this->RenderWindow->GetInteractor()->GetShiftKey())
+            {
+            this->selectNodes(this->GraphRepresentation->GetPickedIds(), true);
+            }
+          else
+            {
+            this->selectNodes(this->GraphRepresentation->GetPickedIds());
+            this->HeldNode = static_cast<int>(id);
+            }
+          }
+        else
+          {
+          this->HeldNode = static_cast<int>(id);
+          }
+        }
+      // Prevent the interactor style from trying to draw a rubberband rect
+      // while we are dragging.
+      this->disableRubberBand();
+      }
+    else // vtkVgPickData::PickedGraphEdge
+      {
+      std::string domain = this->GraphRepresentation->GetPickedDomain();
+      this->selectEdges(
+        this->GraphRepresentation->GetPickedIds(), qtString(domain),
+        this->RenderWindow->GetInteractor()->GetShiftKey() != 0);
+      }
+    }
+  else
+    {
+    if (!this->RenderWindow->GetInteractor()->GetShiftKey())
+      {
+      this->selectNodes(0);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::mouseMove()
+{
+  int pos1[2];
+  int pos2[2];
+  this->RenderWindow->GetInteractor()->GetEventPosition(pos1);
+  this->RenderWindow->GetInteractor()->GetLastEventPosition(pos2);
+
+  double wpos1[3] = { double(pos1[0]), double(pos1[1]), 0.0 };
+  double wpos2[3] = { double(pos2[0]), double(pos2[1]), 0.0 };
+
+  vtkVgSpaceConversion::DisplayToWorldNormalized(this->Renderer,
+                                                 wpos1, wpos1);
+  vtkVgSpaceConversion::DisplayToWorldNormalized(this->Renderer,
+                                                 wpos2, wpos2);
+
+  if (this->ConnectParentNode != -1)
+    {
+    // Update connection line
+    wpos1[2] = -0.1;
+    this->LinePoints->SetPoint(1, wpos1);
+    this->LinePoints->Modified();
+    this->render();
+    }
+  else if (this->HeldNode != -1 && this->CurrentSelectionType == ST_Nodes)
+    {
+    double delta[] = { wpos1[0] - wpos2[0], wpos1[1] - wpos2[1] };
+
+    vtkMatrix3x3* graphToSpatial =
+      this->GraphRepresentation->GetGraphToSpatialMatrix();
+
+    if (!this->DragStarted)
+      {
+      this->DragStarted = true;
+      emit this->aboutToMoveNode();
+      }
+
+    // Move dragged nodes
+    vtkIdTypeArray* selected = this->GraphModel->GetSelectedNodes();
+    int layout = this->GraphRepresentation->GetLayoutMode();
+    for (vtkIdType i = 0, end = selected->GetNumberOfTuples(); i != end; ++i)
+      {
+      int id = static_cast<int>(selected->GetValue(i));
+      bool isSpatialLayout =
+        layout == vpMultiGraphRepresentation::Spatial ||
+        layout == vpMultiGraphRepresentation::RawSpatial;
+
+      bool isTemporalLayout =
+        layout == vpMultiGraphRepresentation::SortByStartTime ||
+        layout == vpMultiGraphRepresentation::RawSpatial;
+
+      if ((isSpatialLayout || isTemporalLayout) &&
+          this->GraphModel->GetNodeEventId(id) != -1)
+        {
+        continue;
+        }
+
+      double x, y, z;
+      vpMultiGraphModel::NodePositionType posType =
+        this->GraphRepresentation->GetNodePositionType();
+      this->GraphModel->GetNodePosition(posType, id, x, y, z);
+      // TODO Fix this
+      this->GraphModel->MoveNode(posType, id, x + delta[0], y + delta[1], z,
+                                 true);
+
+      // In spatial layout mode, also compute the new position for the node in
+      // the overlay (and vice-versa).
+      if (layout == vpMultiGraphRepresentation::Spatial)
+        {
+        double pt[] = { x + delta[0], y + delta[1], 1.0 };
+        graphToSpatial->MultiplyPoint(pt, pt);
+        this->GraphModel->MoveNode(vpMultiGraphModel::NPT_Spatial, id,
+                                   pt[0], pt[1], 0.0);
+        }
+
+      if (layout == vpMultiGraphRepresentation::SortByStartTime)
+        {
+          double position[3];
+          this->GraphModel->GetNodePosition(vpMultiGraphModel::NPT_NormalizedTemporal,
+                id, position[0], position[1], position[2]);
+
+          vtkVgTimeStamp timestamp = this->GraphRepresentation->ComputeNodeStartTime(
+            position[0], position[1], position[2]);
+
+          this->GraphModel->SetNodeStartTime(id, timestamp.GetTime());
+          this->GraphModel->SetNodeEndTime(id, timestamp.GetTime());
+          this->GraphModel->SetNodeStartFrame(id, timestamp.GetFrameNumber());
+          this->GraphModel->SetNodeEndFrame(id, timestamp.GetFrameNumber());
+        }
+      }
+
+    emit this->nodeMoved();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::leftMouseRelease()
+{
+  if (this->ConnectParentNode != -1)
+    {
+    int pos[2];
+    this->RenderWindow->GetInteractor()->GetEventPosition(pos);
+
+    vtkIdType pickType;
+    vtkIdType id = this->GraphRepresentation->Pick(pos[0], pos[1],
+                                                   this->Renderer, pickType);
+    // Link to hovered child node
+    if (id != -1 && pickType == vtkVgPickData::PickedGraphNode)
+      {
+      emit this->nodesLinked(this->ConnectParentNode, static_cast<int>(id));
+      }
+    }
+  else if (this->HeldNode != -1)
+    {
+    // Select *only* the held node now
+    vtkSmartPointer<vtkIdTypeArray> ids =
+      vtkSmartPointer<vtkIdTypeArray>::New();
+    ids->InsertNextValue(this->HeldNode);
+    this->selectNodes(ids);
+    }
+
+  this->DragStarted = false;
+  this->HeldNode = -1;
+  this->ConnectParentNode = -1;
+  this->LineActor->VisibilityOff();
+  this->enableRubberBand();
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelView::updateSelection()
+{
+  // Pick by bounding rect
+  int* startPos = this->InteractorStyle->GetStartPosition();
+  int* endPos = this->InteractorStyle->GetEndPosition();
+
+  if (startPos[0] == endPos[0] && startPos[1] == endPos[1])
+    {
+    return;
+    }
+
+  vtkIdType pickType;
+  vtkIdType id = this->GraphRepresentation->Pick(startPos[0], startPos[1],
+                                                 endPos[0], endPos[1],
+                                                 this->Renderer,
+                                                 pickType);
+  if (id == -1)
+    {
+    this->selectNodes(0);
+    }
+  else
+    {
+    if (pickType == vtkVgPickData::PickedGraphNode)
+      {
+      this->selectNodes(this->GraphRepresentation->GetPickedIds());
+      }
+    else // Picked graph edge
+      {
+      std::string domain = this->GraphRepresentation->GetPickedDomain();
+      this->selectEdges(this->GraphRepresentation->GetPickedIds(),
+                        qtString(domain));
+      }
+    }
+}
diff --git a/Applications/VpView/vpGraphModelView.h b/Applications/VpView/vpGraphModelView.h
new file mode 100644
index 00000000..e73aec37
--- /dev/null
+++ b/Applications/VpView/vpGraphModelView.h
@@ -0,0 +1,156 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpGraphModelView_h
+#define __vpGraphModelView_h
+
+#include "vpMultiGraphModel.h"
+
+#include <QObject>
+
+#include <vtkSmartPointer.h>
+
+#include <vgRange.h>
+
+class vpGraphModelRenderCallback;
+class vpMultiGraphModel;
+class vpMultiGraphRepresentation;
+class vtkActor;
+class vtkIdTypeArray;
+class vtkMatrix3x3;
+class vtkPoints;
+class vtkRenderer;
+class vtkRenderWindow;
+class vtkVgEventTypeRegistry;
+class vtkVgInteractorStyleRubberBand2D;
+
+//-----------------------------------------------------------------------------
+class vpGraphModelView : public QObject
+{
+  Q_OBJECT
+
+public:
+  enum SelectionType
+    {
+    ST_None,
+    ST_Nodes,
+    ST_Edges
+    };
+
+public:
+  vpGraphModelView();
+
+  void initialize(vpMultiGraphModel* model,
+                  vtkRenderer* renderer,
+                  vtkVgInteractorStyleRubberBand2D* istyle);
+
+  void setEventRegistry(vtkVgEventTypeRegistry* reg);
+
+  void setGraphLayout(int layout,
+                      const vgRange<double>& xExtents,
+                      const vgRange<double>& yExtents);
+  int  getGraphLayout();
+
+  void copyCurrentLayout();
+  void refreshGraphLayout();
+
+  void getGraphBounds(vgRange<double>& xExtents, vgRange<double>& yExtents);
+
+  void getWorldPosition(double xDisplay, double yDisplay,
+                        double& xWorld, double& yWorld);
+
+  void setZOffset(double zOffset);
+
+  void setVertexSize(double size);
+  double getVertexSize();
+
+  void setVertexOpacity(double opacity);
+  double getVertexOpacity();
+
+  vpMultiGraphModel::NodePositionType getNodePositionType();
+  vtkMatrix3x3* getGraphToSpatialMatrix();
+
+  void setActive(bool active);
+
+  void render();
+
+  void setCreateNodeEnabled(bool enable);
+
+  void setLightForegroundModeEnabled(bool enable);
+
+signals:
+  void createNodeRequested(double x, double y);
+
+  void deleteSelectedNodesRequested();
+  void deleteSelectedEdgesRequested();
+
+  void nodesLinked(int parentId, int childId);
+
+  void nodesSelected(vtkIdTypeArray* ids, bool append);
+  void edgesSelected(vtkIdTypeArray* ids, const QString& domain, bool append);
+
+  void aboutToMoveNode();
+  void nodeMoved();
+
+public slots:
+  void setCurrentVisibleGraph(const QString& key);
+
+protected slots:
+  void leftMousePress();
+  void leftMouseRelease();
+  void mouseMove();
+
+  void updateSelection();
+
+  void setGraphRepNeedsUpdate()
+    {
+    this->GraphRepNeedsUpdate = true;
+    }
+
+  void forceRender();
+
+  void deleteSelected(vtkObject*, unsigned long, void*, void*,
+                      vtkCommand* command);
+
+protected:
+  friend class vpGraphModelRenderCallback;
+
+  void update();
+
+  void selectNodes(vtkIdTypeArray* ids, bool append = false);
+  void selectEdges(vtkIdTypeArray* ids, const QString& domain,
+                   bool append = false);
+
+  void disableRubberBand();
+  void enableRubberBand();
+
+protected:
+  vtkSmartPointer<vpMultiGraphModel> GraphModel;
+  vtkSmartPointer<vpMultiGraphRepresentation> GraphRepresentation;
+
+  vtkSmartPointer<vpGraphModelRenderCallback> RenderCallback;
+
+  vtkSmartPointer<vtkRenderer> Renderer;
+  vtkSmartPointer<vtkRenderWindow> RenderWindow;
+  vtkSmartPointer<vtkVgInteractorStyleRubberBand2D> InteractorStyle;
+
+  vtkSmartPointer<vtkActor> LineActor;
+  vtkSmartPointer<vtkPoints> LinePoints;
+
+  int HeldNode;
+  int ConnectParentNode;
+
+  SelectionType CurrentSelectionType;
+
+  bool CreateNodeEnabled;
+  bool RenderPending;
+  bool DragStarted;
+  bool GraphRepNeedsUpdate;
+
+  int PrevRubberBandMode;
+};
+
+#endif // __vpGraphModelView_h
diff --git a/Applications/VpView/vpGraphModelWidget.cxx b/Applications/VpView/vpGraphModelWidget.cxx
new file mode 100644
index 00000000..800c63f3
--- /dev/null
+++ b/Applications/VpView/vpGraphModelWidget.cxx
@@ -0,0 +1,2490 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpGraphModelWidget.h"
+
+#include "ui_vpGraphModelWidget.h"
+
+// VpView includes
+#include "vpAttributeConfig.h"
+#include "vpEventConfig.h"
+#include "vpGraphModelHelper.h"
+#include "vpGraphModelView.h"
+#include "vpMultiGraphModel.h"
+#include "vpMultiGraphRepresentation.h"
+#include "vpPrimitiveConfig.h"
+#include "vpViewCore.h"
+
+// VisGUI includes
+#include <qtComboBoxDelegate.h>
+#include <qtStlUtil.h>
+#include <vgFileDialog.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgInteractorStyleRubberBand2D.h>
+#include <vtkVgSpaceConversion.h>
+
+// JSON includes
+#include <json.h>
+
+// VTK includes
+#include <QVTKWidget.h>
+#include <vtkCamera.h>
+#include <vtkDataSetAttributes.h>
+#include <vtkDoubleArray.h>
+#include <vtkEdgeListIterator.h>
+#include <vtkIdTypeArray.h>
+#include <vtkIntArray.h>
+#include <vtkMatrix3x3.h>
+#include <vtkMutableDirectedGraph.h>
+#include <vtkMutableUndirectedGraph.h>
+#include <vtkPoints.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkStringArray.h>
+#include <vtkUnsignedIntArray.h>
+#include <vtkVariantArray.h>
+#include <vtkVertexListIterator.h>
+
+// Qt includes
+#include <QApplication>
+#include <QDebug>
+#include <QDialogButtonBox>
+#include <QList>
+#include <QMessageBox>
+#include <QShortcut>
+
+#include <QtCore/qmath.h>
+
+enum
+{
+  NodeIdRole = Qt::UserRole + 1,
+  EdgeIdRole,
+  EdgeDomainRole
+};
+
+//-----------------------------------------------------------------------------
+static void setComboItemText(QComboBox* cb, int id, const QString& displayId)
+{
+  for (int i = 0, end = cb->count(); i != end; ++i)
+    {
+    if (cb->itemData(i).toInt() == id)
+      {
+      cb->setItemText(i, displayId);
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+static void removeComboItem(QComboBox* cb, int id)
+{
+  for (int i = 0, end = cb->count(); i != end; ++i)
+    {
+    if (cb->itemData(i).toInt() == id)
+      {
+      cb->removeItem(i);
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+class vpNoEditDelegate : public QStyledItemDelegate
+{
+public:
+  vpNoEditDelegate(QObject* parent = 0)
+    : QStyledItemDelegate(parent)
+    {
+    }
+
+  // Hack to prevent editing of a column
+  virtual QWidget* createEditor(QWidget* /*parent*/,
+                                const QStyleOptionViewItem& /*option*/,
+                                const QModelIndex& /*index*/) const
+    {
+    return 0;
+    }
+
+private:
+  Q_DISABLE_COPY(vpNoEditDelegate)
+};
+
+//-----------------------------------------------------------------------------
+class vpNodeTypeDelegate : public qtComboBoxDelegate
+{
+public:
+  vpNodeTypeDelegate(vtkVgEventTypeRegistry* types, QObject* parent = 0)
+    : qtComboBoxDelegate(parent)
+    {
+    QVariantList vl;
+    QStringList sl;
+
+    for (int i = 0, end = types->GetNumberOfTypes(); i != end; ++i)
+      {
+      const vgEventType& type = types->GetType(i);
+      vl << type.GetId();
+      sl << vpEventConfig::GetStringFromId(type.GetId());
+      }
+    this->setMapping(sl, vl);
+    }
+
+  virtual ~vpNodeTypeDelegate()
+    {
+    }
+
+private:
+  Q_DISABLE_COPY(vpNodeTypeDelegate)
+};
+
+//-----------------------------------------------------------------------------
+class vpAttributeDelegate : public qtComboBoxDelegate
+{
+public:
+  vpAttributeDelegate(vpAttributeConfig& config, QObject* parent = 0)
+    : qtComboBoxDelegate(parent)
+    {
+    QVariantList vl;
+    QStringList sl;
+
+    vl << -1;
+    sl << "";
+
+    for (int i = 0, end = config.getNumberOfTypes(); i != end; ++i)
+      {
+      const vpAttributeConfig::vpAttributeType& type
+        = config.getAttributeTypeByIndex(i);
+      vl << type.Id;
+      sl << type.Name;
+      }
+    this->setMapping(sl, vl);
+    }
+
+  virtual ~vpAttributeDelegate()
+    {
+    }
+
+private:
+  Q_DISABLE_COPY(vpAttributeDelegate)
+};
+
+//-----------------------------------------------------------------------------
+class vpGraphModelWidgetPrivate
+{
+public:
+  vpGraphModelWidgetPrivate(vpGraphModelWidget* parent) :
+    GraphModel(vtkSmartPointer<vpMultiGraphModel>::New()), Helper(GraphModel),
+    Selecting(false), PickingMaxSpatialWindow(false),
+    PickingMaxTemporalWindow(false), q_ptr(parent)
+    {
+    this->Renderer = vtkSmartPointer<vtkRenderer>::New();
+    this->RenderWindow = vtkSmartPointer<vtkRenderWindow>::New();
+    this->InteractorStyle =
+      vtkSmartPointer<vtkVgInteractorStyleRubberBand2D>::New();
+
+    this->Renderer->SetBackground(1.0, 1.0, 1.0);
+    this->Renderer->GetActiveCamera()->ParallelProjectionOn();
+    this->RenderWindow->AddRenderer(this->Renderer);
+    this->InteractorStyle->SetRenderer(this->Renderer);
+    this->InteractorStyle->SetRubberBandModeToSelection();
+    }
+
+public:
+  typedef QHash<QString, int> NameToIdMap;
+
+  void enableGraphControls();
+  void disableGraphControls();
+
+  void addEdgeAttributes(JSONNode& node,
+                         vtkVariantArray* parentAttrArrays,
+                         vtkVariantArray* childAttrArrays,
+                         int edgeId);
+
+  QString getEdgeAttributeName(int id);
+  int getEdgeAttributeId(const QString& name);
+
+  vtkSmartPointer<vpMultiGraphModel> GraphModel;
+
+  vtkSmartPointer<vtkRenderer> Renderer;
+  vtkSmartPointer<vtkRenderWindow> RenderWindow;
+  vtkSmartPointer<vtkVgInteractorStyleRubberBand2D> InteractorStyle;
+
+  vtkSmartPointer<vtkIntArray> attributeJsonToArray(const JSONNode& node);
+
+  Ui_GraphModelWidget UI;
+
+  vpGraphModelHelper Helper;
+
+  vpGraphModelView View;
+  vpGraphModelView SpatialView;
+
+  vpPrimitiveConfig PrimitiveConfig;
+  vpAttributeConfig AttributeConfig;
+
+  vpViewCore* AppCore;
+
+  bool Selecting;
+  bool PickingMaxSpatialWindow;
+  bool PickingMaxTemporalWindow;
+
+  JSONNode UndoState;
+  JSONNode RedoState;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vpGraphModelWidget)
+
+  void addEdgeAttributesNode(JSONNode& node, const char* name,
+                             vtkIntArray* array);
+
+private:
+  QTE_DECLARE_PUBLIC(vpGraphModelWidget)
+};
+
+//-----------------------------------------------------------------------------
+class SelectionGuard
+{
+  vpGraphModelWidgetPrivate* P;
+  bool Prev;
+
+public:
+  SelectionGuard(vpGraphModelWidgetPrivate* p)
+    : P(p), Prev(p->Selecting)
+    {
+    this->P->Selecting = true;
+    }
+
+  ~SelectionGuard()
+    {
+    this->P->Selecting = this->Prev;
+    }
+};
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidgetPrivate::enableGraphControls()
+{
+  this->UI.addNodeButton->setEnabled(true);
+  this->UI.eventTypesComboBox->setEnabled(true);
+
+  this->UI.primitivesLabel->setEnabled(true);
+  this->UI.primitivesComboBox->setEnabled(true);
+
+  this->UI.parentNodeLabel->setEnabled(true);
+  this->UI.childNodeLabel->setEnabled(true);
+  this->UI.addEdgeButton->setEnabled(true);
+  this->UI.parentNodesComboBox->setEnabled(true);
+  this->UI.childNodesComboBox->setEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidgetPrivate::disableGraphControls()
+{
+  this->UI.addNodeButton->setDisabled(true);
+  this->UI.eventTypesComboBox->setDisabled(true);
+
+  this->UI.primitivesLabel->setDisabled(true);
+  this->UI.primitivesComboBox->setDisabled(true);
+
+  this->UI.parentNodeLabel->setDisabled(true);
+  this->UI.childNodeLabel->setDisabled(true);
+  this->UI.addEdgeButton->setDisabled(true);
+  this->UI.parentNodesComboBox->setDisabled(true);
+  this->UI.childNodesComboBox->setDisabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidgetPrivate::addEdgeAttributesNode(
+  JSONNode& node, const char* name, vtkIntArray* array)
+{
+  JSONNode attrs(JSON_ARRAY);
+  attrs.set_name(name);
+
+  if (array)
+    {
+    for (int i = 0, end = array->GetNumberOfTuples(); i < end; ++i)
+      {
+      QString name = this->getEdgeAttributeName(array->GetValue(i));
+      if (!name.isEmpty())
+        {
+        attrs.push_back(JSONNode("value", qPrintable(name)));
+        }
+      }
+    }
+
+  node.push_back(attrs);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidgetPrivate::addEdgeAttributes(
+  JSONNode& node,
+  vtkVariantArray* parentAttrArrays,
+  vtkVariantArray* childAttrArrays,
+  int edgeId)
+{
+  vtkIntArray* parentAttrs
+    = vtkIntArray::SafeDownCast(
+        parentAttrArrays->GetValue(edgeId).ToArray());
+
+  vtkIntArray* childAttrs
+    = vtkIntArray::SafeDownCast(
+        childAttrArrays->GetValue(edgeId).ToArray());
+
+  this->addEdgeAttributesNode(node, "parent_attributes", parentAttrs);
+  this->addEdgeAttributesNode(node, "child_attributes", childAttrs);
+}
+
+//-----------------------------------------------------------------------------
+QString vpGraphModelWidgetPrivate::getEdgeAttributeName(int id)
+{
+  int idx = this->AttributeConfig.getAttributeTypeIndex(id);
+  if (idx != -1)
+    {
+    return this->AttributeConfig.getAttributeTypeByIndex(idx).Name;
+    }
+  return QString();
+}
+
+//-----------------------------------------------------------------------------
+int vpGraphModelWidgetPrivate::getEdgeAttributeId(const QString& name)
+{
+  return this->AttributeConfig.getAttributeTypeByName(name).Id;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkIntArray>
+vpGraphModelWidgetPrivate::attributeJsonToArray(const JSONNode& node)
+{
+  vtkSmartPointer<vtkIntArray> attrArray;
+  for (unsigned int i = 0, end = node.size(); i != end; ++i)
+    {
+    std::string attr = node[i].as_string();
+    int id = this->getEdgeAttributeId(qtString(attr));
+    if (id == -1)
+      {
+      qDebug() << "Skipping unrecognized attribute type:" << qtString(attr);
+      continue;
+      }
+    if (!attrArray)
+      {
+      attrArray = vtkSmartPointer<vtkIntArray>::New();
+      }
+    attrArray->InsertNextValue(id);
+    }
+  return attrArray;
+}
+
+//-----------------------------------------------------------------------------
+QTE_IMPLEMENT_D_FUNC(vpGraphModelWidget)
+
+//-----------------------------------------------------------------------------
+vpGraphModelWidget::vpGraphModelWidget(QWidget* parent, Qt::WindowFlags flags) :
+  QWidget(parent, flags),
+  d_ptr(new vpGraphModelWidgetPrivate(this))
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->UI.setupUi(this);
+
+  d->RenderWindow->SetInteractor(d->UI.renderWidget->GetInteractor());
+  d->UI.renderWidget->SetRenderWindow(d->RenderWindow);
+  d->RenderWindow->GetInteractor()->SetInteractorStyle(d->InteractorStyle);
+
+  d->View.initialize(d->GraphModel, d->Renderer, d->InteractorStyle);
+  d->View.setActive(true);
+
+  d->SpatialView.setZOffset(0.5);
+  d->SpatialView.setLightForegroundModeEnabled(true);
+
+  d->Helper.setNewNodeDefaultEdgeAttr(
+    d->AttributeConfig.getAttributeTypeByIndex(0).Id);
+
+  // TODO: Make these configurable
+  d->Helper.setStartAttr(
+    d->AttributeConfig.getAttributeTypeByName("Beginning").Id);
+
+  d->Helper.setStopAttr(
+    d->AttributeConfig.getAttributeTypeByName("end").Id);
+
+  QStringList nodeCols;
+  nodeCols << "Label" << "Type" << "Default Edge Attr";
+  d->UI.nodeTreeWidget->setHeaderLabels(nodeCols);
+
+  vpAttributeDelegate* defaultAttrDg =
+    new vpAttributeDelegate(d->AttributeConfig, d->UI.nodeTreeWidget);
+
+  d->UI.nodeTreeWidget->setItemDelegateForColumn(2, defaultAttrDg);
+
+  QStringList edgeCols;
+  edgeCols << "Id" << "Parent Attr" << "Child Attr";
+  d->UI.edgeTreeWidget->setHeaderLabels(edgeCols);
+
+  vpNoEditDelegate* ndg = new vpNoEditDelegate(d->UI.edgeTreeWidget);
+  vpAttributeDelegate* adg = new vpAttributeDelegate(d->AttributeConfig,
+      d->UI.edgeTreeWidget);
+
+  d->UI.edgeTreeWidget->setItemDelegateForColumn(0, ndg);
+  d->UI.edgeTreeWidget->setItemDelegateForColumn(1, adg);
+  d->UI.edgeTreeWidget->setItemDelegateForColumn(2, adg);
+
+  QShortcut* delNodes =
+    new QShortcut(QKeySequence(QKeySequence::Delete), d->UI.nodeTreeWidget,
+                  0, 0, Qt::WidgetShortcut);
+
+  QShortcut* delEdges =
+    new QShortcut(QKeySequence(QKeySequence::Delete), d->UI.edgeTreeWidget,
+                  0, 0, Qt::WidgetShortcut);
+
+  QShortcut* resetCamera =
+    new QShortcut(QKeySequence(Qt::Key_R), d->UI.renderWidget,
+                  0, 0, Qt::WidgetShortcut);
+
+  connect(delNodes, SIGNAL(activated()), this, SLOT(removeNodes()));
+  connect(delEdges, SIGNAL(activated()), this, SLOT(removeEdges()));
+  connect(resetCamera, SIGNAL(activated()), this, SLOT(resetCamera()));
+
+  QShortcut* undo = new QShortcut(QKeySequence(QKeySequence::Undo), this);
+  connect(undo, SIGNAL(activated()), this, SLOT(undo()));
+
+  QShortcut* redo = new QShortcut(QKeySequence(QKeySequence::Redo), this);
+  connect(redo, SIGNAL(activated()), this, SLOT(redo()));
+
+  d->UI.graphLayoutComboBox->addItem("User Layout");
+  d->UI.graphLayoutComboBox->addItem("Temporal Layout");
+  d->UI.graphLayoutComboBox->addItem("Spatial Layout");
+  connect(d->UI.graphLayoutComboBox, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(changeGraphLayout(int)));
+
+  d->disableGraphControls();
+
+  this->connectViewSignals(&d->View);
+  this->connectViewSignals(&d->SpatialView);
+
+  connect(&d->View, SIGNAL(createNodeRequested(double, double)), this,
+          SLOT(createNode(double, double)));
+
+  connect(&d->SpatialView, SIGNAL(createNodeRequested(double, double)), this,
+          SLOT(createNodeSpatial(double, double)));
+
+  connect(&d->SpatialView, SIGNAL(nodeMoved()), this,
+          SLOT(updateMovedNodeSpatialPositions()));
+
+  connect(&d->View, SIGNAL(nodeMoved()), this, SLOT(updateViews()));
+  connect(&d->SpatialView, SIGNAL(nodeMoved()), this, SLOT(updateViews()));
+
+  connect(&d->Helper, SIGNAL(nodeCreated(QString, int)), this,
+          SLOT(updateNodeListView(QString, int)));
+
+  connect(&d->Helper, SIGNAL(edgeCreated(QString, int)), this,
+          SLOT(updateEdgeListView(QString, int)));
+
+  connect(&d->Helper, SIGNAL(nodesDeleted()), this,
+          SLOT(pruneEdges()));
+
+  connect(&d->Helper, SIGNAL(selectedNodesChanged()), this,
+          SLOT(selectPickedNodes()));
+
+  connect(&d->Helper, SIGNAL(selectedEdgesChanged(QString)), this,
+          SLOT(selectPickedEdges(QString)));
+
+  connect(d->UI.addNodeButton, SIGNAL(toggled(bool)), this,
+          SLOT(enableCreateNode(bool)));
+
+  connect(d->UI.addEdgeButton, SIGNAL(clicked()), this,
+          SLOT(createEdge()));
+
+  connect(d->UI.removeNodeButton, SIGNAL(clicked()), this,
+          SLOT(removeNodes()));
+
+  connect(d->UI.removeEdgeButton, SIGNAL(clicked()), this,
+          SLOT(removeEdges()));
+
+  connect(d->UI.eventTypesComboBox, SIGNAL(currentIndexChanged(QString)),
+          &d->Helper, SLOT(setNewNodeType(QString)));
+
+  connect(d->UI.primitivesComboBox, SIGNAL(currentIndexChanged(QString)),
+          &d->View, SLOT(setCurrentVisibleGraph(QString)));
+
+  connect(d->UI.primitivesComboBox, SIGNAL(currentIndexChanged(QString)),
+          &d->SpatialView, SLOT(setCurrentVisibleGraph(QString)));
+
+  connect(d->UI.primitivesComboBox, SIGNAL(currentIndexChanged(QString)),
+          this, SLOT(updateEdgeSelection()));
+
+  connect(d->UI.primitivesComboBox, SIGNAL(currentIndexChanged(QString)),
+          this, SLOT(updateEdgeInterface()));
+
+  connect(d->UI.primitivesComboBox, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(updateParameterWidget(int)));
+
+  connect(d->UI.distanceParameter, SIGNAL(valueChanged(double)),
+          this, SLOT(setPrimitiveParameter(double)));
+
+  connect(d->UI.pickMaxSpatialWindow, SIGNAL(clicked()),
+          this, SLOT(pickDistance()));
+
+  connect(d->UI.pickRadius, SIGNAL(clicked()),
+          this, SLOT(pickDistance()));
+
+  connect(d->UI.pickMaxTemporalWindow, SIGNAL(clicked()),
+          this, SLOT(pickTimeInterval()));
+
+  connect(d->UI.pickTimeInterval, SIGNAL(clicked()),
+          this, SLOT(pickTimeInterval()));
+
+  connect(d->UI.timeParameter, SIGNAL(valueChanged(double)),
+          this, SLOT(setPrimitiveParameter(double)));
+
+  connect(d->UI.nodeTreeWidget, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateNodeSelection()));
+
+  connect(d->UI.edgeTreeWidget, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateEdgeSelection()));
+
+  connect(d->UI.nodeTreeWidget,
+          SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(updateNodeItem(QTreeWidgetItem*, int)));
+
+  connect(d->UI.edgeTreeWidget,
+          SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(updateEdgeItem(QTreeWidgetItem*, int)));
+
+  connect(d->UI.copyCurrentLayoutButton, SIGNAL(clicked()),
+          this, SLOT(copyCurrentLayoutToDefault()));
+
+  connect(d->UI.resetView, SIGNAL(clicked()),
+          this, SLOT(resetCamera()));
+
+  connect(d->UI.vertexSize, SIGNAL(valueChanged(int)),
+          this, SLOT(updateVertexDisplaySize()));
+
+  connect(d->UI.autoEdgesButton, SIGNAL(clicked()), this,
+          SLOT(autoCreateEdges()));
+
+  connect(d->UI.showMainWindowOverlay, SIGNAL(toggled(bool)),
+          this, SLOT(showMainWindowOverlay(bool)));
+
+  connect(d->UI.vertexOpacity, SIGNAL(valueChanged(int)),
+          this, SLOT(setVertexOpacity(int)));
+
+  d->UI.vertexOpacity->setValue(d->UI.vertexOpacity->maximum());
+}
+
+//-----------------------------------------------------------------------------
+vpGraphModelWidget::~vpGraphModelWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::connectViewSignals(vpGraphModelView* view)
+{
+  QTE_D(vpGraphModelWidget);
+
+  connect(view, SIGNAL(deleteSelectedNodesRequested()), this,
+          SLOT(removeNodes()));
+
+  connect(view, SIGNAL(deleteSelectedEdgesRequested()), this,
+          SLOT(removeEdges()));
+
+  connect(view, SIGNAL(nodesLinked(int, int)), this,
+          SLOT(createEdge(int, int)));
+
+  connect(view, SIGNAL(aboutToMoveNode()), this,
+          SLOT(saveUndoState()));
+
+  connect(view, SIGNAL(nodesSelected(vtkIdTypeArray*, bool)),
+          &d->Helper, SLOT(selectNodes(vtkIdTypeArray*, bool)));
+
+  connect(view, SIGNAL(edgesSelected(vtkIdTypeArray*, QString, bool)),
+          &d->Helper, SLOT(selectEdges(vtkIdTypeArray*, QString, bool)));
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::setSpatialOverlayRenderer(
+  vtkRenderer* ren, vtkVgInteractorStyleRubberBand2D* istyle)
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->SpatialView.initialize(d->GraphModel, ren, istyle);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::setApplicationCore(vpViewCore *core)
+{
+  QTE_D(vpGraphModelWidget);
+  if (core)
+    {
+    d->AppCore = core;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::addEventNodes(const std::vector<vtkVgEvent*>& events)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (events.empty())
+    {
+    return;
+    }
+
+  this->saveUndoState();
+
+  double viewport[4];
+  this->getWorldViewport(viewport, 0.20, 0.20);
+  vgRange<double> width(viewport[0], viewport[2]);
+  vgRange<double> height(viewport[1], viewport[3]);
+
+  // Add nodes in default layout
+  int mode = d->View.getGraphLayout();
+  if (mode != vpMultiGraphRepresentation::Default)
+    {
+    d->View.setGraphLayout(
+      vpMultiGraphRepresentation::Default, width, height);
+    }
+
+  vgRange<double> xExtents, yExtents;
+  d->View.getGraphBounds(xExtents, yExtents);
+  d->Helper.createEventNodes(events, 0.5 * (xExtents.lower + xExtents.upper),
+                             yExtents.lower - 0.3);
+
+  // Return to previous layout
+  if (d->View.getGraphLayout() != mode)
+    {
+    d->View.setGraphLayout(mode, width, height);
+    }
+
+  this->resetCamera();
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::initializeUi()
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->UI.vertexSize->setValue(static_cast<int>(d->View.getVertexSize()));
+
+  // NOTE Hiding the add edge interface for now
+  d->UI.frame_3->setVisible(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::loadEventTypes(
+  vtkVgEventTypeRegistry* reg)
+{
+  if (!reg)
+    {
+    return;
+    }
+
+  // Not using event model for now
+  QTE_D(vpGraphModelWidget);
+
+  d->enableGraphControls();
+
+  // \TODO Cache color as well
+  int count = reg->GetNumberOfTypes();
+  for (int i = 0; i < count; ++i)
+    {
+    const vgEventType& eventType = reg->GetType(i);
+    d->UI.eventTypesComboBox->addItem(
+      vpEventConfig::GetStringFromId(eventType.GetId()));
+    }
+  d->View.setEventRegistry(reg);
+  d->SpatialView.setEventRegistry(reg);
+
+  vpNodeTypeDelegate* ntd = new vpNodeTypeDelegate(reg, d->UI.nodeTreeWidget);
+  d->UI.nodeTreeWidget->setItemDelegateForColumn(1, ntd);
+
+  this->resetPrimitives();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::loadPrimitiveTypes(const QString& filename)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (!filename.isEmpty())
+    {
+    d->PrimitiveConfig.loadFromFile(filename);
+    }
+
+  this->resetPrimitives();
+
+  int count = d->PrimitiveConfig.getNumberOfTypes();
+  for (int i = 0; i < count; ++i)
+    {
+    const vpPrimitiveConfig::vpPrimitiveType& type
+      = d->PrimitiveConfig.getPrimitiveTypeByIndex(i);
+    d->UI.primitivesComboBox->addItem(type.Name, type.ParamDefaultValue);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::loadAttributeTypes(const QString& filename)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (!filename.isEmpty())
+    {
+    d->AttributeConfig.loadFromFile(filename);
+
+    vpAttributeDelegate* adg =
+      new vpAttributeDelegate(d->AttributeConfig, d->UI.edgeTreeWidget);
+    d->UI.edgeTreeWidget->setItemDelegateForColumn(1, adg);
+    d->UI.edgeTreeWidget->setItemDelegateForColumn(2, adg);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::loadConfig(const QString& filename)
+{
+  if (filename.isEmpty())
+    {
+    return;
+    }
+
+  this->loadPrimitiveTypes(filename);
+  this->loadAttributeTypes(filename);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateViews()
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->View.render();
+
+  if (d->UI.showMainWindowOverlay->isChecked())
+    {
+    d->SpatialView.render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateVertexDisplaySize()
+{
+  QTE_D(vpGraphModelWidget);
+  double size = static_cast<double>(d->UI.vertexSize->value());
+  d->View.setVertexSize(size);
+  d->SpatialView.setVertexSize(size);
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::importJson()
+{
+  QTE_D(vpGraphModelWidget);
+
+  QString path = vgFileDialog::getOpenFileName(
+    this, "Import Graph Model", QString(), "Graph Model (*.json);;");
+
+  if (path.isEmpty())
+    {
+    return;
+    }
+
+  QFile file(path);
+  if (!file.open(QIODevice::ReadOnly))
+    {
+    qDebug() << "Error opening file" << path << "for reading:"
+             << qPrintable(file.errorString());
+    return;
+    }
+
+  QTextStream in(&file);
+  QString str = in.readAll();
+
+  JSONNode root;
+  try
+    {
+    root = libjson::parse(qPrintable(str));
+    }
+  catch (...)
+    {
+    qDebug() << "Malformed JSON";
+    return;
+    }
+
+  // Add nodes in default layout
+  d->UI.graphLayoutComboBox->setCurrentIndex(
+    vpMultiGraphRepresentation::Default);
+
+  if (this->importFrom(root))
+    {
+    d->UndoState.clear();
+    d->RedoState.clear();
+    this->resetCamera();
+    this->updateViews();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpGraphModelWidget::importFrom(const JSONNode& root)
+{
+  QTE_D(vpGraphModelWidget);
+
+  JSONNode nodes;
+  try
+    {
+    nodes = root.at("nodes");
+    }
+  catch (...)
+    {
+    qDebug() << "No \"nodes\" element found";
+    return false;
+    }
+
+  // Clear out any previously constructed graphs
+  this->clear();
+
+  try
+    {
+    JSONNode name = root.at("name");
+    d->UI.nameLineEdit->setText(qtString(name.as_string()));
+    }
+  catch (...)
+    {
+    // No name
+    d->UI.nameLineEdit->setText(QString());
+    }
+
+  try
+    {
+    JSONNode desc = root.at("description");
+    d->UI.descriptionLineEdit->setText(qtString(desc.as_string()));
+    }
+  catch (...)
+    {
+    // No description
+    d->UI.descriptionLineEdit->setText(QString());
+    }
+
+  try
+    {
+    JSONNode id = root.at("activity_id");
+    d->UI.activityId->setValue(id.as_int());
+    }
+  catch (...)
+    {
+    d->UI.activityId->setValue(0);
+    }
+
+  try
+    {
+    JSONNode maxSpatial = root.at("max_spatial_window");
+    d->UI.maxSpatialWindow->setValue(maxSpatial.as_float());
+    }
+  catch (...)
+    {
+    d->UI.maxSpatialWindow->setValue(0.0);
+    }
+
+  try
+    {
+    JSONNode maxTemporal= root.at("max_temporal_window");
+    d->UI.maxTemporalWindow->setValue(maxTemporal.as_int());
+    }
+  catch (...)
+    {
+    d->UI.maxTemporalWindow->setValue(0);
+    }
+
+  try
+    {
+    JSONNode numCommonEvents = root.at("num_common_events");
+    d->UI.numCommonEvents->setValue(numCommonEvents.as_int());
+    }
+  catch (...)
+    {
+    d->UI.numCommonEvents->setValue(0);
+    }
+
+  try
+    {
+    JSONNode minNumEvents = root.at("min_num_events");
+    d->UI.minNumEvents->setValue(minNumEvents.as_int());
+    }
+  catch (...)
+    {
+    d->UI.minNumEvents->setValue(0);
+    }
+
+  JSONNode params;
+  try
+    {
+    params = root.at("primitive_params");
+    }
+  catch (...)
+    {}
+
+  // Read primitive params
+  try
+    {
+    for (unsigned int i = 0, end = params.size(); i != end; ++i)
+      {
+      const JSONNode& param = params[i];
+
+      QString domain = qtString(param.at("name").as_string());
+      vpPrimitiveConfig::vpPrimitiveType pt =
+        d->PrimitiveConfig.getPrimitiveTypeByName(domain);
+
+      if (pt.Id == -1)
+        {
+        qDebug() << "Skipping param of unrecognized primitive type:"
+                 << domain;
+        continue;
+        }
+
+      double val = param.at("value").as_float();
+      d->UI.primitivesComboBox->setItemData(
+        d->PrimitiveConfig.getPrimitiveTypeIndex(pt.Id) + 1, val);
+      }
+    }
+  catch (...)
+    {
+    qDebug() << "Malformed primitive param element";
+    return false;
+    }
+
+  // Compute spatial to graph transform in case we need to transform positions
+  vtkSmartPointer<vtkMatrix3x3> spatialToGraph =
+    vtkSmartPointer<vtkMatrix3x3>::New();
+
+  vtkMatrix3x3::Invert(d->View.getGraphToSpatialMatrix(), spatialToGraph);
+
+  try
+    {
+    for (unsigned int i = 0, end = nodes.size(); i != end; ++i)
+      {
+      const JSONNode& node = nodes[i];
+      int id = node.at("id").as_int();
+      std::string label = node.at("label").as_string();
+      std::string type = node.at("event_type").as_string();
+      double x = node.at("x").as_float();
+      double y = node.at("y").as_float();
+
+      try
+        {
+        double spatialX = node.at("spatial_x").as_float();
+        double spatialY = node.at("spatial_y").as_float();
+        int eventId = node.at("event_id").as_int();
+
+        vtkVgTimeStamp startTime, endTime;
+
+        JSONNode::const_iterator itr = node.find("event_start_time");
+        if (itr != node.end())
+          {
+          startTime.SetTime(itr->as_float() * 1e6);
+          }
+        itr = node.find("event_start_frame");
+        if (itr != node.end())
+          {
+          startTime.SetFrameNumber(itr->as_int());
+          }
+
+        itr = node.find("event_end_time");
+        if (itr != node.end())
+          {
+          endTime.SetTime(itr->as_float() * 1e6);
+          }
+        itr = node.find("event_end_frame");
+        if (itr != node.end())
+          {
+          endTime.SetFrameNumber(itr->as_int());
+          }
+
+        double startX = node.at("event_start_position_x").as_float();
+        double startY = node.at("event_start_position_y").as_float();
+        double endX = node.at("event_end_position_x").as_float();
+        double endY = node.at("event_end_position_y").as_float();
+        double eventPositions[4] = {startX, startY, endX, endY};
+        if (d->AppCore)
+          {
+            d->AppCore->toGraphicsCoordinates(eventPositions[0], eventPositions[1]);
+            d->AppCore->toGraphicsCoordinates(eventPositions[2], eventPositions[3]);
+          }
+
+        int groupId = node.at("group_id").as_int();
+
+        QString attrName = qtString(node.at("default_edge_attr").as_string());
+        int defaultEdgeAttr = d->getEdgeAttributeId(attrName);
+
+        d->Helper.createNodeExternal(id, x, y, type, label,
+                                     eventPositions, defaultEdgeAttr, groupId,
+                                     startTime.GetTime(), endTime.GetTime(),
+                                     startTime.GetFrameNumber(),
+                                     endTime.GetFrameNumber(),
+                                     spatialX, spatialY, eventId);
+
+        // Compute the spatial layout position if we're in that layout mode
+        if (d->View.getGraphLayout() == vpMultiGraphRepresentation::Spatial)
+          {
+          double pt[3] = { spatialX, spatialY, 1.0 };
+          spatialToGraph->MultiplyPoint(pt, pt);
+
+          d->Helper.setNodePosition(id, vpMultiGraphModel::NPT_NormalizedSpatial,
+                                    pt[0], pt[1]);
+          }
+        }
+      catch (...)
+        {
+        d->Helper.createNodeExternal(id, x, y, type, label);
+        }
+      }
+    }
+  catch (...)
+    {
+    qDebug() << "Malformed node element";
+    return false;
+    }
+
+  try
+    {
+    JSONNode primitives = root.at("primitives");
+    try
+      {
+      for (unsigned int i = 0, end = primitives.size(); i != end; ++i)
+        {
+        const JSONNode& prim = primitives[i];
+        std::string domain = prim.at("name").as_string();
+
+        if (d->PrimitiveConfig.getPrimitiveTypeByName(
+              qtString(domain)).Id == -1)
+          {
+          qDebug() << "Skipping unrecognized primitive type:"
+                   << qtString(domain);
+          continue;
+          }
+
+        const JSONNode& links = prim.at("links");
+        try
+          {
+          for (unsigned int i = 0, end = links.size(); i != end; ++i)
+            {
+            const JSONNode& link = links[i];
+            int id = link.at("id").as_int();
+            int parentId = link.at("parent_id").as_int();
+            int childId = link.at("child_id").as_int();
+
+            vtkSmartPointer<vtkIntArray> parentAttrArray
+              = d->attributeJsonToArray(link.at("parent_attributes"));
+
+            vtkSmartPointer<vtkIntArray> childAttrArray
+              = d->attributeJsonToArray(link.at("child_attributes"));
+
+            d->Helper.createEdgeExternal(id, parentId, childId, domain,
+                                         parentAttrArray, childAttrArray);
+            d->UI.primitivesComboBox->setCurrentIndex(
+              d->UI.primitivesComboBox->findText(qtString(domain)));
+            }
+          }
+        catch (...)
+          {
+          qDebug() << "Malformed link element";
+          return false;
+          }
+        }
+      }
+    catch (...)
+      {
+      qDebug() << "Malformed primitive element";
+      return false;
+      }
+    }
+  catch (...)
+    {
+    // No primitives
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::exportJson(QString filepath)
+{
+  if (filepath.isEmpty())
+    {
+    filepath = vgFileDialog::getSaveFileName(
+      this, "Export Graph Model", QString(), "Graph Model (*.json);;");
+    }
+
+  if (filepath.isEmpty())
+    {
+    return;
+    }
+
+  QFile file(filepath);
+  if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
+    {
+    qDebug() << "Error opening file" << filepath << "for writing:"
+             << qPrintable(file.errorString());
+    return;
+    }
+
+  try
+    {
+    JSONNode root = this->exportToJson();
+
+    QString output = qtString(root.write_formatted());
+    QTextStream out(&file);
+    out << output;
+
+    file.close();
+    }
+  catch (const std::exception& e)
+    {
+    qDebug() << "Failed to export graph:" << e.what();
+    }
+}
+
+//-----------------------------------------------------------------------------
+JSONNode vpGraphModelWidget::exportToJson()
+{
+  QTE_D(vpGraphModelWidget);
+
+  JSONNode root(JSON_NODE);
+  root.push_back(JSONNode("description",
+                          stdString(d->UI.descriptionLineEdit->text())));
+  root.push_back(JSONNode("file", "amg"));
+  root.push_back(JSONNode("name",
+                          stdString(d->UI.nameLineEdit->text())));
+
+  root.push_back(JSONNode("activity_id", d->UI.activityId->value()));
+  root.push_back(JSONNode("max_spatial_window",
+                          d->UI.maxSpatialWindow->value()));
+  root.push_back(JSONNode("max_temporal_window",
+                          d->UI.maxTemporalWindow->value()));
+  root.push_back(JSONNode("num_common_events", d->UI.numCommonEvents->value()));
+  root.push_back(JSONNode("min_num_events", d->UI.minNumEvents->value()));
+
+  JSONNode params(JSON_ARRAY);
+  params.set_name("primitive_params");
+
+  // Write the parameter values for primitives that have them
+  for (int i = 1; i < d->UI.primitivesComboBox->count(); ++i)
+    {
+    const vpPrimitiveConfig::vpPrimitiveType& pt =
+      d->PrimitiveConfig.getPrimitiveTypeByIndex(i - 1);
+
+    if (pt.ParamType != vpPrimitiveConfig::PPT_None)
+      {
+      JSONNode primitive(JSON_NODE);
+      primitive.push_back(
+        JSONNode("name", stdString(d->UI.primitivesComboBox->itemText(i))));
+      primitive.push_back(
+        JSONNode("value", d->UI.primitivesComboBox->itemData(i).toDouble()));
+      params.push_back(primitive);
+      }
+    }
+
+  root.push_back(params);
+
+  // First get nodes of the graph model
+  vpMultiGraphModel* graphModel = d->GraphModel;
+
+  // Master does not belong to any domain
+  vtkGraph* masterGraph = graphModel->GetGraph(vpMultiGraphModel::NoneDomain);
+
+  // Nodes section
+  JSONNode nodes(JSON_ARRAY);
+  nodes.set_name("nodes");
+
+  vtkDoubleArray* nodePositions = vtkDoubleArray::SafeDownCast(
+    masterGraph->GetVertexData()->GetAbstractArray("CachedPositions"));
+
+  vtkStringArray* nodeLabels = vtkStringArray::SafeDownCast(
+    masterGraph->GetVertexData()->GetAbstractArray("NodeLabels"));
+  vtkStringArray* nodeTypes = vtkStringArray::SafeDownCast(
+    masterGraph->GetVertexData()->GetAbstractArray("NodeTypes"));
+
+  vtkDoubleArray* startTime = vtkDoubleArray::SafeDownCast(
+    masterGraph->GetVertexData()->GetAbstractArray("StartTime"));
+  vtkDoubleArray* endTime = vtkDoubleArray::SafeDownCast(
+    masterGraph->GetVertexData()->GetAbstractArray("EndTime"));
+
+  vtkUnsignedIntArray* startFrame = vtkUnsignedIntArray::SafeDownCast(
+    masterGraph->GetVertexData()->GetAbstractArray("StartFrame"));
+  vtkUnsignedIntArray* endFrame = vtkUnsignedIntArray::SafeDownCast(
+    masterGraph->GetVertexData()->GetAbstractArray("EndFrame"));
+
+  vtkSmartPointer<vtkVertexListIterator> vItr
+    = vtkSmartPointer<vtkVertexListIterator>::New();
+  masterGraph->GetVertices(vItr);
+
+  vtkAbstractArray* nodeIds = masterGraph->GetVertexData()->GetPedigreeIds();
+
+  while (vItr->HasNext())
+    {
+    JSONNode node(JSON_NODE);
+
+    vtkIdType id = vItr->Next();
+    int nodeId = nodeIds->GetVariantValue(id).ToInt();
+    node.push_back(JSONNode("id", nodeId));
+    node.push_back(JSONNode("virtual",  graphModel->GetNodeVirtualType(nodeId)));
+    node.push_back(JSONNode("label", nodeLabels->GetValue(id)));
+    node.push_back(JSONNode("event_type", nodeTypes->GetValue(id)));
+    node.push_back(JSONNode("event_type_id",
+                            vpEventConfig::GetIdFromString(
+                              nodeTypes->GetValue(id).c_str())));
+
+    double *pos = nodePositions->GetTuple3(id);
+    node.push_back(JSONNode("x", pos[0]));
+    node.push_back(JSONNode("y", pos[1]));
+
+    double spatial[2];
+    graphModel->GetSpatialPosition(nodeId, spatial[0], spatial[1]);
+
+    node.push_back(JSONNode("spatial_x", spatial[0]));
+    node.push_back(JSONNode("spatial_y", spatial[1]));
+
+    node.push_back(JSONNode("event_id", graphModel->GetNodeEventId(nodeId)));
+    node.push_back(JSONNode("group_id", graphModel->GetGroupId(nodeId)));
+
+    double st = startTime->GetValue(id);
+    if (st != vgTimeStamp::InvalidTime())
+      {
+      node.push_back(JSONNode("event_start_time", st * 1e-6));
+      }
+    unsigned int sf = startFrame->GetValue(id);
+    if (sf != vgTimeStamp::InvalidFrameNumber())
+      {
+      node.push_back(JSONNode("event_start_frame", sf));
+      }
+
+    double et = endTime->GetValue(id);
+    if (et != vgTimeStamp::InvalidTime())
+      {
+      node.push_back(JSONNode("event_end_time", et * 1e-6));
+      }
+    unsigned int ef = endFrame->GetValue(id);
+    if (ef != vgTimeStamp::InvalidFrameNumber())
+      {
+      node.push_back(JSONNode("event_end_frame", ef));
+      }
+
+    double eventStartPosition[2];
+    graphModel->GetStartPosition(nodeId, eventStartPosition[0], eventStartPosition[1]);
+    if (d->AppCore)
+      {
+      d->AppCore->toWindowCoordinates(eventStartPosition);
+      }
+
+    double eventEndPosition[2];
+    graphModel->GetEndPosition(nodeId, eventEndPosition[0], eventEndPosition[1]);
+    if (d->AppCore)
+      {
+      d->AppCore->toWindowCoordinates(eventEndPosition);
+      }
+
+    node.push_back(JSONNode("event_start_position_x", eventStartPosition[0]));
+    node.push_back(JSONNode("event_start_position_y", eventStartPosition[1]));
+    node.push_back(JSONNode("event_end_position_x", eventEndPosition[0]));
+    node.push_back(JSONNode("event_end_position_y", eventEndPosition[1]));
+
+    QString edgeAttr =
+      d->getEdgeAttributeName(graphModel->GetNodeDefaultEdgeAttr(nodeId));
+
+    node.push_back(JSONNode("default_edge_attr", qPrintable(edgeAttr)));
+
+    nodes.push_back(node);
+    }
+  root.push_back(nodes);
+
+  // Now primitives and edges
+  JSONNode primitives(JSON_ARRAY);
+  primitives.set_name("primitives");
+
+  // Easy to use types
+  typedef std::map<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >
+  UnGraphs;
+  typedef UnGraphs::const_iterator UnConstItr;
+
+  typedef std::map<std::string, vtkSmartPointer<vtkMutableDirectedGraph> >
+  DGraphs;
+  typedef DGraphs::const_iterator DConstItr;
+
+  vtkSmartPointer<vtkEdgeListIterator> egItr
+    = vtkSmartPointer<vtkEdgeListIterator>::New();
+
+  // Undirected graphs
+  UnGraphs unGraphs = graphModel->GetAllUndirectedGraphsWithEdges();
+  UnConstItr unConstItr = unGraphs.begin();
+  for (; unConstItr != unGraphs.end(); ++unConstItr)
+    {
+    JSONNode edges(JSON_NODE);
+    edges.push_back(JSONNode("directed", "false"));
+    edges.push_back(JSONNode("name", unConstItr->first));
+    JSONNode links(JSON_ARRAY);
+    links.set_name("links");
+
+    // Skip master graph
+    if (unConstItr->first.compare(vpMultiGraphModel::NoneDomain) == 0)
+      {
+      continue;
+      }
+
+    vtkAbstractArray* ids = unConstItr->second->GetEdgeData()->GetPedigreeIds();
+
+    vtkVariantArray* parentAttrArrays
+      = vtkVariantArray::SafeDownCast(
+          unConstItr->second->GetEdgeData()->GetAbstractArray(
+            "EdgeParentAttrs"));
+
+    vtkVariantArray* childAttrArrays
+      = vtkVariantArray::SafeDownCast(
+          unConstItr->second->GetEdgeData()->GetAbstractArray(
+            "EdgeChildAttrs"));
+
+    unConstItr->second->GetEdges(egItr);
+    while (egItr->HasNext())
+      {
+      JSONNode link(JSON_NODE);
+      vtkEdgeType edgeType = egItr->Next();
+
+      int edgeId = ids->GetVariantValue(edgeType.Id).ToInt();
+      int parentId = nodeIds->GetVariantValue(edgeType.Source).ToInt();
+      int childId = nodeIds->GetVariantValue(edgeType.Target).ToInt();
+
+      link.push_back(JSONNode("id", edgeId));
+      link.push_back(JSONNode("parent_id", parentId));
+      // \TODO What is parent subtype??
+      link.push_back(JSONNode("parent_subtype", ""));
+      link.push_back(JSONNode("child_id", childId));
+      // \TODO What is child subtype??
+      link.push_back(JSONNode("child_subtype", ""));
+
+      d->addEdgeAttributes(link, parentAttrArrays, childAttrArrays,
+                           edgeType.Id);
+
+      links.push_back(link);
+      }
+
+    edges.push_back(links);
+    primitives.push_back(edges);
+    }
+
+  // Directed graphs
+  DGraphs dGraphs = graphModel->GetAllDirectedGraphs();
+  DConstItr dConstItr = dGraphs.begin();
+  for (; dConstItr != dGraphs.end(); ++dConstItr)
+    {
+    JSONNode edges(JSON_NODE);
+    edges.push_back(JSONNode("directed", "true"));
+    edges.push_back(JSONNode("name", dConstItr->first));
+    JSONNode links(JSON_ARRAY);
+    links.set_name("links");
+
+    vtkAbstractArray* ids = dConstItr->second->GetEdgeData()->GetPedigreeIds();
+
+    vtkVariantArray* parentAttrArrays
+      = vtkVariantArray::SafeDownCast(
+          dConstItr->second->GetEdgeData()->GetAbstractArray(
+            "EdgeParentAttrs"));
+
+    vtkVariantArray* childAttrArrays
+      = vtkVariantArray::SafeDownCast(
+          dConstItr->second->GetEdgeData()->GetAbstractArray(
+            "EdgeChildAttrs"));
+
+    dConstItr->second->GetEdges(egItr);
+    while (egItr->HasNext())
+      {
+      JSONNode link(JSON_NODE);
+      vtkEdgeType edgeType = egItr->Next();
+
+      int edgeId = ids->GetVariantValue(edgeType.Id).ToInt();
+      int parentId = nodeIds->GetVariantValue(edgeType.Source).ToInt();
+      int childId = nodeIds->GetVariantValue(edgeType.Target).ToInt();
+
+      link.push_back(JSONNode("id", edgeId));
+      link.push_back(JSONNode("parent_id", parentId));
+      // \TODO What is parent subtype??
+      link.push_back(JSONNode("parent_subtype", ""));
+      link.push_back(JSONNode("child_id", childId));
+      // \TODO What is child subtype??
+      link.push_back(JSONNode("child_subtype", ""));
+
+      d->addEdgeAttributes(link, parentAttrArrays, childAttrArrays,
+                           edgeType.Id);
+
+      links.push_back(link);
+      }
+
+    edges.push_back(links);
+    primitives.push_back(edges);
+    }
+
+  root.push_back(primitives);
+  return root;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::saveState(JSONNode& root)
+{
+  try
+    {
+    root = this->exportToJson();
+    }
+  catch (const std::exception& e)
+    {
+    qDebug() << "Failed to save state:" << e.what();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::saveUndoState()
+{
+  QTE_D(vpGraphModelWidget);
+
+  this->saveState(d->UndoState);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::getWorldViewport(double (&viewport)[4],
+                                          double offX, double offY)
+{
+  QTE_D(vpGraphModelWidget);
+
+  int* size = d->RenderWindow->GetSize();
+  double dsize[2] =
+    { static_cast<double>(size[0]), static_cast<double>(size[1]) };
+
+  double offsetX = dsize[0] * offX;
+  double offsetY = dsize[1] * offY;
+
+  double minPt[3] = { offsetX, offsetY, 0.0 };
+  double maxPt[3] = { dsize[0] - offsetX, dsize[1] - offsetY, 0.0 };
+
+  vtkVgSpaceConversion::DisplayToWorldNormalized(d->Renderer, minPt, minPt);
+  vtkVgSpaceConversion::DisplayToWorldNormalized(d->Renderer, maxPt, maxPt);
+
+  viewport[0] = minPt[0];
+  viewport[1] = minPt[1];
+  viewport[2] = maxPt[0];
+  viewport[3] = maxPt[1];
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::resetCamera()
+{
+  QTE_D(vpGraphModelWidget);
+
+  // Because the graph mapper uses vtkDistanceToCamera, there is a cyclic
+  // dependency between the bounds of the graph and the zoom level of the
+  // camera when performing a reset. It takes a few iterations for the camera
+  // to converge to the right zoom level.
+  vgRange<double> xExtents, yExtents;
+  for (int i = 0; i < 5; ++i)
+    {
+    d->View.getGraphBounds(xExtents, yExtents);
+    d->Renderer->ResetCamera(xExtents.lower, xExtents.upper,
+                             yExtents.lower, yExtents.upper,
+                             -1.0, 1.0);
+    }
+  d->View.render();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::clear()
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->Helper.clear();
+
+  d->UI.nodeTreeWidget->clear();
+  d->UI.edgeTreeWidget->clear();
+  d->UI.childNodesComboBox->clear();
+  d->UI.parentNodesComboBox->clear();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::selectEvent(int id)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (d->Selecting)
+    {
+    return;
+    }
+
+  if (id == -1)
+    {
+    d->UI.nodeTreeWidget->clearSelection();
+    return;
+    }
+
+  // Find the tree item corresponding to the given event, if any
+  for (int i = 0, end = d->UI.nodeTreeWidget->topLevelItemCount(); i != end;
+       ++i)
+    {
+    QTreeWidgetItem* item = d->UI.nodeTreeWidget->topLevelItem(i);
+    if (d->Helper.getNodeEventId(item->data(0, NodeIdRole).toInt()) ==
+        id)
+      {
+      d->UI.nodeTreeWidget->setCurrentItem(item);
+      d->UI.nodeTreeWidget->scrollTo(d->UI.nodeTreeWidget->currentIndex());
+      return;
+      }
+    }
+
+  // No item found
+  d->UI.nodeTreeWidget->clearSelection();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::resetPrimitives()
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->UI.primitivesComboBox->clear();
+
+  // "None" is required to see nodes
+  d->UI.primitivesComboBox->addItem("None");
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::enableCreateNode(bool flag)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (flag && d->UI.addNodeButton->isEnabled())
+    {
+    // Switch to user-positioned layout if can't place user nodes in this layout
+    if (d->UI.graphLayoutComboBox->currentIndex() ==
+        vpMultiGraphRepresentation::SortByStartTime)
+      {
+      d->UI.graphLayoutComboBox->setCurrentIndex(
+        vpMultiGraphRepresentation::Default);
+      }
+    d->View.setCreateNodeEnabled(flag);
+    d->SpatialView.setCreateNodeEnabled(flag);
+    return;
+    }
+
+  d->View.setCreateNodeEnabled(flag);
+  d->SpatialView.setCreateNodeEnabled(flag);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::enableCreateEdge(bool /*flag*/)
+{
+  //QTE_D(vpGraphModelWidget);
+
+  // FIXME
+  //if (flag && d->UI.addEdgeButton->isEnabled())
+  //  {
+  //  d->Viewer.enableCreateEdge(flag);
+
+  //  return;
+  //  }
+
+  //d->Viewer.enableCreateEdge(flag);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::createEdge()
+{
+  QTE_D(vpGraphModelWidget);
+
+  int parentId
+    = d->UI.parentNodesComboBox->itemData(
+        d->UI.parentNodesComboBox->currentIndex()).toInt();
+
+  int childId
+    = d->UI.childNodesComboBox->itemData(
+        d->UI.childNodesComboBox->currentIndex()).toInt();
+
+  this->createEdge(parentId, childId);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::createNode(double x, double y)
+{
+  QTE_D(vpGraphModelWidget);
+
+  this->saveUndoState();
+  int id = d->Helper.createNode(x, y);
+
+  // Compute and set spatial positions if in that layout
+  if (d->View.getGraphLayout() == vpMultiGraphRepresentation::Spatial)
+    {
+    d->Helper.setNodePosition(id, vpMultiGraphModel::NPT_NormalizedSpatial,
+                              x, y);
+
+    double pt[3] = { x, y, 1.0 };
+    d->View.getGraphToSpatialMatrix()->MultiplyPoint(pt, pt);
+    d->Helper.setNodePosition(id, vpMultiGraphModel::NPT_Spatial, pt[0], pt[1]);
+    }
+
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::createNodeSpatial(double x, double y)
+{
+  QTE_D(vpGraphModelWidget);
+
+  this->saveUndoState();
+
+  double wx, wy;
+  d->SpatialView.getWorldPosition(x, y, wx, wy);
+
+  // TODO: Give the node a sensible position for user layout
+  int id = d->Helper.createNode(x, y);
+
+  d->Helper.setNodePosition(id, vpMultiGraphModel::NPT_Spatial, x, y);
+
+  if (d->View.getGraphLayout() == vpMultiGraphRepresentation::Spatial)
+    {
+    vtkSmartPointer<vtkMatrix3x3> spatialToGraph =
+      vtkSmartPointer<vtkMatrix3x3>::New();;
+    vtkMatrix3x3::Invert(d->View.getGraphToSpatialMatrix(), spatialToGraph);
+
+    double pt[3] = { x, y, 1.0 };
+    spatialToGraph->MultiplyPoint(pt, pt);
+
+    d->Helper.setNodePosition(id, vpMultiGraphModel::NPT_NormalizedSpatial,
+                              pt[0], pt[1]);
+    }
+
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::createEdge(int parentId, int childId)
+{
+  QTE_D(vpGraphModelWidget);
+
+  this->saveUndoState();
+  const QString& domain = d->UI.primitivesComboBox->currentText();
+  d->Helper.createEdge(parentId, childId, stdString(domain), 0, 0);
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::removeNodes()
+{
+  QTE_D(vpGraphModelWidget);
+
+  vtkSmartPointer<vtkIdTypeArray> ids
+    = vtkSmartPointer<vtkIdTypeArray>::New();
+
+  foreach (QTreeWidgetItem* item, d->UI.nodeTreeWidget->selectedItems())
+    {
+    int id = item->data(0, NodeIdRole).toInt();
+    this->deleteItemsForNode(id);
+    ids->InsertNextValue(id);
+    }
+
+  if (ids->GetNumberOfTuples() != 0)
+    {
+    this->saveUndoState();
+    d->Helper.deleteNodes(ids);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::removeEdges()
+{
+  QTE_D(vpGraphModelWidget);
+
+  vtkSmartPointer<vtkIdTypeArray> ids
+    = vtkSmartPointer<vtkIdTypeArray>::New();
+
+  QString curDomain;
+  foreach (QTreeWidgetItem* item, d->UI.edgeTreeWidget->selectedItems())
+    {
+    int id = item->data(0, EdgeIdRole).toInt();
+    QString domain = item->data(0, EdgeDomainRole).toString();
+
+    if (curDomain.isNull())
+      {
+      curDomain = domain;
+      }
+    else if (domain != curDomain)
+      {
+      d->Helper.deleteEdges(ids, curDomain);
+      curDomain = domain;
+      ids->Reset();
+      }
+
+    this->deleteItemsForEdge(domain, id);
+    ids->InsertNextValue(id);
+    }
+
+  if (ids->GetNumberOfTuples() != 0)
+    {
+    this->saveUndoState();
+    d->Helper.deleteEdges(ids, curDomain);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateNodeListView(
+  QString nodeType, int nodeId)
+{
+  QTE_D(vpGraphModelWidget);
+
+  QString nodeLabel =
+    qtString(d->GraphModel->GetNodeLabel(nodeId));
+
+  vpAttributeConfig::vpAttributeType defaultAttrType;
+
+  int attr =
+    d->AttributeConfig.getAttributeTypeIndex(
+      d->GraphModel->GetNodeDefaultEdgeAttr(nodeId));
+
+  if (attr != -1)
+    {
+    defaultAttrType = d->AttributeConfig.getAttributeTypeByIndex(attr);
+    }
+
+  QStringList cols;
+  cols << nodeLabel;
+  cols << nodeType;
+  cols << defaultAttrType.Name;
+
+  QTreeWidgetItem* item = new QTreeWidgetItem(cols);
+  item->setFlags(item->flags() | Qt::ItemIsEditable);
+  item->setData(0, NodeIdRole, nodeId);
+  item->setData(1, Qt::UserRole,
+                vpEventConfig::GetIdFromString(qPrintable(nodeType)));
+  item->setData(2, Qt::UserRole, defaultAttrType.Id);
+
+  d->UI.nodeTreeWidget->addTopLevelItem(item);
+
+  d->UI.parentNodesComboBox->addItem(nodeLabel, nodeId);
+  d->UI.childNodesComboBox->addItem(nodeLabel, nodeId);
+
+  if (!QApplication::keyboardModifiers().testFlag(Qt::ControlModifier))
+    {
+    d->UI.addNodeButton->setChecked(false);
+    }
+
+  // Since we cannot hide any item, hence safe to use count
+  this->enableCreateEdge((d->UI.nodeTreeWidget->topLevelItemCount() > 1));
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateEdgeListView(
+  QString domain, int edgeId)
+{
+  QTE_D(vpGraphModelWidget);
+
+  vtkIntArray* parentAttrs =
+      d->GraphModel->GetEdgeParentAttributes(edgeId, stdString(domain));
+  vtkIntArray* childAttrs =
+      d->GraphModel->GetEdgeChildAttributes(edgeId, stdString(domain));
+
+  int parentAttrId = -1;
+  QString parentAttribute;
+  if (parentAttrs && parentAttrs->GetNumberOfTuples() != 0)
+    {
+    int idx
+      = d->AttributeConfig.getAttributeTypeIndex(parentAttrs->GetValue(0));
+    if (idx != -1)
+      {
+      vpAttributeConfig::vpAttributeType type
+        = d->AttributeConfig.getAttributeTypeByIndex(idx);
+      parentAttrId = type.Id;
+      parentAttribute = type.Name;
+      }
+    }
+
+  int childAttrId = -1;
+  QString childAttribute;
+  if (childAttrs && childAttrs->GetNumberOfTuples() != 0)
+    {
+    int idx
+      = d->AttributeConfig.getAttributeTypeIndex(childAttrs->GetValue(0));
+    if (idx != -1)
+      {
+      vpAttributeConfig::vpAttributeType type
+        = d->AttributeConfig.getAttributeTypeByIndex(idx);
+      childAttrId = type.Id;
+      childAttribute = type.Name;
+      }
+    }
+
+  QStringList cols;
+  // \TODO Revisit this string formatting
+  cols << QString(domain + "_%1").arg(edgeId);
+  cols << parentAttribute;
+  cols << childAttribute;
+  QTreeWidgetItem* item = new QTreeWidgetItem(cols);
+  item->setFlags(item->flags() | Qt::ItemIsEditable);
+  item->setData(0, EdgeIdRole, edgeId);
+  item->setData(0, EdgeDomainRole, domain);
+  item->setData(1, Qt::UserRole, parentAttrId);
+  item->setData(2, Qt::UserRole, childAttrId);
+  d->UI.edgeTreeWidget->addTopLevelItem(item);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateNodeItem(QTreeWidgetItem* item, int col)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (col > 2)
+    {
+    return;
+    }
+
+  QString label = item->text(0);
+  QString type = item->text(1);
+
+  int id = item->data(0, NodeIdRole).toInt();
+  int defaultEdgeAttr = item->data(2, Qt::UserRole).toInt();
+
+  this->saveUndoState();
+  d->Helper.setNodeType(id, stdString(type), stdString(label), defaultEdgeAttr);
+
+  setComboItemText(d->UI.parentNodesComboBox, id, label);
+  setComboItemText(d->UI.childNodesComboBox, id, label);
+
+  // Update layouts in case node positions have changed due to a change in
+  // default edge attribute.
+  d->View.refreshGraphLayout();
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateEdgeItem(QTreeWidgetItem* item, int col)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (col < 1 || col > 2)
+    {
+    return;
+    }
+
+  int attr = item->data(col, Qt::UserRole).toInt();
+
+  vtkSmartPointer<vtkIntArray> attrs;
+  if (attr != -1)
+    {
+    attrs = vtkSmartPointer<vtkIntArray>::New();
+    attrs->InsertNextValue(attr);
+    }
+
+  std::string domain = stdString(item->data(0, EdgeDomainRole).toString());
+  int id = item->data(0, EdgeIdRole).toInt();
+
+  this->saveUndoState();
+  if (col == 1)
+    {
+    d->GraphModel->SetEdgeParentAttributes(id, domain, attrs);
+    }
+  else
+    {
+    d->GraphModel->SetEdgeChildAttributes(id, domain, attrs);
+    }
+
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::undo()
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (!d->UndoState.empty())
+    {
+    this->saveState(d->RedoState);
+    if (this->importFrom(d->UndoState))
+      {
+      this->updateViews();
+      }
+    else
+      {
+      d->RedoState.clear();
+      }
+    d->UndoState.clear();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::redo()
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (!d->RedoState.empty())
+    {
+    this->saveState(d->UndoState);
+    if (this->importFrom(d->RedoState))
+      {
+      this->updateViews();
+      }
+    else
+      {
+      d->UndoState.clear();
+      }
+    d->RedoState.clear();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::deleteItemsForNode(int id)
+{
+  QTE_D(vpGraphModelWidget);
+
+  for (int i = 0, end = d->UI.nodeTreeWidget->topLevelItemCount(); i != end;
+       ++i)
+    {
+    QTreeWidgetItem* item = d->UI.nodeTreeWidget->topLevelItem(i);
+    if (id == item->data(0, NodeIdRole).toInt())
+      {
+      d->UI.nodeTreeWidget->takeTopLevelItem(i);
+      delete item;
+      break;
+      }
+    }
+
+  removeComboItem(d->UI.parentNodesComboBox, id);
+  removeComboItem(d->UI.childNodesComboBox, id);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::deleteItemsForEdge(QString domain, int id)
+{
+  QTE_D(vpGraphModelWidget);
+
+  for (int i = 0, end = d->UI.edgeTreeWidget->topLevelItemCount(); i != end;
+       ++i)
+    {
+    QTreeWidgetItem* item = d->UI.edgeTreeWidget->topLevelItem(i);
+    if (id == item->data(0, EdgeIdRole).toInt() &&
+        domain == item->data(0, EdgeDomainRole).toString())
+      {
+      d->UI.edgeTreeWidget->takeTopLevelItem(i);
+      delete item;
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateNodeControls()
+{
+  QTE_D(vpGraphModelWidget);
+
+  int count = d->UI.nodeTreeWidget->selectedItems().count();
+  d->UI.removeNodeButton->setEnabled(count != 0);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateEdgeControls()
+{
+  QTE_D(vpGraphModelWidget);
+
+  int count = d->UI.edgeTreeWidget->selectedItems().count();
+  d->UI.removeEdgeButton->setEnabled(count != 0);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::selectPickedNodes()
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (d->Selecting)
+    {
+    return;
+    }
+
+  vtkIdTypeArray* pickedIds = d->GraphModel->GetSelectedNodes();
+  QItemSelection selection;
+  for (int i = 0, end = d->UI.nodeTreeWidget->topLevelItemCount(); i != end;
+       ++i)
+    {
+    QTreeWidgetItem* item = d->UI.nodeTreeWidget->topLevelItem(i);
+    for (vtkIdType j = 0, end = pickedIds->GetNumberOfTuples(); j != end; ++j)
+      {
+      if (pickedIds->GetValue(j) == item->data(0, NodeIdRole).toInt())
+        {
+        QModelIndex idx = d->UI.nodeTreeWidget->model()->index(i, 0);
+        selection.select(idx, idx);
+        break;
+        }
+      }
+    }
+
+  d->UI.nodeTreeWidget->selectionModel()->select(
+    selection,
+    QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+
+  if (!selection.isEmpty())
+    {
+    d->UI.nodeTreeWidget->selectionModel()->setCurrentIndex(
+      selection.front().topLeft(),
+      QItemSelectionModel::Rows | QItemSelectionModel::NoUpdate);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::selectPickedEdges(QString domain)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (d->Selecting)
+    {
+    return;
+    }
+
+  vtkIdTypeArray* pickedIds =
+    d->GraphModel->GetSelectedEdges(stdString(domain));
+
+  QItemSelection selection;
+  for (int i = 0, end = d->UI.edgeTreeWidget->topLevelItemCount(); i != end;
+       ++i)
+    {
+    QTreeWidgetItem* item = d->UI.edgeTreeWidget->topLevelItem(i);
+    for (vtkIdType j = 0, end = pickedIds->GetNumberOfTuples(); j != end; ++j)
+      {
+      if (pickedIds->GetValue(j) ==
+          item->data(0, EdgeIdRole).toInt() &&
+          domain == item->data(0, EdgeDomainRole).toString())
+        {
+        QModelIndex idx = d->UI.edgeTreeWidget->model()->index(i, 0);
+        selection.select(idx, idx);
+        break;
+        }
+      }
+    }
+
+  d->UI.edgeTreeWidget->selectionModel()->select(
+    selection,
+    QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
+
+  if (!selection.isEmpty())
+    {
+    d->UI.edgeTreeWidget->selectionModel()->setCurrentIndex(
+      selection.front().topLeft(),
+      QItemSelectionModel::Rows | QItemSelectionModel::NoUpdate);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateNodeSelection()
+{
+  QTE_D(vpGraphModelWidget);
+
+  SelectionGuard sg(d);
+
+  vtkSmartPointer<vtkIdTypeArray> ids
+    = vtkSmartPointer<vtkIdTypeArray>::New();
+
+  int eventId = -1;
+
+  int count = 0;
+  foreach (QTreeWidgetItem* item, d->UI.nodeTreeWidget->selectedItems())
+    {
+    ++count;
+    int id = item->data(0, NodeIdRole).toInt();
+    ids->InsertNextValue(id);
+    if (eventId == -1)
+      {
+      eventId = d->Helper.getNodeEventId(id);
+      }
+    }
+
+  if (count != 0)
+    {
+    d->UI.edgeTreeWidget->clearSelection();
+    }
+
+  this->updateNodeControls();
+
+  d->Helper.selectNodes(ids);
+  this->updateViews();
+
+  // Emit a signal if a node linked to an event was selected
+  if (eventId != -1)
+    {
+    emit this->eventSelected(eventId);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateEdgeSelection()
+{
+  QTE_D(vpGraphModelWidget);
+
+  SelectionGuard sg(d);
+
+  vtkSmartPointer<vtkIdTypeArray> ids
+    = vtkSmartPointer<vtkIdTypeArray>::New();
+
+  QString curDomain = d->UI.primitivesComboBox->currentText();
+
+  int count = 0;
+  foreach (QTreeWidgetItem* item, d->UI.edgeTreeWidget->selectedItems())
+    {
+    if (item->data(0, EdgeDomainRole).toString() == curDomain)
+      {
+      ++count;
+      int id = item->data(0, EdgeIdRole).toInt();
+      ids->InsertNextValue(id);
+      }
+    }
+
+  if (count != 0)
+    {
+    d->UI.nodeTreeWidget->clearSelection();
+    }
+
+  this->updateEdgeControls();
+
+  d->Helper.selectEdges(ids, curDomain);
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateEdgeInterface()
+{
+  QTE_D(vpGraphModelWidget);
+
+  QString curDomain = d->UI.primitivesComboBox->currentText();
+
+  if ((curDomain.compare("before") == 0) ||
+      (curDomain.compare("adjacent") == 0))
+    {
+    d->UI.autoEdgesButton->setEnabled(true);
+    d->UI.autoEdgesCheckBox->setEnabled(true);
+    }
+  else
+    {
+    d->UI.autoEdgesButton->setEnabled(false);
+    d->UI.autoEdgesCheckBox->setEnabled(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateParameterWidget(int primitive)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (--primitive < 0)
+    {
+    d->UI.parameterWidget->setVisible(false);
+    return;
+    }
+
+  int prevType = d->PrimitiveConfig.getPreviousOrderedTypeIndex(primitive);
+  double minimum =
+    prevType != -1
+      ? d->UI.primitivesComboBox->itemData(prevType + 1).toDouble()
+      : 0.0;
+
+  int nextType = d->PrimitiveConfig.getNextOrderedTypeIndex(primitive);
+  double maximum =
+    nextType != -1
+      ? d->UI.primitivesComboBox->itemData(nextType + 1).toDouble()
+      : 1e9;
+
+  vpPrimitiveConfig::vpPrimitiveType pt =
+    d->PrimitiveConfig.getPrimitiveTypeByIndex(primitive);
+  switch (pt.ParamType)
+    {
+    case vpPrimitiveConfig::PPT_Distance:
+      d->UI.parameterWidget->setCurrentIndex(0);
+      d->UI.parameterWidget->setVisible(true);
+      d->UI.distanceParameter->setValue(
+        d->UI.primitivesComboBox->itemData(primitive + 1).toDouble());
+      d->UI.distanceParameter->setRange(minimum, maximum);
+      break;
+    case vpPrimitiveConfig::PPT_Time:
+      d->UI.parameterWidget->setCurrentIndex(1);
+      d->UI.parameterWidget->setVisible(true);
+      d->UI.timeParameter->setValue(
+        d->UI.primitivesComboBox->itemData(primitive + 1).toDouble());
+      d->UI.timeParameter->setRange(minimum, maximum);
+      break;
+    default:
+      d->UI.parameterWidget->setVisible(false);
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::pruneEdges()
+{
+  QTE_D(vpGraphModelWidget);
+
+  vpMultiGraphModel* gm = d->GraphModel;
+  for (int i = 0; i != d->UI.edgeTreeWidget->topLevelItemCount();)
+    {
+    QTreeWidgetItem* item = d->UI.edgeTreeWidget->topLevelItem(i);
+    int id = item->data(0, EdgeIdRole).toInt();
+    QString domain = item->data(0, EdgeDomainRole).toString();
+    if (!gm->HasEdge(id, stdString(domain)))
+      {
+      delete d->UI.edgeTreeWidget->takeTopLevelItem(i);
+      }
+    else
+      {
+      ++i;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::changeGraphLayout(int layoutIndex)
+{
+  QTE_D(vpGraphModelWidget);
+  double viewport[4];
+  this->getWorldViewport(viewport, 0.20, 0.20);
+
+  vgRange<double> width(viewport[0], viewport[2]);
+  vgRange<double> height(viewport[1], viewport[3]);
+  d->View.setGraphLayout(layoutIndex, width, height);
+  d->View.render();
+
+  if (layoutIndex == vpMultiGraphRepresentation::SortByStartTime)
+    {
+    d->UI.addNodeButton->setChecked(false);
+    }
+  d->UI.copyCurrentLayoutButton->setEnabled(
+    layoutIndex != vpMultiGraphRepresentation::Default);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::copyCurrentLayoutToDefault()
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->View.copyCurrentLayout();
+  d->UI.graphLayoutComboBox->setCurrentIndex(
+    vpMultiGraphRepresentation::Default);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::autoCreateEdges()
+{
+  QTE_D(vpGraphModelWidget);
+
+  QString curDomain = d->UI.primitivesComboBox->currentText();
+  d->Helper.autoCreateEdges(curDomain, d->UI.autoEdgesCheckBox->isChecked(),
+                            d->View.getNodePositionType());
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::setVertexOpacity(int value)
+{
+  QTE_D(vpGraphModelWidget);
+
+  double opacity = 0.25 + 0.75 * static_cast<double>(value) /
+                                 d->UI.vertexOpacity->maximum();
+  d->View.setVertexOpacity(opacity);
+  d->SpatialView.setVertexOpacity(opacity);
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::showMainWindowOverlay(bool show)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (show)
+    {
+    d->SpatialView.setGraphLayout(vpMultiGraphRepresentation::RawSpatial,
+                                  vgRange<double>(), vgRange<double>());
+    }
+  d->SpatialView.setActive(show);
+  d->SpatialView.render();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::updateMovedNodeSpatialPositions()
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (d->View.getGraphLayout() != vpMultiGraphRepresentation::Spatial)
+    {
+    return;
+    }
+
+  vtkSmartPointer<vtkMatrix3x3> spatialToGraph =
+    vtkSmartPointer<vtkMatrix3x3>::New();
+  vtkMatrix3x3::Invert(d->View.getGraphToSpatialMatrix(), spatialToGraph);
+
+  // Here we assume that only selected nodes have been moved
+  vtkIdTypeArray* nodes = d->GraphModel->GetSelectedNodes();
+  for (vtkIdType i = 0, end = nodes->GetNumberOfTuples(); i < end; ++i)
+    {
+    int id = static_cast<int>(nodes->GetValue(i));
+    double pt[3];
+    d->GraphModel->GetNodePosition(vpMultiGraphModel::NPT_Spatial, id,
+                                   pt[0], pt[1], pt[2]);
+    pt[2] = 1.0;
+
+    // Set the "normalized" spatial position for the widget graph view based on
+    // the world position of the node that was just set via a drag in the graph
+    // overlay.
+    spatialToGraph->MultiplyPoint(pt, pt);
+    d->Helper.setNodePosition(id, vpMultiGraphModel::NPT_NormalizedSpatial,
+                              pt[0], pt[1]);
+    }
+
+  this->updateViews();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::setPrimitiveParameter(double value)
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->UI.primitivesComboBox->setItemData(
+    d->UI.primitivesComboBox->currentIndex(), value);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::pickDistance()
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (this->sender() == d->UI.pickMaxSpatialWindow)
+    {
+    d->PickingMaxSpatialWindow = true;
+    }
+
+  QMessageBox *mb =
+    new QMessageBox(QMessageBox::NoIcon, QString(),
+                    "Select desired distance by clicking and dragging in the "
+                    "main window.", QMessageBox::Cancel);
+
+  connect(mb, SIGNAL(finished(int)), this, SLOT(cancelPickDistance()));
+  connect(this, SIGNAL(distanceMeasurementComplete()), mb, SLOT(accept()));
+
+  mb->setAttribute(Qt::WA_DeleteOnClose);
+  mb->setModal(false);
+  mb->show();
+
+  // Disable input to the rest of the widget. Normally we would just use a
+  // modal dialog, but can't because there is no such thing as "widget modal".
+  this->setEnabled(false);
+
+  emit this->distanceMeasurementRequested(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::cancelPickDistance()
+{
+  QTE_D(vpGraphModelWidget);
+
+  d->PickingMaxSpatialWindow = false;
+  this->setEnabled(true);
+
+  emit this->distanceMeasurementRequested(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::setMeasuredDistance(double meters)
+{
+  QTE_D(vpGraphModelWidget);
+
+  if (meters < 0.0)
+    {
+    QMessageBox::warning(this, QString(),
+                         "Failed to get valid distance. Make sure the project "
+                         "is loaded with geographic coordinates enabled.");
+
+    emit this->distanceMeasurementComplete();
+    return;
+    }
+
+  if (d->PickingMaxSpatialWindow)
+    {
+    d->UI.maxSpatialWindow->setValue(meters);
+
+    emit this->distanceMeasurementComplete();
+    return;
+    }
+
+  this->setParameterValue(meters, d->UI.distanceParameter);
+
+  emit this->distanceMeasurementComplete();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::pickTimeInterval()
+{
+  QTE_D(vpGraphModelWidget);
+
+  this->setEnabled(false);
+
+  if (this->sender() == d->UI.pickMaxTemporalWindow)
+    {
+    d->PickingMaxTemporalWindow = true;
+    }
+
+  emit this->timeIntervalMeasurementRequested();
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::setMeasuredTimeInterval(double seconds)
+{
+  QTE_D(vpGraphModelWidget);
+
+  this->setEnabled(true);
+  if (seconds >= 0.0)
+    {
+    if (d->PickingMaxTemporalWindow)
+      {
+      d->UI.maxTemporalWindow->setValue(qCeil(seconds));
+      }
+    else
+      {
+      this->setParameterValue(seconds, d->UI.timeParameter);
+      }
+    }
+  d->PickingMaxTemporalWindow = false;
+}
+
+//-----------------------------------------------------------------------------
+void vpGraphModelWidget::setParameterValue(double value, QDoubleSpinBox* widget)
+{
+  QTE_D(vpGraphModelWidget);
+
+  // Sanity check the new value against constraints imposed by other types
+  int currentType = d->UI.primitivesComboBox->currentIndex() - 1;
+  int prevType = d->PrimitiveConfig.getPreviousOrderedTypeIndex(currentType);
+  int nextType = d->PrimitiveConfig.getNextOrderedTypeIndex(currentType);
+
+  if (prevType >= 0 &&
+      value < d->UI.primitivesComboBox->itemData(prevType + 1).toDouble())
+    {
+    double prevVal =
+      d->UI.primitivesComboBox->itemData(prevType + 1).toDouble();
+
+    QMessageBox::warning(
+      this, QString(),
+      QString("Attempted to set parameter to a lower value than that of "
+              "the previous ordered primitive, \"%1\" ( %2 ). Parameter "
+              "value will be clamped.")
+        .arg(d->PrimitiveConfig.getPrimitiveTypeByIndex(prevType).Name)
+        .arg(prevVal));
+    value = prevVal;
+    }
+
+  if (nextType >= 0 &&
+      value > d->UI.primitivesComboBox->itemData(nextType + 1).toDouble())
+    {
+    double nextVal =
+      d->UI.primitivesComboBox->itemData(nextType + 1).toDouble();
+
+    QMessageBox::warning(
+      this, QString(),
+      QString("Attempted to set parameter to a higher value than that of "
+              "the next ordered primitive, \"%1\" ( %2 ). Parameter value "
+              "will be clamped.")
+        .arg(d->PrimitiveConfig.getPrimitiveTypeByIndex(nextType).Name)
+        .arg(nextVal));
+    value = nextVal;
+    }
+
+  widget->setValue(value);
+}
diff --git a/Applications/VpView/vpGraphModelWidget.h b/Applications/VpView/vpGraphModelWidget.h
new file mode 100644
index 00000000..e92c655b
--- /dev/null
+++ b/Applications/VpView/vpGraphModelWidget.h
@@ -0,0 +1,155 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpGraphModelWidget_h
+#define __vpGraphModelWidget_h
+
+#include <QWidget>
+
+// VisGUI includes
+#include <qtGlobal.h>
+
+// VTK includes
+#include <vtkGraph.h>
+#include <vtkSmartPointer.h>
+
+// Forward declarations
+class JSONNode;
+class QDoubleSpinBox;
+class QTreeWidgetItem;
+class vpGraphModelWidgetPrivate;
+class vpGraphModelView;
+class vpViewCore;
+class vtkRenderer;
+class vtkVgEvent;
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+class vtkVgInteractorStyleRubberBand2D;
+class vtkVgRepresentationBase;
+
+class vpGraphModelWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit vpGraphModelWidget(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vpGraphModelWidget();
+
+  void setSpatialOverlayRenderer(vtkRenderer* ren,
+                                 vtkVgInteractorStyleRubberBand2D* istyle);
+
+  void setApplicationCore(vpViewCore* core);
+
+  void addEventNodes(const std::vector<vtkVgEvent*>& events);
+
+signals:
+  void eventSelected(int id);
+
+  void distanceMeasurementRequested(bool enable);
+  void distanceMeasurementComplete();
+
+  void timeIntervalMeasurementRequested();
+
+public slots:
+  void initializeUi();
+  void loadEventTypes(vtkVgEventTypeRegistry* reg);
+  void loadPrimitiveTypes(const QString& filename = QString());
+  void loadAttributeTypes(const QString& filename = QString());
+  void loadConfig(const QString& filename);
+
+  void updateViews();
+  void updateVertexDisplaySize();
+
+  void importJson();
+  void exportJson(QString filename=QString(""));
+
+  void clear();
+
+  void selectEvent(int id);
+
+  void showMainWindowOverlay(bool show);
+
+  void setMeasuredDistance(double meters);
+  void setMeasuredTimeInterval(double seconds);
+
+  void resetCamera();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vpGraphModelWidget)
+
+  void connectViewSignals(vpGraphModelView* view);
+
+  void resetPrimitives();
+  void deleteItemsForNode(int nodeId);
+  void deleteItemsForEdge(QString domain, int edgeId);
+
+  void updateNodeControls();
+  void updateEdgeControls();
+
+  bool importFrom(const JSONNode& root);
+  JSONNode exportToJson();
+
+  void saveState(JSONNode& root);
+
+  void getWorldViewport(double (&viewport)[4], double offX, double offY);
+
+  void setParameterValue(double value, QDoubleSpinBox* widget);
+
+protected slots:
+  void enableCreateNode(bool flag);
+  void enableCreateEdge(bool flag);
+
+  void createNode(double x, double y);
+  void createNodeSpatial(double x, double y);
+
+  void createEdge();
+  void createEdge(int parentId, int childId);
+
+  void removeNodes();
+  void removeEdges();
+
+  void updateNodeListView(QString nodeType, int nodeId);
+  void updateEdgeListView(QString domain, int edgeId);
+
+  void updateNodeItem(QTreeWidgetItem* item, int col);
+  void updateEdgeItem(QTreeWidgetItem* item, int col);
+
+  void undo();
+  void redo();
+
+  void saveUndoState();
+
+  void selectPickedNodes();
+  void selectPickedEdges(QString domain);
+
+  void updateNodeSelection();
+  void updateEdgeSelection();
+  void updateEdgeInterface();
+  void updateParameterWidget(int primitive);
+
+  void pruneEdges();
+
+  void changeGraphLayout(int layoutIndex);
+  void copyCurrentLayoutToDefault();
+
+  void autoCreateEdges();
+
+  void setVertexOpacity(int value);
+
+  void updateMovedNodeSpatialPositions();
+
+  void setPrimitiveParameter(double value);
+
+  void pickDistance();
+  void cancelPickDistance();
+
+  void pickTimeInterval();
+
+private:
+  QTE_DECLARE_PRIVATE(vpGraphModelWidget)
+};
+
+#endif // __vpGraphModelWidget_h
diff --git a/Applications/VpView/vpGraphModelWidget.ui b/Applications/VpView/vpGraphModelWidget.ui
new file mode 100644
index 00000000..925006cc
--- /dev/null
+++ b/Applications/VpView/vpGraphModelWidget.ui
@@ -0,0 +1,624 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GraphModelWidget</class>
+ <widget class="QWidget" name="GraphModelWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>855</width>
+    <height>839</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_4">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QSplitter" name="splitter_2">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QSplitter" name="splitter">
+      <property name="minimumSize">
+       <size>
+        <width>1</width>
+        <height>1</height>
+       </size>
+      </property>
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <widget class="QGroupBox" name="groupBox_3">
+       <property name="title">
+        <string>Properties</string>
+       </property>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QScrollArea" name="scrollArea">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="frameShape">
+           <enum>QFrame::NoFrame</enum>
+          </property>
+          <property name="widgetResizable">
+           <bool>true</bool>
+          </property>
+          <widget class="QWidget" name="scrollAreaWidgetContents">
+           <property name="geometry">
+            <rect>
+             <x>0</x>
+             <y>-56</y>
+             <width>249</width>
+             <height>186</height>
+            </rect>
+           </property>
+           <layout class="QFormLayout" name="formLayout">
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Name:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QLineEdit" name="nameLineEdit"/>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="label_2">
+              <property name="text">
+               <string>Description:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QLineEdit" name="descriptionLineEdit"/>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="label_7">
+              <property name="text">
+               <string>Activity ID:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QSpinBox" name="activityId">
+              <property name="frame">
+               <bool>true</bool>
+              </property>
+              <property name="buttonSymbols">
+               <enum>QAbstractSpinBox::UpDownArrows</enum>
+              </property>
+              <property name="maximum">
+               <number>999999999</number>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="0">
+             <widget class="QLabel" name="label_8">
+              <property name="toolTip">
+               <string>Maximum spatial extents of activity</string>
+              </property>
+              <property name="text">
+               <string>Max Spatial Window:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="3" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_4">
+              <item>
+               <widget class="QDoubleSpinBox" name="maxSpatialWindow">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="suffix">
+                 <string> m</string>
+                </property>
+                <property name="maximum">
+                 <double>999999999.000000000000000</double>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pickMaxSpatialWindow">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>30</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>...</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="4" column="0">
+             <widget class="QLabel" name="label_9">
+              <property name="toolTip">
+               <string>Maximum temporal extents of activity</string>
+              </property>
+              <property name="text">
+               <string>Max Temporal Window:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="0">
+             <widget class="QLabel" name="label_11">
+              <property name="toolTip">
+               <string>The minimum number of observed events that multiple detected activities have must have in common to be considered the same activity</string>
+              </property>
+              <property name="text">
+               <string>Num. Common Events:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="5" column="1">
+             <widget class="QSpinBox" name="numCommonEvents">
+              <property name="maximum">
+               <number>999999999</number>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="0">
+             <widget class="QLabel" name="label_10">
+              <property name="toolTip">
+               <string>The minimum number of events to consider when forming activities (typically half the number of nodes)</string>
+              </property>
+              <property name="text">
+               <string>Min Num. Events:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="6" column="1">
+             <widget class="QSpinBox" name="minNumEvents">
+              <property name="maximum">
+               <number>999999999</number>
+              </property>
+             </widget>
+            </item>
+            <item row="4" column="1">
+             <layout class="QHBoxLayout" name="horizontalLayout_5">
+              <item>
+               <widget class="QSpinBox" name="maxTemporalWindow">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="suffix">
+                 <string> s</string>
+                </property>
+                <property name="maximum">
+                 <number>999999999</number>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QPushButton" name="pickMaxTemporalWindow">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="maximumSize">
+                 <size>
+                  <width>30</width>
+                  <height>16777215</height>
+                 </size>
+                </property>
+                <property name="text">
+                 <string>...</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>Nodes</string>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="1" column="1">
+         <widget class="QPushButton" name="removeNodeButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Remove</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0" colspan="2">
+         <widget class="QFrame" name="frame">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <layout class="QHBoxLayout" name="horizontalLayout">
+           <item>
+            <widget class="QComboBox" name="eventTypesComboBox"/>
+           </item>
+           <item>
+            <widget class="QPushButton" name="addNodeButton">
+             <property name="text">
+              <string>Add</string>
+             </property>
+             <property name="checkable">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="0" column="0" colspan="2">
+         <widget class="QTreeWidget" name="nodeTreeWidget">
+          <property name="editTriggers">
+           <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+          </property>
+          <property name="selectionMode">
+           <enum>QAbstractItemView::ExtendedSelection</enum>
+          </property>
+          <property name="rootIsDecorated">
+           <bool>false</bool>
+          </property>
+          <column>
+           <property name="text">
+            <string notr="true">1</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QGroupBox" name="groupBox_2">
+       <property name="title">
+        <string>Edges</string>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <widget class="QLabel" name="primitivesLabel">
+          <property name="text">
+           <string>Primitive:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1" colspan="3">
+         <widget class="QComboBox" name="primitivesComboBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="2" colspan="2">
+         <widget class="QPushButton" name="removeEdgeButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Remove</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0" colspan="4">
+         <widget class="QFrame" name="frame_3">
+          <property name="frameShape">
+           <enum>QFrame::StyledPanel</enum>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_3">
+           <item row="0" column="0">
+            <widget class="QLabel" name="parentNodeLabel">
+             <property name="text">
+              <string>Parent:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QLabel" name="childNodeLabel">
+             <property name="text">
+              <string>Child:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <widget class="QComboBox" name="parentNodesComboBox"/>
+           </item>
+           <item row="1" column="1">
+            <widget class="QComboBox" name="childNodesComboBox"/>
+           </item>
+           <item row="2" column="1">
+            <widget class="QPushButton" name="addEdgeButton">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="text">
+              <string>Add</string>
+             </property>
+             <property name="checkable">
+              <bool>false</bool>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="2" column="0" colspan="4">
+         <widget class="QTreeWidget" name="edgeTreeWidget">
+          <property name="editTriggers">
+           <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+          </property>
+          <property name="selectionMode">
+           <enum>QAbstractItemView::ExtendedSelection</enum>
+          </property>
+          <property name="rootIsDecorated">
+           <bool>false</bool>
+          </property>
+          <column>
+           <property name="text">
+            <string notr="true">1</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QPushButton" name="autoEdgesButton">
+          <property name="text">
+           <string>Auto</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QCheckBox" name="autoEdgesCheckBox">
+          <property name="text">
+           <string>Selected</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0" colspan="4">
+         <widget class="QStackedWidget" name="parameterWidget">
+          <property name="currentIndex">
+           <number>1</number>
+          </property>
+          <widget class="QWidget" name="page">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="label_3">
+              <property name="text">
+               <string>Distance parameter:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QDoubleSpinBox" name="distanceParameter">
+              <property name="suffix">
+               <string> m</string>
+              </property>
+              <property name="maximum">
+               <double>999999999.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pickRadius">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>30</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+          <widget class="QWidget" name="page_2">
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="label_5">
+              <property name="text">
+               <string>Time parameter:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QDoubleSpinBox" name="timeParameter">
+              <property name="suffix">
+               <string> s</string>
+              </property>
+              <property name="maximum">
+               <double>999999999.000000000000000</double>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="pickTimeInterval">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>30</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+      <widget class="QGroupBox" name="groupBox_4">
+       <property name="title">
+        <string>Graph Display</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_5">
+        <item row="1" column="0">
+         <widget class="QLabel" name="label_6">
+          <property name="text">
+           <string>Vertex opacity:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QComboBox" name="graphLayoutComboBox"/>
+        </item>
+        <item row="3" column="0">
+         <widget class="QCheckBox" name="showMainWindowOverlay">
+          <property name="text">
+           <string>Show main window overlay</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QSlider" name="vertexOpacity">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="label_4">
+          <property name="text">
+           <string>Vertex size:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QPushButton" name="copyCurrentLayoutButton">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Copy To User Layout</string>
+          </property>
+          <property name="checkable">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QSlider" name="vertexSize">
+          <property name="minimum">
+           <number>50</number>
+          </property>
+          <property name="maximum">
+           <number>1000</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QPushButton" name="resetView">
+          <property name="text">
+           <string>Reset View</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QVTKWidget" name="renderWidget" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>1</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>100</width>
+        <height>100</height>
+       </size>
+      </property>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QVTKWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpGraphSortAlgorithms.h b/Applications/VpView/vpGraphSortAlgorithms.h
new file mode 100644
index 00000000..eb6975b8
--- /dev/null
+++ b/Applications/VpView/vpGraphSortAlgorithms.h
@@ -0,0 +1,33 @@
+#ifndef __vpGraphSortAlgorithms_h
+#define __vpGraphSortAlgorithms_h
+
+#include "vpMultiGraphModel.h"
+
+#include <vtkSmartPointer.h>
+
+//-----------------------------------------------------------------------------
+struct SortVerticesByXPosDesc
+{
+  SortVerticesByXPosDesc(vpMultiGraphModel* graphModel,
+                         vpMultiGraphModel::NodePositionType positionType) :
+    GraphModel(graphModel), PositionType(positionType)
+    {
+    }
+
+  bool operator ()(const vtkIdType& lhs, const vtkIdType& rhs)
+    {
+    double lx, ly, lz;
+    double rx, ry, rz;
+
+    this->GraphModel->GetNodePosition(this->PositionType, lhs, lx, ly, lz);
+    this->GraphModel->GetNodePosition(this->PositionType, rhs, rx, ry, rz);
+
+    return (lx > rx);
+    }
+
+  vtkSmartPointer<vpMultiGraphModel> GraphModel;
+  vpMultiGraphModel::NodePositionType PositionType;
+};
+
+
+#endif // __vpGraphSortAlgorithms_h
diff --git a/Applications/VpView/vpImageSourceFactory.cxx b/Applications/VpView/vpImageSourceFactory.cxx
new file mode 100644
index 00000000..865652cf
--- /dev/null
+++ b/Applications/VpView/vpImageSourceFactory.cxx
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpImageSourceFactory.h"
+
+vpImageSourceFactory* vpImageSourceFactory::Instance = 0;
+
+//-----------------------------------------------------------------------------
+vpImageSourceFactory* vpImageSourceFactory::GetInstance()
+{
+  if (Instance == 0)
+    {
+    Instance = new vpImageSourceFactory();
+    }
+
+  return Instance;
+}
+
+//-----------------------------------------------------------------------------
+void vpImageSourceFactory::OnApplicationExit()
+{
+  CleanUp();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgBaseImageSource* vpImageSourceFactory::Create(std::string source)
+{
+  for (size_t i = 0; i < this->Creators.size(); ++i)
+    {
+    vtkVgBaseImageSource* imageSourceInstance = this->Creators[i]();
+    if (imageSourceInstance->CanRead(source))
+      {
+      return imageSourceInstance;
+      }
+    else
+      {
+      imageSourceInstance->Delete();
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpImageSourceFactory::CleanUp()
+{
+  if (Instance)
+    {
+    delete Instance;
+    Instance = 0;
+    }
+}
diff --git a/Applications/VpView/vpImageSourceFactory.h b/Applications/VpView/vpImageSourceFactory.h
new file mode 100644
index 00000000..ba8fe593
--- /dev/null
+++ b/Applications/VpView/vpImageSourceFactory.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpImageSourceFactory_h
+#define __vpImageSourceFactory_h
+
+#include <vgAbstractFactory.h>
+
+// C++ includes
+#include <string>
+
+#include <vtkVgBaseImageSource.h>
+
+//-----------------------------------------------------------------------------
+class vpImageSourceFactory : public vgAbstractFactory<vtkVgBaseImageSource*, std::string>
+{
+public:
+
+  static vpImageSourceFactory*    GetInstance();
+  static void                     OnApplicationExit();
+
+  virtual vtkVgBaseImageSource*   Create(std::string source);
+
+
+private:
+
+  static void CleanUp();
+
+  static vpImageSourceFactory* Instance;
+};
+
+//-----------------------------------------------------------------------------
+struct RegisterVpImageSource
+{
+  typedef vtkVgBaseImageSource* (*Creator)();
+
+  RegisterVpImageSource(Creator function)
+    {
+    vpImageSourceFactory::GetInstance()->Register(function);
+    }
+};
+
+#endif // __vpImageSourceFactory_h
diff --git a/Applications/VpView/vpInformaticsDialog.cxx b/Applications/VpView/vpInformaticsDialog.cxx
new file mode 100644
index 00000000..0fc782fd
--- /dev/null
+++ b/Applications/VpView/vpInformaticsDialog.cxx
@@ -0,0 +1,233 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "ui_qtInformaticsDialog.h"
+
+#include "vpInformaticsDialog.h"
+#include "QVTKWidget.h"
+
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkTexture.h>
+#include <vtkPNGReader.h>
+#include <vtkGraph.h>
+#include <vtkRandomGraphSource.h>
+#include <vtkIntArray.h>
+#include <vtkStringArray.h>
+#include <vtkGraphLayoutView.h>
+#include <vtkRenderedGraphRepresentation.h>
+#include <vtkDataSetAttributes.h>
+
+#include <vtksys/SystemTools.hxx>
+
+namespace
+{
+enum enumGraphLayouts
+{
+  SpanTree,
+  ForceDirected,
+  Circular,
+  Clustering2D,
+  NumGraphLayouts
+};
+
+const char* LayoutLabels[NumGraphLayouts] =
+{
+  "Span Tree",
+  "Force Directed",
+  "Circular",
+  "Clustering 2D"
+};
+}
+
+//-----------------------------------------------------------------------------
+vpInformaticsDialog::vpInformaticsDialog(QWidget* parent, Qt::WindowFlags flags) :
+  QDialog(parent, flags)
+{
+  this->InternalWidget = new Ui::qtInformaticsDialog;
+  this->InternalWidget->setupUi(this);
+
+  this->Renderer = vtkSmartPointer<vtkRenderer>::New();
+  this->GetRenderWindow()->AddRenderer(this->Renderer);
+
+  this->Graph = 0x0;
+
+  this->GraphView = vtkSmartPointer<vtkGraphLayoutView>::New();
+
+  this->IconsFile = std::string("");
+
+  for (int i = 0; i < NumGraphLayouts; ++i)
+    {
+    this->InternalWidget->layoutCombo->addItem(tr(LayoutLabels[i]));
+    }
+
+  this->InternalWidget->iconSizeSlider->setMinimum(5);
+  this->InternalWidget->iconSizeSlider->setMaximum(50);
+  this->InternalWidget->iconSizeSlider->setValue(24);
+
+  connect(this->InternalWidget->layoutCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(onLayoutChanged(int)));
+  connect(this->InternalWidget->iconSizeSlider, SIGNAL(valueChanged(int)), this, SLOT(onIconSizeChanged(int)));
+}
+
+//-----------------------------------------------------------------------------
+vpInformaticsDialog::~vpInformaticsDialog()
+{
+  delete this->InternalWidget;
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderWindow* vpInformaticsDialog::GetRenderWindow()
+{
+  return this->InternalWidget->qvtkRenderWidget->GetRenderWindow();
+}
+
+void vpInformaticsDialog::SetRenderWindow(vtkRenderWindow* renWin)
+{
+  this->InternalWidget->qvtkRenderWidget->SetRenderWindow(renWin);
+}
+
+QVTKWidget* vpInformaticsDialog::GetWidget()
+{
+  return this->InternalWidget->qvtkRenderWidget;
+}
+
+//-----------------------------------------------------------------------------
+void vpInformaticsDialog::Initialize()
+{
+  if (this->IconsFile.empty())
+    {
+    std::cerr << "ERROR: Missing icons image file. " << std::endl;
+    return;
+    }
+
+  int numNodes = 120;
+  vtkSmartPointer<vtkRandomGraphSource> random = vtkSmartPointer<vtkRandomGraphSource>::New();
+  random->SetNumberOfVertices(numNodes);
+  random->StartWithTreeOn();
+  random->Update();
+
+  this->Graph = random->GetOutput();
+  vtkSmartPointer<vtkIntArray> index = vtkSmartPointer<vtkIntArray>::New();
+  index->SetName("IconIndex");
+  vtkSmartPointer<vtkStringArray> name = vtkSmartPointer<vtkStringArray>::New();
+  name->SetName("Name");
+
+  int cacheIdx = 1;
+  int iedIdx = 12;
+  int terrIdx = 5;
+  int docIdx = 14;
+  int houseIdx = 9;
+
+  std::string label;
+  int numIcons = 5;
+  for (int i = 0; i < numNodes; ++i)
+    {
+    switch ((i % numIcons))
+      {
+      case 0:
+        label = "Cache " + i / numIcons;
+        name->InsertNextValue(label.c_str());
+        index->InsertNextValue(cacheIdx);
+        break;
+      case 1:
+        label = "IED " + i / numIcons;
+        name->InsertNextValue(label.c_str());
+        index->InsertNextValue(iedIdx);
+        break;
+      case 2:
+        label = "person " + i / numIcons;
+        name->InsertNextValue(label.c_str());
+        index->InsertNextValue(terrIdx);
+        break;
+      case 3:
+        label = "document " + i / numIcons;
+        name->InsertNextValue(label.c_str());
+        index->InsertNextValue(docIdx);
+        break;
+      case 4:
+        label = "place " + i / numIcons;
+        name->InsertNextValue(label.c_str());
+        index->InsertNextValue(houseIdx);
+        break;
+      default:
+        cout << "Bad icon index\n";
+      }
+    }
+
+  this->Graph->GetVertexData()->AddArray(index);
+  this->Graph->GetVertexData()->AddArray(name);
+
+  vtkSmartPointer<vtkPNGReader> reader = vtkSmartPointer<vtkPNGReader>::New();
+  reader->SetFileName(IconsFile.c_str());
+
+  vtkSmartPointer<vtkTexture> texture = vtkSmartPointer<vtkTexture>::New();
+  texture->SetInputConnection(reader->GetOutputPort());
+
+  this->GraphView = vtkSmartPointer<vtkGraphLayoutView>::New();
+  this->GraphView->SetIconTexture(texture);
+  this->GraphView->SetIconSize(64, 64);
+  this->updateIconSize();
+  this->updateLayout();
+
+  this->GraphView->SetInteractor(this->GetWidget()->GetInteractor());
+  this->SetRenderWindow(this->GraphView->GetRenderWindow());
+
+  // In C++ need to downcast rep to vtkRenderedGraphRepresentation
+  vtkRenderedGraphRepresentation* rep =
+    dynamic_cast<vtkRenderedGraphRepresentation*>(this->GraphView->SetRepresentationFromInput(Graph));
+  rep->UseVertexIconTypeMapOff();
+  rep->SetVertexSelectedIcon(12);
+  rep->SetVertexIconSelectionModeToSelectedIcon();
+  rep->VertexIconVisibilityOn();
+  rep->SetVertexIconArrayName("IconIndex");
+  //rep.VertexLabelVisibilityOn()
+  //rep.SetVertexLabelArrayName('Name')
+
+  //view->GetRenderWindow()->SetSize(500, 500);
+  this->GraphView->ResetCamera();
+  this->GraphView->GetInteractor()->Initialize();
+}
+
+void vpInformaticsDialog::updateLayout()
+{
+  switch (this->InternalWidget->layoutCombo->currentIndex())
+    {
+    case SpanTree:
+      this->GraphView->SetLayoutStrategyToSpanTree();
+      break;
+
+    case ForceDirected:
+      this->GraphView->SetLayoutStrategyToForceDirected();
+      break;
+
+    case Circular:
+      this->GraphView->SetLayoutStrategyToCircular();
+      break;
+
+    case Clustering2D:
+      this->GraphView->SetLayoutStrategyToClustering2D();
+      break;
+    }
+}
+
+void vpInformaticsDialog::updateIconSize()
+{
+  int size = this->InternalWidget->iconSizeSlider->value();
+  this->GraphView->SetDisplaySize(size, size);
+}
+
+void vpInformaticsDialog::onLayoutChanged(int /*index*/)
+{
+  this->updateLayout();
+  this->GraphView->ResetCamera();
+  this->GraphView->Render();
+}
+
+void vpInformaticsDialog::onIconSizeChanged(int /*size*/)
+{
+  this->updateIconSize();
+  this->GraphView->Render();
+}
diff --git a/Applications/VpView/vpInformaticsDialog.h b/Applications/VpView/vpInformaticsDialog.h
new file mode 100644
index 00000000..c478a9ff
--- /dev/null
+++ b/Applications/VpView/vpInformaticsDialog.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpInformaticsDialog_h
+#define __vpInformaticsDialog_h
+
+#include <QDialog>
+
+#include <vtkSmartPointer.h>   // Required for smart pointer internal ivars.
+
+class QVTKWidget;
+class vtkRenderWindow;
+class vtkRenderer;
+class vtkGraph;
+class vtkGraphLayoutView;
+
+namespace Ui
+{
+class qtInformaticsDialog;
+};
+
+class vpInformaticsDialog : public QDialog
+{
+  Q_OBJECT
+public:
+
+  vpInformaticsDialog(QWidget* parent = NULL, Qt::WindowFlags flags = 0);
+  virtual ~vpInformaticsDialog();
+
+  // Description:
+  // Returns the vtkRenderWindow of the QVTK widget.
+  vtkRenderWindow* GetRenderWindow();
+
+  // Description:
+  // Set the vtkRenderWindow to the QVTK widget.
+  void SetRenderWindow(vtkRenderWindow* renWin);
+
+  // Description:
+  // Get the QVTKWidget.
+  QVTKWidget* GetWidget();
+
+  void Initialize();
+
+  void SetIconsFile(const std::string& filename)
+    { IconsFile = filename; }
+
+protected slots:
+
+  virtual void onLayoutChanged(int index);
+  virtual void onIconSizeChanged(int size);
+
+signals:
+
+private:
+  void updateLayout();
+  void updateIconSize();
+
+  Ui::qtInformaticsDialog* InternalWidget;
+
+  vtkSmartPointer<vtkRenderer> Renderer;
+  vtkSmartPointer<vtkGraph> Graph;
+  vtkSmartPointer<vtkGraphLayoutView> GraphView;
+
+  std::string IconsFile;
+};
+
+
+#endif /* __vpInformaticsDialog_h */
diff --git a/Applications/VpView/vpMergeTracksDialog.cxx b/Applications/VpView/vpMergeTracksDialog.cxx
new file mode 100644
index 00000000..1555f0b0
--- /dev/null
+++ b/Applications/VpView/vpMergeTracksDialog.cxx
@@ -0,0 +1,812 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpMergeTracksDialog.h"
+
+#include "ui_vpMergeTracksDialog.h"
+
+#include "vpUtils.h"
+#include "vpViewCore.h"
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+
+#include <QCheckBox>
+#include <QDebug>
+#include <QDialog>
+#include <QIntValidator>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QSettings>
+#include <QSpinBox>
+
+#include <algorithm>
+
+const char* ExtendEventsKey = "AutoExtendEvents";
+const char* MergeEventsKey = "AutoMergeEvents";
+const char* MergeGapKey = "AutoMergeEventsMaxGap";
+
+//-----------------------------------------------------------------------------
+class vpMergeTracksDialogPrivate
+{
+public:
+  Ui_vpMergeTracksDialog UI;
+
+  int Session;
+
+  vpViewCore* ViewCore;
+  vtkSmartPointer<vtkVgTrackModel> TrackModel;
+
+  bool AutoExtendEvents;
+  bool AutoMergeEvents;
+  int  MaxMergeGap;
+};
+
+QTE_IMPLEMENT_D_FUNC(vpMergeTracksDialog)
+
+//-----------------------------------------------------------------------------
+vpMergeTracksDialog::vpMergeTracksDialog(vpViewCore* coreInstance, int session,
+                                         QWidget* parent,
+                                         Qt::WindowFlags flags) :
+  QDialog(parent, flags), d_ptr(new vpMergeTracksDialogPrivate)
+{
+  QTE_D(vpMergeTracksDialog);
+
+  d->UI.setupUi(this);
+
+  d->UI.trackId->setValidator(new QIntValidator(0, INT_MAX, this));
+
+  d->Session = session;
+  d->ViewCore = coreInstance;
+  d->TrackModel = coreInstance->getTrackModel(session);
+
+  d->UI.status->setVisible(false);
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setText("Add Track");
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
+
+  // signal-slot connections
+  connect(d->ViewCore, SIGNAL(trackPicked(int, int)),
+          this, SLOT(addTrack(int, int)));
+
+  connect(d->UI.trackId, SIGNAL(textEdited(QString)), this, SLOT(validate()));
+
+  connect(d->UI.replaceMergedTracks, SIGNAL(toggled(bool)),
+          this, SLOT(changeMergeType(bool)));
+
+  connect(d->UI.trackUp, SIGNAL(clicked()), this, SLOT(moveTrackUp()));
+  connect(d->UI.trackDown, SIGNAL(clicked()), this, SLOT(moveTrackDown()));
+  connect(d->UI.trackDelete, SIGNAL(clicked()), this, SLOT(removeTrack()));
+
+  connect(d->UI.advancedOptions, SIGNAL(clicked()),
+          this, SLOT(showAdvancedOptions()));
+}
+
+//-----------------------------------------------------------------------------
+vpMergeTracksDialog::~vpMergeTracksDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::initialize()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  d->UI.trackList->clear();
+
+  this->updateOptionSettings();
+
+  d->UI.trackId->setText(
+    QString::number(d->ViewCore->getCreateTrackId(d->Session)));
+
+  d->UI.trackId->selectAll();
+  d->UI.trackId->setFocus();
+
+  this->validate();
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::addTrack(int trackId, int session)
+{
+  QTE_D(vpMergeTracksDialog);
+
+  if (session != d->Session)
+    {
+    return;
+    }
+
+  // look for existing track with that id
+  QTreeWidgetItem* item = 0;
+  for (int i = 0, end = d->UI.trackList->topLevelItemCount(); i != end; ++i)
+    {
+    QTreeWidgetItem* current = d->UI.trackList->topLevelItem(i);
+    if (current->data(0, Qt::DisplayRole).toInt() == trackId)
+      {
+      item = current;
+      break;
+      }
+    }
+
+  // create new item if not already present
+  if (!item)
+    {
+    item = new QTreeWidgetItem;
+    item->setData(0, Qt::DisplayRole, trackId);
+    d->UI.trackList->addTopLevelItem(item);
+    }
+
+  // select it
+  d->UI.trackList->setCurrentItem(item);
+
+  this->updateTrackTimeRanges();
+  this->validate();
+}
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+struct EventIdLessThan
+{
+  bool operator()(vtkVgEvent* a, vtkVgEvent* b)
+    {
+    return a->GetId() < b->GetId();
+    }
+};
+
+//-----------------------------------------------------------------------------
+struct EventIdEqual
+{
+  bool operator()(vtkVgEvent* a, vtkVgEvent* b)
+    {
+    return a->GetId() == b->GetId();
+    }
+};
+
+//-----------------------------------------------------------------------------
+struct EventStartsBefore
+{
+  bool operator()(vtkVgEvent* a, vtkVgEvent* b)
+    {
+    return a->GetStartFrame() < b->GetStartFrame();
+    }
+};
+
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::accept()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  if (d->AutoExtendEvents && d->UI.trackList->topLevelItemCount() > 2)
+    {
+    bool isForward = true;
+    bool isBackward = true;
+    for (int i = 1, end = d->UI.trackList->topLevelItemCount(); i < end; ++i)
+      {
+      if (d->TrackModel->GetTrack(this->itemTrackId(i))->GetStartFrame() <
+          d->TrackModel->GetTrack(this->itemTrackId(i - 1))->GetStartFrame())
+        {
+        isForward = false;
+        }
+      if (d->TrackModel->GetTrack(this->itemTrackId(i))->GetEndFrame() >
+          d->TrackModel->GetTrack(this->itemTrackId(i - 1))->GetEndFrame())
+        {
+        isBackward = false;
+        }
+      }
+
+    if (!(isForward || isBackward))
+      {
+      if (QMessageBox::warning(this, "Continue?",
+                               "Extending events when merging unordered tracks "
+                               "may have unexpected results.\n\nContinue?",
+                               QMessageBox::Ok | QMessageBox::Cancel) !=
+            QMessageBox::Ok)
+        {
+        return;
+        }
+      }
+    }
+
+  // Issue a warning if events that are already on the same track will be
+  // merged.
+  if (d->AutoMergeEvents)
+    {
+    std::vector<vtkVgEvent*> events;
+    for (int i = 0, end = d->UI.trackList->topLevelItemCount(); i < end; ++i)
+      {
+      int trackId = this->itemTrackId(i);
+
+      events.clear();
+      d->ViewCore->getEventModel(d->Session)->GetEvents(trackId, events);
+      if (this->mergeEvents(events, true))
+        {
+        if (QMessageBox::warning(this, "Continue?",
+                                 "This operation will cause two or more "
+                                 "events that are already on the same track "
+                                 "to be merged.\n\n"
+                                 "Continue?",
+                                 QMessageBox::Ok | QMessageBox::Cancel) !=
+            QMessageBox::Ok)
+          {
+          return;
+          }
+
+        // proceed with merge
+        break;
+        }
+      }
+    }
+
+  if (d->UI.replaceMergedTracks->isChecked())
+    {
+    // Destructive merge
+    std::vector<vtkVgEvent*> events, mergedTrackEvents;
+    int mergeId = this->itemTrackId(0);
+
+    vtkVgTrack* mergedTrack = d->TrackModel->GetTrack(mergeId);
+
+    for (int i = 1, end = d->UI.trackList->topLevelItemCount(); i < end; ++i)
+      {
+      int thisId = this->itemTrackId(i);
+      vtkVgTrack* track = d->TrackModel->GetTrack(thisId);
+
+      vtkVgTimeStamp mergedPrevStart = mergedTrack->GetStartFrame();
+      vtkVgTimeStamp mergedPrevEnd = mergedTrack->GetEndFrame();
+
+      vtkVgTimeStamp prevStart = track->GetStartFrame();
+      vtkVgTimeStamp prevEnd = track->GetEndFrame();
+
+      if (!d->ViewCore->mergeTracks(mergeId, thisId, d->Session))
+        {
+        d->UI.status->setText(QString("(merge failed)"));
+        d->UI.status->setVisible(true);
+        return;
+        }
+
+      // Try to extend events that reference the merged track
+      if (d->AutoExtendEvents)
+        {
+        d->ViewCore->getEventModel(d->Session)->GetEvents(mergeId,
+                                                          mergedTrackEvents);
+        for (size_t i = 0, end = mergedTrackEvents.size(); i < end; ++i)
+          {
+          this->extendEventTrack(mergedTrackEvents[i], mergeId,
+                                 mergedPrevStart, mergedPrevEnd,
+                                 prevEnd, prevStart);
+          }
+        mergedTrackEvents.clear();
+        }
+
+      // Update any events that reference the track that will be going away
+      d->ViewCore->getEventModel(d->Session)->GetEvents(thisId, events);
+      for (size_t i = 0, end = events.size(); i < end; ++i)
+        {
+        this->fixTrackReferences(events[i], thisId, mergeId);
+
+        if (d->AutoExtendEvents)
+          {
+          this->extendEventTrack(events[i], mergeId, track->GetStartFrame(),
+                                 track->GetEndFrame(),
+                                 mergedPrevEnd, mergedPrevStart);
+          }
+        }
+      events.clear();
+
+      d->ViewCore->deleteTrack(thisId, d->Session);
+      }
+
+    // Merge events where possible
+    if (d->AutoMergeEvents)
+      {
+      d->ViewCore->getEventModel(d->Session)->GetEvents(mergeId,
+                                                        mergedTrackEvents);
+      this->mergeEvents(mergedTrackEvents);
+      }
+
+    emit this->tracksMerged(mergeId);
+
+    this->initialize();
+    d->UI.status->setText(QString("(merged tracks into track %1)").arg(mergeId));
+    d->UI.status->setVisible(true);
+
+    return;
+    }
+
+  // Non-destructive merge
+  std::vector<vtkVgEvent*> events;
+  for (int i = 0, end = d->UI.trackList->topLevelItemCount(); i < end; ++i)
+    {
+    int thisId = this->itemTrackId(i);
+    d->ViewCore->getEventModel(d->Session)->GetEvents(thisId, events);
+    }
+
+  bool createNewEvents = false;
+  if (!events.empty())
+    {
+    QMessageBox::StandardButton btn =
+      QMessageBox::question(this, "Create New Events?",
+                            "A track to be merged is referenced in one or more "
+                            "events. Do you wish to create new events?",
+                            QMessageBox::Yes | QMessageBox::No |
+                            QMessageBox::Cancel);
+
+    if (btn == QMessageBox::Cancel || btn == QMessageBox::Escape)
+      {
+      return;
+      }
+    createNewEvents = btn == QMessageBox::Yes;
+    }
+
+  int mergeId = d->UI.trackId->text().toInt();
+
+  vtkVgTrack* track =
+    d->ViewCore->cloneTrack(this->itemTrackId(0), mergeId, d->Session);
+
+  if (!track)
+    {
+    d->UI.status->setText(QString("(failed to create track)"));
+    d->UI.status->setVisible(true);
+    return;
+    }
+
+  d->ViewCore->setCreateTrackId(mergeId + 1, d->Session);
+
+  for (int i = 1, end = d->UI.trackList->topLevelItemCount(); i < end; ++i)
+    {
+    if (!d->ViewCore->mergeTracks(mergeId, this->itemTrackId(i), d->Session))
+      {
+      d->UI.status->setText(QString("(merge failed)"));
+      d->UI.status->setVisible(true);
+      return;
+      }
+    }
+
+  int numEventsCreated = 0;
+  if (createNewEvents)
+    {
+    // same event may be referenced by multiple tracks, so unique the vector
+    std::sort(events.begin(), events.end(), EventIdLessThan());
+    std::vector<vtkVgEvent*>::iterator newEnd =
+      std::unique(events.begin(), events.end(), EventIdEqual());
+    events.resize(newEnd - events.begin());
+
+    std::vector<vtkVgEvent*> newEvents;
+    newEvents.reserve(events.size());
+
+    bool failed = false;
+    for (size_t i = 0, end = events.size(); i < end; ++i)
+      {
+      vtkVgEvent* event =
+        d->ViewCore->cloneEvent(events[i]->GetId(), d->Session);
+      if (!event)
+        {
+        failed = true;
+        continue;
+        }
+      newEvents.push_back(event);
+
+      // fix up references any of the merged tracks in the new event
+      vtkVgTimeStamp mergedPrevStart, mergedPrevEnd;
+      for (int i = 0, end = d->UI.trackList->topLevelItemCount(); i < end; ++i)
+        {
+        vtkVgTrack* thisTrack = d->TrackModel->GetTrack(this->itemTrackId(i));
+
+        // Simulate the iterative extension of the track when extending events.
+        // We want to get the same extension of events that happens when merging
+        // the tracks in order, two at a time.
+        if (i == 0)
+          {
+          mergedPrevStart = thisTrack->GetStartFrame();
+          mergedPrevEnd = thisTrack->GetEndFrame();
+          }
+
+        vtkIdType trackId = event->GetTrack(0)->GetId();
+        if (trackId == thisTrack->GetId())
+          {
+          if (d->AutoExtendEvents)
+            {
+            // event track getting extended for the first time
+            this->extendEventTrack(event, trackId,
+                                   thisTrack->GetStartFrame(),
+                                   thisTrack->GetEndFrame(),
+                                   mergedPrevEnd, mergedPrevStart);
+            }
+
+          this->fixTrackReferences(event, thisTrack->GetId(), mergeId);
+          }
+        else if (d->AutoExtendEvents && trackId == mergeId)
+          {
+          // event track is getting extended again
+          this->extendEventTrack(event, mergeId,
+                                 mergedPrevStart, mergedPrevEnd,
+                                 thisTrack->GetEndFrame(),
+                                 thisTrack->GetStartFrame());
+          }
+
+        // "Merge" track i and i - 1
+        if (thisTrack->GetStartFrame() < mergedPrevStart)
+          {
+          mergedPrevStart = thisTrack->GetStartFrame();
+          }
+        if (thisTrack->GetEndFrame() > mergedPrevEnd)
+          {
+          mergedPrevEnd = thisTrack->GetEndFrame();
+          }
+        }
+      ++numEventsCreated;
+      }
+
+    if (failed)
+      {
+      QMessageBox::warning(this, "Event Cloning Failed",
+                           "Failed to clone one or more events");
+      }
+    else if (d->AutoMergeEvents)
+      {
+      // merge new events where possible
+      this->mergeEvents(newEvents);
+      }
+    }
+
+  emit this->tracksMerged(mergeId);
+
+  this->initialize();
+  if (createNewEvents)
+    {
+    d->UI.status->setText(QString("(created track %1 and %2 new events)")
+                          .arg(mergeId).arg(numEventsCreated));
+    }
+  else
+    {
+    d->UI.status->setText(QString("(created track %1)").arg(mergeId));
+    }
+
+  d->UI.status->setVisible(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::changeMergeType(bool replaceMerged)
+{
+  QTE_D(vpMergeTracksDialog);
+
+  d->UI.trackId->setEnabled(!replaceMerged);
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setText(
+    replaceMerged ? "Merge Tracks" : "Add Track");
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::moveTrackUp()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  QModelIndex index = d->UI.trackList->currentIndex();
+  if (!index.isValid() || index.row() == 0)
+    {
+    return;
+    }
+
+  QTreeWidgetItem* item = d->UI.trackList->takeTopLevelItem(index.row());
+  d->UI.trackList->insertTopLevelItem(index.row() - 1, item);
+  d->UI.trackList->setCurrentItem(item);
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::moveTrackDown()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  QModelIndex index = d->UI.trackList->currentIndex();
+  if (!index.isValid() ||
+      index.row() == d->UI.trackList->model()->rowCount() - 1)
+    {
+    return;
+    }
+
+  QTreeWidgetItem* item = d->UI.trackList->takeTopLevelItem(index.row());
+  d->UI.trackList->insertTopLevelItem(index.row() + 1, item);
+  d->UI.trackList->setCurrentItem(item);
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::removeTrack()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  QModelIndex index = d->UI.trackList->currentIndex();
+  if (!index.isValid())
+    {
+    return;
+    }
+
+  delete d->UI.trackList->takeTopLevelItem(index.row());
+
+  this->validate();
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::updateTrackTimeRanges()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  int frameOffset = d->ViewCore->getUseZeroBasedFrameNumbers() ? 0 : 1;
+
+  for (int i = 0, size = d->UI.trackList->topLevelItemCount(); i < size; ++i)
+    {
+    QTreeWidgetItem* item = d->UI.trackList->topLevelItem(i);
+    vtkVgTrack* track =
+      d->TrackModel->GetTrack(item->data(0, Qt::DisplayRole).toInt());
+
+    item->setText(1,
+      vpUtils::GetTimeAndFrameNumberString(track->GetStartFrame(), frameOffset));
+
+    item->setText(2,
+      vpUtils::GetTimeAndFrameNumberString(track->GetEndFrame(), frameOffset));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::updateOptionSettings()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  QSettings settings;
+  settings.beginGroup("Annotation");
+
+  d->AutoExtendEvents = settings.value(ExtendEventsKey, false).toBool();
+  d->AutoMergeEvents = settings.value(MergeEventsKey, true).toBool();
+  d->MaxMergeGap = settings.value(MergeGapKey, 2).toInt();
+
+  if (!d->AutoExtendEvents && !d->AutoMergeEvents)
+    {
+    d->UI.advancedOptionsLabel->clear();
+    return;
+    }
+
+  QString label;
+  if (d->AutoExtendEvents)
+    {
+    label += 'E';
+    }
+  if (d->AutoMergeEvents)
+    {
+    label += 'M';
+    label += QString::number(d->MaxMergeGap);
+    }
+
+  d->UI.advancedOptionsLabel->setText(label);
+}
+
+//-----------------------------------------------------------------------------
+int vpMergeTracksDialog::itemTrackId(int index)
+{
+  QTE_D(vpMergeTracksDialog);
+
+  return d->UI.trackList->topLevelItem(index)->data(0, Qt::DisplayRole).toInt();
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::validate()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  int numTracks = d->UI.trackList->topLevelItemCount();
+
+  bool canReplaceMerged = true;
+
+  // See if any of the tracks are referenced in the event model. If so, don't
+  // allow a destructive merge.
+  if (canReplaceMerged)
+    {
+    d->UI.replaceMergedTracks->setEnabled(true);
+    d->UI.replaceMergedTracks->setToolTip(QString());
+    }
+  else
+    {
+    d->UI.replaceMergedTracks->setEnabled(false);
+    d->UI.replaceMergedTracks->setChecked(false);
+    d->UI.replaceMergedTracks->setToolTip("One or more of the tracks to merge "
+                                          "is used by an event");
+    }
+
+  bool valid = numTracks > 1 && !d->UI.trackId->text().isEmpty();
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);
+  d->UI.status->setVisible(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpMergeTracksDialog::showAdvancedOptions()
+{
+  QTE_D(vpMergeTracksDialog);
+
+  QDialog options;
+  options.setWindowTitle("Advanced Options");
+
+  QCheckBox* extendEvents = new QCheckBox("Extend events");
+  QCheckBox* mergeEvents = new QCheckBox("Merge events");
+  QSpinBox* maxMergeGap = new QSpinBox;
+  QLabel* maxMergeGapLabel = new QLabel("Maximum gap (frames)");
+
+  extendEvents->setToolTip("Extend events that start or end on the same frame "
+                           "as one of the merged tracks.");
+  mergeEvents->setToolTip("Merge events that lie on the same track after "
+                          "tracks are merged.");
+  maxMergeGapLabel->setToolTip("Maximum distance between mergeable events.");
+
+  QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok |
+                                                     QDialogButtonBox::Cancel);
+
+  connect(buttonBox, SIGNAL(accepted()), &options, SLOT(accept()));
+  connect(buttonBox, SIGNAL(rejected()), &options, SLOT(reject()));
+
+  extendEvents->setChecked(d->AutoExtendEvents);
+  mergeEvents->setChecked(d->AutoMergeEvents);
+  maxMergeGap->setValue(d->MaxMergeGap);
+  maxMergeGap->setMinimum(0);
+
+  QGridLayout* layout = new QGridLayout;
+  layout->addWidget(extendEvents, 0, 0);
+  layout->addWidget(mergeEvents, 1, 0);
+  layout->addWidget(maxMergeGapLabel, 1, 1);
+  layout->addWidget(maxMergeGap, 1, 2);
+  layout->addWidget(buttonBox, 2, 0, 1, 3);
+
+  options.setLayout(layout);
+
+  if (options.exec() == QDialog::Accepted)
+    {
+    QSettings settings;
+    settings.beginGroup("Annotation");
+    settings.setValue(ExtendEventsKey, extendEvents->isChecked());
+    settings.setValue(MergeEventsKey, mergeEvents->isChecked());
+    settings.setValue(MergeGapKey, maxMergeGap->value());
+    this->updateOptionSettings();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpMergeTracksDialog::fixTrackReferences(vtkVgEvent* event, int trackId,
+                                             int newTrackId)
+{
+  QTE_D(vpMergeTracksDialog);
+
+  bool changed = false;
+  for (unsigned int i = 0; i < event->GetNumberOfTracks(); ++i)
+    {
+    if (event->GetTrack(i)->GetId() == trackId)
+      {
+      //qDebug() << "changing track" << i << "in event" << event->GetId()
+      //         << "from track id" << trackId
+      //         << "to" << newTrackId;
+
+      event->ReplaceTrack(i, newTrackId);
+      event->SetTrackPtr(i, d->TrackModel->GetTrack(newTrackId));
+      changed = true;
+      }
+    }
+
+  return changed;
+}
+
+//-----------------------------------------------------------------------------
+bool vpMergeTracksDialog::extendEventTrack(vtkVgEvent* event,
+                                           int trackId,
+                                           const vtkVgTimeStamp& prevTrackStart,
+                                           const vtkVgTimeStamp& prevTrackEnd,
+                                           const vtkVgTimeStamp& extendedStart,
+                                           const vtkVgTimeStamp& extendedEnd)
+{
+  // Extending one track of a multi-track event is probably not a valid change
+  // without knowing the meaning of the individual tracks in the event.
+  if (event->GetNumberOfTracks() != 1)
+    {
+    return false;
+    }
+
+  vtkVgEventTrackInfoBase* eti = event->GetTrackInfo(0);
+  if (eti->TrackId != trackId)
+    {
+    return false;
+    }
+
+  bool changed = false;
+
+  // Extend single track events which started at the previous start of the
+  // track or ended at the end of the previous end.
+  if (extendedStart < prevTrackStart && eti->StartFrame == prevTrackStart)
+    {
+    qDebug() << "changing start frame of track 0 in event" << event->GetId()
+             << "from" << eti->StartFrame.GetFrameNumber()
+             << "to" << extendedStart.GetFrameNumber();
+
+    event->SetTrackStartFrame(0, extendedStart);
+    changed = true;
+    }
+  if (extendedEnd > prevTrackEnd && eti->EndFrame == prevTrackEnd)
+    {
+    qDebug() << "changing end frame of track 0 in event" << event->GetId()
+             << "from" << eti->EndFrame.GetFrameNumber()
+             << "to" << extendedEnd.GetFrameNumber();
+
+    event->SetTrackEndFrame(0, extendedEnd);
+    changed = true;
+    }
+
+  return changed;
+}
+
+//-----------------------------------------------------------------------------
+bool vpMergeTracksDialog::mergeEvents(std::vector<vtkVgEvent*>& events,
+                                      bool checkOnly)
+{
+  QTE_D(vpMergeTracksDialog);
+
+  if (events.empty())
+    {
+    return false;
+    }
+
+  // Sort by start time
+  std::sort(events.begin(), events.end(), EventStartsBefore());
+
+  // Note: This algorithm will merge two events on the same track if they are
+  // close enough, even if they were already 'mergeable' before the tracks were
+  // merged. Not merging in this case would require keeping track of whether the
+  // events were already on the same track before the track merge occurred.
+  bool changed = false;
+  for (size_t ia = 0; ia < events.size() - 1; ++ia)
+    {
+    vtkVgEvent* eventA = events[ia];
+    if (eventA->GetNumberOfTracks() != 1)
+      {
+      continue;
+      }
+
+    int aType = eventA->GetActiveClassifierType();
+
+    for (size_t ib = ia + 1; ib < events.size();)
+      {
+      vtkVgEvent* eventB = events[ib];
+      int aEndFrame = static_cast<int>(eventA->GetEndFrame().GetFrameNumber());
+      int bStartFrame = static_cast<int>(eventB->GetStartFrame().GetFrameNumber());
+
+      if (bStartFrame > aEndFrame + d->MaxMergeGap)
+        {
+        // no later events will be mergeable with A, so set A to next event
+        break;
+        }
+
+      if (eventB->GetNumberOfTracks() == 1 &&
+          eventB->GetTrack(0) == eventA->GetTrack(0) &&
+          eventB->GetActiveClassifierType() == aType &&
+          bStartFrame - aEndFrame <= d->MaxMergeGap)
+        {
+        if (checkOnly)
+          {
+          return true;
+          }
+
+        qDebug() << "merging event" << eventB->GetId() << "into event"
+                 << eventA->GetId();
+
+        // merge these two events and remove the later occuring one
+        eventA->Merge(eventB);
+        d->ViewCore->deleteEvent(eventB->GetId(), d->Session);
+        events.erase(events.begin() + ib);
+        changed = true;
+        }
+      else
+        {
+        ++ib;
+        }
+      }
+    }
+
+  return changed;
+}
diff --git a/Applications/VpView/vpMergeTracksDialog.h b/Applications/VpView/vpMergeTracksDialog.h
new file mode 100644
index 00000000..08b86a12
--- /dev/null
+++ b/Applications/VpView/vpMergeTracksDialog.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpMergeTracksDialog_h
+#define __vpMergeTracksDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class vpMergeTracksDialogPrivate;
+class vpViewCore;
+class vtkVgEvent;
+class vtkVgTimeStamp;
+
+class vpMergeTracksDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vpMergeTracksDialog(vpViewCore* coreInstance, int session,
+                      QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vpMergeTracksDialog();
+
+  void initialize();
+
+signals:
+  void tracksMerged(int mergedId);
+
+public slots:
+  void addTrack(int trackId, int session);
+
+  virtual void accept();
+
+protected slots:
+  void changeMergeType(bool replaceMerged);
+  void moveTrackUp();
+  void moveTrackDown();
+  void removeTrack();
+  void showAdvancedOptions();
+  void validate();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vpMergeTracksDialog)
+
+  void updateTrackTimeRanges();
+  void updateOptionSettings();
+
+  int  itemTrackId(int index);
+
+  bool fixTrackReferences(vtkVgEvent* event, int trackId, int newTrackId);
+
+  bool extendEventTrack(vtkVgEvent* event, int trackId,
+                        const vtkVgTimeStamp& prevTrackStart,
+                        const vtkVgTimeStamp& prevTrackEnd,
+                        const vtkVgTimeStamp& extendedStart,
+                        const vtkVgTimeStamp& extendedEnd);
+
+  bool mergeEvents(std::vector<vtkVgEvent*>& events, bool checkOnly = false);
+
+private:
+  QTE_DECLARE_PRIVATE(vpMergeTracksDialog)
+};
+
+#endif // __vpMergeTracksDialog_h
diff --git a/Applications/VpView/vpMergeTracksDialog.ui b/Applications/VpView/vpMergeTracksDialog.ui
new file mode 100644
index 00000000..4497eef7
--- /dev/null
+++ b/Applications/VpView/vpMergeTracksDialog.ui
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpMergeTracksDialog</class>
+ <widget class="QDialog" name="vpMergeTracksDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Merge Tracks</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupTracks">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Tracks To Merge (add by picking in main view)</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="2">
+       <widget class="QToolButton" name="trackUp">
+        <property name="toolTip">
+         <string>Increase Priority</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../Icons/vvwidgets.qrc">
+          <normaloff>:/icons/22x22/arrow-up</normaloff>:/icons/22x22/arrow-up</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QToolButton" name="trackDown">
+        <property name="toolTip">
+         <string>Decrease Priority</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../Icons/vvwidgets.qrc">
+          <normaloff>:/icons/22x22/arrow-down</normaloff>:/icons/22x22/arrow-down</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QToolButton" name="trackDelete">
+        <property name="toolTip">
+         <string>Remove</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../../Icons/vvwidgets.qrc">
+          <normaloff>:/icons/22x22/delete</normaloff>:/icons/22x22/delete</iconset>
+        </property>
+        <property name="iconSize">
+         <size>
+          <width>22</width>
+          <height>22</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" rowspan="4" colspan="2">
+       <widget class="QTreeWidget" name="trackList">
+        <property name="rootIsDecorated">
+         <bool>false</bool>
+        </property>
+        <property name="allColumnsShowFocus">
+         <bool>true</bool>
+        </property>
+        <column>
+         <property name="text">
+          <string>Id</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>Start Time</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>End Time</string>
+         </property>
+        </column>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QPushButton" name="advancedOptions">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Advanced...</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLabel" name="advancedOptionsLabel">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>EM10</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="status">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>()</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>New Track</string>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Track Id:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLineEdit" name="trackId"/>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="replaceMergedTracks">
+        <property name="text">
+         <string>Replace merged tracks</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../Icons/vvwidgets.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vpMergeTracksDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vpMergeTracksDialog</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>
diff --git a/Applications/VpView/vpModelIO.cxx b/Applications/VpView/vpModelIO.cxx
new file mode 100644
index 00000000..f24b8063
--- /dev/null
+++ b/Applications/VpView/vpModelIO.cxx
@@ -0,0 +1,130 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpModelIO.h"
+
+#include "vpFseTrackIO.h"
+
+#include <assert.h>
+
+//-----------------------------------------------------------------------------
+vpModelIO::vpModelIO() :
+  TrackIO(0), EventIO(0), ActivityIO(0), FseTrackIO(0)
+{}
+
+//-----------------------------------------------------------------------------
+void vpModelIO::SetTrackOverrideColor(double color[3])
+{
+  assert(this->TrackIO);
+  this->TrackIO->SetOverrideColor(color);
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ReadFrameMetaData(vpFrameMap*, const std::string&)
+{
+  // To be implemented in derived classes
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+int vpModelIO::GetHomographyCount()
+{
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+const std::vector<std::string>& vpModelIO::GetImageFiles() const
+{
+  static std::vector<std::string> empty;
+  return empty;
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ReadTracks()
+{
+  assert(this->TrackIO);
+  return this->TrackIO->ReadTracks();
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ReadTrackTraits()
+{
+  assert(this->TrackIO);
+  return this->TrackIO->ReadTrackTraits();
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ImportTracks(vtkIdType idsOffset,
+                             float offsetX, float offsetY)
+{
+  assert(this->TrackIO);
+  return this->TrackIO->ImportTracks(idsOffset, offsetX, offsetY);
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::WriteTracks(const char* filename)
+{
+  assert(this->TrackIO);
+  return this->TrackIO->WriteTracks(filename, false);
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ReadEvents()
+{
+  assert(this->EventIO);
+  return this->EventIO->ReadEvents();
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ReadEventLinks()
+{
+  assert(this->EventIO);
+  return this->EventIO->ReadEventLinks();
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ImportEvents(vtkIdType idsOffset,
+                             float offsetX, float offsetY)
+{
+  assert(this->EventIO);
+  return this->EventIO->ImportEvents(idsOffset, offsetX, offsetY);
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::WriteEvents(const char* filename)
+{
+  assert(this->EventIO);
+  return this->EventIO->WriteEvents(filename);
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ReadActivities()
+{
+  assert(this->ActivityIO);
+  return this->ActivityIO->ReadActivities();
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ReadFseTracks()
+{
+  assert(this->FseTrackIO);
+  return this->FseTrackIO->ReadTracks();
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::ImportFseTracks(vtkIdType idsOffset,
+                                float offsetX, float offsetY)
+{
+  assert(this->FseTrackIO);
+  return this->FseTrackIO->ImportTracks(idsOffset, offsetX, offsetY);
+}
+
+//-----------------------------------------------------------------------------
+bool vpModelIO::WriteFseTracks(const char* filename, bool writeSceneElements)
+{
+  assert(this->FseTrackIO);
+  return this->FseTrackIO->WriteTracks(filename, writeSceneElements);
+}
diff --git a/Applications/VpView/vpModelIO.h b/Applications/VpView/vpModelIO.h
new file mode 100644
index 00000000..f7b0c7df
--- /dev/null
+++ b/Applications/VpView/vpModelIO.h
@@ -0,0 +1,85 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpModelIO_h
+#define __vpModelIO_h
+
+#include "vpTrackIO.h"
+#include "vpEventIO.h"
+#include "vpActivityIO.h"
+
+#include <vector>
+
+class vpFrameMap;
+class vpFseTrackIO;
+
+class vpModelIO
+{
+public:
+  vpModelIO();
+  virtual ~vpModelIO() {}
+
+  virtual void SetTrackModel(vtkVgTrackModel* trackModel,
+                             vpTrackIO::TrackStorageMode storageMode,
+                             vpTrackIO::TrackTimeStampMode timeStampMode,
+                             vtkVgTrackTypeRegistry* trackTypes,
+                             vtkMatrix4x4* geoTransform,
+                             vpFrameMap* frameMap) = 0;
+
+  virtual void SetEventModel(vtkVgEventModel* eventModel,
+                             vtkVgEventTypeRegistry* eventTypes) = 0;
+
+  virtual void SetActivityModel(vtkVgActivityManager* activityManager,
+                                vpActivityConfig* activityConfig) = 0;
+
+  virtual void SetImageHeight(unsigned int imageHeight) = 0;
+  virtual unsigned int GetImageHeight() const = 0;
+
+  void SetTrackOverrideColor(double color[3]);
+
+  virtual bool ReadFrameMetaData(vpFrameMap* frameMap,
+                                 const std::string& substitutePath);
+
+  virtual int GetHomographyCount();
+  virtual const std::vector<std::string>& GetImageFiles() const;
+
+  bool ReadTracks();
+  bool ReadTrackTraits();
+
+  bool ImportTracks(vtkIdType idsOffset = 0,
+                    float offsetX = 0.0f, float offsetY = 0.0f);
+
+  bool WriteTracks(const char* filename);
+
+  bool ReadEvents();
+  bool ReadEventLinks();
+
+  bool ImportEvents(vtkIdType idsOffset = 0,
+                    float offsetX = 0.0f, float offsetY = 0.0f);
+
+  bool WriteEvents(const char* filename);
+
+  bool ReadActivities();
+
+  bool ReadFseTracks();
+  bool ImportFseTracks(vtkIdType idsOffset = 0,
+                       float offsetX = 0.0f, float offsetY = 0.0f);
+
+  bool WriteFseTracks(const char* filename, bool writeSceneElements = true);
+
+  const vpTrackIO* GetTrackIO() const { return this->TrackIO; }
+  const vpEventIO* GetEventIO() const { return this->EventIO; }
+  const vpActivityIO* GetActivityIO() const { return this->ActivityIO; }
+  const vpFseTrackIO* GetFseTrackIO() const { return this->FseTrackIO; }
+
+protected:
+  vpTrackIO* TrackIO;
+  vpEventIO* EventIO;
+  vpActivityIO* ActivityIO;
+  vpFseTrackIO* FseTrackIO;
+};
+
+#endif // __vpModelIO_h
diff --git a/Applications/VpView/vpMultiGraphModel.cxx b/Applications/VpView/vpMultiGraphModel.cxx
new file mode 100644
index 00000000..63894e4c
--- /dev/null
+++ b/Applications/VpView/vpMultiGraphModel.cxx
@@ -0,0 +1,1496 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpMultiGraphModel.h"
+
+#include "vpEventConfig.h"
+#include "vpPrimitiveConfig.h"
+
+// VisGUI includes
+#include <qtStlUtil.h>
+
+#include <vtkCharArray.h>
+#include <vtkCommand.h>
+#include <vtkDataSetAttributes.h>
+#include <vtkDoubleArray.h>
+#include <vtkIdTypeArray.h>
+#include <vtkIntArray.h>
+#include <vtkMutableDirectedGraph.h>
+#include <vtkMutableUndirectedGraph.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkStringArray.h>
+#include <vtkUnsignedIntArray.h>
+#include <vtkVariantArray.h>
+
+#include <sstream>
+
+vtkStandardNewMacro(vpMultiGraphModel);
+
+//-----------------------------------------------------------------------------
+class vpMultiGraphModel::vtkInternal
+{
+public:
+  typedef std::map<std::string, int> GraphIsDirectedMap;
+  typedef vtkSmartPointer<vtkMutableUndirectedGraph> vtkMutableUndirectedGraphPtr;
+  typedef vtkSmartPointer<vtkMutableDirectedGraph> vtkMutableDirectedGraphPtr;
+  typedef vtkSmartPointer<vtkPoints> vtkPointsPtr;
+  typedef std::map<std::string, vtkMutableUndirectedGraphPtr> UndirectedGraphs;
+  typedef std::map<std::string, vtkMutableDirectedGraphPtr> DirectedGraphs;
+
+  vtkInternal(vpMultiGraphModel* parent)
+    {
+    this->Parent = parent;
+    this->CurrNodeId = 0;
+    }
+
+  void AddNodes(vtkGraph* graph)
+    {
+    if (!graph)
+      {
+      return;
+      }
+
+    vtkIdType numberOfVertices = this->MasterGraph->GetNumberOfVertices();
+
+    vtkMutableUndirectedGraphPtr uGraph =
+      vtkMutableUndirectedGraph::SafeDownCast(graph);
+
+    if (uGraph)
+      {
+      for (vtkIdType i = 0; i < numberOfVertices; ++i)
+        {
+        // \NOTE Every existing graph should have same vertices (id and count)
+        uGraph->AddVertex();
+        }
+
+      uGraph->SetPoints(this->MasterPoints);
+      return;
+      }
+
+    vtkMutableDirectedGraphPtr dGraph =
+      vtkMutableDirectedGraph::SafeDownCast(graph);
+
+    if (dGraph)
+      {
+      for (vtkIdType i = 0; i < numberOfVertices; ++i)
+        {
+        // \NOTE Every existing graph should have same vertices (id and count)
+        dGraph->AddVertex();
+        }
+
+      dGraph->SetPoints(this->MasterPoints);
+      return;
+      }
+    }
+
+  void AddEdgeArrays(vtkGraph* graph)
+    {
+    if (!graph)
+      {
+      return;
+      }
+
+    vtkSmartPointer<vtkVariantArray> parentAttrs =
+      vtkSmartPointer<vtkVariantArray>::New();
+
+    parentAttrs->SetName("EdgeParentAttrs");
+
+    vtkSmartPointer<vtkVariantArray> childAttrs =
+      vtkSmartPointer<vtkVariantArray>::New();
+
+    childAttrs->SetName("EdgeChildAttrs");
+
+    vtkSmartPointer<vtkVariantArray> pedigreeIds =
+      vtkSmartPointer<vtkVariantArray>::New();
+
+    vtkSmartPointer<vtkCharArray> selected =
+      vtkSmartPointer<vtkCharArray>::New();
+    selected->SetName("Selected");
+
+    graph->GetEdgeData()->AddArray(parentAttrs);
+    graph->GetEdgeData()->AddArray(childAttrs);
+    graph->GetEdgeData()->AddArray(selected);
+    graph->GetEdgeData()->SetPedigreeIds(pedigreeIds);
+    }
+
+  void AddEdgeAttrs(vtkGraph* graph,
+                    vtkIntArray* parentAttrs,
+                    vtkIntArray* childAttrs)
+    {
+    if (vtkVariantArray* parentArr =
+          vtkVariantArray::SafeDownCast(
+            graph->GetEdgeData()->GetAbstractArray("EdgeParentAttrs")))
+      {
+      parentArr->InsertNextValue(parentAttrs);
+      }
+
+    if (vtkVariantArray* childArr =
+          vtkVariantArray::SafeDownCast(
+            graph->GetEdgeData()->GetAbstractArray("EdgeChildAttrs")))
+      {
+      childArr->InsertNextValue(childAttrs);
+      }
+    }
+
+  void SetEdgeAttrs(const std::string& domain, int id,
+                    vtkIntArray* attrs, const char* name)
+    {
+    vtkGraph* graph = this->Parent->GetGraph(domain);
+    if (!graph)
+      {
+      return;
+      }
+
+    vtkIdType index =
+      graph->GetEdgeData()->GetPedigreeIds()->LookupValue(id);
+
+    if (index == -1)
+      {
+      return;
+      }
+
+    if (vtkVariantArray* array =
+          vtkVariantArray::SafeDownCast(
+            graph->GetEdgeData()->GetAbstractArray(name)))
+      {
+      array->SetValue(index, attrs);
+      }
+    }
+
+  vtkIntArray* GetEdgeAttrs(const std::string& domain, int id,
+                            const char* name)
+    {
+    vtkGraph* graph = this->Parent->GetGraph(domain);
+    if (!graph)
+      {
+      return 0;
+      }
+
+    vtkIdType index =
+      graph->GetEdgeData()->GetPedigreeIds()->LookupValue(id);
+
+    if (index == -1)
+      {
+      return 0;
+      }
+
+    if (vtkVariantArray* array =
+          vtkVariantArray::SafeDownCast(
+            graph->GetEdgeData()->GetAbstractArray(name)))
+      {
+      return vtkIntArray::SafeDownCast(array->GetValue(index).ToArray());
+      }
+
+    return 0;
+    }
+
+  vtkDoubleArray* GetPositionArray(NodePositionType positionType)
+    {
+    switch (positionType)
+      {
+      case NPT_Spatial: return this->SpatialPositions;
+      case NPT_NormalizedSpatial: return this->NormalizedSpatialPositions;
+      case NPT_NormalizedTemporal: return this->NormalizedTemporalPositions;
+      default: return this->CachedPositions;
+      }
+    }
+
+  void AddPositionArrays(vtkGraph* graph)
+    {
+    vtkDataSetAttributes* vdata = graph->GetVertexData();
+    vdata->AddArray(this->CachedPositions);
+    vdata->AddArray(this->SpatialPositions);
+    vdata->AddArray(this->NormalizedSpatialPositions);
+    vdata->AddArray(this->NormalizedTemporalPositions);
+    vdata->AddArray(this->StartPositions);
+    vdata->AddArray(this->EndPositions);
+    }
+
+  void RemovePositionArrays(vtkGraph* graph)
+    {
+    vtkDataSetAttributes* vdata = graph->GetVertexData();
+    vdata->RemoveArray(this->CachedPositions->GetName());
+    vdata->RemoveArray(this->SpatialPositions->GetName());
+    vdata->RemoveArray(this->NormalizedSpatialPositions->GetName());
+    vdata->RemoveArray(this->NormalizedTemporalPositions->GetName());
+    vdata->RemoveArray(this->StartPositions->GetName());
+    vdata->RemoveArray(this->EndPositions->GetName());
+    }
+
+  vpMultiGraphModel* Parent;
+
+  vtkMutableUndirectedGraphPtr MasterGraph;
+  vtkPointsPtr MasterPoints;
+
+  GraphIsDirectedMap GraphIsDirectedInfo;
+
+  UndirectedGraphs DomainUndirectedGraphs;
+  DirectedGraphs DomainDirectedGraphs;
+
+  std::map<std::string, int> CurrentEdgeIds;
+
+  // Node attributes
+  vtkSmartPointer<vtkStringArray> NodeTypes;
+  vtkSmartPointer<vtkStringArray> NodeLabels;
+  vtkSmartPointer<vtkIntArray> NodeDefaultEdgeAttrs;
+  vtkSmartPointer<vtkCharArray> NodeSelected;
+
+  vtkSmartPointer<vtkUnsignedIntArray> GroupIds;
+
+  vtkSmartPointer<vtkDoubleArray> StartTime;
+  vtkSmartPointer<vtkDoubleArray> EndTime;
+  vtkSmartPointer<vtkUnsignedIntArray> StartFrame;
+  vtkSmartPointer<vtkUnsignedIntArray> EndFrame;
+  vtkSmartPointer<vtkIdTypeArray> EventId;
+  vtkSmartPointer<vtkUnsignedIntArray> NodeVirtualType;
+
+  vtkSmartPointer<vtkDoubleArray> CachedPositions;
+  vtkSmartPointer<vtkDoubleArray> SpatialPositions;
+  vtkSmartPointer<vtkDoubleArray> NormalizedSpatialPositions;
+  vtkSmartPointer<vtkDoubleArray> NormalizedTemporalPositions;
+  vtkSmartPointer<vtkDoubleArray> StartPositions;
+  vtkSmartPointer<vtkDoubleArray> EndPositions;
+
+  // For holding the selected ids after a GetSelected* call
+  vtkSmartPointer<vtkIdTypeArray> SelectedNodesHelper;
+  vtkSmartPointer<vtkIdTypeArray> SelectedEdgesHelper;
+
+  int CurrNodeId;
+};
+
+//-----------------------------------------------------------------------------
+const std::string vpMultiGraphModel::NoneDomain = "None";
+
+//-----------------------------------------------------------------------------
+vpMultiGraphModel::vpMultiGraphModel() :
+  vtkVgModelBase(),
+  LockPositionOfNode(false),
+  Internal(new vtkInternal(this))
+{
+  this->Internal->MasterGraph =
+    vtkSmartPointer<vtkMutableUndirectedGraph>::New();
+  this->Internal->MasterPoints =
+    vtkSmartPointer<vtkPoints>::New();
+
+  vtkSmartPointer<vtkVariantArray> nodePedigreeIds =
+    vtkSmartPointer<vtkVariantArray>::New();
+
+  this->Internal->MasterGraph->GetVertexData()->SetPedigreeIds(
+    nodePedigreeIds);
+
+  this->Internal->MasterGraph->SetPoints(
+    this->Internal->MasterPoints);
+
+  // Master graph is an undirected graph
+  this->Internal->DomainUndirectedGraphs[vpMultiGraphModel::NoneDomain] =
+    this->Internal->MasterGraph;
+
+  this->Internal->NodeTypes = vtkSmartPointer<vtkStringArray>::New();
+  this->Internal->NodeTypes->SetName("NodeTypes");
+
+  this->Internal->NodeLabels = vtkSmartPointer<vtkStringArray>::New();
+  this->Internal->NodeLabels->SetName("NodeLabels");
+
+  this->Internal->NodeDefaultEdgeAttrs = vtkSmartPointer<vtkIntArray>::New();
+  this->Internal->NodeDefaultEdgeAttrs->SetName("NodeDefaultEdgeAttrs");
+
+  this->Internal->NodeSelected = vtkSmartPointer<vtkCharArray>::New();
+  this->Internal->NodeSelected->SetName("Selected");
+
+  this->Internal->GroupIds = vtkSmartPointer<vtkUnsignedIntArray>::New();
+  this->Internal->GroupIds->SetName("GroupIds");
+
+  this->Internal->StartTime = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->StartTime->SetName("StartTime");
+
+  this->Internal->EndTime = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->EndTime->SetName("EndTime");
+
+  this->Internal->StartFrame = vtkSmartPointer<vtkUnsignedIntArray>::New();
+  this->Internal->StartFrame->SetName("StartFrame");
+
+  this->Internal->EndFrame = vtkSmartPointer<vtkUnsignedIntArray>::New();
+  this->Internal->EndFrame->SetName("EndFrame");
+
+  this->Internal->EventId = vtkSmartPointer<vtkIdTypeArray>::New();
+  this->Internal->EventId->SetName("EventId");
+
+  this->Internal->NodeVirtualType = vtkSmartPointer<vtkUnsignedIntArray>::New();
+  this->Internal->NodeVirtualType->SetName("NodeVirtualType");
+
+  this->Internal->CachedPositions = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->CachedPositions->SetNumberOfComponents(3);
+  this->Internal->CachedPositions->SetName("CachedPositions");
+
+  this->Internal->SpatialPositions = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->SpatialPositions->SetNumberOfComponents(3);
+  this->Internal->SpatialPositions->SetName("SpatialPositions");
+
+  this->Internal->NormalizedSpatialPositions = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->NormalizedSpatialPositions->SetNumberOfComponents(3);
+  this->Internal->NormalizedSpatialPositions->SetName("NormalizedSpatialPositions");
+
+  this->Internal->NormalizedTemporalPositions = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->NormalizedTemporalPositions->SetNumberOfComponents(3);
+  this->Internal->NormalizedTemporalPositions->SetName("NormalizedTemporalPositions");
+
+  this->Internal->StartPositions = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->StartPositions->SetNumberOfComponents(2);
+  this->Internal->StartPositions->SetName("StartPositions");
+
+  this->Internal->EndPositions = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->EndPositions->SetNumberOfComponents(2);
+  this->Internal->EndPositions->SetName("EndPositions");
+
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeTypes);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeLabels);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeDefaultEdgeAttrs);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeSelected);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->StartTime);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->EndTime);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->StartFrame);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->EndFrame);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->EventId);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeVirtualType);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->GroupIds);
+
+  this->Internal->AddPositionArrays(this->Internal->MasterGraph);
+
+  this->Internal->SelectedNodesHelper = vtkSmartPointer<vtkIdTypeArray>::New();
+  this->Internal->SelectedEdgesHelper = vtkSmartPointer<vtkIdTypeArray>::New();
+}
+
+//-----------------------------------------------------------------------------
+vpMultiGraphModel::~vpMultiGraphModel()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::Reset()
+{
+  this->Internal->MasterGraph->Initialize();
+
+  this->Internal->MasterGraph->GetVertexData()->SetPedigreeIds(
+    vtkSmartPointer<vtkVariantArray>::New());
+
+  this->Internal->MasterPoints->SetNumberOfPoints(0);
+  this->Internal->MasterGraph->SetPoints(this->Internal->MasterPoints);
+
+  this->Internal->CurrNodeId = 0;
+  this->Internal->CurrentEdgeIds.clear();
+
+  this->Internal->NodeLabels->SetNumberOfTuples(0);
+  this->Internal->NodeTypes->SetNumberOfTuples(0);
+  this->Internal->NodeDefaultEdgeAttrs->SetNumberOfTuples(0);
+  this->Internal->NodeSelected->SetNumberOfTuples(0);
+  this->Internal->StartTime->SetNumberOfTuples(0);
+  this->Internal->EndTime->SetNumberOfTuples(0);
+  this->Internal->StartFrame->SetNumberOfTuples(0);
+  this->Internal->EndFrame->SetNumberOfTuples(0);
+  this->Internal->EventId->SetNumberOfTuples(0);
+  this->Internal->NodeVirtualType->SetNumberOfTuples(0);
+  this->Internal->GroupIds->SetNumberOfTuples(0);
+
+  this->Internal->CachedPositions->SetNumberOfTuples(0);
+  this->Internal->SpatialPositions->SetNumberOfTuples(0);
+  this->Internal->NormalizedSpatialPositions->SetNumberOfTuples(0);
+  this->Internal->NormalizedTemporalPositions->SetNumberOfTuples(0);
+
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeTypes);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeLabels);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeDefaultEdgeAttrs);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->NodeSelected);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->StartTime);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->EndTime);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->StartFrame);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->EndFrame);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->EventId);
+  this->Internal->MasterGraph->GetVertexData()->AddArray(
+    this->Internal->GroupIds);
+
+  this->Internal->AddPositionArrays(this->Internal->MasterGraph);
+
+  this->Internal->DomainDirectedGraphs.clear();
+  this->Internal->DomainUndirectedGraphs.clear();
+
+  this->Internal->DomainUndirectedGraphs[vpMultiGraphModel::NoneDomain] =
+    this->Internal->MasterGraph;
+
+  this->Modified();
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::SetGraphIsDirected(const std::string& domain, int val)
+{
+  // Cannot change graph type if already created
+  if (this->Internal->DomainDirectedGraphs.find(domain) !=
+      this->Internal->DomainDirectedGraphs.end())
+    {
+    return VTK_ERROR;
+    }
+
+  if (this->Internal->DomainUndirectedGraphs.find(domain) !=
+      this->Internal->DomainUndirectedGraphs.end())
+    {
+    return VTK_ERROR;
+    }
+
+  val = val != 0 ? 1 : 0;
+  this->Internal->GraphIsDirectedInfo[domain] = val;
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::GetGraphIsDirected(const std::string& domain) const
+{
+  return this->Internal->GraphIsDirectedInfo[domain];
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::CreateNode(const std::string& nodeType,
+                                  double x, double y, double z,
+                                  int defaultEdgeAttr)
+{
+  int id = this->Internal->CurrNodeId;
+  std::ostringstream ostr;
+  ostr << nodeType << '_' << id;
+
+  double eventPositions[4] = {x, y, x, y};
+  return this->CreateNode(id, nodeType,  ostr.str(), x, y, z, eventPositions,
+                          defaultEdgeAttr);
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::CreateNode(const std::string& nodeType,
+                                  const std::string& nodeLabel,
+                                  double x, double y, double z,
+                                  double (&eventPositions)[4],
+                                  int defaultEdgeAttr,
+                                  unsigned int groupId,
+                                  double st, double et,
+                                  unsigned int sf, unsigned int ef,
+                                  double spatialX, double spatialY,
+                                  vtkIdType eventId)
+{
+  return this->CreateNode(this->Internal->CurrNodeId, nodeType, nodeLabel,
+                          x, y, z, eventPositions, defaultEdgeAttr, groupId,
+                          st, et, sf, ef, spatialX, spatialY, eventId);
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::CreateNode(int id,
+                                  const std::string& nodeType,
+                                  const std::string& nodeLabel,
+                                  double x, double y, double z,
+                                  double (&eventPositions)[4],
+                                  int defaultEdgeAttr,
+                                  unsigned int groupId,
+                                  double st, double et,
+                                  unsigned int sf, unsigned int ef,
+                                  double spatialX, double spatialY,
+                                  vtkIdType eventId)
+{
+  int typeId = vpEventConfig::GetIdFromString(nodeType.c_str());
+  if (typeId == -1)
+    {
+    // Type string not valid
+    return -1;
+    }
+
+  this->Internal->CurrNodeId = std::max(id + 1, this->Internal->CurrNodeId);
+
+  this->Internal->MasterGraph->AddVertex(id);
+
+  this->Internal->MasterPoints->InsertNextPoint(x, y, z);
+  this->Internal->MasterPoints->Modified();
+
+  this->Internal->NodeDefaultEdgeAttrs->InsertNextValue(defaultEdgeAttr);
+  this->Internal->NodeLabels->InsertNextValue(nodeLabel.c_str());
+  this->Internal->NodeTypes->InsertNextValue(nodeType.c_str());
+  this->Internal->NodeSelected->InsertNextValue(0);
+  this->Internal->GroupIds->InsertNextValue(groupId);
+  this->Internal->StartTime->InsertNextValue(st);
+  this->Internal->EndTime->InsertNextValue(et);
+  this->Internal->StartFrame->InsertNextValue(sf);
+  this->Internal->EndFrame->InsertNextValue(ef);
+  this->Internal->EventId->InsertNextValue(eventId);
+  this->Internal->NodeVirtualType->InsertNextValue(eventId != -1 ? 0 : 1);
+  this->Internal->CachedPositions->InsertNextTuple3(x, y, z);
+  this->Internal->SpatialPositions->InsertNextTuple3(spatialX, spatialY, 0.0);
+  this->Internal->NormalizedSpatialPositions->InsertNextTuple3(0.0, 0.0, 0.0);
+  this->Internal->NormalizedTemporalPositions->InsertNextTuple3(0.0, 0.0, 0.0);
+  this->Internal->StartPositions->InsertNextTuple2(
+        eventPositions[0], eventPositions[1]);
+  this->Internal->EndPositions->InsertNextTuple2(
+        eventPositions[2], eventPositions[3]);
+
+  // Add vertex to undirected graphs
+  vtkInternal::UndirectedGraphs::iterator udGraphItr =
+    this->Internal->DomainUndirectedGraphs.begin();
+
+  for (; udGraphItr != this->Internal->DomainUndirectedGraphs.end();
+       ++udGraphItr)
+    {
+    if (udGraphItr->second == this->Internal->MasterGraph)
+      {
+      continue;
+      }
+
+    udGraphItr->second->AddVertex();
+    }
+
+  // Add vertex to directed graphs
+  vtkInternal::DirectedGraphs::iterator dGraphItr =
+    this->Internal->DomainDirectedGraphs.begin();
+
+  for (; dGraphItr != this->Internal->DomainDirectedGraphs.end();
+       ++dGraphItr)
+    {
+    dGraphItr->second->AddVertex();
+    }
+
+  this->Modified();
+
+  // Notify others
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+  return id;
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::CreateEdge(
+  int parent, int child,
+  const std::string& domain, vtkIntArray* parentAttrs, vtkIntArray* childAttrs)
+{
+  return this->CreateEdge(this->Internal->CurrentEdgeIds[domain],
+                          parent, child, domain,
+                          parentAttrs, childAttrs);
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::CreateEdge(
+  int edgeId, int parent, int child,
+  const std::string& domain, vtkIntArray* parentAttrs, vtkIntArray* childAttrs)
+{
+  if (domain.compare(vpMultiGraphModel::NoneDomain) == 0)
+    {
+    return -1;
+    }
+
+  // Parent and child are pedigree ids.
+  vtkIdType pv = this->Internal->MasterGraph->FindVertex(parent);
+  vtkIdType cv = this->Internal->MasterGraph->FindVertex(child);
+
+  if (pv == -1 || cv == -1)
+    {
+    return -1;
+    }
+
+  vpPrimitiveConfig primitiveConfig;
+  vpPrimitiveConfig::vpPrimitiveType type =
+    primitiveConfig.getPrimitiveTypeByName(qtString(domain));
+
+  if (type.Id == -1)
+    {
+    return -1;
+    }
+
+  int& currId = this->Internal->CurrentEdgeIds[domain];
+  currId = std::max(edgeId + 1, currId);
+
+  vtkGraph* graph = 0;
+
+  if (type.Directed)
+    {
+    vtkInternal::DirectedGraphs::iterator dGraphItr =
+      this->Internal->DomainDirectedGraphs.find(domain);
+    if (dGraphItr != this->Internal->DomainDirectedGraphs.end())
+      {
+      dGraphItr->second->AddEdge(pv, cv);
+      graph = dGraphItr->second;
+      }
+    else
+      {
+      vtkSmartPointer<vtkMutableDirectedGraph> newGraph =
+        vtkSmartPointer<vtkMutableDirectedGraph>::New();
+
+      this->Internal->AddNodes(newGraph);
+      this->Internal->AddPositionArrays(newGraph);
+      this->Internal->AddEdgeArrays(newGraph);
+
+      this->Internal->DomainDirectedGraphs.insert(
+        std::pair<std::string, vtkSmartPointer<vtkMutableDirectedGraph> >(
+          domain, newGraph));
+
+      newGraph->AddEdge(pv, cv);
+      graph = newGraph;
+      }
+    }
+  else
+    {
+    vtkInternal::UndirectedGraphs::iterator udGraphItr =
+      this->Internal->DomainUndirectedGraphs.find(domain);
+    if (udGraphItr != this->Internal->DomainUndirectedGraphs.end())
+      {
+      udGraphItr->second->AddEdge(pv, cv);
+      graph = udGraphItr->second;
+      }
+    else
+      {
+      vtkSmartPointer<vtkMutableUndirectedGraph> newGraph =
+        vtkSmartPointer<vtkMutableUndirectedGraph>::New();
+
+      this->Internal->AddNodes(newGraph);
+      this->Internal->AddPositionArrays(newGraph);
+      this->Internal->AddEdgeArrays(newGraph);
+
+      this->Internal->DomainUndirectedGraphs.insert(
+        std::pair<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >(
+          domain, newGraph));
+
+      newGraph->AddEdge(pv, cv);
+      graph = newGraph;
+      }
+    }
+
+  vtkAbstractArray* ids = graph->GetEdgeData()->GetPedigreeIds();
+  ids->InsertVariantValue(ids->GetMaxId() + 1, edgeId);
+
+  vtkAbstractArray* sel = graph->GetEdgeData()->GetArray("Selected");
+  vtkCharArray::SafeDownCast(sel)->InsertNextValue(0);
+
+  vtkSmartPointer<vtkIntArray> parentAttrsSp = parentAttrs;
+  vtkSmartPointer<vtkIntArray> childAttrsSp = childAttrs;
+
+  // Supply default attributes if none were supplied
+  if (!parentAttrs)
+    {
+    int val = this->Internal->NodeDefaultEdgeAttrs->GetValue(pv);
+    if (val != -1)
+      {
+      parentAttrsSp = vtkSmartPointer<vtkIntArray>::New();
+      parentAttrsSp->InsertNextValue(val);
+      }
+    }
+
+  if (!childAttrs)
+    {
+    int val = this->Internal->NodeDefaultEdgeAttrs->GetValue(cv);
+    if (val != -1)
+      {
+      childAttrsSp = vtkSmartPointer<vtkIntArray>::New();
+      childAttrsSp->InsertNextValue(val);
+      }
+    }
+
+  this->Internal->AddEdgeAttrs(graph, parentAttrsSp, childAttrsSp);
+
+  // Notify others
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+  return edgeId;
+}
+
+//-----------------------------------------------------------------------------
+vtkGraph* vpMultiGraphModel::CreateGraph(const std::string &domain)
+{
+  vtkGraph* graph = NULL;
+
+  vpPrimitiveConfig primitiveConfig;
+  vpPrimitiveConfig::vpPrimitiveType type =
+    primitiveConfig.getPrimitiveTypeByName(qtString(domain));
+
+  if (type.Id == -1)
+    {
+    return graph;
+    }
+
+  if (type.Directed)
+    {
+    vtkSmartPointer<vtkMutableDirectedGraph> newGraph =
+      vtkSmartPointer<vtkMutableDirectedGraph>::New();
+
+    this->Internal->AddNodes(newGraph);
+    this->Internal->AddPositionArrays(newGraph);
+    this->Internal->AddEdgeArrays(newGraph);
+
+    this->Internal->DomainDirectedGraphs.insert(
+      std::pair<std::string, vtkSmartPointer<vtkMutableDirectedGraph> >(
+        domain, newGraph));
+
+    graph = newGraph;
+    }
+  else
+    {
+    vtkSmartPointer<vtkMutableUndirectedGraph> newGraph =
+      vtkSmartPointer<vtkMutableUndirectedGraph>::New();
+
+    this->Internal->AddNodes(newGraph);
+    this->Internal->AddPositionArrays(newGraph);
+    this->Internal->AddEdgeArrays(newGraph);
+
+    this->Internal->DomainUndirectedGraphs.insert(
+      std::pair<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >(
+        domain, newGraph));
+
+    graph = newGraph;
+    }
+
+  return graph;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::MoveNode(NodePositionType positionType,
+                                 int id, double x, double y, double z,
+                                 bool overrideLock)
+{
+  if (this->LockPositionOfNode && !overrideLock)
+    {
+    return;
+    }
+
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return;
+    }
+
+  vtkDoubleArray* array = this->Internal->GetPositionArray(positionType);
+  array->SetTuple3(index, x, y, z);
+
+  if (positionType == vpMultiGraphModel::NPT_Spatial &&
+      this->GetNodeEventId(id) == -1)
+      {
+        this->SetStartPosition(id, x, y);
+        this->SetEndPosition(id, x, y);
+      }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::GetNodePosition(NodePositionType positionType, int id,
+                                        double& x, double& y, double& z)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return;
+    }
+
+  vtkDoubleArray* array = this->Internal->GetPositionArray(positionType);
+
+  double* pos = array->GetTuple3(index);
+  x = pos[0];
+  y = pos[1];
+  z = pos[2];
+}
+
+//-----------------------------------------------------------------------------
+std::string vpMultiGraphModel::GetNodeLabel(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return std::string();
+    }
+
+  return this->Internal->NodeLabels->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::GetNodeVirtualType(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return -1;
+    }
+
+  return this->Internal->NodeVirtualType->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::GetNodeDefaultEdgeAttr(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return -1;
+    }
+
+  return this->Internal->NodeDefaultEdgeAttrs->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+double vpMultiGraphModel::GetNodeStartTime(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return vgTimeStamp::InvalidTime();
+    }
+
+  return this->Internal->StartTime->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetNodeStartTime(int id, double time)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    vtkErrorMacro("<< Invalid vertex id");
+    return;
+    }
+
+  return this->Internal->StartTime->SetTuple1(index, time);
+}
+
+//-----------------------------------------------------------------------------
+double vpMultiGraphModel::GetNodeEndTime(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return vgTimeStamp::InvalidTime();
+    }
+
+  return this->Internal->EndTime->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetNodeEndTime(int id, double time)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    vtkErrorMacro("<< Invalid vertex id");
+    return;
+    }
+
+  this->Internal->EndTime->SetTuple1(index, time);
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpMultiGraphModel::GetNodeStartFrame(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return vgTimeStamp::InvalidTime();
+    }
+
+  return this->Internal->StartFrame->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetNodeStartFrame(int id, unsigned int frame)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    vtkErrorMacro("<< Invalid vertex id");
+    return;
+    }
+
+  this->Internal->StartFrame->SetTuple1(index, frame);
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpMultiGraphModel::GetNodeEndFrame(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return vgTimeStamp::InvalidTime();
+    }
+
+  return this->Internal->EndFrame->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetNodeEndFrame(int id, unsigned int frame)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    vtkErrorMacro("<< Invalid vertex id");
+    return;
+    }
+
+  this->Internal->EndFrame->SetTuple1(index, frame);
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpMultiGraphModel::GetGroupId(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return vgTimeStamp::InvalidTime();
+    }
+
+  return this->Internal->GroupIds->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vpMultiGraphModel::GetNodeEventId(int id)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    return -1;
+    }
+  return this->Internal->EventId->GetValue(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::GetSpatialPosition(int id, double &x, double &y)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    vtkErrorMacro("<< Invalid vertex id");
+    return;
+    }
+
+  double* position = this->Internal->SpatialPositions->GetTuple3(index);
+  x = position[0];
+  y = position[1];
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetSpatialPosition(int id, double x, double y)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index != -1)
+    {
+    this->Internal->SpatialPositions->SetTuple3(index, x, y, 0.0);
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::GetCachedPosition(int id, double &x, double &y,
+                                          double &z)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    vtkErrorMacro("<< Invalid vertex id");
+    return;
+    }
+
+  double* position = this->Internal->CachedPositions->GetTuple3(index);
+  x = position[0];
+  y = position[1];
+  z = position[2];
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetCachedPosition(int id, double x, double y, double z)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index != -1)
+    {
+    this->Internal->CachedPositions->SetTuple3(index, x, y, z);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::GetStartPosition(int id, double &x, double &y)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    vtkErrorMacro("<< Invalid vertex id");
+    return;
+    }
+
+  double* position = this->Internal->StartPositions->GetTuple2(index);
+  x = position[0];
+  y = position[1];
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetStartPosition(int id, double x, double y)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index != -1)
+    {
+    this->Internal->StartPositions->SetTuple2(index, x, y);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::GetEndPosition(int id, double &x, double &y)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index == -1)
+    {
+    vtkErrorMacro("<< Invalid vertex id");
+    return;
+    }
+
+  double* position = this->Internal->EndPositions->GetTuple2(index);
+  x = position[0];
+  y = position[1];
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetEndPosition(int id, double x, double y)
+{
+  vtkIdType index = this->Internal->MasterGraph->FindVertex(id);
+  if (index != -1)
+    {
+    this->Internal->EndPositions->SetTuple2(index, x, y);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkIntArray* vpMultiGraphModel::GetEdgeParentAttributes(
+  int id, const std::string& domain)
+{
+  return this->Internal->GetEdgeAttrs(domain, id, "EdgeParentAttrs");
+}
+
+//-----------------------------------------------------------------------------
+vtkIntArray* vpMultiGraphModel::GetEdgeChildAttributes(
+  int id, const std::string& domain)
+{
+  return this->Internal->GetEdgeAttrs(domain, id, "EdgeChildAttrs");
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetEdgeParentAttributes(int id,
+                                                const std::string& domain,
+                                                vtkIntArray* array)
+{
+  this->Internal->SetEdgeAttrs(domain, id, array, "EdgeParentAttrs");
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetEdgeChildAttributes(int id,
+                                               const std::string& domain,
+                                               vtkIntArray* array)
+{
+  this->Internal->SetEdgeAttrs(domain, id, array, "EdgeChildAttrs");
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::DeleteNodes(vtkIdTypeArray* ids)
+{
+  // Convert to vertex indices
+  for (vtkIdType i = 0, end = ids->GetNumberOfTuples(); i != end; ++i)
+    {
+    vtkIdType index =
+      this->Internal->MasterGraph->FindVertex(
+        static_cast<int>(ids->GetValue(i)));
+    if (index == -1)
+      {
+      return;
+      }
+    ids->SetValue(i, index);
+    }
+
+  this->Internal->MasterGraph->RemoveVertices(ids);
+  this->Internal->MasterPoints->Modified();
+
+  // Remove vertex from undirected graphs
+  vtkInternal::UndirectedGraphs::iterator udGraphItr =
+    this->Internal->DomainUndirectedGraphs.begin();
+
+  for (; udGraphItr != this->Internal->DomainUndirectedGraphs.end();
+       ++udGraphItr)
+    {
+    if (udGraphItr->second == this->Internal->MasterGraph)
+      {
+      continue;
+      }
+
+    udGraphItr->second->SetPoints(0);
+    this->Internal->RemovePositionArrays(udGraphItr->second);
+    udGraphItr->second->RemoveVertices(ids);
+    this->Internal->AddPositionArrays(udGraphItr->second);
+    udGraphItr->second->SetPoints(this->Internal->MasterPoints);
+    }
+
+  // Remove vertex from directed graphs
+  vtkInternal::DirectedGraphs::iterator dGraphItr =
+    this->Internal->DomainDirectedGraphs.begin();
+
+  for (; dGraphItr != this->Internal->DomainDirectedGraphs.end();
+       ++dGraphItr)
+    {
+    dGraphItr->second->SetPoints(0);
+    this->Internal->RemovePositionArrays(dGraphItr->second);
+    dGraphItr->second->RemoveVertices(ids);
+    this->Internal->AddPositionArrays(dGraphItr->second);
+    dGraphItr->second->SetPoints(this->Internal->MasterPoints);
+    }
+
+  this->Modified();
+
+  // Notify others
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::DeleteEdges(vtkIdTypeArray* ids,
+                                    const std::string& domain)
+{
+  vtkGraph* graph = this->GetGraph(domain);
+  if (!graph)
+    {
+    return;
+    }
+
+  // Convert to edge indices
+  for (vtkIdType i = 0, end = ids->GetNumberOfTuples(); i != end; ++i)
+    {
+    vtkIdType index =
+      graph->GetEdgeData()->GetPedigreeIds()->LookupValue(
+        static_cast<int>(ids->GetValue(i)));
+    if (index == -1)
+      {
+      return;
+      }
+    ids->SetValue(i, index);
+    }
+
+  if (vtkMutableDirectedGraph* dg =
+        vtkMutableDirectedGraph::SafeDownCast(graph))
+    {
+    dg->RemoveEdges(ids);
+    }
+  else if (vtkMutableUndirectedGraph* ug =
+             vtkMutableUndirectedGraph::SafeDownCast(graph))
+    {
+    ug->RemoveEdges(ids);
+    }
+  else
+    {
+    return;
+    }
+
+  this->Modified();
+
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+}
+
+//-----------------------------------------------------------------------------
+bool vpMultiGraphModel::HasEdge(int id, const std::string& domain)
+{
+  if (vtkGraph* graph = this->GetGraph(domain))
+    {
+    if (vtkAbstractArray* ids = graph->GetEdgeData()->GetPedigreeIds())
+      {
+      return ids->LookupValue(id) != -1;
+      }
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::GetNodeId(vtkIdType index)
+{
+  if (vtkAbstractArray* ids =
+        this->Internal->MasterGraph->GetVertexData()->GetPedigreeIds())
+    {
+    return ids->GetVariantValue(index).ToInt();
+    }
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::GetEdgeId(vtkIdType index,
+                                 const std::string& domain)
+{
+  if (vtkGraph* graph = this->GetGraph(domain))
+    {
+    if (vtkAbstractArray* ids = graph->GetEdgeData()->GetPedigreeIds())
+      {
+      return ids->GetVariantValue(index).ToInt();
+      }
+    }
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetNodeType(int nodeId,
+                                    const std::string& nodeType,
+                                    const std::string& nodeLabel,
+                                    int defaultEdgeAttr)
+{
+  vtkIdType id = this->Internal->MasterGraph->FindVertex(nodeId);
+  if (id == -1)
+    {
+    return;
+    }
+
+  if (!nodeLabel.empty())
+    {
+    this->Internal->NodeLabels->SetValue(id, nodeLabel.c_str());
+    }
+  this->Internal->NodeDefaultEdgeAttrs->SetValue(id, defaultEdgeAttr);
+
+  this->Internal->NodeTypes->SetValue(id, nodeType.c_str());
+  this->Internal->MasterGraph->Modified();
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetSelectedNodes(vtkIdTypeArray* selected)
+{
+  // Clear previous selection
+  int size = this->Internal->NodeSelected->GetNumberOfTuples();
+  void* begin = this->Internal->NodeSelected->WriteVoidPointer(0, size);
+  memset(begin, 0, size);
+  this->AddSelectedNodes(selected);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::SetSelectedEdges(vtkIdTypeArray* selected,
+                                         const std::string& domain)
+{
+  // Clear previous selection
+  for (vtkInternal::UndirectedGraphs::iterator i =
+         this->Internal->DomainUndirectedGraphs.begin(), end =
+         this->Internal->DomainUndirectedGraphs.end(); i != end; ++i)
+    {
+    if (vtkCharArray* sel =
+          vtkCharArray::SafeDownCast(
+            i->second->GetEdgeData()->GetArray("Selected")))
+      {
+      int size = sel->GetNumberOfTuples();
+      void* begin = sel->WriteVoidPointer(0, size);
+      memset(begin, 0, size);
+      sel->Modified();
+      }
+    }
+
+  this->AddSelectedEdges(selected, domain);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::AddSelectedNodes(vtkIdTypeArray* selected)
+{
+  if (!selected)
+    {
+    return;
+    }
+
+  for (vtkIdType i = 0, end = selected->GetNumberOfTuples(); i != end; ++i)
+    {
+    vtkIdType id =
+      this->Internal->MasterGraph->FindVertex(
+        static_cast<int>(selected->GetValue(i)));
+    if (id != -1)
+      {
+      this->Internal->NodeSelected->SetValue(id, 1);
+      }
+    }
+
+  this->Internal->NodeSelected->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphModel::AddSelectedEdges(vtkIdTypeArray* selected,
+                                         const std::string& domain)
+{
+  for (vtkInternal::DirectedGraphs::iterator i =
+         this->Internal->DomainDirectedGraphs.begin(), end =
+         this->Internal->DomainDirectedGraphs.end(); i != end; ++i)
+    {
+    if (vtkCharArray* sel =
+          vtkCharArray::SafeDownCast(
+            i->second->GetEdgeData()->GetArray("Selected")))
+      {
+      int size = sel->GetNumberOfTuples();
+      void* begin = sel->WriteVoidPointer(0, size);
+      memset(begin, 0, size);
+      sel->Modified();
+      }
+    }
+
+  if (!selected)
+    {
+    return;
+    }
+
+  if (vtkGraph* graph = this->GetGraph(domain))
+    {
+    if (vtkCharArray* sel =
+          vtkCharArray::SafeDownCast(
+            graph->GetEdgeData()->GetArray("Selected")))
+      {
+      for (vtkIdType i = 0, end = selected->GetNumberOfTuples(); i != end; ++i)
+        {
+        int id = static_cast<int>(selected->GetValue(i));
+        vtkIdType index =
+          graph->GetEdgeData()->GetPedigreeIds()->LookupValue(id);
+        if (index != -1)
+          {
+          sel->SetValue(index, 1);
+          }
+        }
+      sel->Modified();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkIdTypeArray* vpMultiGraphModel::GetSelectedNodes()
+{
+  this->Internal->SelectedNodesHelper->Reset();
+  for (vtkIdType i = 0, end = this->Internal->NodeSelected->GetNumberOfTuples();
+       i != end; ++i)
+    {
+    if (this->Internal->NodeSelected->GetValue(i))
+      {
+      this->Internal->SelectedNodesHelper->InsertNextValue(this->GetNodeId(i));
+      }
+    }
+  return this->Internal->SelectedNodesHelper;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdTypeArray* vpMultiGraphModel::GetSelectedEdges(const std::string& domain)
+{
+  this->Internal->SelectedEdgesHelper->Reset();
+  if (vtkGraph* graph = this->GetGraph(domain))
+    {
+    if (vtkCharArray* sel =
+          vtkCharArray::SafeDownCast(
+            graph->GetEdgeData()->GetArray("Selected")))
+      {
+      for (vtkIdType i = 0, end = sel->GetNumberOfTuples(); i != end; ++i)
+        {
+        if (sel->GetValue(i))
+          {
+          this->Internal->SelectedEdgesHelper->InsertNextValue(
+            this->GetEdgeId(i, domain));
+          }
+        }
+      }
+    }
+  return this->Internal->SelectedEdgesHelper;
+}
+
+//-----------------------------------------------------------------------------
+vtkGraph* vpMultiGraphModel::GetGraph(const std::string& domain) const
+{
+  vtkInternal::UndirectedGraphs::const_iterator ugItr =
+    this->Internal->DomainUndirectedGraphs.begin();
+
+  for (; ugItr != this->Internal->DomainUndirectedGraphs.end(); ++ugItr)
+    {
+    if (ugItr->first.compare(domain) == 0)
+      {
+      return ugItr->second;
+      }
+    }
+
+  vtkInternal::DirectedGraphs::const_iterator gItr =
+    this->Internal->DomainDirectedGraphs.begin();
+
+  for (; gItr != this->Internal->DomainDirectedGraphs.end(); ++gItr)
+    {
+    if (gItr->first.compare(domain) == 0)
+      {
+      return gItr->second;
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+std::map<std::string, vtkSmartPointer<vtkMutableDirectedGraph> >
+vpMultiGraphModel::GetAllDirectedGraphs() const
+{
+  return this->Internal->DomainDirectedGraphs;
+}
+
+//-----------------------------------------------------------------------------
+std::map<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >
+vpMultiGraphModel::GetAllUndirectedGraphs() const
+{
+  return this->Internal->DomainUndirectedGraphs;
+}
+
+//-----------------------------------------------------------------------------
+std::map<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >
+vpMultiGraphModel::GetAllUndirectedGraphsWithEdges() const
+{
+  typedef std::map<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >
+    Graphs;
+  typedef std::pair<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >
+    GraphElem;
+
+  Graphs outGraphs;
+
+  Graphs::const_iterator uConstItr =
+    this->Internal->DomainUndirectedGraphs.begin();
+
+  // Ignore master graph (since it cannot and should not have any edges)
+  for (; uConstItr != this->Internal->DomainUndirectedGraphs.end(); ++uConstItr)
+    {
+    if (uConstItr->second != this->Internal->MasterGraph)
+      {
+      outGraphs.insert(GraphElem(uConstItr->first, uConstItr->second));
+      }
+    }
+
+  return outGraphs;
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphModel::Update(const vtkVgTimeStamp& vtkNotUsed(timeStamp),
+                              const vtkVgTimeStamp* vtkNotUsed(referenceFrameTimeStamp))
+{
+  // \TODO Implement this
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+unsigned long vpMultiGraphModel::GetUpdateTime()
+{
+  // \TODO Implement this
+  return 0;
+}
diff --git a/Applications/VpView/vpMultiGraphModel.h b/Applications/VpView/vpMultiGraphModel.h
new file mode 100644
index 00000000..d97a6c43
--- /dev/null
+++ b/Applications/VpView/vpMultiGraphModel.h
@@ -0,0 +1,212 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpMultiGraphModel_h
+#define __vpMultiGraphModel_h
+
+#include <vtkVgModelBase.h>
+
+//
+#include <vgTimeStamp.h>
+
+
+// VTK includes
+#include <vtkGraph.h>
+#include <vtkMath.h>
+
+// C++ include
+#include <map>
+#include <string>
+
+class vtkGraph;
+class vtkIntArray;
+class vtkMutableDirectedGraph;
+class vtkMutableUndirectedGraph;
+
+class vpMultiGraphModel : public vtkVgModelBase
+{
+public:
+  enum NodePositionType
+    {
+    NPT_User,
+    NPT_Spatial,
+    NPT_NormalizedSpatial,
+    NPT_NormalizedTemporal
+    };
+
+  vtkVgClassMacro(vpMultiGraphModel);
+
+  vtkTypeMacro(vpMultiGraphModel, vtkVgModelBase);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vpMultiGraphModel* New();
+
+  // Restore initial state
+  void Reset();
+
+  /// Set graph type (directed vs undirected)
+  int SetGraphIsDirected(const std::string& domain, int val);
+  int GetGraphIsDirected(const std::string& domain) const;
+
+  // Create node using internally generated id
+  int CreateNode(
+    const std::string& nodeType, double x, double y, double z,
+    int defaultEdgeAttr = -1);
+
+  // Create node using internally generated id
+  int CreateNode(const std::string& nodeType, const std::string& nodeLabel,
+    double x, double y, double z,
+    double (&eventPositions)[4],
+    int defaultEdgeAttr = -1,
+    unsigned int groupId = 0,
+    double st=vgTimeStamp::InvalidTime(),
+    double et=vgTimeStamp::InvalidTime(),
+    unsigned int sf=vgTimeStamp::InvalidFrameNumber(),
+    unsigned int ef=vgTimeStamp::InvalidFrameNumber(),
+    double spatialX = vtkMath::Nan(), double spatialY = vtkMath::Nan(),
+    vtkIdType eventId = -1);
+
+  // Create node with desired id
+  int CreateNode(int id, const std::string& nodeType,
+    const std::string& nodeLabel, double x, double y, double z,
+    double (&eventPositions)[4],
+    int defaultEdgeAttr = -1,
+    unsigned int orderIndex = 0,
+    double st=vgTimeStamp::InvalidTime(),
+    double et=vgTimeStamp::InvalidTime(),
+    unsigned int sf=vgTimeStamp::InvalidFrameNumber(),
+    unsigned int ef=vgTimeStamp::InvalidFrameNumber(),
+    double spatialX = vtkMath::Nan(), double spatialY = vtkMath::Nan(),
+    vtkIdType eventId = -1);
+
+  // Create edge using internally generated id
+  int CreateEdge(
+    int parent, int child,  const std::string& domain,
+    vtkIntArray* parentAttrs = 0, vtkIntArray* childAttrs = 0);
+
+  // Create edge with desired id
+  int CreateEdge(
+    int edgeId, int parent, int child,
+    const std::string& domain, vtkIntArray* parentAttrs = 0,
+    vtkIntArray* childAttrs = 0);
+
+  // Create a new graph
+  vtkGraph* CreateGraph(const std::string& domain);
+
+  void MoveNode(NodePositionType positionType,
+                int id, double x, double y, double z,
+                bool overrideLock = false);
+
+  vtkSetMacro(LockPositionOfNode, bool);
+  vtkGetMacro(LockPositionOfNode, bool);
+  vtkBooleanMacro(LockPositionOfNode, bool);
+
+  // Accessors
+  void GetNodePosition(NodePositionType positionType,
+                       int id, double& x, double& y, double& z);
+  std::string GetNodeLabel(int id);
+
+  int GetNodeVirtualType(int id);
+
+  int GetNodeDefaultEdgeAttr(int id);
+
+  double GetNodeStartTime(int id);
+  void SetNodeStartTime(int id, double time);
+
+  double GetNodeEndTime(int id);
+  void SetNodeEndTime(int id, double time);
+
+  unsigned int GetNodeStartFrame(int id);
+  void SetNodeStartFrame(int id, unsigned int frame);
+
+  unsigned int GetNodeEndFrame(int id);
+  void SetNodeEndFrame(int id, unsigned int frame);
+
+  unsigned int GetGroupId(int id);
+  vtkIdType GetNodeEventId(int id);
+
+  void GetSpatialPosition(int id, double& x, double& y);
+  void SetSpatialPosition(int id, double x, double y);
+
+  void GetCachedPosition(int id, double&x, double& y, double& z);
+  void SetCachedPosition(int id, double x, double y, double z);
+
+  void GetStartPosition(int id, double&x, double& y);
+  void SetStartPosition(int id, double x, double y);
+
+  void GetEndPosition(int id, double&x, double& y);
+  void SetEndPosition(int id, double x, double y);
+
+  vtkIntArray* GetEdgeParentAttributes(int id,
+                                       const std::string& domain);
+  vtkIntArray* GetEdgeChildAttributes(int id,
+                                      const std::string& domain);
+
+  void SetEdgeParentAttributes(int id,
+                               const std::string& domain,
+                               vtkIntArray* array);
+
+  void SetEdgeChildAttributes(int id,
+                              const std::string& domain,
+                              vtkIntArray* array);
+
+  void DeleteNodes(vtkIdTypeArray* ids);
+  void DeleteEdges(vtkIdTypeArray* ids, const std::string& domain);
+
+  bool HasEdge(int id, const std::string& domain);
+
+  int GetNodeId(vtkIdType index);
+  int GetEdgeId(vtkIdType index, const std::string& domain);
+
+  void SetNodeType(int nodeId, const std::string& nodeType,
+                   const std::string& nodeLabel = std::string(),
+                   int defaultEdgeAttr = -1);
+
+  void SetSelectedNodes(vtkIdTypeArray* selected);
+  void SetSelectedEdges(vtkIdTypeArray* selected, const std::string& domain);
+
+  void AddSelectedNodes(vtkIdTypeArray* selected);
+  void AddSelectedEdges(vtkIdTypeArray* selected, const std::string& domain);
+
+  vtkIdTypeArray* GetSelectedNodes();
+  vtkIdTypeArray* GetSelectedEdges(const std::string& domain);
+
+  vtkGraph* GetGraph(const std::string& domain) const;
+  std::map<std::string, vtkSmartPointer<vtkMutableDirectedGraph> >
+  GetAllDirectedGraphs() const;
+  std::map<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >
+  GetAllUndirectedGraphs() const;
+  std::map<std::string, vtkSmartPointer<vtkMutableUndirectedGraph> >
+  GetAllUndirectedGraphsWithEdges() const;
+
+  virtual int Update(
+    const vtkVgTimeStamp& timeStamp,
+    const vtkVgTimeStamp* referenceFrameTimeStamp);
+  using Superclass::Update;
+
+  /// Return the MTime for the last Update (that did something).
+  virtual unsigned long GetUpdateTime();
+
+  static const std::string NoneDomain;
+
+private:
+  /// Not implemented.
+  vpMultiGraphModel(const vpMultiGraphModel&);
+
+  /// Not implemented.
+  void operator=(const vpMultiGraphModel&);
+
+  vpMultiGraphModel();
+  virtual ~vpMultiGraphModel();
+
+  bool LockPositionOfNode;
+
+  class vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vpMultiGraphModel_h
diff --git a/Applications/VpView/vpMultiGraphRepresentation.cxx b/Applications/VpView/vpMultiGraphRepresentation.cxx
new file mode 100644
index 00000000..ab43cac9
--- /dev/null
+++ b/Applications/VpView/vpMultiGraphRepresentation.cxx
@@ -0,0 +1,1474 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpMultiGraphRepresentation.h"
+
+#include "vpMultiGraphModel.h"
+
+// VisGUI includes
+#include <qtUtil.h>
+
+#include <vgRange.h>
+
+#include <vtkVgColorUtil.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVg2DGraphMapper.h>
+
+#include <vgEventType.h>
+#include <vpEventConfig.h>
+#include <vpGraphAnimateCallback.h>
+
+// VTK includes
+#include <vtkActor.h>
+#include <vtkCommand.h>
+#include <vtkDataSetAttributes.h>
+#include <vtkGlyphSource2D.h>
+#include <vtkGraphToPolyData.h>
+#include <vtkHardwareSelector.h>
+#include <vtkIdTypeArray.h>
+#include <vtkInformation.h>
+#include <vtkMath.h>
+#include <vtkMutableDirectedGraph.h>
+#include <vtkMutableUndirectedGraph.h>
+#include <vtkNew.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkRegularPolygonSource.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkSelection.h>
+#include <vtkSelectionNode.h>
+#include <vtkStringArray.h>
+#include <vtkTransform2D.h>
+#include <vtkVertexListIterator.h>
+
+#include <algorithm>
+
+vtkStandardNewMacro(vpMultiGraphRepresentation);
+
+#define vtkCreateMacro(type, name) \
+  vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
+
+typedef double (vpMultiGraphModel::*GetNodeTimeFn)(int);
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+struct SortGraphByTime
+{
+  vpMultiGraphModel* GraphModel;
+  GetNodeTimeFn TimeFunc;
+
+  SortGraphByTime(vpMultiGraphModel* graphModel, GetNodeTimeFn timeFunc)
+    : GraphModel(graphModel), TimeFunc(timeFunc)
+    {
+    }
+
+  bool operator ()(vtkIdType lhs, vtkIdType rhs)
+    {
+    return (this->GraphModel->*this->TimeFunc)(lhs) <
+           (this->GraphModel->*this->TimeFunc)(rhs);
+    }
+};
+
+//----------------------------------------------------------------------------
+vpMultiGraphModel::NodePositionType GetPositionTypeForLayout(int layout)
+{
+  switch (layout)
+    {
+    case vpMultiGraphRepresentation::SortByStartTime:
+      return vpMultiGraphModel::NPT_NormalizedTemporal;
+    case vpMultiGraphRepresentation::Spatial:
+      return vpMultiGraphModel::NPT_NormalizedSpatial;
+    case vpMultiGraphRepresentation::RawSpatial:
+      return vpMultiGraphModel::NPT_Spatial;
+    default:
+      return vpMultiGraphModel::NPT_User;
+    }
+}
+
+//----------------------------------------------------------------------------
+const char* GetPositionArrayNameForLayout(int layout)
+{
+  switch (layout)
+    {
+    case vpMultiGraphRepresentation::SortByStartTime:
+      return "NormalizedTemporalPositions";
+    case vpMultiGraphRepresentation::Spatial:
+      return "NormalizedSpatialPositions";
+    case vpMultiGraphRepresentation::RawSpatial:
+      return "SpatialPositions";
+    default:
+      return "CachedPositions";
+    }
+}
+
+}
+
+//----------------------------------------------------------------------------
+class vpMultiGraphRepresentation::vtkInternal
+{
+public:
+  typedef vtkSmartPointer<vtkActor> ActorPtr;
+
+  struct GraphEntity
+    {
+    std::string Key;
+    ActorPtr Actor;
+    };
+
+  double TimelineXScale;
+  double TimelineMinTime;
+  unsigned int TimelineMinFrame;
+  double TimelineFrameXScale;
+  double TimelineXMin;
+
+
+  vtkInternal(vpMultiGraphRepresentation* parent);
+  ~vtkInternal();
+
+  //----------------------------------------------------------------------------
+  void ComputeTemporalRange(vpMultiGraphModel* graphModel,
+                            GetNodeTimeFn timeFunc, double (&timeRange)[2],
+                            int (&ids)[2])
+  {
+    vtkGraph* graph = graphModel->GetGraph(vpMultiGraphModel::NoneDomain);
+
+    double curr;
+    std::vector<vtkIdType> vertexIds;
+    double min = vgTimeStamp::InvalidTime();
+    double max = vgTimeStamp::InvalidTime();
+    bool initialized = false;
+
+    vtkSmartPointer<vtkVertexListIterator> vItr =
+      vtkSmartPointer<vtkVertexListIterator>::New();
+    graph->GetVertices(vItr);
+
+    // Compute global min and max
+    while(vItr->HasNext())
+      {
+      vtkIdType vid = graphModel->GetNodeId(vItr->Next());
+      vertexIds.push_back(vid);
+      }
+
+    for (size_t i = 0; i < vertexIds.size(); ++i)
+      {
+      curr = (graphModel->*timeFunc)(static_cast<vtkIdType>(vertexIds[i]));
+
+      if (curr == vgTimeStamp::InvalidTime())
+        {
+        continue;
+        }
+
+      if (!initialized)
+        {
+        min = curr;
+        max = curr;
+        ids[0] = vertexIds[i];
+        ids[1] = vertexIds[i];
+        initialized = true;
+        continue;
+        }
+
+      if (curr < min)
+        {
+        ids[0] = vertexIds[i];
+        min = curr;
+        }
+      if (curr > max)
+        {
+        ids[1] = vertexIds[i];
+        max = curr;
+        }
+      }
+
+    timeRange[0] = min;
+    timeRange[1] = max;
+  }
+
+  //----------------------------------------------------------------------------
+  void  UseSortByTimeLayout(vpMultiGraphModel* graphModel,
+                            vtkRenderer* ren,
+                            const vgRange<double>& widthRange,
+                            const vgRange<double>& heightRange,
+                            GetNodeTimeFn timeFunc,
+                            int prevLayoutMode)
+  {
+    vtkGraph* graph = graphModel->GetGraph(vpMultiGraphModel::NoneDomain);
+
+    // Some useful variables
+    typedef std::map< unsigned int, std::vector<vtkIdType> >::iterator Itr;
+    Itr itr;
+    bool initialized = false;
+    int row = 0;
+    double x, y;
+    double min = vgTimeStamp::InvalidTime();
+    double max = vgTimeStamp::InvalidTime();
+    unsigned int minFrame = vgTimeStamp::InvalidFrameNumber();
+    unsigned int maxFrame = vgTimeStamp::InvalidFrameNumber();
+    double curr;
+    double xScale, yScale;
+
+    double geomBounds[6];
+    this->NodeGeometery->GetBounds(geomBounds);
+    double distanceBtwCols =  (geomBounds[1] - geomBounds[0]);
+    double distanceBtwRows =  (geomBounds[3] - geomBounds[2]) * 2.0;
+
+    std::vector<vtkIdType> vertexIds;
+    std::map< unsigned int, std::vector<vtkIdType> > verticesGroupById;
+
+    vtkSmartPointer<vtkVertexListIterator> vItr =
+      vtkSmartPointer<vtkVertexListIterator>::New();
+    graph->GetVertices(vItr);
+
+    // Compute global min and max
+    while(vItr->HasNext())
+      {
+      vtkIdType vid = graphModel->GetNodeId(vItr->Next());
+      vertexIds.push_back(vid);
+
+      std::vector<vtkIdType>& vertices =
+        verticesGroupById[graphModel->GetGroupId(vid)];
+
+      vertices.push_back(vid);
+      }
+
+    int minId = -1;
+    int maxId = -1;
+    for (size_t i = 0; i < vertexIds.size(); ++i)
+      {
+      curr = (graphModel->*timeFunc)(static_cast<vtkIdType>(vertexIds[i]));
+
+      if (curr == vgTimeStamp::InvalidTime())
+        {
+        continue;
+        }
+
+      if (!initialized)
+        {
+        min = curr;
+        max = curr;
+        minId = vertexIds[i];
+        maxId = vertexIds[i];
+
+        initialized = true;
+        continue;
+        }
+
+      if (curr < min)
+        {
+        min = curr;
+        minId = vertexIds[i];
+        }
+      if (curr > max)
+        {
+        max = curr;
+        maxId = vertexIds[i];
+        }
+      }
+
+    minFrame = graphModel->GetNodeStartFrame(minId);
+    maxFrame = graphModel->GetNodeStartFrame(maxId);
+
+    if (max == min)
+      {
+      min = max * 0.5;
+      minFrame = maxFrame * 0.5;
+      }
+
+    this->TimelineFrameXScale = maxFrame - minFrame;
+
+    xScale = max - min;
+    if (xScale != 0.0)
+      {
+      xScale = (widthRange.upper - widthRange.lower) / xScale;
+      this->TimelineFrameXScale =
+        (widthRange.upper - widthRange.lower) / this->TimelineFrameXScale;
+      }
+
+    yScale = static_cast<double>(verticesGroupById.size());
+    if (yScale > 0.0)
+      {
+      yScale = (heightRange.upper - heightRange.lower) / yScale;
+      }
+
+    this->TimelineXScale = xScale;
+    this->TimelineMinTime = min;
+    this->TimelineMinFrame = minFrame;
+    this->TimelineXMin = widthRange.lower;
+
+    itr = verticesGroupById.begin();
+
+    // Current positions
+    double currX, currY, currZ;
+    std::vector<vtkIdType> ids;
+    std::vector<double> currXYZs;
+    std::vector<double> newXYZs;
+
+    // Now position the nodes appropriately
+    if (!verticesGroupById.empty())
+      {
+      distanceBtwRows = distanceBtwRows / verticesGroupById.size();
+      }
+
+    vpMultiGraphModel::NodePositionType prevPositionType =
+      GetPositionTypeForLayout(prevLayoutMode);
+
+    for (; itr != verticesGroupById.end(); ++itr, ++row)
+      {
+      std::vector<vtkIdType>& vts = itr->second;
+
+      // Now sort them
+      std::sort(vts.begin(), vts.end(),
+                SortGraphByTime(graphModel, timeFunc));
+
+      std::map<double, int> nodesWithSameXPos;
+      for (size_t i = 0; i < vts.size(); ++i)
+        {
+        curr = (graphModel->*timeFunc)(vts[i]);
+
+        if (curr != vgTimeStamp::InvalidTime())
+          {
+          x = widthRange.lower + (curr - min) * xScale;
+          y = heightRange.lower + row * yScale +
+              nodesWithSameXPos[x] * yScale * 0.01;
+          }
+        else
+          {
+          x = widthRange.lower - (1.5 * distanceBtwCols);
+          y = heightRange.lower - (1.5 * distanceBtwRows);
+          }
+
+        if ( x < this->TimelineXMin)
+          {
+          this->TimelineXMin = x;
+          }
+
+        ids.push_back(vts[i]);
+
+        graphModel->GetNodePosition(prevPositionType, vts[i],
+                                    currX, currY, currZ);
+        currXYZs.push_back(currX);
+        currXYZs.push_back(currY);
+        currXYZs.push_back(currZ);
+
+        newXYZs.push_back(x);
+        newXYZs.push_back(y);
+        newXYZs.push_back(0.0);
+
+        nodesWithSameXPos[x] += 1;
+        }
+      }
+
+    this->Animate(graphModel, ren, ids, currXYZs, newXYZs);
+    }
+
+  //----------------------------------------------------------------------------
+  void  UseSpatialLayout(vpMultiGraphModel* graphModel,
+                         vtkRenderer* ren,
+                         const vgRange<double>& widthRange,
+                         const vgRange<double>& heightRange,
+                         int prevLayoutMode)
+  {
+    vtkGraph* graph = graphModel->GetGraph(vpMultiGraphModel::NoneDomain);
+
+    double geomBounds[6];
+    this->NodeGeometery->GetBounds(geomBounds);
+    double distanceBtwCols =  (geomBounds[1] - geomBounds[0]);
+    double distanceBtwRows =  (geomBounds[3] - geomBounds[2]) * 2.0;
+
+    vtkSmartPointer<vtkVertexListIterator> vItr =
+      vtkSmartPointer<vtkVertexListIterator>::New();
+    graph->GetVertices(vItr);
+
+    // Compute min and max spatial positions
+    double minX = VTK_DOUBLE_MAX;
+    double maxX = VTK_DOUBLE_MIN;
+    double minY = VTK_DOUBLE_MAX;
+    double maxY = VTK_DOUBLE_MIN;
+    while (vItr->HasNext())
+      {
+      vtkIdType vid = graphModel->GetNodeId(vItr->Next());
+      double x, y;
+      graphModel->GetSpatialPosition(vid, x, y);
+
+      if (vtkMath::IsNan(x) || vtkMath::IsNan(y))
+        {
+        continue;
+        }
+
+      if (x < minX)
+        {
+        minX = x;
+        }
+      if (x > maxX)
+        {
+        maxX = x;
+        }
+      if (y < minY)
+        {
+        minY = y;
+        }
+      if (y > maxY)
+        {
+        maxY = y;
+        }
+      }
+
+    double xScale = maxX - minX;
+    if (xScale != 0.0)
+      {
+      xScale = (widthRange.upper - widthRange.lower) / xScale;
+      }
+
+    double yScale = maxY - minY;
+    if (yScale != 0.0)
+      {
+      yScale = (heightRange.upper - heightRange.lower) / yScale;
+      }
+
+    // Fit the graph bounds in the viewport, but maintain the aspect ratio
+    double scale = std::min(xScale, yScale);
+
+    // Compute the transform to map the spatial bounds
+    // to the viewport bounds we have been given.
+    this->SpatialTransform->Identity();
+    this->SpatialTransform->Translate(
+      0.5 * (widthRange.lower + widthRange.upper),
+      0.5 * (heightRange.lower + heightRange.upper));
+    this->SpatialTransform->Scale(scale, scale);
+    this->SpatialTransform->Translate(-0.5 * (maxX + minX),
+                                      -0.5 * (maxY + minY));
+
+    std::vector<vtkIdType> ids;
+    std::vector<double> currXYZs;
+    std::vector<double> newXYZs;
+
+    vpMultiGraphModel::NodePositionType prevPositionType =
+      GetPositionTypeForLayout(prevLayoutMode);
+
+    // Compute node positions based on normalized spatial positions
+    graph->GetVertices(vItr);
+    while (vItr->HasNext())
+      {
+      vtkIdType vid = graphModel->GetNodeId(vItr->Next());
+      double point[3];
+      graphModel->GetSpatialPosition(vid, point[0], point[1]);
+      point[2] = 1.0;
+
+      if (!vtkMath::IsNan(point[0]) && !vtkMath::IsNan(point[1]))
+        {
+        SpatialTransform->TransformPoints(point, point, 1);
+        }
+      else
+        {
+        point[0] = widthRange.lower - (1.5 * distanceBtwCols);
+        point[1] = heightRange.lower - (1.5 * distanceBtwRows);
+        }
+
+      ids.push_back(vid);
+
+      double currX, currY, currZ;
+      graphModel->GetNodePosition(prevPositionType, vid, currX, currY, currZ);
+      currXYZs.push_back(currX);
+      currXYZs.push_back(currY);
+      currXYZs.push_back(currZ);
+
+      newXYZs.push_back(point[0]);
+      newXYZs.push_back(point[1]);
+      newXYZs.push_back(0.0);
+      }
+
+    // Invert so clients can later quickly get the graph to spatial transform
+    this->SpatialTransform->Inverse();
+
+    this->Animate(graphModel, ren, ids, currXYZs, newXYZs);
+  }
+
+  //---------------------------------------------------------------------------
+  void Animate(vpMultiGraphModel* graphModel, vtkRenderer* ren,
+    const std::vector<vtkIdType>& ids, const std::vector<double>& currXYZs,
+    const std::vector<double>& newXYZs)
+  {
+    this->GraphAnimateCallback->Reset(
+      graphModel, this->Parent, ren, ids, currXYZs, newXYZs,
+      GetPositionTypeForLayout(this->Parent->GetLayoutMode()));
+
+    if (!ren->GetRenderWindow()->GetInteractor()->HasObserver(
+          vtkCommand::TimerEvent, this->GraphAnimateCallback))
+      {
+      ren->GetRenderWindow()->GetInteractor()->AddObserver(
+        vtkCommand::TimerEvent, this->GraphAnimateCallback);
+      }
+
+    ren->GetRenderWindow()->GetInteractor()->CreateOneShotTimer(0);
+  }
+
+  //----------------------------------------------------------------------------
+  vtkVgTimeStamp ComputeNodeStartTime(
+      double x, double vtkNotUsed(y), double vtkNotUsed(z))
+    {
+      vtkVgTimeStamp timestamp;
+      timestamp.SetTime(vgTimeStamp::InvalidTime());
+      timestamp.SetFrameNumber(vgTimeStamp::InvalidFrameNumber());
+
+      if (this->TimelineXScale != 0.0)
+        {
+        double time;
+        unsigned int frame;
+
+        double distance = x - this->TimelineXMin;
+        time = fabs(distance) * (1 / this->TimelineXScale);
+        frame = fabs(distance) * (1.0 / this->TimelineFrameXScale);
+        if (distance < 0.0)
+          {
+          time = this->TimelineMinTime - time;
+          frame = this->TimelineMinFrame - frame;
+          }
+        else
+          {
+          time = this->TimelineMinTime + time;
+          frame = this->TimelineMinFrame + frame;
+          }
+        timestamp.SetTime(time);
+        timestamp.SetFrameNumber(frame);
+      }
+
+      return timestamp;
+    }
+
+  vpMultiGraphRepresentation* Parent;
+
+  std::vector<GraphEntity> GraphEntities;
+
+  vtkSmartPointer<vtkPolyData> NodeGeometery;
+  vtkSmartPointer<vtkUnsignedCharArray> VertexColorArray;
+  vtkSmartPointer<vtkUnsignedCharArray> EdgeColorArray;
+  vtkSmartPointer<vtkIdTypeArray> PickedIdArray;
+
+  vtkSmartPointer<vtkTransform2D> SpatialTransform;
+
+  vtkSmartPointer<vpGraphAnimateCallback> GraphAnimateCallback;
+};
+
+//-----------------------------------------------------------------------------
+vpMultiGraphRepresentation::vtkInternal::vtkInternal(
+  vpMultiGraphRepresentation* parent)
+{
+  this->Parent = parent;
+
+  vtkSmartPointer<vtkRegularPolygonSource> polygonSource =
+    vtkSmartPointer<vtkRegularPolygonSource>::New();
+
+  polygonSource->SetNumberOfSides(50);
+  polygonSource->SetRadius(0.1);
+  polygonSource->SetCenter(0, 0, 0);
+  polygonSource->Update();
+
+  this->NodeGeometery = vtkSmartPointer<vtkPolyData>::New();
+  this->NodeGeometery->DeepCopy(polygonSource->GetOutput());
+
+  this->GraphAnimateCallback = vtkSmartPointer<vpGraphAnimateCallback>::New();
+
+  this->SpatialTransform = vtkSmartPointer<vtkTransform2D>::New();
+}
+
+//-----------------------------------------------------------------------------
+vpMultiGraphRepresentation::vtkInternal::~vtkInternal()
+{
+}
+
+//-----------------------------------------------------------------------------
+vpMultiGraphRepresentation::vpMultiGraphRepresentation()
+{
+  this->Visible = 1;
+
+  this->Internal = new vtkInternal(this);
+
+  this->NewPropCollection = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+
+  this->Picker = vtkSmartPointer<vtkHardwareSelector>::New();
+
+  this->GraphLayoutMode = Default;
+
+  this->VertexSize = 400.0;
+  this->VertexOpacity = 1.0;
+  this->ZOffset = 0.0;
+
+  this->ForegroundColor[0] =
+    this->ForegroundColor[1] =
+    this->ForegroundColor[2] = 0.0;
+}
+
+//-----------------------------------------------------------------------------
+vpMultiGraphRepresentation::~vpMultiGraphRepresentation()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetGraphModel(
+  vpMultiGraphModel* graphModel)
+{
+  if (this->GraphModel != graphModel)
+    {
+    this->GraphModel = graphModel;
+
+    if (this->GraphModel && this->UseAutoUpdate)
+      {
+      this->GraphModel->AddObserver(vtkCommand::UpdateDataEvent, this,
+                                    &vpMultiGraphRepresentation::Update);
+      }
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vpMultiGraphModel* vpMultiGraphRepresentation::GetGraphModel() const
+{
+  return this->GraphModel;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vpMultiGraphRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vpMultiGraphRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vpMultiGraphRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vpMultiGraphRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vpMultiGraphRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vpMultiGraphRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+
+  this->Visible = flag;
+
+  this->ActivePropCollection->InitTraversal();
+  while (vtkProp* prop = this->ActivePropCollection->GetNextProp())
+    {
+    prop->SetVisibility(flag);
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetCurrentVisibleGraph(
+  const std::string& key)
+{
+  if (key.compare(this->CurrentVisibleGraphKey) == 0)
+    {
+    return;
+    }
+
+  size_t count = this->Internal->GraphEntities.size();
+
+  for (size_t i = 0; i < count; ++i)
+    {
+    // Master graph is always visible
+    if (this->Internal->GraphEntities[i].Key.compare(
+          vpMultiGraphModel::NoneDomain) == 0)
+      {
+      continue;
+      }
+    if (key.compare(this->Internal->GraphEntities[i].Key) == 0)
+      {
+      this->Internal->GraphEntities[i].Actor->SetVisibility(1);
+      }
+    else
+      {
+      this->Internal->GraphEntities[i].Actor->SetVisibility(0);
+      }
+    }
+
+  this->CurrentVisibleGraphKey = key;
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+const std::string& vpMultiGraphRepresentation::GetCurrentVisibleGraph() const
+{
+  return this->CurrentVisibleGraphKey;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::Initialize()
+{
+  if (!this->GraphModel)
+    {
+    vtkErrorMacro("Event model must be set before initialization");
+    return;
+    }
+
+  this->ReinitializeRenderData();
+
+  typedef vtkSmartPointer<vtkMutableDirectedGraph>
+    vtkMutableDirectedGraphPtr;
+  typedef vtkSmartPointer<vtkMutableUndirectedGraph>
+    vtkMutableUndirectedGraphPtr;
+
+  // Add undirected graphs
+  std::map<std::string, vtkMutableUndirectedGraphPtr>::iterator ungItr;
+  std::map<std::string, vtkMutableUndirectedGraphPtr> unDirGraphs =
+    this->GraphModel->GetAllUndirectedGraphs();
+  ungItr = unDirGraphs.begin();
+  for (; ungItr != unDirGraphs.end(); ++ungItr)
+    {
+    if (ungItr->first != vpMultiGraphModel::NoneDomain)
+      {
+      this->AddGraph(ungItr->second, ungItr->first);
+      }
+    }
+
+  // Add directed graphs
+  std::map<std::string, vtkMutableDirectedGraphPtr>::iterator dgItr;
+  std::map<std::string, vtkMutableDirectedGraphPtr> dirGraphs =
+    this->GraphModel->GetAllDirectedGraphs();
+  dgItr = dirGraphs.begin();
+  for (; dgItr != dirGraphs.end(); ++dgItr)
+    {
+    this->AddGraph(dgItr->second, dgItr->first);
+    }
+
+  // Add the main node graph last so that it gets rendered last
+  this->AddGraph(this->GraphModel->GetGraph(vpMultiGraphModel::NoneDomain),
+                 vpMultiGraphModel::NoneDomain);
+
+  this->UpdateRenderObjectsTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::Update()
+{
+  // \note: Currently call initialize every update as the graph model has
+  // changed.
+  this->Initialize();
+
+  if (!this->GetVisible())
+    {
+    return;
+    }
+
+  double zOffset = this->GetZOffset();
+  size_t count = this->Internal->GraphEntities.size();
+
+  for (size_t i = 0; i < count; ++i)
+    {
+    this->Internal->GraphEntities[i].Actor->SetPosition(0.0, 0.0, zOffset);
+    this->Internal->GraphEntities[i].Actor->GetMapper()->Update();
+    }
+
+  this->UpdateTime.Modified();
+}
+
+class HideLabelsAndGlyphs
+{
+  vpMultiGraphRepresentation* Rep;
+
+public:
+  HideLabelsAndGlyphs(vpMultiGraphRepresentation* rep)
+    : Rep(rep)
+    {
+    Rep->SetLabelsVisible(false);
+    Rep->SetEdgeGlyphsVisible(false);
+    }
+
+  ~HideLabelsAndGlyphs()
+    {
+    Rep->SetLabelsVisible(true);
+    Rep->SetEdgeGlyphsVisible(true);
+    }
+};
+
+//-----------------------------------------------------------------------------
+vtkIdType vpMultiGraphRepresentation
+::Pick(double renX, double renY, vtkRenderer* ren, vtkIdType& pickType)
+{
+  return this->Pick(renX, renY, renX, renY, ren, pickType);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vpMultiGraphRepresentation
+::Pick(double x1, double y1, double x2, double y2,
+       vtkRenderer* ren, vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+  this->PickedGraphDomain.clear();
+
+  double minX = std::min(x1, x2);
+  double minY = std::min(y1, y2);
+  double maxX = std::max(x1, x2);
+  double maxY = std::max(y1, y2);
+
+  if (!this->GetVisible() ||
+      minX < 0.0 || minY < 0.0 ||
+      maxX >= ren->GetSize()[0] || maxY >= ren->GetSize()[1])
+    {
+    return -1;
+    }
+
+  // Labels interfere with selection so turn them off temporarily
+  HideLabelsAndGlyphs hide(this);
+
+  // If any nodes are picked, only pick nodes. This behavior is intentional.
+    {
+    vtkIdType id = this->PickNodes(minX, minY, maxX, maxY, ren);
+    if (id != -1)
+      {
+      pickType = vtkVgPickData::PickedGraphNode;
+      return id;
+      }
+    }
+
+    {
+    vtkIdType id = this->PickEdges(minX, minY, maxX, maxY, ren);
+    if (id != -1)
+      {
+      pickType = vtkVgPickData::PickedGraphEdge;
+      return id;
+      }
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vpMultiGraphRepresentation
+::PickNodes(double x1, double y1, double x2, double y2, vtkRenderer* ren)
+{
+  this->Picker->SetFieldAssociation(vtkDataObject::FIELD_ASSOCIATION_POINTS);
+  this->Picker->SetRenderer(ren);
+  this->Picker->SetArea(x1, y1, x2, y2);
+
+  vtkSmartPointer<vtkSelection> selection =
+    vtkSmartPointer<vtkSelection>::Take(this->Picker->Select());
+
+  // Figure out which actor is being used for the master graph. It will
+  // most likely always be the first one, but just to be sure...
+  vtkActor* nodeGraphActor = 0;
+  for (size_t i = 0, end = this->Internal->GraphEntities.size(); i != end; ++i)
+    {
+    if (this->Internal->GraphEntities[i].Key == vpMultiGraphModel::NoneDomain)
+      {
+      nodeGraphActor = this->Internal->GraphEntities[i].Actor;
+      break;
+      }
+    }
+
+  for (int i = 0, end = selection->GetNumberOfNodes(); i != end; ++i)
+    {
+    vtkSelectionNode* node = selection->GetNode(i);
+
+    if (vtkActor* actor =
+          vtkActor::SafeDownCast(
+            node->GetProperties()->Get(vtkSelectionNode::PROP())))
+      {
+      // Is the selected prop our node graph?
+      if (actor != nodeGraphActor)
+        {
+        continue;
+        }
+
+      if (vtkIdTypeArray* ids =
+            vtkIdTypeArray::SafeDownCast(node->GetSelectionList()))
+        {
+        this->Internal->PickedIdArray = ids;
+        this->PickedGraphDomain = vpMultiGraphModel::NoneDomain;
+
+        // Convert to pedigree ids
+        for (vtkIdType i = 0,
+             end = this->Internal->PickedIdArray->GetNumberOfTuples();
+             i != end; ++i)
+          {
+          this->Internal->PickedIdArray->SetValue(
+            i, this->GraphModel->GetNodeId(
+                this->Internal->PickedIdArray->GetValue(i)));
+          }
+
+        // Return first selected node id
+        return this->Internal->PickedIdArray->GetValue(0);
+        }
+      }
+    }
+
+  this->Internal->PickedIdArray = 0;
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vpMultiGraphRepresentation
+::PickEdges(double x1, double y1, double x2, double y2, vtkRenderer* ren)
+{
+  this->Picker->SetFieldAssociation(vtkDataObject::FIELD_ASSOCIATION_CELLS);
+  this->Picker->SetRenderer(ren);
+  this->Picker->SetArea(x1, y1, x2, y2);
+
+  vtkSmartPointer<vtkSelection> selection =
+    vtkSmartPointer<vtkSelection>::Take(this->Picker->Select());
+
+  if (selection->GetNumberOfNodes() == 0)
+    {
+    this->Internal->PickedIdArray = 0;
+    return -1;
+    }
+
+  vtkSelectionNode* node = selection->GetNode(0);
+
+  if (vtkIdTypeArray* ids =
+        vtkIdTypeArray::SafeDownCast(node->GetSelectionList()))
+    {
+    // Figure out which graph this edge belonged to
+    if (vtkActor* actor =
+          vtkActor::SafeDownCast(
+            node->GetProperties()->Get(vtkSelectionNode::PROP())))
+      {
+      for (size_t i = 0, end = this->Internal->GraphEntities.size();
+           i != end; ++i)
+        {
+        if (actor == this->Internal->GraphEntities[i].Actor)
+          {
+          this->PickedGraphDomain = this->Internal->GraphEntities[i].Key;
+          break;
+          }
+        }
+      }
+
+    this->Internal->PickedIdArray = ids;
+
+    // Convert to pedigree ids
+    for (vtkIdType i = 0,
+         end = this->Internal->PickedIdArray->GetNumberOfTuples();
+         i != end; ++i)
+      {
+      this->Internal->PickedIdArray->SetValue(
+        i, this->GraphModel->GetEdgeId(
+            this->Internal->PickedIdArray->GetValue(i),
+            this->PickedGraphDomain));
+      }
+
+    // Return first selected edge id
+    return this->Internal->PickedIdArray->GetValue(0);
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void  vpMultiGraphRepresentation::UseSortByStartTimeLayout(vtkRenderer* ren,
+  const vgRange<double>& widthRange, const vgRange<double>& heightRange,
+  int prevLayoutMode)
+{
+  this->Internal->UseSortByTimeLayout(this->GraphModel, ren,
+    widthRange, heightRange, &vpMultiGraphModel::GetNodeStartTime,
+    prevLayoutMode);
+}
+
+//-----------------------------------------------------------------------------
+void  vpMultiGraphRepresentation::UseSpatialLayout(vtkRenderer* ren,
+  const vgRange<double>& widthRange, const vgRange<double>& heightRange,
+  int prevLayoutMode)
+{
+  this->Internal->UseSpatialLayout(this->GraphModel, ren,
+                                   widthRange, heightRange, prevLayoutMode);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::UseRandomLayout(vtkRenderer* ren,
+  const vgRange<double>& widthRange,
+  const vgRange<double>& heightRange,
+  int prevLayoutMode)
+{
+  Q_UNUSED(widthRange);
+  Q_UNUSED(heightRange);
+  vtkGraph* graph = this->GraphModel->GetGraph(vpMultiGraphModel::NoneDomain);
+
+  // Generate a random position in x and y directions.
+  vtkSmartPointer<vtkVertexListIterator> vItr =
+    vtkSmartPointer<vtkVertexListIterator>::New();
+  graph->GetVertices(vItr);
+
+  double x, y, z;
+  double currX, currY, currZ;
+  std::vector<vtkIdType> ids;
+  std::vector<double> fromXYZs;
+  std::vector<double> toXYZs;
+
+  vpMultiGraphModel::NodePositionType prevPositionType =
+    GetPositionTypeForLayout(prevLayoutMode);
+
+  while(vItr->HasNext())
+    {
+    vtkIdType id = this->GraphModel->GetNodeId(vItr->Next());
+
+    this->GraphModel->GetNodePosition(prevPositionType, id, currX, currY, currZ);
+    fromXYZs.push_back(currX);
+    fromXYZs.push_back(currY);
+    fromXYZs.push_back(currZ);
+
+    this->GraphModel->GetCachedPosition(id, x, y, z);
+    toXYZs.push_back(x);
+    toXYZs.push_back(y);
+    toXYZs.push_back(0.0);
+
+    ids.push_back(id);
+    }
+
+  this->Internal->Animate(this->GraphModel, ren, ids, fromXYZs, toXYZs);
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdTypeArray* vpMultiGraphRepresentation::GetPickedIds()
+{
+  return this->Internal->PickedIdArray;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetEventRegistry(vtkVgEventTypeRegistry* reg)
+{
+  if (!reg)
+    {
+    return;
+    }
+
+  this->EventTypeRegisty = reg;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTypeRegistry* vpMultiGraphRepresentation::GetEventRegistry() const
+{
+  return this->EventTypeRegisty;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::AddGraph(vtkGraph* graph,
+                                          const std::string& domain)
+{
+  if (!graph)
+    {
+    return;
+    }
+
+  if (this->Internal->VertexColorArray)
+    {
+    graph->GetVertexData()->AddArray(this->Internal->VertexColorArray);
+    }
+
+  vtkCreateMacro(vtkVg2DGraphMapper, mapper);
+  mapper->SetVertexPointSize(this->VertexSize);
+  mapper->SetVertexOpacity(this->VertexOpacity);
+  mapper->SetInputData(graph);
+
+  mapper->SetVertexPositionArrayName(
+    GetPositionArrayNameForLayout(this->GraphLayoutMode));
+
+  // Only show the vertices of the master graph
+  if (domain.compare(vpMultiGraphModel::NoneDomain) == 0)
+    {
+    mapper->SetVertexGeometry(this->Internal->NodeGeometery);
+    mapper->SetVertexColorArrayName("VertexColors");
+    mapper->SetColorVertices(true);
+    mapper->SetLabelArrayName("NodeLabels");
+    mapper->SetLabelVisibility(true);
+    mapper->SetVertexVisibility(1);
+    mapper->SetVertexSelectionArrayName("Selected");
+    mapper->SetUseVertexSelection(true);
+    mapper->SetLabelColor(this->ForegroundColor);
+    }
+  else
+    {
+    mapper->SetVertexVisibility(0);
+    if (vtkUndirectedGraph::SafeDownCast(graph))
+      {
+      mapper->GetEdgeGlyphSource()->SetGlyphTypeToDiamond();
+      mapper->GetEdgeGlyphSource()->SetScale(0.75);
+      }
+    mapper->SetEdgeSelectionArrayName("Selected");
+    mapper->SetUseEdgeSelection(true);
+    mapper->SetUseEdgeLayout(true);
+    mapper->SetEdgeGlyphColor(this->ForegroundColor);
+    }
+
+  mapper->SetEdgeLineWidth(5.0f);
+  mapper->Update();
+
+  vtkInternal::GraphEntity graphEntity;
+  graphEntity.Actor = vtkSmartPointer<vtkActor>::New();
+  graphEntity.Actor->SetMapper(mapper);
+  graphEntity.Actor->PickableOn();
+  graphEntity.Key = domain;
+
+  this->Internal->GraphEntities.push_back(graphEntity);
+
+  this->NewPropCollection->AddItem(graphEntity.Actor);
+  this->ActivePropCollection->AddItem(graphEntity.Actor);
+
+  // Do not turn off visibility of master graph
+  if (domain.compare(vpMultiGraphModel::NoneDomain) != 0)
+    {
+    if (this->CurrentVisibleGraphKey.compare(domain) != 0)
+      {
+      graphEntity.Actor->SetVisibility(0);
+      }
+    else
+      {
+      graphEntity.Actor->SetVisibility(1);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetLabelsVisible(bool visible)
+{
+  for (size_t i = 0, end = this->Internal->GraphEntities.size(); i != end; ++i)
+    {
+    if (this->Internal->GraphEntities[i].Key == vpMultiGraphModel::NoneDomain)
+      {
+      if (vtkVg2DGraphMapper* mapper =
+            vtkVg2DGraphMapper::SafeDownCast(
+              this->Internal->GraphEntities[i].Actor->GetMapper()))
+        {
+        mapper->SetLabelVisibility(visible ? 1 : 0);
+        }
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetEdgeGlyphsVisible(bool visible)
+{
+  for (size_t i = 0, end = this->Internal->GraphEntities.size(); i != end; ++i)
+    {
+    if (this->Internal->GraphEntities[i].Key != vpMultiGraphModel::NoneDomain)
+      {
+      if (vtkVg2DGraphMapper* mapper =
+            vtkVg2DGraphMapper::SafeDownCast(
+              this->Internal->GraphEntities[i].Actor->GetMapper()))
+        {
+        mapper->SetEdgeGlyphVisibility(visible ? 1 : 0);
+        }
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::ResetCachedNodePositions()
+{
+  vtkGraph* graph = this->GraphModel->GetGraph(vpMultiGraphModel::NoneDomain);
+
+  vtkSmartPointer<vtkVertexListIterator> vItr =
+    vtkSmartPointer<vtkVertexListIterator>::New();
+  graph->GetVertices(vItr);
+
+  vpMultiGraphModel::NodePositionType positionType = this->GetNodePositionType();
+
+  double x, y, z;
+  while (vItr->HasNext())
+    {
+    vtkIdType id = vItr->Next();
+    this->GraphModel->GetNodePosition(positionType, id, x, y, z);
+    this->GraphModel->SetCachedPosition(id, x, y, z);
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetLayoutMode(int mode, vtkRenderer* ren,
+  const vgRange<double>& widthRange, const vgRange<double>& heightRange)
+{
+  int prevLayoutMode = this->GraphLayoutMode;
+  this->GraphLayoutMode = mode;
+
+  if (!this->GraphModel)
+    {
+      vtkErrorMacro("<< Graph model is not set. Cannot change layout.");
+    }
+
+  vtkGraph* graph = this->GraphModel->GetGraph(vpMultiGraphModel::NoneDomain);
+  if (!graph)
+    {
+    vtkErrorMacro("<< Master graph does not exist.");
+    }
+
+  switch (this->GraphLayoutMode)
+    {
+    case SortByStartTime:
+      {
+      this->UseSortByStartTimeLayout(ren, widthRange, heightRange, prevLayoutMode);
+      this->GraphModel->LockPositionOfNodeOn();
+      break;
+      }
+    case Spatial:
+      {
+      this->UseSpatialLayout(ren, widthRange, heightRange, prevLayoutMode);
+      // Non-event based nodes can be moved in this mode
+      this->GraphModel->LockPositionOfNodeOff();
+      break;
+      }
+    case RawSpatial:
+      {
+      // Using raw spatial coordinates, no explicit layout is required
+      break;
+      }
+    default:
+      {
+      this->GraphModel->LockPositionOfNodeOff();
+      this->UseRandomLayout(ren, widthRange, heightRange, prevLayoutMode);
+      }
+    };
+
+  // Tell the mapper which array to use for vertex positioning
+  for (size_t i = 0, sz = this->Internal->GraphEntities.size(); i != sz; ++i)
+    {
+    if (vtkVg2DGraphMapper* mapper =
+          vtkVg2DGraphMapper::SafeDownCast(
+            this->Internal->GraphEntities[i].Actor->GetMapper()))
+      {
+      mapper->SetVertexPositionArrayName(
+        GetPositionArrayNameForLayout(this->GraphLayoutMode));
+      }
+    }
+
+  this->CurrentLayoutRenderer = ren;
+  this->CurrentLayoutExtentsX = widthRange;
+  this->CurrentLayoutExtentsY = heightRange;
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+int vpMultiGraphRepresentation::GetLayoutMode()
+{
+  return this->GraphLayoutMode;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::RefreshLayout()
+{
+  if (this->CurrentLayoutRenderer)
+    {
+    this->SetLayoutMode(this->GraphLayoutMode, this->CurrentLayoutRenderer,
+                        this->CurrentLayoutExtentsX,
+                        this->CurrentLayoutExtentsY);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vpMultiGraphModel::NodePositionType
+vpMultiGraphRepresentation::GetNodePositionType()
+{
+  return GetPositionTypeForLayout(this->GraphLayoutMode);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetVertexSize(double size)
+{
+  for (size_t i = 0, end = this->Internal->GraphEntities.size(); i != end; ++i)
+    {
+    if (this->Internal->GraphEntities[i].Key == vpMultiGraphModel::NoneDomain)
+      {
+      if (vtkVg2DGraphMapper* mapper =
+            vtkVg2DGraphMapper::SafeDownCast(
+              this->Internal->GraphEntities[i].Actor->GetMapper()))
+        {
+        mapper->SetVertexPointSize(size);
+        }
+      break;
+      }
+    }
+
+  this->VertexSize = size;
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+double vpMultiGraphRepresentation::GetVertexSize()
+{
+  return this->VertexSize;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetVertexOpacity(double opacity)
+{
+  for (size_t i = 0, end = this->Internal->GraphEntities.size(); i != end; ++i)
+    {
+    if (this->Internal->GraphEntities[i].Key == vpMultiGraphModel::NoneDomain)
+      {
+      if (vtkVg2DGraphMapper* mapper =
+            vtkVg2DGraphMapper::SafeDownCast(
+              this->Internal->GraphEntities[i].Actor->GetMapper()))
+        {
+        mapper->SetVertexOpacity(opacity);
+        }
+      break;
+      }
+    }
+
+  this->VertexOpacity = opacity;
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkMatrix3x3* vpMultiGraphRepresentation::GetGraphToSpatialMatrix()
+{
+  return this->Internal->SpatialTransform->GetMatrix();
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::SetForegroundColor(double color[3])
+{
+  this->ForegroundColor[0] = color[0];
+  this->ForegroundColor[1] = color[1];
+  this->ForegroundColor[2] = color[2];
+  for (size_t i = 0, end = this->Internal->GraphEntities.size(); i != end; ++i)
+    {
+    if (vtkVg2DGraphMapper* mapper =
+          vtkVg2DGraphMapper::SafeDownCast(
+            this->Internal->GraphEntities[i].Actor->GetMapper()))
+      {
+      if (this->Internal->GraphEntities[i].Key == vpMultiGraphModel::NoneDomain)
+        {
+        mapper->SetLabelColor(color);
+        }
+      else
+        {
+        mapper->SetEdgeGlyphColor(color);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vpMultiGraphRepresentation::ComputeNodeStartTime(
+  double x, double y, double z)
+{
+  return this->Internal->ComputeNodeStartTime(x, y, z);
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::GetCurrentLayoutExtents(vgRange<double>& xext,
+                                                         vgRange<double>& yext)
+{
+  xext = this->CurrentLayoutExtentsX;
+  yext = this->CurrentLayoutExtentsY;
+}
+
+//-----------------------------------------------------------------------------
+void vpMultiGraphRepresentation::ReinitializeRenderData()
+{
+  // Add existing actor to the list of to be removed
+  size_t count = this->Internal->GraphEntities.size();
+  for (size_t i = 0; i < count; ++i)
+    {
+    this->ExpirePropCollection->AddItem(this->Internal->GraphEntities[i].Actor);
+    }
+  this->Internal->GraphEntities.clear();
+
+  this->ActivePropCollection->RemoveAllItems();
+  this->NewPropCollection->RemoveAllItems();
+
+  // Reinitialize arrays
+  this->Internal->VertexColorArray =
+    vtkSmartPointer<vtkUnsignedCharArray>::New();
+
+  vtkGraph* masterGraph =
+    this->GraphModel->GetGraph(vpMultiGraphModel::NoneDomain);
+  if (masterGraph)
+    {
+    vtkSmartPointer<vtkVertexListIterator> vItr =
+      vtkSmartPointer<vtkVertexListIterator>::New();
+    masterGraph->GetVertices(vItr);
+
+    vtkSmartPointer<vtkStringArray> nodeTypes =
+      vtkStringArray::SafeDownCast(
+        masterGraph->GetVertexData()->GetAbstractArray("NodeTypes"));
+
+    this->Internal->VertexColorArray->SetName("VertexColors");
+    this->Internal->VertexColorArray->SetNumberOfComponents(4);
+    this->Internal->VertexColorArray->SetNumberOfTuples(
+      masterGraph->GetNumberOfVertices());
+
+    while (vItr->HasNext())
+      {
+      vtkIdType id = vItr->Next();
+      std::string label = nodeTypes->GetValue(id);
+      int typeId = vpEventConfig::GetIdFromString(label.c_str());
+      if (typeId == -1)
+        {
+        // Type string not valid
+        unsigned char c[4] = { 0 };
+        this->Internal->VertexColorArray->SetTupleValue(id, c);
+        continue;
+        }
+
+      vgEventType type = this->EventTypeRegisty->GetTypeById(typeId);
+
+      double rgba[4] = { 1.0, 1.0, 1.0, 1.0 };
+      type.GetColor(rgba[0], rgba[1], rgba[2]);
+      unsigned char c[4];
+      vtkVgColorUtil::convert(rgba, c);
+      this->Internal->VertexColorArray->SetTupleValue(id, c);
+      }
+    }
+}
diff --git a/Applications/VpView/vpMultiGraphRepresentation.h b/Applications/VpView/vpMultiGraphRepresentation.h
new file mode 100644
index 00000000..3d15c3be
--- /dev/null
+++ b/Applications/VpView/vpMultiGraphRepresentation.h
@@ -0,0 +1,214 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpMultiGraphRepresentation_h
+#define __vpMultiGraphRepresentation_h
+
+#include "vpMultiGraphModel.h"
+#include "vpPrimitiveConfig.h"
+
+// VisGUI includes
+#include <vgRange.h>
+#include <vtkVgRepresentationBase.h>
+#include <vtkVgPickData.h>
+
+// VTK includes
+#include <vtkActor.h>
+#include <vtkSmartPointer.h>
+
+// C++ includes
+#include <map>
+
+class vtkVgEventTypeRegistry;
+class vtkVgTimeStamp;
+
+class vtkGraph;
+class vtkGraphActor;
+class vtkHardwareSelector;
+class vtkIdTypeArray;
+class vtkMatrix3x3;
+class vtkPropCollection;
+class vtkRenderer;
+class vtkSelection;
+
+class vpMultiGraphRepresentation : public vtkVgRepresentationBase
+{
+public:
+  enum LayoutMode
+    {
+    Default = 0,
+    SortByStartTime,
+    Spatial,
+    RawSpatial
+    };
+
+  /// \TODO Use vtkVgClassMacro as well
+  vtkTypeMacro(vpMultiGraphRepresentation, vtkVgRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vpMultiGraphRepresentation* New();
+
+  static std::string GetGraphEdgeColorModeString(int mode);
+  static std::string GetGraphEdgeThicknessModeString(int mode);
+
+  /// Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  /// Control visibility.
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  /// Control visibility by domain
+  void SetCurrentVisibleGraph(const std::string& key);
+  const std::string& GetCurrentVisibleGraph() const;
+
+  /// Build and initialize representation structures.
+  void Initialize();
+
+  /// Set the item on the representation.
+  void SetGraphModel(vpMultiGraphModel* graphModel);
+  vpMultiGraphModel* GetGraphModel() const;
+
+  /// Update all the event actors. Generally called by the application layer.
+  virtual void Update();
+
+  /// Pick operation from display (i.e., pixel) coordinates in the current
+  /// renderer. Return the picked eventId if a successful pick occurs,
+  /// otherwise return -1. Note that the pick operation takes into account
+  /// whether the event is currently visible or not.
+  virtual vtkIdType Pick(double renX, double renY,
+                         vtkRenderer* ren, vtkIdType& pickType);
+
+  // Pick within bounding rectangle
+  vtkIdType Pick(double x1, double y1, double x2, double y2,
+                 vtkRenderer* ren, vtkIdType& pickType);
+
+  std::string GetPickedDomain()
+    {
+    return this->PickedGraphDomain;
+    }
+
+  vtkIdTypeArray* GetPickedIds();
+
+  void SetEventRegistry(vtkVgEventTypeRegistry* reg);
+  vtkVgEventTypeRegistry* GetEventRegistry() const;
+
+  void SetLabelsVisible(bool visible);
+  void SetEdgeGlyphsVisible(bool visible);
+
+  // Reset cached positions to current positions
+  void ResetCachedNodePositions();
+
+  /// Set graph layout given specific ranges
+  void SetLayoutMode(int mode, vtkRenderer *ren,
+    const vgRange<double>& widthRange, const vgRange<double>& heightRange);
+  int GetLayoutMode();
+
+  void RefreshLayout();
+
+  vpMultiGraphModel::NodePositionType GetNodePositionType();
+
+  /// Set vertex size
+  void SetVertexSize(double size);
+  double GetVertexSize();
+
+  void SetVertexOpacity(double opacity);
+  double GetVertexOpacity() { return this->VertexOpacity; }
+
+  // Description:
+  // Set/Get the Z offset to be applied to the actor
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(ZOffset, double);
+  vtkGetMacro(ZOffset, double);
+
+  vtkMatrix3x3* GetGraphToSpatialMatrix();
+
+  void SetForegroundColor(double color[3]);
+
+  // Description:
+  // Compute event time using node's position and timeline view
+  vtkVgTimeStamp ComputeNodeStartTime(double x, double y, double z);
+
+  // Description:
+  // Return current layout extents
+  void GetCurrentLayoutExtents(vgRange<double>& xext, vgRange<double>& yext);
+
+protected:
+  /// Add graph to the representation
+  void AddGraph(vtkGraph* graph, const std::string& domain);
+
+  vtkIdType PickNodes(double x1, double y1, double x2, double y2,
+                      vtkRenderer* ren);
+  vtkIdType PickEdges(double x1, double y1, double x2, double y2,
+                      vtkRenderer* ren);
+
+  /// Layout implementations
+  void  UseSortByStartTimeLayout(vtkRenderer* ren,
+    const vgRange<double>& widthRange, const vgRange<double>& heightRange,
+    int prevLayoutMode);
+  void  UseSpatialLayout(vtkRenderer* ren,
+    const vgRange<double>& widthRange, const vgRange<double>& heightRange,
+    int prevLayoutMode);
+  void  UseRandomLayout(vtkRenderer* ren,
+    const vgRange<double>& widthRange, const vgRange<double>& heightRange,
+    int prevLayoutMode);
+
+private:
+  /// Not implemented
+  vpMultiGraphRepresentation(const vpMultiGraphRepresentation&);
+
+  /// Not implemented
+  void operator=(const vpMultiGraphRepresentation&);
+
+  vpMultiGraphRepresentation();
+  virtual ~vpMultiGraphRepresentation();
+
+  /// Reinitialize rendering related data
+  void ReinitializeRenderData();
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  int Visible;
+  std::string CurrentVisibleGraphKey;
+
+  vtkSmartPointer<vpMultiGraphModel> GraphModel;
+
+  class vtkInternal;
+  vtkInternal* Internal;
+
+  vtkSmartPointer<vtkHardwareSelector> Picker;
+  std::string PickedGraphDomain;
+
+  vtkSmartPointer<vtkVgEventTypeRegistry> EventTypeRegisty;
+
+  vpPrimitiveConfig PrimitiveConfig;
+
+  vgRange<double> CurrentLayoutExtentsX;
+  vgRange<double> CurrentLayoutExtentsY;
+
+  vtkSmartPointer<vtkRenderer> CurrentLayoutRenderer;
+
+  int GraphLayoutMode;
+  double VertexSize;
+  double VertexOpacity;
+  double ZOffset;
+
+  double ForegroundColor[3];
+};
+
+#endif // __vpMultiGraphRepresentation_h
diff --git a/Applications/VpView/vpNormalcyMaps.cxx b/Applications/VpView/vpNormalcyMaps.cxx
new file mode 100644
index 00000000..1400ea6a
--- /dev/null
+++ b/Applications/VpView/vpNormalcyMaps.cxx
@@ -0,0 +1,212 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpNormalcyMaps.h"
+
+#ifdef VISGUI_USE_VIDTK
+#include <utilities/token_expansion.h>
+#endif
+
+// Qt includes.
+#include <QDebug>
+#include <QFileInfo>
+#include <QMap>
+#include <QSettings>
+#include <QStringList>
+
+// VTK includes.
+#include <vtkImageData.h>
+#include <vtkPNGReader.h>
+#include <vtkSmartPointer.h>
+#include <vtksys/SystemTools.hxx>
+
+// QtExtensions includes.
+#include <qtStlUtil.h>
+
+// C++ includes.
+#include <vector>
+
+//-----------------------------------------------------------------------------
+class vpNormalcyMaps::vpNormalcyMapsInternal
+{
+public:
+  vpNormalcyMapsInternal() :
+    PrecomputeNormalcy(0)
+    {
+    }
+
+  ~vpNormalcyMapsInternal()
+    {
+    }
+
+  void ReadNormalcyMaps(QSettings& settings);
+
+  vtkSmartPointer<vtkImageData> CreateImageData(const QString& source);
+
+  int PrecomputeNormalcy;
+
+  typedef QMap<QString, QString>                        NormalcyMapType;
+  typedef QMap<QString, vtkSmartPointer<vtkImageData> > NormalcyImageMapType;
+  typedef QMap<QString, vtkSmartPointer<vtkActor> >     NormalcyActorMapType;
+
+  typedef NormalcyMapType::iterator             NormalcyMapItr;
+  typedef NormalcyMapType::const_iterator       NormalcyMapConstItr;
+  typedef NormalcyImageMapType::iterator        NormalcyImageMapItr;
+  typedef NormalcyImageMapType::const_iterator  NormalcyImageMapConstItr;
+
+  NormalcyMapType       NormalcyMap;
+  NormalcyImageMapType  NormalcyImageMap;
+  NormalcyActorMapType  NormalcyActorMap;
+};
+
+
+//-----------------------------------------------------------------------------
+void vpNormalcyMaps::vpNormalcyMapsInternal::ReadNormalcyMaps(QSettings& settings)
+{
+  settings.beginGroup("NormalcyMaps");
+  int size = settings.beginReadArray("NormalcyMaps");
+
+  for (int i = 0; i < size; ++i)
+    {
+    settings.setArrayIndex(i);
+    QString type = settings.value("Key").toString();
+    QString source = settings.value("Source").toString();
+
+    // Expand tokens if any.
+#ifdef VISGUI_USE_VIDTK
+    source = qtString(vidtk::token_expansion::expand_token(stdString(source)));
+#endif
+
+    if (!this->PrecomputeNormalcy)
+      {
+      this->NormalcyMap.insert(type, source);
+      }
+    else
+      {
+      // \todo: Implement this.
+      }
+    }
+  settings.endArray();
+  settings.endGroup();
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkImageData>
+vpNormalcyMaps::vpNormalcyMapsInternal::CreateImageData(const QString& source)
+{
+  if (!QFileInfo(source).exists())
+    {
+    qDebug() << "Normalcy file not found:" << source;
+    return 0;
+    }
+
+  const char* filename = stdString(source).c_str();
+  QString ext = qtString(vtksys::SystemTools::GetFilenameLastExtension(filename));
+  if (QString::compare("png", ext))
+    {
+    qDebug() << "Format " << ext << "is not supported";
+    return 0;
+    }
+
+
+  vtkSmartPointer<vtkPNGReader> reader(vtkSmartPointer<vtkPNGReader>::New());
+  reader->SetFileName(filename);
+  reader->Update();
+
+  vtkSmartPointer<vtkImageData> output(vtkSmartPointer<vtkImageData>::New());
+  output->ShallowCopy(reader->GetOutput());
+  return output;
+}
+
+//-----------------------------------------------------------------------------
+vpNormalcyMaps::vpNormalcyMaps()
+{
+  this->Internal = new vpNormalcyMapsInternal();
+}
+
+//-----------------------------------------------------------------------------
+vpNormalcyMaps::~vpNormalcyMaps()
+{
+  delete this->Internal;
+
+  this->Internal = 0;
+}
+
+//-----------------------------------------------------------------------------
+int vpNormalcyMaps::LoadFromFile(const QString& filename)
+{
+  if (!QFileInfo(filename).exists())
+    {
+    qDebug() << "Normalcy maps file not found:" << filename;
+    return 0;
+    }
+
+  QSettings settings(filename, QSettings::IniFormat);
+  this->Internal->ReadNormalcyMaps(settings);
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+void vpNormalcyMaps::SetPrecompute(int state)
+{
+  this->Internal->PrecomputeNormalcy = state;
+}
+
+//-----------------------------------------------------------------------------
+int vpNormalcyMaps::GetPrecompute() const
+{
+  return this->Internal->PrecomputeNormalcy;
+}
+
+//-----------------------------------------------------------------------------
+QString vpNormalcyMaps::GetNormalcySource(const QString& key) const
+{
+  vpNormalcyMapsInternal::NormalcyMapConstItr constItr =
+    this->Internal->NormalcyMap.find(key);
+  if (constItr != this->Internal->NormalcyMap.end())
+    {
+    return constItr.value();
+    }
+  else
+    {
+    return QString("");
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkImageData>
+vpNormalcyMaps::GetNormalcyImage(const QString& key) const
+{
+  vpNormalcyMapsInternal::NormalcyImageMapConstItr imageMapItr =
+    this->Internal->NormalcyImageMap.find(key);
+
+  if (imageMapItr != this->Internal->NormalcyImageMap.end())
+    {
+    return imageMapItr.value();
+    }
+  else
+    {
+    vpNormalcyMapsInternal::NormalcyMapConstItr constItr =
+      this->Internal->NormalcyMap.find(key);
+
+    return this->Internal->CreateImageData(constItr.key());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpNormalcyMaps::GetAllNormalcyKeys(QList<QString>& keys) const
+{
+  keys = this->Internal->NormalcyMap.uniqueKeys();
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkSmartPointer<vtkActor> > vpNormalcyMaps::GetAllNormalcyActors() const
+{
+  // \todo: Implement this.
+  QList< vtkSmartPointer<vtkActor> > actorList;
+
+  return actorList;
+}
diff --git a/Applications/VpView/vpNormalcyMaps.h b/Applications/VpView/vpNormalcyMaps.h
new file mode 100644
index 00000000..e0307b81
--- /dev/null
+++ b/Applications/VpView/vpNormalcyMaps.h
@@ -0,0 +1,43 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// Qt includes.
+#include <QString>
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+// Forward declarations.
+class vtkActor;
+class vtkImageData;
+
+class vpNormalcyMaps
+{
+public:
+
+  vpNormalcyMaps();
+  ~vpNormalcyMaps();
+
+  int  LoadFromFile(const QString& filename);
+
+  void SetPrecompute(int state = 0);
+  int  GetPrecompute() const;
+
+  QString GetNormalcySource(const QString& key) const;
+
+  vtkSmartPointer<vtkImageData> GetNormalcyImage(const QString& key) const;
+
+  void GetAllNormalcyKeys(QList<QString>& keys) const;
+
+  QList<vtkSmartPointer<vtkActor> > GetAllNormalcyActors() const;
+
+private:
+  class vpNormalcyMapsInternal;
+  vpNormalcyMapsInternal* Internal;
+
+  vpNormalcyMaps(const vpNormalcyMaps& src);  // Not implemented.
+  void operator=(const vpNormalcyMaps& src);  // Not implemented.
+};
diff --git a/Applications/VpView/vpObjectInfoPanel.cxx b/Applications/VpView/vpObjectInfoPanel.cxx
new file mode 100644
index 00000000..8a0567ca
--- /dev/null
+++ b/Applications/VpView/vpObjectInfoPanel.cxx
@@ -0,0 +1,711 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "ui_vpObjectInfoPanel.h"
+
+#include "vpObjectInfoPanel.h"
+
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QLineEdit>
+#include <QMessageBox>
+#include <QRegExpValidator>
+
+#include <qtUtil.h>
+
+#include "vgEventType.h"
+#include "vgTrackType.h"
+#include "vgUnixTime.h"
+
+#include "vpEditTrackTypesDialog.h"
+#include "vpTrackConfig.h"
+#include "vpTrackIO.h"
+#include "vpUtils.h"
+#include "vpViewCore.h"
+
+#include "vtkVgActivityManager.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgTrackModel.h"
+
+#include "vtkVgActivity.h"
+#include "vtkVgEvent.h"
+#include "vtkVgTrack.h"
+
+//-----------------------------------------------------------------------------
+vpObjectInfoPanel::vpObjectInfoPanel(QWidget* p)
+  : QWidget(p), Track(0), ChildEvent(0), Editing(false),
+    ParentTrackChangesToApply(false), PrevType(-1)
+{
+  this->Ui = new Ui::vpObjectInfoPanel;
+  this->Ui->setupUi(this);
+
+  this->Ui->trackIdEdit->setValidator(new QIntValidator(0, INT_MAX, this));
+
+  connect(this->Ui->trackStartSpinBox, SIGNAL(valueChanged(int)),
+          this, SLOT(StartFrameChanged(int)));
+
+  connect(this->Ui->trackEndSpinBox, SIGNAL(valueChanged(int)),
+          this, SLOT(EndFrameChanged(int)));
+
+  connect(this->Ui->editProperties, SIGNAL(clicked(bool)),
+          this, SLOT(EditProperties()));
+
+  connect(this->Ui->trackType, SIGNAL(activated(int)),
+          this, SLOT(UpdateTrackType(int)));
+
+  this->LastStartFrameVal = this->LastEndFrameVal = -1;
+
+  this->ShowEmptyPage();
+}
+
+//-----------------------------------------------------------------------------
+vpObjectInfoPanel::~vpObjectInfoPanel()
+{
+  delete this->Ui;
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::ShowEmptyPage()
+{
+  this->Cleanup();
+  this->Ui->editProperties->hide();
+
+  this->Ui->objectInfo->setCurrentWidget(this->Ui->emptyPage);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::Initialize(vpViewCore* viewCore,
+                                   vtkVgActivityManager* activityManager,
+                                   vtkVgEventModel* eventModel,
+                                   vtkVgTrackModel* trackModel,
+                                   vtkVgEventTypeRegistry* eventTypes,
+                                   vpTrackConfig* trackTypes,
+                                   const vpTrackIO* trackIO)
+{
+  this->ViewCoreInstance = viewCore;
+  this->ActivityManager = activityManager;
+  this->EventModel = eventModel;
+  this->TrackModel = trackModel;
+  this->EventTypeRegistry = eventTypes;
+  this->TrackConfig = trackTypes;
+  this->TrackIO = trackIO;
+
+  this->Editing = false;
+
+  this->BuildTypeList();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::ShowActivityInfo(int index)
+{
+  this->Cleanup();
+  this->Ui->editProperties->hide();
+
+  vtkVgActivity* a = this->ActivityManager->GetActivity(index);
+
+  this->Ui->activityType->setText(
+    this->ActivityManager->GetActivityName(a->GetType()));
+
+  vtkVgTimeStamp startFrame, endFrame;
+  a->GetActivityFrameExtents(startFrame, endFrame);
+
+  int frameOffset =
+    this->ViewCoreInstance->getUseZeroBasedFrameNumbers() ? 0 : 1;
+
+  this->Ui->typeColor->setVisible(false);
+
+  this->Ui->activityStartFrame->setText(
+    vpUtils::GetTimeAndFrameNumberString(startFrame, frameOffset));
+  this->Ui->activityEndFrame->setText(
+    vpUtils::GetTimeAndFrameNumberString(endFrame, frameOffset));
+
+  this->Ui->activitySaliency->setText(QString::number(a->GetSaliency()));
+  this->Ui->activityProbability->setText(QString::number(a->GetProbability()));
+
+  this->Ui->objectInfo->setCurrentWidget(this->Ui->activityPage);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::ShowEventInfo(int id, int /*parentId*/, int /*index*/)
+{
+  this->Cleanup();
+  this->Ui->editProperties->hide();
+
+  vtkVgEvent* e = this->EventModel->GetEvent(id);
+
+  this->Ui->eventType->setText(this->EventTypeRegistry->GetTypeById(
+                                 e->GetActiveClassifierType()).GetName());
+
+  this->Ui->eventNormalcy->setText(QString::number(e->GetActiveClassifierNormalcy()));
+
+  vtkVgTimeStamp startFrame = e->GetStartFrame();
+  vtkVgTimeStamp endFrame = e->GetEndFrame();
+
+  this->Ui->typeColor->setVisible(false);
+
+  int frameOffset =
+    this->ViewCoreInstance->getUseZeroBasedFrameNumbers() ? 0 : 1;
+
+  this->Ui->eventStartFrame->setText(
+    vpUtils::GetTimeAndFrameNumberString(startFrame, frameOffset));
+  this->Ui->eventEndFrame->setText(
+    vpUtils::GetTimeAndFrameNumberString(endFrame, frameOffset));
+
+  this->Ui->objectInfo->setCurrentWidget(this->Ui->eventPage);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::ShowTrackInfo(int id, int parentId, int index)
+{
+  this->Cleanup();
+  this->Ui->editProperties->show();
+
+  this->SetEditProperties(false);
+
+  // use track info from parent event if we have one
+  if (parentId >= 0)
+    {
+    this->ShowParentTrackInfo(id, parentId, index);
+    }
+  else
+    {
+    this->Ui->trackGroup->setTitle("Track");
+    this->Ui->typeColor->setVisible(true);
+    this->Ui->trackPVO->setVisible(true);
+    this->Ui->trackPVOLabel->setVisible(true);
+    this->Ui->trackNormalcyLabel->setText("Normalcy:");
+    this->ShowTrackInfo(id);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::ShowSceneElementInfo(int id)
+{
+  this->Cleanup();
+  this->Ui->editProperties->show();
+
+  this->SetEditProperties(false);
+
+  this->Ui->trackGroup->setTitle("Scene Element");
+  this->Ui->typeColor->setVisible(true);
+  this->Ui->trackPVO->setVisible(false);
+  this->Ui->trackPVOLabel->setVisible(false);
+  this->Ui->trackNormalcyLabel->setText("Probability:");
+  this->ShowTrackInfo(id);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::ShowTrackInfo(int id)
+{
+  this->Cleanup();
+
+  vtkVgTrack* t = this->TrackModel->GetTrack(id);
+  this->Track = t;
+
+  int displayId = t->GetDisplayFlags() & vtkVgTrack::DF_SceneElement
+                    ? this->TrackModel->GetSceneElementIdForTrack(id) : id;
+
+  this->Ui->trackId->setText(QString::number(displayId));
+  this->SetCurrentType(t->GetType());
+  this->Ui->trackNormalcy->setText(QString::number(t->GetNormalcy()));
+
+  vtkVgTimeStamp startFrame = t->GetStartFrame();
+  vtkVgTimeStamp endFrame = t->GetEndFrame();
+
+  QString startTime = vgUnixTime(startFrame.GetTime()).timeString();
+  QString endTime = vgUnixTime(endFrame.GetTime()).timeString();
+
+  int frameOffset =
+    this->ViewCoreInstance->getUseZeroBasedFrameNumbers() ? 0 : 1;
+
+  this->Ui->trackStartFrame->setText(
+    vpUtils::GetTimeAndFrameNumberString(startFrame, frameOffset));
+  this->Ui->trackEndFrame->setText(
+    vpUtils::GetTimeAndFrameNumberString(endFrame, frameOffset));
+
+  double pvo[3];
+  t->GetPVO(pvo);
+  QString str("P: %1, V: %2, O: %3");
+  this->Ui->trackPVO->setText(str.arg(pvo[0], 0, 'f', 2)
+                                 .arg(pvo[1], 0, 'f', 2)
+                                 .arg(pvo[2], 0, 'f', 2));
+
+  this->Ui->objectInfo->setCurrentWidget(this->Ui->trackPage);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::ShowParentTrackInfo(int id, int parentId, int index)
+{
+  this->Cleanup();
+  this->ParentTrackChangesToApply = false;
+
+  vtkVgEvent* event = this->EventModel->GetEvent(parentId);
+  this->ChildEvent = event;
+
+  vtkVgTrack* track;
+  vtkVgTimeStamp startFrame, endFrame;
+  event->GetTrack(index, track, startFrame, endFrame);
+
+  this->InitialStartFrame = startFrame;
+  this->InitialEndFrame = endFrame;
+
+  this->Track = track;
+  this->TrackIndex = index;
+
+  this->UpdateParentTrackEventTimes();
+
+  this->Ui->parentTrackId->setText(QString::number(id));
+
+  int frameOffset =
+    this->ViewCoreInstance->getUseZeroBasedFrameNumbers() ? 0 : 1;
+  int minFrameNum = track->GetStartFrame().GetFrameNumber() + frameOffset;
+  int maxFrameNum = track->GetEndFrame().GetFrameNumber() + frameOffset;
+
+  int startVal = startFrame.GetFrameNumber() + frameOffset;
+  int endVal = endFrame.GetFrameNumber() + frameOffset;
+
+  this->Ui->trackStartSpinBox->blockSignals(true);
+  this->Ui->trackEndSpinBox->blockSignals(true);
+
+  this->Ui->trackStartSpinBox->setMinimum(minFrameNum);
+  this->Ui->trackStartSpinBox->setMaximum(std::min(maxFrameNum, endVal));
+
+  this->Ui->trackEndSpinBox->setMinimum(std::max(minFrameNum, startVal));
+  this->Ui->trackEndSpinBox->setMaximum(maxFrameNum);
+
+  this->Ui->trackStartSpinBox->setValue(startVal);
+  this->Ui->trackEndSpinBox->setValue(endVal);
+  this->LastStartFrameVal = startVal;
+  this->LastEndFrameVal = endVal;
+
+  this->Ui->trackEndSpinBox->blockSignals(false);
+  this->Ui->trackStartSpinBox->blockSignals(false);
+
+  this->Ui->objectInfo->setCurrentWidget(this->Ui->parentTrackPage);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::StartFrameChanged(int val)
+{
+  int frameOffset =
+    this->ViewCoreInstance->getUseZeroBasedFrameNumbers() ? 0 : 1;
+
+  // update the limit of the other spinbox
+  int minFrameNum = this->Track->GetStartFrame().GetFrameNumber() + frameOffset;
+  this->Ui->trackEndSpinBox->setMinimum(std::max(minFrameNum, val));
+
+  vtkVgTimeStamp timeStamp;
+  timeStamp.SetFrameNumber(val -= frameOffset);
+  bool advanced = val > (this->LastStartFrameVal - frameOffset);
+
+  // snap the spin box to the closest valid frame
+  if (!this->FindClosestValidFrame(timeStamp, advanced))
+    {
+    this->Ui->trackStartSpinBox->setValue(this->LastStartFrameVal);
+    }
+  else
+    {
+    this->LastStartFrameVal = val + frameOffset;
+    this->ChildEvent->SetTrackStartFrame(this->TrackIndex, timeStamp);
+
+    if (timeStamp.GetFrameNumber() != static_cast<unsigned>(val))
+      {
+      this->Ui->trackStartSpinBox->setValue(timeStamp.GetFrameNumber() +
+                                            frameOffset);
+      }
+    this->ParentTrackChangesToApply = true;
+    this->UpdateParentTrackEventTimes();
+    this->EventModel->Modified();
+    this->ViewCoreInstance->updateScene();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::EndFrameChanged(int val)
+{
+  int frameOffset =
+    this->ViewCoreInstance->getUseZeroBasedFrameNumbers() ? 0 : 1;
+
+  // update the limit of the other spinbox
+  int maxFrameNum = this->Track->GetEndFrame().GetFrameNumber() + frameOffset;
+  this->Ui->trackStartSpinBox->setMaximum(std::min(maxFrameNum, val));
+
+  vtkVgTimeStamp timeStamp;
+  timeStamp.SetFrameNumber(val -= frameOffset);
+  bool advanced = val > (this->LastEndFrameVal - frameOffset);
+
+  // snap the spin box to the closest valid frame
+  if (!this->FindClosestValidFrame(timeStamp, advanced))
+    {
+    this->Ui->trackEndSpinBox->setValue(this->LastEndFrameVal);
+    }
+  else
+    {
+    this->LastEndFrameVal = val + frameOffset;
+    this->ChildEvent->SetTrackEndFrame(this->TrackIndex, timeStamp);
+
+    if (timeStamp.GetFrameNumber() != static_cast<unsigned>(val))
+      {
+      this->Ui->trackEndSpinBox->setValue(timeStamp.GetFrameNumber() +
+                                          frameOffset);
+      }
+
+    this->ParentTrackChangesToApply = true;
+    this->UpdateParentTrackEventTimes();
+    this->EventModel->Modified();
+    this->ViewCoreInstance->updateScene();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::EditProperties()
+{
+  this->SetEditProperties(!this->Editing);
+
+  QWidget* widget = this->Ui->objectInfo->currentWidget();
+  if (widget == this->Ui->trackPage)
+    {
+    this->EditTrackInfo();
+    }
+  else if (widget == this->Ui->parentTrackPage)
+    {
+    this->EditParentTrackInfo();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::EditTrackInfo()
+{
+  this->Ui->trackType->setEnabled(this->Editing);
+
+  if (this->Editing)
+    {
+    this->Ui->trackIdEdit->setText(this->Ui->trackId->text());
+    this->Ui->trackIdEdit->selectAll();
+    this->Ui->trackIdWidget->setCurrentIndex(1);
+    }
+  else
+    {
+    bool ok;
+    int id = this->Ui->trackIdEdit->text().toInt(&ok);
+
+    vgObjectTypeDefinitions::enumObjectTypes objectType =
+      vgObjectTypeDefinitions::Track;
+    if (this->Track->GetDisplayFlags() & vtkVgTrack::DF_SceneElement)
+      {
+      id = this->TrackModel->GetTrackIdForSceneElement(id);
+      objectType = vgObjectTypeDefinitions::SceneElement;
+      }
+
+    if (ok && id != this->Track->GetId())
+      {
+      if (this->TrackModel->GetTrack(id))
+        {
+        QMessageBox::warning(0, QString(),
+                             "A track with this ID already exists.");
+        }
+      else
+        {
+        // update the id
+        this->TrackModel->RemoveTrack(this->Track->GetId());
+        this->Track->SetId(id);
+        this->TrackModel->AddTrack(this->Track);
+        emit this->ObjectIdChanged(objectType, this->Track->GetId());
+        }
+      }
+    this->Ui->trackIdWidget->setCurrentIndex(0);
+
+    int typeIndex = this->GetCurrentType();
+
+    // update color for the type (if changed)
+    if (typeIndex != -1 && this->Ui->typeColor->isVisible())
+      {
+      int nRGB[3];
+      this->Ui->typeColor->color().getRgb(nRGB, nRGB + 1, nRGB + 2);
+      if (nRGB[0] != this->TrackTypeRGB[0] ||
+          nRGB[1] != this->TrackTypeRGB[1] ||
+          nRGB[2] != this->TrackTypeRGB[2])
+        {
+        // if color for the type changed, we need to change track color
+        // of all tracks (which includes scene elements) of this type
+        vgTrackType updatedType =
+          this->TrackConfig->GetTrackTypeByIndex(typeIndex);
+        double rgb[3] = {nRGB[0] / 255.0, nRGB[1] / 255.0, nRGB[2] / 255.0};
+        updatedType.SetColor(rgb[0], rgb[1], rgb[2]);
+        this->TrackConfig->SetType(typeIndex, updatedType);
+        emit this->TypeColorChanged(typeIndex, rgb);
+        }
+      }
+
+    // update the type
+    if (this->Track->GetType() != typeIndex)
+      {
+      double rgb[3];
+      this->Track->SetType(typeIndex);
+      if (typeIndex == -1)
+        {
+        vpTrackIO::GetDefaultTrackColor(this->Track->GetId(), rgb);
+        }
+      else
+        {
+        this->TrackConfig->GetTrackTypeByIndex(typeIndex).GetColor(rgb[0],
+                                                                   rgb[1],
+                                                                   rgb[2]);
+        }
+
+      this->Track->SetColor(rgb[0], rgb[1], rgb[2]);
+
+      this->TrackModel->Modified();
+      emit this->ObjectTypeChanged(objectType, this->Track->GetId());
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::EditParentTrackInfo()
+{
+  if (!this->Editing)
+    {
+    this->ParentTrackChangesToApply = false;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::UpdateTrackType(int type)
+{
+  if (type == this->Ui->trackType->count() - 2)
+    {
+    // <New..>
+    QDialog dlg;
+    dlg.setWindowTitle("New Track Type");
+    QVBoxLayout* layout = new QVBoxLayout(&dlg);
+    QLineEdit* lineEdit = new QLineEdit;
+    QDialogButtonBox* btnBox = new QDialogButtonBox(QDialogButtonBox::Ok |
+                                                    QDialogButtonBox::Cancel);
+
+    // Don't allow whitespace or punctuation in the type
+    lineEdit->setValidator(new QRegExpValidator(QRegExp("\\w+"), lineEdit));
+
+    layout->addWidget(lineEdit);
+    layout->addWidget(btnBox);
+    connect(btnBox, SIGNAL(accepted()), &dlg, SLOT(accept()));
+    connect(btnBox, SIGNAL(rejected()), &dlg, SLOT(reject()));
+    connect(lineEdit, SIGNAL(returnPressed()), &dlg, SLOT(accept()));
+
+    // New track type
+    QString label;
+    if (dlg.exec() == QDialog::Rejected || (label = lineEdit->text()).isEmpty())
+      {
+      // User cancelled or didn't enter any text
+      this->SetCurrentType(this->Track->GetType());
+      return;
+      }
+
+    int index = this->TrackConfig->GetTrackTypeIndex(qPrintable(label));
+    if (index >= 0 || label == this->Ui->trackType->itemText(0))
+      {
+      // User typed a string that is an existing track type
+      this->SetCurrentType(index);
+      }
+    else
+      {
+      // Add the new type
+      vgTrackType tt;
+      tt.SetId(qPrintable(label));
+      this->TrackConfig->AddType(tt);
+      type = this->GetCurrentType();
+      // Rebuild the combo box
+      this->BuildTypeList();
+      // Set the combo box to the new type
+      this->Ui->trackType->setCurrentIndex(
+        this->Ui->trackType->findText(label));
+      }
+    }
+  else if (type == this->Ui->trackType->count() - 1)
+    {
+    // <Edit..>
+    vpEditTrackTypesDialog dlg(this->TrackConfig, this->TrackModel, this);
+    dlg.exec();
+    this->BuildTypeList();
+    this->SetCurrentType(this->PrevType);
+    }
+  else
+    {
+    this->PrevType = this->GetCurrentType();
+    int index = type - 1;
+    if (index == -1)
+      {
+      this->Ui->typeColor->setVisible(false);
+      }
+    else
+      {
+      double rgb[3];
+      this->Ui->typeColor->setVisible(true);
+      this->TrackConfig->GetTrackTypeByIndex(index).GetColor(rgb[0],
+                                                             rgb[1],
+                                                             rgb[2]);
+      this->TrackTypeRGB[0] = 255.0 * rgb[0];
+      this->TrackTypeRGB[1] = 255.0 * rgb[1];
+      this->TrackTypeRGB[2] = 255.0 * rgb[2];
+      this->Ui->typeColor->setColor(QColor(this->TrackTypeRGB[0],
+                                           this->TrackTypeRGB[1],
+                                           this->TrackTypeRGB[2]));
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpObjectInfoPanel::FindClosestValidFrame(vtkVgTimeStamp& current,
+                                              bool next)
+{
+  // HACK: Ask the reader as well as the track itself for the closest frame. If
+  // both agree on the frame number, use the reader timestamp since it is more
+  // likely to contain both time and frame. We can't just always use the reader
+  // frame, since the reader does not get updated when adding or removing points
+  // from tracks. And we can't just use the track timestamp without potentially
+  // throwing out time info, since we currently use frame number only when
+  // setting the initial track points.
+  vtkVgTimeStamp readerFrame;
+  bool valid;
+
+  if (next)
+    {
+    this->TrackIO->GetNextValidTrackFrame(this->Track,
+                                          current.GetFrameNumber(),
+                                          readerFrame);
+    valid = this->Track->GetFrameAtOrAfter(current);
+    }
+  else
+    {
+    this->TrackIO->GetPrevValidTrackFrame(this->Track,
+                                          current.GetFrameNumber(),
+                                          readerFrame);
+    valid = this->Track->GetFrameAtOrBefore(current);
+    }
+
+  if (valid && readerFrame.IsValid() &&
+      current.GetFrameNumber() == readerFrame.GetFrameNumber())
+    {
+    current = readerFrame;
+    return true;
+    }
+
+  return valid;
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::UpdateParentTrackEventTimes()
+{
+  vtkVgTrack* track;
+  vtkVgTimeStamp startFrame, endFrame;
+  this->ChildEvent->GetTrack(this->TrackIndex, track, startFrame, endFrame);
+
+  QString startTime = vgUnixTime(startFrame.GetTime()).timeString();
+  QString endTime = vgUnixTime(endFrame.GetTime()).timeString();
+
+  this->Ui->parentTrackEventStartTime->setText(startTime);
+  this->Ui->parentTrackEventEndTime->setText(endTime);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::SetEditProperties(bool edit)
+{
+  this->Editing = edit;
+  this->Ui->trackType->setEnabled(edit);
+  this->Ui->typeColor->setEnabled(edit);
+  this->Ui->trackStartSpinBox->setEnabled(edit);
+  this->Ui->trackEndSpinBox->setEnabled(edit);
+
+  if (edit)
+    {
+    this->Ui->editProperties->setIcon(qtUtil::standardIcon("apply", 16));
+    this->Ui->editProperties->setToolTip("Apply Changes");
+
+    this->Ui->trackIdEdit->setText(this->Ui->trackId->text());
+    this->Ui->trackIdWidget->setCurrentIndex(1);
+    this->Ui->trackIdEdit->setFocus();
+    this->Ui->trackIdEdit->selectAll();
+    }
+  else
+    {
+    this->Ui->editProperties->setIcon(qtUtil::standardIcon("configure", 16));
+    this->Ui->editProperties->setToolTip("Modify");
+    this->Ui->trackIdWidget->setCurrentIndex(0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::Cleanup()
+{
+  if (this->Ui->objectInfo->currentWidget() == this->Ui->parentTrackPage)
+    {
+    // If the user switched away without applying changes, restore the original
+    // state of the child event.
+    if (this->ParentTrackChangesToApply)
+      {
+      this->ParentTrackChangesToApply = false;
+      this->ChildEvent->SetTrackStartFrame(this->TrackIndex,
+                                           this->InitialStartFrame);
+      this->ChildEvent->SetTrackEndFrame(this->TrackIndex,
+                                         this->InitialEndFrame);
+      this->EventModel->Modified();
+      this->ViewCoreInstance->updateScene();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::BuildTypeList()
+{
+  this->Ui->trackType->clear();
+  this->Ui->trackType->addItem("None", -1);
+
+  for (int i = 0, end = this->TrackConfig->GetNumberOfTypes(); i < end; ++i)
+    {
+    const char* name = this->TrackConfig->GetTrackTypeByIndex(i).GetName();
+    if (*name)
+      {
+      this->Ui->trackType->addItem(name, i);
+      }
+    }
+
+  this->Ui->trackType->insertSeparator(this->Ui->trackType->count());
+
+  this->Ui->trackType->addItem("<New...>", -1);
+  this->Ui->trackType->addItem("<Edit...>", -1);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectInfoPanel::SetCurrentType(int index)
+{
+  this->PrevType = index;
+  int cbIndex = this->Ui->trackType->findData(index);
+  this->Ui->trackType->setCurrentIndex(cbIndex == -1 ? 0 : cbIndex);
+  double rgb[3];
+  if (index == -1 || cbIndex == 0)
+    {
+    this->Ui->typeColor->setVisible(false);
+    }
+  else
+    {
+    this->Ui->typeColor->setVisible(true);
+    this->TrackConfig->GetTrackTypeByIndex(index).GetColor(rgb[0], rgb[1], rgb[2]);
+    this->TrackTypeRGB[0] = 255.0 * rgb[0];
+    this->TrackTypeRGB[1] = 255.0 * rgb[1];
+    this->TrackTypeRGB[2] = 255.0 * rgb[2];
+    this->Ui->typeColor->setColor(QColor(this->TrackTypeRGB[0],
+                                         this->TrackTypeRGB[1],
+                                         this->TrackTypeRGB[2]));
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpObjectInfoPanel::GetCurrentType()
+{
+  return this->Ui->trackType->itemData(
+           this->Ui->trackType->currentIndex()).toInt();
+}
diff --git a/Applications/VpView/vpObjectInfoPanel.h b/Applications/VpView/vpObjectInfoPanel.h
new file mode 100644
index 00000000..73ae437b
--- /dev/null
+++ b/Applications/VpView/vpObjectInfoPanel.h
@@ -0,0 +1,110 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpObjectInfoPanel_h
+#define __vpObjectInfoPanel_h
+
+#include <QWidget>
+
+#include <vtkSmartPointer.h>
+#include <vtkType.h>
+
+#include "vtkVgTimeStamp.h"
+
+namespace Ui
+{
+class vpObjectInfoPanel;
+}
+
+class vpTrackConfig;
+class vpTrackIO;
+class vpViewCore;
+class vtkVgActivityManager;
+class vtkVgEvent;
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+class vtkVgTrack;
+class vtkVgTrackModel;
+
+class vpObjectInfoPanel : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vpObjectInfoPanel(QWidget* parent = 0);
+  virtual ~vpObjectInfoPanel();
+
+  void ShowActivityInfo(int index);
+  void ShowEventInfo(int id, int parentId, int index);
+  void ShowTrackInfo(int id, int parentId, int index);
+  void ShowSceneElementInfo(int id);
+  void ShowEmptyPage();
+
+  void Initialize(vpViewCore* viewCore, vtkVgActivityManager* activityManager,
+                  vtkVgEventModel* eventModel, vtkVgTrackModel* trackModel,
+                  vtkVgEventTypeRegistry* eventTypes, vpTrackConfig* trackTypes,
+                  const vpTrackIO* trackIO);
+
+signals:
+  void ObjectIdChanged(int objectType, int newId);
+  void ObjectTypeChanged(int objectType, int id);
+  void TypeColorChanged(int typeIndex, double *rgb);
+
+private slots:
+  void StartFrameChanged(int val);
+  void EndFrameChanged(int val);
+
+  void EditProperties();
+
+  void UpdateTrackType(int type);
+
+private:
+  void EditTrackInfo();
+  void EditParentTrackInfo();
+
+  void ShowTrackInfo(int id);
+  void ShowParentTrackInfo(int id, int parentId, int index);
+
+  bool FindClosestValidFrame(vtkVgTimeStamp& current, bool next);
+
+  void UpdateParentTrackEventTimes();
+
+  void SetEditProperties(bool edit);
+
+  void Cleanup();
+
+  void BuildTypeList();
+  void SetCurrentType(int index);
+  int  GetCurrentType();
+
+private:
+  Ui::vpObjectInfoPanel* Ui;
+
+  vpViewCore*            ViewCoreInstance;
+  vtkVgActivityManager*  ActivityManager;
+  vtkVgEventModel*       EventModel;
+  vtkVgTrackModel*       TrackModel;
+  const vpTrackIO*       TrackIO;
+
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+  vpTrackConfig* TrackConfig;;
+
+  int TrackIndex;
+  vtkSmartPointer<vtkVgTrack> Track;
+  vtkSmartPointer<vtkVgEvent> ChildEvent;
+
+  int LastStartFrameVal, LastEndFrameVal;
+  bool Editing;
+
+  vtkVgTimeStamp InitialStartFrame;
+  vtkVgTimeStamp InitialEndFrame;
+  bool ParentTrackChangesToApply;
+
+  int PrevType;
+  int TrackTypeRGB[3];
+};
+
+#endif
diff --git a/Applications/VpView/vpObjectInfoPanel.ui b/Applications/VpView/vpObjectInfoPanel.ui
new file mode 100644
index 00000000..5c504018
--- /dev/null
+++ b/Applications/VpView/vpObjectInfoPanel.ui
@@ -0,0 +1,522 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpObjectInfoPanel</class>
+ <widget class="QWidget" name="vpObjectInfoPanel">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>234</width>
+    <height>216</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0" rowspan="2" colspan="2">
+    <widget class="QStackedWidget" name="objectInfo">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
+     <widget class="QWidget" name="emptyPage">
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <property name="topMargin">
+        <number>2</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
+       <property name="bottomMargin">
+        <number>2</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBox_4">
+         <property name="title">
+          <string>Not Available</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="activityPage">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <property name="topMargin">
+        <number>2</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
+       <property name="bottomMargin">
+        <number>2</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Activity</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_3">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_10">
+            <property name="text">
+             <string>Type:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLabel" name="activityType">
+            <property name="text">
+             <string>Type:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>Saliency:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="activitySaliency">
+            <property name="text">
+             <string>Saliency:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>Probability:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="activityProbability">
+            <property name="text">
+             <string>Probability:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_18">
+            <property name="text">
+             <string>Start:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLabel" name="activityStartFrame">
+            <property name="text">
+             <string>Start Frame:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_20">
+            <property name="text">
+             <string>End:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLabel" name="activityEndFrame">
+            <property name="text">
+             <string>End Frame:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="eventPage">
+      <layout class="QVBoxLayout" name="verticalLayout_3">
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <property name="topMargin">
+        <number>2</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
+       <property name="bottomMargin">
+        <number>2</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Event</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_2">
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_26">
+            <property name="text">
+             <string>Type:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLabel" name="eventType">
+            <property name="text">
+             <string>Type:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="label_28">
+            <property name="text">
+             <string>Normalcy:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="eventNormalcy">
+            <property name="text">
+             <string>Normalcy:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_22">
+            <property name="text">
+             <string>Start:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="eventStartFrame">
+            <property name="text">
+             <string>Start Frame:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_23">
+            <property name="text">
+             <string>End:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLabel" name="eventEndFrame">
+            <property name="text">
+             <string>End Frame:</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="trackPage">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <property name="topMargin">
+        <number>2</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
+       <property name="bottomMargin">
+        <number>2</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="trackGroup">
+         <property name="minimumSize">
+          <size>
+           <width>0</width>
+           <height>155</height>
+          </size>
+         </property>
+         <property name="title">
+          <string>Track</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="trackIdLabel">
+            <property name="text">
+             <string>ID:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QStackedWidget" name="trackIdWidget">
+            <property name="midLineWidth">
+             <number>5</number>
+            </property>
+            <property name="currentIndex">
+             <number>0</number>
+            </property>
+            <widget class="QWidget" name="page">
+             <layout class="QVBoxLayout" name="verticalLayout_5">
+              <property name="margin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QLabel" name="trackId">
+                <property name="text">
+                 <string>ID:</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="page_2">
+             <layout class="QVBoxLayout" name="verticalLayout_7">
+              <property name="margin">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QLineEdit" name="trackIdEdit"/>
+              </item>
+             </layout>
+            </widget>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="trackTypeLabel">
+            <property name="text">
+             <string>Type:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="trackType">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="trackNormalcyLabel">
+            <property name="text">
+             <string>Normalcy:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QLabel" name="trackNormalcy">
+            <property name="text">
+             <string>Normalcy:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="trackStartFrameLabel">
+            <property name="text">
+             <string>Start:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QLabel" name="trackStartFrame">
+            <property name="text">
+             <string>Start Frame:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="0">
+           <widget class="QLabel" name="trackEndFrameLabel">
+            <property name="text">
+             <string>End:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QLabel" name="trackEndFrame">
+            <property name="text">
+             <string>End Frame:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="0">
+           <widget class="QLabel" name="trackPVOLabel">
+            <property name="text">
+             <string>PVO:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="1">
+           <widget class="QLabel" name="trackPVO">
+            <property name="text">
+             <string>P: 0.0, V: 0.0, O: 0.0</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="typeColorLabel">
+            <property name="text">
+             <string>Type Color:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="qtColorButton" name="typeColor">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Fixed" vsizetype="Minimum">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="parentTrackPage">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <property name="leftMargin">
+        <number>6</number>
+       </property>
+       <property name="topMargin">
+        <number>2</number>
+       </property>
+       <property name="rightMargin">
+        <number>6</number>
+       </property>
+       <property name="bottomMargin">
+        <number>2</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="trackGroup_2">
+         <property name="title">
+          <string>Parent Track</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout_4">
+          <property name="fieldGrowthPolicy">
+           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+          </property>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_15">
+            <property name="text">
+             <string>ID:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QLabel" name="parentTrackId">
+            <property name="text">
+             <string>ID:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="trackStartFrameLabel_2">
+            <property name="text">
+             <string>Start (In Event):</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
+            <item>
+             <widget class="QLabel" name="parentTrackEventStartTime">
+              <property name="text">
+               <string>00:00:00.000</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="trackStartSpinBox">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="trackEndFrameLabel_2">
+            <property name="text">
+             <string>End (In Event):</string>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,1">
+            <item>
+             <widget class="QLabel" name="parentTrackEventEndTime">
+              <property name="text">
+               <string>00:00:00.000</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QSpinBox" name="trackEndSpinBox">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="editProperties">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="icon">
+      <iconset resource="../../Icons/vpView.qrc">
+       <normaloff>:/icons/16x16/configure</normaloff>:/icons/16x16/configure</iconset>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtColorButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">qtColorButton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vpView.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpObjectSelectionPanel.cxx b/Applications/VpView/vpObjectSelectionPanel.cxx
new file mode 100644
index 00000000..15d6c2f2
--- /dev/null
+++ b/Applications/VpView/vpObjectSelectionPanel.cxx
@@ -0,0 +1,1373 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "ui_vpObjectSelectionPanel.h"
+
+#include "vpObjectSelectionPanel.h"
+
+#include "vgEventType.h"
+#include "vpViewCore.h"
+
+#include "vtkVgActivity.h"
+#include "vtkVgActivityManager.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgRendererUtils.h"
+#include "vtkVgTrack.h"
+#include "vtkVgTrackModel.h"
+#include "vtkVgTrackTypeRegistry.h"
+
+#include <vtkIdList.h>
+
+#include <QContextMenuEvent>
+#include <QInputDialog>
+#include <QMenu>
+#include <QMessageBox>
+#include <QSignalMapper>
+
+// C++ includes.
+#include <vector>
+
+//-----------------------------------------------------------------------------
+static void AddSortComboItem(const QString& fmt, QComboBox* cb, int type)
+{
+  cb->addItem(fmt.arg(vpTreeView::GetSortTypeString(type)), type);
+}
+
+//-----------------------------------------------------------------------------
+static void UpdateTreeSort(vpTreeView* tree,
+                           QComboBox* sortType,
+                           QCheckBox* sortDescending)
+{
+  tree->SortBy(
+    sortType->itemData(sortType->currentIndex()).toInt(),
+    sortDescending->checkState() == Qt::Checked ? Qt::DescendingOrder
+                                                : Qt::AscendingOrder);
+}
+
+//-----------------------------------------------------------------------------
+vpObjectSelectionPanel::vpObjectSelectionPanel(QWidget* p)
+  : QWidget(p)
+{
+  this->Ui = new Ui::vpObjectSelectionPanel;
+  this->Ui->setupUi(this);
+
+  QString fmt("Sort By %1");
+
+  // Populate the various sort type combo boxes.
+  AddSortComboItem(fmt, this->Ui->activitySortType, vpTreeView::ST_Id);
+  AddSortComboItem(fmt, this->Ui->activitySortType, vpTreeView::ST_Name);
+  AddSortComboItem(fmt, this->Ui->activitySortType, vpTreeView::ST_Saliency);
+  AddSortComboItem(fmt, this->Ui->activitySortType, vpTreeView::ST_Probability);
+
+  AddSortComboItem(fmt, this->Ui->eventSortType, vpTreeView::ST_Id);
+  AddSortComboItem(fmt, this->Ui->eventSortType, vpTreeView::ST_Name);
+  AddSortComboItem(fmt, this->Ui->eventSortType, vpTreeView::ST_Normalcy);
+
+  AddSortComboItem(fmt, this->Ui->trackSortType, vpTreeView::ST_Id);
+  AddSortComboItem(fmt, this->Ui->trackSortType, vpTreeView::ST_Name);
+  AddSortComboItem(fmt, this->Ui->trackSortType, vpTreeView::ST_Normalcy);
+  AddSortComboItem(fmt, this->Ui->trackSortType, vpTreeView::ST_Length);
+
+  AddSortComboItem(fmt, this->Ui->fseSortType, vpTreeView::ST_Id);
+  AddSortComboItem(fmt, this->Ui->fseSortType, vpTreeView::ST_Name);
+  AddSortComboItem(fmt, this->Ui->fseSortType, vpTreeView::ST_Probability);
+
+  connect(this->Ui->activitySortType,
+          SIGNAL(currentIndexChanged(int)),
+          SLOT(OnSortTypeChanged(int)));
+
+  connect(this->Ui->eventSortType,
+          SIGNAL(currentIndexChanged(int)),
+          SLOT(OnSortTypeChanged(int)));
+
+  connect(this->Ui->trackSortType,
+          SIGNAL(currentIndexChanged(int)),
+          SLOT(OnSortTypeChanged(int)));
+
+  connect(this->Ui->fseSortType,
+          SIGNAL(currentIndexChanged(int)),
+          SLOT(OnSortTypeChanged(int)));
+
+  connect(this->Ui->activitySortDescending,
+          SIGNAL(stateChanged(int)),
+          SLOT(OnSortDirectionChanged(int)));
+
+  connect(this->Ui->eventSortDescending,
+          SIGNAL(stateChanged(int)),
+          SLOT(OnSortDirectionChanged(int)));
+
+  connect(this->Ui->trackSortDescending,
+          SIGNAL(stateChanged(int)),
+          SLOT(OnSortDirectionChanged(int)));
+
+  connect(this->Ui->fseSortDescending,
+          SIGNAL(stateChanged(int)),
+          SLOT(OnSortDirectionChanged(int)));
+
+  this->CreateEventMapper = new QSignalMapper;
+  this->SetEventStatusMapper = new QSignalMapper;
+  this->SetActivityStatusMapper = new QSignalMapper;
+  this->SetTrackStatusMapper = new QSignalMapper;
+
+  this->ShowEventTypeMapper = new QSignalMapper;
+  this->ShowActivityTypeMapper = new QSignalMapper;
+
+  connect(this->CreateEventMapper,
+          SIGNAL(mapped(int)),
+          SLOT(CreateEvent(int)));
+
+  connect(this->SetEventStatusMapper,
+          SIGNAL(mapped(int)),
+          SLOT(SetEventStatus(int)));
+
+  connect(this->SetActivityStatusMapper,
+          SIGNAL(mapped(int)),
+          SLOT(SetActivityStatus(int)));
+
+  connect(this->SetTrackStatusMapper,
+          SIGNAL(mapped(int)),
+          SLOT(SetTrackStatus(int)));
+
+  connect(this->ShowEventTypeMapper,
+          SIGNAL(mapped(int)),
+          SLOT(ShowEventType(int)));
+
+  connect(this->ShowActivityTypeMapper,
+          SIGNAL(mapped(int)),
+          SLOT(ShowActivityType(int)));
+
+  this->SelectedItem.Type = -1;
+  this->HoveredItem.Type = -1;
+
+  this->Trees[0] = this->Ui->activityTree;
+  this->Trees[1] = this->Ui->eventTree;
+  this->Trees[2] = this->Ui->trackTree;
+  this->Trees[3] = this->Ui->fseTree;
+
+  this->Ui->tabWidget->setCurrentIndex(0);
+  this->PrevTab = 0;
+
+  this->SetupTab();
+
+  connect(this->Ui->tabWidget,
+          SIGNAL(currentChanged(int)),
+          SLOT(OnObjectTypeChanged(int)));
+
+  connect(this->Ui->showExcludedItems,
+          SIGNAL(stateChanged(int)),
+          SLOT(OnShownItemsChanged()));
+
+  connect(this->Ui->showUncheckedItems,
+          SIGNAL(stateChanged(int)),
+          SLOT(OnShownItemsChanged()));
+
+  connect(this->Ui->showAllButton,
+          SIGNAL(clicked()),
+          SLOT(OnShowAll()));
+
+  connect(this->Ui->hideAllButton,
+          SIGNAL(clicked()),
+          SLOT(OnHideAll()));
+
+  this->SessionId = 0;
+  this->ViewCoreInstance = 0;
+  this->ActivityManager = 0;
+  this->EventModel = 0;
+  this->TrackModel = 0;
+  this->RefreshFlags = 0;
+  this->RebuildFlags = 0;
+}
+
+//-----------------------------------------------------------------------------
+vpObjectSelectionPanel::~vpObjectSelectionPanel()
+{
+  delete this->ShowActivityTypeMapper;
+  delete this->ShowEventTypeMapper;
+  delete this->SetActivityStatusMapper;
+  delete this->SetEventStatusMapper;
+  delete this->SetTrackStatusMapper;
+  delete this->CreateEventMapper;
+  delete this->Ui;
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::SetCurrentTab(int type)
+{
+  this->Ui->tabWidget->setCurrentIndex(type);
+}
+
+//-----------------------------------------------------------------------------
+inline int vpObjectSelectionPanel::CurrentTab()
+{
+  return this->Ui->tabWidget->currentIndex();
+}
+
+//-----------------------------------------------------------------------------
+inline vpTreeView* vpObjectSelectionPanel::CurrentTree()
+{
+  return this->Trees[this->CurrentTab()];
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::Initialize(vpViewCore* viewCore,
+                                        vtkVgActivityManager* activityManager,
+                                        vtkVgEventModel* eventModel,
+                                        vtkVgTrackModel* trackModel,
+                                        vtkVgEventFilter* eventFilter,
+                                        vtkVgTrackFilter* trackFilter,
+                                        vtkVgEventTypeRegistry* eventTypes,
+                                        vtkVgTrackTypeRegistry* trackTypes,
+                                        int sessionId,
+                                        const QString& title)
+{
+  for (int i = 0; i < 4; ++i)
+    {
+    this->Trees[i]->Initialize(activityManager, eventModel , trackModel,
+                               eventFilter, trackFilter,
+                               eventTypes, trackTypes);
+    }
+
+  this->SessionId = sessionId;
+  this->Title = title;
+  this->ViewCoreInstance = viewCore;
+  this->ActivityManager = activityManager;
+  this->EventModel = eventModel;
+  this->TrackModel = trackModel;
+
+  this->EventTypeRegistry = eventTypes;
+  this->TrackTypeRegistry = trackTypes;
+
+  this->RebuildFlags = ~0;
+  this->Ui->showAllButton->setEnabled(true);
+  this->Ui->hideAllButton->setEnabled(true);
+
+  connect(this->Ui->tabWidget,
+          SIGNAL(tabBarContextMenu(QContextMenuEvent*, int)),
+          SLOT(OnTabBarContextMenu(QContextMenuEvent*, int)));
+
+  connect(viewCore,
+          SIGNAL(stoppedEditingTrack()),
+          SLOT(StopEditingTrack()));
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::showEvent(QShowEvent* /*event*/)
+{
+  int tab = this->CurrentTab();
+  if (this->NeedsRebuild(tab))
+    {
+    this->RebuildTreeView();
+    }
+  else if (this->NeedsRefresh(tab))
+    {
+    this->RefreshTreeView();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::Update(bool rebuild)
+{
+  // only update the visible tab - don't refresh the others until they are shown
+  if (rebuild)
+    {
+    this->RebuildFlags = ~0;
+    if (this->isVisible())
+      {
+      this->RebuildTreeView();
+      }
+    }
+  else
+    {
+    this->RefreshFlags = ~0;
+    if (this->isVisible())
+      {
+      this->RefreshTreeView();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpObjectSelectionPanel::SelectItem(int type, int id)
+{
+  this->Ui->tabWidget->setCurrentIndex(type);
+  return this->CurrentTree()->SelectItem(type, id);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::AddAndSelectItem(int type, int id)
+{
+  this->Ui->tabWidget->setCurrentIndex(type);
+
+  switch (type)
+    {
+    case vgObjectTypeDefinitions::Track:
+      // add new track (and begin editing)
+      this->Ui->trackTree->AddAndSelectTrack(this->TrackModel->GetTrack(id));
+      break;
+
+    case vgObjectTypeDefinitions::Event:
+      // add new event
+      this->Ui->eventTree->AddAndSelectEvent(this->EventModel->GetEvent(id));
+      break;
+
+    case vgObjectTypeDefinitions::SceneElement:
+      // add new scene element
+      this->Ui->fseTree->AddAndSelectSceneElement(this->TrackModel->GetTrack(id));
+      break;
+
+    default:
+      // not yet implemented
+      return;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpObjectSelectionPanel::GetSelectedItemInfo(vgItemInfo& info)
+{
+  if (this->SelectedItem.Type < 0)
+    {
+    return false;
+    }
+  info = this->SelectedItem;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpObjectSelectionPanel::GetHoveredItemInfo(vgItemInfo& info)
+{
+  if (this->HoveredItem.Type < 0)
+    {
+    return false;
+    }
+  info = this->HoveredItem;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkIdType> vpObjectSelectionPanel::GetSelectedItems(int type)
+{
+  vpTreeView* tree = this->CurrentTree();
+
+  vgItemInfo info;
+  QList<vtkIdType> ids;
+  foreach(QTreeWidgetItem* item, tree->selectedItems())
+    {
+    tree->GetItemInfo(item, info.Type, info.Id, info.ParentId, info.Index);
+    if (info.Type == type)
+      {
+      ids << info.Id;
+      }
+    }
+
+  return ids;
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnTreeHoverItemChanged(QTreeWidgetItem* item)
+{
+  this->CurrentTree()->GetItemInfo(item,
+                                   this->HoveredItem.Type,
+                                   this->HoveredItem.Id,
+                                   this->HoveredItem.ParentId,
+                                   this->HoveredItem.Index);
+
+  emit HoverItemChanged(this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnTreeHoverStopped()
+{
+  this->HoveredItem.Type = -1;
+
+  emit HoverItemChanged(this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnTreeSelectionChanged()
+{
+  vpTreeView* tree = this->CurrentTree();
+  QList<QTreeWidgetItem*> items = tree->selectedItems();
+
+  if (items.isEmpty())
+    {
+    this->SelectedItem.Type = -1;
+    this->SelectedItem.Id = -1;
+    this->SelectedItem.ParentId = -1;
+    this->SelectedItem.Id = -1;
+    }
+  else
+    {
+    QTreeWidgetItem* item = items.first();
+    tree->GetItemInfo(item, this->SelectedItem.Type, this->SelectedItem.Id,
+                      this->SelectedItem.ParentId, this->SelectedItem.Index);
+    }
+
+  emit SelectionChanged(this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnTreeContextMenu(QMenu& menu)
+{
+  int numSelections = this->CurrentTree()->selectedItems().size();
+  switch (this->CurrentTab())
+    {
+    case vgObjectTypeDefinitions::Activity:
+      {
+      // add activity context menu items
+      if (this->SelectedItem.Type == vgObjectTypeDefinitions::Activity)
+        {
+        menu.addSeparator();
+        menu.addAction("Add Event", this, SLOT(AddEventToActivity()));
+
+        QMenu* submenu = menu.addMenu("Set Status");
+
+        vtkVgActivity* a = this->ActivityManager->GetActivity(this->SelectedItem.Id);
+
+        this->AddSetStatusActions(submenu, this->SetActivityStatusMapper,
+                                  a->GetStatus());
+        }
+      // add activity event context menu items
+      else if (this->SelectedItem.Type == vgObjectTypeDefinitions::Event)
+        {
+        menu.addSeparator();
+        menu.addAction("Remove", this, SLOT(RemoveEventFromActivity()));
+        }
+      }
+    break;
+
+    case vgObjectTypeDefinitions::Track:
+      {
+      // add track context menu items
+      menu.addSeparator();
+
+      QMenu* submenu = menu.addMenu("Create Event");
+
+      // are the right number of tracks selected to create an event?
+      if (numSelections == 0)
+        {
+        submenu->setEnabled(false);
+        return;
+        }
+
+      // create items in the submenu for each event type
+      for (int i = 0; i < this->EventTypeRegistry->GetNumberOfTypes(); ++i)
+        {
+        const vgEventType& type = this->EventTypeRegistry->GetType(i);
+
+        QAction* a = submenu->addAction(type.GetName(),
+                                        this->CreateEventMapper, SLOT(map()));
+        this->CreateEventMapper->setMapping(a, type.GetId());
+
+        int minTracks = type.GetMinTracks();
+        int maxTracks = type.GetMaxTracks();
+
+        a->setEnabled(numSelections >= minTracks &&
+                      (maxTracks == -1 || numSelections <= maxTracks));
+        }
+      } // fall through
+
+    case vgObjectTypeDefinitions::SceneElement:
+      {
+      QMenu* submenu = menu.addMenu("Set Status");
+
+      if (numSelections == 0)
+        {
+        submenu->setEnabled(false);
+        return;
+        }
+
+      vtkVgTrack* track = this->TrackModel->GetTrack(this->SelectedItem.Id);
+
+      this->AddSetStatusActions(submenu, this->SetTrackStatusMapper,
+                                track->GetStatus());
+
+      menu.addSeparator();
+
+      if (this->SelectedItem.Type == vgObjectTypeDefinitions::Track ||
+          this->SelectedItem.Type == vgObjectTypeDefinitions::SceneElement)
+        {
+        vtkVgTrack* track = this->TrackModel->GetTrack(this->SelectedItem.Id);
+        if (track->IsModifiable())
+          {
+          menu.addAction("Stop Editing Track", this, SLOT(StopEditingTrack()));
+          }
+        else
+          {
+          menu.addAction("Edit Track", this, SLOT(EditTrack()));
+          }
+        QAction* a = menu.addAction("Delete Track", this, SLOT(DeleteTrack()));
+        if (numSelections != 1)
+          {
+          a->setEnabled(false);
+          }
+
+        a = menu.addAction("Split Here...", this, SLOT(SplitTrack()));
+
+        vtkVgTimeStamp splitTime = this->ViewCoreInstance->getCoreTimeStamp();
+
+        a->setEnabled(!track->GetFrameIsInterpolated(splitTime) &&
+                      track->GetStartFrame() < splitTime &&
+                      track->GetEndFrame() > splitTime);
+        }
+      }
+    break;
+
+    case vgObjectTypeDefinitions::Event:
+      {
+      // make sure they clicked on an event
+      if (this->SelectedItem.Type != vgObjectTypeDefinitions::Event)
+        {
+        return;
+        }
+
+      // add event context menu items
+      menu.addSeparator();
+
+      QMenu* submenu = menu.addMenu("Set Status");
+
+      if (numSelections == 0)
+        {
+        submenu->setEnabled(false);
+        return;
+        }
+
+      vtkVgEvent* event = this->EventModel->GetEvent(this->SelectedItem.Id);
+
+      this->AddSetStatusActions(submenu, this->SetEventStatusMapper,
+                                event->GetStatus());
+
+      QAction* a = menu.addAction("Delete Event", this, SLOT(DeleteEvent()));
+      if (numSelections != 1)
+        {
+        a->setEnabled(false);
+        }
+      }
+    break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::AddSetStatusActions(QMenu* menu,
+                                                 QSignalMapper* mapper,
+                                                 int curStatus)
+{
+  int numSelections = this->CurrentTree()->selectedItems().size();
+
+  QAction* a;
+  a = menu->addAction("None", mapper, SLOT(map()));
+  a->setCheckable(true);
+  a->setChecked(numSelections == 1 && curStatus == vgObjectStatus::None);
+  mapper->setMapping(a, vgObjectStatus::None);
+
+  a = menu->addAction("Positive", mapper, SLOT(map()));
+  a->setCheckable(true);
+  a->setChecked(numSelections == 1 && curStatus == vgObjectStatus::Adjudicated);
+  mapper->setMapping(a, vgObjectStatus::Adjudicated);
+
+  a = menu->addAction("Negative", mapper, SLOT(map()));
+  a->setCheckable(true);
+  a->setChecked(numSelections == 1 && curStatus == vgObjectStatus::Excluded);
+  mapper->setMapping(a, vgObjectStatus::Excluded);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::CreateEvent(int type)
+{
+  QList<QTreeWidgetItem*> trackItems = this->CurrentTree()->selectedItems();
+
+  vtkIdList* idl = vtkIdList::New();
+  idl->SetNumberOfIds(trackItems.size());
+
+  vgItemInfo info;
+  vtkIdType i = 0;
+  foreach (QTreeWidgetItem* item, trackItems)
+    {
+    this->CurrentTree()->GetItemInfo(item, info.Type, info.Id,
+                                     info.ParentId, info.Index);
+    idl->SetId(i++, info.Id);
+    }
+
+  emit this->CreateEvent(type, idl, this->SessionId);
+  idl->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::DeleteEvent()
+{
+  emit this->DeleteEvent(this->SelectedItem.Id, this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::EditTrack()
+{
+  emit this->EditTrack(this->SelectedItem.Id, this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::StopEditingTrack()
+{
+  emit this->StopEditingTrack(this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::DeleteTrack()
+{
+  emit this->DeleteTrack(this->SelectedItem.Id, this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::SplitTrack()
+{
+  emit this->SplitTrack(this->SelectedItem.Id, this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::SetEventStatus(int status)
+{
+  vgItemInfo info;
+  QList<QTreeWidgetItem*> items = this->CurrentTree()->selectedItems();
+
+  // set the status on all selected events
+  foreach (QTreeWidgetItem* item, items)
+    {
+    this->CurrentTree()->GetItemInfo(item, info.Type, info.Id,
+                                     info.ParentId, info.Index);
+
+    if (info.Type == vgObjectTypeDefinitions::Event)
+      {
+      this->EventModel->GetEvent(info.Id)->SetStatus(status);
+
+      // update the tree display
+      this->CurrentTree()->UpdateItemStatus(item);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::SetActivityStatus(int status)
+{
+  vgItemInfo info;
+  QList<QTreeWidgetItem*> items = this->CurrentTree()->selectedItems();
+
+  // set the status on all selected events
+  foreach (QTreeWidgetItem* item, items)
+    {
+    this->CurrentTree()->GetItemInfo(item, info.Type, info.Id,
+                                     info.ParentId, info.Index);
+
+    if (info.Type == vgObjectTypeDefinitions::Activity)
+      {
+      this->ActivityManager->GetActivity(info.Id)->SetStatus(status);
+
+      // update the tree display
+      this->CurrentTree()->UpdateItemStatus(item);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::SetTrackStatus(int status)
+{
+  vgItemInfo info;
+  QList<QTreeWidgetItem*> items = this->CurrentTree()->selectedItems();
+
+  // set the status on all selected events
+  foreach (QTreeWidgetItem* item, items)
+    {
+    this->CurrentTree()->GetItemInfo(item, info.Type, info.Id,
+                                     info.ParentId, info.Index);
+
+    if (info.Type == vgObjectTypeDefinitions::Track ||
+        info.Type == vgObjectTypeDefinitions::SceneElement)
+      {
+      this->TrackModel->GetTrack(info.Id)->SetStatus(status);
+
+      // update the tree display
+      this->CurrentTree()->UpdateItemStatus(item);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::AddEventToActivity()
+{
+  bool ok;
+  int id = QInputDialog::getInt(this, tr("Add Event"),
+                                tr("Event Id:"),
+                                0, 0, 2147483647, 1, &ok);
+  if (!ok)
+    {
+    return;
+    }
+
+  vtkVgEvent* event = this->EventModel->GetEvent(id);
+  if (!event)
+    {
+    QMessageBox::warning(0, QString(), "Invalid event ID.");
+    return;
+    }
+
+  vtkVgActivity* a = this->ActivityManager->GetActivity(this->SelectedItem.Id);
+  a->AddEvent(event);
+
+  this->CurrentTree()->UpdateActivityItem(this->CurrentTree()->currentItem());
+
+  this->ActivityManager->Modified();
+  emit this->ItemsChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::RemoveEventFromActivity()
+{
+  vtkVgActivity* a = this->ActivityManager->GetActivity(this->SelectedItem.ParentId);
+  a->RemoveEvent(this->SelectedItem.Index);
+
+  this->CurrentTree()->UpdateActivityItem(this->CurrentTree()->currentItem()->parent());
+
+  this->ActivityManager->Modified();
+  emit this->ItemsChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnTreeItemsChanged(const QList<QTreeWidgetItem*>& items,
+                                                bool updateStatus)
+{
+  bool changed = false;
+
+  vpTreeView* tree = this->CurrentTree();
+
+  int numShown = 0;
+  int numHidden = 0;
+
+  // update the display status for each changed item
+  foreach (QTreeWidgetItem* item, items)
+    {
+    int itemType, itemId;
+    int parentItemId, index;
+    tree->GetItemInfo(item, itemType, itemId, parentItemId, index);
+
+    bool displayObject = item->checkState(0) != Qt::Unchecked;
+    displayObject ? ++numShown : ++numHidden;
+
+    switch (itemType)
+      {
+      case vgObjectTypeDefinitions::Activity:
+        // @TODO: this is linear in the number of activities
+        this->ActivityManager->SetActivityState(
+          this->ActivityManager->GetActivity(itemId), displayObject);
+        changed = true;
+        break;
+
+      case vgObjectTypeDefinitions::Event:
+        this->EventModel->SetEventDisplayState(itemId, displayObject);
+        changed = true;
+        break;
+
+      case vgObjectTypeDefinitions::SceneElement:
+      case vgObjectTypeDefinitions::Track:
+        this->TrackModel->SetTrackDisplayState(itemId, displayObject);
+        changed = true;
+        break;
+      }
+    }
+
+  // update the viewport
+  if (changed)
+    {
+    emit this->ItemsChanged();
+    }
+
+  // show the number of items changed in the status bar
+  if (updateStatus)
+    {
+    QString status;
+    if (numShown == 0 && numHidden == 0)
+      {
+      status = "0 items changed";
+      }
+    else
+      {
+      if (numShown > 0)
+        {
+        status += numShown == 1 ? "1 item shown"
+                                : QString("%1 items shown").arg(numShown);
+        if (numHidden > 0)
+          {
+          status += ", ";
+          }
+        }
+      if (numHidden > 0)
+        {
+        status += numHidden == 1 ? "1 item hidden"
+                                 : QString("%1 items hidden").arg(numHidden);
+        }
+      }
+
+    emit this->ShowStatusMessage(status, 3000, this->SessionId);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnObjectTypeChanged(int index)
+{
+  if (this->NeedsRebuild(index))
+    {
+    this->RebuildTreeView();
+    }
+  else if (this->NeedsRefresh(index))
+    {
+    this->RefreshTreeView();
+    }
+
+  this->UpdateItemVisibility();
+
+  this->SetupTab();
+
+  // if we are switching to a track or event tab and we already have an object
+  // of that type (or one of its children) selected, try to maintain the
+  // selection in the new tab
+  if ((this->SelectedItem.Type == vgObjectTypeDefinitions::Event &&
+       this->CurrentTab() == vgObjectTypeDefinitions::Event) ||
+      (this->SelectedItem.Type == vgObjectTypeDefinitions::Track &&
+       this->CurrentTab() == vgObjectTypeDefinitions::Track))
+    {
+    this->CurrentTree()->SelectItem(this->SelectedItem.Type,
+                                    this->SelectedItem.Id);
+    }
+  else if (this->SelectedItem.Type == vgObjectTypeDefinitions::Track &&
+           this->SelectedItem.ParentId >= 0 &&
+           this->CurrentTab() == vgObjectTypeDefinitions::Event)
+    {
+    this->CurrentTree()->SelectChildItem(vgObjectTypeDefinitions::Event,
+                                         this->SelectedItem.ParentId,
+                                         this->SelectedItem.Index);
+    }
+
+  // update selection
+  this->OnTreeSelectionChanged();
+  this->OnTreeHoverStopped();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnTabBarContextMenu(QContextMenuEvent* event,
+                                                 int /*tab*/)
+{
+  QMenu menu(this);
+
+  vpTreeView* tree = this->CurrentTree();
+
+  switch (this->CurrentTab())
+    {
+    case vgObjectTypeDefinitions::Activity:
+      {
+      menu.addAction("No Activities", tree, SLOT(HideAllActivities()));
+      menu.addAction("All Activities", tree, SLOT(ShowAllActivities()));
+      QMenu* activityTypeMenu = menu.addMenu("All Activity Type");
+
+      for (int i = 0, end = this->ActivityManager->GetNumberOfActivityTypes();
+           i < end; ++i)
+        {
+        QAction* a =
+          activityTypeMenu->addAction(this->ActivityManager->GetActivityName(i),
+                                      this->ShowActivityTypeMapper,
+                                      SLOT(map()));
+        this->ShowActivityTypeMapper->setMapping(a, i);
+        }
+
+      menu.addSeparator();
+      // fall through
+      }
+
+    case vgObjectTypeDefinitions::Event:
+      {
+      menu.addAction("No Events", tree, SLOT(HideAllEvents()));
+      menu.addAction("All Events", tree, SLOT(ShowAllEvents()));
+      QMenu* eventTypeMenu = menu.addMenu("All Event Type");
+
+      for (int i = 0; i < this->EventTypeRegistry->GetNumberOfTypes(); ++i)
+        {
+        const vgEventType& type = this->EventTypeRegistry->GetType(i);
+
+        if (type.GetIsUsed())
+          {
+          QAction* a = eventTypeMenu->addAction(type.GetName(),
+                                                this->ShowEventTypeMapper,
+                                                SLOT(map()));
+
+          this->ShowEventTypeMapper->setMapping(a, type.GetId());
+          }
+        }
+
+      menu.addSeparator();
+      // fall through
+      }
+
+    case vgObjectTypeDefinitions::Track:
+      {
+      menu.addAction("No Tracks", tree, SLOT(HideAllTracks()));
+      menu.addAction("All Tracks", tree, SLOT(ShowAllTracks()));
+      break;
+      }
+
+    case vgObjectTypeDefinitions::SceneElement:
+      {
+      menu.addAction("No Scene Elements", tree, SLOT(HideAllSceneElements()));
+      menu.addAction("All Scene Elements", tree, SLOT(ShowAllSceneElements()));
+      break;
+      }
+    }
+
+  menu.exec(event->globalPos());
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::ShowEventType(int type)
+{
+  this->CurrentTree()->ShowEventType(type);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::ShowActivityType(int type)
+{
+  this->CurrentTree()->ShowActivityType(type);
+}
+
+//-----------------------------------------------------------------------------
+std::pair<vtkVgTimeStamp, vtkVgTimeStamp>
+vpObjectSelectionPanel::GetSelectedItemFrameExtents()
+{
+  vtkVgTimeStamp startFrame, endFrame;
+  switch (this->SelectedItem.Type)
+    {
+    case vgObjectTypeDefinitions::Activity:
+      {
+      vtkVgActivity* a = this->ActivityManager->GetActivity(this->SelectedItem.Id);
+      a->GetActivityFrameExtents(startFrame, endFrame);
+      break;
+      }
+    case vgObjectTypeDefinitions::Event:
+      {
+      vtkVgEvent* e = this->EventModel->GetEvent(this->SelectedItem.Id);
+      startFrame = e->GetStartFrame();
+      endFrame = e->GetEndFrame();
+      break;
+      }
+    case vgObjectTypeDefinitions::Track:
+    case vgObjectTypeDefinitions::SceneElement:
+      {
+      // use track extents relative to parent event if one exists
+      if (this->SelectedItem.ParentId >= 0)
+        {
+        vtkVgTrack* track;
+        vtkVgEvent* e = this->EventModel->GetEvent(this->SelectedItem.ParentId);
+        e->GetTrack(this->SelectedItem.Index, track, startFrame, endFrame);
+        break;
+        }
+
+      vtkVgTrack* t = this->TrackModel->GetTrack(this->SelectedItem.Id);
+      startFrame = t->GetStartFrame();
+      endFrame = t->GetEndFrame();
+      break;
+      }
+    }
+  return std::make_pair(startFrame, endFrame);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::FocusItemAlone()
+{
+  // turn everything off
+  this->ActivityManager->TurnOffAllActivities();
+  this->EventModel->TurnOffAllEvents();
+  this->TrackModel->TurnOffAllTracks();
+
+  // turn on the selected item
+  QTreeWidgetItem* item = this->CurrentTree()->selectedItems().first();
+  this->SetItemDisplayState(item, true);
+
+  // make sure the item type is visible
+  this->FocusItem(item);
+  emit this->ItemsChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::FocusItem()
+{
+  // first, make sure the item is selected for display
+  QTreeWidgetItem* item = this->CurrentTree()->selectedItems().first();
+  item->setCheckState(0, Qt::Checked);
+  this->FocusItem(item);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::FocusItem(QTreeWidgetItem* item)
+{
+  int itemType, itemId;
+  int parentItemId, index;
+  this->CurrentTree()->GetItemInfo(item, itemType, itemId, parentItemId, index);
+
+  // make sure the item type is visible
+  switch (itemType)
+    {
+    case vgObjectTypeDefinitions::Activity:
+      emit this->DisplayActivities(true);
+      this->ViewCoreInstance->focusActivity(this->SessionId, itemId);
+      break;
+
+    case vgObjectTypeDefinitions::Event:
+      emit this->DisplayEvents(true);
+      this->ViewCoreInstance->focusEvent(this->SessionId, itemId);
+      break;
+
+    case vgObjectTypeDefinitions::Track:
+      {
+      emit this->DisplayTracks(true);
+
+      // use track extents relative to parent event if one exists
+      vtkVgTimeStamp startFrame, endFrame;
+      if (parentItemId >= 0)
+        {
+        vtkVgTrack* track;
+        vtkVgEvent* e = this->EventModel->GetEvent(parentItemId);
+        e->GetTrack(index, track, startFrame, endFrame);
+        }
+
+      this->ViewCoreInstance->focusTrack(this->SessionId, itemId,
+                                         startFrame, endFrame);
+      break;
+      }
+
+    case vgObjectTypeDefinitions::SceneElement:
+      emit this->DisplaySceneElements(true);
+
+      this->ViewCoreInstance->focusTrack(this->SessionId, itemId,
+                                         vtkVgTimeStamp(), vtkVgTimeStamp());
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnGoToStartFrame()
+{
+  this->ViewCoreInstance->setCurrentTime(
+    this->GetSelectedItemFrameExtents().first);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnGoToEndFrame()
+{
+  this->ViewCoreInstance->setCurrentTime(
+    this->GetSelectedItemFrameExtents().second);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::FollowTrack()
+{
+  QList<QTreeWidgetItem*> trackItem = this->CurrentTree()->selectedItems();
+
+  vgItemInfo info;
+  this->CurrentTree()->GetItemInfo(trackItem[0], info.Type, info.Id,
+                                   info.ParentId, info.Index);
+
+  this->ViewCoreInstance->setIdOfTrackToFollow(info.Id);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnShowLinkedEvents()
+{
+  this->ToggleLinkedEvents(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnHideLinkedEvents()
+{
+  this->ToggleLinkedEvents(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnShowLinkedActivities()
+{
+  this->ToggleLinkedActivities(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnHideLinkedActivities()
+{
+  this->ToggleLinkedActivities(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::ToggleLinkedEvents(bool state)
+{
+  QList<QTreeWidgetItem*> trackItems = this->CurrentTree()->selectedItems();
+
+  QTreeWidgetItem* trackItem;
+  foreach (trackItem, trackItems)
+    {
+    vgItemInfo info;
+    this->CurrentTree()->GetItemInfo(trackItem, info.Type, info.Id,
+                                     info.ParentId, info.Index);
+
+    std::vector<vtkVgEvent*> linkedEvents;
+    this->EventModel->GetEvents(info.Id, linkedEvents);
+
+
+    std::vector<vtkVgEvent*>::iterator itr = linkedEvents.begin();
+    for (; itr != linkedEvents.end(); ++itr)
+      {
+      this->EventModel->SetEventDisplayState((*itr)->GetId(), state);
+      }
+    }
+
+  this->Update();
+  emit this->ItemsChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::ToggleLinkedActivities(bool state)
+{
+  QList<QTreeWidgetItem*> trackItems = this->CurrentTree()->selectedItems();
+
+  QTreeWidgetItem* trackItem;
+  foreach (trackItem, trackItems)
+    {
+    vgItemInfo info;
+    this->CurrentTree()->GetItemInfo(trackItem, info.Type, info.Id,
+                                     info.ParentId, info.Index);
+
+    std::vector<vtkVgActivity*> linkedActivites;
+
+    // Get the track.
+    vtkVgTrack* track = this->TrackModel->GetTrack(info.Id);
+
+    // Now fetch all the linked activities.
+    this->ActivityManager->GetActivities(track, linkedActivites);
+
+    std::vector<vtkVgActivity*>::iterator itr = linkedActivites.begin();
+    for (; itr != linkedActivites.end(); ++itr)
+      {
+      this->ActivityManager->SetActivityState(*(itr), state);
+      }
+    }
+
+  emit this->ItemsChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::SetupTab()
+{
+  int currTab = this->CurrentTab();
+  QWidget* prevTree = this->Trees[this->PrevTab];
+  QWidget* currTree = this->Trees[currTab];
+
+  // tear down signal connections from previous tab's tree
+  prevTree->disconnect(this);
+
+  // connect signals to current tab's tree
+  connect(currTree, SIGNAL(itemSelectionChanged()),
+          this, SLOT(OnTreeSelectionChanged()));
+
+  connect(currTree, SIGNAL(itemEntered(QTreeWidgetItem*, int)),
+          this, SLOT(OnTreeHoverItemChanged(QTreeWidgetItem*)));
+
+  connect(currTree, SIGNAL(MouseLeft()), this, SLOT(OnTreeHoverStopped()));
+
+  connect(currTree, SIGNAL(ItemsChanged(const QList<QTreeWidgetItem*>&, bool)),
+          this, SLOT(OnTreeItemsChanged(const QList<QTreeWidgetItem*>&, bool)));
+
+  connect(currTree, SIGNAL(FocusItemAlone()), this, SLOT(FocusItemAlone()));
+  connect(currTree, SIGNAL(FocusItem()), this, SLOT(FocusItem()));
+  connect(currTree, SIGNAL(GoToStartFrame()), this, SLOT(OnGoToStartFrame()));
+  connect(currTree, SIGNAL(GoToEndFrame()), this, SLOT(OnGoToEndFrame()));
+  connect(currTree, SIGNAL(FollowTrack()), this, SLOT(FollowTrack()));
+
+  connect(currTree, SIGNAL(ShowLinkedEvents()), this,
+          SLOT(OnShowLinkedEvents()));
+  connect(currTree, SIGNAL(HideLinkedEvents()), this,
+          SLOT(OnHideLinkedEvents()));
+  connect(currTree, SIGNAL(ShowLinkedActivities()), this,
+          SLOT(OnShowLinkedActivities()));
+  connect(currTree, SIGNAL(HideLinkedActivities()), this,
+          SLOT(OnHideLinkedActivities()));
+  connect(currTree, SIGNAL(AddEventsToGraphModel()), this,
+          SLOT(OnAddEventsToGraphModel()));
+  connect(currTree, SIGNAL(AddTrackEventsToGraphModel()), this,
+          SLOT(OnAddTrackEventsToGraphModel()));
+
+  connect(currTree, SIGNAL(ContextMenuOpened(QMenu&)),
+          this, SLOT(OnTreeContextMenu(QMenu&)));
+
+  this->PrevTab = currTab;
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::RefreshTreeView()
+{
+  this->CurrentTree()->Refresh();
+  this->ClearNeedsRefresh(this->CurrentTab());
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::RebuildTreeView()
+{
+  switch (this->CurrentTab())
+    {
+    case vgObjectTypeDefinitions::Activity:
+      this->Ui->activityTree->Clear();
+      this->Ui->activityTree->AddAllActivities();
+      break;
+    case vgObjectTypeDefinitions::Event:
+      this->Ui->eventTree->Clear();
+      this->Ui->eventTree->AddAllEvents();
+      break;
+    case vgObjectTypeDefinitions::Track:
+      this->Ui->trackTree->Clear();
+      this->Ui->trackTree->AddAllTracks();
+      break;
+    case vgObjectTypeDefinitions::SceneElement:
+      this->Ui->fseTree->Clear();
+      this->Ui->fseTree->AddAllSceneElements();
+      break;
+    }
+  this->UpdateSort(this->CurrentTab());
+  this->ClearNeedsRebuild(this->CurrentTab());
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnSortTypeChanged(int /*index*/)
+{
+  this->UpdateSort(this->CurrentTab());
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnSortDirectionChanged(int /*state*/)
+{
+  this->UpdateSort(this->CurrentTab());
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::UpdateSort(int tab)
+{
+  switch (tab)
+    {
+    case vgObjectTypeDefinitions::Activity:
+      UpdateTreeSort(this->Ui->activityTree,
+                     this->Ui->activitySortType,
+                     this->Ui->activitySortDescending);
+      break;
+
+    case vgObjectTypeDefinitions::Event:
+      UpdateTreeSort(this->Ui->eventTree,
+                     this->Ui->eventSortType,
+                     this->Ui->eventSortDescending);
+      break;
+
+    case vgObjectTypeDefinitions::Track:
+      UpdateTreeSort(this->Ui->trackTree,
+                     this->Ui->trackSortType,
+                     this->Ui->trackSortDescending);
+      break;
+
+    case vgObjectTypeDefinitions::SceneElement:
+      UpdateTreeSort(this->Ui->fseTree,
+                     this->Ui->fseSortType,
+                     this->Ui->fseSortDescending);
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnShownItemsChanged()
+{
+  this->UpdateItemVisibility();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnHideAll()
+{
+  this->ActivityManager->TurnOffAllActivities();
+  this->EventModel->TurnOffAllEvents();
+  this->TrackModel->TurnOffAllTracks();
+  emit this->ItemsChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnShowAll()
+{
+  this->ActivityManager->TurnOnAllActivities();
+  this->EventModel->TurnOnAllEvents();
+  this->TrackModel->TurnOnAllTracks();
+  emit this->ItemsChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnAddEventsToGraphModel()
+{
+  vpTreeView* tree = this->CurrentTree();
+  QList<QTreeWidgetItem*> items = tree->selectedItems();
+  QList<int> ids;
+
+  vgItemInfo info;
+  foreach (QTreeWidgetItem* item, items)
+    {
+    tree->GetItemInfo(item, info.Type, info.Id,
+                      info.ParentId, info.Index);
+    if (info.Type == vgObjectTypeDefinitions::Event)
+      {
+      ids << info.Id;
+      }
+    }
+
+  emit this->AddEventsToGraphModel(ids, this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::OnAddTrackEventsToGraphModel()
+{
+  emit this->AddTrackEventsToGraphModel(this->SelectedItem.Id, this->SessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpObjectSelectionPanel::UpdateItemVisibility()
+{
+  bool showExcluded = this->Ui->showExcludedItems->checkState() == Qt::Checked;
+  bool showUnchecked = this->Ui->showUncheckedItems->checkState() == Qt::Checked;
+  this->CurrentTree()->SetShowExcludedItems(showExcluded);
+  this->CurrentTree()->SetShowUncheckedItems(showUnchecked);
+}
+
+//-----------------------------------------------------------------------------
+int vpObjectSelectionPanel::SetItemDisplayState(QTreeWidgetItem* item, bool on)
+{
+  int itemType, itemId;
+  int parentItemId, index;
+  this->CurrentTree()->GetItemInfo(item, itemType, itemId, parentItemId, index);
+
+  switch (itemType)
+    {
+    case vgObjectTypeDefinitions::Activity:
+      // @TODO: this is linear in the number of activities
+      this->ActivityManager->SetActivityState(
+        this->ActivityManager->GetActivity(itemId), on);
+      emit this->ItemsChanged();
+      return vgObjectTypeDefinitions::Activity;
+
+    case vgObjectTypeDefinitions::Event:
+      this->EventModel->SetEventDisplayState(itemId, on);
+      emit this->ItemsChanged();
+      return vgObjectTypeDefinitions::Event;
+
+    case vgObjectTypeDefinitions::Track:
+    case vgObjectTypeDefinitions::SceneElement:
+      this->TrackModel->SetTrackDisplayState(itemId, on);
+      emit this->ItemsChanged();
+      return itemType;
+    }
+
+  return -1;
+}
diff --git a/Applications/VpView/vpObjectSelectionPanel.h b/Applications/VpView/vpObjectSelectionPanel.h
new file mode 100644
index 00000000..60130a09
--- /dev/null
+++ b/Applications/VpView/vpObjectSelectionPanel.h
@@ -0,0 +1,231 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpObjectSelectionPanel_h
+#define __vpObjectSelectionPanel_h
+
+#include <QWidget>
+
+#include <vtkType.h>
+
+#include "vtkVgTypeDefs.h"
+
+namespace Ui
+{
+class vpObjectSelectionPanel;
+}
+
+class vpViewCore;
+class vpTreeView;
+class vtkIdList;
+class vtkVgActivityManager;
+class vtkVgEventFilter;
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+class vtkVgTimeStamp;
+class vtkVgTrackFilter;
+class vtkVgTrackModel;
+class vtkVgTrackTypeRegistry;
+
+class QMenu;
+class QSignalMapper;
+class QTreeWidgetItem;
+
+struct vgItemInfo
+{
+  int Type;
+  int Id;
+  int ParentId;
+  int Index;
+};
+
+class vpObjectSelectionPanel : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vpObjectSelectionPanel(QWidget* parent = 0);
+  virtual ~vpObjectSelectionPanel();
+
+  void Initialize(vpViewCore* viewCore,
+                  vtkVgActivityManager* activityManager,
+                  vtkVgEventModel* eventModel,
+                  vtkVgTrackModel* trackModel,
+                  vtkVgEventFilter* eventFilter,
+                  vtkVgTrackFilter* trackFilter,
+                  vtkVgEventTypeRegistry* eventTypes,
+                  vtkVgTrackTypeRegistry* trackTypes,
+                  int sessionId,
+                  const QString& title);
+
+  bool SelectItem(int type, int id);
+  void AddAndSelectItem(int type, int id);
+
+  bool GetSelectedItemInfo(vgItemInfo& info);
+  bool GetHoveredItemInfo(vgItemInfo& info);
+
+  QList<vtkIdType> GetSelectedItems(int type);
+
+  void SetCurrentTab(int type);
+
+  void Update(bool rebuild = false);
+
+  void SetSessionId(int id) { this->SessionId = id; }
+  int  GetSessionId() { return this->SessionId; }
+
+  QString GetTitle() { return this->Title; }
+
+signals:
+  void SelectionChanged(int sessionId);
+  void HoverItemChanged(int sessionId);
+
+  void CreateEvent(int type, vtkIdList* ids, int sessionId);
+  void DeleteEvent(int it, int sessionId);
+
+  void EditTrack(int id, int sessionId);
+  void StopEditingTrack(int sessionId);
+  void DeleteTrack(int id, int sessionId);
+  void SplitTrack(int id, int sessionId);
+
+  void AddEventsToGraphModel(QList<int> ids, int sessionId);
+  void AddTrackEventsToGraphModel(int id, int sessionId);
+
+  void ShowStatusMessage(const QString& message, int timeout, int sessionId);
+
+  void DisplayActivities(bool enable);
+  void DisplayEvents(bool enable);
+  void DisplayTracks(bool enable);
+  void DisplayTrackHeads(bool enable);
+  void DisplaySceneElements(bool enable);
+
+  void ItemsChanged();
+
+public slots:
+  void FocusItemAlone();
+  void FocusItem();
+
+protected slots:
+  void OnTreeSelectionChanged();
+  void OnTreeContextMenu(QMenu& menu);
+  void CreateEvent(int type);
+  void DeleteEvent();
+  void EditTrack();
+  void StopEditingTrack();
+  void DeleteTrack();
+  void SplitTrack();
+  void AddEventToActivity();
+  void RemoveEventFromActivity();
+
+  void SetEventStatus(int status);
+  void SetActivityStatus(int status);
+  void SetTrackStatus(int status);
+
+  void OnTreeHoverItemChanged(QTreeWidgetItem* item);
+  void OnTreeHoverStopped();
+
+  void OnTreeItemsChanged(const QList<QTreeWidgetItem*>& items,
+                          bool updateStatus);
+
+  void OnObjectTypeChanged(int);
+
+  void OnTabBarContextMenu(QContextMenuEvent* event, int tab);
+  void ShowEventType(int type);
+  void ShowActivityType(int type);
+
+  void OnGoToStartFrame();
+  void OnGoToEndFrame();
+
+  void OnSortTypeChanged(int index);
+  void OnSortDirectionChanged(int state);
+
+  void FollowTrack();
+
+  void OnShowLinkedEvents();
+  void OnHideLinkedEvents();
+
+  void OnShowLinkedActivities();
+  void OnHideLinkedActivities();
+
+  void OnShownItemsChanged();
+
+  void OnHideAll();
+  void OnShowAll();
+
+  void OnAddEventsToGraphModel();
+  void OnAddTrackEventsToGraphModel();
+
+protected:
+  virtual void showEvent(QShowEvent* event);
+
+  void ToggleLinkedEvents(bool state);
+  void ToggleLinkedActivities(bool state);
+
+private:
+  void SetupTab();
+  void RefreshTreeView();
+  void RebuildTreeView();
+
+  std::pair<vtkVgTimeStamp, vtkVgTimeStamp> GetSelectedItemFrameExtents();
+
+  inline int         CurrentTab();
+  inline vpTreeView* CurrentTree();
+
+  bool NeedsRefresh(int tree)
+    { return (this->RefreshFlags & (1 << tree)) != 0; }
+
+  bool NeedsRebuild(int tree)
+    { return (this->RebuildFlags & (1 << tree)) != 0; }
+
+  void ClearNeedsRefresh(int tree)
+    { this->RefreshFlags &= ~(1 << tree); }
+
+  void ClearNeedsRebuild(int tree)
+    { this->RebuildFlags &= ~(1 << tree); }
+
+  void AddSetStatusActions(QMenu* menu, QSignalMapper* mapper, int curStatus);
+
+  void UpdateSort(int tab);
+
+  void UpdateItemVisibility();
+
+  int SetItemDisplayState(QTreeWidgetItem* item, bool on);
+
+  void FocusItem(QTreeWidgetItem* item);
+
+private:
+  Ui::vpObjectSelectionPanel* Ui;
+
+  QSignalMapper* CreateEventMapper;
+  QSignalMapper* SetEventStatusMapper;
+  QSignalMapper* SetActivityStatusMapper;
+  QSignalMapper* SetTrackStatusMapper;
+
+  QSignalMapper* ShowEventTypeMapper;
+  QSignalMapper* ShowActivityTypeMapper;
+
+  int SessionId;
+  QString Title;
+
+  vpViewCore*            ViewCoreInstance;
+  vtkVgActivityManager*  ActivityManager;
+  vtkVgEventModel*       EventModel;
+  vtkVgTrackModel*       TrackModel;
+
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+  vtkVgTrackTypeRegistry* TrackTypeRegistry;
+
+  vgItemInfo SelectedItem;
+  vgItemInfo HoveredItem;
+
+  int PrevTab;
+
+  vpTreeView* Trees[4];
+
+  unsigned RefreshFlags; // tree needs refresh only
+  unsigned RebuildFlags; // tree needs full rebuild - this should only happen once
+};
+
+#endif
diff --git a/Applications/VpView/vpObjectSelectionPanel.ui b/Applications/VpView/vpObjectSelectionPanel.ui
new file mode 100644
index 00000000..33e3d094
--- /dev/null
+++ b/Applications/VpView/vpObjectSelectionPanel.ui
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpObjectSelectionPanel</class>
+ <widget class="QWidget" name="vpObjectSelectionPanel">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>287</width>
+    <height>393</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0" colspan="2">
+    <widget class="vpTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="activityTab">
+      <attribute name="title">
+       <string>Activities</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_4">
+       <property name="margin">
+        <number>6</number>
+       </property>
+       <item row="0" column="0" colspan="2">
+        <widget class="vpTreeView" name="activityTree">
+         <property name="uniformRowHeights">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QComboBox" name="activitySortType">
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToContents</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="activitySortDescending">
+         <property name="text">
+          <string>Descending</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="eventTab">
+      <attribute name="title">
+       <string>Events</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_2">
+       <property name="margin">
+        <number>6</number>
+       </property>
+       <item row="0" column="0" colspan="2">
+        <widget class="vpTreeView" name="eventTree">
+         <property name="uniformRowHeights">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QComboBox" name="eventSortType">
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToContents</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="eventSortDescending">
+         <property name="text">
+          <string>Descending</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="trackTab">
+      <attribute name="title">
+       <string>Tracks</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_3">
+       <property name="margin">
+        <number>6</number>
+       </property>
+       <item row="0" column="0" colspan="2">
+        <widget class="vpTreeView" name="trackTree">
+         <property name="uniformRowHeights">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QComboBox" name="trackSortType">
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToContents</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="trackSortDescending">
+         <property name="text">
+          <string>Descending</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="fseTab">
+      <attribute name="title">
+       <string>Scene Elements</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_5">
+       <property name="margin">
+        <number>6</number>
+       </property>
+       <item row="0" column="0" colspan="2">
+        <widget class="vpTreeView" name="fseTree">
+         <property name="uniformRowHeights">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QComboBox" name="fseSortType">
+         <property name="sizeAdjustPolicy">
+          <enum>QComboBox::AdjustToContents</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="fseSortDescending">
+         <property name="text">
+          <string>Descending</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QPushButton" name="showAllButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Show All</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="hideAllButton">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Hide All</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QCheckBox" name="showUncheckedItems">
+     <property name="text">
+      <string>Show Unchecked</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QCheckBox" name="showExcludedItems">
+     <property name="text">
+      <string>Show Excluded</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vpTreeView</class>
+   <extends>QTreeView</extends>
+   <header>vpTreeView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vpTabWidget</class>
+   <extends>QTabWidget</extends>
+   <header>vpTabWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpPrimitiveConfig.cxx b/Applications/VpView/vpPrimitiveConfig.cxx
new file mode 100644
index 00000000..bf2e9a6d
--- /dev/null
+++ b/Applications/VpView/vpPrimitiveConfig.cxx
@@ -0,0 +1,285 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpPrimitiveConfig.h"
+
+#include "vpConfigUtils.h"
+
+#include <QColor>
+#include <QSettings>
+#include <QtDebug>
+
+#include <assert.h>
+#include <vector>
+
+//-----------------------------------------------------------------------------
+class vpPrimitiveConfig::vpPrimitiveConfigInternal
+{
+public:
+  vpPrimitiveConfigInternal()
+    : Dirty(false)
+    {
+    }
+
+public:
+  QSettings Settings;
+  QVector<vpPrimitiveConfig::vpPrimitiveType> PrimitiveTypes;
+  QHash<int, int> IdToTypeMap;
+  bool Dirty;
+};
+
+//-----------------------------------------------------------------------------
+vpPrimitiveConfig::vpPrimitiveConfig()
+{
+  this->Internal = new vpPrimitiveConfigInternal;
+  this->Internal->Settings.beginGroup("PrimitiveTypes");
+  this->readPrimitiveTypes(this->Internal->Settings);
+  this->writePrimitiveTypes();
+}
+
+//-----------------------------------------------------------------------------
+vpPrimitiveConfig::~vpPrimitiveConfig()
+{
+  // Write out any config changes made by the user.
+  if (this->Internal->Dirty)
+    {
+    this->writePrimitiveTypes();
+    }
+
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpPrimitiveConfig::readPrimitiveTypes(QSettings& settings)
+{
+  int size = settings.beginReadArray("PrimitiveTypes");
+
+  int prevTypeWithDistanceParam = -1;
+  int prevTypeWithTimeParam = -1;
+
+  for (int i = 0; i < size; ++i)
+    {
+    settings.setArrayIndex(i);
+
+    vpPrimitiveType type;
+    type.Id = settings.value("Id").toInt();
+    type.Directed = settings.value("Directed").toBool();
+    type.Name = settings.value("Name").toString();
+    type.Color = vpConfigUtils::ReadColor("Color", settings);
+
+    QVariant paramType = settings.value("ParamType");
+    if (paramType.isValid())
+      {
+      QString paramString = paramType.toString();
+      if (paramString == this->getParamTypeString(PPT_Distance))
+        {
+        type.ParamType = PPT_Distance;
+        }
+      else if (paramString == this->getParamTypeString(PPT_Time))
+        {
+        type.ParamType = PPT_Time;
+        }
+      else if (!paramString.isEmpty())
+        {
+        qWarning() << "Unrecognized primitive parameter type:" << paramString;
+        qWarning() << "Valid types:" << this->getParamTypeString(PPT_Distance)
+                   << ',' << this->getParamTypeString(PPT_Time);
+        }
+      }
+    type.ParamDefaultValue = settings.value("ParamDefaultValue", 0.0).toDouble();
+
+    int index = this->getPrimitiveTypeIndex(type.Id);
+    if (index == -1)
+      {
+      // Add new type
+      index = this->Internal->PrimitiveTypes.size();
+      this->Internal->PrimitiveTypes.push_back(type);
+      this->Internal->IdToTypeMap.insert(type.Id, index);
+      }
+    else
+      {
+      // Update existing type
+      this->Internal->PrimitiveTypes[index] = type;
+      }
+
+    // Check ordering of default param value and warn if it doesn't look right
+    const vpPrimitiveType* prevType = 0;
+    if (type.ParamType == PPT_Distance && prevTypeWithDistanceParam != -1)
+      {
+      prevType = &this->Internal->PrimitiveTypes[prevTypeWithDistanceParam];
+      }
+    else if (type.ParamType == PPT_Time && prevTypeWithTimeParam != -1)
+      {
+      prevType = &this->Internal->PrimitiveTypes[prevTypeWithTimeParam];
+      }
+
+    if (prevType && type.ParamDefaultValue < prevType->ParamDefaultValue)
+      {
+      qWarning() << "Warning: default parameter value for primitive type"
+                 << type.Name << '(' << type.ParamDefaultValue << ')'
+                 << "is less than that of the previously defined "
+                    "primitive type with the same parameter type"
+                 << prevType->Name << '(' << prevType->ParamDefaultValue << ')';
+      }
+
+    if (type.ParamType == PPT_Distance)
+      {
+      prevTypeWithDistanceParam = index;
+      }
+    else if (type.ParamType == PPT_Time)
+      {
+      prevTypeWithTimeParam = index;
+      }
+    }
+
+  settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+void vpPrimitiveConfig::writePrimitiveTypes()
+{
+  this->Internal->Settings.remove("");
+  this->Internal->Settings.beginWriteArray(
+    "PrimitiveTypes", this->getNumberOfTypes());
+
+  for (int i = 0, end = this->Internal->PrimitiveTypes.size(); i < end; ++i)
+    {
+    const vpPrimitiveType& type = this->Internal->PrimitiveTypes[i];
+
+    this->Internal->Settings.setArrayIndex(i);
+    this->Internal->Settings.setValue("Id", type.Id);
+    this->Internal->Settings.setValue("Directed", type.Directed);
+    this->Internal->Settings.setValue("Name", type.Name);
+    vpConfigUtils::WriteColor("Color", type.Color, this->Internal->Settings);
+    if (type.ParamType != PPT_None)
+      {
+      this->Internal->Settings.setValue("ParamType",
+                                        this->getParamTypeString(
+                                          type.ParamType));
+      this->Internal->Settings.setValue("ParamDefaultValue",
+                                        type.ParamDefaultValue);
+      }
+    }
+
+  this->Internal->Settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+const char* vpPrimitiveConfig::getParamTypeString(PrimitiveParamType type)
+{
+  switch (type)
+    {
+    case PPT_None:     return "";
+    case PPT_Distance: return "Distance";
+    case PPT_Time:     return "Time";
+    }
+  return "";
+}
+
+//-----------------------------------------------------------------------------
+int vpPrimitiveConfig::getNumberOfTypes()
+{
+  return this->Internal->PrimitiveTypes.size();
+}
+
+//-----------------------------------------------------------------------------
+int vpPrimitiveConfig::getPrimitiveTypeIndex(int id)
+{
+  return this->Internal->IdToTypeMap.value(id, -1);
+}
+
+//-----------------------------------------------------------------------------
+vpPrimitiveConfig::vpPrimitiveType vpPrimitiveConfig::getPrimitiveTypeByIndex(
+  int index)
+{
+  if (index < this->Internal->PrimitiveTypes.size())
+    {
+    return this->Internal->PrimitiveTypes[index];
+    }
+  else
+    {
+    return vpPrimitiveType();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vpPrimitiveConfig::vpPrimitiveType vpPrimitiveConfig::getPrimitiveTypeByName(
+  const QString& name)
+
+{
+  int count = this->getNumberOfTypes();
+  for (int i = 0; i < count; ++i)
+    {
+    if (this->Internal->PrimitiveTypes[i].Name.compare(
+          name, Qt::CaseSensitive) == 0)
+      {
+      return this->Internal->PrimitiveTypes[i];
+      }
+    }
+
+  return vpPrimitiveConfig::vpPrimitiveType();
+}
+
+//-----------------------------------------------------------------------------
+int vpPrimitiveConfig::getPreviousOrderedTypeIndex(int index)
+{
+  if (index >= this->Internal->PrimitiveTypes.size())
+    {
+    return -1;
+    }
+
+  const vpPrimitiveType& pt = this->Internal->PrimitiveTypes[index];
+  if (pt.ParamType == PPT_None)
+    {
+    return -1;
+    }
+
+  while (--index >= 0)
+    {
+    const vpPrimitiveType& prev = this->Internal->PrimitiveTypes[index];
+    if (prev.ParamType == pt.ParamType)
+      {
+      return index;
+      }
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vpPrimitiveConfig::getNextOrderedTypeIndex(int index)
+{
+  if (index >= this->Internal->PrimitiveTypes.size())
+    {
+    return -1;
+    }
+
+  const vpPrimitiveType& pt = this->Internal->PrimitiveTypes[index];
+  if (pt.ParamType == PPT_None)
+    {
+    return -1;
+    }
+
+  while (++index < this->Internal->PrimitiveTypes.size())
+    {
+    const vpPrimitiveType& next = this->Internal->PrimitiveTypes[index];
+    if (next.ParamType == pt.ParamType)
+      {
+      return index;
+      }
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vpPrimitiveConfig::loadFromFile(const QString& filename)
+{
+  QSettings settings(filename, QSettings::IniFormat);
+  settings.beginGroup("PrimitiveTypes");
+  this->readPrimitiveTypes(settings);
+  this->writePrimitiveTypes();
+}
diff --git a/Applications/VpView/vpPrimitiveConfig.h b/Applications/VpView/vpPrimitiveConfig.h
new file mode 100644
index 00000000..2e5ab8b1
--- /dev/null
+++ b/Applications/VpView/vpPrimitiveConfig.h
@@ -0,0 +1,76 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpPrimitiveConfig_h
+#define __vpPrimitiveConfig_h
+
+class QSettings;
+
+// Qt includes
+#include <QColor>
+#include <QString>
+
+class vpPrimitiveConfig
+{
+public:
+  enum PrimitiveParamType
+    {
+    PPT_None,
+    PPT_Distance,
+    PPT_Time
+    };
+
+  struct vpPrimitiveType
+    {
+    vpPrimitiveType() :
+      Id(-1),
+      Directed(false),
+      ParamType(PPT_None),
+      ParamDefaultValue(0.0)
+      {
+      }
+
+    int Id;
+    bool Directed;
+    QString Name;
+    QColor Color;
+    PrimitiveParamType ParamType;
+    double ParamDefaultValue;
+    };
+
+  vpPrimitiveConfig();
+  virtual ~vpPrimitiveConfig();
+
+  virtual int getNumberOfTypes();
+
+  int getPrimitiveTypeIndex(int id);
+  vpPrimitiveType getPrimitiveTypeByIndex(int index);
+  vpPrimitiveType getPrimitiveTypeByName(const QString& name);
+
+  int getPreviousOrderedTypeIndex(int index);
+  int getNextOrderedTypeIndex(int index);
+
+  void loadFromFile(const QString& filename);
+
+protected:
+  void readPrimitiveTypes(QSettings& settings);
+  void writePrimitiveTypes();
+
+  const char* getParamTypeString(PrimitiveParamType type);
+
+private:
+  class vpPrimitiveConfigInternal;
+  vpPrimitiveConfigInternal* Internal;
+
+private:
+  /// Not implemented
+  vpPrimitiveConfig(const vpPrimitiveConfig& src);
+
+  /// Not implemented
+  void operator=(const vpPrimitiveConfig& src);
+};
+
+#endif // __vpPrimitiveConfig_h
diff --git a/Applications/VpView/vpProject.cxx b/Applications/VpView/vpProject.cxx
new file mode 100644
index 00000000..2fe86faa
--- /dev/null
+++ b/Applications/VpView/vpProject.cxx
@@ -0,0 +1,217 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpProject.h"
+
+#include "vpModelIO.h"
+
+#include <vtkVgActivityManager.h>
+#include <vtkVgEventIconRepresentation.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgEventRepresentation.h>
+#include <vtkVgIconManager.h>
+#include <vtkVgPicker.h>
+#include <vtkVgTrackHeadRepresentation.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+
+//-----------------------------------------------------------------------------
+vpProject::vpProject(int id) :
+  OverviewFileTag("OverviewFile"),
+  DataSetSpecifierTag("DataSetSpecifier"),
+  TracksFileTag("TracksFile"),
+  TrackTraitsFileTag("TrackTraitsFile"),
+  EventsFileTag("EventsFile"),
+  EventLinksFileTag("EventLinksFile"),
+  IconsFileTag("IconsFile"),
+  ActivitiesFileTag("ActivitiesFile"),
+  InformaticsIconFileTag("InformaticsIconFile"),
+  NormalcyMapsFileTag("NormalcyMapsFile"),
+  PrecomputeActivityTag("PrecomputeActivity"),
+  OverviewSpacingTag("OverviewSpacing"),
+  OverviewOriginTag("OverviewOrigin"),
+  AnalysisDimensionsTag("AnalysisDimensions"),
+  AOIUpperLeftLatLonTag("AOIUpperLeftLatLon"),
+  AOIUpperRightLatLonTag("AOIUpperRightLatLon"),
+  AOILowerLeftLatLonTag("AOILowerLeftLatLon"),
+  AOILowerRightLatLonTag("AOILowerRightLatLon"),
+  ColorWindowTag("ColorWindow"),
+  ColorLevelTag("ColorLevel"),
+  ColorMultiplierTag("ColorMultiplier"),
+  TrackColorOverrideTag("TrackColorOverride"),
+  FrameNumberOffsetTag("FrameNumberOffset"),
+  ImageTimeMapFileTag("ImageTimeMapFile"),
+  HomographyIndexFileTag("HomographyIndexFile"),
+  FiltersFileTag("FiltersFile"),
+  SceneElementsFileTag("SceneElementsFile"),
+  ImageToGcsMatrixTag("ImageToGcsMatrix"),
+  ProjectId(id),
+  NextCreateTrackId(3000000),
+  IsVisible(true)
+{
+  // Internal storage. This is useful as we are going to iterate over the filenames.
+  TagFileMap.insert(
+    std::make_pair(this->OverviewFileTag, &this->OverviewFile));
+  TagFileMap.insert(
+    std::make_pair(this->DataSetSpecifierTag, &this->DataSetSpecifier));
+  TagFileMap.insert(
+    std::make_pair(this->TracksFileTag, &this->TracksFile));
+  TagFileMap.insert(
+    std::make_pair(this->TrackTraitsFileTag, &this->TrackTraitsFile));
+  TagFileMap.insert(
+    std::make_pair(this->EventsFileTag, &this->EventsFile));
+  TagFileMap.insert(
+    std::make_pair(this->EventLinksFileTag, &this->EventLinksFile));
+  TagFileMap.insert(
+    std::make_pair(this->IconsFileTag, &this->IconsFile));
+  TagFileMap.insert(
+    std::make_pair(this->ActivitiesFileTag, &this->ActivitiesFile));
+  TagFileMap.insert(
+    std::make_pair(this->InformaticsIconFileTag, &this->InformaticsIconFile));
+  TagFileMap.insert(
+    std::make_pair(this->NormalcyMapsFileTag, &this->NormalcyMapsFile));
+  TagFileMap.insert(
+    std::make_pair(this->ImageTimeMapFileTag, &this->ImageTimeMapFile));
+  TagFileMap.insert(
+    std::make_pair(this->HomographyIndexFileTag, &this->HomographyIndexFile));
+  TagFileMap.insert(
+    std::make_pair(this->FiltersFileTag, &this->FiltersFile));
+  TagFileMap.insert(
+    std::make_pair(this->SceneElementsFileTag, &this->SceneElementsFile));
+
+  this->PrecomputeActivity = 0;
+
+  this->OverviewSpacing = 1.0;
+  this->OverviewOrigin[0] = this->OverviewOrigin[1] = 0.0;
+  this->AnalysisDimensions[0] = this->AnalysisDimensions[1] = 0.0;
+
+  this->AOIUpperLeftLatLon[0] = this->AOIUpperLeftLatLon[1] = 444;
+  this->AOIUpperRightLatLon[0] = this->AOIUpperRightLatLon[1] = 444;
+  this->AOILowerLeftLatLon[0] = this->AOILowerLeftLatLon[1] = 444;
+  this->AOILowerRightLatLon[0] = this->AOILowerRightLatLon[1] = 444;
+
+  this->ColorWindow = 255.0;
+  this->ColorLevel = 127.5;
+
+  this->ColorMultiplier = 1.0;
+  this->HasTrackColorOverride = false;
+
+  this->FrameNumberOffset = 0;
+
+  this->TrackModel = vtkSmartPointer<vtkVgTrackModel>::New();
+  this->TrackRepresentation = vtkSmartPointer<vtkVgTrackRepresentation>::New();
+  this->SelectedTrackRepresentation =
+    vtkSmartPointer<vtkVgTrackRepresentation>::New();
+  this->TrackHeadRepresentation =
+    vtkSmartPointer<vtkVgTrackHeadRepresentation>::New();
+  this->SelectedTrackHeadRepresentation =
+    vtkSmartPointer<vtkVgTrackHeadRepresentation>::New();
+
+  this->EventModel = vtkSmartPointer<vtkVgEventModel>::New();
+  this->EventRepresentation = vtkSmartPointer<vtkVgEventRepresentation>::New();
+  this->SelectedEventRepresentation = vtkSmartPointer<vtkVgEventRepresentation>::New();
+  this->EventIconRepresentation =
+    vtkSmartPointer<vtkVgEventIconRepresentation>::New();
+  this->EventRegionRepresentation =
+    vtkSmartPointer<vtkVgEventRegionRepresentation>::New();
+
+  this->ActivityManager = vtkSmartPointer<vtkVgActivityManager>::New();
+
+  this->SceneElementRepresentation =
+    vtkSmartPointer<vtkVgTrackHeadRepresentation>::New();
+  this->SceneElementRepresentation->SetShowFill(true);
+  this->SelectedSceneElementRepresentation =
+    vtkSmartPointer<vtkVgTrackHeadRepresentation>::New();
+
+  this->IconManager = vtkSmartPointer<vtkVgIconManager>::New();
+
+  this->Picker = vtkSmartPointer<vtkVgPicker>::New();
+}
+
+//-----------------------------------------------------------------------------
+vpProject::~vpProject()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpProject::SetIsValid(const std::string& file, int state)
+{
+  if (!file.empty())
+    {
+    this->FileValidityMap[file] = state;
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpProject::IsValid(const std::string& file)
+{
+  if (file.empty())
+    {
+    return FILE_NAME_EMPTY;
+    }
+
+  vpProject::FileValidityMapConstItr itr = this->FileValidityMap.find(file);
+  if (itr != this->FileValidityMap.end())
+    {
+    return itr->second;
+    }
+
+  return FILE_NAME_NOT_EMPTY;
+}
+
+
+//-----------------------------------------------------------------------------
+void vpProject::CopyConfig(const vpProject& srcProject)
+{
+  this->ConfigFileStem = srcProject.ConfigFileStem;
+  this->OverviewFile = srcProject.ConfigFileStem;
+  this->DataSetSpecifier = srcProject.DataSetSpecifier;
+  this->TracksFile = srcProject.TracksFile;
+  this->TrackTraitsFile = srcProject.TrackTraitsFile;
+  this->EventsFile = srcProject.EventsFile;
+  this->EventLinksFile = srcProject.EventLinksFile;
+  this->IconsFile = srcProject.IconsFile;
+  this->ActivitiesFile = srcProject.ActivitiesFile;
+  this->InformaticsIconFile = srcProject.InformaticsIconFile;
+  this->NormalcyMapsFile = srcProject.NormalcyMapsFile;
+  this->ImageTimeMapFile = srcProject.ImageTimeMapFile;
+  this->HomographyIndexFile = srcProject.HomographyIndexFile;
+  this->FiltersFile = srcProject.FiltersFile;
+  this->SceneElementsFile = srcProject.SceneElementsFile;
+
+  this->PrecomputeActivity = srcProject.PrecomputeActivity;
+
+  this->OverviewSpacing = srcProject.OverviewSpacing;
+  this->OverviewOrigin[0] = srcProject.OverviewOrigin[0];
+  this->OverviewOrigin[1] = srcProject.OverviewOrigin[1];
+
+  this->ColorWindow = srcProject.ColorWindow;
+  this->ColorLevel = srcProject.ColorLevel;
+
+  this->ColorMultiplier = srcProject.ColorMultiplier;
+  this->FrameNumberOffset = srcProject.FrameNumberOffset;
+
+  this->HasTrackColorOverride = srcProject.HasTrackColorOverride;
+  this->TrackColorOverride[0] = srcProject.TrackColorOverride[0];
+  this->TrackColorOverride[1] = srcProject.TrackColorOverride[1];
+  this->TrackColorOverride[2] = srcProject.TrackColorOverride[2];
+
+  this->AOIUpperLeftLatLon[0] = srcProject.AOIUpperLeftLatLon[0];
+  this->AOIUpperLeftLatLon[1] = srcProject.AOIUpperLeftLatLon[1];
+  this->AOIUpperRightLatLon[0] = srcProject.AOIUpperRightLatLon[0];
+  this->AOIUpperRightLatLon[1] = srcProject.AOIUpperRightLatLon[1];
+  this->AOILowerLeftLatLon[0] = srcProject.AOILowerLeftLatLon[0];
+  this->AOILowerLeftLatLon[1] = srcProject.AOILowerLeftLatLon[1];
+  this->AOILowerRightLatLon[0] = srcProject.AOILowerRightLatLon[0];
+  this->AOILowerRightLatLon[1] = srcProject.AOILowerRightLatLon[1];
+
+  this->AnalysisDimensions[0] = srcProject.AnalysisDimensions[0];
+  this->AnalysisDimensions[1] = srcProject.AnalysisDimensions[1];
+
+  this->TagFileMap = srcProject.TagFileMap;
+  this->FileValidityMap = srcProject.FileValidityMap;
+}
diff --git a/Applications/VpView/vpProject.h b/Applications/VpView/vpProject.h
new file mode 100644
index 00000000..8ea07826
--- /dev/null
+++ b/Applications/VpView/vpProject.h
@@ -0,0 +1,191 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpProject_h
+#define __vpProject_h
+
+#include <QSharedPointer>
+
+#include <vtkSmartPointer.h>
+
+#include <string>
+#include <map>
+#include <vector>
+#include <algorithm>
+
+class vtkMatrix4x4;
+
+class vpModelIO;
+
+class vtkVgActivityManager;
+class vtkVgEventIconRepresentation;
+class vtkVgEventModel;
+class vtkVgEventRegionRepresentation;
+class vtkVgEventRepresentation;
+class vtkVgIconManager;
+class vtkVgPicker;
+class vtkVgTrackHeadRepresentation;
+class vtkVgTrackModel;
+class vtkVgTrackRepresentation;
+class vtkVpReaderBase;
+
+class vpProject
+{
+public:
+  enum FileState
+    {
+    FILE_NOT_EXIST  = 0,
+    FILE_NAME_EMPTY = 1,
+    FILE_EXIST      = 2,
+    FILE_NAME_NOT_EMPTY = 3
+    };
+
+  // Description:
+  // Constructor / Destructor.
+  vpProject(int id);
+  ~vpProject();
+
+  // Description:
+  // Set if a file is valid (if it exists on the system).
+  void SetIsValid(const std::string& file, int state);
+
+  // Description:
+  // Check if a given file is valid or not.
+  int IsValid(const std::string& file);
+
+  void CopyConfig(const vpProject& srcProject);
+
+  // Description:
+  // Keep track of file path stem for finding other files
+  std::string ConfigFileStem;
+
+  // Description:
+  // Various file sources used for the data.
+  std::string OverviewFile;
+  std::string DataSetSpecifier;
+  std::string TracksFile;
+  std::string TrackTraitsFile;
+  std::string EventsFile;
+  std::string EventLinksFile;
+  std::string IconsFile;
+  std::string ActivitiesFile;
+  std::string InformaticsIconFile;
+  std::string NormalcyMapsFile;
+  std::string ImageTimeMapFile;
+  std::string HomographyIndexFile;
+  std::string FiltersFile;
+  std::string SceneElementsFile;
+
+  std::string OverviewFileTag;
+  std::string DataSetSpecifierTag;
+  std::string TracksFileTag;
+  std::string TrackTraitsFileTag;
+  std::string EventsFileTag;
+  std::string EventLinksFileTag;
+  std::string IconsFileTag;
+  std::string ActivitiesFileTag;
+  std::string InformaticsIconFileTag;
+  std::string NormalcyMapsFileTag;
+  std::string PrecomputeActivityTag;
+
+  std::string OverviewSpacingTag;
+  std::string OverviewOriginTag;
+  std::string AnalysisDimensionsTag;
+
+  std::string AOIUpperLeftLatLonTag;
+  std::string AOIUpperRightLatLonTag;
+  std::string AOILowerLeftLatLonTag;
+  std::string AOILowerRightLatLonTag;
+
+  std::string ColorWindowTag;
+  std::string ColorLevelTag;
+
+  std::string ColorMultiplierTag;
+  std::string TrackColorOverrideTag;
+
+  std::string FrameNumberOffsetTag;
+  std::string ImageTimeMapFileTag;
+  std::string HomographyIndexFileTag;
+
+  std::string FiltersFileTag;
+  std::string SceneElementsFileTag;
+
+  std::string ImageToGcsMatrixTag;
+
+  int    PrecomputeActivity;
+
+  double OverviewSpacing;
+  double OverviewOrigin [2];
+
+  double AOIUpperLeftLatLon[2];
+  double AOIUpperRightLatLon[2];
+  double AOILowerLeftLatLon[2];
+  double AOILowerRightLatLon[2];
+
+  double AnalysisDimensions[2];
+
+  double ColorWindow;
+  double ColorLevel;
+
+  double ColorMultiplier;
+
+  bool HasTrackColorOverride;
+  double TrackColorOverride[3];
+
+  int FrameNumberOffset;
+
+  // Description:
+  // Useful data structure.
+  std::map<std::string, std::string*> TagFileMap;
+  typedef std::map<std::string, std::string*>::const_iterator TagFileMapItr;
+
+  std::map<std::string, int> FileValidityMap;
+  typedef std::map<std::string, int>::const_iterator FileValidityMapConstItr;
+
+  // Description:
+  // Project specific models and representations
+  vtkSmartPointer<vtkVgTrackModel> TrackModel;
+  vtkSmartPointer<vtkVgTrackRepresentation> TrackRepresentation;
+  vtkSmartPointer<vtkVgTrackRepresentation> SelectedTrackRepresentation;
+  vtkSmartPointer<vtkVgTrackHeadRepresentation> TrackHeadRepresentation;
+  vtkSmartPointer<vtkVgTrackHeadRepresentation> SelectedTrackHeadRepresentation;
+
+  vtkSmartPointer<vtkVgEventModel> EventModel;
+  vtkSmartPointer<vtkVgEventRepresentation> EventRepresentation;
+  vtkSmartPointer<vtkVgEventRepresentation> SelectedEventRepresentation;
+  vtkSmartPointer<vtkVgEventIconRepresentation> EventIconRepresentation;
+  vtkSmartPointer<vtkVgEventRegionRepresentation> EventRegionRepresentation;
+
+  vtkSmartPointer<vtkVgActivityManager> ActivityManager;
+
+  vtkSmartPointer<vtkVgTrackHeadRepresentation> SceneElementRepresentation;
+  vtkSmartPointer<vtkVgTrackHeadRepresentation> SelectedSceneElementRepresentation;
+
+  vtkSmartPointer<vtkVgIconManager> IconManager;
+
+  // Description:
+  // Project specific transformation matrices
+  double ImageToGcsMatrixArray[18];
+  vtkSmartPointer<vtkMatrix4x4> ImageToGcsMatrix;
+
+  // Description:
+  // Others
+  vtkSmartPointer<vtkVgPicker> Picker;
+  QSharedPointer<vpModelIO> ModelIO;
+
+  int ProjectId;
+  int NextCreateTrackId;
+
+  bool IsVisible;
+
+  std::string Name;
+
+private:
+  vpProject(const vpProject& src);        // Not implemented.
+  void operator=(const vpProject& src);   // Not implemented.
+};
+
+#endif // __vpProject_h
diff --git a/Applications/VpView/vpProjectList.cxx b/Applications/VpView/vpProjectList.cxx
new file mode 100644
index 00000000..4cbb83d8
--- /dev/null
+++ b/Applications/VpView/vpProjectList.cxx
@@ -0,0 +1,43 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpProjectList.h"
+
+#include <QMenu>
+#include <QContextMenuEvent>
+
+//-----------------------------------------------------------------------------
+vpProjectList::vpProjectList(QWidget* parent) :
+  QListWidget(parent)
+{
+}
+
+//-----------------------------------------------------------------------------
+vpProjectList::~vpProjectList()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpProjectList::contextMenuEvent(QContextMenuEvent* event)
+{
+  if (this->selectedItems().size() != 1 ||
+      this->itemAt(event->pos()) == 0)
+    {
+    return;
+    }
+
+  QMenu menu(this);
+  QAction* closeProject = menu.addAction("Close Project");
+
+  // Don't allow the last project to be closed.
+  closeProject->setEnabled(this->count() > 1);
+
+  if (menu.exec(event->globalPos()) == closeProject)
+    {
+    emit this->closeProjectRequested(
+      this->indexFromItem(this->selectedItems()[0]).row());
+    }
+}
diff --git a/Applications/VpView/vpProjectList.h b/Applications/VpView/vpProjectList.h
new file mode 100644
index 00000000..9a0acbf3
--- /dev/null
+++ b/Applications/VpView/vpProjectList.h
@@ -0,0 +1,27 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpProjectList_h
+#define __vpProjectList_h
+
+#include <QListWidget>
+
+class vpProjectList : public QListWidget
+{
+  Q_OBJECT
+
+public:
+  vpProjectList(QWidget* parent = 0);
+  ~vpProjectList();
+
+signals:
+  void closeProjectRequested(int index);
+
+protected:
+  virtual void contextMenuEvent(QContextMenuEvent* event);
+};
+
+#endif
diff --git a/Applications/VpView/vpProjectParser.cxx b/Applications/VpView/vpProjectParser.cxx
new file mode 100644
index 00000000..7f5f40dc
--- /dev/null
+++ b/Applications/VpView/vpProjectParser.cxx
@@ -0,0 +1,270 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpProjectParser.h"
+
+// Application includes.
+#include "vpProject.h"
+
+// VIDTK includes.
+#ifdef VISGUI_USE_VIDTK
+#include <utilities/config_block.h>
+#include <utilities/config_block_parser.h>
+#include <utilities/token_expansion.h>
+#endif
+
+// VTK includes.
+#include <vtkMatrix4x4.h>
+#include <vtksys/SystemTools.hxx>
+
+// C++ includes.
+#include <exception>
+#include <iomanip>
+#include <sstream>
+
+//-----------------------------------------------------------------------------
+vpProjectParser::vpProjectParser() :
+  UseStream(false),
+  ProjectFileName(""),
+  ProjectStream("")
+{
+}
+
+//-----------------------------------------------------------------------------
+vpProjectParser::~vpProjectParser()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vpProjectParser::Parse(vpProject* prj)
+{
+  if (!prj)
+    {
+    std::cerr << "Invalid or NULL project." << std::endl;
+    return false;
+    }
+
+#ifdef VISGUI_USE_VIDTK
+  vidtk::config_block blk;
+  blk.add_parameter(prj->OverviewFileTag, "", "Image for showing context in & around analysis boundary");
+  blk.add_parameter(prj->DataSetSpecifierTag, "", "Filename with list of images for each frame or glob for sequence of imagess");
+  blk.add_parameter(prj->TracksFileTag, "", "Filename containing the tracks data.");
+  blk.add_parameter(prj->TrackTraitsFileTag, "", "Filename containing extra track data (normalcy, etc).");
+  blk.add_parameter(prj->EventsFileTag, "", "Filename containing the events data");
+  blk.add_parameter(prj->EventLinksFileTag, "", "Filename containing the event linking data");
+  blk.add_parameter(prj->ActivitiesFileTag, "", "Filename containing the activities data");
+  blk.add_parameter(prj->IconsFileTag, "", "Filename containg the icons sheet and parameters");
+  blk.add_parameter(prj->InformaticsIconFileTag, "", "Image filename containing icons for the informatics");
+  blk.add_parameter(prj->NormalcyMapsFileTag, "", "Filename containing normalcy map (key, filename)");
+  blk.add_parameter(prj->PrecomputeActivityTag, "0", "Precompute activity at load time");
+  blk.add_parameter(prj->OverviewSpacingTag, "1.0", "Specify spacing (single parameter) for the overview image");
+  blk.add_parameter(prj->OverviewOriginTag, "0.0 0.0", "Specify origin (x y) for the overview image");
+  blk.add_parameter(prj->AnalysisDimensionsTag, "-1.0 -1.0", "Specify analysis dimensions (width height) for the overview image");
+  blk.add_parameter(prj->AOIUpperLeftLatLonTag, "444 444", "Specify upper-left corner of AOI (lat/lon)");
+  blk.add_parameter(prj->AOIUpperRightLatLonTag, "444 444", "Specify upper-right corner of AOI (lat/lon)");
+  blk.add_parameter(prj->AOILowerLeftLatLonTag, "444 444", "Specify lower-left corner of AOI (lat/lon)");
+  blk.add_parameter(prj->AOILowerRightLatLonTag, "444 444", "Specify lower-right corner of AOI (lat/lon)");
+  blk.add_parameter(prj->TrackColorOverrideTag, "Force a track color for this project (r g b)");
+  blk.add_parameter(prj->ColorWindowTag, "255.0", "Specify color value range (window) for data set");
+  blk.add_parameter(prj->ColorLevelTag, "127.5", "Specify color value mean (level) for data set");
+  blk.add_parameter(prj->ColorMultiplierTag, "1.0", "Specify color multiplier for objects");
+  blk.add_parameter(prj->FrameNumberOffsetTag, "0", "Frame number offset of imagery data.");
+  blk.add_parameter(prj->ImageTimeMapFileTag, "", "Filename containing image timestamps");
+  blk.add_parameter(prj->HomographyIndexFileTag, "", "Filename containing image homographies");
+  blk.add_parameter(prj->FiltersFileTag, "", "Filename containing filters to import");
+  blk.add_parameter(prj->ImageToGcsMatrixTag, "", "Image to geographic coordinate matrix");
+  blk.add_parameter(prj->SceneElementsFileTag, "", "Filename containing scene element data");
+
+  vidtk::config_block_parser blkParser;
+  std::istringstream iss;
+
+  if (this->UseStream)
+    {
+    iss.str(this->ProjectStream);
+    blkParser.set_input_stream(iss);
+    }
+  else
+    {
+    blkParser.set_filename(this->ProjectFileName);
+    prj->ConfigFileStem =
+      this->ProjectFileName.substr(0, this->ProjectFileName.find_last_of("/\\"));
+    prj->ConfigFileStem = prj->ConfigFileStem.append("/");
+    }
+
+  // \note: Exception is thrown by the parser if a unknown tag is found
+  // in the project.
+  try
+    {
+    blk.set_fail_on_missing_block(false);
+    blkParser.parse(blk);
+    }
+  catch (std::exception& e)
+    {
+    std::cerr << "ERROR: " << e.what() << std::endl;
+    }
+  catch (...)
+    {
+    std::cerr << "ERROR: Unknown error occurred during project parsing" << std::endl;
+    }
+
+  // Various file sources used for the data.
+  vpProject::TagFileMapItr bItr = prj->TagFileMap.begin();
+  while (bItr != prj->TagFileMap.end())
+    {
+    *bItr->second = blk.get<std::string>(bItr->first);
+
+    *bItr->second = vidtk::token_expansion::expand_token(*bItr->second);
+
+    this->ConstructCompletePath(*bItr->second, prj->ConfigFileStem);
+
+    if (bItr->first.compare(prj->DataSetSpecifierTag) == 0)
+      {
+      prj->SetIsValid(*bItr->second, (*bItr->second).empty() ?
+                      vpProject::FILE_NAME_EMPTY : vpProject::FILE_NAME_NOT_EMPTY);
+      }
+    else
+      {
+      prj->SetIsValid(*bItr->second,
+                      this->CheckIfFileExists(bItr->first, *bItr->second));
+      }
+
+    ++bItr;
+    }
+
+  prj->PrecomputeActivity = blk.get<int>(prj->PrecomputeActivityTag);
+  prj->OverviewSpacing = blk.get<double>(prj->OverviewSpacingTag);
+  prj->ColorWindow = blk.get<double>(prj->ColorWindowTag);
+  prj->ColorLevel = blk.get<double>(prj->ColorLevelTag);
+  prj->ColorMultiplier = blk.get<double>(prj->ColorMultiplierTag);
+  prj->FrameNumberOffset = blk.get<double>(prj->FrameNumberOffsetTag);
+  blk.get(prj->OverviewOriginTag,      prj->OverviewOrigin);
+  blk.get(prj->AnalysisDimensionsTag,  prj->AnalysisDimensions);
+  blk.get(prj->AOIUpperLeftLatLonTag,  prj->AOIUpperLeftLatLon);
+  blk.get(prj->AOIUpperRightLatLonTag, prj->AOIUpperRightLatLon);
+  blk.get(prj->AOILowerLeftLatLonTag, prj->AOILowerLeftLatLon);
+  blk.get(prj->AOILowerRightLatLonTag, prj->AOILowerRightLatLon);
+
+  if (blk.get(prj->TrackColorOverrideTag, prj->TrackColorOverride))
+    {
+    prj->HasTrackColorOverride = true;
+    }
+
+  if (blk.get(prj->ImageToGcsMatrixTag,  prj->ImageToGcsMatrixArray))
+    {
+    prj->ImageToGcsMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+
+    // Get the number of rows and columns
+    int noOfRows = prj->ImageToGcsMatrixArray[0];
+    int noOfCols = prj->ImageToGcsMatrixArray[1];
+
+    // 3x3
+    if (noOfRows == 3 & noOfCols == 3)
+      {
+      prj->ImageToGcsMatrix->SetElement(0, 0, prj->ImageToGcsMatrixArray[2]);
+      prj->ImageToGcsMatrix->SetElement(0, 1, prj->ImageToGcsMatrixArray[3]);
+      prj->ImageToGcsMatrix->SetElement(0, 3, prj->ImageToGcsMatrixArray[4]);
+
+      prj->ImageToGcsMatrix->SetElement(1, 0, prj->ImageToGcsMatrixArray[5]);
+      prj->ImageToGcsMatrix->SetElement(1, 1, prj->ImageToGcsMatrixArray[6]);
+      prj->ImageToGcsMatrix->SetElement(1, 3, prj->ImageToGcsMatrixArray[7]);
+
+      prj->ImageToGcsMatrix->SetElement(3, 0, prj->ImageToGcsMatrixArray[8]);
+      prj->ImageToGcsMatrix->SetElement(3, 1, prj->ImageToGcsMatrixArray[9]);
+      prj->ImageToGcsMatrix->SetElement(3, 3, prj->ImageToGcsMatrixArray[10]);
+      }
+    // 3X4
+    else if (noOfRows == 3 & noOfCols == 4)
+      {
+      prj->ImageToGcsMatrix->SetElement(0, 0, prj->ImageToGcsMatrixArray[2]);
+      prj->ImageToGcsMatrix->SetElement(0, 1, prj->ImageToGcsMatrixArray[3]);
+      prj->ImageToGcsMatrix->SetElement(0, 2, prj->ImageToGcsMatrixArray[4]);
+      prj->ImageToGcsMatrix->SetElement(0, 3, prj->ImageToGcsMatrixArray[5]);
+
+      prj->ImageToGcsMatrix->SetElement(1, 0, prj->ImageToGcsMatrixArray[6]);
+      prj->ImageToGcsMatrix->SetElement(1, 1, prj->ImageToGcsMatrixArray[7]);
+      prj->ImageToGcsMatrix->SetElement(1, 2, prj->ImageToGcsMatrixArray[8]);
+      prj->ImageToGcsMatrix->SetElement(1, 3, prj->ImageToGcsMatrixArray[9]);
+
+      prj->ImageToGcsMatrix->SetElement(3, 0, prj->ImageToGcsMatrixArray[10]);
+      prj->ImageToGcsMatrix->SetElement(3, 1, prj->ImageToGcsMatrixArray[11]);
+      prj->ImageToGcsMatrix->SetElement(3, 2, prj->ImageToGcsMatrixArray[12]);
+      prj->ImageToGcsMatrix->SetElement(3, 3, prj->ImageToGcsMatrixArray[13]);
+      }
+    //4x3
+    else if (noOfRows == 3 & noOfCols == 3)
+      {
+      prj->ImageToGcsMatrix->SetElement(0, 0, prj->ImageToGcsMatrixArray[2]);
+      prj->ImageToGcsMatrix->SetElement(0, 1, prj->ImageToGcsMatrixArray[3]);
+      prj->ImageToGcsMatrix->SetElement(0, 3, prj->ImageToGcsMatrixArray[4]);
+
+      prj->ImageToGcsMatrix->SetElement(1, 0, prj->ImageToGcsMatrixArray[5]);
+      prj->ImageToGcsMatrix->SetElement(1, 1, prj->ImageToGcsMatrixArray[6]);
+      prj->ImageToGcsMatrix->SetElement(1, 3, prj->ImageToGcsMatrixArray[7]);
+
+      prj->ImageToGcsMatrix->SetElement(2, 0, prj->ImageToGcsMatrixArray[8]);
+      prj->ImageToGcsMatrix->SetElement(2, 1, prj->ImageToGcsMatrixArray[9]);
+      prj->ImageToGcsMatrix->SetElement(2, 3, prj->ImageToGcsMatrixArray[10]);
+
+      prj->ImageToGcsMatrix->SetElement(3, 0, prj->ImageToGcsMatrixArray[11]);
+      prj->ImageToGcsMatrix->SetElement(3, 1, prj->ImageToGcsMatrixArray[12]);
+      prj->ImageToGcsMatrix->SetElement(3, 3, prj->ImageToGcsMatrixArray[13]);
+      }
+    else if(noOfRows == 4 && noOfCols ==4)
+      {
+        prj->ImageToGcsMatrix->DeepCopy(&prj->ImageToGcsMatrixArray[2]);
+      }
+    else
+      {
+      std::cerr << "ImageToGcsMatrix with " << noOfRows << " rows and "
+                << noOfCols << " columns  are not supported" << std::endl;
+      }
+    }
+
+  return true;
+#else // VISGUI_USE_VIDTK
+  // TODO: Write a non-vidtk based project parser.
+  return false;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+void vpProjectParser::ConstructCompletePath(std::string& file, const std::string& stem)
+{
+  // First remove carriage return.
+  std::string::size_type pos = std::string::npos;
+
+  pos = file.rfind('\r', pos);
+
+  if (pos != std::string::npos)
+    {
+    file.erase(pos, 1);
+    }
+
+  if (!file.empty() &&
+      !vtksys::SystemTools::FileIsFullPath(file.c_str()))
+    {
+    file = stem + file;
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpProjectParser::CheckIfFileExists(const std::string& tag, const std::string& fileName)
+{
+  if (fileName.empty())
+    {
+    return vpProject::FILE_NAME_EMPTY;
+    }
+
+  if (!vtksys::SystemTools::FileExists(fileName.c_str(), true))
+    {
+    std::cerr << "WARNING: " << tag << " ( " << fileName << " ) does not exist.";
+    std::cerr << "Application may not work properly." << std::endl;
+
+    return vpProject::FILE_NOT_EXIST;
+    }
+
+  return vpProject::FILE_EXIST;
+}
diff --git a/Applications/VpView/vpProjectParser.h b/Applications/VpView/vpProjectParser.h
new file mode 100644
index 00000000..f2c1a4b7
--- /dev/null
+++ b/Applications/VpView/vpProjectParser.h
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpProjectParser_h
+#define __vpProjectParser_h
+
+// C++ includes.
+#include <string>
+
+#include <vtkSetGet.h>
+
+// Forward declarations.
+class vpProject;
+
+class vpProjectParser
+{
+public:
+  // Description:
+  // Constructor / Destructor.
+  vpProjectParser();
+  ~vpProjectParser();
+
+  // Description:
+  // Use stream to read the project configuration (rather than file).
+  // Default is set to false.
+  void SetUseStream(bool flag)
+    {
+    this->UseStream = flag;
+    }
+  bool GetUseStream() const
+    {
+    return this->UseStream;
+    }
+
+  // Description:
+  // Set/Get name of the configuration file that needs
+  // to be parsed.
+  void SetFileName(const std::string& fileName)
+    {
+    this->ProjectFileName = fileName;
+    }
+  const std::string& GetProjectFileName() const
+    {
+    return this->ProjectFileName;
+    }
+
+  // Description:
+  // Set/Get stream to use for configuration.
+  void SetStream(const std::string& stream)
+    {
+    this->ProjectStream = stream;
+    }
+
+  // Description:
+  // Parse the file now.
+  bool Parse(vpProject* prj);
+
+private:
+  void ConstructCompletePath(std::string& fileName, const std::string& stem);
+
+  int  CheckIfFileExists(const std::string& tag, const std::string& fileName);
+
+  bool UseStream;
+
+  std::string        ProjectFileName;
+  std::string        ProjectStream;
+};
+
+#endif // __vpProjectParser_h
diff --git a/Applications/VpView/vpQtSceneUtils.cxx b/Applications/VpView/vpQtSceneUtils.cxx
new file mode 100644
index 00000000..9cc0e588
--- /dev/null
+++ b/Applications/VpView/vpQtSceneUtils.cxx
@@ -0,0 +1,60 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpQtSceneUtils.h"
+
+// Qt includes
+#include <QComboBox>
+#include <QDebug>
+#include <QGridLayout>
+#include <QLabel>
+#include <QWidget>
+
+// VTK includes
+#include <vtkVgBaseImageSource.h>
+
+//-----------------------------------------------------------------------------
+void vpQtSceneUtils::addContextLevels(vtkVgBaseImageSource* contextSource, QComboBox* comboBox)
+{
+  if (!contextSource || !comboBox)
+    {
+    qDebug() << "ERROR: Invalid (NULL) context source or combo box";
+    return;
+    }
+
+  int countContextLOD = contextSource->GetNumberOfLevels();
+
+  comboBox->blockSignals(true);
+
+  comboBox->addItem(QString("Auto"), QVariant(-1));
+
+  // \note: the base level starts at 0.
+  for (int i = 0; i < countContextLOD; ++i)
+    {
+    QString level("Level_");
+    level.append(QString("%1").arg(i));
+    comboBox->addItem(
+      level, QVariant(i));
+    }
+
+  comboBox->blockSignals(false);
+}
+
+//-----------------------------------------------------------------------------
+QWidget* vpQtSceneUtils::createContextSlider(QSlider* slider, QWidget* parent/*=0*/)
+{
+  QWidget* widget = new QWidget(parent);
+  QGridLayout* layout = new QGridLayout(widget);
+  QLabel* mainLabel = new QLabel("Context Detail", parent);
+  QLabel* resolutionLabel = new QLabel("Low", parent);
+  layout->addWidget(resolutionLabel, 0, 0);
+  layout->addWidget(slider, 0, 1);
+  resolutionLabel = new QLabel("High", parent);
+  layout->addWidget(resolutionLabel, 0, 2);
+  mainLabel->setAlignment(Qt::AlignCenter);
+  layout->addWidget(mainLabel, 1, 1);
+  return widget;
+}
diff --git a/Applications/VpView/vpQtSceneUtils.h b/Applications/VpView/vpQtSceneUtils.h
new file mode 100644
index 00000000..45f01649
--- /dev/null
+++ b/Applications/VpView/vpQtSceneUtils.h
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// Forward declarations
+class QComboBox;
+class QSlider;
+class QWidget;
+
+class vtkVgBaseImageSource;
+
+class vpQtSceneUtils
+{
+public:
+  static void addContextLevels(vtkVgBaseImageSource* contextSource,
+                               QComboBox* comboBox);
+
+  static QWidget* createContextSlider(QSlider* slider, QWidget* parent = 0);
+};
diff --git a/Applications/VpView/vpQtViewer3d.cxx b/Applications/VpView/vpQtViewer3d.cxx
new file mode 100644
index 00000000..5080ae9c
--- /dev/null
+++ b/Applications/VpView/vpQtViewer3d.cxx
@@ -0,0 +1,868 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpQtViewer3d.h"
+
+// Qt includes
+#include <QDebug>
+#include <QStringList>
+
+// VTK includes
+#include <vtkCamera.h>
+#include <vtkCellData.h>
+#include <vtkCommand.h>
+#include <vtkEventQtSlotConnect.h>
+#include <vtkHardwareSelector.h>
+#include <vtkIdTypeArray.h>
+#include <vtkImageActor.h>
+#include <vtkImageData.h>
+#include <vtkInteractorStyle.h>
+#include <vtkMath.h>
+#include <vtkPlane.h>
+#include <vtkPlaneSource.h>
+#include <vtkPointData.h>
+#include <vtkPointPicker.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkType.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkSelection.h>
+#include <vtkSelectionNode.h>
+
+#include "vpFileDataSource.h"
+#include "vpImageSourceFactory.h"
+#include "vpProject.h"
+#include "vpViewCore.h"
+
+//  VisGUI includes
+#include <vtkVgPicker.h>
+
+#include <qtStlUtil.h>
+
+#include <vtkVgGraphModel.h>
+#include <vtkVgImageSource.h>
+#include <vtkVgGraphRepresentation.h>
+#include <vtkVgImageSource.h>
+#include <vtkVgRendererUtils.h>
+#include <vtkVgPicker.h>
+#include <vtkVgRepresentationBase.h>
+#include <vtkVgSpaceConversion.h>
+
+// C includes
+#include <cmath>
+
+// C++ includes
+#include <limits>
+
+class vpQtViewer3d::vpQtViewer3dInternal
+{
+public:
+
+  bool                                  Initialized;
+
+  double                                ContextSourceLODFactor;
+
+  vtkSmartPointer<vtkImageData>         ContextData;
+  vtkSmartPointer<vtkVgBaseImageSource> ContextSource;
+  vtkSmartPointer<vtkPlaneSource>       ContextPlane;
+  vtkSmartPointer<vtkActor>             ContextPlaneActor;
+
+  vtkSmartPointer<vtkHardwareSelector>  Selector;
+};
+
+//-----------------------------------------------------------------------------
+vpQtViewer3d::vpQtViewer3d(QObject* parent) : QObject(parent),
+  Internal(new vpQtViewer3dInternal())
+{
+  this->ContextActor  = vtkSmartPointer<vtkImageActor>::New();
+
+  this->ContextDataSource = 0;
+
+  this->SceneRenderer = vtkSmartPointer<vtkRenderer>::New();
+
+  this->SceneRenderWindow = 0;
+
+  this->InteractorStyle   = 0;
+
+  this->Picker = vtkSmartPointer<vtkVgPicker>::New();
+  this->Picker->SetVerbose(0);
+
+  this->VTKConnect = vtkSmartPointer<vtkEventQtSlotConnect>::New();
+
+  this->CoreInstance = 0;
+
+  this->GraphRepresentation = 0;
+
+  this->Project = 0;
+
+  this->Internal->Initialized = false;
+
+  this->Internal->ContextSourceLODFactor = 1.0;
+
+  this->Internal->ContextData       = vtkSmartPointer<vtkImageData>::New();
+  this->Internal->ContextPlane      = vtkSmartPointer<vtkPlaneSource>::New();
+  this->Internal->ContextPlaneActor = vtkSmartPointer<vtkActor>::New();
+  this->Internal->ContextSource     = 0;
+
+  this->Internal->Selector          = 0;
+}
+
+//-----------------------------------------------------------------------------
+vpQtViewer3d::~vpQtViewer3d()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderer* vpQtViewer3d::getSceneRenderer() const
+{
+  return this->SceneRenderer;
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setSceneRenderWindow(vtkRenderWindow* renderWindow)
+{
+  if (renderWindow)
+    {
+    this->SceneRenderWindow = renderWindow;
+    this->SceneRenderWindow->AddRenderer(this->SceneRenderer);
+
+    this->VTKConnect->Connect(
+      this->SceneRenderWindow->GetInteractor(),
+      vtkCommand::MiddleButtonPressEvent, this, SLOT(onMiddleClick()));
+
+    this->VTKConnect->Connect(
+      this->SceneRenderWindow->GetInteractor(),
+      vtkCommand::KeyPressEvent, this, SLOT(onKeyPress()));
+
+    this->VTKConnect->Connect(
+      this->SceneRenderWindow->GetInteractor(),
+      vtkCommand::EndInteractionEvent, this, SLOT(onInteraction()));
+
+    this->VTKConnect->Connect(
+      this->SceneRenderer,
+      vtkCommand::ResetCameraEvent, this, SLOT(onResetCamera()));
+    }
+  else
+    {
+    qDebug() << "ERROR: Invalid ( null ) render window";
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderWindow* vpQtViewer3d::getSceneRenderWindow() const
+{
+  return this->SceneRenderWindow;
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setInteractorStyle(vtkInteractorStyle* style)
+{
+  if (!style)
+    {
+    qDebug() << "ERROR: Invalid ( null ) interactor style";
+    }
+  else
+    {
+    this->InteractorStyle = style;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkInteractorStyle* vpQtViewer3d::getInteractorStyle() const
+{
+  return this->InteractorStyle;
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setPicker(vtkVgPicker* picker)
+{
+  if (!picker)
+    {
+    qDebug() << "ERROR: Invalid ( null ) picker";
+    }
+
+  this->Picker = picker;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPicker* vpQtViewer3d::getPicker() const
+{
+  return this->Picker;
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setViewCoreInstance(vpViewCore* core)
+{
+  if (this->CoreInstance != core)
+    {
+    this->CoreInstance = core;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vpViewCore* vpQtViewer3d::getViewCoreInstance()
+{
+  return this->CoreInstance;
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setContextDataSource(vpFileDataSource* source)
+{
+  if (source && this->ContextDataSource != source)
+    {
+    this->ContextDataSource = source;
+    }
+  else
+    {
+    qDebug() << "ERROR: Invalid ( null ) context source";
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgBaseImageSource* vpQtViewer3d::getContextSource() const
+{
+  return this->Internal->ContextSource;
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setProject(vpProject* project)
+{
+  if (project && project != this->Project)
+    {
+    this->Project = project;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::addRepresentation(vtkVgRepresentationBase* representation)
+{
+  if (representation)
+    {
+    if (vtkVgGraphRepresentation::SafeDownCast(representation))
+      {
+      this->GraphRepresentation =
+        vtkVgGraphRepresentation::SafeDownCast(representation);
+      }
+
+    this->Representations.push_back(representation);
+
+    vtkPropCollection* props =
+      representation->GetActiveRenderObjects();
+    props->InitTraversal();
+    while (vtkProp* prop = props->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+  else
+    {
+    qDebug() << "ERROR: Invalid ( null ) representation";
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::update(const vtkVgTimeStamp& timestamp)
+{
+  if (this->ContextDataSource)
+    {
+    this->updateContext(timestamp);
+
+    if (!this->SceneRenderer->HasViewProp(this->ContextActor))
+      {
+      this->SceneRenderer->AddViewProp(this->ContextActor);
+      }
+    }
+
+  for (int i = 0; i < this->Representations.size(); ++i)
+    {
+    vtkVgRepresentationBase* representation = this->Representations[i];
+
+    vtkPropCollection* expiredProps =
+      representation->GetExpiredRenderObjects();
+    expiredProps->InitTraversal();
+    while (vtkProp* prop = expiredProps->GetNextProp())
+      {
+      this->SceneRenderer->RemoveViewProp(prop);
+      }
+
+    vtkPropCollection* newProps =
+      representation->GetNewRenderObjects();
+    newProps->InitTraversal();
+    while (vtkProp* prop = newProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+
+// Do nothing other than render.
+  this->forceRender();
+}
+
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::forceRender()
+{
+  this->SceneRenderWindow->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::reset()
+{
+  // For now just reset the camera.
+  this->SceneRenderer->ResetCamera();
+
+  this->forceRender();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::pick()
+{
+  vtkRenderWindowInteractor* interactor = this->SceneRenderWindow->GetInteractor();
+  int x = interactor->GetEventPosition()[0];
+  int y = interactor->GetEventPosition()[1];
+
+  if (!this->Internal->Selector)
+    {
+    this->Internal->Selector = vtkSmartPointer<vtkHardwareSelector>::New();
+    this->Internal->Selector->SetRenderer(this->SceneRenderer);
+    this->Internal->Selector->SetFieldAssociation(vtkDataObject::FIELD_ASSOCIATION_POINTS);
+    }
+
+  this->Internal->Selector->SetArea(static_cast<unsigned int>(x),
+                                    static_cast<unsigned int>(y),
+                                    static_cast<unsigned int>(x),
+                                    static_cast<unsigned int>(y));
+
+  vtkSmartPointer<vtkSelection> selection;
+  selection.TakeReference(this->Internal->Selector->Select());
+
+  vtkVgPickData::PickData data = this->GraphRepresentation->Pick(selection);
+
+  if (!data.PickedEntities.empty())
+    {
+    for (size_t i = 0; i < data.PickedEntities.size(); ++i)
+      {
+      std::cout << "Type: " << data.PickedEntities[i].PickedType << std::endl;
+      std::cout << "Id: "   << data.PickedEntities[i].PickedId   << std::endl;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::getGraphEdgeColorModes(QStringList& list)
+{
+  for (int i = 0; i < vtkVgGraphRepresentation::CountEdgeColorModes; ++i)
+    {
+    list.push_back(qtString(vtkVgGraphRepresentation::GetGraphEdgeColorModeString(i)));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::getGraphEdgeThicknessModes(QStringList& list)
+{
+  for (int i = 0; i < vtkVgGraphRepresentation::CountEdgeThicknessModes; ++i)
+    {
+    list.push_back(qtString(vtkVgGraphRepresentation::GetGraphEdgeThicknessModeString(i)));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::onMiddleClick()
+{
+  this->pick();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::onKeyPress()
+{
+  switch (this->SceneRenderWindow->GetInteractor()->GetKeyCode())
+    {
+    case 'a':
+    case 'A':
+      this->resetToAOI();
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::onInteraction()
+{
+  this->updateContext(this->CoreInstance->getImageryTimeStamp());
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::onResetCamera()
+{
+  if (this->CoreInstance)
+    {
+    this->updateContext(this->CoreInstance->getImageryTimeStamp());
+    }
+
+  this->forceRender();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::resetToAOI()
+{
+  if (this->CoreInstance)
+    {
+    double extents[4];
+    this->CoreInstance->getAOIExtents(extents);
+
+    this->resetCamera();
+
+    vtkVgRendererUtils::ZoomToExtents2D(this->SceneRenderer, extents, false);
+
+    this->updateContext(this->CoreInstance->getImageryTimeStamp());
+
+    this->forceRender();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::resetCamera()
+{
+  this->SceneRenderer->GetActiveCamera()->SetViewUp(0.0, 1.0, 0.0);
+  this->SceneRenderer->GetActiveCamera()->SetFocalPoint(0.0, 0.0, 0.0);
+  this->SceneRenderer->GetActiveCamera()->SetPosition(0.0, 0.0, 1.0);
+  this->SceneRenderer->ResetCamera();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setGraphEdgeColorMode(int mode)
+{
+  if (this->GraphRepresentation)
+    {
+    this->GraphRepresentation->SetGraphEdgeColorMode(mode);
+    this->forceRender();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpQtViewer3d::getGraphEdgeColorMode()
+{
+  if (this->GraphRepresentation)
+    {
+    return this->GraphRepresentation->GetGraphEdgeColorMode();
+    }
+  else
+    {
+    return -1;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setGraphEdgeThicknessMode(int mode)
+{
+  if (this->GraphRepresentation)
+    {
+    this->GraphRepresentation->SetGraphEdgeThicknessMode(mode);
+    this->forceRender();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpQtViewer3d::getGraphEdgeThicknessMode()
+{
+  return this->GraphRepresentation->GetGraphEdgeThicknessMode();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setGraphNodeHeightMode(int mode)
+{
+  if (this->GraphRepresentation)
+    {
+    vtkVgGraphModel* model = this->GraphRepresentation->GetGraphModel();
+
+    model->SetCurrentZOffsetMode(mode);
+
+    model->Update(model->GetCurrentTimeStamp());
+
+    this->update(this->CoreInstance->getImageryTimeStamp());
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpQtViewer3d::getGraphNodeHeightMode()
+{
+  return this->GraphRepresentation->GetGraphModel()->GetCurrentZOffsetMode();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::getViewClippedWorldExtents(double points[][4],
+                                              int numberOfPoints,
+                                              double worldExtents[6])
+{
+  // In VTK view extents are -1, +1.
+  const double e = std::numeric_limits<double>::epsilon();
+  double viewExtents[2] = { -1.0, 1.0 };
+
+  std::vector<double> intersectedWorldPoints;
+  std::vector<double> intersectedViewPoints;
+
+  for (int i = 0; i < numberOfPoints; ++i)
+    {
+    if (points[i][0] >= (viewExtents[0] - e) &&
+        points[i][0] <= (viewExtents[1] + e) &&
+        points[i][1] >= (viewExtents[0] - e) &&
+        points[i][1] <= (viewExtents[1] + e))
+      {
+      intersectedViewPoints.push_back(points[i][0]);
+      intersectedViewPoints.push_back(points[i][1]);
+      intersectedViewPoints.push_back(points[i][2]);
+      }
+    }
+
+  // Plane normals.
+  double viewNormals[4][3] =
+    {
+      { viewExtents[1], 0.0, 0.0 },
+      { 0.0, viewExtents[1], 0.0 },
+      { viewExtents[0], 0.0, 0.0 },
+      { 0.0, viewExtents[0], 0.0 }
+    };
+
+  // Points on the plane.
+  double viewPoints[4][3] =
+    {
+      { viewExtents[1], viewExtents[0], 0.0 },
+      { viewExtents[1], viewExtents[1], 0.0 },
+      { viewExtents[0], viewExtents[1], 0.0 },
+      { viewExtents[0], viewExtents[0], 0.0 }
+    };
+
+  for (int i = 0; i < numberOfPoints; ++i)
+    {
+    double point1[3] = { points[i][0], points[i][1], points[i][2] };
+    double point2[3];
+
+    if (i == numberOfPoints - 1)
+      {
+      point2[0] = points[0][0];
+      point2[1] = points[0][1];
+      point2[2] = points[0][2];
+      }
+    else
+      {
+      point2[0] = points[i + 1][0];
+      point2[1] = points[i + 1][1];
+      point2[2] = points[i + 1][2];
+      }
+
+    for (int j = 0; j < 4; ++j)
+      {
+      double intersectedPoint[3];
+
+      bool intersected =
+        vtkVgRendererUtils::GetLinePlaneIntersection(
+          point1, point2, viewNormals[j], viewPoints[j], intersectedPoint);
+
+      if (intersected &&
+          (intersectedPoint[0] >= (viewExtents[0] - e)) &&
+          (intersectedPoint[0] <= (viewExtents[1] + e)) &&
+          (intersectedPoint[1] >= (viewExtents[0] - e)) &&
+          (intersectedPoint[1] <= (viewExtents[1] + e)))
+        {
+        intersectedViewPoints.push_back(intersectedPoint[0]);
+        intersectedViewPoints.push_back(intersectedPoint[1]);
+        intersectedViewPoints.push_back(intersectedPoint[2]);
+        }
+      }
+    }
+
+  // Now check for points that are inside the polygon formed by joining points.
+  this->Picker->SetActor(this->Internal->ContextPlaneActor);
+  for (int i = 0; i < 4; ++i)
+    {
+    double displayPoint[4];
+
+    vtkVgSpaceConversion::ViewToDisplay(this->SceneRenderer, viewPoints[i],
+                                        displayPoint);
+
+    int pickStatus =
+      this->Picker->Pick(displayPoint[0], displayPoint[1], 0.0, this->SceneRenderer);
+
+    if (pickStatus == vtkVgPickData::PickedImage)
+      {
+      double pickedPosition[3];
+      this->Picker->GetPickPosition(pickedPosition);
+
+      intersectedWorldPoints.push_back(pickedPosition[0]);
+      intersectedWorldPoints.push_back(pickedPosition[1]);
+      intersectedWorldPoints.push_back(pickedPosition[2]);
+      }
+    }
+
+  worldExtents[0] = VTK_DOUBLE_MAX;
+  worldExtents[1] = VTK_DOUBLE_MIN;
+  worldExtents[2] = VTK_DOUBLE_MAX;
+  worldExtents[3] = VTK_DOUBLE_MIN;
+  worldExtents[4] = VTK_DOUBLE_MAX;
+  worldExtents[5] = VTK_DOUBLE_MIN;
+
+  for (size_t i = 0; i < intersectedViewPoints.size(); i += 3)
+    {
+    double viewPoint[3] =
+      {
+      intersectedViewPoints[i],
+      intersectedViewPoints[i + 1],
+      intersectedViewPoints[i + 2]
+      };
+
+    double worldPoint[4];
+
+    vtkVgSpaceConversion::ViewToWorld(this->SceneRenderer, viewPoint,
+                                      worldPoint);
+
+    intersectedWorldPoints.push_back(worldPoint[0]);
+    intersectedWorldPoints.push_back(worldPoint[1]);
+    intersectedWorldPoints.push_back(worldPoint[2]);
+    }
+
+  if (intersectedWorldPoints.size())
+    {
+    vtkVgRendererUtils::CalculateBounds(intersectedWorldPoints, worldExtents);
+
+    // Extents are 1 less than bounds.
+    worldExtents[1] += -1;
+    worldExtents[3] += -1;
+    worldExtents[5] += -1;
+    }
+  else
+    {
+    worldExtents[0] = -1;
+    worldExtents[1] = -1;
+    worldExtents[2] = -1;
+    worldExtents[3] = -1;
+    worldExtents[4] = -1;
+    worldExtents[5] = -1;
+    }
+
+//   \note: Debug messages.
+//  qDebug() << worldExtents[0] << worldExtents[1] << worldExtents[2]
+//           << worldExtents[3];
+}
+
+//-----------------------------------------------------------------------------
+int vpQtViewer3d::calculateContextLevelOfDetail(double visibleExtents[6])
+{
+  double level = static_cast<double>(
+                   this->Internal->ContextSource->GetNumberOfLevels());
+
+  double viewableArea = (visibleExtents[1] - visibleExtents[0]) *
+                        (visibleExtents[3] - visibleExtents[2]);
+
+  double maxBounds[6];
+  this->Internal->ContextPlaneActor->GetBounds(maxBounds);
+  double maxViewableArea = (maxBounds[1] - maxBounds[0]) *
+                           (maxBounds[3] - maxBounds[2]) ;
+
+//  \note: Debug messages.
+//  qDebug() << "viewableArea"  << viewableArea;
+//  qDebug() << "maxViewableArea" << maxViewableArea;
+  const double delayHighResolutionFactor = 1.2;
+
+  double range[2] = { 1.0, level };
+  level = pow(2,
+              (level * viewableArea / maxViewableArea) *
+              delayHighResolutionFactor *
+              this->Internal->ContextSourceLODFactor);
+
+  vtkMath::ClampValue(&level, range);
+
+  //  \note: Debug messages.
+//  qDebug() << "level" << level;
+
+  return static_cast<int>(level);
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::setContextLevelOfDetailFactor(int factor)
+{
+  if (factor < 0)
+    {
+    this->Internal->ContextSourceLODFactor = static_cast<double>(abs(factor));
+    }
+  else if (factor > 0)
+    {
+    this->Internal->ContextSourceLODFactor = 1.0 / abs(factor);
+    }
+  else
+    {
+    this->Internal->ContextSourceLODFactor = 1.0;
+    }
+
+  if (!this->Internal->ContextSource)
+    {
+    return;
+    }
+
+  double extents[6] = {0.0};
+  int readExtents[4] = {0};
+
+  this->Internal->ContextSource->GetReadExtents(readExtents);
+
+  extents[0] = static_cast<double>(readExtents[0]);
+  extents[1] = static_cast<double>(readExtents[1]);
+  extents[2] = static_cast<double>(readExtents[2]);
+  extents[3] = static_cast<double>(readExtents[3]);
+
+  this->Internal->ContextSource->SetLevel(
+    this->calculateContextLevelOfDetail(extents));
+
+  this->refreshContext();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::updateContext(const vtkVgTimeStamp& timestamp)
+{
+  if (!this->ContextDataSource)
+    {
+    return;
+    }
+
+  std::string nextDataFile =
+    this->ContextDataSource->getDataFile(timestamp.GetFrameNumber());
+
+  if (!this->Internal->ContextSource)
+    {
+    this->Internal->ContextSource.TakeReference(
+      vpImageSourceFactory::GetInstance()->Create(nextDataFile));
+    this->Internal->ContextSource->SetOrigin(this->Project->OverviewOrigin[0],
+                                             this->Project->OverviewOrigin[1],
+                                             0.0);
+    if (this->Project->OverviewSpacing != -1)
+      {
+      this->Internal->ContextSource->SetSpacing(this->Project->OverviewSpacing,
+                                                this->Project->OverviewSpacing,
+                                                this->Project->OverviewSpacing);
+      }
+    }
+
+  this->Internal->ContextSource->SetFileName(
+    this->ContextDataSource->getDataFile(timestamp.GetFrameNumber()).c_str());
+
+  double bounds[6];
+  this->Internal->ContextPlaneActor->GetBounds(bounds);
+
+  double pt1[3] = {bounds[0], bounds[2], bounds[5]}; // min, min
+  double pt2[3] = {bounds[0], bounds[3], bounds[5]}; // min, max
+  double pt3[3] = {bounds[1], bounds[3], bounds[5]}; // max, max
+  double pt4[3] = {bounds[1], bounds[2], bounds[5]}; // max, min
+
+  double outPoints[4][4];
+
+  // Make sure camera exists, otherwise view transformation will fail
+  this->SceneRenderer->GetActiveCamera();
+
+  vtkVgSpaceConversion::WorldToView(this->SceneRenderer, pt1, &outPoints[0][0]);
+  vtkVgSpaceConversion::WorldToView(this->SceneRenderer, pt2, &outPoints[1][0]);
+  vtkVgSpaceConversion::WorldToView(this->SceneRenderer, pt3, &outPoints[2][0]);
+  vtkVgSpaceConversion::WorldToView(this->SceneRenderer, pt4, &outPoints[3][0]);
+
+  double readExtents[6];
+
+  this->getViewClippedWorldExtents(outPoints, 4, readExtents);
+
+  // Ignoring z extents.
+  readExtents[4] = 0.0;
+  readExtents[5] = 0.0;
+
+  if (!this->Internal->Initialized)
+    {
+    this->ContextActor->SetInputData(this->Internal->ContextData);
+
+    this->Internal->ContextSource->SetLevel(3);
+    this->Internal->ContextSource->SetReadExtents(-1, -1, -1, -1);
+    }
+  else
+    {
+    for (int i = 0; i < 4; ++i)
+      {
+      if (static_cast<int>(readExtents[i]) == -1)
+        {
+        continue;
+        }
+
+      if (i < 2)
+        {
+        readExtents[i] -= this->Project->OverviewOrigin[0];
+        }
+      else
+        {
+        readExtents[i] -= this->Project->OverviewOrigin[1];
+        }
+      }
+
+    //   \note: Debug messages.
+    //  qDebug() << readExtents[0] << readExtents[1] << readExtents[2]
+    //           << readExtents[3];
+
+    this->Internal->ContextSource->SetReadExtents(
+      static_cast<int>(readExtents[0]),
+      static_cast<int>(readExtents[1]),
+      static_cast<int>(readExtents[2]),
+      static_cast<int>(readExtents[3]));
+
+    this->Internal->ContextSource->SetLevel(
+      this->calculateContextLevelOfDetail(readExtents));
+    }
+
+  this->refreshContext();
+
+  if (!this->Internal->Initialized)
+    {
+    double contextBounds[6];
+    this->ContextActor->GetBounds(contextBounds);
+
+    this->Internal->ContextPlane->SetOrigin(
+      contextBounds[0], contextBounds[2], contextBounds[5]);
+
+    this->Internal->ContextPlane->SetPoint1(
+      contextBounds[1], contextBounds[2], contextBounds[5]);
+
+    this->Internal->ContextPlane->SetPoint2(
+      contextBounds[0], contextBounds[3], contextBounds[5]);
+
+    vtkSmartPointer<vtkPolyDataMapper> mapper(
+      vtkSmartPointer<vtkPolyDataMapper>::New());
+    mapper->SetInputData(this->Internal->ContextPlane->GetOutput());
+
+    this->Internal->ContextPlaneActor->SetMapper(mapper);
+    this->Internal->ContextPlaneActor->GetProperty()->SetOpacity(0.0);
+
+    this->SceneRenderer->AddActor(this->Internal->ContextPlaneActor);
+
+    // For some reason this->Picker->SetImageActor(this->ContextActor) is not working.
+    vtkSmartPointer<vtkImageData> imageData(
+      vtkSmartPointer<vtkImageData>::New());
+    imageData->ShallowCopy(this->Internal->ContextData);
+
+    vtkSmartPointer<vtkImageActor> imageActor(
+      vtkSmartPointer<vtkImageActor>::New());
+    imageActor->SetInputData(imageData);
+
+    this->Picker->SetImageActor(imageActor);
+
+    this->Internal->Initialized = true;
+
+    emit this->contextCreated();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3d::refreshContext()
+{
+  this->Internal->ContextSource->Update();
+
+  this->Internal->ContextData->ShallowCopy(
+    this->Internal->ContextSource->GetOutput());
+
+  this->ContextActor->Update();
+}
diff --git a/Applications/VpView/vpQtViewer3d.h b/Applications/VpView/vpQtViewer3d.h
new file mode 100644
index 00000000..670d7d34
--- /dev/null
+++ b/Applications/VpView/vpQtViewer3d.h
@@ -0,0 +1,149 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpQtViewer3d_h
+#define __vpQtViewer3d_h
+
+// VisGUI includes
+#include <vtkVgPicker.h>
+#include <vtkVgTimeStamp.h>
+
+#include <qtGlobal.h>
+
+// Qt includes
+#include <QList>
+#include <QObject>
+
+// VTK includes
+#include <vtkSmartPointer.h>
+
+// Forward declarations.
+class vpFileDataSource;
+class vpProject;
+
+class vtkImageActor;
+class vtkImageData;
+class vtkInteractorStyle;
+class vtkProp;
+class vtkRenderer;
+class vtkRenderWindow;
+
+class vtkVgBaseImageSource;
+class vtkVgGraphRepresentation;
+class vtkVgPicker;
+class vtkVgRepresentationBase;
+
+class vtkEventQtSlotConnect;
+
+class vpViewCore;
+
+class vpQtViewer3d : public QObject
+{
+  Q_OBJECT
+
+public:
+  vpQtViewer3d(QObject* parent);
+
+  virtual ~vpQtViewer3d();
+
+  vtkRenderer*        getSceneRenderer() const;
+
+  void                setSceneRenderWindow(vtkRenderWindow* renderWindow);
+  vtkRenderWindow*    getSceneRenderWindow() const;
+
+  void                setInteractorStyle(vtkInteractorStyle* style);
+  vtkInteractorStyle* getInteractorStyle() const;
+
+  void                setPicker(vtkVgPicker* picker);
+  vtkVgPicker*        getPicker() const;
+
+  void                setViewCoreInstance(vpViewCore* core);
+  vpViewCore*         getViewCoreInstance();
+
+  void                setContextDataSource(vpFileDataSource* source);
+
+  vtkVgBaseImageSource* getContextSource() const;
+
+  void                setProject(vpProject* project);
+
+  void                addRepresentation(vtkVgRepresentationBase* representation);
+
+  virtual void        update(const vtkVgTimeStamp& timestamp);
+
+  virtual void        forceRender();
+
+  virtual void        reset();
+
+  virtual void        pick();
+
+  virtual void        getGraphEdgeColorModes(QStringList& list);
+  virtual void        getGraphEdgeThicknessModes(QStringList& list);
+
+signals:
+  void         contextCreated();
+
+public slots:
+  virtual void onMiddleClick();
+
+  virtual void onKeyPress();
+
+  virtual void onInteraction();
+
+  virtual void onResetCamera();
+
+  virtual void resetCamera();
+
+  virtual void resetToAOI();
+
+  virtual void setGraphEdgeColorMode(int mode);
+  virtual int  getGraphEdgeColorMode();
+
+  virtual void setGraphEdgeThicknessMode(int mode);
+  virtual int  getGraphEdgeThicknessMode();
+
+  virtual void setGraphNodeHeightMode(int mode);
+  virtual int  getGraphNodeHeightMode();
+
+  virtual void setContextLevelOfDetailFactor(int level);
+
+  void         updateContext(const vtkVgTimeStamp& timestamp);
+
+  void         refreshContext();
+
+private:
+  int  calculateContextLevelOfDetail(double visibleExtents[6]);
+
+  void getViewClippedWorldExtents(double points[][4], int numberOfPoints,
+                                  double worldExtents[6]);
+
+  vtkSmartPointer<vtkImageActor>      ContextActor;
+  vpFileDataSource*                   ContextDataSource;
+
+  QList<vtkSmartPointer<vtkVgRepresentationBase> > Representations;
+
+  vtkSmartPointer<vtkRenderer>        SceneRenderer;
+  vtkSmartPointer<vtkRenderWindow>    SceneRenderWindow;
+
+  vtkSmartPointer<vtkInteractorStyle> InteractorStyle;
+
+  vtkSmartPointer<vtkVgPicker>        Picker;
+
+  vtkSmartPointer<vtkEventQtSlotConnect> VTKConnect;
+
+  vpViewCore*                         CoreInstance;
+
+  vtkSmartPointer<vtkVgGraphRepresentation> GraphRepresentation;
+
+  vpProject*                          Project;
+
+  class vpQtViewer3dInternal;
+  vpQtViewer3dInternal* const        Internal;
+
+private:
+  Q_DISABLE_COPY(vpQtViewer3d);
+};
+
+#endif // __vpQtViewer3d_h
diff --git a/Applications/VpView/vpQtViewer3dDialog.cxx b/Applications/VpView/vpQtViewer3dDialog.cxx
new file mode 100644
index 00000000..7e6df37d
--- /dev/null
+++ b/Applications/VpView/vpQtViewer3dDialog.cxx
@@ -0,0 +1,162 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpQtViewer3dDialog.h"
+#include "ui_vpQtViewer3dDialog.h"
+
+// Qt includes
+#include <QDebug>
+
+// VisGUI includes.
+#include "vtkVgBaseImageSource.h"
+
+#include "vpQtSceneUtils.h"
+#include "vpViewCore.h"
+
+//-----------------------------------------------------------------------------
+class vpQtViewer3dDialog::vtkInternal
+{
+public:
+
+  vtkInternal()
+    {
+    this->UI = new Ui::vpQtViewer3dDialog();
+    }
+
+  ~vtkInternal()
+    {
+    delete this->UI;
+    }
+
+  Ui::vpQtViewer3dDialog* UI;
+
+  QWidget* ContextLODWidget;
+};
+
+//-----------------------------------------------------------------------------
+vpQtViewer3dDialog::vpQtViewer3dDialog(QWidget* parent) :
+  QDialog(parent)
+{
+  this->Internal = new vtkInternal();
+  this->Internal->UI->setupUi(this);
+
+  this->setupInternalUi();
+
+  connect(this->Internal->UI->edgeColorModeComboBox,
+          SIGNAL(currentIndexChanged(int)),
+          this->Internal->UI->viewer3dWidget->getViewer3d(),
+          SLOT(setGraphEdgeColorMode(int)));
+
+  connect(this->Internal->UI->edgeThicknessModeComboBox,
+          SIGNAL(currentIndexChanged(int)),
+          this->Internal->UI->viewer3dWidget->getViewer3d(),
+          SLOT(setGraphEdgeThicknessMode(int)));
+
+  connect(this->Internal->UI->nodeHeightComboBox,
+          SIGNAL(currentIndexChanged(int)),
+          this->Internal->UI->viewer3dWidget->getViewer3d(),
+          SLOT(setGraphNodeHeightMode(int)));
+
+  connect(this->Internal->UI->viewer3dWidget->getViewer3d(),
+          SIGNAL(contextCreated()),
+          this, SLOT(onContextCreated()));
+}
+
+//-----------------------------------------------------------------------------
+vpQtViewer3dDialog::~vpQtViewer3dDialog()
+{
+  delete this->Internal;
+  this->Internal = 0;
+}
+
+//-----------------------------------------------------------------------------
+vpQtViewer3dWidget* vpQtViewer3dDialog::getViewer3dWidget()
+{
+  return this->Internal->UI->viewer3dWidget;
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3dDialog::update(const vtkVgTimeStamp& timestamp)
+{
+  this->Internal->UI->viewer3dWidget->update(timestamp);
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3dDialog::reset()
+{
+  this->Internal->UI->viewer3dWidget->reset();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3dDialog::onContextCreated()
+{
+  vtkVgBaseImageSource* contextSource =
+    this->Internal->UI->viewer3dWidget->getViewer3d()->getContextSource();
+
+  if (contextSource->GetNumberOfLevels() > 1)
+    {
+    this->Internal->ContextLODWidget->setEnabled(true);
+    }
+  else
+    {
+    this->Internal->ContextLODWidget->setEnabled(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3dDialog::onContextLODChanged(int value)
+{
+  this->Internal->UI->viewer3dWidget->getViewer3d()->setContextLevelOfDetailFactor(
+    value);
+
+  this->Internal->UI->viewer3dWidget->getViewer3d()->forceRender();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3dDialog::setupInternalUi()
+{
+  // Construct context LOD slider.
+  QHBoxLayout* contextLODLayout = new QHBoxLayout();
+  QSlider* contextLODSlider =
+    new QSlider(Qt::Horizontal, this->Internal->UI->sceneGroupBox);
+  contextLODSlider->setRange(-10, 10);
+  contextLODSlider->setTickInterval(1);
+  contextLODSlider->setSizePolicy(QSizePolicy::Preferred,
+                                  QSizePolicy::Preferred);
+
+  this->Internal->ContextLODWidget =
+    vpQtSceneUtils::createContextSlider(contextLODSlider,
+                                        this->Internal->UI->sceneGroupBox);
+
+  contextLODLayout->addWidget(this->Internal->ContextLODWidget);
+
+  this->Internal->UI->sceneGroupBox->setLayout(contextLODLayout);
+
+  connect(contextLODSlider, SIGNAL(valueChanged(int)) , this,
+          SLOT(onContextLODChanged(int)));
+
+  // Edge color modes.
+  QStringList edgeColorModes;
+  this->Internal->UI->viewer3dWidget->getViewer3d()->getGraphEdgeColorModes(
+    edgeColorModes);
+
+  QString edgeColorMode;
+  foreach (edgeColorMode, edgeColorModes)
+    {
+    this->Internal->UI->edgeColorModeComboBox->addItem(edgeColorMode);
+    }
+
+  // Edge thickness modes.
+  QStringList edgeThicknessModes;
+  this->Internal->UI->viewer3dWidget->getViewer3d()->getGraphEdgeThicknessModes(
+    edgeThicknessModes);
+
+  QString edgeThicknessMode;
+  foreach (edgeThicknessMode, edgeThicknessModes)
+    {
+    this->Internal->UI->edgeThicknessModeComboBox->addItem(edgeThicknessMode);
+    }
+}
diff --git a/Applications/VpView/vpQtViewer3dDialog.h b/Applications/VpView/vpQtViewer3dDialog.h
new file mode 100644
index 00000000..05aad4f0
--- /dev/null
+++ b/Applications/VpView/vpQtViewer3dDialog.h
@@ -0,0 +1,45 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpQtViewer3dDialog_h
+#define __vpQtViewer3dDialog_h
+
+#include <QDialog>
+
+// Forward declarations
+class vpQtViewer3dWidget;
+class vtkVgTimeStamp;
+
+class vpQtViewer3dDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit vpQtViewer3dDialog(QWidget* parent = 0);
+  ~vpQtViewer3dDialog();
+
+  vpQtViewer3dWidget* getViewer3dWidget();
+
+  virtual void update(const vtkVgTimeStamp& timestamp);
+
+  virtual void reset();
+
+
+public slots:
+
+  void onContextCreated();
+  void onContextLODChanged(int value);
+
+
+protected:
+  virtual void setupInternalUi();
+
+private:
+  class vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vpQtViewer3dDialog_h
diff --git a/Applications/VpView/vpQtViewer3dDialog.ui b/Applications/VpView/vpQtViewer3dDialog.ui
new file mode 100644
index 00000000..e2e5242f
--- /dev/null
+++ b/Applications/VpView/vpQtViewer3dDialog.ui
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpQtViewer3dDialog</class>
+ <widget class="QDialog" name="vpQtViewer3dDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>3D View</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="optionsLayout">
+     <item>
+      <widget class="QGroupBox" name="graphDisplayGroupBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Graph Display</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_3">
+        <item row="0" column="0">
+         <widget class="QGroupBox" name="groupBox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="title">
+           <string>Edge Display Options</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_4">
+           <item row="0" column="0">
+            <widget class="QLabel" name="edgeColorModeLabel">
+             <property name="text">
+              <string>Color: </string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="edgeColorModeComboBox"/>
+           </item>
+           <item row="0" column="2">
+            <widget class="QLabel" name="edgeThicknessLabel">
+             <property name="text">
+              <string>Thickness:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="3">
+            <widget class="QComboBox" name="edgeThicknessModeComboBox"/>
+           </item>
+          </layout>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QGroupBox" name="groupBox_2">
+          <property name="title">
+           <string>Node Display Options</string>
+          </property>
+          <layout class="QGridLayout" name="gridLayout_5">
+           <item row="0" column="0">
+            <widget class="QLabel" name="nodeHeightLabel">
+             <property name="text">
+              <string>Height:</string>
+             </property>
+            </widget>
+           </item>
+           <item row="0" column="1">
+            <widget class="QComboBox" name="nodeHeightComboBox">
+             <item>
+              <property name="text">
+               <string>Normalcy</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Start Time</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+          </layout>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="sceneGroupBox">
+       <property name="title">
+        <string>Scene</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="vpQtViewer3dWidget" name="viewer3dWidget" native="true">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vpQtViewer3dWidget</class>
+   <extends>QWidget</extends>
+   <header>vpQtViewer3dWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpQtViewer3dWidget.cxx b/Applications/VpView/vpQtViewer3dWidget.cxx
new file mode 100644
index 00000000..5d905f68
--- /dev/null
+++ b/Applications/VpView/vpQtViewer3dWidget.cxx
@@ -0,0 +1,89 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpQtViewer3dWidget.h"
+
+#include "ui_vpQtViewer3dWidget.h"
+
+// VisGUI includes
+#include "vpQtViewer3d.h"
+#include "vtkVgTimeStamp.h"
+
+// VTK includes
+#include <vtkInteractorStyle.h>
+#include <QVTKWidget.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+
+// Qt includes
+#include <QDebug>
+
+class vpQtViewer3dWidget::vtkInternal
+{
+public:
+
+  vtkInternal()
+    {
+    this->UI = new Ui::Viewer3dWidget();
+    }
+
+  ~vtkInternal()
+    {
+    delete this->UI;
+    }
+
+  Ui::Viewer3dWidget* UI;
+};
+
+//-----------------------------------------------------------------------------
+vpQtViewer3dWidget::vpQtViewer3dWidget(QWidget* parent, Qt::WindowFlags flag) :
+  QWidget(parent, flag)
+{
+  this->Internal = new vtkInternal();
+  this->Viewer3d = new vpQtViewer3d(this);
+
+  this->Internal->UI->setupUi(this);
+
+  this->setupViewer(this->Internal->UI->qvtkWidget);
+}
+
+//-----------------------------------------------------------------------------
+vpQtViewer3dWidget::~vpQtViewer3dWidget()
+{
+  delete this->Internal;
+  this->Internal = 0;
+}
+
+//-----------------------------------------------------------------------------
+vpQtViewer3d* vpQtViewer3dWidget::getViewer3d() const
+{
+  return this->Viewer3d;
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3dWidget::update(const vtkVgTimeStamp& timestamp)
+{
+  this->Viewer3d->update(timestamp);
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3dWidget::reset()
+{
+  this->Viewer3d->reset();
+}
+
+//-----------------------------------------------------------------------------
+void vpQtViewer3dWidget::setupViewer(QVTKWidget* qvtkWidget)
+{
+  if (qvtkWidget)
+    {
+    this->Viewer3d->setSceneRenderWindow(qvtkWidget->GetRenderWindow());
+    }
+  else
+    {
+    qDebug() << "ERROR: Invalid (null) widget";
+    }
+}
diff --git a/Applications/VpView/vpQtViewer3dWidget.h b/Applications/VpView/vpQtViewer3dWidget.h
new file mode 100644
index 00000000..e6cced5c
--- /dev/null
+++ b/Applications/VpView/vpQtViewer3dWidget.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpQtViewer3dWidget_h
+#define __vpQtViewer3dWidget_h
+
+// Qt includes
+#include <QWidget>
+
+#include "vpQtViewer3d.h"
+
+// Forward declarations.
+class QVTKWidget;
+
+class vtkVgTimeStamp;
+
+class vpQtViewer3dWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vpQtViewer3dWidget(QWidget* parent, Qt::WindowFlags flag = 0);
+
+  virtual ~vpQtViewer3dWidget();
+
+  vpQtViewer3d* getViewer3d() const;
+
+  virtual void update(const vtkVgTimeStamp& timestamp);
+
+  virtual void reset();
+
+
+private:
+
+  void setupViewer(QVTKWidget* qvtkWidget);
+
+  class vtkInternal;
+  vtkInternal* Internal;
+
+  vpQtViewer3d* Viewer3d;
+};
+
+#endif // __vpQtViewer3dWidget_h
diff --git a/Applications/VpView/vpQtViewer3dWidget.ui b/Applications/VpView/vpQtViewer3dWidget.ui
new file mode 100644
index 00000000..ad684c60
--- /dev/null
+++ b/Applications/VpView/vpQtViewer3dWidget.ui
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Viewer3dWidget</class>
+ <widget class="QWidget" name="Viewer3dWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QVTKWidget" name="qvtkWidget" native="true"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QVTKWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpRenderWindowDialog.cxx b/Applications/VpView/vpRenderWindowDialog.cxx
new file mode 100644
index 00000000..d962c8e6
--- /dev/null
+++ b/Applications/VpView/vpRenderWindowDialog.cxx
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "ui_qtRenderWindowDialog.h"
+
+#include "vpRenderWindowDialog.h"
+#include "QVTKWidget.h"
+
+//-----------------------------------------------------------------------------
+vpRenderWindowDialog::vpRenderWindowDialog(QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags)
+{
+  this->InternalWidget = new Ui::qtRenderWindowDialog;
+  this->InternalWidget->setupUi(this);
+}
+
+//-----------------------------------------------------------------------------
+vpRenderWindowDialog::~vpRenderWindowDialog()
+{
+  delete this->InternalWidget;
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderWindow* vpRenderWindowDialog::GetRenderWindow()
+{
+  return this->InternalWidget->qvtkRenderWidget->GetRenderWindow();
+}
\ No newline at end of file
diff --git a/Applications/VpView/vpRenderWindowDialog.h b/Applications/VpView/vpRenderWindowDialog.h
new file mode 100644
index 00000000..33ca28e0
--- /dev/null
+++ b/Applications/VpView/vpRenderWindowDialog.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpRenderWindowDialog_h
+#define __vpRenderWindowDialog_h
+
+#include <QDialog>
+
+class vtkRenderWindow;
+
+namespace Ui
+{
+class qtRenderWindowDialog;
+};
+
+class vpRenderWindowDialog : public QDialog
+{
+  Q_OBJECT
+public:
+
+  vpRenderWindowDialog(QWidget* parent = NULL, Qt::WindowFlags flags = 0);
+  virtual ~vpRenderWindowDialog();
+
+  // Description:
+  // Returns the vtkRenderWindow of the QVTK widget.
+  vtkRenderWindow* GetRenderWindow();
+
+signals:
+
+protected:
+  Ui::qtRenderWindowDialog* InternalWidget;
+
+protected slots:
+};
+
+
+#endif /* __vpRenderWindowDialog_h */
diff --git a/Applications/VpView/vpSelectTimeIntervalDialog.cxx b/Applications/VpView/vpSelectTimeIntervalDialog.cxx
new file mode 100644
index 00000000..9513b4e9
--- /dev/null
+++ b/Applications/VpView/vpSelectTimeIntervalDialog.cxx
@@ -0,0 +1,147 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpSelectTimeIntervalDialog.h"
+
+#include "ui_vpSelectTimeIntervalDialog.h"
+
+#include "vpUtils.h"
+#include "vpViewCore.h"
+
+//-----------------------------------------------------------------------------
+class vpSelectTimeIntervalDialogPrivate
+{
+public:
+  Ui_vpSelectTimeIntervalDialog UI;
+
+  vpViewCore* ViewCore;
+
+  vtkVgTimeStamp StartTime;
+  vtkVgTimeStamp EndTime;
+
+public:
+  void updateTimeLabel(QLabel* label, const vtkVgTimeStamp& timeStamp)
+    {
+    if (timeStamp.IsValid())
+      {
+      int offset = this->ViewCore->getUseZeroBasedFrameNumbers() ? 0 : 1;
+      label->setText(vpUtils::GetTimeAndFrameNumberString(timeStamp, offset));
+      }
+    else
+      {
+      label->setText("(none)");
+      }
+    }
+};
+
+QTE_IMPLEMENT_D_FUNC(vpSelectTimeIntervalDialog)
+
+//-----------------------------------------------------------------------------
+vpSelectTimeIntervalDialog::vpSelectTimeIntervalDialog(
+  vpViewCore* coreInstance,
+  QWidget* parent, Qt::WindowFlags flags) :
+  QDialog(parent, flags), d_ptr(new vpSelectTimeIntervalDialogPrivate)
+{
+  QTE_D(vpSelectTimeIntervalDialog);
+
+  d->UI.setupUi(this);
+  d->ViewCore = coreInstance;
+
+  connect(d->UI.startHere, SIGNAL(clicked()),
+          this, SLOT(setStartTimeToCurrentFrame()));
+  connect(d->UI.endHere, SIGNAL(clicked()),
+          this, SLOT(setEndTimeToCurrentFrame()));
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+vpSelectTimeIntervalDialog::~vpSelectTimeIntervalDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vpSelectTimeIntervalDialog::getStartTime() const
+{
+  QTE_D_CONST(vpSelectTimeIntervalDialog);
+  return d->StartTime;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vpSelectTimeIntervalDialog::getEndTime() const
+{
+  QTE_D_CONST(vpSelectTimeIntervalDialog);
+  return d->EndTime;
+}
+
+//-----------------------------------------------------------------------------
+double vpSelectTimeIntervalDialog::getDurationInSeconds() const
+{
+  QTE_D_CONST(vpSelectTimeIntervalDialog);
+  return (d->StartTime.HasTime() && d->EndTime.HasTime())
+           ? d->EndTime.GetTimeDifferenceInSecs(d->StartTime)
+           : -1.0;
+}
+
+//-----------------------------------------------------------------------------
+void vpSelectTimeIntervalDialog::reject()
+{
+  QTE_D(vpSelectTimeIntervalDialog);
+
+  d->StartTime.Reset();
+  d->EndTime.Reset();
+
+  QDialog::reject();
+}
+
+//-----------------------------------------------------------------------------
+void vpSelectTimeIntervalDialog::setStartTimeToCurrentFrame()
+{
+  QTE_D(vpSelectTimeIntervalDialog);
+
+  d->StartTime = d->ViewCore->getCoreTimeStamp();
+
+  if (d->EndTime.IsValid() && d->EndTime < d->StartTime)
+    {
+    d->EndTime = d->StartTime;
+    }
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpSelectTimeIntervalDialog::setEndTimeToCurrentFrame()
+{
+  QTE_D(vpSelectTimeIntervalDialog);
+
+  d->EndTime = d->ViewCore->getCoreTimeStamp();
+
+  if (d->StartTime.IsValid() && d->EndTime < d->StartTime)
+    {
+    d->StartTime = d->EndTime;
+    }
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpSelectTimeIntervalDialog::update()
+{
+  QTE_D(vpSelectTimeIntervalDialog);
+
+  d->updateTimeLabel(d->UI.startTime, d->StartTime);
+  d->updateTimeLabel(d->UI.endTime, d->EndTime);
+
+  double duration = this->getDurationInSeconds();
+  if (duration == -1.0)
+    {
+    d->UI.duration->setText("(invalid)");
+    }
+  else
+    {
+    d->UI.duration->setText(QString("%1 s").arg(duration));
+    }
+}
diff --git a/Applications/VpView/vpSelectTimeIntervalDialog.h b/Applications/VpView/vpSelectTimeIntervalDialog.h
new file mode 100644
index 00000000..5d870df0
--- /dev/null
+++ b/Applications/VpView/vpSelectTimeIntervalDialog.h
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpSelectTimeIntervalDialog_h
+#define __vpSelectTimeIntervalDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class vpSelectTimeIntervalDialogPrivate;
+class vpViewCore;
+
+class vtkVgTimeStamp;
+
+class vpSelectTimeIntervalDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vpSelectTimeIntervalDialog(vpViewCore* coreInstance,
+                             QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vpSelectTimeIntervalDialog();
+
+  vtkVgTimeStamp getStartTime() const;
+  vtkVgTimeStamp getEndTime() const;
+
+  double getDurationInSeconds() const;
+
+  virtual void reject();
+
+protected slots:
+  void setStartTimeToCurrentFrame();
+  void setEndTimeToCurrentFrame();
+
+protected:
+  void update();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vpSelectTimeIntervalDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vpSelectTimeIntervalDialog)
+};
+
+#endif // __vpSelectTimeIntervalDialog_h
diff --git a/Applications/VpView/vpSelectTimeIntervalDialog.ui b/Applications/VpView/vpSelectTimeIntervalDialog.ui
new file mode 100644
index 00000000..6587c96f
--- /dev/null
+++ b/Applications/VpView/vpSelectTimeIntervalDialog.ui
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpSelectTimeIntervalDialog</class>
+ <widget class="QDialog" name="vpSelectTimeIntervalDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>253</width>
+    <height>144</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Select Time Interval</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Start Time:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="startTime">
+        <property name="text">
+         <string>00:00:000</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QPushButton" name="startHere">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>Current Frame</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="text">
+         <string>End Time:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLabel" name="endTime">
+        <property name="text">
+         <string>00:00:000</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="endHere">
+        <property name="text">
+         <string>Current Frame</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="text">
+         <string>Duration:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLabel" name="duration">
+        <property name="text">
+         <string>0.0 s</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vpSelectTimeIntervalDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vpSelectTimeIntervalDialog</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>
diff --git a/Applications/VpView/vpSessionView.cxx b/Applications/VpView/vpSessionView.cxx
new file mode 100644
index 00000000..10911734
--- /dev/null
+++ b/Applications/VpView/vpSessionView.cxx
@@ -0,0 +1,272 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpSessionView.h"
+
+#include "vpProjectList.h"
+
+#include <QSplitter>
+#include <QStackedWidget>
+#include <QTabWidget>
+#include <QVBoxLayout>
+
+//-----------------------------------------------------------------------------
+vpSessionView::vpSessionView(QWidget* p)
+  : QWidget(p)
+{
+  this->Splitter = new QSplitter;
+  this->ListWidget = new vpProjectList;
+  this->StackedWidget = new QStackedWidget;
+  this->Splitter->setObjectName("projectSplitter");
+  this->ListWidget->setObjectName("projectList");
+  this->StackedWidget->setObjectName("projectPanels");
+  this->StackedWidget->addWidget(new vpObjectSelectionPanel);
+  this->Splitter->addWidget(this->ListWidget);
+  this->Splitter->addWidget(this->StackedWidget);
+
+  this->ListWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  this->ListWidget->setTextElideMode(Qt::ElideMiddle);
+
+  QList<int> sizes;
+  sizes << 0 << 1;
+  this->Splitter->setSizes(sizes);
+  this->Splitter->setCollapsible(1, false);
+
+  connect(this->ListWidget,
+          SIGNAL(itemChanged(QListWidgetItem*)),
+          SLOT(ReactToItemChanged(QListWidgetItem*)));
+
+  connect(this->ListWidget,
+          SIGNAL(currentRowChanged(int)),
+          SLOT(SetCurrentSession(int)));
+
+  connect(this->ListWidget,
+          SIGNAL(closeProjectRequested(int)),
+          SIGNAL(CloseProjectRequested(int)));
+
+  connect(this->StackedWidget,
+          SIGNAL(currentChanged(int)),
+          SIGNAL(SessionChanged(int)));
+
+  QVBoxLayout* layout = new QVBoxLayout;
+  layout->setMargin(5);
+  layout->addWidget(this->Splitter);
+  this->setLayout(layout);
+}
+
+//-----------------------------------------------------------------------------
+vpSessionView::~vpSessionView()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::AddSession(vpViewCore* viewCore,
+                               vtkVgActivityManager* activityManager,
+                               vtkVgEventModel* eventModel,
+                               vtkVgTrackModel* trackModel,
+                               vtkVgEventFilter* eventFilter,
+                               vtkVgTrackFilter* trackFilter,
+                               vtkVgEventTypeRegistry* eventTypes,
+                               vtkVgTrackTypeRegistry* trackTypes,
+                               const QString& title)
+{
+  vpObjectSelectionPanel* osp = new vpObjectSelectionPanel;
+  osp->Initialize(viewCore, activityManager, eventModel, trackModel,
+                  eventFilter, trackFilter, eventTypes, trackTypes,
+                  this->GetSessionCount(), title);
+
+  // Add a tab for the new session.
+  this->StackedWidget->addWidget(osp);
+
+  // remove the dummy panel if this is the first project loaded
+  if (this->GetSessionCount() == 0)
+    {
+    QWidget* dummyPanel = this->StackedWidget->widget(0);
+    this->StackedWidget->removeWidget(dummyPanel);
+    delete dummyPanel;
+    }
+
+  // add the list item
+  QListWidgetItem* item =
+    new QListWidgetItem(title.isEmpty() ? QString::number(osp->GetSessionId())
+                                        : title);
+  item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+  this->ListWidget->addItem(item);
+  item->setCheckState(Qt::Checked);
+
+  // force the project list to be shown if more than one is loaded
+  if (this->GetSessionCount() > 1)
+    {
+    QList<int> sizes = this->Splitter->sizes();
+    if (sizes[0] == 0)
+      {
+      sizes[0] = 1;
+      this->Splitter->setSizes(sizes);
+      }
+    this->Splitter->setCollapsible(0, false);
+    }
+
+  connect(osp, SIGNAL(SelectionChanged(int)), SIGNAL(SelectionChanged(int)));
+  connect(osp, SIGNAL(HoverItemChanged(int)), SIGNAL(HoverItemChanged(int)));
+  connect(osp, SIGNAL(ItemsChanged()), SIGNAL(ItemsChanged()));
+
+  connect(osp, SIGNAL(CreateEvent(int, vtkIdList*, int)),
+          SIGNAL(CreateEvent(int, vtkIdList*, int)));
+  connect(osp, SIGNAL(DeleteEvent(int, int)),
+          SIGNAL(DeleteEvent(int, int)));
+
+  connect(osp, SIGNAL(EditTrack(int, int)),
+          SIGNAL(EditTrack(int, int)));
+  connect(osp, SIGNAL(StopEditingTrack(int)),
+          SIGNAL(StopEditingTrack(int)));
+  connect(osp, SIGNAL(DeleteTrack(int, int)),
+          SIGNAL(DeleteTrack(int, int)));
+  connect(osp, SIGNAL(SplitTrack(int, int)),
+          SIGNAL(SplitTrack(int, int)));
+
+  connect(osp, SIGNAL(AddEventsToGraphModel(QList<int>, int)),
+          SIGNAL(AddEventsToGraphModel(QList<int>, int)));
+  connect(osp, SIGNAL(AddTrackEventsToGraphModel(int, int)),
+          SIGNAL(AddTrackEventsToGraphModel(int, int)));
+
+  connect(osp, SIGNAL(ShowStatusMessage(const QString&, int, int)),
+          SIGNAL(ShowStatusMessage(const QString&, int, int)));
+
+  connect(osp, SIGNAL(DisplayActivities(bool)),
+          SIGNAL(DisplayActivities(bool)));
+  connect(osp, SIGNAL(DisplayEvents(bool)),
+          SIGNAL(DisplayEvents(bool)));
+  connect(osp, SIGNAL(DisplayTracks(bool)),
+          SIGNAL(DisplayTracks(bool)));
+  connect(osp, SIGNAL(DisplayTrackHeads(bool)),
+          SIGNAL(DisplayTrackHeads(bool)));
+  connect(osp, SIGNAL(DisplaySceneElements(bool)),
+          SIGNAL(DisplaySceneElements(bool)));
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::RemoveSession(int sessionId)
+{
+  Q_ASSERT(sessionId < this->GetSessionCount());
+
+  vpObjectSelectionPanel* osp =
+    static_cast<vpObjectSelectionPanel*>(this->StackedWidget->widget(sessionId));
+
+  this->StackedWidget->removeWidget(this->StackedWidget->widget(sessionId));
+  delete osp;
+
+  delete this->ListWidget->takeItem(sessionId);
+
+  // Fix up the ids to match the tab indices
+  for (int i = 0, end = this->StackedWidget->count(); i < end; ++i)
+    {
+    static_cast<vpObjectSelectionPanel*>(
+      this->StackedWidget->widget(i))->SetSessionId(i);
+    }
+
+  if (this->GetSessionCount() == 1)
+    {
+    this->Splitter->setCollapsible(0, true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpSessionView::GetSessionCount()
+{
+  return this->ListWidget->count();
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::SetCurrentSession(int sessionId)
+{
+  this->ListWidget->setCurrentRow(sessionId);
+  this->StackedWidget->setCurrentIndex(sessionId);
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::SetSessionVisible(int sessionId, bool visible)
+{
+  this->ListWidget->item(sessionId)->setCheckState(
+    visible ? Qt::Checked : Qt::Unchecked);
+}
+
+//-----------------------------------------------------------------------------
+int vpSessionView::GetCurrentSession()
+{
+  return this->StackedWidget->currentIndex();
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::Update(bool rebuild)
+{
+  for (int i = 0, end = this->StackedWidget->count(); i < end; ++i)
+    {
+    static_cast<vpObjectSelectionPanel*>(
+      this->StackedWidget->widget(i))->Update(rebuild);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpSessionView::SelectItem(int type, int id)
+{
+  return this->CurrentTab()->SelectItem(type, id);
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::AddAndSelectItem(int type, int id)
+{
+  this->CurrentTab()->AddAndSelectItem(type, id);
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::FocusItem()
+{
+  this->CurrentTab()->FocusItem();
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::ReactToItemChanged(QListWidgetItem* item)
+{
+  for (int i = 0, end = this->ListWidget->count(); i < end; ++i)
+    {
+    if (this->ListWidget->item(i) == item)
+      {
+      emit this->SessionVisibilityChanged(i, item->checkState() == Qt::Checked);
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpSessionView::GetSelectedItemInfo(vgItemInfo& info)
+{
+  return this->CurrentTab()->GetSelectedItemInfo(info);
+}
+
+//-----------------------------------------------------------------------------
+bool vpSessionView::GetHoveredItemInfo(vgItemInfo& info)
+{
+  return this->CurrentTab()->GetHoveredItemInfo(info);
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkIdType> vpSessionView::GetSelectedItems(int type)
+{
+  return this->CurrentTab()->GetSelectedItems(type);
+}
+
+//-----------------------------------------------------------------------------
+void vpSessionView::SetCurrentTab(int type)
+{
+  return this->CurrentTab()->SetCurrentTab(type);
+}
+
+//-----------------------------------------------------------------------------
+vpObjectSelectionPanel* vpSessionView::CurrentTab()
+{
+  return static_cast<vpObjectSelectionPanel*>(
+    this->StackedWidget->currentWidget());
+}
diff --git a/Applications/VpView/vpSessionView.h b/Applications/VpView/vpSessionView.h
new file mode 100644
index 00000000..675e3c5c
--- /dev/null
+++ b/Applications/VpView/vpSessionView.h
@@ -0,0 +1,115 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpSessionView_h
+#define __vpSessionView_h
+
+#include <QWidget>
+
+#include <vtkType.h>
+
+#include "vtkVgTypeDefs.h"
+
+#include "vpObjectSelectionPanel.h"
+
+class vpViewCore;
+
+class vtkIdList;
+
+class vtkVgActivityManager;
+class vtkVgEventModel;
+class vtkVgTrackModel;
+
+class QListWidget;
+class QListWidgetItem;
+class QSplitter;
+class QStackedWidget;
+
+class vpSessionView : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vpSessionView(QWidget* parent = 0);
+  virtual ~vpSessionView();
+
+  void AddSession(vpViewCore* viewCore,
+                  vtkVgActivityManager* activityManager,
+                  vtkVgEventModel* eventModel,
+                  vtkVgTrackModel* trackModel,
+                  vtkVgEventFilter* eventFilter,
+                  vtkVgTrackFilter* trackFilter,
+                  vtkVgEventTypeRegistry* eventTypes,
+                  vtkVgTrackTypeRegistry* trackTypes,
+                  const QString& title = QString());
+
+  void RemoveSession(int sessionId);
+
+  int  GetSessionCount();
+
+  int  GetCurrentSession();
+
+  bool SelectItem(int type, int id);
+  void AddAndSelectItem(int type, int id);
+
+  bool GetSelectedItemInfo(vgItemInfo& info);
+  bool GetHoveredItemInfo(vgItemInfo& info);
+
+  QList<vtkIdType> GetSelectedItems(int type);
+
+  void SetCurrentTab(int type);
+
+  void Update(bool rebuild = false);
+
+signals:
+  void SelectionChanged(int sessionId);
+  void HoverItemChanged(int sessionId);
+
+  void ItemsChanged();
+
+  void CreateEvent(int type, vtkIdList* ids, int sessionId);
+  void DeleteEvent(int type, int sessionId);
+
+  void EditTrack(int trackId, int sessionId);
+  void StopEditingTrack(int sessionId);
+  void DeleteTrack(int trackId, int sessionId);
+  void SplitTrack(int trackId, int sessionId);
+
+  void AddEventsToGraphModel(QList<int> eventIds, int sessionId);
+  void AddTrackEventsToGraphModel(int trackId, int sessionId);
+
+  void ShowStatusMessage(const QString& message, int timeout, int sessionId);
+
+  void DisplayActivities(bool);
+  void DisplayEvents(bool);
+  void DisplayTracks(bool);
+  void DisplayTrackHeads(bool);
+  void DisplaySceneElements(bool);
+
+  void SessionChanged(int sessionId);
+  void SessionVisibilityChanged(int sessionId, bool visible);
+
+  void CloseProjectRequested(int sessionId);
+
+public slots:
+  void SetCurrentSession(int sessionId);
+  void SetSessionVisible(int sessionId, bool visible);
+
+  void FocusItem();
+
+protected slots:
+  void ReactToItemChanged(QListWidgetItem* item);
+
+protected:
+  vpObjectSelectionPanel* CurrentTab();
+
+private:
+  QStackedWidget* StackedWidget;
+  QListWidget* ListWidget;
+  QSplitter* Splitter;
+};
+
+#endif
diff --git a/Applications/VpView/vpSettings.cxx b/Applications/VpView/vpSettings.cxx
new file mode 100644
index 00000000..d17ce9f3
--- /dev/null
+++ b/Applications/VpView/vpSettings.cxx
@@ -0,0 +1,234 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#define QTSETTINGS_SUBCLASS_NAME vpSettings
+#include <qtSettingsImpl.h>
+
+#include "vpSettings.h"
+
+const char keyDatabaseHostname[]         = "DatabaseHostname";
+const char keyDatabaseServerPort[]       = "DatabaseServerPort";
+const char keyDatabaseDriver[]           = "DatabaseDriver";
+const char keyDatabaseName[]             = "DatabaseName";
+const char keyDatabaseUsername[]         = "DatabaseUsername";
+const char keyDatabaseUseSourceImages[]  = "DatabaseUseSourceImages";
+
+const char keyCoordinateDisplayMode_[]   = "CoordinateDisplayMode";
+const char keyImageFilteringMode_[]      = "ImageFilteringMode";
+
+const char keyTrackTrailLengthFrames[]   = "TrackTrailLengthFrames";
+const char keyTrackTrailLengthSeconds[]  = "TrackTrailLengthSeconds";
+
+const char keyUseTimeStampData[]         = "UseTimeStampData";
+const char keyForceFrameBasedVideoControls[] = "ForceFrameBasedVideoControls";
+const char keyWorldDisplayEnabled[]      = "WorldDisplayEnabled";
+const char keyTranslateImageEnabled[]    = "TranslateImageEnabled";
+
+const char keyUseZeroBasedFrameNumbers[] = "UseZeroBasedFrameNumbers";
+const char keyRightClickToEdit[]         = "RightClickToEdit";
+const char keyAutoAdvanceDuringCreation[] = "AutoAdvanceDuringCreation";
+
+const char keySceneElementLineWidth[]    = "SceneElementLineWidth";
+
+const char keyStreamingUpdateInterval[]  = "StreamingUpdateInterval";
+const char keyStreamingTrackUpdateChunkSize[] = "StreamingTrackUpdateChunkSize";
+
+const char keyVideoPlaybackMode_[]       = "VideoPlaybackMode";
+const char keyVideoSuggestedFps[]        = "VideoSuggestedFps";
+
+const char keyExternalProcessProgram[]   = "ExternalProcessProgram";
+const char keyExternalProcessArgs[]      = "ExternalProcessArgs";
+const char keyExternalProcessIOPath[]    = "ExternalProcessIOPath";
+const char keyExternalProcessThreshold[]   = "ExternalProcessThreshold";
+const char keyExternalProcessThresholdState[]      = "ExternalProcessThresholdState";
+const char keyExternalProcessCellSize[]   = "ExternalProcessCellSize";
+const char keyExternalProcessCellSizeState[]      = "ExternalProcessCellSizeState";
+
+QString vpSettings::Password = "";
+
+//-----------------------------------------------------------------------------
+vpSettings::vpSettings()
+{
+  this->declareSetting(keyDatabaseHostname);
+  this->declareSetting(keyDatabaseServerPort, QVariant("5432"));
+  this->declareSetting(keyDatabaseDriver);
+  this->declareSetting(keyDatabaseName);
+  this->declareSetting(keyDatabaseUsername);
+  this->declareSetting(keyDatabaseUseSourceImages, QVariant(false));
+
+  this->declareSetting(keyCoordinateDisplayMode_);
+  this->declareSetting(keyImageFilteringMode_);
+
+  this->declareSetting(keyTrackTrailLengthFrames);
+  this->declareSetting(keyTrackTrailLengthSeconds);
+
+  this->declareSetting(keyUseTimeStampData, QVariant(true));
+  this->declareSetting(keyForceFrameBasedVideoControls, QVariant(false));
+  this->declareSetting(keyWorldDisplayEnabled, QVariant(true));
+  this->declareSetting(keyTranslateImageEnabled, QVariant(true));
+
+  this->declareSetting(keyUseZeroBasedFrameNumbers, QVariant(false));
+  this->declareSetting(keyRightClickToEdit, QVariant(true));
+  this->declareSetting(keyAutoAdvanceDuringCreation, QVariant(true));
+
+  this->declareSetting(keySceneElementLineWidth, QVariant(4));
+
+  this->declareSetting(keyStreamingUpdateInterval, QVariant(5));
+  this->declareSetting(keyStreamingTrackUpdateChunkSize, QVariant(10));
+
+  this->declareSetting(keyVideoPlaybackMode_);
+  this->declareSetting(keyVideoSuggestedFps, QVariant(2.0));
+
+  this->declareSetting(keyExternalProcessProgram);
+  this->declareSetting(keyExternalProcessArgs);
+  this->declareSetting(keyExternalProcessIOPath);
+  this->declareSetting(keyExternalProcessThreshold);
+  this->declareSetting(keyExternalProcessThresholdState);
+  this->declareSetting(keyExternalProcessCellSize);
+  this->declareSetting(keyExternalProcessCellSizeState);
+}
+
+//-----------------------------------------------------------------------------
+void vpSettings::setDatabasePassword(const QString& password)
+{
+  Password = password;
+}
+
+//-----------------------------------------------------------------------------
+QString vpSettings::databasePassword()
+{
+  return Password;
+}
+
+//-----------------------------------------------------------------------------
+void vpSettings::setCoordinateDisplayMode(CoordDisplayMode mode)
+{
+  this->setCoordinateDisplayMode_(this->coordinateDisplayModeString(mode));
+}
+
+//-----------------------------------------------------------------------------
+vpSettings::CoordDisplayMode vpSettings::coordinateDisplayMode()
+{
+  QString str = this->coordinateDisplayMode_();
+
+  if (str == coordinateDisplayModeString(ImageRelativeCoords))
+    {
+    return ImageRelativeCoords;
+    }
+
+  return AOIRelativeCoords;
+}
+
+//-----------------------------------------------------------------------------
+void vpSettings::setImageFilteringMode(ImageFilteringMode mode)
+{
+  this->setImageFilteringMode_(this->imageFilteringModeString(mode));
+}
+
+//-----------------------------------------------------------------------------
+vpSettings::ImageFilteringMode vpSettings::imageFilteringMode()
+{
+  QString str = this->imageFilteringMode_();
+
+  if (str == imageFilteringModeString(LinearFiltering))
+    {
+    return LinearFiltering;
+    }
+
+  return NoFiltering;
+}
+
+//-----------------------------------------------------------------------------
+void vpSettings::setVideoPlaybackMode(VideoPlaybackMode mode)
+{
+  this->setVideoPlaybackMode_(this->videoPlaybackModeString(mode));
+}
+
+//-----------------------------------------------------------------------------
+vpSettings::VideoPlaybackMode vpSettings::videoPlaybackMode()
+{
+  QString str = this->videoPlaybackMode_();
+
+  if (str == videoPlaybackModeString(SequentialPlayback))
+    {
+    return SequentialPlayback;
+    }
+
+  return RealTimePlayback;
+}
+
+//-----------------------------------------------------------------------------
+const char* vpSettings::coordinateDisplayModeString(CoordDisplayMode mode)
+{
+  switch (mode)
+    {
+    case AOIRelativeCoords:   return "AOI";
+    case ImageRelativeCoords: return "Image";
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+const char* vpSettings::imageFilteringModeString(ImageFilteringMode mode)
+{
+  switch (mode)
+    {
+    case NoFiltering:     return "None";
+    case LinearFiltering: return "Linear";
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+const char* vpSettings::videoPlaybackModeString(VideoPlaybackMode mode)
+{
+  switch (mode)
+    {
+    case SequentialPlayback: return "Sequential";
+    case RealTimePlayback:   return "RealTime";
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+qtSettings_implement(databaseHostname,        DatabaseHostname,        QUrl)
+qtSettings_implement(databaseServerPort,      DatabaseServerPort,      QString)
+qtSettings_implement(databaseDriver,          DatabaseDriver,          QString)
+qtSettings_implement(databaseName,            DatabaseName,            QString)
+qtSettings_implement(databaseUsername,        DatabaseUsername,        QString)
+qtSettings_implement(databaseUseSourceImages, DatabaseUseSourceImages, bool)
+qtSettings_implement(coordinateDisplayMode_,  CoordinateDisplayMode_,  QString)
+qtSettings_implement(imageFilteringMode_,     ImageFilteringMode_,     QString)
+qtSettings_implement(trackTrailLengthFrames,  TrackTrailLengthFrames,  int)
+qtSettings_implement(trackTrailLengthSeconds, TrackTrailLengthSeconds, double)
+qtSettings_implement(useTimeStampData,        UseTimeStampData,        bool)
+qtSettings_implement(forceFrameBasedVideoControls,
+                     ForceFrameBasedVideoControls, bool)
+qtSettings_implement(worldDisplayEnabled,     WorldDisplayEnabled,     bool)
+qtSettings_implement(translateImageEnabled,   TranslateImageEnabled,   bool)
+qtSettings_implement(useZeroBasedFrameNumbers,UseZeroBasedFrameNumbers,bool)
+qtSettings_implement(streamingUpdateInterval, StreamingUpdateInterval, int)
+qtSettings_implement(streamingTrackUpdateChunkSize,
+                     StreamingTrackUpdateChunkSize, int)
+qtSettings_implement(rightClickToEdit,        RightClickToEdit,        bool)
+qtSettings_implement(autoAdvanceDuringCreation,AutoAdvanceDuringCreation,bool)
+qtSettings_implement(sceneElementLineWidth,   SceneElementLineWidth,   double)
+
+qtSettings_implement(videoPlaybackMode_,      VideoPlaybackMode_,      QString)
+qtSettings_implement(videoSuggestedFps,       VideoSuggestedFps,       double)
+
+qtSettings_implement(externalProcessProgram,  ExternalProcessProgram,  QString)
+qtSettings_implement(externalProcessArgs,     ExternalProcessArgs,     QStringList)
+qtSettings_implement(externalProcessIOPath,   ExternalProcessIOPath,     QString)
+qtSettings_implement(externalProcessThreshold,   ExternalProcessThreshold,     double)
+qtSettings_implement(externalProcessThresholdState,   ExternalProcessThresholdState,     bool)
+qtSettings_implement(externalProcessCellSize,   ExternalProcessCellSize,     double)
+qtSettings_implement(externalProcessCellSizeState,   ExternalProcessCellSizeState,     bool)
+
+//END vpSettings
diff --git a/Applications/VpView/vpSettings.h b/Applications/VpView/vpSettings.h
new file mode 100644
index 00000000..4e2bb8e7
--- /dev/null
+++ b/Applications/VpView/vpSettings.h
@@ -0,0 +1,115 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpSettings_h
+#define __vpSettings_h
+
+#include <QUrl>
+#include <QStringList>
+
+#include <qtSettings.h>
+
+class vpSettings : public qtSettings
+{
+public:
+
+  enum SettingsKey
+    {
+    DatabaseSettingsKey = 0x1,
+    AllSettingsKey      = 0xffff
+    };
+
+  enum CoordDisplayMode
+    {
+    AOIRelativeCoords,
+    ImageRelativeCoords
+    };
+
+  enum ImageFilteringMode
+    {
+    NoFiltering,
+    LinearFiltering
+    };
+
+  enum VideoPlaybackMode
+    {
+    SequentialPlayback,
+    RealTimePlayback
+    };
+
+  Q_DECLARE_FLAGS(SettingsKeys, SettingsKey)
+
+  vpSettings();
+
+  qtSettings_declare(QUrl,    databaseHostname,    setDatabaseHostname);
+  qtSettings_declare(QString, databaseServerPort,  setDatabaseServerPort);
+  qtSettings_declare(QString, databaseDriver,      setDatabaseDriver);
+  qtSettings_declare(QString, databaseName,        setDatabaseName);
+  qtSettings_declare(QString, databaseUsername,    setDatabaseUsername);
+  qtSettings_declare(bool, databaseUseSourceImages, setDatabaseUseSourceImages);
+
+  qtSettings_declare(QString,
+                     coordinateDisplayMode_,
+                     setCoordinateDisplayMode_);
+
+  qtSettings_declare(QString,
+                     imageFilteringMode_,
+                     setImageFilteringMode_);
+
+  qtSettings_declare(int, trackTrailLengthFrames, setTrackTrailLengthFrames);
+  qtSettings_declare(double, trackTrailLengthSeconds, setTrackTrailLengthSeconds);
+
+  qtSettings_declare(bool, useTimeStampData, setUseTimeStampData);
+  qtSettings_declare(bool, forceFrameBasedVideoControls,
+                           setForceFrameBasedVideoControls);
+  qtSettings_declare(bool, worldDisplayEnabled, setWorldDisplayEnabled);
+  qtSettings_declare(bool, translateImageEnabled, setTranslateImageEnabled);
+
+  qtSettings_declare(bool, useZeroBasedFrameNumbers, setUseZeroBasedFrameNumbers);
+  qtSettings_declare(bool, rightClickToEdit, setRightClickToEdit);
+  qtSettings_declare(bool, autoAdvanceDuringCreation, setAutoAdvanceDuringCreation);
+  qtSettings_declare(double, sceneElementLineWidth, setSceneElementLineWidth);
+
+  qtSettings_declare(int, streamingUpdateInterval, setStreamingUpdateInterval);
+  qtSettings_declare(int, streamingTrackUpdateChunkSize, setStreamingTrackUpdateChunkSize);
+
+  qtSettings_declare(QString,
+                     videoPlaybackMode_,
+                     setVideoPlaybackMode_);
+
+  qtSettings_declare(double, videoSuggestedFps, setVideoSuggestedFps);
+
+  qtSettings_declare(QString, externalProcessProgram, setExternalProcessProgram);
+  qtSettings_declare(QStringList, externalProcessArgs, setExternalProcessArgs);
+  qtSettings_declare(QString, externalProcessIOPath, setExternalProcessIOPath);
+  qtSettings_declare(double, externalProcessThreshold, setExternalProcessThreshold);
+  qtSettings_declare(bool, externalProcessThresholdState, setExternalProcessThresholdState);
+  qtSettings_declare(double, externalProcessCellSize, setExternalProcessCellSize);
+  qtSettings_declare(bool, externalProcessCellSizeState, setExternalProcessCellSizeState);
+
+  static void    setDatabasePassword(const QString& password);
+  static QString databasePassword();
+
+  void setCoordinateDisplayMode(CoordDisplayMode mode);
+  CoordDisplayMode coordinateDisplayMode();
+
+  void setImageFilteringMode(ImageFilteringMode mode);
+  ImageFilteringMode imageFilteringMode();
+
+  void setVideoPlaybackMode(VideoPlaybackMode mode);
+  VideoPlaybackMode videoPlaybackMode();
+
+private:
+  const char* coordinateDisplayModeString(CoordDisplayMode mode);
+  const char* imageFilteringModeString(ImageFilteringMode mode);
+  const char* videoPlaybackModeString(VideoPlaybackMode mode);
+
+  static QString Password;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vpSettings::SettingsKeys)
+
+#endif
diff --git a/Applications/VpView/vpTabWidget.h b/Applications/VpView/vpTabWidget.h
new file mode 100644
index 00000000..00a617b8
--- /dev/null
+++ b/Applications/VpView/vpTabWidget.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpTabWidget_h
+#define __vpTabWidget_h
+
+#include <QContextMenuEvent>
+#include <QTabWidget>
+#include <QTabBar>
+
+class vpTabWidget : public QTabWidget
+{
+  Q_OBJECT
+
+public:
+  vpTabWidget(QWidget* parent = 0) : QTabWidget(parent) { }
+  virtual ~vpTabWidget() { }
+
+signals:
+  void tabBarContextMenu(QContextMenuEvent* event, int index);
+
+protected:
+  virtual void contextMenuEvent(QContextMenuEvent* event)
+    {
+    int tab = this->tabBar()->tabAt(event->pos());
+    if (tab >= 0)
+      {
+      this->setCurrentIndex(tab);
+      emit tabBarContextMenu(event, tab);
+      }
+    }
+};
+
+#endif
diff --git a/Applications/VpView/vpTimelineDialog.cxx b/Applications/VpView/vpTimelineDialog.cxx
new file mode 100644
index 00000000..a6f864ea
--- /dev/null
+++ b/Applications/VpView/vpTimelineDialog.cxx
@@ -0,0 +1,685 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "ui_vpTimelineDialog.h"
+
+#include "vpTimelineDialog.h"
+
+#include "vgEventType.h"
+
+#include "vpViewCore.h"
+
+#include "vtkVgChartTimeline.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgPlotTimeline.h"
+#include "vtkVgTypeDefs.h"
+
+#include "vtkAxis.h"
+#include "vtkChartXY.h"
+#include "vtkColorSeries.h"
+#include "vtkContextMapper2D.h"
+#include "vtkContextScene.h"
+#include "vtkContextView.h"
+#include "vtkIdTypeArray.h"
+#include "vtkIntArray.h"
+#include "vtkPlot.h"
+#include "vtkPlotBar.h"
+#include "vtkPlotLine.h"
+#include "vtkRenderWindow.h"
+#include "vtkRenderWindowInteractor.h"
+#include "vtkRenderer.h"
+#include "vtkTable.h"
+#include "vtkTextProperty.h"
+#include "vtkVariantArray.h"
+
+namespace
+{
+enum ChartType
+{
+  BarGraph = vtkChart::BAR,
+  LineGraph = vtkChart::LINE,
+  StackedBarGraph,
+};
+}
+
+// selection callback class for the timeline chart
+class vpTimelineDialog::TimelineSelectionCallback : public vtkCommand
+{
+  vpTimelineDialog* Parent;
+
+  vtkPlot*     LastPlot;
+  vtkIdType    LastSelectedIndex;
+  vtkIdType    LastSelectionSize;
+  vtkIdType    LastSelectionFirstVal;
+  vtkIdType    LastSelectionLastVal;
+
+  TimelineSelectionCallback()
+    : Parent(0), LastPlot(0), LastSelectedIndex(-1), LastSelectionSize(0),
+      LastSelectionFirstVal(-1), LastSelectionLastVal(-1) { }
+
+public:
+  static TimelineSelectionCallback* New() { return new TimelineSelectionCallback; }
+
+  void SetParent(vpTimelineDialog* parent) { this->Parent = parent; }
+
+  virtual void Execute(vtkObject*, unsigned long, void* callData)
+    {
+    if (!callData)
+      {
+      return;
+      }
+
+    vtkVgChartTimeline::SelectionData* sd =
+      static_cast<vtkVgChartTimeline::SelectionData*>(callData);
+
+    vtkPlot* plot = sd->Plot;
+    if (!plot)
+      {
+      this->LastPlot = 0;
+      return;
+      }
+
+    vtkIdTypeArray* selection = plot->GetSelection();
+    vtkIdType size = selection->GetNumberOfTuples();
+
+    if (size == 0)
+      {
+      return;
+      }
+
+    vtkIdType index;
+    vtkIdType firstVal = selection->GetValue(0);
+    vtkIdType lastVal = selection->GetValue(size - 1);
+
+    // Try to determine if this is the same as the last selection. If so,
+    // cycle through the items in the group. This allows us to cycle through
+    // overlapping points when the user clicks the same cluster multiple times.
+    if (this->LastPlot == plot &&
+        this->LastSelectionSize == size &&
+        this->LastSelectionFirstVal == firstVal &&
+        this->LastSelectionLastVal == lastVal)
+      {
+      index = (this->LastSelectedIndex + 1) % size;
+      }
+    else
+      {
+      // just pick the first item if this is a different selection group
+      index = 0;
+      }
+
+    vtkIdType selectedVal = selection->GetValue(index);
+
+    // remember selection group info for next time
+    this->LastPlot = plot;
+    this->LastSelectedIndex = index;
+    this->LastSelectionSize = size;
+    this->LastSelectionFirstVal = firstVal;
+    this->LastSelectionLastVal = lastVal;
+
+    // modify the selection
+    selection->SetNumberOfTuples(0);
+    selection->InsertNextValue(selectedVal);
+
+    this->Parent->OnTimelineSelectionChanged(plot, selectedVal);
+    }
+};
+
+//-----------------------------------------------------------------------------
+vpTimelineDialog::vpTimelineDialog(QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags),  ViewCoreInstance(0), EventModel(0),
+    TimelineView(0), HistogramView(0), NumEventBins(20), MaxHistogramX(0.0),
+    TimelineTables(0)
+{
+  this->Ui = new Ui::vpTimelineDialog;
+  this->Ui->setupUi(this);
+
+  this->IsSelecting = false;
+
+  connect(this->Ui->tabWidget, SIGNAL(currentChanged(int)),
+          this, SLOT(OnPageChanged()));
+
+  this->Ui->plotTypeCombo->addItem("Bar Plot", BarGraph);
+  this->Ui->plotTypeCombo->addItem("Line Plot", LineGraph);
+  this->Ui->plotTypeCombo->addItem("Stacked Bars", StackedBarGraph);
+
+  connect(this->Ui->plotTypeCombo, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(OnPlotTypeChanged(int)));
+
+  this->Ui->binSlider->setMinimum(1);
+  this->Ui->binSlider->setMaximum(100);
+  this->Ui->binSlider->setValue(this->NumEventBins);
+
+  this->Ui->binSpinBox->setMinimum(this->Ui->binSlider->minimum());
+  this->Ui->binSpinBox->setMaximum(this->Ui->binSlider->maximum());
+  this->Ui->binSpinBox->setValue(this->Ui->binSlider->value());
+
+  connect(this->Ui->binSlider, SIGNAL(valueChanged(int)),
+          this->Ui->binSpinBox, SLOT(setValue(int)));
+
+  connect(this->Ui->binSpinBox, SIGNAL(valueChanged(int)),
+          this->Ui->binSlider, SLOT(setValue(int)));
+
+  connect(this->Ui->binSpinBox, SIGNAL(valueChanged(int)),
+          this, SLOT(OnBinCountChanged(int)));
+
+  this->resize(800, 400);
+
+  QPoint p = parent->pos();
+  this->LastWindowPosition = p += QPoint(parent->width() / 2, parent->height() / 4);
+}
+
+//-----------------------------------------------------------------------------
+vpTimelineDialog::~vpTimelineDialog()
+{
+  delete[] this->TimelineTables;
+
+  if (this->TimelineView)
+    {
+    this->TimelineView->Delete();
+    }
+
+  if (this->HistogramView)
+    {
+    this->HistogramView->Delete();
+    }
+
+  delete this->Ui;
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::SelectEvent(int id)
+{
+  // avoid recursion
+  if (this->IsSelecting)
+    {
+    return;
+    }
+
+  int type = this->EventModel->GetEvent(id)->GetActiveClassifierType();
+  vtkTable* table =
+    this->TimelineTables[this->EventTypeRegistry->GetTypeIndex(type)];
+
+  // find the index of the event within the table
+  vtkIdType numRows = table->GetNumberOfRows();
+  for (vtkIdType i = 0; i < numRows; ++i)
+    {
+    if (table->GetValue(i, 2).ToInt() == id)
+      {
+      // figure out which plot is associated with this table
+      for (int j = 0; j < this->TimelineChart->GetNumberOfPlots(); ++j)
+        {
+        if (this->TimelineChart->GetPlot(j)->GetInput() == table)
+          {
+          // select the item in the plot
+          vtkIdTypeArray* selection = vtkIdTypeArray::New();
+          selection->SetNumberOfTuples(0);
+          selection->InsertNextValue(i);
+          this->TimelineChart->ClearSelection();
+          this->TimelineChart->SetSelection(j, selection);
+          selection->Delete();
+
+          this->TimelineView->GetRenderWindow()->Render();
+          return;
+          }
+        }
+      std::cerr << "Plot for event selection not found.\n";
+      return;
+      }
+    }
+  std::cerr << "Event selection not found in table.\n";
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::OnPageChanged()
+{
+  if (this->Ui->tabWidget->currentWidget() == this->Ui->TimelineTab)
+    {
+    this->BuildTimelineChart();
+    }
+  else
+    {
+    this->BuildHistogramChart();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::OnFrameChanged(int frame)
+{
+  this->TimelineChart->GetAxis(1)->SetRange(frame - 1, frame + 50);
+  this->TimelineChart->RecalculateBounds();
+  this->TimelineView->GetRenderWindow()->Render();
+}
+
+//-----------------------------------------------------------------------------
+int vpTimelineDialog::GetCurrentPlotType()
+{
+  int index = this->Ui->plotTypeCombo->currentIndex();
+  return this->Ui->plotTypeCombo->itemData(index).toInt();
+}
+
+//-----------------------------------------------------------------------------
+struct vpTimelineDialog::SelectionGuard
+{
+  vpTimelineDialog* Dialog;
+
+  SelectionGuard(vpTimelineDialog* d)
+    {
+    this->Dialog = d;
+    this->Dialog->IsSelecting = true;
+    }
+
+  ~SelectionGuard()
+    {
+    this->Dialog->IsSelecting = false;
+    }
+};
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::OnTimelineSelectionChanged(vtkPlot* plot, vtkIdType row)
+{
+  SelectionGuard sg(this);
+  vtkTable* table = plot->GetInput();
+  emit this->SelectedObject(vgObjectTypeDefinitions::Event,
+                            table->GetValue(row, 2).ToInt());
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::OnPlotTypeChanged(int /*index*/)
+{
+  this->HistogramChart->ClearPlots();
+  this->AddHistogramPlots(this->GetCurrentPlotType());
+  this->HistogramView->GetRenderWindow()->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::OnBinCountChanged(int count)
+{
+  int divided = count / 26;
+
+  // halve the effective bin count every time lg(count) goes up by 1 - this
+  // ensures that the number of x axis tick marks is bounded
+  int timesToHalve = divided > 0 ? 1 : 0;
+  while (divided >>= 1) ++timesToHalve;
+
+  // force the number of bins to be an even multiple of our divisor so that
+  // we can be sure tick marks will align correctly with bin boundaries
+  count &= ~0 << timesToHalve;
+
+  int prevNumBins = this->NumEventBins;
+  this->NumEventBins = count;
+
+  this->UpdateHistogramTable();
+
+  // show ticks at boundary between bins (or every 2^n bin if there are many)
+  this->UpdateHistogramAxis((count >> timesToHalve) + 1);
+
+  // it is possible for the underlying plot type to change when we have
+  // a line graph with only one bin, so rebuild the plots in this case
+  if (this->GetCurrentPlotType() == LineGraph && (prevNumBins > 1) != (count > 1))
+    {
+    this->HistogramChart->ClearPlots();
+    this->AddHistogramPlots(LineGraph);
+    this->HistogramView->GetRenderWindow()->Render();
+    return;
+    }
+
+  this->HistogramChart->RecalculateBounds();
+  this->HistogramView->GetRenderWindow()->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::BuildTimelineTables()
+{
+  int numFrames = this->ViewCoreInstance->getNumberOfFrames();
+  int numEventTypes = this->EventTypeRegistry->GetNumberOfTypes();
+  this->TimelineTables = new vtkSmartPointer<vtkTable>[numEventTypes];
+
+  // add columns to tables
+  for (int i = 0; i < numEventTypes; ++i)
+    {
+    // @TODO: The y column is a waste of space since it will end up containing
+    //        the same value for every entry. We need added functionality in
+    //        vtkPlotPoints to efficiently support fixed y-value plots.
+    //        (see vtkPlotPoints::UpdateTableCache)
+    vtkSmartPointer<vtkIntArray> xColumn = vtkSmartPointer<vtkIntArray>::New();
+    vtkSmartPointer<vtkIntArray> yColumn = vtkSmartPointer<vtkIntArray>::New();
+    vtkSmartPointer<vtkIntArray> idColumn = vtkSmartPointer<vtkIntArray>::New();
+
+    xColumn->SetName("X");
+    yColumn->SetName(this->EventTypeRegistry->GetType(i).GetName());
+    idColumn->SetName("Id");
+
+    this->TimelineTables[i] = vtkSmartPointer<vtkTable>::New();
+    this->TimelineTables[i]->AddColumn(xColumn);
+    this->TimelineTables[i]->AddColumn(yColumn);
+    this->TimelineTables[i]->AddColumn(idColumn);
+    }
+
+  // iterate through the events and set the corresponding table values
+  this->EventModel->InitEventTraversal();
+  while (vtkVgEvent* event = this->EventModel->GetNextEvent().GetEvent())
+    {
+    vtkIdType startFrame = event->GetStartFrame().GetFrameNumber();
+    if (startFrame < numFrames)
+      {
+      int type =
+        this->EventTypeRegistry->GetTypeIndex(event->GetActiveClassifierType());
+
+      // Ignore events with types that the registry doesn't know about
+      // @TODO: Evaluate if something better suited to the event should happen instead
+      if (0 <= type && type < numEventTypes)
+        {
+        // insert x and y value for this event (y value = normalized event type index)
+        int prevNumRows = this->TimelineTables[type]->GetNumberOfRows();
+        this->TimelineTables[type]->InsertNextBlankRow();
+        this->TimelineTables[type]->SetValue(prevNumRows, 0, startFrame + 1);
+        this->TimelineTables[type]->SetValue(prevNumRows, 1, type);
+        this->TimelineTables[type]->SetValue(prevNumRows, 2, event->GetId());
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::BuildHistogramTableColumns()
+{
+  std::vector<vtkSmartPointer<vtkIntArray> > columns;
+  columns.resize(this->EventTypeRegistry->GetNumberOfTypes() + 1);
+
+  // create the table columns
+  for (unsigned i = 0; i < columns.size(); ++i)
+    {
+    columns[i] = vtkSmartPointer<vtkIntArray>::New();
+    if (i == 0)
+      {
+      columns[i]->SetName("Bin");
+      }
+    else
+      {
+      columns[i]->SetName(this->EventTypeRegistry->GetType(i - 1).GetName());
+      }
+    this->HistogramTable->AddColumn(columns[i]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::UpdateHistogramTable()
+{
+  // one extra row is needed to get correct bar width in the case of
+  // one event bin, since the chart computes bar width based on the difference
+  // in x values of the first two rows
+  this->HistogramTable->SetNumberOfRows(this->NumEventBins + 1);
+
+  int numFrames = this->ViewCoreInstance->getNumberOfFrames();
+  this->MaxHistogramX = static_cast<double>(numFrames);
+
+  // fill with initial values
+  for (int i = 0; i < this->HistogramTable->GetNumberOfRows(); ++i)
+    {
+    int binMidpoint = ((i * numFrames) + ((i + 1) * numFrames)) / 2 / this->NumEventBins;
+    this->HistogramTable->SetValue(i, 0, binMidpoint);
+    for (int j = 1; j < this->HistogramTable->GetNumberOfColumns(); ++j)
+      {
+      this->HistogramTable->SetValue(i, j, 0);
+      }
+    }
+
+  // iterate through the events and build the histogram
+  this->EventModel->InitEventTraversal();
+  while (vtkVgEvent* event = this->EventModel->GetNextEvent().GetEvent())
+    {
+    vtkIdType startFrame = event->GetStartFrame().GetFrameNumber();
+    if (startFrame < numFrames)
+      {
+      int bin = (startFrame * this->NumEventBins) / numFrames;
+      int type =
+        this->EventTypeRegistry->GetTypeIndex(event->GetActiveClassifierType());
+      vtkVariant prev = this->HistogramTable->GetValue(bin, type + 1);
+      this->HistogramTable->SetValue(bin, type + 1, prev.ToInt() + 1);
+      }
+    }
+
+  // inform the table that it has been modified
+  for (int i = 0; i < this->HistogramTable->GetNumberOfColumns(); ++i)
+    {
+    this->HistogramTable->GetColumn(i)->Modified();
+    }
+  this->HistogramTable->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::UpdateHistogramAxis(int numTicks)
+{
+  vtkAxis* x = this->HistogramChart->GetAxis(1);
+  x->SetNumberOfTicks(numTicks);
+
+  // we need to set some specially crafted points to get autoscale to do what we want
+  x->SetPoint1(0.0f, 0.0f);
+  x->SetPoint2(this->MaxHistogramX * 45.0f, 0.0f);
+  x->SetRange(0.0, this->MaxHistogramX);
+
+  x->SetBehavior(vtkAxis::FIXED);
+  x->AutoScale();
+
+  // prevent the chart from trying to scale the axes
+  x->SetBehavior(vtkAxis::CUSTOM);
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::AddHistogramPlots(int type)
+{
+  vtkPlot* plot = 0;
+  int eventTypesPlotted = 0;
+
+  vtkSmartPointer<vtkColorSeries> colors = vtkSmartPointer<vtkColorSeries>::New();
+  colors->ClearColors();
+
+  // a stacked bar graph is a special type of bar plot
+  bool isStackedPlot = false;
+  if (type == StackedBarGraph)
+    {
+    isStackedPlot = true;
+    type = vtkChart::BAR;
+    }
+
+  int numEventTypes = this->EventTypeRegistry->GetNumberOfTypes();
+  for (int i = 0; i < numEventTypes; ++i)
+    {
+    // see if we have any of this type of event
+    bool hasEvents = false;
+    vtkAbstractArray* col = this->HistogramTable->GetColumn(i + 1);
+    for (vtkIdType j = 0, colSize = col->GetSize(); j < colSize; ++j)
+      {
+      if (col->GetVariantValue(j).ToInt() > 0)
+        {
+        hasEvents = true;
+        break;
+        }
+      }
+
+    // don't bother adding a plot if there are no events of this type
+    if (!hasEvents)
+      {
+      continue;
+      }
+
+    ++eventTypesPlotted;
+
+    // add color for this event type to the color series
+    double r, g, b;
+    unsigned char r2, g2, b2;
+    this->EventTypeRegistry->GetType(i).GetColor(r, g, b);
+    r2 = static_cast<unsigned char>(r * 255);
+    g2 = static_cast<unsigned char>(g * 255);
+    b2 = static_cast<unsigned char>(b * 255);
+    colors->AddColor(vtkColor3ub(r2, g2, b2));
+
+    // add to stacked plot?
+    if (isStackedPlot && eventTypesPlotted > 1)
+      {
+      vtkPlotBar* bar = vtkPlotBar::SafeDownCast(plot);
+      bar->SetInputArray(i + 1, this->HistogramTable->GetColumnName(i + 1));
+      bar->SetColorSeries(colors);
+      continue;
+      }
+
+    // don't attempt to draw a line plot with only one point
+    if (type == vtkChart::LINE && this->HistogramTable->GetNumberOfRows() < 2)
+      {
+      type = vtkChart::POINTS;
+      }
+
+    plot = this->HistogramChart->AddPlot(type);
+    plot->SetInputData(this->HistogramTable, 0, i + 1);
+    plot->SetColor(r, g, b);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::AddTimelinePlots()
+{
+  int numEventTypes = this->EventTypeRegistry->GetNumberOfTypes();
+  for (int i = 0; i < numEventTypes; ++i)
+    {
+    int numRows = this->TimelineTables[i]->GetNumberOfRows();
+    if (numRows > 0)
+      {
+      vtkVgPlotTimeline* plot = vtkVgPlotTimeline::New();
+      this->TimelineChart->AddPlot(plot);
+      plot->SetInputData(this->TimelineTables[i], 0, 1);
+
+      double r, g, b;
+      this->EventTypeRegistry->GetType(i).GetColor(r, g, b);
+      plot->SetColor(r, g, b);
+      plot->FastDelete();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::BuildTimelineChart()
+{
+  if (this->TimelineView)
+    {
+    this->Ui->frameSlider->setValue(this->ViewCoreInstance->getCurrentFrameNumber());
+    return;
+    }
+
+  // setup the context view
+  this->TimelineView = vtkContextView::New();
+  this->TimelineView->SetInteractor(this->Ui->timelineRenderWidget->GetInteractor());
+  this->Ui->timelineRenderWidget->SetRenderWindow(this->TimelineView->GetRenderWindow());
+  this->TimelineView->GetRenderer()->SetBackground(1.0, 1.0, 1.0);
+
+  this->TimelineChart = vtkSmartPointer<vtkVgChartTimeline>::New();
+  this->TimelineView->GetScene()->AddItem(this->TimelineChart);
+
+  this->BuildTimelineTables();
+  this->AddTimelinePlots();
+
+  this->TimelineChart->SetShowLegend(true);
+
+  vtkAxis* yAxis = this->TimelineChart->GetAxis(0);
+  vtkAxis* xAxis = this->TimelineChart->GetAxis(1);
+
+  xAxis->SetTitle("time");
+  xAxis->SetBehavior(vtkAxis::FIXED);
+  xAxis->SetMaximum(xAxis->GetMinimum() + 50.0);
+
+  yAxis->SetBehavior(vtkAxis::FIXED);
+  yAxis->SetRange(yAxis->GetMinimum() - 0.5, yAxis->GetMaximum() + 0.5);
+  yAxis->SetLabelsVisible(false);
+  yAxis->SetTitle("");
+
+  // register selection callback
+  TimelineSelectionCallback* cb = TimelineSelectionCallback::New();
+  cb->SetParent(this);
+  this->TimelineChart->AddObserver(vtkCommand::SelectionChangedEvent, cb);
+  cb->Delete();
+
+  // setup frame control widgets
+  connect(this->Ui->frameSlider, SIGNAL(valueChanged(int)),
+          this->Ui->frameSpinBox, SLOT(setValue(int)));
+
+  connect(this->Ui->frameSpinBox, SIGNAL(valueChanged(int)),
+          this->Ui->frameSlider, SLOT(setValue(int)));
+
+  connect(this->Ui->frameSpinBox, SIGNAL(valueChanged(int)),
+          this, SLOT(OnFrameChanged(int)));
+
+  this->Ui->frameSlider->setMinimum(1);
+  this->Ui->frameSlider->setMaximum(this->ViewCoreInstance->getNumberOfFrames());
+
+  this->Ui->frameSpinBox->setMinimum(this->Ui->frameSlider->minimum());
+  this->Ui->frameSpinBox->setMaximum(this->Ui->frameSlider->maximum());
+
+  this->Ui->frameSlider->setValue(this->ViewCoreInstance->getCurrentFrameNumber());
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::BuildHistogramChart()
+{
+  if (this->HistogramView)
+    {
+    return;
+    }
+
+  // setup the context view
+  this->HistogramView = vtkContextView::New();
+  this->HistogramView->SetInteractor(this->Ui->histogramRenderWidget->GetInteractor());
+  this->Ui->histogramRenderWidget->SetRenderWindow(this->HistogramView->GetRenderWindow());
+  this->HistogramView->GetRenderer()->SetBackground(1.0, 1.0, 1.0);
+
+  this->HistogramChart = vtkSmartPointer<vtkChartXY>::New();
+  this->HistogramView->GetScene()->AddItem(this->HistogramChart);
+
+  this->HistogramTable = vtkSmartPointer<vtkTable>::New();
+  this->BuildHistogramTableColumns();
+  this->UpdateHistogramTable();
+
+  this->AddHistogramPlots(this->Ui->plotTypeCombo->itemData(0).toInt());
+
+  // make adjacent bars flush
+  this->HistogramChart->SetBarWidthFraction(1.0f);
+  this->HistogramChart->SetShowLegend(true);
+
+  vtkAxis* x = this->HistogramChart->GetAxis(1);
+  vtkAxis* y = this->HistogramChart->GetAxis(0);
+  x->SetTitle("time");
+  y->SetTitle("count");
+
+  x->GetTitleProperties()->SetFontSize(14);
+  y->GetTitleProperties()->SetFontSize(14);
+
+  // show integer labels
+  x->SetNotation(vtkAxis::FIXED_NOTATION);
+  x->SetPrecision(0);
+
+  this->UpdateHistogramAxis(this->NumEventBins + 1);
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::showEvent(QShowEvent* /*event*/)
+{
+  this->move(this->LastWindowPosition);
+
+  if (this->Ui->tabWidget->currentWidget() == this->Ui->TimelineTab)
+    {
+    this->BuildTimelineChart();
+    }
+  else
+    {
+    this->BuildHistogramChart();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTimelineDialog::hideEvent(QHideEvent* /*event*/)
+{
+  this->LastWindowPosition = this->pos();
+}
diff --git a/Applications/VpView/vpTimelineDialog.h b/Applications/VpView/vpTimelineDialog.h
new file mode 100644
index 00000000..95a5cd20
--- /dev/null
+++ b/Applications/VpView/vpTimelineDialog.h
@@ -0,0 +1,106 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpTimelineDialog_h
+#define __vpTimelineDialog_h
+
+#include <QDialog>
+#include "vtkSmartPointer.h"
+
+namespace Ui
+{
+class vpTimelineDialog;
+};
+
+class vpViewCore;
+
+class vtkChartXY;
+class vtkContextView;
+class vtkPlot;
+class vtkTable;
+
+class vtkVgChartTimeline;
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+
+class vpTimelineDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vpTimelineDialog(QWidget* parent = NULL, Qt::WindowFlags flags = 0);
+  virtual ~vpTimelineDialog();
+
+  void SetViewCoreInstance(vpViewCore* vc)
+    { this->ViewCoreInstance = vc; }
+
+  void SetEventModel(vtkVgEventModel* em)
+    { this->EventModel = em; }
+
+  void SetEventTypeRegistry(vtkVgEventTypeRegistry* etr)
+    { this->EventTypeRegistry = etr; }
+
+protected:
+  // re-implemented from QWidget
+  virtual void showEvent(QShowEvent* event);
+  virtual void hideEvent(QHideEvent* event);
+
+private:
+  void BuildTimelineChart();
+  void BuildHistogramChart();
+
+  void BuildTimelineTables();
+
+  void BuildHistogramTableColumns();
+  void UpdateHistogramTable();
+  void UpdateHistogramAxis(int numTicks);
+
+  void AddHistogramPlots(int type);
+  void AddTimelinePlots();
+
+  int  GetCurrentPlotType();
+
+  void OnTimelineSelectionChanged(vtkPlot* plot, vtkIdType val);
+
+signals:
+  void SelectedObject(int type, int id);
+
+public slots:
+  void SelectEvent(int id);
+
+private slots:
+  void OnPageChanged();
+  void OnFrameChanged(int frame);
+  void OnPlotTypeChanged(int index);
+  void OnBinCountChanged(int count);
+
+private:
+  class TimelineSelectionCallback;
+
+  Ui::vpTimelineDialog* Ui;
+  QPoint LastWindowPosition;
+
+  bool IsSelecting;
+  struct SelectionGuard;
+
+  vpViewCore* ViewCoreInstance;
+  vtkVgEventModel* EventModel;
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+
+  vtkContextView* TimelineView;
+  vtkContextView* HistogramView;
+
+  vtkSmartPointer<vtkVgChartTimeline> TimelineChart;
+  vtkSmartPointer<vtkChartXY> HistogramChart;
+
+  int NumEventBins;
+  double MaxHistogramX;
+
+  vtkSmartPointer<vtkTable> HistogramTable;
+  vtkSmartPointer<vtkTable>* TimelineTables;
+};
+
+#endif
diff --git a/Applications/VpView/vpTimelineDialog.ui b/Applications/VpView/vpTimelineDialog.ui
new file mode 100644
index 00000000..c4b495b2
--- /dev/null
+++ b/Applications/VpView/vpTimelineDialog.ui
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpTimelineDialog</class>
+ <widget class="QDialog" name="vpTimelineDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>593</width>
+    <height>333</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0">
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="TimelineTab">
+      <attribute name="title">
+       <string>Timeline</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_3" stretch="1,0">
+       <item>
+        <widget class="QVTKWidget" name="timelineRenderWidget" native="true"/>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string/>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QLabel" name="frameLabel">
+            <property name="text">
+             <string>Frame</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSlider" name="frameSlider">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSpinBox" name="frameSpinBox"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="HistogramTab">
+      <attribute name="title">
+       <string>Histogram</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2" stretch="1,0">
+       <item>
+        <widget class="QVTKWidget" name="histogramRenderWidget" native="true"/>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Options</string>
+         </property>
+         <layout class="QHBoxLayout" name="horizontalLayout">
+          <item>
+           <widget class="QComboBox" name="plotTypeCombo"/>
+          </item>
+          <item>
+           <widget class="QLabel" name="binLabel">
+            <property name="text">
+             <string>Number of Bins</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSlider" name="binSlider">
+            <property name="orientation">
+             <enum>Qt::Horizontal</enum>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QSpinBox" name="binSpinBox"/>
+          </item>
+         </layout>
+        </widget>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header>QVTKWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpTrackAttributeColorDialog.ui b/Applications/VpView/vpTrackAttributeColorDialog.ui
new file mode 100644
index 00000000..43a9a02c
--- /dev/null
+++ b/Applications/VpView/vpTrackAttributeColorDialog.ui
@@ -0,0 +1,452 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpTrackAttributeColorDialog</class>
+ <widget class="QDialog" name="vpTrackAttributeColorDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>376</width>
+    <height>264</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Track Attribute Colors</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="5" column="4">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="1" colspan="5">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QGroupBox" name="groupBox_5">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Linking</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout_5">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_11">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Start</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="qtColorButton" name="linkStartColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_12">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>End</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="qtColorButton" name="linkEndColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_13">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Combined</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="qtColorButton" name="linkCombinedColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="3" colspan="3">
+    <widget class="QGroupBox" name="groupBox_4">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Interval</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout_4">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_9">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Forward</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="qtColorButton" name="intForwardColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_10">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Back</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="qtColorButton" name="intBackColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_8">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Init</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="qtColorButton" name="intInitColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Data Association Tracking</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout_2">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Kinematic</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="qtColorButton" name="daKinematicColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_5">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Multi Features</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="qtColorButton" name="daMultiFeaturesColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="label_3">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Combined</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="qtColorButton" name="daCombinedColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>Kalman Filter</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_6">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Extended</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="qtColorButton" name="kfExtendedColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_7">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Linear</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="qtColorButton" name="kfLinearColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Foreground Tracking</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>SSD</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="qtColorButton" name="fgSsdColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>CSURF</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="qtColorButton" name="fgCsurfColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtColorButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">qtColorButton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vpTrackAttributeColorDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vpTrackAttributeColorDialog</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>
diff --git a/Applications/VpView/vpTrackColorDialog.cxx b/Applications/VpView/vpTrackColorDialog.cxx
new file mode 100644
index 00000000..ee1d13f9
--- /dev/null
+++ b/Applications/VpView/vpTrackColorDialog.cxx
@@ -0,0 +1,254 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpTrackColorDialog.h"
+#include "ui_vpTrackColorDialog.h"
+#include "ui_vpTrackAttributeColorDialog.h"
+
+#include <vtkVgTrack.h>
+
+#include <vgAttributeSet.h>
+#include <vgColor.h>
+
+#include <QSettings>
+
+QTE_IMPLEMENT_D_FUNC(vpTrackColorDialog)
+
+namespace
+{
+
+// these should match the group/attribute strings set in vpViewCore
+const QString fgSsd           = "ForegroundTracking/SSD";
+const QString fgCsurf         = "ForegroundTracking/CSURF";
+const QString daKinematic     = "DataAssociationTracking/Kinematic";
+const QString daMultiFeatures = "DataAssociationTracking/MultiFeatures";
+const QString daMultiple      = "DataAssociationTracking/Multiple";
+const QString kfExtended      = "KalmanFilter/Extended";
+const QString kfLinear        = "KalmanFilter/Linear";
+const QString intForward      = "Interval/Forward";
+const QString intBack         = "Interval/Back";
+const QString intInit         = "Interval/Init";
+const QString linkStart       = "Linking/Start";
+const QString linkEnd         = "Linking/End";
+const QString linkMultiple    = "Linking/Multiple";
+
+}
+
+//-----------------------------------------------------------------------------
+class vpTrackColorDialogPrivate
+{
+public:
+  Ui::vpTrackColorDialog UI;
+  Ui::vpTrackAttributeColorDialog* AttributeUI;
+};
+
+//-----------------------------------------------------------------------------
+vpTrackColorDialog::vpTrackColorDialog(const vgAttributeSet* trackAttributes,
+                                       QWidget* parent)
+  : QDialog(parent), d_ptr(new vpTrackColorDialogPrivate)
+{
+  QTE_D(vpTrackColorDialog);
+
+  d->AttributeUI = 0;
+  d->UI.setupUi(this);
+
+  if (trackAttributes)
+    {
+    std::vector<std::string> groups = trackAttributes->GetEnabledGroups();
+    if (!groups.empty())
+      {
+      for (size_t i = 0, size = groups.size(); i < size; ++i)
+        {
+        d->UI.attributeGroup->addItem(groups[i].c_str());
+        }
+      }
+    }
+
+  d->UI.colorByStateAttribute->setEnabled(d->UI.attributeGroup->count() != 0);
+  d->UI.colorByStatePVO->setEnabled(true);
+
+  // TODO: Use the real colors
+  d->UI.personColor->setColor(Qt::blue);
+  d->UI.vehicleColor->setColor(Qt::green);
+  d->UI.otherColor->setColor(Qt::red);
+
+  connect(d->UI.colorByStateAttribute, SIGNAL(toggled(bool)),
+          d->UI.attributeGroup, SLOT(setEnabled(bool)));
+  connect(d->UI.setColors, SIGNAL(clicked()), this, SLOT(setAttrColors()));
+  connect(d->UI.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()),
+          this, SLOT(apply()));
+}
+
+//-----------------------------------------------------------------------------
+vpTrackColorDialog::~vpTrackColorDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+vpTrackColorDialog::ColoringMode vpTrackColorDialog::mode() const
+{
+  QTE_D_CONST(vpTrackColorDialog);
+
+  return d->UI.colorByTypeLabel->isChecked() ? ColorByTypeLabel :
+         d->UI.colorByStatePVO->isChecked() ? ColorByStatePVO :
+         d->UI.colorByStateAttribute->isChecked() ? ColorByStateAttribute :
+         d->UI.randomColoring->isChecked() ? RandomColor
+                                                  : SingleColor;
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackColorDialog::setMode(vpTrackColorDialog::ColoringMode mode)
+{
+  QTE_D(vpTrackColorDialog);
+
+  switch (mode)
+    {
+    case ColorByTypeLabel:
+      d->UI.colorByTypeLabel->setChecked(true);
+      break;
+    case ColorByStatePVO:
+      d->UI.colorByStatePVO->setChecked(true);
+      break;
+    case ColorByStateAttribute:
+      d->UI.colorByStateAttribute->setChecked(true);
+      break;
+    case RandomColor:
+      d->UI.randomColoring->setChecked(true);
+      break;
+    case SingleColor:
+    default:
+      d->UI.defaultColoring->setChecked(true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vpTrackColorDialog::attributeGroup() const
+{
+  QTE_D_CONST(vpTrackColorDialog);
+
+  return d->UI.attributeGroup->itemText(d->UI.attributeGroup->currentIndex());
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackColorDialog::setAttributeGroup(const QString& attributeGroup)
+{
+  QTE_D_CONST(vpTrackColorDialog);
+
+  for (int i = 0, count = d->UI.attributeGroup->count(); i < count; ++i)
+    {
+    if (d->UI.attributeGroup->itemText(i) == attributeGroup)
+      {
+      d->UI.attributeGroup->setCurrentIndex(i);
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackColorDialog::accept()
+{
+  // TODO: save colors to settings here
+
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackColorDialog::setAttrColors()
+{
+  QTE_D(vpTrackColorDialog);
+
+  QDialog attrColorDialog;
+
+  Ui::vpTrackAttributeColorDialog ui;
+  ui.setupUi(&attrColorDialog);
+
+  connect(ui.buttonBox->button(QDialogButtonBox::Apply), SIGNAL(clicked()),
+          this, SLOT(applyAttributeColors()));
+
+  QSettings settings;
+  settings.beginGroup("TrackAttributeColors");
+
+  const vgColor white(Qt::white);
+
+  // read colors from settings
+  ui.fgSsdColor->setColor(
+    vgColor::read(settings, fgSsd, white).toQColor());
+  ui.fgCsurfColor->setColor(
+    vgColor::read(settings, fgCsurf, white).toQColor());
+
+  ui.daKinematicColor->setColor(
+    vgColor::read(settings, daKinematic, white).toQColor());
+  ui.daMultiFeaturesColor->setColor(
+    vgColor::read(settings, daMultiFeatures, white).toQColor());
+  ui.daCombinedColor->setColor(
+    vgColor::read(settings, daMultiple, white).toQColor());
+
+  ui.kfExtendedColor->setColor(
+    vgColor::read(settings, kfExtended, white).toQColor());
+  ui.kfLinearColor->setColor(
+    vgColor::read(settings, kfLinear, white).toQColor());
+
+  ui.intForwardColor->setColor(
+    vgColor::read(settings, intForward, white).toQColor());
+  ui.intBackColor->setColor(
+    vgColor::read(settings, intBack, white).toQColor());
+  ui.intInitColor->setColor(
+    vgColor::read(settings, intInit, white).toQColor());
+
+  ui.linkStartColor->setColor(
+    vgColor::read(settings, linkStart, white).toQColor());
+  ui.linkEndColor->setColor(
+    vgColor::read(settings, linkEnd, white).toQColor());
+  ui.linkCombinedColor->setColor(
+    vgColor::read(settings, linkMultiple, white).toQColor());
+
+  // show the color selection dialog
+  d->AttributeUI = &ui;
+  if (attrColorDialog.exec() == QDialog::Accepted)
+    {
+    this->applyAttributeColors();
+    }
+  d->AttributeUI = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackColorDialog::apply()
+{
+  // TODO: save colors to settings here
+  emit this->updateRequested(this);
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackColorDialog::applyAttributeColors()
+{
+  QTE_D(vpTrackColorDialog);
+
+  Ui::vpTrackAttributeColorDialog* ui = d->AttributeUI;
+  if (!ui)
+    {
+    return;
+    }
+
+  QSettings settings;
+  settings.beginGroup("TrackAttributeColors");
+
+  // write colors to settings
+  vgColor::write(settings, fgSsd, ui->fgSsdColor->color());
+  vgColor::write(settings, fgCsurf, ui->fgCsurfColor->color());
+  vgColor::write(settings, daKinematic, ui->daKinematicColor->color());
+  vgColor::write(settings, daMultiFeatures, ui->daMultiFeaturesColor->color());
+  vgColor::write(settings, daMultiple, ui->daCombinedColor->color());
+  vgColor::write(settings, kfExtended, ui->kfExtendedColor->color());
+  vgColor::write(settings, kfLinear, ui->kfLinearColor->color());
+  vgColor::write(settings, intForward, ui->intForwardColor->color());
+  vgColor::write(settings, intBack, ui->intBackColor->color());
+  vgColor::write(settings, intInit, ui->intInitColor->color());
+  vgColor::write(settings, linkStart, ui->linkStartColor->color());
+  vgColor::write(settings, linkEnd, ui->linkEndColor->color());
+  vgColor::write(settings, linkMultiple, ui->linkCombinedColor->color());
+
+  emit this->updateRequested(this);
+}
diff --git a/Applications/VpView/vpTrackColorDialog.h b/Applications/VpView/vpTrackColorDialog.h
new file mode 100644
index 00000000..f606e5fa
--- /dev/null
+++ b/Applications/VpView/vpTrackColorDialog.h
@@ -0,0 +1,61 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpTrackColorDialog_h
+#define __vpTrackColorDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class vgAttributeSet;
+
+class vpTrackColorDialogPrivate;
+
+class vpTrackColorDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  enum ColoringMode
+    {
+    SingleColor,
+    RandomColor,
+    ColorByTypeLabel,
+    ColorByStatePVO,
+    ColorByStateAttribute
+    };
+
+  vpTrackColorDialog(const vgAttributeSet* trackAttribs = 0,
+                     QWidget* parent = 0);
+  ~vpTrackColorDialog();
+
+  ColoringMode mode() const;
+  void setMode(ColoringMode);
+
+  QString attributeGroup() const;
+  void setAttributeGroup(const QString& attributeGroup);
+
+signals:
+  void updateRequested(vpTrackColorDialog* dlg);
+
+public slots:
+  virtual void accept();
+
+protected slots:
+  void setAttrColors();
+  void apply();
+  void applyAttributeColors();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vpTrackColorDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vpTrackColorDialog)
+  Q_DISABLE_COPY(vpTrackColorDialog)
+};
+
+#endif
diff --git a/Applications/VpView/vpTrackColorDialog.ui b/Applications/VpView/vpTrackColorDialog.ui
new file mode 100644
index 00000000..bedab3b9
--- /dev/null
+++ b/Applications/VpView/vpTrackColorDialog.ui
@@ -0,0 +1,235 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpTrackColorDialog</class>
+ <widget class="QDialog" name="vpTrackColorDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>222</width>
+    <height>296</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Track Color</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QRadioButton" name="defaultColoring">
+     <property name="text">
+      <string>&amp;Default Coloring</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="randomColoring">
+     <property name="text">
+      <string>&amp;Random Coloring</string>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="colorByTypeLabel">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Color by &amp;Type Label</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="colorByStatePVO">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="text">
+      <string>Color by State PVO</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="personLabel">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Person:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="qtColorButton" name="personColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="vehicleLabel">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Vehicle:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="qtColorButton" name="vehicleColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="otherLabel">
+        <property name="toolTip">
+         <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+        </property>
+        <property name="text">
+         <string>Other:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="qtColorButton" name="otherColor">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QRadioButton" name="colorByStateAttribute">
+     <property name="text">
+      <string>Color by State &amp;Attribute</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QComboBox" name="attributeGroup">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QPushButton" name="setColors">
+        <property name="text">
+         <string>Set Colors...</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtColorButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">qtColorButton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vpTrackColorDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vpTrackColorDialog</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>
diff --git a/Applications/VpView/vpTrackConfig.cxx b/Applications/VpView/vpTrackConfig.cxx
new file mode 100644
index 00000000..bd8157eb
--- /dev/null
+++ b/Applications/VpView/vpTrackConfig.cxx
@@ -0,0 +1,184 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpTrackConfig.h"
+
+#include "vpConfigUtils.h"
+
+#include <vgTrackType.h>
+
+#include <vtkVgTrackTypeRegistry.h>
+
+#include <QColor>
+#include <QSettings>
+
+//-----------------------------------------------------------------------------
+class vpTrackConfig::vpTrackConfigInternal
+{
+public:
+  vpTrackConfigInternal() : Dirty(false) {}
+
+public:
+  QSettings Settings;
+  bool Dirty;
+};
+
+//-----------------------------------------------------------------------------
+vpTrackConfig::vpTrackConfig(vtkVgTrackTypeRegistry* registry)
+{
+  this->Internal = new vpTrackConfigInternal;
+  this->Internal->Settings.beginGroup("TrackTypes");
+
+  this->Registry = registry;
+  this->Registry->Register(0);
+
+  this->ReadTrackTypes(this->Internal->Settings);
+  this->WriteTrackTypes();
+}
+
+//-----------------------------------------------------------------------------
+vpTrackConfig::~vpTrackConfig()
+{
+  // Write out any config changes made by the user.
+  if (this->Internal->Dirty)
+    {
+    this->WriteTrackTypes();
+    }
+
+  this->Registry->UnRegister(0);
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackConfig::ReadTrackTypes(QSettings& settings)
+{
+  int size = settings.beginReadArray("TrackTypes");
+
+  for (int i = 0; i < size; ++i)
+    {
+    settings.setArrayIndex(i);
+
+    vgTrackType type;
+
+    QString id = settings.value("Id").toString();
+    type.SetId(qPrintable(id));
+
+    QColor color = vpConfigUtils::ReadColor("Color", settings);
+    if (color.isValid())
+      {
+      type.SetColor(color.redF(), color.greenF(), color.blueF());
+      }
+
+    int index = this->Registry->GetTypeIndex(type.GetId());
+
+    // Add or assign to track type vector.
+    if (index == -1)
+      {
+      this->Registry->AddType(type);
+      }
+    else
+      {
+      this->Registry->SetType(index, type);
+      }
+    }
+
+  settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackConfig::WriteTrackTypes()
+{
+  this->Internal->Settings.remove("");
+  this->Internal->Settings.beginWriteArray("TrackTypes",
+                                           this->GetNumberOfTypes());
+
+  int index = 0;
+  for (int i = 0, end = this->Registry->GetNumberOfTypes(); i < end; ++i)
+    {
+    const vgTrackType& type = this->Registry->GetType(i);
+    const char* id = type.GetId();
+    if (!*id)
+      {
+      continue;
+      }
+    this->Internal->Settings.setArrayIndex(index);
+    this->Internal->Settings.setValue("Id", id);
+
+    double c[3];
+    QColor color;
+    type.GetColor(c[0], c[1], c[2]);
+    color.setRgbF(c[0], c[1], c[2]);
+    vpConfigUtils::WriteColor("Color", color, this->Internal->Settings);
+    ++index;
+    }
+
+  this->Internal->Settings.endArray();
+}
+
+//-----------------------------------------------------------------------------
+int vpTrackConfig::GetNumberOfTypes()
+{
+  return this->Registry->GetNumberOfTypes();
+}
+
+//-----------------------------------------------------------------------------
+int vpTrackConfig::GetTrackTypeIndex(const char* id)
+{
+  return this->Registry->GetTypeIndex(id);
+}
+
+//-----------------------------------------------------------------------------
+const vgTrackType& vpTrackConfig::GetTrackTypeByIndex(int index)
+{
+  return this->Registry->GetType(index);
+}
+
+//-----------------------------------------------------------------------------
+const vgEntityType& vpTrackConfig::GetEntityType(int id)
+{
+  return this->Registry->GetEntityType(id);
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackConfig::SetEntityType(int id, const vgEntityType& type)
+{
+  this->Registry->SetEntityType(id, type);
+  this->Internal->Dirty = true;
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackConfig::LoadFromFile(const char* filename)
+{
+  QSettings settings(filename, QSettings::IniFormat);
+  settings.beginGroup("TrackTypes");
+  this->ReadTrackTypes(settings);
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackConfig::MarkTypeUsed(int index)
+{
+  this->Registry->MarkTypeUsed(index);
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackConfig::MarkAllTypesUnused()
+{
+  this->Registry->MarkAllTypesUnused();
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackConfig::AddType(const vgTrackType& tt)
+{
+  this->Registry->AddType(tt);
+  this->Internal->Dirty = true;
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackConfig::SetType(int index, const vgTrackType& tt)
+{
+  this->Registry->SetType(index, tt);
+  this->Internal->Dirty = true;
+}
diff --git a/Applications/VpView/vpTrackConfig.h b/Applications/VpView/vpTrackConfig.h
new file mode 100644
index 00000000..261c53a4
--- /dev/null
+++ b/Applications/VpView/vpTrackConfig.h
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpTrackConfig_h
+#define __vpTrackConfig_h
+
+#include "vpEntityConfig.h"
+
+class QSettings;
+
+class vgTrackType;
+
+class vtkVgTrackTypeRegistry;
+
+class vpTrackConfig : public vpEntityConfig
+{
+public:
+  vpTrackConfig(vtkVgTrackTypeRegistry* registry);
+  virtual ~vpTrackConfig();
+
+  virtual int GetNumberOfTypes();
+
+  virtual const vgEntityType& GetEntityType(int id);
+  virtual void SetEntityType(int id, const vgEntityType& type);
+
+  virtual void MarkTypeUsed(int index);
+  virtual void MarkAllTypesUnused();
+
+  void AddType(const vgTrackType& tt);
+  void SetType(int index, const vgTrackType& tt);
+
+  int GetTrackTypeIndex(const char* id);
+  const vgTrackType& GetTrackTypeByIndex(int index);
+
+  void LoadFromFile(const char* filename);
+
+protected:
+  void ReadTrackTypes(QSettings& settings);
+  void WriteTrackTypes();
+
+private:
+  class vpTrackConfigInternal;
+  vpTrackConfigInternal* Internal;
+
+  vtkVgTrackTypeRegistry* Registry;
+
+private:
+  vpTrackConfig(const vpTrackConfig& src);   // Not implemented.
+  void operator=(const vpTrackConfig& src);  // Not implemented.
+};
+
+#endif // __vpTrackConfig_h
diff --git a/Applications/VpView/vpTrackIO.cxx b/Applications/VpView/vpTrackIO.cxx
new file mode 100644
index 00000000..a9cdc74a
--- /dev/null
+++ b/Applications/VpView/vpTrackIO.cxx
@@ -0,0 +1,110 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpTrackIO.h"
+
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackTypeRegistry.h>
+
+#include <vtkMatrix4x4.h>
+
+#include <assert.h>
+
+enum { NumDefaultTrackColors = 12 };
+static const unsigned char DefaultTrackColors[NumDefaultTrackColors][3] =
+{
+  { 255, 255,   0 }, // Yellow
+  {   0, 255, 255 }, // Cyan
+  { 178,  34,  34 }, // Firebrick
+  { 106,  90, 205 }, // Slate Blue
+  { 255,   0,   0 }, // Red
+  {   0, 100,   0 }, // Dark Green
+  { 188, 143, 143 }, // Rosy Brown
+  {   0,   0, 255 }, // Blue
+  { 127, 255,   0 }, // Chartreuse
+  { 208,  32, 144 }, // Violet Red
+  { 240, 230, 140 }, // Khaki
+  { 255,  69,   0 }  // Orange Red
+};
+
+//-----------------------------------------------------------------------------
+vpTrackIO::vpTrackIO(vtkVgTrackModel* trackModel,
+                     TrackStorageMode storageMode,
+                     TrackTimeStampMode timeStampMode,
+                     vtkVgTrackTypeRegistry* trackTypes,
+                     vtkMatrix4x4* geoTransform,
+                     vpFrameMap* frameMap) :
+  TrackModel(trackModel),
+  TrackTypes(trackTypes),
+  StorageMode(storageMode),
+  TimeStampMode(timeStampMode),
+  GeoTransform(geoTransform),
+  FrameMap(frameMap),
+  HasOverrideColor(false)
+{
+  assert(trackModel);
+}
+
+//-----------------------------------------------------------------------------
+vpTrackIO::~vpTrackIO()
+{}
+
+//-----------------------------------------------------------------------------
+void vpTrackIO::SetOverrideColor(const double color[3])
+{
+  if (!color)
+    {
+    this->HasOverrideColor = false;
+    return;
+    }
+
+  this->HasOverrideColor = true;
+  this->OverrideColor[0] = color[0];
+  this->OverrideColor[1] = color[1];
+  this->OverrideColor[2] = color[2];
+}
+
+//-----------------------------------------------------------------------------
+bool vpTrackIO::ReadTrackTraits()
+{
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpTrackIO::ImportTracks(vtkIdType, float, float)
+{
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpTrackIO::GetNextValidTrackFrame(vtkVgTrack*, unsigned int,
+                                       vtkVgTimeStamp&) const
+{
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpTrackIO::GetPrevValidTrackFrame(vtkVgTrack*, unsigned int,
+                                       vtkVgTimeStamp&) const
+{
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vpTrackIO::GetModelTrackId(unsigned int sourceId) const
+{
+  return static_cast<vtkIdType>(sourceId);
+}
+
+//-----------------------------------------------------------------------------
+void vpTrackIO::GetDefaultTrackColor(int trackId, double (&color)[3])
+{
+  // Switch track colors every million ids.
+  int colorIdx = std::min(trackId / 1000000, NumDefaultTrackColors - 1);
+  color[0] = DefaultTrackColors[colorIdx][0] / 255.0;
+  color[1] = DefaultTrackColors[colorIdx][1] / 255.0;
+  color[2] = DefaultTrackColors[colorIdx][2] / 255.0;
+}
diff --git a/Applications/VpView/vpTrackIO.h b/Applications/VpView/vpTrackIO.h
new file mode 100644
index 00000000..7e915c86
--- /dev/null
+++ b/Applications/VpView/vpTrackIO.h
@@ -0,0 +1,95 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpTrackIO_h
+#define __vpTrackIO_h
+
+#include <vtkSmartPointer.h>
+
+class vpFrameMap;
+
+class vtkVgTimeStamp;
+class vtkVgTrack;
+class vtkVgTrackModel;
+class vtkVgTrackTypeRegistry;
+
+class vtkMatrix4x4;
+
+class vpTrackIO
+{
+protected:
+  enum TimeStampFlag
+    {
+    TSF_Time        = 1 << 0,
+    TSF_FrameNumber = 1 << 1
+    };
+
+public:
+  enum TrackStorageMode
+    {
+    TSM_ImageCoords,
+    TSM_InvertedImageCoords,
+    TSM_TransformedGeoCoords,
+    TSM_HomographyTransformedImageCoords
+    };
+
+  enum TrackTimeStampMode
+    {
+    TTM_TimeOnly           = TSF_Time,
+    TTM_FrameNumberOnly    = TSF_FrameNumber,
+    TTM_TimeAndFrameNumber = TSF_Time | TSF_FrameNumber
+    };
+
+public:
+  vpTrackIO(vtkVgTrackModel* trackModel,
+            TrackStorageMode storageMode,
+            TrackTimeStampMode timeStampMode,
+            vtkVgTrackTypeRegistry* trackTypes,
+            vtkMatrix4x4* geoTransform,
+            vpFrameMap* frameMap);
+
+  virtual ~vpTrackIO();
+
+  void SetOverrideColor(const double color[3]);
+
+  virtual bool ReadTracks() = 0;
+  virtual bool ReadTrackTraits();
+
+  virtual bool ImportTracks(vtkIdType idsOffset, float offsetX, float offsetY);
+
+  virtual bool WriteTracks(const char* filename,
+                           bool writeSceneElements) const = 0;
+
+  virtual bool GetNextValidTrackFrame(vtkVgTrack* track,
+                                      unsigned int startFrame,
+                                      vtkVgTimeStamp& timeStamp) const;
+
+  virtual bool GetPrevValidTrackFrame(vtkVgTrack* track,
+                                      unsigned int startFrame,
+                                      vtkVgTimeStamp& timeStamp) const;
+
+  virtual vtkIdType GetModelTrackId(unsigned int sourceId) const;
+
+  static void GetDefaultTrackColor(int trackId, double (&color)[3]);
+
+protected:
+  virtual unsigned int GetImageHeight() const = 0;
+
+protected:
+  friend class vpFileTrackIOImpl;
+
+  vtkVgTrackModel* TrackModel;
+  vtkVgTrackTypeRegistry* TrackTypes;
+
+  TrackStorageMode StorageMode;
+  TrackTimeStampMode TimeStampMode;
+  vtkSmartPointer<vtkMatrix4x4> GeoTransform;
+  vpFrameMap* FrameMap;
+  double OverrideColor[3];
+  bool HasOverrideColor;
+};
+
+#endif // __vpTrackIO_h
diff --git a/Applications/VpView/vpTreeView.cxx b/Applications/VpView/vpTreeView.cxx
new file mode 100644
index 00000000..0d9f4617
--- /dev/null
+++ b/Applications/VpView/vpTreeView.cxx
@@ -0,0 +1,1221 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpTreeView.h"
+
+#include "vtkVgActivityManager.h"
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgTrackModel.h"
+#include "vtkVgActivity.h"
+#include "vtkVgEvent.h"
+#include "vtkVgTrack.h"
+#include "vtkVgTrackFilter.h"
+#include "vtkVgTrackTypeRegistry.h"
+
+#include "vgEventType.h"
+#include "vgTrackType.h"
+
+#include <QApplication>
+#include <QTreeWidget>
+#include <QMenu>
+#include <QContextMenuEvent>
+
+//-----------------------------------------------------------------------------
+class SignalBlocker
+{
+  vpTreeView* tree;
+
+public:
+  SignalBlocker(vpTreeView* t) : tree(t)
+    {
+    tree->blockSignals(true);
+    tree->model()->blockSignals(true);
+    }
+
+  ~SignalBlocker()
+    {
+    tree->model()->blockSignals(false);
+    tree->blockSignals(false);
+
+    // Make sure an update occurs when event processing is done. This would
+    // normally be triggered by the dataChanged() signal emitted from the model.
+    tree->scheduleDelayedItemsLayout();
+    }
+};
+
+//-----------------------------------------------------------------------------
+class vpTreeView::TreeWidgetItem : public QTreeWidgetItem
+{
+  vpTreeView* Tree;
+
+public:
+  TreeWidgetItem(vpTreeView* parent, const QStringList& strings)
+    : QTreeWidgetItem(strings), Tree(parent)
+    {}
+
+private:
+  virtual bool operator<(const QTreeWidgetItem& other) const
+    {
+    int sortData = vpTreeView::IDR_ItemSortValsStart + Tree->GetSortType();
+    switch (Tree->GetSortType())
+      {
+      case ST_Id:
+        return this->data(0, sortData).toInt() <
+               other.data(0, sortData).toInt();
+
+      case ST_Name:
+        return this->data(0, sortData).toString() <
+               other.data(0, sortData).toString();
+
+      case ST_Normalcy:
+      case ST_Saliency:
+      case ST_Probability:
+      case ST_Length:
+        return this->data(0, sortData).toReal() <
+               other.data(0, sortData).toReal();
+      }
+
+    return QTreeWidgetItem::operator<(other);
+    }
+
+  virtual QVariant data(int column, int role) const
+    {
+    switch (role)
+      {
+      case Qt::ToolTipRole:
+        {
+        // Show the rank of top level items in the tree.
+        if (!this->parent())
+          {
+          return QString("%1 of %2")
+                 .arg(this->Tree->indexFromItem(
+                        const_cast<TreeWidgetItem*>(this)).row() + 1)
+                 .arg(this->Tree->topLevelItemCount());
+          }
+        }
+      }
+    return QTreeWidgetItem::data(column, role);
+    }
+};
+
+//-----------------------------------------------------------------------------
+vpTreeView::vpTreeView(QWidget* p)
+  : QTreeWidget(p), SortType(ST_Id),
+    ShowExcludedItems(false), ShowUncheckedItems(true)
+{
+  this->setColumnCount(1);
+
+  this->setHeaderHidden(true);
+  this->setSelectionMode(QAbstractItemView::ExtendedSelection);
+
+  // this is needed to get hover events
+  this->setMouseTracking(true);
+
+  connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(OnItemChanged(QTreeWidgetItem*)));
+}
+
+//-----------------------------------------------------------------------------
+vpTreeView::~vpTreeView()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::Initialize(vtkVgActivityManager* activityManager,
+                            vtkVgEventModel* eventModel,
+                            vtkVgTrackModel* trackModel,
+                            vtkVgEventFilter* eventFilter,
+                            vtkVgTrackFilter* trackFilter,
+                            vtkVgEventTypeRegistry* eventTypes,
+                            vtkVgTrackTypeRegistry* trackTypes)
+{
+  this->ActivityManager = activityManager;
+  this->EventModel = eventModel;
+  this->TrackModel = trackModel;
+
+  this->TrackFilter = trackFilter;
+  this->EventFilter = eventFilter;
+  this->TrackTypeRegistry = trackTypes;
+  this->EventTypeRegistry = eventTypes;
+
+  // Clear the tree.
+  this->clear();
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vpTreeView::CreateItem(ItemTypeEnum type, const char* name,
+                                        int id)
+{
+  int displayId = type == ItemType::SceneElement
+                    ? this->TrackModel->GetSceneElementIdForTrack(id)
+                    : id;
+
+  QStringList strings(QString("%1-%2").arg(name).arg(displayId));
+
+  TreeWidgetItem* item = new TreeWidgetItem(this, strings);
+
+  item->setData(0, IDR_ItemType, type);
+  item->setData(0, IDR_ItemId, id);
+  item->setData(0, IDR_ItemSortValsStart + ST_Id, id);
+  item->setData(0, IDR_ItemSortValsStart + ST_Name, name);
+
+  return item;
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vpTreeView::CreateItem(vtkVgTrack* track, bool isFseTrack)
+{
+  int type = track->GetType();
+
+  QTreeWidgetItem* item =
+    this->CreateItem(isFseTrack ? ItemType::SceneElement : ItemType::Track,
+                     type == -1
+                       ? "track"
+                       : this->TrackTypeRegistry->GetType(type).GetName(),
+                     track->GetId());
+
+  vtkVgTimeStamp startFrame = track->GetStartFrame();
+  vtkVgTimeStamp endFrame = track->GetEndFrame();
+
+  double length;
+  if (startFrame.HasTime() && endFrame.HasTime())
+    {
+    length = endFrame.GetTime() - startFrame.GetTime();
+    }
+  else
+    {
+    length = static_cast<double>(endFrame.GetFrameNumber() -
+                                 startFrame.GetFrameNumber());
+    }
+
+  // Store the track length for sorting purposes
+  // TODO: Update this if the track changes
+  item->setData(0, IDR_ItemSortValsStart + ST_Length, length);
+  return item;
+}
+
+//-----------------------------------------------------------------------------
+bool vpTreeView::RefreshItem(QTreeWidgetItem* item, bool isTopLevel)
+{
+  bool on = false;
+  bool shown = false;
+
+  int id = item->data(0, IDR_ItemId).toInt();
+  bool sticky = item->data(0, IDR_ItemSticky).toBool();
+
+  switch (item->data(0, IDR_ItemType).toInt())
+    {
+    case ItemType::Activity:
+      {
+      on = this->ActivityManager->GetActivityDisplayState(id);
+      vtkVgActivity* a = this->ActivityManager->GetActivity(id);
+      shown = !this->ActivityManager->ActivityIsFiltered(a) &&
+              this->ActivityManager->GetActivityFilteredDisplayState(id);
+      break;
+      }
+
+    case ItemType::Event:
+      {
+      vtkVgEventInfo info = this->EventModel->GetEventInfo(id);
+      on = info.GetDisplayEvent();
+      shown = this->EventFilter->GetBestClassifier(info.GetEvent()) >= 0 &&
+              info.GetPassesFilters();
+      break;
+      }
+
+    case ItemType::Track:
+      {
+      vtkVgTrackInfo info = this->TrackModel->GetTrackInfo(id);
+      on = info.GetDisplayTrack();
+      shown = this->TrackFilter->GetBestClassifier(info.GetTrack()) >= 0 &&
+              info.GetPassesFilters();
+      break;
+      }
+
+    case ItemType::SceneElement:
+      {
+      vtkVgTrackInfo info = this->TrackModel->GetTrackInfo(id);
+      on = info.GetDisplayTrack();
+      shown = info.GetPassesFilters();
+      break;
+      }
+    }
+
+  if (isTopLevel && !sticky &&
+      ((!on && !this->ShowUncheckedItems) ||
+       (!shown && !this->ShowExcludedItems)))
+    {
+    // Note: If the item has not yet been added to the tree, this won't
+    // actually cause the item to be hidden. Make sure to refresh after
+    // adding the item.
+    item->setHidden(true);
+    return false;
+    }
+
+  item->setHidden(false);
+
+  // gray out excluded (filtered) items
+  QPalette palette;
+  if (!shown)
+    palette.setCurrentColorGroup(QPalette::Disabled);
+
+  // update color
+  item->setForeground(0, palette.windowText());
+
+  // update checkbox
+  item->setCheckState(0, on ? Qt::Checked : Qt::Unchecked);
+
+  // update "sticky" icon
+  item->setIcon(0, sticky ? QIcon(":/icons/16x16/pin") : QIcon());
+
+  this->UpdateItemStatus(item);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::Clear()
+{
+  this->clear();
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::RefreshRecursive(QTreeWidgetItem* root, int depth)
+{
+  int numChildren = root->childCount();
+  for (int i = 0; i < numChildren; ++i)
+    {
+    QTreeWidgetItem* item = root->child(i);
+
+    // Hide top level items if the option has been set, but continue to show
+    // children, even if they are filtered, in order to avoid confusion.
+    this->RefreshItem(item, depth == 0);
+    this->RefreshRecursive(item, depth + 1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::Refresh()
+{
+  // update the items we already have in the tree - do not modify tree structure
+  SignalBlocker sb(this);
+  this->RefreshRecursive(this->invisibleRootItem(), 0);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::AddEventTracks(vtkVgEvent* event, QTreeWidgetItem* eventItem)
+{
+  int numTracks = event->GetNumberOfTracks();
+  for (int k = 0; k < numTracks; ++k)
+    {
+    QTreeWidgetItem* item = this->CreateItem(event->GetTrack(k));
+
+    // store event track index in addition to track id
+    item->setData(0, IDR_ItemIndex, k);
+
+    this->RefreshItem(item);
+    eventItem->addChild(item);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::AddAllActivities()
+{
+  vtkVgActivityManager* am = this->ActivityManager;
+  int numActivities = am->GetNumberOfActivities();
+  for (int i = 0; i < numActivities; ++i)
+    {
+    vtkVgActivity* a = am->GetActivity(i);
+
+    QTreeWidgetItem* activityItem =
+      this->CreateItem(ItemType::Activity, a->GetName(), a->GetId());
+
+    activityItem->setData(0,
+                          IDR_ItemSortValsStart + ST_Saliency,
+                          a->GetSaliency());
+
+    activityItem->setData(0,
+                          IDR_ItemSortValsStart + ST_Probability,
+                          a->GetProbability());
+
+    // store index rather than id since future lookups will be index-based
+    activityItem->setData(0, IDR_ItemId, i);
+
+    // add all events in this activity
+    int numEvents = a->GetNumberOfEvents();
+    for (int j = 0; j < numEvents; ++j)
+      {
+      vtkVgEvent* e = a->GetEvent(j);
+
+      int id = e->GetId();
+      const char* type = this->EventTypeRegistry->GetTypeById(
+                           e->GetActiveClassifierType()).GetName();
+
+      QTreeWidgetItem* eventItem = this->CreateItem(ItemType::Event, type, id);
+
+      eventItem->setData(0, IDR_ItemIndex, j);
+      this->UpdateItemStatus(eventItem);
+
+      // add all tracks in this event
+      this->AddEventTracks(e, eventItem);
+
+      this->RefreshItem(eventItem);
+      activityItem->addChild(eventItem);
+      }
+
+    bool visible = this->RefreshItem(activityItem, true);
+    this->addTopLevelItem(activityItem);
+
+    if (!visible)
+      {
+      activityItem->setHidden(true);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::AddAllEvents()
+{
+  vtkVgEventModel* em = this->EventModel;
+
+  em->InitEventTraversal();
+  while (vtkVgEvent* event = em->GetNextEvent().GetEvent())
+    {
+    const char* type = this->EventTypeRegistry->GetTypeById(
+                         event->GetActiveClassifierType()).GetName();
+
+    int id = event->GetId();
+
+    QTreeWidgetItem* eventItem =
+      this->CreateItem(ItemType::Event, type, id);
+
+    eventItem->setData(0,
+                       IDR_ItemSortValsStart + ST_Normalcy,
+                       event->GetActiveClassifierNormalcy());
+
+    this->UpdateItemStatus(eventItem);
+
+    // add all tracks in this event
+    this->AddEventTracks(event, eventItem);
+
+    bool visible = this->RefreshItem(eventItem, true);
+    this->addTopLevelItem(eventItem);
+
+    if (!visible)
+      {
+      eventItem->setHidden(true);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::AddAllTracks()
+{
+  vtkVgTrackModel* tm = this->TrackModel;
+
+  tm->InitTrackTraversal();
+  while (vtkVgTrack* track = tm->GetNextTrack().GetTrack())
+    {
+    if (track->GetDisplayFlags() & vtkVgTrack::DF_SceneElement)
+      {
+      continue;
+      }
+
+    QTreeWidgetItem* trackItem = this->CreateItem(track);
+
+    trackItem->setData(0,
+                       IDR_ItemSortValsStart + ST_Normalcy,
+                       track->GetNormalcy());
+
+    bool visible = this->RefreshItem(trackItem, true);
+    this->addTopLevelItem(trackItem);
+
+    if (!visible)
+      {
+      trackItem->setHidden(true);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::AddAllSceneElements()
+{
+  vtkVgTrackModel* tm = this->TrackModel;
+
+  tm->InitTrackTraversal();
+  while (vtkVgTrack* track = tm->GetNextTrack().GetTrack())
+    {
+    if (!(track->GetDisplayFlags() & vtkVgTrack::DF_SceneElement))
+      {
+      continue;
+      }
+
+    QTreeWidgetItem* trackItem = this->CreateItem(track, true);
+
+    trackItem->setData(0,
+                       IDR_ItemSortValsStart + ST_Probability,
+                       track->GetNormalcy());
+
+    bool visible = this->RefreshItem(trackItem, true);
+    this->addTopLevelItem(trackItem);
+
+    if (!visible)
+      {
+      trackItem->setHidden(true);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::AddAndSelectTrack(vtkVgTrack* track)
+{
+  int id = track->GetId();
+  QTreeWidgetItem* trackItem;
+
+  if ((trackItem = this->FindTopLevelItem(ItemType::Track, id)) == 0)
+    {
+    trackItem = this->CreateItem(track);
+
+    this->UpdateItemStatus(trackItem);
+
+    bool visible = this->RefreshItem(trackItem, true);
+    this->addTopLevelItem(trackItem);
+
+    if (!visible)
+      {
+      trackItem->setHidden(true);
+      }
+    }
+
+  this->setCurrentItem(trackItem);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::AddAndSelectEvent(vtkVgEvent* event)
+{
+  int id = event->GetId();
+  QTreeWidgetItem* eventItem;
+
+  if ((eventItem = this->FindTopLevelItem(ItemType::Event, id)) == 0)
+    {
+    const char* type = this->EventTypeRegistry->GetTypeById(
+                         event->GetActiveClassifierType()).GetName();
+
+    eventItem = this->CreateItem(ItemType::Event, type, id);
+
+    eventItem->setData(0, IDR_ItemSortValsStart + ST_Saliency,
+                       1.0 - event->GetActiveClassifierNormalcy());
+
+    this->UpdateItemStatus(eventItem);
+
+    // add all tracks in this event
+    this->AddEventTracks(event, eventItem);
+
+    bool visible = this->RefreshItem(eventItem, true);
+    this->addTopLevelItem(eventItem);
+
+    if (!visible)
+      {
+      eventItem->setHidden(true);
+      }
+    }
+
+  this->setCurrentItem(eventItem);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::AddAndSelectSceneElement(vtkVgTrack* track)
+{
+  int id = track->GetId();
+  QTreeWidgetItem* trackItem;
+
+  if ((trackItem = this->FindTopLevelItem(ItemType::SceneElement, id)) == 0)
+    {
+    trackItem = this->CreateItem(track, true);
+
+    this->UpdateItemStatus(trackItem);
+
+    bool visible = this->RefreshItem(trackItem, true);
+    this->addTopLevelItem(trackItem);
+
+    if (!visible)
+      {
+      trackItem->setHidden(true);
+      }
+    }
+
+  this->setCurrentItem(trackItem);
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vpTreeView::FindItem(QTreeWidgetItem* root, int type, int id)
+{
+  // perform a pre-order traversal
+  int numChildren = root->childCount();
+  for (int i = 0; i < numChildren; ++i)
+    {
+    // look at this child
+    QTreeWidgetItem* item = root->child(i);
+    if (item->data(0, IDR_ItemType).toInt() == type &&
+        item->data(0, IDR_ItemId).toInt() == id)
+      {
+      return item;
+      }
+    // look in this child's subtree
+    if (QTreeWidgetItem* child = this->FindItem(item, type, id))
+      {
+      return child;
+      }
+    }
+  return 0; // not found
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vpTreeView::FindTopLevelItem(int type, int id)
+{
+  for (int i = 0, end = this->topLevelItemCount(); i < end; ++i)
+    {
+    QTreeWidgetItem* item = this->topLevelItem(i);
+    if (item->data(0, IDR_ItemType).toInt() == type &&
+        item->data(0, IDR_ItemId).toInt() == id)
+      {
+      return item;
+      }
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+bool vpTreeView::SelectChildItem(int parentType, int parentId, int index)
+{
+  // look up the parent item, then select from its children
+  if (QTreeWidgetItem* foundItem =
+      this->FindItem(this->invisibleRootItem(), parentType, parentId))
+    {
+    this->setCurrentItem(foundItem->child(index));
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpTreeView::SelectItem(int type, int id)
+{
+  if (QTreeWidgetItem* foundItem =
+      this->FindItem(this->invisibleRootItem(), type, id))
+    {
+    this->setCurrentItem(foundItem);
+    this->scrollTo(this->indexFromItem(foundItem));
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::GetItemInfo(QTreeWidgetItem* item,
+                             int& type, int& id,
+                             int& parentId, int& index)
+{
+  type = item->data(0, IDR_ItemType).toInt();
+  id = item->data(0, IDR_ItemId).toInt();
+
+  QTreeWidgetItem* parent = item->parent();
+  if (parent && parent->data(0, IDR_ItemType).isValid())
+    {
+    parentId = parent->data(0, IDR_ItemId).toInt();
+    index = item->data(0, IDR_ItemIndex).toInt();
+    }
+  else
+    {
+    parentId = -1;
+    index = -1;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::UpdateItemStatus(QTreeWidgetItem* item)
+{
+  int status = vgObjectStatus::None;
+
+  int id = item->data(0, IDR_ItemId).toInt();
+  int type = item->data(0, IDR_ItemType).toInt();
+
+  switch (type)
+    {
+    case ItemType::Activity:
+      {
+      status = this->ActivityManager->GetActivity(id)->GetStatus();
+      break;
+      }
+
+    case ItemType::Event:
+      {
+      vtkVgEvent* event = this->EventModel->GetEvent(id);
+      status = event->GetStatus();
+
+      // show modifiable events in bold type
+      QFont f = item->font(0);
+      f.setBold(event->IsModifiable());
+      item->setFont(0, f);
+      break;
+      }
+
+    case ItemType::Track:
+    case ItemType::SceneElement:
+      {
+      vtkVgTrack* track = this->TrackModel->GetTrack(id);
+      status = track->GetStatus();
+      QFont f = item->font(0);
+      f.setBold(track->IsModifiable());
+      f.setItalic(track->IsUserCreated());
+      item->setFont(0, f);
+      break;
+      }
+
+    default:
+      // nothing to be done for this item type
+      return;
+    }
+
+  // update background color based on item status
+  switch (status)
+    {
+    case vgObjectStatus::None:
+      // normal background color
+      item->setBackground(0, QBrush());
+      break;
+
+    case vgObjectStatus::Positive:
+      {
+      QColor lightGreen(159, 202, 166);
+      item->setBackgroundColor(0, lightGreen);
+      break;
+      }
+
+    case vgObjectStatus::Negative:
+      {
+      QColor lightRed(255, 106, 106);
+      item->setBackgroundColor(0, lightRed);
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::UpdateActivityItem(QTreeWidgetItem* item)
+{
+  int id = item->data(0, IDR_ItemId).toInt();
+  vtkVgActivity* activity = this->ActivityManager->GetActivity(id);
+
+  // NOTE: We assume here that the child event tree items appear in the tree
+  // in order of their index in the parent activity. This may not be a safe
+  // assumption in the future if we allow different sort orders.
+  int eventIndex = 0;
+  int childIndex = 0;
+  int numEvents = activity->GetNumberOfEvents();
+  for (; eventIndex < numEvents && childIndex < item->childCount();)
+    {
+    vtkVgEvent* event = activity->GetEvent(eventIndex);
+    QTreeWidgetItem* child = item->child(childIndex);
+
+    if (event->GetId() ==  child->data(0, IDR_ItemId).toInt())
+      {
+      // update the index of the tree item
+      child->setData(0, IDR_ItemIndex, eventIndex);
+      ++childIndex;
+      ++eventIndex;
+      }
+    else
+      {
+      // This event has a different id, so the event referred to in the tree
+      // must have been deleted.  Remove the tree item.
+      QTreeWidgetItem* c =  item->takeChild(childIndex);
+      delete c;
+      }
+    }
+
+  // remove any remaining dangling children
+  while (childIndex < item->childCount())
+    {
+    QTreeWidgetItem* c =  item->takeChild(childIndex);
+    delete c;
+    }
+
+  // Add new events to the tree. We assume new events are always added to the
+  // end of the activity event list.
+  while (eventIndex < numEvents)
+    {
+    vtkVgEvent* e = activity->GetEvent(eventIndex);
+    int id = e->GetId();
+    const char* type = this->EventTypeRegistry->GetTypeById(
+                         e->GetActiveClassifierType()).GetName();
+
+    QTreeWidgetItem* eventItem = this->CreateItem(ItemType::Event, type, id);
+
+    eventItem->setData(0, IDR_ItemIndex, eventIndex);
+    this->UpdateItemStatus(eventItem);
+
+    // add all tracks in this event
+    this->AddEventTracks(e, eventItem);
+
+    item->addChild(eventItem);
+    this->RefreshItem(eventItem);
+    ++eventIndex;
+    }
+}
+
+//-----------------------------------------------------------------------------
+QSize vpTreeView::sizeHint() const
+{
+  QSize size = QTreeWidget::sizeHint();
+  size.setWidth(150);
+  return size;
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::contextMenuEvent(QContextMenuEvent* event)
+{
+  QMenu menu(this);
+
+  if (this->selectedItems().size() == 1)
+    {
+    menu.addAction("Focus Alone", this, SIGNAL(FocusItemAlone()));
+    menu.addAction("Focus", this, SIGNAL(FocusItem()));
+    menu.addSeparator();
+    menu.addAction("Go To Start", this, SIGNAL(GoToStartFrame()));
+    menu.addAction("Go To End", this, SIGNAL(GoToEndFrame()));
+
+    QTreeWidgetItem* item = this->selectedItems()[0];
+
+    if (item->data(0, IDR_ItemType).toInt() == ItemType::Track)
+      {
+      menu.addAction("Follow", this, SIGNAL(FollowTrack()));
+      menu.addSeparator();
+      menu.addAction("Show Related Events", this,
+                     SIGNAL(ShowLinkedEvents()));
+      menu.addAction("Hide Related Events", this,
+                     SIGNAL(HideLinkedEvents()));
+      menu.addAction("Show Related Activities", this,
+                     SIGNAL(ShowLinkedActivities()));
+      menu.addAction("Hide Related Activities", this,
+                     SIGNAL(HideLinkedActivities()));
+      menu.addSeparator();
+      menu.addAction("Add Related Active Events To Graph Model", this,
+                     SIGNAL(AddTrackEventsToGraphModel()));
+      }
+
+    menu.addSeparator();
+    }
+
+  bool enable = this->selectedItems().size() > 0;
+  menu.addAction("Show", this, SLOT(ShowItems()))->setEnabled(enable);
+  menu.addAction("Hide", this, SLOT(HideItems()))->setEnabled(enable);
+  menu.addAction("Hide All Except", this, SLOT(HideItemsExcept()))->setEnabled(enable);
+
+  foreach (QTreeWidgetItem* item, this->selectedItems())
+    {
+    if (item->data(0, IDR_ItemType).toInt() == ItemType::Event)
+      {
+      menu.addSeparator();
+      menu.addAction("Add Event(s) to Graph Model", this,
+                     SIGNAL(AddEventsToGraphModel()));
+      break;
+      }
+    }
+
+  if (enable)
+    {
+    bool allChildren = true;
+    bool allSticky = true;
+    foreach (QTreeWidgetItem* item, this->selectedItems())
+      {
+      if (!item->parent())
+        {
+        allChildren = false;
+        if (allSticky && !item->data(0, IDR_ItemSticky).toBool())
+          {
+          allSticky = false;
+          }
+        }
+      if (!(allChildren || allSticky))
+        {
+        break;
+        }
+      }
+
+    if (!allChildren)
+      {
+      menu.addSeparator();
+      QAction* a = menu.addAction("Sticky", this, SLOT(ToggleSticky()));
+      a->setCheckable(true);
+      a->setChecked(allSticky);
+      }
+    }
+
+  // allow someone else to add items to the menu
+  emit this->ContextMenuOpened(menu);
+
+  menu.exec(event->globalPos());
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::leaveEvent(QEvent* event)
+{
+  QTreeWidget::leaveEvent(event);
+  emit this->MouseLeft();
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetStateRecursive(QTreeWidgetItem* root, Qt::CheckState state,
+                                   QList<QTreeWidgetItem*>& changed)
+{
+  for (int i = 0; i < root->childCount(); ++i)
+    {
+    QTreeWidgetItem* child = root->child(i);
+    if (child->checkState(0) != state)
+      {
+      child->setCheckState(0, state);
+      changed.append(child);
+      }
+    this->SetStateRecursive(child, state, changed);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetStateRecursive(QTreeWidgetItem* root, Qt::CheckState state,
+                                   QList<QTreeWidgetItem*>& changed, int type)
+{
+  for (int i = 0; i < root->childCount(); ++i)
+    {
+    QTreeWidgetItem* child = root->child(i);
+    int childType = child->data(0, IDR_ItemType).toInt();
+    if (childType == type)
+      {
+      if (child->checkState(0) != state)
+        {
+        child->setCheckState(0, state);
+        changed.append(child);
+        }
+      this->SetStateRecursive(child, state, changed);
+      continue;
+      }
+    this->SetStateRecursive(child, state, changed, type);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetEventStateRecursive(QTreeWidgetItem* root,
+                                        Qt::CheckState state,
+                                        QList<QTreeWidgetItem*>& changed,
+                                        int eventType)
+{
+  for (int i = 0; i < root->childCount(); ++i)
+    {
+    QTreeWidgetItem* child = root->child(i);
+    if (child->data(0, IDR_ItemType).toInt() == ItemType::Event)
+      {
+      int id = child->data(0, IDR_ItemId).toInt();
+      if (this->EventModel->GetEvent(id)->GetActiveClassifierType() == eventType)
+        {
+        if (child->checkState(0) != state)
+          {
+          child->setCheckState(0, state);
+          changed.append(child);
+          }
+        this->SetStateRecursive(child, state, changed);
+        continue;
+        }
+      }
+    this->SetEventStateRecursive(child, state, changed, eventType);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetActivityStateRecursive(QTreeWidgetItem* root,
+                                           Qt::CheckState state,
+                                           QList<QTreeWidgetItem*>& changed,
+                                           int activityType)
+{
+  for (int i = 0; i < root->childCount(); ++i)
+    {
+    QTreeWidgetItem* child = root->child(i);
+    if (child->data(0, IDR_ItemType).toInt() == ItemType::Activity)
+      {
+      int id = child->data(0, IDR_ItemId).toInt();
+      if (this->ActivityManager->GetActivity(id)->GetType() == activityType)
+        {
+        if (child->checkState(0) != state)
+          {
+          child->setCheckState(0, state);
+          changed.append(child);
+          }
+        this->SetStateRecursive(child, state, changed);
+        continue;
+        }
+      }
+    this->SetActivityStateRecursive(child, state, changed, activityType);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetAll(Qt::CheckState state)
+{
+  QList<QTreeWidgetItem*> changed;
+    {
+    SignalBlocker sb(this);
+    this->SetStateRecursive(this->invisibleRootItem(), state, changed);
+    }
+  emit this->ItemsChanged(changed);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetAll(Qt::CheckState state, int type)
+{
+  QList<QTreeWidgetItem*> changed;
+    {
+    SignalBlocker sb(this);
+    this->SetStateRecursive(this->invisibleRootItem(), state, changed, type);
+    }
+  emit this->ItemsChanged(changed);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetAllEvents(Qt::CheckState state, int eventType)
+{
+  QList<QTreeWidgetItem*> changed;
+    {
+    SignalBlocker sb(this);
+    this->SetEventStateRecursive(this->invisibleRootItem(), state, changed, eventType);
+    }
+  emit this->ItemsChanged(changed);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetAllActivities(Qt::CheckState state, int activityType)
+{
+  QList<QTreeWidgetItem*> changed;
+    {
+    SignalBlocker sb(this);
+    this->SetActivityStateRecursive(this->invisibleRootItem(), state, changed, activityType);
+    }
+  emit this->ItemsChanged(changed);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ShowAll()
+{
+  this->SetAll(Qt::Checked);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::HideAll()
+{
+  this->SetAll(Qt::Unchecked);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ShowAllTracks()
+{
+  this->SetAll(Qt::Checked, ItemType::Track);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::HideAllTracks()
+{
+  this->SetAll(Qt::Unchecked, ItemType::Track);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ShowEventType(int type)
+{
+  this->SetAllEvents(Qt::Checked, type);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ShowAllEvents()
+{
+  this->SetAll(Qt::Checked, ItemType::Event);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::HideAllEvents()
+{
+  this->SetAll(Qt::Unchecked, ItemType::Event);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ShowActivityType(int type)
+{
+  this->SetAllActivities(Qt::Checked, type);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ShowAllActivities()
+{
+  this->SetAll(Qt::Checked, ItemType::Activity);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::HideAllActivities()
+{
+  this->SetAll(Qt::Unchecked, ItemType::Activity);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ShowAllSceneElements()
+{
+  this->SetAll(Qt::Checked, ItemType::SceneElement);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::HideAllSceneElements()
+{
+  this->SetAll(Qt::Unchecked, ItemType::SceneElement);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ShowItems()
+{
+  // show all selected objects
+  QList<QTreeWidgetItem*> selected = this->selectedItems();
+  QList<QTreeWidgetItem*> changed;
+    {
+    SignalBlocker sb(this);
+    foreach (QTreeWidgetItem* item, selected)
+      {
+      if (item->checkState(0) != Qt::Checked)
+        {
+        item->setCheckState(0, Qt::Checked);
+        changed.append(item);
+        }
+      }
+    }
+  emit this->ItemsChanged(changed);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::HideItems()
+{
+  // hide all selected objects
+  QList<QTreeWidgetItem*> selected = this->selectedItems();
+  QList<QTreeWidgetItem*> changed;
+    {
+    SignalBlocker sb(this);
+    foreach (QTreeWidgetItem* item, selected)
+      {
+      if (item->checkState(0) != Qt::Unchecked)
+        {
+        item->setCheckState(0, Qt::Unchecked);
+        changed.append(item);
+        }
+      }
+    }
+  emit this->ItemsChanged(changed);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::HideUnselectedShowSelected(QTreeWidgetItem* root,
+                                            QList<QTreeWidgetItem*>& changed)
+{
+  // recursively hide all the unselected objects and show the selected ones
+  for (int i = 0; i < root->childCount(); ++i)
+    {
+    QTreeWidgetItem* child = root->child(i);
+    if (child->isSelected() != (child->checkState(0) == Qt::Checked))
+      {
+      child->setCheckState(0, child->isSelected() ? Qt::Checked : Qt::Unchecked);
+      changed.append(child);
+      }
+    this->HideUnselectedShowSelected(child, changed);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::HideItemsExcept()
+{
+  QList<QTreeWidgetItem*> changed;
+    {
+    SignalBlocker sb(this);
+    this->HideUnselectedShowSelected(this->invisibleRootItem(), changed);
+    }
+  emit this->ItemsChanged(changed);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::ToggleSticky()
+{
+  SignalBlocker sb(this);
+  bool sticky = static_cast<QAction*>(this->sender())->isChecked();
+
+  foreach (QTreeWidgetItem* item, this->selectedItems())
+    {
+    if (!item->parent())
+      {
+      item->setData(0, IDR_ItemSticky, sticky);
+      this->RefreshItem(item, true);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::OnItemChanged(QTreeWidgetItem* item)
+{
+  QList<QTreeWidgetItem*> items;
+  items.append(item);
+  // set child state as well unless holding Ctrl
+  if ((QApplication::keyboardModifiers() & Qt::ControlModifier) == 0)
+    {
+    SignalBlocker sb(this);
+    this->SetStateRecursive(item, item->checkState(0), items);
+    }
+  emit this->ItemsChanged(items, items.size() > 1);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SortBy(int sortType, Qt::SortOrder direction)
+{
+  this->SortType = sortType;
+  this->invisibleRootItem()->sortChildren(0, direction);
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetShowExcludedItems(bool show)
+{
+  if (show != this->ShowExcludedItems)
+    {
+    this->ShowExcludedItems = show;
+    this->Refresh();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpTreeView::SetShowUncheckedItems(bool show)
+{
+  if (show != this->ShowUncheckedItems)
+    {
+    this->ShowUncheckedItems = show;
+    this->Refresh();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const char* vpTreeView::GetSortTypeString(int sortType)
+{
+  switch (sortType)
+    {
+    case ST_Id:          return "Id";
+    case ST_Name:        return "Name";
+    case ST_Normalcy:    return "Normalcy";
+    case ST_Saliency:    return "Saliency";
+    case ST_Probability: return "Probability";
+    case ST_Length:      return "Length";
+    }
+  return 0;
+}
diff --git a/Applications/VpView/vpTreeView.h b/Applications/VpView/vpTreeView.h
new file mode 100644
index 00000000..f196b1b2
--- /dev/null
+++ b/Applications/VpView/vpTreeView.h
@@ -0,0 +1,203 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpTreeView_h
+#define __vpTreeView_h
+
+#include <QTreeWidget>
+
+#include "vtkVgTypeDefs.h"
+
+class vtkVgActivityManager;
+class vtkVgEvent;
+class vtkVgEventFilter;
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+class vtkVgTrack;
+class vtkVgTrackFilter;
+class vtkVgTrackModel;
+class vtkVgTrackTypeRegistry;
+
+class SignalBlocker;
+
+class vpTreeView : public QTreeWidget
+{
+  Q_OBJECT
+
+public:
+  typedef vgObjectTypeDefinitions                  ItemType;
+  typedef vgObjectTypeDefinitions::enumObjectTypes ItemTypeEnum;
+
+  enum SortType
+    {
+    ST_Id,
+    ST_Name,
+    ST_Normalcy,
+    ST_Saliency,
+    ST_Probability,
+    ST_Length
+    };
+
+public:
+  vpTreeView(QWidget* parent = 0);
+  virtual ~vpTreeView();
+
+  void Initialize(vtkVgActivityManager* activityManager,
+                  vtkVgEventModel* eventModel,
+                  vtkVgTrackModel* trackModel,
+                  vtkVgEventFilter* eventFilter,
+                  vtkVgTrackFilter* trackFilter,
+                  vtkVgEventTypeRegistry* eventTypes,
+                  vtkVgTrackTypeRegistry* trackTypes);
+
+  void AddAllActivities();
+  void AddAllEvents();
+  void AddAllTracks();
+  void AddAllSceneElements();
+
+  void AddAndSelectTrack(vtkVgTrack* track);
+  void AddAndSelectEvent(vtkVgEvent* event);
+  void AddAndSelectSceneElement(vtkVgTrack* track);
+
+  void Clear();
+  void Refresh();
+
+  bool SelectItem(int type, int id);
+  bool SelectChildItem(int parentType, int parentId, int index);
+
+  void GetItemInfo(QTreeWidgetItem* item,
+                   int& type, int& id,
+                   int& parentId, int& index);
+
+  void UpdateItemStatus(QTreeWidgetItem* item);
+
+  void UpdateActivityItem(QTreeWidgetItem* item);
+
+  // reimplemented from QWidget
+  virtual QSize sizeHint() const;
+  virtual void contextMenuEvent(QContextMenuEvent* event);
+  virtual void leaveEvent(QEvent* event);
+
+  int GetSortType() { return this->SortType; }
+
+  static const char* GetSortTypeString(int sortType);
+
+signals:
+  void ItemsChanged(const QList<QTreeWidgetItem*>& items,
+                    bool updateStatus = true);
+
+  void MouseLeft();
+  void ContextMenuOpened(QMenu& menu);
+
+  void FocusItemAlone();
+  void FocusItem();
+  void GoToStartFrame();
+  void GoToEndFrame();
+  void FollowTrack();
+
+  void ShowLinkedEvents();
+  void HideLinkedEvents();
+
+  void ShowLinkedActivities();
+  void HideLinkedActivities();
+
+  void AddEventsToGraphModel();
+  void AddTrackEventsToGraphModel();
+
+public slots:
+  void ShowAll();
+  void HideAll();
+
+  void SortBy(int type, Qt::SortOrder direction);
+
+  void ShowAllTracks();
+  void HideAllTracks();
+
+  void ShowEventType(int type);
+  void ShowAllEvents();
+  void HideAllEvents();
+
+  void ShowActivityType(int type);
+  void ShowAllActivities();
+  void HideAllActivities();
+
+  void ShowAllSceneElements();
+  void HideAllSceneElements();
+
+  void SetShowExcludedItems(bool show);
+  void SetShowUncheckedItems(bool show);
+
+private slots:
+  void OnItemChanged(QTreeWidgetItem* item);
+
+  void ShowItems();
+  void HideItems();
+  void HideItemsExcept();
+
+  void ToggleSticky();
+
+private:
+  enum ItemDataRole
+    {
+    IDR_ItemType = Qt::UserRole,
+    IDR_ItemId,
+    IDR_ItemIndex,
+    IDR_ItemSticky,
+    IDR_ItemSortValsStart // must be last
+    };
+
+  class TreeWidgetItem;
+  friend class SignalBlocker;
+
+  QTreeWidgetItem* CreateItem(ItemTypeEnum type, const char* name, int id);
+  QTreeWidgetItem* CreateItem(vtkVgTrack* track, bool isFseTrack = false);
+
+  void AddEventTracks(vtkVgEvent* event, QTreeWidgetItem* eventItem);
+
+  bool RefreshItem(QTreeWidgetItem* item, bool isTopLevel = false);
+
+  void RefreshRecursive(QTreeWidgetItem* root, int depth);
+
+  void SetStateRecursive(QTreeWidgetItem* root, Qt::CheckState state,
+                         QList<QTreeWidgetItem*>& changed);
+
+  void SetStateRecursive(QTreeWidgetItem* root, Qt::CheckState state,
+                         QList<QTreeWidgetItem*>& changed, int type);
+
+  void SetEventStateRecursive(QTreeWidgetItem* root, Qt::CheckState state,
+                              QList<QTreeWidgetItem*>& changed, int eventType);
+
+  void SetActivityStateRecursive(QTreeWidgetItem* root, Qt::CheckState state,
+                                 QList<QTreeWidgetItem*>& changed, int activityType);
+
+  QTreeWidgetItem* FindItem(QTreeWidgetItem* root, int type, int id);
+  QTreeWidgetItem* FindTopLevelItem(int type, int id);
+
+  void HideUnselectedShowSelected(QTreeWidgetItem* root,
+                                  QList<QTreeWidgetItem*>& changed);
+
+  void SetAll(Qt::CheckState state);
+  void SetAll(Qt::CheckState state, int type);
+  void SetAllEvents(Qt::CheckState state, int eventType);
+  void SetAllActivities(Qt::CheckState state, int activityType);
+
+private:
+  vtkVgActivityManager* ActivityManager;
+  vtkVgEventModel* EventModel;
+  vtkVgTrackModel* TrackModel;
+
+  vtkVgTrackFilter* TrackFilter;
+  vtkVgEventFilter* EventFilter;
+
+  vtkVgTrackTypeRegistry* TrackTypeRegistry;
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+
+  int SortType;
+  bool ShowExcludedItems;
+  bool ShowUncheckedItems;
+};
+
+#endif
diff --git a/Applications/VpView/vpUtils.cxx b/Applications/VpView/vpUtils.cxx
new file mode 100644
index 00000000..c6035352
--- /dev/null
+++ b/Applications/VpView/vpUtils.cxx
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpUtils.h"
+
+#include <vgUnixTime.h>
+
+#include <vtkVgTimeStamp.h>
+
+#include <QString>
+
+namespace vpUtils
+{
+
+//-----------------------------------------------------------------------------
+QString GetTimeAndFrameNumberString(const vtkVgTimeStamp& ts, int frameOffset)
+{
+  QString fmt("%1 (%2)");
+  return fmt.arg(vgUnixTime(ts.GetTime()).timeString())
+            .arg(ts.GetFrameNumber() + frameOffset);
+}
+
+} // end vpUtils
diff --git a/Applications/VpView/vpUtils.h b/Applications/VpView/vpUtils.h
new file mode 100644
index 00000000..1112d395
--- /dev/null
+++ b/Applications/VpView/vpUtils.h
@@ -0,0 +1,19 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpUtils_h
+#define __vpUtils_h
+
+class QString;
+
+class vtkVgTimeStamp;
+
+namespace vpUtils
+{
+QString GetTimeAndFrameNumberString(const vtkVgTimeStamp& ts, int frameOffset);
+};
+
+#endif // __vpUtils_h
diff --git a/Applications/VpView/vpVersion.cmake b/Applications/VpView/vpVersion.cmake
new file mode 100644
index 00000000..13228e18
--- /dev/null
+++ b/Applications/VpView/vpVersion.cmake
@@ -0,0 +1,8 @@
+SET(VPVIEW_VERSION_MAJOR ${VISGUI_VERSION_MAJOR})
+SET(VPVIEW_VERSION_MINOR ${VISGUI_VERSION_MINOR})
+SET(VPVIEW_VERSION_PATCH ${VISGUI_VERSION_PATCH})
+SET(VPVIEW_VERSION_BUILD "master")
+
+SET(VPVIEW_VERSION_STR "${VPVIEW_VERSION_MAJOR}.${VPVIEW_VERSION_MINOR}.${VPVIEW_VERSION_PATCH}-${VPVIEW_VERSION_BUILD}")
+
+SET(VPVIEW_COPY_YEAR ${VISGUI_COPY_YEAR})
diff --git a/Applications/VpView/vpVersion.h.in b/Applications/VpView/vpVersion.h.in
new file mode 100644
index 00000000..b7f223a3
--- /dev/null
+++ b/Applications/VpView/vpVersion.h.in
@@ -0,0 +1,14 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVersion_h
+#define __vpVersion_h
+
+#define VPVIEW_VERSION_STR "@VPVIEW_VERSION_STR@"
+
+#define VPVIEW_COPY_YEAR @VPVIEW_COPY_YEAR@
+
+#endif // __vpVersion_h
diff --git a/Applications/VpView/vpVideoAnimation.cxx b/Applications/VpView/vpVideoAnimation.cxx
new file mode 100644
index 00000000..883b4f02
--- /dev/null
+++ b/Applications/VpView/vpVideoAnimation.cxx
@@ -0,0 +1,257 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVideoAnimation.h"
+
+#include "vpViewCore.h"
+
+#include <qtScopedValueChange.h>
+
+#include <vgCheckArg.h>
+
+#include <QTimerEvent>
+
+//-----------------------------------------------------------------------------
+vpVideoAnimation::vpVideoAnimation(vpViewCore* viewCore) :
+  qtAbstractAnimation(viewCore),
+  ViewCore(viewCore),
+  TimeDuration(0.0),
+  TimeOffset(0.0),
+  FrameInterval(0.5),
+  BlockUpdates(false)
+{
+  connect(this, SIGNAL(stateChanged(QAbstractAnimation::State,
+                                    QAbstractAnimation::State)),
+          this, SLOT(updateState(QAbstractAnimation::State,
+                                 QAbstractAnimation::State)));
+
+  connect(this->ViewCore, SIGNAL(timeChanged(double)),
+          this, SLOT(updateTimeFromCore(double)));
+
+  this->setPlaybackMode(PM_Sequential);
+}
+
+//-----------------------------------------------------------------------------
+vpVideoAnimation::~vpVideoAnimation()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::updateTimeRange(double start, double end)
+{
+  // Adjust current time for new start time, if it has changed
+  if (start != this->TimeOffset)
+    {
+    double newTime = this->currentTime() + this->TimeOffset - start;
+    this->setCurrentTime(qMax(0.0, newTime));
+    this->TimeOffset = start;
+    }
+
+  this->TimeDuration = end - start;
+}
+
+//-----------------------------------------------------------------------------
+double vpVideoAnimation::duration() const
+{
+  return this->TimeDuration;
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::seek(const vtkVgTimeStamp& ts, vg::SeekMode direction)
+{
+  vgVideoSeekRequest request;
+  request.TimeStamp = ts;
+  request.Direction = direction;
+  this->seek(request);
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::seek(vgVideoSeekRequest request)
+{
+  // Fix up request direction (use Exact if not specified)
+  if (request.Direction < 0)
+    {
+    request.Direction = vg::SeekExact;
+    }
+
+  if (!request.TimeStamp.HasTime())
+    {
+    // If we don't have a valid time stamp, we cannot do anything with this
+    // request...
+    return;
+    }
+
+  if (this->state() == QAbstractAnimation::Stopped && this->duration() > 0.0)
+    {
+    qtScopedValueChange<bool> bu(this->BlockUpdates, true);
+    this->start();
+    this->pause();
+    }
+
+  // Bound request time to within the animation's range
+  const double time = request.TimeStamp.GetTime();
+  const double maxTime = (this->TimeDuration + this->TimeOffset) * 1e6;
+  request.TimeStamp.SetTime(qBound(this->TimeOffset * 1e6, time, maxTime));
+  this->postUpdate(request);
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::setFrameRange(
+  const vtkVgTimeStamp& first, const vtkVgTimeStamp& last)
+{
+  this->updateTimeRange(first.GetTime() * 1e-6, last.GetTime() * 1e-6);
+}
+
+//-----------------------------------------------------------------------------
+bool vpVideoAnimation::setState(QAbstractAnimation::State newState)
+{
+  if (newState != QAbstractAnimation::Stopped && this->duration() <= 0.0)
+    {
+    // We cannot play or pause an animation with no duration...
+    return false;
+    }
+
+  switch (newState)
+    {
+    case QAbstractAnimation::Running:
+      if (this->sequentialPlayback())
+        {
+        // In sequential mode, we don't ever really want the animation to run
+        // since we will be updating the position manually .
+        if (this->state() == QAbstractAnimation::Stopped)
+          {
+          this->start();
+          this->pause();
+          }
+        this->UpdateTimer.start(16, this);
+        }
+      else
+        {
+        if (this->state() == QAbstractAnimation::Paused)
+          {
+          this->resume();
+          }
+        else
+          {
+          this->start();
+          }
+        }
+      break;
+    case QAbstractAnimation::Paused:
+      if (this->state() == QAbstractAnimation::Stopped)
+        {
+        // Must start animation before it can be paused...
+        this->start();
+        }
+      this->pause();
+      if (this->sequentialPlayback())
+        {
+        this->UpdateTimer.stop();
+        }
+      break;
+    default:
+      this->stop();
+      break;
+    }
+
+  // Check if we succeeded
+  return this->state() == newState;
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::setPlaybackMode(PlaybackMode mode)
+{
+  this->Mode = mode;
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::updateCurrentTime(double time)
+{
+  CHECK_ARG(!this->BlockUpdates);
+
+  if (this->sequentialPlayback())
+    {
+    this->FrameTimer.start();
+    }
+
+  vgVideoSeekRequest request;
+  request.TimeStamp = vtkVgTimeStamp((time + this->TimeOffset) * 1e6);
+  request.Direction = vg::SeekNearest;
+  this->postUpdate(request);
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::postUpdate(vgVideoSeekRequest request)
+{
+  CHECK_ARG(!this->BlockUpdates);
+
+  // Post update
+  if (!this->NextRequest.TimeStamp.IsValid())
+    {
+    QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
+    }
+
+  // Set next seek
+  this->NextRequest = request;
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::update()
+{
+  CHECK_ARG(this->NextRequest.TimeStamp.IsValid());
+
+  this->ViewCore->seekToFrame(this->NextRequest.TimeStamp,
+                              this->NextRequest.Direction);
+
+  // Reset the pending update
+  this->NextRequest = vgVideoSeekRequest();
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::timerEvent(QTimerEvent* event)
+{
+  if (event->timerId() == this->UpdateTimer.timerId())
+    {
+    if (!this->FrameTimer.isValid() ||
+        this->FrameTimer.hasExpired(this->FrameInterval * 1000 /
+                                    fabs(this->rate())))
+      {
+      if (this->rate() < 0.0)
+        {
+        this->setCurrentTime(this->currentTime() - this->FrameInterval);
+        }
+      else
+        {
+        this->setCurrentTime(this->currentTime() + this->FrameInterval);
+        }
+      }
+    }
+  else
+    {
+    qtAbstractAnimation::timerEvent(event);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::updateState(QAbstractAnimation::State newState,
+                                   QAbstractAnimation::State oldState)
+{
+  Q_UNUSED(oldState);
+  if (this->sequentialPlayback())
+    {
+    if (newState != QAbstractAnimation::Running)
+      {
+      this->UpdateTimer.stop();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpVideoAnimation::updateTimeFromCore(double microseconds)
+{
+  qtScopedValueChange<bool> bu(this->BlockUpdates, true);
+  this->setCurrentTime((microseconds * 1e-6) - this->TimeOffset);
+}
diff --git a/Applications/VpView/vpVideoAnimation.h b/Applications/VpView/vpVideoAnimation.h
new file mode 100644
index 00000000..77c6d628
--- /dev/null
+++ b/Applications/VpView/vpVideoAnimation.h
@@ -0,0 +1,81 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVideoAnimation_h
+#define __vpVideoAnimation_h
+
+#include <QBasicTimer>
+#include <QElapsedTimer>
+
+#include <qtAbstractAnimation.h>
+
+#include <vgVideoSourceRequestor.h>
+
+class vpViewCore;
+class vtkVgTimeStamp;
+
+class vpVideoAnimation : public qtAbstractAnimation
+{
+  Q_OBJECT
+
+public:
+  enum PlaybackMode
+    {
+    PM_Sequential,
+    PM_RealTime
+    };
+
+public:
+  explicit vpVideoAnimation(vpViewCore* viewCore);
+  virtual ~vpVideoAnimation();
+
+  void setFrameRange(const vtkVgTimeStamp& first, const vtkVgTimeStamp& last);
+  void seek(const vtkVgTimeStamp& ts, vg::SeekMode direction = vg::SeekNearest);
+
+  bool setState(QAbstractAnimation::State);
+
+  void setPlaybackMode(PlaybackMode mode);
+
+  void setFrameInterval(double seconds)
+    { this->FrameInterval = seconds; }
+
+  bool sequentialPlayback() { return this->Mode == PM_Sequential; }
+  bool realTimePlayback() { return this->Mode == PM_RealTime; }
+
+protected slots:
+  void update();
+
+  void updateState(QAbstractAnimation::State newState,
+                   QAbstractAnimation::State oldState);
+
+  void updateTimeFromCore(double microseconds);
+
+protected:
+  virtual void timerEvent(QTimerEvent* event);
+
+private:
+  Q_DISABLE_COPY(vpVideoAnimation)
+
+  void seek(vgVideoSeekRequest);
+
+  virtual double duration() const;
+  virtual void updateCurrentTime(double time);
+
+  void updateTimeRange(double start, double end);
+  void postUpdate(vgVideoSeekRequest);
+
+  vpViewCore* ViewCore;
+
+  double TimeDuration, TimeOffset, FrameInterval;
+  vgVideoSeekRequest NextRequest;
+  bool BlockUpdates;
+
+  PlaybackMode Mode;
+  QBasicTimer UpdateTimer;
+  QElapsedTimer FrameTimer;
+};
+
+#endif
diff --git a/Applications/VpView/vpVidtkActivityIO.cxx b/Applications/VpView/vpVidtkActivityIO.cxx
new file mode 100644
index 00000000..98c10186
--- /dev/null
+++ b/Applications/VpView/vpVidtkActivityIO.cxx
@@ -0,0 +1,104 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVidtkActivityIO.h"
+
+#include "vpActivityConfig.h"
+#include "vpVidtkReader.h"
+
+#include <vtkVgActivity.h>
+#include <vtkVgActivityManager.h>
+#include <vtkVgEventModel.h>
+
+#include <vgActivityType.h>
+
+#include <assert.h>
+
+//-----------------------------------------------------------------------------
+vpVidtkActivityIO::vpVidtkActivityIO(vpVidtkReader& reader,
+                                     vtkVgActivityManager* activityManager,
+                                     vpActivityConfig* activityConfig) :
+  vpActivityIO(activityManager, activityConfig), Reader(reader)
+{}
+
+//-----------------------------------------------------------------------------
+vpVidtkActivityIO::~vpVidtkActivityIO()
+{}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkActivityIO::ReadActivities()
+{
+  if (this->Reader.GetImageHeight() == 0)
+    {
+    return false;
+    }
+
+  if (!this->Reader.ReadActivities(this->Activities))
+    {
+    return false;
+    }
+
+  vcl_vector<vidtk::activity_sptr>::iterator activityIter = this->Activities.begin();
+  for (; activityIter != this->Activities.end(); activityIter++)
+    {
+    vtkSmartPointer<vtkVgActivity> activity = vtkSmartPointer<vtkVgActivity>::New();
+
+    if (this->SetupActivity(*activityIter, activity))
+      {
+      this->ActivityManager->AddActivity(activity);
+      this->ActivityMap[activity] = (*activityIter);
+      }
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkActivityIO::SetupActivity(
+  vidtk::activity_sptr& vidtkActivity, vtkVgActivity* vgActivity)
+{
+  vgActivity->SetId(static_cast<int>(vidtkActivity->get_id()));
+
+  int type = this->ActivityConfig->GetId(vidtkActivity->my_name());
+  this->ActivityConfig->MarkTypeUsed(type);
+  const vgActivityType& at = this->ActivityConfig->GetActivityType(type);
+
+  vgActivity->SetType(type);
+  vgActivity->SetIconIndex(at.GetIconIndex());
+  vgActivity->SetName(at.GetName());
+  vgActivity->SetBoundsMode(at.GetDisplayMode() == vgActivityType::DM_Bounds);
+
+  // spatial bounds
+  double imageYExtent = this->Reader.GetImageHeight() - 1.0;
+  const vgl_box_2d<double>& vglBBox = vidtkActivity->get_spatial_bounds();
+  vgActivity->SetSpatialBounds(vglBBox.min_x(), vglBBox.max_x(),
+                               imageYExtent - vglBBox.max_y(),
+                               imageYExtent - vglBBox.min_y());
+
+  vtkVgEventModel* eventModel = this->ActivityManager->GetEventModel();
+  assert(eventModel);
+
+  const vcl_vector<vidtk::event_sptr>& events = vidtkActivity->get_supporting_events();
+  vcl_vector<vidtk::event_sptr>::const_iterator eventIter = events.begin();
+  for (; eventIter != events.end(); eventIter++)
+    {
+    vtkVgEvent* theEvent = eventModel->GetEvent((*eventIter)->get_id());
+    if (!theEvent)
+      {
+      std::cerr << "ERROR: Unable to find event using event id "
+                << (*eventIter)->get_id() << std::endl;
+      std::cerr << "ERROR: Failed to setup activity " << vgActivity->GetId()
+                << std::endl;
+      return false;
+      }
+    vgActivity->AddEvent(theEvent);
+    }
+
+  vgActivity->SetSaliency(vidtkActivity->get_saliency());
+  vgActivity->SetProbability(vidtkActivity->get_probability());
+
+  return true;
+}
diff --git a/Applications/VpView/vpVidtkActivityIO.h b/Applications/VpView/vpVidtkActivityIO.h
new file mode 100644
index 00000000..191fc133
--- /dev/null
+++ b/Applications/VpView/vpVidtkActivityIO.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkActivityIO_h
+#define __vpVidtkActivityIO_h
+
+#include "vpActivityIO.h"
+
+#include <activity_detectors/activity.h>
+
+class vpVidtkReader;
+class vtkVgActivity;
+
+class vpVidtkActivityIO : public vpActivityIO
+{
+public:
+  vpVidtkActivityIO(vpVidtkReader& reader,
+                    vtkVgActivityManager* activityManager,
+                    vpActivityConfig* activityConfig);
+
+  virtual ~vpVidtkActivityIO();
+
+  virtual bool ReadActivities();
+
+private:
+  bool SetupActivity(vidtk::activity_sptr& vidtkActivity,
+                     vtkVgActivity* vgActivity);
+
+private:
+  vpVidtkReader& Reader;
+  vcl_vector<vidtk::activity_sptr> Activities;
+  vcl_map<vtkVgActivity*, vidtk::activity_sptr> ActivityMap;
+};
+
+#endif // __vpVidtkActivityIO_h
diff --git a/Applications/VpView/vpVidtkEventIO.cxx b/Applications/VpView/vpVidtkEventIO.cxx
new file mode 100644
index 00000000..1d218958
--- /dev/null
+++ b/Applications/VpView/vpVidtkEventIO.cxx
@@ -0,0 +1,586 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVidtkEventIO.h"
+
+#include "vpVidtkReader.h"
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTypeDefs.h>
+
+#include <event_detectors/event_writer_kwe.h>
+#include <event_detectors/human_event_includes.h>
+#include <event_detectors/other_event_includes.h>
+#include <event_detectors/vehicle_event_includes.h>
+
+#include <assert.h>
+
+static vidtk::event_sptr CreateVidtkEvent(int type)
+{
+#define VEHICLE_EVENT_MACRO(name) \
+  if (type == vidtk::name::type())  \
+    {                               \
+    return new vidtk::name;         \
+    }
+#define OTHER_EVENT_MACRO(name) VEHICLE_EVENT_MACRO(name)
+#define HUMAN_EVENT_MACRO(name) VEHICLE_EVENT_MACRO(name)
+#include <event_detectors/vehicle_events.macro>
+#include <event_detectors/other_events.macro>
+#include <event_detectors/human_events.macro>
+#undef VEHICLE_EVENT_MACRO
+#undef HUMAN_EVENT_MACRO
+#undef OTHER_EVENT_MACRO
+
+  std::cerr << "Unknown event type: " << type << std::endl;
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vpVidtkEventIO::vpVidtkEventIO(vpVidtkReader& reader,
+                               vcl_map<vtkVgEvent*, vidtk::event_sptr>& eventMap,
+                               vcl_map<unsigned int, vtkIdType>&
+                                 sourceEventIdToModelIdMap,
+                               const vcl_map<vtkVgTrack*, vidtk::track_sptr>&
+                                 trackMap,
+                               const vcl_map<unsigned int, vtkIdType>&
+                                 sourceTrackIdToModelIdMap,
+                               vtkVgEventModel* eventModel,
+                               vtkVgEventTypeRegistry* eventTypes) :
+  vpEventIO(eventModel, eventTypes), Reader(reader),
+  EventMap(eventMap), SourceEventIdToModelIdMap(sourceEventIdToModelIdMap),
+  TrackMap(trackMap), SourceTrackIdToModelIdMap(sourceTrackIdToModelIdMap)
+{}
+
+//-----------------------------------------------------------------------------
+vpVidtkEventIO::~vpVidtkEventIO()
+{}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkEventIO::ReadEvents()
+{
+  return this->ReadEvents(0, 0.0f, 0.0f);
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkEventIO::ImportEvents(vtkIdType idsOffset,
+                                  float offsetX, float offsetY)
+{
+  return this->ReadEvents(idsOffset, offsetX, offsetY);
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkEventIO::ReadEvents(vtkIdType idsOffset,
+                                float offsetX, float offsetY)
+{
+  size_t prevEventsSize = this->Events.size();
+  if (!this->Reader.ReadEvents(this->Events))
+    {
+    return false;
+    }
+
+  // Loop over all the newly added events.
+  for (size_t i = prevEventsSize, size = this->Events.size(); i < size; ++i)
+    {
+    const vidtk::event_sptr& vEvent = this->Events[i];
+
+    // Determine a unique id for the event.
+    vtkIdType desiredId = idsOffset + vEvent->get_id();
+    if (this->EventModel->GetEvent(desiredId))
+      {
+      // There is already an event in the model with the desired id.
+      vtkIdType id = desiredId;
+      desiredId = this->EventModel->GetNextAvailableId();
+      std::cout << "Event id " << id
+                << " is not unique: changing id of imported event to "
+                << desiredId << '\n';
+      }
+
+    // Keep track of any ids that were changed.
+    if (desiredId != static_cast<vtkIdType>(vEvent->get_id()))
+      {
+      this->SourceEventIdToModelIdMap[vEvent->get_id()] = desiredId;
+      }
+
+    int mode = -1;
+
+    // Get the display mode for this type.
+    if (this->EventTypes)
+      {
+      int index = this->EventTypes->GetTypeIndex(vEvent->my_type());
+      if (index >= 0)
+        {
+        this->EventTypes->MarkTypeUsed(index);
+        mode = this->EventTypes->GetType(index).GetDisplayMode();
+        }
+      }
+
+    if (mode == vgEventType::DM_Regions ||
+        mode == vgEventType::DM_TracksAndRegions)
+      {
+      // Region or combined display mode.
+      vtkSmartPointer<vtkVgEventBase> eventBase =
+        vtkSmartPointer<vtkVgEventBase>::New();
+      eventBase->SetId(desiredId);
+      if (this->SetupNodeEvent(vEvent, eventBase, offsetX, offsetY))
+        {
+        vtkVgEvent* vgEvent = this->EventModel->AddEvent(eventBase);
+        this->EventMap[vgEvent] = vEvent;
+
+        if (mode == vgEventType::DM_TracksAndRegions)
+          {
+          vgEvent->SetDisplayFlags(vtkVgEventBase::DF_TrackAndRegionEvent);
+          }
+        else
+          {
+          vgEvent->SetDisplayFlags(vtkVgEventBase::DF_RegionEvent);
+          }
+        }
+      }
+    else
+      {
+      // Track display mode.
+      vtkSmartPointer<vtkVgEvent> vgEvent = vtkSmartPointer<vtkVgEvent>::New();
+      vgEvent->SetId(desiredId);
+      if (this->SetupEvent(vEvent, vgEvent))
+        {
+        vgEvent->SetDisplayFlags(vtkVgEventBase::DF_TrackEvent);
+        this->EventModel->AddEvent(vgEvent);
+        this->EventMap[vgEvent] = vEvent;
+        }
+      }
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkEventIO::WriteEvents(const char* filename) const
+{
+  vidtk::event_writer_kwe writer;
+  if (!writer.open(filename))
+    {
+    return false;
+    }
+
+  // open supplementary log file
+  std::string logFilename(filename);
+  logFilename += ".log";
+  std::ofstream logfile(logFilename.c_str());
+  if (!logfile)
+    {
+    return false;
+    }
+
+  vcl_vector<vidtk::track_sptr> empty;
+  vcl_vector<vidtk::timestamp> trackBeginTimes(2);
+  vcl_vector<vidtk::timestamp> trackEndTimes(2);
+
+  this->EventModel->InitEventTraversal();
+  while (vtkVgEvent* event = this->EventModel->GetNextEvent().GetEvent())
+    {
+    vidtk::event_sptr e = this->EventMap[event];
+    if (!e)
+      {
+      // If the event was not found in the map, it must have been added at
+      // runtime. Create the vidtk event now.
+      event->InitClassifierTraversal();
+      e = CreateVidtkEvent(event->GetClassifierType());
+      if (!e)
+        {
+        continue;
+        }
+      }
+    e->set_id(event->GetId());
+
+    // write status changes to log file
+    switch (event->GetStatus())
+      {
+      case vgObjectStatus::None:
+        if (event->IsDirty())
+          {
+          logfile << event->GetId();
+          logfile << (event->IsUserCreated() ? "\tcreated\n" : "\tmodified\n");
+          }
+        break;
+
+      case vgObjectStatus::Adjudicated:
+        logfile << event->GetId() << '\t';
+        if (event->IsDirty())
+          {
+          logfile << (event->IsUserCreated() ? "created, " : "modified, ");
+          }
+        logfile << "adjudicated\n";
+        break;
+
+      case vgObjectStatus::Excluded:
+        logfile << event->GetId() << "\texcluded\n";
+        continue; // do not write out excluded events
+      }
+
+    // unmodified events can be written out directly
+    if (!event->IsDirty())
+      {
+      if (!writer.write(e))
+        {
+        return false;
+        }
+      // next event
+      continue;
+      }
+
+    vgl_box_2d<unsigned> eventBounds;
+
+    vidtk::timestamp trackBegin, trackEnd;
+
+    // clear existing tracks
+    e->set_parent_tracks(empty);
+
+    trackBeginTimes.clear();
+    trackEndTimes.clear();
+
+    // iterate over the tracks for this event
+    int numTracks = event->GetNumberOfTracks();
+    for (int i = 0; i < numTracks; ++i)
+      {
+      vtkVgTrack* track;
+      vtkVgTimeStamp vgStartFrame, vgEndFrame;
+
+      // get the track info
+      event->GetTrack(i, track, vgStartFrame, vgEndFrame);
+
+      vidtk::timestamp startFrame(vgStartFrame.GetTime(),
+                                  vgStartFrame.GetFrameNumber());
+      vidtk::timestamp endFrame(vgEndFrame.GetTime(),
+                                vgEndFrame.GetFrameNumber());
+
+      vidtk::track_sptr t;
+      vcl_map<vtkVgTrack*, vidtk::track_sptr>::const_iterator itr =
+        this->TrackMap.find(track);
+      if (itr != this->TrackMap.end())
+        {
+        t = itr->second;
+        assert(t); // null pointers should never be inserted in the track map
+        }
+      else
+        {
+        // track was created after read
+        t = new vidtk::track;
+        t->set_id(track->GetId());
+        }
+
+      // add parent track pointer
+      e->add_parent_track(t);
+
+      // update the spatial bounds of the event
+      bool foundStart = false;
+      const vcl_vector<vidtk::track_state_sptr>& history = t->history();
+      for (unsigned j = 0; j < history.size(); ++j)
+        {
+        // seek to the initial frame of the event track in the history
+        if (!foundStart)
+          {
+          if (history[j]->time_ == startFrame)
+            {
+            foundStart = true;
+            }
+          else
+            {
+            continue;
+            }
+          }
+
+        // enlarge the bounding box
+        eventBounds.add(history[j]->amhi_bbox_);
+
+        // done?
+        if (history[j]->time_ == endFrame)
+          {
+          break;
+          }
+        }
+
+      // write out the track start and end times for multitrack events
+      if (numTracks > 1)
+        {
+        trackBeginTimes.push_back(startFrame);
+        trackEndTimes.push_back(endFrame);
+        }
+      }
+
+    vtkVgTimeStamp vgStartFrame = event->GetStartFrame();
+    vtkVgTimeStamp vgEndFrame = event->GetEndFrame();
+    vidtk::timestamp eb(vgStartFrame.GetTime(), vgStartFrame.GetFrameNumber());
+    vidtk::timestamp ee(vgEndFrame.GetTime(), vgEndFrame.GetFrameNumber());
+
+    e->set_event_begin(eb);
+    e->set_event_end(ee);
+    e->set_probability(event->GetActiveClassifierNormalcy());
+
+    e->set_spatial_bounds(vgl_box_2d<double>(eventBounds.min_x(),
+                                             eventBounds.max_x(),
+                                             eventBounds.min_y(),
+                                             eventBounds.max_y()));
+
+    e->set_tracks_begin(trackBeginTimes);
+    e->set_tracks_end(trackEndTimes);
+
+    // write out the event
+    if (!writer.write(e))
+      {
+      return false;
+      }
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkEventIO::SetupEvent(const vidtk::event_sptr vidtkEvent,
+                                vtkVgEvent* vgEvent)
+{
+  // Currently using probability as normalcy but this will change in future.
+  // TODO: Change this in near future.
+  vgEvent->AddClassifier(vidtkEvent->my_type(), 0.0, vidtkEvent->get_probability());
+
+  // NOTE:  There is a bug (in the "computer vision" code) specifying the event
+  // frame span versus the frame span of the track:  the event MIGHT have a
+  // start or end frame outside the track frame range, which we don't want!
+  // Thus, we don't set the evnt start/end until we find out what the start/end
+  // for our single track is (at this moment we only support 1 track, even
+  // though it looks like we support more).
+  vidtk::timestamp  eventBeginTimeStamp = vidtkEvent->get_event_begin();
+  vidtk::timestamp  eventEndTimeStamp   = vidtkEvent->get_event_end();
+
+  // for now we compute, since there can be a track/event start/end frame issue
+  // as read from the file
+  vtkVgTimeStamp eventBeginFrame(eventBeginTimeStamp.time(),
+                                 eventBeginTimeStamp.frame_number());
+  vtkVgTimeStamp eventEndFrame(eventEndTimeStamp.time(),
+                               eventEndTimeStamp.frame_number());
+  vtkVgTimeStamp eventCalculatedBeginFrame(true); // initialize to MaxTime
+  vtkVgTimeStamp eventCalculatedEndFrame(false); // initialize to MinTime
+
+  // Tracks associated with this event.
+  unsigned int numOfTracks = vidtkEvent->get_num_parent_tracks();
+
+  vcl_vector<vidtk::timestamp> trackBeginTimeStamp = vidtkEvent->get_tracks_begin();
+  vcl_vector<vidtk::timestamp> trackEndTimeStamp   = vidtkEvent->get_tracks_end();
+
+  // Check the assumption here.
+  assert(trackBeginTimeStamp.size() == trackEndTimeStamp.size());
+
+  vtkVgTrackModel* trackModel = this->EventModel->GetTrackModel();
+  assert(trackModel);
+
+  vcl_vector<unsigned int> parentTracksIds;
+  vcl_vector<vidtk::track_sptr> parentTracks;
+  parentTracksIds.reserve(numOfTracks);
+  parentTracks.reserve(numOfTracks);
+
+  for (unsigned int trackIndex = 0; trackIndex < numOfTracks; trackIndex++)
+    {
+    unsigned int srcTrackId = vidtkEvent->get_parent_track_id(trackIndex);
+
+    // Check if the id of the track in the model is different than the source
+    // id, and if so, use that one when looking up the track in the model.
+    vcl_map<unsigned int, vtkIdType>::const_iterator itr =
+      this->SourceTrackIdToModelIdMap.find(srcTrackId);
+
+    vtkIdType trackId;
+    if (itr != this->SourceTrackIdToModelIdMap.end())
+      {
+      trackId = itr->second;
+      }
+    else
+      {
+      trackId = static_cast<vtkIdType>(srcTrackId);
+      }
+
+    vtkVgTrack* track = trackModel->GetTrack(trackId);
+    if (!track)
+      {
+      // should print out warning, but don't want during debugging!
+      return false;
+      }
+
+    vidtk::track_sptr parentTrack = this->TrackMap.find(track)->second;
+    parentTracks.push_back(parentTrack);
+    parentTracksIds.push_back(parentTrack->id());
+
+    vtkVgTimeStamp trackBeginFrame;
+    vtkVgTimeStamp trackEndFrame;
+
+    // We are assuming that timestamps are in sequence and all the empty ones
+    // will be filled up with the event frame index and time.
+    if (trackIndex < trackBeginTimeStamp.size() && numOfTracks > 1)
+      {
+      trackBeginFrame.SetTime(trackBeginTimeStamp[trackIndex].time());
+      trackBeginFrame.SetFrameNumber(trackBeginTimeStamp[trackIndex].frame_number());
+      trackEndFrame.SetTime(trackEndTimeStamp[trackIndex].time());
+      trackEndFrame.SetFrameNumber(trackEndTimeStamp[trackIndex].frame_number());
+      }
+    else
+      {
+      trackBeginFrame = eventBeginFrame;
+      trackEndFrame   = eventEndFrame;
+      }
+
+    if (trackBeginFrame < track->GetStartFrame())
+      {
+      trackBeginFrame = track->GetStartFrame();
+      }
+    else if (track->GetEndFrame() < trackBeginFrame)
+      {
+      trackBeginFrame = track->GetEndFrame();
+      }
+    if (track->GetEndFrame() < trackEndFrame)
+      {
+      trackEndFrame = track->GetEndFrame();
+      }
+    else if (trackEndFrame < trackBeginFrame)
+      {
+      trackEndFrame = trackBeginFrame;
+      }
+
+    if (trackBeginFrame < eventCalculatedBeginFrame)
+      {
+      eventCalculatedBeginFrame = trackBeginFrame;
+      }
+    if (eventCalculatedEndFrame < trackEndFrame)
+      {
+      eventCalculatedEndFrame = trackEndFrame;
+      }
+
+    vgEvent->AddTrack(track, trackBeginFrame, trackEndFrame);
+    }
+
+  // add the parent track pointers (with corrected ids) to the event
+  vidtkEvent->set_parent_tracks_ids(parentTracksIds);
+  for (unsigned int i = 0; i < numOfTracks; ++i)
+    {
+    vidtkEvent->set_track(parentTracks[i]);
+    }
+
+  // Currently dealing with only one track.
+  vgEvent->SetStartFrame(eventCalculatedBeginFrame);
+  vgEvent->SetEndFrame(eventCalculatedEndFrame);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkEventIO::SetupNodeEvent(const vidtk::event_sptr vidtkEvent,
+                                    vtkVgEventBase* vgEvent,
+                                    float offsetX, float offsetY)
+{
+  if (this->Reader.GetImageHeight() == 0)
+    {
+    return false;
+    }
+
+  double imageYExtent = this->Reader.GetImageHeight() - 1.0;
+
+  const vgl_box_2d<double>& bbox = vidtkEvent->get_spatial_bounds();
+  double region[8] = { bbox.min_x() + offsetX, imageYExtent - bbox.min_y() + offsetY,
+                       bbox.min_x() + offsetX, imageYExtent - bbox.max_y() + offsetY,
+                       bbox.max_x() + offsetX, imageYExtent - bbox.max_y() + offsetY,
+                       bbox.max_x() + offsetX, imageYExtent - bbox.min_y() + offsetY
+                     };
+
+  vidtk::timestamp eventBeginTimeStamp = vidtkEvent->get_event_begin();
+  vidtk::timestamp eventEndTimeStamp   = vidtkEvent->get_event_end();
+
+  unsigned beginFrame = eventBeginTimeStamp.frame_number();
+  unsigned endFrame = eventEndTimeStamp.frame_number();
+  double beginTime = eventBeginTimeStamp.time();
+  double endTime = eventEndTimeStamp.time();
+
+  vtkVgTimeStamp eventBeginFrame(beginTime, beginFrame);
+  vtkVgTimeStamp eventEndFrame(endTime, endFrame);
+
+  // Add duplicate regions for each valid frame. This is wasteful of memory,
+  // but right now the event representation expects per-frame regions.
+  for (unsigned i = beginFrame; i <= endFrame; ++i)
+    {
+    vtkVgTimeStamp frame;
+    frame.SetFrameNumber(i);
+    vgEvent->AddRegion(frame, 4, region);
+    }
+
+  // Add tracks.
+  unsigned numOfTracks = vidtkEvent->get_num_parent_tracks();
+
+  vcl_vector<vidtk::timestamp> trackBeginTimeStamp = vidtkEvent->get_tracks_begin();
+  vcl_vector<vidtk::timestamp> trackEndTimeStamp   = vidtkEvent->get_tracks_end();
+
+  // Check the assumption here.
+  assert(trackBeginTimeStamp.size() == trackEndTimeStamp.size());
+
+  vtkVgTrackModel* trackModel = this->EventModel->GetTrackModel();
+  assert(trackModel);
+
+  unsigned int trackIndex;
+  for (trackIndex = 0; trackIndex < numOfTracks; trackIndex++)
+    {
+    int trackId = static_cast<int>(vidtkEvent->get_parent_track_id(trackIndex));
+
+    vtkVgTrack* track = trackModel->GetTrack(trackId);
+    if (!track)
+      {
+      // should print out warning, but don't want during debugging!
+      return false;
+      }
+
+    vtkVgTimeStamp trackBeginFrame;
+    vtkVgTimeStamp trackEndFrame;
+
+    // We are assuming that timestamps are in sequence and all the empty ones
+    // will be filled up with the event frame index and time.
+    if (trackIndex < trackBeginTimeStamp.size())
+      {
+      trackBeginFrame.SetTime(trackBeginTimeStamp[trackIndex].time());
+      trackBeginFrame.SetFrameNumber(trackBeginTimeStamp[trackIndex].frame_number());
+      trackEndFrame.SetTime(trackEndTimeStamp[trackIndex].time());
+      trackEndFrame.SetFrameNumber(trackEndTimeStamp[trackIndex].frame_number());
+      }
+    else
+      {
+      trackBeginFrame = eventBeginFrame;
+      trackEndFrame   = eventEndFrame;
+      }
+
+    if (trackBeginFrame < track->GetStartFrame())
+      {
+      trackBeginFrame = track->GetStartFrame();
+      }
+    else if (track->GetEndFrame() < trackBeginFrame)
+      {
+      trackBeginFrame = track->GetEndFrame();
+      }
+    if (track->GetEndFrame() < trackEndFrame)
+      {
+      trackEndFrame = track->GetEndFrame();
+      }
+    else if (trackEndFrame < trackBeginFrame)
+      {
+      trackEndFrame = trackBeginFrame;
+      }
+
+    vgEvent->AddTrack(trackId, trackBeginFrame, trackEndFrame);
+    }
+
+  vgEvent->AddClassifier(vidtkEvent->my_type(), 0.0,
+                         vidtkEvent->get_probability());
+
+  vgEvent->SetStartFrame(vtkVgTimeStamp(beginTime, beginFrame));
+  vgEvent->SetEndFrame(vtkVgTimeStamp(endTime, endFrame));
+
+  return true;
+}
diff --git a/Applications/VpView/vpVidtkEventIO.h b/Applications/VpView/vpVidtkEventIO.h
new file mode 100644
index 00000000..3c4683df
--- /dev/null
+++ b/Applications/VpView/vpVidtkEventIO.h
@@ -0,0 +1,62 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkEventIO_h
+#define __vpVidtkEventIO_h
+
+#include "vpEventIO.h"
+
+#include <vtkType.h>
+
+#include <event_detectors/event.h>
+#include <tracking_data/track.h>
+
+class vpVidtkReader;
+class vtkVgEvent;
+class vtkVgEventBase;
+class vtkVgTrack;
+
+class vpVidtkEventIO : public vpEventIO
+{
+public:
+  vpVidtkEventIO(vpVidtkReader& reader,
+                 vcl_map<vtkVgEvent*, vidtk::event_sptr>& eventMap,
+                 vcl_map<unsigned int, vtkIdType>& sourceEventIdToModelIdMap,
+                 const vcl_map<vtkVgTrack*, vidtk::track_sptr>& trackMap,
+                 const vcl_map<unsigned int, vtkIdType>& sourceTrackIdToModelIdMap,
+                 vtkVgEventModel* eventModel,
+                 vtkVgEventTypeRegistry* eventTypes = 0);
+
+  ~vpVidtkEventIO();
+
+  virtual bool ReadEvents();
+
+  virtual bool ImportEvents(vtkIdType idsOffset, float offsetX, float offsetY);
+
+  virtual bool WriteEvents(const char* filename) const;
+
+protected:
+  const vpVidtkReader& GetReader() const { return this->Reader; }
+
+private:
+  bool SetupEvent(const vidtk::event_sptr vidtkEvent,
+                  vtkVgEvent* vgEvent);
+
+  bool SetupNodeEvent(const vidtk::event_sptr vidtkEvent,
+                      vtkVgEventBase* vgEvent, float offsetX, float offsetY);
+
+  bool ReadEvents(vtkIdType idsOffset, float offsetX, float offsetY);
+
+private:
+  vpVidtkReader& Reader;
+  vcl_vector<vidtk::event_sptr> Events;
+  vcl_map<vtkVgEvent*, vidtk::event_sptr>& EventMap;
+  vcl_map<unsigned int, vtkIdType>& SourceEventIdToModelIdMap;
+  const vcl_map<vtkVgTrack*, vidtk::track_sptr>& TrackMap;
+  const vcl_map<unsigned int, vtkIdType>& SourceTrackIdToModelIdMap;
+};
+
+#endif // __vpVidtkEventIO_h
diff --git a/Applications/VpView/vpVidtkFileEventIO.cxx b/Applications/VpView/vpVidtkFileEventIO.cxx
new file mode 100644
index 00000000..a39730f1
--- /dev/null
+++ b/Applications/VpView/vpVidtkFileEventIO.cxx
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVidtkFileEventIO.h"
+
+#include "vpFileEventIOImpl.h"
+#include "vpVidtkFileReader.h"
+
+//-----------------------------------------------------------------------------
+vpVidtkFileEventIO::vpVidtkFileEventIO(
+  vpVidtkFileReader& reader,
+  vcl_map<vtkVgEvent*, vidtk::event_sptr>& eventMap,
+  vcl_map<unsigned int, vtkIdType>& sourceEventIdToModelIdMap,
+  const vcl_map<vtkVgTrack*, vidtk::track_sptr>& trackMap,
+  const vcl_map<unsigned int, vtkIdType>& sourceTrackIdToModelIdMap,
+  vtkVgEventModel* eventModel,
+  vtkVgEventTypeRegistry* eventTypes) :
+  vpVidtkEventIO(reader, eventMap, sourceEventIdToModelIdMap,
+                 trackMap, sourceTrackIdToModelIdMap,
+                 eventModel, eventTypes)
+{}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkFileEventIO::ReadEventLinks()
+{
+  return vpFileEventIOImpl::ReadEventLinks(
+           this, static_cast<const vpVidtkFileReader&>(
+                   this->GetReader()).GetEventLinksFileName());
+}
diff --git a/Applications/VpView/vpVidtkFileEventIO.h b/Applications/VpView/vpVidtkFileEventIO.h
new file mode 100644
index 00000000..b8c4c50d
--- /dev/null
+++ b/Applications/VpView/vpVidtkFileEventIO.h
@@ -0,0 +1,28 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkFileEventIO_h
+#define __vpVidtkFileEventIO_h
+
+#include "vpVidtkEventIO.h"
+
+class vpVidtkFileReader;
+
+class vpVidtkFileEventIO : public vpVidtkEventIO
+{
+public:
+  vpVidtkFileEventIO(vpVidtkFileReader& reader,
+                     vcl_map<vtkVgEvent*, vidtk::event_sptr>& eventMap,
+                     vcl_map<unsigned int, vtkIdType>& sourceEventIdToModelIdMap,
+                     const vcl_map<vtkVgTrack*, vidtk::track_sptr>& trackMap,
+                     const vcl_map<unsigned int, vtkIdType>& sourceTrackIdToModelIdMap,
+                     vtkVgEventModel* eventModel,
+                     vtkVgEventTypeRegistry* eventTypes = 0);
+
+  bool ReadEventLinks();
+};
+
+#endif // __vpVidtkFileEventIO_h
diff --git a/Applications/VpView/vpVidtkFileIO.cxx b/Applications/VpView/vpVidtkFileIO.cxx
new file mode 100644
index 00000000..cd42be09
--- /dev/null
+++ b/Applications/VpView/vpVidtkFileIO.cxx
@@ -0,0 +1,98 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVidtkFileIO.h"
+
+#include "vpFseTrackIO.h"
+#include "vpVidtkFileEventIO.h"
+#include "vpVidtkFileTrackIO.h"
+
+//-----------------------------------------------------------------------------
+vpVidtkFileIO::vpVidtkFileIO() :
+  ImageHeight(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vpVidtkFileIO::~vpVidtkFileIO()
+{
+  delete this->FseTrackIO;
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkFileIO::SetTrackModel(vtkVgTrackModel* trackModel,
+                                  vpTrackIO::TrackStorageMode storageMode,
+                                  vpTrackIO::TrackTimeStampMode timeStampMode,
+                                  vtkVgTrackTypeRegistry* trackTypes,
+                                  vtkMatrix4x4* geoTransform,
+                                  vpFrameMap* frameMap)
+{
+  delete this->TrackIO;
+  this->TrackMap.clear();
+  this->TrackIO = new vpVidtkFileTrackIO(
+                    this->Reader, this->TrackMap,
+                    this->SourceTrackIdToModelIdMap, trackModel,
+                    storageMode, timeStampMode, trackTypes,
+                    geoTransform, frameMap);
+
+  delete this->FseTrackIO;
+  this->FseTrackIO = new vpFseTrackIO(trackModel, storageMode, timeStampMode,
+                                      trackTypes, geoTransform, frameMap);
+  this->FseTrackIO->SetTracksFileName(this->FseTracksFileName.c_str());
+  this->FseTrackIO->SetImageHeight(this->ImageHeight);
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkFileIO::SetEventModel(vtkVgEventModel* eventModel,
+                                  vtkVgEventTypeRegistry* eventTypes)
+{
+  delete this->EventIO;
+  this->EventMap.clear();
+  this->EventIO = new vpVidtkFileEventIO(
+                    this->Reader,
+                    this->EventMap, this->SourceEventIdToModelIdMap,
+                    this->TrackMap, this->SourceTrackIdToModelIdMap,
+                    eventModel, eventTypes);
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkFileIO::SetImageHeight(unsigned int imageHeight)
+{
+  this->ImageHeight = imageHeight;
+  this->GetReader().SetImageHeight(imageHeight);
+  if (this->FseTrackIO)
+    {
+    this->FseTrackIO->SetImageHeight(imageHeight);
+    }
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpVidtkFileIO::GetImageHeight() const
+{
+  return this->ImageHeight;
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkFileIO::SetFseTracksFileName(const char* fseTracksFileName)
+{
+  this->FseTracksFileName = fseTracksFileName;
+  if (this->FseTrackIO)
+    {
+    this->FseTrackIO->SetTracksFileName(fseTracksFileName);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vpVidtkReader& vpVidtkFileIO::GetReader()
+{
+  return this->Reader;
+}
+
+//-----------------------------------------------------------------------------
+const vpVidtkReader& vpVidtkFileIO::GetReader() const
+{
+  return this->Reader;
+}
diff --git a/Applications/VpView/vpVidtkFileIO.h b/Applications/VpView/vpVidtkFileIO.h
new file mode 100644
index 00000000..203ea8cf
--- /dev/null
+++ b/Applications/VpView/vpVidtkFileIO.h
@@ -0,0 +1,60 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkFileIO_h
+#define __vpVidtkFileIO_h
+
+#include "vpVidtkIO.h"
+
+#include "vpVidtkFileReader.h"
+
+class vpVidtkFileIO : public vpVidtkIO
+{
+public:
+  vpVidtkFileIO();
+  virtual ~vpVidtkFileIO();
+
+  virtual void SetTrackModel(vtkVgTrackModel* trackModel,
+                             vpTrackIO::TrackStorageMode storageMode,
+                             vpTrackIO::TrackTimeStampMode timeStampMode,
+                             vtkVgTrackTypeRegistry* trackTypes,
+                             vtkMatrix4x4* geoTransform,
+                             vpFrameMap* frameMap);
+
+  virtual void SetEventModel(vtkVgEventModel* eventModel,
+                             vtkVgEventTypeRegistry* eventTypes);
+
+  virtual void SetImageHeight(unsigned int imageHeight);
+  virtual unsigned int GetImageHeight() const;
+
+  void SetTracksFileName(const char* tracksFileName)
+    { this->Reader.SetTracksFileName(tracksFileName); }
+
+  void SetTrackTraitsFileName(const char* trackTraitsFileName)
+    { this->Reader.SetTrackTraitsFileName(trackTraitsFileName); }
+
+  void SetEventsFileName(const char* eventsFileName)
+    { this->Reader.SetEventsFileName(eventsFileName); }
+
+  void SetEventLinksFileName(const char* eventLinksFileName)
+    { this->Reader.SetEventLinksFileName(eventLinksFileName); }
+
+  void SetActivitiesFileName(const char* activitiesFileName)
+    { this->Reader.SetActivitiesFileName(activitiesFileName); }
+
+  void SetFseTracksFileName(const char* fseTracksFileName);
+
+private:
+  virtual vpVidtkReader& GetReader();
+  virtual const vpVidtkReader& GetReader() const;
+
+private:
+  vpVidtkFileReader Reader;
+  std::string FseTracksFileName;
+  unsigned int ImageHeight;
+};
+
+#endif // __vpVidtkFileIO_h
diff --git a/Applications/VpView/vpVidtkFileReader.cxx b/Applications/VpView/vpVidtkFileReader.cxx
new file mode 100644
index 00000000..60629f55
--- /dev/null
+++ b/Applications/VpView/vpVidtkFileReader.cxx
@@ -0,0 +1,109 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVidtkFileReader.h"
+
+#include <activity_detectors/activity_reader.h>
+#include <event_detectors/event_reader_kwe.h>
+#include <tracking_data/io/track_reader_process.h>
+
+//-----------------------------------------------------------------------------
+bool vpVidtkFileReader::ReadTracks(vcl_vector<vidtk::track_sptr>& tracks)
+{
+  if (this->TracksFileName.empty())
+    {
+    return false;
+    }
+
+  vcl_string format = this->TracksFileName.substr(
+                        this->TracksFileName.rfind('.') + 1);
+
+  vidtk::track_reader_process trackReaderProcess(
+    "vpVidtkFileReader::ReadTracks");
+  trackReaderProcess.set_batch_mode(true);
+  vidtk::config_block processConfiguration = trackReaderProcess.params();
+  processConfiguration.set("disabled", "false");
+  processConfiguration.set("format", format);
+  processConfiguration.set("filename", this->TracksFileName);
+
+  if (!trackReaderProcess.set_params(processConfiguration))
+    {
+    return false;
+    }
+  if (!trackReaderProcess.initialize())
+    {
+    return false;
+    }
+  if (!trackReaderProcess.step())
+    {
+    return false;
+    }
+
+  tracks.insert(tracks.end(),
+                trackReaderProcess.tracks().begin(),
+                trackReaderProcess.tracks().end());
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkFileReader::ReadEvents(vcl_vector<vidtk::event_sptr>& events)
+{
+  if (this->EventsFileName.empty())
+    {
+    return false;
+    }
+
+  vidtk::event_reader_kwe reader;
+  if (!reader.open(this->EventsFileName))
+    {
+    return false;
+    }
+
+  vcl_map<vidtk::event_sptr, unsigned int> stepMap;
+  if (reader.read(events, stepMap))
+    {
+    // Build the map of event ids to events that will be needed if we read
+    // activities later.
+    this->EventMap.clear();
+    for (size_t i = 0, size = events.size(); i < size; ++i)
+      {
+      this->EventMap.insert(std::make_pair(events[i]->get_id(), events[i]));
+      }
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkFileReader::ReadActivities(
+  vcl_vector<vidtk::activity_sptr>& activities)
+{
+  if (this->ActivitiesFileName.empty())
+    {
+    return false;
+    }
+
+  vidtk::activity_reader reader;
+  if (!reader.open(this->ActivitiesFileName))
+    {
+    return false;
+    }
+
+  return reader.read(activities, this->EventMap);
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkFileReader::SetImageHeight(unsigned int imageHeight)
+{
+  vpVidtkReader::SetImageHeight(imageHeight);
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpVidtkFileReader::GetImageHeight() const
+{
+  return vpVidtkReader::GetImageHeight();
+}
diff --git a/Applications/VpView/vpVidtkFileReader.h b/Applications/VpView/vpVidtkFileReader.h
new file mode 100644
index 00000000..11039653
--- /dev/null
+++ b/Applications/VpView/vpVidtkFileReader.h
@@ -0,0 +1,27 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkFileReader_h
+#define __vpVidtkFileReader_h
+
+#include "vpFileReader.h"
+#include "vpVidtkReader.h"
+
+class vpVidtkFileReader : public vpFileReader, public vpVidtkReader
+{
+public:
+  virtual bool ReadTracks(vcl_vector<vidtk::track_sptr>& tracks);
+  virtual bool ReadEvents(vcl_vector<vidtk::event_sptr>& events);
+  virtual bool ReadActivities(vcl_vector<vidtk::activity_sptr>& activities);
+
+  virtual void SetImageHeight(unsigned int imageHeight);
+  virtual unsigned int GetImageHeight() const;
+
+private:
+  vcl_map<unsigned int, vidtk::event_sptr> EventMap;
+};
+
+#endif // __vpVidtkFileReader_h
diff --git a/Applications/VpView/vpVidtkFileTrackIO.cxx b/Applications/VpView/vpVidtkFileTrackIO.cxx
new file mode 100644
index 00000000..66528143
--- /dev/null
+++ b/Applications/VpView/vpVidtkFileTrackIO.cxx
@@ -0,0 +1,62 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVidtkFileTrackIO.h"
+
+#include "vpFileTrackIOImpl.h"
+#include "vpVidtkFileReader.h"
+
+//-----------------------------------------------------------------------------
+vpVidtkFileTrackIO::vpVidtkFileTrackIO(
+  vpVidtkFileReader& reader,
+  vcl_map<vtkVgTrack*, vidtk::track_sptr>& trackMap,
+  vcl_map<unsigned int, vtkIdType>& sourceIdToModelIdMap,
+  vtkVgTrackModel* trackModel,
+  TrackStorageMode storageMode,
+  TrackTimeStampMode timeStampMode,
+  vtkVgTrackTypeRegistry* trackTypes,
+  vtkMatrix4x4* geoTransform,
+  vpFrameMap* frameMap) :
+  vpVidtkTrackIO(reader, trackMap, sourceIdToModelIdMap, trackModel,
+                 storageMode, timeStampMode, trackTypes, geoTransform,
+                 frameMap)
+{}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkFileTrackIO::ReadTracks()
+{
+  if (!vpVidtkTrackIO::ReadTracks())
+    {
+    return false;
+    }
+  vpFileTrackIOImpl::ReadSupplementalFiles(
+    this, static_cast<const vpVidtkFileReader&>(
+            this->GetReader()).GetTracksFileName());
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkFileTrackIO::ImportTracks(vtkIdType idsOffset,
+                                      float offsetX, float offsetY)
+{
+  if (!vpVidtkTrackIO::ImportTracks(idsOffset, offsetX, offsetY))
+    {
+    return false;
+    }
+  vpFileTrackIOImpl::ImportSupplementalFiles(
+    this,
+    static_cast<const vpVidtkFileReader&>(this->GetReader()).GetTracksFileName(),
+    offsetX, offsetY);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkFileTrackIO::ReadTrackTraits()
+{
+  return vpFileTrackIOImpl::ReadTrackTraits(
+           this, static_cast<const vpVidtkFileReader&>(
+                   this->GetReader()).GetTrackTraitsFileName());
+}
diff --git a/Applications/VpView/vpVidtkFileTrackIO.h b/Applications/VpView/vpVidtkFileTrackIO.h
new file mode 100644
index 00000000..5f61735d
--- /dev/null
+++ b/Applications/VpView/vpVidtkFileTrackIO.h
@@ -0,0 +1,34 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkFileTrackIO_h
+#define __vpVidtkFileTrackIO_h
+
+#include "vpVidtkTrackIO.h"
+
+class vpVidtkFileReader;
+
+class vpVidtkFileTrackIO : public vpVidtkTrackIO
+{
+public:
+  vpVidtkFileTrackIO(vpVidtkFileReader& reader,
+                     vcl_map<vtkVgTrack*, vidtk::track_sptr>& trackMap,
+                     vcl_map<unsigned int, vtkIdType>& sourceIdToModelIdMap,
+                     vtkVgTrackModel* trackModel,
+                     TrackStorageMode storageMode,
+                     TrackTimeStampMode timeStampMode,
+                     vtkVgTrackTypeRegistry* trackTypes = 0,
+                     vtkMatrix4x4* geoTransform = 0,
+                     vpFrameMap* frameMap = 0);
+
+  virtual bool ReadTracks();
+
+  virtual bool ImportTracks(vtkIdType idsOffset, float offsetX, float offsetY);
+
+  bool ReadTrackTraits();
+};
+
+#endif // __vpVidtkFileTrackIO_h
diff --git a/Applications/VpView/vpVidtkIO.cxx b/Applications/VpView/vpVidtkIO.cxx
new file mode 100644
index 00000000..314afa98
--- /dev/null
+++ b/Applications/VpView/vpVidtkIO.cxx
@@ -0,0 +1,80 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVidtkIO.h"
+
+#include "vpVidtkActivityIO.h"
+#include "vpVidtkEventIO.h"
+#include "vpVidtkReader.h"
+#include "vpVidtkTrackIO.h"
+
+//-----------------------------------------------------------------------------
+vpVidtkIO::~vpVidtkIO()
+{
+  delete this->ActivityIO;
+  delete this->EventIO;
+  delete this->TrackIO;
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkIO::SetTrackModel(vtkVgTrackModel* trackModel,
+                              vpTrackIO::TrackStorageMode storageMode,
+                              vpTrackIO::TrackTimeStampMode timeStampMode,
+                              vtkVgTrackTypeRegistry* trackTypes,
+                              vtkMatrix4x4* geoTransform,
+                              vpFrameMap* frameMap)
+{
+  delete this->TrackIO;
+  this->TrackMap.clear();
+  this->TrackIO = new vpVidtkTrackIO(this->GetReader(), this->TrackMap,
+                                     this->SourceTrackIdToModelIdMap,
+                                     trackModel, storageMode, timeStampMode,
+                                     trackTypes, geoTransform, frameMap);
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkIO::SetEventModel(vtkVgEventModel* eventModel,
+                              vtkVgEventTypeRegistry* eventTypes)
+{
+  delete this->EventIO;
+  this->EventMap.clear();
+  this->EventIO = new vpVidtkEventIO(this->GetReader(), this->EventMap,
+                                     this->SourceEventIdToModelIdMap,
+                                     this->TrackMap,
+                                     this->SourceTrackIdToModelIdMap,
+                                     eventModel, eventTypes);
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkIO::SetActivityModel(vtkVgActivityManager* activityManager,
+                                 vpActivityConfig* activityConfig)
+{
+  delete this->ActivityIO;
+  this->ActivityIO = new vpVidtkActivityIO(this->GetReader(), activityManager,
+                                           activityConfig);
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkIO::SetImageHeight(unsigned int imageHeight)
+{
+  this->GetReader().SetImageHeight(imageHeight);
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpVidtkIO::GetImageHeight() const
+{
+  return this->GetReader().GetImageHeight();
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkIO::UpdateTracks(const vcl_vector<vidtk::track_sptr>& tracks,
+                             unsigned int updateStartFrame,
+                             unsigned int updateEndFrame)
+{
+  assert(this->TrackIO);
+  static_cast<vpVidtkTrackIO*>(this->TrackIO)->UpdateTracks(
+    tracks, updateStartFrame, updateEndFrame);
+}
diff --git a/Applications/VpView/vpVidtkIO.h b/Applications/VpView/vpVidtkIO.h
new file mode 100644
index 00000000..4150cd10
--- /dev/null
+++ b/Applications/VpView/vpVidtkIO.h
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkIO_h
+#define __vpVidtkIO_h
+
+#include "vpModelIO.h"
+
+#include <event_detectors/event.h>
+#include <tracking_data/track.h>
+
+class vpVidtkReader;
+
+class vtkVgTrack;
+class vtkVgEvent;
+
+class vpVidtkIO : public vpModelIO
+{
+public:
+  virtual ~vpVidtkIO();
+
+  virtual void SetTrackModel(vtkVgTrackModel* trackModel,
+                             vpTrackIO::TrackStorageMode storageMode,
+                             vpTrackIO::TrackTimeStampMode timeStampMode,
+                             vtkVgTrackTypeRegistry* trackTypes,
+                             vtkMatrix4x4* geoTransform,
+                             vpFrameMap* frameMap);
+
+  virtual void SetEventModel(vtkVgEventModel* eventModel,
+                             vtkVgEventTypeRegistry* eventTypes);
+
+  virtual void SetActivityModel(vtkVgActivityManager* activityManager,
+                                vpActivityConfig* activityConfig);
+
+  virtual void SetImageHeight(unsigned int imageHeight);
+  virtual unsigned int GetImageHeight() const;
+
+  void UpdateTracks(const vcl_vector<vidtk::track_sptr>& tracks,
+                    unsigned int updateStartFrame, unsigned int updateEndFrame);
+
+private:
+  virtual vpVidtkReader& GetReader() = 0;
+  virtual const vpVidtkReader& GetReader() const = 0;
+
+protected:
+  vcl_map<vtkVgTrack*, vidtk::track_sptr> TrackMap;
+  vcl_map<vtkVgEvent*, vidtk::event_sptr> EventMap;
+  vcl_map<unsigned int, vtkIdType> SourceTrackIdToModelIdMap;
+  vcl_map<unsigned int, vtkIdType> SourceEventIdToModelIdMap;
+};
+
+#endif // __vpVidtkIO_h
diff --git a/Applications/VpView/vpVidtkReader.h b/Applications/VpView/vpVidtkReader.h
new file mode 100644
index 00000000..a98df406
--- /dev/null
+++ b/Applications/VpView/vpVidtkReader.h
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkReader_h
+#define __vpVidtkReader_h
+
+#include <activity_detectors/activity.h>
+#include <event_detectors/event.h>
+#include <tracking_data/track.h>
+
+class vpVidtkReader
+{
+public:
+  vpVidtkReader() : ImageHeight(0) {}
+  virtual ~vpVidtkReader() {}
+  virtual bool ReadTracks(vcl_vector<vidtk::track_sptr>& tracks) = 0;
+  virtual bool ReadEvents(vcl_vector<vidtk::event_sptr>& events) = 0;
+  virtual bool ReadActivities(vcl_vector<vidtk::activity_sptr>& activities) = 0;
+
+  void SetImageHeight(unsigned int imageHeight)
+    { this->ImageHeight = imageHeight; }
+
+  unsigned int GetImageHeight() const
+    { return this->ImageHeight; }
+
+private:
+  unsigned int ImageHeight;
+};
+
+#endif // __vpVidtkReader_h
diff --git a/Applications/VpView/vpVidtkTrackIO.cxx b/Applications/VpView/vpVidtkTrackIO.cxx
new file mode 100644
index 00000000..4dfbaf2f
--- /dev/null
+++ b/Applications/VpView/vpVidtkTrackIO.cxx
@@ -0,0 +1,861 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpVidtkTrackIO.h"
+
+#include "vpFrameMap.h"
+#include "vpVidtkReader.h"
+
+#include <vtkVgScalars.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackTypeRegistry.h>
+
+#include <vtkBoundingBox.h>
+#include <vtkMatrix4x4.h>
+#include <vtkPoints.h>
+#include <vtksys/SystemTools.hxx>
+
+#include <tracking_data/io/track_writer_process.h>
+#include <tracking_data/pvo_probability.h>
+#include <tracking_data/tracking_keys.h>
+
+#include <assert.h>
+
+//-----------------------------------------------------------------------------
+vpVidtkTrackIO::vpVidtkTrackIO(vpVidtkReader& reader,
+                               vcl_map<vtkVgTrack*, vidtk::track_sptr>& trackMap,
+                               vcl_map<unsigned int, vtkIdType>&
+                                 sourceIdToModelIdMap,
+                               vtkVgTrackModel* trackModel,
+                               TrackStorageMode storageMode,
+                               TrackTimeStampMode timeStampMode,
+                               vtkVgTrackTypeRegistry* trackTypes,
+                               vtkMatrix4x4* geoTransform,
+                               vpFrameMap* frameMap) :
+  vpTrackIO(trackModel, storageMode, timeStampMode, trackTypes,
+            geoTransform, frameMap),
+  Reader(reader), TrackMap(trackMap), SourceIdToModelIdMap(sourceIdToModelIdMap)
+{}
+
+//-----------------------------------------------------------------------------
+vpVidtkTrackIO::~vpVidtkTrackIO()
+{}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkTrackIO::ReadTracks()
+{
+  assert(this->StorageMode != TSM_TransformedGeoCoords ||
+         this->GeoTransform);
+  assert(this->StorageMode != TSM_InvertedImageCoords ||
+         this->Reader.GetImageHeight() != 0);
+
+  size_t prevTracksSize = this->Tracks.size();
+  if (!this->Reader.ReadTracks(this->Tracks))
+    {
+    return false;
+    }
+
+  // Make a quick pass through to find out roughly how many points we should
+  // allocate.
+  if (this->TrackModel->GetPoints()->GetNumberOfPoints() == 0)
+    {
+    vtkIdType numberOfActualPoints = 0, totalNumberOfMissingFrames = 0;
+    for (size_t i = 0, size = this->Tracks.size(); i < size; ++i)
+      {
+      const vcl_vector<vidtk::track_state_sptr>& history =
+        this->Tracks[i]->history();
+
+      numberOfActualPoints += static_cast<vtkIdType>(history.size());
+      vtkIdType numberOfMissingFrames =
+        static_cast<vtkIdType>(history.back()->time_.frame_number() -
+                               history.front()->time_.frame_number() + 1) -
+        static_cast<vtkIdType>(history.size());
+
+      // Perchance we come up with a negative number, which we shouldn't!
+      if (numberOfMissingFrames > 0)
+        {
+        totalNumberOfMissingFrames += numberOfMissingFrames;
+        }
+      }
+
+    // Should be correct for bbox (4pts) + pt for all actual points, and only
+    // single point for missing frames.
+    this->TrackModel->GetPoints()->Allocate(
+      5 * numberOfActualPoints + totalNumberOfMissingFrames);
+    }
+
+  // Process the newly added tracks.
+  for (size_t i = prevTracksSize, size = this->Tracks.size(); i < size; ++i)
+    {
+    this->ReadTrack(this->Tracks[i]);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkTrackIO::ImportTracks(vtkIdType idsOffset,
+                                  float offsetX, float offsetY)
+{
+  assert(this->StorageMode != TSM_TransformedGeoCoords ||
+         this->GeoTransform);
+  assert(this->StorageMode != TSM_InvertedImageCoords ||
+         this->Reader.GetImageHeight() != 0);
+
+  size_t prevTracksSize = this->Tracks.size();
+  if (!this->Reader.ReadTracks(this->Tracks))
+    {
+    return false;
+    }
+
+  for (size_t i = prevTracksSize, size = this->Tracks.size(); i < size; ++i)
+    {
+    this->ReadTrack(this->Tracks[i], offsetX, offsetY, false, 0, 0,
+                    idsOffset + this->Tracks[i]->id());
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkTrackIO::WriteTracks(const char* filename,
+                                 bool writeSceneElements) const
+{
+  if (writeSceneElements)
+    {
+    std::cerr << "ERROR: Can't write scene element tracks to kw18\n";
+    return false;
+    }
+
+  vidtk::track_writer_process writer("vpVidtkTrackIO::WriteTracks");
+
+  std::string filestr(filename);
+  vcl_string format = filestr.substr(filestr.rfind('.') + 1);
+
+  if (!writer.set_params(
+        writer.params().set_value("filename", filename)
+                       .set_value("overwrite_existing", true)
+                       .set_value("format", format)
+                       .set_value("disabled", false)))
+    {
+    return false;
+    }
+
+  if (!writer.initialize())
+    {
+    return false;
+    }
+
+  bool useWorldCoords = this->StorageMode == TSM_TransformedGeoCoords;
+  bool useRawImageCoords = this->StorageMode == TSM_ImageCoords;
+
+  vcl_vector<vidtk::track_sptr> tracks;
+  vcl_vector<vidtk::image_object_sptr> objs(1);
+
+  vtkPoints* points = this->TrackModel->GetPoints();
+  double imageYExtent = this->Reader.GetImageHeight() - 1;
+
+  std::ofstream typesFile;
+  std::ofstream regionsFile;
+
+  bool typesFileOpenFailed = false;
+  bool regionsFileOpenFailed = false;
+
+  vcl_string typesFilename(filename);
+  typesFilename += ".types";
+
+  vcl_string regionsFilename(filename);
+  regionsFilename += ".regions";
+
+  // Remove any existing companion files
+  vtksys::SystemTools::RemoveFile(typesFilename.c_str());
+  vtksys::SystemTools::RemoveFile(regionsFilename.c_str());
+
+  // Convert track model tracks back to vidtk tracks.
+  this->TrackModel->InitTrackTraversal();
+  while (vtkVgTrack* modelTrack = this->TrackModel->GetNextTrack().GetTrack())
+    {
+    bool isSceneElement =
+      (modelTrack->GetDisplayFlags() & vtkVgTrack::DF_SceneElement) != 0;
+
+    if (isSceneElement)
+      {
+      continue;
+      }
+
+    vidtk::track_sptr track(new vidtk::track);
+    track->set_id(modelTrack->GetId());
+
+    vidtk::track_sptr origTrack;
+    vcl_map<vtkVgTrack*, vidtk::track_sptr>::const_iterator itr =
+      this->TrackMap.find(modelTrack);
+    if (itr != this->TrackMap.end())
+      {
+      origTrack = itr->second;
+      }
+
+    // Write out track type to supplemental text file
+    if (!typesFileOpenFailed && modelTrack->GetType() != -1)
+      {
+      if (!typesFile.is_open())
+        {
+        typesFile.open(typesFilename.c_str(), ios::out | ios::trunc);
+        if (!typesFile)
+          {
+          std::cerr << "ERROR: Failed to write track types to "
+                    << typesFilename << '\n';
+          typesFileOpenFailed = true;
+          }
+        }
+
+      if (!typesFileOpenFailed)
+        {
+        // Write out the type id
+        typesFile << modelTrack->GetId() << ' '
+                  << this->TrackTypes->GetType(modelTrack->GetType()).GetId()
+                  << '\n';
+        }
+      }
+
+    vcl_vector<vidtk::track_state_sptr>::const_iterator origTrkStateIter,
+                                                        origTrkStateEnd;
+    if (origTrack)
+      {
+      origTrkStateIter = origTrack->history().begin();
+      origTrkStateEnd = origTrack->history().end();
+      }
+
+    modelTrack->InitPathTraversal();
+    vtkVgTimeStamp ts;
+    for (;;)
+      {
+      vtkIdType ptId = modelTrack->GetNextPathPt(ts);
+      if (ptId == -1)
+        {
+        break;
+        }
+
+      vtkIdType nHeadPts;
+      vtkIdType trackPtId;
+      vtkIdType* headPts;
+      modelTrack->GetHeadIdentifier(ts, nHeadPts, headPts, trackPtId);
+
+      bool frameIsInterpolated = modelTrack->GetFrameIsInterpolated(ts);
+
+      // Don't export frames without regions
+      if (nHeadPts == 0)
+        {
+        continue;
+        }
+
+      // Catch up the state iterator on the vidtk track
+      while (origTrack && origTrkStateIter != origTrkStateEnd &&
+             (*origTrkStateIter)->time_.frame_number() < ts.GetFrameNumber())
+        {
+        ++origTrkStateIter;
+        }
+      vidtk::track_state_sptr orig_state;
+      if (origTrack && origTrkStateIter != origTrkStateEnd)
+        {
+        orig_state = *origTrkStateIter;
+        }
+
+      bool isAABB = nHeadPts == 5;
+      if (isAABB)
+        {
+        double ul[3];
+        double ll[3];
+        double lr[3];
+        double ur[3];
+        points->GetPoint(headPts[0], ul);
+        points->GetPoint(headPts[1], ll);
+        points->GetPoint(headPts[2], lr);
+        points->GetPoint(headPts[3], ur);
+
+        isAABB =
+          ul[0] == ll[0] &&
+          ll[1] == lr[1] &&
+          lr[0] == ur[0] &&
+          ur[1] == ul[1];
+        }
+
+      // Write out polygonal or interpolated regions to a supplemental file
+      if (nHeadPts != 0 && (!isAABB || frameIsInterpolated))
+        {
+        if (!regionsFileOpenFailed)
+          {
+          if (!regionsFile.is_open())
+            {
+            regionsFile.open(regionsFilename.c_str(), ios::out | ios::trunc);
+            if (!regionsFile)
+              {
+              std::cerr << "ERROR: Failed to write track regions to "
+                        << regionsFilename << '\n';
+              regionsFileOpenFailed = true;
+              }
+            }
+
+          if (!regionsFileOpenFailed)
+            {
+            regionsFile << modelTrack->GetId() << ' '
+                        << ts.GetFrameNumber() << ' '
+                        << !frameIsInterpolated << ' '
+                        << nHeadPts - 1;
+            for (int i = 0; i < nHeadPts - 1; ++i)
+              {
+              double point[3];
+              points->GetPoint(headPts[i], point);
+              // seems like the yflip is in error if storage mode is
+              // TSM_ImageCoords but let it go for now (trying to get
+              // it to work for world coordinates)
+              regionsFile << ' ' << point[0] << ' ' <<
+                (useWorldCoords ? point[1] : imageYExtent - point[1]);
+              }
+            regionsFile << '\n';
+            }
+          }
+        }
+
+      double minX;
+      double maxX;
+      double minY;
+      double maxY;
+
+      if (!isAABB)
+        {
+        // compute the bounding rect of the points so we can export that instead
+        vtkBoundingBox bbox;
+        for (int i = 0; i < nHeadPts; ++i)
+          {
+          bbox.AddPoint(points->GetPoint(headPts[i]));
+          }
+
+        double z;
+        bbox.GetMinPoint(minX, maxY, z);
+        bbox.GetMaxPoint(maxX, minY, z);
+
+        if (!useRawImageCoords && !useWorldCoords)
+          {
+          minY = imageYExtent - minY;
+          maxY = imageYExtent - maxY;
+          }
+        }
+      else
+        {
+        minX = points->GetPoint(headPts[0])[0];
+        maxX = points->GetPoint(headPts[2])[0];
+
+        if (useRawImageCoords || useWorldCoords)
+          {
+          minY = points->GetPoint(headPts[0])[1];
+          maxY = points->GetPoint(headPts[1])[1];
+          }
+        else
+          {
+          minY = imageYExtent - points->GetPoint(headPts[0])[1];
+          maxY = imageYExtent - points->GetPoint(headPts[1])[1];
+          }
+        }
+
+      vidtk::track_state_sptr new_state(new vidtk::track_state);
+      vidtk::image_object_sptr obj(new vidtk::image_object);
+
+      new_state->time_.set_frame_number(ts.GetFrameNumber());
+
+      if (ts.HasTime())
+        {
+        new_state->time_.set_time(ts.GetTime());
+        }
+      else
+        {
+        // HACK: This time is not necessarily valid, but this state must have a
+        // time *different* from that of the last state, or the kw18 reader will
+        // silently refuse to append the states to the track history when
+        // reading the file back in.
+        new_state->time_.set_time(ts.GetFrameNumber() * 0.5e6);
+        }
+
+      vtkVgGeoCoord geoCoord = modelTrack->GetGeoCoord(ts);
+
+      double lat = 444.0;
+      double lon = 444.0;
+      if (orig_state && !orig_state->latitude_longitude(lat, lon))
+        {
+        vcl_vector<vidtk::image_object_sptr> objs;
+        if (orig_state->data_.get(vidtk::tracking_keys::img_objs, objs))
+          {
+          lon = objs[0]->world_loc_[0];
+          lat = objs[0]->world_loc_[1];
+          }
+        }
+
+      // Use the original ground information if this frame of the track hasn't
+      // been modified. Otherwise just write zeros.
+      if (orig_state &&
+          orig_state->time_.frame_number() == ts.GetFrameNumber() &&
+          ((nHeadPts == 0 && geoCoord.Latitude == lat &&
+            geoCoord.Longitude == lon) ||
+           (orig_state->amhi_bbox_.min_x() == minX &&
+            orig_state->amhi_bbox_.min_y() == minY &&
+            orig_state->amhi_bbox_.max_x() == maxX &&
+            orig_state->amhi_bbox_.max_y() == maxY)))
+        {
+        new_state->loc_ = orig_state->loc_;
+        new_state->vel_ = orig_state->vel_;
+        new_state->amhi_bbox_ = orig_state->amhi_bbox_;
+
+        vcl_vector<vidtk::image_object_sptr> objs;
+        if (orig_state->data_.get(vidtk::tracking_keys::img_objs, objs))
+          {
+          obj->img_loc_ = objs[0]->img_loc_;
+          obj->world_loc_ = objs[0]->world_loc_;
+          obj->area_ = objs[0]->area_;
+          obj->bbox_ = objs[0]->bbox_;
+          }
+        else
+          {
+          obj->img_loc_[0] = 0;
+          obj->img_loc_[1] = 0;
+          obj->img_loc_[2] = 0;
+          obj->world_loc_[0] = 0;
+          obj->world_loc_[1] = 0;
+          obj->world_loc_[2] = 0;
+          }
+        }
+      else
+        {
+        new_state->loc_[0] = 0;
+        new_state->loc_[1] = 0;
+        new_state->loc_[2] = 0;
+
+        new_state->vel_[0] = 0;
+        new_state->vel_[1] = 0;
+        new_state->vel_[2] = 0;
+
+        new_state->amhi_bbox_.set_min_x(minX);
+        new_state->amhi_bbox_.set_min_y(minY);
+        new_state->amhi_bbox_.set_max_x(maxX);
+        new_state->amhi_bbox_.set_max_y(maxY);
+
+        double pt[3];
+        points->GetPoint(ptId, pt);
+
+        if (geoCoord.IsValid())
+          {
+          obj->world_loc_[0] = geoCoord.Longitude;
+          obj->world_loc_[1] = geoCoord.Latitude;
+          obj->world_loc_[2] = 0.0;
+          }
+        else
+          {
+          obj->world_loc_[0] = 0;
+          obj->world_loc_[1] = 0;
+          obj->world_loc_[2] = 0;
+          }
+
+        if (useWorldCoords)
+          {
+          obj->img_loc_[0] = 0.5 * (minX + maxX);
+          obj->img_loc_[1] = 0.5 * (minY + maxY);
+          }
+        else
+          {
+          obj->img_loc_[0] = pt[0];
+          obj->img_loc_[1] = useRawImageCoords ? pt[1] : imageYExtent - pt[1];
+          }
+        obj->bbox_ = new_state->amhi_bbox_;
+        }
+
+      objs[0] = obj;
+      new_state->data_.set(vidtk::tracking_keys::img_objs, objs);
+
+      track->add_state(new_state);
+      }
+
+    tracks.push_back(track);
+    }
+
+  writer.set_tracks(tracks);
+  return writer.step();
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkTrackIO::UpdateTracks(const vcl_vector<vidtk::track_sptr>& tracks,
+                                  unsigned int updateStartFrame,
+                                  unsigned int updateEndFrame)
+{
+  for (vcl_vector<vidtk::track_sptr>::const_iterator itr = tracks.begin(),
+       end = tracks.end(); itr != end; ++itr)
+    {
+    this->ReadTrack(*itr, 0.0f, 0.0f, true, updateStartFrame, updateEndFrame);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkTrackIO::GetNextValidTrackFrame(vtkVgTrack* track,
+                                            unsigned int startFrame,
+                                            vtkVgTimeStamp& timeStamp) const
+{
+  vcl_map<vtkVgTrack*, vidtk::track_sptr>::const_iterator itr =
+    this->TrackMap.find(track);
+  if (itr == this->TrackMap.end())
+    {
+    return false;
+    }
+
+  vidtk::track_sptr vtrack = itr->second;
+  vcl_vector<vidtk::track_state_sptr>::const_iterator iter;
+  vcl_vector<vidtk::track_state_sptr>::const_iterator end =
+    vtrack->history().end();
+
+  // search forwards through the track history until we find the start frame
+  // or go past
+  for (iter = vtrack->history().begin(); iter != end; ++iter)
+    {
+    if ((*iter)->time_.frame_number() >= startFrame)
+      {
+      timeStamp.SetTime((*iter)->time_.time());
+      timeStamp.SetFrameNumber((*iter)->time_.frame_number());
+      return true;
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpVidtkTrackIO::GetPrevValidTrackFrame(vtkVgTrack* track,
+                                            unsigned int startFrame,
+                                            vtkVgTimeStamp& timeStamp) const
+{
+  vcl_map<vtkVgTrack*, vidtk::track_sptr>::const_iterator itr =
+    this->TrackMap.find(track);
+  if (itr == this->TrackMap.end())
+    {
+    return false;
+    }
+
+  vidtk::track_sptr vtrack = itr->second;
+  vcl_vector<vidtk::track_state_sptr>::const_reverse_iterator iter;
+  vcl_vector<vidtk::track_state_sptr>::const_reverse_iterator end
+    = vtrack->history().rend();
+
+  // search backwards through the track history until we find the start frame
+  // or go past
+  for (iter = vtrack->history().rbegin(); iter != end; ++iter)
+    {
+    if ((*iter)->time_.frame_number() <= startFrame)
+      {
+      timeStamp.SetTime((*iter)->time_.time());
+      timeStamp.SetFrameNumber((*iter)->time_.frame_number());
+      return true;
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vpVidtkTrackIO::GetModelTrackId(unsigned int sourceId) const
+{
+  vcl_map<unsigned int, vtkIdType>::const_iterator itr =
+    this->SourceIdToModelIdMap.find(sourceId);
+
+  if (itr == this->SourceIdToModelIdMap.end())
+    {
+    return vpTrackIO::GetModelTrackId(sourceId);
+    }
+
+  return itr->second;
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpVidtkTrackIO::GetImageHeight() const
+{
+  return this->Reader.GetImageHeight();
+}
+
+//-----------------------------------------------------------------------------
+void vpVidtkTrackIO::ReadTrack(
+  const vidtk::track_sptr vidtkTrack,
+  float offsetX, float offsetY,
+  bool update, unsigned int updateStartFrame, unsigned int updateEndFrame,
+  vtkIdType desiredId)
+{
+  if (desiredId == -1)
+    {
+    desiredId = static_cast<vtkIdType>(vidtkTrack->id());
+    }
+
+  bool newTrack = false;
+  vtkVgTrack* track = 0;
+  if (update)
+    {
+    track = this->TrackModel->GetTrack(desiredId);
+    }
+  else if (this->TrackModel->GetTrack(desiredId))
+    {
+    // There is already a track in the model with the desired id.
+    vtkIdType id = desiredId;
+    desiredId = this->TrackModel->GetNextAvailableId();
+    std::cout << "Track id " << id
+              << " is not unique: changing id of imported track to "
+              << desiredId << '\n';
+    }
+
+  // Keep track of any ids that were changed.
+  if (desiredId != static_cast<vtkIdType>(vidtkTrack->id()))
+    {
+    this->SourceIdToModelIdMap[vidtkTrack->id()] = desiredId;
+    }
+  vidtkTrack->set_id(static_cast<unsigned int>(desiredId));
+
+  if (!track)
+    {
+    track = vtkVgTrack::New();
+    track->InterpolateMissingPointsOnInsertOn();
+    track->SetId(desiredId);
+    track->SetPoints(this->TrackModel->GetPoints());
+    newTrack = true;
+    }
+
+  vidtk::pvo_probability pvo;
+  if (vidtkTrack->get_pvo(pvo))
+    {
+    track->SetPVO(pvo.get_probability_person(),
+                  pvo.get_probability_vehicle(),
+                  pvo.get_probability_other());
+    }
+
+  const vcl_vector<vidtk::track_state_sptr>& trackHistory =
+    vidtkTrack->history();
+
+  vtkSmartPointer<vtkVgScalars> attrScalars;
+  if (newTrack)
+    {
+    attrScalars = vtkSmartPointer<vtkVgScalars>::New();
+    attrScalars->SetNotFoundValue(0.0);
+
+    track->SetScalars("StateAttributes", attrScalars);
+
+    // set the size the track should need for its id lists
+    track->Allocate(static_cast<vtkIdType>(
+                      trackHistory.back()->time_.frame_number() -
+                      trackHistory.front()->time_.frame_number() + 1));
+    }
+  else
+    {
+    attrScalars = track->GetScalars("StateAttributes");
+    }
+
+#ifdef VPVIEW_ASSIGN_FAKE_TRACK_ATTRIBUTES
+  unsigned int count = 0;
+  unsigned int attrs = 0;
+  unsigned int attrType = 0;
+#endif
+
+  vcl_vector<vidtk::image_object_sptr> objs;
+  vcl_vector<vidtk::track_state_sptr>::const_iterator trkStateIter;
+  for (trkStateIter = trackHistory.begin(); trkStateIter != trackHistory.end();
+       trkStateIter++)
+    {
+    // Only look at the frames in the update range.
+    if (update)
+      {
+      unsigned int frame = (*trkStateIter)->time_.frame_number();
+      if (frame < updateStartFrame)
+        {
+        continue;
+        }
+      if (frame > updateEndFrame)
+        {
+        break;
+        }
+      }
+
+    vtkVgTimeStamp timeStamp;
+    if (this->TimeStampMode & TSF_FrameNumber)
+      {
+      timeStamp.SetFrameNumber((*trkStateIter)->time_.frame_number());
+      }
+    if (this->TimeStampMode & TSF_Time)
+      {
+      timeStamp.SetTime((*trkStateIter)->time_.time());
+      }
+
+    if ((*trkStateIter)->data_.get(vidtk::tracking_keys::img_objs, objs))
+      {
+      double lat, lon;
+      if (!(*trkStateIter)->latitude_longitude(lat, lon))
+        {
+        lon = objs[0]->world_loc_[0];
+        lat = objs[0]->world_loc_[1];
+        }
+      vtkVgGeoCoord geoCoord(lat, lon);
+
+      bool trackPointAvailable = true;
+      double minY;
+      double maxY;
+      vgl_box_2d<unsigned>& vglBBox = objs[0]->bbox_;
+      double pt[4] = {0.0, 0.0, 0.0, 1.0};
+      if (this->StorageMode == TSM_TransformedGeoCoords)
+        {
+        // tracks points stored in geo coordinates, head point in image
+        // coordinates (non-inverted)
+        pt[0] = lon;
+        pt[1] = lat;
+        this->GeoTransform->MultiplyPoint(pt, pt);
+        pt[0] /= pt[3];
+        pt[1] /= pt[3];
+
+        minY = static_cast<double>(vglBBox.min_y());
+        maxY = static_cast<double>(vglBBox.max_y());
+        }
+      else
+        {
+        pt[0] = objs[0]->img_loc_[0];
+        unsigned int imageMaxY = this->Reader.GetImageHeight() - 1;
+        if (this->StorageMode == TSM_InvertedImageCoords)
+          {
+          pt[1] = imageMaxY - objs[0]->img_loc_[1];
+          }
+        else // TSM_ImageCoords || TSM_HomographyTransformedImageCoords
+          {
+          pt[1] = objs[0]->img_loc_[1];
+          }
+
+        if (this->StorageMode == TSM_HomographyTransformedImageCoords)
+          {
+          // we expect there to be a homography for every frame
+          vpFrame frameMetaData;
+          if (!this->FrameMap->getFrame((*trkStateIter)->time_.frame_number(),
+                                        frameMetaData) ||
+              !frameMetaData.Homography)
+            {
+            std::cerr << "ERROR: Homgraphy for frame # "
+              << (*trkStateIter)->time_.frame_number()
+              << "is unavailable.  Track point not added!\n";
+            trackPointAvailable = false;
+            }
+          else
+            {
+            frameMetaData.Homography->MultiplyPoint(pt, pt);
+            pt[0] /= pt[3];
+            pt[1] /= pt[3];
+            }
+          }
+        else
+          {
+          pt[0] += offsetX;
+          pt[1] += offsetY;
+          }
+
+        if (this->StorageMode == TSM_InvertedImageCoords)
+          {
+          minY = imageMaxY - static_cast<double>(vglBBox.min_y());
+          maxY = imageMaxY - static_cast<double>(vglBBox.max_y());
+          }
+        else // TSM_ImageCoords || TSM_HomographyTransformedImageCoords
+          {
+          minY = static_cast<double>(vglBBox.min_y());
+          maxY = static_cast<double>(vglBBox.max_y());
+          }
+        }
+
+      float bbox[] =
+        {
+        offsetX + static_cast<float>(vglBBox.min_x()), offsetY + static_cast<float>(minY), 0.0f,
+        offsetX + static_cast<float>(vglBBox.min_x()), offsetY + static_cast<float>(maxY), 0.0f,
+        offsetX + static_cast<float>(vglBBox.max_x()), offsetY + static_cast<float>(maxY), 0.0f,
+        offsetX + static_cast<float>(vglBBox.max_x()), offsetY + static_cast<float>(minY), 0.0f
+        };
+      // Don't currently have ability to add shell (bbox) without setting a
+      // track point, but may at some point.
+      if (trackPointAvailable)
+        {
+        if (update)
+          {
+          track->SetPoint(timeStamp, pt, geoCoord, 4, bbox);
+          }
+        else
+          {
+          track->InsertNextPoint(timeStamp, pt, geoCoord, 4, bbox);
+          }
+        }
+
+#ifdef VPVIEW_ASSIGN_FAKE_TRACK_ATTRIBUTES
+      // assign fake attributes for testing purposes
+      if (count++ % 4 == 0)
+        {
+        switch (attrType++ % 3)
+          {
+          case 0:
+            attrs = vidtk::track_state_attributes::ATTR_ASSOC_FG_SSD |
+                    vidtk::track_state_attributes::ATTR_ASSOC_DA_KINEMATIC |
+                    vidtk::track_state_attributes::ATTR_KALMAN_ESH |
+                    vidtk::track_state_attributes::ATTR_INTERVAL_FORWARD |
+                    vidtk::track_state_attributes::ATTR_LINKING_START;
+            break;
+          case 1:
+            attrs = vidtk::track_state_attributes::ATTR_ASSOC_FG_CSURF |
+                    vidtk::track_state_attributes::ATTR_ASSOC_DA_MULTI_FEATURES |
+                    vidtk::track_state_attributes::ATTR_KALMAN_LVEL |
+                    vidtk::track_state_attributes::ATTR_INTERVAL_BACK |
+                    vidtk::track_state_attributes::ATTR_LINKING_END;
+            break;
+          case 2:
+            attrs = vidtk::track_state_attributes::ATTR_ASSOC_DA_KINEMATIC |
+                    vidtk::track_state_attributes::ATTR_ASSOC_DA_MULTI_FEATURES |
+                    vidtk::track_state_attributes::ATTR_INTERVAL_INIT |
+                    vidtk::track_state_attributes::ATTR_LINKING_START |
+                    vidtk::track_state_attributes::ATTR_LINKING_END;
+            break;
+          }
+        }
+      attrScalars->InsertValue(timeStamp,
+                               static_cast<double>(attrs));
+#else
+      attrScalars->InsertValue(timeStamp,
+                               static_cast<double>((*trkStateIter)->get_attrs()));
+#endif
+      }
+    }
+
+  if (!update)
+    {
+    track->Close();
+    }
+
+  if (newTrack)
+    {
+    if (this->HasOverrideColor)
+      {
+      track->SetColor(this->OverrideColor);
+      }
+    else
+      {
+      double color[3];
+      int typeIndex = track->GetType();
+      if (typeIndex != -1)
+        {
+        // If the track has a valid type, use that to look up a color
+        const vgTrackType& type = this->TrackTypes->GetType(typeIndex);
+        type.GetColor(color[0], color[1], color[2]);
+        track->SetColor(color[0], color[1], color[2]);
+        }
+      else
+        {
+        this->GetDefaultTrackColor(track->GetId(), color);
+        track->SetColor(color);
+        }
+      }
+    this->TrackModel->AddTrack(track);
+    track->FastDelete();
+    }
+
+  this->TrackMap[track] = vidtkTrack;
+}
diff --git a/Applications/VpView/vpVidtkTrackIO.h b/Applications/VpView/vpVidtkTrackIO.h
new file mode 100644
index 00000000..33cf2d09
--- /dev/null
+++ b/Applications/VpView/vpVidtkTrackIO.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpVidtkTrackIO_h
+#define __vpVidtkTrackIO_h
+
+#include "vpTrackIO.h"
+
+#include <tracking_data/track.h>
+
+class vpVidtkReader;
+class vtkVgTrack;
+
+class vpVidtkTrackIO : public vpTrackIO
+{
+public:
+  vpVidtkTrackIO(vpVidtkReader& reader,
+                 vcl_map<vtkVgTrack*, vidtk::track_sptr>& trackMap,
+                 vcl_map<unsigned int, vtkIdType>& sourceIdToModelIdMap,
+                 vtkVgTrackModel* trackModel,
+                 vpTrackIO::TrackStorageMode storageMode,
+                 vpTrackIO::TrackTimeStampMode timeStampMode,
+                 vtkVgTrackTypeRegistry* trackTypes = 0,
+                 vtkMatrix4x4* geoTransform = 0,
+                 vpFrameMap* frameMap = 0);
+
+  virtual ~vpVidtkTrackIO();
+
+  virtual bool ReadTracks();
+
+  virtual bool ImportTracks(vtkIdType idsOffset, float offsetX, float offsetY);
+
+  virtual bool WriteTracks(const char* filename, bool writeSceneElements) const;
+
+  void UpdateTracks(const vcl_vector<vidtk::track_sptr>& tracks,
+                    unsigned int updateStartFrame, unsigned int updateEndFrame);
+
+  virtual bool GetNextValidTrackFrame(vtkVgTrack* track,
+                                      unsigned int startFrame,
+                                      vtkVgTimeStamp& timeStamp) const;
+
+  virtual bool GetPrevValidTrackFrame(vtkVgTrack* track,
+                                      unsigned int startFrame,
+                                      vtkVgTimeStamp& timeStamp) const;
+
+  virtual vtkIdType GetModelTrackId(unsigned int sourceId) const;
+
+protected:
+  const vpVidtkReader& GetReader() const { return this->Reader; }
+
+  virtual unsigned int GetImageHeight() const;
+
+private:
+  void ReadTrack(const vidtk::track_sptr vidtkTrack,
+                 float offsetX = 0.0f, float offsetY = 0.0f,
+                 bool update = false,
+                 unsigned int updateStartFrame = 0,
+                 unsigned int updateEndFrame = 0,
+                 vtkIdType desiredId = -1);
+
+private:
+  vpVidtkReader& Reader;
+  vcl_vector<vidtk::track_sptr> Tracks;
+  vcl_map<vtkVgTrack*, vidtk::track_sptr>& TrackMap;
+  vcl_map<unsigned int, vtkIdType>& SourceIdToModelIdMap;
+};
+
+#endif // __vpVidtkTrackIO_h
diff --git a/Applications/VpView/vpView.cxx b/Applications/VpView/vpView.cxx
new file mode 100644
index 00000000..59c35d00
--- /dev/null
+++ b/Applications/VpView/vpView.cxx
@@ -0,0 +1,3372 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QClipboard>
+#include <QComboBox>
+#include <QDoubleSpinBox>
+#include <QEventLoop>
+#include <QFileDialog>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QSettings>
+#include <QSlider>
+#include <QSplitter>
+#include <QTimer>
+#include <QTreeWidget>
+#include <QVBoxLayout>
+#include <QWidget>
+
+#include "ui_vpView.h"
+
+#include "vpApplication.h"
+#include "vpConfigureDialog.h"
+#include "vpCreateEventDialog.h"
+#include "vpExternalProcessDialog.h"
+#include "vpFilterTypeDelegate.h"
+#include "vpMergeTracksDialog.h"
+#include "vpQtSceneUtils.h"
+#include "vpQtViewer3dDialog.h"
+#include "vpQtViewer3dWidget.h"
+#include "vpSelectTimeIntervalDialog.h"
+#include "vpSettings.h"
+#include "vpTimelineDialog.h"
+#include "vpTrackColorDialog.h"
+#include "vpVersion.h"
+#include "vpView.h"
+#include "vpViewCore.h"
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventFilter.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgTemporalFilters.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentationBase.h>
+
+#include <QVTKWidget.h>
+#include <vtkRenderer.h>
+
+#ifdef ENABLE_QTTESTING
+#include "pqCoreTestUtility.h"
+#endif
+
+#include <vgAboutAction.h>
+#include <vgFileDialog.h>
+#include <vgUnixTime.h>
+
+#include <qtCliArgs.h>
+#include <qtScopedValueChange.h>
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+//-----------------------------------------------------------------------------
+class vpView::vtkInternal
+{
+public:
+  ~vtkInternal()
+    {
+    }
+
+  Ui::vpMainWindow UI;
+  const qtCliArgs* CliArgs;
+
+  QVTKWidget* QVTKMainRenderWidget;
+
+  QStringList ProjectFileNames;
+  QString ConfigFileName;
+
+  QComboBox* eventTypeFilter;
+  bool DisableFilterPresetUpdates;
+
+  QComboBox* executeModeCombo;
+
+  QLabel* Coordinates;
+  QLabel* Gsd;
+  QLabel* FrameDate;
+  QLabel* FrameTime;
+  QLabel* ActivityCount;
+  QLabel* EventCount;
+  QLabel* TrackCount;
+
+  vpSettings::CoordDisplayMode CoordDisplayMode;
+  vpSettings::ImageFilteringMode ImageFilteringMode;
+
+  vtkVgTimeStamp MinFrameOffset;
+
+  QWidget* contextLOD;
+
+  bool TrackUpdateInProgress;
+  QTimer* TrackUpdateTimer;
+
+  bool DataLoaded;
+  bool Seeking;
+  bool Selecting;
+
+  int RenderWindowMouseCoords[2];
+};
+
+// Helper to set up icons
+//-----------------------------------------------------------------------------
+void setupIcon(QAction* action, QString name)
+{
+  action->setIcon(qtUtil::standardActionIcon(name));
+}
+
+class SetScoped
+{
+public:
+  SetScoped(bool& var) : Var(var)
+    {
+    this->Var = true;
+    }
+
+  ~SetScoped()
+    {
+    this->Var = false;
+    }
+
+private:
+  bool& Var;
+};
+
+
+// Constructor
+//-----------------------------------------------------------------------------
+vpView::vpView()
+{
+  this->Internal = new vtkInternal;
+  this->Internal->MinFrameOffset.SetFrameNumber(10);
+  this->Internal->MinFrameOffset.SetTime(5.0e6);
+  this->Internal->TrackUpdateInProgress = false;
+  this->Internal->DataLoaded = false;
+  this->Internal->Seeking = false;
+  this->Internal->Selecting = false;
+  this->Internal->CliArgs = 0;
+  this->Internal->RenderWindowMouseCoords[0] = -1;
+  this->Internal->RenderWindowMouseCoords[1] = -1;
+
+  this->Internal->TrackUpdateTimer = new QTimer(this);
+  connect(this->Internal->TrackUpdateTimer, SIGNAL(timeout()),
+          this, SLOT(updateTracks()));
+
+  this->Internal->UI.setupUi(this);
+
+  // Add dock and toolbar view actions to the view menu
+  QAction* insertBefore = this->Internal->UI.menuView->actions()[0];
+
+  foreach (QDockWidget* dock, this->findChildren<QDockWidget*>())
+    {
+    if (dock->parentWidget() == this)
+      {
+      this->Internal->UI.menuView->insertAction(insertBefore,
+                                                dock->toggleViewAction());
+      }
+    }
+  this->Internal->UI.menuView->insertSeparator(insertBefore);
+
+  foreach (QToolBar* toolbar, this->findChildren<QToolBar*>())
+    {
+    if (toolbar->parentWidget() == this)
+      {
+      this->Internal->UI.menuView->insertAction(insertBefore,
+                                                toolbar->toggleViewAction());
+      }
+    }
+  this->Internal->UI.menuView->insertSeparator(insertBefore);
+
+  // disable render frame until we have data, because otherwise accidental
+  // mouse movement / scrolling could cause crash
+  this->Internal->UI.renderFrame->setEnabled(false);
+  this->Internal->UI.currentFrame->setEnabled(false);
+
+  this->Core = new vpViewCore();
+#ifdef ENABLE_QTTESTING
+  this->Core->setAntialiasing(false);
+#endif // ENABLE_QTTESTING
+
+  // Disable expensive 3d graph update when the window isn't visible
+  this->Core->setGraphRenderingEnabled(false);
+
+  this->loadSettings();
+
+  this->Internal->eventTypeFilter = new QComboBox(this);
+  this->Internal->eventTypeFilter->setInsertPolicy(QComboBox::NoInsert);
+  this->Internal->eventTypeFilter->setSizeAdjustPolicy(QComboBox::AdjustToContents);
+  this->Internal->eventTypeFilter->setEnabled(false);
+  this->Internal->DisableFilterPresetUpdates = false;
+
+  this->Core->setupRenderWidget(this->Internal->UI.renderFrame);
+  this->Core->setSessionView(this->Internal->UI.sessionView);
+
+  QActionGroup* playbackActions = new QActionGroup(this);
+  playbackActions->addAction(this->Internal->UI.actionFastBackward);
+  playbackActions->addAction(this->Internal->UI.actionReverse);
+  playbackActions->addAction(this->Internal->UI.actionPreviousFrame);
+  playbackActions->addAction(this->Internal->UI.actionPause);
+  playbackActions->addAction(this->Internal->UI.actionNextFrame);
+  playbackActions->addAction(this->Internal->UI.actionPlay);
+  playbackActions->addAction(this->Internal->UI.actionFastForward);
+
+  // Set up action icons
+  setupIcon(this->Internal->UI.actionFastBackward, "playback-fast-backward");
+  setupIcon(this->Internal->UI.actionReverse, "playback-play-reverse");
+  setupIcon(this->Internal->UI.actionPreviousFrame, "playback-frame-backward");
+  setupIcon(this->Internal->UI.actionPause, "playback-pause");
+  setupIcon(this->Internal->UI.actionNextFrame, "playback-frame-forward");
+  setupIcon(this->Internal->UI.actionPlay, "playback-play");
+  setupIcon(this->Internal->UI.actionFastForward, "playback-fast-forward");
+
+  // Set window title (i.e. add version number) and icon
+  QString title("%1 %3");
+  title = title.arg(this->windowTitle()).arg(VPVIEW_VERSION_STR);
+  this->setWindowTitle(title);
+  qtUtil::setApplicationIcon("vpView", this);
+
+  // Set up About dialog
+  this->Internal->UI.menuHelp->addAction(new vgAboutAction(this));
+
+  // Set up toolbar widgets
+  QWidget* widget;
+  QVBoxLayout* layout;
+  QLabel* label;
+
+  this->Internal->UI.toolBar->addSeparator();
+  widget = new QWidget(this);
+  layout = new QVBoxLayout(widget);
+  label = new QLabel("Event Filter");
+  label->setAlignment(Qt::AlignCenter);
+  layout->addWidget(this->Internal->eventTypeFilter);
+  layout->addWidget(label);
+  this->Internal->UI.toolBar->addWidget(widget);
+  this->Internal->UI.toolBar->addAction(this->Internal->UI.actionDisplayFullVolume);
+  this->Internal->UI.toolBar->addAction(this->Internal->UI.actionLoop);
+
+  this->Internal->UI.toolBar->addSeparator();
+  this->Internal->UI.toolBar->addAction(this->Internal->UI.actionCreateTrack);
+  this->Internal->UI.toolBar->addAction(this->Internal->UI.actionCreateEvent);
+  this->Internal->UI.toolBar->addAction(this->Internal->UI.actionCreateSceneElement);
+
+  QComboBox* editModeCombo = new QComboBox(this);
+  editModeCombo->setObjectName("editModeCombo");
+  editModeCombo->addItem("Auto");
+  editModeCombo->addItem("Bounding Box");
+  editModeCombo->addItem("Polygon");
+
+  connect(editModeCombo, SIGNAL(currentIndexChanged(int)),
+          this->Core, SLOT(setRegionEditMode(int)));
+
+  widget = new QWidget(this);
+  widget->setObjectName("editModeWidget");
+  layout = new QVBoxLayout(widget);
+  label = new QLabel("Edit Mode");
+  label->setAlignment(Qt::AlignCenter);
+  layout->addWidget(editModeCombo);
+  layout->addWidget(label);
+
+  this->Internal->UI.toolBar->addWidget(widget);
+
+  this->Internal->UI.toolBar->addSeparator();
+
+  this->Internal->executeModeCombo = new QComboBox(this);
+  this->Internal->executeModeCombo->setObjectName("executeModeCombo");
+  this->Internal->executeModeCombo->addItem("FSE Recognition", 0);
+  this->Internal->executeModeCombo->addItem("Scene Learning", 1);
+  this->Internal->executeModeCombo->addItem("Normalcy Anomaly", 2);
+  this->Internal->executeModeCombo->addItem("Activity Learning", 3);
+  this->Internal->executeModeCombo->setCurrentIndex(2);
+  this->Core->setExternalExecuteMode(2);
+
+  this->Internal->UI.toolBar->addWidget(this->Internal->executeModeCombo);
+  this->Internal->UI.toolBar->addAction(this->Internal->UI.actionExecuteExternalProcess);
+
+  connect(this->Internal->executeModeCombo, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(onExecuteModeChanged(int)));
+
+  this->Internal->UI.toolBar->addSeparator();
+  QSlider* contextLODSlider = new QSlider(Qt::Horizontal, this);
+  contextLODSlider->setRange(-10, 10);
+  contextLODSlider->setTickInterval(1);
+  contextLODSlider->setSizePolicy(QSizePolicy::Preferred,
+                                  QSizePolicy::Preferred);
+  this->Internal->contextLOD =
+    vpQtSceneUtils::createContextSlider(contextLODSlider, this);
+  this->Internal->UI.toolBar->addWidget(this->Internal->contextLOD);
+
+  this->Internal->UI.toolBar->addSeparator();
+  this->Internal->UI.toolBar->addAction(this->Internal->UI.actionAutoUpdate);
+
+  // Set up status bar
+  this->Internal->Coordinates = new QLabel;
+  this->Internal->Gsd = new QLabel;
+  this->Internal->FrameDate = new QLabel;
+  this->Internal->FrameTime = new QLabel;
+  this->Internal->ActivityCount = new QLabel;
+  this->Internal->EventCount = new QLabel;
+  this->Internal->TrackCount = new QLabel;
+  this->statusBar()->addWidget(this->Internal->Coordinates);
+  this->statusBar()->addPermanentWidget(this->Internal->Gsd);
+  this->statusBar()->addPermanentWidget(this->Internal->FrameDate);
+  this->statusBar()->addPermanentWidget(this->Internal->FrameTime);
+  this->statusBar()->addPermanentWidget(this->Internal->ActivityCount);
+  this->statusBar()->addPermanentWidget(this->Internal->EventCount);
+  this->statusBar()->addPermanentWidget(this->Internal->TrackCount);
+  this->Internal->Gsd->hide();
+  this->Internal->FrameDate->hide();
+
+  // Set the status bar to a good fixed height. If we don't do this, a second
+  // layout event may occur after the first time the window is shown (Qt bug).
+  this->updateFrameTime();
+  this->updateObjectCounts();
+  this->statusBar()->setFixedHeight(this->statusBar()->sizeHint().height());
+
+  // Show the frame spin box now so that layout doesn't need to change later
+  this->Internal->UI.currentFrame->setFrameNumberRange(0, 0);
+  this->Internal->UI.minTime->hide();
+
+  this->CreateEventDialog = 0;
+  this->TimelineDialog = new vpTimelineDialog(this);
+
+  // Initialize viewer3d dialog.
+  this->Viewer3dDialog = new vpQtViewer3dDialog(this);
+
+  // Graph model widget
+  this->GraphModelWidget = this->Internal->UI.graphModelWidget;
+  this->GraphModelWidget->setApplicationCore(this->Core);
+
+  connect(this->GraphModelWidget, SIGNAL(eventSelected(int)),
+          this, SLOT(selectEvent(int)));
+
+  connect(this->GraphModelWidget, SIGNAL(distanceMeasurementRequested(bool)),
+          this->Core, SLOT(setRulerEnabled(bool)));
+
+  connect(this->Core, SIGNAL(geoDistanceMeasured(double)),
+          this->GraphModelWidget, SLOT(setMeasuredDistance(double)));
+
+  connect(this->GraphModelWidget, SIGNAL(timeIntervalMeasurementRequested()),
+          this, SLOT(pickTimeInterval()));
+
+  connect(this->Core, SIGNAL(graphModelExportRequested(QString)),
+          this->GraphModelWidget, SLOT(exportJson(QString)));
+
+  // Signals for setting up timeline selections
+  connect(this->TimelineDialog, SIGNAL(SelectedObject(int, int)),
+          this, SLOT(onTimelineSelectionChanged(int, int)));
+  connect(this, SIGNAL(eventSelected(int)),
+          this->TimelineDialog, SLOT(SelectEvent(int)));
+
+#ifdef ENABLE_QTTESTING
+  this->TestUtility = new pqCoreTestUtility(this, this->Internal->UI.renderFrame);
+  this->TestUtility->SetDataRootEnvironment("VISGUI_DATA_ROOT");
+  this->TestUtility->AddTestingMenu(this->Internal->UI.menuTools);
+
+  connect(this->TestUtility, SIGNAL(StartedTesting()), SLOT(onTestingStarted()));
+  connect(this->TestUtility, SIGNAL(StoppedTesting()), SLOT(onTestingStopped()));
+#endif
+
+  // Set up action signals and slots
+  connect(this->Internal->UI.actionOpenFile, SIGNAL(triggered()),
+          this->Core, SLOT(openProject()));
+  connect(this->Internal->UI.actionImportProject, SIGNAL(triggered()),
+          this, SLOT(importProject()));
+
+  connect(this->Internal->UI.actionExportTracks,
+          SIGNAL(triggered()), SLOT(exportTracks()));
+  connect(this->Internal->UI.actionExportEvents,
+          SIGNAL(triggered()), SLOT(exportEvents()));
+  connect(this->Internal->UI.actionExportSceneElements,
+          SIGNAL(triggered()), SLOT(exportSceneElements()));
+  connect(this->Internal->UI.actionExportFilters,
+          SIGNAL(triggered()), SLOT(exportFilters()));
+
+  connect(this->Internal->UI.actionImportFilters,
+          SIGNAL(triggered()), this->Core, SLOT(loadFilters()));
+
+  connect(this->Internal->UI.actionExportGraphModel, SIGNAL(triggered()),
+          this->GraphModelWidget, SLOT(exportJson()));
+  connect(this->Internal->UI.actionImportGraphModel, SIGNAL(triggered()),
+          this->GraphModelWidget, SLOT(importJson()));
+
+  connect(this->Internal->UI.actionSaveRenderedImages, SIGNAL(triggered(bool)),
+          this, SLOT(onSaveRenderedImages(bool)));
+
+  connect(this->Internal->UI.actionWebExport, SIGNAL(triggered()),
+          this, SLOT(onWebExport()));
+
+  connect(this->Internal->UI.actionExportImageTimeStamps, SIGNAL(triggered()),
+          this->Core, SLOT(exportImageTimeStampsToFile()));
+
+  connect(this->Internal->UI.actionExit, SIGNAL(triggered()),
+          this, SLOT(exitApp()));
+
+  connect(this->Core, SIGNAL(dataLoaded()), this, SLOT(onDataLoaded()));
+  connect(this->Core, SIGNAL(dataSetChanged()), this, SLOT(onDataChanged()));
+  connect(this->Core, SIGNAL(iconsLoaded()), this, SLOT(onIconsLoaded()));
+  connect(this->Core, SIGNAL(overviewLoaded()), this, SLOT(onOverviewLoaded()));
+  connect(this->Core, SIGNAL(frameChanged()), this, SLOT(onFrameChange()));
+  connect(this->Core, SIGNAL(timeChanged(double)),
+          this, SLOT(onTimeChange(double)));
+  connect(this->Core, SIGNAL(reachedPlayBoundary()), this, SLOT(onReachedPlayBoundary()));
+
+  connect(this->Core, SIGNAL(reinitialized()), this, SLOT(onReinitialized()));
+  connect(this->Core, SIGNAL(frameRendered()), this, SLOT(onFrameRendered()));
+  connect(this->Core, SIGNAL(eventFilterChanged()), this, SLOT(onEventFilterChanged()));
+
+  connect(this->Core, SIGNAL(objectInfoUpdateNeeded()), this, SLOT(updateInfoWidget()));
+
+  connect(this->Core, SIGNAL(projectVisibilityChanged(int, bool)),
+          this->Internal->UI.sessionView, SLOT(SetSessionVisible(int, bool)));
+
+  connect(this->Internal->UI.objectInfoWidget, SIGNAL(ObjectIdChanged(int, int)),
+          this, SLOT(updateObject(int, int)));
+
+  connect(this->Internal->UI.objectInfoWidget, SIGNAL(ObjectTypeChanged(int, int)),
+          this, SLOT(updateObject(int, int)));
+
+  connect(this->Internal->UI.objectInfoWidget, SIGNAL(TypeColorChanged(int, double*)),
+          this, SLOT(updateColorofTracksOfType(int, double*)));
+
+  connect(this->Core, SIGNAL(showStatusMessage(const QString&, int)),
+          this->statusBar(), SLOT(showMessage(const QString&, int)));
+
+  connect(this->Core, SIGNAL(timeBasedIndexingDisabled()),
+          this, SLOT(disableTimeBasedIndexing()));
+
+  connect(this->Core, SIGNAL(playbackStateChanged()),
+          this, SLOT(updatePlaybackState()));
+
+  connect(this->Core, SIGNAL(playbackRateChanged(qreal)),
+          this, SLOT(updatePlaybackRate(qreal)));
+
+  // Frame scrubber and time interval controls
+  connect(this->Internal->UI.currentFrame,
+          SIGNAL(frameNumbersChanged(int, int, bool)),
+          SLOT(onFrameUpdate(int, int, bool)));
+
+  connect(this->Internal->UI.currentFrame,
+          SIGNAL(timesChanged(double, double, bool)),
+          SLOT(onTimeUpdate(double, double, bool)));
+
+  connect(this->Internal->UI.currentFrame,
+          SIGNAL(minFrameNumberChanged(int)),
+          this->Internal->UI.minFrame,
+          SLOT(setValue(int)));
+
+  connect(this->Internal->UI.currentFrame,
+          SIGNAL(minTimeChanged(double)),
+          SLOT(updateMinTime(double)));
+
+  connect(this->Internal->UI.minFrame,
+          SIGNAL(valueChanged(int)),
+          this->Internal->UI.currentFrame,
+          SLOT(setMinFrameNumber(int)));
+
+  connect(this->Internal->UI.minFrameCheckBox,
+          SIGNAL(stateChanged(int)),
+          SLOT(onFrameIntervalEnabled(int)));
+
+  // Filters
+  connect(this->Internal->eventTypeFilter, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(onEventFilterPresetChanged(int)));
+  connect(this->Internal->UI.normalcyFilter, SIGNAL(stateChanged(int, bool)),
+          this, SLOT(onEventFilterVisibilityChanged()));
+
+  connect(this->Core,
+          SIGNAL(filterRegionComplete(vtkPoints*, vtkPoints*,
+                                      const vtkVgTimeStamp*,
+                                      vtkMatrix4x4*, QString, bool)),
+          this,
+          SLOT(onSpatialFilterComplete(vtkPoints*, vtkPoints*,
+                                      const vtkVgTimeStamp*,
+                                      vtkMatrix4x4*, QString, bool)));
+  connect(this->Core,
+          SIGNAL(temporalFilterReady(int, const QString&, int,
+                                     double, double)),
+          this,
+          SLOT(onTemporalFilterReady(int, const QString&, int,
+                                     double, double)));
+
+  // View menu
+  connect(this->Internal->UI.sessionView, SIGNAL(SessionChanged(int)),
+          this, SLOT(onTreeSelectionChanged(int)));
+
+  connect(this->Internal->UI.sessionView, SIGNAL(SelectionChanged(int)),
+          this, SLOT(onTreeSelectionChanged(int)));
+
+  connect(this->Internal->UI.sessionView, SIGNAL(HoverItemChanged(int)),
+          this, SLOT(onTreeHoverItemChanged(int)));
+
+  connect(this->Internal->UI.sessionView, SIGNAL(ItemsChanged()),
+          this, SLOT(updateCore()));
+
+  connect(this->Internal->UI.sessionView,
+          SIGNAL(CreateEvent(int, vtkIdList*, int)),
+          this, SLOT(onCreateEvent(int, vtkIdList*)));
+
+  connect(this->Internal->UI.sessionView, SIGNAL(DeleteEvent(int, int)),
+          this->Core, SLOT(deleteEvent(int, int)));
+
+  connect(this->Internal->UI.sessionView,
+          SIGNAL(SessionVisibilityChanged(int, bool)),
+          this->Core, SLOT(setProjectVisible(int, bool)));
+
+  connect(this->Internal->UI.sessionView, SIGNAL(EditTrack(int, int)),
+          this->Core, SLOT(beginEditingTrack(int)));
+  connect(this->Internal->UI.sessionView, SIGNAL(StopEditingTrack(int)),
+          this->Core, SLOT(stopEditingTrack()));
+  connect(this->Internal->UI.sessionView, SIGNAL(DeleteTrack(int, int)),
+          this->Core, SLOT(deleteTrack(int, int)));
+  connect(this->Internal->UI.sessionView, SIGNAL(SplitTrack(int, int)),
+          this, SLOT(splitTrack(int, int)));
+
+  connect(this->Internal->UI.sessionView,
+          SIGNAL(AddEventsToGraphModel(QList<int>, int)),
+          this, SLOT(addEventsToGraphModel(QList<int>, int)));
+
+  connect(this->Internal->UI.sessionView,
+          SIGNAL(AddTrackEventsToGraphModel(int, int)),
+          this, SLOT(addTrackEventsToGraphModel(int, int)));
+
+  connect(this->Internal->UI.sessionView,
+          SIGNAL(ShowStatusMessage(const QString&, int, int)),
+          this->statusBar(), SLOT(showMessage(const QString&, int)));
+
+  connect(this->Internal->UI.sessionView,
+          SIGNAL(CloseProjectRequested(int)),
+          this, SLOT(closeProject(int)));
+
+  connect(this->Internal->UI.actionShowHideTimelineView, SIGNAL(triggered(bool)),
+          this, SLOT(onShowHideTimelineView(bool)));
+  connect(this->TimelineDialog, SIGNAL(rejected()),
+          this, SLOT(onTimelineDialogClosed()));
+
+  connect(this->Internal->UI.actionShowHideObjectTags, SIGNAL(triggered(bool)),
+          this->Core, SLOT(showHideObjectTags(bool)));
+
+  connect(this->Internal->UI.actionDisplayEventLegend, SIGNAL(triggered(bool)),
+          this, SLOT(onDisplayEventLegend(bool)));
+  connect(this->Internal->UI.actionViewEventIcons, SIGNAL(toggled(bool)),
+          this, SLOT(onDisplayEventIcons(bool)));
+
+  connect(this->Internal->UI.actionViewTracks, SIGNAL(toggled(bool)),
+          this->Core, SLOT(onViewTracks(bool)));
+  connect(this->Internal->UI.actionViewTrackHeads, SIGNAL(toggled(bool)),
+          this->Core, SLOT(onViewTrackHeads(bool)));
+  connect(this->Internal->UI.actionViewEvents, SIGNAL(toggled(bool)),
+          this->Core, SLOT(onViewEvents(bool)));
+  connect(this->Internal->UI.actionViewActivities, SIGNAL(toggled(bool)),
+          this->Core, SLOT(onViewActivities(bool)));
+  connect(this->Internal->UI.actionViewSceneElements, SIGNAL(toggled(bool)),
+          this->Core, SLOT(onViewSceneElements(bool)));
+
+  connect(this->Internal->UI.actionRandomEventColors, SIGNAL(toggled(bool)),
+          this->Core, SLOT(onRandomEventColor(bool)));
+  connect(this->Internal->UI.actionDisplayFullVolume, SIGNAL(toggled(bool)),
+          this->Core, SLOT(onDisplayFullVolume(bool)));
+
+  connect(this->Internal->UI.actionSetTrackTrailLength, SIGNAL(triggered()),
+          this, SLOT(setTrackTrailLength()));
+  connect(this->Internal->UI.actionChangeTrackColors, SIGNAL(triggered()),
+          this, SLOT(changeTrackColors()));
+  connect(this->Internal->UI.actionPreviousAttribute, SIGNAL(triggered()),
+          this->Core, SLOT(previousTrackAttributeGroup()));
+  connect(this->Internal->UI.actionNextAttribute, SIGNAL(triggered()),
+          this->Core, SLOT(nextTrackAttributeGroup()));
+
+  connect(this->Internal->UI.actionViewNormalcyCues, SIGNAL(triggered(bool)),
+          this->Internal->UI.actionViewSwapNormalcyScaling, SLOT(setEnabled(bool)));
+  connect(this->Internal->UI.actionViewNormalcyCues, SIGNAL(triggered(bool)),
+          this->Core, SLOT(onUseNormalcyCues(bool)));
+  connect(this->Internal->UI.actionViewSwapNormalcyScaling, SIGNAL(triggered()),
+          this->Core, SLOT(onSwapNormalcyCues()));
+
+  connect(this->Core, SIGNAL(updateFinished()), this, SLOT(finishTrackUpdate()));
+
+  QActionGroup* iconSizeGroup = new QActionGroup(this);
+  iconSizeGroup->addAction(this->Internal->UI.actionIconSizeSmall);
+  iconSizeGroup->addAction(this->Internal->UI.actionIconSizeMedium);
+  iconSizeGroup->addAction(this->Internal->UI.actionIconSizeLarge);
+  this->onIconSizeChange(iconSizeGroup->checkedAction(), false);
+
+  connect(iconSizeGroup, SIGNAL(triggered(QAction*)), SLOT(onIconSizeChange(QAction*)));
+
+  connect(this->Internal->UI.actionIncreaseIconXOffset, SIGNAL(triggered()),
+          this->Core, SLOT(onIncreaseIconXOffset()));
+  connect(this->Internal->UI.actionDecreaseIconXOffset, SIGNAL(triggered()),
+          this->Core, SLOT(onDecreaseIconXOffset()));
+  connect(this->Internal->UI.actionIncreaseIconYOffset, SIGNAL(triggered()),
+          this->Core, SLOT(onIncreaseIconYOffset()));
+  connect(this->Internal->UI.actionDecreaseIconYOffset, SIGNAL(triggered()),
+          this->Core, SLOT(onDecreaseIconYOffset()));
+
+  connect(this->Internal->UI.actionIncreaseOverlayTransparency, SIGNAL(triggered()),
+          this->Core, SLOT(onIncreaseOverlayTransparency()));
+  connect(this->Internal->UI.actionDecreaseOverlayTransparency, SIGNAL(triggered()),
+          this->Core, SLOT(onDecreaseOverlayTransparency()));
+  connect(this->Internal->UI.actionIncreaseSceneElementTransparency, SIGNAL(triggered()),
+          this->Core, SLOT(onIncreaseSceneElementTransparency()));
+  connect(this->Internal->UI.actionDecreaseSceneElementTransparency, SIGNAL(triggered()),
+          this->Core, SLOT(onDecreaseSceneElementTransparency()));
+  connect(this->Internal->UI.actionDisplayOverview, SIGNAL(triggered(bool)),
+          this, SLOT(onDisplayOverview(bool)));
+  connect(this->Core, SIGNAL(enterAdjudicationMode()),
+          this, SLOT(onEnterAdjudicationMode()));
+  connect(this->Internal->UI.actionAdjudicationMode, SIGNAL(triggered(bool)),
+          this, SLOT(toggleAdjudicationMode(bool)));
+  connect(this->Core, SIGNAL(followTrackChange(int)),
+          this, SLOT(onFollowTrackChange(int)));
+  connect(this->Internal->UI.actionExitFollowMode, SIGNAL(triggered()),
+          this, SLOT(onExitFollowTrack()));
+
+  // Display options
+  QActionGroup* eventExpireGroup = new QActionGroup(this);
+  eventExpireGroup->addAction(this->Internal->UI.actionShowEventsUntilEventEnd);
+  eventExpireGroup->addAction(this->Internal->UI.actionShowEventsUntilTrackEnd);
+  this->onEventExpirationModeChange(eventExpireGroup->checkedAction(), false);
+
+  connect(eventExpireGroup,
+          SIGNAL(triggered(QAction*)),
+          SLOT(onEventExpirationModeChange(QAction*)));
+
+  connect(this->Internal->UI.actionSetFrameOffset, SIGNAL(triggered()),
+          this, SLOT(setFrameOffset()));
+
+  // Playback menu
+  connect(this->Internal->UI.actionFastBackward, SIGNAL(triggered(bool)),
+          this, SLOT(onFastBackward()));
+  connect(this->Internal->UI.actionReverse, SIGNAL(triggered(bool)),
+          this, SLOT(onReversePause()));
+  connect(this->Internal->UI.actionPreviousFrame, SIGNAL(triggered()),
+          this->Core, SLOT(prevFrame()));
+  connect(this->Internal->UI.actionPause, SIGNAL(triggered(bool)),
+          this, SLOT(onPause()));
+  connect(this->Internal->UI.actionNextFrame, SIGNAL(triggered()),
+          this->Core, SLOT(nextFrame()));
+  connect(this->Internal->UI.actionPlay, SIGNAL(triggered(bool)),
+          this, SLOT(onPlayPause()));
+  connect(this->Internal->UI.actionFastForward, SIGNAL(triggered(bool)),
+          this, SLOT(onFastForward()));
+
+  connect(this->Internal->UI.actionLoop, SIGNAL(toggled(bool)),
+          this, SLOT(onLoopToggle(bool)));
+
+  // MainWindow event.
+  // @NOTE: Using Qt::QueuedConnection to delay invoking the slot. This is important
+  // as if we don't do this then the viewport size on the renderer and others
+  // don't get updated resulting in wrong location of legend.
+  connect(this, SIGNAL(windowSizeChanged(int, int)),
+          this->Core, SLOT(onResize(int, int)),
+          Qt::QueuedConnection);
+
+  this->Internal->UI.renderFrame->installEventFilter(this);
+
+  // AOI outline.
+  connect(this->Internal->UI.actionDisplayAOIOutline, SIGNAL(triggered(bool)),
+          this, SLOT(onDisplayAOIOutline(bool)));
+
+  // Handle warning / errors.
+  connect(this->Core,
+          SIGNAL(criticalError(QString)), SLOT(onCriticalError(QString)));
+  connect(this->Core,
+          SIGNAL(warningError(QString)), SLOT(onWarningError(QString)));
+
+  // Configure dialog.
+  connect(this->Internal->UI.actionConfigure, SIGNAL(triggered()),
+          this, SLOT(onShowConfigureDialog()));
+
+  // External Process dialog.
+  connect(this->Internal->UI.actionExternalProcess, SIGNAL(triggered()),
+          this, SLOT(onShowExternalProcessDialog()));
+
+  // Camera
+  connect(this->Internal->UI.actionViewportZoomExtents, SIGNAL(triggered()),
+          this->Core, SLOT(resetView()));
+  connect(this->Internal->UI.actionViewportZoomAOI, SIGNAL(triggered()),
+          this->Core, SLOT(resetToAOIView()));
+  connect(this->Internal->UI.actionViewportBookmark, SIGNAL(triggered()),
+          this, SLOT(bookmarkViewport()));
+  connect(this->Internal->UI.actionViewportRestore, SIGNAL(triggered()),
+          this->Core, SLOT(restoreCameraPosition()));
+  connect(this->Internal->UI.actionViewportCopyViewExtentsToClipboard, SIGNAL(triggered()),
+          this, SLOT(copyViewportExtentsToClipboard()));
+  connect(this->Internal->UI.actionViewportCopyExtendedInfoToClipboard, SIGNAL(triggered()),
+          this, SLOT(copyExtendedInfoToClipboard()));
+
+  //  3D View.
+  connect(this->Internal->UI.action3DView, SIGNAL(triggered(bool)), this,
+          SLOT(onShow3dView(bool)));
+  connect(this->Viewer3dDialog, SIGNAL(rejected()), this,
+          SLOT(onHide3dView()));
+
+  // Object panel display requests.
+  connect(this->Internal->UI.sessionView, SIGNAL(DisplayActivities(bool)),
+          this->Internal->UI.actionViewActivities, SLOT(setChecked(bool)));
+  connect(this->Internal->UI.sessionView, SIGNAL(DisplayEvents(bool)),
+          this->Internal->UI.actionViewEvents, SLOT(setChecked(bool)));
+  connect(this->Internal->UI.sessionView, SIGNAL(DisplayTracks(bool)),
+          this->Internal->UI.actionViewTracks, SLOT(setChecked(bool)));
+  connect(this->Internal->UI.sessionView, SIGNAL(DisplayTrackHeads(bool)),
+          this->Internal->UI.actionViewTrackHeads, SLOT(setChecked(bool)));
+  connect(this->Internal->UI.sessionView, SIGNAL(DisplaySceneElements(bool)),
+          this->Internal->UI.actionViewSceneElements, SLOT(setChecked(bool)));
+
+  // Spatial filter dock
+  this->Internal->UI.spatialFilterTree->sortItems(0, Qt::AscendingOrder);
+  connect(this->Internal->UI.spatialFilterTree,
+          SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          SLOT(spatialFilterChanged(QTreeWidgetItem*)));
+  connect(this->Internal->UI.actionSpatialFilterAdd,
+          SIGNAL(triggered(bool)), SLOT(onCreateNewSpatialFilter(bool)));
+  connect(this->Internal->UI.actionSpatialFilterRemoveSelected,
+          SIGNAL(triggered(bool)), SLOT(onRemoveSelectedSpatialFilters()));
+  connect(this->Internal->UI.actionSpatialFilterRemoveAll,
+          SIGNAL(triggered(bool)), SLOT(onRemoveAllSpatialFilters()));
+
+  // Temporal filter dock
+  this->Internal->UI.temporalFilterTree->sortItems(0, Qt::AscendingOrder);
+
+  vpFilterTypeDelegate* delegate =
+    new vpFilterTypeDelegate(this->Internal->UI.temporalFilterTree);
+  this->Internal->UI.temporalFilterTree->setItemDelegateForColumn(1, delegate);
+
+  connect(this->Internal->UI.temporalFilterTree,
+          SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          SLOT(temporalFilterChanged(QTreeWidgetItem*, int)));
+  connect(this->Internal->UI.actionTemporalFilterAdd,
+          SIGNAL(triggered(bool)), SLOT(onAddTemporalFilter()));
+  connect(this->Internal->UI.actionTemporalFilterSetStart,
+          SIGNAL(triggered(bool)), SLOT(onTemporalFilterSetStart()));
+  connect(this->Internal->UI.actionTemporalFilterSetEnd,
+          SIGNAL(triggered(bool)), SLOT(onTemporalFilterSetEnd()));
+  connect(this->Internal->UI.actionTemporalFilterRemoveSelected,
+          SIGNAL(triggered(bool)), SLOT(onRemoveSelectedTemporalFilters()));
+  connect(this->Internal->UI.actionTemporalFilterRemoveAll,
+          SIGNAL(triggered(bool)), SLOT(onRemoveAllTemporalFilters()));
+  connect(this->Core, SIGNAL(removeAllFilters()),
+          this, SLOT(onRemoveAllFilters()));
+
+  // Annotation tools
+  connect(this->Internal->UI.actionCreateTrack, SIGNAL(toggled(bool)),
+          this, SLOT(createTrack(bool)));
+  connect(this->Internal->UI.actionCreateEvent, SIGNAL(toggled(bool)),
+          this, SLOT(createEvent(bool)));
+  connect(this->Internal->UI.actionCreateSceneElement, SIGNAL(toggled(bool)),
+          this, SLOT(createSceneElement(bool)));
+  connect(this->Internal->UI.actionMergeTracks, SIGNAL(toggled(bool)),
+          this, SLOT(mergeTracks(bool)));
+
+  connect(this->Core, SIGNAL(stoppedEditingTrack()),
+          this, SLOT(stopCreatingTrack()));
+
+  // Streaming mode
+  connect(this->Internal->UI.actionAutoUpdate, SIGNAL(toggled(bool)),
+          this, SLOT(setAutoUpdateEnabled(bool)));
+
+  // Misc status bar stuff
+  connect(this->Core,
+          SIGNAL(mouseMoved(int, int)),
+          SLOT(handleRenderWindowMouseMove(int, int)));
+  connect(this->Internal->UI.actionExecuteExternalProcess, SIGNAL(triggered()),
+          this, SLOT(executeExternalProcess()));
+  connect(this->Core, SIGNAL(exportFilters(QString, bool)),
+          this, SLOT(exportFilters(QString, bool)));
+
+  // Get notifications of config changes
+  connect(vpApplication::instance(),
+          SIGNAL(settingsChanged(vpSettings::SettingsKeys)),
+          SLOT(onSettingsChanged()));
+
+  // Set default dock visibility.
+  this->setupDock();
+
+  // Connect context level of detail controller.
+  connect(contextLODSlider, SIGNAL(valueChanged(int)),
+          this, SLOT(onContextLODChanged(int)));
+
+  // Restore window state and geometry.
+  QSettings settings(QSettings::NativeFormat, QSettings::UserScope,
+                     qApp->organizationName(), qApp->applicationName());
+  settings.beginGroup("Window");
+  this->restoreGeometry(settings.value("geometry").toByteArray());
+  this->restoreState(settings.value("state").toByteArray());
+  settings.endGroup();
+}
+
+//-----------------------------------------------------------------------------
+vpView::~vpView()
+{
+#ifdef ENABLE_QTTESTING
+  delete this->TestUtility;
+#endif
+  delete this->Core;
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vpView::closeEvent(QCloseEvent* e)
+{
+  // Save window state and geometry.
+  QSettings settings(QSettings::NativeFormat, QSettings::UserScope,
+                     qApp->organizationName(), qApp->applicationName());
+  settings.beginGroup("Window");
+  settings.setValue("state", this->saveState());
+  settings.setValue("geometry", this->saveGeometry());
+  settings.endGroup();
+
+  QWidget::closeEvent(e);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onDataLoaded()
+{
+  this->resetFrameScrubberConfiguration();
+
+  this->Internal->UI.menuCamera->setEnabled(true);
+  this->Internal->UI.menuEventDisplay->setEnabled(true);
+  this->Internal->UI.actionRandomEventColors->setEnabled(true);
+  this->Internal->UI.actionChangeTrackColors->setEnabled(true);
+  this->Internal->UI.actionPreviousAttribute->setEnabled(true);
+  this->Internal->UI.actionNextAttribute->setEnabled(true);
+  this->Internal->UI.actionDisplayFullVolume->setEnabled(true);
+  this->Internal->UI.actionViewNormalcyCues->setEnabled(true);
+
+  this->Internal->UI.actionDisplayAOIOutline->setEnabled(true);
+
+  // By default it is on.
+  // FIXME:
+  this->Internal->UI.actionDisplayAOIOutline->setChecked(true);
+
+  this->Internal->UI.actionShowHideTimelineView->setEnabled(true);
+  this->Internal->UI.actionViewportBookmark->setEnabled(true);
+
+  this->Internal->UI.actionCreateTrack->setEnabled(true);
+  this->Internal->UI.actionCreateEvent->setEnabled(true);
+  this->Internal->UI.actionCreateSceneElement->setEnabled(true);
+  this->Internal->UI.actionMergeTracks->setEnabled(true);
+
+  this->Internal->UI.actionExportTracks->setEnabled(true);
+  this->Internal->UI.actionExportEvents->setEnabled(true);
+  this->Internal->UI.actionExportSceneElements->setEnabled(true);
+  this->Internal->UI.actionExportFilters->setEnabled(true);
+  this->Internal->UI.actionImportFilters->setEnabled(true);
+
+  this->Internal->UI.actionImportProject->setEnabled(true);
+  this->Internal->UI.actionWebExport->setEnabled(true);
+  this->Internal->UI.actionExportImageTimeStamps->setEnabled(true);
+
+  this->Internal->UI.actionSetFrameOffset->setEnabled(
+    !this->Core->getUsingTimeStampData());
+
+  this->Internal->UI.actionViewTracks->setEnabled(true);
+  this->Internal->UI.actionViewTrackHeads->setEnabled(true);
+  this->Internal->UI.pvoFilter->setEnabled(true);
+
+  this->Internal->UI.actionViewEvents->setEnabled(true);
+  this->Internal->UI.normalcyFilter->setEnabled(true);
+  this->Internal->eventTypeFilter->setEnabled(true);
+
+  this->Internal->UI.actionViewActivities->setEnabled(true);
+  this->Internal->UI.actionViewSceneElements->setEnabled(true);
+
+  this->Internal->UI.saliencyFilter->setEnabled(true);
+
+  // display all activity types
+  this->Internal->UI.saliencyFilter->setGroupState(0, true);
+
+  this->Internal->UI.actionDisplayEventLegend->setEnabled(true);
+
+  // enable viewing of various event types
+  this->Internal->UI.normalcyFilter->setGroupState(0, true);
+  // and finally, enable the renderFrame and slider / current frame controls
+  this->Internal->UI.renderFrame->setEnabled(true);
+  this->Internal->UI.currentFrame->setEnabled(true);
+  this->Internal->UI.minFrameCheckBox->setEnabled(true);
+
+  this->Internal->UI.actionSpatialFilterAdd->setEnabled(true);
+
+  this->postDataLoaded();
+
+  // Initialize the normalcy map widget.
+  this->Core->setupNormalcyMapsFilters(this->Internal->UI.normalcyMapsFilter);
+
+  this->Core->UpdateEventDisplayStates(true);
+
+  // Now is a good time to setup 3d view widget.
+  this->Core->setup3dWidget(this->Viewer3dDialog->getViewer3dWidget());
+
+  // Update UI components.
+  this->updateUI();
+
+  this->updateObjectCounts();
+
+  // Perform the initial streaming update
+  if (this->Internal->CliArgs->isSet("streaming") &&
+      this->Internal->UI.actionAutoUpdate->isChecked())
+    {
+    this->updateTracks();
+    this->Internal->TrackUpdateTimer->start();
+    }
+
+  this->Core->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onDataChanged()
+{
+  this->updateFrameScrubberRange();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onIconsLoaded()
+{
+  // Now we can enable the option to display event icons.
+  this->Internal->UI.actionViewEventIcons->setEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onOverviewLoaded()
+{
+  this->Internal->UI.actionDisplayOverview->setEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onEnterAdjudicationMode()
+{
+  this->Internal->UI.actionAdjudicationMode->setEnabled(true);
+  this->Internal->UI.actionAdjudicationMode->setChecked(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onFollowTrackChange(int trackId)
+{
+  this->Internal->UI.actionExitFollowMode->setEnabled(trackId != -1);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onExitFollowTrack()
+{
+  this->Core->setIdOfTrackToFollow(-1);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::toggleAdjudicationMode(bool vtkNotUsed(state))
+{
+  this->Internal->UI.actionAdjudicationMode->setEnabled(false);
+  this->Core->exitAdjudicationMode();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTreeHoverItemChanged(int sessionId)
+{
+  vgItemInfo info;
+  if (!this->Internal->UI.sessionView->GetHoveredItemInfo(info))
+    {
+    this->Core->hideAnnotation();
+    return;
+    }
+
+  this->Core->showAnnotation(sessionId, info.Type, info.Id);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateObject(int objectType, int id)
+{
+  this->updateEverything();
+  this->Internal->UI.sessionView->SelectItem(objectType, id);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateColorofTracksOfType(int typeIndex, double *rgb)
+{
+  this->Core->updateColorofTracksOfType(typeIndex, rgb);
+  this->Core->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateCore()
+{
+  this->Core->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateEverything()
+{
+  this->rebuildObjectViews();
+  this->Core->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTreeSelectionChanged(int sessionId)
+{
+  SetScoped ss(this->Internal->Selecting);
+
+  this->Core->onShowObjectInfo(sessionId, this->Internal->UI.objectInfoWidget);
+  this->updateInfoWidget();
+
+  vgItemInfo info;
+  if (!this->Internal->UI.sessionView->GetSelectedItemInfo(info) ||
+      info.Type != vgObjectTypeDefinitions::Event)
+    {
+    // Clear selection
+    this->GraphModelWidget->selectEvent(-1);
+    }
+  else
+    {
+    this->GraphModelWidget->selectEvent(info.Id);
+    }
+
+  this->Core->setTrackSelection(
+    this->Internal->UI.sessionView->GetSelectedItems(
+      vgObjectTypeDefinitions::Track), sessionId);
+
+  this->Core->setEventSelection(
+    this->Internal->UI.sessionView->GetSelectedItems(
+      vgObjectTypeDefinitions::Event), sessionId);
+
+  if (info.Type == vgObjectTypeDefinitions::SceneElement)
+    {
+    this->Core->setTrackSelection(
+      this->Internal->UI.sessionView->GetSelectedItems(
+      vgObjectTypeDefinitions::SceneElement), sessionId);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateInfoWidget()
+{
+  vgItemInfo info;
+  if (!this->Internal->UI.sessionView->GetSelectedItemInfo(info))
+    {
+    this->Internal->UI.objectInfoWidget->ShowEmptyPage();
+    return;
+    }
+
+  switch (info.Type)
+    {
+    case vgObjectTypeDefinitions::Activity:
+      this->Internal->UI.objectInfoWidget->ShowActivityInfo(info.Id);
+      break;
+    case vgObjectTypeDefinitions::Event:
+      this->Internal->UI.objectInfoWidget->ShowEventInfo(
+        info.Id,
+        info.ParentId,
+        info.Index);
+      // select the event in the timeline
+      if (this->TimelineDialog->isVisible())
+        {
+        emit this->eventSelected(info.Id);
+        }
+      break;
+    case vgObjectTypeDefinitions::Track:
+      this->Internal->UI.objectInfoWidget->ShowTrackInfo(
+        info.Id,
+        info.ParentId,
+        info.Index);
+      break;
+    case vgObjectTypeDefinitions::SceneElement:
+      this->Internal->UI.objectInfoWidget->ShowSceneElementInfo(
+        info.Id);
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::rebuildObjectViews()
+{
+  this->Internal->UI.sessionView->Update(true);
+  this->updateInfoWidget();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onCreateEvent(int type, vtkIdList* ids)
+{
+  int session = this->Internal->UI.sessionView->GetCurrentSession();
+  int id = this->Core->createEvent(type, ids, session);
+
+  // show the newly created event
+  if (id >= 0)
+    {
+    this->Core->getEventModel(session)->GetEvent(id)->ClearFlags(
+      vtkVgEvent::EF_Modifiable);
+
+    this->Internal->UI.sessionView->AddAndSelectItem(
+      vgObjectTypeDefinitions::Event, id);
+
+    // focus it in the viewport
+    this->Internal->UI.sessionView->FocusItem();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTimelineSelectionChanged(int type, int id)
+{
+  this->Internal->UI.sessionView->SelectItem(type, id);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onShowHideTimelineView(bool show)
+{
+  this->Core->showHideTimelineDialog(this->TimelineDialog, show);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTimelineDialogClosed()
+{
+  this->Internal->UI.actionShowHideTimelineView->setChecked(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onDisplayEventLegend(bool state)
+{
+  this->Internal->UI.actionDisplayEventLegend->setChecked(state);
+  this->Core->showHideEventLegend(state, true);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onDisplayEventIcons(bool state)
+{
+  this->Internal->UI.actionViewEventIcons->setChecked(state);
+  this->Core->onViewEventIcons(state);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onFrameChange()
+{
+  // If the frame changed as a result of scrubbing there is nothing to do
+  if (this->Internal->Seeking)
+    {
+    return;
+    }
+
+  if (this->Core->getUsingTimeBasedIndexing())
+    {
+    // Wait for the more accurate timeChanged() signal
+    return;
+    }
+
+  // Frame numbers only
+  int frameNumber = this->Core->getCurrentFrameNumber();
+
+  // Make sure the max is high enough let us change the value.
+  if (this->Internal->UI.minFrame->maximum() < frameNumber)
+    {
+    this->Internal->UI.minFrame->setMaximum(frameNumber);
+    }
+
+  // Maintain the existing time interval if possible.
+  if (this->Internal->UI.minFrameCheckBox->checkState() == Qt::Checked)
+    {
+    int minFrame =
+      std::max<int>(this->Core->getMinimumFrameNumber(),
+                    frameNumber -
+                    this->Internal->MinFrameOffset.GetFrameNumber());
+
+      {
+      qtScopedBlockSignals bs(this->Internal->UI.minFrame);
+      this->Internal->UI.minFrame->setValue(minFrame);
+      }
+      {
+      qtScopedBlockSignals bs(this->Internal->UI.currentFrame);
+      this->Internal->UI.currentFrame->setFrameNumbers(minFrame, frameNumber);
+      }
+    }
+  else
+    {
+      {
+      qtScopedBlockSignals bs(this->Internal->UI.minFrame);
+      this->Internal->UI.minFrame->setValue(frameNumber);
+      }
+      {
+      qtScopedBlockSignals bs(this->Internal->UI.currentFrame);
+      this->Internal->UI.currentFrame->setFrameNumber(frameNumber);
+      }
+    }
+
+  // Make sure low end of the interval goes no higher than the current frame.
+  this->Internal->UI.minFrame->setMaximum(frameNumber);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTimeChange(double now)
+{
+  if (!this->Core->getUsingTimeBasedIndexing())
+    {
+    return;
+    }
+
+  // Update the time controls to match the new core time, which is most likely
+  // not the same as the current frame's timestamp.
+  if (this->Internal->UI.minFrameCheckBox->checkState() == Qt::Checked)
+    {
+    double minTime =
+      std::max(this->Core->getMinimumTime(),
+               now - this->Internal->MinFrameOffset.GetTime());
+
+    qtScopedBlockSignals bs(this->Internal->UI.currentFrame);
+    this->Internal->UI.currentFrame->setTimes(minTime, now);
+    this->updateMinTime(minTime);
+    }
+  else
+    {
+    qtScopedBlockSignals bs(this->Internal->UI.currentFrame);
+    this->Internal->UI.currentFrame->setTime(now);
+    this->updateMinTime(now);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onReachedPlayBoundary()
+{
+  if (!this->Internal->CliArgs->isSet("streaming"))
+    {
+    this->Internal->UI.actionPause->setChecked(true);
+    this->Core->onPause();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onPlayPause()
+{
+  if (this->Core->isPlaying() && this->Core->getPlaybackRate() == 1.0)
+    {
+    this->Internal->UI.actionPause->setChecked(true);
+    this->Core->onPause();
+    }
+  else
+    {
+    this->Core->setPlaybackRate(1.0);
+    this->Core->onPlay();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onPause()
+{
+  if (this->Core->isPlaying())
+    {
+    this->Internal->UI.actionPause->setChecked(true);
+    this->Core->onPause();
+    }
+  else
+    {
+    // Resume in the same direction we were previously playing
+    if (this->Core->getPlaybackRate() < 0.0)
+      {
+      this->Internal->UI.actionReverse->setChecked(true);
+      this->Core->setPlaybackRate(-1.0);
+      }
+    else
+      {
+      this->Internal->UI.actionPlay->setChecked(true);
+      this->Core->setPlaybackRate(1.0);
+      }
+    this->Core->onPlay();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onReversePause()
+{
+  if (this->Core->isPlaying() && this->Core->getPlaybackRate() == -1.0)
+    {
+    this->Internal->UI.actionPause->setChecked(true);
+    this->Core->onPause();
+    }
+  else
+    {
+    this->Core->setPlaybackRate(-1.0);
+    this->Core->onPlay();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onFastForward()
+{
+  double rate = this->Core->getPlaybackRate();
+  if (rate > 1.0)
+    {
+    rate = qMin(rate * 2.0, 32.0);
+    this->Core->setPlaybackRate(rate);
+    }
+  else
+    {
+    this->Core->setPlaybackRate(2.0);
+    }
+  this->Core->onPlay();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onFastBackward()
+{
+  double rate = this->Core->getPlaybackRate();
+  if (rate < -1.0)
+    {
+    rate = qMax(rate * 2.0, -32.0);
+    this->Core->setPlaybackRate(rate);
+    }
+  else
+    {
+    this->Core->setPlaybackRate(-2.0);
+    }
+  this->Core->onPlay();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onLoopToggle(bool state)
+{
+  this->Internal->UI.actionLoop->setChecked(state);
+  this->Core->setLoop(state);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onFrameUpdate(int minFrameNumber, int frameNumber, bool resized)
+{
+  int frameNumberOffset = this->Core->getUseZeroBasedFrameNumbers() ? 0 : 1;
+  if (frameNumber >= frameNumberOffset)
+    {
+    if (this->Core->getObjectExpirationTime().IsValid())
+      {
+      // Update the offset if this represents an intentional change to the
+      // interval size (such as when dragging a single handle of the frame
+      // slider).
+      vtkVgTimeStamp offsetTimeStamp;
+      int frameDelta = frameNumber - minFrameNumber;
+      offsetTimeStamp.SetFrameNumber(frameDelta);
+      offsetTimeStamp.SetTime(1e6 * (frameDelta / this->Core->getRequestFPS()));
+      if (resized)
+        {
+        this->Internal->MinFrameOffset = offsetTimeStamp;
+        }
+      this->Core->setObjectExpirationTime(offsetTimeStamp);
+      }
+
+    vtkVgTimeStamp time;
+    time.SetFrameNumber(frameNumber - frameNumberOffset);
+    SetScoped ss(this->Internal->Seeking);
+    this->Core->setCurrentTime(time);
+    this->Core->updateScene();
+    }
+  else
+    {
+    qErrnoWarning("Frame number cannot be less that one. Possibly data import failed.");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTimeUpdate(double minTime, double time, bool resized)
+{
+  if (this->Core->getObjectExpirationTime().IsValid())
+    {
+    vtkVgTimeStamp offsetTimeStamp;
+    offsetTimeStamp.SetTime(time - minTime);
+    offsetTimeStamp.SetFrameNumber(qRound((time - minTime) *
+                                          this->Core->getRequestFPS() / 1e6));
+    if (resized)
+      {
+      this->Internal->MinFrameOffset = offsetTimeStamp;
+      }
+    this->Core->setObjectExpirationTime(offsetTimeStamp);
+    }
+
+  SetScoped ss(this->Internal->Seeking);
+  this->Core->setCurrentTime(vtkVgTimeStamp(time));
+  this->Core->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateMinTime(double time)
+{
+  this->Internal->UI.minTime->setText(vgUnixTime(time).timeString());
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onFrameIntervalEnabled(int state)
+{
+  if (this->Core->getUsingTimeBasedIndexing())
+    {
+    double currTime = this->Core->getCurrentFrameTime();
+    if (state == Qt::Checked)
+      {
+      double val =
+        std::max(this->Core->getMinimumTime(),
+                 currTime - this->Internal->MinFrameOffset.GetTime());
+      this->Internal->UI.minTime->setEnabled(true);
+      this->updateMinTime(val);
+      this->Internal->UI.currentFrame->setIntervalModeEnabled(true);
+      this->Internal->UI.currentFrame->setMinTime(val);
+      vtkVgTimeStamp offset;
+      offset.SetTime(currTime - val);
+      this->Core->setObjectExpirationTime(offset);
+      }
+    else
+      {
+      this->Internal->UI.minTime->setEnabled(false);
+      this->updateMinTime(currTime);
+      this->Internal->UI.currentFrame->setIntervalModeEnabled(false);
+      this->Core->setObjectExpirationTime(vtkVgTimeStamp());
+      }
+    }
+  else
+    {
+    int currFrame = this->Core->getCurrentFrameNumber();
+    if (state == Qt::Checked)
+      {
+      int val =
+        std::max<int>(this->Core->getMinimumFrameNumber(),
+                      currFrame -
+                      this->Internal->MinFrameOffset.GetFrameNumber());
+      this->Internal->UI.minFrame->setEnabled(true);
+      this->Internal->UI.minFrame->setValue(val);
+      this->Internal->UI.currentFrame->setIntervalModeEnabled(true);
+      this->Internal->UI.currentFrame->setMinFrameNumber(val);
+      vtkVgTimeStamp offset;
+      offset.SetFrameNumber(currFrame - val);
+      offset.SetTime(1e6 * ((currFrame - val) / this->Core->getRequestFPS()));
+      this->Core->setObjectExpirationTime(offset);
+      }
+    else
+      {
+      this->Internal->UI.minFrame->setEnabled(false);
+      this->Internal->UI.minFrame->setValue(currFrame);
+      this->Internal->UI.currentFrame->setIntervalModeEnabled(false);
+      this->Core->setObjectExpirationTime(vtkVgTimeStamp());
+      }
+    }
+
+  this->Core->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onIconSizeChange(QAction* sizeAction, bool render)
+{
+  int size;
+  if (sizeAction == this->Internal->UI.actionIconSizeSmall)
+    {
+    size = 16;
+    }
+  else if (sizeAction == this->Internal->UI.actionIconSizeLarge)
+    {
+    size = 64;
+    }
+  else
+    {
+    size = 32;
+    }
+
+  this->Core->setIconSize(size, render);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onDisplayOverview(bool state)
+{
+  this->Internal->UI.actionDisplayOverview->setChecked(state);
+  this->Core->setOverviewDisplayState(state);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onDisplayAOIOutline(bool state)
+{
+  this->Internal->UI.actionDisplayAOIOutline->setChecked(state);
+  this->Core->setDisplayAOIOutlineState(state);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onCriticalError(const QString& errorMsg)
+{
+  switch (QMessageBox::critical(0, "vpView", errorMsg))
+    {
+    case QMessageBox::Ok:
+      {
+      break;
+      }
+    default:
+      {
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onWarningError(const QString& warningMsg)
+{
+  switch (QMessageBox::warning(0, "vpView", warningMsg))
+    {
+    case QMessageBox::Ok:
+      {
+      break;
+      }
+    default:
+      {
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onShowConfigureDialog()
+{
+  vpConfigureDialog dialog(this);
+  dialog.setTrackAttributes(this->Core->getTrackAttributes());
+
+  if (dialog.exec() == QDialog::Accepted)
+    {
+    // Do nothing.
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onShowExternalProcessDialog()
+{
+  if (this->Core->isExternalProcessRunning())
+    {
+    QMessageBox::warning(this, "Warning!",
+                         "Can only execute one process at a time!");
+    return;
+    }
+
+  vpExternalProcessDialog dialog(this);
+  if (dialog.exec() == QDialog::Accepted)
+    {
+    this->Core->startExternalProcess(dialog.getProgram(),
+                                     dialog.getArguments(),
+                                     dialog.getIOPath());
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+void vpView::executeExternalProcess()
+{
+  if (this->Core->isExternalProcessRunning())
+    {
+    QMessageBox::warning(this, "Warning!",
+                         "Can only execute one process at a time!");
+    return;
+    }
+
+  vpSettings settings;
+  this->Core->startExternalProcess(settings.externalProcessProgram(),
+                                   settings.externalProcessArgs(),
+                                   settings.externalProcessIOPath());
+}
+
+//-----------------------------------------------------------------------------
+bool vpView::eventFilter(QObject* obj, QEvent* event)
+{
+  switch (event->type())
+    {
+    default:
+      break;
+    case QEvent::Resize:
+      {
+      emit this->windowSizeChanged(this->Internal->UI.renderFrame->width(),
+                                   this->Internal->UI.renderFrame->height());
+      break;
+      }
+    case QEvent::Leave:
+      {
+      this->updateGsdDisplay();
+      this->updateCoordinateDisplay();
+      this->Core->mouseLeftViewport();
+      break;
+      }
+    case QEvent::Enter:
+      {
+      this->Core->mouseEnteredViewport();
+      break;
+      }
+    }
+
+  return QObject::eventFilter(obj, event);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::initialize(const qtCliArgs* cliArgs)
+{
+  this->Internal->CliArgs = cliArgs;
+  // Defer command line parsing until the event loop has been entered.
+  QMetaObject::invokeMethod(this, "onInitialize", Qt::QueuedConnection);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onInitialize()
+{
+  if (this->Internal->CliArgs)
+    {
+#ifdef ENABLE_QTTESTING
+    this->TestUtility->ParseCommandLine(*this->Internal->CliArgs);
+#endif
+    this->parseCommandLine(*this->Internal->CliArgs);
+    }
+
+  this->onLoopToggle(this->Internal->UI.actionLoop->isChecked());
+
+  bool streaming = this->Internal->CliArgs->isSet("streaming");
+  this->Core->setStreamingEnabled(streaming);
+
+  this->Internal->UI.actionAutoUpdate->setEnabled(streaming);
+
+  this->processCommandLine();
+
+  this->Core->setupEventConfig(this->Internal->UI.eventConfig);
+  this->Core->setupActivityConfig(this->Internal->UI.activityConfig);
+
+  // Update graph model
+  this->GraphModelWidget->initializeUi();
+  this->GraphModelWidget->loadEventTypes(this->Core->getEventTypeRegistry());
+  this->GraphModelWidget->loadPrimitiveTypes();
+  this->GraphModelWidget->loadAttributeTypes();
+  this->GraphModelWidget->setSpatialOverlayRenderer(
+    this->Core->getSceneRenderer(), this->Core->getInteractorStyle());
+
+#ifdef ENABLE_QTTESTING
+  this->TestUtility->ProcessCommandLine();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+void vpView::parseCommandLine(const qtCliArgs& args)
+{
+  this->Internal->ProjectFileNames = args.values("project");
+  this->Internal->ConfigFileName = args.value("config");
+}
+
+//-----------------------------------------------------------------------------
+void vpView::processCommandLine()
+{
+  // Reset all settings?
+  if (this->Internal->CliArgs->isSet("reset-config"))
+    {
+    QSettings().clear();  // clear ini settings
+    vpSettings().clear(); // clear any other settings
+    this->loadSettings();
+    }
+
+  // First load the config file. Order is important.
+  if (!this->Internal->ConfigFileName.isEmpty())
+    {
+    this->Core->loadConfig(this->Internal->ConfigFileName.toStdString().c_str());
+    this->GraphModelWidget->loadConfig(this->Internal->ConfigFileName);
+    }
+
+  this->postLoadConfig();
+
+  // Now load the projects.
+  bool loadedProject = false;
+  foreach (const QString& p, this->Internal->ProjectFileNames)
+    {
+    if (this->Core->loadProject(qPrintable(p)))
+      {
+      loadedProject = true;
+      }
+    }
+
+  if (loadedProject)
+    {
+    // Now refresh view.
+    this->Core->refreshView();
+
+    // Update observers.
+    this->Core->dataChanged();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::setupDock()
+{
+  // set default visibility
+  //
+  // NOTE: wait until actions are set up, as the action check state is not
+  //       correct until the parent window has been shown; if we did this
+  //       first, it wouldn't work, and all docks would be hidden by the dock
+  //       controller's initial state synchronization
+  this->Internal->UI.sessionViewDock->show();
+  this->Internal->UI.objectInfoDock->show();
+  this->Internal->UI.eventOptionDock->hide();
+  this->Internal->UI.displayOptionsDock->hide();
+  this->Internal->UI.normalcyMapsDock->hide();
+  this->Internal->UI.spatialFiltersDock->hide();
+  this->Internal->UI.graphModelDock->show();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::postLoadConfig()
+{
+  this->Core->setupTrackAttributeColors();
+  this->Core->setupTrackFilters(this->Internal->UI.pvoFilter);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::postDataLoaded()
+{
+  // \note: If state is not changed by setChecked qt does not invoke
+  // toggled(...). Hence we have to first set it to unchecked state and
+  // then back to the state we want it to be.
+  bool state = this->Internal->UI.actionViewTracks->isEnabled() &&
+               this->Internal->UI.actionViewTracks->isChecked();
+  this->Internal->UI.actionViewTracks->setChecked(false);
+  this->Internal->UI.actionViewTracks->setChecked(state);
+
+  state = this->Internal->UI.actionViewTrackHeads->isEnabled() &&
+          this->Internal->UI.actionViewTrackHeads->isChecked();
+  this->Internal->UI.actionViewTrackHeads->setChecked(false);
+  this->Internal->UI.actionViewTrackHeads->setChecked(state);
+
+  state = this->Internal->UI.actionViewEvents->isEnabled() &&
+          this->Internal->UI.actionViewEvents->isChecked();
+  this->Internal->UI.actionViewEvents->setChecked(false);
+  this->Internal->UI.actionViewEvents->setChecked(state);
+
+  state = this->Internal->UI.actionViewEventIcons->isEnabled() &&
+          this->Internal->UI.actionViewEventIcons->isChecked();
+  this->Internal->UI.actionViewEventIcons->setChecked(false);
+  this->Internal->UI.actionViewEventIcons->setChecked(state);
+
+  state = this->Internal->UI.actionDisplayEventLegend->isChecked();
+  this->Core->showHideEventLegend(state, false);
+
+  state = this->Internal->UI.actionViewEventIcons->isEnabled() &&
+          this->Internal->UI.actionViewEventIcons->isChecked();
+  this->Internal->UI.actionViewEventIcons->setChecked(false);
+  this->Internal->UI.actionViewEventIcons->setChecked(state);
+
+  state = this->Internal->UI.actionViewActivities->isEnabled() &&
+          this->Internal->UI.actionViewActivities->isChecked();
+  this->Internal->UI.actionViewActivities->setChecked(false);
+  this->Internal->UI.actionViewActivities->setChecked(state);
+
+  state = this->Internal->UI.actionDisplayFullVolume->isChecked();
+  this->Core->onDisplayFullVolume(state, false);
+
+  // Initialize the event and activity widgets now that we now the types used.
+  this->Core->setupEventFilters(this->Internal->UI.normalcyFilter,
+                                this->Internal->eventTypeFilter);
+  this->Core->setupActivityFilters(this->Internal->UI.saliencyFilter);
+
+  this->Internal->UI.eventConfig->Update();
+  this->Internal->UI.activityConfig->Update();
+
+  this->Internal->DataLoaded = true;
+}
+
+//-----------------------------------------------------------------------------
+void vpView::exitApp()
+{
+  this->close();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onSaveRenderedImages(bool state)
+{
+  // if turning "on", ask for an output directory (required)
+  if (state == true)
+    {
+    QString path = vgFileDialog::getExistingDirectory(
+      0, "Image Output Directory");
+
+    if (!path.isEmpty())
+      {
+      this->Core->setSaveRenderedImages(state, &path);
+      }
+    else
+      {
+      this->Internal->UI.actionSaveRenderedImages->setChecked(false);
+      }
+    }
+  else
+    {
+    this->Core->setSaveRenderedImages(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateFrameTime()
+{
+  vgUnixTime time(this->Core->getCurrentFrameTime());
+  QString ts = time.timeString();
+  if (this->Core->getUsingTimeBasedIndexing())
+    {
+    ts += QString(" [%1]").arg(this->Core->getCurrentFrameIndex());
+    }
+  if (this->Core->getUsingTimeStampData())
+    {
+    this->Internal->FrameDate->setText(time.dateString());
+    this->Internal->FrameDate->show();
+    }
+  this->Internal->FrameTime->setText(ts);
+  this->Internal->FrameTime->show();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateObjectCounts()
+{
+  QString as = QString("%1 activities").arg(this->Core->getNumberOfActivities());
+  QString es = QString("%1 events").arg(this->Core->getNumberOfEvents());
+  QString ts = QString("%1 tracks").arg(this->Core->getNumberOfTracks());
+  this->Internal->ActivityCount->setText(as);
+  this->Internal->EventCount->setText(es);
+  this->Internal->TrackCount->setText(ts);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::handleRenderWindowMouseMove(int x, int y)
+{
+  this->Internal->RenderWindowMouseCoords[0] = x;
+  this->Internal->RenderWindowMouseCoords[1] = y;
+
+  this->updateCoordinateDisplay();
+  this->updateGsdDisplay();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateCoordinateDisplay()
+{
+  if (!this->Internal->UI.renderFrame->underMouse())
+    {
+    this->Internal->Coordinates->setText(QString());
+    return;
+    }
+
+  int out[2];
+  bool hasImgCoords = false;
+  switch (this->Internal->CoordDisplayMode)
+    {
+      // Display coordinates only within the AOI region.
+    case vpSettings::AOIRelativeCoords:
+      {
+      hasImgCoords =
+        this->Core->displayToAOI(this->Internal->RenderWindowMouseCoords, out);
+      break;
+      }
+
+    // Display coordinates within the bounds of the image.
+    case vpSettings::ImageRelativeCoords:
+      {
+      hasImgCoords =
+        this->Core->displayToImage(this->Internal->RenderWindowMouseCoords, out);
+      break;
+      }
+    }
+
+  QString str;
+  if (hasImgCoords)
+    {
+    str = QString("%1, %2 ").arg(out[0]).arg(out[1]);
+    }
+
+  double northing, easting;
+  if (this->Core->displayToGeo(this->Internal->RenderWindowMouseCoords,
+                               northing, easting))
+    {
+    str += QString().sprintf("(%+.6f, %+.6f)", northing, easting);
+    }
+
+  this->Internal->Coordinates->setText(str);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateGsdDisplay()
+{
+  double latDist, lonDist;
+  double width, height;
+
+  if (this->Internal->UI.renderFrame->underMouse())
+    {
+    // The mouse is positioned over the render window, so get the width and
+    // height of the hovered image pixel.
+    if (this->Core->getGsd(this->Internal->RenderWindowMouseCoords,
+                           latDist, lonDist, width, height))
+      {
+      this->showGsd(width, height);
+      }
+    }
+  else
+    {
+    // The mouse is outside the render window, so just show the average GSD
+    // across the whole image.
+    if (this->Core->getGsd(latDist, lonDist, width, height))
+      {
+      this->showGsd(width, height, "/px");
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::showGsd(double width, double height, const QString& suffix)
+{
+  this->Internal->Gsd->setText(
+    ((width < 0.5 && height < 0.5) ?
+     QString().sprintf("%.3f x %.3f cm", width * 100.0, height * 100.0) :
+     QString().sprintf("%.3f x %.3f m", width, height)) + suffix);
+
+  this->Internal->Gsd->show();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateUI()
+{
+  if (this->Core->hasMultiLevelOfDetailSource())
+    {
+    this->Internal->contextLOD->setEnabled(true);
+    }
+  else
+    {
+    this->Internal->contextLOD->setEnabled(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onExecuteModeChanged(int index)
+{
+  QComboBox* combo = this->Internal->executeModeCombo;
+  this->Core->setExternalExecuteMode(combo->itemData(index).toInt());
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onEventFilterPresetChanged(int index)
+{
+  QComboBox* combo = this->Internal->eventTypeFilter;
+  int ftype = combo->itemData(index).toInt();
+  if (ftype == -2)
+    {
+    // selected 'custom', don't change filters
+    return;
+    }
+
+  // remove 'custom' if it exists
+  int indexCustom = combo->findData(QVariant(-2));
+  if (indexCustom >= 0)
+    {
+    combo->removeItem(indexCustom);
+    }
+
+  // don't change preset while we update filters... can't use blockSignals
+  // because we want filter changes to otherwise be seen.
+  this->Internal->DisableFilterPresetUpdates = true;
+
+  vgMixerWidget* filter = this->Internal->UI.normalcyFilter;
+  foreach (int t, filter->keys())
+    {
+    // turn on filter if it matches preset or preset is 'all', else turn off
+    filter->setState(t, ftype == -1 || ftype == t);
+    }
+
+  this->onEventFilterChanged();
+
+  this->Internal->DisableFilterPresetUpdates = false;
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onEventFilterVisibilityChanged()
+{
+  if (this->Internal->DisableFilterPresetUpdates)
+    {
+    return;
+    }
+
+  vgMixerWidget* filter = this->Internal->UI.normalcyFilter;
+  QList<int> keys = filter->keys();
+  int countEnabled = 0;
+  int maybeType = -2;
+
+  // count events turned on and record last type
+  foreach (int t, keys)
+    {
+    if (filter->state(t))
+      {
+      ++countEnabled;
+      maybeType = t;
+      }
+    }
+
+  // how many events turned on?
+  if (countEnabled == keys.count())
+    {
+    maybeType = -1;
+    }
+  else if (countEnabled != 1)
+    {
+    maybeType = -2;
+    }
+
+  QComboBox* combo = this->Internal->eventTypeFilter;
+  combo->blockSignals(true);
+  int indexCustom = combo->findData(QVariant(-2));
+  if (maybeType == -2)
+    {
+    // ensure 'custom' exists
+    if (indexCustom < 0)
+      {
+      combo->addItem("(Custom)", QVariant(-2));
+      }
+    }
+  else if (indexCustom >= 0)
+    {
+    // remove 'custom'
+    combo->removeItem(indexCustom);
+    }
+
+  // set to appropriate index
+  combo->setCurrentIndex(combo->findData(maybeType));
+  combo->blockSignals(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onFrameRendered()
+{
+  if (this->Viewer3dDialog->isVisible())
+    {
+    this->Viewer3dDialog->update(this->Core->getImageryTimeStamp());
+    }
+  this->updateGsdDisplay();
+  this->updateFrameTime();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onEventFilterChanged()
+{
+  this->Core->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onReinitialized()
+{
+  this->Internal->UI.actionViewTracks->setEnabled(false);
+  this->Internal->UI.actionViewTrackHeads->setEnabled(false);
+  this->Internal->UI.actionViewEvents->setEnabled(false);
+  this->Internal->UI.actionViewEventIcons->setEnabled(false);
+  this->Internal->UI.actionViewActivities->setEnabled(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onShow3dView(bool state)
+{
+  if (state)
+    {
+    this->Core->setGraphRenderingEnabled(true);
+    this->Viewer3dDialog->update(this->Core->getImageryTimeStamp());
+    this->Viewer3dDialog->show();
+    this->Viewer3dDialog->reset();
+    }
+  else
+    {
+    this->Viewer3dDialog->close();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onHide3dView()
+{
+  this->Core->setGraphRenderingEnabled(false);
+  this->Internal->UI.action3DView->setChecked(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onContextLODChanged(int value)
+{
+  if (value > 0)
+    {
+    this->Core->setImageSourceLevelOfDetailFactor(1.0 / value);
+    }
+  else if (value < 0)
+    {
+    this->Core->setImageSourceLevelOfDetailFactor(1.0 * abs(value));
+    }
+  else
+    {
+    this->Core->setImageSourceLevelOfDetailFactor(1.0);
+    }
+
+  this->Core->render(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onWebExport()
+{
+  QFileDialog fileDialog(0, tr("Image Output Directory"));
+  fileDialog.setObjectName("GenerateEventClipsDialog");
+  fileDialog.setFileMode(QFileDialog::Directory);
+  fileDialog.setOption(QFileDialog::ShowDirsOnly);
+
+  if (fileDialog.exec() == QDialog::Accepted)
+    {
+    this->Core->exportForWeb(qPrintable(fileDialog.selectedFiles().front()), 4);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onCreateNewSpatialFilter(bool state)
+{
+  if (state)
+    {
+    this->Internal->UI.renderFrame->setCursor(Qt::CrossCursor);
+    this->Core->drawFilterRegion();
+    }
+  else
+    {
+    this->Core->completeFilterRegion();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onSpatialFilterComplete(vtkPoints* contourPoints,
+                                     vtkPoints* filterPoints,
+                                     const vtkVgTimeStamp* timeStamp,
+                                     vtkMatrix4x4* worldToImageMatrix,
+                                     const QString& name,
+                                     bool enabled)
+{
+  this->Internal->UI.actionSpatialFilterAdd->setChecked(false);
+  this->Internal->UI.renderFrame->setCursor(Qt::ArrowCursor);
+
+  if (!contourPoints || !filterPoints)
+    {
+    return;
+    }
+
+  static int filterId = 1;
+
+  vtkVgTimeStamp invalidTimeStamp;
+  QTreeWidgetItem* wi = new QTreeWidgetItem;
+  wi->setData(0, Qt::UserRole, QVariant::fromValue<void*>(contourPoints));
+  wi->setData(0, Qt::UserRole + 1, QVariant::fromValue<void*>(filterPoints));
+  if (timeStamp)
+    {
+    wi->setData(0, Qt::UserRole + 3,
+      timeStamp->HasFrameNumber() ? timeStamp->GetFrameNumber()
+                                  : invalidTimeStamp.GetFrameNumber());
+    wi->setData(0, Qt::UserRole + 4,
+      timeStamp->HasTime() ? timeStamp->GetTimeInSecs()
+                           : invalidTimeStamp.GetTime());
+    }
+  else
+    {
+    wi->setData(0, Qt::UserRole + 3, invalidTimeStamp.GetFrameNumber());
+    wi->setData(0, Qt::UserRole + 4, invalidTimeStamp.GetTime());
+    }
+
+  if (name.isEmpty())
+    {
+    wi->setText(0, QString("filter %1").arg(filterId));
+    }
+  else
+    {
+    wi->setText(0, name);
+    }
+  wi->setData(0, Qt::UserRole + 5,
+    QVariant::fromValue<void*>(worldToImageMatrix));
+
+  Qt::CheckState initialState = enabled ? Qt::Checked : Qt::Unchecked;
+  wi->setCheckState(0, initialState);
+  wi->setData(1, Qt::UserRole + 2, initialState);
+  wi->setFlags(wi->flags() |  Qt::ItemIsEditable | Qt::ItemIsUserCheckable |
+               Qt::ItemIsTristate);
+
+  this->Internal->UI.spatialFilterTree->addTopLevelItem(wi);
+  this->Internal->UI.spatialFilterTree->setCurrentItem(wi);
+
+  this->Internal->UI.spatialFiltersDock->show();
+  ++filterId;
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onRemoveSelectedSpatialFilters()
+{
+  QTreeWidgetItem* root =
+    this->Internal->UI.spatialFilterTree->invisibleRootItem();
+  foreach (QTreeWidgetItem* wi,
+           this->Internal->UI.spatialFilterTree->selectedItems())
+    {
+    this->Core->removeFilterRegion(
+      static_cast<vtkPoints*>(wi->data(0, Qt::UserRole).value<void*>()),
+      static_cast<vtkPoints*>(wi->data(0, Qt::UserRole + 1).value<void*>()));
+    root->removeChild(wi);
+    delete wi;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onRemoveAllSpatialFilters()
+{
+  this->Core->removeAllFilterRegions();
+  this->Internal->UI.spatialFilterTree->clear();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::spatialFilterChanged(QTreeWidgetItem* item)
+{
+  static bool ignoreChanges = false;
+  if (ignoreChanges)
+    {
+    return;
+    }
+
+  // Normally, Qt doesn't let the user directly change an item's state to
+  // partially checked. But since we want to be able to do that, we have to
+  // set the state ourselves.
+  int prevCheckState = item->data(0, Qt::UserRole + 2).toInt();
+  if (prevCheckState == Qt::Unchecked && item->checkState(0) == Qt::Checked)
+    {
+    item->setCheckState(0, Qt::PartiallyChecked);
+    return;
+    }
+
+  // Record the current checkstate so we know how to transition next time
+  ignoreChanges = true;
+  item->setData(0, Qt::UserRole + 2, item->checkState(0));
+  ignoreChanges = false;
+
+  vtkPoints* contourPoints =
+    static_cast<vtkPoints*>(item->data(0, Qt::UserRole).value<void*>());
+  vtkPoints* filterPoints =
+    static_cast<vtkPoints*>(item->data(0, Qt::UserRole + 1).value<void*>());
+
+  // If the item is partially checked, show the contour but disable the filter
+  this->Core->setContourVisible(contourPoints,
+                                item->checkState(0) != Qt::Unchecked);
+  this->Core->setFilterRegionEnabled(filterPoints,
+                                     item->checkState(0) == Qt::Checked);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onAddTemporalFilter()
+{
+  vtkVgTimeStamp start, end;
+  start.SetToMinTime();
+  end.SetToMaxTime();
+
+  int id =
+    this->Core->addTemporalFilter(vtkVgTemporalFilters::FT_Select, start, end);
+
+  this->onTemporalFilterReady(id, QString("filter %1").arg(id),
+                              vtkVgTemporalFilters::FT_Select, -1, -1);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTemporalFilterReady(int id, const QString& name,
+                                   int type, double start, double end)
+{
+  QTreeWidgetItem* wi = new QTreeWidgetItem;
+  wi->setData(0, Qt::UserRole, id);
+  wi->setText(0, name);
+  wi->setText(1, vtkVgTemporalFilters::StringForType(
+                     vtkVgTemporalFilters::FilterType(type)));
+  wi->setData(1, Qt::UserRole, type);
+
+  if (start != -1)
+    {
+    wi->setText(2, this->setTemporalFilterTimeLabelValue(start));
+    }
+  wi->setData(2, Qt::UserRole, start);
+  if (end != -1)
+    {
+    wi->setText(3, this->setTemporalFilterTimeLabelValue(end));
+    }
+  wi->setData(3, Qt::UserRole, end);
+
+  wi->setCheckState(0, Qt::Checked);
+  wi->setFlags(wi->flags() | Qt::ItemIsEditable | Qt::ItemIsUserCheckable);
+
+  this->Internal->UI.temporalFilterTree->addTopLevelItem(wi);
+  this->Internal->UI.temporalFilterTree->setCurrentItem(wi);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTemporalFilterSetStart()
+{
+  QList<QTreeWidgetItem*> selectedItems =
+    this->Internal->UI.temporalFilterTree->selectedItems();
+  if (selectedItems.count() != 1)
+    {
+    return;
+    }
+
+  QTreeWidgetItem* wi = selectedItems.first();
+
+  double start =
+    this->Core->getUsingTimeStampData() ? this->Core->getCurrentFrameTime()
+                                        : this->Core->getCurrentFrameNumber();
+
+  // limit based on end (frame / time)
+  double end = wi->data(3, Qt::UserRole).toDouble();
+
+  if (end > 0 && start > end)
+    {
+    start = end;
+    }
+
+  this->Internal->UI.temporalFilterTree->blockSignals(true);
+  wi->setData(2, Qt::UserRole, start);
+  wi->setText(2, this->setTemporalFilterTimeLabelValue(start));
+  this->Internal->UI.temporalFilterTree->blockSignals(false);
+
+  vtkVgTimeStamp startTime;
+  if (this->Core->getUsingTimeStampData())
+    {
+    startTime.SetTime(start);
+    }
+  else
+    {
+    start -= (this->Core->getUseZeroBasedFrameNumbers() ? 0 : 1);
+    startTime.SetFrameNumber(start);
+    }
+
+  this->Core->updateTemporalFilterStart(wi->data(0, Qt::UserRole).toInt(),
+                                        startTime);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTemporalFilterSetEnd()
+{
+  QList<QTreeWidgetItem*> selectedItems =
+    this->Internal->UI.temporalFilterTree->selectedItems();
+  if (selectedItems.count() != 1)
+    {
+    return;
+    }
+
+  QTreeWidgetItem* wi = selectedItems.first();
+
+  double end =
+    this->Core->getUsingTimeStampData() ? this->Core->getCurrentFrameTime()
+                                        : this->Core->getCurrentFrameNumber();
+
+  // limit based on end (frame / time)
+  double start = wi->data(2, Qt::UserRole).toDouble();
+
+  if (end < start)
+    {
+    end = start;
+    }
+
+  this->Internal->UI.temporalFilterTree->blockSignals(true);
+  wi->setData(3, Qt::UserRole, end);
+  wi->setText(3, this->setTemporalFilterTimeLabelValue(end));
+  this->Internal->UI.temporalFilterTree->blockSignals(false);
+
+  vtkVgTimeStamp endTime;
+  if (this->Core->getUsingTimeStampData())
+    {
+    endTime.SetTime(end);
+    }
+  else
+    {
+    end -= (this->Core->getUseZeroBasedFrameNumbers() ? 0 : 1);
+    endTime.SetFrameNumber(end);
+    }
+
+  this->Core->updateTemporalFilterEnd(wi->data(0, Qt::UserRole).toInt(),
+                                      endTime);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onRemoveSelectedTemporalFilters()
+{
+  QTreeWidgetItem* root =
+    this->Internal->UI.temporalFilterTree->invisibleRootItem();
+  foreach (QTreeWidgetItem* wi,
+           this->Internal->UI.temporalFilterTree->selectedItems())
+    {
+    this->Core->removeTemporalFilter(wi->data(0, Qt::UserRole).toInt());
+    root->removeChild(wi);
+    delete wi;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onRemoveAllTemporalFilters()
+{
+  this->Core->removeAllTemporalFilters();
+  this->Internal->UI.temporalFilterTree->clear();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onRemoveAllFilters()
+{
+  this->Core->removeAllTemporalFilters();
+  this->Internal->UI.temporalFilterTree->clear();
+  this->Core->removeAllFilterRegions();
+  this->Internal->UI.spatialFilterTree->clear();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::temporalFilterChanged(QTreeWidgetItem* item, int column)
+{
+  // Fix up invalid columns.
+  // TODO: Write a custom delegate for these columns in order to clean this up.
+  if (column != 1)
+    {
+    if (column) // column 2 or 3 (not column 0)
+      {
+      item->setText(column, this->setTemporalFilterTimeLabelValue(
+        item->data(column, Qt::UserRole).toDouble()));
+      }
+    else // did checked state change?
+      {
+      bool enabled = item->checkState(0) == Qt::Checked;
+      this->Core->enableTemporalFilter(item->data(0, Qt::UserRole).toInt(),
+                                       enabled);
+      }
+    return;
+    }
+
+  this->Core->updateTemporalFilterType(item->data(0, Qt::UserRole).toInt(),
+                                       item->data(1, Qt::UserRole).toInt());
+}
+
+//-----------------------------------------------------------------------------
+void vpView::bookmarkViewport()
+{
+  this->Core->saveCameraPosition();
+  this->Internal->UI.actionViewportRestore->setEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::copyViewportExtentsToClipboard()
+{
+  int extents[4];
+  this->Core->getImageSpaceViewportExtents(extents);
+
+  // output in format "WxH[+/-]X[+/-]Y"
+  QString str("%1x%2");
+  str = str.arg(extents[1] - extents[0] + 1).arg(extents[3] - extents[2] + 1);
+
+  if (extents[0] >= 0)
+    {
+    str += '+';
+    }
+  str += QString::number(extents[0]);
+
+  if (extents[2] >= 0)
+    {
+    str += '+';
+    }
+  str += QString::number(extents[2]);
+
+  QApplication::clipboard()->setText(str);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::copyExtendedInfoToClipboard()
+{
+  QString info;
+  info += "frame time: ";
+  if (this->Core->getUsingTimeStampData())
+    {
+    vgUnixTime time(this->Core->getCurrentFrameTime());
+    info += time.dateString();
+    info += 'T';
+    info += time.timeString();
+    info += "Z";
+    }
+
+  info += "\ncursor position: ";
+  info += this->Internal->Coordinates->text();
+
+  double latDist, lonDist;
+  double width, height;
+  if (this->Internal->UI.renderFrame->underMouse())
+    {
+    // The mouse is positioned over the render window, so get the width and
+    // height of the hovered image pixel.
+    info += "\npixel size (at cursor): ";
+    if (this->Core->getGsd(this->Internal->RenderWindowMouseCoords,
+                           latDist, lonDist, width, height))
+      {
+      info += QString().sprintf("%.3f x %.3f m (%.15f, %.15f)",
+                                width, height, latDist, lonDist);
+      }
+    }
+  else
+    {
+    // The mouse is outside the render window, so just show the average GSD
+    // across the whole image.
+    info += "\npixel size: ";
+    if (this->Core->getGsd(latDist, lonDist, width, height))
+      {
+      info += QString().sprintf("%.3f x %.3f m/px (%.15f, %.15f)",
+                                width, height, latDist, lonDist);
+      }
+    }
+
+  QApplication::clipboard()->setText(info);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onSettingsChanged()
+{
+  bool prevUsedTimeIndexing = this->Core->getUsingTimeBasedIndexing();
+  this->loadSettings();
+  if (this->Core->getUsingTimeBasedIndexing() != prevUsedTimeIndexing)
+    {
+    this->resetFrameScrubberConfiguration();
+    }
+  else if (this->Internal->DataLoaded)
+    {
+    this->updateFrameScrubberRange();
+    }
+  this->onFrameChange();
+  this->updateFrameTime();
+  this->updateInfoWidget();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::loadSettings()
+{
+  vpSettings settings;
+  this->Internal->CoordDisplayMode = settings.coordinateDisplayMode();
+  this->Internal->ImageFilteringMode = settings.imageFilteringMode();
+
+  bool enable = this->Internal->ImageFilteringMode != vpSettings::NoFiltering;
+  this->Core->setImageFiltering(enable);
+
+  vtkVgTimeStamp trackTrailLength;
+  if (settings.trackTrailLengthFrames() != 0)
+    {
+    trackTrailLength.SetFrameNumber(settings.trackTrailLengthFrames());
+    }
+  if (settings.trackTrailLengthSeconds() != 0.0)
+    {
+    trackTrailLength.SetTime(settings.trackTrailLengthSeconds() * 1e6);
+    }
+  this->Core->setTrackTrailLength(trackTrailLength);
+
+  this->Core->setUseTimeStampDataIfAvailable(settings.useTimeStampData());
+  this->Core->setUseTimeBasedIndexing(!settings.forceFrameBasedVideoControls());
+
+  this->Core->setEnableWorldDisplayIfAvailable(settings.worldDisplayEnabled());
+  this->Core->setEnableTranslateImage(settings.translateImageEnabled());
+
+  this->Core->setUseZeroBasedFrameNumbers(settings.useZeroBasedFrameNumbers());
+  this->Core->setRightClickToEditEnabled(settings.rightClickToEdit());
+  this->Core->setAutoAdvanceDuringCreation(settings.autoAdvanceDuringCreation());
+  this->Core->setSceneElementLineWidth(settings.sceneElementLineWidth());
+
+  this->Core->setTrackUpdateChunkSize(settings.streamingTrackUpdateChunkSize());
+
+  this->Core->setRealTimeVideoPlayback(settings.videoPlaybackMode() ==
+                                       vpSettings::RealTimePlayback);
+
+  this->Core->setRequestFPS(settings.videoSuggestedFps());
+
+  this->Internal->TrackUpdateTimer->setInterval(
+    std::max(1, settings.streamingUpdateInterval()) * 1000);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTestingStarted()
+{
+  this->Core->setImageFiltering(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTestingStopped()
+{
+  bool enable = this->Internal->ImageFilteringMode != vpSettings::NoFiltering;
+  this->Core->setImageFiltering(enable);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::createTrack(bool start)
+{
+  if (!start)
+    {
+    this->Core->stopEditingTrack();
+    return;
+    }
+
+  // stop event creation
+  this->Internal->UI.actionCreateEvent->setChecked(false);
+  this->Internal->UI.actionCreateSceneElement->setChecked(false);
+
+  int session = this->Internal->UI.sessionView->GetCurrentSession();
+
+  int id;
+  bool ok;
+  for (;;)
+    {
+    id = QInputDialog::getInt(this,
+                              tr("Add Track"),
+                              tr("Track Id:"),
+                              this->Core->getCreateTrackId(session),
+                              0, 2147483647, 1, &ok);
+    if (!ok)
+      {
+      this->stopCreatingTrack();
+      return;
+      }
+
+    if (this->Core->getTrackModel(session)->GetTrack(id))
+      {
+      QMessageBox::warning(0,
+                           QString(),
+                           "A track with this ID already exists.");
+      }
+    else
+      {
+      break;
+      }
+    }
+
+  // show the newly created track and begin editing
+  if (this->Core->createTrack(id, session))
+    {
+    this->Core->setCreateTrackId(id + 1, session);
+    this->Internal->UI.sessionView->AddAndSelectItem(
+      vgObjectTypeDefinitions::Track, id);
+    this->Core->beginEditingTrack(id);
+
+    this->Internal->UI.actionViewTrackHeads->setChecked(true);
+    if (this->Core->getAutoAdvanceDuringCreation())
+      {
+      this->Core->setIdOfTrackToFollow(id);
+      }
+    }
+  else
+    {
+    this->stopCreatingTrack();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::createEvent(bool start)
+{
+  if (!start)
+    {
+    if (this->CreateEventDialog)
+      {
+      this->CreateEventDialog->reject();
+      }
+    return;
+    }
+
+  // stop track creation
+  this->Internal->UI.actionCreateTrack->setChecked(false);
+  this->Internal->UI.actionCreateSceneElement->setChecked(false);
+
+  // make only the current project visible
+  int session = this->Internal->UI.sessionView->GetCurrentSession();
+  for (int i = 0; i < this->Internal->UI.sessionView->GetSessionCount(); ++i)
+    {
+    this->Core->setProjectVisible(i, i == session);
+    }
+
+  // Show events and tracks
+  this->Internal->UI.actionViewEvents->setChecked(true);
+  this->Internal->UI.actionViewTracks->setChecked(true);
+  this->Internal->UI.actionViewTrackHeads->setChecked(true);
+
+  this->Core->update();
+
+  this->CreateEventDialog = new vpCreateEventDialog(this->Core, session, this);
+
+  connect(this->CreateEventDialog,
+          SIGNAL(eventCreated(int)), SLOT(onEventCreated(int)));
+
+  connect(this->CreateEventDialog,
+          SIGNAL(rejected()), SLOT(stopCreatingEvent()));
+
+  this->CreateEventDialog->initialize();
+  this->CreateEventDialog->show();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::createSceneElement(bool start)
+{
+  // This is almost the same as createTrack since we will be using the normal
+  // track creation machinery.
+
+  if (!start)
+    {
+    this->Core->stopEditingTrack();
+    return;
+    }
+
+  // stop event creation
+  this->Internal->UI.actionCreateTrack->setChecked(false);
+  this->Internal->UI.actionCreateEvent->setChecked(false);
+
+  int session = this->Internal->UI.sessionView->GetCurrentSession();
+
+  int id;
+  bool ok;
+  for (;;)
+    {
+    id = QInputDialog::getInt(this,
+                              tr("Add Scene Element"),
+                              tr("Scene Element Id:"),
+                              this->Core->getCreateTrackId(session),
+                              0, 2147483647, 1, &ok);
+    if (!ok)
+      {
+      this->stopCreatingTrack();
+      return;
+      }
+
+    vtkVgTrackModel* model = this->Core->getTrackModel(session);
+    id = model->GetTrackIdForSceneElement(id);
+    if (model->GetTrack(id))
+      {
+      QMessageBox::warning(0,
+                           QString(),
+                           "A object with this ID already exists.");
+      }
+    else
+      {
+      break;
+      }
+    }
+
+  // show the newly created track and begin editing
+  if (this->Core->createTrack(id, session, true))
+    {
+    this->Core->setCreateTrackId(id + 1, session);
+    this->Internal->UI.sessionView->AddAndSelectItem(
+      vgObjectTypeDefinitions::SceneElement, id);
+    this->Core->beginEditingTrack(id);
+
+    this->Internal->UI.actionViewSceneElements->setChecked(true);
+    if (this->Core->getAutoAdvanceDuringCreation())
+      {
+      this->Core->setIdOfTrackToFollow(id);
+      }
+    }
+  else
+    {
+    this->stopCreatingTrack();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::mergeTracks(bool start)
+{
+  if (!start)
+    {
+    if (this->MergeTracksDialog)
+      {
+      this->MergeTracksDialog->reject();
+      }
+    return;
+    }
+
+  // stop track / event creation
+  this->Internal->UI.actionCreateTrack->setChecked(false);
+  this->Internal->UI.actionCreateEvent->setChecked(false);
+
+  // make only the current project visible
+  int session = this->Internal->UI.sessionView->GetCurrentSession();
+  for (int i = 0; i < this->Internal->UI.sessionView->GetSessionCount(); ++i)
+    {
+    this->Core->setProjectVisible(i, i == session);
+    }
+
+  // show tracks only
+  this->Internal->UI.actionViewActivities->setChecked(false);
+  this->Internal->UI.actionViewEvents->setChecked(false);
+  this->Internal->UI.actionViewTracks->setChecked(true);
+  this->Internal->UI.actionViewTrackHeads->setChecked(true);
+
+  this->Core->update();
+
+  this->MergeTracksDialog = new vpMergeTracksDialog(this->Core, session, this);
+
+  connect(this->MergeTracksDialog,
+          SIGNAL(tracksMerged(int)), SLOT(onTracksMerged(int)));
+
+  connect(this->MergeTracksDialog,
+          SIGNAL(rejected()), SLOT(stopMergingTracks()));
+
+  this->MergeTracksDialog->initialize();
+  this->MergeTracksDialog->show();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::stopCreatingTrack()
+{
+  this->Internal->UI.actionCreateTrack->setChecked(false);
+  this->Internal->UI.actionCreateSceneElement->setChecked(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::stopCreatingEvent()
+{
+  this->Internal->UI.actionCreateEvent->setChecked(false);
+  delete this->CreateEventDialog;
+  this->CreateEventDialog = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpView::stopMergingTracks()
+{
+  this->Internal->UI.actionMergeTracks->setChecked(false);
+  delete this->MergeTracksDialog;
+  this->MergeTracksDialog = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onEventCreated(int id)
+{
+  this->Internal->UI.sessionView->SetCurrentTab(vgObjectTypeDefinitions::Event);
+  this->rebuildObjectViews();
+  this->Internal->UI.sessionView->SelectItem(vgObjectTypeDefinitions::Event, id);
+  this->Core->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onTracksMerged(int id)
+{
+  this->Internal->UI.sessionView->SetCurrentTab(vgObjectTypeDefinitions::Track);
+  this->rebuildObjectViews();
+  this->Internal->UI.sessionView->SelectItem(vgObjectTypeDefinitions::Track, id);
+  this->Core->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::splitTrack(int id, int sessionId)
+{
+  std::vector<vtkVgEvent*> events;
+  this->Core->getEventModel(sessionId)->GetEvents(id, events);
+
+  if (!events.empty())
+    {
+    QMessageBox::StandardButton btn =
+      QMessageBox::question(0, "Split Events?",
+                            QString("The track being split is referenced by %1 "
+                                    "events. Splitting the track will cause "
+                                    "event track references to be updated "
+                                    "and events to be split apart, as "
+                                    "necessary.")
+                            .arg(events.size()),
+                            QMessageBox::Ok | QMessageBox::Cancel);
+
+    if (btn != QMessageBox::Ok)
+      {
+      return;
+      }
+    }
+
+  int newId;
+  bool ok;
+  for (;;)
+    {
+    newId = QInputDialog::getInt(this,
+                                 tr("Split Track"),
+                                 tr("Second Track Id:"),
+                                 this->Core->getCreateTrackId(sessionId),
+                                 0, 2147483647, 1, &ok);
+    if (!ok)
+      {
+      return;
+      }
+
+    if (this->Core->getTrackModel(sessionId)->GetTrack(newId))
+      {
+      QMessageBox::warning(0,
+                           QString(),
+                           "A track with this ID already exists.");
+      }
+    else
+      {
+      break;
+      }
+    }
+
+  // try to split the track
+  if (this->Core->splitTrack(id, newId, sessionId))
+    {
+    this->Core->setCreateTrackId(newId + 1, sessionId);
+    this->Internal->UI.sessionView->AddAndSelectItem(
+      vgObjectTypeDefinitions::Track, newId);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::addEventsToGraphModel(QList<int> eventIds, int sessionId)
+{
+  vtkVgEventModel* model = this->Core->getEventModel(sessionId);
+  std::vector<vtkVgEvent*> events;
+
+  foreach(int id, eventIds)
+    {
+    if (vtkVgEvent* event = model->GetEvent(id))
+      {
+      events.push_back(event);
+      }
+    }
+
+  this->GraphModelWidget->addEventNodes(events);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::addTrackEventsToGraphModel(int id, int sessionId)
+{
+  vtkVgEventModel* model = this->Core->getEventModel(sessionId);
+  vtkVgEventFilter* filter = this->Core->getEventFilter();
+
+  std::vector<vtkVgEvent*> events;
+  model->GetEvents(id, events);
+
+  // Remove all the events are not turned on or don't pass filters
+  for (size_t i = 0; i < events.size(); )
+    {
+    vtkVgEvent* event = events[i];
+    vtkVgEventInfo info = model->GetEventInfo(event->GetId());
+    if (!info.GetDisplayEvent() || !info.GetPassesFilters() ||
+        filter->GetBestClassifier(event) < 0)
+      {
+      // This is slow, but not expecting it to matter
+      events.erase(events.begin() + i);
+      }
+    else
+      {
+      ++i;
+      }
+    }
+
+  this->GraphModelWidget->addEventNodes(events);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::selectEvent(int id)
+{
+  if (this->Internal->Selecting)
+    {
+    return;
+    }
+
+  this->Internal->UI.sessionView->SelectItem(vgObjectTypeDefinitions::Event,
+                                             id);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::exportTracks()
+{
+  if (this->Internal->UI.actionCreateTrack->isChecked())
+    {
+    this->onWarningError(
+      "Cannot export tracks while a track is being created.");
+    }
+  else
+    {
+    this->Core->exportTracksToFile();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::exportEvents()
+{
+  if (this->Internal->UI.actionCreateEvent->isChecked())
+    {
+    this->onWarningError(
+      "Cannot export events while an event is being created.");
+    }
+  else
+    {
+    this->Core->exportEventsToFile();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::exportSceneElements()
+{
+  if (this->Internal->UI.actionCreateSceneElement->isChecked())
+    {
+    this->onWarningError(
+      "Cannot export scene elements while one is being created.");
+    }
+  else
+    {
+    this->Core->exportSceneElementsToFile();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::exportFilters()
+{
+  QString path = vgFileDialog::getSaveFileName(
+    this, "Save Filters", QString(), "vpView filters (*.txt);;");
+
+  if (path.isEmpty())
+    {
+    return;
+    }
+  this->exportFilters(path, false);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::exportFilters(QString path, bool startExternalProcess)
+{
+  std::ofstream file(qPrintable(path), ios::out | ios::trunc);
+  if (!file)
+    {
+    this->onWarningError("Unable to write filter file.");
+    return;
+    }
+
+  // Write out the spatial filters, one per line
+  for (int i = 0,
+       count = this->Internal->UI.spatialFilterTree->topLevelItemCount();
+       i < count; ++i)
+    {
+    QTreeWidgetItem* item =
+      this->Internal->UI.spatialFilterTree->topLevelItem(i);
+
+    vtkPoints* contourPoints =
+      static_cast<vtkPoints*>(item->data(0, Qt::UserRole).value<void*>());
+    vtkPoints* filterPoints =
+      static_cast<vtkPoints*>(item->data(0, Qt::UserRole + 1).value<void*>());
+    unsigned int frameNumber = item->data(0, Qt::UserRole + 3).toUInt();
+    double time = item->data(0, Qt::UserRole + 4).toDouble();
+    vtkMatrix4x4* worldtoImageMatrix = static_cast<vtkMatrix4x4*>
+      (item->data(0, Qt::UserRole + 5).value<void*>());
+
+    this->Core->writeSpatialFilter(contourPoints, filterPoints,
+                                   frameNumber, time, worldtoImageMatrix,
+                                   stdString(item->text(0)), file);
+    }
+
+  // Write out the temporal filters, one per line
+  for (int i = 0,
+       count = this->Internal->UI.temporalFilterTree->topLevelItemCount();
+       i < count; ++i)
+    {
+    QTreeWidgetItem* item =
+      this->Internal->UI.temporalFilterTree->topLevelItem(i);
+
+    int type = item->data(1, Qt::UserRole).toInt();
+    double start = item->data(2, Qt::UserRole).toDouble();
+    double end = item->data(3, Qt::UserRole).toDouble();
+    this->Core->writeTemporalFilter(type, start, end,
+                                    stdString(item->text(0)), file);
+    }
+  file.close();
+
+  if (startExternalProcess)
+    {
+    this->Core->startExternalProcess();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::setTrackTrailLength()
+{
+  vpSettings settings;
+  vtkVgTimeStamp trailLength = this->Core->getTrackTrailLength();
+  if ((this->Internal->DataLoaded && this->Core->getUsingTimeStampData()) ||
+      (!this->Internal->DataLoaded && settings.useTimeStampData()))
+    {
+    double prevLength = trailLength.HasTime() ? trailLength.GetTime() * 1e-6
+                                              : 0.0;
+    bool ok = false;
+    double length = QInputDialog::getDouble(
+                      this, "Set Track Trail Length",
+                      "Trail time (seconds, 0 = unlimited)",
+                      prevLength, 0.0, static_cast<double>(INT_MAX), 1, &ok);
+    if (ok)
+      {
+      settings.setTrackTrailLengthSeconds(length);
+      settings.commit();
+
+      vtkVgTimeStamp ts;
+      if (length != 0.0)
+        {
+        ts.SetTime(length * 1e6);
+        }
+      this->Core->setTrackTrailLength(ts);
+      this->Core->updateScene();
+      }
+    }
+  else
+    {
+    // Frame numbers only
+    int prevLength = trailLength.HasFrameNumber() ? trailLength.GetFrameNumber()
+                                                  : 0;
+    bool ok = false;
+    int length = QInputDialog::getInt(
+                   this, "Set Track Trail Length", "Trail frames (0 = unlimited)",
+                   prevLength, 0, INT_MAX, 1, &ok);
+    if (ok)
+      {
+      settings.setTrackTrailLengthFrames(length);
+      settings.commit();
+
+      vtkVgTimeStamp ts;
+      if (length != 0)
+        {
+        ts.SetFrameNumber(length);
+        }
+      this->Core->setTrackTrailLength(ts);
+      this->Core->updateScene();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::changeTrackColors()
+{
+  vpTrackColorDialog dlg(this->Core->getTrackAttributes());
+
+  int trackColorMode = this->Core->getTrackColorMode();
+  switch (trackColorMode)
+    {
+    case vtkVgTrackRepresentationBase::TCM_StateAttrs:
+      {
+      dlg.setMode(vpTrackColorDialog::ColorByStateAttribute);
+      break;
+      }
+    case vtkVgTrackRepresentationBase::TCM_PVO:
+      {
+      dlg.setMode(vpTrackColorDialog::ColorByStatePVO);
+      break;
+      }
+    case vtkVgTrackRepresentationBase::TCM_Random:
+      {
+      dlg.setMode(vpTrackColorDialog::RandomColor);
+      break;
+      }
+    default:
+      {
+      dlg.setMode(vpTrackColorDialog::SingleColor);
+      }
+    }
+  dlg.setAttributeGroup(this->Core->getTrackAttributeGroup());
+
+  connect(&dlg, SIGNAL(updateRequested(vpTrackColorDialog*)),
+          this, SLOT(updateTrackColorsFromDialog(vpTrackColorDialog*)));
+
+  if (dlg.exec() == QDialog::Accepted)
+    {
+    this->updateTrackColorsFromDialog(&dlg);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateTrackColorsFromDialog(vpTrackColorDialog* dlg)
+{
+  switch (dlg->mode())
+    {
+    case vpTrackColorDialog::ColorByStateAttribute:
+      {
+      this->Core->setTrackColorMode(
+        vtkVgTrackRepresentationBase::TCM_StateAttrs, dlg->attributeGroup());
+      break;
+      }
+    case vpTrackColorDialog::ColorByStatePVO:
+      {
+      this->Core->setTrackColorMode(
+        vtkVgTrackRepresentationBase::TCM_PVO, dlg->attributeGroup());
+      break;
+      }
+    case vpTrackColorDialog::RandomColor:
+      {
+      this->Core->setTrackColorMode(
+        vtkVgTrackRepresentationBase::TCM_Random, dlg->attributeGroup());
+      break;
+      }
+    case vpTrackColorDialog::SingleColor:
+    default:
+      {
+      this->Core->setTrackColorMode(
+        vtkVgTrackRepresentationBase::TCM_Model, dlg->attributeGroup());
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::onEventExpirationModeChange(QAction* action, bool render)
+{
+  vpViewCore::enumEventExpirationMode mode;
+  if (action == this->Internal->UI.actionShowEventsUntilEventEnd)
+    {
+    mode = vpViewCore::ShowUntilEventEnd;
+    }
+  else
+    {
+    mode = vpViewCore::ShowUntilTrackEnd;
+    }
+  this->Core->setEventExpirationMode(mode, render);
+}
+
+//-----------------------------------------------------------------------------
+void vpView::setFrameOffset()
+{
+  int prevOffset = this->Core->getFrameNumberOffset();
+
+  bool ok = false;
+  int offset = QInputDialog::getInt(
+                 this, "Set Image Data Frame Offset", "Offset",
+                 prevOffset, 0, INT_MAX, 1, &ok);
+  if (ok)
+    {
+    this->Core->setFrameNumberOffset(offset);
+
+    this->Internal->UI.currentFrame->setFrameNumberRange(
+      this->Core->getMinimumFrameNumber(), this->Core->getMaximumFrameNumber());
+
+    vtkVgTimeStamp time;
+    time.SetFrameNumber(this->Core->getCurrentFrameIndex() + offset);
+    this->Core->setCurrentTime(time);
+    this->Core->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::importProject()
+{
+  this->Core->importProject();
+  this->updateObjectCounts();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::closeProject(int sessionId)
+{
+  this->Core->closeProject(sessionId);
+  this->Internal->UI.sessionView->RemoveSession(sessionId);
+  this->updateEverything();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateTracks()
+{
+  if (this->Internal->TrackUpdateInProgress)
+    {
+    return;
+    }
+
+  this->Internal->TrackUpdateInProgress = true;
+  if (this->Core->updateTracks() == VTK_ERROR)
+    {
+    this->Internal->TrackUpdateInProgress = false;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::finishTrackUpdate()
+{
+  this->Internal->TrackUpdateInProgress = false;
+  this->updateEverything();
+  this->updateObjectCounts();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::setAutoUpdateEnabled(bool enable)
+{
+  if (!this->Internal->DataLoaded)
+    {
+    return;
+    }
+
+  if (!enable)
+    {
+    this->Internal->TrackUpdateTimer->stop();
+    return;
+    }
+
+  this->updateTracks();
+  this->Internal->TrackUpdateTimer->start();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::disableTimeBasedIndexing()
+{
+  vpSettings settings;
+  settings.setForceFrameBasedVideoControls(true);
+  settings.commit();
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updatePlaybackState()
+{
+  if (this->Core->isPlaying())
+    {
+    this->updatePlaybackRate(this->Core->getPlaybackRate());
+    }
+  else
+    {
+    this->Internal->UI.playbackSpeed->setText("P");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updatePlaybackRate(qreal rate)
+{
+  this->Internal->UI.playbackSpeed->setText(
+    QString("%1x").arg(static_cast<int>(rate)));
+}
+
+//-----------------------------------------------------------------------------
+void vpView::pickTimeInterval()
+{
+  QEventLoop eventLoop;
+  vpSelectTimeIntervalDialog selectTime(this->Core, this->GraphModelWidget);
+
+  connect(&selectTime, SIGNAL(finished(int)), &eventLoop, SLOT(quit()));
+
+  selectTime.show();
+  eventLoop.exec();
+
+  this->GraphModelWidget->setMeasuredTimeInterval(
+    selectTime.getDurationInSeconds());
+}
+
+//-----------------------------------------------------------------------------
+void vpView::updateFrameScrubberRange()
+{
+  if (this->Core->getUsingTimeBasedIndexing())
+    {
+    this->Internal->UI.currentFrame->setTimeRange(
+      this->Core->getMinimumTime(), this->Core->getMaximumTime());
+    }
+  else
+    {
+    this->Internal->UI.currentFrame->setFrameNumberRange(
+      this->Core->getMinimumFrameNumber(), this->Core->getMaximumFrameNumber());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpView::resetFrameScrubberConfiguration()
+{
+  if (this->Core->getUsingTimeBasedIndexing())
+    {
+    this->Internal->UI.currentFrame->blockSignals(true);
+    this->Internal->UI.currentFrame->setTimeRange(
+      this->Core->getMinimumTime(), this->Core->getMaximumTime());
+    this->Internal->UI.currentFrame->blockSignals(false);
+    this->Internal->UI.minFrame->setVisible(false);
+    this->Internal->UI.minTime->setVisible(true);
+    this->Internal->UI.minTime->setEnabled(
+      this->Internal->UI.minFrameCheckBox->checkState() == Qt::Checked);
+    this->Internal->UI.minFrameCheckBox->setText("Min Time");
+    }
+  else
+    {
+    this->Internal->UI.currentFrame->blockSignals(true);
+    this->Internal->UI.currentFrame->setFrameNumberRange(
+      this->Core->getMinimumFrameNumber(), this->Core->getMaximumFrameNumber());
+    this->Internal->UI.currentFrame->blockSignals(false);
+    this->Internal->UI.minFrame->setVisible(true);
+    this->Internal->UI.minFrame->setEnabled(
+      this->Internal->UI.minFrameCheckBox->checkState() == Qt::Checked);
+    this->Internal->UI.minTime->setVisible(false);
+    this->Internal->UI.minFrameCheckBox->setText("Min Frame");
+    }
+  this->onFrameChange();
+}
+
+//-----------------------------------------------------------------------------
+QString vpView::setTemporalFilterTimeLabelValue(double time)
+{
+  QString ts;
+  if (this->Core->getUsingTimeStampData())
+    {
+    vgUnixTime unixTime(time);
+    ts = unixTime.timeString();
+    }
+  else
+    {
+    ts = QString("%1").arg(time);
+    }
+  return ts;
+}
diff --git a/Applications/VpView/vpView.h b/Applications/VpView/vpView.h
new file mode 100644
index 00000000..cb78cb04
--- /dev/null
+++ b/Applications/VpView/vpView.h
@@ -0,0 +1,238 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpView_h
+#define __vpView_h
+
+#include <QMainWindow>
+
+class qtCliArgs;
+
+class vtkIdList;
+class vtkMatrix4x4;
+class vtkPoints;
+
+class vtkVgTimeStamp;
+
+class pqCoreTestUtility;
+
+class vpCreateEventDialog;
+class vpGraphModelWidget;
+class vpMergeTracksDialog;
+class vpQtViewer3dDialog;
+class vpTimelineDialog;
+class vpTrackColorDialog;
+class vpViewCore;
+
+class QTreeWidgetItem;
+
+class vpView : public QMainWindow
+{
+  Q_OBJECT
+
+public:
+  vpView();
+  ~vpView();
+
+  void initialize(const qtCliArgs* cliArgs);
+
+signals:
+  void windowSizeChanged(int, int);
+  void quitApp();
+  void eventSelected(int id);
+
+public slots:
+  void onInitialize();
+  void onDataLoaded();
+  void onDataChanged();
+  void onIconsLoaded();
+  void onOverviewLoaded();
+  void onEnterAdjudicationMode();
+  void onFollowTrackChange(int trackId);
+  void onExitFollowTrack();
+  void toggleAdjudicationMode(bool state);
+  void exitApp();
+  void onFrameChange();
+  void onTimeChange(double now);
+  void onReachedPlayBoundary();
+  void onFastBackward();
+  void onReversePause();
+  void onPause();
+  void onPlayPause();
+  void onFastForward();
+  void onLoopToggle(bool state);
+  void onFrameUpdate(int minFrameNumber, int frameNumber, bool resize);
+  void onTimeUpdate(double minTime, double time, bool resize);
+  void updateMinTime(double time);
+  void onFrameIntervalEnabled(int state);
+  void onTreeSelectionChanged(int sessionId);
+  void onTreeHoverItemChanged(int sessionId);
+  void updateObject(int objectType, int id);
+  void updateColorofTracksOfType(int typeIndex, double *rgb);
+  void updateCore();
+  void updateEverything();
+  void onCreateEvent(int type, vtkIdList* ids);
+  void onTimelineSelectionChanged(int type, int id);
+  void onShowHideTimelineView(bool show);
+  void onTimelineDialogClosed();
+  void onDisplayEventLegend(bool state);
+  void onDisplayEventIcons(bool state);
+  void onIconSizeChange(QAction* sizeAction, bool render = true);
+  void onDisplayOverview(bool state);
+  void onDisplayAOIOutline(bool state);
+  void onCriticalError(const QString&);
+  void onWarningError(const QString&);
+  void onShowConfigureDialog();
+  void onShowExternalProcessDialog();
+  void onSaveRenderedImages(bool state);
+  void onExecuteModeChanged(int index);
+  void onEventFilterPresetChanged(int index);
+  void onEventFilterVisibilityChanged();
+  void onEventFilterChanged();
+  void onFrameRendered();
+  void onReinitialized();
+  void onShow3dView(bool state);
+  void onHide3dView();
+  void onEventExpirationModeChange(QAction* sizeAction, bool render = true);
+  void onContextLODChanged(int value);
+  void onWebExport();
+
+  void updateFrameTime();
+  void updateObjectCounts();
+  void updateUI();
+
+  void handleRenderWindowMouseMove(int x, int y);
+
+  bool eventFilter(QObject* obj, QEvent* event);
+
+  void onCreateNewSpatialFilter(bool state);
+  void onSpatialFilterComplete(vtkPoints* contourPoints,
+                               vtkPoints* filterPoints,
+                               const vtkVgTimeStamp* timeStamp,
+                               vtkMatrix4x4* worldToImageMatrix,
+                               const QString& name,
+                               bool enabled);
+  void onTemporalFilterReady(int id, const QString& name,
+                             int type, double start, double end);
+
+  void onRemoveSelectedSpatialFilters();
+  void onRemoveAllSpatialFilters();
+
+  void spatialFilterChanged(QTreeWidgetItem* item);
+
+  void onAddTemporalFilter();
+  void onTemporalFilterSetStart();
+  void onTemporalFilterSetEnd();
+  void onRemoveSelectedTemporalFilters();
+  void onRemoveAllTemporalFilters();
+  void onRemoveAllFilters();
+
+  void temporalFilterChanged(QTreeWidgetItem* item, int column);
+
+  void bookmarkViewport();
+  void copyViewportExtentsToClipboard();
+  void copyExtendedInfoToClipboard();
+
+  void updateInfoWidget();
+  void rebuildObjectViews();
+
+  void onSettingsChanged();
+
+  void onTestingStarted();
+  void onTestingStopped();
+
+  void createTrack(bool start);
+  void createEvent(bool start);
+  void createSceneElement(bool start);
+
+  void mergeTracks(bool start);
+
+  void stopCreatingTrack();
+  void stopCreatingEvent();
+  void stopMergingTracks();
+
+  void onEventCreated(int id);
+  void onTracksMerged(int id);
+
+  void splitTrack(int id, int sessionId);
+
+  void addEventsToGraphModel(QList<int> eventIds, int sessionId);
+  void addTrackEventsToGraphModel(int id, int sessionId);
+
+  void selectEvent(int id);
+
+  void exportTracks();
+  void exportEvents();
+  void exportSceneElements();
+  void exportFilters();
+  void exportFilters(QString path, bool startExternalProcess);
+
+  void setTrackTrailLength();
+
+  void changeTrackColors();
+  void updateTrackColorsFromDialog(vpTrackColorDialog* dlg);
+
+  void setFrameOffset();
+
+  void importProject();
+  void closeProject(int sessionId);
+
+  void updateTracks();
+  void finishTrackUpdate();
+
+  void setAutoUpdateEnabled(bool enable);
+
+  void disableTimeBasedIndexing();
+
+  void updatePlaybackState();
+  void updatePlaybackRate(qreal rate);
+
+  void pickTimeInterval();
+
+  void executeExternalProcess();
+
+protected:
+  virtual void closeEvent(QCloseEvent*);  // reimplemented from QWidget
+
+private:
+  void parseCommandLine(const qtCliArgs& args);
+  void processCommandLine();
+
+  void setupDock();
+
+  void postLoadConfig();
+
+  void postDataLoaded();
+
+  void updateCoordinateDisplay();
+  void updateGsdDisplay();
+
+  void showGsd(double width, double height, const QString& suffix = QString());
+
+  void loadSettings();
+
+  void updateFrameScrubberRange();
+  void resetFrameScrubberConfiguration();
+
+  QString setTemporalFilterTimeLabelValue(double time);
+
+  class vtkInternal;
+  vtkInternal*             Internal;
+
+  // The core;
+  vpViewCore*             Core;
+
+  vpCreateEventDialog*    CreateEventDialog;
+  vpMergeTracksDialog*    MergeTracksDialog;
+  vpTimelineDialog*       TimelineDialog;
+  vpQtViewer3dDialog*     Viewer3dDialog;
+
+  pqCoreTestUtility*      TestUtility;
+
+  vpGraphModelWidget*     GraphModelWidget;
+};
+
+#endif // __vpView_h
diff --git a/Applications/VpView/vpView.ui b/Applications/VpView/vpView.ui
new file mode 100644
index 00000000..ad0dce10
--- /dev/null
+++ b/Applications/VpView/vpView.ui
@@ -0,0 +1,1614 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vpMainWindow</class>
+ <widget class="QMainWindow" name="vpMainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>749</width>
+    <height>689</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>VisGUI View</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">QStatusBar QLabel { padding-left: 4px; padding-right: 4px }</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QVTKWidget" name="renderFrame" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="leftMargin">
+       <number>6</number>
+      </property>
+      <property name="rightMargin">
+       <number>6</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="playbackSpeed">
+        <property name="minimumSize">
+         <size>
+          <width>32</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>P</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="minFrameCheckBox">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>Min Frame</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QSpinBox" name="minFrame">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="minimum">
+         <number>1</number>
+        </property>
+        <property name="maximum">
+         <number>10000</number>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="minTime">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="text">
+         <string>00:00:00.000</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="vgFrameScrubber" name="currentFrame" native="true">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>749</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuFile">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="actionOpenFile"/>
+    <addaction name="actionImportProject"/>
+    <addaction name="separator"/>
+    <addaction name="actionExportTracks"/>
+    <addaction name="actionExportEvents"/>
+    <addaction name="actionExportSceneElements"/>
+    <addaction name="separator"/>
+    <addaction name="actionExportFilters"/>
+    <addaction name="actionExportGraphModel"/>
+    <addaction name="separator"/>
+    <addaction name="actionImportFilters"/>
+    <addaction name="actionImportGraphModel"/>
+    <addaction name="separator"/>
+    <addaction name="actionSaveRenderedImages"/>
+    <addaction name="actionWebExport"/>
+    <addaction name="actionExportImageTimeStamps"/>
+    <addaction name="separator"/>
+    <addaction name="actionExit"/>
+   </widget>
+   <widget class="QMenu" name="menuView">
+    <property name="title">
+     <string>&amp;View</string>
+    </property>
+    <widget class="QMenu" name="menuCamera">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string>Viewport</string>
+     </property>
+     <addaction name="actionViewportZoomExtents"/>
+     <addaction name="actionViewportZoomAOI"/>
+     <addaction name="separator"/>
+     <addaction name="actionViewportBookmark"/>
+     <addaction name="actionViewportRestore"/>
+     <addaction name="separator"/>
+     <addaction name="actionViewportCopyViewExtentsToClipboard"/>
+     <addaction name="actionViewportCopyExtendedInfoToClipboard"/>
+    </widget>
+    <addaction name="separator"/>
+    <addaction name="actionShowHideTimelineView"/>
+    <addaction name="action3DView"/>
+    <addaction name="separator"/>
+    <addaction name="menuCamera"/>
+    <addaction name="separator"/>
+    <addaction name="actionShowHideObjectTags"/>
+    <addaction name="actionDisplayOverview"/>
+    <addaction name="actionDisplayAOIOutline"/>
+    <addaction name="actionDisplayEventLegend"/>
+   </widget>
+   <widget class="QMenu" name="menuPlayback">
+    <property name="title">
+     <string>&amp;Playback</string>
+    </property>
+    <addaction name="actionPlay"/>
+    <addaction name="actionPause"/>
+    <addaction name="actionReverse"/>
+    <addaction name="separator"/>
+    <addaction name="actionPreviousFrame"/>
+    <addaction name="actionNextFrame"/>
+    <addaction name="separator"/>
+    <addaction name="actionFastBackward"/>
+    <addaction name="actionFastForward"/>
+    <addaction name="separator"/>
+    <addaction name="actionLoop"/>
+   </widget>
+   <widget class="QMenu" name="menuTools">
+    <property name="title">
+     <string>&amp;Tools</string>
+    </property>
+    <widget class="QMenu" name="menuAnnotation">
+     <property name="title">
+      <string>Annotation</string>
+     </property>
+     <addaction name="actionCreateTrack"/>
+     <addaction name="actionCreateEvent"/>
+     <addaction name="actionCreateSceneElement"/>
+     <addaction name="separator"/>
+     <addaction name="actionMergeTracks"/>
+    </widget>
+    <addaction name="actionConfigure"/>
+    <addaction name="actionDatabaseQuery"/>
+    <addaction name="separator"/>
+    <addaction name="menuAnnotation"/>
+    <addaction name="separator"/>
+    <addaction name="actionAdjudicationMode"/>
+    <addaction name="actionExitFollowMode"/>
+    <addaction name="separator"/>
+    <addaction name="actionExternalProcess"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menuDisplay">
+    <property name="title">
+     <string>Display</string>
+    </property>
+    <widget class="QMenu" name="menuEventDisplay">
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
+     <property name="title">
+      <string>Show Events Until</string>
+     </property>
+     <addaction name="actionShowEventsUntilEventEnd"/>
+     <addaction name="actionShowEventsUntilTrackEnd"/>
+    </widget>
+    <widget class="QMenu" name="menuIcon_Size">
+     <property name="title">
+      <string>Icon Size</string>
+     </property>
+     <addaction name="actionIconSizeSmall"/>
+     <addaction name="actionIconSizeMedium"/>
+     <addaction name="actionIconSizeLarge"/>
+    </widget>
+    <addaction name="actionViewTracks"/>
+    <addaction name="actionViewTrackHeads"/>
+    <addaction name="actionViewEvents"/>
+    <addaction name="actionViewEventIcons"/>
+    <addaction name="actionViewActivities"/>
+    <addaction name="actionViewSceneElements"/>
+    <addaction name="separator"/>
+    <addaction name="actionDisplayFullVolume"/>
+    <addaction name="menuEventDisplay"/>
+    <addaction name="actionSetTrackTrailLength"/>
+    <addaction name="separator"/>
+    <addaction name="actionRandomEventColors"/>
+    <addaction name="separator"/>
+    <addaction name="actionChangeTrackColors"/>
+    <addaction name="actionPreviousAttribute"/>
+    <addaction name="actionNextAttribute"/>
+    <addaction name="separator"/>
+    <addaction name="menuIcon_Size"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewNormalcyCues"/>
+    <addaction name="actionViewSwapNormalcyScaling"/>
+    <addaction name="separator"/>
+    <addaction name="actionIncreaseIconXOffset"/>
+    <addaction name="actionDecreaseIconXOffset"/>
+    <addaction name="actionIncreaseIconYOffset"/>
+    <addaction name="actionDecreaseIconYOffset"/>
+    <addaction name="separator"/>
+    <addaction name="actionIncreaseOverlayTransparency"/>
+    <addaction name="actionDecreaseOverlayTransparency"/>
+    <addaction name="separator"/>
+    <addaction name="actionIncreaseSceneElementTransparency"/>
+    <addaction name="actionDecreaseSceneElementTransparency"/>
+    <addaction name="separator"/>
+    <addaction name="actionSetFrameOffset"/>
+   </widget>
+   <addaction name="menuFile"/>
+   <addaction name="menuView"/>
+   <addaction name="menuDisplay"/>
+   <addaction name="menuPlayback"/>
+   <addaction name="menuTools"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>Tool Bar</string>
+   </property>
+   <property name="iconSize">
+    <size>
+     <width>22</width>
+     <height>22</height>
+    </size>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonTextUnderIcon</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionFastBackward"/>
+   <addaction name="actionReverse"/>
+   <addaction name="actionPreviousFrame"/>
+   <addaction name="actionPause"/>
+   <addaction name="actionNextFrame"/>
+   <addaction name="actionPlay"/>
+   <addaction name="actionFastForward"/>
+  </widget>
+  <widget class="QDockWidget" name="objectInfoDock">
+   <property name="allowedAreas">
+    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
+   </property>
+   <property name="windowTitle">
+    <string>Object Info</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="vpObjectInfoPanel" name="objectInfoWidget"/>
+  </widget>
+  <widget class="QDockWidget" name="sessionViewDock">
+   <property name="allowedAreas">
+    <set>Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea</set>
+   </property>
+   <property name="windowTitle">
+    <string>Tree View</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="sessionViewDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_8">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vpSessionView" name="sessionView"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="eventOptionDock">
+   <property name="windowTitle">
+    <string>Filtering Options</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QScrollArea" name="eventOptionDockScrollArea">
+    <property name="frameShape">
+     <enum>QFrame::NoFrame</enum>
+    </property>
+    <property name="widgetResizable">
+     <bool>true</bool>
+    </property>
+    <widget class="QWidget" name="eventOptionDockContents">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>0</y>
+       <width>255</width>
+       <height>104</height>
+      </rect>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="spacing">
+       <number>4</number>
+      </property>
+      <property name="margin">
+       <number>4</number>
+      </property>
+      <item>
+       <widget class="QGroupBox" name="pvoGroupBox">
+        <property name="title">
+         <string>Tracks</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_11">
+         <property name="leftMargin">
+          <number>4</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>4</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="vgMixerWidget" name="pvoFilter" native="true">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="normalcyGroupBox">
+        <property name="title">
+         <string>Events</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <property name="leftMargin">
+          <number>4</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>4</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="vgMixerWidget" name="normalcyFilter" native="true">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="saliencyGroupBox">
+        <property name="title">
+         <string>Activities</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_4">
+         <property name="leftMargin">
+          <number>4</number>
+         </property>
+         <property name="topMargin">
+          <number>0</number>
+         </property>
+         <property name="rightMargin">
+          <number>4</number>
+         </property>
+         <property name="bottomMargin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="vgMixerWidget" name="saliencyFilter" native="true">
+           <property name="enabled">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>438</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="displayOptionsDock">
+   <property name="windowTitle">
+    <string>Display Options</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QScrollArea" name="displayOptionsDockScrollArea">
+    <property name="frameShape">
+     <enum>QFrame::NoFrame</enum>
+    </property>
+    <property name="widgetResizable">
+     <bool>true</bool>
+    </property>
+    <widget class="QWidget" name="displayOptionsDockContents">
+     <property name="geometry">
+      <rect>
+       <x>0</x>
+       <y>0</y>
+       <width>234</width>
+       <height>122</height>
+      </rect>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <property name="margin">
+       <number>4</number>
+      </property>
+      <item>
+       <widget class="QGroupBox" name="eventsGroup">
+        <property name="title">
+         <string>Events</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_6">
+         <item>
+          <widget class="vpEntityConfigWidget" name="eventConfig" native="true"/>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QGroupBox" name="activitiesGroup">
+        <property name="title">
+         <string>Activities</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_7">
+         <item>
+          <widget class="vpEntityConfigWidget" name="activityConfig" native="true"/>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <spacer name="verticalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>69</width>
+          <height>133</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="normalcyMapsDock">
+   <property name="windowTitle">
+    <string>Normalcy Maps</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="normalcyMapsDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_9">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QScrollArea" name="normalcyMapsScrollArea">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="widgetResizable">
+        <bool>true</bool>
+       </property>
+       <widget class="QWidget" name="normalcyMapsScrollAreaContent">
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>135</width>
+          <height>236</height>
+         </rect>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_10">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="vgMixerWidget" name="normalcyMapsFilter" native="true"/>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="spatialFiltersDock">
+   <property name="windowTitle">
+    <string>Spatial Filters</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents">
+    <layout class="QVBoxLayout" name="verticalLayout_12">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QTreeWidget" name="spatialFilterTree">
+       <property name="editTriggers">
+        <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+       </property>
+       <property name="alternatingRowColors">
+        <bool>true</bool>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="uniformRowHeights">
+        <bool>true</bool>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+       <property name="allColumnsShowFocus">
+        <bool>true</bool>
+       </property>
+       <column>
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolBar" name="spatialFilterToolBar">
+       <property name="windowTitle">
+        <string>Spatial Filter Tool Bar</string>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonFollowStyle</enum>
+       </property>
+       <addaction name="actionSpatialFilterAdd"/>
+       <addaction name="separator"/>
+       <addaction name="actionSpatialFilterRemoveSelected"/>
+       <addaction name="actionSpatialFilterRemoveAll"/>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="temporalFiltersDock">
+   <property name="windowTitle">
+    <string>Temporal Filters</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents_2">
+    <layout class="QVBoxLayout" name="verticalLayout_13">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QTreeWidget" name="temporalFilterTree">
+       <property name="editTriggers">
+        <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+       </property>
+       <property name="alternatingRowColors">
+        <bool>true</bool>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="uniformRowHeights">
+        <bool>true</bool>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+       <property name="allColumnsShowFocus">
+        <bool>true</bool>
+       </property>
+       <column>
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Type</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Start Frame</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string> End Frame</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolBar" name="temporalFilterToolBar">
+       <property name="windowTitle">
+        <string>Temporal Filter Tool Bar</string>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonFollowStyle</enum>
+       </property>
+       <addaction name="actionTemporalFilterAdd"/>
+       <addaction name="separator"/>
+       <addaction name="actionTemporalFilterSetStart"/>
+       <addaction name="actionTemporalFilterSetEnd"/>
+       <addaction name="separator"/>
+       <addaction name="actionTemporalFilterRemoveSelected"/>
+       <addaction name="actionTemporalFilterRemoveAll"/>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="graphModelDock">
+   <property name="windowTitle">
+    <string>Graph Model</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents_3">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="vpGraphModelWidget" name="graphModelWidget" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <action name="actionOpenFile">
+   <property name="text">
+    <string>&amp;Open Project</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+  </action>
+  <action name="actionExit">
+   <property name="text">
+    <string>E&amp;xit</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="actionDisplayEventLegend">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Event &amp;Legend</string>
+   </property>
+  </action>
+  <action name="actionViewEventIcons">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Event &amp;Icons</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+I</string>
+   </property>
+  </action>
+  <action name="actionViewSwapNormalcyScaling">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Swap Normalcy Scaling</string>
+   </property>
+  </action>
+  <action name="actionViewTracks">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Tracks</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+T</string>
+   </property>
+  </action>
+  <action name="actionViewEvents">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Events</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
+   </property>
+  </action>
+  <action name="actionViewActivities">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Activities</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+A</string>
+   </property>
+  </action>
+  <action name="actionPlay">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Play</string>
+   </property>
+   <property name="shortcut">
+    <string>F5</string>
+   </property>
+  </action>
+  <action name="actionLoop">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Loop Playback</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+L</string>
+   </property>
+  </action>
+  <action name="actionPreviousFrame">
+   <property name="text">
+    <string>P&amp;revious Frame</string>
+   </property>
+   <property name="shortcut">
+    <string>Left</string>
+   </property>
+  </action>
+  <action name="actionNextFrame">
+   <property name="text">
+    <string>&amp;Next Frame</string>
+   </property>
+   <property name="shortcut">
+    <string>Right</string>
+   </property>
+  </action>
+  <action name="actionIncreaseIconXOffset">
+   <property name="text">
+    <string>Increase Icon X Offset</string>
+   </property>
+   <property name="shortcut">
+    <string>+</string>
+   </property>
+  </action>
+  <action name="actionDecreaseIconXOffset">
+   <property name="text">
+    <string>Decrease Icon X Offset</string>
+   </property>
+   <property name="shortcut">
+    <string>-</string>
+   </property>
+  </action>
+  <action name="actionIncreaseIconYOffset">
+   <property name="text">
+    <string>Increase Icon Y Offset</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl++</string>
+   </property>
+  </action>
+  <action name="actionDecreaseIconYOffset">
+   <property name="text">
+    <string>Decrease Icon Y Offset</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+-</string>
+   </property>
+  </action>
+  <action name="actionIncreaseOverlayTransparency">
+   <property name="text">
+    <string>Increase Overlay Transparency</string>
+   </property>
+   <property name="shortcut">
+    <string>T</string>
+   </property>
+  </action>
+  <action name="actionDecreaseOverlayTransparency">
+   <property name="text">
+    <string>Decrease Overlay Transparency</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+T</string>
+   </property>
+  </action>
+  <action name="actionDisplayOverview">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Overview</string>
+   </property>
+  </action>
+  <action name="actionAdjudicationMode">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Ad&amp;judication Mode</string>
+   </property>
+  </action>
+  <action name="actionDisplayAOIOutline">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>AOI O&amp;utline</string>
+   </property>
+  </action>
+  <action name="actionRandomEventColors">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Random Event Colors</string>
+   </property>
+  </action>
+  <action name="actionViewTrackHeads">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Track Heads</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+H</string>
+   </property>
+  </action>
+  <action name="actionShowHideTimelineView">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Timeline View</string>
+   </property>
+  </action>
+  <action name="actionShowHideObjectTags">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Object Tags</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+  <action name="actionDisplayFullVolume">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Show Full Volume</string>
+   </property>
+  </action>
+  <action name="actionExportEvents">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Export Events</string>
+   </property>
+  </action>
+  <action name="actionExitFollowMode">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Exit Follow Mode</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+F</string>
+   </property>
+  </action>
+  <action name="actionConfigure">
+   <property name="text">
+    <string>Configure</string>
+   </property>
+  </action>
+  <action name="actionDatabaseQuery">
+   <property name="text">
+    <string>Database Query</string>
+   </property>
+  </action>
+  <action name="actionSaveRenderedImages">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Save Rendered Images</string>
+   </property>
+  </action>
+  <action name="actionIconSizeSmall">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Small</string>
+   </property>
+  </action>
+  <action name="actionIconSizeMedium">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Medium</string>
+   </property>
+   <property name="toolTip">
+    <string>Medium</string>
+   </property>
+  </action>
+  <action name="actionIconSizeLarge">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Large</string>
+   </property>
+  </action>
+  <action name="actionViewNormalcyCues">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Normalcy Cues</string>
+   </property>
+  </action>
+  <action name="action3DView">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;3D View</string>
+   </property>
+  </action>
+  <action name="actionSpatialFilterRemoveSelected">
+   <property name="text">
+    <string>Clear S&amp;elected</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove selected filters</string>
+   </property>
+  </action>
+  <action name="actionSpatialFilterRemoveAll">
+   <property name="text">
+    <string>Clear &amp;All</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove all filters</string>
+   </property>
+  </action>
+  <action name="actionViewportBookmark">
+   <property name="text">
+    <string>Bookmark</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+K</string>
+   </property>
+  </action>
+  <action name="actionViewportRestore">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Restore</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+K</string>
+   </property>
+  </action>
+  <action name="actionViewportZoomExtents">
+   <property name="text">
+    <string>Zoom Image Extents</string>
+   </property>
+   <property name="shortcut">
+    <string>R</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetShortcut</enum>
+   </property>
+  </action>
+  <action name="actionViewportZoomAOI">
+   <property name="text">
+    <string>Zoom AOI</string>
+   </property>
+   <property name="shortcut">
+    <string>A</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetShortcut</enum>
+   </property>
+  </action>
+  <action name="actionViewportCopyViewExtentsToClipboard">
+   <property name="text">
+    <string>Copy View Extents To Clipboard</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+X</string>
+   </property>
+  </action>
+  <action name="actionTemporalFilterRemoveAll">
+   <property name="text">
+    <string>Clear &amp;All</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove all filters</string>
+   </property>
+  </action>
+  <action name="actionTemporalFilterRemoveSelected">
+   <property name="text">
+    <string>Clear S&amp;elected</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove selected filters</string>
+   </property>
+  </action>
+  <action name="actionTemporalFilterAdd">
+   <property name="text">
+    <string>Add</string>
+   </property>
+   <property name="toolTip">
+    <string>Add a new filter</string>
+   </property>
+  </action>
+  <action name="actionExportTracks">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Export Tracks</string>
+   </property>
+  </action>
+  <action name="actionShowEventsUntilEventEnd">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>End of Event</string>
+   </property>
+  </action>
+  <action name="actionShowEventsUntilTrackEnd">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>End of Track</string>
+   </property>
+  </action>
+  <action name="actionExportGraphModel">
+   <property name="text">
+    <string>Export Graph Model</string>
+   </property>
+  </action>
+  <action name="actionImportGraphModel">
+   <property name="text">
+    <string>Import Graph Model</string>
+   </property>
+  </action>
+  <action name="actionCreateEvent">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Create Event...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+E</string>
+   </property>
+  </action>
+  <action name="actionCreateTrack">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Create Track</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+T</string>
+   </property>
+  </action>
+  <action name="actionMergeTracks">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Merge Tracks...</string>
+   </property>
+   <property name="toolTip">
+    <string>Merge Tracks</string>
+   </property>
+  </action>
+  <action name="actionSetTrackTrailLength">
+   <property name="text">
+    <string>Set Track Trail Length...</string>
+   </property>
+  </action>
+  <action name="actionChangeTrackColors">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Change Track Color(s)...</string>
+   </property>
+  </action>
+  <action name="actionNextAttribute">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Next Attribute</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+]</string>
+   </property>
+  </action>
+  <action name="actionPreviousAttribute">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Previous Attribute</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+[</string>
+   </property>
+  </action>
+  <action name="actionWebExport">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Export Assets for Web</string>
+   </property>
+  </action>
+  <action name="actionSetFrameOffset">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Set Frame Offset...</string>
+   </property>
+  </action>
+  <action name="actionAutoUpdate">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vpView.qrc">
+     <normaloff>:/icons/16x16/refresh</normaloff>:/icons/16x16/refresh</iconset>
+   </property>
+   <property name="text">
+    <string>Auto Update</string>
+   </property>
+  </action>
+  <action name="actionExportImageTimeStamps">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Export Image Timestamps</string>
+   </property>
+  </action>
+  <action name="actionViewportCopyExtendedInfoToClipboard">
+   <property name="text">
+    <string>Copy Extended Info To Clipboard</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+I</string>
+   </property>
+  </action>
+  <action name="actionImportProject">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Import Project</string>
+   </property>
+  </action>
+  <action name="actionReverse">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Re&amp;verse</string>
+   </property>
+   <property name="toolTip">
+    <string>Play reversed</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+F5</string>
+   </property>
+  </action>
+  <action name="actionPause">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Pa&amp;use</string>
+   </property>
+   <property name="toolTip">
+    <string>Pause</string>
+   </property>
+  </action>
+  <action name="actionFastForward">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Fast &amp;Forward</string>
+   </property>
+   <property name="toolTip">
+    <string>Fast forward</string>
+   </property>
+   <property name="shortcut">
+    <string>&gt;</string>
+   </property>
+  </action>
+  <action name="actionFastBackward">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Fast &amp;Backward</string>
+   </property>
+   <property name="toolTip">
+    <string>Fast backward</string>
+   </property>
+   <property name="shortcut">
+    <string>&lt;</string>
+   </property>
+  </action>
+  <action name="actionSpatialFilterAdd">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Add</string>
+   </property>
+   <property name="toolTip">
+    <string>Add a new spatial filter</string>
+   </property>
+  </action>
+  <action name="actionExportFilters">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Export Filters</string>
+   </property>
+  </action>
+  <action name="actionImportFilters">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Import Filters</string>
+   </property>
+  </action>
+  <action name="actionViewSceneElements">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Scene Elements</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="actionCreateSceneElement">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Create Scene Element...</string>
+   </property>
+   <property name="toolTip">
+    <string>Create Scene Element</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+S</string>
+   </property>
+  </action>
+  <action name="actionExportSceneElements">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Export Scene Elements</string>
+   </property>
+  </action>
+  <action name="actionExternalProcess">
+   <property name="text">
+    <string>External Process</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+P</string>
+   </property>
+  </action>
+  <action name="actionIncreaseSceneElementTransparency">
+   <property name="text">
+    <string>Increase Scene Element Transparency</string>
+   </property>
+   <property name="shortcut">
+    <string>S</string>
+   </property>
+  </action>
+  <action name="actionDecreaseSceneElementTransparency">
+   <property name="text">
+    <string>Decrease Scene Element Transparency</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+S</string>
+   </property>
+  </action>
+  <action name="actionExecuteExternalProcess">
+   <property name="text">
+    <string>Execute Process</string>
+   </property>
+   <property name="toolTip">
+    <string>Execute currently configured external process</string>
+   </property>
+  </action>
+  <action name="actionTemporalFilterSetStart">
+   <property name="text">
+    <string>Set Start</string>
+   </property>
+   <property name="toolTip">
+    <string>Set start frame of filter to current frame</string>
+   </property>
+  </action>
+  <action name="actionTemporalFilterSetEnd">
+   <property name="text">
+    <string>Set End</string>
+   </property>
+   <property name="toolTip">
+    <string>Set end frame of filter to current frame</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QVTKWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vgFrameScrubber</class>
+   <extends>QWidget</extends>
+   <header location="global">vgFrameScrubber.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vgMixerWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">vgMixerWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vpObjectInfoPanel</class>
+   <extends>QWidget</extends>
+   <header>vpObjectInfoPanel.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vpSessionView</class>
+   <extends>QTabWidget</extends>
+   <header>vpSessionView.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vpEntityConfigWidget</class>
+   <extends>QWidget</extends>
+   <header>vpEntityConfigWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vpGraphModelWidget</class>
+   <extends>QWidget</extends>
+   <header>vpGraphModelWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vpView.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Applications/VpView/vpViewCore.cxx b/Applications/VpView/vpViewCore.cxx
new file mode 100644
index 00000000..cb4b1cd8
--- /dev/null
+++ b/Applications/VpView/vpViewCore.cxx
@@ -0,0 +1,8582 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vpViewCore.h"
+
+#include <vgActivityType.h>
+#include <vgColor.h>
+#include <vgEventType.h>
+#include <vgTrackType.h>
+#include <vgFileDialog.h>
+#include <vgMixerWidget.h>
+
+#include "vpActivityConfig.h"
+#include "vpAnnotation.h"
+#include "vpBox.h"
+#include "vpContour.h"
+#include "vpEntityConfigWidget.h"
+#include "vpEventConfig.h"
+#include "vpEventTypeRegistry.h"
+#include "vpFileDataSource.h"
+#include "vpFrameMap.h"
+#include "vpImageSourceFactory.h"
+#include "vpInformaticsDialog.h"
+#include "vpModelIO.h"
+#include "vpNormalcyMaps.h"
+#include "vpObjectInfoPanel.h"
+#include "vpProject.h"
+#include "vpProjectParser.h"
+#include "vpQtViewer3dWidget.h"
+#include "vpRenderWindowDialog.h"
+#include "vpSessionView.h"
+#include "vpTimelineDialog.h"
+#include "vpTrackConfig.h"
+#include "vpVideoAnimation.h"
+
+#ifdef VISGUI_USE_VIDTK
+#include "vpVidtkFileIO.h"
+#endif
+
+// VTK includes.
+#include <vtkActor.h>
+#include <vtkActor2D.h>
+#include <vtkBoundingBox.h>
+#include <vtkCamera.h>
+#include <vtkCellArray.h>
+#include <vtkCommand.h>
+#include <vtkContourWidget.h>
+#include <vtkCoordinate.h>
+#include <vtkCursor2D.h>
+#include <vtkDataSetAttributes.h>
+#include <vtkDoubleArray.h>
+#include <vtkElevationFilter.h>
+#include <vtkEventQtSlotConnect.h>
+#include <vtkExtractVOI.h>
+#include <vtkGraph.h>
+#include <vtkGraphLayoutView.h>
+#include <vtkGreedyTerrainDecimation.h>
+#include <vtkHoverWidget.h>
+#include <vtkImageActor.h>
+#include <vtkImageBlend.h>
+#include <vtkImageData.h>
+#include <vtkImageMapToColors.h>
+#include <vtkImageProperty.h>
+#include <vtkIntArray.h>
+#include <vtkJPEGReader.h>
+#include <vtkJPEGWriter.h>
+#include <vtkLegendBoxActor.h>
+#include <vtkLinearTransform.h>
+#include <vtkLineSource.h>
+#include <vtkLookupTable.h>
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkMergeFilter.h>
+#include <vtkNew.h>
+#include <vtkPNGReader.h>
+#include <vtkPNGWriter.h>
+#include <vtkPlaneSource.h>
+#include <vtkPointData.h>
+#include <vtkPoints.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkPolyDataMapper2D.h>
+#include <vtkPolygon.h>
+#include <vtkProperty.h>
+#include <vtkProperty2D.h>
+#include <vtkRandomGraphSource.h>
+#include <vtkRegularPolygonSource.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderedGraphRepresentation.h>
+#include <vtkRenderer.h>
+#include <vtkSetGet.h>
+#include <vtkStringArray.h>
+#include <vtkTexture.h>
+#include <vtkTextureMapToPlane.h>
+#include <vtkTexturedActor2D.h>
+#include <vtkTimerLog.h>
+#include <vtkWarpScalar.h>
+#include <vtkWindowToImageFilter.h>
+#include <vtkXMLPolyDataReader.h>
+#include <vtkXMLPolyDataWriter.h>
+
+// VisGUI includes.
+#include <vtkVgActivity.h>
+#include <vtkVgActivityManager.h>
+#include <vtkVgActivityTypeRegistry.h>
+#include <vtkVgContourOperatorManager.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventFilter.h>
+#include <vtkVgEventIconRepresentation.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgEventRepresentation.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgGraphModel.h>
+#include <vtkVgGraphRepresentation.h>
+#include <vtkVgIconManager.h>
+#include <vtkVgImageSource.h>
+#include <vtkVgInteractorStyleRubberBand2D.h>
+#include <vtkVgJPEGReader.h>
+#include <vtkVgMultiResJpgImageReader2.h>
+#include <vtkVgPNGReader.h>
+#include <vtkVgPickData.h>
+#include <vtkVgPicker.h>
+#include <vtkVgRendererUtils.h>
+#include <vtkVgTemporalFilters.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackFilter.h>
+#include <vtkVgTrackHeadRepresentation.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+#include <vtkVgTrackTypeRegistry.h>
+
+#include <vtkVpInteractionCallback.h>
+
+#if defined(VISGUI_USE_GDAL)
+  #include <vtkVgGDALReader.h>
+#endif
+
+#include <QVTKWidget.h>
+
+// Qt includes.
+#include <QApplication>
+#include <QComboBox>
+#include <QCursor>
+#include <QDebug>
+#include <QDir>
+#include <QDockWidget>
+#include <QFileDialog>
+#include <QFileInfo>
+#include <QFileSystemWatcher>
+#include <QInputDialog>
+#include <QLayout>
+#include <QMessageBox>
+#include <QProcess>
+#include <QProgressDialog>
+#include <QRegExp>
+#include <QSettings>
+#include <QScopedPointer>
+#include <QTime>
+#include <QTimer>
+#include <QToolBar>
+
+// C++ includes.
+#include <cmath>
+#include <cstdlib>
+#include <limits>
+
+// QtExtensions includes.
+#include <qtStlUtil.h>
+
+#include <vtksys/SystemTools.hxx>
+
+// VIDTK includes
+#ifdef VISGUI_USE_VIDTK
+#include <tracking_data/track_state.h> // for track state attributes
+#include <utilities/token_expansion.h>
+#endif
+
+#include <GeographicLib/Geodesic.hpp>
+
+static double TrackEditColor[] = { 1.0, .274, .274 };
+static double SelectedColor[] =  { 1.0, 0.08, 0.58 };
+
+enum { DefaultTrackExpiration = 10 };
+
+enum RegionEditMode { REM_Auto, REM_BoundingBox, REM_Polygon };
+
+// Workaround name collision with macro from WinUser.h
+#undef GetProp
+
+// Constructor
+//-----------------------------------------------------------------------------
+vpViewCore::vpViewCore() :
+  Playing(false),
+  UsingTimeStampData(false),
+  UsingTimeBasedIndexing(false),
+  UseTimeStampDataIfAvailable(true),
+  UseTimeBasedIndexing(true),
+  EnableWorldDisplayIfAvailable(true),
+  EnableTranslateImage(true),
+  CurrentProjectId(0),
+  CurrentTrackColorMode(vtkVgTrackRepresentationBase::TCM_Model),
+  Contour(0),
+  DrawingContour(false),
+  NewTrackId(-1),
+  TrackHeadBox(0),
+  TrackHeadContour(0),
+  TrackHeadRegion(0),
+  HideTrackHeadIndicator(false),
+  RegionEditMode(REM_Auto),
+  ExternalExecuteMode(-1),
+  TrackUpdateChunkSize(10),
+  VideoAnimation(new vpVideoAnimation(this)),
+  GraphRenderingEnabled(true),
+  RulerEnabled(false)
+{
+  this->initializeDisplay();
+  this->initializeData();
+  this->initializeScene();
+  this->initializeExtentsBounds();
+  this->initializeSources();
+  this->initializeAllOthers();
+
+  this->ExternalProcess = new QProcess(this);
+  this->FileSystemWatcher = new QFileSystemWatcher();
+  // Force watcher to use polling since the normal engine doesn't work
+  // with network shares.
+  this->FileSystemWatcher->setObjectName(
+    QLatin1String("_qt_autotest_force_engine_poller"));
+
+  connect(this->VideoAnimation, SIGNAL(finished()), this,
+          SIGNAL(reachedPlayBoundary()));
+
+  connect(this->VideoAnimation, SIGNAL(rateChanged(qreal)), this,
+          SIGNAL(playbackRateChanged(qreal)));
+}
+
+//-----------------------------------------------------------------------------
+vpViewCore::~vpViewCore()
+{
+  if (this->ExternalProcess->state() == QProcess::Running)
+    {
+    this->ExternalProcess->kill();
+    this->ExternalProcess->waitForFinished(5000);
+    delete ExternalProcess;
+    }
+  delete this->FileSystemWatcher;
+
+  this->cleanUp();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::cleanUp()
+{
+  delete this->InformaticsDialog;   this->InformaticsDialog = 0;
+  delete this->FrameMap;            this->FrameMap = 0;
+  delete this->ImageDataSource;     this->ImageDataSource = 0;
+
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    delete this->Projects[i];
+    }
+
+  delete this->ProjectParser;       this->ProjectParser = 0;
+  delete this->TrackConfig;         this->TrackConfig = 0;
+  delete this->EventConfig;         this->EventConfig = 0;
+  delete this->ActivityConfig;      this->ActivityConfig = 0;
+  delete this->NormalcyMaps;        this->NormalcyMaps = 0;
+  delete this->Annotation;          this->Annotation = 0;
+  delete this->Contour;             this->Contour = 0;
+  delete this->TrackHeadBox;        this->TrackHeadBox = 0;
+  delete this->TrackHeadContour;    this->TrackHeadContour = 0;
+
+  for (size_t i = 0, end = this->Contours.size(); i < end; ++i)
+    {
+    delete this->Contours[i];
+    }
+
+  this->ActivityTypeRegistry->Delete();
+  this->EventTypeRegistry->Delete();
+  this->TrackTypeRegistry->Delete();
+
+  vpImageSourceFactory::OnApplicationExit();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::openProject()
+{
+  QString path = vgFileDialog::getOpenFileName(
+    0, "File Open Dialog:", QString(), "vpView project (*.prj);;");
+
+  if (path.isEmpty())
+    {
+    return;
+    }
+
+  if (!this->loadProject(qPrintable(path)))
+    {
+    return;
+    }
+
+  // Update view.
+  if (this->Projects.size() == 1)
+    {
+    this->refreshView();
+    }
+}
+
+namespace
+{
+
+class SetImageHeight
+{
+  unsigned int PrevHeight;
+  vpModelIO* IO;
+
+public:
+  SetImageHeight(vpModelIO* io, unsigned int imageHeight) : IO(io)
+    {
+    this->PrevHeight = io->GetImageHeight();
+    io->SetImageHeight(imageHeight);
+    }
+
+  ~SetImageHeight()
+    {
+    this->IO->SetImageHeight(this->PrevHeight);
+    }
+};
+
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::importProject()
+{
+#ifndef VISGUI_USE_VIDTK
+  QMessageBox::warning(0, QString(),
+                       "Cannot import project files without VidTK support.");
+  return;
+#else
+  int session = this->SessionView->GetCurrentSession();
+  vpProject* currentProject = this->Projects[session];
+
+  vpVidtkFileIO* currentIO =
+    dynamic_cast<vpVidtkFileIO*>(currentProject->ModelIO.data());
+  if (!currentIO)
+    {
+    emit this->warningError(
+      "Importing into non-file-based projects is not currently supported.");
+    return;
+    }
+
+  QString filter = "*.prj;;";
+  vgFileDialog fileDialog(0, "Import Project", QString(), filter);
+  fileDialog.setObjectName("importProjectDialog");
+  fileDialog.setFileMode(QFileDialog::ExistingFile);
+  if (fileDialog.exec() != QDialog::Accepted)
+    {
+    return;
+    }
+
+  this->ProjectParser->SetFileName(
+    qPrintable(fileDialog.selectedFiles().front()));
+  this->ProjectParser->SetUseStream(false);
+
+  QScopedPointer<vpProject> project(new vpProject(this->CurrentProjectId + 1));
+  this->ProjectParser->Parse(project.data());
+
+  if (project->AnalysisDimensions[0] == -1.0 ||
+      project->AnalysisDimensions[1] == -1.0)
+    {
+    emit this->warningError("The source project does not have valid AOI "
+                            "dimensions specified in the project file. "
+                            "Please add a valid AnalysisDimensions tag to the "
+                            "project file to be imported and try again.");
+    return;
+    }
+
+  if (this->UseRawImageCoordinates)
+    {
+    if (project->AOIUpperLeftLatLon[0] == 444.0 ||
+        project->AOIUpperLeftLatLon[1] == 444.0)
+      {
+      emit this->warningError("The source project does not have valid AOI "
+                              "geocoordinates. It cannot be imported while in "
+                              "translated image coordinate mode.");
+      return;
+      }
+    }
+
+  if (QDir::cleanPath(qtString(this->ImageDataSource->getDataSetSpecifier())) !=
+      QDir::cleanPath(qtString(project->DataSetSpecifier)))
+    {
+    if (QMessageBox::warning(0, QString(),
+                             "The project to be imported has a different "
+                             "dataset specifier than the currently loaded "
+                             "data. The import operation may produce invalid "
+                             "tracks or events.\n\nContinue?",
+                             QMessageBox::Ok | QMessageBox::Cancel) !=
+        QMessageBox::Ok)
+      {
+      return;
+      }
+    }
+
+  // Compute a reasonable offset for incoming object ids, assuming the source
+  // ids start near 0.
+  vtkIdType lastId =
+    std::max(currentProject->TrackModel->GetNextAvailableId(),
+             currentProject->EventModel->GetNextAvailableId());
+
+  int idsOffset = static_cast<int>(((lastId + 1000 - 1) / 1000) * 1000);
+
+  // Allow the user to tweak the offset as desired.
+  bool ok;
+  idsOffset =
+    QInputDialog::getInt(0, QString(), "Offset to apply to imported object ids:",
+                         idsOffset, INT_MIN, INT_MAX, 1, &ok);
+  if (!ok)
+    {
+    return;
+    }
+
+  // Point current project's IO manager to the files we are importing from.
+  currentIO->SetTracksFileName(project->TracksFile.c_str());
+  currentIO->SetTrackTraitsFileName(project->TrackTraitsFile.c_str());
+  currentIO->SetEventsFileName(project->EventsFile.c_str());
+  currentIO->SetEventLinksFileName(project->EventLinksFile.c_str());
+  currentIO->SetActivitiesFileName(project->ActivitiesFile.c_str());
+  currentIO->SetFseTracksFileName(project->SceneElementsFile.c_str());
+
+  // Temporarily change the AOI height to that of the input project, so that
+  // imported object points get y-flipped correctly.
+  SetImageHeight sih(currentIO,
+                     static_cast<unsigned int>(project->AnalysisDimensions[1]));
+
+  // Compute the offsets needed to transform the track data to the AOI of the
+  // current project.
+  float offsetX, offsetY;
+
+  if (this->UseRawImageCoordinates)
+    {
+    // Compute the image coordinates of the AOI origin for the source project.
+    double point[4] = { project->AOIUpperLeftLatLon[1],
+                        project->AOIUpperLeftLatLon[0], 0.0, 1.0 };
+    this->LatLonToImageReferenceMatrix->MultiplyPoint(point, point);
+    if (point[3] != 0)
+      {
+      point[0] /= point[3];
+      point[1] /= point[3];
+      }
+
+    // The desired offset is the difference between the AOI origins.
+    offsetX = point[0] - this->ImageTranslationReferenceOffset[0];
+    offsetY = this->ImageTranslationReferenceOffset[1] - point[1];
+    }
+  else if (!this->UseGeoCoordinates)
+    {
+    // Using inverted image coordinates.
+    offsetX = static_cast<float>(currentProject->OverviewOrigin[0] -
+                                 project->OverviewOrigin[0]);
+    offsetY = static_cast<float>(currentProject->OverviewOrigin[1] -
+                                 project->OverviewOrigin[1]);
+    }
+  else
+    {
+    // Geocoordinate mode, no offset required.
+    offsetX = 0.0f;
+    offsetY = 0.0f;
+    }
+
+  switch (project->IsValid(project->TracksFile))
+    {
+    case vpProject::FILE_EXIST:
+      if (!currentIO->ImportTracks(idsOffset, offsetX, offsetY))
+        {
+        emit this->warningError("Error occurred while importing tracks.");
+        return;
+        }
+      break;
+
+    case vpProject::FILE_NAME_EMPTY:
+      emit this->warningError("Project to import has no tracks file.");
+      return;
+
+    default:
+      emit this->warningError("Tracks file not found.");
+      return;
+    }
+
+  switch (project->IsValid(project->EventsFile))
+    {
+    case vpProject::FILE_EXIST:
+      if (!currentIO->ImportEvents(idsOffset, offsetX, offsetY))
+        {
+        emit this->warningError("Error occurred while importing events.");
+        }
+      // fall through
+    case vpProject::FILE_NAME_EMPTY:
+      break;
+
+    default:
+      emit this->warningError("Events file not found.");
+      break;
+    }
+
+  switch (project->IsValid(project->SceneElementsFile))
+    {
+    case vpProject::FILE_EXIST:
+      if (!currentIO->ImportFseTracks(idsOffset, offsetX, offsetY))
+        {
+        emit this->warningError("Error occurred while importing scene elements.");
+        return;
+        }
+      break;
+
+    case vpProject::FILE_NAME_EMPTY:
+      break;
+
+    default:
+      emit this->warningError("Scene elements file not found.");
+      return;
+    }
+
+
+  // TODO: For completeness, we should import activities as well. But the lack
+  // of id tracking in the activitiy manager makes that tricky at the moment.
+
+  this->SessionView->Update(true);
+  emit this->objectInfoUpdateNeeded();
+
+  this->UpdateObjectViews = false;
+  this->updateScene();
+
+#endif // VISGUI_USE_VIDTK
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::importTracksFromFile(vpProject* project)
+{
+  if (project->IsValid(project->TracksFile) == vpProject::FILE_NOT_EXIST)
+    {
+    this->handleFileNotFound(project->TracksFileTag, project->TracksFile);
+    return false;
+    }
+
+  if (project->IsValid(project->TracksFile) == vpProject::FILE_EXIST)
+    {
+    this->loadTracks(project);
+
+    // load track traits file if one was given
+    if (project->IsValid(project->TrackTraitsFile) == vpProject::FILE_EXIST)
+      {
+      this->loadTrackTraits(project);
+      }
+
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::importEventsFromFile(vpProject* project,
+                                      bool importTracksSuccessful)
+{
+  bool result = true;
+
+  // Even though track file may not be valid if user has specified a event file
+  // we need to inform user whether or not it is valid or not. This does not include
+  // the case when the file name is empty or not given.
+  if (project->IsValid(project->EventsFile) == vpProject::FILE_NOT_EXIST)
+    {
+    this->handleFileNotFound(project->EventsFileTag, project->EventsFile);
+    result = false;
+    }
+
+  // If track file is valid only then import events.
+  if (importTracksSuccessful)
+    {
+    if (project->IsValid(project->EventsFile) == vpProject::FILE_EXIST)
+      {
+      this->loadEvents(project);
+      }
+    else
+      {
+      result = false;
+      }
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::importEventLinksFromFile(vpProject* project,
+                                          bool eventsImportSuccessful)
+{
+  if (project->IsValid(project->EventLinksFile) ==
+      vpProject::FILE_NOT_EXIST)
+    {
+    this->handleFileNotFound(project->EventLinksFileTag,
+                             project->EventLinksFile);
+    return false;
+    }
+
+  if (!eventsImportSuccessful)
+    {
+    return false;
+    }
+
+  if (project->IsValid(project->EventLinksFile) !=
+      vpProject::FILE_EXIST)
+    {
+    return false;
+    }
+
+  this->loadEventLinks(project);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::importActivitiesFromFile(vpProject* project,
+                                          bool eventsImportSuccessful)
+{
+  bool result  = true;
+
+  if (project->IsValid(project->ActivitiesFile) == vpProject::FILE_NOT_EXIST)
+    {
+    this->handleFileNotFound(project->ActivitiesFileTag,
+                             project->ActivitiesFile);
+    result = false;
+    }
+
+  // Only if events file is valid load the activities file.
+  if (eventsImportSuccessful)
+    {
+    if (project->IsValid(project->ActivitiesFile) == vpProject::FILE_EXIST)
+      {
+      this->loadActivities(project);
+      }
+    else
+      {
+      result = false;
+      }
+    }
+
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::importSceneElementsFromFile(vpProject* project)
+{
+  if (project->IsValid(project->SceneElementsFile) == vpProject::FILE_NOT_EXIST)
+    {
+    this->handleFileNotFound(project->SceneElementsFileTag, project->SceneElementsFile);
+    return false;
+    }
+
+  if (project->IsValid(project->SceneElementsFile) == vpProject::FILE_EXIST)
+    {
+    this->loadSceneElements(project);
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::importIconsFromFile(vpProject* project)
+{
+  bool result = true;
+
+  if (project->IsValid(project->IconsFile) == vpProject::FILE_NOT_EXIST)
+    {
+    this->handleFileNotFound(project->IconsFileTag, project->IconsFile);
+    result = false;
+    }
+  else if (project->IsValid(project->IconsFile) == vpProject::FILE_EXIST)
+    {
+    this->loadIcons(project);
+    }
+  else
+    {
+    result = false;
+    }
+
+  if (this->Projects.empty())
+    {
+    this->createEventLegend(project);
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::importOverviewFromFile(vpProject* project)
+{
+  bool result = true;
+
+  if (project->IsValid(project->OverviewFile) == vpProject::FILE_EXIST)
+    {
+    const int levelOfDetailToLoad = 3;
+    this->ImageSource->SetFileName(project->OverviewFile.c_str());
+    this->ImageSource->SetLevel(levelOfDetailToLoad);
+    this->ImageSource->Update();
+    this->ImageData[0]->DeepCopy(this->ImageSource->GetOutput());
+    this->ImageData[0]->GetBounds(this->OverviewImageBounds);
+
+    this->OverviewExtents[0] = this->OverviewImageBounds[0];
+    this->OverviewExtents[1] = this->OverviewImageBounds[1];
+    this->OverviewExtents[2] = this->OverviewImageBounds[2];
+    this->OverviewExtents[3] = this->OverviewImageBounds[3];
+
+    double origins[3];
+    this->ImageData[0]->GetOrigin(origins);
+    if (project->OverviewSpacing != -1)
+      {
+      this->ImageData[0]->SetSpacing(project->OverviewSpacing,
+                                     project->OverviewSpacing, 1);
+      }
+    else
+      {
+      this->ImageData[0]->SetSpacing(
+        1 << levelOfDetailToLoad, 1 << levelOfDetailToLoad, 1);
+      }
+    this->ImageData[0]->SetOrigin(project->OverviewOrigin[0],
+                                  project->OverviewOrigin[1],
+                                  0);
+    this->emit overviewLoaded();
+    }
+  else
+    {
+    result = false;
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::importNormalcyMapsFromFile(vpProject* project)
+{
+  if (project->IsValid(project->NormalcyMapsFile) == vpProject::FILE_EXIST)
+    {
+    return this->NormalcyMaps->LoadFromFile(
+             qtString(project->NormalcyMapsFile));
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::exportTracksToFile()
+{
+  if (this->isEditingTrack())
+    {
+    emit this->warningError(
+      "Cannot export tracks while a track is being edited.");
+    return;
+    }
+
+  QString filter = "*.kw18;;*.json";
+  vgFileDialog fileDialog(0, tr("Export Tracks"), QString(), filter);
+  fileDialog.setObjectName("ExportTracks");
+  fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+  fileDialog.setDefaultSuffix("kw18");
+  if (fileDialog.exec() != QDialog::Accepted)
+    {
+    return;
+    }
+
+  QStringList files = fileDialog.selectedFiles();
+
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Writing tracks...");
+  msgBox.setText("Writing tracks...");
+  msgBox.show();
+
+  int session = this->SessionView->GetCurrentSession();
+  bool success;
+  if (QFileInfo(files[0]).suffix() == "json")
+    {
+    success = this->Projects[session]->ModelIO->WriteFseTracks(
+                qPrintable(files[0]), false);
+    }
+  else
+    {
+    success = this->Projects[session]->ModelIO->WriteTracks(
+                qPrintable(files[0]));
+    }
+
+  if (!success)
+    {
+    QMessageBox::warning(0, "vpView", "Error writing tracks file.");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::exportEventsToFile()
+{
+  QString filter = "*.txt;;";
+  vgFileDialog fileDialog(0, tr("Export Events"), QString(), filter);
+  fileDialog.setObjectName("ExportEvents");
+  fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+  fileDialog.setDefaultSuffix("txt");
+  if (fileDialog.exec() != QDialog::Accepted)
+    {
+    return;
+    }
+
+  QStringList files = fileDialog.selectedFiles();
+
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Writing events...");
+  msgBox.setText("Writing events...");
+  msgBox.show();
+
+  int session = this->SessionView->GetCurrentSession();
+  if (!this->Projects[session]->ModelIO->WriteEvents(qPrintable(files[0])))
+    {
+    QMessageBox::warning(0, "vpView", "Error writing events file.");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::exportSceneElementsToFile()
+{
+  QString filter = "*.json;;";
+  vgFileDialog fileDialog(0, tr("Export Scene Elements"), QString(), filter);
+  fileDialog.setObjectName("ExportSceneElements");
+  fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+  fileDialog.setDefaultSuffix("json");
+  if (fileDialog.exec() != QDialog::Accepted)
+    {
+    return;
+    }
+
+  QStringList files = fileDialog.selectedFiles();
+
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Writing scene elements...");
+  msgBox.setText("Writing scene elements...");
+  msgBox.show();
+
+  int session = this->SessionView->GetCurrentSession();
+  vpProject* project = this->Projects[session];
+
+  if (!project->ModelIO->WriteFseTracks(qPrintable(files[0])))
+    {
+    QMessageBox::warning(0, "vpView", "Error writing scene elements file.");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::exportImageTimeStampsToFile()
+{
+  QString filter = "*.txt;;";
+  vgFileDialog fileDialog(0, tr("Export Image Timestamps"), QString(), filter);
+  fileDialog.setObjectName("ExportImageTimeStamps");
+  fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+  fileDialog.setDefaultSuffix("txt");
+  if (fileDialog.exec() != QDialog::Accepted)
+    {
+    return;
+    }
+
+  std::ofstream out(qPrintable(fileDialog.selectedFiles().front()));
+  if (!out.is_open())
+    {
+    emit this->warningError("Could not open image timestamp file for writing.");
+    return;
+    }
+
+  out.precision(20);
+  std::vector<std::pair<std::string, double> > imageTimes;
+  this->FrameMap->exportImageTimes(imageTimes);
+  for (size_t i = 0, size = imageTimes.size(); i < size; ++i)
+    {
+    out << imageTimes[i].first << ' ' << imageTimes[i].second / 1e6 << '\n';
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::createTrack(int trackId, int session, bool isFse)
+{
+  vtkVgTrack* track = this->makeTrack(trackId, session);
+  if (isFse)
+    {
+    track->SetDisplayFlags(vtkVgTrack::DF_SceneElement);
+    }
+
+  this->NewTrackId = trackId;
+
+  // Compute the point in the center of the view bounds, so that the initial
+  // follow of the track doesn't cause the camera to move.
+  double bounds[4];
+  vtkVgRendererUtils::GetBounds(this->SceneRenderer, bounds);
+  double center[4] =
+    {
+    0.5 * (bounds[0] + bounds[1]),
+    0.5 * (bounds[2] + bounds[3]),
+    0.0,
+    1.0
+    };
+
+  vtkMatrix4x4* trackToWorld =
+    this->Projects[session]->TrackRepresentation->GetRepresentationMatrix();
+
+  double worldToTrack[16];
+  vtkMatrix4x4::Invert(trackToWorld->Element[0], worldToTrack);
+  vtkMatrix4x4::MultiplyPoint(worldToTrack, center, center);
+  center[0] /= center[3];
+  center[1] /= center[3];
+
+  // Insert a placeholder point (to avoid warnings and other issues), but don't
+  // display this track until the user adds a point of their own.
+  this->NewTrackTimeStamp = this->CoreTimeStamp;
+  track->InsertNextPoint(this->NewTrackTimeStamp, center, vtkVgGeoCoord());
+  this->Projects[session]->TrackRepresentation->SetExcludedTrack(track);
+  this->Projects[session]->TrackHeadRepresentation->SetExcludedTrack(track);
+  this->Projects[session]->SceneElementRepresentation->SetExcludedTrack(track);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::createEvent(int type, vtkIdList* ids, int session)
+{
+  if (vtkVgEvent* event =
+        this->Projects[session]->EventModel->CreateAndAddEvent(type, ids))
+    {
+    return event->GetId();
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::splitTrack(int trackId, int newTrackId, int session)
+{
+  vtkVgTrack* track =
+    this->Projects[session]->TrackModel->GetTrack(trackId);
+
+  if (!track)
+    {
+    return false;
+    }
+
+  if (track->GetFrameIsInterpolated(this->CoreTimeStamp) ||
+      track->GetStartFrame() >= this->CoreTimeStamp ||
+      track->GetEndFrame() <= this->CoreTimeStamp)
+    {
+    return false;
+    }
+
+  // Initially, the new track contains all the data of the original
+  vtkVgTrack* newTrack = this->cloneTrack(trackId, newTrackId, session);
+  if (!newTrack)
+    {
+    return false;
+    }
+
+  // Trim beginning of new track up to (but not including) the split frame
+  while (newTrack->GetStartFrame() < this->CoreTimeStamp)
+    {
+    newTrack->DeletePoint(newTrack->GetStartFrame());
+    }
+
+  // Trim end of the original track back to (but not including) the split frame
+  while (track->GetEndFrame() > this->CoreTimeStamp)
+    {
+    track->DeletePoint(track->GetEndFrame());
+    }
+
+  vpProject* project = this->Projects[session];
+
+  std::vector<vtkVgEvent*> events;
+  project->EventModel->GetEvents(trackId, events);
+
+  int eventsCreated = 0;
+  if (!events.empty())
+    {
+    // Fix track references in events, and split events where necesssary
+    bool error = false;
+    for (size_t i = 0, end = events.size(); i < end; ++i)
+      {
+      vtkVgEvent* e = events[i];
+      for (unsigned int ti = 0; ti < e->GetNumberOfTracks(); ++ti)
+        {
+        vtkVgEventTrackInfoBase* eti = e->GetTrackInfo(ti);
+        if (eti->TrackId != trackId)
+          {
+          continue;
+          }
+
+        if (this->CoreTimeStamp < eti->StartFrame)
+          {
+          // Split time before the start of track time range, so just fix up the
+          // track reference to point to the newly created track
+          e->ReplaceTrack(ti, newTrackId);
+          e->SetTrackPtr(ti, newTrack);
+          }
+        else if (this->CoreTimeStamp > eti->StartFrame &&
+                 this->CoreTimeStamp < eti->EndFrame)
+          {
+          // Time range intersects the split frame, the event must be split
+          vtkVgEvent* eNew = this->cloneEvent(e->GetId(), session);
+          if (!eNew)
+            {
+            error = true;
+            break;
+            }
+
+          // In certain pathological cases, there may be events that refer
+          // to the same track more than once. Make sure we fix each ref.
+          for (unsigned int ti = 0; ti < e->GetNumberOfTracks(); ++ti)
+            {
+            vtkVgEventTrackInfoBase* eti = e->GetTrackInfo(ti);
+            if (eti->TrackId == trackId &&
+                this->CoreTimeStamp > eti->StartFrame &&
+                this->CoreTimeStamp < eti->EndFrame)
+              {
+              eNew->ReplaceTrack(ti, newTrackId);
+              eNew->SetTrackPtr(ti, newTrack);
+              eNew->SetTrackStartFrame(ti, this->CoreTimeStamp);
+              e->SetTrackEndFrame(ti, this->CoreTimeStamp);
+              }
+            }
+
+          // Done with this event
+          ++eventsCreated;
+          break;
+          }
+        }
+      }
+
+    if (error)
+      {
+      QMessageBox::warning(0, "Warning", "Failed to split one or more events.");
+      }
+    }
+
+  if (eventsCreated > 0)
+    {
+    project->EventModel->Modified();
+    this->SessionView->Update(true);
+    emit this->objectInfoUpdateNeeded();
+    emit this->showStatusMessage(
+      QString("%1 event(s) created").arg(eventsCreated));
+    }
+
+  this->update();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::mergeTracks(int trackA, int trackB, int session)
+{
+  vtkVgTrack* a = this->Projects[session]->TrackModel->GetTrack(trackA);
+  vtkVgTrack* b = this->Projects[session]->TrackModel->GetTrack(trackB);
+
+  if (a == 0 || b == 0)
+    {
+    return false;
+    }
+
+  a->Merge(b);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack* vpViewCore::cloneTrack(int trackId, int newTrackId, int session)
+{
+  vtkVgTrack* track = this->Projects[session]->TrackModel->GetTrack(trackId);
+  if (!track)
+    {
+    return 0;
+    }
+
+  // make sure id is available
+  if (this->Projects[session]->TrackModel->GetTrack(newTrackId))
+    {
+    return 0;
+    }
+
+  vtkVgTrack* newTrack = this->makeTrack(newTrackId, session);
+  newTrack->CopyData(track);
+  return newTrack;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vpViewCore::cloneEvent(int eventId, int session)
+{
+  vtkVgEventModel* eventModel = this->Projects[session]->EventModel;
+  return eventModel->CloneEvent(eventId);
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::setAntialiasing(bool state)
+{
+  if (this->RenderWindow)
+    {
+    this->RenderWindow->SetMultiSamples(state ? 1 : 0);
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::getAntialiasing() const
+{
+  return this->RenderWindow->GetMultiSamples() > 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setImageFiltering(bool state)
+{
+  this->ImageActor[1]->SetInterpolate(state ? 1 : 0);
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::getImageFiltering() const
+{
+  return this->ImageActor[1]->GetInterpolate() != 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setup3dWidget(vpQtViewer3dWidget* viewer3dWidget)
+{
+  if (!viewer3dWidget)
+    {
+    qDebug() << "ERROR: Invalid (null) viewer 3d widget";
+    return;
+    }
+
+  viewer3dWidget->getViewer3d()->setProject(this->Projects[0]);
+  viewer3dWidget->getViewer3d()->setContextDataSource(this->ImageDataSource);
+  viewer3dWidget->getViewer3d()->addRepresentation(
+    this->Projects[0]->TrackRepresentation);
+  viewer3dWidget->getViewer3d()->addRepresentation(
+    this->GraphRepresentation);
+
+  viewer3dWidget->getViewer3d()->setViewCoreInstance(this);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setIdOfTrackToFollow(vtkIdType trackId)
+{
+  int projectId =
+    this->Projects[this->SessionView->GetCurrentSession()]->ProjectId;
+
+  if (this->IdOfTrackToFollow == trackId &&
+      this->FollowTrackProjectId == projectId)
+    {
+    return;
+    }
+
+  this->IdOfTrackToFollow = trackId;
+  this->FollowTrackProjectId = projectId;
+
+  emit followTrackChange(static_cast<int>(this->IdOfTrackToFollow));
+
+  if (this->IdOfTrackToFollow > -1)
+    {
+    this->updateTrackFollowCamera();
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::loadTracks(vpProject* project)
+{
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Loading tracks...");
+  msgBox.setText("Loading tracks (may take awhile)...");
+  msgBox.setModal(false);
+  msgBox.show();
+
+  if (!project->ModelIO->ReadTracks())
+    {
+    return VTK_ERROR;
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::loadTrackTraits(vpProject* project)
+{
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Loading track traits...");
+  msgBox.setText("Loading track traits (may take awhile)...");
+  msgBox.setModal(false);
+  msgBox.show();
+
+  if (!project->ModelIO->ReadTrackTraits())
+    {
+    return VTK_ERROR;
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::loadEvents(vpProject* project)
+{
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Loading events...");
+  msgBox.setText("Loading events (may take awhile)...");
+  msgBox.setModal(false);
+  msgBox.show();
+
+  if (!project->ModelIO->ReadEvents())
+    {
+    return VTK_ERROR;
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::loadEventLinks(vpProject* project)
+{
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Loading event links...");
+  msgBox.setText("Loading event links (may take awhile)...");
+  msgBox.setModal(false);
+  msgBox.show();
+
+  if (!project->ModelIO->ReadEventLinks())
+    {
+    return VTK_ERROR;
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::loadActivities(vpProject* project)
+{
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Loading activities...");
+  msgBox.setText("Loading activities (may take awhile)...");
+  msgBox.setModal(false);
+  msgBox.show();
+
+  if (!project->ModelIO->ReadActivities())
+    {
+    return VTK_ERROR;
+    }
+
+  // Set disply full volume from the project file.
+  if (project->PrecomputeActivity != 0)
+    {
+    project->ActivityManager->SetShowFullVolume(true);
+    project->ActivityManager->SetVisibility(true);
+    project->ActivityManager->UpdateActivityActors(this->CoreTimeStamp);
+    project->ActivityManager->SetVisibility(false);
+    project->ActivityManager->SetShowFullVolume(false);
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::loadSceneElements(vpProject* project)
+{
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Loading scene elements...");
+  msgBox.setText("Loading scene elements (may take awhile)...");
+  msgBox.setModal(false);
+  msgBox.show();
+
+  if (!project->ModelIO->ReadFseTracks())
+    {
+    return VTK_ERROR;
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::loadIcons(vpProject* project)
+{
+  QMessageBox msgBox;
+  msgBox.setWindowTitle("Loading icons...");
+  msgBox.setText("Loading icons (may take awhile)...");
+  msgBox.setModal(false);
+  msgBox.show();
+
+  if (project->IconManager->LoadIcons(project->IconsFile.c_str()) != VTK_OK)
+    {
+    return VTK_ERROR;
+    }
+
+  this->SceneRenderer->AddViewProp(project->IconManager->GetIconActor());
+  emit this->iconsLoaded();
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::updateTracks()
+{
+  bool hasNonFileProjects = false;
+
+#ifdef VISGUI_USE_VIDTK
+  for (size_t i = 0, size = this->Projects.size(); i < size; ++i)
+    {
+    if (!this->Projects[i]->ModelIO.dynamicCast<vpVidtkFileIO>())
+      {
+      hasNonFileProjects = true;
+      break;
+      }
+    }
+#endif
+
+  // If we only have file-backed projects then there is no point in updating.
+  if (!hasNonFileProjects)
+    {
+    return VTK_ERROR;
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::dataChanged()
+{
+  emit this->dataLoaded();
+  emit this->frameChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::refreshView()
+{
+  if (this->Projects.empty())
+    {
+    return;
+    }
+
+  // AOI outline.
+  this->createDisplayOutline(this->Projects[0]);
+
+  this->resetView();
+
+  // Set overview (larger area) display. Order matters here.
+  this->setOverviewDisplay(this->Projects[0]);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::reset()
+{
+  this->sanitizeSceneRenderer();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initializeAllOthers()
+{
+  this->AdjudicationMode            = false;
+  this->AdjudicationAllTracksState  = false;
+
+  this->TrackOffset[0]  = this->TrackOffset[1] = 0;
+
+  this->DisplayMode                 = this->OverViewMode;
+
+  this->Loop                        = true;
+  this->NumberOfFrames              = 0;
+  this->FrameNumberOffset           = 0;
+  this->UseZeroBasedFrameNumbers    = false;
+  this->RightClickToEditEnabled     = true;
+  this->AutoAdvanceDuringCreation   = true;
+  this->SceneElementLineWidth       = 3.0;
+
+  this->CoreTimeStamp.SetFrameNumber(0);
+  this->CurrentFrame = 0;
+  this->LastFrame = -1;
+  this->CurrentTime = 0.0;
+
+  this->TimeLogger                  = vtkSmartPointer<vtkTimerLog>::New();
+  this->LoadRenderTimeLogger        = vtkSmartPointer<vtkTimerLog>::New();
+
+  this->RenderingTime               = 0.0;
+  this->RequestedFPS                = 2.0;
+
+  this->VideoAnimation->setFrameInterval(1.0 / this->RequestedFPS);
+
+  this->InteractionCallback         = vtkSmartPointer<vtkVpInteractionCallback>::New();
+  this->InteractionCallback->ViewCoreInstance = this;
+
+  this->RubberbandInteractorStyle->AddObserver(
+    vtkCommand::InteractionEvent, this->InteractionCallback);
+  this->RubberbandInteractorStyle->AddObserver(
+    vtkVgInteractorStyleRubberBand2D::ZoomCompleteEvent, this->InteractionCallback);
+
+  this->InformaticsDialog           = new vpInformaticsDialog(0);
+
+  this->RenderTimeLogger = vtkSmartPointer<vtkTimerLog>::New();
+  this->TotalRenderTime             = 0.0;
+  this->TotalNumberOfRenderCalls    = 0.0;
+
+  this->ImageDataSource             = new vpFileDataSource();
+  this->FrameMap                    = new vpFrameMap(this->ImageDataSource);
+
+  connect(this->ImageDataSource, SIGNAL(dataFilesChanged()), this,
+          SLOT(reactToDataChanged()));
+
+  this->ProjectParser               = new vpProjectParser();
+
+  this->ActivityTypeRegistry        = vtkVgActivityTypeRegistry::New();
+  this->EventTypeRegistry           = vpEventTypeRegistry::New();
+  this->TrackTypeRegistry           = vtkVgTrackTypeRegistry::New();
+
+  this->TrackConfig                 = new vpTrackConfig(this->TrackTypeRegistry);
+  this->EventConfig                 = new vpEventConfig(this->EventTypeRegistry);
+  this->ActivityConfig              = new vpActivityConfig(this->ActivityTypeRegistry);
+
+  this->NormalcyMaps                = new vpNormalcyMaps();
+
+  this->Annotation                  = new vpAnnotation;
+  this->Annotation->SetViewCoreInstance(this);
+
+  // Add actor for text annotations
+  this->SceneRenderer->AddViewProp(this->Annotation->GetProp());
+  this->ShowAnnotations             = true;
+
+  this->TrackStorageMode            = vpTrackIO::TSM_InvertedImageCoords;
+  this->UseGeoCoordinates           = false;
+  this->UseRawImageCoordinates      = false;
+  this->ImageTranslationReferenceLatLon[0] = 444;
+  this->ImageTranslationReferenceLatLon[1] = 444;
+  this->ImageTranslationOffset[0] = 0;
+  this->ImageTranslationOffset[1] = 0;
+
+  this->IdOfTrackToFollow           = -1;
+  this->FollowTrackProjectId        = -1;
+
+  this->SaveRenderedImages          = false;
+  this->ImageOutputDirectory        = "";
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initializeData()
+{
+  this->ImageCounter = 1;
+
+  for (int i = 0; i < 2; i++)
+    {
+    this->ImageData[i] = vtkSmartPointer<vtkImageData>::New();
+    this->ImageActor[i] = vtkSmartPointer<vtkImageActor>::New();
+    this->ImageActor[i]->SetInputData(this->ImageData[i]);
+    }
+
+  this->AOIImage = vtkSmartPointer<vtkImageData>::New();
+
+  this->MainImageData = this->ImageData[1];
+
+  // Image souce intialized to NULL.
+  this->ImageSource = NULL;
+
+  this->ImageSourceLODFactor = 1.0;
+
+  this->AOIOutlinePolyData = 0;
+  this->AOIOutlineActor    = 0;
+
+  this->VTKConnect = vtkSmartPointer<vtkEventQtSlotConnect>::New();
+
+  // Legend stuff.
+  this->EventLegend = vtkSmartPointer<vtkLegendBoxActor>::New();
+
+  // setup outputing images from render window
+  this->WindowToImageFilter = vtkSmartPointer<vtkWindowToImageFilter>::New();
+  this->WindowToImageFilter->SetInput(this->RenderWindow);
+  this->PNGWriter = vtkSmartPointer<vtkPNGWriter>::New();
+  this->PNGWriter->SetInputConnection(this->WindowToImageFilter->GetOutputPort());
+
+  // populate track state attributes
+#ifdef VISGUI_USE_VIDTK
+  this->TrackAttributes.Clear();
+  this->TrackAttributes.SetMask("ForegroundTracking", "SSD",
+    vidtk::track_state_attributes::ATTR_ASSOC_FG_SSD);
+  this->TrackAttributes.SetMask("ForegroundTracking", "CSURF",
+    vidtk::track_state_attributes::ATTR_ASSOC_FG_CSURF);
+
+  this->TrackAttributes.SetMask("DataAssociationTracking", "Kinematic",
+    vidtk::track_state_attributes::ATTR_ASSOC_DA_KINEMATIC);
+  this->TrackAttributes.SetMask("DataAssociationTracking", "MultiFeatures",
+    vidtk::track_state_attributes::ATTR_ASSOC_DA_MULTI_FEATURES);
+  this->TrackAttributes.SetMask("DataAssociationTracking", "Multiple",
+    vidtk::track_state_attributes::ATTR_ASSOC_DA_KINEMATIC |
+    vidtk::track_state_attributes::ATTR_ASSOC_DA_MULTI_FEATURES);
+
+  this->TrackAttributes.SetMask("KalmanFilter", "Extended",
+    vidtk::track_state_attributes::ATTR_KALMAN_ESH);
+  this->TrackAttributes.SetMask("KalmanFilter", "Linear",
+    vidtk::track_state_attributes::ATTR_KALMAN_LVEL);
+
+  this->TrackAttributes.SetMask("Interval", "Forward",
+    vidtk::track_state_attributes::ATTR_INTERVAL_FORWARD);
+  this->TrackAttributes.SetMask("Interval", "Back",
+    vidtk::track_state_attributes::ATTR_INTERVAL_BACK);
+  this->TrackAttributes.SetMask("Interval", "Init",
+    vidtk::track_state_attributes::ATTR_INTERVAL_INIT);
+
+  this->TrackAttributes.SetMask("Linking", "Start",
+    vidtk::track_state_attributes::ATTR_LINKING_START);
+  this->TrackAttributes.SetMask("Linking", "End",
+    vidtk::track_state_attributes::ATTR_LINKING_END);
+  this->TrackAttributes.SetMask("Linking", "Multiple",
+    vidtk::track_state_attributes::ATTR_LINKING_START |
+    vidtk::track_state_attributes::ATTR_LINKING_END);
+#endif
+
+  // turn off attributes that have been hidden in settings
+  QSettings settings;
+  settings.beginGroup("ShowTrackAttribute");
+  foreach (const QString& group, settings.childKeys())
+    {
+    if (!settings.value(group).toBool())
+      {
+      this->TrackAttributes.SetGroupEnabled(stdString(group), false);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initializeDisplay()
+{
+  this->ShowTracks = false;
+  this->ShowTrackHeads = false;
+  this->ShowEvents = false;
+  this->ShowEventIcons = false;
+  this->ShowActivities = false;
+  this->ShowSceneElements = false;
+
+  this->DisplayFullVolume = false;
+
+  this->UpdatePending = false;
+  this->UpdateObjectViews = false;
+  this->ForceFullUpdate = false;
+  this->RenderPending = false;
+  this->LogRenderTime = true;
+
+  this->RenderWindow = vtkSmartPointer<vtkRenderWindow>::New();
+  this->RenderWidget = 0;
+
+  // Main Renderer
+  this->SceneRenderer = vtkSmartPointer<vtkRenderer>::New();
+  this->SceneRenderer->GetActiveCamera()->ParallelProjectionOn();
+
+  // "small" renderer in lower left which gives some sort of context for the large renderer
+  this->ContextRenderer = vtkSmartPointer<vtkRenderer>::New();
+  this->ContextRenderer->GetActiveCamera()->ParallelProjectionOn();
+  // background renderer to give border around the context renderer
+  this->BackgroundRenderer = vtkSmartPointer<vtkRenderer>::New();
+  this->BackgroundRenderer->SetBackground(0.0, 0.0, 1.0);
+
+  // initially context and background are both off (these should always be both on or both off)
+  this->ContextRenderer->DrawOff();
+  this->BackgroundRenderer->DrawOff();
+  // and no interaction in context (or background)
+  this->ContextRenderer->InteractiveOff();
+  this->BackgroundRenderer->InteractiveOff();
+
+  // SceneRenderer 1st, followed by BackgroundRenderer, and then ContextRenderer, so that
+  // we know that result will be layered correctly
+  this->RenderWindow->AddRenderer(this->SceneRenderer);
+  this->RenderWindow->AddRenderer(this->BackgroundRenderer);
+  this->RenderWindow->AddRenderer(this->ContextRenderer);
+
+  // setup BackgroundRenderer for the lower-left corner
+  this->BackgroundRenderer->SetViewport(0, 0, 0.25, 0.25);
+  // the ContextRenderer will be set once the renderwindow has been "realized"...
+  // not sure when that is so will be "over" doing it for now (every time a new image
+  // is displayed when there is a context "window"
+
+  this->RubberbandInteractorStyle =
+    vtkSmartPointer<vtkVgInteractorStyleRubberBand2D>::New();
+  this->RubberbandInteractorStyle->SetRenderer(this->SceneRenderer);
+
+  this->TrackHeadIndicatorActor = vtkSmartPointer<vtkActor>::New();
+  this->TrackHeadIndicatorActor->SetVisibility(0);
+
+  // Set up the ruler line for measuring distance
+    {
+    this->RulerPoints = vtkSmartPointer<vtkPoints>::New();
+    this->RulerPoints->SetNumberOfPoints(2);
+
+    vtkNew<vtkPolyData> pd;
+    vtkNew<vtkCellArray> ca;
+    vtkNew<vtkPolyDataMapper2D> pdm;
+
+    vtkIdType ids[] = { 0, 1 };
+    ca->InsertNextCell(2, ids);
+    pd->SetPoints(this->RulerPoints);
+    pd->SetLines(ca.GetPointer());
+    pd->SetVerts(ca.GetPointer());
+    pdm->SetInputData(pd.GetPointer());
+
+    this->RulerActor = vtkSmartPointer<vtkActor2D>::New();
+    this->RulerActor->SetVisibility(0);
+    this->RulerActor->SetMapper(pdm.GetPointer());
+    this->RulerActor->GetProperty()->SetColor(1.0, 1.0, 0.0);
+    this->RulerActor->GetProperty()->SetLineWidth(2.0f);
+    this->RulerActor->GetProperty()->SetPointSize(3.0f);
+    }
+
+  this->SceneRenderer->AddViewProp(this->TrackHeadIndicatorActor);
+  this->SceneRenderer->AddViewProp(this->RulerActor);
+
+  this->EventExpirationMode = ShowUntilEventEnd;
+
+  this->SessionView = 0;
+
+  this->YFlipMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->YFlipMatrix->SetElement(1, 1, -1.0);  // y dim set later
+  this->ImageToWorldMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->WorldToImageMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->LatLonToImageMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->LatLonToWorldMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->LatLonToImageReferenceMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initializeExtentsBounds()
+{
+  for (int i = 0; i < 4; ++i)
+    {
+    this->ViewExtents[i] = -1.0;
+    this->OverviewExtents[i] = -1.0;
+    }
+
+  for (int i = 0; i < 6; ++i)
+    {
+    this->WholeImageBounds[i] = 0.0;
+    this->OverviewImageBounds[i] = 0.0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initializeScene()
+{
+  this->SceneInitialized = false;
+  this->OverlayOpacity = 0.3;
+  this->SceneElementFillOpacity = 0.2;
+  this->IconSize = 16;
+  this->IconOffsetX = this->IconOffsetY = 5;
+
+  this->TrackFilter = vtkSmartPointer<vtkVgTrackFilter>::New();
+  this->TrackFilter->SetShowType(vtkVgTrack::Person, true);
+  this->TrackFilter->SetShowType(vtkVgTrack::Vehicle, true);
+  this->TrackFilter->SetShowType(vtkVgTrack::Other, true);
+  this->TrackFilter->SetMinProbability(vtkVgTrack::Person, 0.0);
+  this->TrackFilter->SetMinProbability(vtkVgTrack::Vehicle, 0.0);
+  this->TrackFilter->SetMinProbability(vtkVgTrack::Other, 0.0);
+  this->TrackFilter->SetMaxProbability(vtkVgTrack::Person, 1.0);
+  this->TrackFilter->SetMaxProbability(vtkVgTrack::Vehicle, 1.0);
+  this->TrackFilter->SetMaxProbability(vtkVgTrack::Other, 1.0);
+
+  this->ContourOperatorManager =
+    vtkSmartPointer<vtkVgContourOperatorManager>::New();
+
+  this->TemporalFilters =
+    vtkSmartPointer<vtkVgTemporalFilters>::New();
+
+  this->TrackEditProjectId = -1;
+
+  this->EventFilter = vtkSmartPointer<vtkVgEventFilter>::New();
+
+  this->GraphModel = vtkSmartPointer<vtkVgGraphModel>::New();
+  this->GraphRepresentation = vtkSmartPointer<vtkVgGraphRepresentation>::New();
+  this->GraphRepresentation->SetGraphModel(this->GraphModel);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initializeViewInteractions()
+{
+  this->VTKConnect->Connect(
+    this->RenderWindow->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::KeyPressEvent_A,
+    this, SLOT(resetToAOIView()));
+
+  this->VTKConnect->Connect(
+    this->RenderWindow->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::KeyPressEvent_R,
+    this, SLOT(resetToViewExtents()));
+
+  this->VTKConnect->Connect(
+    this->RenderWindow->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::KeyPressEvent_Z,
+    this, SLOT(decreaseTrackHeadSize()));
+
+  this->VTKConnect->Connect(
+    this->RenderWindow->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::KeyPressEvent_S,
+    this, SLOT(increaseTrackHeadSize()));
+
+  this->VTKConnect->Connect(
+    this->RenderWindow->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::KeyPressEvent_P,
+    this, SLOT(pickScene()));
+
+  this->VTKConnect->Connect(
+    this->RenderWindow->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::KeyPressEvent_Delete,
+    this, SLOT(deleteTrackPoint()));
+
+  // setup widget for detecting mouse hover events
+  this->HoveredActivity = 0;
+  this->IsHovering = false;
+  this->HoverWidget = vtkSmartPointer<vtkHoverWidget>::New();
+  this->HoverWidget->SetInteractor(this->RenderWindow->GetInteractor());
+  this->HoverWidget->SetTimerDuration(200);
+  this->HoverWidget->On();
+  this->HoverWidget->Render();
+
+  this->VTKConnect->Connect(this->HoverWidget, vtkCommand::TimerEvent,
+                            this, SLOT(onHoverStart()));
+  this->VTKConnect->Connect(this->HoverWidget, vtkCommand::EndInteractionEvent,
+                            this, SLOT(onHoverStop()));
+
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initializeSources()
+{
+  RegisterVpImageSource registerPNGImageSouce(&vtkVgPNGReader::Create);
+  RegisterVpImageSource registerMRJImageSouce(&vtkVgMultiResJpgImageReader2::Create);
+  RegisterVpImageSource registerJP2ImageSource(&vtkVgImageSource::Create);
+  RegisterVpImageSource registerJPEGImageSource(&vtkVgJPEGReader::Create);
+
+#if defined(VISGUI_USE_GDAL)
+  RegisterVpImageSource registerGDALImageSource(&vtkVgGDALReader::Create);
+#endif
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::reinitialize()
+{
+  this->initializeScene();
+
+  this->CoreTimeStamp.Reset();
+  this->CoreTimeStamp.SetFrameNumber(0);
+  this->CurrentFrame = 0;
+  this->LastFrame = -1;
+  this->CurrentTime = 0.0;
+
+  this->IdOfTrackToFollow = -1;
+  this->FollowTrackProjectId = -1;
+
+  emit this->reinitialized();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setOverviewDisplayState(bool state)
+{
+  if (state)
+    {
+    this->BackgroundRenderer->DrawOn();
+    this->ContextRenderer->DrawOn();
+    int* wsize = this->RenderWindow->GetSize();
+    // 3 pixel border
+    double xDelta =  3.0 / wsize[0];
+    double yDelta =  3.0 / wsize[1];
+    this->ContextRenderer->SetViewport(0.0 + xDelta, 0.0 + yDelta, 0.25 - xDelta, 0.25 - yDelta);
+    }
+  else
+    {
+    this->BackgroundRenderer->DrawOff();
+    this->ContextRenderer->DrawOff();
+    }
+
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setupRenderWidget(QVTKWidget* renderWidget)
+{
+  this->RenderWindow->SetInteractor(renderWidget->GetInteractor());
+
+  renderWidget->SetRenderWindow(this->RenderWindow);
+
+  renderWidget->GetInteractor()->SetInteractorStyle(this->RubberbandInteractorStyle);
+
+  this->VTKConnect->Connect(
+    renderWidget->GetInteractor(),
+    vtkCommand::LeftButtonPressEvent,
+    this, SLOT(onLeftPress()));
+
+  this->VTKConnect->Connect(
+    renderWidget->GetInteractor(),
+    vtkCommand::LeftButtonReleaseEvent,
+    this, SLOT(onLeftRelease()));
+
+  this->VTKConnect->Connect(
+    renderWidget->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::LeftClickEvent,
+    this, SLOT(onLeftClick()));
+
+  this->VTKConnect->Connect(
+    renderWidget->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::SelectionCompleteEvent,
+    this, SLOT(onSelectionComplete()));
+
+  this->VTKConnect->Connect(
+    renderWidget->GetInteractor(),
+    vtkCommand::RightButtonReleaseEvent,
+    this, SLOT(onRightClick()));
+
+  this->VTKConnect->Connect(
+    renderWidget->GetInteractor(),
+    vtkCommand::MouseMoveEvent,
+    this, SLOT(onMouseMove()));
+
+  this->initializeViewInteractions();
+  this->RenderWidget = renderWidget;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setupTrackFilters(vgMixerWidget* filterWidget)
+{
+  filterWidget->addItem(vtkVgTrack::Person, "Person");
+  filterWidget->setValue(vtkVgTrack::Person, 0.0);
+
+  filterWidget->addItem(vtkVgTrack::Vehicle, "Vehicle");
+  filterWidget->setValue(vtkVgTrack::Vehicle, 0.0);
+
+  filterWidget->addItem(vtkVgTrack::Other, "Other");
+  filterWidget->setValue(vtkVgTrack::Other, 1.0);
+
+  connect(filterWidget, SIGNAL(stateChanged(int, bool)),
+          this, SLOT(SetTrackTypeDisplayState(int, bool)));
+  connect(filterWidget, SIGNAL(valueChanged(int, double)),
+          this, SLOT(SetTrackTypeProbabilityLimit(int, double)));
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setupEventFilters(vgMixerWidget* filterWidget,
+                                   QComboBox* presetWidget)
+{
+  filterWidget->clear();
+  presetWidget->clear();
+  filterWidget->blockSignals(true);
+  presetWidget->blockSignals(true);
+
+  for (int i = 0, end = this->EventConfig->GetNumberOfTypes(); i < end; ++i)
+    {
+    const vgEventType& et = this->EventConfig->GetEventTypeByIndex(i);
+    if (et.GetIsUsed())
+      {
+      filterWidget->addItem(et.GetId(), et.GetName());
+      filterWidget->setValue(et.GetId(), 1.0);
+      presetWidget->addItem(et.GetName(), QVariant(et.GetId()));
+      }
+    }
+
+  int k = presetWidget->count();
+  presetWidget->insertSeparator(k);
+  presetWidget->addItem("All Events", QVariant(-1));
+  presetWidget->setCurrentIndex(k + 1);
+
+  filterWidget->blockSignals(false);
+  presetWidget->blockSignals(false);
+
+  filterWidget->disconnect(this);
+
+  connect(filterWidget, SIGNAL(stateChanged(int, bool)),
+          this, SLOT(SetEventTypeDisplayState(int, bool)));
+  connect(filterWidget, SIGNAL(invertedChanged(int,bool)),
+          this, SLOT(SetEventInverseDisplayState(int, bool)));
+  connect(filterWidget, SIGNAL(valueChanged(int, double)),
+          this, SLOT(SetEventTypeNormalcyThreshold(int, double)));
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setupActivityFilters(vgMixerWidget* filterWidget)
+{
+  filterWidget->disconnect();
+  filterWidget->clear();
+
+  int numTypes = this->ActivityConfig->GetNumberOfTypes();
+  std::vector< std::pair<double, double> > ranges(
+    numTypes, std::make_pair(0.0, 1.0));
+
+  // Compute min and max saliencies for each type based on the loaded activities.
+  for (size_t p = 0, end = this->Projects.size(); p < end; ++p)
+    {
+    vtkVgActivityManager* am = this->Projects[p]->ActivityManager;
+    for (int i = 0, end = am->GetNumberOfActivities();
+         i < end; ++i)
+      {
+      vtkVgActivity* a = am->GetActivity(i);
+      double saliency = a->GetSaliency();
+
+      std::pair<double, double>& range = ranges[a->GetType()];
+      if (saliency < range.first)
+        {
+        range.first = saliency;
+        }
+      else if (saliency > range.second)
+        {
+        range.second = saliency;
+        }
+      }
+    }
+
+  for (int i = 0; i < numTypes; ++i)
+    {
+    const vgActivityType& at = this->ActivityConfig->GetActivityType(i);
+    if (at.GetIsUsed())
+      {
+      filterWidget->addItem(i, at.GetName());
+
+      // Round up or down to the next nearest step.
+      // Otherwise the slider may not correctly cover the whole range.
+      double step = filterWidget->singleStep(i);
+      double minVal = ranges[i].first;
+      minVal /= step;
+      minVal = floor(minVal);
+      minVal *= step;
+
+      double maxVal = ranges[i].second;
+      maxVal /= step;
+      maxVal = ceil(maxVal);
+      maxVal *= step;
+
+      filterWidget->setRange(i, minVal, maxVal);
+      filterWidget->setValue(i, minVal);
+
+      for (size_t p = 0, end = this->Projects.size(); p < end; ++p)
+        {
+        this->Projects[p]->ActivityManager->SetSaliencyThreshold(i, minVal);
+        }
+      }
+    }
+
+  connect(filterWidget, SIGNAL(stateChanged(int, bool)),
+          this, SLOT(SetActivityTypeDisplayState(int, bool)));
+  connect(filterWidget, SIGNAL(valueChanged(int, double)),
+          this, SLOT(SetActivityTypeSaliencyThreshold(int, double)));
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setupNormalcyMapsFilters(vgMixerWidget* filterWidget)
+{
+  filterWidget->clear();
+
+  QList<QString> keys;
+  this->NormalcyMaps->GetAllNormalcyKeys(keys);
+
+  for (int i = 0; i < keys.count(); ++i)
+    {
+    filterWidget->addItem(i, keys.at(i));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setupTrackAttributeColors()
+{
+  const vgColor one(Qt::green);
+  const vgColor two(Qt::red);
+  const vgColor three(Qt::blue);
+  const vgColor oneAndTwo(0x80, 0x80, 0);
+
+  const QString fgSsd           = "ForegroundTracking/SSD";
+  const QString fgCsurf         = "ForegroundTracking/CSURF";
+  const QString daKinematic     = "DataAssociationTracking/Kinematic";
+  const QString daMultiFeatures = "DataAssociationTracking/MultiFeatures";
+  const QString daMultiple      = "DataAssociationTracking/Multiple";
+  const QString kfExtended      = "KalmanFilter/Extended";
+  const QString kfLinear        = "KalmanFilter/Linear";
+  const QString intForward      = "Interval/Forward";
+  const QString intBack         = "Interval/Back";
+  const QString intInit         = "Interval/Init";
+  const QString linkStart       = "Linking/Start";
+  const QString linkEnd         = "Linking/End";
+  const QString linkMultiple    = "Linking/Multiple";
+
+  QSettings settings;
+  settings.beginGroup("TrackAttributeColors");
+
+  // write sensible default color settings if none yet exist
+  vgColor::read(settings, fgSsd, one).write(settings, fgSsd);
+  vgColor::read(settings, fgCsurf, two).write(settings, fgCsurf);
+
+  vgColor::read(settings, daKinematic, one).write(settings, daKinematic);
+  vgColor::read(settings, daMultiFeatures, two).write(settings, daMultiFeatures);
+  vgColor::read(settings, daMultiple, oneAndTwo).write(settings, daMultiple);
+
+  vgColor::read(settings, kfExtended, one).write(settings, kfExtended);
+  vgColor::read(settings, kfLinear, two).write(settings, kfLinear);
+
+  vgColor::read(settings, intForward, one).write(settings, intForward);
+  vgColor::read(settings, intBack, two).write(settings, intBack);
+  vgColor::read(settings, intInit, three).write(settings, intInit);
+
+  vgColor::read(settings, linkStart, one).write(settings, linkStart);
+  vgColor::read(settings, linkEnd, two).write(settings, linkEnd);
+  vgColor::read(settings, linkMultiple, oneAndTwo).write(settings, linkMultiple);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setupEventConfig(vpEntityConfigWidget* configWidget)
+{
+  configWidget->Initialize(this->EventConfig);
+  connect(configWidget, SIGNAL(EntityTypeChanged(int)),
+          SLOT(eventTypeChanged(int)));
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setupActivityConfig(vpEntityConfigWidget* configWidget)
+{
+  configWidget->Initialize(this->ActivityConfig);
+  connect(configWidget, SIGNAL(EntityTypeChanged(int)),
+          SLOT(activityTypeChanged(int)));
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onLeftPress()
+{
+  if (this->RulerEnabled)
+    {
+    vtkRenderWindowInteractor* interactor = this->RenderWindow->GetInteractor();
+    int x = interactor->GetEventPosition()[0];
+    int y = interactor->GetEventPosition()[1];
+    this->RulerPoints->SetPoint(0, x, y, 0.0);
+    this->RulerPoints->SetPoint(1, x, y, 0.0);
+    this->RulerPoints->Modified();
+    this->RulerActor->SetVisibility(1);
+    this->RubberbandInteractorStyle->SetRubberBandModeToDisabled();
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onLeftRelease()
+{
+  if (this->RulerEnabled)
+    {
+    if (!(this->UseGeoCoordinates || this->UseRawImageCoordinates ||
+          this->ImageToGcsMatrix))
+      {
+      emit this->geoDistanceMeasured(-1.0);
+      this->RulerActor->SetVisibility(0);
+      this->render();
+      return;
+      }
+
+    // Compute the ground distance in meters between the ruler endpoints, after
+    // first transforming them from display to image coordinates.
+    double p1[4];
+    this->SceneRenderer->SetDisplayPoint(this->RulerPoints->GetPoint(0));
+    this->SceneRenderer->DisplayToWorld();
+    this->SceneRenderer->GetWorldPoint(p1);
+
+    this->WorldToImageMatrix->MultiplyPoint(p1, p1);
+    p1[0] /= p1[3];
+    p1[1] /= p1[3];
+
+    double p2[4];
+    this->SceneRenderer->SetDisplayPoint(this->RulerPoints->GetPoint(1));
+    this->SceneRenderer->DisplayToWorld();
+    this->SceneRenderer->GetWorldPoint(p2);
+
+    this->WorldToImageMatrix->MultiplyPoint(p2, p2);
+    p2[0] /= p2[3];
+    p2[1] /= p2[3];
+
+    double dummy;
+    double dist = this->getGeoDistance(p1, p2, dummy, dummy);
+    emit this->geoDistanceMeasured(dist);
+
+    this->RulerActor->SetVisibility(0);
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onLeftClick()
+{
+  if (this->TrackEditProjectId == -1)
+    {
+    this->pickScene();
+    return;
+    }
+
+  // placing track head
+  vtkRenderWindowInteractor* interactor = this->RenderWindow->GetInteractor();
+
+  int x = interactor->GetEventPosition()[0];
+  int y = interactor->GetEventPosition()[1];
+
+  double world[4];
+  this->SceneRenderer->SetDisplayPoint(x, y, 0.0);
+  this->SceneRenderer->DisplayToWorld();
+  this->SceneRenderer->GetWorldPoint(world);
+  world[2] = 0.0;
+  world[3] = 1.0;
+
+  this->WorldToImageMatrix->MultiplyPoint(world, world);
+  world[0] /= world[3];
+  world[1] /= world[3];
+
+  if (!this->UseGeoCoordinates)
+    {
+    world[0] = vtkMath::Round(world[0]);
+    world[1] = vtkMath::Round(world[1]);
+    }
+
+  vtkSmartPointer<vtkPoints> points = vtkSmartPointer<vtkPoints>::New();
+  points->DeepCopy(this->TrackHeadIndicatorPolyData->GetPoints());
+
+  // transform indicator points from actor-space to world-space
+  for (vtkIdType i = 0, end = points->GetNumberOfPoints(); i != end; ++i)
+    {
+    double point[4];
+    points->GetPoint(i, point);
+    point[3] = 1.0;
+
+    point[0] += world[0];
+    point[1] += world[1];
+
+    this->ImageToWorldMatrix->MultiplyPoint(point, point);
+    point[0] /= point[3];
+    point[1] /= point[3];
+
+    points->SetPoint(i, point);
+    }
+
+  this->setTrackHeadAndAdvance(points);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onRightClick()
+{
+  if (this->isEditingTrack())
+    {
+    this->stopEditingTrack();
+    return;
+    }
+
+  if (this->DrawingContour)
+    {
+    this->completeFilterRegion();
+    return;
+    }
+
+  if (this->RightClickToEditEnabled &&
+      this->pickScene() == vtkVgPickData::PickedTrack)
+    {
+    int session = this->SessionView->GetCurrentSession();
+    this->beginEditingTrack(this->Projects[session]->Picker->GetPickedId());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onMouseMove()
+{
+  vtkRenderWindowInteractor* interactor = this->RenderWindow->GetInteractor();
+  int dx = interactor->GetEventPosition()[0];
+  int dy = interactor->GetEventPosition()[1];
+
+  if (this->RulerActor->GetVisibility())
+    {
+    this->RulerPoints->SetPoint(1, dx, dy, 0.0);
+    this->RulerPoints->Modified();
+    this->render();
+    }
+  else if (this->isEditingTrack())
+    {
+    this->updateTrackHeadIndicator(dx, dy);
+    this->render();
+    }
+
+  emit this->mouseMoved(dx, dy);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onSelectionComplete()
+{
+  if (!this->isEditingTrack())
+    {
+    return;
+    }
+
+  // this is a ctrl-drag drawing a new bbox
+  int x1 = this->RubberbandInteractorStyle->GetStartPosition()[0];
+  int y1 = this->RubberbandInteractorStyle->GetStartPosition()[1];
+
+  int x2 = this->RubberbandInteractorStyle->GetEndPosition()[0];
+  int y2 = this->RubberbandInteractorStyle->GetEndPosition()[1];
+
+  // make sure box is adequate size
+  if (abs((x2 - x1) * (y2 - y1)) < 25)
+    {
+    return;
+    }
+
+  double p1[4];
+  this->SceneRenderer->SetDisplayPoint(x1, y1, 0.0);
+  this->SceneRenderer->DisplayToWorld();
+  this->SceneRenderer->GetWorldPoint(p1);
+
+  double p2[4];
+  this->SceneRenderer->SetDisplayPoint(x2, y2, 0.0);
+  this->SceneRenderer->DisplayToWorld();
+  this->SceneRenderer->GetWorldPoint(p2);
+
+  double ul[2] =
+    {
+    std::min(p1[0], p2[0]),
+    std::max(p1[1], p2[1])
+    };
+
+  double lr[2] =
+    {
+    std::max(p1[0], p2[0]),
+    std::min(p1[1], p2[1])
+    };
+
+  vtkIdType rect[] = { 0, 1, 2, 3, 0 };
+
+  // update indicator geometry
+  vtkCellArray* ca = this->TrackHeadIndicatorPolyData->GetLines();
+  ca->Reset();
+  ca->InsertNextCell(5, rect);
+  ca->Modified();
+
+  double w = lr[0] - ul[0];
+  double h = ul[1] - lr[1];
+
+  // indicator point positions are relative to lower right corner
+  vtkPoints* indicatorPts = this->TrackHeadIndicatorPolyData->GetPoints();
+  indicatorPts->SetNumberOfPoints(4);
+  indicatorPts->SetPoint(0,  -w,   h, 0.0);
+  indicatorPts->SetPoint(1,  -w, 0.0, 0.0);
+  indicatorPts->SetPoint(2, 0.0, 0.0, 0.0);
+  indicatorPts->SetPoint(3, 0.0,   h, 0.0);
+  indicatorPts->Modified();
+
+  vtkSmartPointer<vtkPoints> pts = vtkSmartPointer<vtkPoints>::New();
+  pts->SetNumberOfPoints(4);
+  pts->SetPoint(0, ul[0], ul[1], 0.0);
+  pts->SetPoint(1, ul[0], lr[1], 0.0);
+  pts->SetPoint(2, lr[0], lr[1], 0.0);
+  pts->SetPoint(3, lr[0], ul[1], 0.0);
+
+  // update the track
+  this->setTrackHeadAndAdvance(pts);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onEditTrackHeadRegion()
+{
+  vtkPolyData* pd = this->TrackHeadRegion->GetPolyData();
+  vtkPoints* pts = pd->GetPoints();
+  vtkIdType npts = pts->GetNumberOfPoints();
+
+  for (vtkIdType i = 0; i != npts; ++i)
+    {
+    double point[3];
+    pts->GetPoint(i, point);
+
+    // round each point to nearest pixel
+    point[0] = vtkMath::Round(point[0]);
+    point[1] = vtkMath::Round(point[1]);
+    pts->SetPoint(i, point);
+    }
+
+  pts->Modified();
+  this->initTrackHeadIndicator(pd);
+
+  this->setTrackHead(pts);
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::showAnnotation(int sessionId, int objectType,
+                                vtkIdType objectId)
+{
+  vpProject* project = this->Projects[sessionId];
+
+  bool show = true;
+  switch (objectType)
+    {
+    default:
+      std::cerr << "Unknown object type.\n";
+      show = false;
+      break;
+    case vgObjectTypeDefinitions::Activity:
+      {
+      vtkVgActivity* activity = project->ActivityManager->GetActivity(objectId);
+      this->Annotation->SetAnnotatedActivity(activity);
+      break;
+      }
+    case vgObjectTypeDefinitions::Event:
+      {
+      vtkVgEvent* event = project->EventModel->GetEvent(objectId);
+      this->Annotation->SetAnnotatedEvent(event);
+      break;
+      }
+    case vgObjectTypeDefinitions::Track:
+      {
+      // don't show annotation on a freshly created track (not yet valid)
+      if (objectId == this->NewTrackId)
+        {
+        show = false;
+        break;
+        }
+      vtkVgTrack* track = project->TrackModel->GetTrack(objectId);
+      this->Annotation->SetAnnotatedTrack(track);
+      break;
+      }
+    case vgObjectTypeDefinitions::SceneElement:
+      {
+      // don't show annotation on a freshly created track (not yet valid)
+      if (objectId == this->NewTrackId)
+        {
+        show = false;
+        break;
+        }
+      vtkVgTrack* track = project->TrackModel->GetTrack(objectId);
+      this->Annotation->SetAnnotatedSceneElement(
+        track, project->TrackModel->GetSceneElementIdForTrack(objectId));
+      }
+    }
+
+  if (!this->ShowAnnotations)
+    {
+    return;
+    }
+
+  this->Annotation->SetVisible(show);
+  this->Annotation->Update();
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::hideAnnotation()
+{
+  if (this->Annotation->GetVisible())
+    {
+    this->Annotation->SetVisible(false);
+    this->Annotation->Update();
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::getCreateTrackId(int session)
+{
+  return this->Projects[session]->NextCreateTrackId;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setCreateTrackId(int id, int session)
+{
+  this->Projects[session]->NextCreateTrackId = id;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::createEventLegend(vpProject* project)
+{
+  double color[3];
+  int numberOfEventTypes = this->EventTypeRegistry->GetNumberOfTypes();
+
+  this->EventLegend->SetPickable(true);
+
+  int numUsedTypes = 0;
+  for (int i = 0; i < numberOfEventTypes; ++i)
+    {
+    if (this->EventTypeRegistry->GetType(i).GetIsUsed())
+      {
+      ++numUsedTypes;
+      }
+    }
+
+  this->EventLegend->SetNumberOfEntries(numUsedTypes);
+
+  for (int i = 0, entry = 0; i < numberOfEventTypes; ++i)
+    {
+    const vgEventType& type = this->EventTypeRegistry->GetType(i);
+    if (!type.GetIsUsed())
+      {
+      continue;
+      }
+
+    vtkSmartPointer<vtkLineSource> ls(vtkSmartPointer<vtkLineSource>::New());
+    ls->SetPoint1(-0.5, 0.5, 0.0);
+    ls->SetPoint2(0.5, 0.5, 0.0);
+    vtkSmartPointer<vtkPolyData> pd = ls->GetOutput();
+
+    type.GetColor(color[0], color[1], color[2]);
+
+    if (project->IconManager->GetIconSheetFileName())
+      {
+      int icon = type.GetIconIndex();
+      if (!project->IconManager->GetIconImage(icon))
+        {
+        std::cerr << "No valid icon image found." << std::endl;
+        this->EventLegend->SetEntry(entry++, pd, type.GetName(), color);
+        continue;
+        }
+
+      this->EventLegend->SetEntry(entry++, pd,
+                                  project->IconManager->GetIconImage(icon),
+                                  type.GetName(), color);
+      }
+    else
+      {
+      // No icons loaded for project.
+      this->EventLegend->SetEntry(entry++, pd, type.GetName(), color);
+      }
+    }
+
+  this->SceneRenderer->AddActor(this->EventLegend);
+
+  this->EventLegend->SetVisibility(0);
+  this->EventLegend->SetUseBackground(1);
+  this->EventLegend->SetBackgroundColor(0.1, 0.1, 0.1);
+  this->EventLegend->SetBackgroundOpacity(0.7);
+
+  vtkCoordinate* pos1 = this->EventLegend->GetPositionCoordinate();
+  vtkCoordinate* pos2 = this->EventLegend->GetPosition2Coordinate();
+  pos1->SetCoordinateSystemToDisplay();
+  pos2->SetCoordinateSystemToDisplay();
+  pos2->SetValue(200.0, 20.0 * (numUsedTypes + 1));
+
+  this->updateEventLegendPosition(this->SceneRenderer->GetSize()[0],
+                                  this->SceneRenderer->GetSize()[1]);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateEventLegendPosition(int w, int vtkNotUsed(h))
+{
+  double x = w - this->EventLegend->GetWidth();
+  this->EventLegend->GetPositionCoordinate()->SetValue(x, 8.0);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateEventLegendColors()
+{
+  for (int i = 0, entry = 0; i < this->EventTypeRegistry->GetNumberOfTypes(); ++i)
+    {
+    const vgEventType& type = this->EventTypeRegistry->GetType(i);
+    if (!type.GetIsUsed())
+      {
+      continue;
+      }
+
+    double color[3];
+    type.GetColor(color[0], color[1], color[2]);
+
+    this->EventLegend->SetEntryColor(entry++, color);
+    }
+}
+
+//-----------------------------------------------------------------------------
+double vpViewCore::getCurrentScale(vtkRenderer* renderer) const
+{
+  // If not a valid renderer return 1.
+  if (!renderer)
+    {
+    return 1.0;
+    }
+
+  int* viewPortSize = renderer->GetSize();
+  double cameraWidth = renderer->GetActiveCamera()->GetParallelScale() *
+                       ((double)viewPortSize[0] / viewPortSize[1]);
+
+  // @NOTE: We are multiply it by 2.0 so that we increase the scale
+  // which means that we are requesting even lower level of detail
+  // than calculated by the image source.
+  const double realTimeTuneParam  = 2.0;
+
+  return ((cameraWidth * realTimeTuneParam) / (double)viewPortSize[0]);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::focusBounds(double bounds[4])
+{
+  double width = bounds[1] - bounds[0];
+  double height = bounds[3] - bounds[2];
+
+  // pad out the bounds a small amount
+  double padScale = 0.1;
+  bounds[0] -= width * padScale;
+  bounds[1] += width * padScale;
+  bounds[2] -= height * padScale;
+  bounds[3] += height * padScale;
+
+  double paddedWidth = bounds[1] - bounds[0];
+  double paddedHeight = bounds[3] - bounds[2];
+
+  // get the current bounds of the viewport
+  double cameraBounds[4];
+  vtkVgRendererUtils::GetBounds(this->SceneRenderer, cameraBounds);
+
+  // zoom out if the bounds won't fit in the viewport
+  if (paddedWidth > cameraBounds[1] - cameraBounds[0] ||
+      paddedHeight > cameraBounds[3] - cameraBounds[2])
+    {
+    this->doZoomToExtent(bounds);
+    }
+  else
+    {
+    // bounds will fit, so just pan the camera to center the extents
+    double center[2];
+    center[0] = 0.5 * (bounds[0] + bounds[1]);
+    center[1] = 0.5 * (bounds[2] + bounds[3]);
+    this->moveCameraTo(center);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::focusBounds(double bounds[4], vtkMatrix4x4* xform)
+{
+  double minPt[] = { bounds[0], bounds[2], 0.0, 1.0 };
+  double maxPt[] = { bounds[1], bounds[3], 0.0, 1.0 };
+
+  xform->MultiplyPoint(minPt, minPt);
+  xform->MultiplyPoint(maxPt, maxPt);
+
+  minPt[0] /= minPt[3];
+  minPt[1] /= minPt[3];
+
+  maxPt[0] /= maxPt[3];
+  maxPt[1] /= maxPt[3];
+
+  bounds[0] = std::min(minPt[0], maxPt[0]);
+  bounds[1] = std::max(minPt[0], maxPt[0]);
+  bounds[2] = std::min(minPt[1], maxPt[1]);
+  bounds[3] = std::max(minPt[1], maxPt[1]);
+
+  this->focusBounds(bounds);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::focusTimeInterval(const vtkVgTimeStamp& start,
+                                   const vtkVgTimeStamp& end)
+{
+  // advance or go back to the closest frame that is in the interval
+  if (this->CoreTimeStamp < start)
+    {
+    this->setCurrentTime(start);
+    }
+  else if (this->CoreTimeStamp > end)
+    {
+    this->setCurrentTime(end);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::focusTrack(int sessionId, vtkIdType trackId,
+                            vtkVgTimeStamp start, vtkVgTimeStamp end)
+{
+  vpProject* project = this->Projects[sessionId];
+  vtkVgTrack* track = project->TrackModel->GetTrack(trackId);
+
+  double bounds[4];
+  track->GetFullBounds(bounds);
+
+  this->focusBounds(bounds,
+                    project->TrackRepresentation->GetRepresentationMatrix());
+
+  if (!start.IsValid())
+    {
+    start = track->GetStartFrame();
+    }
+  if (!end.IsValid())
+    {
+    end = track->GetEndFrame();
+    }
+
+  this->focusTimeInterval(start, end);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::focusEvent(int sessionId, vtkIdType eventId)
+{
+  vpProject* project = this->Projects[sessionId];
+  vtkVgEvent* event = project->EventModel->GetEvent(eventId);
+
+  double bounds[4];
+  event->GetFullBounds(bounds);
+
+  this->focusBounds(bounds,
+                    project->EventRepresentation->GetRepresentationMatrix());
+
+  this->focusTimeInterval(event->GetStartFrame(), event->GetEndFrame());
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::focusActivity(int sessionId, vtkIdType activityId)
+{
+  vpProject* project = this->Projects[sessionId];
+  vtkVgActivity* activity = project->ActivityManager->GetActivity(activityId);
+
+  double bounds[4];
+
+  // compute the bounds of this activity from the component events
+  for (unsigned int i = 0; i < activity->GetNumberOfEvents(); ++i)
+    {
+    vtkVgEvent* event = activity->GetEvent(i);
+
+    double eventBounds[4];
+    event->GetFullBounds(eventBounds);
+
+    if (i == 0)
+      {
+      bounds[0] = eventBounds[0];
+      bounds[1] = eventBounds[1];
+      bounds[2] = eventBounds[2];
+      bounds[3] = eventBounds[3];
+      }
+    else
+      {
+      bounds[0] = std::min(bounds[0], eventBounds[0]);
+      bounds[1] = std::max(bounds[1], eventBounds[1]);
+      bounds[2] = std::min(bounds[2], eventBounds[2]);
+      bounds[3] = std::max(bounds[3], eventBounds[3]);
+      }
+    }
+
+  this->focusBounds(bounds,
+                    project->EventRepresentation->GetRepresentationMatrix());
+
+  vtkVgTimeStamp startFrame, endFrame;
+  activity->GetActivityFrameExtents(startFrame, endFrame);
+
+  this->focusTimeInterval(startFrame, endFrame);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::doZoomToExtent(double extents[4])
+{
+  // Extents and AOI will be updated via vtkVpInteractionCallback
+  this->getInteractorStyle()->ZoomToExtents(this->SceneRenderer, extents);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::getImageSpaceViewportExtents(int (&extents)[4])
+{
+  double dextents[4];
+  vtkVgRendererUtils::GetBounds(this->SceneRenderer, dextents);
+
+  double p1[] = { dextents[0], dextents[2] };
+  double p2[] = { dextents[1], dextents[3] };
+
+  int i1[2];
+  int i2[2];
+  this->worldToImage(p1, i1);
+  this->worldToImage(p2, i2);
+
+  extents[0] = i1[0];
+  extents[1] = i2[0];
+  extents[2] = i2[1];
+  extents[3] = i1[1];
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateCropExtents(double newExtents[4])
+{
+  // No need to update crop extents if we never loaded the data.
+  if (!this->ImageSource)
+    {
+    return;
+    }
+
+  if (this->UseGeoCoordinates)
+    {
+    double* out;
+    double minPoint[4] = {newExtents[0], newExtents[2], 0, 1};
+    double maxPoint[4] = {newExtents[1], newExtents[3], 0, 1};
+
+    out = this->WorldToImageMatrix->MultiplyDoublePoint(minPoint);
+    newExtents[0] = out[0] / out[3];
+    newExtents[2] = out[1] / out[3];
+
+    out = this->WorldToImageMatrix->MultiplyDoublePoint(maxPoint);
+    newExtents[1] = out[0] / out[3];
+    newExtents[3] = out[1] / out[3];
+    }
+  else if (this->UseRawImageCoordinates)
+    {
+    newExtents[0] += this->ImageTranslationOffset[0];
+    newExtents[1] += this->ImageTranslationOffset[0];
+    newExtents[2] += this->ImageTranslationOffset[1];
+    newExtents[3] += this->ImageTranslationOffset[1];
+    }
+
+  bool outOfBounds = false;
+  if (newExtents[0] >=  this->WholeImageBounds[1]) { outOfBounds = true; }
+  if (newExtents[1] <=  this->WholeImageBounds[0]) { outOfBounds = true; }
+  if (newExtents[2] >=  this->WholeImageBounds[3]) { outOfBounds = true; }
+  if (newExtents[3] <=  this->WholeImageBounds[2]) { outOfBounds = true; }
+
+  if (outOfBounds)
+    {
+    std::cerr << "outOfBounds: " << std::endl;
+    return;
+    }
+
+  int usableExtents[4];
+  usableExtents[0] = floor(newExtents[0] >= this->WholeImageBounds[0]
+    ? (newExtents[0] - this->WholeImageBounds[0])
+    : 0);
+
+  usableExtents[1] = ceil(newExtents[1] >= this->WholeImageBounds[1]
+    ? (this->WholeImageBounds[1] - this->WholeImageBounds[0])
+    : (newExtents[1] - this->WholeImageBounds[0]));
+
+  // Y
+  usableExtents[2] = floor(newExtents[2] >= this->WholeImageBounds[2]
+    ? (newExtents[2] - this->WholeImageBounds[2])
+    : 0);
+
+  usableExtents[3] = ceil(newExtents[3] >= this->WholeImageBounds[3]
+    ? (this->WholeImageBounds[3] - this->WholeImageBounds[2])
+    : (newExtents[3] - this->WholeImageBounds[2]));
+
+  this->ImageSource->SetReadExtents(usableExtents);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateAOIImagery()
+{
+  if (!this->ImageSource)
+    {
+    return;
+    }
+
+  this->ImageSource->SetLevel(-1);
+
+  this->ImageSource->SetScale(this->getCurrentScale(this->SceneRenderer) *
+                              this->ImageSourceLODFactor);
+  this->ImageSource->Update();
+
+  this->ImageData[1]->ShallowCopy(this->ImageSource->GetOutput());
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateViewExtents()
+{
+  double minPt[] =
+    { this->WholeImageBounds[0], this->WholeImageBounds[2], 0.0, 1.0 };
+
+  this->ImageToWorldMatrix->MultiplyPoint(minPt, minPt);
+  minPt[0] /= minPt[3];
+  minPt[1] /= minPt[3];
+
+  double maxPt[] =
+    { this->WholeImageBounds[1], this->WholeImageBounds[3], 0.0, 1.0 };
+
+  this->ImageToWorldMatrix->MultiplyPoint(maxPt, maxPt);
+  maxPt[0] /= maxPt[3];
+  maxPt[1] /= maxPt[3];
+
+  this->ViewExtents[0] = minPt[0];
+  this->ViewExtents[1] = maxPt[0];
+  this->ViewExtents[2] = minPt[1];
+  this->ViewExtents[3] = maxPt[1];
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::calculateNewExtents(vtkRenderer* ren, double newExtents[4])
+{
+  if (!newExtents)
+    {
+    std::cerr << "Invalid input extents." << std::endl;
+    return;
+    }
+
+  double cameraCurrentPosition[3];
+  vtkCamera* camera = ren->GetActiveCamera();
+  camera->GetPosition(cameraCurrentPosition);
+
+  double* rendererAspect = ren->GetAspect();
+
+  double renderedBounds[4];
+  vtkVgRendererUtils::GetBounds(ren, renderedBounds);
+
+  double newCenter[2] = {cameraCurrentPosition[0], cameraCurrentPosition[1]};
+  double extentHalfHeight, extentHalfWidth;
+  extentHalfWidth = (renderedBounds[1] - renderedBounds[0]) * 0.5;
+
+  newExtents[0] = /*floor*/(newCenter[0] - extentHalfWidth);
+  newExtents[1] = /*ceil*/(newCenter[0] + extentHalfWidth);
+  extentHalfHeight =
+    0.5 * (newExtents[1] - newExtents[0]) *
+    (rendererAspect[1] / rendererAspect[0]);
+  newExtents[2] = /*floor*/(newCenter[1] - extentHalfHeight);
+  newExtents[3] = /*ceil*/(newCenter[1] + extentHalfHeight);
+}
+
+//-----------------------------------------------------------------------------
+vpProject* vpViewCore::loadProject(const char* fileName)
+{
+  if (!fileName)
+    {
+    return 0;
+    }
+
+  // Parse the file and fill in the variables.
+  this->ProjectParser->SetFileName(fileName);
+  this->ProjectParser->SetUseStream(false);
+
+  // Read data from configuration file now.
+  QScopedPointer<vpProject> project(new vpProject(this->CurrentProjectId++));
+  this->ProjectParser->Parse(project.data());
+
+#ifdef VISGUI_USE_VIDTK
+  QSharedPointer<vpVidtkFileIO> fileIO(new vpVidtkFileIO);
+  fileIO->SetTracksFileName(project->TracksFile.c_str());
+  fileIO->SetTrackTraitsFileName(project->TrackTraitsFile.c_str());
+  fileIO->SetEventsFileName(project->EventsFile.c_str());
+  fileIO->SetEventLinksFileName(project->EventLinksFile.c_str());
+  fileIO->SetActivitiesFileName(project->ActivitiesFile.c_str());
+  fileIO->SetFseTracksFileName(project->SceneElementsFile.c_str());
+  project->ModelIO = fileIO;
+  return this->processProject(project);
+#else
+  QMessageBox::warning(0, QString(),
+                       "Cannot open project files without VidTK support.");
+  return 0;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+vpProject* vpViewCore::loadProject(const QSharedPointer<vpModelIO>& modelIO,
+                                   const std::string& stream,
+                                   const std::string& name)
+{
+  this->ProjectParser->SetStream(stream);
+  this->ProjectParser->SetUseStream(true);
+
+  // Not really a filename, but this string will be used in the UI as a label
+  this->ProjectParser->SetFileName(name);
+
+  QScopedPointer<vpProject> project(new vpProject(this->CurrentProjectId++));
+  this->ProjectParser->Parse(project.data());
+
+  project->ModelIO = modelIO;
+  return this->processProject(project);
+}
+
+//-----------------------------------------------------------------------------
+static void emitHomographyCountWarning()
+{
+  std::cerr << "One or more frames don't have homographies - track "
+            << "states falling on those frames may be dropped.\n";
+}
+
+//-----------------------------------------------------------------------------
+vpProject* vpViewCore::processProject(QScopedPointer<vpProject>& project)
+{
+  // If this is the first project loaded, set up the imagery data sources.
+  // Subsequent projects will share this data.
+  if (this->Projects.empty())
+    {
+    if (project->IsValid(project->OverviewFile) ==
+        vpProject::FILE_NOT_EXIST)
+      {
+      this->handleFileNotFound(project->OverviewFileTag,
+                               project->OverviewFile);
+      }
+
+    // Allow user to change the data path if not found
+    std::string substitutePath;
+    size_t pos = project->DataSetSpecifier.find_last_of("/\\");
+    if (pos != std::string::npos)
+      {
+      QString path = qtString(project->DataSetSpecifier.substr(0, pos));
+      if (!QDir(path).exists())
+        {
+        if (QMessageBox::warning(
+              0, QString(),
+              QString("%1\n\ndoesn't appear to be a valid path. Would you "
+                      "like to change the base path for project image data?")
+                      .arg(path), QMessageBox::Ok | QMessageBox::Cancel) ==
+            QMessageBox::Ok)
+          {
+          for (;;)
+            {
+            QString newPath =
+              QInputDialog::getText(0, QString(), "Path:", QLineEdit::Normal,
+                                    path);
+
+            if (newPath.isEmpty())
+              {
+              break;
+              }
+
+            if (!QDir(newPath).exists())
+              {
+              QMessageBox::warning(0, QString(), "Path does not exist.");
+              }
+            else
+              {
+              substitutePath = stdString(newPath);
+              project->DataSetSpecifier.replace(0, pos, substitutePath);
+              break;
+              }
+            }
+          }
+        }
+      }
+
+    bool hasFrameMap = project->ModelIO->ReadFrameMetaData(this->FrameMap,
+                                                           substitutePath);
+    if (hasFrameMap)
+      {
+      // Use the image filenames retrieved as the dataset
+      this->ImageDataSource->setDataFiles(project->ModelIO->GetImageFiles());
+
+      this->NumberOfFrames =
+        static_cast<unsigned int>(this->ImageDataSource->getFileCount());
+
+      // If the expected metadata is not there, fall back to determining the
+      // dataset from the project parameters.
+      if (this->NumberOfFrames == 0)
+        {
+        std::cerr << "Expected frame metadata not found.\n";
+        hasFrameMap = false;
+        }
+      else
+        {
+        if (project->ModelIO->GetHomographyCount() <
+            this->ImageDataSource->getFileCount())
+          {
+          emitHomographyCountWarning();
+          }
+        this->TrackStorageMode =
+          vpTrackIO::TSM_HomographyTransformedImageCoords;
+        }
+      }
+
+    if (!hasFrameMap)
+      {
+      this->ImageDataSource->setDataSetSpecifier(project->DataSetSpecifier);
+
+      this->NumberOfFrames =
+        static_cast<unsigned int>(this->ImageDataSource->getFileCount());
+
+      if (this->NumberOfFrames == 0)
+        {
+        this->handleDataSetNotFound(project.data());
+        return 0;
+        }
+
+      // TODO: Sink all this stuff into model io
+      switch (project->IsValid(project->ImageTimeMapFile))
+        {
+        case vpProject::FILE_NOT_EXIST:
+          emit this->warningError("Image time map file not found.");
+          break;
+
+        case vpProject::FILE_EXIST:
+          {
+          // Populate the image->time map from text file if available.
+          std::ifstream file(project->ImageTimeMapFile.c_str());
+          if (!file.is_open())
+            {
+            emit this->warningError("Unable to open image time map file.");
+            break;
+            }
+
+          std::string imageFile;
+          double seconds;
+          while (file >> imageFile >> seconds)
+            {
+#ifdef VISGUI_USE_VIDTK
+            // Expand any environment variable tokens
+            imageFile = vidtk::token_expansion::expand_token(imageFile);
+#endif
+            this->FrameMap->setImageTime(imageFile, seconds * 1e6);
+            }
+          hasFrameMap = true;
+          }
+        }
+
+      switch (project->IsValid(project->HomographyIndexFile))
+        {
+        case vpProject::FILE_NOT_EXIST:
+          emit this->warningError("Homography index file not found.");
+          break;
+
+        case vpProject::FILE_EXIST:
+          {
+          // Populate the image->time map from text file if available.
+          std::ifstream file(project->HomographyIndexFile.c_str());
+          if (!file.is_open())
+            {
+            emit this->warningError("Unable to open Homography index file.");
+            break;
+            }
+
+          int homographyCount = 0;
+          bool endOfFile = false;
+          int frameIndex;
+          double timeStamp, matrixElement;
+          vtkSmartPointer<vtkMatrix4x4> homography =
+            vtkSmartPointer<vtkMatrix4x4>::New();
+          while (file >> frameIndex >> timeStamp)
+            {
+            for (int i = 0; i < 3 && !endOfFile; ++i)
+              {
+              for (int j = 0; j < 3 && !endOfFile; ++j)
+                {
+                if (!(file >> matrixElement))
+                  {
+                  endOfFile = true;
+                  break;
+                  }
+                homography->SetElement(i < 2 ? i : 3,
+                                       j < 2 ? j : 3,
+                                       matrixElement);
+                }
+              }
+            // trusting that a negative frameIndex won't occur?
+            if (frameIndex >= this->ImageDataSource->getFileCount())
+              {
+              break;
+              }
+
+            this->FrameMap->setImageHomography(
+              this->ImageDataSource->getDataFile(frameIndex), homography);
+            ++homographyCount;
+            }
+          if (homographyCount < this->ImageDataSource->getFileCount())
+            {
+            emitHomographyCountWarning();
+            }
+          this->TrackStorageMode =
+            vpTrackIO::TSM_HomographyTransformedImageCoords;
+          }
+        }
+      }
+
+    // Now first initialize the image source.
+    this->initializeImageSource();
+
+    // If the image source is not initialized we cannot proceed.
+    if (!this->ImageSource)
+      {
+      QString errorMsg = QString("Image source could not be initialized.\n"
+                                 "Application cannot proceed.");
+      emit this->criticalError(errorMsg);
+      return 0;
+      }
+
+    // Read GCS matrix if any
+    // @TODO: Currently we use it only for text display purposes
+    if (project->ImageToGcsMatrix)
+      {
+      this->ImageToGcsMatrix = project->ImageToGcsMatrix;
+      }
+
+    this->importOverviewFromFile(project.data());
+
+    // @NOTE: Currently we are assuming that we are having five (5)
+    // level of detail in MRJ file. This can change and we need to
+    // find a strategy about it.
+
+    // This needs to set regardless.
+    this->ImageSource->SetOrigin(project->OverviewOrigin[0],
+                                 project->OverviewOrigin[1], 0.0);
+
+    this->ImageSource->SetFileName(
+      this->ImageDataSource->getDataFile(
+        this->CoreTimeStamp.GetFrameNumber()).c_str());
+
+    this->ImageSource->SetLevel(3);
+    this->ImageSource->SetReadExtents(-1, -1, -1, -1);
+    this->ImageSource->Update();
+    this->ImageData[1]->ShallowCopy(this->ImageSource->GetOutput());
+    int dim[2];
+    this->ImageSource->GetDimensions(dim);
+
+    this->UsingTimeStampData = false;
+    if (this->UseTimeStampDataIfAvailable)
+      {
+      this->UsingTimeStampData =
+        hasFrameMap || this->ImageSource->GetImageTimeStamp().IsValid();
+      }
+
+    if (this->UsingTimeStampData)
+      {
+      // Go ahead and kick off the background thread to decode image timestamps.
+      // Even if we are using frame-based indexing right now, this will be nice
+      // to have if the user switches to time-based indexing later, or wants
+      // to export image timestamps.
+      this->startFrameMapRebuild();
+
+      if (this->UseTimeBasedIndexing)
+        {
+        this->UsingTimeBasedIndexing = true;
+        if (this->waitForFrameMapRebuild())
+          {
+          vpFrame firstFrame;
+          this->FrameMap->first(firstFrame);
+          this->CoreTimeStamp = firstFrame.Time;
+          }
+        }
+      }
+
+    // FIXME - right now things will break if you mix projects that result
+    // in UseGeoCoordinates or UseRawImageCoordinates being set differently.
+    if (this->EnableWorldDisplayIfAvailable)
+      {
+      this->UseGeoCoordinates = this->ImageSource->GetGeoCornerPoints()
+        ? true : false;
+      if (this->UseGeoCoordinates)
+        {
+        if (this->TrackStorageMode ==
+            vpTrackIO::TSM_HomographyTransformedImageCoords)
+          {
+          emit this->warningError("Currently don't support world mode in which"
+                                  " tracks are transformed by homographies.\n"
+                                  "Homographies not used!");
+          }
+
+        this->TrackStorageMode = vpTrackIO::TSM_TransformedGeoCoords;
+        }
+      }
+    else if (this->EnableTranslateImage &&
+             project->AOIUpperLeftLatLon[0] != 444 &&
+             project->AOIUpperLeftLatLon[1] != 444 &&
+             this->ImageSource->GetGeoCornerPoints())
+      {
+      // if both the AOI is specified in lat/lon AND there are lat/lon corner
+      // points available (in the future, WAMI, the homography will suffice)
+      // then we save track points in raw form and transform the
+      // representations.  Ignored if UseGeoCoordinates is true
+      this->UseRawImageCoordinates = true;
+      if (this->TrackStorageMode ==
+          vpTrackIO::TSM_HomographyTransformedImageCoords)
+        {
+        emit this->warningError("Currently don't support world mode in which"
+                                " tracks are transformed by homographies.\n"
+                                "Homographies not used!");
+        }
+      this->TrackStorageMode = vpTrackIO::TSM_ImageCoords;
+      }
+
+    if (this->UseGeoCoordinates || this->UseRawImageCoordinates)
+      {
+      if (vtkSmartPointer<vtkMatrix4x4> imageToLatLon =
+          this->ImageSource->GetImageToWorldMatrix())
+        {
+        vtkMatrix4x4::Invert(imageToLatLon, this->LatLonToImageMatrix);
+        }
+
+      // Remember the initial lat-lon-to-image transform, since it can be used
+      // to compute offsets between projects with different AOI's, such as when
+      // when importing tracks from a different project.
+      this->LatLonToImageReferenceMatrix->DeepCopy(this->LatLonToImageMatrix);
+
+      // if we haven't yet set the reference lat/lon, do so now, and compute
+      // the reference offset
+      if (this->ImageTranslationReferenceLatLon[0] == 444)
+        {
+        this->ImageTranslationReferenceLatLon[0] =
+          project->AOIUpperLeftLatLon[0];
+        this->ImageTranslationReferenceLatLon[1] =
+          project->AOIUpperLeftLatLon[1];
+        double in[4] = {this->ImageTranslationReferenceLatLon[1],
+                        this->ImageTranslationReferenceLatLon[0], 0, 1.0};
+        double out[4];
+        this->LatLonToImageMatrix->MultiplyPoint(in, out);
+        if (out[3] != 0)
+          {
+          this->ImageTranslationReferenceOffset[0] = out[0] / out[3];
+          this->ImageTranslationReferenceOffset[1] = out[1] / out[3];
+          }
+        else
+          {
+          std::cerr <<
+            "Unable to compute reference offset for image translation\n";
+          }
+        }
+
+      // Define the reference coordinate system using the initial
+      // lat-lon-to-image transform. Using lat-lon directly as the coordinate
+      // system is prone to loss of precision.
+      if (this->UseGeoCoordinates)
+        {
+        this->LatLonToWorldMatrix->DeepCopy(this->LatLonToImageMatrix);
+        }
+      else
+        {
+        this->LatLonToWorldMatrix->Identity();
+        }
+
+      this->updateImageMatrices();
+
+      if (this->UseRawImageCoordinates)
+        {
+        // Compute lat-lon-to-world
+        vtkMatrix4x4::Multiply4x4(this->ImageToWorldMatrix,
+                                  this->LatLonToImageMatrix,
+                                  this->LatLonToWorldMatrix);
+        }
+      }
+    if (this->UseGeoCoordinates)
+      {
+      this->ImageActor[1]->SetUserMatrix(this->ImageToWorldMatrix);
+      this->WholeImageBounds[0] = 0;
+      this->WholeImageBounds[1] = dim[0] - 1;
+      this->WholeImageBounds[2] = 0;
+      this->WholeImageBounds[3] = dim[1] - 1;
+
+      // Set to world bounds
+      this->updateViewExtents();
+      }
+    else
+      {
+      this->WholeImageBounds[0] = project->OverviewOrigin[0];
+      this->WholeImageBounds[1] = this->WholeImageBounds[0] + dim[0] - 1;
+      this->WholeImageBounds[2] = project->OverviewOrigin[1];
+      this->WholeImageBounds[3] = this->WholeImageBounds[2] + dim[1] - 1;
+
+      int aoiExtents[4] =
+        {
+        static_cast<int>(-project->OverviewOrigin[0]),
+        static_cast<int>(-project->OverviewOrigin[0] + project->AnalysisDimensions[0] - 1),
+        static_cast<int>(-project->OverviewOrigin[1]),
+        static_cast<int>(-project->OverviewOrigin[1] + project->AnalysisDimensions[1] - 1)
+        };
+
+      this->ImageSource->SetReadExtents(aoiExtents);
+      this->ImageSource->SetLevel(1);
+
+      this->ViewExtents[0] = this->WholeImageBounds[0];
+      this->ViewExtents[1] = this->WholeImageBounds[1];
+      this->ViewExtents[2] = this->WholeImageBounds[2];
+      this->ViewExtents[3] = this->WholeImageBounds[3];
+
+      if (project->AnalysisDimensions[0] == -1)
+        {
+        project->AnalysisDimensions[0] =
+          this->ViewExtents[1] - this->ViewExtents[0] + 1;
+        }
+      if (project->AnalysisDimensions[1] == -1)
+        {
+        project->AnalysisDimensions[1] =
+          this->ViewExtents[3] - this->ViewExtents[2] + 1;
+        }
+      }
+
+    if (!this->UsingTimeStampData)
+      {
+      this->FrameNumberOffset = project->FrameNumberOffset;
+      this->CoreTimeStamp.SetFrameNumber(this->FrameNumberOffset);
+      }
+
+    this->VideoAnimation->setFrameRange(
+      vtkVgTimeStamp(this->getMinimumTime()),
+      vtkVgTimeStamp(this->getMaximumTime()));
+
+    this->ImageSource->Update();
+    this->AOIImage->DeepCopy(this->ImageSource->GetOutput());
+
+    // The background image will be rendered before everything else.
+    this->SceneRenderer->AddViewProp(this->ImageActor[1]);
+
+    this->ImageActor[1]->GetProperty()->SetColorWindow(project->ColorWindow);
+    this->ImageActor[1]->GetProperty()->SetColorLevel(project->ColorLevel);
+
+    this->TrackConfig->MarkAllTypesUnused();
+    this->EventConfig->MarkAllTypesUnused();
+    this->ActivityConfig->MarkAllTypesUnused();
+    }
+  else
+    {
+    if (QDir::cleanPath(qtString(this->ImageDataSource->getDataSetSpecifier()))
+        != QDir::cleanPath(qtString(project->DataSetSpecifier)))
+      {
+      QString str = "Warning: \"%1\" has a dataset specifier that doesn't match"
+                    " the currently loaded data.";
+      emit warningError(str.arg(QFileInfo(qtString(
+        this->ProjectParser->GetProjectFileName())).fileName()));
+      }
+    if (project->FrameNumberOffset != this->FrameNumberOffset)
+      {
+      QString str = "Warning: \"%1\" has a frame number offset that doesn't match"
+                    " the currently loaded data.";
+      emit warningError(str.arg(QFileInfo(qtString(
+        this->ProjectParser->GetProjectFileName())).fileName()));
+      }
+    }
+
+  project->TrackModel->SetContourOperatorManager(this->ContourOperatorManager);
+  project->TrackModel->SetTemporalFilters(this->TemporalFilters);
+  project->TrackModel->Initialize();
+
+  vtkVgTimeStamp offset = this->ObjectExpirationTime;
+  if (!offset.IsValid())
+    {
+    offset.SetFrameNumber(DefaultTrackExpiration);
+    offset.SetTime(1e6 * (DefaultTrackExpiration / this->RequestedFPS));
+    }
+
+  project->TrackModel->SetTrackExpirationOffset(offset);
+  this->setTrackTrailLength(project.data(), this->TrackTrailLength);
+  this->setSceneElementLineWidth(project.data(), this->SceneElementLineWidth);
+
+  project->IconManager->SetRenderer(this->SceneRenderer);
+  project->IconManager->SetMinimumIconSize(this->IconSize);
+  project->IconManager->SetMaximumIconSize(this->IconSize);
+  project->IconManager->SetIconOffset(this->IconOffsetX, this->IconOffsetY);
+  for (int i = 0, end = this->EventConfig->GetNumberOfTypes(); i < end; ++i)
+    {
+    const vgEventType& type = this->EventConfig->GetEventTypeByIndex(i);
+    const char* str = vpEventConfig::GetStringFromId(type.GetId());
+    project->IconManager->RegisterStaticEventIcon(str, type.GetIconIndex());
+    }
+
+  project->TrackRepresentation->UseAutoUpdateOff();
+  project->TrackRepresentation->SetTrackModel(project->TrackModel);
+  project->TrackRepresentation->SetTrackFilter(this->TrackFilter);
+  project->TrackRepresentation->SetVisible(this->ShowTracks ? 1 : 0);
+  project->TrackRepresentation->SetColorMultiplier(project->ColorMultiplier);
+  project->TrackRepresentation->SetZOffset(0.1);
+  project->TrackRepresentation->SetDisplayMask(vtkVgTrack::DF_Normal);
+
+  project->SelectedTrackRepresentation->SetOverrideColor(SelectedColor);
+  project->SelectedTrackRepresentation->UseAutoUpdateOff();
+  project->SelectedTrackRepresentation->SetTrackModel(project->TrackModel);
+  project->SelectedTrackRepresentation->SetTrackFilter(this->TrackFilter);
+  project->SelectedTrackRepresentation->SetVisible(this->ShowTracks ? 1 : 0);
+  project->SelectedTrackRepresentation->SetDisplayMask(vtkVgTrack::DF_Normal |
+                                                       vtkVgTrack::DF_Selected);
+  project->SelectedTrackRepresentation->SetZOffset(0.4);
+
+  project->TrackHeadRepresentation->UseAutoUpdateOff();
+  project->TrackHeadRepresentation->SetTrackModel(project->TrackModel);
+  project->TrackHeadRepresentation->SetTrackFilter(this->TrackFilter);
+  project->TrackHeadRepresentation->SetDisplayAllHeads(false);
+  project->TrackHeadRepresentation->SetVisible(this->ShowTrackHeads ? 1 : 0);
+  project->TrackHeadRepresentation->SetColorMultiplier(project->ColorMultiplier);
+  project->TrackHeadRepresentation->SetZOffset(0.1);
+  project->TrackHeadRepresentation->SetDisplayMask(vtkVgTrack::DF_Normal);
+
+  project->SelectedTrackHeadRepresentation->SetOverrideColor(SelectedColor);
+  project->SelectedTrackHeadRepresentation->UseAutoUpdateOff();
+  project->SelectedTrackHeadRepresentation->SetTrackModel(project->TrackModel);
+  project->SelectedTrackHeadRepresentation->SetTrackFilter(this->TrackFilter);
+  project->SelectedTrackHeadRepresentation->SetDisplayAllHeads(false);
+  project->SelectedTrackHeadRepresentation->SetVisible(this->ShowTrackHeads ? 1 : 0);
+  project->SelectedTrackHeadRepresentation->SetDisplayMask(vtkVgTrack::DF_Normal |
+                                                           vtkVgTrack::DF_Selected);
+  project->SelectedTrackHeadRepresentation->SetZOffset(0.4);
+
+  project->EventModel->SetContourOperatorManager(this->ContourOperatorManager);
+  project->EventModel->SetTemporalFilters(this->TemporalFilters);
+  project->EventModel->SetTrackModel(project->TrackModel);
+  project->EventModel->Initialize();
+
+  this->updateEventDisplayEndFrame(project.data());
+
+  project->EventRepresentation->UseAutoUpdateOff();
+  project->EventRepresentation->SetEventFilter(this->EventFilter);
+  project->EventRepresentation->SetEventModel(project->EventModel);
+  project->EventRepresentation->SetDisplayMask(vtkVgEventBase::DF_TrackEvent);
+  project->EventRepresentation->SetVisible(this->ShowEvents ? 1 : 0);
+  project->EventRepresentation->SetColorMultiplier(project->ColorMultiplier);
+  project->EventRepresentation->SetEventTypeRegistry(this->EventTypeRegistry);
+  project->EventRepresentation->SetZOffset(0.2);
+  project->EventRepresentation->Initialize();
+
+  project->SelectedEventRepresentation->SetOverrideColor(SelectedColor);
+  project->SelectedEventRepresentation->UseAutoUpdateOff();
+  project->SelectedEventRepresentation->SetEventFilter(this->EventFilter);
+  project->SelectedEventRepresentation->SetEventModel(project->EventModel);
+  project->SelectedEventRepresentation->SetDisplayMask(vtkVgEventBase::DF_TrackEvent |
+                                                       vtkVgEventBase::DF_Selected);
+  project->SelectedEventRepresentation->SetVisible(this->ShowEvents ? 1 : 0);
+  project->SelectedEventRepresentation->SetEventTypeRegistry(this->EventTypeRegistry);
+  project->SelectedEventRepresentation->SetZOffset(0.5);
+  project->SelectedEventRepresentation->Initialize();
+
+  project->EventIconRepresentation->UseAutoUpdateOff();
+  project->EventIconRepresentation->SetEventFilter(this->EventFilter);
+  project->EventIconRepresentation->SetEventModel(project->EventModel);
+  project->EventIconRepresentation->SetIconManager(project->IconManager);
+  project->EventIconRepresentation->SetVisible(this->ShowEventIcons ? 1 : 0);
+  project->EventIconRepresentation->SetEventTypeRegistry(
+    this->EventTypeRegistry);
+
+  project->EventRegionRepresentation->UseAutoUpdateOff();
+  project->EventRegionRepresentation->SetEventFilter(this->EventFilter);
+  project->EventRegionRepresentation->SetEventModel(project->EventModel);
+  project->EventRegionRepresentation->SetDisplayMask(vtkVgEventBase::DF_RegionEvent);
+  project->EventRegionRepresentation->SetVisible(this->ShowEvents ? 1 : 0);
+  project->EventRegionRepresentation->SetColorMultiplier(project->ColorMultiplier);
+  project->EventRegionRepresentation->SetEventTypeRegistry(
+    this->EventTypeRegistry);
+  project->EventRegionRepresentation->SetRegionZOffset(0.3);
+
+  project->ActivityManager->SetOverlayOpacity(this->OverlayOpacity);
+  project->ActivityManager->SetColorMultiplier(project->ColorMultiplier);
+  project->ActivityManager->Initialize();
+  project->ActivityManager->SetRenderer(this->SceneRenderer);
+  project->ActivityManager->SetVisibility(this->ShowActivities ? 1 : 0);
+  project->ActivityManager->SetIconManager(project->IconManager);
+  project->ActivityManager->SetEventModel(project->EventModel);
+  project->ActivityManager->SetActivityTypeRegistry(this->ActivityTypeRegistry);
+  project->ActivityManager->InitializeTypeInfo();
+
+  project->SceneElementRepresentation->SetFillOpacity(this->SceneElementFillOpacity);
+  project->SceneElementRepresentation->UseAutoUpdateOff();
+  project->SceneElementRepresentation->SetTrackModel(project->TrackModel);
+  project->SceneElementRepresentation->SetDisplayAllHeads(false);
+  project->SceneElementRepresentation->SetVisible(this->ShowSceneElements ? 1 : 0);
+  project->SceneElementRepresentation->SetColorMultiplier(project->ColorMultiplier);
+  project->SceneElementRepresentation->SetZOffset(0.2);
+  project->SceneElementRepresentation->SetDisplayMask(vtkVgTrack::DF_SceneElement);
+
+  project->SelectedSceneElementRepresentation->SetOverrideColor(SelectedColor);
+  project->SelectedSceneElementRepresentation->UseAutoUpdateOff();
+  project->SelectedSceneElementRepresentation->SetTrackModel(project->TrackModel);
+  project->SelectedSceneElementRepresentation->SetDisplayAllHeads(false);
+  project->SelectedSceneElementRepresentation->SetVisible(this->ShowSceneElements ? 1 : 0);
+  project->SelectedSceneElementRepresentation->SetDisplayMask(vtkVgTrack::DF_SceneElement |
+                                                              vtkVgTrack::DF_Selected);
+  project->SelectedSceneElementRepresentation->SetZOffset(0.4);
+
+  project->Picker->SetIconManager(project->IconManager);
+  project->Picker->AddRepresentation(project->EventRegionRepresentation);
+  project->Picker->AddRepresentation(project->EventRepresentation);
+  project->Picker->AddRepresentation(project->TrackHeadRepresentation);
+  project->Picker->AddRepresentation(project->TrackRepresentation);
+  project->Picker->AddRepresentation(project->SceneElementRepresentation);
+  project->Picker->SetActivityManager(project->ActivityManager);
+
+  // We only support a single AOI at the moment (that of the original project).
+  // If the project being loaded is not the first and doesn't have explicit AOI
+  // dimensions in the project file, AnalysisDimensions will be -1 here anyways.
+  unsigned int imageHeight =
+    static_cast<unsigned int>(this->Projects.empty()
+                                ? project->AnalysisDimensions[1]
+                                : this->Projects[0]->AnalysisDimensions[1]);
+
+  project->ModelIO->SetImageHeight(imageHeight);
+
+  project->ModelIO->SetTrackModel(project->TrackModel, this->TrackStorageMode,
+                                  this->UsingTimeStampData ?
+                                    vpTrackIO::TTM_TimeAndFrameNumber :
+                                    vpTrackIO::TTM_FrameNumberOnly,
+                                  this->TrackTypeRegistry,
+                                  this->LatLonToWorldMatrix,
+                                  this->FrameMap);
+
+  project->ModelIO->SetEventModel(project->EventModel, this->EventTypeRegistry);
+
+  project->ModelIO->SetActivityModel(project->ActivityManager,
+                                     this->ActivityConfig);
+
+  if (this->Projects.empty())
+    {
+    // The graph model will just use the data from the first loaded project.
+    // TODO: Add multi-model support to the graph model?
+    this->GraphModel->SetTrackModel(project->TrackModel);
+    this->GraphModel->SetEventModel(project->EventModel);
+    this->GraphModel->SetActivityManager(project->ActivityManager);
+    this->GraphModel->SetEventFilter(this->EventFilter);
+
+    this->GraphRepresentation->SetEventTypeRegistry(this->EventTypeRegistry);
+
+    project->Picker->AddRepresentation(this->GraphRepresentation);
+    project->Picker->SetImageActor(this->ImageActor[0]);
+    }
+
+  if (project->HasTrackColorOverride)
+    {
+    project->ModelIO->SetTrackOverrideColor(project->TrackColorOverride);
+    }
+
+  bool tracksImportSuccessful =
+    this->importTracksFromFile(project.data());
+
+  bool eventsImportSuccessful =
+    this->importEventsFromFile(project.data(), tracksImportSuccessful);
+
+  this->importSceneElementsFromFile(project.data());
+
+  this->addTracks(project.data());
+  this->addTrackHeads(project.data());
+  this->addEvents(project.data());
+
+  this->importEventLinksFromFile(project.data(), eventsImportSuccessful);
+  this->importActivitiesFromFile(project.data(), eventsImportSuccessful);
+  this->importNormalcyMapsFromFile(project.data());
+
+  this->importIconsFromFile(project.data());
+
+  // Set display full volume from the project file.
+  if (project->PrecomputeActivity != 0)
+    {
+    project->ActivityManager->SetShowFullVolume(true);
+    project->ActivityManager->UpdateActivityActors(this->CoreTimeStamp);
+    }
+
+  // Set next "create" track id to be an even multiple of 1000.
+  project->NextCreateTrackId =
+    1000 * ((project->TrackModel->GetNextAvailableId() + 999) / 1000);
+
+  vpProject* projPtr = project.take();
+  this->Projects.push_back(projPtr);
+
+  if (projPtr->Name.empty())
+    {
+    QFileInfo fi(qtString(this->ProjectParser->GetProjectFileName()));
+    projPtr->Name = stdString(fi.fileName());
+    }
+  this->SessionView->AddSession(this, projPtr->ActivityManager,
+                                projPtr->EventModel, projPtr->TrackModel,
+                                this->EventFilter, this->TrackFilter,
+                                this->EventTypeRegistry,
+                                this->TrackTypeRegistry,
+                                projPtr->Name.c_str());
+
+
+
+  // Load bundled filters
+  if (projPtr->IsValid(projPtr->FiltersFile) == vpProject::FILE_EXIST)
+    {
+    this->loadFilters(projPtr->FiltersFile.c_str());
+    }
+
+  // Prevent the interactor from rendering the window before we have performed
+  // the initial update, which will occur at the end of this event loop.
+  this->RenderWindow->GetInteractor()->SetEnableRender(false);
+
+  // Make sure the next update computes new transforms for the representations
+  this->ForceFullUpdate = true;
+
+  // Notify observers.
+  this->dataChanged();
+
+  return this->Projects.back();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::closeProject(int sessionId)
+{
+  vpProject* project = this->Projects[sessionId];
+  this->removeTracks(project);
+  this->removeTrackHeads(project);
+  this->removeEvents(project);
+  this->SceneRenderer->RemoveViewProp(project->IconManager->GetIconActor());
+  this->Projects.erase(this->Projects.begin() + sessionId);
+  delete project;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::loadConfig(const char* fileName)
+{
+  if (!QFileInfo(fileName).exists())
+    {
+    qDebug() << "Project file not found:" << fileName;
+    return;
+    }
+  this->TrackConfig->LoadFromFile(fileName);
+  this->EventConfig->LoadFromFile(fileName);
+  this->ActivityConfig->LoadFromFile(fileName);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::writeSpatialFilter(
+  vtkPoints* contourPoints, vtkPoints* filterPoints, unsigned int frameNumber,
+  double time, vtkMatrix4x4* worldtoImageMatrix,
+  const std::string& name, std::ostream& out)
+{
+  bool writeLatLon = this->UseGeoCoordinates || this->UseRawImageCoordinates;
+  out << (writeLatLon ? (worldtoImageMatrix ? "SpatialFilterLatLonAndImage\n"
+                                            : "SpatialFilterLatLonV2")
+                      : "SpatialFilterV2\n");
+  out << name << '\n';
+  out << contourPoints->GetNumberOfPoints();
+
+  if (writeLatLon)
+    {
+    vtkSmartPointer<vtkMatrix4x4> worldToLatLon =
+      vtkSmartPointer<vtkMatrix4x4>::New();
+    vtkMatrix4x4::Invert(this->LatLonToWorldMatrix, worldToLatLon);
+
+    out.precision(15);
+
+    double point[4];
+    vtkIdType i, npts;
+    // Convert from world coords to lat-long points
+    for (i = 0, npts = contourPoints->GetNumberOfPoints(); i < npts; ++i)
+      {
+      contourPoints->GetPoint(i, point);
+      point[2] = 0.0;
+      point[3] = 1.0;
+
+      worldToLatLon->MultiplyPoint(point, point);
+      point[0] /= point[3];
+      point[1] /= point[3];
+
+      out << ' ' << point[1] << ' ' << point[0];
+      }
+    if (worldtoImageMatrix)
+      {
+      out << "\n" << npts;
+      for (i = 0; i < npts; ++i)
+        {
+        contourPoints->GetPoint(i, point);
+        point[2] = 0.0;
+        point[3] = 1.0;
+
+        worldtoImageMatrix->MultiplyPoint(point, point);
+        point[0] /= point[3];
+        point[1] /= point[3];
+
+        out << ' ' << vtkMath::Round(point[0]) << ' ' << vtkMath::Round(point[1]);
+        }
+      // write out the matrix, so (if/when) we can edit (upon loading of the filter), we
+      // can maintain the correct "image" mapping
+      out << "\n";
+      for (int i = 0; i < 4; ++i)
+        {
+        for (int j = 0; j < 4; ++j)
+          {
+          out << worldtoImageMatrix->GetElement(i, j) << " ";
+          }
+        }
+      }
+    }
+  else
+    {
+    // Normal inverted-y coord mode, just unflip the filter points
+    double maxY = this->Projects[0]->AnalysisDimensions[1] - 1;
+    for (vtkIdType i = 0, npts = filterPoints->GetNumberOfPoints(); i < npts;
+         ++i)
+      {
+      double point[3];
+      filterPoints->GetPoint(i, point);
+      point[1] = maxY - point[1];
+      out << ' ' << vtkMath::Round(point[0]) << ' ' << vtkMath::Round(point[1]);
+      }
+    }
+  // write frame number and time of the frame the filter was started on
+  out << "\n" << frameNumber << " " << time;
+
+  out << "\n\n";
+}
+
+
+//-----------------------------------------------------------------------------
+void vpViewCore::writeTemporalFilter(int type, double start, double end,
+                                     const std::string& name,
+                                     std::ostream& out)
+{
+  out << "TemporalFilter " << (this->getUsingTimeStampData() ? "seconds\n"
+                                                             : "frame#\n");
+  out << name << "\n";
+  out << type << "\n";
+  if (this->getUsingTimeStampData())
+    {
+    out.precision(15);
+    // Adjust time to be in seconds (not microseconds)
+    if (start != -1)
+      {
+      start *= 1e-6;
+      }
+    if (end != -1)
+      {
+      end *= 1e-6;
+      }
+    }
+  else if (!this->UseZeroBasedFrameNumbers)
+    {
+    // Adjust frame number by 1 if not zero-based indexing
+    if (start != -1)
+      {
+      start -= 1.0;
+      }
+    if (end != -1)
+      {
+      end -= 1.0;
+      }
+    }
+
+  out << start << " " << end << "\n\n";
+}
+
+//-----------------------------------------------------------------------------
+static void skipLines(istream& in, int n)
+{
+  while (n--)
+    {
+    in.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::loadFilters()
+{
+  QString path = vgFileDialog::getOpenFileName(
+    0, "Load Filters", QString(), "vpView filters (*.txt);;");
+
+  if (!path.isEmpty())
+    {
+    this->loadFilters(qPrintable(path));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::loadFilters(const char* fileName)
+{
+  std::ifstream file(fileName);
+  if (!file.is_open())
+    {
+    emit this->warningError("Unable to open filter file.");
+    return;
+    }
+
+  vtkSmartPointer<vtkMatrix4x4> worldToImageMatrix =
+    vtkSmartPointer<vtkMatrix4x4>::New();
+  vtkMatrix4x4* matrixPtr;
+  std::string type;
+  std::string name;
+  int numPoints;
+  std::vector<double> points;
+  vtkVgTimeStamp timeStamp;
+  bool needLatLon = this->UseGeoCoordinates || this->UseRawImageCoordinates;
+  bool warn = false;
+  bool hasTimeStampInfo = false;
+  bool unitsInSeconds = true;
+  bool readSpatialFilter;
+  while (file >> type)
+    {
+    if (type == "SpatialFilter" || type == "SpatialFilterV2")
+      {
+      readSpatialFilter = true;
+      hasTimeStampInfo = (type == "SpatialFilterV2");
+      if (needLatLon)
+        {
+        qWarning().nospace() << "Ignoring image coordinate spatial filter "
+                             << " in geo coordinate mode\n";
+        skipLines(file, (hasTimeStampInfo ? 4 : 3));
+        warn = true;
+        continue;
+        }
+      }
+    else if (type == "SpatialFilterLatLon" || type == "SpatialFilterLatLonV2")
+      {
+      readSpatialFilter = true;
+      hasTimeStampInfo = (type == "SpatialFilterLatLonV2");
+      if (!needLatLon)
+        {
+        qWarning().nospace() << "Ignoring lat-lon spatial filter "
+                             << "in image coordinate mode\n";
+        skipLines(file, (hasTimeStampInfo ? 4 : 3));
+        warn = true;
+        continue;
+        }
+      }
+    else if (type == "SpatialFilterLatLonAndImage")
+      {
+      readSpatialFilter = true;
+      hasTimeStampInfo = true;
+      if (!needLatLon)
+        {
+        qWarning().nospace() << "Filter has Lat/Lon and image coordinates but "
+                             << "currently only supports using Lat/Lon\n";
+        skipLines(file, 6);
+        warn = true;
+        continue;
+        }
+      }
+    else if (type == "TemporalFilter")
+      {
+      readSpatialFilter = false;
+      std::string units;
+      file >> units;
+      unitsInSeconds = (units == "seconds");
+      if (this->getUsingTimeStampData() != unitsInSeconds)
+        {
+        qWarning().nospace() << "Temporal units mismatch; "
+                             << "ignoring temporal filter\n";
+        skipLines(file, 4);
+        warn = true;
+        continue;
+        }
+      }
+    else
+      {
+      qWarning().nospace() << "Ignoring filter of unknown type "
+                           << '"' << qtString(type) << '"' << '\n';
+      // hmmm... if we don't recognize, how do we know how many lines to skip?
+      skipLines(file, 3);
+      warn = true;
+      continue;
+      }
+
+    skipLines(file, 1); // finish the line we were reading
+    std::getline(file, name);
+
+    if (readSpatialFilter)
+      {
+      file >> numPoints;
+      points.resize(numPoints * 2);
+      for (int i = 0; i < numPoints; ++i)
+        {
+        double x, y;
+        if (file >> x >> y)
+          {
+          points[i * 2 + 0] = x;
+          points[i * 2 + 1] = y;
+          }
+        else
+          {
+          emit this->warningError(
+            QString("Error occurred while reading points for filter \"%1\"")
+            .arg(qtString(name)));
+          return;
+          }
+        }
+
+      matrixPtr = 0;
+      if (type == "SpatialFilterLatLonAndImage")
+        {
+        // next are image coordinates, which we skip
+        file >> numPoints;
+        for (int i = 0; i < numPoints; ++i)
+          {
+          double x, y;
+          if (!(file >> x >> y))
+            {
+            emit this->warningError(
+              QString("Error occurred while reading points for filter \"%1\"")
+              .arg(qtString(name)));
+            return;
+            }
+          }
+        // and now the vtkMatrix used to map from world to image coordinates
+        matrixPtr = worldToImageMatrix;
+        for (int i = 0; i < 4; ++i)
+          {
+          for (int j = 0; j < 4; ++j)
+            {
+            double value;
+            if (!(file >> value))
+              {
+              emit this->warningError(
+                QString("Error occurred while reading matrix for filter \"%1\"")
+                .arg(qtString(name)));
+              return;
+              }
+            matrixPtr->SetElement(i, j, value);
+            }
+          }
+        }
+
+      timeStamp.Reset();
+      if (hasTimeStampInfo)
+        {
+        unsigned int frameNumber;
+        double time;
+        file >> frameNumber >> time;
+        timeStamp.SetFrameNumber(frameNumber);
+        timeStamp.SetTime(time);
+        }
+
+      this->addFilterRegion(name, points, matrixPtr, timeStamp);
+      }
+    else
+      {
+      int temporalFilterType;
+      file >> temporalFilterType;
+      double start, end;
+      file >> start >> end;
+      vtkVgTimeStamp startTime, endTime;
+      if (this->getUsingTimeStampData())
+        {
+        // convert time (in seconds) to microseconds, as used in timestamp
+        if (start != -1)
+          {
+          start *= 1e6;
+          startTime.SetTime(start);
+          }
+        if (end != -1)
+          {
+          end *= 1e6;
+          endTime.SetTime(end);
+          }
+        }
+      else
+        {
+        startTime.SetFrameNumber(start);
+        endTime.SetFrameNumber(end);
+        if (!this->UseZeroBasedFrameNumbers)
+          {
+          // if not zer-based, need to offset frame number by 1 for tree view
+          start += 1;
+          end += 1;
+          }
+        }
+      int id = this->addTemporalFilter(temporalFilterType, startTime, endTime);
+      emit this->temporalFilterReady(id, qtString(name), temporalFilterType,
+                                     start, end);
+      }
+    }
+
+  if (warn)
+    {
+    emit this->warningError(
+      "One or more filters were not loaded due to having an unrecognized type "
+      "or require vpView to be in a different coordinate / time mode.");
+    }
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+static inline void writePixel(vtkImageData* imageData, int x, int y,
+                              unsigned char value)
+{
+  unsigned char* pixel =
+    static_cast<unsigned char*>(imageData->GetScalarPointer(x, y, 0));
+
+  for (int i = 0, nc = imageData->GetNumberOfScalarComponents(); i < nc; ++i)
+    {
+    pixel[i] = value;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::exportForWeb(const char* path, int paddingFrames)
+{
+  QString fullPath = QString("%1/%2").arg(path).arg("context.png");
+
+  vtkSmartPointer<vtkPNGWriter> imageWriter =
+    vtkSmartPointer<vtkPNGWriter>::New();
+
+  int currentExtents[4];
+  int aoiExtents[4] =
+    {
+    static_cast<int>(-this->Projects[0]->OverviewOrigin[0]),
+    static_cast<int>(-this->Projects[0]->OverviewOrigin[0] +
+                     this->Projects[0]->AnalysisDimensions[0] - 1),
+    static_cast<int>(-this->Projects[0]->OverviewOrigin[1]),
+    static_cast<int>(-this->Projects[0]->OverviewOrigin[1] +
+                     this->Projects[0]->AnalysisDimensions[1] - 1)
+    };
+
+  this->ImageSource->GetReadExtents(currentExtents);
+
+  int currentLevel = this->ImageSource->GetLevel();
+  this->ImageSource->SetReadExtents(aoiExtents);
+  this->ImageSource->SetLevel(0);
+  this->ImageSource->Update();
+  imageWriter->SetInputData(this->ImageSource->GetOutput());
+  imageWriter->SetFileName(qPrintable(fullPath));
+  imageWriter->Write();
+  this->ImageSource->SetLevel(currentLevel);
+  this->ImageSource->SetReadExtents(currentExtents);
+
+  std::string fileName = this->ImageDataSource->getDataFile(0);
+
+  vtkSmartPointer<vtkVgBaseImageSource> imageSource;
+  imageSource.TakeReference(
+    vpImageSourceFactory::GetInstance()->Create(fileName));
+
+  if (!imageSource)
+    {
+    emit this->warningError("Image source could not be initialized.");
+    return;
+    }
+
+  vtkSmartPointer<vtkExtractVOI> extractVOI =
+    vtkSmartPointer<vtkExtractVOI>::New();
+
+  int session = this->SessionView->GetCurrentSession();
+  vpProject* project = this->Projects[session];
+
+  QProgressDialog progress("Generating event clip images...", "Cancel", 1,
+                           project->EventModel->GetNumberOfEvents());
+  progress.setWindowModality(Qt::ApplicationModal);
+  progress.setMinimumDuration(0);
+  progress.setAutoClose(false);
+  progress.setAutoReset(false);
+  progress.setValue(0);
+
+  int count = 0;
+  vtkVgEventInfo eventInfo;
+  project->EventModel->InitEventTraversal();
+  while ((eventInfo = project->EventModel->GetNextEvent()).GetEvent())
+    {
+    if (progress.wasCanceled())
+      {
+      break;
+      }
+    progress.setValue(++count);
+
+    if (!eventInfo.GetDisplayEvent())
+      {
+      continue;
+      }
+
+    vtkVgEvent* event = eventInfo.GetEvent();
+    if (event->GetNumberOfTracks() == 0)
+      {
+      continue; // ignoring node events for now.
+      }
+
+    fullPath = QString("%1/event-%2/").arg(path).arg(event->GetId());
+    if (!QDir().mkpath(fullPath))
+      {
+      qDebug() << "Failed to create path" << fullPath;
+      continue;
+      }
+
+    vtkVgEventTrackInfo* eti =
+      vtkVgEventTrackInfo::SafeDownCast(event->GetTrackInfo(0));
+
+    vtkVgTrack* track = eti->GetTrack();
+    vtkPoints* points = track->GetPoints();
+
+    // First pass: Compute the largest bbox occurring in the event. If this is
+    // larger than our default clip image size, we'll need to downsample the
+    // image to make sure the entire object fits in view.
+    vtkIdType id;
+    vtkVgTimeStamp timeStamp;
+    track->InitPathTraversal();
+
+    // Skip to first frame
+    while ((id = track->GetNextPathPt(timeStamp)) != -1)
+      {
+      if (timeStamp >= eti->StartFrame)
+        {
+        break;
+        }
+      }
+
+    double maxWidth = 0.0;
+    double maxHeight = 0.0;
+
+    // Expand bbox by the track head region
+    for (; id != -1; id = track->GetNextPathPt(timeStamp))
+      {
+      if (timeStamp > eti->EndFrame)
+        {
+        break;
+        }
+
+      vtkIdType npts, *ptIds, ptId;
+      track->GetHeadIdentifier(timeStamp, npts, ptIds, ptId);
+
+      vtkBoundingBox bbox;
+      for (vtkIdType i = 0; i < npts; ++i)
+        {
+        bbox.AddPoint(points->GetPoint(ptIds[i]));
+        }
+
+      if (bbox.IsValid())
+        {
+        maxWidth = std::max(maxWidth, bbox.GetLength(0));
+        maxHeight = std::max(maxHeight, bbox.GetLength(1));
+        }
+      }
+
+    // Bbox's are double original size
+    maxWidth *= 2.0;
+    maxHeight *= 2.0;
+
+    int clipSampleRate = 1;
+    int thumbSampleRate = 1;
+    int clipImageDim[] =  { 200, 200 };
+    int thumbImageDim[] = { 100, 100 };
+
+    // Expand the input dimensions and downsample if 1:1 is not big enough
+    if (maxWidth > clipImageDim[0] || maxHeight > clipImageDim[1])
+      {
+      qDebug() << "Event region dimensions exceed clip image dimensions, "
+                  "downsampling will occur";
+
+      int xSampleRate = 1;
+      int divX = maxWidth / clipImageDim[0];
+      while (++xSampleRate < 4 && (divX >>= 1));
+
+      int ySampleRate = 1;
+      int divY = maxHeight / clipImageDim[1];
+      while (++ySampleRate < 4 && (divY >>= 1));
+
+      clipSampleRate = std::max(xSampleRate, ySampleRate);
+      clipImageDim[0] *= clipSampleRate;
+      clipImageDim[1] *= clipSampleRate;
+      }
+
+    // Expand the input dimensions and downsample if 1:1 is not big enough
+    if (maxWidth > thumbImageDim[0] || maxHeight > thumbImageDim[1])
+      {
+      int xSampleRate = 1;
+      int divX = maxWidth / thumbImageDim[0];
+      while (++xSampleRate < 4 && (divX >>= 1));
+
+      int ySampleRate = 1;
+      int divY = maxHeight / thumbImageDim[1];
+      while (++ySampleRate < 4 && (divY >>= 1));
+
+      thumbSampleRate = std::max(xSampleRate, ySampleRate);
+      thumbImageDim[0] *= thumbSampleRate;
+      thumbImageDim[1] *= thumbSampleRate;
+      }
+
+    // Second pass: Iterate over the track points again, this time writing a
+    // clip image for each point.
+    track->InitPathTraversal();
+
+    vtkVgTimeStamp videoStartFrame, videoEndFrame;
+
+    videoStartFrame.SetFrameNumber(
+      std::max<int>(eti->StartFrame.GetFrameNumber() - paddingFrames,
+                    this->FrameNumberOffset));
+
+    videoEndFrame.SetFrameNumber(
+      std::min<int>(eti->EndFrame.GetFrameNumber() + paddingFrames,
+                    this->FrameNumberOffset + this->NumberOfFrames - 1));
+
+    // Position track iterator at first frame of event
+    vtkVgTimeStamp trackTimeStamp;
+    while ((id = track->GetNextPathPt(trackTimeStamp)) != -1)
+      {
+      if (trackTimeStamp >= eti->StartFrame)
+        {
+        break;
+        }
+      }
+
+    bool madeThumbnail = false;
+    timeStamp = videoStartFrame;
+    for (int frame = 0; timeStamp <= videoEndFrame;
+         timeStamp.SetFrameNumber(timeStamp.GetFrameNumber() + 1), ++frame)
+      {
+      // Advance the track iterator
+      while (trackTimeStamp < timeStamp &&
+             trackTimeStamp < eti->EndFrame)
+        {
+        vtkIdType newId = track->GetNextPathPt(trackTimeStamp);
+        if (newId == -1)
+          {
+          break;
+          }
+        id = newId;
+        }
+
+      std::string fileName =
+        this->ImageDataSource->getDataFile(timeStamp.GetFrameNumber() -
+                                           this->FrameNumberOffset);
+      if (fileName.empty())
+        {
+        qDebug() << "Image for frame"
+                 << timeStamp.GetFrameNumber() - this->FrameNumberOffset
+                 << "not found, skipping";
+        continue;
+        }
+
+again:
+      int dim[2];
+      int sampleRate;
+      if (!madeThumbnail &&
+          timeStamp.GetFrameNumber() == trackTimeStamp.GetFrameNumber())
+        {
+        dim[0] = thumbImageDim[0];
+        dim[1] = thumbImageDim[1];
+        sampleRate = thumbSampleRate;
+        }
+      else
+        {
+        dim[0] = clipImageDim[0];
+        dim[1] = clipImageDim[1];
+        sampleRate = clipSampleRate;
+        }
+
+      double point[3];
+      points->GetPoint(id, point);
+
+      // TODO: Transform world-based points
+      point[0] -= project->OverviewOrigin[0];
+      point[1] -= project->OverviewOrigin[1];
+
+      // compute the cropped region of the image
+      int extents[6];
+      extents[0] = std::max(qRound(point[0] - dim[0] / 2), 0);
+      extents[2] = std::max(qRound(point[1] - dim[1] / 2), 0);
+      extents[1] = extents[0] + dim[0] - 1;
+      extents[3] = extents[2] + dim[1] - 1;
+      extents[4] = extents[5] = 0;
+
+      imageSource->SetFileName(fileName.c_str());
+      imageSource->UpdateInformation();
+
+      int imageDimensions[2];
+      this->ImageSource->GetDimensions(imageDimensions);
+
+      // shift extents if part of the crop region falls outside the image
+      if (extents[1] >= imageDimensions[0])
+        {
+        int shift = extents[1] - (imageDimensions[0] - 1);
+        extents[0] -= shift;
+        extents[1] -= shift;
+        }
+      if (extents[3] >= imageDimensions[1])
+        {
+        int shift = extents[3] - (imageDimensions[1] - 1);
+        extents[2] -= shift;
+        extents[3] -= shift;
+        }
+
+      imageSource->SetReadExtents(extents);
+      imageSource->SetLevel(0);
+      imageSource->Update();
+
+      // crop to the area of interest / downsample to output dimensions
+      extractVOI->SetInputConnection(imageSource->GetOutputPort());
+      extractVOI->SetVOI(extents);
+      extractVOI->SetSampleRate(sampleRate, sampleRate, 1);
+      extractVOI->UpdateWholeExtent();
+
+      vtkImageData* image = extractVOI->GetOutput();
+
+      // draw the track head bounding box on top of the image
+      if (timeStamp.GetFrameNumber() == trackTimeStamp.GetFrameNumber())
+        {
+        vtkIdType npts, *ptIds, ptId;
+        track->GetHeadIdentifier(trackTimeStamp, npts, ptIds, ptId);
+        if (sampleRate == 1 && npts > 1)
+          {
+          vtkBoundingBox bbox;
+          for (int i = 0; i < npts - 1; ++i)
+            {
+            double point[3];
+            points->GetPoint(ptIds[i], point);
+            point[0] -= project->OverviewOrigin[0];
+            point[1] -= project->OverviewOrigin[1];
+            bbox.AddPoint(point);
+            }
+
+          // draw bbox at 2x scale
+          double center[3], minPt[3], maxPt[3];
+          bbox.GetCenter(center);
+          bbox.GetMinPoint(minPt[0], minPt[1], minPt[2]);
+          bbox.GetMaxPoint(maxPt[0], maxPt[1], maxPt[2]);
+          minPt[0] -= center[0];
+          minPt[1] -= center[1];
+          maxPt[0] -= center[0];
+          maxPt[1] -= center[1];
+          minPt[0] *= 2.0;
+          minPt[1] *= 2.0;
+          maxPt[0] *= 2.0;
+          maxPt[1] *= 2.0;
+          minPt[0] += center[0];
+          minPt[1] += center[1];
+          maxPt[0] += center[0];
+          maxPt[1] += center[1];
+          bbox.SetMinPoint(minPt);
+          bbox.SetMaxPoint(maxPt);
+
+          int p0[] = { qRound(bbox.GetMinPoint()[0]),
+                       qRound(bbox.GetMinPoint()[1]) };
+          int p1[] = { qRound(bbox.GetMaxPoint()[0]),
+                       qRound(bbox.GetMaxPoint()[1]) };
+
+          p0[0] = qBound(extents[0], p0[0], extents[1]);
+          p0[1] = qBound(extents[2], p0[1], extents[3]);
+          p1[0] = qBound(extents[0], p1[0], extents[1]);
+          p1[1] = qBound(extents[2], p1[1], extents[3]);
+
+          for (int i = p0[0]; i <= p1[0]; ++i)
+            {
+            writePixel(image, i, p0[1], 255);
+            writePixel(image, i, p1[1], 255);
+            }
+
+          for (int i = p0[1] + 1; i < p1[1]; ++i)
+            {
+            writePixel(image, p0[0], i, 255);
+            writePixel(image, p1[0], i, 255);
+            }
+          }
+        }
+
+      QString file = madeThumbnail ||
+                     trackTimeStamp.GetFrameNumber() != timeStamp.GetFrameNumber()
+                       ? QString("%1.png").arg(frame, 6, 10, QChar('0'))
+                       : QString("event-%1.png").arg(event->GetId());
+      imageWriter->SetInputData(image);
+      imageWriter->SetFileName(qPrintable(fullPath + file));
+      imageWriter->Write();
+
+      // if we just generated a thumbnail, go back and write the real frame now
+      if (!madeThumbnail &&
+          trackTimeStamp.GetFrameNumber() == timeStamp.GetFrameNumber())
+        {
+        madeThumbnail = true;
+        goto again;
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderer* vpViewCore::getSceneRenderer()
+{
+  return this->SceneRenderer;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgInteractorStyleRubberBand2D* vpViewCore::getInteractorStyle()
+{
+  return this->RubberbandInteractorStyle;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::moveCameraTo(double pos[2], bool forceRender/*=true*/)
+{
+  vtkCamera* camera = this->getSceneRenderer()->GetActiveCamera();
+
+  double lastFocalPt[3], lastPos[3];
+  camera->GetFocalPoint(lastFocalPt);
+  camera->GetPosition(lastPos);
+
+  camera->SetFocalPoint(pos[0], pos[1], lastFocalPt[2]);
+  camera->SetPosition(pos[0], pos[1], lastPos[2]);
+
+  this->updateExtents();
+
+  if (forceRender)
+    {
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::render(bool logTime)
+{
+  if (!this->SceneInitialized)
+    {
+    return;
+    }
+  if (!this->RenderPending)
+    {
+    this->RenderPending = true;
+    this->LogRenderTime = logTime;
+    QMetaObject::invokeMethod(this, "forceRender", Qt::QueuedConnection);
+    }
+  else if (logTime)
+    {
+    this->LogRenderTime = true;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::forceRender()
+{
+  this->RenderPending = false;
+
+  this->RenderTimeLogger->StartTimer();
+  this->RenderWindow->Render();
+  this->RenderTimeLogger->StopTimer();
+
+  if (this->LogRenderTime)
+    {
+    this->TotalRenderTime += this->RenderTimeLogger->GetElapsedTime();
+    this->TotalNumberOfRenderCalls += 1.0;
+
+    // Reset if exceed the limit.
+    if (this->TotalRenderTime >= VTK_DOUBLE_MAX ||
+        this->TotalNumberOfRenderCalls >= VTK_DOUBLE_MAX)
+      {
+      this->TotalRenderTime = this->RenderTimeLogger->GetElapsedTime();
+      this->TotalNumberOfRenderCalls = 1.0;
+      }
+    }
+
+  if (this->SaveRenderedImages)
+    {
+    this->WindowToImageFilter->Modified();
+    QChar zero('0');
+    QString outputFileName =
+      this->ImageOutputDirectory +
+        QString("/vpViewImage%1.png").arg(this->ImageCounter++, 6, 10, zero);
+    this->PNGWriter->SetFileName(outputFileName.toAscii());
+    this->PNGWriter->Write();
+    }
+
+  emit this->frameRendered();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::reactToDataChanged()
+{
+  this->NumberOfFrames =
+    static_cast<unsigned int>(this->ImageDataSource->getFileCount());
+
+  if (this->UsingTimeStampData)
+    {
+    this->startFrameMapRebuild();
+
+    if (this->UsingTimeBasedIndexing)
+      {
+      this->waitForFrameMapRebuild();
+      }
+    }
+
+  this->VideoAnimation->setFrameRange(
+    vtkVgTimeStamp(this->getMinimumTime()),
+    vtkVgTimeStamp(this->getMaximumTime()));
+
+  double currentTime = this->VideoAnimation->currentTime();
+
+  // Resume the video animation if we were waiting on additional stream frames.
+  if (this->Playing)
+    {
+    this->VideoAnimation->setState(QAbstractAnimation::Running);
+    }
+  else
+    {
+    // Try to set the state to paused. If the video was previously stopped
+    // because the last frame was reached, but we now are no longer at the
+    // end due to receiving more frames, we no longer want to be stopped.
+    this->VideoAnimation->setState(QAbstractAnimation::Paused);
+    }
+
+  // Playing from a stopped state causes the position to be reset, so un-reset
+  this->VideoAnimation->setCurrentTime(currentTime);
+
+  emit this->dataSetChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::refreshSelectionPanel()
+{
+  if (this->SessionView)
+    {
+    this->SessionView->Update();
+    }
+  emit this->objectInfoUpdateNeeded();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setOverviewDisplay(vpProject* project)
+{
+  // Only add the overview when the background imagery exist.
+  if (project->IsValid(project->OverviewFile) ==
+      vpProject::FILE_EXIST)
+    {
+    this->ContextRenderer->AddViewProp(this->ImageActor[0]);
+    this->ContextRenderer->ResetCamera();
+
+    // Set the camera so that the rendering fits the image right on.
+    vtkCamera* camera = this->ContextRenderer->GetActiveCamera();
+    camera->SetParallelScale((this->OverviewExtents[3] - this->OverviewExtents[2]) / 2.0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::resetToAOIView()
+{
+  // If we only have the upper left of the AOI, just move the camera so that
+  // the upper left of the AOI is at the upper-mid-left of the camera.
+  vtkPoints* points = this->AOIOutlinePolyData->GetPoints();
+  double point1[3], point3[3];
+  points->GetPoint(1, point1);
+  points->GetPoint(3, point3);
+  if (point1[0] == point3[0] &&
+      point1[1] == point3[1])
+    {
+    double bounds[4];
+    vtkVgRendererUtils::GetBounds(this->SceneRenderer, bounds);
+    double point[] = { point3[0] + 0.25 * (bounds[1] - bounds[0]),
+                       point3[1] + 0.25 * (bounds[2] - bounds[3]) };
+    this->moveCameraTo(point);
+    return;
+    }
+
+  double extents[4];
+  this->getAOIExtents(extents);
+  this->doZoomToExtent(extents);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::resetView()
+{
+  if (this->UseGeoCoordinates || this->UseRawImageCoordinates)
+    {
+    this->updateViewExtents();
+    }
+
+  this->doZoomToExtent(this->ViewExtents);
+  this->SceneInitialized = true;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::resetToViewExtents()
+{
+  if (this->UseGeoCoordinates || this->UseRawImageCoordinates)
+    {
+    this->updateViewExtents();
+    }
+
+  this->doZoomToExtent(this->ViewExtents);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::getAOIExtents(double extents[4])
+{
+  double bounds[6];
+  this->AOIOutlinePolyData->GetBounds(bounds);
+  extents[0] = bounds[0];
+  extents[1] = bounds[1];
+  extents[2] = bounds[2];
+  extents[3] = bounds[3];
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::decreaseTrackHeadSize()
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    vtkPropCollection* props =
+      this->Projects[i]->TrackHeadRepresentation->GetActiveRenderObjects();
+
+    props->InitTraversal();
+    while (vtkProp* prop = props->GetNextProp())
+      {
+      vtkActor* actor = vtkActor::SafeDownCast(prop);
+      float pointSize = actor->GetProperty()->GetPointSize();
+      if (pointSize >= 2.0)
+        {
+        actor->GetProperty()->SetPointSize(pointSize - 1);
+        }
+      }
+    }
+
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::increaseTrackHeadSize()
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    vtkPropCollection* props =
+      this->Projects[i]->TrackHeadRepresentation->GetActiveRenderObjects();
+
+    props->InitTraversal();
+    while (vtkProp* prop = props->GetNextProp())
+      {
+      vtkActor* actor = vtkActor::SafeDownCast(prop);
+      actor->GetProperty()->SetPointSize(actor->GetProperty()->GetPointSize() + 1);
+      }
+    }
+
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::exitAdjudicationMode()
+{
+  this->AdjudicationMode = false;
+
+  this->Projects[0]->TrackModel->SetDisplayAllTracks(
+    this->AdjudicationAllTracksState);
+
+  for (int i = 0, end = this->EventConfig->GetNumberOfTypes(); i < end; ++i)
+    {
+    const vgEventType& et = this->EventConfig->GetEventTypeByIndex(i);
+    this->EventFilter->SetShowType(et.GetId(), this->AdjudicationEventsState[i]);
+    }
+
+  this->Projects[0]->ActivityManager->UpdateActivityDisplayStates();
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setDisplayAOIOutlineState(bool flag /*=true*/)
+{
+  this->AOIOutlineActor->SetVisibility(flag ? 1 : 0);
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::pickScene()
+{
+  if (this->AdjudicationMode)
+    {
+    this->Projects[0]->ActivityManager->TurnOffAllActivities();
+    this->Projects[0]->ActivityManager->SetActivityState(
+      this->Projects[0]->ActivityManager->GetNextAdjudicationActivity(), true);
+    this->update();
+    return -1;
+    }
+
+  vtkRenderWindowInteractor* interactor = this->RenderWindow->GetInteractor();
+  int x = interactor->GetEventPosition()[0];
+  int y = interactor->GetEventPosition()[1];
+
+  // Projects appearing earlier in the list will be picked against first.
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    int session = static_cast<int>(i);
+    vpProject* project = this->Projects[i];
+    switch (project->Picker->Pick(x, y, 0.0, this->SceneRenderer))
+      {
+      case vtkVgPickData::PickedTrack:
+        {
+        vtkIdType id = project->Picker->GetPickedId();
+        vgObjectTypeDefinitions::enumObjectTypes objType =
+          project->TrackModel->GetTrack(id)->GetDisplayFlags() &
+          vtkVgTrack::DF_SceneElement ? vgObjectTypeDefinitions::SceneElement
+                                      : vgObjectTypeDefinitions::Track;
+        this->SessionView->SetCurrentSession(session);
+        this->SessionView->SelectItem(objType, id);
+        emit this->trackPicked(project->Picker->GetPickedId(), session);
+        return vtkVgPickData::PickedTrack;
+        }
+      case vtkVgPickData::PickedEvent:
+        {
+        this->SessionView->SetCurrentSession(session);
+        this->SessionView->SelectItem(vgObjectTypeDefinitions::Event,
+                                      project->Picker->GetPickedId());
+        return vtkVgPickData::PickedEvent;
+        }
+      case vtkVgPickData::PickedActivity:
+        {
+        this->SessionView->SetCurrentSession(session);
+        this->SessionView->SelectItem(vgObjectTypeDefinitions::Activity,
+                                      project->Picker->GetActivityIndex());
+        return vtkVgPickData::PickedActivity;
+        }
+      }
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::
+CreateInformaticsDisplay(int vtkNotUsed(x), int vtkNotUsed(y), vtkImageData* vtkNotUsed(normalcy))
+{
+  if (!this->Projects[0]->IsValid(this->Projects[0]->InformaticsIconFile))
+    {
+    std::cerr << "ERROR: File ( " << this->Projects[0]->InformaticsIconFile
+              << " ) does not exist or is invalid." << std::endl;
+    return;
+    }
+
+  this->InformaticsDialog->SetIconsFile(this->Projects[0]->InformaticsIconFile);
+  this->InformaticsDialog->Initialize();
+  this->InformaticsDialog->exec();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::
+CreateBlendedImageDisplay(int vtkNotUsed(x), int vtkNotUsed(y), vtkImageData* normalcy)
+{
+  vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
+  lut->SetNumberOfColors(3);
+  lut->SetTableRange(0, 1);
+  lut->SetHueRange(0.333, 0.333);
+  lut->SetSaturationRange(1, 1);
+  lut->SetValueRange(1, 1);
+  lut->SetAlphaRange(0.0, 0.8);
+  lut->Build();
+  vtkSmartPointer<vtkImageMapToColors> lutMapper =
+    vtkSmartPointer<vtkImageMapToColors>::New();
+  lutMapper->SetLookupTable(lut);
+  lutMapper->SetInputData(normalcy);
+
+  vtkSmartPointer<vtkTexture> nTexture = vtkSmartPointer<vtkTexture>::New();
+  nTexture->SetInputConnection(lutMapper->GetOutputPort());
+
+  vtkSmartPointer<vtkPlaneSource> nPlane = vtkSmartPointer<vtkPlaneSource>::New();
+  nPlane->SetXResolution(100);
+  nPlane->SetYResolution(100);
+  nPlane->Push(0.001);
+  nPlane->Update();
+
+  vtkSmartPointer<vtkPolyDataMapper> nMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
+  nMapper->SetInputConnection(nPlane->GetOutputPort());
+  nMapper->ScalarVisibilityOff();
+
+  vtkSmartPointer<vtkActor> nActor = vtkSmartPointer<vtkActor>::New();
+  nActor->SetTexture(nTexture);
+  nActor->SetMapper(nMapper);
+  nActor->GetProperty()->SetOpacity(0.33);
+
+  // Set up the image plane
+  vtkSmartPointer<vtkTexture> texture = vtkSmartPointer<vtkTexture>::New();
+  texture->SetInputData(this->ImageActor[1]->GetInput());
+
+  vtkSmartPointer<vtkPlaneSource> plane = vtkSmartPointer<vtkPlaneSource>::New();
+  plane->SetXResolution(100);
+  plane->SetYResolution(100);
+  plane->Update();
+
+  vtkSmartPointer<vtkPolyDataMapper> mapper = vtkSmartPointer<vtkPolyDataMapper>::New();
+  mapper->SetInputConnection(plane->GetOutputPort());
+
+  vtkSmartPointer<vtkActor> actor = vtkSmartPointer<vtkActor>::New();
+  actor->SetTexture(texture);
+  actor->SetMapper(mapper);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onPlay()
+{
+  this->Playing = true;
+  this->VideoAnimation->setState(QAbstractAnimation::Running);
+  emit this->playbackStateChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onPause()
+{
+  this->Playing = false;
+  if (this->VideoAnimation->state() != QAbstractAnimation::Stopped)
+    {
+    this->VideoAnimation->setState(QAbstractAnimation::Paused);
+    }
+  emit this->playbackStateChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setLoop(bool state)
+{
+  this->Loop = state;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onResize(int width, int height)
+{
+  this->updateEventLegendPosition(width, height);
+  this->updateExtents();
+  this->render(false);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setRequestFPS(double fps)
+{
+  this->RequestedFPS = fps;
+  this->VideoAnimation->setFrameInterval(1.0 / this->RequestedFPS);
+
+  if (!this->Projects.empty() && !this->UsingTimeBasedIndexing)
+    {
+    this->syncAnimationToCore();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setIconSize(int size, bool render)
+{
+  if (size == this->IconSize)
+    {
+    return;
+    }
+  this->IconSize = size;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->IconManager->SetMinimumIconSize(size);
+    this->Projects[i]->IconManager->SetMaximumIconSize(size);
+    this->Projects[i]->IconManager->UpdateIconActors(
+      this->CoreTimeStamp.GetFrameNumber());
+    }
+
+  if (render)
+    {
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setSessionView(vpSessionView* view)
+{
+  this->SessionView = view;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onShowObjectInfo(int sessionId, vpObjectInfoPanel* objectInfo)
+{
+  vpProject* project = this->Projects[sessionId];
+  objectInfo->Initialize(this,
+                         project->ActivityManager,
+                         project->EventModel,
+                         project->TrackModel,
+                         this->EventTypeRegistry,
+                         this->TrackConfig,
+                         project->ModelIO->GetTrackIO());
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::showHideEventLegend(bool show, bool render)
+{
+  this->EventLegend->SetVisibility(show ? 1 : 0);
+  this->EventLegend->Modified();
+
+  if (render)
+    {
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::showHideTimelineDialog(vpTimelineDialog* dialog, bool show)
+{
+  if (show)
+    {
+    dialog->SetViewCoreInstance(this);
+    dialog->SetEventModel(this->Projects[0]->EventModel);
+    dialog->SetEventTypeRegistry(this->EventTypeRegistry);
+    dialog->show();
+    }
+  else
+    {
+    dialog->hide();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::showHideObjectTags(bool show)
+{
+  this->ShowAnnotations = show;
+  this->Annotation->SetVisible(show);
+  this->Annotation->Update();
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::nextFrame()
+{
+  this->seekInternal(vtkVgTimeStamp(this->getCurrentTime()),
+                                    vg::SeekNext);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::prevFrame()
+{
+  this->seekInternal(vtkVgTimeStamp(this->getCurrentTime()),
+                                    vg::SeekPrevious);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::seekInternal(const vtkVgTimeStamp& position,
+                              vg::SeekMode direction)
+{
+  this->VideoAnimation->seek(position, direction);
+  if (this->Playing &&
+      this->VideoAnimation->state() != QAbstractAnimation::Running)
+    {
+    // Try to unpause the animation if the UI is still in play mode and the
+    // animation is no longer at the end.
+    if (this->VideoAnimation->currentTime() <
+        this->VideoAnimation->totalDuration())
+      {
+      this->VideoAnimation->setState(QAbstractAnimation::Running);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::seekToFrame(const vtkVgTimeStamp& position,
+                             vg::SeekMode direction)
+{
+  if (!position.HasTime())
+    {
+    return;
+    }
+
+  if (this->NumberOfFrames == 0)
+    {
+    return;
+    }
+
+  if (this->UsingTimeBasedIndexing)
+    {
+    if (this->FrameMap->isEmpty())
+      {
+      return;
+      }
+
+    vpFrame frame;
+    if (this->FrameMap->find(position, frame, direction))
+      {
+      // If we are playing (hence the seek mode is nearest frame), we want to
+      // set the current time using the seek position so that the frame scrubber
+      // can update continuously, not just when the displayed frame changes.
+      this->setCurrentFrame(frame,
+                            direction == vg::SeekNearest ? position.GetTime()
+                                                         : -1);
+      }
+    else if (this->Loop)
+      {
+      // Handle loop-around
+      if (direction == vg::SeekNext)
+        {
+        this->FrameMap->first(frame);
+        this->setCurrentFrame(frame, -1.0);
+        }
+      else if (direction == vg::SeekPrevious)
+        {
+        this->FrameMap->last(frame);
+        this->setCurrentFrame(frame, -1.0);
+        }
+      }
+
+    return;
+    }
+
+  double baseTime = position.GetTime() - this->getMinimumTime();
+  int frame = vtkMath::Round((baseTime / 1e6) * this->RequestedFPS);
+
+  // Handle loop-around correctly in the case of "step" seeks. Looping during
+  // playing will be handled internally by the video animation.
+  int lastFrame = this->NumberOfFrames - 1;
+  double currentTime = position.GetTime();
+  switch (direction)
+    {
+    case vg::SeekNext:
+      if (frame++ >= lastFrame)
+        {
+        if (this->Loop)
+          {
+          frame = 0;
+          }
+        else
+          {
+          frame = lastFrame;
+          }
+        }
+      currentTime = -1.0;
+      break;
+
+    case vg::SeekPrevious:
+      if (frame-- <= 0)
+        {
+        if (this->Loop)
+          {
+          frame = lastFrame;
+          }
+        else
+          {
+          frame = 0;
+          }
+        }
+      currentTime = -1.0;
+      break;
+
+    default:
+      break;
+    }
+
+  this->setCurrentFrame(frame, currentTime);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setPlaybackRate(double rate)
+{
+  this->VideoAnimation->setRate(rate);
+}
+
+//-----------------------------------------------------------------------------
+double vpViewCore::getPlaybackRate()
+{
+  return this->VideoAnimation->rate();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::update()
+{
+  this->UpdateObjectViews = true;
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateScene()
+{
+  if (!this->UpdatePending)
+    {
+    this->UpdatePending = true;
+    QMetaObject::invokeMethod(this, "forceUpdate", Qt::QueuedConnection);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateExtents()
+{
+  double newExtents[4];
+  this->calculateNewExtents(this->SceneRenderer, newExtents);
+  this->updateCropExtents(newExtents);
+
+  if (this->isEditingTrack())
+    {
+    int x, y;
+    this->getMousePosition(&x, &y);
+    this->updateTrackHeadIndicator(x, y);
+    }
+
+  if (this->SceneInitialized)
+    {
+    this->updateAOIImagery();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateRepresentation(vtkVgRepresentationBase* representation,
+                                      vtkObject* filter,
+                                      unsigned long prevModelUpdateTime,
+                                      unsigned long modelUpdateTime)
+{
+  unsigned long repUpdateTime = representation->GetUpdateTime();
+
+  // Only update the representation when needed.
+  if (modelUpdateTime != prevModelUpdateTime ||
+      (filter && filter->GetMTime() > repUpdateTime) ||
+      repUpdateTime < representation->GetMTime() ||
+      repUpdateTime < modelUpdateTime)
+    {
+    representation->Update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::forceUpdate()
+{
+  this->UpdatePending = false;
+
+  // Enable interactor rendering now that we know the scene has been
+  // fully initialized.
+  this->RenderWindow->GetInteractor()->SetEnableRender(true);
+
+  unsigned long prevModelUpdateTime;
+  unsigned long modelUpdateTime;
+
+  this->LoadRenderTimeLogger->StartTimer();
+
+  // Update the image data if the timestamp differs from last update
+  if (this->ForceFullUpdate || this->CurrentFrame != this->LastFrame)
+    {
+    std::string imageFile =
+      this->ImageDataSource->getDataFile(this->CurrentFrame);
+    if (imageFile.empty())
+      {
+      return;
+      }
+
+    this->ForceFullUpdate = false;
+    this->LastFrame = this->CurrentFrame;
+    this->ImageSource->SetFileName(imageFile.c_str());
+
+    if (this->UseGeoCoordinates || this->UseRawImageCoordinates)
+      {
+      this->ImageSource->UpdateInformation();
+      int dim[2];
+      if (this->ImageSource->GetRasterDimensions(dim))
+        {
+        this->WholeImageBounds[0] = 0;
+        this->WholeImageBounds[1] = dim[0] - 1;
+        this->WholeImageBounds[2] = 0;
+        this->WholeImageBounds[3] = dim[1] - 1;
+        }
+
+      if (this->updateImageMatrices())
+        {
+        this->ImageActor[1]->SetUserMatrix(this->ImageToWorldMatrix);
+        this->TrackHeadIndicatorActor->SetUserMatrix(this->ImageToWorldMatrix);
+
+        // Since the 'new' user matrix may just be the same allocated matrix
+        // with new values, we have to force the transform to update since it
+        // internally uses pointer equality to determine if the matrix has
+        // changed...
+        this->ImageActor[1]->GetUserTransform()->Modified();
+        this->TrackHeadIndicatorActor->GetUserTransform()->Modified();
+        }
+      else
+        {
+        std::cerr << "Unable to update image to world transform\n";
+        }
+
+      if (this->UseRawImageCoordinates)
+        {
+        for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+          {
+          vpProject* project = this->Projects[i];
+          double in[4] = {project->AOIUpperLeftLatLon[1],
+                          project->AOIUpperLeftLatLon[0], 0, 1.0};
+          double out[4];
+          this->LatLonToImageMatrix->MultiplyPoint(in, out);
+          if (out[3] != 0)
+            {
+            vtkSmartPointer<vtkMatrix4x4> matrix =
+              vtkSmartPointer<vtkMatrix4x4>::New();
+            matrix->SetElement(0, 3,
+              out[0]/out[3] - this->ImageTranslationOffset[0]);
+            matrix->SetElement(1, 1, -1.0);
+            matrix->SetElement(1, 3,
+              out[1]/out[3] - this->ImageTranslationOffset[1]);
+            project->TrackRepresentation->SetRepresentationMatrix(matrix);
+            project->TrackHeadRepresentation->SetRepresentationMatrix(matrix);
+            project->SelectedTrackRepresentation->SetRepresentationMatrix(matrix);
+            project->SelectedTrackHeadRepresentation->SetRepresentationMatrix(matrix);
+            project->EventRepresentation->SetRepresentationMatrix(matrix);
+            project->SelectedEventRepresentation->SetRepresentationMatrix(matrix);
+            project->SceneElementRepresentation->SetRepresentationMatrix(matrix);
+            project->SelectedSceneElementRepresentation->SetRepresentationMatrix(matrix);
+            this->Annotation->SetRepresentationMatrix(matrix);
+            // FIXME - other reperesentations probably need to be handled
+            }
+          else
+            {
+            std::cerr << "Unable to compute final image coordinates.\n";
+            }
+          }
+        }
+      else // this->UseGeoCoordinates
+        {
+        // track heads and fse are in image coordinates and need to be
+        // transformed, including y-flip
+        int dim[2];
+        this->ImageSource->GetRasterDimensions(dim);
+        this->YFlipMatrix->SetElement(1, 3, dim[1]);
+        vtkSmartPointer<vtkMatrix4x4> transformMatrix =
+          vtkSmartPointer<vtkMatrix4x4>::New();
+        vtkMatrix4x4::Multiply4x4(this->ImageToWorldMatrix, this->YFlipMatrix,
+                                  transformMatrix);
+
+        for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+          {
+          vpProject* project = this->Projects[i];
+          project->TrackHeadRepresentation->SetRepresentationMatrix(transformMatrix);
+          project->SelectedTrackHeadRepresentation->SetRepresentationMatrix(transformMatrix);
+          project->SceneElementRepresentation->SetRepresentationMatrix(transformMatrix);
+          project->SelectedSceneElementRepresentation->SetRepresentationMatrix(transformMatrix);
+          }
+        }
+
+      this->updateExtents();
+      }
+    else
+      {
+      if (this->TrackStorageMode ==
+          vpTrackIO::TSM_HomographyTransformedImageCoords)
+        {
+        vtkSmartPointer<vtkMatrix4x4> inverseMatrix =
+          vtkSmartPointer<vtkMatrix4x4>::New();
+        vpFrame frameMetaData;
+        if (this->FrameMap->getFrame(this->CurrentFrame, frameMetaData) &&
+          frameMetaData.Homography)
+          {
+          vtkMatrix4x4::Invert(frameMetaData.Homography, inverseMatrix);
+          }
+        vtkSmartPointer<vtkMatrix4x4> flipMatrix =
+          vtkSmartPointer<vtkMatrix4x4>::New();
+        flipMatrix->SetElement(1, 1, -1.0);
+        flipMatrix->SetElement(1, 3,
+                               this->Projects[0]->ModelIO->GetImageHeight());
+        vtkSmartPointer<vtkMatrix4x4> transformMatrix =
+          vtkSmartPointer<vtkMatrix4x4>::New();
+        vtkMatrix4x4::Multiply4x4(flipMatrix, inverseMatrix, transformMatrix);
+        // If [3][3] component is negative, we're likely to (will?) run into
+        // issues with OpenGL decided to clip away the data.  Therefore scale
+        // to make sure the [3][3] element is positive.
+        if (transformMatrix->Element[3][3] < 0)
+          {
+          for (int i = 0; i < 4; ++i)
+            {
+            for (int j = 0; j < 4; ++j)
+              {
+              transformMatrix->Element[i][j] *= -1;
+              }
+            }
+          // we "Position" the non image actors "above" (+z) the image; the
+          // [2][2] component must be 1 (versus -1, which it would be because
+          // of the previously scaling by -1) to insure the z position isn't
+          // altered to be behind the image.
+          transformMatrix->Element[2][2] = 1.0;
+          }
+        for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+          {
+          vpProject* project = this->Projects[i];
+          project->TrackRepresentation->SetRepresentationMatrix(
+            transformMatrix);
+          project->SelectedTrackRepresentation->SetRepresentationMatrix(
+            transformMatrix);
+          project->EventRepresentation->SetRepresentationMatrix(
+            transformMatrix);
+          project->SelectedEventRepresentation->SetRepresentationMatrix(
+            transformMatrix);
+          project->TrackHeadRepresentation->SetRepresentationMatrix(
+            flipMatrix);
+          project->SelectedTrackHeadRepresentation->SetRepresentationMatrix(
+            flipMatrix);
+          project->SceneElementRepresentation->SetRepresentationMatrix(
+            flipMatrix);
+          project->SelectedSceneElementRepresentation->SetRepresentationMatrix(
+            flipMatrix);
+          }
+        this->Annotation->SetRepresentationMatrix(transformMatrix);
+        }
+
+      this->updateAOIImagery();
+      }
+    }
+
+  // If we're not doing time-based indexing but timestamp data is available,
+  // go ahead and "fill out" the core timestamp with the image time, since
+  // we still want to give a time-based timestamp to the models.
+  if (this->UsingTimeStampData && !this->UsingTimeBasedIndexing)
+    {
+    if (this->CurrentFrame != this->LastFrame || !this->CoreTimeStamp.HasTime())
+      {
+      vpFrame frame;
+      if (this->FrameMap->getFrame(this->CurrentFrame, frame))
+        {
+        this->CoreTimeStamp.SetTime(frame.Time.GetTime());
+        }
+      else
+        {
+        this->ImageSource->UpdateInformation();
+        this->CoreTimeStamp.SetTime(
+          this->ImageSource->GetImageTimeStamp().GetTime());
+        }
+      }
+    }
+
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    vpProject* project = this->Projects[i];
+
+    // Update the event model
+    prevModelUpdateTime = project->EventModel->GetUpdateTime();
+    project->EventModel->Update(this->CoreTimeStamp);
+    modelUpdateTime = project->EventModel->GetUpdateTime();
+
+    // Update event representations
+    this->updateRepresentation(project->EventRepresentation,
+                               this->EventFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+    this->updateRepresentation(project->SelectedEventRepresentation,
+                               this->EventFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+    this->updateRepresentation(project->EventRegionRepresentation,
+                               this->EventFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+    this->updateRepresentation(project->EventIconRepresentation,
+                               this->EventFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+
+    // Update the track model
+    prevModelUpdateTime = project->TrackModel->GetUpdateTime();
+    project->TrackModel->Update(this->CoreTimeStamp);
+    modelUpdateTime = project->TrackModel->GetUpdateTime();
+
+    // Update the track representations
+    this->updateRepresentation(project->TrackRepresentation,
+                               this->TrackFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+    this->updateRepresentation(project->SelectedTrackRepresentation,
+                               this->TrackFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+    this->updateRepresentation(project->TrackHeadRepresentation,
+                               this->TrackFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+    this->updateRepresentation(project->SelectedTrackHeadRepresentation,
+                               this->TrackFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+    this->updateRepresentation(project->SceneElementRepresentation,
+                               0,
+                               prevModelUpdateTime, modelUpdateTime);
+    this->updateRepresentation(project->SelectedSceneElementRepresentation,
+                               0,
+                               prevModelUpdateTime, modelUpdateTime);
+
+    // Update the activity manager. If a new activity actor is added to the
+    // renderer, we must re-add the annotation prop to ensure it still gets
+    // rendered after everything else.
+    if (project->ActivityManager->UpdateActivityActors(this->CoreTimeStamp))
+      {
+      this->SceneRenderer->RemoveViewProp(this->Annotation->GetProp());
+      this->SceneRenderer->AddViewProp(this->Annotation->GetProp());
+      }
+    }
+
+  // Update the track head editor widget
+  if (this->isEditingTrack())
+    {
+    this->updateTrackHeadRegion();
+    }
+
+  // Update the graph model
+  if (this->GraphRenderingEnabled)
+    {
+    prevModelUpdateTime = this->GraphModel->GetUpdateTime();
+    this->GraphModel->Update(this->CoreTimeStamp);
+    modelUpdateTime = this->GraphModel->GetUpdateTime();
+
+    // Update the graph representation
+    this->updateRepresentation(this->GraphRepresentation, this->EventFilter,
+                               prevModelUpdateTime, modelUpdateTime);
+    }
+
+  this->Annotation->Update();
+
+  // Update tracking camera
+  if (this->IdOfTrackToFollow > -1)
+    {
+    this->updateTrackFollowCamera();
+    }
+
+  if (this->UpdateObjectViews)
+    {
+    this->refreshSelectionPanel();
+    this->UpdateObjectViews = false;
+    }
+
+  this->forceRender();
+
+  this->LoadRenderTimeLogger->StopTimer();
+  this->RenderingTime = this->LoadRenderTimeLogger->GetElapsedTime() * 1000;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setProjectVisible(int index, bool visible)
+{
+  if (this->Projects[index]->IsVisible == visible)
+    {
+    return;
+    }
+
+  int tracksVisible = visible && this->ShowTracks ? 1 : 0;
+  int trackHeadsVisible = visible && this->ShowTrackHeads ? 1 : 0;
+  int eventsVisible = visible && this->ShowEvents ? 1 : 0;
+  int eventIconsVisible = visible && this->ShowEventIcons ? 1 : 0;
+  int activitiesVisible = visible && this->ShowActivities ? 1 : 0;
+  int sceneElementsVisible = visible && this->ShowSceneElements ? 1 : 0;
+  this->Projects[index]->IsVisible = visible;
+  this->Projects[index]->TrackRepresentation->SetVisible(tracksVisible);
+  this->Projects[index]->SelectedTrackRepresentation->SetVisible(tracksVisible);
+  this->Projects[index]->TrackHeadRepresentation->SetVisible(trackHeadsVisible);
+  this->Projects[index]->SelectedTrackHeadRepresentation->SetVisible(trackHeadsVisible);
+  this->Projects[index]->EventRepresentation->SetVisible(eventsVisible);
+  this->Projects[index]->SelectedEventRepresentation->SetVisible(eventsVisible);
+  this->Projects[index]->EventRegionRepresentation->SetVisible(eventsVisible);
+  this->Projects[index]->EventIconRepresentation->SetVisible(eventIconsVisible);
+  this->Projects[index]->ActivityManager->SetVisibility(activitiesVisible);
+  this->Projects[index]->SceneElementRepresentation->SetVisible(sceneElementsVisible);
+  this->Projects[index]->SelectedSceneElementRepresentation->SetVisible(sceneElementsVisible);
+  this->updateScene();
+
+  emit this->projectVisibilityChanged(index, visible);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onViewTracks(bool state)
+{
+  this->ShowTracks = state;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->TrackRepresentation->SetVisible(
+      state && this->Projects[i]->IsVisible ? 1 : 0);
+    this->Projects[i]->SelectedTrackRepresentation->SetVisible(
+      state && this->Projects[i]->IsVisible ? 1 : 0);
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onViewTrackHeads(bool state)
+{
+  this->ShowTrackHeads = state;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->TrackHeadRepresentation->SetVisible(
+      state && this->Projects[i]->IsVisible ? 1 : 0);
+    this->Projects[i]->SelectedTrackHeadRepresentation->SetVisible(
+      state && this->Projects[i]->IsVisible ? 1 : 0);
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onViewEvents(bool state)
+{
+  this->ShowEvents = state;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    int visible = (state && this->Projects[i]->IsVisible) ? 1 : 0;
+    this->Projects[i]->EventRepresentation->SetVisible(visible);
+    this->Projects[i]->SelectedEventRepresentation->SetVisible(visible);
+    this->Projects[i]->EventRegionRepresentation->SetVisible(visible);
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onViewActivities(bool state)
+{
+  this->ShowActivities = state;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->ActivityManager->SetVisibility(
+      state && this->Projects[i]->IsVisible ? 1 : 0);
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onViewSceneElements(bool state)
+{
+  this->ShowSceneElements = state;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->SceneElementRepresentation->SetVisible(
+      state && this->Projects[i]->IsVisible ? 1 : 0);
+    this->Projects[i]->SelectedSceneElementRepresentation->SetVisible(
+      state && this->Projects[i]->IsVisible ? 1 : 0);
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onViewEventIcons(bool show)
+{
+  this->ShowEventIcons = show;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->EventIconRepresentation->SetVisible(
+      show && this->Projects[i]->IsVisible ? 1 : 0);
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onRandomEventColor(bool state)
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->EventRepresentation->RandomizeEventColors(state);
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onRandomTrackColor(bool state)
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    if (state)
+      {
+      this->Projects[i]->TrackRepresentation->SetColorModeToRandom();
+      this->Projects[i]->TrackHeadRepresentation->SetColorModeToRandom();
+      }
+    else
+      {
+      this->Projects[i]->TrackRepresentation->SetColorModeToModel();
+      this->Projects[i]->TrackHeadRepresentation->SetColorModeToModel();
+      }
+    }
+
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onDisplayFullVolume(bool state, bool render)
+{
+  this->DisplayFullVolume = state;
+
+  // Full volume setting is overridden if an expiration window is set.
+  if (this->ObjectExpirationTime.IsValid())
+    {
+    return;
+    }
+
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    vpProject* project = this->Projects[i];
+    if (state)
+      {
+      project->EventModel->ShowEventsBeforeStartOn();
+      project->EventModel->ShowEventsAfterExpirationOn();
+      project->TrackModel->ShowTracksBeforeStartOn();
+      project->TrackModel->ShowTracksAfterExpirationOn();
+      }
+    else
+      {
+      project->TrackModel->ShowTracksBeforeStartOff();
+      project->TrackModel->ShowTracksAfterExpirationOff();
+      project->EventModel->ShowEventsBeforeStartOff();
+      this->updateEventDisplayEndFrame(project);
+      }
+    project->ActivityManager->SetShowFullVolume(state);
+    }
+
+  if (render)
+    {
+    this->updateScene();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::enableEventsChange(int eventType, bool state)
+{
+  this->EventFilter->SetShowType(eventType, state);
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::enableInverseEventsChange(int eventType, bool state)
+{
+  this->EventFilter->SetInverse(eventType, state);
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::UpdateEventDisplayStates(bool state)
+{
+  // now make sure the EventManager is setup correctly (proper events on/off)
+  for (int i = 0, end = this->EventConfig->GetNumberOfTypes(); i < end; ++i)
+    {
+    const vgEventType& et = this->EventConfig->GetEventTypeByIndex(i);
+    this->EventFilter->SetShowType(et.GetId(), state);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::SetTrackTypeDisplayState(int trackType, bool state)
+{
+  this->TrackFilter->SetShowType(trackType, state);
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::SetTrackTypeProbabilityLimit(int trackType, double prob)
+{
+  // HACK: Invert the sense of the Other filter, so that it becomes low-pass
+  // rather than high-pass. This should be configurable in the UI, via a range
+  // slider filter or some other means.
+  if (trackType == vtkVgTrack::Other)
+    {
+    this->TrackFilter->SetMaxProbability(trackType, prob);
+    }
+  else
+    {
+    this->TrackFilter->SetMinProbability(trackType, prob);
+    }
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::SetEventTypeDisplayState(int eventType, bool state)
+{
+  this->enableEventsChange(eventType, state);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::SetEventInverseDisplayState(int eventType, bool state)
+{
+  this->enableInverseEventsChange(eventType, state);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::SetEventTypeNormalcyThreshold(int eventType, double threshold)
+{
+  this->EventFilter->SetMaxNormalcy(eventType, threshold);
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::SetActivityTypeDisplayState(int type, bool state)
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->ActivityManager->SetDisplayActivityType(type, state);
+    }
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::SetActivityTypeSaliencyThreshold(int type, double threshold)
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->ActivityManager->SetSaliencyThreshold(type, threshold);
+    }
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onUseNormalcyCues(bool enable)
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->EventRepresentation->SetUseNormalcyCues(enable);
+    this->Projects[i]->EventIconRepresentation->SetUseNormalcyCues(enable);
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onSwapNormalcyCues()
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->EventRepresentation->SwapNormalcyCues();
+    this->Projects[i]->EventIconRepresentation->SwapNormalcyCues();
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::createDisplayOutline(vpProject* project)
+{
+  vtkSmartPointer<vtkPoints> aoiOutlinePoints = vtkSmartPointer<vtkPoints>::New();
+  aoiOutlinePoints->SetDataTypeToDouble();
+  aoiOutlinePoints->SetNumberOfPoints(4);
+
+  if (this->UseGeoCoordinates)
+    {
+    if (project->AOIUpperLeftLatLon[0] != 444)
+      {
+      double ul[] = { project->AOIUpperLeftLatLon[1],
+                      project->AOIUpperLeftLatLon[0], 0.0, 1.0 };
+      this->LatLonToWorldMatrix->MultiplyPoint(ul, ul);
+      ul[0] /= ul[3];
+      ul[1] /= ul[3];
+      if (project->AOILowerRightLatLon[0] != 444)
+        {
+        double lr[] = { project->AOILowerRightLatLon[1],
+                        project->AOILowerRightLatLon[0], 0.0, 1.0 };
+        this->LatLonToWorldMatrix->MultiplyPoint(lr, lr);
+        lr[0] /= lr[3];
+        lr[1] /= lr[3];
+        if (project->AOILowerLeftLatLon[0] != 444 &&
+            project->AOIUpperRightLatLon[0] != 444)
+          {
+          // All 4 corners.
+          double ll[] = { project->AOILowerLeftLatLon[1],
+                          project->AOILowerLeftLatLon[0], 0.0, 1.0 };
+          this->LatLonToWorldMatrix->MultiplyPoint(ll, ll);
+          ll[0] /= ll[3];
+          ll[1] /= ll[3];
+          double ur[] = { project->AOIUpperRightLatLon[1],
+                          project->AOIUpperRightLatLon[0], 0.0, 1.0 };
+          this->LatLonToWorldMatrix->MultiplyPoint(ur, ur);
+          ur[0] /= ur[3];
+          ur[1] /= ur[3];
+          aoiOutlinePoints->SetPoint(0, ll);
+          aoiOutlinePoints->SetPoint(1, lr);
+          aoiOutlinePoints->SetPoint(2, ur);
+          aoiOutlinePoints->SetPoint(3, ul);
+          }
+        else
+          {
+          // Two corners.
+          aoiOutlinePoints->SetPoint(0, ul[0], lr[1], 0);
+          aoiOutlinePoints->SetPoint(1, lr[0], lr[1], 0);
+          aoiOutlinePoints->SetPoint(2, lr[0], ul[1], 0);
+          aoiOutlinePoints->SetPoint(3, ul[0], ul[1], 0);
+          }
+        }
+      else
+        {
+        // Just one corner - show a 'notch' in the upper left corner.
+        aoiOutlinePoints->SetPoint(0, ul[0], ul[1] - 100, 0);
+        aoiOutlinePoints->SetPoint(1, ul[0], ul[1], 0);
+        aoiOutlinePoints->SetPoint(2, ul[0] + 100, ul[1], 0);
+        aoiOutlinePoints->SetPoint(3, ul[0], ul[1], 0);
+        }
+      }
+    else
+      {
+      aoiOutlinePoints->SetPoint(0, this->ViewExtents[0], this->ViewExtents[2], 0);
+      aoiOutlinePoints->SetPoint(1, this->ViewExtents[1], this->ViewExtents[2], 0);
+      aoiOutlinePoints->SetPoint(2, this->ViewExtents[1], this->ViewExtents[3], 0);
+      aoiOutlinePoints->SetPoint(3, this->ViewExtents[0], this->ViewExtents[3], 0);
+      }
+    }
+  else if (this->UseRawImageCoordinates)
+    {
+    if (project->AOILowerRightLatLon[0] != 444)
+      {
+      double lr[4] = { project->AOILowerRightLatLon[1],
+                       project->AOILowerRightLatLon[0], 0, 1.0 };
+
+      this->LatLonToWorldMatrix->MultiplyPoint(lr, lr);
+      if (lr[3] != 0)
+        {
+        lr[0] /= lr[3];
+        lr[1] /= lr[3];
+        }
+
+      if (project->AOILowerLeftLatLon[0] != 444 &&
+          project->AOIUpperRightLatLon[0] != 444)
+        {
+        // All four corners.
+        double ll[4] = { project->AOILowerLeftLatLon[1],
+                         project->AOILowerLeftLatLon[0], 0, 1.0 };
+
+        this->LatLonToWorldMatrix->MultiplyPoint(ll, ll);
+        if (ll[3] != 0)
+          {
+          ll[0] /= ll[3];
+          ll[1] /= ll[3];
+          }
+        double ur[4] = { project->AOIUpperRightLatLon[1],
+                         project->AOIUpperRightLatLon[0], 0, 1.0 };
+
+        this->LatLonToWorldMatrix->MultiplyPoint(ur, ur);
+        if (ur[3] != 0)
+          {
+          ur[0] /= ur[3];
+          ur[1] /= ur[3];
+          }
+
+        aoiOutlinePoints->SetPoint(0, ll[0], ll[1], 0);
+        aoiOutlinePoints->SetPoint(1, lr[0], lr[1], 0);
+        aoiOutlinePoints->SetPoint(2, ur[0], ur[1], 0);
+        aoiOutlinePoints->SetPoint(3, 0, 0, 0);
+        }
+      else
+        {
+        // Two corners.
+        aoiOutlinePoints->SetPoint(0, 0, lr[1], 0);
+        aoiOutlinePoints->SetPoint(1, lr[0], lr[1], 0);
+        aoiOutlinePoints->SetPoint(2, lr[0], 0, 0);
+        aoiOutlinePoints->SetPoint(3, 0, 0, 0);
+        }
+      }
+    else
+      {
+      // Just one corner - show a 'notch' in the upper left corner.
+      aoiOutlinePoints->SetPoint(0, 0, -100, 0);
+      aoiOutlinePoints->SetPoint(1, 0, 0, 0);
+      aoiOutlinePoints->SetPoint(2, 100, 0, 0);
+      aoiOutlinePoints->SetPoint(3, 0, 0, 0);
+      }
+    }
+  else // Inverted image coordinates
+    {
+    aoiOutlinePoints->SetPoint(0, 0, 0, 0);
+    aoiOutlinePoints->SetPoint(1, project->AnalysisDimensions[0] - 1, 0, 0);
+    aoiOutlinePoints->SetPoint(2, project->AnalysisDimensions[0] - 1,
+                               project->AnalysisDimensions[1] - 1, 0);
+    aoiOutlinePoints->SetPoint(3, 0, project->AnalysisDimensions[1] - 1, 0);
+    }
+
+  vtkSmartPointer<vtkCellArray> aoiOutlineLines = vtkSmartPointer<vtkCellArray>::New();
+  vtkIdType ptIds[5] = {0, 1, 2, 3, 0};
+  aoiOutlineLines->InsertNextCell(5, ptIds);
+
+  this->AOIOutlinePolyData = vtkSmartPointer<vtkPolyData>::New();
+  this->AOIOutlinePolyData->SetPoints(aoiOutlinePoints);
+  this->AOIOutlinePolyData->SetLines(aoiOutlineLines);
+
+  vtkSmartPointer<vtkPolyDataMapper> aoiOutlineMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
+  aoiOutlineMapper->SetInputData(this->AOIOutlinePolyData);
+
+  this->AOIOutlineActor = vtkSmartPointer<vtkActor>::New();
+  this->AOIOutlineActor->SetMapper(aoiOutlineMapper);
+  this->AOIOutlineActor->GetProperty()->SetColor(1, 0.5, 0);
+
+  this->SceneRenderer->AddViewProp(this->AOIOutlineActor);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::handleDataSetNotFound(vpProject* project)
+{
+  emit this->criticalError(
+    QString("Unable to read dataset using path (\"%1\").\n").arg(
+      qtString(project->DataSetSpecifier)));
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::handleFileNotFound(const std::string& tag, const std::string& file)
+{
+  QString warningMsg = tr("Unable to find file ( %1 ) for %2")
+                         .arg(QString(file.c_str()), QString(tag.c_str()));
+
+  emit this->warningError(warningMsg);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onIncreaseIconXOffset()
+{
+  this->changeIconOffset(1, 0);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onDecreaseIconXOffset()
+{
+  this->changeIconOffset(-1, 0);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onIncreaseIconYOffset()
+{
+  this->changeIconOffset(0, 1);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onDecreaseIconYOffset()
+{
+  this->changeIconOffset(0, -1);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onIncreaseOverlayTransparency()
+{
+  this->changeOverlayOpacity(-0.1);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onDecreaseOverlayTransparency()
+{
+  this->changeOverlayOpacity(0.1);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onIncreaseSceneElementTransparency()
+{
+  this->changeSceneElementOpacity(-0.1);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onDecreaseSceneElementTransparency()
+{
+  this->changeSceneElementOpacity(0.1);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::changeSceneElementOpacity(double delta)
+{
+  double opacity = this->SceneElementFillOpacity;
+  opacity += delta;
+
+  if (opacity < 0.1)
+    {
+    opacity = 0.1;
+    }
+  else if (opacity > 1.0)
+    {
+    opacity = 1.0;
+    }
+
+  this->SceneElementFillOpacity = opacity;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->SceneElementRepresentation->SetFillOpacity(opacity);
+    }
+
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::changeIconOffset(int deltaX, int deltaY)
+{
+  this->IconOffsetX += deltaX;
+  this->IconOffsetY += deltaY;
+
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->IconManager->SetIconOffset(this->IconOffsetX,
+                                                  this->IconOffsetY);
+
+    // This call is required to update the state.
+    this->Projects[i]->IconManager->UpdateIconActors(
+      this->CoreTimeStamp.GetFrameNumber());
+    }
+
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::changeOverlayOpacity(double delta)
+{
+  double opacity = this->OverlayOpacity;
+  opacity += delta;
+
+  if (opacity < 0.1)
+    {
+    opacity = 0.1;
+    }
+  else if (opacity > 1.0)
+    {
+    opacity = 1.0;
+    }
+
+  this->OverlayOpacity = opacity;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->ActivityManager->SetOverlayOpacity(opacity);
+    }
+
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initializeImageSource()
+{
+  // Check here the extension of the files.
+  // Grab the first file.
+  std::string fileName = this->ImageDataSource->getDataFile(0);
+  this->ImageSource.TakeReference(vpImageSourceFactory::GetInstance()->Create(fileName));
+
+  if (!this->ImageSource)
+    {
+    QString errorMsg = QString("Unable to create image souce for \"%1\"");
+    emit this->criticalError(errorMsg.arg(qtString(fileName)));
+    return;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::addEvents(vpProject* project)
+{
+    {
+    // normal event representation
+    project->EventRepresentation->UpdateEventTypes();
+    vtkPropCollection* eventProps =
+      project->EventRepresentation->GetActiveRenderObjects();
+    eventProps->InitTraversal();
+    while (vtkProp* prop = eventProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+    {
+    // event region representation
+    vtkPropCollection* eventProps =
+      project->EventRegionRepresentation->GetActiveRenderObjects();
+    eventProps->InitTraversal();
+    while (vtkProp* prop = eventProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+    {
+    // selected event representation
+    project->SelectedEventRepresentation->UpdateEventTypes();
+    vtkPropCollection* eventProps =
+      project->SelectedEventRepresentation->GetActiveRenderObjects();
+    eventProps->InitTraversal();
+    while (vtkProp* prop = eventProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::removeEvents(vpProject* project)
+{
+  // Remove events from renderer.
+  vtkPropCollection* eventProps =
+    project->EventRepresentation->GetActiveRenderObjects();
+  eventProps->InitTraversal();
+  while (vtkProp* prop = eventProps->GetNextProp())
+    {
+    this->SceneRenderer->RemoveViewProp(prop);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::addTrackHeads(vpProject* project)
+{
+    {
+    vtkPropCollection* headProps =
+      project->TrackHeadRepresentation->GetActiveRenderObjects();
+    headProps->InitTraversal();
+    while (vtkProp* prop = headProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+    {
+    vtkPropCollection* headProps =
+      project->SelectedTrackHeadRepresentation->GetActiveRenderObjects();
+    headProps->InitTraversal();
+    while (vtkProp* prop = headProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+    {
+    vtkPropCollection* headProps =
+      project->SceneElementRepresentation->GetActiveRenderObjects();
+    headProps->InitTraversal();
+    while (vtkProp* prop = headProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+    {
+    vtkPropCollection* headProps =
+      project->SelectedSceneElementRepresentation->GetActiveRenderObjects();
+    headProps->InitTraversal();
+    while (vtkProp* prop = headProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::removeTrackHeads(vpProject* project)
+{
+  // Remove track heads from the renderer.
+    {
+    vtkPropCollection* headProps =
+      project->TrackHeadRepresentation->GetActiveRenderObjects();
+    headProps->InitTraversal();
+    while (vtkProp* prop = headProps->GetNextProp())
+      {
+      this->SceneRenderer->RemoveViewProp(prop);
+      }
+    }
+    {
+    vtkPropCollection* headProps =
+      project->SelectedTrackHeadRepresentation->GetActiveRenderObjects();
+    headProps->InitTraversal();
+    while (vtkProp* prop = headProps->GetNextProp())
+      {
+      this->SceneRenderer->RemoveViewProp(prop);
+      }
+    }
+    {
+    vtkPropCollection* headProps =
+      project->SceneElementRepresentation->GetActiveRenderObjects();
+    headProps->InitTraversal();
+    while (vtkProp* prop = headProps->GetNextProp())
+      {
+      this->SceneRenderer->RemoveViewProp(prop);
+      }
+    }
+    {
+    vtkPropCollection* headProps =
+      project->SelectedSceneElementRepresentation->GetActiveRenderObjects();
+    headProps->InitTraversal();
+    while (vtkProp* prop = headProps->GetNextProp())
+      {
+      this->SceneRenderer->RemoveViewProp(prop);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::addTracks(vpProject* project)
+{
+  // Add track actors to renderer. Track actors are added *after* events so that
+  // tracks and events won't be alpha blended together and show misleading
+  // colors.
+    {
+    vtkPropCollection* trackProps =
+      project->TrackRepresentation->GetActiveRenderObjects();
+    trackProps->InitTraversal();
+    while (vtkProp* prop = trackProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+    {
+    vtkPropCollection* trackProps =
+      project->SelectedTrackRepresentation->GetActiveRenderObjects();
+    trackProps->InitTraversal();
+    while (vtkProp* prop = trackProps->GetNextProp())
+      {
+      this->SceneRenderer->AddViewProp(prop);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::removeTracks(vpProject* project)
+{
+  // Remove tracks from renderer.
+  vtkPropCollection* trackProps =
+    project->TrackRepresentation->GetActiveRenderObjects();
+  trackProps->InitTraversal();
+  while (vtkProp* prop = trackProps->GetNextProp())
+    {
+    this->SceneRenderer->RemoveViewProp(prop);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::sanitizeSceneRenderer()
+{
+  // First remove actors from representations.
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->removeTracks(this->Projects[i]);
+    this->removeTrackHeads(this->Projects[i]);
+    this->removeEvents(this->Projects[i]);
+    this->SceneRenderer->RemoveViewProp(
+      this->Projects[i]->IconManager->GetIconActor());
+    }
+
+  if (this->SceneRenderer)
+    {
+    if (this->Annotation)
+      {
+      this->Annotation->SetVisible(false);
+      }
+    if (this->AOIOutlineActor)
+      {
+      this->SceneRenderer->RemoveViewProp(this->AOIOutlineActor);
+      }
+    if (this->EventLegend)
+      {
+      this->SceneRenderer->RemoveViewProp(this->EventLegend);
+      }
+
+    this->SceneRenderer->RemoveViewProp(this->ImageActor[1]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setSaveRenderedImages(bool state, QString* outputDir/*=0*/)
+{
+  this->SaveRenderedImages = state;
+  if (outputDir)
+    {
+    this->ImageOutputDirectory = *outputDir;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onHoverStart()
+{
+  if (vtkVgActivity* a = this->getHoveredActivity())
+    {
+    if (this->HoveredActivity)
+      {
+      this->HoveredActivity->SetShowLabel(false);
+      }
+
+    this->IsHovering = true;
+    this->HoveredActivity = a;
+    this->HoveredActivity->SetShowLabel(true);
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onHoverStop()
+{
+  this->IsHovering = false;
+
+  if (this->HoveredActivity)
+    {
+    QTimer::singleShot(500, this, SLOT(onHoverTimer()));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::onHoverTimer()
+{
+  if (!this->IsHovering)
+    {
+    if (this->HoveredActivity && !this->getHoveredActivity())
+      {
+      this->HoveredActivity->SetShowLabel(false);
+      this->HoveredActivity = 0;
+      this->render();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgActivity* vpViewCore::getHoveredActivity()
+{
+  vtkRenderWindowInteractor* interactor = this->RenderWindow->GetInteractor();
+  int x = interactor->GetEventPosition()[0];
+  int y = interactor->GetEventPosition()[1];
+
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    int pickStatus =
+      this->Projects[i]->Picker->Pick(x, y, 0.0, this->SceneRenderer);
+
+    if (pickStatus == vtkVgPickData::PickedActivity)
+      {
+      vtkIdType id = this->Projects[i]->Picker->GetActivityIndex();
+      return this->Projects[i]->ActivityManager->GetActivity(id);
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::eventTypeChanged(int vtkNotUsed(type))
+{
+  this->updateEventLegendColors();
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->Projects[i]->EventRepresentation->Modified();
+    }
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::activityTypeChanged(int vtkNotUsed(type))
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    if (this->Projects[i]->ActivityManager->GetNumberOfActivities() > 0)
+      {
+      this->Projects[i]->ActivityManager->UpdateActivityColors();
+      }
+    }
+
+  this->render();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::addFilterRegion(const std::string& name,
+                                 const std::vector<double>& points,
+                                 vtkMatrix4x4* worldToImageMatrix,
+                                 vtkVgTimeStamp& timeStamp)
+{
+  vtkIdType numPoints = static_cast<vtkIdType>(points.size() / 2);
+  vtkSmartPointer<vtkPoints> contourPoints = vtkSmartPointer<vtkPoints>::New();
+  vtkSmartPointer<vtkIdList> contourIds = vtkSmartPointer<vtkIdList>::New();
+  vtkSmartPointer<vtkPoints> filterPoints;
+  contourPoints->SetNumberOfPoints(numPoints);
+  contourIds->SetNumberOfIds(numPoints + 1);
+
+  if (this->UseGeoCoordinates)
+    {
+    // Convert from lat-long points to world coords
+    for (size_t i = 0, size = points.size(); i < size; i += 2)
+      {
+      double point[4] =
+        {
+        points[i + 1],
+        points[i + 0],
+        0.0, 1.0
+        };
+
+      this->LatLonToWorldMatrix->MultiplyPoint(point, point);
+      point[0] /= point[3];
+      point[1] /= point[3];
+      point[2] = 0.0;
+
+      vtkIdType id = static_cast<vtkIdType>(i / 2);
+      contourPoints->SetPoint(id, point);
+      contourIds->SetId(id, id);
+      }
+
+    // Track points are in the same coordinate system
+    filterPoints = contourPoints;
+    }
+  else
+    {
+    if (this->UseRawImageCoordinates)
+      {
+      // Convert from lat-long points to track-space points
+      double in[4] = { this->Projects[0]->AOIUpperLeftLatLon[1],
+                       this->Projects[0]->AOIUpperLeftLatLon[0], 0, 1.0 };
+      double out[4];
+      this->LatLonToImageMatrix->MultiplyPoint(in, out);
+      if (out[3] == 0.0)
+        {
+        qWarning() << "Lat-lon to image transform is invalid";
+        return;
+        }
+
+      vtkSmartPointer<vtkMatrix4x4> worldToTrack =
+        vtkSmartPointer<vtkMatrix4x4>::New();
+      worldToTrack->SetElement(0, 3,
+                               out[0]/out[3] - this->ImageTranslationOffset[0]);
+      worldToTrack->SetElement(1, 1, -1.0);
+      worldToTrack->SetElement(1, 3,
+                               out[1]/out[3] - this->ImageTranslationOffset[1]);
+      worldToTrack->Invert();
+
+      filterPoints = vtkSmartPointer<vtkPoints>::New();
+      filterPoints->SetNumberOfPoints(contourPoints->GetNumberOfPoints());
+
+      for (size_t i = 0, size = points.size(); i < size; i += 2)
+        {
+        double point[4] =
+          {
+          points[i + 1],
+          points[i + 0],
+          0.0, 1.0
+          };
+
+        // First go from lat-lon to world
+        this->LatLonToWorldMatrix->MultiplyPoint(point, point);
+        point[0] /= point[3];
+        point[1] /= point[3];
+        point[2] = 0.0;
+        point[3] = 1.0;
+
+        vtkIdType id = static_cast<vtkIdType>(i / 2);
+        contourPoints->SetPoint(id, point);
+        contourIds->SetId(id, id);
+
+        // Then to track space
+        worldToTrack->MultiplyPoint(point, point);
+        point[0] /= point[3];
+        point[1] /= point[3];
+        point[2] = 0.0;
+
+        filterPoints->SetPoint(id, point);
+        }
+      }
+    else
+      {
+      // Normal image coordinate mode, all we do is y-flip
+      double maxY = this->Projects[0]->AnalysisDimensions[1] - 1;
+      for (size_t i = 0, size = points.size(); i < size; i += 2)
+        {
+        double point[4] =
+          {
+          points[i + 0],
+          maxY - points[i + 1],
+          0.0, 1.0
+          };
+
+        vtkIdType id = static_cast<vtkIdType>(i / 2);
+        contourPoints->SetPoint(id, point);
+        contourIds->SetId(id, id);
+        }
+
+      // Track points are in the same coordinate system
+      filterPoints = contourPoints;
+      }
+    }
+
+  // Close the loop
+  contourIds->SetId(contourIds->GetNumberOfIds() - 1, 0);
+
+  vtkSmartPointer<vtkCellArray> cells = vtkSmartPointer<vtkCellArray>::New();
+  cells->InsertNextCell(contourIds);
+
+  vtkSmartPointer<vtkPolyData> polydata = vtkSmartPointer<vtkPolyData>::New();
+  polydata->SetPoints(contourPoints);
+  polydata->SetLines(cells);
+
+  vpContour* contour = this->makeFilterContour();
+  contour->Initialize(polydata);
+  contour->End();
+  contour->Finalize();
+  contour->SetVisible(0);
+  contour->SetTimeStamp(timeStamp);
+  contour->SetWorldToImageMatrix(worldToImageMatrix);
+  this->Contours.push_back(contour);
+
+  this->ContourOperatorManager->AddSelector(filterPoints);
+  this->ContourOperatorManager->SetContourEnabled(filterPoints, false);
+  emit this->filterRegionComplete(contour->GetPolyData()->GetPoints(),
+                                  filterPoints, contour->GetTimeStampPtr(),
+                                  contour->GetWorldToImageMatrix(),
+                                  qtString(name), false);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::drawFilterRegion()
+{
+  this->DrawingContour = true;
+  emit this->showStatusMessage("Drawing filter region (right-click when done)");
+
+  delete this->Contour;
+  this->Contour = this->makeFilterContour();
+  this->Contour->Initialize();
+  this->Contour->Begin();
+  this->Contour->SetTimeStamp(this->CoreTimeStamp);
+  // in the case of geo coordinates, which is the main case trying to be
+  // addressed by / when adding this, the head representation matrix
+  // maps from raw (y down) to world; invert that to get world to raw image
+  vtkSmartPointer<vtkMatrix4x4> tmpMatrix =
+    vtkSmartPointer<vtkMatrix4x4>::New();
+  tmpMatrix->DeepCopy(
+    this->Projects[0]->TrackHeadRepresentation->GetRepresentationMatrix());
+  tmpMatrix->Invert();
+  this->Contour->SetWorldToImageMatrix(tmpMatrix);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::completeFilterRegion()
+{
+  if (!this->Contour)
+    {
+    return;
+    }
+
+  emit this->showStatusMessage(QString());
+  this->DrawingContour = false;
+  this->Contour->End();
+  this->Contour->Finalize();
+
+  vtkPoints* points = this->Contour->GetPolyData()->GetPoints();
+  if (points->GetNumberOfPoints() < 3)
+    {
+    delete this->Contour;
+    this->Contour = 0;
+    emit this->showStatusMessage("Not enough points in region", 3000);
+    emit this->filterRegionComplete(0, 0, 0);
+    this->render();
+    }
+  else
+    {
+    const vtkVgTimeStamp *timeStamp = this->Contour->GetTimeStampPtr();
+    vtkMatrix4x4* matrix = this->Contour->GetWorldToImageMatrix();
+    this->Contours.push_back(this->Contour);
+    this->Contour = 0;
+
+    // We need to make sure the contour points are in the same coordinate space
+    // as the track points. This should already be true except in the case we
+    // are using translated image coordinates, but just go ahead and do the
+    // transform regardless.
+    vtkSmartPointer<vtkPoints> xfPoints = vtkSmartPointer<vtkPoints>::New();
+    xfPoints->SetNumberOfPoints(points->GetNumberOfPoints());
+
+    vtkSmartPointer<vtkMatrix4x4> worldToTracks =
+      vtkSmartPointer<vtkMatrix4x4>::New();
+
+    // Using the representation matrix of the first project
+    // FIXME: This won't work if we ever support loading multiple AOIs
+    vtkMatrix4x4::Invert(
+      this->Projects[0]->TrackRepresentation->GetRepresentationMatrix(),
+      worldToTracks);
+
+    // Transform the points of the contour to the space of the track data
+    for (vtkIdType i = 0, npts = points->GetNumberOfPoints(); i < npts; ++i)
+      {
+      double pt[4];
+      points->GetPoint(i, pt);
+      pt[3] = 1.0;
+      worldToTracks->MultiplyPoint(pt, pt);
+      pt[0] /= pt[3];
+      pt[1] /= pt[3];
+      pt[2] = 0.0;
+      xfPoints->SetPoint(i, pt);
+      }
+
+    this->ContourOperatorManager->AddSelector(xfPoints);
+    emit this->filterRegionComplete(points, xfPoints, timeStamp, matrix);
+
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setContourVisible(vtkPoints* contourPoints, bool visible)
+{
+  for (size_t i = 0, end = this->Contours.size(); i < end; ++i)
+    {
+    if (this->Contours[i]->GetPolyData()->GetPoints() == contourPoints)
+      {
+      this->Contours[i]->SetVisible(visible ? 1 : 0);
+      break;
+      }
+    }
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setFilterRegionEnabled(vtkPoints* filterPoints, bool enabled)
+{
+  this->ContourOperatorManager->SetContourEnabled(filterPoints, enabled);
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::removeFilterRegion(vtkPoints* contourPoints,
+                                    vtkPoints* filterPoints)
+{
+  this->ContourOperatorManager->RemoveSelector(filterPoints);
+  for (size_t i = 0, end = this->Contours.size(); i < end; ++i)
+    {
+    if (this->Contours[i]->GetPolyData()->GetPoints() == contourPoints)
+      {
+      delete this->Contours[i];
+      this->Contours.erase(this->Contours.begin() + i);
+      break;
+      }
+    }
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::removeAllFilterRegions()
+{
+  this->ContourOperatorManager->RemoveAllOperators();
+  for (size_t i = 0, end = this->Contours.size(); i < end; ++i)
+    {
+    delete this->Contours[i];
+    }
+  this->Contours.clear();
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::getNumberOfActivities()
+{
+  int count = 0;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    count += this->Projects[i]->ActivityManager->GetNumberOfActivities();
+    }
+  return count;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::getNumberOfEvents()
+{
+  int count = 0;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    count += this->Projects[i]->EventModel->GetNumberOfEvents();
+    }
+  return count;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::getNumberOfTracks()
+{
+  int count = 0;
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    count += this->Projects[i]->TrackModel->GetNumberOfTracks();
+    }
+  return count;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::saveCameraPosition()
+{
+  vtkVgRendererUtils::GetBounds(this->SceneRenderer, this->SavedViewExtents);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::restoreCameraPosition()
+{
+  this->doZoomToExtent(this->SavedViewExtents);
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::addTemporalFilter(int type,
+                                  const vtkVgTimeStamp& start,
+                                  const vtkVgTimeStamp& end)
+{
+  int id =
+    this->TemporalFilters->AddFilter(vtkVgTemporalFilters::FilterType(type),
+                                     start, end);
+  this->update();
+  return id;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateTemporalFilterStart(int id,
+                                           const vtkVgTimeStamp& newStart)
+{
+  vtkVgTemporalFilters::FilterType type;
+  vtkVgTimeStamp startTime;
+  vtkVgTimeStamp endTime;
+  bool enabled;
+
+  this->TemporalFilters->GetFilterInfo(id, type, startTime, endTime, enabled);
+  if (newStart != startTime)
+    {
+    this->TemporalFilters->SetFilter(id, type, newStart, endTime, enabled);
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateTemporalFilterEnd(int id,
+                                         const vtkVgTimeStamp& newEnd)
+{
+  vtkVgTemporalFilters::FilterType type;
+  vtkVgTimeStamp startTime;
+  vtkVgTimeStamp endTime;
+  bool enabled;
+
+  this->TemporalFilters->GetFilterInfo(id, type, startTime, endTime, enabled);
+  if (newEnd != endTime)
+    {
+    this->TemporalFilters->SetFilter(id, type, startTime, newEnd, enabled);
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateTemporalFilterType(int id, int newType)
+{
+  vtkVgTemporalFilters::FilterType type;
+  vtkVgTimeStamp startTime;
+  vtkVgTimeStamp endTime;
+  bool enabled;
+
+  this->TemporalFilters->GetFilterInfo(id, type, startTime, endTime, enabled);
+  this->TemporalFilters->SetFilter(id,
+                                   vtkVgTemporalFilters::FilterType(newType),
+                                   startTime, endTime, enabled);
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::enableTemporalFilter(int id, bool newState)
+{
+  vtkVgTemporalFilters::FilterType type;
+  vtkVgTimeStamp startTime;
+  vtkVgTimeStamp endTime;
+  bool enabled;
+
+  this->TemporalFilters->GetFilterInfo(id, type, startTime, endTime, enabled);
+  if (enabled != newState)
+    {
+    this->TemporalFilters->SetFilter(id, type, startTime, endTime, newState);
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::removeTemporalFilter(int id)
+{
+  this->TemporalFilters->RemoveFilter(id);
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::removeAllTemporalFilters()
+{
+  this->TemporalFilters->RemoveAllFilters();
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::beginEditingTrack(int trackId)
+{
+  this->stopEditingTrack();
+
+  int session = this->SessionView->GetCurrentSession();
+  this->TrackEditProjectId = this->Projects[session]->ProjectId;
+
+  this->EditingTrackId = trackId;
+  this->RubberbandInteractorStyle->SetRubberBandSelectionWithCtrlKey(1);
+
+  this->initTrackHeadIndicator();
+
+  // place indicator next to mouse cursor
+  int x, y;
+  this->getMousePosition(&x, &y);
+  this->updateTrackHeadIndicator(x, y);
+
+  double* prevColor =
+    this->Projects[session]->TrackModel->GetTrackColor(trackId);
+  this->EditedTrackPrevColor[0] = prevColor[0];
+  this->EditedTrackPrevColor[1] = prevColor[1];
+  this->EditedTrackPrevColor[2] = prevColor[2];
+  this->Projects[session]->TrackModel->SetTrackColor(trackId, TrackEditColor);
+  this->Projects[session]->TrackModel->GetTrack(trackId)->SetModifiable(true);
+
+  this->update();
+
+  emit this->showStatusMessage(
+    "Editing track (Ctrl+Drag to resize bounds, right click when done)");
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::stopEditingTrack(bool autoremove)
+{
+  if (!this->isEditingTrack())
+    {
+    return;
+    }
+
+  int projectId = this->TrackEditProjectId;
+
+  this->TrackEditProjectId = -1;
+  this->TrackHeadIndicatorActor->SetVisibility(0);
+  this->RubberbandInteractorStyle->SetRubberBandSelectionWithCtrlKey(0);
+
+  if (this->TrackHeadRegion)
+    {
+    this->TrackHeadRegion->SetVisible(0);
+    }
+
+  if (autoremove)
+    {
+    emit this->stoppedEditingTrack();
+    }
+
+  if (this->EditingTrackId == this->NewTrackId)
+    {
+    if (autoremove)
+      {
+      emit this->showStatusMessage("Auto-deleting track with no added points",
+                                   3000);
+
+      for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+        {
+        if (this->Projects[i]->ProjectId == projectId)
+          {
+          this->deleteTrack(this->EditingTrackId, static_cast<int>(i));
+          break;
+          }
+        }
+      }
+    }
+  else
+    {
+    emit this->showStatusMessage(QString());
+
+    if (vpProject* project = this->findProject(projectId))
+      {
+      vtkVgTrack* track = project->TrackModel->GetTrack(this->EditingTrackId);
+      track->Close();
+      track->SetModifiable(false);
+      project->TrackModel->SetTrackColor(this->EditingTrackId,
+                                         this->EditedTrackPrevColor);
+      this->update();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::deleteTrack(int trackId, int session)
+{
+  if (this->isEditingTrack())
+    {
+    this->stopEditingTrack(false);
+    }
+
+  vpProject* project = this->Projects[session];
+
+  std::vector<vtkVgEvent*> events;
+  project->EventModel->GetEvents(trackId, events);
+
+  if (!events.empty())
+    {
+    QMessageBox::StandardButton btn =
+      QMessageBox::question(0, "Delete Events?",
+                            QString(
+                              "The track being deleted is referenced by %1 "
+                              "events. Removing the track will cause these "
+                              "events to be deleted.").arg(events.size()),
+                            QMessageBox::Ok | QMessageBox::Cancel);
+
+    if (btn != QMessageBox::Ok)
+      {
+      return;
+      }
+
+    for (size_t i = 0, end = events.size(); i < end; ++i)
+      {
+      project->EventModel->RemoveEvent(events[i]->GetId());
+      }
+    }
+
+  project->TrackModel->RemoveTrack(trackId);
+
+  this->SessionView->Update(true);
+  emit this->objectInfoUpdateNeeded();
+
+  this->UpdateObjectViews = false;
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::deleteEvent(int eventId, int session)
+{
+  vpProject* project = this->Projects[session];
+  if (project->ActivityManager->IsEventUsedByActivity(eventId))
+    {
+    QMessageBox::information(0, "Event Deletion Failed",
+                             "Cannot delete an event that is referenced by an "
+                             "activity.", QMessageBox::Ok);
+    return;
+    }
+
+  this->Projects[session]->EventModel->RemoveEvent(eventId);
+
+  this->SessionView->Update(true);
+  emit this->objectInfoUpdateNeeded();
+
+  this->UpdateObjectViews = false;
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setEventSelection(const QList<vtkIdType>& ids, int session)
+{
+  // Clear previous selection
+  for (size_t i = 0, size = this->SelectedEvents.size(); i < size; ++i)
+    {
+    vtkVgEvent* event = this->SelectedEvents[i];
+    event->SetDisplayFlags(event->GetDisplayFlags() &
+                           ~vtkVgEventBase::DF_Selected);
+    }
+  this->SelectedEvents.clear();
+
+  // Set new selection
+  vpProject* project= this->Projects[session];
+  foreach (vtkIdType id, ids)
+    {
+    vtkVgEvent* event = project->EventModel->GetEvent(id);
+    event->SetDisplayFlags(event->GetDisplayFlags() |
+                           vtkVgEventBase::DF_Selected);
+    this->SelectedEvents.push_back(event);
+    }
+
+  project->SelectedEventRepresentation->Modified();
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setTrackSelection(const QList<vtkIdType>& ids, int session)
+{
+  // Clear previous selection
+  for (size_t i = 0, size = this->SelectedTracks.size(); i < size; ++i)
+    {
+    vtkVgTrack* track = this->SelectedTracks[i];
+    track->SetDisplayFlags(track->GetDisplayFlags() & ~vtkVgTrack::DF_Selected);
+    }
+  this->SelectedTracks.clear();
+
+  // Set new selection
+  vpProject* project= this->Projects[session];
+  foreach (vtkIdType id, ids)
+    {
+    vtkVgTrack* track = project->TrackModel->GetTrack(id);
+    track->SetDisplayFlags(track->GetDisplayFlags() |
+                           vtkVgTrack::DF_Selected);
+    this->SelectedTracks.push_back(track);
+    }
+
+  project->SelectedTrackRepresentation->Modified();
+  project->SelectedTrackHeadRepresentation->Modified();
+  project->SelectedSceneElementRepresentation->Modified();
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initTrackHeadIndicator(vtkPolyData* pd)
+{
+  this->initTrackHeadIndicator();
+
+  this->TrackHeadIndicatorPolyData->DeepCopy(pd);
+  double bounds[6];
+  pd->GetBounds(bounds);
+
+  vtkPoints* pts = this->TrackHeadIndicatorPolyData->GetPoints();
+
+  // make points relative to the lower right corner
+  for (vtkIdType i = 0, end = pts->GetNumberOfPoints(); i != end; ++i)
+    {
+    double point[3];
+    pts->GetPoint(i, point);
+    point[0] -= bounds[1];
+    point[1] -= bounds[2];
+    pts->SetPoint(i, point);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::initTrackHeadIndicator()
+{
+  if (this->TrackHeadIndicatorPolyData)
+    {
+    return;
+    }
+
+  this->TrackHeadIndicatorPolyData = vtkSmartPointer<vtkPolyData>::New();
+
+  vtkPoints* points = vtkPoints::New();
+  vtkCellArray* ca = vtkCellArray::New();
+  vtkPolyDataMapper* pdm = vtkPolyDataMapper::New();
+
+  // initially default to small box
+  points->SetNumberOfPoints(4);
+  points->SetPoint(0, -10.0, 10.0, 0.0);
+  points->SetPoint(1, -10.0, 0.0, 0.0);
+  points->SetPoint(2, 0.0, 0.0, 0.0);
+  points->SetPoint(3, 0.0, 10.0, 0.0);
+
+  vtkIdType ids[] = { 0, 1, 2, 3, 0 };
+  ca->InsertNextCell(5, ids);
+
+  this->TrackHeadIndicatorPolyData->SetPoints(points);
+  this->TrackHeadIndicatorPolyData->SetLines(ca);
+  pdm->SetInputData(this->TrackHeadIndicatorPolyData);
+
+  this->TrackHeadIndicatorActor->SetMapper(pdm);
+  this->TrackHeadIndicatorActor->GetProperty()->SetColor(TrackEditColor);
+  this->TrackHeadIndicatorActor->SetUserMatrix(this->ImageToWorldMatrix);
+
+  points->FastDelete();
+  ca->FastDelete();
+  pdm->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateTrackHeadIndicator(int x, int y)
+{
+  if (this->HideTrackHeadIndicator)
+    {
+    return;
+    }
+
+  // hide the indicator if close enough to manipulate head contour
+  if (this->TrackHeadRegion &&
+      this->TrackHeadRegion->GetVisible() &&
+      this->TrackHeadRegion->CanInteract(x, y))
+    {
+    this->TrackHeadIndicatorActor->SetVisibility(0);
+    return;
+    }
+
+  this->TrackHeadIndicatorActor->SetVisibility(1);
+
+  // screen to world
+  double p[4];
+  this->SceneRenderer->SetDisplayPoint(static_cast<double>(x),
+                                       static_cast<double>(y), 0.0);
+  this->SceneRenderer->DisplayToWorld();
+  this->SceneRenderer->GetWorldPoint(p);
+
+  this->WorldToImageMatrix->MultiplyPoint(p, p);
+  p[0] /= p[3];
+  p[1] /= p[3];
+
+  this->TrackHeadIndicatorActor->SetPosition(vtkMath::Round(p[0]),
+                                             vtkMath::Round(p[1]),
+                                             0.5);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateTrackHeadRegion()
+{
+  vpProject* project = this->findProject(this->TrackEditProjectId);
+  if (!project)
+    {
+    return;
+    }
+
+  vtkVgTrack* track = project->TrackModel->GetTrack(this->EditingTrackId);
+
+  vtkIdType npts, *ptIds, trackPointId;
+  track->GetHeadIdentifier(project->TrackModel->GetCurrentTimeStamp(),
+                           npts, ptIds, trackPointId);
+  if (npts < 4)
+    {
+    if (this->TrackHeadRegion)
+      {
+      this->TrackHeadRegion->SetVisible(0);
+      }
+    return;
+    }
+
+  bool usePolygonEditor = false;
+  switch (this->RegionEditMode)
+    {
+    case REM_Auto:
+      // Use the contour editor if the current head isn't a box
+      if (npts != 5)
+        {
+        usePolygonEditor = true;
+        }
+      else
+        {
+        double ul[3];
+        double ll[3];
+        double lr[3];
+        double ur[3];
+        vtkPoints* trackPts = track->GetPoints();
+        trackPts->GetPoint(ptIds[0], ul);
+        trackPts->GetPoint(ptIds[1], ll);
+        trackPts->GetPoint(ptIds[2], lr);
+        trackPts->GetPoint(ptIds[3], ur);
+
+        usePolygonEditor =
+          ul[0] != ll[0] ||
+          ll[1] != lr[1] ||
+          lr[0] != ur[0] ||
+          ur[1] != ul[1];
+        }
+      break;
+
+    case REM_Polygon:
+      usePolygonEditor = true;
+      break;
+    }
+
+  // Lazily create the contour on first use since it's an expensive operation
+  if (usePolygonEditor)
+    {
+    if (!this->TrackHeadContour)
+      {
+      this->TrackHeadContour =
+        new vpContour(this->RenderWindow->GetInteractor());
+
+      this->VTKConnect->Connect(this->TrackHeadContour->GetWidget(),
+                                vtkCommand::EndInteractionEvent,
+                                this, SLOT(onEditTrackHeadRegion()));
+      }
+    this->TrackHeadRegion = this->TrackHeadContour;
+    if (this->TrackHeadBox)
+      {
+      this->TrackHeadBox->SetVisible(0);
+      }
+    }
+  else
+    {
+    if (!this->TrackHeadBox)
+      {
+      this->TrackHeadBox =
+        new vpBox(this->RenderWindow->GetInteractor());
+
+      this->VTKConnect->Connect(this->TrackHeadBox->GetWidget(),
+                                vtkCommand::EndInteractionEvent,
+                                this, SLOT(onEditTrackHeadRegion()));
+      }
+    this->TrackHeadRegion = this->TrackHeadBox;
+    if (this->TrackHeadContour)
+      {
+      this->TrackHeadContour->SetVisible(0);
+      }
+    }
+
+  if (!this->TrackHeadRegionPolyData)
+    {
+    this->TrackHeadRegionPolyData = vtkSmartPointer<vtkPolyData>::New();
+    vtkCellArray* ca = vtkCellArray::New();
+    vtkPoints* pts = vtkPoints::New();
+    this->TrackHeadRegionPolyData->SetPoints(pts);
+    this->TrackHeadRegionPolyData->SetLines(ca);
+    pts->FastDelete();
+    ca->FastDelete();
+    }
+
+  // Rebuild the polydata
+  vtkPoints* pts = this->TrackHeadRegionPolyData->GetPoints();
+  pts->SetNumberOfPoints(npts - 1);
+
+  vtkMatrix4x4* trackToWorld =
+    project->TrackHeadRepresentation->GetRepresentationMatrix();
+
+  vtkCellArray* ca = this->TrackHeadRegionPolyData->GetLines();
+  ca->Reset();
+  ca->InsertNextCell(npts);
+  for (int i = 0; i < npts - 1; ++i)
+    {
+    double point[4];
+    track->GetPoints()->GetPoint(ptIds[i], point);
+    point[2] = 0.0;
+    point[3] = 1.0;
+
+    // Transform to world point
+    trackToWorld->MultiplyPoint(point, point);
+
+    ca->InsertCellPoint(i);
+    pts->SetPoint(i, point);
+    }
+  ca->InsertCellPoint(0);
+
+  this->TrackHeadRegionPolyData->Modified();
+
+  this->TrackHeadRegion->Initialize(this->TrackHeadRegionPolyData);
+  this->TrackHeadRegion->SetVisible(1);
+
+  // Show interpolated heads in a slightly darker color
+  if (track->GetFrameIsInterpolated(this->CoreTimeStamp))
+    {
+    this->TrackHeadRegion->SetLineColor(0.0, 0.6, 0.6);
+    }
+  else
+    {
+    this->TrackHeadRegion->SetLineColor(0.0, 1.0, 1.0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateTrackFollowCamera()
+{
+  if (vpProject* project = this->findProject(this->FollowTrackProjectId))
+    {
+    vtkVgTrack* trackToFollow =
+      project->TrackModel->GetTrack(this->IdOfTrackToFollow);
+    if (trackToFollow && trackToFollow->GetPointIds()->GetNumberOfIds() > 0)
+      {
+      double center[4];
+      trackToFollow->GetClosestFramePt(this->CoreTimeStamp, center);
+      center[2] = 0.0;
+      center[3] = 1.0;
+      project->TrackRepresentation->GetRepresentationMatrix()->MultiplyPoint(
+        center, center);
+      center[0] /= center[3];
+      center[1] /= center[3];
+      this->moveCameraTo(center, false);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::mouseLeftViewport()
+{
+  this->HideTrackHeadIndicator = true;
+  if (this->isEditingTrack())
+    {
+    this->TrackHeadIndicatorActor->SetVisibility(0);
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::mouseEnteredViewport()
+{
+  this->HideTrackHeadIndicator = false;
+  if (this->isEditingTrack())
+    {
+    int x, y;
+    this->getMousePosition(&x, &y);
+    this->updateTrackHeadIndicator(x, y);
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setTrackHead(vtkPoints* points)
+{
+  vpProject* project = this->findProject(this->TrackEditProjectId);
+  if (!project)
+    {
+    return;
+    }
+
+  double bounds[6];
+  points->GetBounds(bounds);
+  double worldCenter[2];
+  worldCenter[0] = 0.5 * (bounds[0] + bounds[1]);
+  worldCenter[1] = 0.5 * (bounds[2] + bounds[3]);
+
+  // Incoming points are in world coordinates. In raw image mode and geo mode,
+  // world space and track space are different coordinate systems, so transform
+  // back now.
+  if (this->UseRawImageCoordinates || this->UseGeoCoordinates)
+    {
+    const vtkMatrix4x4* trackToWorld =
+      project->TrackHeadRepresentation->GetRepresentationMatrix();
+
+    vtkSmartPointer<vtkMatrix4x4> worldToTrack =
+      vtkSmartPointer<vtkMatrix4x4>::New();
+    vtkMatrix4x4::Invert(trackToWorld, worldToTrack);
+
+    for (vtkIdType i = 0, size = points->GetNumberOfPoints(); i < size; ++i)
+      {
+      double point[4];
+      points->GetPoint(i, point);
+      point[2] = 0.0;
+      point[3] = 1.0;
+      worldToTrack->MultiplyPoint(point, point);
+      points->SetPoint(i, point);
+      }
+    points->Modified();
+    }
+
+  vtkVgTrack* track = project->TrackModel->GetTrack(this->EditingTrackId);
+
+  points->GetBounds(bounds);
+
+  double center[2];
+  if (this->UseGeoCoordinates)
+    {
+    // the track point is stored in world coordinates while head is in
+    // image coordinates
+    center[0] = worldCenter[0];
+    center[1] = worldCenter[1];
+    }
+  else
+    {
+    center[0] = 0.5 * (bounds[0] + bounds[1]);
+    center[1] = 0.5 * (bounds[2] + bounds[3]);
+    }
+
+  vtkVgGeoCoord geoCoord;
+  if (this->UseRawImageCoordinates || this->UseGeoCoordinates)
+    {
+    geoCoord = this->worldToGeo(worldCenter);
+    }
+
+  track->SetPoint(this->CoreTimeStamp, center, geoCoord,
+    points->GetNumberOfPoints(), 0, points, 0);
+
+  project->TrackModel->Modified();
+
+  // remove dummy point if this is first user-created point, and show the track
+  if (this->EditingTrackId == this->NewTrackId)
+    {
+    if (this->CoreTimeStamp != this->NewTrackTimeStamp)
+      {
+      track->DeletePoint(this->NewTrackTimeStamp);
+      }
+
+    this->NewTrackId = -1;
+    this->NewTrackTimeStamp = vtkVgTimeStamp();
+    project->TrackRepresentation->SetExcludedTrack(0);
+    project->TrackHeadRepresentation->SetExcludedTrack(0);
+    project->SceneElementRepresentation->SetExcludedTrack(0);
+    }
+
+  emit this->objectInfoUpdateNeeded();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setTrackHeadAndAdvance(vtkPoints* points)
+{
+  vpProject* project = this->findProject(this->TrackEditProjectId);
+  if (!project)
+    {
+    return;
+    }
+
+  bool isNewTrack = this->EditingTrackId == this->NewTrackId;
+  vtkVgTrack* track = project->TrackModel->GetTrack(this->EditingTrackId);
+  vtkVgTimeStamp sf = track->GetStartFrame();
+  vtkVgTimeStamp ef = track->GetEndFrame();
+
+  this->setTrackHead(points);
+
+  // If the newly added head is past the end of the track, or this is a new
+  // track with no points, advance to the next frame. If the head is inserted
+  // before the start of the track, rewind to the previous frame. Otherwise
+  // stay put on the current frame.
+  if (this->AutoAdvanceDuringCreation && (isNewTrack || track->GetEndFrame() > ef))
+    {
+    this->nextFrame();
+    }
+  else if (this->AutoAdvanceDuringCreation && track->GetStartFrame() < sf)
+    {
+    this->prevFrame();
+    }
+  else
+    {
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgBaseImageSource* vpViewCore::getImageSource()
+{
+  return this->ImageSource;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setImageSourceLevelOfDetailFactor(double factor)
+{
+  if (this->ImageSource)
+    {
+    this->ImageSourceLODFactor = factor;
+
+    this->updateAOIImagery();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::hasMultiLevelOfDetailSource()
+{
+  if (this->ImageSource->GetNumberOfLevels() > 1)
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackModel* vpViewCore::getTrackModel(int session)
+{
+  return this->Projects[session]->TrackModel;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventModel* vpViewCore::getEventModel(int session)
+{
+  return this->Projects[session]->EventModel;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventFilter* vpViewCore::getEventFilter()
+{
+  return this->EventFilter;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setTrackTrailLength(const vtkVgTimeStamp& duration)
+{
+  this->TrackTrailLength = duration;
+  for (size_t i = 0, size = this->Projects.size(); i < size; ++i)
+    {
+    this->setTrackTrailLength(this->Projects[i], duration);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vpViewCore::getTrackTrailLength()
+{
+  return this->TrackTrailLength;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setSceneElementLineWidth(double lineWidth)
+{
+  if (this->SceneElementLineWidth == lineWidth)
+    {
+    return;
+    }
+  this->SceneElementLineWidth = lineWidth;
+  for (size_t i = 0, size = this->Projects.size(); i < size; ++i)
+    {
+    this->setSceneElementLineWidth(this->Projects[i], lineWidth);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setUseTimeBasedIndexing(bool state)
+{
+  if (state == this->UseTimeBasedIndexing)
+    {
+    return;
+    }
+
+  this->UseTimeBasedIndexing = state;
+  if (this->UseTimeBasedIndexing && this->UsingTimeStampData)
+    {
+    this->UsingTimeBasedIndexing = true;
+    this->waitForFrameMapRebuild();
+    }
+  else
+    {
+    this->UsingTimeBasedIndexing = false;
+    }
+
+  if (!this->Projects.empty())
+    {
+    this->syncAnimationToCore();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setEnableWorldDisplayIfAvailable(bool state)
+{
+  this->EnableWorldDisplayIfAvailable = state;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setEnableTranslateImage(bool state)
+{
+  this->EnableTranslateImage = state;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::deleteTrackPoint()
+{
+  if (this->isEditingTrack())
+    {
+    vpProject* project = this->findProject(this->TrackEditProjectId);
+    if (!project)
+      {
+      return;
+      }
+    vtkVgTrack* track = project->TrackModel->GetTrack(this->EditingTrackId);
+    track->DeletePoint(this->CoreTimeStamp);
+    project->TrackModel->Modified();
+    emit this->objectInfoUpdateNeeded();
+    this->updateScene();
+    emit this->showStatusMessage(
+      QString("Deleted frame %1 of track %2")
+      .arg(this->CoreTimeStamp.GetFrameNumber())
+      .arg(this->EditingTrackId), 3000);
+    }
+  else
+    {
+    emit this->showStatusMessage("Track not in edit mode", 3000);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setRegionEditMode(int mode)
+{
+  this->RegionEditMode = mode;
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setExternalExecuteMode(int mode)
+{
+  this->ExternalExecuteMode = mode;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setTrackColorMode(int mode, const QString& attributeGroup)
+{
+  QSettings settings;
+
+  switch (mode)
+    {
+    case vtkVgTrackRepresentationBase::TCM_StateAttrs:
+      {
+      std::vector<vgAttribute> attrs =
+        this->TrackAttributes.GetAttributes(stdString(attributeGroup));
+
+      // Create LUT
+      vtkSmartPointer<vtkLookupTable> lookupTable =
+        vtkSmartPointer<vtkLookupTable>::New();
+      lookupTable->SetNumberOfTableValues(
+        static_cast<vtkIdType>(attrs.size() + 1));
+
+      // first entry is used for 'unknown' attribute combinations
+      lookupTable->SetTableValue(0, 1.0, 1.0, 1.0);
+
+      // read attribute colors from settings
+      settings.beginGroup("TrackAttributeColors");
+      for (size_t i = 0, size = attrs.size(); i < size; ++i)
+        {
+        vgColor color(Qt::white);
+        color.read(settings,
+                   attributeGroup + QChar('/') + qtString(attrs[i].Name));
+        lookupTable->SetTableValue(static_cast<vtkIdType>(i + 1),
+                                   color.data().array);
+        }
+
+      // set up a 1-1 mapping
+      lookupTable->SetTableRange(0.0, static_cast<double>(attrs.size()));
+
+      // Set the LUT on each track rep
+      for (size_t i = 0, size = this->Projects.size(); i < size; ++i)
+        {
+        vtkVgTrackRepresentation* rep = this->Projects[i]->TrackRepresentation;
+        rep->SetLookupTable(lookupTable);
+        rep->ClearStateAttributeMasks();
+        for (size_t j = 0, size = attrs.size(); j < size; ++j)
+          {
+          rep->AddStateAttributeMask(attrs[j].Mask);
+          }
+        rep->SetStateAttributeGroupMask(
+          this->TrackAttributes.GetGroupMask(stdString(attributeGroup)));
+
+        this->Projects[i]->TrackModel->SetActiveScalars("StateAttributes");
+        }
+
+      emit this->showStatusMessage(
+        QString("Coloring tracks by \'%1\' attribute").arg(attributeGroup),
+        3000);
+
+      break;
+      }
+    }
+
+  this->CurrentTrackColorMode = mode;
+  this->CurrentTrackAttributeGroup = attributeGroup;
+  vtkVgTrackRepresentationBase::TrackColorMode trackColorMode =
+    static_cast<vtkVgTrackRepresentationBase::TrackColorMode>(mode);
+  for (size_t i = 0, size = this->Projects.size(); i < size; ++i)
+    {
+    this->Projects[i]->TrackRepresentation->SetColorMode(trackColorMode);
+    this->Projects[i]->TrackHeadRepresentation->SetColorMode(trackColorMode);
+    }
+
+  this->updateScene();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::previousTrackAttributeGroup()
+{
+  std::vector<std::string> groups = this->TrackAttributes.GetEnabledGroups();
+  if (groups.empty())
+    {
+    return;
+    }
+
+  std::string currentGroup = stdString(this->CurrentTrackAttributeGroup);
+  for (size_t i = 0, size = groups.size(); i < size; ++i)
+    {
+    if (currentGroup == groups[i])
+      {
+      this->setTrackColorMode(vtkVgTrackRepresentationBase::TCM_StateAttrs,
+                              qtString(groups[i == 0 ? size - 1 : i - 1]));
+      return;
+      }
+    }
+
+  this->setTrackColorMode(vtkVgTrackRepresentationBase::TCM_StateAttrs,
+                          qtString(groups.front()));
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::nextTrackAttributeGroup()
+{
+  std::vector<std::string> groups = this->TrackAttributes.GetEnabledGroups();
+  if (groups.empty())
+    {
+    return;
+    }
+
+  std::string currentGroup = stdString(this->CurrentTrackAttributeGroup);
+  for (size_t i = 0, size = groups.size(); i < size; ++i)
+    {
+    if (currentGroup == groups[i])
+      {
+      this->setTrackColorMode(vtkVgTrackRepresentationBase::TCM_StateAttrs,
+                              qtString(groups[(i + 1) % size]));
+      return;
+      }
+    }
+
+  this->setTrackColorMode(vtkVgTrackRepresentationBase::TCM_StateAttrs,
+                          qtString(groups.front()));
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setStreamingEnabled(bool enable)
+{
+  this->ImageDataSource->setMonitoringEnabled(enable);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::worldToImage(double in[2], int out[2])
+{
+  double p[] = { in[0], in[1], 0.0, 1.0 };
+  this->WorldToImageMatrix->MultiplyPoint(p, p);
+  p[0] /= p[3];
+  p[1] /= p[3];
+
+  out[0] = vtkMath::Floor(p[0] + 0.5);
+  out[1] = vtkMath::Floor(p[1] + 0.5);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGeoCoord vpViewCore::worldToGeo(double in[2])
+{
+  if (!(this->UseGeoCoordinates || this->UseRawImageCoordinates))
+    {
+    return vtkVgGeoCoord();
+    }
+
+  double worldToLatLon[16];
+  vtkMatrix4x4::Invert(this->LatLonToWorldMatrix->Element[0], worldToLatLon);
+  double point[] = { in[0], in[1], 0.0, 1.0 };
+  vtkMatrix4x4::MultiplyPoint(worldToLatLon, point, point);
+  point[0] /= point[3];
+  point[1] /= point[3];
+  return vtkVgGeoCoord(point[1], point[0]);
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::displayToImage(int in[2], int out[2])
+{
+  double p[4];
+  this->SceneRenderer->SetDisplayPoint(in[0], in[1], 0);
+  this->SceneRenderer->DisplayToWorld();
+  this->SceneRenderer->GetWorldPoint(p);
+
+  this->worldToImage(p, out);
+
+  bool inside =
+    out[0] >= this->WholeImageBounds[0] &&
+    out[0] <= this->WholeImageBounds[1] &&
+    out[1] >= this->WholeImageBounds[2] &&
+    out[1] <= this->WholeImageBounds[3];
+
+  out[0] -= this->WholeImageBounds[0];
+  out[1] -= this->WholeImageBounds[2];
+
+  out[1] = this->WholeImageBounds[3] - this->WholeImageBounds[2] - out[1];
+
+  return inside;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::displayToAOI(int in[2], int out[2])
+{
+  double p[4];
+  this->SceneRenderer->SetDisplayPoint(in[0], in[1], 0);
+  this->SceneRenderer->DisplayToWorld();
+  this->SceneRenderer->GetWorldPoint(p);
+  p[2] = 0.0;
+
+  vtkPoints* points = this->AOIOutlinePolyData->GetPoints();
+
+  double ll[3], lr[3], ur[3], ul[3];
+  points->GetPoint(0, ll);
+  points->GetPoint(1, lr);
+  points->GetPoint(2, ur);
+  points->GetPoint(3, ul);
+
+  double bounds[6];
+  this->AOIOutlinePolyData->GetBounds(bounds);
+
+  if (lr[0] == ul[0] && lr[1] == ul[1])
+    {
+    // Only have upper-left corner.
+    if (p[0] < ul[0] || p[1] > ul[1])
+      {
+      return false;
+      }
+    }
+  else
+    {
+    if (ll[0] != ul[0] ||
+        lr[0] != ur[0] ||
+        ll[1] != lr[1] ||
+        ur[1] != ul[1])
+      {
+      // Non-rectangular AOI
+      double normal[] = { 0, 0, 1 };
+      vtkDoubleArray* ptArray = static_cast<vtkDoubleArray*>(points->GetData());
+      if (vtkPolygon::PointInPolygon(p, 4, ptArray->GetPointer(0),
+                                     bounds, normal) < 1)
+        {
+        return false;
+        }
+      }
+    else if (p[0] < bounds[0] || p[0] > bounds[1] ||
+             p[1] < bounds[2] || p[1] > bounds[3])
+      {
+      return false;
+      }
+    }
+
+  this->worldToImage(p, out);
+
+  double uli[4] = { ul[0], ul[1], 0.0, 1.0 };
+  this->WorldToImageMatrix->MultiplyPoint(uli, uli);
+  uli[0] /= uli[3];
+  uli[1] /= uli[3];
+
+  double lri[4] = { lr[0], lr[1], 0.0, 1.0 };
+  this->WorldToImageMatrix->MultiplyPoint(lri, lri);
+  lri[0] /= lri[3];
+  lri[1] /= lri[3];
+
+  // Coordinates are relative to the upper left corner.
+  out[0] = vtkMath::Round(out[0] - uli[0]);
+  out[1] = vtkMath::Round(uli[1] - out[1]);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::displayToGeo(int in[2], double& northing, double& easting)
+{
+  if (!(this->UseGeoCoordinates || this->UseRawImageCoordinates ||
+        this->ImageToGcsMatrix))
+    {
+    return false;
+    }
+
+  double p[4];
+  this->SceneRenderer->SetDisplayPoint(in[0], in[1], 0);
+  this->SceneRenderer->DisplayToWorld();
+  this->SceneRenderer->GetWorldPoint(p);
+
+  if (!this->ImageToGcsMatrix)
+    {
+    double worldToLatLon[16];
+    vtkMatrix4x4::Invert(this->LatLonToWorldMatrix->Element[0], worldToLatLon);
+    vtkMatrix4x4::MultiplyPoint(worldToLatLon, p, p);
+    }
+  else
+    {
+    this->ImageToGcsMatrix->MultiplyPoint(p, p);
+    }
+  northing = p[1] / p[3];
+  easting = p[0] / p[3];
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::getGsd(int displayPoint[2],
+                        double& northingDist, double& eastingDist,
+                        double& width, double& height)
+{
+  if (!(this->UseGeoCoordinates || this->UseRawImageCoordinates ||
+        this->ImageToGcsMatrix))
+    {
+    return false;
+    }
+
+  double p[4];
+  this->SceneRenderer->SetDisplayPoint(displayPoint[0], displayPoint[1], 0);
+  this->SceneRenderer->DisplayToWorld();
+  this->SceneRenderer->GetWorldPoint(p);
+
+  this->WorldToImageMatrix->MultiplyPoint(p, p);
+  p[0] /= p[3];
+  p[1] /= p[3];
+
+  // We will be measuring the distances across the center of the pixel, from
+  // left to right then from bottom to top.
+  double leftMid[] =
+    {
+    floor(p[0]), floor(p[1]) + 0.5, 0.0, 1.0
+    };
+  double rightMid[] =
+    {
+    leftMid[0] + 1.0, leftMid[1], 0.0, 1.0
+    };
+  double bottomMid[] =
+    {
+    floor(p[0]) + 0.5, floor(p[1]), 0.0, 1.0
+    };
+  double topMid[] =
+    {
+    bottomMid[0], bottomMid[1] + 1.0, 0.0, 1.0
+    };
+
+  double dummy;
+  width = this->getGeoDistance(leftMid, rightMid, dummy, eastingDist);
+  height = this->getGeoDistance(bottomMid, topMid, northingDist, dummy);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::getGsd(double& northingDistPerPixel, double& eastingDistPerPixel,
+                        double& widthPerPixel, double& heightPerPixel)
+{
+  if (!(this->UseGeoCoordinates || this->UseRawImageCoordinates || this->ImageToGcsMatrix))
+    {
+    return false;
+    }
+
+  double leftMid[] =
+    {
+    this->WholeImageBounds[0] - 0.5,
+    0.5 * (this->WholeImageBounds[2] + this->WholeImageBounds[3]),
+    0.0,
+    1.0
+    };
+
+  double rightMid[] =
+    {
+    this->WholeImageBounds[1] + 0.5,
+    leftMid[1],
+    0.0,
+    1.0
+    };
+
+  double bottomMid[] =
+    {
+    0.5 * (this->WholeImageBounds[0] + this->WholeImageBounds[1]),
+    this->WholeImageBounds[2] - 0.5,
+    0.0,
+    1.0
+    };
+
+  double topMid[] =
+    {
+    bottomMid[0],
+    this->WholeImageBounds[3] + 0.5,
+    0.0,
+    1.0
+    };
+
+  double dummy;
+  double northingDist, eastingDist;
+  double width = this->getGeoDistance(leftMid, rightMid, dummy, eastingDist);
+  double height = this->getGeoDistance(bottomMid, topMid, northingDist, dummy);
+
+  double imageWidth = this->WholeImageBounds[1] - this->WholeImageBounds[0] + 1.0;
+  double imageHeight = this->WholeImageBounds[3] - this->WholeImageBounds[2] + 1.0;
+
+  northingDistPerPixel = std::abs(northingDist) / imageHeight;
+  eastingDistPerPixel = std::abs(eastingDist) / imageWidth;
+
+  widthPerPixel = width / imageWidth;
+  heightPerPixel = height / imageHeight;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+double vpViewCore::getGeoDistance(double imagePt1[4], double imagePt2[4],
+                                  double& northingDist, double& eastingDist)
+{
+  // Currently the assumption is that imageToGcs will be in UTM
+  vtkSmartPointer<vtkMatrix4x4> imageToGcs = this->ImageToGcsMatrix;
+
+  if (!imageToGcs)
+    {
+    imageToGcs = this->ImageSource->GetImageToWorldMatrix();
+    }
+
+  imageToGcs->MultiplyPoint(imagePt1, imagePt1);
+  double northing1 = imagePt1[1] / imagePt1[3];
+  double easting1 = imagePt1[0] / imagePt1[3];
+
+  imageToGcs->MultiplyPoint(imagePt2, imagePt2);
+  double northing2 = imagePt2[1] / imagePt2[3];
+  double easting2 = imagePt2[0] / imagePt2[3];
+
+  northingDist = std::abs(northing2 - northing1);
+  eastingDist = std::abs(easting2 - easting1);
+
+  double distance;
+  if (this->ImageToGcsMatrix)
+    {
+    distance = sqrt(northingDist * northingDist + eastingDist * eastingDist);
+    }
+  else
+    {
+    GeographicLib::Geodesic::WGS84.Inverse(
+      northing1, easting1, northing2, easting2, distance);
+    }
+
+  return distance;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setRealTimeVideoPlayback(bool enable)
+{
+  this->VideoAnimation->setPlaybackMode(
+    enable ? vpVideoAnimation::PM_RealTime : vpVideoAnimation::PM_Sequential);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setRulerEnabled(bool enable)
+{
+  this->RulerEnabled = enable;
+  if (!enable)
+    {
+    this->RubberbandInteractorStyle->SetRubberBandModeToZoom();
+    this->RulerActor->SetVisibility(0);
+    this->render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::updateImageMatrices()
+{
+  vtkSmartPointer<vtkMatrix4x4> imageToLatLon =
+    this->ImageSource->GetImageToWorldMatrix();
+
+  if (!imageToLatLon)
+    {
+    this->ImageToWorldMatrix->Identity();
+    this->WorldToImageMatrix->Identity();
+    this->LatLonToImageMatrix->Identity();
+    return true;
+    }
+
+  vtkMatrix4x4::Invert(imageToLatLon, this->LatLonToImageMatrix);
+
+  if (this->UseGeoCoordinates)
+    {
+    vtkMatrix4x4::Multiply4x4(this->LatLonToWorldMatrix, imageToLatLon,
+                              this->ImageToWorldMatrix);
+    vtkMatrix4x4::Invert(this->ImageToWorldMatrix, this->WorldToImageMatrix);
+    return true;
+    }
+
+  if (this->UseRawImageCoordinates)
+    {
+    double refPt[4] = { this->ImageTranslationReferenceLatLon[1],
+                        this->ImageTranslationReferenceLatLon[0], 0, 1.0 };
+    this->LatLonToImageMatrix->MultiplyPoint(refPt, refPt);
+
+    if (refPt[3] != 0)
+      {
+      // Store the computed offset for later reference.
+      this->ImageTranslationOffset[0] = refPt[0] / refPt[3];
+      this->ImageTranslationOffset[1] = refPt[1] / refPt[3];
+
+      // The reference point will be positioned at the world origin.
+      this->ImageToWorldMatrix->Identity();
+      this->ImageToWorldMatrix->SetElement(0, 3, -this->ImageTranslationOffset[0]);
+      this->ImageToWorldMatrix->SetElement(1, 3, -this->ImageTranslationOffset[1]);
+      vtkMatrix4x4::Invert(this->ImageToWorldMatrix, this->WorldToImageMatrix);
+      return true;
+      }
+
+    // Bad image to lat-lon matrix?
+    return false;
+    }
+
+  this->ImageToWorldMatrix->Identity();
+  this->WorldToImageMatrix->Identity();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setEventExpirationMode(enumEventExpirationMode mode,
+                                        bool render)
+{
+  this->EventExpirationMode = mode;
+
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    this->updateEventDisplayEndFrame(this->Projects[i]);
+    }
+
+  if (render)
+    {
+    this->updateScene();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateEventDisplayEndFrame(vpProject* project)
+{
+  switch (this->EventExpirationMode)
+    {
+    case ShowUntilEventEnd:
+      project->EventModel->ShowEventsAfterExpirationOff();
+      project->EventModel->ShowEventsUntilSupportingTracksExpireOff();
+      break;
+
+    case ShowUntilTrackEnd:
+      project->EventModel->ShowEventsAfterExpirationOn();
+      project->EventModel->ShowEventsUntilSupportingTracksExpireOn();
+      break;
+    }
+}
+//-----------------------------------------------------------------------------
+void vpViewCore::getMousePosition(int* x, int* y)
+{
+  if (this->RenderWidget && this->RenderWindow)
+    {
+    QPoint pos = this->RenderWidget->mapFromGlobal(QCursor::pos());
+    *x = pos.x();
+    *y = this->RenderWindow->GetInteractor()->GetSize()[1] - pos.y() - 1;
+    }
+  else
+    {
+    *x = *y = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vpProject* vpViewCore::findProject(int projectId)
+{
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    if (this->Projects[i]->ProjectId == projectId)
+      {
+      return this->Projects[i];
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setObjectExpirationTime(const vtkVgTimeStamp& time)
+{
+  if (time.GetFrameNumber() == this->ObjectExpirationTime.GetFrameNumber() &&
+      time.GetTime() == this->ObjectExpirationTime.GetTime())
+    {
+    return;
+    }
+
+  bool timeIsValid = time.IsValid();
+  this->ObjectExpirationTime = time;
+
+  for (size_t i = 0, end = this->Projects.size(); i < end; ++i)
+    {
+    vpProject* project = this->Projects[i];
+    if (!timeIsValid)
+      {
+      vtkVgTimeStamp ts;
+      ts.SetFrameNumber(DefaultTrackExpiration);
+      ts.SetTime(1e6 * (DefaultTrackExpiration / this->RequestedFPS));
+      project->TrackModel->SetTrackExpirationOffset(ts);
+      if (this->DisplayFullVolume)
+        {
+        project->TrackModel->ShowTracksBeforeStartOn();
+        project->TrackModel->ShowTracksAfterExpirationOn();
+        project->EventModel->ShowEventsBeforeStartOn();
+        project->EventModel->ShowEventsAfterExpirationOn();
+        }
+      else
+        {
+        project->TrackModel->ShowTracksBeforeStartOff();
+        project->TrackModel->ShowTracksAfterExpirationOff();
+        project->EventModel->ShowEventsBeforeStartOff();
+        this->updateEventDisplayEndFrame(project);
+        }
+      ts.SetFrameNumber(0);
+      project->ActivityManager->SetActivityExpirationOffset(ts);
+      project->ActivityManager->SetShowFullVolume(this->DisplayFullVolume);
+      }
+    else
+      {
+      project->TrackModel->SetTrackExpirationOffset(time);
+      project->TrackModel->ShowTracksBeforeStartOff();
+      project->TrackModel->ShowTracksAfterExpirationOff();
+
+      project->EventModel->SetEventExpirationOffset(time);
+      project->EventModel->ShowEventsBeforeStartOff();
+      project->EventModel->ShowEventsAfterExpirationOff();
+
+      project->ActivityManager->SetActivityExpirationOffset(time);
+      project->ActivityManager->SetShowFullVolume(false);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+double vpViewCore::getMinimumTime()
+{
+  if (this->UsingTimeBasedIndexing)
+    {
+    vpFrame frame;
+    if (!this->FrameMap->first(frame))
+      {
+      return vgTimeStamp::InvalidTime();
+      }
+    return frame.Time.GetTime();
+    }
+  return 1e6 * (this->FrameNumberOffset / this->RequestedFPS);
+}
+
+//-----------------------------------------------------------------------------
+double vpViewCore::getMaximumTime()
+{
+  if (this->UsingTimeBasedIndexing)
+    {
+    vpFrame frame;
+    if (!this->FrameMap->last(frame))
+      {
+      return vgTimeStamp::InvalidTime();
+      }
+    return frame.Time.GetTime();
+    }
+  return 1e6 * ((this->FrameNumberOffset + this->NumberOfFrames - 1) /
+                this->RequestedFPS);
+}
+
+//-----------------------------------------------------------------------------
+double vpViewCore::getCurrentTime()
+{
+  if (this->UsingTimeBasedIndexing)
+    {
+    return this->CoreTimeStamp.GetTime();
+    }
+
+  return 1e6 * (this->CoreTimeStamp.GetFrameNumber() / this->RequestedFPS);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setCurrentTime(const vtkVgTimeStamp& timeStamp)
+{
+  if (!this->UsingTimeBasedIndexing)
+    {
+    vtkVgTimeStamp ts(1e6 * timeStamp.GetFrameNumber() / this->RequestedFPS);
+    this->seekInternal(ts);
+    return;
+    }
+
+  this->seekInternal(timeStamp);
+}
+
+//-----------------------------------------------------------------------------
+double vpViewCore::getCurrentFrameTime()
+{
+  if (this->UsingTimeStampData)
+    {
+    return this->CoreTimeStamp.GetTime();
+    }
+
+  return 1e6 * (this->CoreTimeStamp.GetFrameNumber() / this->RequestedFPS);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::startFrameMapRebuild()
+{
+  this->FrameMap->stop();
+  this->FrameMap->startUpdate();
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::waitForFrameMapRebuild()
+{
+  int numFiles = this->ImageDataSource->getFileCount();
+  if (!this->FrameMap->isRunning() && this->FrameMap->progress() < numFiles)
+    {
+    // This shouldn't ever happen.
+    qDebug() << "Trying to wait for frame map build thread to complete, but "
+                "the thread has not been started. Restarting...";
+    this->FrameMap->startUpdate();
+    }
+
+  QProgressDialog progress("Decoding image timestamps...", "Cancel",
+                           0, numFiles);
+  progress.setWindowModality(Qt::ApplicationModal);
+
+  // Manually force the dialog to be shown. Otherwise, in release builds a
+  // strange bug can occur where the dialog never appears, and allows the user
+  // to continue interacting with the UI.
+  progress.show();
+
+  int curProgress;
+  while ((curProgress = this->FrameMap->progress()) < numFiles)
+    {
+    progress.setValue(curProgress);
+
+    QApplication::sendPostedEvents();
+    QApplication::processEvents();
+
+    if (progress.wasCanceled())
+      {
+      // Stop using time based indexing for now, but continue to update the
+      // frame map in the background.
+      emit this->timeBasedIndexingDisabled();
+      this->setUseTimeBasedIndexing(false);
+      return false;
+      }
+    }
+  progress.setValue(numFiles);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setCurrentFrame(unsigned int frameIndex, double currentTime)
+{
+  Q_ASSERT(!this->UsingTimeBasedIndexing);
+
+  vtkVgTimeStamp ts;
+  ts.SetFrameNumber(frameIndex + this->FrameNumberOffset);
+
+  if (frameIndex != this->CurrentFrame || this->CoreTimeStamp != ts)
+    {
+    this->CoreTimeStamp = ts;
+    this->CurrentFrame = frameIndex;
+    this->updateScene();
+    emit this->frameChanged();
+    }
+
+  if (currentTime == -1.0)
+    {
+    currentTime = this->getCurrentTime();
+    }
+  if (currentTime != this->CurrentTime)
+    {
+    this->CurrentTime = currentTime;
+    emit this->timeChanged(currentTime);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setCurrentFrame(const vpFrame& frame, double currentTime)
+{
+  if (this->CurrentFrame != frame.Index || this->CoreTimeStamp != frame.Time)
+    {
+    this->CoreTimeStamp = frame.Time;
+    this->CurrentFrame = frame.Index;
+    this->updateScene();
+    emit this->frameChanged();
+    }
+
+  if (currentTime == -1.0)
+    {
+    currentTime = this->getCurrentTime();
+    }
+  else
+    {
+    currentTime = qBound(this->getMinimumTime(), currentTime,
+                         this->getMaximumTime());
+    }
+  if (currentTime != this->CurrentTime)
+    {
+    this->CurrentTime = currentTime;
+    emit this->timeChanged(currentTime);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setTrackTrailLength(vpProject* project,
+                                     vtkVgTimeStamp duration)
+{
+  // Use only the appropriate part of the timestamp for the current mode.
+  if (this->UsingTimeStampData)
+    {
+    duration.SetFrameNumber(vgTimeStamp::InvalidFrameNumber());
+    }
+  else
+    {
+    duration.SetTime(vgTimeStamp::InvalidTime());
+    }
+  project->TrackModel->SetMaximumDisplayDuration(duration);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setSceneElementLineWidth(vpProject* project,
+                                          double lineWidth)
+{
+  project->SceneElementRepresentation->SetLineWidth(lineWidth);
+  project->SelectedSceneElementRepresentation->SetLineWidth(lineWidth);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack* vpViewCore::makeTrack(int id, int session)
+{
+  vtkVgTrackModel* trackModel = this->Projects[session]->TrackModel;
+  vtkVgTrack* track = vtkVgTrack::New();
+  track->InterpolateMissingPointsOnInsertOn();
+  track->SetId(id);
+  track->SetPoints(trackModel->GetPoints());
+  track->SetUserCreated(true);
+
+  double color[3];
+  vpTrackIO::GetDefaultTrackColor(id, color);
+  track->SetColor(color);
+
+  trackModel->AddTrack(track);
+  track->FastDelete();
+  return track;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setFrameNumberOffset(int offset)
+{
+  this->FrameNumberOffset = offset;
+  this->syncAnimationToCore();
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::syncAnimationToCore()
+{
+  this->VideoAnimation->setFrameRange(
+    vtkVgTimeStamp(this->getMinimumTime()),
+    vtkVgTimeStamp(this->getMaximumTime()));
+  this->seekInternal(vtkVgTimeStamp(this->getCurrentTime()));
+}
+
+//-----------------------------------------------------------------------------
+vpContour* vpViewCore::makeFilterContour()
+{
+  vpContour* contour = new vpContour(this->RenderWindow->GetInteractor());
+
+  QSettings settings;
+
+  vgColor lineColor =
+    vgColor::read(settings, "FilterLineColor",
+                  QColor::fromRgbF(1.0, 1.0, 1.0));
+
+  vgColor finalColor =
+    vgColor::read(settings, "FilterFinalColor",
+                  QColor::fromRgbF(0.8, 0.8, 0.8));
+
+  contour->SetLineColor(lineColor.data().color.red,
+                        lineColor.data().color.green,
+                        lineColor.data().color.blue);
+
+  contour->SetFinalLineColor(finalColor.data().color.red,
+                             finalColor.data().color.green,
+                             finalColor.data().color.blue);
+
+  settings.setValue("FilterLineColor", lineColor.toString(vgColor::NoAlpha));
+  settings.setValue("FilterFinalColor", finalColor.toString(vgColor::NoAlpha));
+
+  return contour;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setGraphRenderingEnabled(bool enable)
+{
+  this->GraphRenderingEnabled = enable;
+  if (enable)
+    {
+    this->forceUpdate();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::updateColorofTracksOfType(int typeIndex, double *rgb)
+{
+  for (size_t i = 0, size = this->Projects.size(); i < size; ++i)
+    {
+    this->Projects[i]->TrackModel->UpdateColorOfTracksOfType(typeIndex, rgb);
+    }
+}
+
+//-----------------------------------------------------------------------------
+int findToken(const QStringList& fields, const QString& token,
+              Qt::CaseSensitivity cs)
+{
+  QString trimmedToken = token.trimmed();
+  QString trimmedField;
+  for (int i = 0; i < fields.count(); ++i)
+    {
+    trimmedField = fields[i].trimmed();
+    if (trimmedField.compare(trimmedToken, cs) == 0)
+      {
+      return i;
+      }
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::startExternalProcess(QString program, QStringList fields,
+                                      QString ioPath)
+{
+  fields.replaceInStrings(QRegExp("^\\s*|\\s*$"),"");
+
+  static int uniqueFilenameCounter = 0;
+  bool startExternalProcessAfterFilterExport = false;
+
+  if (this->Projects.size())
+    {
+    vpProject* currentProject =
+      this->Projects[this->SessionView->GetCurrentSession()];
+    QString processInput, processOutput, graphOutput;
+
+    if ((findToken(fields, "${PI}", Qt::CaseInsensitive) != -1) ||
+        (findToken(fields, "${PO}", Qt::CaseInsensitive) != -1) ||
+        (findToken(fields, "${GF}", Qt::CaseInsensitive) != -1) ||
+        (findToken(fields, "${EFO}", Qt::CaseInsensitive) != -1))
+      {
+      QDir ioDir(ioPath);
+      if (!ioDir.exists())
+        {
+        if (!ioDir.mkpath(ioDir.absolutePath()))
+          {
+          QMessageBox::warning(0, "External Process Error!",
+            "Unable to create ioDirectory; process aborted!");
+          return;
+          }
+        }
+
+      if (findToken(fields, "${PI}", Qt::CaseInsensitive) != -1)
+        {
+        QFileInfo inputFI(ioDir,
+          QString("fseQuery_%1.json").arg(uniqueFilenameCounter));
+        processInput = inputFI.absoluteFilePath();
+        if (!currentProject->ModelIO->WriteFseTracks(qPrintable(processInput)))
+          {
+          QMessageBox::warning(0, "vpView", "Error writing scene elements file.");
+          return;
+          }
+        }
+      if (findToken(fields, "${PO}", Qt::CaseInsensitive) != -1)
+        {
+        QFileInfo outputFI(ioDir,
+          QString("processOutput_%1.txt").arg(uniqueFilenameCounter++));
+        processOutput = outputFI.absoluteFilePath();
+        if (this->ExternalExecuteMode == 0 || this->ExternalExecuteMode == 2)
+          {
+          this->ExternalProcessOutputFile = processOutput;
+          // if the file doesn't exist, create empty file so we have something
+          // to watch for change
+          if (!outputFI.exists())
+            {
+            QFile touchOutput(processOutput);
+            touchOutput.open(QIODevice::WriteOnly);
+            }
+          }
+        } // Process output file (PO)
+      if (findToken(fields, "${GF}", Qt::CaseInsensitive) != -1)
+        {
+        QFileInfo outputFI(ioDir,
+          QString("graphModel_%1.json").arg(uniqueFilenameCounter++));
+        graphOutput = outputFI.absoluteFilePath();
+        emit this->graphModelExportRequested(graphOutput);
+        }
+      }
+
+    if ((findToken(fields, "${FF}", Qt::CaseInsensitive) != -1) &&
+        this->ExternalExecuteMode == 1) // Scene Learning mode
+      {
+      if (currentProject->FiltersFile.empty())
+        {
+        QMessageBox::warning(0, QString(),
+          "Aborting process execution; "
+          "Input project FiltersFile is empty, but must be set.");
+        return;
+        }
+
+      QFileInfo filterFileInfo(currentProject->FiltersFile.c_str());
+      this->ExternalProcessOutputFile = filterFileInfo.absoluteFilePath();
+      startExternalProcessAfterFilterExport = true;
+      }
+
+    // Mapping of tokens to their values
+    QHash<QString, QString> externalProcessKeywords;
+    externalProcessKeywords["${TF}"] =
+      (QString("-trackfile ") + qtString(currentProject->TracksFile));
+    externalProcessKeywords["${EF}"] =
+      (QString("-eventfile ") + qtString(currentProject->EventsFile));
+    externalProcessKeywords["${FF}"] =
+      (QString("-filtersfile ") + qtString(currentProject->FiltersFile));
+    externalProcessKeywords["${PI}"] =
+      (QString("-inputfile ") + processInput);
+    externalProcessKeywords["${PO}"] =
+      (QString("-outputfile ") + processOutput);
+    externalProcessKeywords["${GF}"] =
+      (QString("-graphfile ") + graphOutput);
+    externalProcessKeywords["${EM}"] =
+      (QString("%1").arg(this->ExternalExecuteMode));
+
+    QHash<QString, QString>::const_iterator kwItr;
+    for (int i = 0; i < fields.count(); ++i)
+      {
+      kwItr = externalProcessKeywords.find(fields[i].toUpper());
+      if (kwItr != externalProcessKeywords.end())
+        {
+        fields[i] = fields[i].replace(
+                      fields[i], kwItr.value(), Qt::CaseInsensitive);
+        }
+      }
+    }
+
+  this->ExternalProcessProgram = program;
+  this->ExternalProcessArguments = fields.join(" ").split(QRegExp("\\s+"));
+
+  this->ExecutedExternalProcessMode = this->ExternalExecuteMode;
+  if (startExternalProcessAfterFilterExport)
+    {
+    emit this->exportFilters(this->ExternalProcessOutputFile, true);
+    }
+  else
+    {
+    this->startExternalProcess();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::startExternalProcess()
+{
+  this->FileSystemWatcher->addPath(this->ExternalProcessOutputFile);
+  connect(this->FileSystemWatcher, SIGNAL(fileChanged(QString)), this,
+          SLOT(reactToExternalProcessFileChanged(QString)));
+
+
+  qDebug()  << "Running process with arguments "
+            << this->ExternalProcessArguments;
+
+  this->ExternalProcess->start(this->ExternalProcessProgram,
+                               this->ExternalProcessArguments);
+
+  QByteArray standardOutput = this->ExternalProcess->readAllStandardOutput();
+  if (standardOutput.length() > 0)
+    {
+    qDebug() << standardOutput;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vpViewCore::isExternalProcessRunning()
+{
+  return this->ExternalProcess->state() == QProcess::Running;
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::toWindowCoordinates(double &x, double &y)
+{
+  if (!this->Projects.empty())
+    {
+    double maxY = this->Projects[0]->AnalysisDimensions[1] - 1;
+    y = maxY - y;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::toWindowCoordinates(double (&xy)[2])
+{
+  this->toWindowCoordinates(xy[0], xy[1]);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::toGraphicsCoordinates(double &x, double &y)
+{
+  if (!this->Projects.empty())
+    {
+    double maxY = this->Projects[0]->AnalysisDimensions[1] - 1;
+    y = maxY - y;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::toGraphicsCoordinates(double (&xy)[2])
+{
+  this->toGraphicsCoordinates(xy[0], xy[1]);
+}
+
+//-----------------------------------------------------------------------------
+void vpViewCore::reactToExternalProcessFileChanged(QString changedFile)
+{
+  QFile fileInfo(this->ExternalProcessOutputFile);
+  if (!fileInfo.exists())
+    {
+    return;
+    }
+
+  disconnect(this->FileSystemWatcher, SIGNAL(fileChanged(QString)), this,
+          SLOT(reactToExternalProcessFileChanged(QString)));
+  this->FileSystemWatcher->removePath(changedFile);
+
+# if 0
+  // if filters file is set, wipe out all existing filters before loading
+  if (!this->Projects[this->SessionView->GetCurrentSession()]->
+                                                      FiltersFile.empty())
+    {
+    emit removeAllFilters();
+    }
+#endif
+
+  // wait until file size hasn't changed for two seconds - can we skip this?
+  qint64 oldFileSize, fileSize = fileInfo.size();
+  do
+    {
+    oldFileSize = fileSize;
+    QTime waitUntil = QTime::currentTime().addSecs(2);
+    while(QTime::currentTime() < waitUntil) {}
+    fileSize = fileInfo.size();
+    } while(fileSize != oldFileSize);
+
+  if (this->ExecutedExternalProcessMode == 1)  // Learning mode
+    {
+    this->loadFilters(this->ExternalProcessOutputFile.toStdString().c_str());
+    return;
+    }
+
+  // Copy the current project and update the scene element file
+  static int memoryProjectCounter = 0;
+  QScopedPointer<vpProject> project(new vpProject(this->CurrentProjectId++));
+  project->CopyConfig(*this->Projects[this->SessionView->GetCurrentSession()]);
+  QString projectName(
+    this->Projects[this->SessionView->GetCurrentSession()]->Name.c_str());
+  projectName += QString(".%1").arg(memoryProjectCounter++);
+  project->Name = projectName.toStdString();
+
+  // For now, this is specific to FSE
+  if (this->ExecutedExternalProcessMode == 0)
+    {
+    project->SceneElementsFile = this->ExternalProcessOutputFile.toStdString();
+    project->SetIsValid(project->SceneElementsFile, vpProject::FILE_EXIST);
+    }
+
+  // For now this is specific to normalcy anamoly
+  if (this->ExecutedExternalProcessMode == 2)
+    {
+    project->EventsFile = this->ExternalProcessOutputFile.toStdString();
+    project->SetIsValid(project->EventsFile, vpProject::FILE_EXIST);
+    }
+
+  // For now this is specific to normalcy anamoly
+  if (this->ExecutedExternalProcessMode == 3)
+    {
+    project->ActivitiesFile = this->ExternalProcessOutputFile.toStdString();
+    project->SetIsValid(project->ActivitiesFile, vpProject::FILE_EXIST);
+    }
+
+  project->FrameNumberOffset = this->FrameNumberOffset;
+
+  // If filters file is set, wipe out all existing filters before loading
+  if (!project->FiltersFile.empty())
+    {
+    emit removeAllFilters();
+    }
+
+#ifdef VISGUI_USE_VIDTK
+  QSharedPointer<vpVidtkFileIO> fileIO(new vpVidtkFileIO);
+  fileIO->SetTracksFileName(project->TracksFile.c_str());
+  fileIO->SetTrackTraitsFileName(project->TrackTraitsFile.c_str());
+  fileIO->SetEventsFileName(project->EventsFile.c_str());
+  fileIO->SetEventLinksFileName(project->EventLinksFile.c_str());
+  fileIO->SetActivitiesFileName(project->ActivitiesFile.c_str());
+  fileIO->SetFseTracksFileName(project->SceneElementsFile.c_str());
+  project->ModelIO = fileIO;
+  this->processProject(project);
+#else
+  QMessageBox::warning(0, QString(),
+                       "Cannot open project files without VidTK support.");
+#endif
+}
diff --git a/Applications/VpView/vpViewCore.h b/Applications/VpView/vpViewCore.h
new file mode 100644
index 00000000..785d1bac
--- /dev/null
+++ b/Applications/VpView/vpViewCore.h
@@ -0,0 +1,1022 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vpViewCore_h
+#define __vpViewCore_h
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QSharedPointer>
+#include <QString>
+#include <QStringList>
+
+#include <vgAttributeSet.h>
+#include <vgNamespace.h>
+
+#include <vtkSmartPointer.h>   // Required for smart pointer internal ivars.
+
+#include <vtkVgTimeStamp.h>   // Required for vtkVgTimeStamp.
+
+#include "vpTrackIO.h"
+
+// Forward VTK class declarations
+class vtkActor;
+class vtkActor2D;
+class vtkCamera;
+class vtkEventQtSlotConnect;
+class vtkHoverWidget;
+class vtkIdList;
+class vtkImageActor;
+class vtkImageData;
+class vtkLegendBoxActor;
+class vtkMatrix4x4;
+class vtkObject;
+class vtkPNGWriter;
+class vtkPoints;
+class vtkPolyData;
+class vtkRenderWindow;
+class vtkRenderer;
+class vtkTimerLog;
+class vtkWindowToImageFilter;
+
+class vtkVgActivity;
+class vtkVgActivityTypeRegistry;
+class vtkVgBaseImageSource;
+class vtkVgContourOperatorManager;
+class vtkVgEvent;
+class vtkVgEventFilter;
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+class vtkVgGeoCoord;
+class vtkVgGraphModel;
+class vtkVgGraphRepresentation;
+class vtkVgIconManager;
+class vtkVgInteractorStyleRubberBand2D;
+class vtkVgRepresentationBase;
+class vtkVgTemporalFilters;
+class vtkVgTrack;
+class vtkVgTrackFilter;
+class vtkVgTrackModel;
+class vtkVgTrackTypeRegistry;
+
+class QVTKWidget;
+class QComboBox;
+class QDockWidget;
+class QFileSystemWatcher;
+class QProcess;
+class QToolBar;
+
+class vtkVpInteractionCallback;
+class vtkVpVideoPlayCallback;
+
+class vgConfigParser;
+class vgMixerWidget;
+
+class vpActivityConfig;
+class vpAnnotation;
+class vpBoundingRegion;
+class vpBox;
+class vpContour;
+class vpDatabaseQueryDialog;
+class vpEntityConfigWidget;
+class vpEventConfig;
+class vpFileDataSource;
+class vpFrame;
+class vpFrameMap;
+class vpInformaticsDialog;
+class vpModelIO;
+class vpNormalcyMaps;
+class vpObjectInfoPanel;
+class vpProject;
+class vpProjectParser;
+class vpQtViewer3dWidget;
+class vpSessionView;
+class vpTimelineDialog;
+class vpTrackConfig;
+class vpVideoAnimation;
+
+// STL includes.
+#include <vector> // STL required.
+
+class vpViewCore : public QObject
+{
+  Q_OBJECT
+
+public:
+  enum enumDisplayModes
+    {
+    OverViewMode,
+    ZoomEventMode,
+    ZoomTrackMode
+    };
+
+  enum enumEventExpirationMode
+    {
+    ShowUntilEventEnd,
+    ShowUntilTrackEnd
+    };
+
+  // Constructor/Destructor
+  vpViewCore();
+  virtual ~vpViewCore();
+
+  void cleanUp();
+
+  void setupRenderWidget(QVTKWidget* renderWidget);
+  void setupTrackFilters(vgMixerWidget* filterWidget);
+  void setupEventFilters(vgMixerWidget* filterWidget, QComboBox* presetWidget);
+  void setupActivityFilters(vgMixerWidget* filterWidget);
+  void setupNormalcyMapsFilters(vgMixerWidget* filterWidget);
+  void setupTrackAttributeColors();
+
+  void setSessionView(vpSessionView* view);
+  void setupEventConfig(vpEntityConfigWidget* configWidget);
+  void setupActivityConfig(vpEntityConfigWidget* configWidget);
+
+  inline void setTrackOffset(int* trackOffset);
+
+  void setOverviewDisplay(vpProject* project);
+
+  // Set/Get functions.
+  inline int    getNumberOfFrames();
+  inline int    getMinimumFrameNumber();
+  inline int    getMaximumFrameNumber();
+  inline int    getCurrentFrameNumber();
+  inline vtkVgTimeStamp getCoreTimeStamp();
+  inline vtkVgTimeStamp getImageryTimeStamp();
+
+  // Note: This is a low level function that should almost never be called
+  // externally. Use the frame number or time-based functions instead.
+  inline unsigned int getCurrentFrameIndex();
+
+  double getMinimumTime();
+  double getMaximumTime();
+  double getCurrentTime();
+
+  void setCurrentTime(const vtkVgTimeStamp& timeStamp);
+
+  // Unlike getCurrentTime(), when using timestamp data without time-based
+  // indexing, this will return the actual timestamp time of the frame. This
+  // should be used for display purposes only.
+  double getCurrentFrameTime();
+
+  void setFrameNumberOffset(int offset);
+  int getFrameNumberOffset() { return this->FrameNumberOffset; }
+
+  void setObjectExpirationTime(const vtkVgTimeStamp& time);
+  inline vtkVgTimeStamp getObjectExpirationTime();
+
+  void setIconSize(int size, bool render);
+  void setEventExpirationMode(enumEventExpirationMode mode, bool render);
+
+  inline double getRequestFPS() const;
+
+  vtkRenderer* getSceneRenderer();
+
+  vtkVgInteractorStyleRubberBand2D* getInteractorStyle();
+
+  void moveCameraTo(double pos[2], bool forceRender = true);
+
+  void refreshSelectionPanel();
+
+  // Update and render the scene. Use this method if there have not been
+  // any changes that would be visible through the ui views, such as a
+  // change in filtering.
+  void updateScene();
+
+  // Update and render the scene and object views
+  void update();
+
+  void updateExtents();
+
+  void render(bool logTime = true);
+
+  void setOverviewDisplayState(bool state);
+
+  void exitAdjudicationMode();
+
+  void setDisplayAOIOutlineState(bool flag = true);
+
+  void focusBounds(double bounds[4]);
+  void focusTimeInterval(const vtkVgTimeStamp& start,
+                         const vtkVgTimeStamp& end);
+
+  void focusTrack(int sessionId, vtkIdType trackId,
+                  vtkVgTimeStamp start = vtkVgTimeStamp(),
+                  vtkVgTimeStamp end = vtkVgTimeStamp());
+
+  void focusEvent(int sessionId, vtkIdType eventId);
+  void focusActivity(int sessionId, vtkIdType activityId);
+
+  void doZoomToExtent(double extents[4]);
+  void getImageSpaceViewportExtents(int (&extents)[4]);
+
+  void showAnnotation(int sessionId, int objectType, vtkIdType objectId);
+  void hideAnnotation();
+
+  int  getCreateTrackId(int session);
+  void setCreateTrackId(int id, int session);
+
+  bool createTrack(int trackId, int session, bool isFse = false);
+  int  createEvent(int type, vtkIdList* ids, int session);
+
+  bool splitTrack(int trackId, int newTrackId, int session);
+  bool mergeTracks(int trackA, int trackB, int session);
+  vtkVgTrack* cloneTrack(int trackId, int newTrackId, int session);
+
+  vtkVgEvent* cloneEvent(int eventId, int session);
+
+  void setIdOfTrackToFollow(vtkIdType trackId);
+  vtkIdType getIdOfTrackToFollow() { return this->IdOfTrackToFollow; }
+
+  void setSaveRenderedImages(bool state, QString* outputDir = 0);
+
+  bool setAntialiasing(bool);
+  bool getAntialiasing() const;
+
+  void setImageFiltering(bool);
+  bool getImageFiltering() const;
+
+  void setup3dWidget(vpQtViewer3dWidget* viewer3dWidget);
+
+  int getNumberOfActivities();
+  int getNumberOfEvents();
+  int getNumberOfTracks();
+
+  int addTemporalFilter(int type,
+                        const vtkVgTimeStamp& start, const vtkVgTimeStamp& end);
+
+  void updateTemporalFilterStart(int id, const vtkVgTimeStamp& newStart);
+  void updateTemporalFilterEnd(int id, const vtkVgTimeStamp& newEnd);
+  void updateTemporalFilterType(int id, int type);
+  void enableTemporalFilter(int id, bool newState);
+
+  void removeTemporalFilter(int id);
+  void removeAllTemporalFilters();
+
+  bool      isEditingTrack() { return this->TrackEditProjectId != -1; }
+  vtkIdType editingTrackId() { return this->EditingTrackId; }
+
+  void mouseLeftViewport();
+  void mouseEnteredViewport();
+
+  void setTrackHead(vtkPoints* points);
+  void setTrackHeadAndAdvance(vtkPoints* points);
+
+  // Helper functions for converting a point from display to image space.
+  // Returns true if the point is within the bound of the image or AOI.
+  bool displayToImage(int in[2], int out[2]);
+  bool displayToAOI(int in[2], int out[2]);
+  bool displayToGeo(int in[2], double& northing, double& easting);
+
+  // Get the distance across a single pixel
+  bool getGsd(int displayPoint[2], double& latDist, double& lonDist,
+              double& width, double& height);
+
+  // Get average GSD across the current image
+  bool getGsd(double& latDistPerPixel, double& lonDistPerPixel,
+              double& widthPerPixel, double& heightPerPixel);
+
+  vtkVgBaseImageSource* getImageSource();
+  void setImageSourceLevelOfDetailFactor(double factor);
+  bool hasMultiLevelOfDetailSource();
+
+  vtkVgTrackModel* getTrackModel(int session);
+  vtkVgEventModel* getEventModel(int session);
+
+  vtkVgEventFilter* getEventFilter();
+
+  inline const vtkVgEventTypeRegistry* getEventTypeRegistry() const
+    {
+    return this->EventTypeRegistry;
+    }
+
+  inline vtkVgEventTypeRegistry* getEventTypeRegistry()
+    {
+    return this->EventTypeRegistry;
+    }
+
+  void setTrackTrailLength(const vtkVgTimeStamp& duration);
+  vtkVgTimeStamp getTrackTrailLength();
+
+  void setUseTimeStampDataIfAvailable(bool state)
+    {
+    this->UseTimeStampDataIfAvailable = state;
+    }
+
+  bool getUsingTimeStampData()
+    {
+    return this->UsingTimeStampData;
+    }
+
+  void setUseTimeBasedIndexing(bool state);
+
+  bool getUsingTimeBasedIndexing()
+    {
+    return this->UsingTimeBasedIndexing;
+    }
+
+  void setEnableWorldDisplayIfAvailable(bool state);
+  void setEnableTranslateImage(bool state);
+
+  void setUseZeroBasedFrameNumbers(bool enable)
+    {
+    this->UseZeroBasedFrameNumbers = enable;
+    }
+
+  bool getUseZeroBasedFrameNumbers()
+    {
+    return this->UseZeroBasedFrameNumbers;
+    }
+
+  void setRightClickToEditEnabled(bool enable)
+    {
+    this->RightClickToEditEnabled = enable;
+    }
+
+  void setAutoAdvanceDuringCreation(bool enable)
+    {
+    this->AutoAdvanceDuringCreation = enable;
+    }
+
+  bool getRightClickToEditEnabled()
+    {
+    return this->RightClickToEditEnabled;
+    }
+
+  bool getAutoAdvanceDuringCreation()
+    {
+    return this->AutoAdvanceDuringCreation;
+    }
+
+  void setSceneElementLineWidth(double lineWidth);
+  double getSceneElementLineWidth()
+    {
+    return this->SceneElementLineWidth;
+    }
+
+  bool isPlaying()
+    {
+    return this->Playing;
+    }
+
+  void setGraphRenderingEnabled(bool enable);
+
+  void updateColorofTracksOfType(int typeIndex, double *rgb);
+
+  void startExternalProcess(QString program, QStringList fields,
+                            QString ioPath);
+  void startExternalProcess();
+  bool isExternalProcessRunning();
+
+  void toWindowCoordinates(double&x, double&y);
+  void toWindowCoordinates(double (&xy)[2]);
+
+  void toGraphicsCoordinates(double&x, double&y);
+  void toGraphicsCoordinates(double (&xy)[2]);
+
+public slots:
+
+  void openProject();
+  void importProject();
+
+  bool importTracksFromFile(vpProject* project);
+  bool importEventsFromFile(vpProject* project, bool tracksImportSuccessful);
+  bool importEventLinksFromFile(vpProject* project, bool eventsImportSuccessful);
+  bool importActivitiesFromFile(vpProject* project, bool eventsImportSuccessful);
+  bool importSceneElementsFromFile(vpProject* project);
+  bool importIconsFromFile(vpProject* project);
+  bool importOverviewFromFile(vpProject* project);
+  bool importNormalcyMapsFromFile(vpProject* project);
+
+  void exportTracksToFile();
+  void exportEventsToFile();
+  void exportSceneElementsToFile();
+  void exportImageTimeStampsToFile();
+
+  void onLeftPress();
+  void onLeftRelease();
+  void onLeftClick();
+  void onRightClick();
+  void onMouseMove();
+  void onSelectionComplete();
+
+  void onEditTrackHeadRegion();
+
+  void resetToAOIView();
+  void resetView();
+  void resetToViewExtents();
+  void getAOIExtents(double extents[4]);
+
+  void decreaseTrackHeadSize();
+  void increaseTrackHeadSize();
+
+  int pickScene();
+
+  void CreateInformaticsDisplay(int x, int y, vtkImageData* normalcy);
+  void CreateBlendedImageDisplay(int x, int y, vtkImageData* normalcy);
+
+  void setProjectVisible(int index, bool visible);
+
+  void onViewTracks(bool state);
+  void onViewTrackHeads(bool state);
+  void onViewEvents(bool state);
+  void onViewActivities(bool state);
+  void onViewSceneElements(bool state);
+  void onViewEventIcons(bool show);
+
+  void onShowObjectInfo(int sessionId, vpObjectInfoPanel* objectInfo);
+
+  void onRandomEventColor(bool state);
+  void onRandomTrackColor(bool state);
+  void onDisplayFullVolume(bool state, bool render = true);
+
+  void SetTrackTypeDisplayState(int trackType, bool state);
+  void SetTrackTypeProbabilityLimit(int trackType, double prob);
+
+  void SetEventTypeDisplayState(int eventType, bool state);
+  void SetEventInverseDisplayState(int eventType, bool state);
+  void SetEventTypeNormalcyThreshold(int eventType, double threshold);
+  void UpdateEventDisplayStates(bool state);
+
+  void onUseNormalcyCues(bool enable);
+  void onSwapNormalcyCues();
+
+  void SetActivityTypeDisplayState(int type, bool state);
+  void SetActivityTypeSaliencyThreshold(int type, double threshold);
+
+  void onIncreaseIconXOffset();
+  void onDecreaseIconXOffset();
+  void onIncreaseIconYOffset();
+  void onDecreaseIconYOffset();
+
+  void onIncreaseOverlayTransparency();
+  void onDecreaseOverlayTransparency();
+
+  void onIncreaseSceneElementTransparency();
+  void onDecreaseSceneElementTransparency();
+
+  void onPlay();
+  void onPause();
+  void setLoop(bool state);
+
+  void nextFrame();
+  void prevFrame();
+  void seekToFrame(const vtkVgTimeStamp& position, vg::SeekMode direction);
+
+  void setPlaybackRate(double rate);
+  double getPlaybackRate();
+
+  void onResize(int width, int height);
+
+  void setRequestFPS(double fps);
+
+  void showHideEventLegend(bool show, bool render);
+  void showHideTimelineDialog(vpTimelineDialog* dialog, bool show);
+
+  void showHideObjectTags(bool show);
+
+  vpProject* loadProject(const char* fileName);
+  vpProject* loadProject(const QSharedPointer<vpModelIO>& modelIO,
+                         const std::string& stream,
+                         const std::string& name = std::string());
+  vpProject* processProject(QScopedPointer<vpProject>& project);
+  void closeProject(int sessionId);
+
+  void loadConfig(const char* fileName);
+
+  void writeSpatialFilter(vtkPoints* contourPoints, vtkPoints* filterPoints,
+                          unsigned int frameNumber, double time,
+                          vtkMatrix4x4* worldtoImageMatrix,
+                          const std::string& name, std::ostream& out);
+  void writeTemporalFilter(int type, double start, double end,
+                           const std::string& name, std::ostream& out);
+  void loadFilters();
+  void loadFilters(const char* fileName);
+
+  void exportForWeb(const char* path, int paddingFrames);
+
+  void initializeAllOthers();
+  void initializeData();
+  void initializeDisplay();
+  void initializeExtentsBounds();
+  void initializeScene();
+  void initializeViewInteractions();
+  void initializeSources();
+  void reinitialize();
+
+  int loadTracks(vpProject* project);
+  int loadTrackTraits(vpProject* project);
+  int loadEvents(vpProject* project);
+  int loadEventLinks(vpProject* project);
+  int loadActivities(vpProject* project);
+  int loadIcons(vpProject* project);
+  int loadSceneElements(vpProject* project);
+
+  int updateTracks();
+
+  void dataChanged();
+
+  void refreshView();
+
+  void reset();
+
+  void onHoverStart();
+  void onHoverStop();
+  void onHoverTimer();
+
+  void eventTypeChanged(int type);
+  void activityTypeChanged(int type);
+
+  void addFilterRegion(const std::string& name,
+                       const std::vector<double>& points,
+                       vtkMatrix4x4* worldToImageMatrix,
+                       vtkVgTimeStamp& timeStamp);
+
+  void drawFilterRegion();
+  void completeFilterRegion();
+
+  void setContourVisible(vtkPoints* contourPoints, bool visible);
+  void setFilterRegionEnabled(vtkPoints* filterPoints, bool enabled);
+
+  void removeFilterRegion(vtkPoints* contourPoints, vtkPoints* filterPoints);
+  void removeAllFilterRegions();
+
+  void saveCameraPosition();
+  void restoreCameraPosition();
+
+  void beginEditingTrack(int trackId);
+  void stopEditingTrack(bool autoremove = true);
+  void deleteTrack(int trackId, int session);
+  void deleteEvent(int eventId, int session);
+  void deleteTrackPoint();
+
+  void setEventSelection(const QList<vtkIdType>& ids, int session);
+  void setTrackSelection(const QList<vtkIdType>& ids, int session);
+
+  void setRegionEditMode(int mode);
+  void setExternalExecuteMode(int mode);
+
+  void setTrackColorMode(int mode, const QString& attributeGroup = QString());
+  int  getTrackColorMode()         { return this->CurrentTrackColorMode; }
+  QString getTrackAttributeGroup() { return this->CurrentTrackAttributeGroup; }
+
+  void previousTrackAttributeGroup();
+  void nextTrackAttributeGroup();
+
+  vgAttributeSet* getTrackAttributes() { return &this->TrackAttributes; }
+
+  void setStreamingEnabled(bool enable);
+
+  void setTrackUpdateChunkSize(int frames)
+    {
+    this->TrackUpdateChunkSize = frames;
+    }
+
+  double getGeoDistance(double imagePt1[4], double imagePt2[4],
+                        double& latDist, double& lonDist);
+
+  void setRealTimeVideoPlayback(bool enable);
+
+  void setRulerEnabled(bool enable);
+
+protected slots:
+
+  void forceUpdate();
+  void forceRender();
+
+  void reactToDataChanged();
+
+  void reactToExternalProcessFileChanged(QString);
+
+signals:
+
+  void dataLoaded();
+  void dataSetChanged();
+  void iconsLoaded();
+  void overviewLoaded();
+  void followTrackChange(int trackId);
+
+  void displayZoom();
+  void frameChanged();
+  void timeChanged(double microseconds);
+  void reachedPlayBoundary();
+  void enterAdjudicationMode();
+  void criticalError(const QString&);
+  void warningError(const QString&);
+
+  void reinitialized();
+
+  void frameRendered();
+
+  void eventFilterChanged();
+
+  void showStatusMessage(const QString& msg, int timeout = 0);
+
+  void filterRegionComplete(vtkPoints* contourPoints, vtkPoints* filterPoints,
+                            const vtkVgTimeStamp* timeStamp,
+                            vtkMatrix4x4* worldToImageMatrix = 0,
+                            const QString& name = QString(),
+                            bool enabled = true);
+  void temporalFilterReady(int id, const QString& name, int type,
+                           double start, double end);
+
+  void mouseMoved(int x, int y);
+
+  void stoppedEditingTrack();
+
+  void objectInfoUpdateNeeded();
+
+  void trackPicked(int id, int session);
+
+  void projectVisibilityChanged(int index, bool visible);
+
+  void updateFinished();
+
+  void timeBasedIndexingDisabled();
+
+  void playbackStateChanged();
+  void playbackRateChanged(qreal rate);
+
+  void geoDistanceMeasured(double meters);
+
+  void exportFilters(QString path, bool startExternalProcess);
+
+  void removeAllFilters();
+
+  void graphModelExportRequested(QString);
+
+private:
+
+  void updateRepresentation(vtkVgRepresentationBase* representation,
+                            vtkObject* filter,
+                            unsigned long prevModelUpdateTime,
+                            unsigned long modelUpdateTime);
+
+  void enableEventsChange(int eventType, bool state);
+  void enableInverseEventsChange(int eventType, bool state);
+
+  void createEventLegend(vpProject* project);
+  void updateEventLegendPosition(int w, int h);
+  void updateEventLegendColors();
+
+  double getCurrentScale(vtkRenderer* renderer) const;
+
+  void changeIconOffset(int deltaX, int deltaY);
+  void changeOverlayOpacity(double delta);
+  void changeSceneElementOpacity(double delta);
+  void createDisplayOutline(vpProject* project);
+
+  void calculateNewExtents(vtkRenderer* ren, double extents[4]);
+  void updateCropExtents(double newExtents[4]);
+  void updateAOIImagery();
+  void updateViewExtents();
+
+  // Helper functions.
+  void handleDataSetNotFound(vpProject* project);
+  void handleFileNotFound(const std::string& tag, const std::string& file);
+
+  void initializeImageSource();
+
+  void addEvents(vpProject* project);
+  void removeEvents(vpProject* project);
+  void addTrackHeads(vpProject* project);
+  void removeTrackHeads(vpProject* project);
+  void addTracks(vpProject* project);
+  void removeTracks(vpProject* project);
+
+  vtkVgActivity* getHoveredActivity();
+
+  void sanitizeSceneRenderer();
+
+  void initTrackHeadIndicator();
+  void initTrackHeadIndicator(vtkPolyData* pd);
+  void updateTrackHeadIndicator(int x, int y);
+  void updateTrackHeadRegion();
+
+  void updateTrackFollowCamera();
+
+  void worldToImage(double in[2], int out[2]);
+  vtkVgGeoCoord worldToGeo(double in[2]);
+
+  bool updateImageMatrices();
+
+  void updateEventDisplayEndFrame(vpProject* project);
+
+  void getMousePosition(int* x, int* y);
+
+  vpProject* findProject(int projectId);
+
+  void focusBounds(double bounds[4], vtkMatrix4x4* xform);
+
+  void startFrameMapRebuild();
+  bool waitForFrameMapRebuild();
+
+  void setCurrentFrame(unsigned int frameIndex, double currentTime);
+  void setCurrentFrame(const vpFrame& frame, double currentTime);
+
+  void setTrackTrailLength(vpProject* project, vtkVgTimeStamp duration);
+  void setSceneElementLineWidth(vpProject* project, double lineWidth);
+
+  vtkVgTrack* makeTrack(int trackId, int session);
+
+  void seekInternal(const vtkVgTimeStamp& position,
+                    vg::SeekMode direction = vg::SeekNearest);
+
+  void syncAnimationToCore();
+
+  vpContour* makeFilterContour();
+
+  bool UpdatePending;
+  bool UpdateObjectViews;
+  bool ForceFullUpdate;
+  bool RenderPending;
+  bool LogRenderTime;
+  bool Playing;
+
+  bool DisplayFullVolume;
+
+  bool ShowAnnotations;
+
+  bool ShowTracks;
+  bool ShowTrackHeads;
+  bool ShowEvents;
+  bool ShowEventIcons;
+  bool ShowActivities;
+  bool ShowSceneElements;
+
+  bool UsingTimeStampData;
+  bool UsingTimeBasedIndexing;
+  bool UseTimeStampDataIfAvailable;
+  bool UseTimeBasedIndexing;
+
+  vpTrackIO::TrackStorageMode TrackStorageMode;
+  bool UseGeoCoordinates;
+  bool UseRawImageCoordinates;  // ignored if UseGeoCoordinates is true
+  bool EnableWorldDisplayIfAvailable;
+  bool EnableTranslateImage;
+  double ImageTranslationReferenceLatLon[2];
+  double ImageTranslationReferenceOffset[2];
+  double ImageTranslationOffset[2];
+
+  vtkSmartPointer<vtkMatrix4x4>     YFlipMatrix;
+  vtkSmartPointer<vtkMatrix4x4>     ImageToWorldMatrix;
+  vtkSmartPointer<vtkMatrix4x4>     WorldToImageMatrix;
+  vtkSmartPointer<vtkMatrix4x4>     LatLonToImageMatrix;
+  vtkSmartPointer<vtkMatrix4x4>     LatLonToWorldMatrix;
+  vtkSmartPointer<vtkMatrix4x4>     LatLonToImageReferenceMatrix;
+  vtkSmartPointer<vtkMatrix4x4>     ImageToGcsMatrix;
+
+  int IconSize;
+  int IconOffsetX, IconOffsetY;
+
+  vtkSmartPointer<vtkRenderWindow>  RenderWindow;
+  vtkSmartPointer<vtkRenderer>      SceneRenderer;
+  vtkSmartPointer<vtkRenderer>      ContextRenderer;
+  vtkSmartPointer<vtkRenderer>      BackgroundRenderer;
+  vtkSmartPointer<vtkVgInteractorStyleRubberBand2D> RubberbandInteractorStyle;
+
+  vpSessionView*                    SessionView;
+
+  QVTKWidget* RenderWidget;
+
+  // Image
+  vtkIdType                             ImageCounter;
+  vtkSmartPointer<vtkImageData>         ImageData[2];
+  vtkSmartPointer<vtkImageActor>        ImageActor[2];
+  vtkSmartPointer<vtkImageData>         AOIImage;
+  // keep track of the vtkImageData being displayed in the MainRenderer
+  vtkSmartPointer<vtkImageData>         MainImageData;
+  vtkSmartPointer<vtkVgBaseImageSource> ImageSource;
+  double                                ImageSourceLODFactor;
+  vtkSmartPointer<vtkActor>             AOIOutlineActor;
+  vtkSmartPointer<vtkPolyData>          AOIOutlinePolyData;
+
+  // Scene
+  bool SceneInitialized;
+  double OverlayOpacity;
+  double SceneElementFillOpacity;
+
+  vtkSmartPointer<vtkVgTrackFilter> TrackFilter;
+  vtkSmartPointer<vtkVgEventFilter> EventFilter;
+
+  vtkSmartPointer<vtkVgGraphModel> GraphModel;
+  vtkSmartPointer<vtkVgGraphRepresentation> GraphRepresentation;
+
+  vtkSmartPointer<vtkLegendBoxActor> EventLegend;
+
+  // Extents / Bounds
+  double            ViewExtents[4];
+  double            OverviewExtents[4];
+
+  double            WholeImageBounds[6];
+  double            OverviewImageBounds[6];
+
+  // Writer
+  vtkSmartPointer<vtkWindowToImageFilter> WindowToImageFilter;
+  vtkSmartPointer<vtkPNGWriter>           PNGWriter;
+
+  vtkSmartPointer<vtkEventQtSlotConnect> VTKConnect;
+
+  // General
+  bool              AdjudicationMode;
+  bool              AdjudicationAllTracksState;
+  std::vector<bool> AdjudicationEventsState;
+
+  int               TrackOffset[2];
+  int               DisplayMode;
+
+  // Frame
+  bool              Loop;
+  bool              Paused;
+  bool              UseZeroBasedFrameNumbers;
+  bool              RightClickToEditEnabled;
+  bool              AutoAdvanceDuringCreation;
+  double            SceneElementLineWidth;
+
+  int               FrameNumberOffset;
+
+  vtkVgTimeStamp    CoreTimeStamp;
+  unsigned int      CurrentFrame;
+  unsigned int      LastFrame;
+  unsigned int      NumberOfFrames;
+  double            CurrentTime;
+
+  vtkSmartPointer<vtkTimerLog> TimeLogger;
+  vtkSmartPointer<vtkTimerLog> LoadRenderTimeLogger;
+
+  double            TimeElapsedSinceLastRender;
+  double            RenderingTime;
+  double            RequestedFPS;
+
+  std::vector<int>  TimerIds;
+
+  // Callbacks
+  vtkSmartPointer<vtkVpInteractionCallback>  InteractionCallback;
+
+  // Informatics
+  vpInformaticsDialog* InformaticsDialog;
+
+  // Measurements
+  vtkSmartPointer<vtkTimerLog> RenderTimeLogger;
+  double                       TotalRenderTime;
+  double                       TotalNumberOfRenderCalls;
+
+  vpFileDataSource* ImageDataSource;
+  vpFrameMap* FrameMap;
+
+  // Configs
+  std::vector<vpProject*> Projects;
+  vpProjectParser*     ProjectParser;
+  int CurrentProjectId;
+
+  vtkVgActivityTypeRegistry* ActivityTypeRegistry;
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+  vtkVgTrackTypeRegistry* TrackTypeRegistry;
+
+  vpTrackConfig*    TrackConfig;
+  vpEventConfig*    EventConfig;
+  vpActivityConfig* ActivityConfig;
+
+  vgAttributeSet    TrackAttributes;
+  QString           CurrentTrackAttributeGroup;
+
+  int               CurrentTrackColorMode;
+
+  vpNormalcyMaps*   NormalcyMaps;
+
+  vpAnnotation*     Annotation;
+
+  vtkIdType         IdOfTrackToFollow;
+  int               FollowTrackProjectId;
+
+  // Render to file
+  bool              SaveRenderedImages;
+  QString           ImageOutputDirectory;
+
+  vtkSmartPointer<vtkHoverWidget> HoverWidget;
+  vtkVgActivity* HoveredActivity;
+  bool IsHovering;
+
+  vtkSmartPointer<vtkVgContourOperatorManager> ContourOperatorManager;
+  vpContour* Contour;
+  std::vector<vpContour*> Contours;
+  bool DrawingContour;
+
+  vtkSmartPointer<vtkVgTemporalFilters> TemporalFilters;
+
+  double SavedViewExtents[4];
+
+  int TrackEditProjectId;
+  vtkIdType NewTrackId;
+  vtkVgTimeStamp NewTrackTimeStamp;
+  vtkIdType EditingTrackId;
+  double EditedTrackPrevColor[3];
+
+  vpBox* TrackHeadBox;
+  vpContour* TrackHeadContour;
+  vpBoundingRegion* TrackHeadRegion;
+  vtkSmartPointer<vtkPolyData> TrackHeadRegionPolyData;
+
+  vtkSmartPointer<vtkActor> TrackHeadIndicatorActor;
+  vtkSmartPointer<vtkPolyData> TrackHeadIndicatorPolyData;
+
+  bool HideTrackHeadIndicator;
+  int RegionEditMode;
+  int ExternalExecuteMode;
+  int ExecutedExternalProcessMode;
+
+  int EventExpirationMode;
+  vtkVgTimeStamp ObjectExpirationTime;
+  vtkVgTimeStamp TrackTrailLength;
+
+  int TrackUpdateChunkSize;
+
+  vpVideoAnimation* VideoAnimation;
+
+  vtkSmartPointer<vtkPoints> RulerPoints;
+  vtkSmartPointer<vtkActor2D> RulerActor;
+
+  std::vector<vtkVgEvent*> SelectedEvents;
+  std::vector<vtkVgTrack*> SelectedTracks;
+
+  bool GraphRenderingEnabled;
+
+  bool RulerEnabled;
+
+  QProcess* ExternalProcess;
+  QFileSystemWatcher* FileSystemWatcher;
+  QString ExternalProcessOutputFile;
+  QString ExternalProcessProgram;
+  QStringList ExternalProcessArguments;
+};
+
+//-----------------------------------------------------------------------------
+void vpViewCore::setTrackOffset(int* trackOffset)
+{
+  if (trackOffset)
+    {
+    this->TrackOffset[0] = trackOffset[0];
+    this->TrackOffset[1] = trackOffset[1];
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::getNumberOfFrames()
+{
+  return this->NumberOfFrames;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::getMinimumFrameNumber()
+{
+  return this->FrameNumberOffset + (this->UseZeroBasedFrameNumbers ? 0 : 1);
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::getMaximumFrameNumber()
+{
+  return this->getMinimumFrameNumber() + this->NumberOfFrames - 1;
+}
+
+//-----------------------------------------------------------------------------
+int vpViewCore::getCurrentFrameNumber()
+{
+  return this->CurrentFrame + this->FrameNumberOffset +
+         (this->UseZeroBasedFrameNumbers ? 0 : 1);
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vpViewCore::getCurrentFrameIndex()
+{
+  return this->CurrentFrame;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vpViewCore::getCoreTimeStamp()
+{
+  return this->CoreTimeStamp;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vpViewCore::getImageryTimeStamp()
+{
+  return vtkVgTimeStamp(this->CoreTimeStamp.GetTime(), this->CurrentFrame);
+}
+
+//-----------------------------------------------------------------------------
+double vpViewCore::getRequestFPS() const
+{
+  return this->RequestedFPS;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vpViewCore::getObjectExpirationTime()
+{
+  return this->ObjectExpirationTime;
+}
+
+#endif // __vpViewCore_h
diff --git a/Applications/VpView/vtkVpFileReader.cxx b/Applications/VpView/vtkVpFileReader.cxx
new file mode 100644
index 00000000..543aec7f
--- /dev/null
+++ b/Applications/VpView/vtkVpFileReader.cxx
@@ -0,0 +1,466 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVpFileReader.h"
+#include "vtkVpReaderInternalBase.h"
+
+// VTK includes.
+#include <vtkIdList.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+
+#include "vtkVgActivity.h"
+#include "vtkVgActivityManager.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventModel.h"
+#include "vtkVpReaderInternalBase.h"
+#include "vtkVgTimeStamp.h"
+#include "vtkVgTrack.h"
+#include "vtkVgTrackModel.h"
+#include "vtkVgTrackTypeRegistry.h"
+
+#include <vgTrackType.h>
+
+#include <activity_detectors/activity_reader.h>
+#include <activity_detectors/activity.h>
+
+#include <event_detectors/event_reader_kwe.h>
+#include <event_detectors/event_types.h>
+#include <event_detectors/event.h>
+
+#include <tracking/track_reader_process.h>
+#include <tracking/tracking_keys.h>
+
+#include <utilities/config_block.h>
+
+#include <vtksys/SystemTools.hxx>
+
+vtkStandardNewMacro(vtkVpFileReader);
+
+//-----------------------------------------------------------------------------
+vtkVpFileReader::vtkVpFileReader() : vtkVpReaderBase()
+{
+  this->TracksFileName = 0;
+  this->EventsFileName = 0;
+  this->ActivitiesFileName = 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVpFileReader::~vtkVpFileReader()
+{
+  this->Reset();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVpFileReader::GetNextValidTrackFrame(vtkVgTrack* t, vtkIdType startIndex,
+                                             vtkVgTimeStamp& timeStamp)
+{
+  vidtk::track_sptr track = this->InternalBase->TrackMap[t];
+
+  if (!track)
+    {
+    return false;
+    }
+
+  vcl_vector<vidtk::track_state_sptr>::const_iterator iter;
+  vcl_vector<vidtk::track_state_sptr>::const_iterator end = track->history().end();
+
+  // search forwards through the track history until we find the start frame
+  // or go past
+  for (iter = track->history().begin(); iter != end; ++iter)
+    {
+    if ((*iter)->time_.frame_number() >= (unsigned) startIndex)
+      {
+      timeStamp.SetTime((*iter)->time_.time());
+      timeStamp.SetFrameNumber((*iter)->time_.frame_number());
+      return true;
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVpFileReader::GetPrevValidTrackFrame(vtkVgTrack* t, vtkIdType startIndex,
+                                             vtkVgTimeStamp& timeStamp)
+{
+  vidtk::track_sptr track = this->InternalBase->TrackMap[t];
+
+  if (!track)
+    {
+    return false;
+    }
+
+  vcl_vector<vidtk::track_state_sptr>::const_reverse_iterator iter;
+  vcl_vector<vidtk::track_state_sptr>::const_reverse_iterator end
+    = track->history().rend();
+
+  // search backwards through the track history until we find the start frame
+  // or go past
+  for (iter = track->history().rbegin(); iter != end; ++iter)
+    {
+    if ((*iter)->time_.frame_number() <= (unsigned) startIndex)
+      {
+      timeStamp.SetTime((*iter)->time_.time());
+      timeStamp.SetFrameNumber((*iter)->time_.frame_number());
+      return true;
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVpFileReader::ReadTracks(const char* filename,
+                                enumTrackStorageModes trackStorageMode,
+                                vtkMatrix4x4* latLonToWorld,
+                                double* overrideColor)
+{
+  if (this->TracksFileName && !strcmp(this->TracksFileName, filename))
+    {
+    return this->InternalBase->Tracks.size() > 0 ? VTK_OK : VTK_ERROR;
+    }
+
+  this->SetTracksFileName(filename);
+
+  this->InternalBase->PreReadTracks();
+
+  if (!this->TracksFileName)
+    {
+    vtkErrorMacro("Must read tracks, but no filename specified!");
+    return VTK_ERROR;
+    }
+  if (this->TracksFileName &&
+      !vtksys::SystemTools::FileExists(this->TracksFileName, true))
+    {
+    vtkErrorMacro("Track file doesn't exist!");
+    return VTK_ERROR;
+    }
+
+  vcl_string fname(filename);
+  vcl_string fext = fname.substr(fname.rfind('.') + 1);
+
+  // Just run this process without making a pipeline (setting one up is probably overkill)
+  vidtk::track_reader_process trackReaderProcess("VpFileReader::vtkInternal::ReadTracks");
+  trackReaderProcess.set_batch_mode(true); // All the tracks in one step
+  vidtk::config_block processConfiguration = trackReaderProcess.params();
+  processConfiguration.set("disabled", "false");
+  processConfiguration.set("format", fext);
+  processConfiguration.set("filename", fname);
+  trackReaderProcess.set_params(processConfiguration);
+  trackReaderProcess.initialize();
+  trackReaderProcess.step();
+
+  this->InternalBase->Tracks = trackReaderProcess.tracks();
+
+  if (this->InternalBase->ReadTracks(this->TrackModel,
+                                     this->ImageHeight,
+                                     this->TimeStampMode,
+                                     trackStorageMode,
+                                     latLonToWorld,
+                                     overrideColor) != VTK_OK)
+    {
+    return VTK_ERROR;
+    }
+
+  // Look for files containing supplemental track info
+  vcl_string trackTypes(filename);
+  trackTypes += ".types";
+
+  // Load track types
+  if (vtksys::SystemTools::FileExists(trackTypes.c_str(), true))
+    {
+    vcl_ifstream file(trackTypes.c_str());
+    int id;
+    vcl_string type;
+    while (file >> id >> type)
+      {
+      vtkVgTrack* track = this->TrackModel->GetTrack(id);
+      if (!track)
+        {
+        vtkErrorMacro(<< trackTypes << ": track " << id
+                      << " does not exist!");
+        continue;
+        }
+
+      int typeIndex = this->TrackTypes->GetTypeIndex(type.c_str());
+      if (typeIndex == -1)
+        {
+        // Add a new type to the registry if it's not already defined
+        vgTrackType tt;
+        tt.SetId(type.c_str());
+        typeIndex = this->TrackTypes->GetNumberOfTypes();
+        this->TrackTypes->AddType(tt);
+        }
+      track->SetType(typeIndex);
+      }
+    }
+
+  vcl_string trackRegions(filename);
+  trackRegions += ".regions";
+
+  // Load polygonal bounding regions
+  if (vtksys::SystemTools::FileExists(trackRegions.c_str(), true))
+    {
+    if (this->TimeStampMode != FrameNumberOnly)
+      {
+      vtkErrorMacro("Cannot load polygonal track regions "
+                    "in current timestamp mode");
+      return VTK_OK;
+      }
+
+    vcl_ifstream file(trackRegions.c_str());
+    int id;
+    int frame;
+    int numPoints;
+    vcl_vector<float> points;
+    bool isKeyFrame;
+    while (file >> id >> frame >> isKeyFrame >> numPoints)
+      {
+      vtkVgTrack* track = this->TrackModel->GetTrack(id);
+      if (!track)
+        {
+        vtkErrorMacro(<< trackRegions << ": track " << id
+                      << " does not exist!");
+        continue;
+        }
+
+      if (numPoints < 3)
+        {
+        vtkErrorMacro(<< trackRegions << ": region for track " << id
+                      << " has an invalid number of points (" << numPoints
+                      << ")");
+        continue;
+        }
+
+      vtkVgTimeStamp ts;
+      ts.SetFrameNumber(frame);
+
+      // "Delete" frames from the track that we now know are interpolated. The
+      // track code will re-generate the interpolated frames, which is
+      // inefficient, but this is the only way (currently) to preserve the
+      // information about which frames are true keyframes. We want to keep
+      // track of this info since it will make the annotators' lives easier.
+      if (!isKeyFrame)
+        {
+        track->DeletePoint(ts, true);
+        file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
+        continue;
+        }
+
+      points.reserve(numPoints * 3);
+      std::back_insert_iterator<vcl_vector<float> > iter(points);
+
+      for (int i = 0; i < numPoints; ++i)
+        {
+        float x, y;
+        file >> x >> y;
+        y = this->ImageHeight - y - 1;
+        *iter++ = x;
+        *iter++ = y;
+        *iter++ = 0.0f;
+        }
+
+      // Use the original point supplied in the track file (which should be the
+      // same whether using polygons or bounding boxes).
+      double point[2];
+      if (!track->GetPoint(ts, point, false))
+        {
+        vtkErrorMacro(<< trackRegions << ": region for track " << id
+                      << " does not have a point in track file at frame "
+                      << ts.GetFrameNumber());
+        continue;
+        }
+
+      track->SetPoint(ts, point, track->GetGeoCoord(ts), numPoints, &points[0]);
+      points.clear();
+      }
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVpFileReader::ReadTrackTraits(const char* filename)
+{
+  if (!filename)
+    {
+    return VTK_ERROR;
+    }
+
+  if (filename &&
+      !vtksys::SystemTools::FileExists(filename, true))
+    {
+    vtkErrorMacro("Track traits file doesn't exist!");
+    return VTK_ERROR;
+    }
+
+  vcl_ifstream file(filename);
+
+  int id;
+  double normalcy;
+
+  while (file >> id >> normalcy)
+    {
+    vtkVgTrack* track = this->TrackModel->GetTrack(id);
+
+    if (!track)
+      {
+      vtkErrorMacro("Unknown track id: " << id);
+      continue;
+      }
+
+    track->SetNormalcy(normalcy);
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVpFileReader::ReadEvents(const char* filename)
+{
+  if (this->InternalBase->Tracks.size() == 0)
+    {
+    vtkErrorMacro("No track. Can't read events.");
+    return VTK_ERROR;
+    }
+
+  if (this->EventsFileName && !strcmp(this->EventsFileName, filename))
+    {
+    return this->InternalBase->Tracks.size() > 0 ? VTK_OK : VTK_ERROR;
+    }
+
+  this->SetEventsFileName(filename);
+
+  this->InternalBase->PreReadEvents();
+
+  if (!this->EventsFileName)
+    {
+    vtkErrorMacro("Trying to read events, but no filename specified!");
+    return VTK_ERROR;
+    }
+  if (this->EventsFileName &&
+      !vtksys::SystemTools::FileExists(this->EventsFileName, true))
+    {
+    vtkErrorMacro("Event file doesn't exist!");
+    return VTK_ERROR;
+    }
+
+  vidtk::event_reader_kwe reader;
+  const std::string  file(filename);
+  reader.open(file);
+
+  this->InternalBase->EventStepMap.clear();
+  reader.read(this->InternalBase->Events, this->InternalBase->EventStepMap);
+
+  return this->InternalBase->ReadEvents(this->TrackModel,
+                                        this->EventModel,
+                                        this->ImageHeight,
+                                        this->EventConfig);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVpFileReader::ReadEventLinks(const char* filename)
+{
+  if (!filename)
+    {
+    return VTK_ERROR;
+    }
+
+  if (filename &&
+      !vtksys::SystemTools::FileExists(filename, true))
+    {
+    vtkErrorMacro("Event links file doesn't exist!");
+    return VTK_ERROR;
+    }
+
+  vcl_ifstream file(filename);
+
+  EventLink link;
+  while (file >> link.Source >> link.Destination >> link.Probability)
+    {
+    // convert from log probability
+    link.Probability = exp(link.Probability);
+    this->EventModel->AddEventLink(link);
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVpFileReader::ReadActivities(const char* filename)
+{
+  if (this->InternalBase->Events.size() == 0)
+    {
+    vtkErrorMacro("No events. Can't read activities.");
+    return VTK_ERROR;
+    }
+
+  if (this->ActivitiesFileName && !strcmp(this->ActivitiesFileName, filename))
+    {
+    return this->InternalBase->Activities.size() > 0 ? VTK_OK : VTK_ERROR;
+    }
+
+  this->SetActivitiesFileName(filename);
+
+  if (!this->ActivitiesFileName)
+    {
+    vtkErrorMacro("Trying to read activities, but no filename specified!");
+    return VTK_ERROR;
+    }
+  if (this->ActivitiesFileName &&
+      !vtksys::SystemTools::FileExists(this->ActivitiesFileName, true))
+    {
+    vtkErrorMacro("Activity file doesn't exist!");
+    return VTK_ERROR;
+    }
+
+  this->InternalBase->PreReadActivities();
+
+  // the event manager actually hasthis map, but the reader's need for it should
+  // go away, I think, since "ids" are going away "soon"
+  vcl_map<unsigned int, vidtk::event_sptr> eventMap;
+
+  vcl_vector<vidtk::event_sptr>::const_iterator eventIter =
+    this->InternalBase->Events.begin();
+  for (; eventIter != this->InternalBase->Events.end(); eventIter++)
+    {
+    eventMap[(*eventIter)->get_id()] = *eventIter;
+    }
+
+  vidtk::activity_reader reader;
+  reader.open(filename);
+  reader.read(this->InternalBase->Activities, eventMap);
+
+  return this->InternalBase->ReadActivities(this->EventModel,
+                                            this->ActivityManager,
+                                            this->ImageHeight,
+                                            this->ActivityConfig);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVpFileReader::Reset()
+{
+  vtkVpReaderBase::Reset();
+
+  this->SetTracksFileName(0);
+  this->SetEventsFileName(0);
+  this->SetActivitiesFileName(0);
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVpFileReader::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+  os << indent << "Tracks FileName: " <<
+     (this->TracksFileName != 0 ? this->TracksFileName : "NULL") << endl;
+  os << indent << "Events FileName: " <<
+     (this->EventsFileName != 0 ? this->EventsFileName : "NULL") << endl;
+  os << indent << "Activities FileName: " <<
+     (this->ActivitiesFileName != 0 ? this->ActivitiesFileName : "NULL") << endl;
+}
diff --git a/Applications/VpView/vtkVpFileReader.h b/Applications/VpView/vtkVpFileReader.h
new file mode 100644
index 00000000..1a862f45
--- /dev/null
+++ b/Applications/VpView/vtkVpFileReader.h
@@ -0,0 +1,77 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVpFileReader_h
+#define __vtkVpFileReader_h
+
+#include "vtkVpReaderBase.h"
+
+#include "vtkVgTimeStamp.h"
+
+class vpEventConfig;
+class vtkMatrix4x4;
+class vtkVgActivityManager;
+class vtkVgEventModel;
+class vtkVgEvent;
+class vtkVgTrackModel;
+class vtkVgTrack;
+
+class vtkVpFileReader : public vtkVpReaderBase
+{
+public:
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVpFileReader* New();
+  vtkTypeMacro(vtkVpFileReader, vtkVpReaderBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  virtual int ReadTracks(const char* filename,
+                         enumTrackStorageModes trackStorageMode,
+                         vtkMatrix4x4* latLonToWorld,
+                         double* overrideColor = 0);
+
+  virtual int ReadTrackTraits(const char* filename);
+  virtual int ReadEvents(const char* filename);
+  virtual int ReadEventLinks(const char* filename);
+  virtual int ReadActivities(const char* filename);
+  virtual int Reset();
+
+  int CreateUserEvent(int type, int trackId1, int trackId2);
+
+  vtkGetStringMacro(TracksFileName);
+  vtkGetStringMacro(EventsFileName);
+  vtkGetStringMacro(ActivitiesFileName);
+
+  bool GetNextValidTrackFrame(vtkVgTrack* t, vtkIdType startIndex,
+                              vtkVgTimeStamp& timeStamp);
+
+  bool GetPrevValidTrackFrame(vtkVgTrack* t, vtkIdType startIndex,
+                              vtkVgTimeStamp& timeStamp);
+
+
+protected:
+  // internally for convenience
+  vtkSetStringMacro(TracksFileName);
+  vtkSetStringMacro(EventsFileName);
+  vtkSetStringMacro(ActivitiesFileName);
+
+  // Description:
+  // Constructor / Destructor.
+  vtkVpFileReader();
+  virtual ~vtkVpFileReader();
+
+  char*        TracksFileName;
+  char*        EventsFileName;
+  char*        ActivitiesFileName;
+
+
+private:
+  vtkVpFileReader(const vtkVpFileReader&);  // Not implemented.
+  void operator=(const vtkVpFileReader&);  // Not implemented.
+};
+
+#endif // __vtkVIDTKtReader_h
diff --git a/Applications/VpView/vtkVpInteractionCallback.h b/Applications/VpView/vtkVpInteractionCallback.h
new file mode 100644
index 00000000..d226882a
--- /dev/null
+++ b/Applications/VpView/vtkVpInteractionCallback.h
@@ -0,0 +1,69 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVpInteractionCallback_h
+#define __vtkVpInteractionCallback_h
+
+// VTK includes.
+#include <vtkCamera.h>
+#include <vtkCommand.h>
+#include <vtkSetGet.h>
+
+// VG Application includes.
+#include <vpViewCore.h>
+
+// VG VTK includes.
+#include "vtkVgInteractorStyleRubberBand2D.h"
+
+class vtkVpInteractionCallback : public vtkCommand
+{
+public:
+
+  static vtkVpInteractionCallback* New()
+    {
+    return new vtkVpInteractionCallback();
+    }
+
+  void UpdateViewCoreInstance()
+    {
+    this->ViewCoreInstance->updateExtents();
+    this->ViewCoreInstance->render(false);
+    }
+
+  virtual void Execute(vtkObject* caller, unsigned long eventId,
+                       void* vtkNotUsed(callData))
+    {
+    if (!vtkVgInteractorStyleRubberBand2D::SafeDownCast(caller))
+      {
+      return;
+      }
+
+    if (eventId == vtkCommand::InteractionEvent)
+      {
+      int interaction =
+        this->ViewCoreInstance->getInteractorStyle()->GetInteraction();
+
+      if (interaction == vtkInteractorStyleRubberBand2D::PANNING ||
+          interaction == vtkInteractorStyleRubberBand2D::ZOOMING)
+        {
+        if (interaction == vtkInteractorStyleRubberBand2D::PANNING)
+          {
+          this->ViewCoreInstance->setIdOfTrackToFollow(-1);
+          }
+        this->UpdateViewCoreInstance();
+        }
+      }
+    else if (eventId == vtkVgInteractorStyleRubberBand2D::ZoomCompleteEvent)
+      {
+      this->ViewCoreInstance->setIdOfTrackToFollow(-1);
+      this->UpdateViewCoreInstance();
+      }
+    }
+
+  vpViewCore* ViewCoreInstance;
+};
+
+#endif // __vtkVpInteractionCallback_h
diff --git a/Applications/VsPlay/CMakeLists.txt b/Applications/VsPlay/CMakeLists.txt
new file mode 100644
index 00000000..7c2f14f2
--- /dev/null
+++ b/Applications/VsPlay/CMakeLists.txt
@@ -0,0 +1,153 @@
+project(vsPlay)
+
+###############################################################################
+
+# BEGIN user configurable build options
+
+if(NOT VISGUI_ENABLE_VSPLAY)
+  # If vsPlay is disabled, we are only here to declare our options (there are
+  # none, currently), so leave now
+  return()
+endif()
+
+# END user configurable build options
+
+###############################################################################
+
+# BEGIN core libraries and includes
+
+if (QtTesting_FOUND)
+  include_directories(${qtTestingSupport_SOURCE_DIR})
+  add_definitions(-DENABLE_QTTESTING)
+  set(QT_TESTING_SUPPORT_LIBRARIES qtTestingSupport ${QtTesting_LIBRARIES})
+endif()
+
+# Use the include path and library for Qt that is used by VTK
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${QtTesting_INCLUDE_DIRS}
+)
+
+set(vspSdkTargets
+  vspSourceUtil
+  vspUserInterface # Inherit the rest of our dependencies from this
+)
+
+vg_include_library_sdk_directories(${vspSdkTargets})
+
+# Configure version header here
+include(vsVersion.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vsVersion.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/vsVersion.h @ONLY)
+
+# END core libraries and includes
+
+###############################################################################
+
+# BEGIN built-in plugins
+
+set(vspPluginSources
+    # Archive sources
+    Plugins/vsArchiveSourceFactory.cxx
+    Plugins/vsArchiveSourcePlugin.cxx
+    Plugins/vsVideoArchiveSourcePlugin.cxx
+    Plugins/vsTrackArchiveSourcePlugin.cxx
+    Plugins/vsDescriptorArchiveSourcePlugin.cxx
+    # Other sources
+    Plugins/vsVvqsDatabaseFactory.cxx
+    Plugins/vsVvqsDatabaseQueryDialog.cxx
+    Plugins/vsVvqsDatabaseSource.cxx
+    Plugins/vsVvqsDatabaseSourcePlugin.cxx
+)
+
+set(vspPluginMocHeaders
+    # Archive sources
+    Plugins/vsVideoArchiveSourcePlugin.h
+    Plugins/vsTrackArchiveSourcePlugin.h
+    Plugins/vsDescriptorArchiveSourcePlugin.h
+    # Other sources
+    Plugins/vsVvqsDatabaseQueryDialog.h
+    Plugins/vsVvqsDatabaseSource.h
+    Plugins/vsVvqsDatabaseSourcePrivate.h
+    Plugins/vsVvqsDatabaseSourcePlugin.h
+)
+
+set(vspPluginUI
+    Plugins/vvqsDatabaseQuery.ui
+)
+
+# Built-in plugins should be considered static plugins
+add_source_files_definitions(${vspPluginSources} SYMBOLS QT_STATICPLUGIN)
+
+# END built-in plugins
+
+###############################################################################
+
+# BEGIN program code
+
+set(vspSources
+    # UI library wrapper
+    main.cxx
+    # Built-in source plugins
+    ${vspPluginSources}
+)
+
+set(vspUI
+    ${vspPluginUI}
+)
+
+set(vspMocHeaders
+    ${vspPluginMocHeaders}
+)
+
+set(vspResources
+  ../../Icons/stdbutton.qrc
+  ../../Icons/vgvideo.qrc
+  ../../Icons/vsp.qrc
+)
+
+# END core program code
+
+###############################################################################
+
+# BEGIN build rules
+
+qt4_wrap_ui(uiSources ${vspUI})
+qt4_wrap_cpp(mocSources ${vspMocHeaders})
+qt4_add_resources(resSources ${vspResources})
+
+source_group("User Interface" FILES
+  ${vspUI}
+)
+
+source_group("Resources" FILES
+  ${vspUI}
+  ${EXE_ICON}
+)
+
+source_group("Generated" FILES
+  ${uiSources}
+  ${mocSources}
+  ${resSources}
+)
+
+set_source_files_properties(${vspSources}
+  PROPERTIES OBJECT_DEPENDS "${uiSources}"
+)
+
+add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
+  ${vspSources} ${uiSources} ${mocSources} ${resSources}
+)
+
+target_link_libraries(${PROJECT_NAME} LINK_PRIVATE
+  ${vspSdkTargets}
+  ${QT_TESTING_SUPPORT_LIBRARIES}
+)
+
+vg_add_test_subdirectory()
+
+install_executable_target(${PROJECT_NAME} ${PROJECT_NAME})
+
+# END build rules
diff --git a/Applications/VsPlay/Plugins/vsArchiveSourceFactory.cxx b/Applications/VsPlay/Plugins/vsArchiveSourceFactory.cxx
new file mode 100644
index 00000000..e4dc7a18
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsArchiveSourceFactory.cxx
@@ -0,0 +1,176 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsArchiveSourceFactory.h"
+
+#include <QFileInfo>
+#include <QUrl>
+
+#include <vgFileDialog.h>
+
+#include <vsSourceService.h>
+
+// Need these so that QSharedPointer can find their dtors
+#include <vsDescriptorSource.h>
+#include <vsTrackSource.h>
+#include <vsVideoSource.h>
+
+QTE_IMPLEMENT_D_FUNC(vsArchiveSourceFactory)
+
+//-----------------------------------------------------------------------------
+class vsArchiveSourceFactoryPrivate
+{
+public:
+  vsArchiveSourceFactoryPrivate(vsArchiveSourceType type) : Type(type) {}
+
+  QString typeString() const;
+
+  const vsArchiveSourceType Type;
+  vsSimpleSourceFactoryPtr Sources;
+};
+
+//-----------------------------------------------------------------------------
+QString vsArchiveSourceFactoryPrivate::typeString() const
+{
+  switch (this->Type)
+    {
+    case vs::ArchiveVideoSource:      return "video";
+    case vs::ArchiveTrackSource:      return "track";
+    case vs::ArchiveDescriptorSource: return "descriptor";
+    default: return QString("(unknown archive type: %1)").arg(this->Type);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceFactory::vsArchiveSourceFactory(vsArchiveSourceType type) :
+  d_ptr(new vsArchiveSourceFactoryPrivate(type))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceFactory::~vsArchiveSourceFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsArchiveSourceFactory::initialize(QWidget* dialogParent)
+{
+  QTE_D_CONST(vsArchiveSourceFactory);
+
+  // Get information on available plugins
+  QList<vsArchivePluginInfo> pluginInfo =
+    vsSourceService::archivePluginInfo(d->Type);
+
+  // Build filters
+  QStringList filters;
+  QStringList allTypes;
+  foreach (const vsArchivePluginInfo& pi, pluginInfo)
+    {
+    foreach (const vsArchiveFileType& supportedType, pi.SupportedFileTypes)
+      {
+      allTypes.append(supportedType.Patterns);
+      filters.append(QString("%1 (%2)").arg(supportedType.Description,
+                                            supportedType.Patterns.join(" ")));
+      }
+    }
+
+  // Create merged filter
+  const QString type = d->typeString();
+  const QString dialogTitle = QString("Load %1 archive...").arg(type);
+  const QString mergedFilter = "Supported %1 formats (%2)";
+
+  filters.prepend(mergedFilter.arg(type, allTypes.join(" ")));
+  filters.append("All files (*)");
+
+  // Get name of archive file to open
+  const QString fileName = vgFileDialog::getOpenFileName(
+                             dialogParent, dialogTitle, QString(),
+                             filters.join(";;"));
+
+  if (fileName.isEmpty())
+    {
+    return false;
+    }
+
+  return this->initialize(QUrl::fromLocalFile(fileName));
+}
+
+//-----------------------------------------------------------------------------
+bool vsArchiveSourceFactory::initialize(const QUrl& uri)
+{
+  // Check that we are being asked to open a file
+  if (uri.scheme() != "file")
+    {
+    QTE_D_CONST(vsArchiveSourceFactory);
+
+    const QString message =
+      "Error loading " + d->typeString() + " archive from URI \"" +
+      uri.toString() + "\": the scheme " + uri.scheme() + " is not supported.";
+    this->warn(0, "Not Supported", message);
+
+    return false;
+    }
+
+  return this->initialize(uri, 0);
+}
+
+//-----------------------------------------------------------------------------
+bool vsArchiveSourceFactory::initialize(const QUrl& uri, QWidget* dialogParent)
+{
+  QTE_D(vsArchiveSourceFactory);
+
+  // Check that file exists
+  QFileInfo fi(uri.toLocalFile());
+  if (!fi.exists())
+    {
+    const QString message =
+      "Error loading " + d->typeString() + " archive from file \"" +
+      uri.toLocalFile() + "\": the file specified does not exist.";
+    this->warn(dialogParent, "Error loading archive", message);
+
+    return false;
+    }
+
+  // Get canonical path to file
+  QUrl canonicalUri = QUrl::fromLocalFile(fi.canonicalFilePath());
+
+  // Create source(s)
+  vsSimpleSourceFactoryPtr sources =
+    vsSourceService::createArchiveSource(d->Type, canonicalUri);
+  if (!sources)
+    {
+    const QString message =
+      "Error loading " + d->typeString() + " archive from file \"" +
+      uri.toLocalFile() + "\": none of the loaded handlers accepted the file.";
+    this->warn(dialogParent, "Error loading archive", message);
+
+    return false;
+    }
+
+  d->Sources = sources;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vsVideoSourcePtr vsArchiveSourceFactory::videoSource() const
+{
+  QTE_D_CONST(vsArchiveSourceFactory);
+  return d->Sources->videoSource();
+}
+
+//-----------------------------------------------------------------------------
+QList<vsTrackSourcePtr> vsArchiveSourceFactory::trackSources() const
+{
+  QTE_D_CONST(vsArchiveSourceFactory);
+  return d->Sources->trackSources();
+}
+
+//-----------------------------------------------------------------------------
+QList<vsDescriptorSourcePtr> vsArchiveSourceFactory::descriptorSources() const
+{
+  QTE_D_CONST(vsArchiveSourceFactory);
+  return d->Sources->descriptorSources();
+}
diff --git a/Applications/VsPlay/Plugins/vsArchiveSourceFactory.h b/Applications/VsPlay/Plugins/vsArchiveSourceFactory.h
new file mode 100644
index 00000000..cbeebedc
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsArchiveSourceFactory.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsArchiveSourceFactory_h
+#define __vsArchiveSourceFactory_h
+
+#include <qtGlobal.h>
+
+#include <vsArchiveSourceInfo.h>
+#include <vsSourceFactory.h>
+
+class vsArchiveSourceFactoryPrivate;
+
+class vsArchiveSourceFactory : public vsSourceFactory
+{
+public:
+  explicit vsArchiveSourceFactory(vsArchiveSourceType);
+  virtual ~vsArchiveSourceFactory();
+
+  virtual bool initialize(QWidget* dialogParent) QTE_OVERRIDE;
+  virtual bool initialize(const QUrl& uri) QTE_OVERRIDE;
+
+  virtual vsVideoSourcePtr videoSource() const QTE_OVERRIDE;
+  virtual QList<vsTrackSourcePtr> trackSources() const QTE_OVERRIDE;
+  virtual QList<vsDescriptorSourcePtr> descriptorSources() const QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsArchiveSourceFactory)
+
+  virtual bool initialize(const QUrl& uri, QWidget* dialogParent);
+
+private:
+  QTE_DECLARE_PRIVATE(vsArchiveSourceFactory)
+  QTE_DISABLE_COPY(vsArchiveSourceFactory)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsArchiveSourcePlugin.cxx b/Applications/VsPlay/Plugins/vsArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..49010f00
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsArchiveSourcePlugin.cxx
@@ -0,0 +1,96 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsArchiveSourcePlugin.h"
+
+#include <qtCliArgs.h>
+
+#include <vsFactoryAction.h>
+#include <vsSourceService.h>
+
+#include "vsArchiveSourceFactory.h"
+
+//-----------------------------------------------------------------------------
+class vsArchiveSourcePluginPrivate
+{
+public:
+  vsArchiveSourcePluginPrivate(vsArchiveSourceType type) :
+    Type(type), BackendsChecked(false) {}
+
+  const vsArchiveSourceType Type;
+  bool BackendsAvailable;
+  bool BackendsChecked;
+  QList<QString> CliOptions;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsArchiveSourcePlugin)
+
+//-----------------------------------------------------------------------------
+vsArchiveSourcePlugin::vsArchiveSourcePlugin(vsArchiveSourceType type) :
+  d_ptr(new vsArchiveSourcePluginPrivate(type))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourcePlugin::~vsArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsArchiveSourcePlugin::areBackendsAvailable()
+{
+  QTE_D(vsArchiveSourcePlugin);
+  if (!d->BackendsChecked)
+    {
+    d->BackendsAvailable =
+      !vsSourceService::archivePluginInfo(d->Type).isEmpty();
+    d->BackendsChecked = true;
+    }
+  return d->BackendsAvailable;
+}
+
+//-----------------------------------------------------------------------------
+void vsArchiveSourcePlugin::addArchiveOption(
+  qtCliOptions& options, const QString& type, const QString& shortName)
+{
+  QTE_D(vsArchiveSourcePlugin);
+
+  options.add(type + "-file <file>",
+              QString("Load %1 from archive 'file'").arg(type))
+         .add(shortName, qtCliOption::Short);
+
+  d->CliOptions.append(type + "-file");
+}
+
+//-----------------------------------------------------------------------------
+QList<vsPendingFactoryAction>
+vsArchiveSourcePlugin::parseFactoryArguments(const qtCliArgs& args)
+{
+  QTE_D_CONST(vsArchiveSourcePlugin);
+
+  QList<vsPendingFactoryAction> requestedActions;
+  foreach (const QString& option, d->CliOptions)
+    {
+    foreach (const QString& uri, args.values(option))
+      {
+      if (!uri.isEmpty())
+        {
+        vsPendingFactoryAction action;
+        action.FactoryIdentifier = this->identifier();
+        action.SourceUri = QUrl::fromLocalFile(uri);
+        requestedActions.append(action);
+        }
+      }
+    }
+  return requestedActions;
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactory* vsArchiveSourcePlugin::createFactory()
+{
+  QTE_D_CONST(vsArchiveSourcePlugin);
+  return new vsArchiveSourceFactory(d->Type);
+}
diff --git a/Applications/VsPlay/Plugins/vsArchiveSourcePlugin.h b/Applications/VsPlay/Plugins/vsArchiveSourcePlugin.h
new file mode 100644
index 00000000..5c1a834b
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsArchiveSourcePlugin.h
@@ -0,0 +1,69 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsArchiveSourcePlugin_h
+#define __vsArchiveSourcePlugin_h
+
+#include <vsArchiveSourceInfo.h>
+
+#include <vsSourceFactoryPlugin.h>
+
+class vsArchiveSourcePluginPrivate;
+
+class vsArchiveSourcePlugin : public vsSourceFactoryPlugin
+{
+public:
+  virtual ~vsArchiveSourcePlugin();
+
+  /// Parse CLI arguments for factory plugin.
+  ///
+  /// This method is called by the source factory framework to allow the plugin
+  /// to process command line arguments. The default implementation will
+  /// request creation of its subclass's source for any files passed by command
+  /// line options registered with ::addArchiveOption.
+  virtual QList<vsPendingFactoryAction> parseFactoryArguments(
+    const qtCliArgs&) QTE_OVERRIDE;
+
+  /// Create a new factory instance.
+  ///
+  /// This method will create a new ::vsArchiveSourceFactory instance with the
+  /// same source type that was passed to this instance at creation.
+  virtual vsSourceFactory* createFactory() QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsArchiveSourcePlugin)
+
+  /// Construct a generic archive plugin bound to the specified \p type.
+  explicit vsArchiveSourcePlugin(vsArchiveSourceType type);
+
+  /// Check if back-ends are available.
+  ///
+  /// This method tests if there are any loaded plugins able to handle the
+  /// source type assigned to this instance. Subclasses should call this before
+  /// registering command line options or creating menu actions, to avoid
+  /// giving the appearance that a source of our type can be created when in
+  /// fact there are no archive plugins available for the source type.
+  ///
+  /// \return \c true if there are loaded archive source plugins that support
+  ///         our type, \c false otherwise.
+  bool areBackendsAvailable();
+
+  /// Add a CLI option to load an archive.
+  ///
+  /// This method registers a command line option to load an archive, using a
+  /// standard format for the option. The option will have the specified
+  /// \p shortName, and a long name of \p type suffixed with "-file". Note that
+  /// \p type is also used in the option description, and should be the plural
+  /// of the data type (e.g. "video", "tracks").
+  void addArchiveOption(
+    qtCliOptions& options, const QString& type, const QString& shortName);
+
+private:
+  QTE_DECLARE_PRIVATE(vsArchiveSourcePlugin)
+  QTE_DISABLE_COPY(vsArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsDescriptorArchiveSourcePlugin.cxx b/Applications/VsPlay/Plugins/vsDescriptorArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..cba42e18
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsDescriptorArchiveSourcePlugin.cxx
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsDescriptorArchiveSourcePlugin.h"
+
+#include <QtPlugin>
+
+Q_EXPORT_PLUGIN2(vsDescriptorArchiveSource, vsDescriptorArchiveSourcePlugin)
+
+namespace { static const int keyLoadAction = 0; }
+
+//-----------------------------------------------------------------------------
+vsDescriptorArchiveSourcePlugin::vsDescriptorArchiveSourcePlugin() :
+  vsArchiveSourcePlugin(vs::ArchiveDescriptorSource)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorArchiveSourcePlugin::~vsDescriptorArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsDescriptorArchiveSourcePlugin::identifier() const
+{
+  return "DescriptorArchive";
+}
+
+//-----------------------------------------------------------------------------
+void vsDescriptorArchiveSourcePlugin::registerFactoryCliOptions(
+  qtCliOptions& options)
+{
+  if (this->areBackendsAvailable())
+    {
+    this->addArchiveOption(options, "descriptors", "df");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsDescriptorArchiveSourcePlugin::registerActions()
+{
+  if (this->areBackendsAvailable())
+    {
+    this->registerAction(
+      keyLoadAction, "&Load Archive", "load-events", "Ctrl+O, D",
+      "Load a descriptor (event) archive");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsDescriptorArchiveSourcePlugin::insertActions(
+  qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  if (this->areBackendsAvailable())
+    {
+    Q_UNUSED(videoMenu);
+    Q_UNUSED(trackMenu);
+    descriptorMenu.insertAction(this->action(keyLoadAction));
+    }
+}
diff --git a/Applications/VsPlay/Plugins/vsDescriptorArchiveSourcePlugin.h b/Applications/VsPlay/Plugins/vsDescriptorArchiveSourcePlugin.h
new file mode 100644
index 00000000..ad7517a8
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsDescriptorArchiveSourcePlugin.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsDescriptorArchiveSourcePlugin_h
+#define __vsDescriptorArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include "vsArchiveSourcePlugin.h"
+
+class vsDescriptorArchiveSourcePlugin : public QObject,
+                                        public vsArchiveSourcePlugin
+{
+  Q_OBJECT
+  Q_INTERFACES(vsSourceFactoryInterface)
+
+public:
+  vsDescriptorArchiveSourcePlugin();
+  virtual ~vsDescriptorArchiveSourcePlugin();
+
+  virtual QString identifier() const QTE_OVERRIDE;
+
+  virtual void registerFactoryCliOptions(qtCliOptions&) QTE_OVERRIDE;
+  virtual void registerActions() QTE_OVERRIDE;
+
+protected:
+  virtual void insertActions(
+    qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsDescriptorArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsTrackArchiveSourcePlugin.cxx b/Applications/VsPlay/Plugins/vsTrackArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..d60ad720
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsTrackArchiveSourcePlugin.cxx
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackArchiveSourcePlugin.h"
+
+#include <QtPlugin>
+
+Q_EXPORT_PLUGIN2(vsTrackArchiveSource, vsTrackArchiveSourcePlugin)
+
+namespace { static const int keyLoadAction = 0; }
+
+//-----------------------------------------------------------------------------
+vsTrackArchiveSourcePlugin::vsTrackArchiveSourcePlugin() :
+  vsArchiveSourcePlugin(vs::ArchiveTrackSource)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsTrackArchiveSourcePlugin::~vsTrackArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsTrackArchiveSourcePlugin::identifier() const
+{
+  return "TrackArchive";
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackArchiveSourcePlugin::registerFactoryCliOptions(
+  qtCliOptions& options)
+{
+  if (this->areBackendsAvailable())
+    {
+    this->addArchiveOption(options, "tracks", "tf");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackArchiveSourcePlugin::registerActions()
+{
+  if (this->areBackendsAvailable())
+    {
+    this->registerAction(
+      keyLoadAction, "&Load Archive", "load-tracks", "Ctrl+O, T",
+      "Load a track archive");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackArchiveSourcePlugin::insertActions(
+  qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  if (this->areBackendsAvailable())
+    {
+    Q_UNUSED(videoMenu);
+    trackMenu.insertAction(this->action(keyLoadAction));
+    Q_UNUSED(descriptorMenu);
+    }
+}
diff --git a/Applications/VsPlay/Plugins/vsTrackArchiveSourcePlugin.h b/Applications/VsPlay/Plugins/vsTrackArchiveSourcePlugin.h
new file mode 100644
index 00000000..2992e2b3
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsTrackArchiveSourcePlugin.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackArchiveSourcePlugin_h
+#define __vsTrackArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include "vsArchiveSourcePlugin.h"
+
+class vsTrackArchiveSourcePlugin : public QObject, public vsArchiveSourcePlugin
+{
+  Q_OBJECT
+  Q_INTERFACES(vsSourceFactoryInterface)
+
+public:
+  vsTrackArchiveSourcePlugin();
+  virtual ~vsTrackArchiveSourcePlugin();
+
+  virtual QString identifier() const QTE_OVERRIDE;
+
+  virtual void registerFactoryCliOptions(qtCliOptions&) QTE_OVERRIDE;
+  virtual void registerActions() QTE_OVERRIDE;
+
+protected:
+  virtual void insertActions(
+    qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsTrackArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsVideoArchiveSourcePlugin.cxx b/Applications/VsPlay/Plugins/vsVideoArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..e79a5415
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVideoArchiveSourcePlugin.cxx
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVideoArchiveSourcePlugin.h"
+
+#include <QtPlugin>
+
+Q_EXPORT_PLUGIN2(vsVideoArchiveSource, vsVideoArchiveSourcePlugin)
+
+namespace { static const int keyLoadAction = 0; }
+
+//-----------------------------------------------------------------------------
+vsVideoArchiveSourcePlugin::vsVideoArchiveSourcePlugin() :
+  vsArchiveSourcePlugin(vs::ArchiveVideoSource)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVideoArchiveSourcePlugin::~vsVideoArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsVideoArchiveSourcePlugin::identifier() const
+{
+  return "VideoArchive";
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoArchiveSourcePlugin::registerFactoryCliOptions(
+  qtCliOptions& options)
+{
+  if (this->areBackendsAvailable())
+    {
+    this->addArchiveOption(options, "video", "vf");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoArchiveSourcePlugin::registerActions()
+{
+  if (this->areBackendsAvailable())
+    {
+    this->registerAction(
+      keyLoadAction, "&Load Archive", "load-video", "Ctrl+O, V",
+      "Load a video archive");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoArchiveSourcePlugin::insertActions(
+  qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  if (this->areBackendsAvailable())
+    {
+    videoMenu.insertAction(this->action(keyLoadAction));
+    Q_UNUSED(trackMenu);
+    Q_UNUSED(descriptorMenu);
+    }
+}
diff --git a/Applications/VsPlay/Plugins/vsVideoArchiveSourcePlugin.h b/Applications/VsPlay/Plugins/vsVideoArchiveSourcePlugin.h
new file mode 100644
index 00000000..7c315b2e
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVideoArchiveSourcePlugin.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVideoArchiveSourcePlugin_h
+#define __vsVideoArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include "vsArchiveSourcePlugin.h"
+
+class vsVideoArchiveSourcePlugin : public QObject, public vsArchiveSourcePlugin
+{
+  Q_OBJECT
+  Q_INTERFACES(vsSourceFactoryInterface)
+
+public:
+  vsVideoArchiveSourcePlugin();
+  virtual ~vsVideoArchiveSourcePlugin();
+
+  virtual QString identifier() const QTE_OVERRIDE;
+
+  virtual void registerFactoryCliOptions(qtCliOptions&) QTE_OVERRIDE;
+  virtual void registerActions() QTE_OVERRIDE;
+
+protected:
+  virtual void insertActions(
+    qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsVideoArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseFactory.cxx b/Applications/VsPlay/Plugins/vsVvqsDatabaseFactory.cxx
new file mode 100644
index 00000000..0c1d4fca
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseFactory.cxx
@@ -0,0 +1,150 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVvqsDatabaseFactory.h"
+
+#include <QMessageBox>
+
+#include <vvQueryService.h>
+
+#include <vsTrackSource.h>
+
+#include "vsVvqsDatabaseQueryDialog.h"
+#include "vsVvqsDatabaseSource.h"
+
+QTE_IMPLEMENT_D_FUNC(vsVvqsDatabaseFactory)
+
+//-----------------------------------------------------------------------------
+class vsVvqsDatabaseFactoryPrivate
+{
+public:
+  static vvQuerySession* createSession(QUrl server);
+
+  vsTrackSourcePtr TrackSource;
+  vsDescriptorSourcePtr DescriptorSource;
+};
+
+//-----------------------------------------------------------------------------
+vvQuerySession* vsVvqsDatabaseFactoryPrivate::createSession(QUrl server)
+{
+  // Remove request parameters from URI
+  server.removeAllQueryItems("Stream");
+  server.removeAllQueryItems("TemporalLower");
+  server.removeAllQueryItems("TemporalUpper");
+  server.removeAllQueryItems("ExtractClassifiers");
+
+  // Create session
+  return vvQueryService::createSession(server);
+}
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseFactory::vsVvqsDatabaseFactory() :
+  d_ptr(new vsVvqsDatabaseFactoryPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseFactory::~vsVvqsDatabaseFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsVvqsDatabaseFactory::initialize(QWidget* dialogParent)
+{
+  vsVvqsDatabaseQueryDialog dlg(dialogParent);
+  if (dlg.exec() != QDialog::Accepted)
+    {
+    return false;
+    }
+
+  return this->initialize(dlg.uri());
+}
+
+//-----------------------------------------------------------------------------
+bool vsVvqsDatabaseFactory::initialize(const QUrl& uri)
+{
+  return this->initialize(uri, 0);
+}
+
+//-----------------------------------------------------------------------------
+bool vsVvqsDatabaseFactory::initialize(const QUrl& uri, QWidget* dialogParent)
+{
+  // Create query session
+  vvQuerySession* querySession =
+    vsVvqsDatabaseFactoryPrivate::createSession(uri);
+  if (!querySession)
+    {
+    const QString message =
+      "Error processing database request \"" + uri.toString() +
+      "\": the scheme " + uri.scheme() + " is not supported.";
+    this->warn(dialogParent, "Not supported", message);
+    return false;
+    }
+
+  QUrl muri = uri;
+  if (uri.queryItemValue("ExtractClassifiers") == "ask")
+    {
+    // Build message
+    muri.setEncodedQuery(QByteArray());
+    QString msg = "Do you wish to request classifier extraction in this query?"
+                  "\n\nServer: " + muri.toString();
+    muri = uri;
+    muri.removeAllQueryItems("ExtractClassifiers");
+    typedef QPair<QString, QString> QueryItem;
+    foreach (const QueryItem& qi, muri.queryItems())
+      {
+      msg += QString("\n%1: %2").arg(qi.first, qi.second);
+      }
+
+    // Ask user if they want classifiers
+    int result = QMessageBox::question(0, "Extract Classifiers?", msg,
+                                       QMessageBox::Yes | QMessageBox::No);
+    if (result == QMessageBox::Yes)
+      {
+      muri.addQueryItem("ExtractClassifiers", "yes");
+      }
+    }
+
+  QTE_D(vsVvqsDatabaseFactory);
+
+  // Create source
+  vsVvqsDatabaseSource* source = new vsVvqsDatabaseSource(querySession, muri);
+  d->DescriptorSource = vsDescriptorSourcePtr(source);
+  d->TrackSource = source->trackSource();
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsTrackSourcePtr> vsVvqsDatabaseFactory::trackSources() const
+{
+  QTE_D_CONST(vsVvqsDatabaseFactory);
+
+  if (!d->TrackSource)
+    {
+    return vsSourceFactory::trackSources();
+    }
+
+  QList<vsTrackSourcePtr> list;
+  list.append(d->TrackSource);
+  return list;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsDescriptorSourcePtr> vsVvqsDatabaseFactory::descriptorSources() const
+{
+  QTE_D_CONST(vsVvqsDatabaseFactory);
+
+  if (!d->DescriptorSource)
+    {
+    return vsSourceFactory::descriptorSources();
+    }
+
+  QList<vsDescriptorSourcePtr> list;
+  list.append(d->DescriptorSource);
+  return list;
+}
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseFactory.h b/Applications/VsPlay/Plugins/vsVvqsDatabaseFactory.h
new file mode 100644
index 00000000..98f0eea8
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseFactory.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVvqsDatabaseFactory_h
+#define __vsVvqsDatabaseFactory_h
+
+#include <qtGlobal.h>
+
+#include <vsSourceFactory.h>
+
+class vsVvqsDatabaseFactoryPrivate;
+
+class vsVvqsDatabaseFactory : public vsSourceFactory
+{
+public:
+  vsVvqsDatabaseFactory();
+  virtual ~vsVvqsDatabaseFactory();
+
+  virtual bool initialize(QWidget* dialogParent) QTE_OVERRIDE;
+  virtual bool initialize(const QUrl& uri) QTE_OVERRIDE;
+
+  virtual QList<vsTrackSourcePtr> trackSources() const QTE_OVERRIDE;
+  virtual QList<vsDescriptorSourcePtr> descriptorSources() const QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsVvqsDatabaseFactory)
+
+  bool initialize(const QUrl& uri, QWidget* dialogParent);
+
+private:
+  QTE_DECLARE_PRIVATE(vsVvqsDatabaseFactory)
+  QTE_DISABLE_COPY(vsVvqsDatabaseFactory)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseQueryDialog.cxx b/Applications/VsPlay/Plugins/vsVvqsDatabaseQueryDialog.cxx
new file mode 100644
index 00000000..bf0e797c
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseQueryDialog.cxx
@@ -0,0 +1,211 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVvqsDatabaseQueryDialog.h"
+#include "ui_vvqsDatabaseQuery.h"
+
+#include <QMessageBox>
+#include <QPushButton>
+#include <QSettings>
+
+#include <qtUiState.h>
+#include <qtUtil.h>
+
+#include <vgUnixTime.h>
+
+#include <vvQueryServerDialog.h>
+#include <vvQueryService.h>
+
+QTE_IMPLEMENT_D_FUNC(vsVvqsDatabaseQueryDialog)
+
+//-----------------------------------------------------------------------------
+class vsVvqsDatabaseQueryDialogPrivate
+{
+public:
+  Ui::vsVvqsDatabaseQueryDialog UI;
+  qtUiState UiState;
+  QUrl Uri;
+};
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseQueryDialog::vsVvqsDatabaseQueryDialog(
+  QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags), d_ptr(new vsVvqsDatabaseQueryDialogPrivate)
+{
+  QTE_D(vsVvqsDatabaseQueryDialog);
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  // Restore previous request
+  d->UiState.setCurrentGroup("Database");
+  d->UiState.mapText("Server", d->UI.serverUri);
+  d->UiState.mapText("StreamLimit", d->UI.streamId);
+  d->UiState.mapChecked("TemporalLimit", d->UI.timeLimit);
+  d->UiState.mapChecked("ExtractClassifiers", d->UI.extractClassifiers);
+  d->UiState.restore();
+  if (d->UI.timeLimit->isChecked())
+    {
+    QSettings settings;
+    settings.beginGroup("Database");
+    const long long tl = settings.value("TemporalLower", 0).toLongLong();
+    const long long tu = settings.value("TemporalUpper", 0).toLongLong();
+    d->UI.timeLower->setDateTime(vgUnixTime(tl).toDateTime().toUTC());
+    d->UI.timeUpper->setDateTime(vgUnixTime(tu).toDateTime().toUTC());
+    }
+
+  // Encourage user to provide a stream limit if no limit is set
+  d->UI.streamLimit->setChecked(!d->UI.streamId->text().isEmpty() ||
+                                !d->UI.timeLimit->isChecked());
+
+  // Set default min/max values for temporal limit
+  QDateTime epoch = QDateTime::fromMSecsSinceEpoch(0).toUTC();
+  d->UI.timeLower->setMinimumDateTime(epoch.addYears(-40));
+  d->UI.timeUpper->setMinimumDateTime(epoch.addYears(-40));
+  d->UI.timeLower->setMaximumDateTime(epoch.addYears(530).addSecs(-1));
+  d->UI.timeUpper->setMaximumDateTime(epoch.addYears(530).addSecs(-1));
+
+  // Connect UI signals
+  connect(d->UI.serverUriEdit, SIGNAL(clicked(bool)),
+          this, SLOT(editServerUri()));
+  connect(d->UI.timeLower, SIGNAL(editingFinished()),
+          this, SLOT(updateTimeUpperFromLower()));
+  connect(d->UI.timeUpper, SIGNAL(editingFinished()),
+          this, SLOT(updateTimeLowerFromUpper()));
+
+  connect(d->UI.serverUri, SIGNAL(textChanged(QString)),
+          this, SLOT(validate()));
+  connect(d->UI.streamId, SIGNAL(textChanged(QString)),
+          this, SLOT(validate()));
+  connect(d->UI.streamLimit, SIGNAL(toggled(bool)),
+          this, SLOT(validate()));
+
+  this->validate();
+}
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseQueryDialog::~vsVvqsDatabaseQueryDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+QUrl vsVvqsDatabaseQueryDialog::uri() const
+{
+  QTE_D_CONST(vsVvqsDatabaseQueryDialog);
+  return d->Uri;
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseQueryDialog::accept()
+{
+  QTE_D(vsVvqsDatabaseQueryDialog);
+
+  if (!d->UI.streamLimit->isChecked() && !d->UI.timeLimit->isChecked())
+    {
+    // No limits are defined; this is probably not good, so require user
+    // confirmation before proceeding anyway
+    const char* msg =
+      "Your request does not have any limits defined. If you continue with "
+      "this request, the entire contents of the database will be retrieved. "
+      "This may take a considerable amount of time and lead to application "
+      "instability, and is probably not what you want.\n\nAre you sure you "
+      "want to continue?";
+    QMessageBox::StandardButton result =
+      QMessageBox::warning(this, "Are you sure?", msg,
+                           QMessageBox::Yes | QMessageBox::No);
+
+    if (result != QMessageBox::Yes)
+      {
+      // User not sure; do nothing (return to dialog and allow user to make
+      // changes)
+      return;
+      }
+    }
+
+  // Form request URI and save options for next time... these are interleaved
+  // because both behave differently depending on if a temporal limit has been
+  // requested
+  QSettings settings;
+  settings.beginGroup("Database");
+  d->Uri = QUrl::fromUserInput(d->UI.serverUri->text());
+  d->UiState.save();
+
+  if (d->UI.streamLimit->isChecked())
+    {
+    d->Uri.addQueryItem("Stream", d->UI.streamId->text());
+    }
+  else
+    {
+    d->UI.streamId->clear();
+    }
+
+  const bool timeLimit = d->UI.timeLimit->isChecked();
+  if (timeLimit)
+    {
+    const vgUnixTime tl(d->UI.timeLower->dateTime());
+    const vgUnixTime tu(d->UI.timeUpper->dateTime());
+    d->Uri.addQueryItem("TemporalLower", QString::number(tl.toInt64()));
+    d->Uri.addQueryItem("TemporalUpper", QString::number(tu.toInt64()));
+    settings.setValue("TemporalLower", tl.toInt64());
+    settings.setValue("TemporalUpper", tu.toInt64());
+    }
+
+  if (d->UI.extractClassifiers->isChecked())
+    {
+    d->Uri.addQueryItem("ExtractClassifiers", "true");
+    }
+
+  // Done
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseQueryDialog::updateTimeUpperFromLower()
+{
+  QTE_D(vsVvqsDatabaseQueryDialog);
+  const QDateTime value = d->UI.timeLower->dateTime();
+  if (d->UI.timeUpper->dateTime() < value)
+    {
+    d->UI.timeUpper->setDateTime(value);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseQueryDialog::updateTimeLowerFromUpper()
+{
+  QTE_D(vsVvqsDatabaseQueryDialog);
+  const QDateTime value = d->UI.timeUpper->dateTime();
+  if (d->UI.timeLower->dateTime() > value)
+    {
+    d->UI.timeLower->setDateTime(value);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseQueryDialog::editServerUri()
+{
+  QTE_D(vsVvqsDatabaseQueryDialog);
+
+  vvQueryServerDialog dialog;
+  vvQueryService::registerChoosers(&dialog);
+  int result = dialog.exec(QUrl::fromUserInput(d->UI.serverUri->text()));
+  if (result == QDialog::Accepted)
+    {
+    d->UI.serverUri->setText(dialog.uri().toString());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseQueryDialog::validate()
+{
+  QTE_D(vsVvqsDatabaseQueryDialog);
+  bool valid = true;
+
+  valid = valid && !d->UI.serverUri->text().isEmpty();
+  valid = valid && !(d->UI.streamLimit->isChecked() &&
+                     d->UI.streamId->text().isEmpty());
+
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);
+}
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseQueryDialog.h b/Applications/VsPlay/Plugins/vsVvqsDatabaseQueryDialog.h
new file mode 100644
index 00000000..3b0ae530
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseQueryDialog.h
@@ -0,0 +1,47 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVvqsDatabaseQueryDialog_h
+#define __vsVvqsDatabaseQueryDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class QDateTime;
+class QUrl;
+
+class vsVvqsDatabaseQueryDialogPrivate;
+
+class vsVvqsDatabaseQueryDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vsVvqsDatabaseQueryDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vsVvqsDatabaseQueryDialog();
+
+  QUrl uri() const;
+
+  virtual void accept();
+
+protected slots:
+  void updateTimeUpperFromLower();
+  void updateTimeLowerFromUpper();
+
+  void editServerUri();
+
+  void validate();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsVvqsDatabaseQueryDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vsVvqsDatabaseQueryDialog)
+  QTE_DISABLE_COPY(vsVvqsDatabaseQueryDialog)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseSource.cxx b/Applications/VsPlay/Plugins/vsVvqsDatabaseSource.cxx
new file mode 100644
index 00000000..81b34eb5
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseSource.cxx
@@ -0,0 +1,452 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVvqsDatabaseSourcePrivate.h"
+
+#include <QDebug>
+#include <QRegExp>
+#include <QSettings>
+
+#include <qtScopedValueChange.h>
+#include <qtStlUtil.h>
+
+#include <vvMakeId.h>
+#include <vvQuerySession.h>
+
+#include <vsTrackSource.h>
+
+#include <vsAdapt.h>
+
+#include <limits>
+
+QTE_IMPLEMENT_D_FUNC(vsVvqsDatabaseSource)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsVvqsDatabaseTrackSource
+
+//-----------------------------------------------------------------------------
+class vsVvqsDatabaseTrackSource : public vsTrackSource
+{
+public:
+  virtual ~vsVvqsDatabaseTrackSource() {}
+
+  virtual Status status() const;
+  virtual QString text() const;
+  virtual QString toolTip() const;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsVvqsDatabaseSourcePrivate)
+  friend class vsVvqsDatabaseSource;
+
+  vsVvqsDatabaseTrackSource(vsVvqsDatabaseSourcePrivate* q) : q_ptr(q) {}
+
+private:
+  QTE_DECLARE_PUBLIC(vsVvqsDatabaseSourcePrivate)
+};
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsVvqsDatabaseTrackSource::status() const
+{
+  QTE_Q_CONST(vsVvqsDatabaseSourcePrivate);
+  return (q->PublicTrackStatus == vsDataSource::InProcessActive
+          ? vsDataSource::ArchivedActive : q->PublicTrackStatus);
+}
+
+//-----------------------------------------------------------------------------
+QString vsVvqsDatabaseTrackSource::text() const
+{
+  QTE_Q_CONST(vsVvqsDatabaseSourcePrivate);
+  return q->text(q->PublicTrackStatus);
+}
+
+//-----------------------------------------------------------------------------
+QString vsVvqsDatabaseTrackSource::toolTip() const
+{
+  QTE_Q_CONST(vsVvqsDatabaseSourcePrivate);
+  return q->toolTip(q->PublicTrackStatus, "track", "tracks");
+}
+
+//END vsVvqsDatabaseTrackSource
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsVvqsDatabaseSourcePrivate
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseSourcePrivate::vsVvqsDatabaseSourcePrivate(
+  vsVvqsDatabaseSource* q, vvQuerySession* qs, const QUrl& request)
+  : q_ptr(q), TrackSource(new vsVvqsDatabaseTrackSource(this)),
+    QuerySession(qs), RequestUri(request), NextEventId(0)
+{
+  this->TrackSource->moveToThread(this->thread());
+}
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseSourcePrivate::~vsVvqsDatabaseSourcePrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePrivate::run()
+{
+  this->updateStatus(vsDataSource::ArchivedActive,
+                     vsDataSource::ArchivedActive);
+
+  // Connect to query session signals
+  connect(this->QuerySession.data(),
+          SIGNAL(resultAvailable(vvQueryResult, bool)),
+          this, SLOT(processResult(vvQueryResult)));
+  connect(this->QuerySession.data(), SIGNAL(resultSetComplete(bool)),
+          this, SLOT(finalize()));
+  connect(this->QuerySession.data(),
+          SIGNAL(error(qtStatusSource, QString)),
+          this, SLOT(die(qtStatusSource, QString)));
+
+  // Get retrieval options
+  QSettings settings;
+  settings.beginGroup("Database");
+  this->RetrieveDescriptors =
+    settings.value("RetrieveDescriptors", true).toBool();
+  this->DescriptorBatchSize =
+    settings.value("DescriptorBatchSize", 400).toInt();
+
+  // Create retrieval query
+  this->Query.QueryId = vvMakeId("VSPLAY-DB-SOURCE");
+  this->Query.StreamIdLimit =
+    stdString(this->RequestUri.queryItemValue("Stream"));
+
+  // Query initially for just tracks, as retrieving descriptors can be slow,
+  // and we want the tracks available as soon as possible
+  this->Query.RequestedEntities = vvRetrievalQuery::Tracks;
+
+  const QString tl = this->RequestUri.queryItemValue("TemporalLower");
+  const QString tu = this->RequestUri.queryItemValue("TemporalUpper");
+  if (!tl.isEmpty())
+    {
+    this->Query.TemporalLowerLimit = tl.toLongLong();
+    }
+  if (!tu.isEmpty())
+    {
+    this->Query.TemporalUpperLimit = tu.toLongLong();
+    }
+
+  const QString ec =
+    this->RequestUri.queryItemValue("ExtractClassifiers").toLower();
+  this->ExtractClassifiers = (ec == "yes" || ec == "true");
+
+  // Issue the query
+  this->QuerySession->processQuery(
+    this->Query, std::numeric_limits<int>::max());
+
+  // Hand off to the event loop
+  qtThread::run();
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePrivate::processResult(vvQueryResult result)
+{
+  vsDataSource::Status trackStatus =
+    (result.Tracks.empty() ? this->PrivateTrackStatus
+                           : vsDataSource::InProcessActive);
+  vsDataSource::Status descriptorStatus =
+    (result.Descriptors.empty() ? this->PrivateDescriptorStatus
+                                : vsDataSource::InProcessActive);
+
+  this->updateStatus(trackStatus, descriptorStatus);
+
+  size_t n, k;
+
+  // Emit tracks
+  for (n = 0, k = result.Tracks.size(); n < k; ++n)
+    {
+    const vvTrack& track = result.Tracks[n];
+
+    QList<vvTrackState> states;
+    foreach_iter (vvTrackTrajectory::const_iterator, tsIter, track.Trajectory)
+      {
+      states.append(*tsIter);
+      }
+
+    // Emit track
+    emit this->TrackSource->trackUpdated(track.Id, states);
+    emit this->TrackSource->trackClosed(track.Id);
+
+    // Extract and emit track classification
+    vsTrackObjectClassifier toc;
+    QMap<std::string, double> classifier(track.Classification);
+    toc.probabilityPerson = classifier.value("TTPerson", 0.0);
+    toc.probabilityVehicle = classifier.value("TTVehicle", 0.0);
+    toc.probabilityOther =
+      1.0 - (toc.probabilityPerson + toc.probabilityVehicle);
+    emit this->tocAvailable(track.Id, toc);
+    }
+
+  // Emit descriptors and extract classifiers
+  QList<vsEvent> classifierEvents;
+  for (n = 0, k = result.Descriptors.size(); n < k; ++n)
+    {
+    const vvDescriptor& descriptor = result.Descriptors[n];
+
+    // Add descriptor to current batch
+    this->PendingDescriptors.append(new vvDescriptor(descriptor));
+
+    // Check if current batch is at size limit
+    if (this->PendingDescriptors.count() >= this->DescriptorBatchSize)
+      {
+      // If so, send the current batch (which will transfer the descriptors to
+      // a new instance, making the current batch empty again)
+      emit this->descriptorsAvailable(this->PendingDescriptors);
+      }
+
+    if (this->ExtractClassifiers)
+      {
+      vsExtractClassifier(descriptor, classifierEvents);
+      }
+    }
+
+  // Emit classifier events
+  foreach (vsEvent event, classifierEvents)
+    {
+    event->SetId(++this->NextEventId);
+    emit this->eventAvailable(event);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePrivate::finalize()
+{
+  // Did we get descriptors, or just tracks?
+  if (this->Query.RequestedEntities == vvRetrievalQuery::Tracks)
+    {
+    // If just tracks, do we want to re-query for descriptors?
+    if (this->RetrieveDescriptors)
+      {
+      this->updateStatus(vsDataSource::ArchivedIdle,
+                         vsDataSource::ArchivedActive);
+      this->Query.RequestedEntities = vvRetrievalQuery::Descriptors;
+      this->QuerySession->endQuery();
+      this->QuerySession->processQuery(
+        this->Query, std::numeric_limits<int>::max());
+
+      // Wait for second query to finish
+      return;
+      }
+    }
+
+  // Do we have any descriptors left that have not yet been sent?
+  if (!this->PendingDescriptors.isEmpty())
+    {
+    // If so, send them now
+    emit this->descriptorsAvailable(this->PendingDescriptors);
+    }
+
+  // We're done; change status to Idle and release query session
+  this->updateStatus(vsDataSource::ArchivedIdle,
+                     vsDataSource::ArchivedIdle);
+  this->QuerySession.reset();
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePrivate::die(qtStatusSource, QString error)
+{
+  if (error.isEmpty())
+    {
+    error = "An unknown error occurred";
+    }
+  qWarning() << "Database retrieval failed:" << error;
+  this->suicide();
+}
+
+//-----------------------------------------------------------------------------
+QString vsVvqsDatabaseSourcePrivate::text(vsDataSource::Status status) const
+{
+  // Get appropriate format
+  switch (status)
+    {
+    case vsDataSource::InProcessActive:
+    case vsDataSource::ArchivedActive:
+      return "A Archived";
+    case vsDataSource::ArchivedIdle:
+      return "(I Archived)";
+    default:
+      return "(none)";
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vsVvqsDatabaseSourcePrivate::toolTip(
+  vsDataSource::Status status,
+  const QString& sourceTypeSingular,
+  const QString& sourceTypePlural) const
+{
+  // Get appropriate format
+  QString format;
+  switch (status)
+    {
+    case vsDataSource::InProcessActive:
+      format = "Receiving %1 from %2";
+      break;
+    case vsDataSource::ArchivedActive:
+      format = "Requesting %1 from %2";
+      break;
+    case vsDataSource::ArchivedIdle:
+      format = "Using archived %1 from %2";
+      break;
+    default:
+      return QString("(no %1 source)").arg(sourceTypeSingular);
+    }
+
+  // Return formatted text
+  return format.arg(sourceTypePlural).arg(this->displayableRequestUri());
+}
+
+//-----------------------------------------------------------------------------
+QString vsVvqsDatabaseSourcePrivate::displayableRequestUri() const
+{
+  // Separate query items with zero-width space for better line breaking
+  QString uri = this->RequestUri.toString();
+  const QString replacement = QString::fromUtf8("\xe2\x80\x8b\\1");
+  return uri.replace(QRegExp("([?&])"), replacement);
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePrivate::updateStatus(
+  vsDataSource::Status trackStatus, vsDataSource::Status descriptorStatus)
+{
+  bool needUpdate = false;
+
+  if (trackStatus != this->PrivateTrackStatus)
+    {
+    this->PrivateTrackStatus = trackStatus;
+    needUpdate = true;
+    }
+  if (descriptorStatus != this->PrivateDescriptorStatus)
+    {
+    this->PrivateDescriptorStatus = descriptorStatus;
+    needUpdate = true;
+    }
+
+  if (needUpdate)
+    {
+    // Report status to parent
+    QTE_Q(vsVvqsDatabaseSource);
+    QMetaObject::invokeMethod(
+      q, "updateStatus",
+      Q_ARG(vsDataSource::Status, trackStatus),
+      Q_ARG(vsDataSource::Status, descriptorStatus));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePrivate::suicide()
+{
+  QTE_Q(vsVvqsDatabaseSource);
+
+  // Stop our thread
+  this->quit();
+
+  // Notify core we are done
+  this->TrackSource->suicide();
+  q->suicide(); // CAUTION: we may be deleted when this returns!
+}
+
+//END vsVvqsDatabaseSourcePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsVvqsDatabaseSource
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseSource::vsVvqsDatabaseSource(
+  vvQuerySession* querySession, const QUrl& request)
+  : d_ptr(new vsVvqsDatabaseSourcePrivate(this, querySession, request))
+{
+  QTE_D(vsVvqsDatabaseSource);
+
+  connect(d, SIGNAL(descriptorsAvailable(vsDescriptorList)),
+          this, SLOT(emitDescriptors(vsDescriptorList)));
+  connect(d, SIGNAL(eventAvailable(vsEvent)),
+          this, SLOT(emitEvent(vsEvent)));
+  connect(d, SIGNAL(tocAvailable(vvTrackId, vsTrackObjectClassifier)),
+          this, SIGNAL(tocAvailable(vvTrackId, vsTrackObjectClassifier)));
+
+  d->PublicTrackStatus = vsDataSource::ArchivedIdle;
+  d->PrivateTrackStatus = vsDataSource::ArchivedIdle;
+  d->PublicDescriptorStatus = vsDataSource::ArchivedIdle;
+  d->PrivateDescriptorStatus = vsDataSource::ArchivedIdle;
+}
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseSource::~vsVvqsDatabaseSource()
+{
+  QTE_D(vsVvqsDatabaseSource);
+
+  // Don't emit our own destroyed() when we are going away anyway
+  qtScopedBlockSignals bs(this);
+
+  // Shut down thread and track source
+  d->suicide();
+  d->wait();
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSource::start()
+{
+  QTE_D(vsVvqsDatabaseSource);
+
+  d->start();
+  vsDataSource::start();
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSource::updateStatus(
+  vsDataSource::Status trackStatus, vsDataSource::Status descriptorStatus)
+{
+  QTE_D(vsVvqsDatabaseSource);
+
+  if (trackStatus != d->PublicTrackStatus)
+    {
+    d->PublicTrackStatus = trackStatus;
+    emit d->TrackSource->statusChanged(trackStatus);
+    }
+  if (descriptorStatus != d->PublicDescriptorStatus)
+    {
+    d->PublicDescriptorStatus = descriptorStatus;
+    emit this->statusChanged(descriptorStatus);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsVvqsDatabaseSource::status() const
+{
+  QTE_D_CONST(vsVvqsDatabaseSource);
+  return (d->PublicDescriptorStatus == vsDataSource::InProcessActive
+          ? vsDataSource::ArchivedActive : d->PublicDescriptorStatus);
+}
+
+//-----------------------------------------------------------------------------
+QString vsVvqsDatabaseSource::text() const
+{
+  QTE_D_CONST(vsVvqsDatabaseSource);
+  return d->text(d->PublicDescriptorStatus);
+}
+
+//-----------------------------------------------------------------------------
+QString vsVvqsDatabaseSource::toolTip() const
+{
+  QTE_D_CONST(vsVvqsDatabaseSource);
+  return d->toolTip(d->PublicDescriptorStatus, "descriptor", "descriptors");
+}
+
+//-----------------------------------------------------------------------------
+vsTrackSourcePtr vsVvqsDatabaseSource::trackSource()
+{
+  QTE_D(vsVvqsDatabaseSource);
+  return d->TrackSource;
+}
+
+//END vsVvqsDatabaseSource
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseSource.h b/Applications/VsPlay/Plugins/vsVvqsDatabaseSource.h
new file mode 100644
index 00000000..a4a37b4d
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseSource.h
@@ -0,0 +1,48 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVvqsDatabaseSource_h
+#define __vsVvqsDatabaseSource_h
+
+#include <QUrl>
+
+#include <vsSourceFactory.h>
+#include <vsDescriptorSource.h>
+
+class vvQuerySession;
+
+class vsVvqsDatabaseSourcePrivate;
+
+class vsVvqsDatabaseSource : public vsDescriptorSource
+{
+  Q_OBJECT
+
+public:
+  explicit vsVvqsDatabaseSource(vvQuerySession*, const QUrl& request);
+  virtual ~vsVvqsDatabaseSource();
+
+  virtual void start() QTE_OVERRIDE;
+
+  virtual Status status() const QTE_OVERRIDE;
+  virtual QString text() const QTE_OVERRIDE;
+  virtual QString toolTip() const QTE_OVERRIDE;
+
+protected slots:
+  void updateStatus(vsDataSource::Status trackStatus,
+                    vsDataSource::Status descriptorStatus);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsVvqsDatabaseSource)
+
+  vsTrackSourcePtr trackSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsVvqsDatabaseSource)
+  QTE_DISABLE_COPY(vsVvqsDatabaseSource)
+  friend class vsVvqsDatabaseFactory;
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePlugin.cxx b/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePlugin.cxx
new file mode 100644
index 00000000..3b818864
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePlugin.cxx
@@ -0,0 +1,137 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVvqsDatabaseSourcePlugin.h"
+
+#include <QSignalMapper>
+#include <QtPlugin>
+
+#include <qtActionFactory.h>
+#include <qtActionManager.h>
+#include <qtCliArgs.h>
+
+#include <vvQueryService.h>
+
+#include <vsFactoryAction.h>
+
+#include "vsVvqsDatabaseFactory.h"
+
+Q_EXPORT_PLUGIN2(vsVvqsDatabaseSource, vsVvqsDatabaseSourcePlugin)
+
+namespace { static const int keyLoadAction = 0; }
+
+//-----------------------------------------------------------------------------
+class vsVvqsDatabaseSourcePluginPrivate
+{
+public:
+  vsVvqsDatabaseSourcePluginPrivate() : BackendsChecked(false) {}
+
+  bool areBackendsAvailable();
+
+  bool BackendsAvailable;
+  bool BackendsChecked;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsVvqsDatabaseSourcePlugin)
+
+//-----------------------------------------------------------------------------
+bool vsVvqsDatabaseSourcePluginPrivate::areBackendsAvailable()
+{
+  if (!this->BackendsChecked)
+    {
+    this->BackendsAvailable = !vvQueryService::supportedSchemes().isEmpty();
+    this->BackendsChecked = true;
+    }
+  return this->BackendsAvailable;
+}
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseSourcePlugin::vsVvqsDatabaseSourcePlugin() :
+  d_ptr(new vsVvqsDatabaseSourcePluginPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVvqsDatabaseSourcePlugin::~vsVvqsDatabaseSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsVvqsDatabaseSourcePlugin::identifier() const
+{
+  return "VvqsDatabase";
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePlugin::registerFactoryCliOptions(
+  qtCliOptions& options)
+{
+  QTE_D(vsVvqsDatabaseSourcePlugin);
+
+  if (d->areBackendsAvailable())
+    {
+    options.add("query-database <uri>",
+                "Issue database query defined by 'uri' to load archived data")
+           .add("qd", qtCliOption::Short);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QList<vsPendingFactoryAction>
+vsVvqsDatabaseSourcePlugin::parseFactoryArguments(const qtCliArgs& args)
+{
+  QTE_D(vsVvqsDatabaseSourcePlugin);
+
+  QList<vsPendingFactoryAction> requestedActions;
+  if (d->areBackendsAvailable())
+    {
+    foreach (const QString& uri, args.values("query-database"))
+      {
+      if (!uri.isEmpty())
+        {
+        vsPendingFactoryAction action;
+        action.FactoryIdentifier = this->identifier();
+        action.SourceUri = QUrl::fromUserInput(uri);
+        requestedActions.append(action);
+        }
+      }
+    }
+  return requestedActions;
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePlugin::registerActions()
+{
+  QTE_D(vsVvqsDatabaseSourcePlugin);
+
+  if (d->areBackendsAvailable())
+    {
+    this->registerAction(
+      keyLoadAction, "Load from &Database", "load-database", "Ctrl+O, B",
+      "Load tracks and descriptors from a database");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVvqsDatabaseSourcePlugin::insertActions(
+  qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  QTE_D(vsVvqsDatabaseSourcePlugin);
+
+  if (d->areBackendsAvailable())
+    {
+    Q_UNUSED(videoMenu);
+    trackMenu.insertAction(this->action(keyLoadAction), 200);
+    descriptorMenu.insertAction(this->action(keyLoadAction), 200);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactory* vsVvqsDatabaseSourcePlugin::createFactory()
+{
+  return new vsVvqsDatabaseFactory;
+}
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePlugin.h b/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePlugin.h
new file mode 100644
index 00000000..ef23250b
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePlugin.h
@@ -0,0 +1,47 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVvqsDatabaseSourcePlugin_h
+#define __vsVvqsDatabaseSourcePlugin_h
+
+#include <QObject>
+
+#include <vsSourceFactoryPlugin.h>
+
+class vsVvqsDatabaseSourcePluginPrivate;
+
+class vsVvqsDatabaseSourcePlugin : public QObject, public vsSourceFactoryPlugin
+{
+  Q_OBJECT
+  Q_INTERFACES(vsSourceFactoryInterface)
+
+public:
+  vsVvqsDatabaseSourcePlugin();
+  virtual ~vsVvqsDatabaseSourcePlugin();
+
+  virtual QString identifier() const QTE_OVERRIDE;
+
+  virtual void registerFactoryCliOptions(qtCliOptions&) QTE_OVERRIDE;
+  virtual QList<vsPendingFactoryAction> parseFactoryArguments(
+    const qtCliArgs&) QTE_OVERRIDE;
+
+  virtual void registerActions() QTE_OVERRIDE;
+
+  virtual vsSourceFactory* createFactory() QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsVvqsDatabaseSourcePlugin)
+
+  virtual void insertActions(
+    qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu) QTE_OVERRIDE;
+
+private:
+  QTE_DECLARE_PRIVATE(vsVvqsDatabaseSourcePlugin)
+  QTE_DISABLE_COPY(vsVvqsDatabaseSourcePlugin)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePrivate.h b/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePrivate.h
new file mode 100644
index 00000000..df2d4525
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vsVvqsDatabaseSourcePrivate.h
@@ -0,0 +1,85 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVvqsDatabaseSourcePrivate_h
+#define __vsVvqsDatabaseSourcePrivate_h
+
+#include "vsVvqsDatabaseSource.h"
+
+#include <QUrl>
+
+#include <qtStatusSource.h>
+#include <qtThread.h>
+
+#include <vvQuery.h>
+#include <vvQueryResult.h>
+
+#include <vsDescriptorInput.h>
+#include <vsEvent.h>
+
+class vsVvqsDatabaseTrackSource;
+
+class vsVvqsDatabaseSourcePrivate : public qtThread
+{
+  Q_OBJECT
+
+public:
+  vsVvqsDatabaseSourcePrivate(vsVvqsDatabaseSource* q, vvQuerySession*,
+                              const QUrl& request);
+  virtual ~vsVvqsDatabaseSourcePrivate();
+
+  QString text(vsDataSource::Status) const;
+  QString toolTip(vsDataSource::Status,
+                  const QString& sourceTypeSingular,
+                  const QString& sourceTypePlural) const;
+  QString displayableRequestUri() const;
+
+signals:
+  void descriptorsAvailable(vsDescriptorList);
+  void eventAvailable(vsEvent);
+  void tocAvailable(vvTrackId trackId, vsTrackObjectClassifier toc);
+
+protected slots:
+  void processResult(vvQueryResult);
+  void finalize();
+  void die(qtStatusSource, QString error);
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsVvqsDatabaseSource)
+  friend class vsVvqsDatabaseTrackSource;
+
+  virtual void run() QTE_OVERRIDE;
+
+  void updateStatus(vsDataSource::Status trackStatus,
+                    vsDataSource::Status descriptorStatus);
+  void suicide();
+
+  QSharedPointer<vsVvqsDatabaseTrackSource> TrackSource;
+
+  // Access these next two only from public thread
+  vsDataSource::Status PublicTrackStatus;
+  vsDataSource::Status PublicDescriptorStatus;
+
+  // Access these next two only from private thread
+  vsDataSource::Status PrivateTrackStatus;
+  vsDataSource::Status PrivateDescriptorStatus;
+
+  QScopedPointer<vvQuerySession> QuerySession;
+  vvRetrievalQuery Query;
+  const QUrl RequestUri;
+  bool RetrieveDescriptors;
+  bool ExtractClassifiers;
+  int DescriptorBatchSize;
+
+  vsDescriptorList PendingDescriptors;
+  vtkIdType NextEventId;
+
+private:
+  QTE_DECLARE_PUBLIC(vsVvqsDatabaseSource)
+  QTE_DISABLE_COPY(vsVvqsDatabaseSourcePrivate)
+};
+
+#endif
diff --git a/Applications/VsPlay/Plugins/vvqsDatabaseQuery.ui b/Applications/VsPlay/Plugins/vvqsDatabaseQuery.ui
new file mode 100644
index 00000000..0c76a240
--- /dev/null
+++ b/Applications/VsPlay/Plugins/vvqsDatabaseQuery.ui
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vsVvqsDatabaseQueryDialog</class>
+ <widget class="QDialog" name="vsVvqsDatabaseQueryDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>258</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Database Retrieval Options</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout_3">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::ExpandingFieldsGrow</enum>
+     </property>
+     <item row="0" column="0">
+      <widget class="QLabel" name="labelServerUri">
+       <property name="toolTip">
+        <string>The URI of the query server.</string>
+       </property>
+       <property name="text">
+        <string>Server URI:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <layout class="QHBoxLayout" name="serverUriLayout">
+       <property name="spacing">
+        <number>2</number>
+       </property>
+       <item>
+        <widget class="QLineEdit" name="serverUri"/>
+       </item>
+       <item>
+        <widget class="QToolButton" name="serverUriEdit">
+         <property name="icon">
+          <iconset resource="../../../Icons/vsp.qrc">
+           <normaloff>:/icons/16x16/edit-location</normaloff>:/icons/16x16/edit-location</iconset>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="3" column="0" colspan="2">
+      <widget class="QCheckBox" name="extractClassifiers">
+       <property name="text">
+        <string>Extract Classifiers</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" colspan="2">
+      <widget class="QGroupBox" name="timeLimit">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="title">
+        <string>Restrict to Time</string>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <layout class="QFormLayout" name="formLayout">
+        <item row="0" column="0">
+         <widget class="QLabel" name="labelTimeLower">
+          <property name="text">
+           <string>Lower Limit (UTC):</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QDateTimeEdit" name="timeLower">
+          <property name="maximumDate">
+           <date>
+            <year>2501</year>
+            <month>1</month>
+            <day>4</day>
+           </date>
+          </property>
+          <property name="minimumDate">
+           <date>
+            <year>1930</year>
+            <month>1</month>
+            <day>1</day>
+           </date>
+          </property>
+          <property name="displayFormat">
+           <string>yyyy-MM-dd hh:mm</string>
+          </property>
+          <property name="calendarPopup">
+           <bool>true</bool>
+          </property>
+          <property name="timeSpec">
+           <enum>Qt::UTC</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="labelTimeUpper">
+          <property name="text">
+           <string>Upper Limit (UTC):</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QDateTimeEdit" name="timeUpper">
+          <property name="maximumDate">
+           <date>
+            <year>2501</year>
+            <month>1</month>
+            <day>4</day>
+           </date>
+          </property>
+          <property name="minimumDate">
+           <date>
+            <year>1930</year>
+            <month>1</month>
+            <day>1</day>
+           </date>
+          </property>
+          <property name="displayFormat">
+           <string>yyyy-MM-dd hh:mm</string>
+          </property>
+          <property name="calendarPopup">
+           <bool>true</bool>
+          </property>
+          <property name="timeSpec">
+           <enum>Qt::UTC</enum>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="1" column="0" colspan="2">
+      <widget class="QGroupBox" name="streamLimit">
+       <property name="title">
+        <string>Restrict to Stream</string>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+       <layout class="QFormLayout" name="formLayout_2">
+        <item row="0" column="0">
+         <widget class="QLabel" name="labelStreamId">
+          <property name="text">
+           <string>Stream ID:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <layout class="QHBoxLayout" name="streamIdLayout">
+          <property name="spacing">
+           <number>2</number>
+          </property>
+          <item>
+           <widget class="QLineEdit" name="streamId"/>
+          </item>
+          <item>
+           <widget class="QToolButton" name="streamIdSearch">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../../Icons/vsp.qrc">
+              <normaloff>:/icons/16x16/search-database</normaloff>:/icons/16x16/search-database</iconset>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>385</width>
+       <height>63</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../../Icons/vsp.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vsVvqsDatabaseQueryDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>224</x>
+     <y>239</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>257</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vsVvqsDatabaseQueryDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>292</x>
+     <y>245</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>257</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Applications/VsPlay/Testing/AboutDialog.xml b/Applications/VsPlay/Testing/AboutDialog.xml
new file mode 100644
index 00000000..30055195
--- /dev/null
+++ b/Applications/VsPlay/Testing/AboutDialog.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuHelp" />
+  <pqevent object="MainWindow/menubar/menuHelp" command="activate" arguments="&amp;About Video Stream Player" />
+  <pqevent object="vgAboutDialog/label" command="mousePress" arguments="2,2,0,46,133" />
+  <pqevent object="vgAboutDialog/label" command="contextMenu" arguments="" />
+  <pqevent object="vgAboutDialog/1QMenu0" command="activate" arguments="&amp;Copy to clipboard" />
+  <pqevent object="vgAboutDialog/buttonBox/1QPushButton0" command="activate" arguments="" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/Annotate.xml b/Applications/VsPlay/Testing/Annotate.xml
new file mode 100644
index 00000000..d6a19646
--- /dev/null
+++ b/Applications/VsPlay/Testing/Annotate.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuDraw" />
+  <pqevent object="MainWindow/menubar/menuDraw" command="activate" arguments="actionRegionDraw" />
+  <pqevent object="MainWindow/videoToolBar" command="mousePress" arguments="1,1,0,78,1" />
+  <pqevent object="MainWindow/videoToolBar" command="mouseRelease" arguments="1,0,0,78,1" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="actionTracksShow" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="358" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.422,0.48,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.422,0.48,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.422,0.48,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.744,0.306,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.744,0.306,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.744,0.306,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.618,0.646,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.618,0.648,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.618,0.648,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.422,0.48,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.422,0.48,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.422,0.48,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.682,0.566,2,2,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.682,0.566,2,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.682,0.566,2,0,0)" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="378" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/CMakeLists.txt b/Applications/VsPlay/Testing/CMakeLists.txt
new file mode 100644
index 00000000..e7f76356
--- /dev/null
+++ b/Applications/VsPlay/Testing/CMakeLists.txt
@@ -0,0 +1,34 @@
+set(TESTS_WITHOUT_BASELINES
+  AboutDialog.xml
+  LoadVideoArchiveCancel.xml
+)
+
+set(TESTS_WITH_BASELINES
+  Annotate.xml
+  Filter.xml
+  LoadVideoArchive.xml
+  LoadCompressedVideoArchive.xml
+  MoveSlider.xml
+  Select.xml
+  SelectZoomReset.xml
+  SelectZoom.xml
+  ShowEvents.xml
+  ShowEventHeads.xml
+  ShowTrackBoxes.xml
+  ShowTrackIDs.xml
+  ShowTrackPVOs.xml
+  ShowTracks.xml
+  UseVideoControls-SkipBackward.xml
+  UseVideoControls-SkipForward.xml
+  UseVideoControls-StepBackward.xml
+  UseVideoControls-StepForward.xml
+  UseVideoControls-Stop.xml
+)
+
+foreach(script ${TESTS_WITHOUT_BASELINES})
+  vg_add_scripted_test(vsPlay "${script}")
+endforeach()
+
+foreach(script ${TESTS_WITH_BASELINES})
+  vg_add_scripted_test(vsPlay "${script}" WITH_BASELINE)
+endforeach()
diff --git a/Applications/VsPlay/Testing/Filter.xml b/Applications/VsPlay/Testing/Filter.xml
new file mode 100644
index 00000000..5dc0c139
--- /dev/null
+++ b/Applications/VsPlay/Testing/Filter.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_reconciled_tracks.kw18" />
+  <pqevent object="MainWindow/actionTracksShow" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowBoxes" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowId" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowPvo" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="758" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/drawingToolBar/regionType" command="set_string" arguments="Filter" />
+  <pqevent object="MainWindow/actionRegionDraw" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.77605,0.530378,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.77605,0.530378,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.77605,0.530378,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.713841,0.559934,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.713841,0.559934,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.713841,0.559934,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.696734,0.671593,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.696734,0.671593,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.696734,0.671593,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.754277,0.72578,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.754277,0.72578,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.754277,0.72578,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.856921,0.714286,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.860031,0.702791,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.860031,0.702791,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.835148,0.543514,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.835148,0.543514,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.835148,0.543514,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.835148,0.543514,2,2,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.835148,0.543514,2,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.835148,0.543514,2,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseDblClick" arguments="2,2,0,537,331" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.835148,0.543514,2,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.835148,0.543514,2,0,0)" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/LoadCompressedVideoArchive.xml b/Applications/VsPlay/Testing/LoadCompressedVideoArchive.xml
new file mode 100644
index 00000000..91f326e4
--- /dev/null
+++ b/Applications/VsPlay/Testing/LoadCompressedVideoArchive.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_compressed.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/LoadVideoArchive.xml b/Applications/VsPlay/Testing/LoadVideoArchive.xml
new file mode 100644
index 00000000..7a4d092e
--- /dev/null
+++ b/Applications/VsPlay/Testing/LoadVideoArchive.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/LoadVideoArchiveCancel.xml b/Applications/VsPlay/Testing/LoadVideoArchiveCancel.xml
new file mode 100644
index 00000000..5833f5ff
--- /dev/null
+++ b/Applications/VsPlay/Testing/LoadVideoArchiveCancel.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="cancelled" arguments="" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/MoveSlider.xml b/Applications/VsPlay/Testing/MoveSlider.xml
new file mode 100644
index 00000000..ab0c8f87
--- /dev/null
+++ b/Applications/VsPlay/Testing/MoveSlider.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f53aab3b3" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f53e65f36" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f54220ab9" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f549961c0" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f54d50d43" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f5510b8c6" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f563b1256" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f59071c7d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f5bd326a4" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f5e638547" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f612f8f6e" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f6348970b" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f659d4a2b" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f67b651c8" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f6a825bef" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f6cd70f0f" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f6e78bfa6" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f70561bc0" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f726f235d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f72e67a63" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f73997ced" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f744c7f77" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f74c3d67d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f74ff8201" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7576d907" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f75b2848a" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f75ee300d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7629db91" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f76a13297" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f77543521" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f77cb8c27" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f787e8eb1" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7931913b" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f79e493c4" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7ad341d1" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7bc1efde" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7cec496e" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7ddaf77b" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7ec9a588" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f7fb85395" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f80a701a2" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8195afaf" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f820d06b5" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f82845dbc" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f82fbb4c2" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f83376046" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f83730bc9" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f83aeb74c" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f83ea62cf" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f84260e53" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8461b9d6" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f849d6559" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f84d910dc" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8514bc5f" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f855067e3" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f858c1366" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f85c7bee9" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f86036a6c" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f863f15f0" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f867ac173" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f86b66cf6" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f86f21879" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f872dc3fd" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f87696f80" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f87a51b03" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f87e0c686" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f881c7209" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f88581d8d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8893c910" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f88cf7493" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f890b2016" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8946cb9a" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8982771d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f89f9ce23" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8a3579a6" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8a71252a" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8ae87c30" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8b5fd337" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8b9b7eba" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8c12d5c0" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8c4e8144" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8c8a2cc7" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8cc5d84a" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8d0183cd" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8d3d2f50" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8d78dad4" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8db48657" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8df031da" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8e2bdd5d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8e6788e1" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8ea33464" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8ededfe7" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8f5636ee" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8f91e271" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8f5636ee" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8ededfe7" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8ea33464" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8e6788e1" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8e2bdd5d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8df031da" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8d78dad4" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8d3d2f50" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8d0183cd" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8cc5d84a" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8c8a2cc7" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8c4e8144" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8c12d5c0" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8bd72a3d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8b9b7eba" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8b5fd337" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8b2427b3" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8ae87c30" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8aacd0ad" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8a71252a" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8a3579a6" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f89f9ce23" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f89be22a0" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8946cb9a" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f890b2016" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f88cf7493" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f88581d8d" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f881c7209" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f87a51b03" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f87696f80" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f872dc3fd" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f86b66cf6" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f867ac173" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f86036a6c" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f855067e3" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f84d910dc" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f849d6559" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f8461b9d6" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f83ea62cf" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f83730bc9" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f82c0093f" />
+  <pqevent object="MainWindow/centralwidget/scrubber/1qtDoubleSlider0" command="set_xdouble" arguments="43138a3f82845dbc" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/Select.xml b/Applications/VsPlay/Testing/Select.xml
new file mode 100644
index 00000000..5d0f208e
--- /dev/null
+++ b/Applications/VsPlay/Testing/Select.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_reconciled_tracks.kw18" />
+  <pqevent object="MainWindow/actionTracksShow" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowBoxes" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowId" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowPvo" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="758" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/drawingToolBar/regionType" command="set_string" arguments="Selector" />
+  <pqevent object="MainWindow/actionRegionDraw" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.352,0.642,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.352,0.642,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.352,0.642,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.542,0.288,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.542,0.288,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.542,0.288,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.73,0.462,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.73,0.46,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.73,0.46,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.664,0.644,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.662,0.646,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.662,0.646,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.46,0.762,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.46,0.762,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.46,0.762,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.36,0.644,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.36,0.644,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.36,0.644,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.444,0.442,2,2,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.444,0.442,2,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.444,0.442,2,0,0)" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/SelectZoom.xml b/Applications/VsPlay/Testing/SelectZoom.xml
new file mode 100644
index 00000000..f9e271ce
--- /dev/null
+++ b/Applications/VsPlay/Testing/SelectZoom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="638" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.44,0.442,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.706,0.624,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.706,0.624,1,0,0)" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/SelectZoomReset.xml b/Applications/VsPlay/Testing/SelectZoomReset.xml
new file mode 100644
index 00000000..67bbc8ce
--- /dev/null
+++ b/Applications/VsPlay/Testing/SelectZoomReset.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="638" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mousePress" arguments="(0.44,0.442,1,1,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseMove" arguments="(0.706,0.624,1,0,0)" />
+  <pqevent object="MainWindow/centralwidget/renderFrame" command="mouseRelease" arguments="(0.706,0.624,1,0,0)" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="actionViewReset" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/ShowEventHeads.xml b/Applications/VsPlay/Testing/ShowEventHeads.xml
new file mode 100644
index 00000000..274580ff
--- /dev/null
+++ b/Applications/VsPlay/Testing/ShowEventHeads.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_reconciled_tracks.kw18" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuDescriptors"/>
+  <pqevent object="MainWindow/menubar/menuDescriptors" command="activate" arguments="&amp;Load Archive"/>
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_KWSOTI.xml"/>
+  <pqevent object="MainWindow" command="pause" arguments="2000" />
+  <pqevent object="MainWindow/actionTracksShow" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionTracksShowBoxes" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionEventsTracksShow" command="set_boolean" arguments="false"/>
+  <pqevent object="MainWindow/actionEventsBoxesShow" command="set_boolean" arguments="true"/>
+  <pqevent object="MainWindow/actionEventsLabelsShow" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionEventsProbabilityShow" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/filterDock/filterDockContents/filterDockScrollArea/qt_scrollarea_viewport/filterDockScrollAreaContents/filter" command="mixer_set_state" arguments="4,1"/>
+  <pqevent command="mousePress" arguments="(0.444,0.45,1,1,0)" object="MainWindow/centralwidget/renderFrame"/>
+  <pqevent command="mouseMove" arguments="(0.698,0.806,1,0,0)" object="MainWindow/centralwidget/renderFrame"/>
+  <pqevent command="mouseRelease" arguments="(0.698,0.806,1,0,0)" object="MainWindow/centralwidget/renderFrame"/>
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="100"/>
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/ShowEvents.xml b/Applications/VsPlay/Testing/ShowEvents.xml
new file mode 100644
index 00000000..80a75fbe
--- /dev/null
+++ b/Applications/VsPlay/Testing/ShowEvents.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_reconciled_tracks.kw18" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuDescriptors"/>
+  <pqevent object="MainWindow/menubar/menuDescriptors" command="activate" arguments="&amp;Load Archive"/>
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_KWSOTI.xml"/>
+  <pqevent object="MainWindow" command="pause" arguments="2000" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuEvents" />
+  <pqevent object="MainWindow/menubar/menuEvents" command="activate" arguments="actionEventsPersonEnableAll" />
+  <pqevent object="MainWindow/menubar/menuEvents" command="activate" arguments="actionEventsVehicleEnableAll" />
+  <pqevent object="MainWindow/menubar/menuEvents" command="activate" arguments="actionEventProbabilityThresholdSet" />
+  <pqevent object="MainWindow/1qtDoubleInputDialog0/1QDialogButtonBox0" command="activate" arguments="0x400" />
+  <pqevent object="MainWindow/actionTracksShow" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionTracksShowBoxes" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionEventsTracksShow" command="set_boolean" arguments="true"/>
+  <pqevent object="MainWindow/actionEventsBoxesShow" command="set_boolean" arguments="true"/>
+  <pqevent object="MainWindow/actionEventsLabelsShow" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionEventsProbabilityShow" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/filterDock/filterDockContents/filterDockScrollArea/qt_scrollarea_viewport/filterDockScrollAreaContents/filter" command="mixer_set_state" arguments="5,0"/>
+  <pqevent object="MainWindow/filterDock/filterDockContents/filterDockScrollArea/qt_scrollarea_viewport/filterDockScrollAreaContents/filter" command="mixer_set_state" arguments="5,0"/>
+  <pqevent object="MainWindow/filterDock/filterDockContents/filterDockScrollArea/qt_scrollarea_viewport/filterDockScrollAreaContents/filter" command="mixer_set_state" arguments="4,0"/>
+  <pqevent object="MainWindow/filterDock/filterDockContents/filterDockScrollArea/qt_scrollarea_viewport/filterDockScrollAreaContents/filter" command="mixer_set_state" arguments="4,0"/>
+  <pqevent object="MainWindow/filterDock/filterDockContents/filterDockScrollArea/qt_scrollarea_viewport/filterDockScrollAreaContents/filter" command="mixer_set_state" arguments="3,0"/>
+  <pqevent object="MainWindow/filterDock/filterDockContents/filterDockScrollArea/qt_scrollarea_viewport/filterDockScrollAreaContents/filter" command="mixer_set_state" arguments="3,0"/>
+  <pqevent object="MainWindow/filterDock/filterDockContents/filterDockScrollArea/qt_scrollarea_viewport/filterDockScrollAreaContents/filter" command="mixer_set_state" arguments="5,1"/>
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="900"/>
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/ShowTrackBoxes.xml b/Applications/VsPlay/Testing/ShowTrackBoxes.xml
new file mode 100644
index 00000000..6aaa19df
--- /dev/null
+++ b/Applications/VsPlay/Testing/ShowTrackBoxes.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_reconciled_tracks.kw18" />
+  <pqevent object="MainWindow/actionTracksShow" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowBoxes" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowId" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionTracksShowPvo" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="765" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/ShowTrackIDs.xml b/Applications/VsPlay/Testing/ShowTrackIDs.xml
new file mode 100644
index 00000000..5b52becd
--- /dev/null
+++ b/Applications/VsPlay/Testing/ShowTrackIDs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_reconciled_tracks.kw18" />
+  <pqevent object="MainWindow/actionTracksShow" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowBoxes" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionTracksShowId" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowPvo" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="316" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/ShowTrackPVOs.xml b/Applications/VsPlay/Testing/ShowTrackPVOs.xml
new file mode 100644
index 00000000..c359f3c7
--- /dev/null
+++ b/Applications/VsPlay/Testing/ShowTrackPVOs.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_reconciled_tracks.kw18" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuDescriptors" />
+  <pqevent object="MainWindow/menubar/menuDescriptors" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.pvo.txt" />
+  <pqevent object="MainWindow/actionTracksShow" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowBoxes" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowId" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionTracksShowPvo" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="765" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/ShowTracks.xml b/Applications/VsPlay/Testing/ShowTracks.xml
new file mode 100644
index 00000000..0511f018
--- /dev/null
+++ b/Applications/VsPlay/Testing/ShowTracks.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuTracks" />
+  <pqevent object="MainWindow/menubar/menuTracks" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5_reconciled_tracks.kw18" />
+  <pqevent object="MainWindow/actionTracksShow" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionTracksShowBoxes" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionTracksShowId" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionTracksShowPvo" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="876" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/UseVideoControls-SkipBackward.xml b/Applications/VsPlay/Testing/UseVideoControls-SkipBackward.xml
new file mode 100644
index 00000000..708bd06c
--- /dev/null
+++ b/Applications/VsPlay/Testing/UseVideoControls-SkipBackward.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow" command="pause" arguments="1" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="785" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/actionVideoSkipBackward" command="activate" arguments="" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
\ No newline at end of file
diff --git a/Applications/VsPlay/Testing/UseVideoControls-SkipForward.xml b/Applications/VsPlay/Testing/UseVideoControls-SkipForward.xml
new file mode 100644
index 00000000..9002e653
--- /dev/null
+++ b/Applications/VsPlay/Testing/UseVideoControls-SkipForward.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow" command="pause" arguments="1" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="785" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/actionVideoSkipForward" command="activate" arguments="" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
\ No newline at end of file
diff --git a/Applications/VsPlay/Testing/UseVideoControls-StepBackward.xml b/Applications/VsPlay/Testing/UseVideoControls-StepBackward.xml
new file mode 100644
index 00000000..256532c4
--- /dev/null
+++ b/Applications/VsPlay/Testing/UseVideoControls-StepBackward.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow" command="pause" arguments="1" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="783" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/actionVideoFrameBackward" command="activate" arguments="" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
\ No newline at end of file
diff --git a/Applications/VsPlay/Testing/UseVideoControls-StepForward.xml b/Applications/VsPlay/Testing/UseVideoControls-StepForward.xml
new file mode 100644
index 00000000..b7ce8f27
--- /dev/null
+++ b/Applications/VsPlay/Testing/UseVideoControls-StepForward.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow" command="pause" arguments="1" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="785" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/actionVideoFrameForward" command="activate" arguments="" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
diff --git a/Applications/VsPlay/Testing/UseVideoControls-Stop.xml b/Applications/VsPlay/Testing/UseVideoControls-Stop.xml
new file mode 100644
index 00000000..bf9f56f4
--- /dev/null
+++ b/Applications/VsPlay/Testing/UseVideoControls-Stop.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow" command="pause" arguments="1" />
+  <pqevent object="MainWindow/centralwidget/frame" command="set_int" arguments="785" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow" command="invokeMethod" arguments="flushPendingSeeks,int,30000" />
+</pqevents>
\ No newline at end of file
diff --git a/Applications/VsPlay/Testing/UseVideoControls.xml b/Applications/VsPlay/Testing/UseVideoControls.xml
new file mode 100644
index 00000000..e491f292
--- /dev/null
+++ b/Applications/VsPlay/Testing/UseVideoControls.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>
+<pqevents>
+  <pqevent object="MainWindow/menubar" command="activate" arguments="menuVideo" />
+  <pqevent object="MainWindow/menubar/menuVideo" command="activate" arguments="&amp;Load Archive" />
+  <pqevent object="MainWindow/QFileDialog" command="filesSelected" arguments="$VISGUI_DATA_ROOT/APHill/09172008flight1tape1_5.index" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionVideoPlay" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionVideoPause" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionVideoPlay" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionVideoPlay" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionVideoFastForward" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionVideoFastBackward" command="set_boolean" arguments="true" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="false" />
+  <pqevent object="MainWindow/actionVideoFrameForward" command="activate" arguments="" />
+  <pqevent object="MainWindow/actionVideoFrameBackward" command="activate" arguments="" />
+  <pqevent object="MainWindow/actionVideoStop" command="set_boolean" arguments="true" />
+</pqevents>
diff --git a/Applications/VsPlay/main.cxx b/Applications/VsPlay/main.cxx
new file mode 100644
index 00000000..d0d8a464
--- /dev/null
+++ b/Applications/VsPlay/main.cxx
@@ -0,0 +1,198 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QtCore>
+#include <QAbstractAnimation>
+#include <QApplication>
+#include <QDir>
+#include <QHostAddress>
+#include <QMainWindow>
+#include <QSettings>
+
+#include <qtCliArgs.h>
+#include <qtUtil.h>
+
+#ifdef ENABLE_QTTESTING
+#include <pqCoreTestUtility.h>
+#endif
+
+#include <vgImage.h>
+
+#include <vtkVgVideoFrameMetaData.h>
+
+#include <vgVideoSourceRequestor.h>
+
+#include <vvQueryResult.h>
+
+#include <vvQueryInstance.h>
+#include <vvQueryService.h>
+
+#include <vsContour.h>
+#include <vsDataSource.h>
+#include <vsDescriptor.h>
+#include <vsDescriptorInput.h>
+#include <vsEvent.h>
+#include <vsEventInfo.h>
+#include <vsFactoryAction.h>
+#include <vsSourceService.h>
+#include <vsTrackClassifier.h>
+#include <vsTrackData.h>
+#include <vsTrackState.h>
+
+#include "vsVersion.h"
+
+#include "vsApplication.h"
+#include "vsMainWindow.h"
+
+// Register built-in data source plugins
+Q_IMPORT_PLUGIN(vsDescriptorArchiveSource)
+Q_IMPORT_PLUGIN(vsTrackArchiveSource)
+Q_IMPORT_PLUGIN(vsVideoArchiveSource)
+Q_IMPORT_PLUGIN(vsVvqsDatabaseSource)
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  // Set application information
+  QApplication::setApplicationName("Video Stream Player");
+  QApplication::setOrganizationName("Kitware");
+  QApplication::setOrganizationDomain("kitware.com");
+  QApplication::setApplicationVersion(VSPLAY_VERSION_STR);
+
+  // Set up command line options
+  qtCliArgs args(argc, argv);
+
+#ifdef ENABLE_QTTESTING
+  pqCoreTestUtility::AddCommandLineOptions(args);
+#endif
+
+  qtCliOptions options;
+  vsSourceService::registerCliOptions(options);
+  options.add("filters-file <file>", "Load filter settings from 'file'")
+         .add("ff", qtCliOption::Short);
+  options.add("seek <time>",
+              "Attempt to seek to 'time' once video is loaded");
+  options.add("import-config <file>", "Append settings from 'file'"
+              " to the application's configuration space");
+  options.add("import-config-org <file>", "Append settings from 'file'"
+              " to the organization's configuration space");
+  options.add("mask-image <file>", "Mask image to overlay on video");
+  args.addOptions(options);
+
+  // Parse arguments
+  args.parseOrDie();
+
+  // Create application instance and set copyright information
+  vsApplication app(args.qtArgc(), args.qtArgv());
+
+  app.setProperty("COPY_YEAR", VSPLAY_COPY_YEAR);
+  app.setProperty("COPY_ORGANIZATION", "Kitware, Inc.");
+
+  // Register metatypes
+  QTE_REGISTER_METATYPE(QHostAddress);
+  QTE_REGISTER_METATYPE(vgImage);
+  QTE_REGISTER_METATYPE(vgTimeStamp);
+  QTE_REGISTER_METATYPE(vtkVgTimeStamp);
+  QTE_REGISTER_METATYPE(vtkVgTimeStamp*);
+  QTE_REGISTER_METATYPE(vgVideoSeekRequest);
+  QTE_REGISTER_METATYPE(vgVideoSourceRequestor*);
+  QTE_REGISTER_METATYPE(vtkVgVideoFrame*);
+  QTE_REGISTER_METATYPE(vtkVgVideoFrameMetaData);
+  QTE_REGISTER_METATYPE(QList<vtkVgVideoFrameMetaData>);
+  QTE_REGISTER_METATYPE(vsDataSource::Status);
+  QTE_REGISTER_METATYPE(vsContour);
+  QTE_REGISTER_METATYPE(vsTrackObjectClassifier);
+  QTE_REGISTER_METATYPE(vvDescriptor);
+  QTE_REGISTER_METATYPE(vsDescriptor);
+  QTE_REGISTER_METATYPE(vsDescriptorList);
+  QTE_REGISTER_METATYPE(vsTrackData);
+  QTE_REGISTER_METATYPE(vvTrackState);
+  QTE_REGISTER_METATYPE(QList<vvTrackState>);
+  QTE_REGISTER_METATYPE(vvTrackId);
+  QTE_REGISTER_METATYPE(vvQueryInstance);
+  QTE_REGISTER_METATYPE(vvQueryResult);
+  QTE_REGISTER_METATYPE(vtkIdType);
+  QTE_REGISTER_METATYPE(vsEvent);
+  QTE_REGISTER_METATYPE(vsEventInfo);
+  QTE_REGISTER_METATYPE(vsEventInfo::Group);
+  QTE_REGISTER_METATYPE(vsDescriptorInputPtr);
+  QTE_REGISTER_METATYPE(const qtCliArgs*);
+
+  // Register actions for source factory plugins
+  vsSourceService::registerActions();
+
+  // Import configuration file, if requested
+  foreach (QString config, args.values("import-config"))
+    {
+    QSettings loadSettings(config, QSettings::IniFormat);
+    QSettings saveSettings;
+
+    foreach (QString key, loadSettings.allKeys())
+      saveSettings.setValue(key, loadSettings.value(key));
+    saveSettings.sync();
+    }
+
+  foreach (QString config, args.values("import-config-org"))
+    {
+    QSettings loadSettings(config, QSettings::IniFormat);
+    QSettings saveSettings(QApplication::organizationName());
+
+    foreach (QString key, loadSettings.allKeys())
+      saveSettings.setValue(key, loadSettings.value(key));
+    saveSettings.sync();
+    }
+
+  // Parse plugin-specific command line options and get list of sources to be
+  // created based on the same
+  QList<vsPendingFactoryAction> sourceActions =
+    vsSourceService::parseArguments(args);
+
+  // Initialize application (i.e. creates vsCore) and create first view
+  app.initialize();
+  app.newView();
+
+  // Connect sources specified on command line
+  foreach (vsPendingFactoryAction sourceAction, sourceActions)
+    {
+    app.connectSource(sourceAction.FactoryIdentifier, sourceAction.SourceUri);
+    }
+
+  vsMainWindow* view = app.firstView();
+  if (view)
+    {
+    const QString filtersFile = args.value("filters-file");
+    if (!filtersFile.isEmpty())
+      {
+      // Load filter settings specified on command line
+      view->loadFilterSettings(filtersFile);
+      }
+
+    const QString maskFile = args.value("mask-image");
+    if (!maskFile.isEmpty())
+      {
+      // Load image mask
+      view->loadMaskImage(maskFile);
+      }
+
+    bool okay;
+    double seekTime = args.value("seek").toDouble(&okay);
+    if (okay)
+      {
+      // Request pending seek
+      view->setPendingSeek(vtkVgTimeStamp(seekTime));
+      }
+
+#ifdef ENABLE_QTTESTING
+    // If given testing arguments, run tests on the initial view; invoke by
+    // queued connection so this doesn't execute until the event loop is up and
+    // running
+    QMetaObject::invokeMethod(view, "initializeTesting", Qt::QueuedConnection,
+                              Q_ARG(const qtCliArgs*, &args));
+#endif
+    }
+
+  return app.exec();
+}
diff --git a/Applications/VsPlay/vsVersion.cmake b/Applications/VsPlay/vsVersion.cmake
new file mode 100644
index 00000000..881c7ad4
--- /dev/null
+++ b/Applications/VsPlay/vsVersion.cmake
@@ -0,0 +1,8 @@
+SET(VSPLAY_VERSION_MAJOR ${VISGUI_VERSION_MAJOR})
+SET(VSPLAY_VERSION_MINOR ${VISGUI_VERSION_MINOR})
+SET(VSPLAY_VERSION_PATCH ${VISGUI_VERSION_PATCH})
+SET(VSPLAY_VERSION_BUILD ${VISGUI_VERSION_BUILD})
+
+SET(VSPLAY_VERSION_STR "${VSPLAY_VERSION_MAJOR}.${VSPLAY_VERSION_MINOR}.${VSPLAY_VERSION_PATCH}-${VSPLAY_VERSION_BUILD}")
+
+SET(VSPLAY_COPY_YEAR ${VISGUI_COPY_YEAR})
diff --git a/Applications/VsPlay/vsVersion.h.in b/Applications/VsPlay/vsVersion.h.in
new file mode 100644
index 00000000..fb838ac9
--- /dev/null
+++ b/Applications/VsPlay/vsVersion.h.in
@@ -0,0 +1,8 @@
+#ifndef _vsplay_version_H
+#define _vsplay_version_H
+
+#define VSPLAY_VERSION_STR "@VSPLAY_VERSION_STR@"
+
+#define VSPLAY_COPY_YEAR @VSPLAY_COPY_YEAR@
+
+#endif
diff --git a/Applications/Web/CMakeLists.txt b/Applications/Web/CMakeLists.txt
new file mode 100644
index 00000000..0d709813
--- /dev/null
+++ b/Applications/Web/CMakeLists.txt
@@ -0,0 +1,8 @@
+vg_option(VISGUI_ENABLE_KOVSQI ON
+  "Enable kovqsi"
+  "VISGUI_ENABLE_WEB"
+)
+
+if(VISGUI_ENABLE_KOVSQI)
+  add_subdirectory(Kovsqi)
+endif()
diff --git a/Applications/Web/Kovsqi/CMakeLists.txt b/Applications/Web/Kovsqi/CMakeLists.txt
new file mode 100644
index 00000000..65cd9b43
--- /dev/null
+++ b/Applications/Web/Kovsqi/CMakeLists.txt
@@ -0,0 +1,11 @@
+project(kovsqi)
+
+vg_install_files_with_prefix(
+  bin/kovsqi.py
+  content/index.html
+  content/config.json
+  TARGET ${PROJECT_NAME}-webContentFiles
+  DESTINATION share/VisGUI/www/apps/${PROJECT_NAME}
+)
+
+vg_web_server(${PROJECT_NAME})
diff --git a/Applications/Web/Kovsqi/bin/kovsqi.py b/Applications/Web/Kovsqi/bin/kovsqi.py
new file mode 100644
index 00000000..e46e6a42
--- /dev/null
+++ b/Applications/Web/Kovsqi/bin/kovsqi.py
@@ -0,0 +1,6 @@
+if __name__ == "__main__":
+  from PySide.QtCore import QCoreApplication
+  QCoreApplication.setApplicationName("KOVSQI")
+
+  from visgui.web import ParaViewServer
+  ParaViewServer.run()
diff --git a/Applications/Web/Kovsqi/content/config.json b/Applications/Web/Kovsqi/content/config.json
new file mode 100644
index 00000000..c4aee905
--- /dev/null
+++ b/Applications/Web/Kovsqi/content/config.json
@@ -0,0 +1,9 @@
+{
+  "osm_map_layers": [
+    {
+      "name": "kitware_osm",
+      "type": "OSM",
+      "urls": [ "http://otile1.mqcdn.com/tiles/1.0.0/sat/${z}/${x}/${y}.png" ]
+    }
+  ]
+}
diff --git a/Applications/Web/Kovsqi/content/index.html b/Applications/Web/Kovsqi/content/index.html
new file mode 100644
index 00000000..919bc285
--- /dev/null
+++ b/Applications/Web/Kovsqi/content/index.html
@@ -0,0 +1,259 @@
+<!DOCTYPE html>
+<!-- saved from url=(0055)http://twitter.github.com/bootstrap/examples/fluid.html -->
+<html lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta charset="utf-8">
+    <title>Kitware Online Vision Systems Query Interface</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <!-- Include local javascript -->
+    <script src="/js/autobahn.min.js"></script>
+    <script src="/js/hammer.min.js"></script>
+    <script src="/js/jquery-1.8.2.min.js"></script>
+    <script src="/js/jquery-ui-1.10.0.min.js"></script>
+    <script src="/js/jquery.hammer.min.js"></script>
+    <script src="/js/gl-matrix-min.js"></script>
+    <script src="/js/bootstrap.min.js"></script>
+    <script src="/js/bootstrap-contextmenu.js"></script>
+    <script src="/js/OpenLayers.js"></script>
+
+    <script src="/js/paraview-all.js"></script>
+    <script src="/js/paraview.ui.pipeline.js"></script>
+    <script src="/js/paraview.ui.toolbar.vcr.js"></script>
+    <script src="/js/paraview.ui.toolbar.viewport.js"></script>
+
+    <script src="/js/visgui.js"></script>
+
+    <!-- Le styles -->
+    <link href="/css/bootstrap.css" rel="stylesheet" />
+    <link href="/css/visgui.css" rel="stylesheet" />
+    <link href="/css/jquery-ui-1.10.0.css" rel="stylesheet" />
+    <script>
+      // Global variable.
+      var vgweb = null;
+
+      // Initialize.
+      var vgWebInitialize = function () {
+        vgweb.parseConfig('config.json', function(config) {
+          vgweb.initializeView(config);
+          vgweb.startSession();
+        });
+      };
+
+      // Shutdown.
+      var vgWebShutdown = function () {
+        vgweb.endSession();
+      };
+
+      // As soon as document is ready to be manipulated
+      // create vgweb instance and initialize it.
+      $( document ).ready(function() {
+        vgweb = new vgWeb();
+        vgWebInitialize();
+      });
+
+    </script>
+  </head>
+
+  <body onbeforeunload="vgWebShutdown()" onunload="vgWebShutdown()">
+
+    <div class="navbar navbar-inverse navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container-fluid">
+          <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="brand" href="#">Kovsqi</a>
+          <div class="nav-collapse collapse">
+            <ul class="nav">
+              <li><a href="#" onclick="javascript:$('#query-file-input').click();">Open query</a></li>
+              <li><a href="#" onclick="javascript:vgweb.refineResults();">Refine</a></li>
+            </ul>
+          </div><!--/.nav-collapse -->
+        </div>
+      </div>
+    </div>
+
+    <div class="container-fluid main-content">
+      <div class="row-fluid">
+        <div class="span6" id="map-placeholder">
+          <div id="map-canvas"></div>
+        </div>
+        <div class="span6">
+          <div class="row-fluid">
+            <div class="well sidebar-nav videoContainer">
+              <div class="container-fluid">
+                <div class="row-fluid">
+                  <div class="span12">
+                    <div class='videoPlayer' id='queryVideoPlayer'>
+                      <div class="video-timestamp">00:00:00</div>
+                    </div>
+                    <div class='videoPlayerController' id='videoPlayerController'>
+                      <div id="video-scrubber"></div>
+                      <button class="btn btn-mini" id='play' onclick=vgweb.runAnimation()>
+                        <img alt="Play" src="/images/icons/playback-play.png" />
+                      </button>
+                      <button class="btn btn-mini" id='stop' onclick=vgweb.stopAnimation()>
+                        <img alt="Stop" src="/images/icons/playback-stop.png" />
+                      </button>
+                      <div class="video-control-separator"></div>
+                      <button class="btn btn-mini active" id='toggle_trails' data-toggle="button" onclick=vgweb.toggleTrails()>
+                        <img title="Toggle visibility of trails" alt="Trails" src="/images/icons/show-trails.png" />
+                      </button>
+                    </div>
+                  </div>
+                </div>
+                <div class="row-fluid">
+                  <div class="span12">
+                    <div class="accordion" id="metadata-accordion">
+                      <div class="accordion-group">
+                        <div class="accordion-heading">
+                          <a class="accordion-toggle" data-toggle="collapse" data-parent="#metadata-accordion" href="#metadata-collapsible">
+                            Video Metadata
+                          </a>
+                        </div>
+                        <div id="metadata-collapsible" class="accordion-body collapse">
+                          <div class="accordion-inner">
+                            <table id="table-videometadata" class="table table-striped table-hover">
+                              <thead>
+                                <tr>
+                                  <th>Name</th>
+                                  <th>Source</th>
+                                  <th>Start Time</th>
+                                  <th>End Time</th>
+                                </tr>
+                              </thead>
+                            </table>
+                            <div class="btn-group track-toggle" data-toggle="buttons-radio">
+                              <button type="button" class="btn btn-primary">Show All</button>
+                              <button type="button" class="btn btn-primary">Hide All</button>
+                            </div>
+                            <div class="btn-group" data-toggle="buttons-checkbox">
+                              <button type="button" class="btn btn-primary">Hide All Events</button>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div> <!--/well (video)-->
+          </div> <!--/row-->
+          <div class="row-fluid">
+            <div id="results">
+              <div class="well sidebar-nav query-results">
+                <div class="container-fluid">
+                  <div class="row-fluid">
+                    <div class="span12">
+                      <ul class="results-tabs nav nav-tabs">
+                        <li class="active"><a href="#results-tab" data-toggle="tab">Results</a></li>
+                        <li><a href="#feedback-tab" data-toggle="tab">Feedback Requests</a></li>
+                      </ul>
+                      <div class="tab-content">
+                        <div class="tab-pane active" id="results-tab">
+                          <div id="table-results">
+                            <div class="row-fluid result-table-header">
+                              <div class="span2 result-col col-number relevant">#</div>
+                              <div class="span2 result-col col-rank">Rank</div>
+                              <div class="span2 result-col col-score">Score</div>
+                              <div class="span2 result-col col-color">Color</div>
+                              <div class="span2 result-col col-start-time">Start Time</div>
+                              <div class="span2 result-col col-end-time">End Time</div>
+                            </div>
+                            <div id="active-results">
+                            <!-- TEMPLATE: Query result row. -->
+                              <div id="template-result-row" class="row-fluid" style="display: none;">
+                                <div class="span2 result-col col-number"></div>
+                                <div class="span2 result-col col-rank"></div>
+                                <div class="span2 result-col col-score"></div>
+                                <div class="span2 result-col col-color">
+                                  <div class="visgui-color-swatch"></div>
+                                </div>
+                                <div class="span2 result-col col-start-time"></div>
+                                <div class="span2 result-col col-end-time"></div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <div class="tab-pane" id="feedback-tab">
+                          <div id="table-feedback">
+                            <div class="row-fluid result-table-header">
+                              <div class="span2 result-col col-number relevant">#</div>
+                              <div class="span2 result-col col-rank">Rank</div>
+                              <div class="span2 result-col col-score">Preference</div>
+                              <div class="span2 result-col col-color">Color</div>
+                              <div class="span2 result-col col-start-time">Start Time</div>
+                              <div class="span2 result-col col-end-time">End Time</div>
+                            </div>
+                            <div id="active-feedback-requests">
+                            <!-- TEMPLATE: Feedback request row. -->
+                              <div id="template-feedback-row" class="row-fluid" style="display: none;">
+                                <div class="span2 result-col col-number"></div>
+                                <div class="span2 result-col col-rank"></div>
+                                <div class="span2 result-col col-score"></div>
+                                <div class="span2 result-col col-color">
+                                  <div class="visgui-color-swatch"></div>
+                                </div>
+                                <div class="span2 result-col col-start-time"></div>
+                                <div class="span2 result-col col-end-time"></div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div> <!-- /tab-content -->
+                    </div>
+                  </div>
+                </div>
+              </div><!--/well (query results)-->
+            </div>
+          </div><!--/row-->
+        </div>
+      </div>
+    </div>
+
+    <!--<div class="span4">
+      <footer class="kw-footer">
+        <p>© Kitware 2013</p>
+      </footer>
+    </div>-->
+    </div>
+  </div><!--/.fluid-container-->
+
+    <!-- Le javascript
+    ================================================== -->
+    <!-- Placed at the end of the document so the pages load faster -->
+
+
+</body></html>
+
+<!-- Hidden form for uploading query plan files. -->
+<input class="hide" type="file" accept=".vqp" id="query-file-input" onchange="vgweb.querySelected();"/>
+
+<!-- Modal dialog: generic loading message -->
+<div id="loading-dialog" class="modal hide fade">
+  <div class="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+    <h3>Please Wait</h3>
+  </div>
+  <div class="modal-body">
+    <p>
+      <img src="/images/icons/loading.gif"/>
+      <span class="loading-message"></span>
+    </p>
+  </div>
+</div>
+
+<!-- Result row action menu template. -->
+<div id="result-context-menu">
+  <ul class="dropdown-menu" role="menu">
+    <li><a class="rate-relevant-action" tabindex="-1" href="#">Rate as Relevant</a></li>
+    <li><a class="rate-not-relevant-action" tabindex="-1" href="#">Rate as Not Relevant</a></li>
+    <li><a class="remove-rating-action" tabindex="-1" href="#">Remove Rating</a></li>
+    <li class="divider"></li>
+    <li><a class="view-tracking-clip-action" tabindex="-1" href="#">View Tracking Clip(s)</a></li>
+  </ul>
+</div>
diff --git a/CMake/CTestCustom.ctest.in b/CMake/CTestCustom.ctest.in
new file mode 100644
index 00000000..5f8822e5
--- /dev/null
+++ b/CMake/CTestCustom.ctest.in
@@ -0,0 +1,14 @@
+set(CTEST_CUSTOM_WARNING_EXCEPTION
+  ${CTEST_CUSTOM_WARNING_EXCEPTION}
+  "jmem_src"
+  "TPL/libkml"
+  "TPL/vidtk"
+  "TPL/vxl"
+  "vgl_polygon"
+  "kml/dom"
+)
+
+set(CTEST_CUSTOM_COVERAGE_EXCLUDE
+  ${CTEST_CUSTOM_COVERAGE_EXCLUDE}
+  ".*moc_.*cxx"
+)
diff --git a/CMake/CTestInclude.cmake.in b/CMake/CTestInclude.cmake.in
new file mode 100644
index 00000000..2c9bd76c
--- /dev/null
+++ b/CMake/CTestInclude.cmake.in
@@ -0,0 +1,31 @@
+#------------------------------------------------------------------------------
+# Prepend a path to the specified environment variable
+macro(prepend_environment_path NAME PATH)
+  if("x_$ENV{${NAME}}" STREQUAL "x_")
+    set(ENV{${NAME}} "${PATH}")
+  elseif(WIN32)
+    set(ENV{${NAME}} "${PATH}\\;$ENV{${NAME}}")
+  else()
+    set(ENV{${NAME}} "${PATH}:$ENV{${NAME}}")
+  endif()
+endmacro()
+
+###############################################################################
+
+# Set environment for Python tests
+prepend_environment_path(PYTHONPATH "@visGUI_SOURCE_DIR@/Modules")
+if(WIN32)
+  prepend_environment_path(PYTHONPATH "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@")
+  prepend_environment_path(PATH "@CMAKE_RUNTIME_OUTPUT_DIRECTORY@")
+else()
+  prepend_environment_path(PYTHONPATH "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
+  if(APPLE)
+    prepend_environment_path(DYLD_LIBRARY_PATH
+      "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"
+    )
+  else()
+    prepend_environment_path(LD_LIBRARY_PATH
+      "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@"
+    )
+  endif()
+endif()
diff --git a/CMake/Doxyfile.in b/CMake/Doxyfile.in
new file mode 100644
index 00000000..f02ef25f
--- /dev/null
+++ b/CMake/Doxyfile.in
@@ -0,0 +1,258 @@
+# Doxyfile 1.8.1.1
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+DOXYFILE_ENCODING       = UTF-8
+PROJECT_NAME            = @DOXYGEN_PROJECT_NAME@
+PROJECT_NUMBER          = @VISGUI_VERSION_STR@
+OUTPUT_DIRECTORY        = @DOXYGEN_DOCUMENTATION_OUTPUT_PATH@
+CREATE_SUBDIRS          = NO
+OUTPUT_LANGUAGE         = English
+BRIEF_MEMBER_DESC       = YES
+REPEAT_BRIEF            = YES
+ABBREVIATE_BRIEF        =
+ALWAYS_DETAILED_SEC     = NO
+INLINE_INHERITED_MEMB   = NO
+FULL_PATH_NAMES         = YES
+STRIP_FROM_PATH         = @DOXYGEN_PROJECT_SOURCE_DIR@
+STRIP_FROM_INC_PATH     =
+SHORT_NAMES             = NO
+JAVADOC_AUTOBRIEF       = YES
+QT_AUTOBRIEF            = YES
+MULTILINE_CPP_IS_BRIEF  = NO
+INHERIT_DOCS            = YES
+SEPARATE_MEMBER_PAGES   = NO
+TAB_SIZE                = 8
+ALIASES                 =
+TCL_SUBST               =
+OPTIMIZE_OUTPUT_FOR_C   = NO
+OPTIMIZE_OUTPUT_JAVA    = NO
+OPTIMIZE_FOR_FORTRAN    = NO
+OPTIMIZE_OUTPUT_VHDL    = NO
+EXTENSION_MAPPING       =
+MARKDOWN_SUPPORT        = NO
+BUILTIN_STL_SUPPORT     = NO
+CPP_CLI_SUPPORT         = NO
+SIP_SUPPORT             = NO
+IDL_PROPERTY_SUPPORT    = NO
+DISTRIBUTE_GROUP_DOC    = YES
+SUBGROUPING             = YES
+INLINE_GROUPED_CLASSES  = NO
+INLINE_SIMPLE_STRUCTS   = NO
+TYPEDEF_HIDES_STRUCT    = NO
+SYMBOL_CACHE_SIZE       = 0
+LOOKUP_CACHE_SIZE       = 0
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+EXTRACT_ALL             = NO
+EXTRACT_PRIVATE         = NO
+EXTRACT_PACKAGE         = NO
+EXTRACT_STATIC          = NO
+EXTRACT_LOCAL_CLASSES   = NO
+EXTRACT_LOCAL_METHODS   = NO
+EXTRACT_ANON_NSPACES    = NO
+HIDE_UNDOC_MEMBERS      = NO
+HIDE_UNDOC_CLASSES      = NO
+HIDE_FRIEND_COMPOUNDS   = NO
+HIDE_IN_BODY_DOCS       = NO
+INTERNAL_DOCS           = NO
+CASE_SENSE_NAMES        = YES
+HIDE_SCOPE_NAMES        = NO
+SHOW_INCLUDE_FILES      = YES
+FORCE_LOCAL_INCLUDES    = NO
+INLINE_INFO             = YES
+SORT_MEMBER_DOCS        = YES
+SORT_BRIEF_DOCS         = NO
+SORT_MEMBERS_CTORS_1ST  = YES
+SORT_GROUP_NAMES        = NO
+SORT_BY_SCOPE_NAME      = NO
+STRICT_PROTO_MATCHING   = NO
+GENERATE_TODOLIST       = NO
+GENERATE_TESTLIST       = YES
+GENERATE_BUGLIST        = YES
+GENERATE_DEPRECATEDLIST = YES
+ENABLED_SECTIONS        =
+MAX_INITIALIZER_LINES   = 0
+SHOW_USED_FILES         = NO
+SHOW_FILES              = YES
+SHOW_NAMESPACES         = YES
+FILE_VERSION_FILTER     =
+LAYOUT_FILE             =
+CITE_BIB_FILES          =
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET                   = YES
+WARNINGS                = YES
+WARN_IF_UNDOCUMENTED    = NO
+WARN_IF_DOC_ERROR       = YES
+WARN_NO_PARAMDOC        = NO
+WARN_FORMAT             = "$file:$line: $text"
+WARN_LOGFILE            =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT                   = @DOXYGEN_PROJECT_SOURCE_DIR@
+INPUT_ENCODING          = UTF-8
+FILE_PATTERNS           = *.cxx *.h *.dox
+RECURSIVE               = YES
+EXCLUDE                 =
+EXCLUDE_SYMLINKS        = NO
+EXCLUDE_PATTERNS        = @DOXYGEN_EXCLUDE_PATTERNS@
+EXCLUDE_SYMBOLS         =
+EXAMPLE_PATH            = @DOXYGEN_PROJECT_SOURCE_DIR@/doc
+EXAMPLE_PATTERNS        = *
+EXAMPLE_RECURSIVE       = NO
+IMAGE_PATH              =
+INPUT_FILTER            =
+FILTER_PATTERNS         =
+FILTER_SOURCE_FILES     = NO
+FILTER_SOURCE_PATTERNS  =
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER          = NO
+INLINE_SOURCES          = NO
+STRIP_CODE_COMMENTS     = YES
+REFERENCED_BY_RELATION  = NO
+REFERENCES_RELATION     = NO
+REFERENCES_LINK_SOURCE  = YES
+USE_HTAGS               = NO
+VERBATIM_HEADERS        = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX      = YES
+COLS_IN_ALPHA_INDEX     = 5
+IGNORE_PREFIX           =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML           = @GENERATE_HTML@
+HTML_OUTPUT             = .
+HTML_FILE_EXTENSION     = .html
+HTML_HEADER             =
+HTML_FOOTER             =
+HTML_STYLESHEET         =
+HTML_EXTRA_STYLESHEET   = @DOXYGEN_EXTRA_STYLESHEET@
+HTML_EXTRA_FILES        =
+HTML_COLORSTYLE_HUE     = 220
+HTML_COLORSTYLE_SAT     = 100
+HTML_COLORSTYLE_GAMMA   = 80
+HTML_TIMESTAMP          = NO
+HTML_DYNAMIC_SECTIONS   = NO
+HTML_INDEX_NUM_ENTRIES  = 100
+GENERATE_DOCSET         = NO
+DOCSET_FEEDNAME         = "Kitware"
+DOCSET_BUNDLE_ID        = com.kitware.visgui.@DOXYGEN_PROJECT_NAME@
+DOCSET_PUBLISHER_ID     = com.kitware.documentation
+DOCSET_PUBLISHER_NAME   = Kitware
+GENERATE_HTMLHELP       = NO
+CHM_FILE                =
+HHC_LOCATION            =
+GENERATE_CHI            = NO
+CHM_INDEX_ENCODING      =
+BINARY_TOC              = NO
+TOC_EXPAND              = NO
+GENERATE_QHP            = YES
+QCH_FILE                =
+QHP_NAMESPACE           = com.kitware.visgui.@DOXYGEN_PROJECT_NAME@
+QHP_VIRTUAL_FOLDER      = doc
+QHP_CUST_FILTER_NAME    =
+QHP_CUST_FILTER_ATTRS   =
+QHP_SECT_FILTER_ATTRS   =
+QHG_LOCATION            =
+GENERATE_ECLIPSEHELP    = NO
+ECLIPSE_DOC_ID          = com.kitware.visgui.@DOXYGEN_PROJECT_NAME@
+DISABLE_INDEX           = NO
+GENERATE_TREEVIEW       = NO
+ENUM_VALUES_PER_LINE    = 4
+TREEVIEW_WIDTH          = 250
+EXT_LINKS_IN_WINDOW     = NO
+FORMULA_FONTSIZE        = 10
+FORMULA_TRANSPARENT     = YES
+USE_MATHJAX             = NO
+MATHJAX_RELPATH         = http://cdn.mathjax.org/mathjax/latest
+MATHJAX_EXTENSIONS      =
+SEARCHENGINE            = NO
+SERVER_BASED_SEARCH     = NO
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX          = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF            = NO
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN            = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML            = NO
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF    = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD        = NO
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING    = YES
+MACRO_EXPANSION         = YES
+EXPAND_ONLY_PREDEF      = YES
+SEARCH_INCLUDES         = YES
+INCLUDE_PATH            = @DOXYGEN_INCLUDE_PATHS@
+INCLUDE_FILE_PATTERNS   = *
+PREDEFINED              = DOXYGEN QTE_EXPORT
+EXPAND_AS_DEFINED       = QTE_OVERRIDE
+SKIP_FUNCTION_MACROS    = YES
+#---------------------------------------------------------------------------
+# Configuration::additions related to external references
+#---------------------------------------------------------------------------
+TAGFILES                = @DOXYGEN_TAG_FILES@
+GENERATE_TAGFILE        = @DOXYGEN_OUTPUT_TAG_FILE@
+ALLEXTERNALS            = NO
+EXTERNAL_GROUPS         = NO
+PERL_PATH               = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS          = YES
+MSCGEN_PATH             =
+HIDE_UNDOC_RELATIONS    = YES
+HAVE_DOT                = YES
+DOT_NUM_THREADS         = 0
+DOT_FONTNAME            = DejaVu Sans
+DOT_FONTSIZE            = 10
+DOT_FONTPATH            =
+CLASS_GRAPH             = YES
+COLLABORATION_GRAPH     = NO
+GROUP_GRAPHS            = YES
+UML_LOOK                = NO
+UML_LIMIT_NUM_FIELDS    = 10
+TEMPLATE_RELATIONS      = YES
+INCLUDE_GRAPH           = YES
+INCLUDED_BY_GRAPH       = NO
+CALL_GRAPH              = NO
+CALLER_GRAPH            = NO
+GRAPHICAL_HIERARCHY     = YES
+DIRECTORY_GRAPH         = YES
+DOT_IMAGE_FORMAT        = png
+INTERACTIVE_SVG         = NO
+DOT_PATH                =
+DOTFILE_DIRS            =
+MSCFILE_DIRS            =
+DOT_GRAPH_MAX_NODES     = 50
+MAX_DOT_GRAPH_DEPTH     = 0
+DOT_TRANSPARENT         = YES
+DOT_MULTI_TARGETS       = NO
+GENERATE_LEGEND         = YES
+DOT_CLEANUP             = YES
diff --git a/CMake/GetGitStatus.cmake b/CMake/GetGitStatus.cmake
new file mode 100644
index 00000000..6805be30
--- /dev/null
+++ b/CMake/GetGitStatus.cmake
@@ -0,0 +1,13 @@
+execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
+                WORKING_DIRECTORY ${GIT_STATUS_WORKING_DIR}
+                RESULT_VARIABLE _git_status_result
+                OUTPUT_VARIABLE GIT_SHA1
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+execute_process(COMMAND "${GIT_EXECUTABLE}" status -z --porcelain --untracked-files=normal
+                WORKING_DIRECTORY ${GIT_STATUS_WORKING_DIR}
+                RESULT_VARIABLE _git_status_result
+                OUTPUT_VARIABLE GIT_STATUS
+                OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+configure_file(${GIT_STATUS_INPUT_FILE} ${GIT_STATUS_OUTPUT_FILE} @ONLY)
diff --git a/CMake/InstallRules/CMakeLists.txt b/CMake/InstallRules/CMakeLists.txt
new file mode 100644
index 00000000..a55cc986
--- /dev/null
+++ b/CMake/InstallRules/CMakeLists.txt
@@ -0,0 +1,55 @@
+# Bundle cpack
+include(InstallRequiredSystemLibraries)
+
+set(DIRS ${global_library_search_paths} ${Boost_LIBRARY_DIRS})
+
+set(BINARY_NAME)
+set(BINARY_DIR)
+if(VISGUI_ENABLE_VSPLAY)
+  set(BINARY_NAME vsPlay)
+  set(BINARY_DIR  ${vsPlay_BINARY_DIR})
+elseif(VISGUI_ENABLE_VPVIEW)
+  set(BINARY_NAME vpView)
+  set(BINARY_DIR  ${vpView_BINARY_DIR})
+  set(DIRS ${DIRS} ${CPPDB_LIB_DIR})
+else()
+  message(FATAL_ERROR "Installer only supports vpView and vsPlay at this time")
+endif()
+
+set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/${BINARY_NAME}")
+if(WIN32)
+  set(APPS "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin/${BINARY_NAME}.exe")
+  set(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\\\${BINARY_NAME}.exe")
+endif(WIN32)
+if(APPLE)
+  SET(APPS "\${CMAKE_INSTALL_PREFIX}/${BINARY_NAME}.app")
+
+  # Write an empty qt.conf file. Without this, Qt will spew warnings about
+  # ambiguous library references when running the Mac app bundle on a system
+  # with its own Qt installation.
+  set(QT_CONF_DIR ${BINARY_NAME}.app/Contents/Resources)
+  INSTALL(CODE "
+    file(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QT_CONF_DIR}/qt.conf\" \"\")
+  ")
+endif(APPLE)
+
+
+
+if (NOT VISGUI_DISABLE_FIXUP_BUNDLE)
+install(CODE "
+  message(\"Running fixup_bundle\")
+  include(BundleUtilities)
+  fixup_bundle(\"${APPS}\" \"\" \"${DIRS}\")
+")
+endif()
+
+set(CPACK_PACKAGE_NAME "VisGUI")
+set(CPACK_PACKAGE_VENDOR "Kitware")
+set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}")
+# Currently the versions match irrespective of the application
+set(CPACK_PACKAGE_VERSION_MAJOR ${VISGUI_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${VISGUI_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${VISGUI_VERSION_PATCH})
+
+set(CPACK_PACKAGE_EXECUTABLES "${BINARY_NAME}" "VisGUI ${BINARY_NAME}")
+include(CPack)
diff --git a/CMake/Modules/FindGDAL.cmake b/CMake/Modules/FindGDAL.cmake
new file mode 100644
index 00000000..be161d6b
--- /dev/null
+++ b/CMake/Modules/FindGDAL.cmake
@@ -0,0 +1,44 @@
+#ckwg +4
+# Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+# KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+# Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+
+# Locate the system installed PROJ
+#
+# The following variables will guide the build:
+#
+# GDAL_ROOT        - Set to the install prefix of the PROJ library
+#
+# The following variables will be set:
+#
+# GDAL_FOUND       - Set to true if PROJ can be found
+# GDAL_INCLUDE_DIR - The path to the PROJ header files
+# GDAL_LIBRARY     - The full path to the PROJ library
+
+if( GDAL_DIR )
+  find_package( GDAL NO_MODULE )
+elseif( NOT GDAL_FOUND )
+  if (WIN32)
+    set(_gdal_library gdal_i)
+  else()
+    set(_gdal_library gdal)
+  endif()
+
+  # Backup the previous root path
+  if(GDAL_ROOT)
+    set(_CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})
+    set(CMAKE_FIND_ROOT_PATH ${GDAL_ROOT})
+    set(_GDAL_ROOT_OPTS ONLY_CMAKE_FIND_ROOT_PATH)
+  endif()
+
+  find_path(GDAL_INCLUDE_DIR gdal.h ${_GDAL_ROOT_OPTS} PATH_SUFFIXES gdal)
+  find_library( GDAL_LIBRARY ${_gdal_library} ${_GDAL_ROOT_OPTS})
+
+  # Restore the original root path
+  if(GDAL_ROOT)
+    set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})
+  endif()
+
+  include( FindPackageHandleStandardArgs )
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS( GDAL GDAL_INCLUDE_DIR GDAL_LIBRARY )
+endif()
diff --git a/CMake/Modules/FindLIBJSON.cmake b/CMake/Modules/FindLIBJSON.cmake
new file mode 100644
index 00000000..277722e4
--- /dev/null
+++ b/CMake/Modules/FindLIBJSON.cmake
@@ -0,0 +1,38 @@
+#ckwg +4
+# Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+# KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+# Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+
+# Locate the system installed PROJ
+#
+# The following variables will guide the build:
+#
+# LIBJSON_ROOT        - Set to the install prefix of the PROJ library
+# LIBJSON_LIBNAME     - Name of the installed library (defaults to json)
+#
+# The following variables will be set:
+#
+# LIBJSON_FOUND       - Set to true if PROJ can be found
+# LIBJSON_INCLUDE_DIR - The path to the PROJ header files
+# LIBJSON_LIBRARY     - The full path to the PROJ library
+
+if( LIBJSON_DIR )
+  find_package( LIBJSON NO_MODULE )
+elseif( NOT LIBJSON_FOUND )
+
+  if(NOT LIBJSON_LIBNAME)
+    set(LIBJSON_LIBNAME json)
+  endif()
+
+  # Backup the previous root path
+  if(LIBJSON_ROOT)
+    set(_LIBJSON_ROOT_OPTS_INCLUDE ${LIBJSON_ROOT}/include/${LIBJSON_LIBNAME})
+    set(_LIBJSON_ROOT_OPTS_LIB     ${LIBJSON_ROOT}/lib)
+  endif()
+
+  find_path(LIBJSON_INCLUDE_DIR ${LIBJSON_LIBNAME}.h ${_LIBJSON_ROOT_OPTS_INCLUDE})
+  find_library(LIBJSON_LIBRARY ${LIBJSON_LIBNAME} ${_LIBJSON_ROOT_OPTS_LIB})
+
+  include( FindPackageHandleStandardArgs )
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS( LIBJSON LIBJSON_INCLUDE_DIR LIBJSON_LIBRARY )
+endif()
diff --git a/CMake/Modules/FindLTIDSDK.cmake b/CMake/Modules/FindLTIDSDK.cmake
new file mode 100644
index 00000000..16a03e76
--- /dev/null
+++ b/CMake/Modules/FindLTIDSDK.cmake
@@ -0,0 +1,64 @@
+# Copyright 2012 by Kitware, Inc. All Rights Reserved.
+#
+# Author: Chuck Atkins <chuck dot atkins at kitware dot com>
+#
+# Locate the LizardTech Raster Decode SDK
+#
+# If set, the following variable will be used to guide the search
+# LTIDSDK_ROOT        - The locations of the extracted Raster_DSDK folder
+#
+# The following variables will be set:
+#
+# LTIDSDK_FOUND       - Set to true if Decode SDK can be found
+# LTIDSDK_INCLUDE_DIR - The path to the SDK  header files
+# LTIDSDK_LIBRARIES   - The full path to the SDK libraries
+
+if( NOT LTIDSDK_FOUND )
+
+  if (WIN32)
+    set(_lti_dsdk_lib lti_dsdk)
+  else()
+    set(_lti_dsdk_lib ltidsdk)
+  endif()
+
+  if( LTIDSDK_ROOT )
+    set( LTIDSDK_INCLUDE_PATH_HINT ${LTIDSDK_ROOT}/include )
+    set( LTIDSDK_LIBRARY_PATH_HINT ${LTIDSDK_ROOT}/lib )
+  else( LTIDSDK_ROOT )
+    set( LTIDSDK_INCLUDE_PATH_HINT )
+    set( LTIDSDK_LIBRARY_PATH_HINT )
+  endif( LTIDSDK_ROOT )
+
+  find_path( LTIDSDK_INCLUDE_DIR lt_base.h ${LTIDSDK_INCLUDE_PATH_HINT} )
+  find_library( LTIDSDK_LIBRARIES ${_lti_dsdk_lib} ${LTIDSDK_LIBRARY_PATH_HINT} )
+  if(LTIDSDK_LIBRARIES)
+    find_package(Threads REQUIRED)
+    list(APPEND LTIDSDK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+  endif()
+
+  # Determine the SDK version
+  if(LTIDSDK_INCLUDE_DIR)
+    file( READ ${LTIDSDK_INCLUDE_DIR}/lti_version.h LTIDSDK_VERSION_FILE )
+    string( REGEX MATCH "LTI_SDK_MAJOR *[0-9]+"
+      LTIDSDK_VERSION_MAJOR "${LTIDSDK_VERSION_FILE}" )
+    string( REGEX REPLACE "LTI_SDK_MAJOR *" ""
+      LTIDSDK_VERSION_MAJOR "${LTIDSDK_VERSION_MAJOR}" )
+    string( REGEX MATCH "LTI_SDK_MINOR *[0-9]+"
+      LTIDSDK_VERSION_MINOR "${LTIDSDK_VERSION_FILE}" )
+    string( REGEX REPLACE "LTI_SDK_MINOR *" ""
+      LTIDSDK_VERSION_MINOR "${LTIDSDK_VERSION_MINOR}" )
+    string( REGEX MATCH "LTI_SDK_REV *[0-9]+"
+      LTIDSDK_VERSION_PATCH "${LTIDSDK_VERSION_FILE}" )
+    string( REGEX REPLACE "LTI_SDK_REV *" ""
+      LTIDSDK_VERSION_PATCH "${LTIDSDK_VERSION_PATCH}" )
+    set(LTIDSDK_VERSION "${LTIDSDK_VERSION_MAJOR}.${LTIDSDK_VERSION_MINOR}.${LTIDSDK_VERSION_PATCH}")
+  else()
+    set(LTIDSDK_VERSION "0.0.0")
+  endif()
+
+  include( FindPackageHandleStandardArgs )
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS( LTIDSDK
+    REQUIRED_VARS LTIDSDK_INCLUDE_DIR LTIDSDK_LIBRARIES
+    VERSION_VAR LTIDSDK_VERSION
+  )
+endif(NOT LTIDSDK_FOUND)
diff --git a/CMake/Modules/FindPROJ4.cmake b/CMake/Modules/FindPROJ4.cmake
new file mode 100644
index 00000000..e3e73872
--- /dev/null
+++ b/CMake/Modules/FindPROJ4.cmake
@@ -0,0 +1,39 @@
+#ckwg +4
+# Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+# KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+# Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+
+# Locate the system installed PROJ
+#
+# The following variables will guide the build:
+#
+# PROJ4_ROOT        - Set to the install prefix of the PROJ library
+#
+# The following variables will be set:
+#
+# PROJ4_FOUND       - Set to true if PROJ can be found
+# PROJ4_INCLUDE_DIR - The path to the PROJ header files
+# PROJ4_LIBRARY     - The full path to the PROJ library
+
+if( PROJ4_DIR )
+  find_package( PROJ NO_MODULE )
+elseif( NOT PROJ4_FOUND )
+
+  # Backup the previous root path
+  if(PROJ4_ROOT)
+    set(_CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})
+    set(CMAKE_FIND_ROOT_PATH ${PROJ4_ROOT})
+    set(_PROJ4_ROOT_OPTS ONLY_CMAKE_FIND_ROOT_PATH)
+  endif()
+
+  find_path( PROJ4_INCLUDE_DIR proj_api.h ${_PROJ4_ROOT_OPTS})
+  find_library( PROJ4_LIBRARY proj ${_PROJ4_ROOT_OPTS})
+
+  # Restore the original root path
+  if(PROJ4_ROOT)
+    set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH})
+  endif()
+
+  include( FindPackageHandleStandardArgs )
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS( PROJ4 PROJ4_INCLUDE_DIR PROJ4_LIBRARY )
+endif()
diff --git a/CMake/VisGUIConfig.cmake.in b/CMake/VisGUIConfig.cmake.in
new file mode 100644
index 00000000..adaf7b4b
--- /dev/null
+++ b/CMake/VisGUIConfig.cmake.in
@@ -0,0 +1,6 @@
+# VisGUI include directory and libraries
+set(VisGUI_INCLUDE_DIR @VisGUI_INCLUDE_DIR@)
+
+# Import library targets
+get_filename_component(_SELF_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+include(${_SELF_DIR}/VisGUIConfigTargets.cmake)
diff --git a/CMake/configure-file-script.cmake b/CMake/configure-file-script.cmake
new file mode 100644
index 00000000..4bdd5a0d
--- /dev/null
+++ b/CMake/configure-file-script.cmake
@@ -0,0 +1,2 @@
+string(REPLACE " " ";" CONFIGURE_ARGS "${CONFIGURE_ARGS}")
+configure_file("${INPUT_FILE}" "${OUTPUT_FILE}" ${CONFIGURE_ARGS})
diff --git a/CMake/coredeps.cmake b/CMake/coredeps.cmake
new file mode 100644
index 00000000..c0b036f3
--- /dev/null
+++ b/CMake/coredeps.cmake
@@ -0,0 +1,148 @@
+list(APPEND CMAKE_MODULE_PATH ${visGUI_SOURCE_DIR}/CMake/Modules)
+
+# Boost is required.
+if(WIN32)
+  set(Boost_USE_STATIC_LIBS ON)
+endif()
+add_definitions(-DBOOST_ALL_NO_LIB)
+find_package(Boost REQUIRED
+  COMPONENTS thread signals system filesystem date_time
+)
+set(CMAKE_THREAD_PREFER_PTHREAD 1)
+find_package(Threads)
+set(Boost_LIBRARIES ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+
+if(VISGUI_ENABLE_VPVIEW OR VISGUI_ENABLE_WEB)
+  # libjson is required for vpView and vtkVwCore
+  find_package(LIBJSON REQUIRED)
+endif()
+
+set(vtk_python_wrap_core)
+if(VISGUI_ENABLE_PYTHON)
+  set(vtk_python_wrap_core vtkPython vtkWrappingPythonCore)
+endif()
+
+set(vtk_testing_support)
+if(BUILD_TESTING)
+  set(vtk_testing_support vtkTestingRendering)
+endif()
+
+# VTK is required
+set(VTK_REQUIRED_COMPONENTS
+  # Core components
+  vtkChartsCore
+  vtkCommonCore
+  vtkFiltersCore
+  vtkImagingCore
+  vtkInfovisCore
+  vtkIOCore
+  vtkViewsCore
+  # Additional features
+  ${vtk_python_wrap_core}
+  vtkCommonColor
+  vtkCommonDataModel
+  vtkCommonExecutionModel
+  vtkCommonMath
+  vtkCommonSystem
+  vtkFiltersExtraction
+  vtkFiltersGeneral
+  vtkFiltersHybrid
+  vtkFiltersModeling
+  vtkFiltersSources
+  vtkFiltersStatistics
+  vtkFiltersTexture
+  vtkImagingHybrid
+  vtkImagingStencil
+  vtkInfovisLayout
+  vtkInteractionStyle
+  vtkInteractionWidgets
+  vtkIOImage
+  vtkIOLegacy
+  vtkIOXML
+  vtkRenderingAnnotation
+  vtkRenderingContext2D
+  vtkRenderingFreeType
+  vtkRenderingFreeTypeOpenGL
+  vtkRenderingLabel
+  vtkRenderingOpenGL
+  vtkRenderingVolumeOpenGL
+  vtksys
+  ${vtk_testing_support}
+  vtkViewsContext2D
+  vtkViewsInfovis
+  # GUI support
+  vtkGUISupportQt
+)
+
+# We need ParaView for VisGUI-Web
+if(VISGUI_ENABLE_WEB)
+  find_package(ParaView REQUIRED)
+  include(${PARAVIEW_USE_FILE})
+  if (NOT VTK_DIR AND EXISTS "${VTK_CONFIG_FILE}")
+    get_filename_component(VTK_DIR "${VTK_CONFIG_FILE}" PATH)
+  elseif(VTK_DIR)
+    message("Using VTK from ${VTK_DIR}")
+  endif()
+endif()
+
+find_package(VTK NO_MODULE REQUIRED COMPONENTS ${VTK_REQUIRED_COMPONENTS})
+include(${VTK_USE_FILE})
+
+# We need this definition to be set regardless
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${VTK_DEFINITIONS})
+
+include(vtkExternalModuleMacros)
+if(VISGUI_ENABLE_PYTHON)
+  include(vtkPythonWrapping)
+  set(VTK_WRAP_TCL OFF)
+  find_file(VTK_WRAP_HINTS
+    NAMES hints
+    PATHS ${VTK_CMAKE_DIR}/../Wrapping/Tools
+    NO_CMAKE_FIND_ROOT_PATH
+  )
+endif()
+
+find_package(VXL REQUIRED)
+
+# DO NOT use UseVXL.cmake; its documentation stuff is broken
+include_directories(SYSTEM ${VXL_VCL_INCLUDE_DIR} ${VXL_CORE_INCLUDE_DIR})
+link_directories(${VXL_LIBRARY_DIR})
+
+if (VISGUI_ENABLE_VIDTK)
+  find_package(vidtk REQUIRED)
+  add_definitions(-DVISGUI_USE_VIDTK)
+
+  # This is a fix for a change in VIDTK. It is required or else
+  # class definitions and other code would be different when seen
+  # by VISGUI.
+  add_definitions(-DUUIDABLE)
+endif()
+
+# QtTesting is required for tests
+find_package(QtTesting QUIET)
+if(QtTesting_FOUND)
+  find_multi_configuration_library(QtTesting QtTesting ${QtTesting_LIBRARY_DIR})
+  set(QtTesting_LIBRARIES ${QtTesting_LIBRARY})
+else()
+   message("QtTesting was not found; GUI testing will not be enabled")
+endif()
+
+set(QT_USE_QTNETWORK TRUE)
+set(QT_USE_QTXML TRUE)
+find_package(Qt4 4.7.0 REQUIRED)
+
+# This adds ${QT_INCLUDE_DIR} to the build (via include_directories)
+include(${QT_USE_FILE})
+
+find_package(PROJ4 REQUIRED)
+
+if(VISGUI_ENABLE_VSPLAY OR VISGUI_ENABLE_VIQUI)
+  find_package(KML REQUIRED)
+endif()
+
+if(VISGUI_ENABLE_GDAL)
+  find_package(GDAL REQUIRED)
+  add_definitions(-DVISGUI_USE_GDAL)
+endif()
+
+find_package(geographiclib REQUIRED)
diff --git a/CMake/doxygen-script.cmake b/CMake/doxygen-script.cmake
new file mode 100644
index 00000000..77c0de3f
--- /dev/null
+++ b/CMake/doxygen-script.cmake
@@ -0,0 +1,21 @@
+# Create configuration for generating tag file
+set(DOXYGEN_OUTPUT_TAG_FILE
+  "${DOXYGEN_DOCUMENTATION_OUTPUT_PATH}/${DOXYGEN_PROJECT_NAME}.tag"
+)
+set(GENERATE_HTML NO)
+
+configure_file(
+  "${DOXYGEN_TEMPLATE}"
+  "${DOXYGEN_OUTPUT_FILE}.tag"
+  @ONLY
+)
+
+# Create configuration for generating HTML
+set(DOXYGEN_OUTPUT_TAG_FILE)
+set(GENERATE_HTML YES)
+
+configure_file(
+  "${DOXYGEN_TEMPLATE}"
+  "${DOXYGEN_OUTPUT_FILE}.html"
+  @ONLY
+)
diff --git a/CMake/doxygen.cmake b/CMake/doxygen.cmake
new file mode 100644
index 00000000..dc9bc44d
--- /dev/null
+++ b/CMake/doxygen.cmake
@@ -0,0 +1,145 @@
+# Doxygen functions for the visGUI project
+# The following functions are defined:
+#   create_doxygen
+# Their syntax is:
+#   create_doxygen(inputdir name [tagdep...])
+#     The first argument is the directory to use as the input directory for
+#     doxygen. The targets `doxygen-${name}-dir', `doxygen-${name}-doxyfile',
+#     `doxygen-${name}-tag', and `doxygen-${name}' will be created. All
+#     `tagdep' arguments will be added as dependencies.
+
+vg_option(INSTALL_DOCUMENTATION ON
+  "Install documentation"
+  "BUILD_DOCUMENTATION" OFF
+)
+
+if(BUILD_DOCUMENTATION)
+  find_package(Doxygen REQUIRED)
+  add_custom_target(doc)
+
+  # Find qhelpgenerator
+  find_program(QHELPGENERATOR_EXECUTABLE qhelpgenerator HINTS ${QT_BINARY_DIR})
+
+  # Find Qt tag file
+  find_file(QT4_TAG_FILE
+    NAMES qt4.tags qt4.tag qt.tags qt.tag
+    PATHS "${QT_DOC_DIR}"
+    PATH_SUFFIXES html
+  )
+
+  set(QT4_EXTRA_TAG_FILE
+    "${visGUI_BINARY_DIR}/doc/qt4-extra.tag" CACHE INTERNAL
+    "Location of generated file containing additional Doxygen tags for Qt4"
+    FORCE
+  )
+endif()
+
+# Function to create documentation
+#   name - partial name of target (generates targets doxygen-${name}, etc.)
+#   input_dir - directory containing files to use for documentation
+#   ARGN - additional <name>s to use as tag-file dependencies
+function(vg_add_documentation name input_dir)
+  if(BUILD_DOCUMENTATION)
+    set(tag_files)
+    set(tag_targets)
+
+    foreach(tag ${ARGN})
+      if("x_${tag}" MATCHES "x_[Qq][Tt]4?")
+        if(QT4_TAG_FILE)
+          list(APPEND tag_files "\"${QT4_TAG_FILE}=${QT_DOC_DIR}/html\"")
+        else()
+          message(WARNING
+            "Documentation for ${name} requested Qt tag file,"
+            "but Qt tag file was not found."
+          )
+        endif()
+        list(APPEND tag_files "\"${QT4_EXTRA_TAG_FILE}=${QT_DOC_DIR}/html\"")
+        list(APPEND tag_targets doxygen-qt4-extra-tag)
+      else()
+        list(APPEND tag_files "\"${visGUI_BINARY_DIR}/doc/${tag}.tag=../${tag}\"")
+        list(APPEND tag_targets doxygen-${tag}-tag)
+      endif()
+    endforeach()
+    string(REPLACE ";" " " tag_files "${tag_files}")
+
+    if(TARGET ${name})
+      get_target_property(DOXYGEN_INCLUDE_PATHS
+        ${name} INCLUDE_DIRECTORIES
+      )
+    else()
+      get_directory_property(DOXYGEN_INCLUDE_PATHS
+        DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        INCLUDE_DIRECTORIES
+      )
+    endif()
+    string(REPLACE ";" " " DOXYGEN_INCLUDE_PATHS "${DOXYGEN_INCLUDE_PATHS}")
+
+    set(doc_dir "${CMAKE_BINARY_DIR}/doc/${name}")
+    set(doxyfile_template "${visGUI_SOURCE_DIR}/CMake/Doxyfile.in")
+    set(doxyfile "${doc_dir}/Doxyfile")
+    set(doc_css "${visGUI_SOURCE_DIR}/CMake/visgui.css")
+
+    add_custom_command(
+      OUTPUT "${doc_dir}"
+      COMMAND "${CMAKE_COMMAND}" -E make_directory "${doc_dir}"
+      COMMENT "Creating documentation directory for ${name}"
+    )
+    add_custom_command(
+      OUTPUT "${doxyfile}.tag" "${doxyfile}.html"
+      COMMAND "${CMAKE_COMMAND}"
+              -D "DOXYGEN_TEMPLATE=${doxyfile_template}"
+              -D "DOXYGEN_PROJECT_SOURCE_DIR=${input_dir}"
+              -D "DOXYGEN_DOCUMENTATION_OUTPUT_PATH=${doc_dir}"
+              -D "DOXYGEN_OUTPUT_FILE=${doxyfile}"
+              -D "DOXYGEN_PROJECT_NAME=${name}"
+              -D "DOXYGEN_TAG_FILES=${tag_files}"
+              -D "DOXYGEN_EXCLUDE_PATTERNS=${DOXYGEN_EXCLUDE_PATTERNS}"
+              -D "DOXYGEN_INCLUDE_PATHS=${DOXYGEN_INCLUDE_PATHS}"
+              -D "DOXYGEN_EXTRA_STYLESHEET=${doc_css}"
+              -P "${visGUI_SOURCE_DIR}/CMake/doxygen-script.cmake"
+      DEPENDS "${doc_dir}" "${doxyfile_template}"
+      WORKING_DIRECTORY "${visGUI_BINARY_DIR}/doc/${name}"
+      COMMENT "Generating Doxyfile for ${name}"
+    )
+    add_custom_target(doxygen-${name}-tag DEPENDS "${doxyfile}.tag")
+    add_custom_command(
+      TARGET doxygen-${name}-tag
+      COMMAND "${DOXYGEN_EXECUTABLE}" "${doxyfile}.tag"
+      WORKING_DIRECTORY "${visGUI_BINARY_DIR}/doc/${name}"
+      COMMENT "Creating tags for ${name}"
+    )
+    add_custom_target(doxygen-${name}
+      DEPENDS ${tag_targets} "${doxyfile}.html" "${doc_css}"
+      COMMAND "${DOXYGEN_EXECUTABLE}" "${doxyfile}.html"
+      WORKING_DIRECTORY "${visGUI_BINARY_DIR}/doc/${name}"
+      COMMENT "Creating documentation for ${name}"
+    )
+    add_dependencies(doc doxygen-${name})
+
+    if(VISGUI_INSTALL_DOCUMENTATION)
+      install(
+        DIRECTORY "${visGUI_BINARY_DIR}/doc/${name}"
+        DESTINATION "share/doc/visgui-${VISGUI_VERSION_STR}/${name}"
+        COMPONENT documentation
+      )
+    endif()
+
+    if(QHELPGENERATOR_EXECUTABLE)
+      set(qch_file "${visGUI_BINARY_DIR}/doc/${name}.qch")
+      add_custom_target(doxygen-${name}-qch
+        COMMAND "${QHELPGENERATOR_EXECUTABLE}" index.qhp -o "${qch_file}"
+        WORKING_DIRECTORY "${visGUI_BINARY_DIR}/doc/${name}"
+        DEPENDS doxygen-${name}
+        COMMENT "Creating Qt compressed help for ${name}"
+      )
+      add_dependencies(doc doxygen-${name}-qch)
+
+      if(VISGUI_INSTALL_DOCUMENTATION)
+        install("${qch_file}"
+          DESTINATION "share/doc/visgui-${VISGUI_VERSION_STR}"
+          COMPONENT documentation
+        )
+      endif()
+    endif()
+  endif()
+endfunction()
diff --git a/CMake/exports.cmake b/CMake/exports.cmake
new file mode 100644
index 00000000..654f5bd5
--- /dev/null
+++ b/CMake/exports.cmake
@@ -0,0 +1,11 @@
+# Generate export header
+function(vg_generate_export_header FINAL_OUTPUT_FILE EXPORTS_FILE)
+  # Generate the header
+  set(OUTPUT_FILE "${PROJECT_BINARY_DIR}/.gen-export.h.tmp")
+  include(${PROJECT_SOURCE_DIR}/CMake/gen-export.cmake)
+
+  # Copy the header to its final location; this is done because the copy will
+  # no-op if the file isn't changed, such that we don't rebuild unnecessarily
+  configure_file("${OUTPUT_FILE}" "${FINAL_OUTPUT_FILE}" COPYONLY)
+  message(STATUS "Generated export header file '${FINAL_OUTPUT_FILE}'")
+endfunction()
diff --git a/CMake/functions.cmake b/CMake/functions.cmake
new file mode 100644
index 00000000..ac610b16
--- /dev/null
+++ b/CMake/functions.cmake
@@ -0,0 +1,487 @@
+# Macro to declare a dependent option with more convenient syntax
+macro(vg_option NAME DEFAULT_VALUE DOCSTRING DEPENDENCIES)
+  cmake_dependent_option(
+    ${NAME} ${DOCSTRING} ${DEFAULT_VALUE}
+    "${DEPENDENCIES}" OFF
+  )
+endmacro()
+
+# Function to extract first argument into named variable
+function(shift_arg variable value)
+  set(${variable} "${value}" PARENT_SCOPE)
+  set(ARGN "${ARGN}" PARENT_SCOPE)
+endfunction()
+
+# Helper macro to parse template argument of extract_flags, extract_args
+macro(__parse_extract_template template)
+  set(_vars "")
+  set(_extra "")
+
+  foreach(pair ${template})
+    string(REGEX MATCH "^[^=]+" varname "${pair}")
+    string(REGEX REPLACE "^[^=]+=" "" token "${pair}")
+    if("x_${varname}" STREQUAL "x_" OR "x_${token}" STREQUAL "x_")
+      message(FATAL_ERROR "extract_args: bad variable/token pair '${pair}'")
+    endif()
+    set(${varname} "")
+    set(__var_for_token_${token} "${varname}")
+    list(APPEND _vars "${varname}")
+  endforeach()
+endmacro()
+
+# Function to extract named flags
+function(extract_flags template)
+  __parse_extract_template("${template}")
+  foreach(_var ${_vars})
+    # Initially set all flags to FALSE
+    set(${_var} FALSE PARENT_SCOPE)
+  endforeach()
+
+  foreach(arg ${ARGN})
+    # Skip empty args
+    if(NOT "x_${arg}" STREQUAL "x_")
+      # Test if arg is a token
+      if(NOT "x_${__var_for_token_${arg}}" STREQUAL "x_")
+        # Yes; set flag to TRUE
+        set(${__var_for_token_${arg}} TRUE PARENT_SCOPE)
+      else()
+        # No; add to leftovers list
+        list(APPEND _extra "${arg}")
+      endif()
+    endif()
+  endforeach()
+
+  # Shift ARGN
+  set(ARGN "${_extra}" PARENT_SCOPE)
+endfunction()
+
+# Function to extract named arguments
+function(extract_args template)
+  __parse_extract_template("${template}")
+  set(_var "")
+
+  foreach(arg ${ARGN})
+    # Skip empty args
+    if(NOT "x_${arg}" STREQUAL "x_")
+      # Test if arg is a token
+      if(NOT "x_${__var_for_token_${arg}}" STREQUAL "x_")
+        set(_var "${__var_for_token_${arg}}")
+      # Not a token; test if we have a current token
+      elseif(NOT "x_${_var}" STREQUAL "x_")
+        # Add arg to named list
+        list(APPEND ${_var} "${arg}")
+      else()
+        # Add arg to leftovers list
+        list(APPEND _extra "${arg}")
+      endif()
+    endif()
+  endforeach()
+
+  # Raise lists to parent scope
+  foreach(varname ${_vars})
+    set(${varname} "${${varname}}" PARENT_SCOPE)
+  endforeach()
+
+  # Shift ARGN
+  set(ARGN "${_extra}" PARENT_SCOPE)
+endfunction()
+
+# Function to extract path to a library given a set of libraries
+function(find_libraries_path library_search_paths)
+  set(search_paths)
+  foreach(library ${ARGN})
+    get_filename_component(path "${library}" PATH)
+    if(path)
+      set(search_paths ${search_paths} ${path})
+    endif(path)
+  endforeach()
+  set(${library_search_paths} ${search_paths} PARENT_SCOPE)
+endfunction()
+
+# Function to find a library with given name and configuration
+function(find_library_for_configuration VAR NAME CONFIG SUFFIX)
+  set(paths)
+  foreach(path ${ARGN})
+    list(APPEND paths ${path}/${SUFFIX})
+  endforeach()
+  set(paths ${paths} ${ARGN})
+  find_library(${VAR}_LIBRARY_${CONFIG} ${NAME} PATHS ${paths})
+  mark_as_advanced(${VAR}_LIBRARY_${CONFIG})
+endfunction()
+
+# Function to find a library for various configurations
+function(find_multi_configuration_library VAR NAME)
+  if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+    find_library_for_configuration(${VAR} ${NAME} RELEASE Release ${ARGN})
+    find_library_for_configuration(${VAR} ${NAME} DEBUG Debug ${ARGN})
+
+    set(libraries)
+    if(${VAR}_LIBRARY_RELEASE)
+      set(libraries ${libraries} optimized ${${VAR}_LIBRARY_RELEASE})
+    endif()
+    if(${VAR}_LIBRARY_DEBUG)
+      set(libraries ${libraries} debug ${${VAR}_LIBRARY_DEBUG})
+    endif()
+
+    if("x_${libraries}" STREQUAL "x_")
+      set(${VAR}_LIBRARY ${VAR}_LIBRARY-NOTFOUND PARENT_SCOPE)
+    else()
+      set(${VAR}_LIBRARY ${libraries} PARENT_SCOPE)
+    endif()
+  else(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+    find_library(${VAR}_LIBRARY ${NAME}
+      PATHS ${ARGN}
+    )
+  endif(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+endfunction()
+
+# Function to add definitions to individual source files' compile flags
+function(add_source_files_definitions)
+  extract_args("_symbols=SYMBOLS;_symbols=DEFINITIONS" ${ARGN})
+
+  # Generate list of new compile flags
+  set(_extra_flags)
+  foreach(_symbol ${_symbols})
+    set(_extra_flags "${_extra_flags} -D${_symbol}")
+  endforeach()
+
+  # Iterate over each file
+  foreach(_file ${ARGN})
+    # Get current flags
+    get_source_file_property(_flags "${_file}" COMPILE_FLAGS)
+    if("x_${_flags}" STREQUAL "x_NOTFOUND")
+      set(_flags)
+    endif()
+    # Append new flags
+    set(_flags "${_flags} ${_extra_flags}")
+    # Set new flags
+    set_source_files_properties("${_file}" PROPERTIES COMPILE_FLAGS "${_flags}")
+  endforeach()
+endfunction()
+
+# Function to add definitions to individual source files' compile flags
+function(add_targets_definitions)
+  extract_args("_symbols=SYMBOLS;_symbols=DEFINITIONS" ${ARGN})
+
+  # Generate list of new compile flags
+  set(_extra_flags)
+  foreach(_symbol ${_symbols})
+    set(_extra_flags "${_extra_flags} -D${_symbol}")
+  endforeach()
+
+  # Iterate over each file
+  foreach(_target ${ARGN})
+    # Get current flags
+    get_target_property(_flags "${_target}" COMPILE_FLAGS)
+    if("x_${_flags}" STREQUAL "x_NOTFOUND" OR "x_${_flags}" STREQUAL "x__flags-NOTFOUND")
+      set(_flags)
+    endif()
+    # Append new flags
+    set(_flags "${_flags} ${_extra_flags}")
+    # Set new flags
+    set_target_properties("${_target}" PROPERTIES COMPILE_FLAGS "${_flags}")
+  endforeach()
+endfunction()
+
+# Function to resolve library names to full paths
+function(resolve_library_paths VAR)
+  set(_libraries)
+  foreach(_library ${${VAR}})
+    if(IS_ABSOLUTE ${_library})
+      list(APPEND _libraries "${_library}")
+    else()
+      find_multi_configuration_library(${_library} ${_library} ${ARGN})
+      if(${_library}_LIBRARY)
+        list(APPEND _libraries "${${_library}_LIBRARY}")
+        mark_as_advanced(${_library}_LIBRARY)
+      else()
+        list(APPEND _libraries "${_library}")
+      endif()
+    endif()
+  endforeach()
+
+  set(${VAR} ${_libraries} PARENT_SCOPE)
+endfunction()
+
+# Function to add include directory to target's SDK include directories
+function(vg_target_include_directories TARGET)
+  set(_changed FALSE)
+  foreach(_path ${ARGN})
+    list(FIND ${TARGET}_INCLUDE_DIRS "${_path}" _index)
+    if(_index EQUAL -1)
+      list(APPEND ${TARGET}_INCLUDE_DIRS "${_path}")
+      set(_changed TRUE)
+    endif()
+  endforeach()
+  if(_changed)
+    set(${TARGET}_INCLUDE_DIRS "${${TARGET}_INCLUDE_DIRS}"
+        CACHE INTERNAL "SDK include directories for ${TARGET}")
+  endif()
+endfunction()
+
+# Function to include library SDK directories
+function(vg_include_library_sdk_directories)
+  extract_args("_target=TARGET;_interface_targets=INTERFACE" ${ARGN})
+
+  if(NOT "x_${_interface_targets}" STREQUAL "x_")
+    if("x_${_target}" STREQUAL "x_")
+      message(FATAL_ERROR "vg_include_library_sdk_directories:"
+                          " INTERFACE includes specified,"
+                          " but no TARGET specified")
+    endif()
+
+    # Handle interface include directories
+    foreach(_interface ${_interface_targets})
+      vg_target_include_directories(
+        ${_target} "${${_interface}_INCLUDE_DIRS}"
+      )
+      include_directories(${${_interface}_INCLUDE_DIRS})
+    endforeach()
+  endif()
+
+  # Handle non-interface include directories
+  if(NOT "x_${ARGN}" STREQUAL "x_")
+    foreach(_lib ${ARGN})
+      include_directories(${${_lib}_INCLUDE_DIRS})
+    endforeach()
+  endif()
+endfunction()
+
+# Function to add include and/or link dependencies to a target
+function(vg_add_dependencies TARGET)
+  set(_args)
+  list(APPEND _args "_link=LINK_LIBRARIES")
+  list(APPEND _args "_public_targets=PUBLIC_INTERFACE_TARGETS")
+  list(APPEND _args "_private_targets=PRIVATE_INTERFACE_TARGETS")
+  extract_args("${_args}" ${ARGN})
+  list(APPEND _private_interface_targets ${ARGN})
+
+  # Add include directories
+  vg_include_library_sdk_directories(
+    ${_private_targets}
+    TARGET ${TARGET} INTERFACE ${_public_targets}
+  )
+
+  # Link libraries
+  if(NOT "x_${_private_targets}" STREQUAL "x_")
+    target_link_libraries(${TARGET} LINK_PRIVATE ${_private_targets})
+  endif()
+  if(NOT "x_${_public_targets}" STREQUAL "x_")
+    target_link_libraries(${TARGET} LINK_PUBLIC ${_public_targets})
+  endif()
+  if(NOT "x_${_link}" STREQUAL "x_")
+    target_link_libraries(${TARGET} ${_link})
+  endif()
+endfunction()
+
+# Function to generate a target to copy a list of files to a destination
+function(copy_files_target TARGET DESTINATION)
+  set(_target_depends)
+  foreach(file ${ARGN})
+    get_filename_component(_in "${file}" REALPATH)
+    get_filename_component(_out "${file}" NAME)
+    set(_out "${DESTINATION}/${_out}")
+    add_custom_command(OUTPUT "${_out}" DEPENDS "${_in}"
+                       COMMAND ${CMAKE_COMMAND} -E copy "${_in}" "${_out}")
+    list(APPEND _target_depends "${_out}")
+  endforeach()
+  add_custom_target(${TARGET} ALL DEPENDS ${_target_depends})
+endfunction()
+
+# Function to install executable targets
+function(install_executable_target NAME COMPONENT)
+  if(TARGET ${NAME})
+    get_target_property(_type ${NAME} TYPE)
+    if(${_type} STREQUAL EXECUTABLE)
+      install(TARGETS ${NAME}
+              RUNTIME COMPONENT ${COMPONENT} DESTINATION bin
+              BUNDLE  COMPONENT ${COMPONENT} DESTINATION .
+      )
+    else()
+      message(WARNING
+        "install_executable_target given non-executable target '${NAME}'"
+      )
+    endif()
+  else()
+    message(WARNING
+      "install_executable_target given non-target name '${NAME}'"
+    )
+  endif()
+endfunction()
+
+# Function to install library targets
+function(install_library_targets)
+  foreach(_target ${ARGN})
+    if(TARGET ${_target})
+      get_target_property(_type ${_target} TYPE)
+      if(${_type} MATCHES "(SHARED|STATIC|MODULE)_LIBRARY")
+        install(TARGETS ${_target}
+                EXPORT VisGUI
+                RUNTIME COMPONENT Runtime     DESTINATION bin
+                LIBRARY COMPONENT Runtime     DESTINATION lib${LIB_SUFFIX}
+                ARCHIVE COMPONENT Development DESTINATION lib${LIB_SUFFIX}
+        )
+        if(${_type} STREQUAL SHARED_LIBRARY)
+          export(TARGETS ${_target} APPEND FILE "${VisGUI_EXPORT_FILE}")
+        endif()
+      else()
+        message(WARNING
+          "install_library_targets given non-library target '${_target}'"
+        )
+      endif()
+    else()
+      message(WARNING
+        "install_library_targets given non-target name '${_target}'"
+      )
+    endif()
+  endforeach()
+endfunction()
+
+# Function to define a VTK module
+macro(vg_vtk_module NAME)
+  # Register module for subsequent use as a dependency
+  set_property(GLOBAL APPEND PROPERTY VG_VTK_MODULES ${NAME})
+  get_property(VG_VTK_MODULES GLOBAL PROPERTY VG_VTK_MODULES)
+  list(APPEND VTK_MODULES_ENABLED ${VG_VTK_MODULES})
+
+  # Clear vg include directories; they will be rebuilt, but VTK also picks them
+  # up, which causes the VTK module include directories to change on subsequent
+  # CMake runs, which can lead to hard-to-track-down bugs where clean builds
+  # break, but work after a second configure pass.
+  unset(${NAME}_INCLUDE_DIRS CACHE)
+
+  vtk_module(${NAME} ${ARGN})
+endmacro()
+
+# Function to define a Qt plugin target
+function(vg_add_qt_plugin NAME)
+  add_library(${NAME} MODULE ${ARGN})
+  get_target_property(_type ${NAME} TYPE)
+  add_targets_definitions(${NAME} SYMBOLS QT_PLUGIN QT_SHARED)
+  set_target_properties(${NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY
+                        ${CMAKE_BINARY_DIR}/plugins)
+  foreach(config ${CMAKE_CONFIGURATION_TYPES})
+    string(TOUPPER "${config}" config_upper)
+    set_target_properties(${NAME} PROPERTIES
+      RUNTIME_OUTPUT_DIRECTORY_${config_upper}
+      ${CMAKE_BINARY_DIR}/${config}/plugins
+    )
+  endforeach()
+endfunction()
+
+# Function to install files with (optionally) their respective path prefixes
+function(vg_install_files_with_prefix)
+  cmake_parse_arguments(_install
+    "STRIP_PATH"
+    "SOURCE;TARGET;DESTINATION"
+    "FILES"
+    ${ARGN}
+  )
+  list(APPEND _install_FILES ${_install_UNPARSED_ARGUMENTS})
+
+  set(_path)
+  set(_in_prefix)
+  if(_install_SOURCE)
+    set(_in_prefix "${_install_SOURCE}/")
+  endif()
+
+  set(_target_depends)
+  foreach(file ${_install_FILES})
+    get_filename_component(_in "${_in_prefix}${file}" REALPATH)
+    get_filename_component(_name "${file}" NAME)
+    if(NOT _install_STRIP_PATH)
+      get_filename_component(_path "${file}" PATH)
+    endif()
+    set(_out "${visGUI_BINARY_DIR}/${_install_DESTINATION}/${_path}/${_name}")
+
+    add_custom_command(OUTPUT "${_out}" DEPENDS "${_in}"
+                       COMMAND ${CMAKE_COMMAND} -E copy "${_in}" "${_out}")
+    list(APPEND _target_depends "${_out}")
+
+    install(FILES "${_in_prefix}${file}"
+      DESTINATION ${_install_DESTINATION}/${_path}
+      COMPONENT Web
+    )
+  endforeach()
+
+  add_custom_target(${_install_TARGET} ALL DEPENDS ${_target_depends})
+endfunction()
+
+# Function to install headers
+function(install_headers)
+  extract_args("_target=TARGET;_dest=DESTINATION" ${ARGN})
+  if(NOT _dest)
+    set(_dest include)
+  endif()
+
+  if("x_${_target}" STREQUAL "x_")
+    message(FATAL_ERROR "install_headers: no TARGET specified")
+  endif()
+
+  if(NOT "x_${ARGN}" STREQUAL "x_")
+    # Iterate over file list
+    foreach(_file ${ARGN})
+      # Get name, canonical path and subdirectory
+      string(REPLACE "${CMAKE_CURRENT_BINARY_DIR}/" "" _relfile "${_file}")
+      get_filename_component(_name "${_file}" NAME)
+      get_filename_component(_subdir "${_relfile}" PATH)
+      get_filename_component(_realpath "${_file}" REALPATH)
+      if("${_subdir}" STREQUAL "")
+        set(_subdir ".")
+      endif()
+      # Add to subdirectory group
+      string(REGEX REPLACE "[^A-Za-z0-9]" "_" _dirvar "${_subdir}")
+      if(NOT _dir_${_dirvar})
+        list(APPEND _dirs "${_subdir}")
+        set(_dir_${_dirvar} "${_file}")
+      else()
+        list(APPEND _dir_${_dirvar} "${_file}")
+      endif()
+      # Create SDK wrapper header
+      set(_wrapper "${CMAKE_BINARY_DIR}/${_dest}/${_subdir}/${_name}")
+      file(WRITE "${_wrapper}.tmp" "#include \"${_realpath}\"\n")
+      execute_process(
+        COMMAND ${CMAKE_COMMAND}
+                -E copy_if_different "${_wrapper}.tmp" "${_wrapper}"
+      )
+      file(REMOVE "${_wrapper}.tmp")
+    endforeach()
+
+    # Iterate over subdirectory groups and install headers
+    foreach(_dir ${_dirs})
+      if("x_${_dir}" STREQUAL "x_.")
+        vg_target_include_directories(
+          ${_target} "${CMAKE_BINARY_DIR}/${_dest}"
+        )
+        install(FILES ${_dir__}
+                COMPONENT Development
+                DESTINATION "${_dest}"
+        )
+      else()
+        string(REGEX REPLACE "[^A-Za-z0-9]" "_" _dirvar "${_dir}")
+        vg_target_include_directories(
+          ${_target} "${CMAKE_BINARY_DIR}/${_dest}/${_dir}"
+        )
+        install(FILES ${_dir_${_dirvar}}
+                COMPONENT Development
+                DESTINATION "${_dest}/${_dir}"
+        )
+      endif()
+    endforeach()
+  endif()
+endfunction()
+
+# Function to install plugin targets
+function(install_plugin_targets)
+  foreach(_target ${ARGN})
+    if(TARGET ${_target})
+      get_target_property(_type ${_target} TYPE)
+      if(NOT ${_type} STREQUAL STATIC_LIBRARY)
+        install(TARGETS ${_target}
+                COMPONENT Plugins
+                RUNTIME DESTINATION plugins
+                LIBRARY DESTINATION plugins)
+      endif()
+    endif()
+  endforeach()
+endfunction()
diff --git a/CMake/gen-export.cmake b/CMake/gen-export.cmake
new file mode 100644
index 00000000..6a2efd2a
--- /dev/null
+++ b/CMake/gen-export.cmake
@@ -0,0 +1,93 @@
+# Generate export header from input script
+#   Input variables:
+#     EXPORTS_FILE - filepath to input script
+#     OUTPUT_FILE - filepath of header that will be created
+
+# Declare content blocks
+set(CONTENT_HEADER)
+set(CONTENT_PRE_ABI)
+set(CONTENT_PRE_EXPORTS)
+set(CONTENT_POST_EXPORTS)
+
+# Write content line
+macro(write)
+  set(CONTENT "${CONTENT}${ARGN}\n")
+endmacro()
+
+# Write content block, if non-empty
+function(write_content NAME)
+  if(NOT "x_${${NAME}}" STREQUAL "x_")
+    string(REPLACE ";" "\n" content "${${NAME}}")
+    write("${content}\n")
+    set(CONTENT "${CONTENT}" PARENT_SCOPE)
+  endif()
+endfunction()
+
+# Write export block
+function(write_export ITEM)
+  string(REGEX REPLACE "=.*$"   "" target "${ITEM}")
+  string(REGEX REPLACE "^[^=]*=" "" symbol "${ITEM}")
+  write("#ifdef ${target}_EXPORTS")
+  write("#  define ${symbol}_EXPORT ${PROJECT}_ABI_EXPORT")
+  write("#  define ${symbol}_EXPORT_TEMPLATE ${PROJECT}_EXPORT_TEMPLATE")
+  write("#else")
+  write("#  define ${symbol}_EXPORT ${PROJECT}_ABI_IMPORT")
+  write("#  define ${symbol}_EXPORT_TEMPLATE ${PROJECT}_IMPORT_TEMPLATE")
+  write("#endif")
+  write()
+  set(CONTENT "${CONTENT}" PARENT_SCOPE)
+endfunction()
+
+# Add export
+macro(add_export TARGET SYMBOL)
+  list(APPEND EXPORTS "${TARGET}=${SYMBOL}")
+endmacro()
+
+# Include exports file
+set(EXPORTS)
+include("${EXPORTS_FILE}" RESULT_VARIABLE EXPORTS_FILE)
+
+# Generate output file
+set(CONTENT)
+write_content(CONTENT_HEADER)
+write("/* This file was generated by ${CMAKE_CURRENT_LIST_FILE}")
+write(" * from ${EXPORTS_FILE}.")
+write(" * Do not edit this file directly.")
+write(" */")
+write()
+write("#ifndef ${INCLUDE_GUARD}")
+write("#define ${INCLUDE_GUARD}")
+write()
+write_content(CONTENT_PRE_ABI)
+write("#ifndef ${PROJECT}_STATIC")
+write("#  if defined(_WIN32)")
+write("#    define ${PROJECT}_ABI_IMPORT __declspec(dllimport)")
+write("#    define ${PROJECT}_ABI_EXPORT __declspec(dllexport)")
+write("#    define ${PROJECT}_IMPORT_TEMPLATE extern")
+write("#    define ${PROJECT}_EXPORT_TEMPLATE")
+write("#  elif __GNUC__ >= 4")
+write("#    define ${PROJECT}_ABI_IMPORT __attribute__ ((visibility(\"default\")))")
+write("#    define ${PROJECT}_ABI_EXPORT __attribute__ ((visibility(\"default\")))")
+write("#    define ${PROJECT}_IMPORT_TEMPLATE extern")
+write("#    define ${PROJECT}_EXPORT_TEMPLATE extern")
+write("#  else")
+write("#    define ${PROJECT}_ABI_IMPORT")
+write("#    define ${PROJECT}_ABI_EXPORT")
+write("#    define ${PROJECT}_IMPORT_TEMPLATE extern")
+write("#    define ${PROJECT}_EXPORT_TEMPLATE extern")
+write("#  endif")
+write("#else")
+write("#  define ${PROJECT}_ABI_IMPORT")
+write("#  define ${PROJECT}_ABI_EXPORT")
+write("#  define ${PROJECT}_IMPORT_TEMPLATE extern")
+write("#  define ${PROJECT}_EXPORT_TEMPLATE extern")
+write("#endif")
+write()
+write_content(CONTENT_PRE_EXPORTS)
+foreach(export ${EXPORTS})
+  write_export(${export})
+endforeach()
+write("#endif")
+
+# Write output file
+file(WRITE "${OUTPUT_FILE}" "${CONTENT}")
diff --git a/CMake/list_typesystem_sources.py b/CMake/list_typesystem_sources.py
new file mode 100755
index 00000000..00cf5b9e
--- /dev/null
+++ b/CMake/list_typesystem_sources.py
@@ -0,0 +1,68 @@
+#!/bin/env python
+
+import os.path
+import re
+import sys
+import xml.sax
+
+prefix = None
+
+class_types = {
+  'object-type',
+  'value-type',
+  'interface-type'
+}
+
+scope_types = class_types | {
+  'namespace-type'
+}
+
+#==============================================================================
+class typesystem_parser(xml.sax.ContentHandler):
+  #----------------------------------------------------------------------------
+  def __init__(self):
+    self.current_namespace = []
+    self.package_name = None
+    self.package_prefix_path = None
+
+  #----------------------------------------------------------------------------
+  def printFile(self, name):
+    print os.path.join(self.package_prefix_path, name.lower())
+
+  #----------------------------------------------------------------------------
+  def printFiles(self, prefix, extensions):
+    for extension in extensions:
+      self.printFile(prefix + '.' + extension)
+
+  #----------------------------------------------------------------------------
+  def printWrapperFiles(self, names):
+      self.printFiles('_'.join(names) + '_wrapper', ['cpp', 'h'])
+
+  #----------------------------------------------------------------------------
+  def startElement(self, name, attrs):
+    if name == 'typesystem':
+      self.package_name = attrs['package']
+      self.package_prefix_path = os.path.join(prefix, self.package_name)
+      self.printFile(self.package_name + '_module_wrapper.cpp')
+      self.printFile(self.package_name + '_python.h')
+
+    elif name == 'namespace-type':
+      self.current_namespace.append(attrs['name'])
+      self.printWrapperFiles(self.current_namespace)
+
+    elif name in class_types:
+      self.current_namespace.append(attrs['name'])
+      self.printWrapperFiles(self.current_namespace)
+
+  #----------------------------------------------------------------------------
+  def endElement(self, name):
+    if name in scope_types:
+      self.current_namespace.pop()
+
+#==============================================================================
+if __name__ == '__main__':
+  if len(sys.argv) < 3:
+    sys.exit(1)
+
+  prefix = sys.argv[2]
+  xml.sax.parse(sys.argv[1], typesystem_parser())
diff --git a/CMake/testing.cmake b/CMake/testing.cmake
new file mode 100644
index 00000000..f9ef3faa
--- /dev/null
+++ b/CMake/testing.cmake
@@ -0,0 +1,223 @@
+#------------------------------------------------------------------------------
+# Add the standard testing subdirectory, if testing is enabled
+function(vg_add_test_subdirectory)
+  if(BUILD_TESTING)
+    add_subdirectory(Testing)
+  endif()
+endfunction()
+
+#------------------------------------------------------------------------------
+# Define a test in the VisGUI-standard manner
+function(vg_add_test)
+  # Extract arguments
+  extract_flags("_inter=INTERACTIVE" ${ARGN})
+  if(NOT ${_inter})
+    shift_arg(test_name ${ARGN})
+  endif()
+  shift_arg(test_executable ${ARGN})
+  set(_opts "_srcs=SOURCES;_moc=MOC_HEADERS;_res=RESOURCES;_ui=UI")
+  set(_opts "${_opts};_libs=LINK_LIBRARIES;_args=ARGS")
+  extract_args("${_opts}" ${ARGN})
+  set(_srcs ${_srcs} ${ARGN}) # Use leftover args as sources
+
+  if(NOT TARGET ${test_executable})
+    # Handle Qt executables
+    if(NOT "x_${_moc}" STREQUAL "x_")
+      qt4_wrap_cpp(_moc_srcs ${_moc})
+      set(_srcs ${_srcs} ${_moc_srcs})
+    endif()
+    if(NOT "x_${_ui}" STREQUAL "x_")
+      qt4_wrap_ui(_ui_srcs ${_ui})
+      set(_srcs ${_srcs} ${_ui_srcs})
+    endif()
+    if(NOT "x_${_res}" STREQUAL "x_")
+      qt4_add_resources(_res_srcs ${_res})
+      set(_srcs ${_srcs} ${_res_srcs})
+    endif()
+
+    # Generate test executable
+    add_executable(${test_executable} ${_srcs})
+    target_link_libraries(${test_executable} ${_libs} ${VGTEST_LINK_LIBRARIES})
+  endif()
+
+  # Add CTest test, if not interactive
+  if(NOT ${_inter})
+    add_test(NAME ${test_name}
+             COMMAND $<TARGET_FILE:${test_executable}> ${_args})
+  endif()
+endfunction()
+
+#------------------------------------------------------------------------------
+# Set test baseline arguments and required files
+function(vg_test_set_baseline REQUIRED_FILES ARGS PATH)
+  set(_baseline "${VISGUI_BASELINE_ROOT}/${PATH}")
+  list(APPEND ${ARGS}
+    --test-baseline "${_baseline}"
+    --test-temp-root "${visGUI_BINARY_DIR}/Testing/Temporary"
+  )
+  set(${ARGS} "${${ARGS}}" PARENT_SCOPE)
+
+  list(APPEND ${REQUIRED_FILES} "${_baseline}")
+  set(${REQUIRED_FILES} "${${REQUIRED_FILES}}" PARENT_SCOPE)
+endfunction()
+
+#------------------------------------------------------------------------------
+# Get required data files from test script
+function(vg_test_get_data_files SCRIPT REQUIRED_FILES ARGS)
+  file(STRINGS
+    "${SCRIPT}" _script_commands_with_data
+    REGEX "\\$VISGUI_DATA_ROOT"
+  )
+  string(REGEX MATCHALL
+    "[\"']\\$VISGUI_DATA_ROOT[^\"]*[\"']"
+    _data_files "${_script_commands_with_data}"
+  )
+  if(NOT "x_${_data_files}" STREQUAL "x_")
+    string(REGEX REPLACE "[\"']" "" _data_files "${_data_files}")
+    string(REPLACE
+      "\$VISGUI_DATA_ROOT" "${VISGUI_DATA_ROOT}"
+      _data_files "${_data_files}"
+    )
+  endif()
+
+  if(_data_files)
+    list(APPEND ${ARGS} --test-data-root "${VISGUI_DATA_ROOT}")
+    set(${ARGS} "${${ARGS}}" PARENT_SCOPE)
+
+    list(APPEND ${REQUIRED_FILES} ${_data_files})
+    set(${REQUIRED_FILES} "${${REQUIRED_FILES}}" PARENT_SCOPE)
+  endif()
+endfunction()
+
+#------------------------------------------------------------------------------
+# Define a standard Python test
+function(vg_add_vtk_python_test MODULE NAME)
+  if(VISGUI_ENABLE_PYTHON AND TARGET vtkpython)
+    get_target_property(VTK_PYTHON_EXE vtkpython LOCATION)
+    set(_required_files)
+    set(_script "${CMAKE_CURRENT_SOURCE_DIR}/Test${NAME}.py")
+
+    # Extract arguments
+    extract_flags("_baseline=WITH_BASELINE" ${ARGN})
+
+    # Set up test arguments
+    set(_args ${ARGN})
+    if(_baseline)
+      vg_test_set_baseline(_required_files _args "${MODULE}/${NAME}.png")
+    endif()
+
+    # Get required data file from test script
+    vg_test_get_data_files("${_script}" _required_files _args)
+
+    # Create test
+    set(_name ${MODULE}Python-${NAME})
+    add_test(${_name} "${VTK_PYTHON_EXE}" "${_script}" ${_args})
+    if(_required_files)
+      set_tests_properties(${_name} PROPERTIES
+        REQUIRED_FILES "${_required_files}"
+      )
+    endif()
+  endif()
+endfunction()
+
+#------------------------------------------------------------------------------
+# Define a standard application scripted test
+function(vg_add_scripted_test APPLICATION SCRIPT)
+  # Extract arguments
+  extract_flags("_baseline=WITH_BASELINE" ${ARGN})
+  set(_opts "_args=ARGS;_required_files=REQUIRED_FILES")
+  extract_args("${_opts}" ${ARGN})
+
+  # Get script name without extension
+  get_filename_component(_name "${SCRIPT}" NAME_WE)
+  get_filename_component(_script "${SCRIPT}" REALPATH)
+
+  # Add baseline args
+  if(_baseline)
+    vg_test_set_baseline(_required_files _args "${APPLICATION}/${NAME}.png")
+  endif()
+
+  # Get required data file from test script
+  vg_test_get_data_files("${_script}" _required_files _args)
+
+  # Define test
+  add_test(NAME ${APPLICATION}-${_name}
+           COMMAND $<TARGET_FILE:${APPLICATION}>
+                   --test-script "${_script}" --exit ${_args}
+  )
+  if(NOT "x_${_required_files}" STREQUAL "x_")
+    set_tests_properties(${APPLICATION}-${_name}
+      PROPERTIES REQUIRED_FILES "${_required_files}"
+    )
+  endif()
+endfunction()
+
+#------------------------------------------------------------------------------
+# Set test data location variable from environment
+function(vg_set_test_path_env NAME VALUE)
+  set(${NAME} "${VALUE}" CACHE PATH
+      "Setting ${NAME} to '${VALUE}' from environment." FORCE
+  )
+endfunction()
+
+###############################################################################
+
+# Enable testing?
+if(BUILD_TESTING)
+  enable_testing()
+  include(CTest)
+
+  configure_file(${visGUI_SOURCE_DIR}/CMake/CTestCustom.ctest.in
+    ${visGUI_BINARY_DIR}/CMake/CTestCustom.ctest @ONLY
+  )
+  file(WRITE ${visGUI_BINARY_DIR}/CTestCustom.cmake
+    "INCLUDE(\"${visGUI_BINARY_DIR}/CMake/CTestCustom.ctest\")\n")
+
+  # Configure testing data paths
+  if(NOT VISGUI_DATA_ROOT OR NOT IS_DIRECTORY "${VISGUI_DATA_ROOT}")
+    if(IS_DIRECTORY "$ENV{VISGUI_DATA_ROOT}")
+      vg_set_test_path_env(VISGUI_DATA_ROOT "$ENV{VISGUI_DATA_ROOT}")
+    else(IS_DIRECTORY "$ENV{VISGUI_DATA_ROOT}")
+      set(VISGUI_DATA_ROOT VISGUI_DATA_ROOT-NOTFOUND CACHE PATH
+          "The repository containing data used for VisGUI testing." FORCE
+      )
+      message(WARNING "VISGUI_DATA_ROOT is not valid directory. "
+                      "Some tests will not be run.")
+    endif(IS_DIRECTORY "$ENV{VISGUI_DATA_ROOT}")
+  endif(NOT VISGUI_DATA_ROOT OR NOT IS_DIRECTORY "${VISGUI_DATA_ROOT}")
+
+  # Configure baseline data path
+  if(NOT VISGUI_BASELINE_ROOT OR NOT IS_DIRECTORY "${VISGUI_BASELINE_ROOT}")
+    if(IS_DIRECTORY "$ENV{VISGUI_BASELINE_ROOT}")
+      vg_set_test_path_env(VISGUI_BASELINE_ROOT "$ENV{VISGUI_BASELINE_ROOT}")
+    else(IS_DIRECTORY "$ENV{VISGUI_BASELINE_ROOT}")
+      set(VISGUI_BASELINE_ROOT VISGUI_BASELINE_ROOT-NOTFOUND CACHE PATH
+          "The repository containing data used as a testing baseline." FORCE
+      )
+      message(WARNING "VISGUI_BASELINE_ROOT is not valid directory. "
+                      "Some tests will not be run.")
+    endif(IS_DIRECTORY "$ENV{VISGUI_BASELINE_ROOT}")
+  endif(NOT VISGUI_BASELINE_ROOT OR NOT IS_DIRECTORY "${VISGUI_BASELINE_ROOT}")
+
+  # Configure CTestCustom file
+  configure_file("${CMAKE_SOURCE_DIR}/CMake/CTestCustom.ctest.in"
+                 "${PROJECT_BINARY_DIR}/CMake/CTestCustom.ctest"
+  )
+  file(WRITE "${PROJECT_BINARY_DIR}/CTestCustom.cmake"
+       "\ninclude(\"${PROJECT_BINARY_DIR}/CMake/CTestCustom.ctest\")\n"
+  )
+
+  # Configure CTest include file
+  configure_file("${CMAKE_CURRENT_LIST_DIR}/CTestInclude.cmake.in"
+                 "${PROJECT_BINARY_DIR}/CTestInclude.cmake" @ONLY
+  )
+  set_property(DIRECTORY PROPERTY
+    TEST_INCLUDE_FILE "${PROJECT_BINARY_DIR}/CTestInclude.cmake"
+  )
+
+  # Check if vtkpython is available
+  if(VISGUI_ENABLE_PYTHON AND NOT TARGET vtkpython)
+    message(WARNING "vtkpython was not imported from VTK. "
+                    "VTK Python tests will be disabled.")
+  endif()
+endif()
diff --git a/CMake/visgui.css b/CMake/visgui.css
new file mode 100644
index 00000000..7d1807db
--- /dev/null
+++ b/CMake/visgui.css
@@ -0,0 +1,9 @@
+/* Different style for brief documentation of \page's */
+div.contents div.textblock:first-child p:first-of-type {
+  border-top: 1px solid #c4cfe5;
+  border-bottom: 1px solid #c4cfe5;
+  background-color: #fbfcfd;
+  color: #596d97;
+  font-style: italic;
+  padding: 4px;
+}
diff --git a/CMake/wrapping.cmake b/CMake/wrapping.cmake
new file mode 100644
index 00000000..819b771f
--- /dev/null
+++ b/CMake/wrapping.cmake
@@ -0,0 +1,270 @@
+set(LIST_TYPESYSTEM_SOURCES_SCRIPT
+  "${CMAKE_CURRENT_LIST_DIR}/list_typesystem_sources.py"
+)
+
+###############################################################################
+
+# Function to concatenate strings in a list into a single string
+function(vg_cat VAR SEP)
+  set(_result)
+  foreach(_item ${ARGN})
+    if(_result)
+      set(_result "${_result}${SEP}${_item}")
+    else()
+      set(_result "${_item}")
+    endif()
+  endforeach()
+  set(${VAR} "${_result}" PARENT_SCOPE)
+endfunction()
+
+# Function to write content to a file, without spurious changes to time stamp
+function(vg_write_file PATH CONTENT)
+  set(CMAKE_CONFIGURABLE_FILE_CONTENT "${CONTENT}")
+  configure_file(
+    "${CMAKE_ROOT}/Modules/CMakeConfigurableFile.in"
+    "${PATH}" @ONLY
+  )
+endfunction()
+
+# Function to create a Shiboken wrapped library
+function(vg_add_sbk_library NAME)
+  add_library(${NAME} MODULE ${ARGN})
+  set_property(TARGET ${NAME} PROPERTY PREFIX "")
+  set(_flags "-DSHIBOKEN")
+  if(CMAKE_COMPILER_IS_GNUCXX)
+    vg_cat(_flags " "
+      -Wno-cast-qual
+      -Wno-missing-field-initializers
+      -Wno-unused-function
+      -Wno-unused-parameter
+      -Wno-overloaded-virtual
+      ${_flags}
+    )
+  endif()
+  set_target_properties(${NAME} PROPERTIES COMPILE_FLAGS "${_flags}")
+endfunction()
+
+# Function to wrap a library using shiboken
+function(vg_wrap_library NAME)
+  if(NOT VISGUI_ENABLE_PYTHON)
+    return()
+  endif()
+
+  set(_pyname ${NAME}Python)
+
+  cmake_parse_arguments(""
+    ""
+    "TYPESYSTEM"
+    "OBJECTS;HEADERS;DEPENDS;EXTRA_INCLUDES"
+    ${ARGN}
+  )
+
+  # Get list of typesystem dependencies and build paths for the same
+  set(_typesystem_depends)
+  set(_typesystem_paths)
+  set(_extra_typesystems)
+  set(_extra_include_dirs)
+  set(_extra_link_libraries)
+  foreach(_dep ${_DEPENDS})
+    if(NOT ${_dep}_TYPESYSTEM)
+      message(SEND_ERROR "${NAME} dependency ${_dep} is not a wrapped library")
+    else()
+      if(IS_ABSOLUTE "${${_dep}_TYPESYSTEM}")
+        list(APPEND _typesystem_depends "${${_dep}_TYPESYSTEM}")
+      endif()
+      get_filename_component(_dep_typesystem_name "${${_dep}_TYPESYSTEM}" NAME)
+      get_filename_component(_dep_typesystem_path "${${_dep}_TYPESYSTEM}" PATH)
+      list(APPEND _extra_typesystems
+        "  <load-typesystem name=\"${_dep_typesystem_name}\" generate=\"no\"/>"
+      )
+      if(_dep_typesystem_path)
+        list(APPEND _typesystem_paths "${_dep_typesystem_path}")
+      endif()
+      if(${_dep}_TYPESYSTEM_PATHS)
+        list(APPEND _typesystem_paths "${${_dep}_TYPESYSTEM_PATHS}")
+      endif()
+      if(${_dep}_GLOBAL_HEADER)
+        list(APPEND _EXTRA_INCLUDES "${${_dep}_GLOBAL_HEADER}")
+      endif()
+      list(APPEND _extra_include_dirs ${${_dep}_INCLUDE_DIRS})
+      list(APPEND _extra_include_dirs ${${_dep}_WRAP_INCLUDE_DIRS})
+      list(APPEND _extra_link_libraries ${${_dep}_WRAP_LINK_LIBRARIES})
+    endif()
+  endforeach()
+
+  # Generate monolithic include file, as required by shiboken
+  set(_global_header "${CMAKE_CURRENT_BINARY_DIR}/${NAME}_all_sdk_headers.h")
+  set(_depends)
+  set(_content)
+  foreach(_extra_include ${_EXTRA_INCLUDES})
+    list(APPEND _content "#include <${_extra_include}>")
+  endforeach()
+  foreach(_hdr ${_HEADERS})
+    get_filename_component(_hdr "${_hdr}" REALPATH)
+    list(APPEND _depends "${_hdr}")
+    list(APPEND _content "#include \"${_hdr}\"")
+  endforeach()
+  vg_cat(_content "\n" ${_content})
+  vg_write_file("${_global_header}" "${_content}\n")
+
+  # Get list of objects to wrap
+  set(_objects)
+  set(_type "object-type")
+  foreach(_object ${_OBJECTS})
+    if(_object STREQUAL "BY_REF")
+      set(_type "object-type")
+    elseif(_object STREQUAL "BY_VALUE")
+      set(_type "value-type")
+    elseif(_object STREQUAL "INTERFACES")
+      set(_type "interface-type")
+    else()
+      list(APPEND _objects "  <${_type} name=\"${_object}\"/>")
+    endif()
+  endforeach()
+
+  # Generate typesystem
+  set(_typesystem "${CMAKE_CURRENT_BINARY_DIR}/${NAME}_typesystem.xml")
+  if(_TYPESYSTEM)
+    vg_cat(EXTRA_TYPESYSTEMS "\n" "${_extra_typesystems}")
+    vg_cat(EXTRA_OBJECTS "\n" "${_objects}")
+    set(TYPESYSTEM_NAME "${_pyname}")
+
+    configure_file("${_TYPESYSTEM}" "${_typesystem}")
+  else()
+    vg_cat(_content "\n"
+      "<?xml version=\"1.0\"?>"
+      "<typesystem package=\"${_pyname}\">"
+      ${_extra_typesystems}
+      ${_objects}
+      "</typesystem>"
+    )
+    vg_write_file("${_typesystem}" "${_content}\n")
+  endif()
+
+  # Determine list of generated source files
+  execute_process(
+    COMMAND "${PYTHON_EXECUTABLE}"
+            "${LIST_TYPESYSTEM_SOURCES_SCRIPT}"
+            "${_typesystem}"
+            "${CMAKE_CURRENT_BINARY_DIR}"
+    OUTPUT_VARIABLE _sources
+  )
+  string(REPLACE "\n" ";" _sources "${_sources}")
+  set_source_files_properties(${_sources} PROPERTIES GENERATED TRUE)
+
+  # Define rule to run the generator
+  get_directory_property(_includes INCLUDE_DIRECTORIES)
+  if(WIN32)
+    vg_cat(_includes ";" ${_includes} ${_extra_include_dirs})
+    vg_cat(_typesystem_paths ";" ${_typesystem_paths})
+  else()
+    vg_cat(_includes ":" ${_includes} ${_extra_include_dirs})
+    vg_cat(_typesystem_paths ":" ${_typesystem_paths})
+  endif()
+  set(_shiboken_options
+    --generatorSet=shiboken
+    --enable-parent-ctor-heuristic
+    --enable-return-value-heuristic
+  )
+  if(_DEPENDS MATCHES "PySide")
+    list(APPEND _shiboken_options --enable-pyside-extensions)
+  endif()
+  add_custom_command(
+    OUTPUT ${_sources}
+    DEPENDS ${_typesystem} ${_global_header} ${_depends} ${_typesystem_depends}
+    COMMAND "${SHIBOKEN_BINARY}"
+            ${_shiboken_options}
+            "${_global_header}"
+            "--include-paths=${_includes}"
+            "--typesystem-paths=${_typesystem_paths}"
+            "--output-directory=${CMAKE_CURRENT_BINARY_DIR}"
+            "${_typesystem}"
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMENT "Generating Python bindings for ${NAME}"
+  )
+
+  # Remove "special" dependencies
+  if(_DEPENDS)
+    list(REMOVE_ITEM _DEPENDS PySide:Core)
+    list(REMOVE_ITEM _DEPENDS PySide:Gui)
+  endif()
+
+  # Declare the wrapper library
+  include_directories(SYSTEM
+    ${PYTHON_INCLUDE_DIRS}
+    ${SHIBOKEN_INCLUDE_DIR}
+  )
+  include_directories(${_extra_include_dirs})
+  vg_add_sbk_library(${_pyname} ${_sources})
+  vg_add_dependencies(${_pyname}
+    PRIVATE_INTERFACE_TARGETS
+    ${NAME}
+    ${_DEPENDS}
+    LINK_LIBRARIES
+    LINK_PRIVATE
+    ${SHIBOKEN_PYTHON_LIBRARIES}
+    ${SHIBOKEN_LIBRARY}
+    ${_extra_link_libraries}
+  )
+  foreach(_dep ${_DEPENDS})
+    add_dependencies(${_pyname} ${_dep}Python)
+  endforeach()
+
+  # Install the wrapper library
+  install_library_targets(${_pyname})
+
+  # Record dependency information
+  set(${NAME}_TYPESYSTEM
+    "${_typesystem}"
+    CACHE INTERNAL "Shiboken typesystem XML for ${NAME}"
+  )
+  set(${NAME}_GLOBAL_HEADER
+    "${_global_header}"
+    CACHE INTERNAL "Header file containing all includes for ${NAME}"
+  )
+  set(${NAME}_TYPESYSTEM_PATHS
+    "${_typesystem_paths}"
+    CACHE INTERNAL "Shiboken typesystem paths for ${NAME}"
+  )
+  set(${NAME}_WRAP_INCLUDE_DIRS
+    "${CMAKE_CURRENT_BINARY_DIR}/${_pyname}"
+    ${_extra_include_dirs}
+    CACHE INTERNAL "Include directory for wrapped ${NAME} module"
+  )
+endfunction()
+
+# Function to wrap a library using VTK
+function(vg_wrap_vtk_library NAME)
+  if(VISGUI_ENABLE_PYTHON)
+    # Temporarily unset VisGUI module include directories, as VTK uses the same
+    # name, and we need VTK to see a different directory list (must remove it
+    # from cache or vtk_module_load will not be able to populate it)
+    set(_old_include_dirs "${${NAME}_INCLUDE_DIRS}")
+    unset(${NAME}_INCLUDE_DIRS CACHE)
+
+    vtk_module_load("${NAME}")
+    vtk_module_headers_load("${NAME}")
+
+    # Ensure wrapping knows about local includes, including any generated
+    # headers
+    #
+    # NOTE: It is important that the current module's source directory is first
+    # in the include order, so that wrapping finds the real headers and not the
+    # <build>/include wrappers, as it only considers for wrapping objects that
+    # are defined in directly-parsed headers
+    set(${NAME}_INCLUDE_DIRS
+      ${${NAME}_SOURCE_DIR}
+      ${CMAKE_CURRENT_SOURCE_DIR}
+      ${CMAKE_CURRENT_BINARY_DIR}
+      ${${NAME}_INCLUDE_DIRS} # Include dirs set by vtk_module_load
+      ${_old_include_dirs} # Include dirs set by VisGUI
+    )
+    list(REMOVE_DUPLICATES ${NAME}_INCLUDE_DIRS)
+
+    vtk_add_python_wrapping("${NAME}")
+
+    # Restore VisGUI module include directories
+    set(${NAME}_INCLUDE_DIRS)
+    vg_target_include_directories(${NAME} ${_old_include_dirs})
+  endif()
+endfunction()
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 00000000..35a7bde0
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,152 @@
+# Root cmake file.
+cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
+
+project(visGUI)
+
+include(vgVersion.cmake)
+
+# Include essential cmake modules.
+include(CMakeDependentOption)
+
+# User-configurable build options for...
+#   ...Applications
+option(VISGUI_ENABLE_VIQUI          "Build viqui application"               ON)
+option(VISGUI_ENABLE_VPVIEW         "Build vpView application"              ON)
+option(VISGUI_ENABLE_VSPLAY         "Build vsPlay application"              ON)
+#   ...External library features
+option(VISGUI_ENABLE_GDAL           "Enable features that require GDAL"     OFF)
+option(VISGUI_ENABLE_VIDTK          "Enable features that require VidTK"    ON)
+#   ...Python bindings
+option(VISGUI_ENABLE_PYTHON         "Enable VisGUI Python bindings"         OFF)
+#   ...Install options
+option(VISGUI_DISABLE_FIXUP_BUNDLE  "Disable install fixup bundle utility"  OFF)
+#   ...General features
+option(BUILD_TESTING                "Build tests"                           OFF)
+option(BUILD_DOCUMENTATION          "Build documentation"                   OFF)
+
+# Include core CMake support code.
+include(CMake/functions.cmake)
+include(CMake/wrapping.cmake)
+include(CMake/doxygen.cmake)
+
+# Find dependencies. These manage to be more complicated than simple calls to
+# find_package with remarkable consistency, so are in a separate file.
+set(global_library_search_paths)
+include(CMake/coredeps.cmake)
+
+# We currently build static libraries by default. This might change in the
+# future.
+set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libraries")
+set(VISGUI_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS})
+
+# Set default visibility to hidden when building shared
+if(BUILD_SHARED_LIBS)
+  include(CheckCCompilerFlag)
+  include(CheckCXXCompilerFlag)
+  check_c_compiler_flag(-fvisibility=hidden C_HAS_VISIBILITY_FLAG)
+  check_cxx_compiler_flag(-fvisibility=hidden CXX_HAS_VISIBILITY_FLAG)
+  if(C_HAS_VISIBILITY_FLAG)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
+  endif()
+  if(CXX_HAS_VISIBILITY_FLAG)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+  endif()
+else()
+  add_definitions(-DVISGUI_STATIC)
+endif()
+
+# Place executable and libraries in a common location, rather than their
+# respective build directories.
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+
+set(VTK_MODULES_DIR "${visGUI_BINARY_DIR}/${VTK_INSTALL_PACKAGE_DIR}/Modules")
+set(VTK_INSTALL_PYTHON_USING_CMAKE TRUE)
+
+# Include testing support.
+include(CMake/testing.cmake)
+
+# Create ABI exports header
+include(CMake/exports.cmake)
+vg_generate_export_header(
+  "${PROJECT_BINARY_DIR}/vgExport.h"
+  "${PROJECT_SOURCE_DIR}/vgExport.cmake"
+)
+install_headers("${PROJECT_BINARY_DIR}/vgExport.h" TARGET ${PROJECT_NAME})
+
+# Declare exports file
+set(VisGUI_EXPORT_FILE "${visGUI_BINARY_DIR}/VisGUIConfigTargets.cmake")
+if(EXISTS "${VisGUI_EXPORT_FILE}")
+  file(REMOVE "${VisGUI_EXPORT_FILE}")
+endif()
+
+# Create package config for build directory
+set(VisGUI_INCLUDE_DIR "${visGUI_BINARY_DIR}/include")
+configure_file(
+  CMake/VisGUIConfig.cmake.in "${visGUI_BINARY_DIR}/VisGUIConfig.cmake"
+  @ONLY
+)
+
+# Create package config for install directory
+set(VisGUI_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include")
+configure_file(
+  CMake/VisGUIConfig.cmake.in "${visGUI_BINARY_DIR}/VisGUIConfig-install.cmake"
+  @ONLY
+)
+
+# Configure developer environment
+configure_file(
+  setupDevel.sh.in "${visGUI_BINARY_DIR}/setupDevel.sh" @ONLY
+)
+
+install(FILES "${visGUI_BINARY_DIR}/VisGUIConfig-install.cmake"
+        COMPONENT Development
+        DESTINATION lib/cmake RENAME VisGUIConfig.cmake
+)
+install(EXPORT VisGUI
+        COMPONENT Development
+        DESTINATION lib/cmake FILE VisGUIConfigTargets.cmake
+)
+
+# Allow subprojects to find configured headers
+include_directories(${PROJECT_BINARY_DIR})
+
+if(VISGUI_ENABLE_PYTHON)
+  find_package(PythonInterp REQUIRED VERSION 2.7)
+  find_package(PythonLibs REQUIRED)
+  find_package(Shiboken REQUIRED)
+  find_package(PySide REQUIRED)
+
+  set(PYTHON_SHORT python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+
+  # Create 'virtual modules' for use as wrapping dependencies, starting with
+  # common properties (note that any PySide dependency requires using the
+  # pyside_global.h header, which in turn brings in all of Qt that is wrapped
+  # by PySide, hence every 'virtual module' needs include paths for everything)
+  foreach(_module Core Gui)
+    set(PySide:${_module}_TYPESYSTEM_PATHS ${PYSIDE_TYPESYSTEMS})
+    set(PySide:${_module}_WRAP_INCLUDE_DIRS
+      ${PYSIDE_INCLUDE_DIR}
+      ${PYSIDE_INCLUDE_DIR}/QtCore
+      ${PYSIDE_INCLUDE_DIR}/QtGui
+    )
+    set(PySide:${_module}_WRAP_LINK_LIBRARIES ${PYSIDE_LIBRARY})
+    set(PySide:${_module}_GLOBAL_HEADER pyside_global.h)
+  endforeach()
+
+  # Set typesystem for each 'virtual module'
+  set(PySide:Core_TYPESYSTEM "typesystem_core.xml")
+  set(PySide:Gui_TYPESYSTEM "typesystem_gui.xml")
+endif()
+
+# Include subdirectories to build.
+add_subdirectory(Libraries)
+add_subdirectory(Modules)
+add_subdirectory(Web)
+add_subdirectory(Applications)
+add_subdirectory(Plugins)
+add_subdirectory(Tools)
+
+# Install rules need to be in a separate directory
+add_subdirectory(CMake/InstallRules)
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
new file mode 100644
index 00000000..6a77e867
--- /dev/null
+++ b/CTestConfig.cmake
@@ -0,0 +1,7 @@
+set(CTEST_PROJECT_NAME "visGUI")
+set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
+
+set(CTEST_DROP_METHOD "http")
+set(CTEST_DROP_SITE "www.kitware.com")
+set(CTEST_DROP_LOCATION "/CDash/submit.php?project=visgui")
+set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/Data/VpView/sampleConfig.prj b/Data/VpView/sampleConfig.prj
new file mode 100644
index 00000000..dc38a7ca
--- /dev/null
+++ b/Data/VpView/sampleConfig.prj
@@ -0,0 +1,8 @@
+OverviewFile=stab_00000.mrj
+DataSetSpecifier=stab_*.mrj
+OverviewSpacing=-1
+OverviewOrigin=-9116 -5891
+AnalysisDimensions=892 1311
+TracksFile=clif-tracks-sample/tracks.kw18
+EventsFile=clif-tracks-sample/clif_events.txt
+IconsFile=clif-tracks-sample/demo_icons.txt
diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
new file mode 100644
index 00000000..5937502b
--- /dev/null
+++ b/Examples/CMakeLists.txt
@@ -0,0 +1,89 @@
+project(Examples)
+
+# Use the include path and library for Qt that is used by VTK.
+include_directories(
+  ${VTK_INCLUDE_DIRS}
+  ${VIDTK_INCLUDE_DIRS}
+  ${VIDTK_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${vtkVgCore_SOURCE_DIR}
+)
+
+# Set your files and resources here
+set(ExampleSrcs
+  RenderVolumeWithImageActor
+  GenerateBeachTestData
+  TestImageIcon
+)
+
+set(ExamplesHeaders
+)
+
+#SET(ExamplesResources Icons/icons.qrc)
+
+qt4_wrap_ui(UISrcs
+  ${ExamplesUI}
+)
+qt4_wrap_cpp(MOCSrcs
+  ${ExamplesHeaders}
+)
+qt4_add_resources(ResourceSrcs
+  ${ExamplesResources}
+)
+
+source_group("Resources" FILES
+  ${ExamplesUI}
+  ${EXE_ICON}
+)
+
+source_group("Generated" FILES
+  ${UISrcs}
+  ${MOCSrcs}
+  ${ResourceSrcs}
+  ${RCS_SOURCES}
+)
+
+set_source_files_properties(${vgViewSrcs}
+  PROPERTIES OBJECT_DEPENDS "${UISrcs}"
+)
+
+# It's nice to have the ui in the windows project file...just double click on it
+# and designer comes up on that ui file :)
+IF (${CMAKE_BUILD_TOOL} MATCHES "msdev")
+  SET (Examples ${Examples} ${ExamplesUI})
+ENDIF (${CMAKE_BUILD_TOOL} MATCHES "msdev")
+IF (${CMAKE_BUILD_TOOL} MATCHES "devenv")
+  SET (ExamplesSrcs ${ExamplesSrcs} ${ExamplesUI})
+ENDIF (${CMAKE_BUILD_TOOL} MATCHES "devenv")
+
+#add_executable(Examples
+#  MACOSX_BUNDLE ${ExamplesSrcs} ${UISrcs} ${MOCSrcs} ${ResourceSrcs}
+#)
+
+#target_link_libraries( Examples
+#  ${QT_LIBRARIES}
+#  QVTK
+#  vtkRendering
+#  vtkVgCore
+#  vidtk_tracking
+#  vidtk_utilities_no_process
+#  vgl
+#  vnl
+#  vul
+#)
+foreach(example ${ExampleSrcs})
+  add_executable(${example} ${example}.cxx)
+  target_link_libraries(${example} 
+    ${QT_LIBRARIES}
+    vtkGUISupportQt
+    vtkRendering
+    vtkVgCore
+    vidtk_tracking
+    vidtk_utilities_no_process
+    vgl
+    vnl
+    vul
+  )
+endforeach()
+
diff --git a/Examples/GenerateBeachTestData.cxx b/Examples/GenerateBeachTestData.cxx
new file mode 100644
index 00000000..53c7fda6
--- /dev/null
+++ b/Examples/GenerateBeachTestData.cxx
@@ -0,0 +1,127 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkImageData.h"
+#include "vtkRenderWindowInteractor.h"
+#include "vtkRenderWindow.h"
+#include "vtkRenderer.h"
+#include "vtkActor.h"
+#include "vtkJPEGReader.h"
+#include "vtkImageActor.h"
+#include "vtkCamera.h"
+#include "vtkDataArray.h"
+#include "vtkPointData.h"
+#include "vtkSmartPointer.h"
+#include "vtkUnsignedCharArray.h"
+#include "vtkImageGaussianSmooth.h"
+#include "vtkImageMagnify.h"
+#include "vtkImageWrapPad.h"
+#include "vtkMath.h"
+#include "vtkXMLImageDataWriter.h"
+#include "vtkJPEGWriter.h"
+#include "vtkExtractVOI.h"
+
+template <class T>
+void AppendSliceToVolume(T* slicePtr, T* volumePtr, size_t imageSize, int currentSlice)
+{
+  T* ptr = volumePtr + currentSlice * imageSize;
+  memcpy(ptr, slicePtr, imageSize);
+}
+
+
+int main(int argc, char** argv)
+{
+  // Global controls
+  int magFactor = 5;
+  int numImages = 100;
+
+  // Create the volume: read the first image to get the x-y dimensions. Then append them all
+  // together to create a volume.
+  vtkSmartPointer<vtkJPEGReader> jpgReader = vtkSmartPointer<vtkJPEGReader>::New();
+  jpgReader->SetFileName("C:/F/CV/Data/Test/Beach/beach1.jpg");
+  vtkSmartPointer<vtkImageWrapPad> pad = vtkSmartPointer<vtkImageWrapPad>::New();
+  pad->SetInputConnection(jpgReader->GetOutputPort());
+  pad->SetOutputWholeExtent(0, 999, 0, 999, 0, 0);
+  pad->Update();
+
+  vtkSmartPointer<vtkImageData> slice = vtkSmartPointer<vtkImageData>::New();
+  slice = pad->GetOutput();
+  int dims[3];
+  slice->GetDimensions(dims);
+  int scalarType = slice->GetScalarType();
+
+  // Okay we have enough information to create the volume
+  vtkSmartPointer<vtkImageData> volume = vtkSmartPointer<vtkImageData>::New();
+  vtkSmartPointer<vtkDataArray> scalars = slice->GetPointData()->GetScalars()->NewInstance();
+  scalars->UnRegister(NULL);
+  int numComps = slice->GetPointData()->GetScalars()->GetNumberOfComponents();
+  scalars->SetNumberOfComponents(numComps);
+  scalars->SetNumberOfTuples(dims[0]*dims[1]*numImages);
+  volume->GetPointData()->SetScalars(scalars);
+  volume->SetExtent(0, dims[0] - 1, 0, dims[1] - 1, 0, numImages - 1);
+  volume->SetWholeExtent(0, dims[0] - 1, 0, dims[1] - 1, 0, numImages - 1);
+
+  // Now append the slices into the volume. Use pointers / memcpy for speed
+  vtkSmartPointer<vtkImageGaussianSmooth> smoother =
+    vtkSmartPointer<vtkImageGaussianSmooth>::New();
+  smoother->SetInputConnection(pad->GetOutputPort());
+  smoother->SetDimensionality(2);
+
+  int currentSlice;
+  size_t imageSize;
+  for (currentSlice = 0; currentSlice < numImages; ++currentSlice)
+    {
+    switch (scalarType)
+      {
+      case VTK_UNSIGNED_CHAR:
+        {
+        smoother->SetStandardDeviation(10 * currentSlice / numImages);
+        smoother->Update();
+        slice = smoother->GetOutput();
+
+        imageSize = dims[0] * dims[1] * sizeof(unsigned char) * numComps;
+        unsigned char* volumePtr = vtkUnsignedCharArray::SafeDownCast(scalars)->GetPointer(0);
+        unsigned char* slicePtr = vtkUnsignedCharArray::SafeDownCast(
+          slice->GetPointData()->GetScalars())->GetPointer(0);
+        AppendSliceToVolume(slicePtr, volumePtr, imageSize, currentSlice);
+        }
+      break;
+
+      default:
+        cout << "Bad data type\n";
+      }
+    }
+
+  // Write out high-res data file
+  vtkSmartPointer<vtkExtractVOI> subsample =
+    vtkSmartPointer<vtkExtractVOI>::New();
+  subsample->SetInput(volume);
+  vtkSmartPointer<vtkJPEGWriter> writer =
+    vtkSmartPointer<vtkJPEGWriter>::New();
+  writer->SetInputConnection(subsample->GetOutputPort());
+  char outputStr[256];
+  for (int k = 0; k < numImages; ++k)
+    {
+    subsample->SetVOI(0, dims[0] - 1, 0, dims[1] - 1, k, k);
+    subsample->Update();
+    vtkImageData* subOut = subsample->GetOutput();
+    sprintf(outputStr, "c:/f/CV/Data/Test/Beach/HighResData_%i.jpg", k);
+    writer->SetFileName(outputStr);
+    writer->Write();
+    }
+
+  // Write out low-res data file
+  vtkSmartPointer<vtkExtractVOI> subsample2 = vtkSmartPointer<vtkExtractVOI>::New();
+  subsample2->SetInput(volume);
+  subsample2->SetSampleRate(10, 10, 1);
+  vtkSmartPointer<vtkXMLImageDataWriter> writer2 =
+    vtkSmartPointer<vtkXMLImageDataWriter>::New();
+  writer2->SetInputConnection(subsample2->GetOutputPort());
+  writer2->SetFileName("c:/f/CV/Data/Test/Beach/LowResData.vti");
+  writer2->Write();
+
+  return 0;
+}
diff --git a/Examples/LoadJP2/loadJP2.cxx b/Examples/LoadJP2/loadJP2.cxx
new file mode 100644
index 00000000..f50e7576
--- /dev/null
+++ b/Examples/LoadJP2/loadJP2.cxx
@@ -0,0 +1,79 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// Kitware license?
+
+#include "vtkRenderWindowInteractor.h"
+#include "vtkRenderWindow.h"
+#include "vtkRenderer.h"
+#include "vtkActor.h"
+#include "vtkTexture.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkPlaneSource.h"
+#include "vtkSmartPointer.h"
+#include "vtkImageFlip.h"
+
+#include "vtkVgImageSource.h"
+#include "vtkVgInteractorStyleRubberBand2D.h"
+
+// VXL code from vxl/core/vil/tests/test_file_format_read.cxx
+
+
+int main(int argc,
+         char* argv[])
+{
+  if (argc  < 2)
+    {
+    cerr << "Requires image filename as argument." << endl;
+    return 0;
+    }
+
+  // East to use vars.
+  typedef vtkSmartPointer<vtkRenderWindowInteractor>
+    vtkRenderWindowInteractorRef;
+  typedef vtkSmartPointer<vtkRenderWindow>    vtkRenderWindowRef;
+  typedef vtkSmartPointer<vtkPolyDataMapper>  vtkPolyDataMapperRef;
+  typedef vtkSmartPointer<vtkPlaneSource>     vtkPlaneSourceRef;
+  typedef vtkSmartPointer<vtkVgInteractorStyleRubberBand2D>
+    vtkVgInteractorStyleRubberBand2DRef;
+
+  vtkRenderWindowInteractorRef iren(vtkRenderWindowInteractorRef::New());
+  vtkRenderWindowRef           win(vtkRenderWindowRef::New());
+  vtkSmartPointer<vtkRenderer> r(vtkSmartPointer<vtkRenderer>::New());
+  vtkSmartPointer<vtkActor>    a(vtkSmartPointer<vtkActor>::New());
+  vtkPolyDataMapperRef         m(vtkPolyDataMapperRef::New());
+  vtkPlaneSourceRef            p(vtkPlaneSourceRef::New());
+  vtkSmartPointer<vtkTexture>  t(vtkSmartPointer<vtkTexture>::New());
+  vtkVgInteractorStyleRubberBand2DRef
+    is(vtkVgInteractorStyleRubberBand2DRef::New());
+
+  is->SetEnabled(1);
+  iren->SetInteractorStyle(is);
+  win->SetInteractor(iren);
+  win->AddRenderer(r);
+
+  m->SetInputConnection(p->GetOutputPort());
+  a->SetMapper(m);
+  a->SetTexture(t);
+  r->AddViewProp(a);
+
+  // VXL to VTK pipeline
+  vtkStdString fileName(argv[1]);
+
+  vtkSmartPointer<vtkVgImageSource> vgImgSrc(vtkSmartPointer<vtkVgImageSource>::New());
+  vgImgSrc->SetFileName(fileName);
+  vgImgSrc->SetReadExtents(320, 639, 240, 479);
+  vgImgSrc->SetOutputResolution(320 * 4, 240 * 4);
+  vgImgSrc->SetUseOutputResolution(true);
+  vgImgSrc->Update();
+  t->SetInputConnection(vgImgSrc->GetOutputPort());
+  t->SetInterpolate(true);
+
+  iren->Initialize();
+  iren->Start();
+
+  return 0;
+}
diff --git a/Examples/RenderVolumeWithImageActor.cxx b/Examples/RenderVolumeWithImageActor.cxx
new file mode 100644
index 00000000..ab938637
--- /dev/null
+++ b/Examples/RenderVolumeWithImageActor.cxx
@@ -0,0 +1,125 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+///#include "main.h"
+#include "vtkImageData.h"
+#include "vtkRenderWindowInteractor.h"
+#include "vtkRenderWindow.h"
+#include "vtkRenderer.h"
+#include "vtkActor.h"
+#include "vtkJPEGReader.h"
+#include "vtkImageActor.h"
+#include "vtkCamera.h"
+#include "vtkDataArray.h"
+#include "vtkPointData.h"
+#include "vtkSmartPointer.h"
+#include "vtkUnsignedCharArray.h"
+#include "vtkImageGaussianSmooth.h"
+#include "vtkMath.h"
+
+template <class T>
+void AppendSliceToVolume(T* slicePtr, T* volumePtr, size_t imageSize, int currentSlice)
+{
+  T* ptr = volumePtr + currentSlice * imageSize;
+  memcpy(ptr, slicePtr, imageSize);
+}
+
+
+int main(int argc, char** argv)
+{
+  // create a rendering window and both renderers
+  vtkSmartPointer<vtkRenderer> renderer = vtkSmartPointer<vtkRenderer>::New();
+  vtkSmartPointer<vtkRenderWindow> renWin =
+    vtkSmartPointer<vtkRenderWindow>::New();
+  renWin->AddRenderer(renderer);
+  vtkSmartPointer<vtkRenderWindowInteractor> iren =
+    vtkSmartPointer<vtkRenderWindowInteractor>::New();
+  iren->SetRenderWindow(renWin);
+
+  vtkSmartPointer<vtkImageActor> ia = vtkSmartPointer<vtkImageActor>::New();
+  renderer->AddActor(ia);
+
+  // Create the volume: read the first image to get the x-y dimensions. Then append them all
+  // together to create a volume.
+  vtkSmartPointer<vtkJPEGReader> jpgReader = vtkSmartPointer<vtkJPEGReader>::New();
+  jpgReader->SetFileName("C:/F/CV/Data/Test/Beach/beach1.jpg");
+  jpgReader->Update();
+
+  vtkSmartPointer<vtkImageData> slice = vtkSmartPointer<vtkImageData>::New();
+  slice = jpgReader->GetOutput();
+  int dims[3];
+  slice->GetDimensions(dims);
+  int scalarType = slice->GetScalarType();
+
+  // Okay we have enough information to create the volume
+  int numImages = 15;
+  vtkSmartPointer<vtkImageData> volume = vtkSmartPointer<vtkImageData>::New();
+  vtkSmartPointer<vtkDataArray> scalars = slice->GetPointData()->GetScalars()->NewInstance();
+  scalars->UnRegister(NULL);
+  int numComps = slice->GetPointData()->GetScalars()->GetNumberOfComponents();
+  scalars->SetNumberOfComponents(numComps);
+  scalars->SetNumberOfTuples(dims[0]*dims[1]*numImages);
+  volume->GetPointData()->SetScalars(scalars);
+  volume->SetExtent(0, dims[0] - 1, 0, dims[1] - 1, 0, numImages - 1);
+  volume->SetWholeExtent(0, dims[0] - 1, 0, dims[1] - 1, 0, numImages - 1);
+
+  // Now append the slices into the volume. Use pointers / memcpy for speed
+  vtkSmartPointer<vtkImageGaussianSmooth> smoother =
+    vtkSmartPointer<vtkImageGaussianSmooth>::New();
+  smoother->SetInputConnection(jpgReader->GetOutputPort());
+  smoother->SetDimensionality(2);
+
+  int currentSlice;
+  size_t imageSize;
+  for (currentSlice = 0; currentSlice < numImages; ++currentSlice)
+    {
+    switch (scalarType)
+      {
+      case VTK_UNSIGNED_CHAR:
+        {
+        smoother->SetStandardDeviation(currentSlice);
+//        smoother->SetStandardDeviation(vtkMath::Random(1,10));
+        smoother->Update();
+        slice = jpgReader->GetOutput();
+//        slice = smoother->GetOutput();
+        imageSize = dims[0] * dims[1] * sizeof(unsigned char) * numComps;
+        unsigned char* volumePtr = vtkUnsignedCharArray::SafeDownCast(scalars)->GetPointer(0);
+        unsigned char* slicePtr = vtkUnsignedCharArray::SafeDownCast(
+          slice->GetPointData()->GetScalars())->GetPointer(0);
+        AppendSliceToVolume(slicePtr, volumePtr, imageSize, currentSlice);
+        }
+      break;
+
+      default:
+        cout << "Bad data type\n";
+      }
+    }
+
+  // Loop through volume and display slices
+  ia->SetInput(volume);
+  ia->SetDisplayExtent(0, dims[0] - 1, 0, dims[1] - 1, 0, numImages - 1);
+
+  renderer->SetBackground(0.1, 0.2, 0.4);
+  renWin->SetSize(400, 400);
+
+  int sliceNum;
+  while (1)
+    {
+    cout << "Enter Slice Number" << "\n";
+    cin >> currentSlice;
+    ia->SetZSlice(currentSlice);
+    renWin->Render();
+//     for (currentSlice=0; currentSlice <numImages; ++currentSlice)
+//       {
+//       ia->SetZSlice(currentSlice);
+//       renWin->Render();
+//       }
+    }
+
+  iren->Start();
+
+  return 0;
+}
diff --git a/Examples/TestImageIcon.cxx b/Examples/TestImageIcon.cxx
new file mode 100644
index 00000000..36578fff
--- /dev/null
+++ b/Examples/TestImageIcon.cxx
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// This example tests the vtkVgImageIcon
+
+// First include the required header files for the VTK classes we are using.
+#include "vtkSmartPointer.h"
+#include "vtkVgImageIcon.h"
+#include "vtkRenderer.h"
+#include "vtkRenderWindow.h"
+#include "vtkRenderWindowInteractor.h"
+#include "vtkInteractorStyleTrackballCamera.h"
+#include "vtkJPEGReader.h"
+
+int main(int argc, char* argv[])
+{
+  // Create the RenderWindow, Renderer and both Actors
+  //
+  vtkSmartPointer<vtkRenderer> ren1 = vtkSmartPointer<vtkRenderer>::New();
+  vtkSmartPointer<vtkRenderWindow> renWin = vtkSmartPointer<vtkRenderWindow>::New();
+  renWin->AddRenderer(ren1);
+
+  vtkSmartPointer<vtkRenderWindowInteractor> iren = vtkSmartPointer<vtkRenderWindowInteractor>::New();
+  iren->SetRenderWindow(renWin);
+
+  // Create the widget
+  vtkSmartPointer<vtkVgImageIcon> icon = vtkSmartPointer<vtkVgImageIcon>::New();
+  icon->SetBalloonLayoutToImageRight();
+  icon->SetFileName("C:/F/CV/Data/Test/Beach/beach1.jpg");
+  icon->SetRenderer(ren1);
+  icon->SetImageSize(32, 32);
+
+  // Add the actors to the renderer, set the background and size
+  //
+  ren1->AddViewProp(icon);
+  ren1->SetBackground(0.1, 0.2, 0.4);
+  renWin->SetSize(300, 300);
+
+  // render the image
+  //
+  iren->Initialize();
+  renWin->Render();
+
+  icon->SetPosition(50, 50);
+  renWin->Render();
+  icon->SetPosition(75, 75);
+  renWin->Render();
+
+  iren->Start();
+
+  return 0;
+}
diff --git a/Icons/128x128/viqui.png b/Icons/128x128/viqui.png
new file mode 100644
index 00000000..a130a75c
Binary files /dev/null and b/Icons/128x128/viqui.png differ
diff --git a/Icons/128x128/vpView.png b/Icons/128x128/vpView.png
new file mode 100644
index 00000000..8c37ba00
Binary files /dev/null and b/Icons/128x128/vpView.png differ
diff --git a/Icons/128x128/vsPlay.png b/Icons/128x128/vsPlay.png
new file mode 100644
index 00000000..128fc778
Binary files /dev/null and b/Icons/128x128/vsPlay.png differ
diff --git a/Icons/16x16/add.png b/Icons/16x16/add.png
new file mode 100644
index 00000000..1368d445
Binary files /dev/null and b/Icons/16x16/add.png differ
diff --git a/Icons/16x16/alert-activate.png b/Icons/16x16/alert-activate.png
new file mode 100644
index 00000000..9fd77520
Binary files /dev/null and b/Icons/16x16/alert-activate.png differ
diff --git a/Icons/16x16/alert-clear-all.png b/Icons/16x16/alert-clear-all.png
new file mode 100644
index 00000000..3763402f
Binary files /dev/null and b/Icons/16x16/alert-clear-all.png differ
diff --git a/Icons/16x16/alert-clear.png b/Icons/16x16/alert-clear.png
new file mode 100644
index 00000000..500d61d5
Binary files /dev/null and b/Icons/16x16/alert-clear.png differ
diff --git a/Icons/16x16/alert-deactivate.png b/Icons/16x16/alert-deactivate.png
new file mode 100644
index 00000000..3205c0af
Binary files /dev/null and b/Icons/16x16/alert-deactivate.png differ
diff --git a/Icons/16x16/alert-list.png b/Icons/16x16/alert-list.png
new file mode 100644
index 00000000..e61d60a1
Binary files /dev/null and b/Icons/16x16/alert-list.png differ
diff --git a/Icons/16x16/apply.png b/Icons/16x16/apply.png
new file mode 100644
index 00000000..a71cc80a
Binary files /dev/null and b/Icons/16x16/apply.png differ
diff --git a/Icons/16x16/arrow-down.png b/Icons/16x16/arrow-down.png
new file mode 100644
index 00000000..3e31ac5e
Binary files /dev/null and b/Icons/16x16/arrow-down.png differ
diff --git a/Icons/16x16/arrow-up.png b/Icons/16x16/arrow-up.png
new file mode 100644
index 00000000..a5910ae8
Binary files /dev/null and b/Icons/16x16/arrow-up.png differ
diff --git a/Icons/16x16/blank.png b/Icons/16x16/blank.png
new file mode 100644
index 00000000..2872878d
Binary files /dev/null and b/Icons/16x16/blank.png differ
diff --git a/Icons/16x16/browse.png b/Icons/16x16/browse.png
new file mode 100644
index 00000000..5e0e7df6
Binary files /dev/null and b/Icons/16x16/browse.png differ
diff --git a/Icons/16x16/cancel.png b/Icons/16x16/cancel.png
new file mode 100644
index 00000000..3166a70d
Binary files /dev/null and b/Icons/16x16/cancel.png differ
diff --git a/Icons/16x16/clear-lineedit.png b/Icons/16x16/clear-lineedit.png
new file mode 100644
index 00000000..37b3a8c7
Binary files /dev/null and b/Icons/16x16/clear-lineedit.png differ
diff --git a/Icons/16x16/clear.png b/Icons/16x16/clear.png
new file mode 100644
index 00000000..015da32e
Binary files /dev/null and b/Icons/16x16/clear.png differ
diff --git a/Icons/16x16/close.png b/Icons/16x16/close.png
new file mode 100644
index 00000000..a638b0cd
Binary files /dev/null and b/Icons/16x16/close.png differ
diff --git a/Icons/16x16/configure-shortcuts.png b/Icons/16x16/configure-shortcuts.png
new file mode 100644
index 00000000..c1f04fb0
Binary files /dev/null and b/Icons/16x16/configure-shortcuts.png differ
diff --git a/Icons/16x16/configure.png b/Icons/16x16/configure.png
new file mode 100644
index 00000000..a078e7b8
Binary files /dev/null and b/Icons/16x16/configure.png differ
diff --git a/Icons/16x16/connect-stream-video.png b/Icons/16x16/connect-stream-video.png
new file mode 100644
index 00000000..87834b29
Binary files /dev/null and b/Icons/16x16/connect-stream-video.png differ
diff --git a/Icons/16x16/delete.png b/Icons/16x16/delete.png
new file mode 100644
index 00000000..d4ef95d6
Binary files /dev/null and b/Icons/16x16/delete.png differ
diff --git a/Icons/16x16/edit-location.png b/Icons/16x16/edit-location.png
new file mode 100644
index 00000000..5643dcd4
Binary files /dev/null and b/Icons/16x16/edit-location.png differ
diff --git a/Icons/16x16/edit-number.png b/Icons/16x16/edit-number.png
new file mode 100644
index 00000000..8eb091e7
Binary files /dev/null and b/Icons/16x16/edit-number.png differ
diff --git a/Icons/16x16/edit-query.png b/Icons/16x16/edit-query.png
new file mode 100644
index 00000000..bd8b1704
Binary files /dev/null and b/Icons/16x16/edit-query.png differ
diff --git a/Icons/16x16/edit.png b/Icons/16x16/edit.png
new file mode 100644
index 00000000..8003709b
Binary files /dev/null and b/Icons/16x16/edit.png differ
diff --git a/Icons/16x16/event-show-boxes.png b/Icons/16x16/event-show-boxes.png
new file mode 100644
index 00000000..48aa16b9
Binary files /dev/null and b/Icons/16x16/event-show-boxes.png differ
diff --git a/Icons/16x16/event-show-label.png b/Icons/16x16/event-show-label.png
new file mode 100644
index 00000000..dc743336
Binary files /dev/null and b/Icons/16x16/event-show-label.png differ
diff --git a/Icons/16x16/event-show-probability.png b/Icons/16x16/event-show-probability.png
new file mode 100644
index 00000000..66797e06
Binary files /dev/null and b/Icons/16x16/event-show-probability.png differ
diff --git a/Icons/16x16/event-show-tracks.png b/Icons/16x16/event-show-tracks.png
new file mode 100644
index 00000000..566aedc5
Binary files /dev/null and b/Icons/16x16/event-show-tracks.png differ
diff --git a/Icons/16x16/filter-show.png b/Icons/16x16/filter-show.png
new file mode 100644
index 00000000..544ad0cc
Binary files /dev/null and b/Icons/16x16/filter-show.png differ
diff --git a/Icons/16x16/load-alert.png b/Icons/16x16/load-alert.png
new file mode 100644
index 00000000..e28d15c6
Binary files /dev/null and b/Icons/16x16/load-alert.png differ
diff --git a/Icons/16x16/load-database.png b/Icons/16x16/load-database.png
new file mode 100644
index 00000000..b1f68f91
Binary files /dev/null and b/Icons/16x16/load-database.png differ
diff --git a/Icons/16x16/load-events.png b/Icons/16x16/load-events.png
new file mode 100644
index 00000000..24ed899b
Binary files /dev/null and b/Icons/16x16/load-events.png differ
diff --git a/Icons/16x16/load-query.png b/Icons/16x16/load-query.png
new file mode 100644
index 00000000..df7edcae
Binary files /dev/null and b/Icons/16x16/load-query.png differ
diff --git a/Icons/16x16/load-tracks.png b/Icons/16x16/load-tracks.png
new file mode 100644
index 00000000..4f028b3c
Binary files /dev/null and b/Icons/16x16/load-tracks.png differ
diff --git a/Icons/16x16/load-video.png b/Icons/16x16/load-video.png
new file mode 100644
index 00000000..c2e4bc46
Binary files /dev/null and b/Icons/16x16/load-video.png differ
diff --git a/Icons/16x16/load.png b/Icons/16x16/load.png
new file mode 100644
index 00000000..805dd0dc
Binary files /dev/null and b/Icons/16x16/load.png differ
diff --git a/Icons/16x16/mask-color.png b/Icons/16x16/mask-color.png
new file mode 100644
index 00000000..dc6b089f
Binary files /dev/null and b/Icons/16x16/mask-color.png differ
diff --git a/Icons/16x16/mask-show-filtering.png b/Icons/16x16/mask-show-filtering.png
new file mode 100644
index 00000000..1447ca68
Binary files /dev/null and b/Icons/16x16/mask-show-filtering.png differ
diff --git a/Icons/16x16/mask-show-tracking.png b/Icons/16x16/mask-show-tracking.png
new file mode 100644
index 00000000..95a9ccab
Binary files /dev/null and b/Icons/16x16/mask-show-tracking.png differ
diff --git a/Icons/16x16/measure.png b/Icons/16x16/measure.png
new file mode 100644
index 00000000..7750414e
Binary files /dev/null and b/Icons/16x16/measure.png differ
diff --git a/Icons/16x16/new-alert.png b/Icons/16x16/new-alert.png
new file mode 100644
index 00000000..5bb066c2
Binary files /dev/null and b/Icons/16x16/new-alert.png differ
diff --git a/Icons/16x16/new-query.png b/Icons/16x16/new-query.png
new file mode 100644
index 00000000..035f70cd
Binary files /dev/null and b/Icons/16x16/new-query.png differ
diff --git a/Icons/16x16/new-stream-video.png b/Icons/16x16/new-stream-video.png
new file mode 100644
index 00000000..75c40461
Binary files /dev/null and b/Icons/16x16/new-stream-video.png differ
diff --git a/Icons/16x16/okay.png b/Icons/16x16/okay.png
new file mode 100644
index 00000000..2d7459c8
Binary files /dev/null and b/Icons/16x16/okay.png differ
diff --git a/Icons/16x16/open-video-external.png b/Icons/16x16/open-video-external.png
new file mode 100644
index 00000000..e6f9ede9
Binary files /dev/null and b/Icons/16x16/open-video-external.png differ
diff --git a/Icons/16x16/path-clear-all.png b/Icons/16x16/path-clear-all.png
new file mode 100644
index 00000000..562546db
Binary files /dev/null and b/Icons/16x16/path-clear-all.png differ
diff --git a/Icons/16x16/path-clear.png b/Icons/16x16/path-clear.png
new file mode 100644
index 00000000..c6fa3a26
Binary files /dev/null and b/Icons/16x16/path-clear.png differ
diff --git a/Icons/16x16/path-close.png b/Icons/16x16/path-close.png
new file mode 100644
index 00000000..bc3c0685
Binary files /dev/null and b/Icons/16x16/path-close.png differ
diff --git a/Icons/16x16/path-draw.png b/Icons/16x16/path-draw.png
new file mode 100644
index 00000000..d32e77c5
Binary files /dev/null and b/Icons/16x16/path-draw.png differ
diff --git a/Icons/16x16/path-list.png b/Icons/16x16/path-list.png
new file mode 100644
index 00000000..d7ee3e7a
Binary files /dev/null and b/Icons/16x16/path-list.png differ
diff --git a/Icons/16x16/pin.png b/Icons/16x16/pin.png
new file mode 100644
index 00000000..4d49b04b
Binary files /dev/null and b/Icons/16x16/pin.png differ
diff --git a/Icons/16x16/playback-fast-backward.png b/Icons/16x16/playback-fast-backward.png
new file mode 100644
index 00000000..d6f2e06b
Binary files /dev/null and b/Icons/16x16/playback-fast-backward.png differ
diff --git a/Icons/16x16/playback-fast-forward.png b/Icons/16x16/playback-fast-forward.png
new file mode 100644
index 00000000..1039a034
Binary files /dev/null and b/Icons/16x16/playback-fast-forward.png differ
diff --git a/Icons/16x16/playback-frame-backward.png b/Icons/16x16/playback-frame-backward.png
new file mode 100644
index 00000000..344f18bb
Binary files /dev/null and b/Icons/16x16/playback-frame-backward.png differ
diff --git a/Icons/16x16/playback-frame-forward.png b/Icons/16x16/playback-frame-forward.png
new file mode 100644
index 00000000..ca206cff
Binary files /dev/null and b/Icons/16x16/playback-frame-forward.png differ
diff --git a/Icons/16x16/playback-pause.png b/Icons/16x16/playback-pause.png
new file mode 100644
index 00000000..e61dc164
Binary files /dev/null and b/Icons/16x16/playback-pause.png differ
diff --git a/Icons/16x16/playback-play-live.png b/Icons/16x16/playback-play-live.png
new file mode 100644
index 00000000..4833dd5f
Binary files /dev/null and b/Icons/16x16/playback-play-live.png differ
diff --git a/Icons/16x16/playback-play-reverse.png b/Icons/16x16/playback-play-reverse.png
new file mode 100644
index 00000000..02dc1ae6
Binary files /dev/null and b/Icons/16x16/playback-play-reverse.png differ
diff --git a/Icons/16x16/playback-play.png b/Icons/16x16/playback-play.png
new file mode 100644
index 00000000..75bbfe71
Binary files /dev/null and b/Icons/16x16/playback-play.png differ
diff --git a/Icons/16x16/playback-skip-backward.png b/Icons/16x16/playback-skip-backward.png
new file mode 100644
index 00000000..89f381da
Binary files /dev/null and b/Icons/16x16/playback-skip-backward.png differ
diff --git a/Icons/16x16/playback-skip-forward.png b/Icons/16x16/playback-skip-forward.png
new file mode 100644
index 00000000..4b501c2e
Binary files /dev/null and b/Icons/16x16/playback-skip-forward.png differ
diff --git a/Icons/16x16/playback-speed-decrease.png b/Icons/16x16/playback-speed-decrease.png
new file mode 100644
index 00000000..32f00aa9
Binary files /dev/null and b/Icons/16x16/playback-speed-decrease.png differ
diff --git a/Icons/16x16/playback-speed-increase.png b/Icons/16x16/playback-speed-increase.png
new file mode 100644
index 00000000..fa2aaf52
Binary files /dev/null and b/Icons/16x16/playback-speed-increase.png differ
diff --git a/Icons/16x16/playback-stop.png b/Icons/16x16/playback-stop.png
new file mode 100644
index 00000000..317d9a6a
Binary files /dev/null and b/Icons/16x16/playback-stop.png differ
diff --git a/Icons/16x16/quit.png b/Icons/16x16/quit.png
new file mode 100644
index 00000000..32993c98
Binary files /dev/null and b/Icons/16x16/quit.png differ
diff --git a/Icons/16x16/refresh.png b/Icons/16x16/refresh.png
new file mode 100644
index 00000000..dd5d70b9
Binary files /dev/null and b/Icons/16x16/refresh.png differ
diff --git a/Icons/16x16/remove.png b/Icons/16x16/remove.png
new file mode 100644
index 00000000..87c82a0f
Binary files /dev/null and b/Icons/16x16/remove.png differ
diff --git a/Icons/16x16/reset.png b/Icons/16x16/reset.png
new file mode 100644
index 00000000..82fbdd57
Binary files /dev/null and b/Icons/16x16/reset.png differ
diff --git a/Icons/16x16/save-query.png b/Icons/16x16/save-query.png
new file mode 100644
index 00000000..ebe95061
Binary files /dev/null and b/Icons/16x16/save-query.png differ
diff --git a/Icons/16x16/save.png b/Icons/16x16/save.png
new file mode 100644
index 00000000..f98985d6
Binary files /dev/null and b/Icons/16x16/save.png differ
diff --git a/Icons/16x16/search-database.png b/Icons/16x16/search-database.png
new file mode 100644
index 00000000..5f2c32b2
Binary files /dev/null and b/Icons/16x16/search-database.png differ
diff --git a/Icons/16x16/search.png b/Icons/16x16/search.png
new file mode 100644
index 00000000..70482d52
Binary files /dev/null and b/Icons/16x16/search.png differ
diff --git a/Icons/16x16/star-off.png b/Icons/16x16/star-off.png
new file mode 100644
index 00000000..bc1a0ffb
Binary files /dev/null and b/Icons/16x16/star-off.png differ
diff --git a/Icons/16x16/star.png b/Icons/16x16/star.png
new file mode 100644
index 00000000..8e383004
Binary files /dev/null and b/Icons/16x16/star.png differ
diff --git a/Icons/16x16/track-color.png b/Icons/16x16/track-color.png
new file mode 100644
index 00000000..35709e69
Binary files /dev/null and b/Icons/16x16/track-color.png differ
diff --git a/Icons/16x16/track-list.png b/Icons/16x16/track-list.png
new file mode 100644
index 00000000..8db2be12
Binary files /dev/null and b/Icons/16x16/track-list.png differ
diff --git a/Icons/16x16/track-show-boxes.png b/Icons/16x16/track-show-boxes.png
new file mode 100644
index 00000000..9f21495d
Binary files /dev/null and b/Icons/16x16/track-show-boxes.png differ
diff --git a/Icons/16x16/track-show-id.png b/Icons/16x16/track-show-id.png
new file mode 100644
index 00000000..8c1f8a0e
Binary files /dev/null and b/Icons/16x16/track-show-id.png differ
diff --git a/Icons/16x16/track-show-pvo.png b/Icons/16x16/track-show-pvo.png
new file mode 100644
index 00000000..21c60afa
Binary files /dev/null and b/Icons/16x16/track-show-pvo.png differ
diff --git a/Icons/16x16/track-show.png b/Icons/16x16/track-show.png
new file mode 100644
index 00000000..3e1c0b38
Binary files /dev/null and b/Icons/16x16/track-show.png differ
diff --git a/Icons/16x16/view-reset.png b/Icons/16x16/view-reset.png
new file mode 100644
index 00000000..990a8b3f
Binary files /dev/null and b/Icons/16x16/view-reset.png differ
diff --git a/Icons/16x16/view-track.png b/Icons/16x16/view-track.png
new file mode 100644
index 00000000..f675fdd4
Binary files /dev/null and b/Icons/16x16/view-track.png differ
diff --git a/Icons/16x16/viqui.png b/Icons/16x16/viqui.png
new file mode 100644
index 00000000..7096cdc4
Binary files /dev/null and b/Icons/16x16/viqui.png differ
diff --git a/Icons/16x16/vsPlay.png b/Icons/16x16/vsPlay.png
new file mode 100644
index 00000000..9a574f9d
Binary files /dev/null and b/Icons/16x16/vsPlay.png differ
diff --git a/Icons/22x22/alert-activate.png b/Icons/22x22/alert-activate.png
new file mode 100644
index 00000000..9c78ba05
Binary files /dev/null and b/Icons/22x22/alert-activate.png differ
diff --git a/Icons/22x22/alert-clear-all.png b/Icons/22x22/alert-clear-all.png
new file mode 100644
index 00000000..553545c0
Binary files /dev/null and b/Icons/22x22/alert-clear-all.png differ
diff --git a/Icons/22x22/alert-clear.png b/Icons/22x22/alert-clear.png
new file mode 100644
index 00000000..20e2d02f
Binary files /dev/null and b/Icons/22x22/alert-clear.png differ
diff --git a/Icons/22x22/alert-deactivate.png b/Icons/22x22/alert-deactivate.png
new file mode 100644
index 00000000..24f02ac7
Binary files /dev/null and b/Icons/22x22/alert-deactivate.png differ
diff --git a/Icons/22x22/alert-list.png b/Icons/22x22/alert-list.png
new file mode 100644
index 00000000..80b1f5fc
Binary files /dev/null and b/Icons/22x22/alert-list.png differ
diff --git a/Icons/22x22/apply.png b/Icons/22x22/apply.png
new file mode 100644
index 00000000..edc6fad5
Binary files /dev/null and b/Icons/22x22/apply.png differ
diff --git a/Icons/22x22/arrow-down-multi.png b/Icons/22x22/arrow-down-multi.png
new file mode 100644
index 00000000..caca47d5
Binary files /dev/null and b/Icons/22x22/arrow-down-multi.png differ
diff --git a/Icons/22x22/arrow-down.png b/Icons/22x22/arrow-down.png
new file mode 100644
index 00000000..85420266
Binary files /dev/null and b/Icons/22x22/arrow-down.png differ
diff --git a/Icons/22x22/arrow-up.png b/Icons/22x22/arrow-up.png
new file mode 100644
index 00000000..6beb89f2
Binary files /dev/null and b/Icons/22x22/arrow-up.png differ
diff --git a/Icons/22x22/cancel.png b/Icons/22x22/cancel.png
new file mode 100644
index 00000000..0b6f851f
Binary files /dev/null and b/Icons/22x22/cancel.png differ
diff --git a/Icons/22x22/clear.png b/Icons/22x22/clear.png
new file mode 100644
index 00000000..11de4bf6
Binary files /dev/null and b/Icons/22x22/clear.png differ
diff --git a/Icons/22x22/close.png b/Icons/22x22/close.png
new file mode 100644
index 00000000..ba1fac51
Binary files /dev/null and b/Icons/22x22/close.png differ
diff --git a/Icons/22x22/configure-shortcuts.png b/Icons/22x22/configure-shortcuts.png
new file mode 100644
index 00000000..54bd5e67
Binary files /dev/null and b/Icons/22x22/configure-shortcuts.png differ
diff --git a/Icons/22x22/configure.png b/Icons/22x22/configure.png
new file mode 100644
index 00000000..961cc854
Binary files /dev/null and b/Icons/22x22/configure.png differ
diff --git a/Icons/22x22/connect-stream-video.png b/Icons/22x22/connect-stream-video.png
new file mode 100644
index 00000000..b03aa9b6
Binary files /dev/null and b/Icons/22x22/connect-stream-video.png differ
diff --git a/Icons/22x22/delete.png b/Icons/22x22/delete.png
new file mode 100644
index 00000000..69018a93
Binary files /dev/null and b/Icons/22x22/delete.png differ
diff --git a/Icons/22x22/edit-query.png b/Icons/22x22/edit-query.png
new file mode 100644
index 00000000..960affed
Binary files /dev/null and b/Icons/22x22/edit-query.png differ
diff --git a/Icons/22x22/edit.png b/Icons/22x22/edit.png
new file mode 100644
index 00000000..5730c670
Binary files /dev/null and b/Icons/22x22/edit.png differ
diff --git a/Icons/22x22/event-show-boxes.png b/Icons/22x22/event-show-boxes.png
new file mode 100644
index 00000000..edf653ec
Binary files /dev/null and b/Icons/22x22/event-show-boxes.png differ
diff --git a/Icons/22x22/event-show-label.png b/Icons/22x22/event-show-label.png
new file mode 100644
index 00000000..8a41f2e9
Binary files /dev/null and b/Icons/22x22/event-show-label.png differ
diff --git a/Icons/22x22/event-show-probability.png b/Icons/22x22/event-show-probability.png
new file mode 100644
index 00000000..da814602
Binary files /dev/null and b/Icons/22x22/event-show-probability.png differ
diff --git a/Icons/22x22/event-show-tracks.png b/Icons/22x22/event-show-tracks.png
new file mode 100644
index 00000000..5224003e
Binary files /dev/null and b/Icons/22x22/event-show-tracks.png differ
diff --git a/Icons/22x22/filter-show.png b/Icons/22x22/filter-show.png
new file mode 100644
index 00000000..35cb0fef
Binary files /dev/null and b/Icons/22x22/filter-show.png differ
diff --git a/Icons/22x22/load-alert.png b/Icons/22x22/load-alert.png
new file mode 100644
index 00000000..f2c56b95
Binary files /dev/null and b/Icons/22x22/load-alert.png differ
diff --git a/Icons/22x22/load-database.png b/Icons/22x22/load-database.png
new file mode 100644
index 00000000..9a422b63
Binary files /dev/null and b/Icons/22x22/load-database.png differ
diff --git a/Icons/22x22/load-events.png b/Icons/22x22/load-events.png
new file mode 100644
index 00000000..b9493d66
Binary files /dev/null and b/Icons/22x22/load-events.png differ
diff --git a/Icons/22x22/load-query.png b/Icons/22x22/load-query.png
new file mode 100644
index 00000000..b4ed3e06
Binary files /dev/null and b/Icons/22x22/load-query.png differ
diff --git a/Icons/22x22/load-tracks.png b/Icons/22x22/load-tracks.png
new file mode 100644
index 00000000..7a900bbe
Binary files /dev/null and b/Icons/22x22/load-tracks.png differ
diff --git a/Icons/22x22/load-video.png b/Icons/22x22/load-video.png
new file mode 100644
index 00000000..9d962450
Binary files /dev/null and b/Icons/22x22/load-video.png differ
diff --git a/Icons/22x22/load.png b/Icons/22x22/load.png
new file mode 100644
index 00000000..da37239a
Binary files /dev/null and b/Icons/22x22/load.png differ
diff --git a/Icons/22x22/mask-color.png b/Icons/22x22/mask-color.png
new file mode 100644
index 00000000..ac1ae0f3
Binary files /dev/null and b/Icons/22x22/mask-color.png differ
diff --git a/Icons/22x22/mask-show-filtering.png b/Icons/22x22/mask-show-filtering.png
new file mode 100644
index 00000000..bad5cb58
Binary files /dev/null and b/Icons/22x22/mask-show-filtering.png differ
diff --git a/Icons/22x22/mask-show-tracking.png b/Icons/22x22/mask-show-tracking.png
new file mode 100644
index 00000000..66cfd2b3
Binary files /dev/null and b/Icons/22x22/mask-show-tracking.png differ
diff --git a/Icons/22x22/measure.png b/Icons/22x22/measure.png
new file mode 100644
index 00000000..81023c4f
Binary files /dev/null and b/Icons/22x22/measure.png differ
diff --git a/Icons/22x22/new-alert.png b/Icons/22x22/new-alert.png
new file mode 100644
index 00000000..601a5ca8
Binary files /dev/null and b/Icons/22x22/new-alert.png differ
diff --git a/Icons/22x22/new-query.png b/Icons/22x22/new-query.png
new file mode 100644
index 00000000..b649e99d
Binary files /dev/null and b/Icons/22x22/new-query.png differ
diff --git a/Icons/22x22/new-stream-video.png b/Icons/22x22/new-stream-video.png
new file mode 100644
index 00000000..30668764
Binary files /dev/null and b/Icons/22x22/new-stream-video.png differ
diff --git a/Icons/22x22/okay.png b/Icons/22x22/okay.png
new file mode 100644
index 00000000..39826b04
Binary files /dev/null and b/Icons/22x22/okay.png differ
diff --git a/Icons/22x22/open-video-external.png b/Icons/22x22/open-video-external.png
new file mode 100644
index 00000000..22ac46db
Binary files /dev/null and b/Icons/22x22/open-video-external.png differ
diff --git a/Icons/22x22/path-clear-all.png b/Icons/22x22/path-clear-all.png
new file mode 100644
index 00000000..643190e7
Binary files /dev/null and b/Icons/22x22/path-clear-all.png differ
diff --git a/Icons/22x22/path-clear.png b/Icons/22x22/path-clear.png
new file mode 100644
index 00000000..80a44fd8
Binary files /dev/null and b/Icons/22x22/path-clear.png differ
diff --git a/Icons/22x22/path-close.png b/Icons/22x22/path-close.png
new file mode 100644
index 00000000..c05807b8
Binary files /dev/null and b/Icons/22x22/path-close.png differ
diff --git a/Icons/22x22/path-draw.png b/Icons/22x22/path-draw.png
new file mode 100644
index 00000000..830a3422
Binary files /dev/null and b/Icons/22x22/path-draw.png differ
diff --git a/Icons/22x22/path-list.png b/Icons/22x22/path-list.png
new file mode 100644
index 00000000..207bf614
Binary files /dev/null and b/Icons/22x22/path-list.png differ
diff --git a/Icons/22x22/playback-fast-backward.png b/Icons/22x22/playback-fast-backward.png
new file mode 100644
index 00000000..19c000ea
Binary files /dev/null and b/Icons/22x22/playback-fast-backward.png differ
diff --git a/Icons/22x22/playback-fast-forward.png b/Icons/22x22/playback-fast-forward.png
new file mode 100644
index 00000000..8327941e
Binary files /dev/null and b/Icons/22x22/playback-fast-forward.png differ
diff --git a/Icons/22x22/playback-frame-backward.png b/Icons/22x22/playback-frame-backward.png
new file mode 100644
index 00000000..8d1d9d39
Binary files /dev/null and b/Icons/22x22/playback-frame-backward.png differ
diff --git a/Icons/22x22/playback-frame-forward.png b/Icons/22x22/playback-frame-forward.png
new file mode 100644
index 00000000..365a42aa
Binary files /dev/null and b/Icons/22x22/playback-frame-forward.png differ
diff --git a/Icons/22x22/playback-pause.png b/Icons/22x22/playback-pause.png
new file mode 100644
index 00000000..ba6c8b38
Binary files /dev/null and b/Icons/22x22/playback-pause.png differ
diff --git a/Icons/22x22/playback-play-live.png b/Icons/22x22/playback-play-live.png
new file mode 100644
index 00000000..1d6fced9
Binary files /dev/null and b/Icons/22x22/playback-play-live.png differ
diff --git a/Icons/22x22/playback-play-reverse.png b/Icons/22x22/playback-play-reverse.png
new file mode 100644
index 00000000..6e493fa1
Binary files /dev/null and b/Icons/22x22/playback-play-reverse.png differ
diff --git a/Icons/22x22/playback-play.png b/Icons/22x22/playback-play.png
new file mode 100644
index 00000000..18f51f84
Binary files /dev/null and b/Icons/22x22/playback-play.png differ
diff --git a/Icons/22x22/playback-skip-backward.png b/Icons/22x22/playback-skip-backward.png
new file mode 100644
index 00000000..6f38c477
Binary files /dev/null and b/Icons/22x22/playback-skip-backward.png differ
diff --git a/Icons/22x22/playback-skip-forward.png b/Icons/22x22/playback-skip-forward.png
new file mode 100644
index 00000000..38077cb4
Binary files /dev/null and b/Icons/22x22/playback-skip-forward.png differ
diff --git a/Icons/22x22/playback-speed-decrease.png b/Icons/22x22/playback-speed-decrease.png
new file mode 100644
index 00000000..0b1fbd1c
Binary files /dev/null and b/Icons/22x22/playback-speed-decrease.png differ
diff --git a/Icons/22x22/playback-speed-increase.png b/Icons/22x22/playback-speed-increase.png
new file mode 100644
index 00000000..26abccf0
Binary files /dev/null and b/Icons/22x22/playback-speed-increase.png differ
diff --git a/Icons/22x22/playback-stop.png b/Icons/22x22/playback-stop.png
new file mode 100644
index 00000000..975e129a
Binary files /dev/null and b/Icons/22x22/playback-stop.png differ
diff --git a/Icons/22x22/quit.png b/Icons/22x22/quit.png
new file mode 100644
index 00000000..3813f82a
Binary files /dev/null and b/Icons/22x22/quit.png differ
diff --git a/Icons/22x22/refresh.png b/Icons/22x22/refresh.png
new file mode 100644
index 00000000..29afef0d
Binary files /dev/null and b/Icons/22x22/refresh.png differ
diff --git a/Icons/22x22/reset.png b/Icons/22x22/reset.png
new file mode 100644
index 00000000..834deaf3
Binary files /dev/null and b/Icons/22x22/reset.png differ
diff --git a/Icons/22x22/save-query.png b/Icons/22x22/save-query.png
new file mode 100644
index 00000000..0eb1042c
Binary files /dev/null and b/Icons/22x22/save-query.png differ
diff --git a/Icons/22x22/save.png b/Icons/22x22/save.png
new file mode 100644
index 00000000..9c290f3a
Binary files /dev/null and b/Icons/22x22/save.png differ
diff --git a/Icons/22x22/track-color.png b/Icons/22x22/track-color.png
new file mode 100644
index 00000000..75367327
Binary files /dev/null and b/Icons/22x22/track-color.png differ
diff --git a/Icons/22x22/track-list.png b/Icons/22x22/track-list.png
new file mode 100644
index 00000000..bb4d0118
Binary files /dev/null and b/Icons/22x22/track-list.png differ
diff --git a/Icons/22x22/track-show-boxes.png b/Icons/22x22/track-show-boxes.png
new file mode 100644
index 00000000..ac4ed2a7
Binary files /dev/null and b/Icons/22x22/track-show-boxes.png differ
diff --git a/Icons/22x22/track-show-id.png b/Icons/22x22/track-show-id.png
new file mode 100644
index 00000000..a3b8efe6
Binary files /dev/null and b/Icons/22x22/track-show-id.png differ
diff --git a/Icons/22x22/track-show-pvo.png b/Icons/22x22/track-show-pvo.png
new file mode 100644
index 00000000..b63ab911
Binary files /dev/null and b/Icons/22x22/track-show-pvo.png differ
diff --git a/Icons/22x22/track-show.png b/Icons/22x22/track-show.png
new file mode 100644
index 00000000..99efc75d
Binary files /dev/null and b/Icons/22x22/track-show.png differ
diff --git a/Icons/22x22/view-reset.png b/Icons/22x22/view-reset.png
new file mode 100644
index 00000000..359ba1a2
Binary files /dev/null and b/Icons/22x22/view-reset.png differ
diff --git a/Icons/22x22/view-track.png b/Icons/22x22/view-track.png
new file mode 100644
index 00000000..2302409d
Binary files /dev/null and b/Icons/22x22/view-track.png differ
diff --git a/Icons/32x32/data-providers.png b/Icons/32x32/data-providers.png
new file mode 100644
index 00000000..cf7f67e9
Binary files /dev/null and b/Icons/32x32/data-providers.png differ
diff --git a/Icons/32x32/display.png b/Icons/32x32/display.png
new file mode 100644
index 00000000..f47a023d
Binary files /dev/null and b/Icons/32x32/display.png differ
diff --git a/Icons/32x32/iqr.png b/Icons/32x32/iqr.png
new file mode 100644
index 00000000..664080a8
Binary files /dev/null and b/Icons/32x32/iqr.png differ
diff --git a/Icons/32x32/qf.png b/Icons/32x32/qf.png
new file mode 100644
index 00000000..b4a6a457
Binary files /dev/null and b/Icons/32x32/qf.png differ
diff --git a/Icons/32x32/viqui.png b/Icons/32x32/viqui.png
new file mode 100644
index 00000000..947bc8ba
Binary files /dev/null and b/Icons/32x32/viqui.png differ
diff --git a/Icons/32x32/vsPlay.png b/Icons/32x32/vsPlay.png
new file mode 100644
index 00000000..c4278a0a
Binary files /dev/null and b/Icons/32x32/vsPlay.png differ
diff --git a/Icons/48x48/viqui.png b/Icons/48x48/viqui.png
new file mode 100644
index 00000000..4b5f477e
Binary files /dev/null and b/Icons/48x48/viqui.png differ
diff --git a/Icons/48x48/vsPlay.png b/Icons/48x48/vsPlay.png
new file mode 100644
index 00000000..640903a4
Binary files /dev/null and b/Icons/48x48/vsPlay.png differ
diff --git a/Icons/64x64/viqui.png b/Icons/64x64/viqui.png
new file mode 100644
index 00000000..988db567
Binary files /dev/null and b/Icons/64x64/viqui.png differ
diff --git a/Icons/64x64/vsPlay.png b/Icons/64x64/vsPlay.png
new file mode 100644
index 00000000..20abd51b
Binary files /dev/null and b/Icons/64x64/vsPlay.png differ
diff --git a/Icons/app-viqui.svg b/Icons/app-viqui.svg
new file mode 100644
index 00000000..f2024c48
--- /dev/null
+++ b/Icons/app-viqui.svg
@@ -0,0 +1,3211 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="208"
+   height="128"
+   id="svg18874"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="app-viqui.svg">
+  <defs
+     id="defs18876">
+    <linearGradient
+       id="linearGradient4506">
+      <stop
+         style="stop-color:#123401;stop-opacity:1;"
+         offset="0"
+         id="stop4508" />
+      <stop
+         style="stop-color:#3c3a18;stop-opacity:1"
+         offset="1"
+         id="stop4510" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4401">
+      <stop
+         style="stop-color:#4c7019;stop-opacity:1;"
+         offset="0"
+         id="stop4403" />
+      <stop
+         id="stop4415"
+         offset="0.34999999"
+         style="stop-color:#1e4904;stop-opacity:1;" />
+      <stop
+         id="stop4407"
+         offset="0.5"
+         style="stop-color:#184402;stop-opacity:1;" />
+      <stop
+         style="stop-color:#40511c;stop-opacity:1;"
+         offset="0.80000001"
+         id="stop4417" />
+      <stop
+         style="stop-color:#695e36;stop-opacity:1;"
+         offset="1"
+         id="stop4405" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4395">
+      <stop
+         id="stop4397"
+         offset="0"
+         style="stop-color:#695e36;stop-opacity:1;" />
+      <stop
+         id="stop4399"
+         offset="1"
+         style="stop-color:#184402;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4389">
+      <stop
+         id="stop4391"
+         offset="0"
+         style="stop-color:#847146;stop-opacity:1;" />
+      <stop
+         id="stop4393"
+         offset="1"
+         style="stop-color:#4c7019;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4381">
+      <stop
+         id="stop4383"
+         offset="0"
+         style="stop-color:#4b4624;stop-opacity:1" />
+      <stop
+         style="stop-color:#353813;stop-opacity:1;"
+         offset="0.69999999"
+         id="stop4385" />
+      <stop
+         id="stop4387"
+         offset="1"
+         style="stop-color:#204001;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4373">
+      <stop
+         id="stop4375"
+         offset="0"
+         style="stop-color:#3a3606;stop-opacity:1" />
+      <stop
+         style="stop-color:#3a3606;stop-opacity:1;"
+         offset="0.5"
+         id="stop4377" />
+      <stop
+         id="stop4379"
+         offset="1"
+         style="stop-color:#123401;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4365">
+      <stop
+         id="stop4367"
+         offset="0"
+         style="stop-color:#3d3719;stop-opacity:1;" />
+      <stop
+         style="stop-color:#31330e;stop-opacity:1"
+         offset="0.69999999"
+         id="stop4369" />
+      <stop
+         id="stop4371"
+         offset="1"
+         style="stop-color:#123401;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4359">
+      <stop
+         id="stop4361"
+         offset="0"
+         style="stop-color:#776648;stop-opacity:1" />
+      <stop
+         id="stop4363"
+         offset="1"
+         style="stop-color:#5d5e32;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4353">
+      <stop
+         id="stop4355"
+         offset="0"
+         style="stop-color:#184402;stop-opacity:1;" />
+      <stop
+         id="stop4357"
+         offset="1"
+         style="stop-color:#0f2b01;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4347">
+      <stop
+         style="stop-color:#a59077;stop-opacity:1"
+         offset="0"
+         id="stop4349" />
+      <stop
+         style="stop-color:#605130;stop-opacity:1"
+         offset="1"
+         id="stop4351" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4341">
+      <stop
+         id="stop4343"
+         offset="0"
+         style="stop-color:#64552a;stop-opacity:1" />
+      <stop
+         id="stop4345"
+         offset="1"
+         style="stop-color:#414519;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4335">
+      <stop
+         style="stop-color:#a59077;stop-opacity:1"
+         offset="0"
+         id="stop4337" />
+      <stop
+         style="stop-color:#66653a;stop-opacity:1"
+         offset="1"
+         id="stop4339" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4325">
+      <stop
+         id="stop4327"
+         offset="0"
+         style="stop-color:#4c7019;stop-opacity:1;" />
+      <stop
+         style="stop-color:#3f6513;stop-opacity:1;"
+         offset="0.25"
+         id="stop4329" />
+      <stop
+         id="stop4331"
+         offset="0.64999998"
+         style="stop-color:#254f07;stop-opacity:1;" />
+      <stop
+         id="stop4333"
+         offset="1"
+         style="stop-color:#184401;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11091">
+      <stop
+         id="stop11093"
+         offset="0"
+         style="stop-color:#585023;stop-opacity:1" />
+      <stop
+         style="stop-color:#585023;stop-opacity:1;"
+         offset="0.5"
+         id="stop11095" />
+      <stop
+         id="stop11097"
+         offset="1"
+         style="stop-color:#204001;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11083">
+      <stop
+         style="stop-color:#105090;stop-opacity:1"
+         offset="0"
+         id="stop11085" />
+      <stop
+         id="stop11087"
+         offset="0.5"
+         style="stop-color:#000840;stop-opacity:0.98039216" />
+      <stop
+         style="stop-color:#000428;stop-opacity:1;"
+         offset="1"
+         id="stop11089" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11073">
+      <stop
+         style="stop-color:#105090;stop-opacity:1"
+         offset="0"
+         id="stop11075" />
+      <stop
+         id="stop11077"
+         offset="0.34999999"
+         style="stop-color:#002060;stop-opacity:1;" />
+      <stop
+         style="stop-color:#000840;stop-opacity:0.98039216;"
+         offset="0.64999998"
+         id="stop11079" />
+      <stop
+         style="stop-color:#000428;stop-opacity:1;"
+         offset="1"
+         id="stop11081" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14204">
+      <stop
+         style="stop-color:#6f6f58;stop-opacity:0"
+         offset="0"
+         id="stop14206" />
+      <stop
+         id="stop14212"
+         offset="0.5"
+         style="stop-color:#6f6f58;stop-opacity:0;" />
+      <stop
+         style="stop-color:#6f6f58;stop-opacity:1;"
+         offset="1"
+         id="stop14208" />
+    </linearGradient>
+    <linearGradient
+       id="SG_BLACK_1">
+      <stop
+         style="stop-color:#111111;stop-opacity:1;"
+         offset="0"
+         id="stop3900-0" />
+      <stop
+         style="stop-color:#434343;stop-opacity:1;"
+         offset="1"
+         id="stop3902-39" />
+    </linearGradient>
+    <linearGradient
+       x1="343.66751"
+       y1="122.48"
+       x2="332.00931"
+       y2="108.939"
+       id="SG_GRAY_2"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6371-1-1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6373-2-8"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6375-7-1"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.73286879" />
+      <stop
+         id="stop6377-4-1"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.90309668" />
+      <stop
+         id="stop6379-7-5"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="359.05081"
+       y1="122.8501"
+       x2="346.7869"
+       y2="108.6055"
+       id="SG_GRAY_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6630-5-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6632-5"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6634-2-5"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.51010001" />
+      <stop
+         id="stop6636-90"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop6638-2-8"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient14137-8"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient14317-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient14200-4"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient14133-3"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient14210-2"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="2.1355548"
+       fy="77.608032"
+       fx="-151.26682"
+       cy="77.608032"
+       cx="-151.26682"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient14399"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient18227-5-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient18728-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1326893,0.10986245,-0.05157623,0.53175443,212.48813,-65.944457)"
+       cx="-143.17728"
+       cy="82.496986"
+       fx="-143.17728"
+       fy="82.496986"
+       r="10.547367" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19425"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19427"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19429"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient19431"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient19433"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19435"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       cx="-151.26682"
+       cy="77.608032"
+       fx="-151.26682"
+       fy="77.608032"
+       r="2.1355548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19739"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19741"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19743"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient19745"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient19747"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       cx="-151.26682"
+       cy="77.608032"
+       fx="-151.26682"
+       fy="77.608032"
+       r="2.1355548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19917"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19921"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient19923"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient19925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19927"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       cx="-151.26682"
+       cy="77.608032"
+       fx="-151.26682"
+       fy="77.608032"
+       r="2.1355548" />
+    <radialGradient
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999"
+       id="radialGradient6847"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6849"
+         style="stop-color:#c1ced7;stop-opacity:0.50196081;"
+         offset="0" />
+      <stop
+         id="stop6851"
+         style="stop-color:#91a8b8;stop-opacity:0.3764706;"
+         offset="0.47130001" />
+      <stop
+         id="stop6853"
+         style="stop-color:#718fa3;stop-opacity:0.3137255;"
+         offset="0.82730001" />
+      <stop
+         id="stop6855"
+         style="stop-color:#64859b;stop-opacity:0.25098041;"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6911"
+       r="9.7730999"
+       cy="121.8931"
+       cx="310.94339">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.50196081;"
+         id="stop6913" />
+      <stop
+         offset="0.69999999"
+         style="stop-color:#ffffff;stop-opacity:0.3764706;"
+         id="stop6917" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop6919" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient6943">
+      <stop
+         style="stop-color:#415564;stop-opacity:1;"
+         offset="0"
+         id="stop6945" />
+      <stop
+         id="stop6951"
+         offset="0.69999999"
+         style="stop-color:#839daf;stop-opacity:1" />
+      <stop
+         style="stop-color:#a7bac6;stop-opacity:1"
+         offset="1"
+         id="stop6947" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11073"
+       id="radialGradient5788-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6991389,1.2224198e-6,-1.2224026e-6,1.6991149,-501.15878,-187.4769)"
+       cx="726.09155"
+       cy="240.15294"
+       fx="726.09155"
+       fy="240.15295"
+       r="72.64286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11083"
+       id="radialGradient5790-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.699138,-1.3712271e-7,1.3712087e-7,1.6991147,-501.15838,-187.47587)"
+       cx="726.09155"
+       cy="240.15294"
+       fx="726.09155"
+       fy="240.15294"
+       r="72.64286" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath17433-0">
+      <path
+         transform="matrix(1.2222222,0,0,1.2222222,-540.12221,-137.64442)"
+         d="m 820,236 a 72,72 0 1 1 -144,0 72,72 0 1 1 144,0 z"
+         sodipodi:ry="72"
+         sodipodi:rx="72"
+         sodipodi:cy="236"
+         sodipodi:cx="748"
+         id="path17435-6"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.28571427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc"
+         clip-path="none" />
+    </clipPath>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter17427-4">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.9755386"
+         id="feGaussianBlur17429-7" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4325"
+       id="linearGradient5792-4"
+       gradientUnits="userSpaceOnUse"
+       x1="367.5755"
+       y1="195.24956"
+       x2="401.19031"
+       y2="223.58434"
+       gradientTransform="matrix(0.63636365,0,0,0.63636365,-173.56366,-31.46365)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4353"
+       id="linearGradient5794-6"
+       gradientUnits="userSpaceOnUse"
+       x1="367.5755"
+       y1="195.24956"
+       x2="401.19031"
+       y2="223.58434"
+       gradientTransform="matrix(0.63636365,0,0,0.63636365,-173.56366,-31.46365)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4341"
+       id="radialGradient5796-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72092886,-0.48272512,0.32231418,0.48136216,-224.44788,157.62828)"
+       spreadMethod="reflect"
+       cx="333.37241"
+       cy="229.53526"
+       fx="333.37241"
+       fy="229.53526"
+       r="17.499531" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4347"
+       id="radialGradient5798-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47016438,-0.39574234,0.83634416,0.99362435,-60.166004,158.85303)"
+       cx="379.70749"
+       cy="231.1389"
+       fx="379.70749"
+       fy="231.1389"
+       r="14.853663" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4325"
+       id="linearGradient5800-3"
+       gradientUnits="userSpaceOnUse"
+       x1="334.24048"
+       y1="160.24777"
+       x2="379.24472"
+       y2="163.30348" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4353"
+       id="linearGradient5802-7"
+       gradientUnits="userSpaceOnUse"
+       x1="334.24048"
+       y1="160.24777"
+       x2="379.24472"
+       y2="163.30348" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4335"
+       id="radialGradient5804-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76515765,-0.05501436,0.08555321,1.1899009,-115.01881,-12.72962)"
+       cx="497.24936"
+       cy="195.71024"
+       fx="497.24936"
+       fy="195.71024"
+       r="14.853663" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4359"
+       id="linearGradient5806-2"
+       gradientUnits="userSpaceOnUse"
+       x1="279.89703"
+       y1="194.48685"
+       x2="292.94226"
+       y2="190.98685" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4381"
+       id="radialGradient5808-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.42711658,0.48968735,-0.35418784,0.30893079,209.70302,4.9690984)"
+       cx="293.70053"
+       cy="-85.369713"
+       fx="293.70053"
+       fy="-85.36972"
+       r="40.697742" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4365"
+       id="radialGradient5810-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.73554113,0.84329537,-0.60995065,0.53201263,246.5433,-223.02553)"
+       cx="302.45364"
+       cy="169.89259"
+       fx="302.45364"
+       fy="169.89259"
+       r="23.632486" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11091"
+       id="radialGradient5812-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67769422,0.06832868,-0.03781293,0.37503436,120.28747,32.040329)"
+       cx="376.12302"
+       cy="78.275429"
+       fx="376.12302"
+       fy="78.275429"
+       r="57.517914" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4373"
+       id="radialGradient5814-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67769429,0.06832884,-0.03781301,0.37503437,123.02241,31.387779)"
+       cx="372.22403"
+       cy="80.725609"
+       fx="372.22403"
+       fy="80.725609"
+       r="57.517914" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4389"
+       id="linearGradient5816-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+       x1="347.71976"
+       y1="168.30508"
+       x2="342.59323"
+       y2="150.45064" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4395"
+       id="linearGradient5818-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+       x1="347.71976"
+       y1="168.30508"
+       x2="342.59323"
+       y2="150.45064" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6173-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4,0,0,4,-1656.5,-559.5)"
+       spreadMethod="reflect"
+       x1="436"
+       y1="141.5"
+       x2="434.5"
+       y2="143" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient6175-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2499988,2.6914149e-7,-3.7017555e-5,1.2499998,46.037033,-14.94106)"
+       cx="307.17429"
+       cy="122.3528"
+       fx="307.17429"
+       fy="122.3528"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient6177-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81250011,2.705083e-7,-1.0362556e-5,0.81249999,179.72209,38.960485)"
+       cx="305.57431"
+       cy="121.2793"
+       fx="305.57431"
+       fy="121.2793"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient6179-4"
+       gradientUnits="userSpaceOnUse"
+       x1="428"
+       y1="129.875"
+       x2="428"
+       y2="142.125" />
+    <filter
+       inkscape:collect="always"
+       id="filter7637-2"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.049765625"
+         id="feGaussianBlur7639-1" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7597-7"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.06734375"
+         id="feGaussianBlur7599-5" />
+    </filter>
+    <linearGradient
+       y2="145.5"
+       x2="440.5"
+       y1="147"
+       x1="439"
+       spreadMethod="pad"
+       gradientTransform="matrix(4,0,0,4,-1656.5,-559.5)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6291"
+       xlink:href="#SG_BLACK_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6394"
+       x1="425.125"
+       y1="133.125"
+       x2="430.125"
+       y2="140.125"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11128-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-76)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="156.5"
+       x2="-29.5"
+       y2="156.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11132-4"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="156.5"
+       x2="-29.5"
+       y2="156.5" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11554"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11763"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11870"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-447.81194)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11883"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-443.31194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11887"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-438.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11073"
+       id="radialGradient7682-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(63.175029,2.926516e-4,-1.3289985e-4,60.658834,48958.121,-6563.083)"
+       cx="-793.20764"
+       cy="103.69733"
+       fx="-793.20764"
+       fy="103.69733"
+       r="9.7730999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4389"
+       id="linearGradient4606"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7857113,0,0,1.7857078,-895.64137,-79.524698)"
+       x1="525.5"
+       y1="47"
+       x2="519"
+       y2="44.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4325"
+       id="radialGradient4609"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7857113,0,0,1.429635,-895.64137,-62.3239)"
+       cx="513.04407"
+       cy="50.817272"
+       fx="513.04407"
+       fy="50.817272"
+       r="6.8698621" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4401"
+       id="radialGradient4612"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.219948,-0.2579214,0.20521108,1.7662662,-123.48005,-4.3432158)"
+       cx="64.537453"
+       cy="22.297655"
+       fx="64.537453"
+       fy="22.297655"
+       r="5.0932951" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4506"
+       id="linearGradient4614"
+       gradientUnits="userSpaceOnUse"
+       x1="64.24369"
+       y1="22.946571"
+       x2="70.399483"
+       y2="28.946571"
+       gradientTransform="matrix(1.4999981,0,0,1.4999981,-71.999945,-16.025026)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4359"
+       id="linearGradient4695"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.25,0,0,0.25,115.48046,48.521179)"
+       x1="279.89703"
+       y1="194.48685"
+       x2="292.94226"
+       y2="190.98685" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4335"
+       id="radialGradient4697"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.19128941,-0.01375359,0.0213883,0.29747523,86.725755,45.338775)"
+       cx="497.24936"
+       cy="195.71024"
+       fx="497.24936"
+       fy="195.71024"
+       r="14.853663" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6541-9"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="436"
+       y1="141.5"
+       x2="434.5"
+       y2="143"
+       gradientTransform="translate(-482.25,-162.25)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient6239-4-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2499988,2.6914149e-7,-3.7017555e-5,1.2499998,46.037033,-14.94106)"
+       cx="307.17429"
+       cy="122.3528"
+       fx="307.17429"
+       fy="122.3528"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient6909-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81250011,2.705083e-7,-1.0362556e-5,0.81249999,179.72209,38.960485)"
+       cx="305.57431"
+       cy="121.2793"
+       fx="305.57431"
+       fy="121.2793"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient6949-2"
+       x1="428"
+       y1="130"
+       x2="428"
+       y2="142"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter7637-1"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.049765625"
+         id="feGaussianBlur7639-19" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7597-1"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.06734375"
+         id="feGaussianBlur7599-3" />
+    </filter>
+    <linearGradient
+       y2="145.5"
+       x2="440.5"
+       y1="147"
+       x1="439"
+       spreadMethod="pad"
+       gradientTransform="translate(-482.25,-162.25)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6650"
+       xlink:href="#SG_BLACK_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11887-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-438.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11883-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-443.31194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11870-0"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-447.81194)" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6806"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11073"
+       id="radialGradient9127"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(37.869042,-1.7645588e-5,5.5328525e-5,36.395224,28959.271,-4159.9929)"
+       cx="-794.35272"
+       cy="107.19527"
+       fx="-794.35272"
+       fy="107.19527"
+       r="9.7730999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4335"
+       id="radialGradient9130"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.09947037,-0.00715186,0.0111219,0.15468693,-46.742547,-2.3351175)"
+       cx="497.24936"
+       cy="195.71024"
+       fx="497.24936"
+       fy="195.71024"
+       r="14.853663" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4359"
+       id="linearGradient9132"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12999984,0,0,0.12999984,-31.790119,-0.68026946)"
+       x1="279.89703"
+       y1="194.48685"
+       x2="292.94226"
+       y2="190.98685" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4389"
+       id="linearGradient9138"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61904659,0,0,0.61904538,-310.80901,-6.3332192)"
+       x1="525.5"
+       y1="47"
+       x2="519"
+       y2="44.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4325"
+       id="radialGradient9141"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.61904659,0,0,0.4956068,-310.80901,-0.37027587)"
+       cx="513.04407"
+       cy="50.817272"
+       fx="513.04407"
+       fy="50.817272"
+       r="6.8698621" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4401"
+       id="radialGradient9144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76958198,-0.08941275,0.07113984,0.61230562,-43.126415,19.729695)"
+       cx="64.537453"
+       cy="22.297655"
+       fx="64.537453"
+       fy="22.297655"
+       r="5.0932951" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4506"
+       id="linearGradient9146"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51999935,0,0,0.51999935,-25.279978,15.680001)"
+       x1="64.24369"
+       y1="22.946571"
+       x2="70.399483"
+       y2="28.946571" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4569-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.5,0,0,0.5,-16.78125,-77.875)"
+       spreadMethod="reflect"
+       x1="436"
+       y1="141.5"
+       x2="434.5"
+       y2="143" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient4571-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2499988,2.6914149e-7,-3.7017555e-5,1.2499998,46.037033,-14.94106)"
+       cx="307.17429"
+       cy="122.3528"
+       fx="307.17429"
+       fy="122.3528"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient4573-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8750005,8.3209436e-7,-1.3436817e-5,0.87499975,160.62394,31.418847)"
+       cx="305.57431"
+       cy="120.66392"
+       fx="305.57431"
+       fy="120.66392"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient4575-9"
+       gradientUnits="userSpaceOnUse"
+       x1="428"
+       y1="129.5"
+       x2="428"
+       y2="142.5" />
+    <filter
+       inkscape:collect="always"
+       id="filter7637-1-8-7"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.049765625"
+         id="feGaussianBlur7639-19-1-5" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7597-1-2-8"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.06734375"
+         id="feGaussianBlur7599-3-9-7" />
+    </filter>
+    <linearGradient
+       y2="145.5"
+       x2="440.5"
+       y1="147"
+       x1="439"
+       spreadMethod="pad"
+       gradientTransform="matrix(0.5,0,0,0.5,-16.78125,-77.875)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4632"
+       xlink:href="#SG_BLACK_1"
+       inkscape:collect="always" />
+    <filter
+       inkscape:collect="always"
+       id="filter4731">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.32499998"
+         id="feGaussianBlur4733" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath4737">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.89999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4739"
+         sodipodi:cx="194"
+         sodipodi:cy="72"
+         sodipodi:rx="3.5"
+         sodipodi:ry="3.5"
+         d="m 197.5,72 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z"
+         transform="matrix(2,0,0,2,40,-8)" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter4141">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.24"
+         id="feGaussianBlur4143" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter4149">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.245"
+         id="feGaussianBlur4151" />
+    </filter>
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4214"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-444.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4306"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-440.81195)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-436.81196)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11073"
+       id="radialGradient4781"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(63.175029,2.926516e-4,-1.3289985e-4,60.658834,48958.121,-6563.083)"
+       cx="-793.20764"
+       cy="103.69733"
+       fx="-793.20764"
+       fy="103.69733"
+       r="9.7730999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4335"
+       id="radialGradient4796"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.29841519,-0.02145579,0.03336616,0.4640655,-140.22986,-71.005978)"
+       cx="497.24936"
+       cy="195.71024"
+       fx="497.24936"
+       fy="195.71024"
+       r="14.853663" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4359"
+       id="linearGradient4798"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.39000485,0,0,0.39000348,-95.371961,-66.041384)"
+       x1="279.89703"
+       y1="194.48685"
+       x2="292.94226"
+       y2="190.98685" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4389"
+       id="linearGradient4804"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8571652,0,0,1.857155,-932.44009,-83.000409)"
+       x1="525.5"
+       y1="47"
+       x2="519"
+       y2="44.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4325"
+       id="radialGradient4807"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8571652,0,0,1.4868356,-932.44009,-65.111397)"
+       cx="513.04407"
+       cy="50.817272"
+       fx="513.04407"
+       fy="50.817272"
+       r="6.8698621" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4401"
+       id="radialGradient4810"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.3087775,-0.26824099,0.21342245,1.8369356,-129.38131,-4.8108713)"
+       cx="64.537453"
+       cy="22.297655"
+       fx="64.537453"
+       fy="22.297655"
+       r="5.0932951" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4506"
+       id="linearGradient4812"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5600194,0,0,1.5600139,-75.841275,-16.960078)"
+       x1="64.24369"
+       y1="22.946571"
+       x2="70.399483"
+       y2="28.946571" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6541-9-1"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="436.33334"
+       y1="141.66667"
+       x2="435"
+       y2="143"
+       gradientTransform="translate(-482.25,-162.25)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient6239-4-6-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2500009,-3.6238018e-5,-5.1048689e-7,1.2499999,46.031937,-14.929854)"
+       cx="307.17429"
+       cy="122.3528"
+       fx="307.17429"
+       fy="122.3528"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient6909-0-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7916684,-7.1980556e-6,-2.1374502e-6,0.79166661,186.08672,41.4937)"
+       cx="305.57431"
+       cy="121.48443"
+       fx="305.57431"
+       fy="121.48443"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient6949-2-7"
+       x1="428"
+       y1="130"
+       x2="428"
+       y2="142"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4141-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.24"
+         id="feGaussianBlur4143-9" />
+    </filter>
+    <linearGradient
+       y2="145.33333"
+       x2="440.66666"
+       y1="147"
+       x1="439"
+       spreadMethod="pad"
+       gradientTransform="translate(-482.25,-162.25)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6599"
+       xlink:href="#SG_BLACK_1"
+       inkscape:collect="always" />
+    <filter
+       inkscape:collect="always"
+       id="filter7487">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.08"
+         id="feGaussianBlur7489" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7498">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.062637898"
+         id="feGaussianBlur7500" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11073"
+       id="radialGradient5788-7-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6991389,1.2224198e-6,-1.2224026e-6,1.6991149,-501.15878,-187.4769)"
+       cx="726.09155"
+       cy="240.15294"
+       fx="726.09155"
+       fy="240.15295"
+       r="72.64286" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11083"
+       id="radialGradient5790-5-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.699138,-1.3712271e-7,1.3712087e-7,1.6991147,-501.15838,-187.47587)"
+       cx="726.09155"
+       cy="240.15294"
+       fx="726.09155"
+       fy="240.15294"
+       r="72.64286" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath17433-0-7">
+      <path
+         transform="matrix(1.2222222,0,0,1.2222222,-540.12221,-137.64442)"
+         d="m 820,236 a 72,72 0 1 1 -144,0 72,72 0 1 1 144,0 z"
+         sodipodi:ry="72"
+         sodipodi:rx="72"
+         sodipodi:cy="236"
+         sodipodi:cx="748"
+         id="path17435-6-1"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.28571427;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc"
+         clip-path="none" />
+    </clipPath>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter17427-4-3">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.9755386"
+         id="feGaussianBlur17429-7-8" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4325"
+       id="linearGradient5792-4-0"
+       gradientUnits="userSpaceOnUse"
+       x1="367.5755"
+       y1="195.24956"
+       x2="401.19031"
+       y2="223.58434"
+       gradientTransform="matrix(0.63636365,0,0,0.63636365,-173.56366,-31.46365)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4353"
+       id="linearGradient5794-6-4"
+       gradientUnits="userSpaceOnUse"
+       x1="367.5755"
+       y1="195.24956"
+       x2="401.19031"
+       y2="223.58434"
+       gradientTransform="matrix(0.63636365,0,0,0.63636365,-173.56366,-31.46365)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4341"
+       id="radialGradient5796-9-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72092886,-0.48272512,0.32231418,0.48136216,-224.44788,157.62828)"
+       spreadMethod="reflect"
+       cx="333.37241"
+       cy="229.53526"
+       fx="333.37241"
+       fy="229.53526"
+       r="17.499531" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4347"
+       id="radialGradient5798-0-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47016438,-0.39574234,0.83634416,0.99362435,-60.166004,158.85303)"
+       cx="379.70749"
+       cy="231.1389"
+       fx="379.70749"
+       fy="231.1389"
+       r="14.853663" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4325"
+       id="linearGradient5800-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="334.24048"
+       y1="160.24777"
+       x2="379.24472"
+       y2="163.30348" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4353"
+       id="linearGradient5802-7-4"
+       gradientUnits="userSpaceOnUse"
+       x1="334.24048"
+       y1="160.24777"
+       x2="379.24472"
+       y2="163.30348" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4335"
+       id="radialGradient5804-4-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76515765,-0.05501436,0.08555321,1.1899009,-115.01881,-12.72962)"
+       cx="497.24936"
+       cy="195.71024"
+       fx="497.24936"
+       fy="195.71024"
+       r="14.853663" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4359"
+       id="linearGradient5806-2-1"
+       gradientUnits="userSpaceOnUse"
+       x1="279.89703"
+       y1="194.48685"
+       x2="292.94226"
+       y2="190.98685" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4381"
+       id="radialGradient5808-9-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.42711658,0.48968735,-0.35418784,0.30893079,209.70302,4.9690984)"
+       cx="293.70053"
+       cy="-85.369713"
+       fx="293.70053"
+       fy="-85.36972"
+       r="40.697742" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4365"
+       id="radialGradient5810-3-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.73554113,0.84329537,-0.60995065,0.53201263,246.5433,-223.02553)"
+       cx="302.45364"
+       cy="169.89259"
+       fx="302.45364"
+       fy="169.89259"
+       r="23.632486" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11091"
+       id="radialGradient5812-0-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67769422,0.06832868,-0.03781293,0.37503436,120.28747,32.040329)"
+       cx="376.12302"
+       cy="78.275429"
+       fx="376.12302"
+       fy="78.275429"
+       r="57.517914" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4373"
+       id="radialGradient5814-0-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.67769429,0.06832884,-0.03781301,0.37503437,123.02241,31.387779)"
+       cx="372.22403"
+       cy="80.725609"
+       fx="372.22403"
+       fy="80.725609"
+       r="57.517914" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4389"
+       id="linearGradient5816-7-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+       x1="347.71976"
+       y1="168.30508"
+       x2="342.59323"
+       y2="150.45064" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4395"
+       id="linearGradient5818-3-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+       x1="347.71976"
+       y1="168.30508"
+       x2="342.59323"
+       y2="150.45064" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11887-44"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-438.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11883-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-443.31194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11870-9"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-447.81194)" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11763-7"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6541-9-8"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="436"
+       y1="141.5"
+       x2="434.5"
+       y2="143"
+       gradientTransform="translate(-482.25,-162.25)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient6239-4-6-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2499988,2.6914149e-7,-3.7017555e-5,1.2499998,46.037033,-14.94106)"
+       cx="307.17429"
+       cy="122.3528"
+       fx="307.17429"
+       fy="122.3528"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient6909-0-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81250011,2.705083e-7,-1.0362556e-5,0.81249999,179.72209,38.960485)"
+       cx="305.57431"
+       cy="121.2793"
+       fx="305.57431"
+       fy="121.2793"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient6949-2-8"
+       x1="428"
+       y1="130"
+       x2="428"
+       y2="142"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter4141-8">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.24"
+         id="feGaussianBlur4143-96" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7637-1-7"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.049765625"
+         id="feGaussianBlur7639-19-7" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7597-1-3"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.06734375"
+         id="feGaussianBlur7599-3-7" />
+    </filter>
+    <linearGradient
+       y2="145.5"
+       x2="440.5"
+       y1="147"
+       x1="439"
+       spreadMethod="pad"
+       gradientTransform="translate(-482.25,-162.25)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10576"
+       xlink:href="#SG_BLACK_1"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="103.99998"
+     inkscape:cy="63.99999"
+     inkscape:current-layer="icon_64"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1127"
+     inkscape:window-x="-4"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-object-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid19743"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata18879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,80)">
+    <g
+       transform="matrix(2.66667,0,0,2.66667,-8e-5,-37.333341)"
+       id="icon_128"
+       inkscape:label="#icon_128"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/128x128/viqui.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <g
+         id="g5768"
+         transform="matrix(0.23863607,0,0,0.23863607,-14.461319,-27.798831)">
+        <path
+           transform="matrix(1.2222222,0,0,1.2222222,-752.26508,-137.64442)"
+           d="m 820,236 c 0,39.7645 -32.2355,72 -72,72 -39.7645,0 -72,-32.2355 -72,-72 0,-39.7645 32.2355,-72 72,-72 39.7645,0 72,32.2355 72,72 z"
+           sodipodi:ry="72"
+           sodipodi:rx="72"
+           sodipodi:cy="236"
+           sodipodi:cx="748"
+           id="path6924"
+           style="color:#000000;fill:url(#radialGradient5788-7);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#radialGradient5790-5);stroke-width:1.28571426999999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc"
+           clip-path="none" />
+        <path
+           transform="translate(-212.14287,0)"
+           clip-path="url(#clipPath17433-0)"
+           style="fill:#105090;fill-opacity:1;stroke-linejoin:round;filter:url(#filter17427-4)"
+           d="m 442.3589,110.70438 c 3.55125,7.54397 -5.50038,2.40937 0,0 z m -5.30357,-0.0491 c 1.20632,4.15944 8.59344,6.21374 5.69631,11.63839 0.16003,4.76864 -1.71311,7.36014 -1.71875,1.22768 0.41633,-2.86134 -0.78154,-5.67639 -2.16063,-4.22322 -0.56581,-2.72795 -2.19423,-6.08507 -1.81693,-8.64285 z m -60.45089,-6.67857 c 5.68536,3.39882 1.09977,8.39033 -0.58928,1.66964 l 0.29464,-0.98214 0.29464,-0.6875 0,0 z m 66.39286,-4.075895 c 4.89422,2.710035 3.94217,8.340755 4.86162,12.227675 1.19626,7.09511 -10.20684,-6.17432 -2.65145,-4.86161 2.06164,-1.31539 -3.09836,-5.36434 -2.21017,-7.366065 z m -9.52679,-9.82142 c 2.10634,1.53714 7.34487,10.203825 2.11162,4.07589 -2.00793,-2.29407 -2.19775,-2.33927 -2.11162,-4.07589 z m -64.52678,-14.3393 c 6.76844,1.73901 14.96182,5.47078 18.70982,11.73661 -6.10191,-0.76014 2.96411,3.33793 5.98746,1.79541 4.96597,1.27124 14.64027,-0.40248 12.51586,7.08482 4.59549,-0.16538 8.79226,7.585475 1.67973,6.735855 -0.98495,-2.64799 -6.91979,-4.804625 -8.24995,-6.089285 -4.72794,5.672395 -5.40581,-6.83274 -10.85268,-5.40177 -2.26415,-1.55011 -7.76015,-1.04755 -9.52679,-2.1116 -2.13455,6.70427 -4.6247,-4.02972 -5.40608,-1.88342 2.06734,4.82681 -4.93449,0.89498 -4.72958,0.43303 -3.65128,0.36362 4.83195,7.06601 -3.41807,5.87003 -6.00493,-0.81868 -15.97509,8.951485 -18.36549,0.44587 -1.53971,-7.07666 9.41584,-3.15443 8.98603,-5.70033 -2.1568,-0.56621 4.97437,-2.29124 -1.12954,-2.50446 -6.18179,-1.66464 12.68197,-0.9287 3.29017,-3.19197 4.35545,-4.4753 9.12495,-3.12026 12.52232,1.03125 7.50572,3.20417 -12.34223,-7.16762 -2.01321,-8.25004 z m 4.71428,-12.86607 c -6.26443,-0.13 -13.2539,0.49753 -19.63042,2.18825 -6.92134,0.96517 -10.20194,4.50579 -14.99016,5.27605 -2.39314,2.34157 -10.48416,4.55484 -7.5556,7.03109 2.01228,1.62126 6.91943,3.20497 0.97515,4.45995 -4.08317,0.88884 6.54163,-0.76485 0.93311,3.58484 -4.55347,1.2128 -7.58889,10.68658 -11.29464,8.69196 -0.34466,-9.92046 -2.58054,3.27979 0.79981,5.959535 3.63384,4.40158 13.68121,3.77443 8.14404,11.97588 -1.65533,3.22045 -2.47695,4.78014 -1.03732,5.29226 -3.54948,6.13488 -2.51021,14.59656 -8.55839,19.99522 0.40108,5.70851 -2.00106,10.48524 -0.2319,16.44209 2.887,4.68606 -0.32319,13.55344 5.5982,16.40179 2.35824,-5.63411 2.05309,7.55214 5.15625,8.39733 -0.90033,0.17097 3.8338,4.20404 3.19197,3.24106 4.31673,4.07708 9.70705,6.4204 14.51833,10.36817 5.22228,2.72033 11.73661,8.79037 3.30745,10.79693 0.36193,0.70385 -7.12285,2.7741 -4.49171,6.48567 3.31563,1.4017 8.69639,1.06719 2.38,-0.98597 -4.41408,-3.30399 6.43234,-3.75067 8.02781,-6.70444 3.36871,-1.07638 2.6162,2.28804 4.70993,-0.26341 3.96819,0.14431 4.3943,-2.04084 4.90038,3.13727 0.26407,-4.85512 -2.62727,5.06236 -5.37904,5.59935 -3.73228,8.53592 6.15554,15.38635 13.40762,17.40135 7.89879,2.47698 -7.20552,13.60864 -1.99697,10.29424 3.72354,-2.87829 -2.78188,2.45622 2.8444,1.17022 12.93397,-0.14806 25.63021,-4.83923 35.64118,-12.98253 5.89239,-3.52655 7.12839,-5.74575 10.69866,-9.45856 -3.47006,-0.73995 2.67266,-6.05431 5.2758,-10.20685 1.92885,-7.24534 -9.82954,-0.56815 -13.96651,-4.04039 -2.71031,-3.76856 -8.44056,-2.41433 -11.86395,-6.12477 -2.4603,4.52658 -8.46196,0.82322 -6.62946,-3.3883 -0.88349,0.10037 -3.85518,-3.44928 -5.09243,1.28983 -2.88963,2.43499 -1.61019,-4.29674 -1.38962,-4.53091 4.47159,0.93581 3.16032,0.98923 1.45583,-2.88504 -6.92624,-3.28026 0.81841,8.25805 -4.85789,9.03215 -6.60075,-3.11487 -13.93656,-0.1927 -18.49979,2.93765 -1.98043,-0.51189 -11.07895,-0.79714 -6.38393,-3.29029 3.57411,-1.74491 2.93342,-6.75389 9.21799,-5.69763 0.75311,-4.6814 5.0069,-0.64596 9.14799,-2.65028 -1.83561,1.65645 13.11486,-1.54319 4.77586,-0.93145 -4.00044,1.41374 -8.08102,-3.7795 -11.89638,-0.2962 3.82418,1.39787 -4.396,-0.14961 -2.99538,3.53578 -0.64555,-5.23838 -11.24025,0.54167 -16.05803,-0.93296 -0.85378,-1.93255 0.37957,-4.30488 0.88401,-3.78125 4.51189,-3.39057 2.34358,-10.4053 -3.63384,-6.924 -2.95559,1.44766 -8.07911,7.66102 -8.85564,0.12829 -0.24843,-7.30952 6.69612,-5.33065 10.86903,-5.82462 3.26194,-5.65752 7.71588,5.87791 6.68749,7.42342 -6.08091,1.61172 2.35524,2.78669 3.7562,2.01629 5.06694,1.2104 -0.27658,4.67189 5.76136,3.47533 8.18037,0.9986 -1.53713,-2.93398 1.03126,-2.89712 3.06742,0.53389 1.22998,-6.35379 -1.86595,-4.27234 1.98981,-3.07464 -0.0242,-9.41784 2.70075,-13.30793 1.40583,-6.3657 6.05739,-9.19916 11.50018,-11.6238 4.69462,-3.82624 10.86324,-9.58786 16.88525,-5.6168 1.11492,-2.90083 1.39148,-6.31368 4.56547,-8.58975 -1.76751,-5.53873 -6.10365,2.62451 -7.5625,-4.32143 -3.61792,-5.32764 -11.32294,-4.65515 -12.62046,-11.98214 0.93191,-8.06035 9.05318,-0.47579 12.12946,0.0491 2.18266,-1.25202 -0.37979,-7.67735 2.45528,-10.85267 5.05594,-4.98907 5.09843,17.8614 7.17,5.84294 0.53762,-2.9217 1.46062,-8.0548 3.53668,-9.16678 3.7493,3.25144 0.28336,11.12467 5.89126,10.5426 3.30595,1.32484 -1.6853,-12.93738 3.63391,-5.79463 -0.86163,3.8482 2.0239,8.04866 4.63381,6.01102 0.27964,4.55496 13.08094,-4.40247 9.55815,2.82825 -3.44101,4.45889 3.23898,9.94703 6.82589,11.78571 1.59406,5.88139 1.70758,8.37913 0.7905,13.51463 -1.78476,3.45762 2.72481,-1.52517 0.60578,3.92787 -1.26413,8.07415 4.91866,13.62384 4.79122,21.7941 4.7001,-1.41276 9.73997,-0.38549 10.85259,-7.66071 1.47346,1.04704 1.70479,-10.93704 3.48638,-6.72757 2.50412,-4.19078 1.39268,-5.53653 1.57125,-12.03125 -0.32242,-23.06256 -11.37532,-45.33816 -28.32397,-60.717225 -6.3783,-5.39965 -13.00302,-10.69304 -20.71455,-14.16145 -12.21051,-5.7746 -25.73772,-9.26546 -39.30449,-8.70201 z"
+           id="path16835-0"
+           inkscape:connector-curvature="0" />
+        <g
+           transform="translate(-212.14287,0)"
+           id="g4582">
+          <path
+             style="color:#000000;fill:url(#linearGradient5792-4);fill-opacity:1;stroke:url(#linearGradient5794-6);stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="M 66.25 93.21875 C 64.903615 93.215803 62.331353 95.328522 61.0625 95.96875 C 58.956862 95.493011 58.473666 95.798955 59.9375 96.1875 C 61.631398 97.257087 61.463757 101.84148 58.46875 101.84375 C 56.929482 103.78145 59.205675 104.45424 57.3125 105.875 C 60.194406 109.36298 63.174993 112.87529 67.71875 114 C 68.762759 116.52687 64.436486 119.73417 65.46875 120.46875 C 66.360897 120.45352 67.243484 120.43149 68.125 120.375 C 68.13539 120.37433 68.145861 120.37567 68.15625 120.375 C 72.987612 120.12721 77.468749 118.61694 81.75 116.71875 C 85.834258 113.61196 90.72451 111.57446 94.3125 107.84375 C 94.365127 104.60948 101.547 100.24432 98.53125 98.34375 C 94.609341 98.647359 91.746332 99.515216 88.625 99.8125 C 86.284964 102.46273 89.953461 97.438068 86.53125 100.03125 C 84.307662 101.76117 89.056794 97.421374 85.75 96.6875 C 82.229064 96.133635 78.346445 96.399318 76 94.25 C 73.128326 94.712407 69.059541 92.80313 67.09375 94.0625 C 67.010883 93.459816 66.698795 93.219732 66.25 93.21875 z "
+             transform="matrix(1.5714285,0,0,1.5714285,272.74288,49.442877)"
+             id="path17437" />
+          <path
+             style="fill:url(#radialGradient5796-9);fill-opacity:1;stroke:#3c3a18;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 98.53125 98.34375 C 97.38013 98.43285 96.34573 98.56111 95.34375 98.71875 C 95.33875 98.72575 95.34875 98.7429 95.34375 98.75 C 93.48034 101.22608 88.06006 102.36504 86.28125 106 C 84.24831 110.15425 76.21004 109.89114 72.75 113.15625 C 71.88099 113.9763 69.98575 114.75391 67.78125 115.5625 C 67.239966 117.72088 64.597591 119.8954 65.46875 120.46875 C 66.360897 120.45352 67.243484 120.43149 68.125 120.375 C 68.13539 120.37433 68.145861 120.37567 68.15625 120.375 C 72.98761 120.12721 77.46875 118.61694 81.75 116.71875 C 85.83426 113.61196 90.72451 111.57446 94.3125 107.84375 C 94.3651 104.60948 101.547 100.24432 98.53125 98.34375 z "
+             id="path17564"
+             transform="matrix(1.5714285,0,0,1.5714285,272.74288,49.442877)" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#radialGradient5798-0);fill-opacity:1.0;stroke:#605130;stroke-width:1;stroke-linejoin:round;stroke-opacity:1"
+             d="m 302.46875,228.21875 c -0.30309,-0.0118 -0.59701,0.0236 -0.90625,0.0625 -0.0441,0.33343 -0.20432,0.68424 -0.75,1.09375 2.88191,3.48798 5.86249,7.00029 10.40625,8.125 0.6368,1.54129 -0.72132,3.32115 -1.65625,4.65625 0.074,-0.008 0.14421,-0.0201 0.21875,-0.0312 2.20629,0.0586 4.65874,0.24053 5.71875,-2.125 1.33589,-0.64037 1.49851,-2.2152 2,-3.4375 -0.44397,-1.80919 -3.45827,-0.0145 -4.25,-1.96875 -1.30525,-0.38487 -2.69559,-0.33463 -4.03125,-0.625 -1.35627,0.0225 -2.72115,-0.18938 -3.4375,-1.5 -0.54477,-1.1192 -1.11395,-2.22264 -1.6875,-3.34375 -0.3317,-0.64901 -0.95639,-0.88021 -1.625,-0.90625 z"
+             transform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+             id="path17044-5" />
+        </g>
+        <g
+           transform="translate(-212.14287,0)"
+           id="g4587">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 364.38438,199.35945 c -3.72831,-0.88322 -6.90395,-2.47739 -4.42725,-7.84969 -2.07996,-3.17765 -11.43618,-1.3514 -5.89286,-6.43304 4.36311,-5.69473 -4.61079,-4.75676 -5.84375,-0.88392 -9.17728,1.21237 -9.19452,-14.55195 -2.1116,-16.20536 5.04574,0.5744 6.8425,0.98915 11.39285,0.54018 5.49535,-0.72715 4.31933,9.64035 7.75893,7.26785 -2.66508,-6.37822 0.18694,-10.43213 5.59822,-13.65178 1.34204,-1.32869 -1.30542,-8.82637 1.32589,-4.07589 0.57901,-4.97123 6.34565,-5.08488 7.16964,-9.67411 2.48786,-1.35036 5.83781,-4.09615 3.53572,0.54018 3.46933,-1.05848 8.67141,-7.81222 2.30803,-3.48661 -5.67441,-2.17435 1.04389,-6.58614 -5.40178,-3.73214 -5.87493,5.5355 3.1858,-6.49984 7.41517,-3.53572 4.87519,-1.69819 3.46169,-7.79747 -0.54017,-5.30357 2.20446,-1.93076 -4.31307,-4.84369 -5.30358,-8.49553 -3.76272,6.8103 -3.11303,-4.11389 -8.15178,-3.04464 -5.72778,-0.19327 1.11999,10.06603 -3.97768,11.68749 1.90891,7.74548 -4.35534,2.82119 -3.19196,-1.71875 -5.30988,-1.49035 -11.45883,-7.06446 -5.05804,-11.63839 3.29928,-2.54529 6.60949,-4.2435 8.49554,-6.67857 -0.44832,-5.46137 4.52541,-2.10496 5.45089,1.375 -1.33351,2.97123 -6.17168,3.61798 -0.19643,4.22322 1.53664,2.78411 6.29789,3.44509 3.97768,0.93303 4.84108,1.61966 -4.64455,-7.48199 1.96428,-3.14286 1.65516,-3.40275 -4.31344,-3.76366 -4.41964,-7.07142 -3.08474,-1.45969 -4.70008,-5.43842 -4.95982,-2.16072 -1.1047,-3.92052 -3.52578,2.02282 -2.89732,-2.20982 -4.77543,1.64254 2.34731,7.83145 -2.55357,7.85714 -1.60657,-1.66161 -1.21217,-6.65605 0.39286,-8.69196 -3.42149,-0.12304 -4.12944,11.68885 -4.27233,6.58036 0.51331,-2.0603 -5.16003,2.25053 -5.20535,-2.60268 3.35704,4.51195 5.54676,-7.53791 2.65178,-4.27232 -1.9953,1.26973 -1.89888,-9.182222 -6.58035,-3.3884 -0.54746,3.0228 5.064,0.50563 1.17857,3.29018 3.65637,1.83727 -3.30607,1.55903 0.63839,4.07589 2.51685,2.16136 -0.13074,3.62914 -1.62054,0.49108 -0.35528,-2.32701 -2.6514,-7.07737 -6.33482,-8.00447 -2.7307,-1.761711 1.68586,-10.018955 -4.66517,-10.950891 -3.36611,3.545159 -2.51157,2.466939 -4.56697,0.982143 -0.6927,5.873356 -6.41751,-0.224997 -8.29911,5.647321 -0.0573,4.073457 -4.04938,3.405333 -6.2366,1.669643 2.31853,4.878684 9.12263,1.108454 8.2991,4.616074 3.6652,-1.02054 0.98967,8.99148 2.11161,9.77232 -2.16173,1.39967 -1.32548,6.84538 -3.09375,9.52678 -2.34448,2.40914 -1.37902,9.79756 -6.58036,13.89732 -4.67056,6.42611 -0.6896,13.41395 -0.7366,20.18304 0.36466,4.58989 0.64015,7.45464 2.20982,12.08036 3.29866,6.0691 -1.05217,-8.22942 -0.83482,-10.70536 1.75973,-4.62581 2.67097,7.3755 3.63393,9.57589 3.41336,7.47698 3.50584,15.49939 12.27678,19.39732 5.68018,2.15594 12.6736,5.14964 15.86161,10.50893 1.0529,1.61573 7.55176,6.61355 8.15178,3.97768 4.6226,-0.20066 2.11442,-0.56479 0.15495,-1.08781 z m -17.146,-92.60862 c 0.62122,-0.0314 1.49921,0.0715 1.57143,1.27679 0.11173,1.86331 -0.96343,1.50225 -1.47321,1.08036 -0.30139,-0.24942 -2.03305,-0.36244 -0.54018,-0.98215 1.46751,-0.60918 -0.89548,-1.32589 -0.049,-1.32589 0.11346,0 0.284,-0.0387 0.49107,-0.049 z m -0.14732,7.75893 c 0.12069,-0.0165 0.22171,0.009 0.29464,0.049 1.61818,0.86817 0.0693,1.13883 -1.03125,1.22768 -1.80792,0.14599 -0.10827,-1.16113 0.73661,-1.27679 3e-5,0 -3e-5,8e-5 0,8e-5 z m 0.63839,10.85268 c 0.39251,0.0404 0.78974,0.38096 0.88393,0.73661 0.28795,1.08722 -0.18995,1.16479 -0.6875,0.88393 -0.60835,-0.34341 -1.24905,-1.2279 -0.58928,-1.52233 0.11188,-0.0498 0.26202,-0.11172 0.39285,-0.0982 z m 4.56697,5.20536 c 0.15227,-0.0233 0.26389,0.1232 0.34375,0.24553 0.6327,0.96945 -0.0528,1.26912 -0.54018,1.08036 -0.38533,-0.14929 -0.6457,-0.58973 0.049,-1.22768 0.0619,-0.0569 0.0966,-0.0904 0.14724,-0.0982 z m 30.25,2.0625 c 0.73143,-0.0437 1.48712,0.11565 0.39285,0.78571 -0.61532,0.3768 -1.05631,0.23424 -1.22768,0 -0.21058,-0.28784 -0.009,-0.73532 0.83483,-0.78571 z m -21.16518,1.86607 c 0.28414,0.13844 -2.00697,1.75893 -2.35714,2.11161 -1.54345,1.55441 -1.28903,-0.45944 -2.79911,-0.6875 -1.91218,-0.2888 0.364,-0.98868 1.03125,-0.44197 1.29952,1.06479 2.16626,-0.40739 3.83036,-0.93303 0.15835,-0.05 0.25405,-0.0688 0.29464,-0.049 z m 29.66071,0.98214 c -2.61226,2.26616 -2.24439,4.63595 -1.03125,5.74554 1.20863,1.10543 3.26964,0.93762 4.07589,-1.76786 -0.27407,-2.23608 -4.01852,0.0591 -3.04464,-3.97768 z m -12.22768,1.22776 c 0.39602,-0.16371 0.75228,0.41533 0.88393,0.78571 0.53883,1.51598 -0.43813,1.14848 -0.98214,0.49107 -0.37114,-0.44847 -0.53507,-1.01497 0.0982,-1.27678 z m -3.92857,0.88393 c 0.2487,0.0325 0.36899,0.27693 0.0982,0.63839 -0.44885,0.59911 -0.83454,0.67642 -1.03125,0.54018 -0.27703,-0.19189 -0.17981,-0.82077 0.63839,-1.12947 0.0952,-0.036 0.21175,-0.06 0.29464,-0.049 z m -14.24107,2.50446 c 1.08548,0.10922 1.86815,1.72431 2.25893,2.55357 1.06552,2.26108 -1.86965,2.01775 -2.79911,1.22768 -1.7126,-1.45577 -3.91232,0.59879 -4.51785,-1.17857 -0.53377,-1.5667 2.98909,-2.01155 4.56696,-2.50446 0.16577,-0.0517 0.336,-0.11378 0.49107,-0.0982 z m 9.77232,2.94643 c 0.0566,0.008 0.11912,0.0701 0.24554,0.0982 1.28423,0.28607 0.61366,0.5122 -0.0982,0.58929 -0.66212,0.0717 -1.38219,-0.1243 -0.34375,-0.58929 0.10529,-0.0471 0.13986,-0.10607 0.19643,-0.0982 z m -9.13393,1.81696 c 0.61027,-0.008 1.19548,0.30997 1.76786,0.14725 1.66518,-0.47319 6.33479,2.8376 4.02679,2.75 -2.61769,-0.0995 -1.2103,3.42779 -2.65179,1.03125 -0.81405,-1.3534 0.10183,-2.51019 -1.47321,-2.99554 -1.89948,-0.58532 -2.77603,2.39051 -2.89732,4.27232 -0.12038,1.86749 -2.23148,0.7447 -1.52233,-0.7366 0.78485,-1.6394 0.17582,-4.43866 2.75,-4.46875 z m 9.23215,3.68304 c 0.15384,0.003 0.26331,0.0616 0.34375,0.0982 2.44489,1.11479 -1.91656,1.29917 -2.45536,1.12947 -1.4738,-0.4642 1.03435,-1.24619 2.11161,-1.22768 z m -3.68304,1.86607 c 0.47858,-0.0691 0.87571,-0.011 1.08036,0.14724 0.75749,0.58695 -2.5108,2.16441 -3.38839,1.71875 -1.17642,-0.59741 0.8723,-1.65859 2.30803,-1.86607 z m -5.64732,29.51339 c -5.3251,1.30589 8.05385,0.55784 7.70982,5.00893 10.99331,1.37029 -4.91118,-5.51904 -7.70982,-5.00893 z m 15.07589,5.20536 c -0.22474,0.82743 -4.97679,2.95586 -0.39285,2.40625 3.9865,0.99765 8.75496,-2.05936 1.52232,-2.40625 z m -8.34821,1.91518 c 0.25804,1.0802 1.31706,0.95929 1.71875,0.63839 0.37005,-0.29563 0.18298,-0.75977 -1.71875,-0.63839 z"
+             style="color:#000000;fill:url(#linearGradient5800-3);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient5802-7);stroke-width:1.57142854000000010;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path17441" />
+          <path
+             sodipodi:nodetypes="cccccccsssssscccsscc"
+             inkscape:connector-curvature="0"
+             id="path4885"
+             transform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+             d="m 279.0625,171.90625 c -0.49775,2.02982 -0.97866,4.59609 -3.15625,6.3125 -2.97217,4.08934 -0.43884,8.53615 -0.46875,12.84375 0.23206,2.92084 0.40737,4.74386 1.40625,7.6875 2.09915,3.86215 -0.66956,-5.2369 -0.53125,-6.8125 1.11983,-2.9437 1.69971,4.6935 2.3125,6.09375 1.0504,2.30091 1.60572,4.68532 2.53125,6.8125 0.98681,-1.06713 -0.39053,-4.46456 -0.625,-6.21875 -0.21435,-1.60363 -1.20692,-7.07848 0.21875,-5.5625 1.305,1.38767 0.77731,3.89576 1.0625,6 0.34946,2.57842 2.26183,3.89101 2.875,6.21875 0.67827,2.57485 2.60107,5.97278 3.21875,4.375 0.73712,-1.90676 -2.41078,-3.0179 -2.25,-5.40625 0.0706,-1.04873 0.8151,-1.48666 1.5625,-1.90625 0.27629,-1.04483 0.77964,-1.98388 1.5,-2.625 -0.017,-0.0654 -0.0408,-0.11828 -0.0625,-0.1875 -0.41627,-1.32672 -0.36853,-2.84211 0.5625,-3.96875 1.38092,-1.67105 2.07075,-3.93231 2.625,-6.03125 0.86809,-3.28745 2.6747,-9.9624 1.11152,-13.46339 -3.26308,-5.84519 -9.13766,-5.35292 -13.89277,-4.16161 z"
+             style="color:#000000;fill:url(#radialGradient5804-4);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient5806-2);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cccccccccsssssssssssssssssscccccccccccccccccccccccccccccccccccssccccccccssccccccccccccccssccccscccccccccccccssscccccsscccssssccccsccssccssssssssscscss"
+             inkscape:connector-curvature="0"
+             d="m 342.03303,89.317871 c -3.36611,3.545146 -2.51157,2.46693 -4.56697,0.98214 -0.6927,5.873346 -6.41751,-0.225 -8.29911,5.647316 -0.0573,4.073463 -4.04938,3.40534 -6.2366,1.66965 2.31853,4.878683 9.12263,1.10846 8.2991,4.616073 3.6652,-1.02054 0.98967,8.99147 2.11161,9.77231 -2.16173,1.39969 -1.32548,6.84539 -3.09375,9.5268 -2.34448,2.40914 -1.37902,9.79756 -6.58036,13.89732 -3.6379,5.00532 -2.04651,10.34711 -1.17857,15.66519 0.57111,-0.89133 1.01373,-2.18757 1.27679,-3.53572 0.39286,-2.01339 1.32589,-1.12946 1.03125,-0.44196 -0.29464,0.68748 -0.29464,2.89734 -0.58929,3.78125 -0.29464,0.88393 0.73661,2.55357 0.19643,3.58482 -0.54018,1.03124 0.19643,0.98214 0.58929,0.44197 0.39285,-0.54018 0.49105,-1.81697 0.39285,-3.83036 -0.0982,-2.01339 0.15075,-5.14823 0.51575,-9.10517 0.39763,-4.31074 2.38887,-7.86304 3.74213,-9.3055 3.9321,-4.19131 5.46391,-0.35945 2.56783,1.84987 -2.18615,1.66773 1.40914,3.43768 1.52251,3.89115 0.41668,1.66676 0.29175,6.38948 -1.5139,7.77843 -1.80565,1.38895 0.61928,1.40393 1.87101,-0.0111 1.5973,-1.80565 3.38637,-3.31017 5.192,-9.97719 0.75749,-2.79691 -2.52077,-0.77895 -0.53152,-5.95489 0.52069,-1.3548 3.04979,-4.70439 4.33482,-3.18523 1.8408,2.17621 5.16212,4.16086 6.33226,7.35234 1.75874,4.79691 3.62983,8.01622 3.07426,12.73868 -0.55558,4.72247 7.36222,7.80106 14.58482,8.49553 1.88087,0.18086 3.0618,0.77387 3.92857,1.57143 -0.0665,-0.94275 0.0816,-1.14576 1.17857,0.83482 0.57901,-4.97123 6.34565,-5.08487 7.16964,-9.6741 2.48786,-1.35036 5.83781,-4.09615 3.53572,0.54017 3.46933,-1.05848 8.67141,-7.81221 2.30803,-3.4866 -5.67441,-2.17436 1.04389,-6.58614 -5.40178,-3.73215 -5.87493,5.5355 3.1858,-6.49983 7.41517,-3.53571 4.87519,-1.6982 3.46169,-7.79749 -0.54017,-5.30357 2.20446,-1.93078 -4.31307,-4.8437 -5.30358,-8.49554 -3.76272,6.8103 -3.11303,-4.1139 -8.15178,-3.04465 -5.72778,-0.19327 1.11999,10.06604 -3.97768,11.68751 1.90891,7.74548 -4.35534,2.82119 -3.19196,-1.71876 -5.30988,-1.49034 -11.45883,-7.06446 -5.05804,-11.63839 3.29928,-2.54529 6.60949,-4.2435 8.49554,-6.67857 -0.44832,-5.46137 4.52541,-2.10497 5.45089,1.375 -1.33351,2.97122 -6.17168,3.61798 -0.19643,4.22321 1.53664,2.78412 6.29789,3.44509 3.97768,0.93304 4.84108,1.61965 -4.64455,-7.48199 1.96428,-3.14286 1.65516,-3.40276 -4.31344,-3.76367 -4.41964,-7.07144 -3.08474,-1.45967 -4.70008,-5.43841 -4.95982,-2.1607 -1.1047,-3.92054 -3.52578,2.02281 -2.89732,-2.20982 -4.77543,1.64253 2.34731,7.83145 -2.55357,7.85714 -1.60657,-1.66162 -1.21217,-6.65605 0.39286,-8.69197 -3.42149,-0.12305 -4.12944,11.68886 -4.27233,6.58035 0.51331,-2.0603 -5.16003,2.25055 -5.20535,-2.60268 3.35704,4.51196 5.54676,-7.5379 2.65178,-4.27232 -1.9953,1.26974 -1.89888,-9.182223 -6.58035,-3.38839 -0.54746,3.0228 5.064,0.50562 1.17857,3.29018 3.65637,1.83728 -3.30607,1.55904 0.63839,4.0759 2.51685,2.16135 -0.13074,3.62913 -1.62054,0.49106 -0.35528,-2.32699 -2.6514,-7.07736 -6.33482,-8.00446 -2.7307,-1.761703 1.68585,-10.018959 -4.66517,-10.950889 z m 5.20535,17.433039 c 0.62122,-0.0314 1.49921,0.0715 1.57143,1.27678 0.11173,1.8633 -0.96343,1.50225 -1.47321,1.08035 -0.30139,-0.24941 -2.03305,-0.36243 -0.54018,-0.98214 1.46751,-0.60917 -0.89559,-1.32588 -0.049,-1.32588 0.11346,0 0.284,-0.0388 0.49107,-0.049 z m -0.14724,7.75893 c 0.12068,-0.0165 0.22171,0.009 0.29464,0.049 1.61818,0.86816 0.0693,1.13883 -1.03125,1.22768 -1.80791,0.14598 -0.10827,-1.16113 0.73661,-1.27679 z m 0.63839,10.85268 c 0.39251,0.0404 0.78974,0.38096 0.88393,0.7366 0.28795,1.08723 -0.18995,1.16479 -0.6875,0.88393 -0.60835,-0.3434 -1.24905,-1.2279 -0.58929,-1.52232 0.11189,-0.0498 0.26202,-0.11173 0.39286,-0.0982 z m 4.56697,5.20535 c 0.15227,-0.0233 0.26389,0.1232 0.34375,0.24554 0.6327,0.96944 -0.0528,1.26912 -0.54018,1.08036 -0.38533,-0.14929 -0.64559,-0.58973 0.049,-1.22768 0.0619,-0.0569 0.0966,-0.0904 0.14724,-0.0982 z m 30.24999,2.0625 c 0.73144,-0.0437 1.48713,0.11566 0.39286,0.78572 -0.61532,0.37679 -1.05631,0.23423 -1.22768,0 -0.21058,-0.28784 -0.009,-0.73532 0.83482,-0.78572 z m -21.16517,1.86607 c 0.28414,0.13845 -2.00697,1.75894 -2.35715,2.11161 -1.54345,1.55441 -1.28902,-0.45944 -2.7991,-0.6875 -1.91218,-0.2888 0.364,-0.98868 1.03125,-0.44196 1.29952,1.06478 2.16626,-0.4074 3.83035,-0.93304 0.15836,-0.05 0.25406,-0.0688 0.29465,-0.049 z m 29.66071,0.98215 c -2.61226,2.26615 -2.24439,4.63596 -1.03125,5.74554 1.20863,1.10544 3.26964,0.93763 4.07589,-1.76785 -0.27407,-2.23609 -4.01852,0.0591 -3.04464,-3.97769 z m -12.22776,1.22768 c 0.39602,-0.16372 0.75228,0.41532 0.88393,0.78571 0.53883,1.51597 -0.43813,1.14848 -0.98214,0.49107 -0.37114,-0.44847 -0.53506,-1.01497 0.0982,-1.27678 z m -3.92857,0.88392 c 0.2487,0.0325 0.36901,0.27694 0.0982,0.6384 -0.44885,0.5991 -0.83454,0.67642 -1.03125,0.54018 -0.27703,-0.19189 -0.17981,-0.82076 0.63839,-1.12947 0.0952,-0.036 0.21175,-0.0602 0.29464,-0.049 z m -14.24107,2.50448 c 1.08548,0.10921 1.86815,1.72431 2.25893,2.55357 1.06552,2.26108 -1.86965,2.01775 -2.79911,1.22768 -1.7126,-1.45577 -3.91232,0.59879 -4.51785,-1.17857 -0.53377,-1.5667 2.98909,-2.01156 4.56696,-2.50447 0.16577,-0.0517 0.336,-0.11377 0.49107,-0.0982 z m 9.77232,2.94643 c 0.0566,0.008 0.11912,0.0701 0.24554,0.0982 1.28423,0.28606 0.61364,0.51219 -0.0982,0.58929 -0.66212,0.0716 -1.38219,-0.1243 -0.34375,-0.58929 0.10529,-0.0471 0.13986,-0.10607 0.19643,-0.0982 z m -9.13393,1.81696 c 0.61027,-0.008 1.19548,0.31004 1.76786,0.14724 1.66518,-0.47318 6.33479,2.83761 4.02679,2.75 -2.61769,-0.0995 -1.2103,3.42779 -2.65179,1.03125 -0.81405,-1.35339 0.10183,-2.51018 -1.47321,-2.99553 -1.89948,-0.58533 -2.77604,2.3905 -2.89732,4.27232 -0.12038,1.86749 -2.23148,0.7447 -1.52233,-0.73661 0.78485,-1.63939 0.17583,-4.43865 2.75,-4.46875 z m 9.23215,3.68304 c 0.15384,0.003 0.26331,0.0616 0.34375,0.0982 2.44489,1.11479 -1.91656,1.29916 -2.45536,1.12947 -1.4738,-0.4642 1.03435,-1.24619 2.11161,-1.22767 z m -3.68304,1.86607 c 0.47858,-0.0691 0.87571,-0.011 1.08036,0.14724 0.75749,0.58695 -2.5108,2.16441 -3.38839,1.71875 -1.17642,-0.59741 0.8723,-1.65859 2.30803,-1.86607 z m -33.49105,6.13839 c -0.3716,-1.26965 -1.02602,-2.39284 -2.12149,-3.24726 -1.04533,-0.81532 -0.29361,-2.27303 -0.3674,-3.41522 -0.0379,-0.58608 0.462,2.8826 1.28425,3.44173 0.8681,0.59031 1.61558,4.62484 1.20464,3.22075 z m 5.79511,-4.22323 c 0.18801,1.14436 -1.17766,1.92489 -2.27518,2.041 -1.29429,0.13688 -1.54257,-1.15853 -1.02688,-2.21444 0.58981,-1.20767 -1.83506,-1.7544 -1.22225,-3.00966 0.72835,-1.49195 2.0189,-2.62381 2.85732,-4.06651 0.67306,-1.15818 2.86814,-0.4783 2.64533,0.9041 -0.20817,1.2915 -0.36031,2.56601 -0.61391,3.84978 -0.15337,0.77629 -0.50378,1.64755 -0.36443,2.49573 z"
+             style="fill:url(#radialGradient5808-9);fill-opacity:1.0;stroke:url(#radialGradient5810-3);stroke-width:1.57142854000000010px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             id="path4779" />
+          <path
+             sodipodi:nodetypes="cscccccccccscscsssccsccsscccssssscsccscsccsssss"
+             inkscape:connector-curvature="0"
+             d="m 283.34375,154.125 c -0.97874,-0.0781 -1.51482,1.16264 -2.4375,1.3125 -1.01747,0.16525 -2.38675,0.45829 -3.125,-0.34375 -0.0304,-0.033 -0.0635,-0.0607 -0.0937,-0.0937 -0.76161,-0.005 -1.62035,-0.34408 -2.25,-0.84375 1.47543,3.10462 5.80531,0.70538 5.28125,2.9375 2.3324,-0.64943 0.62979,5.72185 1.34375,6.21875 -1.20369,0.77936 -0.95421,3.52515 -1.625,5.34375 -0.12429,0.61242 -0.22032,1.21666 -0.1875,1.84375 0.017,0.32432 0.33222,0.93464 0.25,1.15625 -0.34631,0.93334 0.86363,1.62322 0.9375,0.3125 0.061,-1.08184 0.46037,-3.30845 0.75,-4.3125 0.25022,-0.86743 -0.0909,-0.93604 0.78125,-1.375 0.88418,-0.445 1.46286,0.87259 2.34375,0.15625 0.76187,-0.61954 1.29701,-1.89435 0.18745,-2.40625 -0.77107,-0.35576 -2.35267,-0.29235 -2,-1.625 0.29565,-1.11718 0.36058,-2.289 0.46875,-3.4375 0.1003,-1.06502 0.73282,-1.85259 1,-2.84375 0.27238,-1.01046 -0.73987,-1.92933 -1.625,-2 z m 4.5,1.6875 c -0.92615,0.62334 -1.3879,1.26674 -1.125,2.0625 0.19011,0.52936 0.78004,0.91815 0.75,1.53125 -0.0247,0.50336 -0.30061,0.93535 -0.4375,1.40625 -0.1491,0.51292 -0.43288,0.75425 -0.8125,1.1875 -0.25015,0.28549 0.27417,0.65211 0.625,0.5625 0.26165,-0.0668 0.79716,-0.30948 0.75,0.15625 -0.0312,0.30799 0.16754,0.57969 0.4375,0.34375 0.35944,-0.31416 0.52076,-0.81085 0.75,-1.21875 0.45335,-0.80669 1.01742,-1.70698 0.65625,-2.6875 -0.25676,-0.69705 -0.96231,-0.95444 -1.375,-1.5625 -0.22257,-0.32793 0.10115,-0.72005 0.21875,-1.0625 0.10062,-0.293 -0.19437,-0.88239 -0.4375,-0.71875 z m -3.46875,12.40625 c -0.26433,0.72861 -0.18253,1.27808 -0.40625,2.0625 -0.2382,0.83519 -0.0314,1.91968 -0.40625,2.78125 -0.15008,0.34499 0.0346,0.82025 0.3125,1.09375 0.47316,0.46575 0.49237,0.0312 1.4375,0.0312 0.56112,0 -0.0359,-1.14107 -0.0937,-1.8125 -0.1129,-1.31006 -0.0171,-2.64147 -0.25,-4.03125 -0.11368,-0.67839 -0.56589,-0.2018 -0.59375,-0.125 z m -3.30764,17.06219 c 0.38771,-0.30068 0.58146,-1.18096 1.0234,-1.51241 0.44194,-0.33146 0.20044,-1.80688 -0.75065,-1.34663 -0.52059,0.25192 -1.11213,1.4923 -1.4609,2.01935 -0.35198,0.53189 0.49275,1.37898 1.18815,0.83969 z"
+             style="color:#000000;fill:#b2b5aa;fill-opacity:1;fill-rule:nonzero;stroke:#7b7e69;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             transform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+             id="path4597" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 357.69851,115.09908 c 0.39154,1.88687 3.24931,2.52915 3.78125,1.08035 0.6669,-1.81635 2.01522,-1.39603 3.14286,-0.78571 0.43544,0.23568 0.70749,0.64349 0.87943,1.07791 1.58462,-1.11158 2.98296,-2.19454 3.98184,-3.48419 -0.44832,-5.46137 4.52541,-2.10496 5.45089,1.375 -1.33351,2.97123 -6.17168,3.61798 -0.19643,4.22322 1.53664,2.78411 6.29789,3.44509 3.97768,0.93303 4.84108,1.61966 -4.64455,-7.48199 1.96428,-3.14286 1.65516,-3.40275 -4.31344,-3.76366 -4.41964,-7.07142 -3.08474,-1.45969 -4.70008,-5.43842 -4.95982,-2.16072 -1.1047,-3.92052 -3.52578,2.02282 -2.89732,-2.20982 -4.77543,1.64254 2.34731,7.83145 -2.55357,7.85714 -1.60657,-1.66161 -1.21217,-6.65605 0.39286,-8.69196 -3.42149,-0.12304 -4.12944,11.68885 -4.27233,6.58036 0.51331,-2.0603 -5.16003,2.25053 -5.20535,-2.60268 3.35704,4.51195 5.54676,-7.53791 2.65178,-4.27232 -1.9953,1.26973 -1.89888,-9.182222 -6.58035,-3.3884 -0.54746,3.0228 5.064,0.50563 1.17857,3.29018 3.65637,1.83727 -3.30607,1.55903 0.63839,4.07589 1.33345,1.14511 1.21725,2.09553 0.59163,2.26945 0.4553,1.79775 2.06895,3.19502 2.45335,5.04755 z m 23.66931,9.2813 c -0.11519,0.20859 -0.1874,0.364 -0.29465,0.54018 0.32299,1.16373 0.7791,2.30787 0.58929,3.53571 -0.25492,1.64901 1.11215,1.69986 2.01339,2.40625 0.45476,0.35642 2.6442,1.41974 2.11161,0.24554 -0.32636,-0.71955 -0.65934,-1.42716 -0.93304,-2.16072 -1.41183,-1.34764 -3.02904,-2.87997 -3.4866,-4.56696 z m -7.26786,-3.09375 c -0.27294,-0.0197 -0.56901,-0.0178 -0.88393,0.049 -1.56568,-0.0528 -2.16991,0.69768 -2.35714,1.81696 0.72183,0.35517 1.4475,0.7414 2.16071,1.12946 1.44477,0.78606 3.21987,1.25686 4.86161,0.93304 -0.84923,-1.53984 -1.78027,-3.78479 -3.78125,-3.92857 z"
+             style="color:#000000;fill:#b2b5aa;fill-opacity:1;fill-rule:nonzero;stroke:#7b7e69;stroke-width:1.57142854;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4748" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           d="m 177.1312,85.094585 c -0.0523,1.41251 0.56056,2.139547 1.31037,2.455923 1.36391,0.575489 3.18108,-0.207916 2.27295,-0.696284 -0.38733,-0.208277 -1.27039,-0.362906 -2.89582,-0.335532 0.8921,-0.716775 0.25354,-1.41647 -0.6875,-1.424107 z m 6.92411,-8.397321 c -1.06904,1.18162 -4.2218,0.954926 -6.48214,0.638393 -2.70746,-0.379154 -4.15351,-0.893876 0.78571,0.638393 0.55359,-0.09633 3.47184,0.374597 5.15625,0.245536 1.1672,-0.08942 1.76063,-0.466259 0.54018,-1.522322 z m -10.95087,14.290178 c -1.41994,4.021553 -4.27922,-2.250317 -5.45089,2.160714 -2.13424,1.609065 -6.15362,6.209264 -3.68304,7.611604 0.1942,1.43274 6.99319,1.83626 6.97321,6.58036 3.54169,-1.80947 -0.17133,4.30113 2.75,1.375 -0.16866,3.927 1.91363,6.72411 4.61608,9.67411 5.8552,5.27448 6.66673,-0.58307 4.125,-5.64732 1.67404,-3.01165 3.39694,-7.76149 2.25892,-9.87054 -2.24316,1.62619 -1.3944,-0.9656 0.0982,-1.22768 -3.93538,-1.65718 -2.92077,-1.691123 -3.73214,-3.781248 -2.81093,-2.561177 -5.54452,-3.147493 -7.95536,-6.875 z m -11.54018,2.700893 c -2.72787,0.275377 -4.15025,3.15854 -0.63839,2.553571 -2.78247,2.330853 -4.99069,-2.50547 -4.37054,2.651786 4.88936,-0.198723 -3.4437,3.425128 3.48661,2.897318 -0.29753,-2.288248 6.73333,-7.241077 2.75,-8.053568 -0.43249,-0.08517 -0.83798,-0.08847 -1.22768,-0.04903 z m -2.79911,4.272321 c 1.70802,1.46289 -1.19381,0.680602 0,0 z m -10.60714,0.392857 c -4.53014,1.748627 3.6482,4.543987 1.81697,0.638393 -2.01082,2.730044 -0.49186,-0.29205 -1.81697,-0.638393 z m 4.91072,1.767857 c -3.59625,2.54419 2.07543,2.47696 0,0 z m 1.52232,0 c -2.21344,4.54506 9.73761,3.82929 1.96428,2.20982 -0.73002,-0.63625 -1.00383,-1.71997 -1.96428,-2.20982 z m -3.68304,3.4375 c -4.92338,3.53713 3.90858,3.89772 0,0 z m 3.68304,12.42411 c -1.86754,2.23683 -0.5839,3.15678 0.7512,3.18797 1.66158,0.0388 3.40288,-1.29891 -0.7512,-3.18797 z"
+           style="color:#000000;fill:#e8e8e8;fill-opacity:1;fill-rule:nonzero;stroke:#b8b8b8;stroke-width:1.57142854;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path17447" />
+        <g
+           transform="translate(-212.14287,0)"
+           id="g5732">
+          <path
+             sodipodi:nodetypes="cccccccccc"
+             style="color:#000000;fill:#4c7019;fill-opacity:1;fill-rule:nonzero;stroke:#184402;stroke-width:1.57142854;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 444.86339,99.974127 c 3.60614,4.935743 4.17178,12.349853 4.37053,17.187503 -1.39968,6.49458 -6.16083,-5.16391 -5.5,3.19196 -0.42439,7.51588 -4.80354,12.46603 -1.375,19.79018 1.35038,6.67543 -1.84393,15.02064 2.7009,20.87053 -0.81938,5.84275 3.5598,10.26123 9.13392,9.33036 3.72693,-3.21154 5.7028,-18.02972 7.66072,-14.73214 0.51774,-2.39025 0.1815,-14.4592 -1.03125,-19.79018 -2.11345,-13.25134 -7.54579,-25.75052 -15.37753,-36.52144 z"
+             id="path5721"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="ccccccccccccccccccccccccccccccccsccccccccccccccccscc"
+             id="path17449"
+             style="color:#000000;fill:url(#radialGradient5812-0);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient5814-0);stroke-width:1.57142854;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 341.83658,69.085736 c 1.64324,0.903901 -6.33819,1.827288 0.39285,1.03125 3.6301,-1.716676 10.22336,-3.657123 3.53572,1.178571 -5.20427,-0.05201 -5.56613,11.172448 -8.39732,4.8125 -4.11509,-3.619958 -8.77841,3.832667 -1.81697,1.866071 1.26079,1.487028 -2.80311,9.405911 2.65179,6.53125 0.89112,1.265393 -3.25528,5.702164 1.57143,3.290179 4.20556,-3.466933 5.93162,-6.218442 8.25,-8.790179 4.75229,-2.908101 10.55838,-4.387491 14.58482,-7.267856 3.3916,1.146922 11.98641,-1.85548 9.37946,1.915178 4.1721,0.66099 11.01603,-0.58641 14.09375,-1.227678 2.61542,2.181252 11.05052,-3.17119 4.8125,0.34375 -5.24401,4.174059 6.03209,-1.998669 5.45089,2.995535 1.74232,-0.322237 8.66742,3.456561 6.77679,4.223214 4.65859,-0.731468 9.46481,6.705961 4.22321,2.553572 -5.41489,-3.59645 -5.83523,7.021771 -0.049,8.348213 5.21518,1.900423 7.30963,10.650044 12.91518,9.477674 -3.18778,-6.375972 7.75351,3.696 3.14286,-2.946424 -3.10175,-4.19771 -11.8726,-4.81107 -12.81697,-9.477678 2.12359,2.381311 9.12615,5.264584 6.92411,0.785714 2.38835,3.745799 7.41221,4.273547 8.20089,9.477678 2.91747,6.57811 -7.43975,-1.186978 -2.01339,3.78125 3.84933,2.76245 5.99211,9.86329 5.25447,13.84821 2.63679,0.17935 9.57034,3.37928 4.02678,7.46429 -0.489,4.50247 6.93259,12.04681 7.95536,4.8125 0.97114,-5.30008 -7.50532,-15.00675 -2.25893,-17.13839 6.55198,-0.95795 3.20062,-4.64518 -1.52232,-2.7009 -4.3928,-5.14097 10.20259,0.0806 6.04018,-2.7991 -1.51766,-1.40323 -5.14477,-6.372114 0.14724,-3.53572 -1.03164,-4.148427 -2.70259,-7.269771 1.57143,-1.964283 L 445.44568,99.3009 C 433.04383,82.244757 414.62525,69.522396 393.84107,65.009843 c -6.46566,-1.480474 -13.10871,-2.245718 -19.74108,-2.209821 -10.97766,0.05942 -22.24895,1.843977 -32.26341,6.285714 z m 91.4866,19.249921 c 3.14525,2.009354 8.526,14.993803 1.71875,7.022321 -2.68446,-3.149159 -1.39147,-3.991539 -4.125,-6.875 1.7576,1.564121 1.20992,1.12288 2.40625,-0.147243 z m -29.16142,16.157063 c -1.26481,1.06934 -1.72065,2.08442 -1.51026,2.80676 0.26218,0.90009 1.55878,1.34566 3.61365,0.87538 0.96625,-1.19556 0.7267,-4.12787 -1.23996,-4.07589 -0.34331,0.0141 -0.60957,0.27799 -0.86343,0.39375 z m 15.01856,1.57061 c -3.64772,0.2184 0.73573,4.32844 3.33929,3.63393 2.63962,4.1512 6.36518,6.77476 4.37053,-0.29464 -1.77216,-2.11143 -6.4339,0.0275 -7.70982,-3.33929 z m 1.76786,4.61608 c -1.06384,1.58458 -0.22894,3.06593 0.84381,3.90333 1.63568,1.27683 3.82432,1.0566 0.67851,-2.57744 -0.44693,-0.49451 -0.79326,-1.2202 -1.52232,-1.32589 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;fill:url(#linearGradient5816-7);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient5818-3);stroke-width:1.57142854000000010;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 391.92588,64.616986 c 5.76312,4.511069 10.91511,6.256061 13.89732,7.611607 4.58356,2.083447 15.94732,10.575132 18.16965,15.714285 0.86051,1.989963 0.92297,4.661423 0.49107,7.267857 0.56667,0.810495 0.99264,1.768658 1.17857,2.995535 1.73603,3.9143 -1.20783,2.74796 -2.75,2.20982 -0.0955,0.20278 -0.19393,0.39836 -0.29464,0.58929 0.25505,0.26375 0.52554,0.51913 1.03125,0.98214 3.84932,2.76245 5.9921,9.86329 5.25446,13.84821 2.63679,0.17935 9.57034,3.37928 4.02679,7.46429 -0.489,4.50247 6.93259,12.04681 7.95535,4.8125 0.97114,-5.30008 -7.50531,-15.00675 -2.25893,-17.13839 6.55198,-0.95795 3.20063,-4.64518 -1.52232,-2.7009 -4.3928,-5.14097 10.2026,0.0806 6.04018,-2.7991 -1.51765,-1.40323 -5.14468,-6.372114 0.14724,-3.53572 -1.03164,-4.148427 -2.70259,-7.269771 1.57143,-1.964283 l 0.83049,-0.279038 C 433.29658,82.445141 414.77617,69.555185 393.84098,65.009843 c -0.63715,-0.145828 -1.27476,-0.261517 -1.91518,-0.392857 z m 41.39732,23.718749 c 3.14525,2.009354 8.52601,14.993805 1.71875,7.022321 -2.68445,-3.149158 -1.39147,-3.991538 -4.125,-6.874999 1.7576,1.564121 1.20992,1.122801 2.40625,-0.147243 z m -9.52678,9.772321 c -0.14897,0.472309 -0.31503,0.934969 -0.49107,1.375 1.10535,0.509426 1.71895,0.551634 0.49107,-1.375 z m -4.61607,7.955354 c -3.64773,0.2184 0.73572,4.32844 3.33928,3.63393 2.63962,4.1512 6.36518,6.77476 4.37054,-0.29464 -1.77217,-2.11144 -6.4339,0.0275 -7.70982,-3.33929 z m 1.76785,4.61607 c -1.06384,1.58459 -0.23793,3.04207 0.83482,3.87947 1.63569,1.27683 3.83332,1.08047 0.6875,-2.55357 -0.44693,-0.49452 -0.79325,-1.2202 -1.52232,-1.3259 z"
+             id="path5679"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cssccccccccccccccccccccccccccccscc" />
+          <path
+             style="fill:#ccb38f;fill-opacity:1;stroke:#7d6f4a;stroke-width:1.57142854;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 383.43034,63.291093 c 4.16633,1.461775 8.8546,2.435227 13.13195,3.679547 10.80358,3.142857 17.45808,6.796193 22.16273,10.478113 6.52063,5.103135 10.9898,6.634194 14.7455,10.788846 0.93194,1.03092 1.87721,1.914267 2.70089,2.970975 2.63193,3.760067 5.20138,6.988912 7.12046,10.729916 -1.03164,-4.148428 -2.70259,-7.269772 1.57143,-1.964284 3.60614,4.935744 4.17178,12.349854 4.37053,17.187504 -1.39968,6.49457 -6.16083,-5.16391 -5.5,3.19196 -0.42439,7.51587 -4.80354,12.46603 -1.375,19.79018 1.35038,6.67543 -1.84393,15.02064 2.7009,20.87053 -0.39402,2.80968 0.39922,5.30785 1.96428,7.02232 4.36985,-8.06039 8.16238,-7.73856 10.55804,-12.32589 1.8515,-3.54535 3.37763,-7.0017 4.07589,-13.65178 -0.207,-2.38746 -0.46849,-4.62629 -0.83482,-6.23661 -5.46018,-34.23532 -33.07279,-63.450277 -66.98214,-70.812498 -3.42494,-0.784221 -6.91419,-1.352701 -10.41071,-1.71875 z"
+             id="path5677"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         id="g11872">
+        <path
+           id="path11885"
+           style="color:#000000;fill:url(#linearGradient11887);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,31.062471 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           sodipodi:nodetypes="sccccs"
+           inkscape:connector-curvature="0"
+           d="m 12.937518,26.562475 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           style="color:#000000;fill:url(#linearGradient11883);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path11881" />
+        <path
+           id="path11109-7"
+           style="color:#000000;fill:url(#linearGradient11870);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,22.062479 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           transform="matrix(2.9999963,0,0,2.9999963,108.9374,-453.81193)"
+           d="m -29.5,156 c 0,0.62132 -1.119288,1.125 -2.5,1.125 -1.380712,0 -2.5,-0.50368 -2.5,-1.125 0,-0.62132 1.119288,-1.125 2.5,-1.125 1.380712,0 2.5,0.50368 2.5,1.125 z"
+           sodipodi:ry="1.1250012"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099-5"
+           style="color:#000000;fill:url(#linearGradient11763);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.125;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+      <rect
+         width="48"
+         height="48"
+         x="0"
+         y="-16"
+         id="rect19265"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g6162"
+         transform="matrix(0.37499953,0,0,0.37499953,3.0048689e-5,13.624986)">
+        <path
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0"
+           id="path6134"
+           d="m 89.5,2.499999 8,8 26,24 -10,10 -24,-26 -8,-8"
+           style="fill:url(#linearGradient6173-9);fill-opacity:1.0;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <g
+           id="g6136"
+           transform="matrix(4,0,0,4,39.5,-79.5)">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:url(#radialGradient6175-7);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path6138"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6.5"
+             sodipodi:ry="6.5"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             transform="translate(-421,-119)" />
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             sodipodi:ry="6.5"
+             sodipodi:rx="6.5"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6140"
+             style="color:#000000;fill:url(#radialGradient6177-7);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.125,136 c 0,3.38274 -2.74226,6.125 -6.125,6.125 -3.38274,0 -6.125,-2.74226 -6.125,-6.125 0,-3.38274 2.74226,-6.125 6.125,-6.125 3.38274,0 6.125,2.74226 6.125,6.125 z"
+             sodipodi:ry="6.125"
+             sodipodi:rx="6.125"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6142"
+             style="color:#000000;fill:none;stroke:url(#linearGradient6179-4);stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter4149)"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:0.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path6144"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6.5"
+             sodipodi:ry="6.5"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             transform="translate(-421,-119)" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path6146"
+             d="m 7,11.5 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,0.25674 0.02846,0.50262 0.0625,0.75 -0.0021,-0.45763 0.06335,-0.91165 0.1875,-1.375 0.75044,-2.8007 3.60555,-4.46919 6.40625,-3.71875 2.8007,0.75044 4.46919,3.6368 3.71875,6.4375 -0.12837,0.4791 -0.32061,0.90642 -0.5625,1.3125 C 12.0553,19.46855 12.5,18.28917 12.5,17 12.5,13.96243 10.03757,11.5 7,11.5 z"
+             style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7637-2);enable-background:accumulate" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path6148"
+             d="m 7,12 c -1.64808,0 -3.08913,0.83249 -4,2.0625 1.40812,-1.00322 3.2308,-1.41993 5.03125,-0.9375 0.31676,0.08488 0.6163,0.18223 0.90625,0.3125 L 9.1875,12.5 C 8.52925,12.17878 7.78163,12 7,12 z m 3.0625,1.09375 -0.21875,0.875 c 0.94547,0.63904 1.673,1.5097 2.125,2.53125 -0.14086,-1.38702 -0.86841,-2.58673 -1.90625,-3.40625 z"
+             style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7597-7);enable-background:accumulate" />
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             sodipodi:ry="6.5"
+             sodipodi:rx="6.5"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6386"
+             style="color:#000000;fill:none;stroke:url(#linearGradient6394);stroke-width:0.25000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path6150"
+           d="m 89.5,18.499999 8,-8 26,24 -10,10 z"
+           style="fill:url(#linearGradient6291);fill-opacity:1.0;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         transform="translate(-11,37.499981)"
+         id="g19359">
+        <path
+           id="path19361"
+           transform="translate(11,-53.5)"
+           d="M 47.81247,9.7500278 32.71875,11.875 l 2.75,1.6875 12.34372,-2.312472 z"
+           style="color:#000000;fill:url(#linearGradient19425);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499951999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499951999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           id="path19363"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19365"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499951999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path19367"
+           transform="translate(11,-53.5)"
+           d="m 24.21875,12.84375 -24.03122023,4.40627 0,2.125 L 26.96875,15.25 z"
+           style="color:#000000;fill:url(#linearGradient19427);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499951999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499951999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           id="path19369"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19429);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499951999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           id="path19371"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssss" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19431);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.37499951999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path19373"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="ssssss"
+           inkscape:connector-curvature="0"
+           id="path19375"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           style="color:#000000;fill:url(#radialGradient19433);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path3467"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499951999999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19435);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           id="path19377"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/64x64/viqui.png"
+       inkscape:label="#icon_64"
+       id="icon_64"
+       transform="matrix(1.333335,0,0,1.333335,128,-58.66672)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect19579"
+         y="-16"
+         x="0"
+         height="48"
+         width="48" />
+      <g
+         id="g5768-2"
+         transform="matrix(0.23863607,0,0,0.23863607,-14.273844,-27.611293)">
+        <path
+           transform="matrix(1.2222222,0,0,1.2222222,-752.26508,-137.64442)"
+           d="m 820,236 c 0,39.7645 -32.2355,72 -72,72 -39.7645,0 -72,-32.2355 -72,-72 0,-39.7645 32.2355,-72 72,-72 39.7645,0 72,32.2355 72,72 z"
+           sodipodi:ry="72"
+           sodipodi:rx="72"
+           sodipodi:cy="236"
+           sodipodi:cx="748"
+           id="path6924-5"
+           style="color:#000000;fill:url(#radialGradient5788-7-7);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#radialGradient5790-5-8);stroke-width:2.57142853999999987;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc"
+           clip-path="none" />
+        <path
+           transform="translate(-212.14287,0)"
+           clip-path="url(#clipPath17433-0-7)"
+           style="fill:#105090;fill-opacity:1;stroke-linejoin:round;filter:url(#filter17427-4-3)"
+           d="m 442.3589,110.70438 c 3.55125,7.54397 -5.50038,2.40937 0,0 z m -5.30357,-0.0491 c 1.20632,4.15944 8.59344,6.21374 5.69631,11.63839 0.16003,4.76864 -1.71311,7.36014 -1.71875,1.22768 0.41633,-2.86134 -0.78154,-5.67639 -2.16063,-4.22322 -0.56581,-2.72795 -2.19423,-6.08507 -1.81693,-8.64285 z m -60.45089,-6.67857 c 5.68536,3.39882 1.09977,8.39033 -0.58928,1.66964 l 0.29464,-0.98214 0.29464,-0.6875 0,0 z m 66.39286,-4.075895 c 4.89422,2.710035 3.94217,8.340755 4.86162,12.227675 1.19626,7.09511 -10.20684,-6.17432 -2.65145,-4.86161 2.06164,-1.31539 -3.09836,-5.36434 -2.21017,-7.366065 z m -9.52679,-9.82142 c 2.10634,1.53714 7.34487,10.203825 2.11162,4.07589 -2.00793,-2.29407 -2.19775,-2.33927 -2.11162,-4.07589 z m -64.52678,-14.3393 c 6.76844,1.73901 14.96182,5.47078 18.70982,11.73661 -6.10191,-0.76014 2.96411,3.33793 5.98746,1.79541 4.96597,1.27124 14.64027,-0.40248 12.51586,7.08482 4.59549,-0.16538 8.79226,7.585475 1.67973,6.735855 -0.98495,-2.64799 -6.91979,-4.804625 -8.24995,-6.089285 -4.72794,5.672395 -5.40581,-6.83274 -10.85268,-5.40177 -2.26415,-1.55011 -7.76015,-1.04755 -9.52679,-2.1116 -2.13455,6.70427 -4.6247,-4.02972 -5.40608,-1.88342 2.06734,4.82681 -4.93449,0.89498 -4.72958,0.43303 -3.65128,0.36362 4.83195,7.06601 -3.41807,5.87003 -6.00493,-0.81868 -15.97509,8.951485 -18.36549,0.44587 -1.53971,-7.07666 9.41584,-3.15443 8.98603,-5.70033 -2.1568,-0.56621 4.97437,-2.29124 -1.12954,-2.50446 -6.18179,-1.66464 12.68197,-0.9287 3.29017,-3.19197 4.35545,-4.4753 9.12495,-3.12026 12.52232,1.03125 7.50572,3.20417 -12.34223,-7.16762 -2.01321,-8.25004 z m 4.71428,-12.86607 c -6.26443,-0.13 -13.2539,0.49753 -19.63042,2.18825 -6.92134,0.96517 -10.20194,4.50579 -14.99016,5.27605 -2.39314,2.34157 -10.48416,4.55484 -7.5556,7.03109 2.01228,1.62126 6.91943,3.20497 0.97515,4.45995 -4.08317,0.88884 6.54163,-0.76485 0.93311,3.58484 -4.55347,1.2128 -7.58889,10.68658 -11.29464,8.69196 -0.34466,-9.92046 -2.58054,3.27979 0.79981,5.959535 3.63384,4.40158 13.68121,3.77443 8.14404,11.97588 -1.65533,3.22045 -2.47695,4.78014 -1.03732,5.29226 -3.54948,6.13488 -2.51021,14.59656 -8.55839,19.99522 0.40108,5.70851 -2.00106,10.48524 -0.2319,16.44209 2.887,4.68606 -0.32319,13.55344 5.5982,16.40179 2.35824,-5.63411 2.05309,7.55214 5.15625,8.39733 -0.90033,0.17097 3.8338,4.20404 3.19197,3.24106 4.31673,4.07708 9.70705,6.4204 14.51833,10.36817 5.22228,2.72033 11.73661,8.79037 3.30745,10.79693 0.36193,0.70385 -7.12285,2.7741 -4.49171,6.48567 3.31563,1.4017 8.69639,1.06719 2.38,-0.98597 -4.41408,-3.30399 6.43234,-3.75067 8.02781,-6.70444 3.36871,-1.07638 2.6162,2.28804 4.70993,-0.26341 3.96819,0.14431 4.3943,-2.04084 4.90038,3.13727 0.26407,-4.85512 -2.62727,5.06236 -5.37904,5.59935 -3.73228,8.53592 6.15554,15.38635 13.40762,17.40135 7.89879,2.47698 -7.20552,13.60864 -1.99697,10.29424 3.72354,-2.87829 -2.78188,2.45622 2.8444,1.17022 12.93397,-0.14806 25.63021,-4.83923 35.64118,-12.98253 5.89239,-3.52655 7.12839,-5.74575 10.69866,-9.45856 -3.47006,-0.73995 2.67266,-6.05431 5.2758,-10.20685 1.92885,-7.24534 -9.82954,-0.56815 -13.96651,-4.04039 -2.71031,-3.76856 -8.44056,-2.41433 -11.86395,-6.12477 -2.4603,4.52658 -8.46196,0.82322 -6.62946,-3.3883 -0.88349,0.10037 -3.85518,-3.44928 -5.09243,1.28983 -2.88963,2.43499 -1.61019,-4.29674 -1.38962,-4.53091 4.47159,0.93581 3.16032,0.98923 1.45583,-2.88504 -6.92624,-3.28026 0.81841,8.25805 -4.85789,9.03215 -6.60075,-3.11487 -13.93656,-0.1927 -18.49979,2.93765 -1.98043,-0.51189 -11.07895,-0.79714 -6.38393,-3.29029 3.57411,-1.74491 2.93342,-6.75389 9.21799,-5.69763 0.75311,-4.6814 5.0069,-0.64596 9.14799,-2.65028 -1.83561,1.65645 13.11486,-1.54319 4.77586,-0.93145 -4.00044,1.41374 -8.08102,-3.7795 -11.89638,-0.2962 3.82418,1.39787 -4.396,-0.14961 -2.99538,3.53578 -0.64555,-5.23838 -11.24025,0.54167 -16.05803,-0.93296 -0.85378,-1.93255 0.37957,-4.30488 0.88401,-3.78125 4.51189,-3.39057 2.34358,-10.4053 -3.63384,-6.924 -2.95559,1.44766 -8.07911,7.66102 -8.85564,0.12829 -0.24843,-7.30952 6.69612,-5.33065 10.86903,-5.82462 3.26194,-5.65752 7.71588,5.87791 6.68749,7.42342 -6.08091,1.61172 2.35524,2.78669 3.7562,2.01629 5.06694,1.2104 -0.27658,4.67189 5.76136,3.47533 8.18037,0.9986 -1.53713,-2.93398 1.03126,-2.89712 3.06742,0.53389 1.22998,-6.35379 -1.86595,-4.27234 1.98981,-3.07464 -0.0242,-9.41784 2.70075,-13.30793 1.40583,-6.3657 6.05739,-9.19916 11.50018,-11.6238 4.69462,-3.82624 10.86324,-9.58786 16.88525,-5.6168 1.11492,-2.90083 1.39148,-6.31368 4.56547,-8.58975 -1.76751,-5.53873 -6.10365,2.62451 -7.5625,-4.32143 -3.61792,-5.32764 -11.32294,-4.65515 -12.62046,-11.98214 0.93191,-8.06035 9.05318,-0.47579 12.12946,0.0491 2.18266,-1.25202 -0.37979,-7.67735 2.45528,-10.85267 5.05594,-4.98907 5.09843,17.8614 7.17,5.84294 0.53762,-2.9217 1.46062,-8.0548 3.53668,-9.16678 3.7493,3.25144 0.28336,11.12467 5.89126,10.5426 3.30595,1.32484 -1.6853,-12.93738 3.63391,-5.79463 -0.86163,3.8482 2.0239,8.04866 4.63381,6.01102 0.27964,4.55496 13.08094,-4.40247 9.55815,2.82825 -3.44101,4.45889 3.23898,9.94703 6.82589,11.78571 1.59406,5.88139 1.70758,8.37913 0.7905,13.51463 -1.78476,3.45762 2.72481,-1.52517 0.60578,3.92787 -1.26413,8.07415 4.91866,13.62384 4.79122,21.7941 4.7001,-1.41276 9.73997,-0.38549 10.85259,-7.66071 1.47346,1.04704 1.70479,-10.93704 3.48638,-6.72757 2.50412,-4.19078 1.39268,-5.53653 1.57125,-12.03125 -0.32242,-23.06256 -11.37532,-45.33816 -28.32397,-60.717225 -6.3783,-5.39965 -13.00302,-10.69304 -20.71455,-14.16145 -12.21051,-5.7746 -25.73772,-9.26546 -39.30449,-8.70201 z"
+           id="path16835-0-8"
+           inkscape:connector-curvature="0" />
+        <g
+           transform="translate(-212.14287,0)"
+           id="g4582-9">
+          <path
+             inkscape:connector-curvature="0"
+             style="color:#000000;fill:url(#linearGradient5792-4-0);fill-opacity:1.0;stroke:url(#linearGradient5794-6-4);stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 66.25,93.21875 c -1.346385,-0.0029 -3.918647,2.109772 -5.1875,2.75 -2.105638,-0.475739 -2.588834,-0.169795 -1.125,0.21875 1.693898,1.069587 1.526257,5.65398 -1.46875,5.65625 -1.539268,1.9377 0.736925,2.61049 -1.15625,4.03125 2.881906,3.48798 5.862493,7.00029 10.40625,8.125 1.044009,2.52687 -3.282264,5.73417 -2.25,6.46875 0.892147,-0.0152 1.774734,-0.0373 2.65625,-0.0937 0.01039,-6.7e-4 0.02086,6.7e-4 0.03125,0 4.831362,-0.24779 9.312499,-1.75806 13.59375,-3.65625 4.084258,-3.10679 8.97451,-5.14429 12.5625,-8.875 0.05263,-3.23427 7.2345,-7.59943 4.21875,-9.5 -3.921909,0.303609 -6.784918,1.171466 -9.90625,1.46875 -2.340036,2.65023 1.328461,-2.374432 -2.09375,0.21875 C 84.307662,101.76117 89.056794,97.421374 85.75,96.6875 82.229064,96.133635 78.346445,96.399318 76,94.25 73.128326,94.712407 69.059541,92.80313 67.09375,94.0625 67.010883,93.459816 66.698795,93.219732 66.25,93.21875 z"
+             transform="matrix(1.5714285,0,0,1.5714285,272.74288,49.442877)"
+             id="path17437-0" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#radialGradient5796-9-2);fill-opacity:1.0;stroke:#3c3a18;stroke-width:2px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 98.53125,98.34375 c -1.15112,0.0891 -2.18552,0.21736 -3.1875,0.375 -0.005,0.007 0.005,0.02415 0,0.03125 -1.86341,2.47608 -7.28369,3.61504 -9.0625,7.25 -2.03294,4.15425 -10.07121,3.89114 -13.53125,7.15625 -0.86901,0.82005 -2.76425,1.59766 -4.96875,2.40625 -0.541284,2.15838 -3.183659,4.3329 -2.3125,4.90625 0.892147,-0.0152 1.774734,-0.0373 2.65625,-0.0937 0.01039,-6.7e-4 0.02086,6.7e-4 0.03125,0 4.83136,-0.24779 9.3125,-1.75806 13.59375,-3.65625 4.08426,-3.10679 8.97451,-5.14429 12.5625,-8.875 0.0526,-3.23427 7.2345,-7.59943 4.21875,-9.5 z"
+             id="path17564-2"
+             transform="matrix(1.5714285,0,0,1.5714285,272.74288,49.442877)" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#radialGradient5798-0-1);fill-opacity:1.0;stroke:#605130;stroke-width:2;stroke-linejoin:round;stroke-opacity:1"
+             d="m 302.46875,228.21875 c -0.30309,-0.0118 -0.59701,0.0236 -0.90625,0.0625 -0.0441,0.33343 -0.20432,0.68424 -0.75,1.09375 2.88191,3.48798 5.86249,7.00029 10.40625,8.125 0.6368,1.54129 -0.72132,3.32115 -1.65625,4.65625 0.074,-0.008 0.14421,-0.0201 0.21875,-0.0312 2.20629,0.0586 4.65874,0.24053 5.71875,-2.125 1.33589,-0.64037 1.49851,-2.2152 2,-3.4375 -0.44397,-1.80919 -3.45827,-0.0145 -4.25,-1.96875 -1.30525,-0.38487 -2.69559,-0.33463 -4.03125,-0.625 -1.35627,0.0225 -2.72115,-0.18938 -3.4375,-1.5 -0.54477,-1.1192 -1.11395,-2.22264 -1.6875,-3.34375 -0.3317,-0.64901 -0.95639,-0.88021 -1.625,-0.90625 z"
+             transform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+             id="path17044-5-4" />
+        </g>
+        <g
+           transform="translate(-212.14287,0)"
+           id="g4587-7">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 364.38438,199.35945 c -3.72831,-0.88322 -6.90395,-2.47739 -4.42725,-7.84969 -2.07996,-3.17765 -11.43618,-1.3514 -5.89286,-6.43304 4.36311,-5.69473 -4.61079,-4.75676 -5.84375,-0.88392 -9.17728,1.21237 -9.19452,-14.55195 -2.1116,-16.20536 5.04574,0.5744 6.8425,0.98915 11.39285,0.54018 5.49535,-0.72715 4.31933,9.64035 7.75893,7.26785 -2.66508,-6.37822 0.18694,-10.43213 5.59822,-13.65178 1.34204,-1.32869 -1.30542,-8.82637 1.32589,-4.07589 0.57901,-4.97123 6.34565,-5.08488 7.16964,-9.67411 2.48786,-1.35036 5.83781,-4.09615 3.53572,0.54018 3.46933,-1.05848 8.67141,-7.81222 2.30803,-3.48661 -5.67441,-2.17435 1.04389,-6.58614 -5.40178,-3.73214 -5.87493,5.5355 3.1858,-6.49984 7.41517,-3.53572 4.87519,-1.69819 3.46169,-7.79747 -0.54017,-5.30357 2.20446,-1.93076 -4.31307,-4.84369 -5.30358,-8.49553 -3.76272,6.8103 -3.11303,-4.11389 -8.15178,-3.04464 -5.72778,-0.19327 1.11999,10.06603 -3.97768,11.68749 1.90891,7.74548 -4.35534,2.82119 -3.19196,-1.71875 -5.30988,-1.49035 -11.45883,-7.06446 -5.05804,-11.63839 3.29928,-2.54529 6.60949,-4.2435 8.49554,-6.67857 -0.44832,-5.46137 4.52541,-2.10496 5.45089,1.375 -1.33351,2.97123 -6.17168,3.61798 -0.19643,4.22322 1.53664,2.78411 6.29789,3.44509 3.97768,0.93303 4.84108,1.61966 -4.64455,-7.48199 1.96428,-3.14286 1.65516,-3.40275 -4.31344,-3.76366 -4.41964,-7.07142 -3.08474,-1.45969 -4.70008,-5.43842 -4.95982,-2.16072 -1.1047,-3.92052 -3.52578,2.02282 -2.89732,-2.20982 -4.77543,1.64254 2.34731,7.83145 -2.55357,7.85714 -1.60657,-1.66161 -1.21217,-6.65605 0.39286,-8.69196 -3.42149,-0.12304 -4.12944,11.68885 -4.27233,6.58036 0.51331,-2.0603 -5.16003,2.25053 -5.20535,-2.60268 3.35704,4.51195 5.54676,-7.53791 2.65178,-4.27232 -1.9953,1.26973 -1.89888,-9.182222 -6.58035,-3.3884 -0.54746,3.0228 5.064,0.50563 1.17857,3.29018 3.65637,1.83727 -3.30607,1.55903 0.63839,4.07589 2.51685,2.16136 -0.13074,3.62914 -1.62054,0.49108 -0.35528,-2.32701 -2.6514,-7.07737 -6.33482,-8.00447 -2.7307,-1.761711 1.68586,-10.018955 -4.66517,-10.950891 -3.36611,3.545159 -2.51157,2.466939 -4.56697,0.982143 -0.6927,5.873356 -6.41751,-0.224997 -8.29911,5.647321 -0.0573,4.073457 -4.04938,3.405333 -6.2366,1.669643 2.31853,4.878684 9.12263,1.108454 8.2991,4.616074 3.6652,-1.02054 0.98967,8.99148 2.11161,9.77232 -2.16173,1.39967 -1.32548,6.84538 -3.09375,9.52678 -2.34448,2.40914 -1.37902,9.79756 -6.58036,13.89732 -4.67056,6.42611 -0.6896,13.41395 -0.7366,20.18304 0.36466,4.58989 0.64015,7.45464 2.20982,12.08036 3.29866,6.0691 -1.05217,-8.22942 -0.83482,-10.70536 1.75973,-4.62581 2.67097,7.3755 3.63393,9.57589 3.41336,7.47698 3.50584,15.49939 12.27678,19.39732 5.68018,2.15594 12.6736,5.14964 15.86161,10.50893 1.0529,1.61573 7.55176,6.61355 8.15178,3.97768 4.6226,-0.20066 2.11442,-0.56479 0.15495,-1.08781 z m -17.146,-92.60862 c 0.62122,-0.0314 1.49921,0.0715 1.57143,1.27679 0.11173,1.86331 -0.96343,1.50225 -1.47321,1.08036 -0.30139,-0.24942 -2.03305,-0.36244 -0.54018,-0.98215 1.46751,-0.60918 -0.89548,-1.32589 -0.049,-1.32589 0.11346,0 0.284,-0.0387 0.49107,-0.049 z m -0.14732,7.75893 c 0.12069,-0.0165 0.22171,0.009 0.29464,0.049 1.61818,0.86817 0.0693,1.13883 -1.03125,1.22768 -1.80792,0.14599 -0.10827,-1.16113 0.73661,-1.27679 3e-5,0 -3e-5,8e-5 0,8e-5 z m 0.63839,10.85268 c 0.39251,0.0404 0.78974,0.38096 0.88393,0.73661 0.28795,1.08722 -0.18995,1.16479 -0.6875,0.88393 -0.60835,-0.34341 -1.24905,-1.2279 -0.58928,-1.52233 0.11188,-0.0498 0.26202,-0.11172 0.39285,-0.0982 z m 4.56697,5.20536 c 0.15227,-0.0233 0.26389,0.1232 0.34375,0.24553 0.6327,0.96945 -0.0528,1.26912 -0.54018,1.08036 -0.38533,-0.14929 -0.6457,-0.58973 0.049,-1.22768 0.0619,-0.0569 0.0966,-0.0904 0.14724,-0.0982 z m 30.25,2.0625 c 0.73143,-0.0437 1.48712,0.11565 0.39285,0.78571 -0.61532,0.3768 -1.05631,0.23424 -1.22768,0 -0.21058,-0.28784 -0.009,-0.73532 0.83483,-0.78571 z m -21.16518,1.86607 c 0.28414,0.13844 -2.00697,1.75893 -2.35714,2.11161 -1.54345,1.55441 -1.28903,-0.45944 -2.79911,-0.6875 -1.91218,-0.2888 0.364,-0.98868 1.03125,-0.44197 1.29952,1.06479 2.16626,-0.40739 3.83036,-0.93303 0.15835,-0.05 0.25405,-0.0688 0.29464,-0.049 z m 29.66071,0.98214 c -2.61226,2.26616 -2.24439,4.63595 -1.03125,5.74554 1.20863,1.10543 3.26964,0.93762 4.07589,-1.76786 -0.27407,-2.23608 -4.01852,0.0591 -3.04464,-3.97768 z m -12.22768,1.22776 c 0.39602,-0.16371 0.75228,0.41533 0.88393,0.78571 0.53883,1.51598 -0.43813,1.14848 -0.98214,0.49107 -0.37114,-0.44847 -0.53507,-1.01497 0.0982,-1.27678 z m -3.92857,0.88393 c 0.2487,0.0325 0.36899,0.27693 0.0982,0.63839 -0.44885,0.59911 -0.83454,0.67642 -1.03125,0.54018 -0.27703,-0.19189 -0.17981,-0.82077 0.63839,-1.12947 0.0952,-0.036 0.21175,-0.06 0.29464,-0.049 z m -14.24107,2.50446 c 1.08548,0.10922 1.86815,1.72431 2.25893,2.55357 1.06552,2.26108 -1.86965,2.01775 -2.79911,1.22768 -1.7126,-1.45577 -3.91232,0.59879 -4.51785,-1.17857 -0.53377,-1.5667 2.98909,-2.01155 4.56696,-2.50446 0.16577,-0.0517 0.336,-0.11378 0.49107,-0.0982 z m 9.77232,2.94643 c 0.0566,0.008 0.11912,0.0701 0.24554,0.0982 1.28423,0.28607 0.61366,0.5122 -0.0982,0.58929 -0.66212,0.0717 -1.38219,-0.1243 -0.34375,-0.58929 0.10529,-0.0471 0.13986,-0.10607 0.19643,-0.0982 z m -9.13393,1.81696 c 0.61027,-0.008 1.19548,0.30997 1.76786,0.14725 1.66518,-0.47319 6.33479,2.8376 4.02679,2.75 -2.61769,-0.0995 -1.2103,3.42779 -2.65179,1.03125 -0.81405,-1.3534 0.10183,-2.51019 -1.47321,-2.99554 -1.89948,-0.58532 -2.77603,2.39051 -2.89732,4.27232 -0.12038,1.86749 -2.23148,0.7447 -1.52233,-0.7366 0.78485,-1.6394 0.17582,-4.43866 2.75,-4.46875 z m 9.23215,3.68304 c 0.15384,0.003 0.26331,0.0616 0.34375,0.0982 2.44489,1.11479 -1.91656,1.29917 -2.45536,1.12947 -1.4738,-0.4642 1.03435,-1.24619 2.11161,-1.22768 z m -3.68304,1.86607 c 0.47858,-0.0691 0.87571,-0.011 1.08036,0.14724 0.75749,0.58695 -2.5108,2.16441 -3.38839,1.71875 -1.17642,-0.59741 0.8723,-1.65859 2.30803,-1.86607 z m -5.64732,29.51339 c -5.3251,1.30589 8.05385,0.55784 7.70982,5.00893 10.99331,1.37029 -4.91118,-5.51904 -7.70982,-5.00893 z m 15.07589,5.20536 c -0.22474,0.82743 -4.97679,2.95586 -0.39285,2.40625 3.9865,0.99765 8.75496,-2.05936 1.52232,-2.40625 z m -8.34821,1.91518 c 0.25804,1.0802 1.31706,0.95929 1.71875,0.63839 0.37005,-0.29563 0.18298,-0.75977 -1.71875,-0.63839 z"
+             style="color:#000000;fill:url(#linearGradient5800-3-7);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient5802-7-4);stroke-width:3.14285706999999981;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path17441-6" />
+          <path
+             sodipodi:nodetypes="cccccccsssssscccsscc"
+             inkscape:connector-curvature="0"
+             id="path4885-5"
+             transform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+             d="m 279.0625,171.90625 c -0.49775,2.02982 -0.97866,4.59609 -3.15625,6.3125 -2.97217,4.08934 -0.43884,8.53615 -0.46875,12.84375 0.23206,2.92084 0.40737,4.74386 1.40625,7.6875 2.09915,3.86215 -0.66956,-5.2369 -0.53125,-6.8125 1.11983,-2.9437 1.69971,4.6935 2.3125,6.09375 1.0504,2.30091 1.60572,4.68532 2.53125,6.8125 0.98681,-1.06713 -0.39053,-4.46456 -0.625,-6.21875 -0.21435,-1.60363 -1.20692,-7.07848 0.21875,-5.5625 1.305,1.38767 0.77731,3.89576 1.0625,6 0.34946,2.57842 2.26183,3.89101 2.875,6.21875 0.67827,2.57485 2.60107,5.97278 3.21875,4.375 0.73712,-1.90676 -2.41078,-3.0179 -2.25,-5.40625 0.0706,-1.04873 0.8151,-1.48666 1.5625,-1.90625 0.27629,-1.04483 0.77964,-1.98388 1.5,-2.625 -0.017,-0.0654 -0.0408,-0.11828 -0.0625,-0.1875 -0.41627,-1.32672 -0.36853,-2.84211 0.5625,-3.96875 1.38092,-1.67105 2.07075,-3.93231 2.625,-6.03125 0.86809,-3.28745 2.6747,-9.9624 1.11152,-13.46339 -3.26308,-5.84519 -9.13766,-5.35292 -13.89277,-4.16161 z"
+             style="color:#000000;fill:url(#radialGradient5804-4-1);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient5806-2-1);stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cccccccccsssssssssssssssssscccccccccccccccccccccccccccccccccccssccccccccssccccccccccccccssccccscccccccccccccssscccccsscccssssccccsccssccssssssssscscss"
+             inkscape:connector-curvature="0"
+             d="m 342.03303,89.317871 c -3.36611,3.545146 -2.51157,2.46693 -4.56697,0.98214 -0.6927,5.873346 -6.41751,-0.225 -8.29911,5.647316 -0.0573,4.073463 -4.04938,3.40534 -6.2366,1.66965 2.31853,4.878683 9.12263,1.10846 8.2991,4.616073 3.6652,-1.02054 0.98967,8.99147 2.11161,9.77231 -2.16173,1.39969 -1.32548,6.84539 -3.09375,9.5268 -2.34448,2.40914 -1.37902,9.79756 -6.58036,13.89732 -3.6379,5.00532 -2.04651,10.34711 -1.17857,15.66519 0.57111,-0.89133 1.01373,-2.18757 1.27679,-3.53572 0.39286,-2.01339 1.32589,-1.12946 1.03125,-0.44196 -0.29464,0.68748 -0.29464,2.89734 -0.58929,3.78125 -0.29464,0.88393 0.73661,2.55357 0.19643,3.58482 -0.54018,1.03124 0.19643,0.98214 0.58929,0.44197 0.39285,-0.54018 0.49105,-1.81697 0.39285,-3.83036 -0.0982,-2.01339 0.15075,-5.14823 0.51575,-9.10517 0.39763,-4.31074 2.38887,-7.86304 3.74213,-9.3055 3.9321,-4.19131 5.46391,-0.35945 2.56783,1.84987 -2.18615,1.66773 1.40914,3.43768 1.52251,3.89115 0.41668,1.66676 0.29175,6.38948 -1.5139,7.77843 -1.80565,1.38895 0.61928,1.40393 1.87101,-0.0111 1.5973,-1.80565 3.38637,-3.31017 5.192,-9.97719 0.75749,-2.79691 -2.52077,-0.77895 -0.53152,-5.95489 0.52069,-1.3548 3.04979,-4.70439 4.33482,-3.18523 1.8408,2.17621 5.16212,4.16086 6.33226,7.35234 1.75874,4.79691 3.62983,8.01622 3.07426,12.73868 -0.55558,4.72247 7.36222,7.80106 14.58482,8.49553 1.88087,0.18086 3.0618,0.77387 3.92857,1.57143 -0.0665,-0.94275 0.0816,-1.14576 1.17857,0.83482 0.57901,-4.97123 6.34565,-5.08487 7.16964,-9.6741 2.48786,-1.35036 5.83781,-4.09615 3.53572,0.54017 3.46933,-1.05848 8.67141,-7.81221 2.30803,-3.4866 -5.67441,-2.17436 1.04389,-6.58614 -5.40178,-3.73215 -5.87493,5.5355 3.1858,-6.49983 7.41517,-3.53571 4.87519,-1.6982 3.46169,-7.79749 -0.54017,-5.30357 2.20446,-1.93078 -4.31307,-4.8437 -5.30358,-8.49554 -3.76272,6.8103 -3.11303,-4.1139 -8.15178,-3.04465 -5.72778,-0.19327 1.11999,10.06604 -3.97768,11.68751 1.90891,7.74548 -4.35534,2.82119 -3.19196,-1.71876 -5.30988,-1.49034 -11.45883,-7.06446 -5.05804,-11.63839 3.29928,-2.54529 6.60949,-4.2435 8.49554,-6.67857 -0.44832,-5.46137 4.52541,-2.10497 5.45089,1.375 -1.33351,2.97122 -6.17168,3.61798 -0.19643,4.22321 1.53664,2.78412 6.29789,3.44509 3.97768,0.93304 4.84108,1.61965 -4.64455,-7.48199 1.96428,-3.14286 1.65516,-3.40276 -4.31344,-3.76367 -4.41964,-7.07144 -3.08474,-1.45967 -4.70008,-5.43841 -4.95982,-2.1607 -1.1047,-3.92054 -3.52578,2.02281 -2.89732,-2.20982 -4.77543,1.64253 2.34731,7.83145 -2.55357,7.85714 -1.60657,-1.66162 -1.21217,-6.65605 0.39286,-8.69197 -3.42149,-0.12305 -4.12944,11.68886 -4.27233,6.58035 0.51331,-2.0603 -5.16003,2.25055 -5.20535,-2.60268 3.35704,4.51196 5.54676,-7.5379 2.65178,-4.27232 -1.9953,1.26974 -1.89888,-9.182223 -6.58035,-3.38839 -0.54746,3.0228 5.064,0.50562 1.17857,3.29018 3.65637,1.83728 -3.30607,1.55904 0.63839,4.0759 2.51685,2.16135 -0.13074,3.62913 -1.62054,0.49106 -0.35528,-2.32699 -2.6514,-7.07736 -6.33482,-8.00446 -2.7307,-1.761703 1.68585,-10.018959 -4.66517,-10.950889 z m 5.20535,17.433039 c 0.62122,-0.0314 1.49921,0.0715 1.57143,1.27678 0.11173,1.8633 -0.96343,1.50225 -1.47321,1.08035 -0.30139,-0.24941 -2.03305,-0.36243 -0.54018,-0.98214 1.46751,-0.60917 -0.89559,-1.32588 -0.049,-1.32588 0.11346,0 0.284,-0.0388 0.49107,-0.049 z m -0.14724,7.75893 c 0.12068,-0.0165 0.22171,0.009 0.29464,0.049 1.61818,0.86816 0.0693,1.13883 -1.03125,1.22768 -1.80791,0.14598 -0.10827,-1.16113 0.73661,-1.27679 z m 0.63839,10.85268 c 0.39251,0.0404 0.78974,0.38096 0.88393,0.7366 0.28795,1.08723 -0.18995,1.16479 -0.6875,0.88393 -0.60835,-0.3434 -1.24905,-1.2279 -0.58929,-1.52232 0.11189,-0.0498 0.26202,-0.11173 0.39286,-0.0982 z m 4.56697,5.20535 c 0.15227,-0.0233 0.26389,0.1232 0.34375,0.24554 0.6327,0.96944 -0.0528,1.26912 -0.54018,1.08036 -0.38533,-0.14929 -0.64559,-0.58973 0.049,-1.22768 0.0619,-0.0569 0.0966,-0.0904 0.14724,-0.0982 z m 30.24999,2.0625 c 0.73144,-0.0437 1.48713,0.11566 0.39286,0.78572 -0.61532,0.37679 -1.05631,0.23423 -1.22768,0 -0.21058,-0.28784 -0.009,-0.73532 0.83482,-0.78572 z m -21.16517,1.86607 c 0.28414,0.13845 -2.00697,1.75894 -2.35715,2.11161 -1.54345,1.55441 -1.28902,-0.45944 -2.7991,-0.6875 -1.91218,-0.2888 0.364,-0.98868 1.03125,-0.44196 1.29952,1.06478 2.16626,-0.4074 3.83035,-0.93304 0.15836,-0.05 0.25406,-0.0688 0.29465,-0.049 z m 29.66071,0.98215 c -2.61226,2.26615 -2.24439,4.63596 -1.03125,5.74554 1.20863,1.10544 3.26964,0.93763 4.07589,-1.76785 -0.27407,-2.23609 -4.01852,0.0591 -3.04464,-3.97769 z m -12.22776,1.22768 c 0.39602,-0.16372 0.75228,0.41532 0.88393,0.78571 0.53883,1.51597 -0.43813,1.14848 -0.98214,0.49107 -0.37114,-0.44847 -0.53506,-1.01497 0.0982,-1.27678 z m -3.92857,0.88392 c 0.2487,0.0325 0.36901,0.27694 0.0982,0.6384 -0.44885,0.5991 -0.83454,0.67642 -1.03125,0.54018 -0.27703,-0.19189 -0.17981,-0.82076 0.63839,-1.12947 0.0952,-0.036 0.21175,-0.0602 0.29464,-0.049 z m -14.24107,2.50448 c 1.08548,0.10921 1.86815,1.72431 2.25893,2.55357 1.06552,2.26108 -1.86965,2.01775 -2.79911,1.22768 -1.7126,-1.45577 -3.91232,0.59879 -4.51785,-1.17857 -0.53377,-1.5667 2.98909,-2.01156 4.56696,-2.50447 0.16577,-0.0517 0.336,-0.11377 0.49107,-0.0982 z m 9.77232,2.94643 c 0.0566,0.008 0.11912,0.0701 0.24554,0.0982 1.28423,0.28606 0.61364,0.51219 -0.0982,0.58929 -0.66212,0.0716 -1.38219,-0.1243 -0.34375,-0.58929 0.10529,-0.0471 0.13986,-0.10607 0.19643,-0.0982 z m -9.13393,1.81696 c 0.61027,-0.008 1.19548,0.31004 1.76786,0.14724 1.66518,-0.47318 6.33479,2.83761 4.02679,2.75 -2.61769,-0.0995 -1.2103,3.42779 -2.65179,1.03125 -0.81405,-1.35339 0.10183,-2.51018 -1.47321,-2.99553 -1.89948,-0.58533 -2.77604,2.3905 -2.89732,4.27232 -0.12038,1.86749 -2.23148,0.7447 -1.52233,-0.73661 0.78485,-1.63939 0.17583,-4.43865 2.75,-4.46875 z m 9.23215,3.68304 c 0.15384,0.003 0.26331,0.0616 0.34375,0.0982 2.44489,1.11479 -1.91656,1.29916 -2.45536,1.12947 -1.4738,-0.4642 1.03435,-1.24619 2.11161,-1.22767 z m -3.68304,1.86607 c 0.47858,-0.0691 0.87571,-0.011 1.08036,0.14724 0.75749,0.58695 -2.5108,2.16441 -3.38839,1.71875 -1.17642,-0.59741 0.8723,-1.65859 2.30803,-1.86607 z m -33.49105,6.13839 c -0.3716,-1.26965 -1.02602,-2.39284 -2.12149,-3.24726 -1.04533,-0.81532 -0.29361,-2.27303 -0.3674,-3.41522 -0.0379,-0.58608 0.462,2.8826 1.28425,3.44173 0.8681,0.59031 1.61558,4.62484 1.20464,3.22075 z m 5.79511,-4.22323 c 0.18801,1.14436 -1.17766,1.92489 -2.27518,2.041 -1.29429,0.13688 -1.54257,-1.15853 -1.02688,-2.21444 0.58981,-1.20767 -1.83506,-1.7544 -1.22225,-3.00966 0.72835,-1.49195 2.0189,-2.62381 2.85732,-4.06651 0.67306,-1.15818 2.86814,-0.4783 2.64533,0.9041 -0.20817,1.2915 -0.36031,2.56601 -0.61391,3.84978 -0.15337,0.77629 -0.50378,1.64755 -0.36443,2.49573 z"
+             style="fill:url(#radialGradient5808-9-8);fill-opacity:1.0;stroke:url(#radialGradient5810-3-2);stroke-width:3.14285706999999981px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             id="path4779-7" />
+          <path
+             sodipodi:nodetypes="cscccccccccscscsssccsccsscccssssscsccscsccsssss"
+             inkscape:connector-curvature="0"
+             d="m 283.34375,154.125 c -0.97874,-0.0781 -1.51482,1.16264 -2.4375,1.3125 -1.01747,0.16525 -2.38675,0.45829 -3.125,-0.34375 -0.0304,-0.033 -0.0635,-0.0607 -0.0937,-0.0937 -0.76161,-0.005 -1.62035,-0.34408 -2.25,-0.84375 1.47543,3.10462 5.80531,0.70538 5.28125,2.9375 2.3324,-0.64943 0.62979,5.72185 1.34375,6.21875 -1.20369,0.77936 -0.95421,3.52515 -1.625,5.34375 -0.12429,0.61242 -0.22032,1.21666 -0.1875,1.84375 0.017,0.32432 0.33222,0.93464 0.25,1.15625 -0.34631,0.93334 0.86363,1.62322 0.9375,0.3125 0.061,-1.08184 0.46037,-3.30845 0.75,-4.3125 0.25022,-0.86743 -0.0909,-0.93604 0.78125,-1.375 0.88418,-0.445 1.46286,0.87259 2.34375,0.15625 0.76187,-0.61954 1.29701,-1.89435 0.18745,-2.40625 -0.77107,-0.35576 -2.35267,-0.29235 -2,-1.625 0.29565,-1.11718 0.36058,-2.289 0.46875,-3.4375 0.1003,-1.06502 0.73282,-1.85259 1,-2.84375 0.27238,-1.01046 -0.73987,-1.92933 -1.625,-2 z m 4.5,1.6875 c -0.92615,0.62334 -1.3879,1.26674 -1.125,2.0625 0.19011,0.52936 0.78004,0.91815 0.75,1.53125 -0.0247,0.50336 -0.30061,0.93535 -0.4375,1.40625 -0.1491,0.51292 -0.43288,0.75425 -0.8125,1.1875 -0.25015,0.28549 0.27417,0.65211 0.625,0.5625 0.26165,-0.0668 0.79716,-0.30948 0.75,0.15625 -0.0312,0.30799 0.16754,0.57969 0.4375,0.34375 0.35944,-0.31416 0.52076,-0.81085 0.75,-1.21875 0.45335,-0.80669 1.01742,-1.70698 0.65625,-2.6875 -0.25676,-0.69705 -0.96231,-0.95444 -1.375,-1.5625 -0.22257,-0.32793 0.10115,-0.72005 0.21875,-1.0625 0.10062,-0.293 -0.19437,-0.88239 -0.4375,-0.71875 z m -3.46875,12.40625 c -0.26433,0.72861 -0.18253,1.27808 -0.40625,2.0625 -0.2382,0.83519 -0.0314,1.91968 -0.40625,2.78125 -0.15008,0.34499 0.0346,0.82025 0.3125,1.09375 0.47316,0.46575 0.49237,0.0312 1.4375,0.0312 0.56112,0 -0.0359,-1.14107 -0.0937,-1.8125 -0.1129,-1.31006 -0.0171,-2.64147 -0.25,-4.03125 -0.11368,-0.67839 -0.56589,-0.2018 -0.59375,-0.125 z m -3.30764,17.06219 c 0.38771,-0.30068 0.58146,-1.18096 1.0234,-1.51241 0.44194,-0.33146 0.20044,-1.80688 -0.75065,-1.34663 -0.52059,0.25192 -1.11213,1.4923 -1.4609,2.01935 -0.35198,0.53189 0.49275,1.37898 1.18815,0.83969 z"
+             style="color:#000000;fill:#b2b5aa;fill-opacity:1;fill-rule:nonzero;stroke:#7b7e69;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             transform="matrix(1.5714285,0,0,1.5714285,-109.89999,-144.62854)"
+             id="path4597-1" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 357.69851,115.09908 c 0.39154,1.88687 3.24931,2.52915 3.78125,1.08035 0.6669,-1.81635 2.01522,-1.39603 3.14286,-0.78571 0.43544,0.23568 0.70749,0.64349 0.87943,1.07791 1.58462,-1.11158 2.98296,-2.19454 3.98184,-3.48419 -0.44832,-5.46137 4.52541,-2.10496 5.45089,1.375 -1.33351,2.97123 -6.17168,3.61798 -0.19643,4.22322 1.53664,2.78411 6.29789,3.44509 3.97768,0.93303 4.84108,1.61966 -4.64455,-7.48199 1.96428,-3.14286 1.65516,-3.40275 -4.31344,-3.76366 -4.41964,-7.07142 -3.08474,-1.45969 -4.70008,-5.43842 -4.95982,-2.16072 -1.1047,-3.92052 -3.52578,2.02282 -2.89732,-2.20982 -4.77543,1.64254 2.34731,7.83145 -2.55357,7.85714 -1.60657,-1.66161 -1.21217,-6.65605 0.39286,-8.69196 -3.42149,-0.12304 -4.12944,11.68885 -4.27233,6.58036 0.51331,-2.0603 -5.16003,2.25053 -5.20535,-2.60268 3.35704,4.51195 5.54676,-7.53791 2.65178,-4.27232 -1.9953,1.26973 -1.89888,-9.182222 -6.58035,-3.3884 -0.54746,3.0228 5.064,0.50563 1.17857,3.29018 3.65637,1.83727 -3.30607,1.55903 0.63839,4.07589 1.33345,1.14511 1.21725,2.09553 0.59163,2.26945 0.4553,1.79775 2.06895,3.19502 2.45335,5.04755 z m 23.66931,9.2813 c -0.11519,0.20859 -0.1874,0.364 -0.29465,0.54018 0.32299,1.16373 0.7791,2.30787 0.58929,3.53571 -0.25492,1.64901 1.11215,1.69986 2.01339,2.40625 0.45476,0.35642 2.6442,1.41974 2.11161,0.24554 -0.32636,-0.71955 -0.65934,-1.42716 -0.93304,-2.16072 -1.41183,-1.34764 -3.02904,-2.87997 -3.4866,-4.56696 z m -7.26786,-3.09375 c -0.27294,-0.0197 -0.56901,-0.0178 -0.88393,0.049 -1.56568,-0.0528 -2.16991,0.69768 -2.35714,1.81696 0.72183,0.35517 1.4475,0.7414 2.16071,1.12946 1.44477,0.78606 3.21987,1.25686 4.86161,0.93304 -0.84923,-1.53984 -1.78027,-3.78479 -3.78125,-3.92857 z"
+             style="color:#000000;fill:#b2b5aa;fill-opacity:1;fill-rule:nonzero;stroke:#7b7e69;stroke-width:3.14285707;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4748-3" />
+        </g>
+        <path
+           inkscape:connector-curvature="0"
+           d="m 177.1312,85.094585 c -0.0523,1.41251 0.56056,2.139547 1.31037,2.455923 1.36391,0.575489 3.18108,-0.207916 2.27295,-0.696284 -0.38733,-0.208277 -1.27039,-0.362906 -2.89582,-0.335532 0.8921,-0.716775 0.25354,-1.41647 -0.6875,-1.424107 z m 6.92411,-8.397321 c -1.06904,1.18162 -4.2218,0.954926 -6.48214,0.638393 -2.70746,-0.379154 -4.15351,-0.893876 0.78571,0.638393 0.55359,-0.09633 3.47184,0.374597 5.15625,0.245536 1.1672,-0.08942 1.76063,-0.466259 0.54018,-1.522322 z m -10.95087,14.290178 c -1.41994,4.021553 -4.27922,-2.250317 -5.45089,2.160714 -2.13424,1.609065 -6.15362,6.209264 -3.68304,7.611604 0.1942,1.43274 6.99319,1.83626 6.97321,6.58036 3.54169,-1.80947 -0.17133,4.30113 2.75,1.375 -0.16866,3.927 1.91363,6.72411 4.61608,9.67411 5.8552,5.27448 6.66673,-0.58307 4.125,-5.64732 1.67404,-3.01165 3.39694,-7.76149 2.25892,-9.87054 -2.24316,1.62619 -1.3944,-0.9656 0.0982,-1.22768 -3.93538,-1.65718 -2.92077,-1.691123 -3.73214,-3.781248 -2.81093,-2.561177 -5.54452,-3.147493 -7.95536,-6.875 z m -11.54018,2.700893 c -2.72787,0.275377 -4.15025,3.15854 -0.63839,2.553571 -2.78247,2.330853 -4.99069,-2.50547 -4.37054,2.651786 4.88936,-0.198723 -3.4437,3.425128 3.48661,2.897318 -0.29753,-2.288248 6.73333,-7.241077 2.75,-8.053568 -0.43249,-0.08517 -0.83798,-0.08847 -1.22768,-0.04903 z m -2.79911,4.272321 c 1.70802,1.46289 -1.19381,0.680602 0,0 z m -10.60714,0.392857 c -4.53014,1.748627 3.6482,4.543987 1.81697,0.638393 -2.01082,2.730044 -0.49186,-0.29205 -1.81697,-0.638393 z m 4.91072,1.767857 c -3.59625,2.54419 2.07543,2.47696 0,0 z m 1.52232,0 c -2.21344,4.54506 9.73761,3.82929 1.96428,2.20982 -0.73002,-0.63625 -1.00383,-1.71997 -1.96428,-2.20982 z m -3.68304,3.4375 c -4.92338,3.53713 3.90858,3.89772 0,0 z m 3.68304,12.42411 c -1.86754,2.23683 -0.5839,3.15678 0.7512,3.18797 1.66158,0.0388 3.40288,-1.29891 -0.7512,-3.18797 z"
+           style="color:#000000;fill:#e8e8e8;fill-opacity:1;fill-rule:nonzero;stroke:#b8b8b8;stroke-width:3.14285707;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path17447-3" />
+        <g
+           transform="translate(-212.14287,0)"
+           id="g5732-3">
+          <path
+             sodipodi:nodetypes="cccccccccc"
+             style="color:#000000;fill:#4c7019;fill-opacity:1;fill-rule:nonzero;stroke:#184402;stroke-width:3.14285707;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 444.86339,99.974127 c 3.60614,4.935743 4.17178,12.349853 4.37053,17.187503 -1.39968,6.49458 -6.16083,-5.16391 -5.5,3.19196 -0.42439,7.51588 -4.80354,12.46603 -1.375,19.79018 1.35038,6.67543 -1.84393,15.02064 2.7009,20.87053 -0.81938,5.84275 3.5598,10.26123 9.13392,9.33036 3.72693,-3.21154 5.7028,-18.02972 7.66072,-14.73214 0.51774,-2.39025 0.1815,-14.4592 -1.03125,-19.79018 -2.11345,-13.25134 -7.54579,-25.75052 -15.37753,-36.52144 z"
+             id="path5721-8"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="ccccccccccccccccccccccccccccccccsccccccccccccccccscc"
+             id="path17449-5"
+             style="color:#000000;fill:url(#radialGradient5812-0-8);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#radialGradient5814-0-2);stroke-width:3.14285706999999981;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 341.83658,69.085736 c 1.64324,0.903901 -6.33819,1.827288 0.39285,1.03125 3.6301,-1.716676 10.22336,-3.657123 3.53572,1.178571 -5.20427,-0.05201 -5.56613,11.172448 -8.39732,4.8125 -4.11509,-3.619958 -8.77841,3.832667 -1.81697,1.866071 1.26079,1.487028 -2.80311,9.405911 2.65179,6.53125 0.89112,1.265393 -3.25528,5.702164 1.57143,3.290179 4.20556,-3.466933 5.93162,-6.218442 8.25,-8.790179 4.75229,-2.908101 10.55838,-4.387491 14.58482,-7.267856 3.3916,1.146922 11.98641,-1.85548 9.37946,1.915178 4.1721,0.66099 11.01603,-0.58641 14.09375,-1.227678 2.61542,2.181252 11.05052,-3.17119 4.8125,0.34375 -5.24401,4.174059 6.03209,-1.998669 5.45089,2.995535 1.74232,-0.322237 8.66742,3.456561 6.77679,4.223214 4.65859,-0.731468 9.46481,6.705961 4.22321,2.553572 -5.41489,-3.59645 -5.83523,7.021771 -0.049,8.348213 5.21518,1.900423 7.30963,10.650044 12.91518,9.477674 -3.18778,-6.375972 7.75351,3.696 3.14286,-2.946424 -3.10175,-4.19771 -11.8726,-4.81107 -12.81697,-9.477678 2.12359,2.381311 9.12615,5.264584 6.92411,0.785714 2.38835,3.745799 7.41221,4.273547 8.20089,9.477678 2.91747,6.57811 -7.43975,-1.186978 -2.01339,3.78125 3.84933,2.76245 5.99211,9.86329 5.25447,13.84821 2.63679,0.17935 9.57034,3.37928 4.02678,7.46429 -0.489,4.50247 6.93259,12.04681 7.95536,4.8125 0.97114,-5.30008 -7.50532,-15.00675 -2.25893,-17.13839 6.55198,-0.95795 3.20062,-4.64518 -1.52232,-2.7009 -4.3928,-5.14097 10.20259,0.0806 6.04018,-2.7991 -1.51766,-1.40323 -5.14477,-6.372114 0.14724,-3.53572 -1.03164,-4.148427 -2.70259,-7.269771 1.57143,-1.964283 L 445.44568,99.3009 C 433.04383,82.244757 414.62525,69.522396 393.84107,65.009843 c -6.46566,-1.480474 -13.10871,-2.245718 -19.74108,-2.209821 -10.97766,0.05942 -22.24895,1.843977 -32.26341,6.285714 z m 91.4866,19.249921 c 3.14525,2.009354 8.526,14.993803 1.71875,7.022321 -2.68446,-3.149159 -1.39147,-3.991539 -4.125,-6.875 1.7576,1.564121 1.20992,1.12288 2.40625,-0.147243 z m -29.16142,16.157063 c -1.26481,1.06934 -1.72065,2.08442 -1.51026,2.80676 0.26218,0.90009 1.55878,1.34566 3.61365,0.87538 0.96625,-1.19556 0.7267,-4.12787 -1.23996,-4.07589 -0.34331,0.0141 -0.60957,0.27799 -0.86343,0.39375 z m 15.01856,1.57061 c -3.64772,0.2184 0.73573,4.32844 3.33929,3.63393 2.63962,4.1512 6.36518,6.77476 4.37053,-0.29464 -1.77216,-2.11143 -6.4339,0.0275 -7.70982,-3.33929 z m 1.76786,4.61608 c -1.06384,1.58458 -0.22894,3.06593 0.84381,3.90333 1.63568,1.27683 3.82432,1.0566 0.67851,-2.57744 -0.44693,-0.49451 -0.79326,-1.2202 -1.52232,-1.32589 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;fill:url(#linearGradient5816-7-6);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient5818-3-7);stroke-width:3.14285706999999981;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 391.92588,64.616986 c 5.76312,4.511069 10.91511,6.256061 13.89732,7.611607 4.58356,2.083447 15.94732,10.575132 18.16965,15.714285 0.86051,1.989963 0.92297,4.661423 0.49107,7.267857 0.56667,0.810495 0.99264,1.768658 1.17857,2.995535 1.73603,3.9143 -1.20783,2.74796 -2.75,2.20982 -0.0955,0.20278 -0.19393,0.39836 -0.29464,0.58929 0.25505,0.26375 0.52554,0.51913 1.03125,0.98214 3.84932,2.76245 5.9921,9.86329 5.25446,13.84821 2.63679,0.17935 9.57034,3.37928 4.02679,7.46429 -0.489,4.50247 6.93259,12.04681 7.95535,4.8125 0.97114,-5.30008 -7.50531,-15.00675 -2.25893,-17.13839 6.55198,-0.95795 3.20063,-4.64518 -1.52232,-2.7009 -4.3928,-5.14097 10.2026,0.0806 6.04018,-2.7991 -1.51765,-1.40323 -5.14468,-6.372114 0.14724,-3.53572 -1.03164,-4.148427 -2.70259,-7.269771 1.57143,-1.964283 l 0.83049,-0.279038 C 433.29658,82.445141 414.77617,69.555185 393.84098,65.009843 c -0.63715,-0.145828 -1.27476,-0.261517 -1.91518,-0.392857 z m 41.39732,23.718749 c 3.14525,2.009354 8.52601,14.993805 1.71875,7.022321 -2.68445,-3.149158 -1.39147,-3.991538 -4.125,-6.874999 1.7576,1.564121 1.20992,1.122801 2.40625,-0.147243 z m -9.52678,9.772321 c -0.14897,0.472309 -0.31503,0.934969 -0.49107,1.375 1.10535,0.509426 1.71895,0.551634 0.49107,-1.375 z m -4.61607,7.955354 c -3.64773,0.2184 0.73572,4.32844 3.33928,3.63393 2.63962,4.1512 6.36518,6.77476 4.37054,-0.29464 -1.77217,-2.11144 -6.4339,0.0275 -7.70982,-3.33929 z m 1.76785,4.61607 c -1.06384,1.58459 -0.23793,3.04207 0.83482,3.87947 1.63569,1.27683 3.83332,1.08047 0.6875,-2.55357 -0.44693,-0.49452 -0.79325,-1.2202 -1.52232,-1.3259 z"
+             id="path5679-1"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cssccccccccccccccccccccccccccccscc" />
+          <path
+             style="fill:#ccb38f;fill-opacity:1;stroke:#7d6f4a;stroke-width:3.14285707;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 383.43034,63.291093 c 4.16633,1.461775 8.8546,2.435227 13.13195,3.679547 10.80358,3.142857 17.45808,6.796193 22.16273,10.478113 6.52063,5.103135 10.9898,6.634194 14.7455,10.788846 0.93194,1.03092 1.87721,1.914267 2.70089,2.970975 2.63193,3.760067 5.20138,6.988912 7.12046,10.729916 -1.03164,-4.148428 -2.70259,-7.269772 1.57143,-1.964284 3.60614,4.935744 4.17178,12.349854 4.37053,17.187504 -1.39968,6.49457 -6.16083,-5.16391 -5.5,3.19196 -0.42439,7.51587 -4.80354,12.46603 -1.375,19.79018 1.35038,6.67543 -1.84393,15.02064 2.7009,20.87053 -0.39402,2.80968 0.39922,5.30785 1.96428,7.02232 4.36985,-8.06039 8.16238,-7.73856 10.55804,-12.32589 1.8515,-3.54535 3.37763,-7.0017 4.07589,-13.65178 -0.207,-2.38746 -0.46849,-4.62629 -0.83482,-6.23661 -5.46018,-34.23532 -33.07279,-63.450277 -66.98214,-70.812498 -3.42494,-0.784221 -6.91419,-1.352701 -10.41071,-1.71875 z"
+             id="path5677-0"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         transform="matrix(1.4999981,0,0,1.4999981,101.24981,46.249981)"
+         id="g6586-5">
+        <path
+           style="fill:url(#linearGradient6541-9-8);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -45.75,-21.75 2,2 6.5,6 -2.5,2.5 -6,-6.5 -2,-2"
+           id="path7013-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+        <g
+           transform="translate(-58.25,-42.249999)"
+           id="g7039-9">
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             sodipodi:ry="6.5"
+             sodipodi:rx="6.5"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6806-0"
+             style="color:#000000;fill:url(#radialGradient6239-4-6-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:url(#radialGradient6909-0-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path6907-4"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6.5"
+             sodipodi:ry="6.5"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             transform="translate(-421,-119)" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:none;stroke:url(#linearGradient6949-2-8);stroke-width:0.34999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4141-8);enable-background:accumulate"
+             id="path6905-0"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6"
+             sodipodi:ry="6"
+             d="m 434,136 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 3.31371,0 6,2.68629 6,6 z"
+             transform="translate(-421,-119)" />
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             sodipodi:ry="6.5"
+             sodipodi:rx="6.5"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6921-1"
+             style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7637-1-7);enable-background:accumulate"
+             d="m 7,11.5 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,0.25674 0.02846,0.50262 0.0625,0.75 -0.0021,-0.45763 0.06335,-0.91165 0.1875,-1.375 0.75044,-2.8007 3.60555,-4.46919 6.40625,-3.71875 2.8007,0.75044 4.46919,3.6368 3.71875,6.4375 -0.12837,0.4791 -0.32061,0.90642 -0.5625,1.3125 C 12.0553,19.46855 12.5,18.28917 12.5,17 12.5,13.96243 10.03757,11.5 7,11.5 z"
+             id="path7609-3"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7597-1-3);enable-background:accumulate"
+             d="m 7,12 c -1.64808,0 -3.08913,0.83249 -4,2.0625 1.40812,-1.00322 3.2308,-1.41993 5.03125,-0.9375 0.31676,0.08488 0.6163,0.18223 0.90625,0.3125 L 9.1875,12.5 C 8.52925,12.17878 7.78163,12 7,12 z m 3.0625,1.09375 -0.21875,0.875 c 0.94547,0.63904 1.673,1.5097 2.125,2.53125 -0.14086,-1.38702 -0.86841,-2.58673 -1.90625,-3.40625 z"
+             id="path7454-7"
+             inkscape:connector-curvature="0" />
+        </g>
+        <path
+           style="fill:url(#linearGradient10576);fill-opacity:1;stroke:#000000;stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -45.75,-17.75 2,-2 6.5,6 -2.5,2.5 z"
+           id="path7023-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g19673"
+         transform="translate(-11,37.499981)">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient19739);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 47.62494,9.7500668 32.71875,11.875 l 2.75,1.6875 12.15619,-2.312435 z"
+           transform="translate(11,-53.5)"
+           id="path19675" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19677"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           id="path19679"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient19741);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 24.21875,12.84375 -23.84375047,4.406307 0,2.124963 L 26.96875,15.25 z"
+           transform="translate(11,-53.5)"
+           id="path19681" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19683"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssss"
+           inkscape:connector-curvature="0"
+           id="path19685"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           style="color:#000000;fill:url(#radialGradient19743);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path19687"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:url(#linearGradient19745);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           id="path19689"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssss" />
+        <path
+           style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path3471"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path19691"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           style="color:#000000;fill:url(#radialGradient19749);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+      <g
+         transform="translate(0.18746792,-0.18747041)"
+         id="g11872-8">
+        <path
+           id="path11885-7"
+           style="color:#000000;fill:url(#linearGradient11887-44);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,31.062471 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           sodipodi:nodetypes="sccccs"
+           inkscape:connector-curvature="0"
+           d="m 12.937518,26.562475 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           style="color:#000000;fill:url(#linearGradient11883-3);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path11881-63" />
+        <path
+           id="path11109-7-5"
+           style="color:#000000;fill:url(#linearGradient11870-9);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,22.062479 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           transform="matrix(2.9999963,0,0,2.9999963,108.9374,-453.81193)"
+           d="m -29.5,156 c 0,0.62132 -1.119288,1.125 -2.5,1.125 -1.380712,0 -2.5,-0.50368 -2.5,-1.125 0,-0.62132 1.119288,-1.125 2.5,-1.125 1.380712,0 2.5,0.50368 2.5,1.125 z"
+           sodipodi:ry="1.1250012"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099-5-0"
+           style="color:#000000;fill:url(#linearGradient11763-7);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/48x48/viqui.png"
+       inkscape:label="#icon_48"
+       id="icon_48"
+       transform="translate(128,1.9e-5)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8868-6"
+         y="-16"
+         x="0"
+         height="48"
+         width="48" />
+      <g
+         id="g4815">
+        <path
+           transform="matrix(0.05053371,0,0,0.05262996,79.145344,18.489177)"
+           d="m -705.37759,-199.30086 c 0,204.6278058 -172.76485,370.51142 -385.88111,370.51142 -213.1162,0 -385.881,-165.8836142 -385.881,-370.51142 0,-204.6278 172.7648,-370.51141 385.881,-370.51141 213.11626,0 385.88111,165.88361 385.88111,370.51141 z"
+           sodipodi:ry="370.51141"
+           sodipodi:rx="385.88107"
+           sodipodi:cy="-199.30086"
+           sodipodi:cx="-1091.2587"
+           id="path21667-5-2"
+           style="color:#000000;fill:url(#radialGradient4781);fill-opacity:1.0;fill-rule:nonzero;stroke:#000633;stroke-width:19.39067458999999971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.99215686000000003;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <path
+           id="path22086-6-5"
+           d="m 22.039908,18.974838 c 1.12849,-0.378831 0.981792,1.945527 -0.188687,2.078864 -0.605398,1.503795 0.708789,2.900208 2.045799,3.57264 1.88077,0.0713 1.228923,2.135751 0.09081,2.784557 1.336694,0.175094 2.673426,-0.185194 3.96618,-0.485982 1.411279,-0.526137 2.768383,-1.14494 3.956635,-2.108719 1.839077,-0.682552 2.627294,-2.308473 3.717785,-3.770854 1.278047,-1.38771 -0.820068,-1.755519 -1.691098,-0.914652 -1.302857,0.0624 -1.541892,-0.139028 -2.523497,0.371353 0.50606,-0.367303 0.463679,-1.482231 -0.525484,-1.51288 -1.516768,0.7173 -2.591712,-1.067733 -4.029491,-0.711662 -1.391816,0.03307 -2.216751,-0.694835 -3.346354,0.148078 -0.188092,0.244713 -0.67389,0.375836 -1.181064,0.375681"
+           style="color:#000000;fill:url(#radialGradient4810);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient4812);stroke-width:1.00000011999999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path21928-1-8"
+           d="m 22.331448,18.801256 c -0.844567,-2.55e-4 -1.748411,-0.364533 -1.435591,-1.174511 0.620479,-1.596463 -2.39214,-0.677337 -1.439117,-1.930802 0.990092,-0.877255 -0.384434,-1.483065 -0.90286,-0.521805 -2.013242,1.009281 -2.522663,-2.993293 -0.678348,-3.405471 1.207342,0.516947 2.828869,-0.512988 3.548188,1.007789 -0.07819,1.159737 1.021182,1.017657 0.615055,-0.101495 -0.82603,-1.572955 1.888461,-1.66728 1.365057,-3.2490478 0.234633,0.3541185 0.575757,-1.1905465 1.316098,-1.0985384 0.04401,-0.4150916 0.776406,-1.2382423 1.5215,-1.5128796 C 25.759906,7.4474537 26.1727,7.6720301 26.706002,7.1392791 27.436516,7.0447733 26.25263,6.6648851 25.997789,6.194775 26.155277,5.851185 26.187628,5.5863866 26.142278,5.4031116 26.686112,5.2426346 27.257004,5.0893912 27.584961,4.5792059 27.983231,3.6505155 27.104642,3.8240578 27.032028,3.7851541 26.441319,3.6652983 26.132529,2.7459743 25.656221,2.189884 25.382251,2.9111283 24.606607,2.9458854 24.716329,2.0107803 23.686028,0.6559472 23.02057,2.298467 23.348878,3.2502191 22.740639,3.6226584 23.246364,5.7031803 22.53557,4.8454892 22.794441,3.2571534 20.247597,3.3938777 20.570985,1.8459992 21.1382,1.5123324 21.102432,0.49195854 21.805869,0.74626574 c -0.03937,-0.83250763 1.736621,-0.69451971 1.169199,-1.72542213 0.391918,0.0104521 0.762478,-0.12898201 0.734473,0.41314627 1.126519,0.32285892 -0.105489,1.2348602 -0.210193,1.3994432 0.851638,-0.37234877 0.684958,0.55989202 1.502408,0.67703512 0.746395,0.1362048 -0.237755,-1.28845603 -0.05014,-1.41138512 0.342628,0.2277012 0.606253,0.56912896 0.594757,0.01326014 -0.629357,-0.28555899 -0.85556,-1.31557992 -1.310137,-1.26928972 -0.258265,-0.1658778 -0.265284,-0.5793909 -0.807334,-0.4394877 -0.486819,-0.164934 -0.70734,-0.3026177 -1.015128,-0.5003138 -0.197175,-0.1246342 -0.898536,0.135052 -0.732097,0.7152442 -0.105301,1.11150945 -0.447428,0.86878689 -0.981696,0.49195462 0.06296,-0.13934042 0.03862,-0.40935542 -0.01856,-0.49672932 0.510666,-0.8601841 -0.250939,-1.4997419 -0.71538,-1.3910853 0.12889,0.4454239 -0.692314,0.2197498 -0.0585,0.659123 -0.326528,0.015226 -0.560176,0.092337 -0.715361,0.2029907 -0.09806,-0.206499 -0.190703,-0.3946826 -0.27589,-0.5027002 -0.983146,-0.5274414 -1.492437,-1.544518 -1.246826,-2.6997796 -0.186684,-0.2406131 -0.357004,-0.3265937 -0.517128,-0.3319498 -0.01482,-4.995e-4 -0.02934,-8.561e-4 -0.0442,0 l 6.13e-4,-6.12e-5 c -0.459871,0.026595 -0.837061,0.6780508 -1.265938,0.1468643 -0.130183,0.5947185 -0.122383,0.6680445 -0.849132,0.5755397 -1.28813,-0.046502 -0.562126,1.6921672 -1.737675,1.2907841 -0.966672,0.1915468 1.11027,0.2991133 1.193081,0.4788191 1.012711,0.5728727 0.54348,2.11625166 0.32127,3.18934309 5.58e-4,1.27541741 -1.088021,1.74194111 -0.610284,2.88127871 -0.752039,0.07939 -1.756655,2.2813767 -1.789025,3.4186065 0.338192,1.6083962 0.371415,3.3246361 0.751206,4.9482014 0.724294,1.561966 0.08765,-1.002735 -0.0011,-1.5833279 -0.157303,-1.5856121 0.539934,0.1049889 0.563705,0.7510639 0.320323,1.161391 0.769666,2.286201 1.025879,3.503386 0.991577,1.469706 2.958891,1.748076 4.233705,2.831125 1.155343,0.426236 1.625151,2.544241 3.09556,1.992895"
+           style="color:#000000;fill:url(#radialGradient4807);fill-opacity:1.0;fill-rule:nonzero;stroke:#123401;stroke-width:1.00000011999999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient4804);fill-opacity:1.0;fill-rule:nonzero;stroke:#123401;stroke-width:1.00000011999999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 39.468588,-3.4155119 c -0.306382,-0.3819839 -0.897511,-0.8309189 -0.346639,-0.07347 0.349165,0.5720484 -0.0221,0.8982483 -0.483348,0.6030591 -0.112913,0.6045467 1.600823,1.4460607 0.184418,1.0287971 -0.583317,-0.4126562 -1.720255,0.3268257 -0.554309,0.4577255 0.69018,-0.2925798 0.769108,0.069086 1.022111,0.54409551 C 37.311641,-1.5525663 37.949669,1.066744 38.604877,1.9793663 39.502296,3.1916094 37.622695,4.5261513 37.204166,2.8079022 36.499613,1.9517478 38.272871,0.90353384 36.768455,0.40663826 35.658966,0.64567919 36.441539,-1.3050355 35.534611,-1.8835449 c 0.38915,-0.6358339 -1.872765,-1.718238 -0.49943,-1.1043088 1.057918,0.2233006 -0.065,-2.1309255 -0.970108,-2.1064297 -0.343129,-0.5354196 -0.664475,-0.8902013 -0.51982,0.016343 -0.569277,-0.2200841 -2.201447,-1.0633105 -0.859811,-0.108272 0.53711,0.5326299 2.68091,1.1105934 2.149482,1.7312916 -0.429079,-0.210033 -1.337754,-0.2348316 -0.619087,0.3934031 -1.381228,0.06773 -1.636533,-1.6586141 -2.818267,-2.1332601 -0.908153,-0.4026701 -1.396958,-1.6842519 -0.420034,-2.1611137 0.100466,0.3859057 0.859756,1.0893775 0.901598,0.3862436 -0.643006,-0.5481504 -1.382121,-0.5258328 -1.650091,-1.0013129 -0.646647,-0.2296875 -1.618408,-1.0410246 -2.011998,-0.9865225 -0.451754,0.3162697 -0.630805,-0.00298 -0.916863,-0.1093866 -1.029743,-0.7325307 -3.177907,0.7775591 -3.669851,-0.2335223 -0.530797,-0.1769498 -2.423157,-0.3842455 -3.010428,0.4359727 -1.134896,0.3650945 -2.347755,0.738908 -2.986397,1.8294686 -0.42271,0.3125665 -1.597237,1.9327505 -1.679899,0.9663315 0.745707,-0.5261597 0.174573,-0.804395 -0.425254,-0.4883128 -0.441615,-0.484788 0.767734,-1.9502747 -0.572936,-1.3318755 -0.823299,-0.8438486 1.294835,-1.1037185 1.275985,-0.093656 0.490644,-0.5558559 0.898032,-1.4054913 1.783268,-1.7055871 1.180749,-1.3194062 -1.279716,0.2522277 -1.689203,-0.059559 1.08867,-0.3185812 1.990195,-1.1494012 3.233417,-1.2209232 7.247162,-1.805975 15.367437,1.104509 19.882126,7.0399173 0.158355,0.2081884 0.126625,0.6365892 0.02758,0.5131033 z"
+           id="path4421-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="scccccccccccccccccccccccccccccccss" />
+        <path
+           style="color:#000000;fill:#ccb38f;fill-opacity:1;fill-rule:nonzero;stroke:#7d6f4a;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 39.44101,-3.9286152 c 0.764241,0.9557256 1.17941,2.1288939 1.939939,3.0823673 1.671745,3.2808918 2.394034,7.0433816 2.025014,10.7089119 0.08024,-0.5139809 -0.110495,-1.8598127 -0.257828,-0.5887134 -0.880613,0.8362954 -0.460373,2.7476274 -1.86207,3.1391234 l -0.27278,-0.01341 C 39.644722,11.971389 39.700121,10.378443 39.263464,9.1901359 39.012135,7.9628962 39.406471,6.7006314 38.98723,5.4813323 38.524424,4.0231514 39.447399,2.6990179 39.321631,1.2240591 c -0.05275,-1.41295926 1.261442,0.6698324 1.372854,-0.80632134 -0.195746,-1.32244405 -0.23202,-2.72222596 -1.225897,-3.83325126 -0.266246,-0.2976299 -0.142812,-0.657206 -0.02758,-0.5131017 z"
+           id="path21878-1-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="scccccccccss" />
+        <path
+           id="path21822-5-8"
+           d="M 28.668393,1.3049489 C 28.24195,1.2037664 27.621601,1.0420506 27.340817,0.53740331 27.544603,0.02866718 27.077007,0.63959982 26.971556,-0.07263077 26.499353,0.08304302 26.945551,-0.95262524 26.598212,-0.70780446 26.946484,-1.4706548 26.147254,-1.1971855 26.43998,-1.57761 c -0.517127,0.064982 -0.555571,-0.5891954 -1.138406,-1.0582514 -0.825712,-0.107028 -1.004428,-0.250159 -0.855111,-0.5014674 -0.519543,-0.1522495 0.498053,-1.3729574 0.374997,-1.1476345 -0.144115,-0.2770281 0.757389,-0.1210492 0.415616,-0.5017067 0.219444,-0.6219126 0.988011,-0.2407112 0.909324,-0.1325263 0.38848,0.4427402 0.131307,-0.6086357 0.517629,0.03783 0.04904,0.06175 0.937497,0.8073498 0.913225,0.7489035 0.569164,0.3066626 0.616151,0.5120881 0.883248,0.7493174 -0.597432,0.2726081 0.171231,0.327201 0.695712,0.6207948 -0.951184,0.3642421 -0.243306,0.1706912 0.11644,0.4326225 -0.57808,0.7683218 -0.177545,1.1944531 -0.715622,1.92042576 0.144302,0.50350073 0.10641,1.02872465 0.384209,1.62101664 0.112541,0.019141 -0.308399,0.3184925 -0.272834,0.093226 z"
+           style="color:#000000;fill:#e8e8e8;fill-opacity:1;fill-rule:nonzero;stroke:#b8b8b8;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#958166;fill-opacity:1;fill-rule:nonzero;stroke:#685939;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 21.70872,21.725105 c -0.06786,1.243127 1.054276,2.351923 2.193777,2.925025 1.645679,0.0624 1.349012,1.606752 0.487506,2.437522 0.84731,0.02386 1.788313,0.07613 2.193777,-0.828758 0.521,-0.249742 0.58443,-0.888319 0.78001,-1.365012 -0.173147,-0.705594 -1.348745,0.03089 -1.657521,-0.731256 -0.509049,-0.150074 -1.087864,-0.130573 -1.60877,-0.243753 -0.528955,0.0094 -1.036882,-0.07379 -1.316265,-0.585004 -0.21246,-0.436493 -0.458819,-0.879021 -0.682509,-1.316262 -0.08861,-0.173286 -0.225502,-0.245343 -0.390005,-0.292502 z"
+           id="path17044-5-6-4"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#radialGradient4796);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient4798);stroke-width:1.00000011999999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 16.833667,1.298678 c -0.330146,0.013104 -0.772505,0.6043119 -0.877511,0.8775078 -0.493699,1.2845841 0.33425,0.7683646 0.146174,1.4625131 -0.448131,1.654649 -0.871099,2.0381378 -1.267516,2.4862721 -0.310662,0.3511997 -0.935652,0.3447132 -0.487506,0 0.448131,-0.3447162 0.493418,-1.4876028 0.390005,-1.9012669 -0.02824,-0.1125395 -0.93258,-0.5611043 -0.390005,-0.9750088 0.370224,-0.2824311 0.17544,-0.7534149 -0.243752,-1.0237591 -0.07161,0.2656064 -0.09781,0.5280725 0.04868,0.8775079 -0.752038,0.07939 -1.771403,2.2753005 -1.803773,3.4125303 0.338197,1.6083963 0.400224,3.3489787 0.78001,4.9725446 0.724302,1.561966 0.08877,-1.028171 0,-1.6087645 -0.157297,-1.5856122 0.512482,0.1339275 0.536257,0.7800065 0.211834,0.768069 0.450986,1.517902 0.682508,2.291271 -0.0869,-0.523455 -0.23979,-1.116877 -0.292504,-1.511263 -0.08362,-0.625423 -0.507225,-2.7850076 0.04868,-2.1937701 0.508957,0.5411953 0.327526,1.5193591 0.438756,2.3400211 0.136346,1.005594 0.882128,1.529696 1.121264,2.437522 0.128702,0.48858 0.389786,1.034569 0.633757,1.413762 0.0062,0.01092 -0.0062,0.03853 0,0.04867 0.188934,0.104366 0.389912,0.196329 0.585008,0.292503 0.01248,-0.01935 0.03869,-0.02277 0.04868,-0.04867 0.28748,-0.743642 -0.940207,-1.164799 -0.877511,-2.096268 0.02762,-0.409007 0.293518,-0.616364 0.585008,-0.780007 0.107797,-0.407488 0.304064,-0.773718 0.585007,-1.023759 -0.0062,-0.0255 0.0078,-0.02175 0,-0.04875 C 17.061032,11.262598 17.055275,10.659402 17.418386,10.22001 17.956939,9.5682921 18.22598,8.6985796 18.442136,7.8799857 18.656643,7.0676125 19.043637,5.7384214 19.124634,4.5162066 18.98158,4.1172596 18.811303,3.6749957 18.637128,3.1999449 18.346715,2.4078712 17.485209,1.936279 17.028358,1.3961789 16.968609,1.3254946 16.909485,1.2956359 16.833355,1.298678 z"
+           id="path4686-72" />
+      </g>
+      <g
+         transform="matrix(1.0000012,0,0,1.0000012,-0.93753393,-3.8125254)"
+         id="g11872-9-1">
+        <path
+           style="color:#000000;fill:url(#linearGradient4310);fill-opacity:1.0;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875000000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.437531,25.812475 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+           id="path4308"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cssscc" />
+        <path
+           sodipodi:nodetypes="cssscc"
+           inkscape:connector-curvature="0"
+           id="path4304"
+           d="m 5.437531,21.812479 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+           style="color:#000000;fill:url(#linearGradient4306);fill-opacity:1.0;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875000000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#linearGradient4302);fill-opacity:1.0;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875000000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.437531,17.812483 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+           id="path11109-7-8-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cssscc" />
+        <path
+           transform="matrix(2.9999963,0,0,2.9999963,108.9374,-450.18693)"
+           d="m -29.5,156 c 0,0.64433 -1.119288,1.16667 -2.5,1.16667 -1.380712,0 -2.5,-0.52234 -2.5,-1.16667 0,-0.64433 1.119288,-1.16667 2.5,-1.16667 1.380712,0 2.5,0.52234 2.5,1.16667 z"
+           sodipodi:ry="1.1666679"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099-5-5-4"
+           style="color:#000000;fill:url(#linearGradient4214);fill-opacity:1.0;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.33333333999999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         transform="matrix(1.5,0,0,1.5,100.875,45.87498)"
+         id="g6586-3"
+         inkscape:transform-center-x="-5.625"
+         inkscape:transform-center-y="5.6249995">
+        <path
+           style="fill:url(#linearGradient6541-9-1);fill-opacity:1.0;stroke:#4b4b3c;stroke-width:0.66666669000000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -45.916666,-21.916666 2,2 6.666666,6.333333 -2.333333,2.333334 -6.333333,-6.666667 -2,-2"
+           id="path7013-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+        <g
+           transform="translate(-58.25,-42.249999)"
+           id="g7039-0">
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.33333,136 c 0,3.4978 -2.83553,6.33333 -6.33333,6.33333 -3.4978,0 -6.33333,-2.83553 -6.33333,-6.33333 0,-3.4978 2.83553,-6.33333 6.33333,-6.33333 3.4978,0 6.33333,2.83553 6.33333,6.33333 z"
+             sodipodi:ry="6.3333335"
+             sodipodi:rx="6.3333335"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6806-3"
+             style="color:#000000;fill:url(#radialGradient6239-4-6-0);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:url(#radialGradient6909-0-8);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path6907-9"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6.3333335"
+             sodipodi:ry="6.3333335"
+             d="m 434.33333,136 c 0,3.4978 -2.83553,6.33333 -6.33333,6.33333 -3.4978,0 -6.33333,-2.83553 -6.33333,-6.33333 0,-3.4978 2.83553,-6.33333 6.33333,-6.33333 3.4978,0 6.33333,2.83553 6.33333,6.33333 z"
+             transform="translate(-421,-119)" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:none;stroke:url(#linearGradient6949-2-7);stroke-width:0.66666667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4141-2);enable-background:accumulate"
+             id="path6905-1"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6"
+             sodipodi:ry="6.0000005"
+             d="m 434,136 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 3.31371,0 6,2.68629 6,6 z"
+             transform="translate(-421,-119)" />
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.33333,136 c 0,3.4978 -2.83553,6.33333 -6.33333,6.33333 -3.4978,0 -6.33333,-2.83553 -6.33333,-6.33333 0,-3.4978 2.83553,-6.33333 6.33333,-6.33333 3.4978,0 6.33333,2.83553 6.33333,6.33333 z"
+             sodipodi:ry="6.3333335"
+             sodipodi:rx="6.3333335"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6921-9"
+             style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:0.66666669;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:1.04999995;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7487);enable-background:accumulate"
+             d="m 272,88 c -4.41828,0 -8,3.581722 -8,8 0,0.702506 0.11119,1.382076 0.28125,2.03125 -0.0265,-0.260532 -0.0312,-0.513737 -0.0312,-0.78125 0,-4.280207 3.46979,-7.75 7.75,-7.75 4.28021,0 7.75,3.469793 7.75,7.75 0,0.267513 -0.005,0.520718 -0.0312,0.78125 C 279.88881,97.382076 280,96.702506 280,96 c 0,-4.418278 -3.58172,-8 -8,-8 z"
+             transform="matrix(0.64395055,0.17254603,-0.17254603,0.64395055,-151.59011,-91.751773)"
+             id="path6694"
+             inkscape:connector-curvature="0"
+             inkscape:transform-center-y="-2.0210812"
+             inkscape:transform-center-x="-0.010254471" />
+          <path
+             style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7498);enable-background:accumulate"
+             d="m 6.9999997,12 c -1.6480793,0 -3.0891293,0.83249 -3.9999996,2.0625 1.4081203,-1.00322 3.2308003,-1.41993 5.0312496,-0.9375 0.31676,0.08488 0.6163,0.18223 0.90625,0.3125 l 0.25,-0.9375 c -0.65825,-0.32122 -1.40587,-0.5 -2.1875,-0.5 z m 3.0625003,1.09375 -0.2187503,0.875 C 10.78922,14.60779 11.51675,15.47845 11.96875,16.5 11.82789,15.11298 11.10034,13.91327 10.0625,13.09375 z"
+             id="path7454-9"
+             inkscape:connector-curvature="0"
+             inkscape:transform-center-x="-0.7265625"
+             inkscape:transform-center-y="-4.1249995" />
+        </g>
+        <path
+           style="fill:url(#linearGradient6599);fill-opacity:1.0;stroke:#000000;stroke-width:0.66666669000000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -45.916666,-17.916666 2,-2 6.666666,6.333333 -2.333333,2.333334 z"
+           id="path7023-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g14257"
+         transform="translate(-11,37.499981)">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient14137-8);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.5,9.90625 -14.78125,1.96875 2.75,1.6875 12.03125,-2.15625 0,-1.5 z"
+           transform="translate(11,-53.5)"
+           id="path13921" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path13923"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           id="path14216"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient14317-7);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 24.21875,12.84375 0.5,17.0625 l 0,2.125 26.46875,-3.9375 -2.75,-2.40625 z"
+           transform="translate(11,-53.5)"
+           id="path13919" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path13925"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssss"
+           inkscape:connector-curvature="0"
+           id="path13929"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           style="color:#000000;fill:url(#radialGradient14200-4);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path13927"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:url(#linearGradient14133-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient14210-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           id="path14202"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssss" />
+        <path
+           style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path3469"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path13948"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           style="color:#000000;fill:url(#radialGradient14399);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.6666675,0,0,0.6666675,176,10.66664)"
+       id="icon_32"
+       inkscape:label="#icon_32"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/viqui.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="48"
+         height="48"
+         x="0"
+         y="-16"
+         id="rect19757"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g4617">
+        <path
+           transform="matrix(0.04858944,0,0,0.05060521,77.014324,18.073145)"
+           d="m -705.56406,-199.30086 c 0,204.4927179 -172.68136,370.26682 -385.69464,370.26682 -213.0132,0 -385.6946,-165.7741021 -385.6946,-370.26682 0,-204.49271 172.6814,-370.26681 385.6946,-370.26681 213.01328,0 385.69464,165.7741 385.69464,370.26681 z"
+           sodipodi:ry="370.26682"
+           sodipodi:rx="385.69461"
+           sodipodi:cy="-199.30086"
+           sodipodi:cx="-1091.2587"
+           id="path21667-5"
+           style="color:#000000;fill:url(#radialGradient7682-5);fill-opacity:1;fill-rule:nonzero;stroke:#000633;stroke-width:30.24977534;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.99215686000000003;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none"
+           sodipodi:type="arc" />
+        <path
+           id="path22086-6"
+           d="m 22.115289,18.527426 c 1.085072,-0.364257 0.944018,1.87068 -0.181427,1.998888 -0.582106,1.445941 0.681518,2.788633 1.967087,3.435195 1.808408,0.06856 1.181641,2.053586 0.08731,2.677432 1.285265,0.168357 2.570567,-0.17807 3.813582,-0.467286 1.356981,-0.505896 2.661871,-1.100893 3.804405,-2.027593 1.768319,-0.656294 2.52621,-2.219664 3.574744,-3.625785 1.228874,-1.334323 -0.788517,-1.687982 -1.626034,-0.879464 -1.252729,0.06 -1.482568,-0.13368 -2.426406,0.357066 0.486589,-0.353172 0.445839,-1.425207 -0.505266,-1.454677 -1.45841,0.689705 -2.491997,-1.026656 -3.874458,-0.684283 -1.338265,0.0318 -2.131461,-0.668105 -3.217603,0.14238 -0.180856,0.235299 -0.647963,0.361378 -1.135623,0.361229"
+           style="color:#000000;fill:url(#radialGradient4612);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4614);stroke-width:1.49999809;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path21928-1"
+           d="m 22.395612,18.360522 c -0.812072,-2.46e-4 -1.681141,-0.350509 -1.380357,-1.129326 0.596606,-1.535045 -2.300103,-0.651279 -1.383747,-1.856522 0.951998,-0.843506 -0.369643,-1.426009 -0.868123,-0.50173 -1.935783,0.970453 -2.425604,-2.878137 -0.652249,-3.274458 1.16089,0.497059 2.72003,-0.493253 3.411672,0.969018 -0.07518,1.11512 0.981893,0.978506 0.591392,-0.09759 -0.794249,-1.512442 1.815802,-1.603138 1.312536,-3.1240531 0.225606,0.340495 0.553606,-1.1447446 1.265462,-1.0562762 0.04231,-0.3991225 0.746534,-1.1906055 1.462961,-1.4546772 -0.462998,0.6086078 -0.06608,0.8245445 0.446697,0.3122891 0.702408,-0.09087 -0.435928,-0.4561434 -0.680964,-0.9081678 0.151428,-0.3303716 0.182535,-0.5849828 0.13893,-0.761207 0.52291,-0.1543033 1.071837,-0.3016512 1.387176,-0.792209 C 27.829945,3.7926504 26.985159,3.9595162 26.915339,3.9221092 26.347357,3.8068644 26.050447,2.922908 25.592465,2.3882112 25.329037,3.0817083 24.583235,3.1151283 24.688736,2.2159979 23.698075,0.91328704 23.05822,2.492617 23.373897,3.4077539 c -0.584837,0.358111 -0.09857,2.3585925 -0.782016,1.533898 0.248911,-1.5272305 -2.199944,-1.3957662 -1.888999,-2.8840958 0.545392,-0.3208301 0.511,-1.30194886 1.187373,-1.0574252 -0.03786,-0.80047995 1.669804,-0.66780062 1.124214,-1.65904286 0.37684,0.01005 0.733142,-0.12401985 0.706214,0.39725199 1.083177,0.31043811 -0.10143,1.1873535 -0.202106,1.34560477 0.818872,-0.35802402 0.658605,0.5383523 1.444604,0.6509887 0.717677,0.1309648 -0.228607,-1.23888743 -0.04821,-1.35708728 0.329446,0.21894123 0.582928,0.54723381 0.571875,0.01275 -0.605143,-0.27457316 -0.822643,-1.2649679 -1.25973,-1.22045846 -0.248328,-0.1594963 -0.255078,-0.55710096 -0.776273,-0.42257996 -0.468088,-0.1585888 -0.680124,-0.2909757 -0.97607,-0.4810662 -0.189589,-0.1198393 -0.863965,0.1298564 -0.70393,0.6877279 -0.10125,1.06874818 -0.430213,0.83536348 -0.943926,0.47302844 0.06054,-0.13397983 0.03714,-0.393607 -0.01785,-0.47761954 0.491017,-0.8270916 -0.241285,-1.4420447 -0.687856,-1.3375684 0.12393,0.4282879 -0.665678,0.2112958 -0.05625,0.6337657 -0.313964,0.01464 -0.538623,0.088785 -0.687837,0.1951814 -0.09429,-0.1985547 -0.183366,-0.3794986 -0.265276,-0.4833607 -0.94532,-0.50715 -1.435016,-1.4850983 -1.198854,-2.5959155 -0.179501,-0.2313564 -0.343269,-0.3140292 -0.497232,-0.3191792 -0.01425,-4.804e-4 -0.02821,-8.232e-4 -0.0425,0 l 5.9e-4,-5.89e-5 c -0.442177,0.025572 -0.804856,0.6519653 -1.217231,0.1412143 -0.125175,0.5718389 -0.117675,0.6423439 -0.816462,0.5533979 -1.23857,-0.044713 -0.540499,1.6270673 -1.670818,1.2411259 -0.929481,0.1841778 1.067552,0.287606 1.147176,0.4603983 0.973748,0.5508336 0.522571,2.03483668 0.30891,3.06664487 5.37e-4,1.22635043 -1.046159,1.67492633 -0.586803,2.77043203 -0.723105,0.076335 -1.689068,2.1936092 -1.720193,3.2870883 0.325179,1.546519 0.357124,3.1967329 0.722303,4.7578376 0.696427,1.501875 0.08428,-0.964158 -0.0011,-1.5224152 -0.151251,-1.5246116 0.51916,0.1009499 0.542017,0.7221692 0.307999,1.116711 0.740053,2.198248 0.986409,3.368606 0.953426,1.413165 2.845048,1.680826 4.070814,2.722209 1.110891,0.409837 1.562623,2.446359 2.976459,1.916225"
+           style="color:#000000;fill:url(#radialGradient4609);fill-opacity:1;fill-rule:nonzero;stroke:#123401;stroke-width:1.49999809;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient4606);fill-opacity:1;fill-rule:nonzero;stroke:#123401;stroke-width:1.49999809;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 38.873406,-3.0015377 c -0.294594,-0.3672884 -0.86298,-0.7989524 -0.333303,-0.070643 0.335732,0.5500409 -0.02125,0.8636915 -0.46475,0.5798586 -0.10857,0.581289 1.539231,1.3904289 0.177322,0.9892179 -0.560874,-0.3967807 -1.654069,0.3142524 -0.532982,0.4401162 0.663625,-0.2813239 0.739517,0.0664289 0.982785,0.52316349 C 36.799446,-1.2102621 37.412927,1.30828 38.042925,2.1857924 38.905817,3.351399 37.098533,4.6345993 36.696106,2.9824534 36.018661,2.1592365 37.723694,1.1513487 36.27716,0.67356935 35.210358,0.90341406 35.962822,-0.97225407 35.090787,-1.5285074 35.464965,-2.13988 33.290076,-3.1806425 34.610573,-2.590332 c 1.017214,0.2147099 -0.0625,-2.048946 -0.932784,-2.0253926 -0.329927,-0.5148213 -0.638909,-0.8559541 -0.49982,0.015714 -0.547374,-0.2116172 -2.116747,-1.0224035 -0.82673,-0.1041067 0.516445,0.5121389 2.577763,1.0678674 2.066781,1.6646866 -0.41257,-0.2019528 -1.286283,-0.2257974 -0.595267,0.3782683 -1.328086,0.065125 -1.573568,-1.594805 -2.709835,-2.0511907 -0.873212,-0.3871789 -1.34321,-1.6194566 -0.403873,-2.0779728 0.0966,0.3710593 0.826676,1.0474677 0.866909,0.3713843 -0.618267,-0.5270624 -1.328944,-0.5056034 -1.586605,-0.9627911 -0.621767,-0.2208511 -1.55614,-1.000975 -1.934586,-0.9485697 -0.434374,0.3041024 -0.606535,-0.00286 -0.881587,-0.1051783 -0.990124,-0.7043493 -3.055638,0.7476454 -3.528655,-0.2245384 -0.510375,-0.1701423 -2.329926,-0.3694631 -2.894603,0.4192002 -1.091231,0.3510488 -2.257426,0.7104813 -2.871496,1.7590865 -0.406446,0.3005417 -1.535784,1.8583951 -1.615266,0.9291555 0.717017,-0.5059177 0.167857,-0.7734489 -0.408892,-0.4695268 -0.424624,-0.4661376 0.738196,-1.875245 -0.550892,-1.2806364 -0.791623,-0.8113846 1.245016,-1.061257 1.226892,-0.090053 0.471766,-0.5344713 0.86348,-1.3514202 1.714657,-1.6399709 1.13532,-1.268647 -1.23048,0.2425242 -1.624212,-0.057267 1.046784,-0.3063256 1.913623,-1.105183 3.109013,-1.173953 6.96833,-1.736497 14.776179,1.0620174 19.117166,6.7690827 0.152263,0.2001792 0.121754,0.6120988 0.02652,0.4933635 z"
+           id="path4421"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="scccccccccccccccccccccccccccccccss" />
+        <path
+           style="color:#000000;fill:#ccb38f;fill-opacity:1;fill-rule:nonzero;stroke:#7d6f4a;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 38.846888,-3.4949012 c 0.734838,0.9189576 1.134034,2.0469926 1.865301,2.96378457 1.607425,3.15467153 2.301924,6.77241343 1.947103,10.29692593 0.07715,-0.4942073 -0.106245,-1.7882632 -0.247909,-0.5660648 -0.846731,0.8041225 -0.44266,2.6419225 -1.790427,3.0183575 l -0.262285,-0.0129 c -1.315908,-0.411793 -1.26264,-1.943456 -1.682497,-3.0860478 -0.24166,-1.1800261 0.137505,-2.39373 -0.265606,-3.566121 -0.445,-1.4020828 0.442464,-2.6752751 0.321535,-4.0934903 -0.05072,-1.35860083 1.212908,0.6440631 1.320033,-0.77530107 -0.188214,-1.27156788 -0.223093,-2.61749833 -1.17873,-3.68578103 -0.256003,-0.2861797 -0.137317,-0.6319224 -0.02652,-0.493362 z"
+           id="path21878-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="scccccccccss" />
+        <path
+           id="path21822-5"
+           d="M 28.488745,1.5373208 C 28.07871,1.4400309 27.482228,1.2845366 27.212247,0.79930369 27.408193,0.31013931 26.958587,0.89756856 26.857194,0.21273843 26.403158,0.36242324 26.832189,-0.6334015 26.498213,-0.39799929 26.833086,-1.1315017 26.064606,-0.8685532 26.34607,-1.2343423 c -0.497231,0.062482 -0.534196,-0.5665283 -1.094606,-1.0175391 -0.793944,-0.1029104 -0.965784,-0.2405349 -0.822212,-0.4821752 -0.499553,-0.1463923 0.478891,-1.320138 0.36057,-1.1034835 -0.13857,-0.2663704 0.728249,-0.1163923 0.399625,-0.4824054 0.211,-0.5979868 0.949998,-0.2314507 0.874338,-0.1274278 0.373534,0.4257074 0.126255,-0.5852208 0.497713,0.036375 0.04715,0.059375 0.901427,0.77629 0.878089,0.7200921 0.547266,0.294865 0.592445,0.4923875 0.849265,0.7204902 -0.574445,0.2621205 0.164643,0.3146132 0.668946,0.5969121 -0.914588,0.3502292 -0.233946,0.1641244 0.111959,0.4159789 -0.555839,0.7387634 -0.170714,1.14850083 -0.688088,1.84654444 0.13875,0.48413039 0.102315,0.98914825 0.369427,1.55865406 0.10821,0.018405 -0.296534,0.3062396 -0.262337,0.08964 z"
+           style="color:#000000;fill:#e8e8e8;fill-opacity:1;fill-rule:nonzero;stroke:#b8b8b8;stroke-width:1.49999813;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#958166;fill-opacity:1;fill-rule:nonzero;stroke:#685939;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 21.796843,21.171886 c -0.06525,1.195303 1.013714,2.261442 2.109372,2.812496 1.582363,0.06 1.297109,1.544938 0.46875,2.343747 0.814709,0.02295 1.719508,0.0732 2.109372,-0.796874 0.500954,-0.240134 0.561944,-0.854144 0.749999,-1.312498 -0.166485,-0.678449 -1.296853,0.0297 -1.593748,-0.703124 -0.489464,-0.1443 -1.046009,-0.12555 -1.546873,-0.234375 -0.508604,0.009 -0.996989,-0.07095 -1.265623,-0.562499 -0.204285,-0.4197 -0.441165,-0.845204 -0.656249,-1.265623 -0.0852,-0.16662 -0.216825,-0.235905 -0.375,-0.28125 z"
+           id="path17044-5-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#radialGradient4697);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4695);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 187.40625 91.6875 C 187.19462 91.695947 186.91106 92.074876 186.84375 92.25 C 186.52728 93.073444 187.05801 92.742537 186.9375 93.1875 C 186.65024 94.248163 186.37911 94.493987 186.125 94.78125 C 185.92586 95.006376 185.52523 95.002218 185.8125 94.78125 C 186.09976 94.56028 186.12879 93.827667 186.0625 93.5625 C 186.04443 93.490357 185.4647 93.202821 185.8125 92.9375 C 186.04982 92.756456 185.92496 92.454546 185.65625 92.28125 C 185.61039 92.451509 185.59358 92.619755 185.6875 92.84375 C 185.20543 92.89464 184.552 94.302263 184.53125 95.03125 C 184.74804 96.062264 184.7878 97.178012 185.03125 98.21875 C 185.49554 99.220001 185.08817 97.559672 185.03125 97.1875 C 184.93042 96.171091 185.35976 97.273353 185.375 97.6875 C 185.51079 98.179847 185.66409 98.660505 185.8125 99.15625 C 185.75677 98.820705 185.65879 98.44031 185.625 98.1875 C 185.5714 97.786592 185.29986 96.402255 185.65625 96.78125 C 185.9825 97.128167 185.8662 97.75519 185.9375 98.28125 C 186.02487 98.925856 186.50296 99.261816 186.65625 99.84375 C 186.73875 100.15694 186.90611 100.50693 187.0625 100.75 C 187.06683 100.75673 187.05817 100.77471 187.0625 100.78125 C 187.18361 100.84811 187.31244 100.9071 187.4375 100.96875 C 187.44502 100.95634 187.46232 100.95414 187.46875 100.9375 C 187.65303 100.46081 186.86606 100.19084 186.90625 99.59375 C 186.92392 99.331568 187.0944 99.198648 187.28125 99.09375 C 187.35032 98.832542 187.47616 98.597781 187.65625 98.4375 C 187.65225 98.421147 187.66165 98.423557 187.65625 98.40625 C 187.55218 98.07457 187.54849 97.687909 187.78125 97.40625 C 188.12648 96.988488 188.29894 96.430985 188.4375 95.90625 C 188.57501 95.385502 188.82308 94.533464 188.875 93.75 C 188.78332 93.494267 188.67415 93.210767 188.5625 92.90625 C 188.37634 92.398515 187.8241 92.096215 187.53125 91.75 C 187.49292 91.704687 187.45509 91.685553 187.40625 91.6875 z "
+           transform="matrix(1.4999981,0,0,1.4999981,-263.99967,-135.99979)"
+           id="path4686" />
+      </g>
+      <g
+         transform="translate(-1.687532,-1.3124702)"
+         id="g11872-9">
+        <path
+           id="path11885-2"
+           style="color:#000000;fill:url(#linearGradient11887-4);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,31.062471 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           sodipodi:nodetypes="sccccs"
+           inkscape:connector-curvature="0"
+           d="m 12.937518,26.562475 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           style="color:#000000;fill:url(#linearGradient11883-5);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path11881-6" />
+        <path
+           id="path11109-7-8"
+           style="color:#000000;fill:url(#linearGradient11870-0);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,22.062479 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           transform="matrix(2.9999963,0,0,2.9999963,108.9374,-453.81193)"
+           d="m -29.5,156 c 0,0.62132 -1.119288,1.125 -2.5,1.125 -1.380712,0 -2.5,-0.50368 -2.5,-1.125 0,-0.62132 1.119288,-1.125 2.5,-1.125 1.380712,0 2.5,0.50368 2.5,1.125 z"
+           sodipodi:ry="1.1250012"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099-5-5"
+           style="color:#000000;fill:url(#linearGradient6806);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         transform="matrix(1.4999981,0,0,1.4999981,100.87487,45.87498)"
+         id="g6586">
+        <path
+           style="fill:url(#linearGradient6541-9);fill-opacity:1;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -45.75,-21.75 2,2 6.5,6 -2.5,2.5 -6,-6.5 -2,-2"
+           id="path7013"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+        <g
+           transform="translate(-58.25,-42.249999)"
+           id="g7039">
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             sodipodi:ry="6.5"
+             sodipodi:rx="6.5"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6806"
+             style="color:#000000;fill:url(#radialGradient6239-4-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:url(#radialGradient6909-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path6907"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6.5"
+             sodipodi:ry="6.5"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             transform="translate(-421,-119)" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:none;stroke:url(#linearGradient6949-2);stroke-width:0.69999999000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter4141)"
+             id="path6905"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6"
+             sodipodi:ry="6"
+             d="m 434,136 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 3.31371,0 6,2.68629 6,6 z"
+             transform="translate(-421,-119)" />
+          <path
+             transform="translate(-421,-119)"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             sodipodi:ry="6.5"
+             sodipodi:rx="6.5"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6921"
+             style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7637-1);enable-background:accumulate"
+             d="m 7,11.5 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,0.25674 0.02846,0.50262 0.0625,0.75 -0.0021,-0.45763 0.06335,-0.91165 0.1875,-1.375 0.75044,-2.8007 3.60555,-4.46919 6.40625,-3.71875 2.8007,0.75044 4.46919,3.6368 3.71875,6.4375 -0.12837,0.4791 -0.32061,0.90642 -0.5625,1.3125 C 12.0553,19.46855 12.5,18.28917 12.5,17 12.5,13.96243 10.03757,11.5 7,11.5 z"
+             id="path7609"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7597-1);enable-background:accumulate"
+             d="m 7,12 c -1.64808,0 -3.08913,0.83249 -4,2.0625 1.40812,-1.00322 3.2308,-1.41993 5.03125,-0.9375 0.31676,0.08488 0.6163,0.18223 0.90625,0.3125 L 9.1875,12.5 C 8.52925,12.17878 7.78163,12 7,12 z m 3.0625,1.09375 -0.21875,0.875 c 0.94547,0.63904 1.673,1.5097 2.125,2.53125 -0.14086,-1.38702 -0.86841,-2.58673 -1.90625,-3.40625 z"
+             id="path7454"
+             inkscape:connector-curvature="0" />
+        </g>
+        <path
+           style="fill:url(#linearGradient6650);fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -45.75,-17.75 2,-2 6.5,6 -2.5,2.5 z"
+           id="path7023"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         transform="translate(-11,37.499981)"
+         id="g19851">
+        <path
+           id="path19853"
+           transform="translate(11,-53.5)"
+           d="M 47.249941,9.9000666 32.71875,11.875 l 2.75,1.6875 11.781191,-2.162435 z"
+           style="color:#000000;fill:url(#linearGradient19917);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999834999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999834999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           id="path19855"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19857"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path19859"
+           transform="translate(11,-53.5)"
+           d="m 24.21875,12.84375 -23.46875094,4.256308 0,2.099997 L 26.96875,15.25 z"
+           style="color:#000000;fill:url(#linearGradient19919);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999834999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999834999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           id="path19861"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19921);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999834999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           id="path19863"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssss" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19923);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.34999834999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path19865"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="ssssss"
+           inkscape:connector-curvature="0"
+           id="path19867"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           style="color:#000000;fill:url(#radialGradient19925);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path3473"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999834999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19927);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999834999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           id="path19869"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/viqui.png"
+       inkscape:label="#icon_16"
+       id="icon_16"
+       transform="translate(176,-31.99998)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8868"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <g
+         id="g9149">
+        <path
+           transform="matrix(0.0324239,0,0,0.03373685,43.382859,30.723764)"
+           d="m -890.78925,-199.30086 c 0,106.407415 -89.75321,192.667666 -200.46945,192.667666 -110.7162,0 -200.4694,-86.260251 -200.4694,-192.667666 0,-106.40741 89.7532,-192.66766 200.4694,-192.66766 110.71624,0 200.46945,86.26025 200.46945,192.66766 z"
+           sodipodi:ry="192.66766"
+           sodipodi:rx="200.46942"
+           sodipodi:cy="-199.30086"
+           sodipodi:cx="-1091.2587"
+           id="path21667-5-8"
+           style="color:#000000;fill:url(#radialGradient9127);fill-opacity:1.0;fill-rule:nonzero;stroke:#000633;stroke-width:27.21182251000000107;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <path
+           id="path22086-6-4"
+           d="m 7.3466366,27.658184 c 0.3761583,-0.126276 0.3272596,0.648502 -0.062895,0.692948 -0.2017968,0.501259 0.2362596,0.966726 0.6819235,1.190868 0.6269148,0.02377 0.4096355,0.711909 0.030267,0.928176 0.4455585,0.05836 0.8911299,-0.06173 1.3220417,-0.161993 0.4704201,-0.175377 0.9227822,-0.381642 1.3188602,-0.702898 0.613017,-0.227516 0.875753,-0.769484 1.239245,-1.256939 0.426009,-0.462566 -0.273353,-0.585167 -0.563692,-0.304881 -0.43428,0.0208 -0.513957,-0.04634 -0.841154,0.123783 0.168684,-0.122433 0.154557,-0.494072 -0.175159,-0.504288 -0.5055821,0.239097 -0.8638922,-0.355908 -1.3431454,-0.237218 -0.4639318,0.01102 -0.7389065,-0.23161 -1.1154357,0.04936 -0.062697,0.08157 -0.2246272,0.125278 -0.3936826,0.125226"
+           style="color:#000000;fill:url(#radialGradient9144);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient9146);stroke-width:0.89999998000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path21928-1-7"
+           d="m 7.4438152,27.600324 c -0.2815183,-8.5e-5 -0.5827955,-0.12151 -0.4785237,-0.3915 0.2068234,-0.532149 -0.7973691,-0.225776 -0.479699,-0.643594 0.330026,-0.292415 -0.1281429,-0.49435 -0.3009493,-0.173933 -0.6710715,0.336424 -0.8408761,-0.997754 -0.226113,-1.135145 0.4024419,0.172313 0.9429437,-0.170995 1.182713,0.335926 -0.026062,0.386575 0.3403895,0.339215 0.2050159,-0.03383 -0.2753397,-0.524314 0.629478,-0.555755 0.4550124,-1.083006 0.07821,0.118039 0.1919168,-0.396844 0.4386935,-0.366175 0.014667,-0.138363 0.2587985,-0.412744 0.5071599,-0.504288 -0.160506,0.210984 -0.022908,0.285842 0.1548549,0.10826 0.2435015,-0.0315 -0.1511217,-0.15813 -0.2360675,-0.314832 0.052495,-0.114528 0.063279,-0.202794 0.048162,-0.263885 C 8.8953498,23.080832 9.0856445,23.02975 9.194962,22.85969 9.3277169,22.550129 9.0348578,22.607976 9.0106535,22.595009 8.8137531,22.555059 8.7108243,22.248619 8.5520572,22.063257 8.4607352,22.30367 8.2021908,22.315255 8.2387645,22.003557 7.8953353,21.55195 7.6735189,22.099447 7.7829536,22.416699 7.5802101,22.540844 7.7487826,23.234344 7.5118547,22.94845 7.5981437,22.41901 6.7492075,22.464584 6.8570018,21.94863 7.046071,21.837409 7.0341484,21.497288 7.2686244,21.582056 c -0.013125,-0.2775 0.5788654,-0.231504 0.3897275,-0.575135 0.1306379,0.0035 0.2541559,-0.04299 0.2448209,0.137714 0.3755013,0.107619 -0.035162,0.411616 -0.070063,0.466477 0.2838756,-0.124115 0.2283164,0.186628 0.500796,0.225676 0.2487947,0.0454 -0.07925,-0.429481 -0.016713,-0.470457 0.114208,0.0759 0.2020817,0.189707 0.19825,0.0044 -0.2097829,-0.09519 -0.2851829,-0.438523 -0.4367064,-0.423093 -0.086087,-0.05529 -0.088427,-0.193128 -0.269108,-0.146494 -0.1622705,-0.05498 -0.2357763,-0.100872 -0.3383709,-0.16677 -0.065724,-0.04154 -0.2995079,0.04502 -0.2440291,0.238413 -0.0351,0.370499 -0.1491405,0.289592 -0.3272276,0.163983 0.020987,-0.04645 0.012875,-0.13645 -0.00619,-0.165575 0.1702192,-0.286725 -0.083645,-0.499909 -0.2384568,-0.46369 0.042962,0.148473 -0.2307684,0.07325 -0.0195,0.219705 -0.1088409,0.0051 -0.1867226,0.03078 -0.2384502,0.06766 -0.032685,-0.06881 -0.063565,-0.131537 -0.09196,-0.167543 C 5.9777328,20.351515 5.8079715,20.012493 5.889841,19.62741 c -0.062227,-0.0802 -0.119,-0.108864 -0.1723738,-0.110649 -0.00494,-1.67e-4 -0.00978,-2.85e-4 -0.014733,0 l 2.045e-4,-2.1e-5 c -0.153288,0.0089 -0.2790167,0.226015 -0.4219734,0.04896 -0.043394,0.198237 -0.040794,0.222679 -0.2830402,0.191844 -0.4293709,-0.0155 -0.187373,0.56405 -0.5792169,0.430257 -0.3222201,0.06385 0.3700847,0.0997 0.3976877,0.159605 0.337566,0.190956 0.1811579,0.70541 0.1070888,1.063104 1.862e-4,0.425134 -0.3626685,0.580641 -0.203425,0.960416 -0.2506764,0.02646 -0.5855436,0.760451 -0.5963336,1.139524 0.1127287,0.536127 0.123803,1.108201 0.2503984,1.649384 0.241428,0.52065 0.029217,-0.334242 -3.814e-4,-0.527771 -0.052434,-0.528532 0.1799755,0.035 0.1878993,0.250352 0.1067729,0.387127 0.2565517,0.762059 0.3419551,1.167784 0.330521,0.489897 0.9862833,0.582686 1.4112155,0.943699 0.3851089,0.142077 0.5417093,0.848071 1.0318391,0.664291"
+           style="color:#000000;fill:url(#radialGradient9141);fill-opacity:1.0;fill-rule:nonzero;stroke:#123401;stroke-width:0.89999998000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient9138);fill-opacity:1.0;fill-rule:nonzero;stroke:#123401;stroke-width:0.89999998000000003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.156117,20.19481 c -0.102126,-0.127327 -0.299166,-0.27697 -0.115545,-0.02449 0.116387,0.190681 -0.0074,0.299413 -0.161113,0.201018 -0.03764,0.201514 0.5336,0.482015 0.06147,0.342929 -0.194436,-0.137551 -0.57341,0.108941 -0.184767,0.152573 0.230057,-0.09753 0.256366,0.02303 0.340699,0.181364 -0.659718,-0.232419 -0.447044,0.640676 -0.228645,0.94488 0.299136,0.404077 -0.327389,0.84892 -0.466897,0.276176 -0.234848,-0.285382 0.35623,-0.634783 -0.145235,-0.800413 -0.369824,0.07968 -0.10897,-0.570552 -0.411276,-0.763387 0.129715,-0.211942 -0.624246,-0.57274 -0.166474,-0.368099 0.352634,0.07443 -0.02167,-0.710301 -0.323365,-0.702136 -0.114375,-0.178471 -0.221488,-0.296731 -0.173271,0.0054 -0.189756,-0.07336 -0.733806,-0.354434 -0.2866,-0.03609 0.179035,0.177542 0.893625,0.370194 0.716484,0.577092 -0.143024,-0.07001 -0.445911,-0.07828 -0.206359,0.131133 -0.460403,0.02258 -0.545503,-0.552866 -0.939409,-0.71108 -0.302714,-0.134222 -0.465646,-0.561411 -0.14001,-0.720364 0.03349,0.128634 0.286581,0.363122 0.300529,0.128747 -0.214332,-0.182668 -0.4607,-0.175229 -0.550022,-0.333721 C 9.8607648,18.599781 9.5368489,18.329338 9.4056543,18.347505 9.2550713,18.452927 9.1953888,18.346513 9.1000374,18.311043 8.7567944,18.066869 8.0407496,18.570227 7.8767703,18.233203 7.6998403,18.17422 7.0690627,18.105122 6.873308,18.378526 6.4950145,18.500223 6.0907336,18.624826 5.877856,18.988342 5.7369547,19.09253 5.3454509,19.632586 5.3178971,19.31045 5.566463,19.135065 5.3760876,19.042321 5.1761479,19.14768 5.0289449,18.986086 5.4320558,18.497595 4.985172,18.703726 4.7107427,18.422446 5.4167776,18.335824 5.4104946,18.672508 5.5740401,18.487225 5.7098343,18.204016 6.004909,18.103985 6.3984866,17.664187 5.5783426,18.18806 5.4418488,18.084132 5.804734,17.977939 6.1052381,17.701002 6.51964,17.677162 c 2.4156878,-0.601986 5.122409,0.368166 6.627284,2.346615 0.05279,0.0694 0.04221,0.212194 0.0092,0.171033 z"
+           id="path4421-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="scccccccccccccccccccccccccccccccss" />
+        <path
+           style="color:#000000;fill:#ccb38f;fill-opacity:1;fill-rule:nonzero;stroke:#7d6f4a;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.146924,20.023777 c 0.254744,0.318572 0.393132,0.709624 0.646638,1.027446 0.557241,1.093619 0.798,2.34777 0.674996,3.569601 0.02675,-0.171326 -0.03683,-0.619932 -0.08594,-0.196236 -0.293534,0.278762 -0.153456,0.915866 -0.620681,1.046364 l -0.09093,-0.0045 c -0.456181,-0.142755 -0.437715,-0.673732 -0.583266,-1.06983 -0.08377,-0.409076 0.04767,-0.829827 -0.09208,-1.236255 -0.154267,-0.486056 0.153387,-0.927429 0.111465,-1.419077 -0.01758,-0.470982 0.420475,0.223275 0.457612,-0.268771 -0.06525,-0.44081 -0.07734,-0.9074 -0.408627,-1.277738 -0.08875,-0.09921 -0.0476,-0.219066 -0.0092,-0.171032 z"
+           id="path21878-1-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="scccccccccss" />
+        <path
+           id="path21822-5-1"
+           d="M 9.5561014,21.768281 C 9.4139559,21.734554 9.2071755,21.680649 9.113582,21.512435 9.18151,21.342858 9.0256466,21.5465 8.990497,21.309092 8.8330979,21.360983 8.9818286,21.015764 8.8660503,21.09737 8.9821396,20.843089 8.7157332,20.934245 8.8133073,20.807438 8.6409339,20.829098 8.6281194,20.611041 8.4338439,20.454691 8.15861,20.419015 8.0990388,20.371305 8.1488104,20.287537 7.9756321,20.236787 8.314826,19.829889 8.273808,19.904996 c -0.048038,-0.09234 0.2524597,-0.04035 0.1385367,-0.167234 0.073147,-0.207302 0.3293326,-0.08024 0.3031038,-0.04417 0.1294918,0.147578 0.043768,-0.202877 0.1725406,0.01261 0.016345,0.02058 0.3124946,0.269114 0.3044041,0.249632 0.1897189,0.10222 0.205381,0.170694 0.2944119,0.24977 -0.1991409,0.09087 0.057076,0.109066 0.2319013,0.206929 -0.3170572,0.121413 -0.081101,0.0569 0.038812,0.144206 -0.1926908,0.256105 -0.059181,0.398147 -0.2385371,0.640136 0.0481,0.167832 0.035469,0.342904 0.128068,0.540333 0.037513,0.0064 -0.1027985,0.106163 -0.090943,0.03107 z"
+           style="color:#000000;fill:#e8e8e8;fill-opacity:1;fill-rule:nonzero;stroke:#b8b8b8;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#958166;fill-opacity:1;fill-rule:nonzero;stroke:#685939;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 7.236242,28.57493 c -0.02262,0.414372 0.3514208,0.783967 0.7312489,0.974999 0.5485525,0.0208 0.4496645,0.535578 0.1625,0.812499 0.2824325,0.008 0.5960962,0.02538 0.731249,-0.27625 0.1736641,-0.08325 0.1948073,-0.296103 0.2599997,-0.454999 -0.057715,-0.235196 -0.4495758,0.0103 -0.5524994,-0.24375 -0.1696808,-0.05002 -0.3626164,-0.04352 -0.5362493,-0.08125 -0.176316,0.0031 -0.3456228,-0.0246 -0.4387493,-0.194999 -0.070819,-0.145496 -0.1529372,-0.293005 -0.2274996,-0.43875 -0.029536,-0.05776 -0.075166,-0.08178 -0.13,-0.0975 z"
+           id="path17044-5-6-6"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#radialGradient9130);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient9132);stroke-width:0.90000004000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.6112452,21.766189 c -0.1100475,0.0044 -0.2574985,0.201436 -0.2924996,0.2925 -0.1645642,0.42819 0.111415,0.256119 0.048724,0.487499 -0.149375,0.551544 -0.2903624,0.679373 -0.4224995,0.828749 -0.1035527,0.117066 -0.31188,0.114904 -0.1624998,0 0.149375,-0.114904 0.1644706,-0.495862 0.1299999,-0.633749 -0.00941,-0.03751 -0.3108557,-0.187033 -0.1299999,-0.324999 0.1234063,-0.09414 0.058479,-0.251136 -0.08125,-0.34125 -0.023868,0.08854 -0.032604,0.176022 0.016224,0.2925 -0.2506761,0.02646 -0.5904593,0.758425 -0.6012492,1.137498 0.1127306,0.536127 0.1334058,1.116315 0.2599996,1.657498 0.2414305,0.52065 0.029588,-0.34272 0,-0.536249 -0.052431,-0.528532 0.170825,0.04464 0.1787498,0.26 0.070611,0.25602 0.1503266,0.505961 0.2274997,0.763749 -0.028964,-0.174484 -0.079929,-0.372289 -0.0975,-0.50375 -0.027872,-0.208472 -0.1690725,-0.928326 0.016224,-0.731249 0.1696498,0.180397 0.1091739,0.506448 0.1462498,0.779999 0.045448,0.335195 0.2940389,0.509894 0.3737496,0.812499 0.0429,0.162859 0.129927,0.344853 0.2112497,0.47125 0.00208,0.0036 -0.00208,0.01284 0,0.01622 0.062977,0.03479 0.1299686,0.06544 0.1949998,0.0975 0.00416,-0.0064 0.012896,-0.0076 0.016224,-0.01622 0.095826,-0.247878 -0.3133984,-0.388262 -0.2924996,-0.698749 0.0092,-0.136334 0.097838,-0.205453 0.1949998,-0.259999 0.035932,-0.135828 0.101353,-0.257904 0.1949997,-0.34125 -0.00208,-0.0085 0.0026,-0.0072 0,-0.01625 -0.054116,-0.172473 -0.056035,-0.373537 0.065,-0.519999 C 5.9856604,24.522701 6.0753395,24.2328 6.1473906,23.959938 6.2188956,23.689149 6.347892,23.24609 6.3748903,22.838689 6.3272063,22.705708 6.2704485,22.558288 6.2123905,22.39994 6.1155875,22.135918 5.828423,21.978722 5.6761412,21.79869 c -0.019916,-0.02356 -0.039624,-0.03351 -0.065,-0.0325 z"
+           id="path4686-7" />
+      </g>
+      <g
+         id="g11122"
+         transform="translate(36,-50.00002)">
+        <path
+           style="color:#000000;fill:url(#linearGradient11128-0);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.9;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
+           d="m -29.5,80 c 0,0.82843 -1.119288,1.5 -2.5,1.5 -1.380712,0 -2.5,-0.67157 -2.5,-1.5 l 0,-2 5,0 z"
+           id="path11114"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssccs" />
+        <path
+           sodipodi:nodetypes="sssccs"
+           inkscape:connector-curvature="0"
+           id="path11109"
+           d="m -29.5,156 c 0,0.82843 -1.119288,1.5 -2.5,1.5 -1.380712,0 -2.5,-0.67157 -2.5,-1.5 l 0,-2 5,0 z"
+           style="color:#000000;fill:url(#linearGradient11132-4);fill-opacity:1.0;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.90000000000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
+           transform="translate(0,-78)" />
+        <path
+           transform="translate(0,-80)"
+           d="m -29.5,156 c 0,0.82843 -1.119288,1.5 -2.5,1.5 -1.380712,0 -2.5,-0.67157 -2.5,-1.5 0,-0.82843 1.119288,-1.5 2.5,-1.5 1.380712,0 2.5,0.67157 2.5,1.5 z"
+           sodipodi:ry="1.5"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099"
+           style="color:#000000;fill:url(#linearGradient11554);fill-opacity:1.0;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.90000000000000002;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         id="g4360"
+         transform="translate(-190.5,33.49998)">
+        <path
+           style="fill:url(#linearGradient4569-9);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.9;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+           d="m 201.46875,-7.6250005 1,1 3.25,3 -1.25,1.25 -3,-3.25 -1,-1"
+           id="path7013-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc" />
+        <g
+           transform="matrix(0.5,0,0,0.5,224.34375,3.2499995)"
+           id="g4321">
+          <path
+             transform="translate(-479.6875,-161.5)"
+             d="m 435,136 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
+             sodipodi:ry="6.999999"
+             sodipodi:rx="7"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6806-9"
+             style="color:#000000;fill:url(#radialGradient4571-9);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:url(#radialGradient4573-1);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path6907-6"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="7"
+             sodipodi:ry="6.999999"
+             d="m 435,136 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
+             transform="translate(-479.6875,-161.5)" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:none;stroke:url(#linearGradient4575-9);stroke-width:1.79999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter4731);enable-background:accumulate"
+             id="path6905-3"
+             sodipodi:cx="428"
+             sodipodi:cy="136"
+             sodipodi:rx="6.5"
+             sodipodi:ry="6.499999"
+             d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+             transform="translate(-479.6875,-161.5)"
+             clip-path="url(#clipPath4737)" />
+          <path
+             transform="translate(-479.6875,-161.5)"
+             d="m 435,136 c 0,3.86599 -3.13401,7 -7,7 -3.86599,0 -7,-3.13401 -7,-7 0,-3.86599 3.13401,-7 7,-7 3.86599,0 7,3.13401 7,7 z"
+             sodipodi:ry="7"
+             sodipodi:rx="7"
+             sodipodi:cy="136"
+             sodipodi:cx="428"
+             id="path6921-8"
+             style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1.79999994999999990;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7637-1-8-7);enable-background:accumulate"
+             d="m -51.750063,-30.749999 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,0.25674 0.02846,0.50262 0.0625,0.75 -0.0021,-0.45763 0.06335,-0.91165 0.1875,-1.375 0.75044,-2.8007 3.60555,-4.46919 6.40625,-3.71875 2.8007,0.75044 4.46919,3.6368 3.71875,6.4375 -0.12837,0.4791 -0.32061,0.90642 -0.5625,1.3125 0.7428,-0.9377 1.1875,-2.11708 1.1875,-3.40625 0,-3.03757 -2.46243,-5.5 -5.5,-5.5 z"
+             id="path7609-5"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7597-1-2-8);enable-background:accumulate"
+             d="m -51.750063,-30.249999 c -1.64808,0 -3.08913,0.83249 -4,2.0625 1.40812,-1.00322 3.2308,-1.41993 5.03125,-0.9375 0.31676,0.08488 0.6163,0.18223 0.90625,0.3125 l 0.25,-0.9375 c -0.65825,-0.32122 -1.40587,-0.5 -2.1875,-0.5 z m 3.0625,1.09375 -0.21875,0.875 c 0.94547,0.63904 1.673,1.5097 2.125,2.53125 -0.14086,-1.38702 -0.86841,-2.58673 -1.90625,-3.40625 z"
+             id="path7454-6"
+             inkscape:connector-curvature="0" />
+        </g>
+        <path
+           style="fill:url(#linearGradient4632);fill-opacity:1;stroke:#000000;stroke-width:0.9;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+           d="m 201.46875,-5.6250005 1,-1 3.25,3 -1.25,1.25 z"
+           id="path7023-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         transform="matrix(0.33333,0,0,0.33333,-3.6665496,33.833227)"
+         id="g18155">
+        <path
+           id="path18157"
+           d="m 57.433933,-42.502982 -14.908438,2.236966 1.68933,0.659976 13.219108,-2.457597 z"
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:2.70002699999999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:2.70002699000000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 23.056495,-34.768536 9.137149,-8.032301"
+           id="path18159"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           id="path18163"
+           d="m 36.412004,-39.595579 -23.879083,4.153328 0,0.605074 25.10437,-3.810575 z"
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:2.70002699000000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:2.70002699000000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.454095,-45.214685 -1.274969,-4.373934"
+           id="path18165"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:2.10002084999999994;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           id="path18167"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssss" />
+        <path
+           style="color:#000000;fill:url(#linearGradient18227-5-4-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.80001799999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path18169"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="ssssss"
+           inkscape:connector-curvature="0"
+           id="path18171"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -2.157239,-1.985917 -2.626213,-2.469316 -1.288965,-1.328612 4.369783,-6.174866 6.603683,-4.424974 z"
+           style="color:#000000;fill:url(#radialGradient18728-3);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path3475"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.80001799999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.80001799999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           id="path18173"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/Icons/app-vpView.svg b/Icons/app-vpView.svg
new file mode 100644
index 00000000..ebb9901d
--- /dev/null
+++ b/Icons/app-vpView.svg
@@ -0,0 +1,2250 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="208"
+   height="128"
+   id="svg18874"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="app-vpView.svg">
+  <defs
+     id="defs18876">
+    <linearGradient
+       id="linearGradient4107">
+      <stop
+         style="stop-color:#84a060;stop-opacity:1;"
+         offset="0"
+         id="stop4109" />
+      <stop
+         id="stop4115"
+         offset="0.60000002"
+         style="stop-color:#6c8050;stop-opacity:1;" />
+      <stop
+         style="stop-color:#64744c;stop-opacity:1;"
+         offset="1"
+         id="stop4111" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4632">
+      <stop
+         style="stop-color:#504034;stop-opacity:1;"
+         offset="0"
+         id="stop4634" />
+      <stop
+         style="stop-color:#28201a;stop-opacity:1;"
+         offset="1"
+         id="stop4636" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4590">
+      <stop
+         style="stop-color:#788088;stop-opacity:1;"
+         offset="0"
+         id="stop4592" />
+      <stop
+         id="stop4598"
+         offset="0.5"
+         style="stop-color:#586068;stop-opacity:1;" />
+      <stop
+         style="stop-color:#485058;stop-opacity:1;"
+         offset="1"
+         id="stop4594" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4421">
+      <stop
+         style="stop-color:#c0c6cc;stop-opacity:1;"
+         offset="0"
+         id="stop4423" />
+      <stop
+         id="stop4429"
+         offset="0.5"
+         style="stop-color:#acb4bc;stop-opacity:1;" />
+      <stop
+         style="stop-color:#9098a0;stop-opacity:1"
+         offset="1"
+         id="stop4425" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6318">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop6320" />
+      <stop
+         id="stop6322"
+         offset="0.25"
+         style="stop-color:#404040;stop-opacity:1;" />
+      <stop
+         style="stop-color:#101010;stop-opacity:1;"
+         offset="1"
+         id="stop6324" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6312">
+      <stop
+         id="stop6314"
+         offset="0"
+         style="stop-color:#8282b2;stop-opacity:1;" />
+      <stop
+         id="stop6316"
+         offset="1"
+         style="stop-color:#4a4a79;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6296">
+      <stop
+         id="stop6298"
+         offset="0"
+         style="stop-color:#dae4f0;stop-opacity:1" />
+      <stop
+         style="stop-color:#c0c8d0;stop-opacity:1"
+         offset="0.39602903"
+         id="stop6300" />
+      <stop
+         style="stop-color:#b8c0ca;stop-opacity:1"
+         offset="0.48324502"
+         id="stop6302" />
+      <stop
+         id="stop6304"
+         offset="0.60376924"
+         style="stop-color:#a0aab5;stop-opacity:1;" />
+      <stop
+         id="stop6306"
+         offset="0.69923288"
+         style="stop-color:#8894a1;stop-opacity:1;" />
+      <stop
+         style="stop-color:#707e8c;stop-opacity:1;"
+         offset="0.80106777"
+         id="stop6308" />
+      <stop
+         id="stop6310"
+         offset="1"
+         style="stop-color:#586878;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6290">
+      <stop
+         style="stop-color:#c0c8d0;stop-opacity:1;"
+         offset="0"
+         id="stop6292" />
+      <stop
+         style="stop-color:#dae4f0;stop-opacity:1"
+         offset="1"
+         id="stop6294" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6284">
+      <stop
+         id="stop6286"
+         offset="0"
+         style="stop-color:#b8c0ca;stop-opacity:1;" />
+      <stop
+         id="stop6288"
+         offset="1"
+         style="stop-color:#c0c8d0;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14204">
+      <stop
+         style="stop-color:#6f6f58;stop-opacity:0"
+         offset="0"
+         id="stop14206" />
+      <stop
+         id="stop14212"
+         offset="0.5"
+         style="stop-color:#6f6f58;stop-opacity:0;" />
+      <stop
+         style="stop-color:#6f6f58;stop-opacity:1;"
+         offset="1"
+         id="stop14208" />
+    </linearGradient>
+    <linearGradient
+       x1="343.66751"
+       y1="122.48"
+       x2="332.00931"
+       y2="108.939"
+       id="SG_GRAY_2"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6371-1-1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6373-2-8"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6375-7-1"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.73286879" />
+      <stop
+         id="stop6377-4-1"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.90309668" />
+      <stop
+         id="stop6379-7-5"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="359.05081"
+       y1="122.8501"
+       x2="346.7869"
+       y2="108.6055"
+       id="SG_GRAY_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6630-5-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6632-5"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6634-2-5"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.51010001" />
+      <stop
+         id="stop6636-90"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop6638-2-8"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient14137-8"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient14317-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient14200-4"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient14133-3"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient14210-2"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="2.1355548"
+       fy="77.608032"
+       fx="-151.26682"
+       cy="77.608032"
+       cx="-151.26682"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient14399"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient18227-5-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient18728-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1326893,0.10986245,-0.05157623,0.53175443,212.48813,-65.944457)"
+       cx="-143.17728"
+       cy="82.496986"
+       fx="-143.17728"
+       fy="82.496986"
+       r="10.547367" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19739"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19741"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19743"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient19745"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient19747"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       cx="-151.26682"
+       cy="77.608032"
+       fx="-151.26682"
+       fy="77.608032"
+       r="2.1355548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19917"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19921"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient19923"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient19925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19927"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       cx="-151.26682"
+       cy="77.608032"
+       fx="-151.26682"
+       fy="77.608032"
+       r="2.1355548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11128-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-76)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="156.5"
+       x2="-29.5"
+       y2="156.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11132-4"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="156.5"
+       x2="-29.5"
+       y2="156.5" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11554"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11887-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-438.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11883-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-443.31194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11870-0"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-447.81194)" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6806"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4214"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-444.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4306"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-440.81195)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-436.81196)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11887-44"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-438.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11883-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-443.31194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient11870-9"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-447.81194)" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11763-7"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="SG_BLACK2">
+      <stop
+         style="stop-color:#c0c0c0;stop-opacity:1;"
+         offset="0"
+         id="stop4548-7" />
+      <stop
+         id="stop4919"
+         offset="0.25999999"
+         style="stop-color:#606060;stop-opacity:1;" />
+      <stop
+         style="stop-color:#505050;stop-opacity:1;"
+         offset="0.30000001"
+         id="stop4925" />
+      <stop
+         style="stop-color:#404040;stop-opacity:1;"
+         offset="0.34999999"
+         id="stop4921" />
+      <stop
+         style="stop-color:#101010;stop-opacity:1;"
+         offset="1"
+         id="stop4550-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6290"
+       id="linearGradient4320-1"
+       gradientUnits="userSpaceOnUse"
+       x1="55"
+       y1="-78"
+       x2="25.5"
+       y2="-99"
+       gradientTransform="matrix(-1,0,0,1,128,-80)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient4340-4"
+       cx="58.999996"
+       cy="-66.753288"
+       fx="58.999996"
+       fy="-66.753288"
+       r="11"
+       gradientTransform="matrix(1.0909096,-1.1117934e-7,9.2649439e-8,0.90909125,-5.363653,-85.31516)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6284"
+       id="linearGradient4269-4"
+       x1="0"
+       y1="-159.75"
+       x2="55.5"
+       y2="-159.75"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6290"
+       id="linearGradient4281-9"
+       x1="25.5"
+       y1="-99"
+       x2="55"
+       y2="-78"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-80)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6284"
+       id="linearGradient4326-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,128,5)"
+       x1="0"
+       y1="-159.75"
+       x2="55.5"
+       y2="-159.75" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6296"
+       id="radialGradient4316-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0454544,5.6181037e-8,-5.8623688e-8,1.0909094,-2.40057,8.7179833)"
+       cx="59.6875"
+       cy="-161.99144"
+       fx="59.6875"
+       fy="-161.99144"
+       r="11" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6296"
+       id="radialGradient4300-5"
+       cx="59"
+       cy="-156.07895"
+       fx="59"
+       fy="-156.07895"
+       r="11"
+       gradientTransform="matrix(1.4545456,7.8018671e-7,-1.1702794e-6,2.1818172,-26.81837,184.53567)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6312"
+       id="radialGradient4388-4"
+       cx="59"
+       cy="-70.383682"
+       fx="59"
+       fy="-70.383682"
+       r="5.8562498"
+       gradientTransform="matrix(2.0490929,1.7897247e-7,-1.4914373e-7,1.7075774,-61.896492,54.185572)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6318"
+       id="radialGradient4364-4"
+       cx="63"
+       cy="-61.171936"
+       fx="63"
+       fy="-61.171936"
+       r="3.98125"
+       gradientTransform="matrix(0.87912087,-2.1231407e-8,1.8198333e-8,0.75353178,7.6153864,-14.905001)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4421"
+       id="linearGradient4427"
+       x1="4.5"
+       y1="60.5"
+       x2="36.5"
+       y2="123.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4590"
+       id="linearGradient4596"
+       x1="8"
+       y1="84"
+       x2="36"
+       y2="140"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4632"
+       id="linearGradient4638"
+       x1="25.874998"
+       y1="22.437475"
+       x2="26.624996"
+       y2="22.437475"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4632"
+       id="linearGradient4646"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="25.874998"
+       y1="22.437475"
+       x2="26.437496"
+       y2="22.437475"
+       gradientTransform="translate(-0.56249931,-4.6874944)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient4722"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1666667,8.3611137e-7,-8.3611138e-7,1.1666667,-6.41672,10.499967)"
+       cx="38.5"
+       cy="-63"
+       fx="38.5"
+       fy="-63"
+       r="3" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient4724"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1666667,8.3611137e-7,-8.3611138e-7,1.1666667,-6.41672,10.499967)"
+       cx="38.5"
+       cy="-63"
+       fx="38.5"
+       fy="-63"
+       r="3" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK2"
+       id="radialGradient4726"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.7244775e-7,0.83333305,-0.83333263,-5.7244734e-7,-13.499893,-95.500011)"
+       cx="38.999985"
+       cy="-62.999954"
+       fx="38.999985"
+       fy="-62.999954"
+       r="3" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK2"
+       id="radialGradient4728"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.7244775e-7,0.83333305,-0.83333263,-5.7244734e-7,-13.499893,-95.500011)"
+       cx="38.999985"
+       cy="-62.999954"
+       fx="38.999985"
+       fy="-62.999954"
+       r="3" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK2"
+       id="radialGradient4730"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.7244775e-7,0.83333305,-0.83333263,-5.7244734e-7,-13.499893,-95.500011)"
+       cx="38.999985"
+       cy="-62.999954"
+       fx="38.999985"
+       fy="-62.999954"
+       r="3" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK2"
+       id="radialGradient4732"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-5.7244775e-7,0.83333305,-0.83333263,-5.7244734e-7,-13.499893,-95.500011)"
+       cx="38.999985"
+       cy="-62.999954"
+       fx="38.999985"
+       fy="-62.999954"
+       r="3" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4107"
+       id="radialGradient4113"
+       cx="68"
+       cy="96.727272"
+       fx="68"
+       fy="96.727272"
+       r="6.5"
+       gradientTransform="matrix(-5.5970113e-7,1.0000003,-1.1538479,-6.458099e-7,179.60859,29.000039)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4107"
+       id="radialGradient4123"
+       cx="68"
+       cy="97.249992"
+       fx="68"
+       fy="97.249992"
+       r="5"
+       gradientTransform="matrix(-1.0104491e-6,0.90000062,-1.1999997,-1.3472643e-6,184.70004,36.300091)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="104"
+     inkscape:cy="64"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1127"
+     inkscape:window-x="-4"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-object-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid19743"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata18879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,80)"
+     style="display:inline">
+    <g
+       transform="matrix(2.66667,0,0,2.66667,-8e-5,-37.333341)"
+       id="icon_128"
+       inkscape:label="#icon_128"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/128x128/vpView.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="48"
+         height="48"
+         x="4.0438721e-08"
+         y="-16"
+         id="rect19265"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g9277">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path9041"
+           d="m 35.437486,16.437482 10.874986,13.874983 -44.624944,-1e-6 10.874986,-13.874982 z"
+           style="fill:#b1b1a4;fill-opacity:1;stroke:#4b4b3c;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           style="fill:#4b4b3c;fill-opacity:1;stroke:#303028;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 21.375003,26.937469 22.312472,0 2.249998,2.812497 -29.437464,-0.1875 -0.937498,-0.749999 3.937495,-12.374985 2.999996,0 z"
+           id="path9057"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+        <g
+           id="g10267"
+           transform="translate(3.7499954,-7.4999906)">
+          <rect
+             y="23.562473"
+             x="12.562514"
+             height="1.687498"
+             width="1.8749976"
+             id="rect4297"
+             style="color:#000000;fill:#c8c0b8;fill-opacity:1;fill-rule:nonzero;stroke:#484038;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             style="color:#000000;fill:#c8c0b8;fill-opacity:1;fill-rule:nonzero;stroke:#484038;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect10269"
+             width="23"
+             height="28"
+             x="10.5"
+             y="95.5"
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)" />
+          <rect
+             y="26.187469"
+             x="3.937525"
+             height="0.37499952"
+             width="8.6249895"
+             id="rect4355"
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;stroke:#4c5f7a;stroke-width:0.37499949px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;stroke:#4c5f7a;stroke-width:0.37499949px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4357"
+             width="8.6249895"
+             height="0.37499952"
+             x="3.937525"
+             y="22.812473" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;stroke:#4c5f7a;stroke-width:0.37499949px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4325"
+             width="8.6249895"
+             height="0.37499952"
+             x="3.937525"
+             y="28.437468" />
+          <path
+             style="fill:#aca094;fill-opacity:1;stroke:#484038;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             d="M 10.5,95.5 24,87 l 16,0 -6.5,8.5 z"
+             id="path10271"
+             inkscape:connector-curvature="0"
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)"
+             inkscape:connector-curvature="0"
+             id="path10273"
+             d="M 33.5,95.5 40,87 l 0,19.5 -1.5,3.5 0,-4 -3,7 0,5.5 -2,5 z"
+             style="fill:#786c60;fill-opacity:1;stroke:#484038;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             sodipodi:nodetypes="ccccccccc" />
+          <path
+             style="fill:none;stroke:#263345;stroke-width:0.37499952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 12.562514,28.624967 0.749999,-1.874998"
+             id="path4313"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:none;stroke:#263345;stroke-width:0.37499952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 14.437512,23.937473 0.562499,-1.312499"
+             id="path4309"
+             inkscape:connector-curvature="0" />
+          <path
+             transform="matrix(0.37499953,0,0,0.37499953,-3.7499654,-8.4999865)"
+             inkscape:connector-curvature="0"
+             id="path4301"
+             d="M 43.5,84.5 50,73"
+             style="fill:none;stroke:#263345;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+             sodipodi:nodetypes="cc" />
+          <path
+             style="fill:none;stroke:#263345;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 43.5,93.5 50,79"
+             id="path4299"
+             inkscape:connector-curvature="0"
+             transform="matrix(0.37499953,0,0,0.37499953,-3.7499654,-8.4999865)" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="fill:none;stroke:#484038;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+             d="M 35.5,118.5 35.5,93"
+             id="path3457"
+             inkscape:connector-curvature="0"
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4227"
+             d="m 14.437512,25.249971 10e-7,-7.874992"
+             style="fill:none;stroke:#484038;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+             sodipodi:nodetypes="cc" />
+          <path
+             style="color:#000000;fill:none;stroke:#484038;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="M 43.5,89 50,76"
+             id="path4229"
+             inkscape:connector-curvature="0"
+             transform="matrix(0.37499953,0,0,0.37499953,-3.7499654,-8.4999865)"
+             sodipodi:nodetypes="cc" />
+          <path
+             sodipodi:nodetypes="cc"
+             transform="matrix(0.37499953,0,0,0.37499953,-3.7499654,-8.4999865)"
+             inkscape:connector-curvature="0"
+             id="path4303"
+             d="M 43.5,80 50,70"
+             style="color:#000000;fill:none;stroke:#484038;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)"
+             inkscape:connector-curvature="0"
+             id="path4305"
+             d="m 33.5,123.5 0,-28"
+             style="fill:none;stroke:#484038;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+             sodipodi:nodetypes="cc" />
+          <path
+             sodipodi:nodetypes="cc"
+             style="fill:none;stroke:#484038;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+             d="m 15.000011,23.937473 0,-7.312491"
+             id="path4307"
+             inkscape:connector-curvature="0" />
+          <path
+             style="color:#000000;fill:none;stroke:#484038;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 43.5,80.5 -23,0"
+             id="path4315"
+             inkscape:connector-curvature="0"
+             transform="matrix(0.37499953,0,0,0.37499953,-3.7499654,-8.4999865)"
+             sodipodi:nodetypes="cc" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4317"
+             d="m 12.562514,25.062472 -8.624989,0"
+             style="color:#000000;fill:none;stroke:#484038;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        </g>
+        <g
+           id="g10262">
+          <rect
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)"
+             y="60.5"
+             x="4.5"
+             height="63"
+             width="32"
+             id="rect10256"
+             style="color:#000000;fill:url(#linearGradient4427);fill-opacity:1;fill-rule:nonzero;stroke:#384048;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)"
+             inkscape:connector-curvature="0"
+             id="path10258"
+             d="m 4.5,60.5 9.5,-2 27.5,0 -5,2 z"
+             style="fill:#9098a0;fill-opacity:1;stroke:#384048;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             style="fill:url(#linearGradient4596);fill-opacity:1;stroke:#384048;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             d="m 36.5,60.5 5,-2 0,51.5 -5,13.5 z"
+             id="path10260"
+             inkscape:connector-curvature="0"
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)" />
+          <g
+             id="g4431"
+             style="opacity:0.25">
+            <path
+               sodipodi:nodetypes="ccc"
+               inkscape:connector-curvature="0"
+               id="path4371"
+               d="m 15.56251,22.624974 -1.874997,4.687494 -11.9999851,0"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 15.562511,20.187478 -1.874998,4.124993 -11.9999851,0"
+               id="path4373"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccc" />
+            <path
+               sodipodi:nodetypes="ccc"
+               inkscape:connector-curvature="0"
+               id="path4375"
+               d="m 15.562511,17.749981 -1.874998,3.562494 -11.9999851,0"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 15.562511,15.312484 -1.874998,2.999995 -11.9999851,0"
+               id="path4377"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccc" />
+            <path
+               sodipodi:nodetypes="ccc"
+               inkscape:connector-curvature="0"
+               id="path4379"
+               d="m 15.562511,12.874987 -1.874998,2.437496 -11.9999851,0"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 15.562511,10.43749 -1.874998,1.874997 -11.9999851,0"
+               id="path4381"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="ccc" />
+            <path
+               sodipodi:nodetypes="ccc"
+               inkscape:connector-curvature="0"
+               id="path4383"
+               d="m 15.562511,7.9999929 -1.874998,1.312497 -11.9999851,0"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 3.187526,30.312465 0,-23.6249705"
+               id="path4440"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+            <path
+               sodipodi:nodetypes="cc"
+               inkscape:connector-curvature="0"
+               id="path4442"
+               d="m 4.6875241,30.312465 0,-23.6249705"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 6.1875222,30.312465 1e-7,-23.6249705"
+               id="path4444"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+            <path
+               sodipodi:nodetypes="cc"
+               inkscape:connector-curvature="0"
+               id="path4446"
+               d="m 7.6875203,30.312465 1e-7,-23.6249705"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 9.1875184,30.312465 10e-8,-23.6249705"
+               id="path4448"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+            <path
+               sodipodi:nodetypes="cc"
+               inkscape:connector-curvature="0"
+               id="path4450"
+               d="m 10.687516,30.312465 10e-7,-23.6249705"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 12.187514,30.312465 10e-7,-23.6249705"
+               id="path4452"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+            <path
+               sodipodi:nodetypes="cc"
+               inkscape:connector-curvature="0"
+               id="path4584"
+               d="m 14.156262,28.999967 0,-22.4999722"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="m 15.093761,26.562469 0,-20.4374738"
+               id="path4586"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+            <path
+               sodipodi:nodetypes="cc"
+               inkscape:connector-curvature="0"
+               id="path4588"
+               d="m 14.625012,27.687468 0,-21.374973"
+               style="fill:none;stroke:#384048;stroke-width:0.26249966;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          </g>
+        </g>
+        <g
+           id="g4734"
+           transform="matrix(-1,0,0,1,43.687508,-9.7499881)">
+          <rect
+             style="color:#000000;fill:#c8c4b7;fill-opacity:1;fill-rule:nonzero;stroke:#484537;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4736"
+             width="8.2499895"
+             height="15.749981"
+             x="-13.500015"
+             y="14.937485"
+             transform="scale(-1,1)" />
+          <path
+             style="fill:#918a6f;fill-opacity:1;stroke:#484537;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             d="m 5.250026,14.937484 3.3749958,-0.749999 6.3749922,0 -1.499998,0.749999 z"
+             id="path4738"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4740"
+             d="m 13.500015,14.937485 1.499999,-0.749999 0,11.999984 -1.499999,4.499994 z"
+             style="fill:#aca793;fill-opacity:1;stroke:#484537;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             sodipodi:nodetypes="ccccc" />
+          <rect
+             transform="scale(-1,1)"
+             y="29.187468"
+             x="-12.750016"
+             height="1.4999973"
+             width="0.74999863"
+             id="rect4789"
+             style="color:#000000;fill:#6c6753;fill-opacity:1;fill-rule:nonzero;stroke:#484537;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             style="color:#000000;fill:#6c6753;fill-opacity:1;fill-rule:nonzero;stroke:#484537;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4791"
+             width="0.74999863"
+             height="1.4999973"
+             x="-11.250018"
+             y="29.187468"
+             transform="scale(-1,1)" />
+          <rect
+             transform="scale(-1,1)"
+             y="29.187468"
+             x="-9.75002"
+             height="1.4999973"
+             width="0.74999863"
+             id="rect4793"
+             style="color:#000000;fill:#6c6753;fill-opacity:1;fill-rule:nonzero;stroke:#484537;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             style="color:#000000;fill:#6c6753;fill-opacity:1;fill-rule:nonzero;stroke:#484537;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4795"
+             width="0.74999863"
+             height="1.4999973"
+             x="-8.2500219"
+             y="29.187468"
+             transform="scale(-1,1)" />
+          <rect
+             transform="scale(-1,1)"
+             y="29.187468"
+             x="-6.7500243"
+             height="1.4999973"
+             width="0.74999863"
+             id="rect4797"
+             style="color:#000000;fill:#6c6753;fill-opacity:1;fill-rule:nonzero;stroke:#484537;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             style="fill:none;stroke:#484537;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 78.5,89 0,3.5"
+             id="path4799"
+             inkscape:connector-curvature="0"
+             transform="matrix(-0.37499953,0,0,0.37499953,43.687478,-6.249989)"
+             sodipodi:nodetypes="cc" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4801"
+             d="m 13.875015,28.249968 0,1.312498"
+             style="fill:none;stroke:#484537;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4803"
+             d="m 14.625014,25.999971 0,1.124998"
+             style="fill:none;stroke:#484537;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <rect
+             style="color:#000000;fill:#1f5282;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4805"
+             width="8.2499886"
+             height="1.124999"
+             x="-13.500015"
+             y="25.437469"
+             transform="scale(-1,1)" />
+          <rect
+             transform="scale(-1,1)"
+             y="23.187471"
+             x="-13.500016"
+             height="1.1250014"
+             width="8.2499905"
+             id="rect4807"
+             style="color:#000000;fill:#1f5282;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             style="color:#000000;fill:#1f5282;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4809"
+             width="8.2499905"
+             height="1.1250014"
+             x="-13.500016"
+             y="20.937473"
+             transform="scale(-1,1)" />
+          <rect
+             transform="scale(-1,1)"
+             y="18.687475"
+             x="-13.500016"
+             height="1.1250014"
+             width="8.2499905"
+             id="rect4811"
+             style="color:#000000;fill:#1f5282;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             style="color:#000000;fill:#1f5282;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4813"
+             width="8.2499905"
+             height="1.1250014"
+             x="-13.500016"
+             y="16.437477"
+             transform="scale(-1,1)" />
+          <rect
+             transform="scale(-1,1)"
+             y="16.437477"
+             x="-13.500016"
+             height="1.1250014"
+             width="8.2499905"
+             id="rect4815"
+             style="color:#000000;fill:#1f5282;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4824"
+             d="m 15.000014,15.312482 -1.499996,1.124995 0,1.125 1.499996,-1.499996 z"
+             style="color:#000000;fill:#1a456e;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             style="color:#000000;fill:#1a456e;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 15.000014,16.999981 -1.499996,1.687494 0,1.125 1.499996,-2.062495 z"
+             id="path4826"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4828"
+             d="m 15.000014,18.68748 -1.499996,2.249993 0,1.125 1.499996,-2.624994 z"
+             style="color:#000000;fill:#1a456e;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             style="color:#000000;fill:#1a456e;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 15.000014,20.374979 -1.499996,2.812492 0,1.125 1.499996,-3.187493 z"
+             id="path4830"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccccc" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4832"
+             d="m 15.000014,22.249978 -1.499996,3.187491 0,1.125 1.499996,-3.562492 z"
+             style="color:#000000;fill:#1a456e;fill-opacity:1;fill-rule:nonzero;stroke:#11304c;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        </g>
+        <g
+           transform="matrix(-1,0,0,1,44.250008,-4.4999944)"
+           id="g4454">
+          <rect
+             transform="scale(-1,1)"
+             y="21.687475"
+             x="-12.562517"
+             height="8.6249895"
+             width="8.6249924"
+             id="rect4458"
+             style="color:#000000;fill:#c8b7b7;fill-opacity:1;fill-rule:nonzero;stroke:#483737;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)"
+             inkscape:connector-curvature="0"
+             id="path4466"
+             d="m 10.500009,100.5 6.5,-6 19.5,0 -3,6 z"
+             style="fill:#ac9393;fill-opacity:1;stroke:#483737;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccccc"
+             style="fill:#916f6f;fill-opacity:1;stroke:#483737;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             d="m 33.500009,100.5 3,-6 0,19.5 L 33.5,123.5 z"
+             id="path4468"
+             inkscape:connector-curvature="0"
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)" />
+          <path
+             style="color:#000000;fill:none;stroke:#483737;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 3.937525,27.68747 8.624989,0 1.125002,-2.999998"
+             id="path4492"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cc" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4501"
+             d="m 11.812519,21.687476 0,8.624989"
+             style="color:#000000;fill:none;stroke:#483737;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             style="color:#000000;fill:none;stroke:#483737;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 4.6875278,21.687476 0,8.624989"
+             id="path4503"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cc" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4505"
+             d="m 8.8125228,21.687476 0,8.624989"
+             style="color:#000000;fill:none;stroke:#483737;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             style="color:#000000;fill:none;stroke:#483737;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 7.6875243,21.687476 0,8.624989"
+             id="path4513"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cc" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4515"
+             d="m 3.937525,24.687474 8.624989,0 1.125002,-2.624999"
+             style="color:#000000;fill:none;stroke:#483737;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4517"
+             d="m 3.937525,26.93747 8.624989,0 1.125002,-2.812497"
+             style="color:#000000;fill:none;stroke:#483737;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             style="color:#000000;fill:none;stroke:#483737;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 3.937525,22.437474 8.624989,0 1.125002,-2.249996"
+             id="path4519"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccc" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4521"
+             d="m 11.062519,23.187471 0,0.749999"
+             style="fill:none;stroke:#4c5f7a;stroke-width:0.37499952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.40000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4533"
+             width="1"
+             height="3"
+             x="88"
+             y="92"
+             transform="matrix(-0.37499953,0,0,0.37499953,44.249978,-11.499983)" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4537"
+             width="0.37499952"
+             height="1.1249986"
+             x="-10.500021"
+             y="22.999973"
+             transform="scale(-1,1)" />
+          <rect
+             transform="scale(-1,1)"
+             y="22.999973"
+             x="-9.750021"
+             height="1.1249986"
+             width="0.37499952"
+             id="rect4535"
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             transform="scale(-1,1)"
+             y="25.249971"
+             x="-11.250019"
+             height="1.1249986"
+             width="0.37499952"
+             id="rect4539"
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             transform="scale(-1,1)"
+             y="25.249971"
+             x="-10.500021"
+             height="1.1249986"
+             width="0.37499952"
+             id="rect4541"
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4543"
+             width="0.37499952"
+             height="1.1249986"
+             x="-9.750021"
+             y="25.249971"
+             transform="scale(-1,1)" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4545"
+             width="0.37499952"
+             height="1.1249986"
+             x="-7.1250234"
+             y="22.999973"
+             transform="scale(-1,1)" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4547"
+             width="0.37499952"
+             height="1.1249986"
+             x="-6.3750253"
+             y="22.999973"
+             transform="scale(-1,1)" />
+          <rect
+             transform="scale(-1,1)"
+             y="22.999973"
+             x="-5.6250257"
+             height="1.1249986"
+             width="0.37499952"
+             id="rect4549"
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             transform="scale(-1,1)"
+             y="25.249971"
+             x="-7.1250234"
+             height="1.1249986"
+             width="0.37499952"
+             id="rect4551"
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             transform="scale(-1,1)"
+             y="25.249971"
+             x="-6.3750253"
+             height="1.1249986"
+             width="0.37499952"
+             id="rect4553"
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.14999981;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4555"
+             width="0.37499952"
+             height="1.1249986"
+             x="-5.6250257"
+             y="25.249971"
+             transform="scale(-1,1)" />
+          <rect
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.37499952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect4557"
+             width="1.8749975"
+             height="1.8749974"
+             x="-11.250019"
+             y="28.437468"
+             transform="scale(-1,1)" />
+          <rect
+             transform="scale(-1,1)"
+             y="28.437468"
+             x="-7.1250243"
+             height="1.8749974"
+             width="1.8749976"
+             id="rect4559"
+             style="color:#000000;fill:#4c5f7a;fill-opacity:1;fill-rule:nonzero;stroke:#263345;stroke-width:0.37499952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             style="color:#000000;fill:none;stroke:#263345;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 83.5,104 0,4"
+             id="path4561"
+             inkscape:connector-curvature="0"
+             transform="matrix(-0.37499953,0,0,0.37499953,44.249978,-11.499983)" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4580"
+             d="m 13.312517,26.56247 0,1.312496"
+             style="color:#000000;fill:none;stroke:#263345;stroke-width:0.37499949;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:nodetypes="cc" />
+        </g>
+        <g
+           id="g4782">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path9281"
+             d="m 27.937495,17.562481 2.249997,8.624989 -7.49999,0 0.562499,-8.624989 z"
+             style="color:#000000;fill:#5b963c;fill-opacity:1;fill-rule:nonzero;stroke:#435a36;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4612"
+             d="m 26.062497,23.937473 0,-2.812497"
+             style="fill:none;stroke:url(#linearGradient4638);stroke-width:1.12499857;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+          <path
+             style="fill:none;stroke:url(#linearGradient4646);stroke-width:0.74999905;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+             d="m 25.499998,18.874978 0,-2.249997"
+             id="path4644"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="cc" />
+          <path
+             transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-16.374977)"
+             d="m 75.5,98.5 a 6,5 0 1 1 -12,0 6,5 0 1 1 12,0 z"
+             sodipodi:ry="5"
+             sodipodi:rx="6"
+             sodipodi:cy="98.5"
+             sodipodi:cx="69.5"
+             id="path4650"
+             style="color:#000000;fill:url(#radialGradient4113);fill-opacity:1;fill-rule:nonzero;stroke:#505b3f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:url(#radialGradient4123);fill-opacity:1;fill-rule:nonzero;stroke:#505b3f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4680"
+             sodipodi:cx="69.5"
+             sodipodi:cy="98.5"
+             sodipodi:rx="4.5"
+             sodipodi:ry="3.4999957"
+             d="m 74,98.5 a 4.5,3.4999957 0 1 1 -9,0 4.5,3.4999957 0 1 1 9,0 z"
+             transform="matrix(0.37499953,0,0,0.37499953,-0.56246926,-20.499973)" />
+        </g>
+      </g>
+      <g
+         transform="matrix(0.37499953,0,0,0.37499953,2.9956253e-5,51.499945)"
+         id="g4494">
+        <path
+           id="path4978"
+           style="fill:#383838;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 24.5,-142.5 0,-2.5 -4,0 0,2.5 -2,0 0,-4 4,-2 4,2 0,4 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccc" />
+        <path
+           d="m 41,-62.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+           sodipodi:ry="1.5"
+           sodipodi:rx="1.5"
+           sodipodi:cy="-62.5"
+           sodipodi:cx="39.5"
+           id="path4972"
+           style="color:#000000;fill:url(#radialGradient4732);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc"
+           transform="translate(-20.5,-79.5)" />
+        <path
+           transform="translate(-13.5,-79.5)"
+           sodipodi:type="arc"
+           style="color:#000000;fill:url(#radialGradient4730);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path4530-9"
+           sodipodi:cx="39.5"
+           sodipodi:cy="-62.5"
+           sodipodi:rx="1.5"
+           sodipodi:ry="1.5"
+           d="m 41,-62.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+        <path
+           sodipodi:nodetypes="cccccccccc"
+           inkscape:connector-curvature="0"
+           d="m 107.5,-142.5 0,-2.5 -4,0 0,2.5 -2,0 0,-4 4,-2 4,2 0,4 z"
+           style="fill:#383838;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4981" />
+        <path
+           transform="translate(62.5,-79.5)"
+           sodipodi:type="arc"
+           style="color:#000000;fill:url(#radialGradient4728);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path4985"
+           sodipodi:cx="39.5"
+           sodipodi:cy="-62.5"
+           sodipodi:rx="1.5"
+           sodipodi:ry="1.5"
+           d="m 41,-62.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z" />
+        <path
+           d="m 41,-62.5 a 1.5,1.5 0 1 1 -3,0 1.5,1.5 0 1 1 3,0 z"
+           sodipodi:ry="1.5"
+           sodipodi:rx="1.5"
+           sodipodi:cy="-62.5"
+           sodipodi:cx="39.5"
+           id="path4983"
+           style="color:#000000;fill:url(#radialGradient4726);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc"
+           transform="translate(69.5,-79.5)" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4498"
+           d="m 24,-152.5 -0.5,5 -2,0 -0.5,-5 z"
+           style="fill:#b8c0ca;fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4514"
+           d="m 107,-152.5 -0.5,5 -2,0 -0.5,-5 z"
+           style="fill:#b8c0ca;fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#b8c0ca;fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 41,-72.5 -0.5,5 -2,0 -0.5,-5 z"
+           id="path4500"
+           inkscape:connector-curvature="0"
+           transform="translate(0,-80)"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:#b8c0ca;fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 90,-152.5 -0.5,5 -2,0 -0.5,-5 z"
+           id="path4496"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           d="m 42,-62.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+           sodipodi:ry="2.5"
+           sodipodi:rx="2.5"
+           sodipodi:cy="-62.5"
+           sodipodi:cx="39.5"
+           id="path4526"
+           style="color:#000000;fill:url(#radialGradient4724);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc"
+           transform="translate(0,-83)" />
+        <path
+           transform="translate(49,-83)"
+           sodipodi:type="arc"
+           style="color:#000000;fill:url(#radialGradient4722);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path4528"
+           sodipodi:cx="39.5"
+           sodipodi:cy="-62.5"
+           sodipodi:rx="2.5"
+           sodipodi:ry="2.5"
+           d="m 42,-62.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z" />
+        <path
+           style="fill:url(#radialGradient4340-4);fill-opacity:1;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 53.5,-148 c 0,3.5 5,8 10.5,8 5.5,0 10.5,-4.5 10.5,-8 z"
+           id="path4504"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czcc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient4388-4);fill-opacity:1;fill-rule:nonzero;stroke:#30304f;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 64,-64.5 c -2.5,0 -4.5,1 -5.5,3 1.5,1 3.5,1.5 5.5,1.5 2,0 4,-0.5 5.5,-1.5 -1,-2 -3,-3 -5.5,-3 z"
+           transform="translate(0,-80)"
+           id="path4522"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="zczcz" />
+        <path
+           style="color:#000000;fill:url(#radialGradient4364-4);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 64,-62.5 c -1.5,0 -2.5,0.5 -3.5,2 1.5,0.5 2,0.5 3.5,0.5 1.5,0 2,0 3.5,-0.5 -1,-1.5 -2,-2 -3.5,-2 z"
+           transform="translate(0,-80)"
+           id="path4524"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="zczcz" />
+        <path
+           style="fill:url(#linearGradient4281-9);fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 55,-157 -31.5,-22.5 4,0 29,20 z"
+           id="path4510"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4502"
+           d="m 73,-157 31.5,-22.5 -4,0 -29,20 z"
+           style="fill:url(#linearGradient4320-1);fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           style="fill:url(#linearGradient4269-4);fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 54,-152.50002 1,-5 -54.5,1.00002 0,4 z"
+           id="path4506"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="fill:none;stroke:#dae4f0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1,-153.5 52.5,0"
+           id="path4508"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path4512"
+           d="m 74,-152.50002 -1,-5 54.5,1.00002 0,4 z"
+           style="fill:url(#linearGradient4326-7);fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path4518"
+           d="m 127,-153.5 -52.5,0"
+           style="fill:none;stroke:#dae4f0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="szszs"
+           inkscape:connector-curvature="0"
+           d="m 71.5,-166 c 0,-3.5 -3.5,-6 -7.5,-6 -4,0 -7.5,2.5 -7.5,6 0,4.5 1.5,9.5 7.5,9.5 6,0 7.5,-5 7.5,-9.5 z"
+           style="fill:url(#radialGradient4316-7);fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           id="path4516" />
+        <path
+           id="path8350"
+           style="fill:#181818;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 62.5,-165.00002 c -1,0 -1,-0.5 -1,-1 0,-1 1.5,-1.5 2.5,-1.5 1,0 2.5,0.5 2.5,1.5 0,0.5 0,1 -1,1 -1,0 -1,-0.5 -1.5,-0.5 -0.5,0 -0.5,0.5 -1.5,0.5 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sszsszs" />
+        <path
+           id="path4520"
+           style="fill:url(#radialGradient4300-5);fill-opacity:1;stroke:#484c54;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 74.5,-148 c 0,-12 -5,-16.5 -10.5,-16.5 -5.5,0 -10.5,4.5 -10.5,16.5 0,0.5 2.5,1.5 10.5,1.5 8,0 10.5,-1 10.5,-1.5 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="szszs" />
+      </g>
+      <g
+         id="g4693"
+         style="opacity:0.5">
+        <path
+           sodipodi:nodetypes="cccc"
+           style="opacity:0.8;color:#000000;fill:#ffba58;fill-opacity:1;fill-rule:nonzero;stroke:#ff9400;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 20.437504,20.187478 23.062501,-0.43749658 18.562507,20.187478 z"
+           id="path4718"
+           inkscape:connector-curvature="0" />
+        <path
+           transform="matrix(0.37499953,0,0,0.37499953,-17.999951,-24.062471)"
+           d="m 102.49999,118 a 2.4999902,1.9999897 0 1 1 -4.99998,0 2.4999902,1.9999897 0 1 1 4.99998,0 z"
+           sodipodi:ry="1.9999897"
+           sodipodi:rx="2.4999902"
+           sodipodi:cy="118"
+           sodipodi:cx="100"
+           id="path4720"
+           style="color:#000000;fill:#ffba58;fill-opacity:1;fill-rule:nonzero;stroke:#ff9400;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4684"
+           d="M 23.437501,27.874968 23.8125,-0.43749658 20.812504,27.874968 z"
+           style="opacity:0.8;color:#000000;fill:#ffba58;fill-opacity:1;fill-rule:nonzero;stroke:#ff9400;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:nodetypes="cccc" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#ffba58;fill-opacity:1;fill-rule:nonzero;stroke:#ff9400;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path4699"
+           sodipodi:cx="100"
+           sodipodi:cy="118"
+           sodipodi:rx="3.5"
+           sodipodi:ry="2.5"
+           d="m 103.5,118 a 3.5,2.5 0 1 1 -7,0 3.5,2.5 0 1 1 7,0 z"
+           transform="matrix(0.37499953,0,0,0.37499953,-15.374953,-16.374979)" />
+        <path
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0"
+           d="m 99.3,118.1 -32.8,-76.6 26,78 z"
+           style="opacity:0.8;fill:#ffba58;fill-opacity:1;stroke:#ff9400;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           transform="matrix(0.37499953,0,0,0.37499953,2.9999963e-5,-15.999977)"
+           id="path4690" />
+        <path
+           transform="matrix(0.37499953,0,0,0.37499953,-1.4999681,-15.624977)"
+           d="m 103.5,118 a 3.5,2.5 0 1 1 -7,0 3.5,2.5 0 1 1 7,0 z"
+           sodipodi:ry="2.5"
+           sodipodi:rx="3.5"
+           sodipodi:cy="118"
+           sodipodi:cx="100"
+           id="path4688"
+           style="color:#000000;fill:#ffba58;fill-opacity:1;fill-rule:nonzero;stroke:#ff9400;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/64x64/vpView.png"
+       inkscape:label="#icon_64"
+       id="icon_64"
+       transform="matrix(1.333335,0,0,1.333335,128,-58.66672)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect19579"
+         y="-16"
+         x="0"
+         height="48"
+         width="48" />
+      <g
+         id="g19673"
+         transform="translate(-11,37.499981)">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient19739);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 47.62494,9.7500668 32.71875,11.875 l 2.75,1.6875 12.15619,-2.312435 z"
+           transform="translate(11,-53.5)"
+           id="path19675" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19677"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           id="path19679"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient19741);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 24.21875,12.84375 -23.84375047,4.406307 0,2.124963 L 26.96875,15.25 z"
+           transform="translate(11,-53.5)"
+           id="path19681" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19683"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssss"
+           inkscape:connector-curvature="0"
+           id="path19685"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           style="color:#000000;fill:url(#radialGradient19743);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path19687"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:url(#linearGradient19745);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.74999905;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           id="path19689"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssss" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path3471"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path19691"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           style="color:#000000;fill:url(#radialGradient19749);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+      <g
+         transform="translate(0.18746792,-0.18747041)"
+         id="g11872-8">
+        <path
+           id="path11885-7"
+           style="color:#000000;fill:url(#linearGradient11887-44);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,31.062471 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           sodipodi:nodetypes="sccccs"
+           inkscape:connector-curvature="0"
+           d="m 12.937518,26.562475 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           style="color:#000000;fill:url(#linearGradient11883-3);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path11881-63" />
+        <path
+           id="path11109-7-5"
+           style="color:#000000;fill:url(#linearGradient11870-9);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,22.062479 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           transform="matrix(2.9999963,0,0,2.9999963,108.9374,-453.81193)"
+           d="m -29.5,156 a 2.5,1.1250012 0 1 1 -5,0 2.5,1.1250012 0 1 1 5,0 z"
+           sodipodi:ry="1.1250012"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099-5-0"
+           style="color:#000000;fill:url(#linearGradient11763-7);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.25;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/48x48/vpView.png"
+       inkscape:label="#icon_48"
+       id="icon_48"
+       transform="translate(128,1.9e-5)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8868-6"
+         y="-16"
+         x="0"
+         height="48"
+         width="48" />
+      <g
+         transform="matrix(1.0000012,0,0,1.0000012,-0.93753393,-3.8125254)"
+         id="g11872-9-1">
+        <path
+           style="color:#000000;fill:url(#linearGradient4310);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.437531,25.812475 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+           id="path4308"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cssscc" />
+        <path
+           sodipodi:nodetypes="cssscc"
+           inkscape:connector-curvature="0"
+           id="path4304"
+           d="m 5.437531,21.812479 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+           style="color:#000000;fill:url(#linearGradient4306);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#linearGradient4302);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.437531,17.812483 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+           id="path11109-7-8-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cssscc" />
+        <path
+           transform="matrix(2.9999963,0,0,2.9999963,108.9374,-450.18693)"
+           d="m -29.5,156 a 2.5,1.1666679 0 1 1 -5,0 2.5,1.1666679 0 1 1 5,0 z"
+           sodipodi:ry="1.1666679"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099-5-5-4"
+           style="color:#000000;fill:url(#linearGradient4214);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.33333334;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         id="g14257"
+         transform="translate(-11,37.499981)">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient14137-8);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.5,9.90625 -14.78125,1.96875 2.75,1.6875 12.03125,-2.15625 0,-1.5 z"
+           transform="translate(11,-53.5)"
+           id="path13921" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path13923"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           id="path14216"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient14317-7);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 24.21875,12.84375 0.5,17.0625 l 0,2.125 26.46875,-3.9375 -2.75,-2.40625 z"
+           transform="translate(11,-53.5)"
+           id="path13919" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path13925"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssss"
+           inkscape:connector-curvature="0"
+           id="path13929"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           style="color:#000000;fill:url(#radialGradient14200-4);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path13927"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:url(#linearGradient14133-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient14210-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           id="path14202"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssss" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path3469"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path13948"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           style="color:#000000;fill:url(#radialGradient14399);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.6666675,0,0,0.6666675,176,10.66664)"
+       id="icon_32"
+       inkscape:label="#icon_32"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/vpView.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="48"
+         height="48"
+         x="0"
+         y="-16"
+         id="rect19757"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         transform="translate(-1.687532,-1.3124702)"
+         id="g11872-9">
+        <path
+           id="path11885-2"
+           style="color:#000000;fill:url(#linearGradient11887-4);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,31.062471 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           sodipodi:nodetypes="sccccs"
+           inkscape:connector-curvature="0"
+           d="m 12.937518,26.562475 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           style="color:#000000;fill:url(#linearGradient11883-5);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path11881-6" />
+        <path
+           id="path11109-7-8"
+           style="color:#000000;fill:url(#linearGradient11870-0);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.937518,22.062479 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sccccs" />
+        <path
+           transform="matrix(2.9999963,0,0,2.9999963,108.9374,-453.81193)"
+           d="m -29.5,156 a 2.5,1.1250012 0 1 1 -5,0 2.5,1.1250012 0 1 1 5,0 z"
+           sodipodi:ry="1.1250012"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099-5-5"
+           style="color:#000000;fill:url(#linearGradient6806);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         transform="translate(-11,37.499981)"
+         id="g19851">
+        <path
+           id="path19853"
+           transform="translate(11,-53.5)"
+           d="M 47.249941,9.9000666 32.71875,11.875 l 2.75,1.6875 11.781191,-2.162435 z"
+           style="color:#000000;fill:url(#linearGradient19917);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999835;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999835;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           id="path19855"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19857"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path19859"
+           transform="translate(11,-53.5)"
+           d="m 24.21875,12.84375 -23.46875094,4.256308 0,2.099997 L 26.96875,15.25 z"
+           style="color:#000000;fill:url(#linearGradient19919);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999835;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999835;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           id="path19861"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19921);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999835;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           id="path19863"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssss" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19923);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.34999835;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path19865"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="ssssss"
+           inkscape:connector-curvature="0"
+           id="path19867"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           style="color:#000000;fill:url(#radialGradient19925);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path3473"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1.34999835;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19927);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.34999835;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           id="path19869"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/vpView.png"
+       inkscape:label="#icon_16"
+       id="icon_16"
+       transform="translate(176,-31.99998)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8868"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <g
+         id="g11122"
+         transform="translate(36,-50.00002)">
+        <path
+           style="color:#000000;fill:url(#linearGradient11128-0);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -29.5,80 c 0,0.82843 -1.119288,1.5 -2.5,1.5 -1.380712,0 -2.5,-0.67157 -2.5,-1.5 l 0,-2 5,0 z"
+           id="path11114"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssccs" />
+        <path
+           sodipodi:nodetypes="sssccs"
+           inkscape:connector-curvature="0"
+           id="path11109"
+           d="m -29.5,156 c 0,0.82843 -1.119288,1.5 -2.5,1.5 -1.380712,0 -2.5,-0.67157 -2.5,-1.5 l 0,-2 5,0 z"
+           style="color:#000000;fill:url(#linearGradient11132-4);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           transform="translate(0,-78)" />
+        <path
+           transform="translate(0,-80)"
+           d="m -29.5,156 a 2.5,1.5 0 1 1 -5,0 2.5,1.5 0 1 1 5,0 z"
+           sodipodi:ry="1.5"
+           sodipodi:rx="2.5"
+           sodipodi:cy="156"
+           sodipodi:cx="-32"
+           id="path11099"
+           style="color:#000000;fill:url(#linearGradient11554);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         transform="matrix(0.33333,0,0,0.33333,-3.6665496,33.833227)"
+         id="g18155">
+        <path
+           id="path18157"
+           d="m 57.433933,-42.502982 -14.908438,2.236966 1.68933,0.659976 13.219108,-2.457597 z"
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:2.70002699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:2.70002699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 23.056495,-34.768536 9.137149,-8.032301"
+           id="path18159"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           id="path18163"
+           d="m 36.412004,-39.595579 -23.879083,4.153328 0,0.605074 25.10437,-3.810575 z"
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:2.70002699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:2.70002699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.454095,-45.214685 -1.274969,-4.373934"
+           id="path18165"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:2.10002089;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           id="path18167"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssss" />
+        <path
+           style="color:#000000;fill:url(#linearGradient18227-5-4-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.80001795;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path18169"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="ssssss"
+           inkscape:connector-curvature="0"
+           id="path18171"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -2.157239,-1.985917 -2.626213,-2.469316 -1.288965,-1.328612 4.369783,-6.174866 6.603683,-4.424974 z"
+           style="color:#000000;fill:url(#radialGradient18728-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path3475"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1.80001795;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.80001795;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           id="path18173"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/Icons/app-vsPlay.svg b/Icons/app-vsPlay.svg
new file mode 100644
index 00000000..00553071
--- /dev/null
+++ b/Icons/app-vsPlay.svg
@@ -0,0 +1,2843 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="208"
+   height="128"
+   id="svg18874"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="app-vsPlay.svg">
+  <defs
+     id="defs18876">
+    <linearGradient
+       id="linearGradient17275"
+       inkscape:collect="always">
+      <stop
+         id="stop17277"
+         offset="0"
+         style="stop-color:#685b48;stop-opacity:1;" />
+      <stop
+         id="stop17279"
+         offset="1"
+         style="stop-color:#4a3e26;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16401">
+      <stop
+         id="stop16403"
+         offset="0"
+         style="stop-color:#dcd2d0;stop-opacity:1;" />
+      <stop
+         style="stop-color:#4c433a;stop-opacity:1"
+         offset="0.5"
+         id="stop16405" />
+      <stop
+         id="stop16407"
+         offset="1"
+         style="stop-color:#1b170c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16391">
+      <stop
+         id="stop16393"
+         offset="0"
+         style="stop-color:#524a25;stop-opacity:1;" />
+      <stop
+         style="stop-color:#49411c;stop-opacity:1;"
+         offset="0.18679009"
+         id="stop16395" />
+      <stop
+         style="stop-color:#39310d;stop-opacity:1"
+         offset="0.37358019"
+         id="stop16397" />
+      <stop
+         id="stop16399"
+         offset="1"
+         style="stop-color:#2e2601;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16385"
+       inkscape:collect="always">
+      <stop
+         id="stop16387"
+         offset="0"
+         style="stop-color:#766052;stop-opacity:1" />
+      <stop
+         id="stop16389"
+         offset="1"
+         style="stop-color:#311f1d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16379"
+       inkscape:collect="always">
+      <stop
+         id="stop16381"
+         offset="0"
+         style="stop-color:#a6988b;stop-opacity:1;" />
+      <stop
+         id="stop16383"
+         offset="1"
+         style="stop-color:#756d60;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16373"
+       inkscape:collect="always">
+      <stop
+         id="stop16375"
+         offset="0"
+         style="stop-color:#bdad93;stop-opacity:1;" />
+      <stop
+         id="stop16377"
+         offset="1"
+         style="stop-color:#6c5c43;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16367"
+       inkscape:collect="always">
+      <stop
+         id="stop16369"
+         offset="0"
+         style="stop-color:#4b3828;stop-opacity:1;" />
+      <stop
+         id="stop16371"
+         offset="1"
+         style="stop-color:#352a18;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16357">
+      <stop
+         id="stop16359"
+         offset="0"
+         style="stop-color:#b7c6d9;stop-opacity:0;" />
+      <stop
+         style="stop-color:#b7c6d9;stop-opacity:0;"
+         offset="0.5"
+         id="stop16361" />
+      <stop
+         id="stop16363"
+         offset="0.75"
+         style="stop-color:#b7c6d9;stop-opacity:0.37583894;" />
+      <stop
+         id="stop16365"
+         offset="1"
+         style="stop-color:#b7c6d9;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16345">
+      <stop
+         id="stop16347"
+         offset="0"
+         style="stop-color:#b7c6d9;stop-opacity:1;" />
+      <stop
+         style="stop-color:#b7c6d9;stop-opacity:0.43921569;"
+         offset="0.5"
+         id="stop16349" />
+      <stop
+         id="stop16351"
+         offset="0.75"
+         style="stop-color:#b7c6d9;stop-opacity:0.15686275;" />
+      <stop
+         style="stop-color:#b7c6d9;stop-opacity:0.04705882;"
+         offset="0.875"
+         id="stop16353" />
+      <stop
+         id="stop16355"
+         offset="1"
+         style="stop-color:#b7c6d9;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16339">
+      <stop
+         style="stop-color:#b7c6d9;stop-opacity:1;"
+         offset="0"
+         id="stop16341" />
+      <stop
+         style="stop-color:#b7c6d9;stop-opacity:0;"
+         offset="1"
+         id="stop16343" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15371">
+      <stop
+         id="stop15373"
+         offset="0"
+         style="stop-color:#d1f0c2;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d1f0c2;stop-opacity:1;"
+         offset="0.5"
+         id="stop15375" />
+      <stop
+         id="stop15377"
+         offset="1"
+         style="stop-color:#d1f0c2;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14204">
+      <stop
+         style="stop-color:#6f6f58;stop-opacity:0"
+         offset="0"
+         id="stop14206" />
+      <stop
+         id="stop14212"
+         offset="0.5"
+         style="stop-color:#6f6f58;stop-opacity:0;" />
+      <stop
+         style="stop-color:#6f6f58;stop-opacity:1;"
+         offset="1"
+         id="stop14208" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient8978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient8980"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient8978-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3,0,0,3,-1,-160.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient8980-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3,0,0,3,-1,-142.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879"
+       id="SG_GREEN_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6305-3-0"
+         style="stop-color:#d1f0c2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6307-0-29"
+         style="stop-color:#66cc33;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="SG_BLACK_1">
+      <stop
+         style="stop-color:#111111;stop-opacity:1;"
+         offset="0"
+         id="stop3900-0" />
+      <stop
+         style="stop-color:#434343;stop-opacity:1;"
+         offset="1"
+         id="stop3902-39" />
+    </linearGradient>
+    <linearGradient
+       id="SG_GRAYBLUE_1">
+      <stop
+         style="stop-color:#b7c6d9;stop-opacity:1;"
+         offset="0"
+         id="stop27541" />
+      <stop
+         id="stop27597"
+         offset="0.5"
+         style="stop-color:#788596;stop-opacity:1;" />
+      <stop
+         style="stop-color:#6e7c8d;stop-opacity:1"
+         offset="0.75"
+         id="stop27599" />
+      <stop
+         style="stop-color:#576270;stop-opacity:1;"
+         offset="1"
+         id="stop27543" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(0,-16.000019)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient13662-5"
+       gradientUnits="userSpaceOnUse"
+       x1="22.015011"
+       y1="19.815565"
+       x2="22.227951"
+       y2="17.671274" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter13642-8"
+       x="-0.027672652"
+       width="1.0553453"
+       y="-0.18083484"
+       height="1.3616697">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.10521373"
+         id="feGaussianBlur13644-5" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(0,-16.000019)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient12239-9-2"
+       x1="18.140011"
+       y1="22.628065"
+       x2="17.477951"
+       y2="19.921274"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter13595-8">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.13849716"
+         id="feGaussianBlur13597-7" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16357"
+       id="radialGradient13566-2"
+       cx="19.861277"
+       cy="17.381275"
+       fx="19.861277"
+       fy="17.381275"
+       r="7.7812505"
+       gradientTransform="matrix(1.9531012,-0.0257675,0.018029,1.3665495,-17.948197,-21.724428)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter13568-0">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.23642872"
+         id="feGaussianBlur13570-3" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(0,-16.000019)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient12282-7"
+       x1="19.113462"
+       y1="34.869453"
+       x2="19.683861"
+       y2="28.994453"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter12383-2">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.23004167"
+         id="feGaussianBlur12385-3" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(0,-16.000019)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient12239-5"
+       x1="24.390011"
+       y1="48.753067"
+       x2="25.665451"
+       y2="41.858776"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter12379-1">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.15621412"
+         id="feGaussianBlur12381-7" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16357"
+       id="radialGradient12309-8"
+       cx="27.437141"
+       cy="33.426018"
+       fx="27.437141"
+       fy="33.426018"
+       r="6.8295865"
+       gradientTransform="matrix(1.6140928,-0.63425299,0.39437033,1.0036219,-30.860428,2.8525346)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter12371-9">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.19614908"
+         id="feGaussianBlur12373-4" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(0,-16.000019)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient16345"
+       id="linearGradient12239-4-1"
+       x1="39.30175"
+       y1="37.842846"
+       x2="35.655174"
+       y2="42.393547"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter12375-7">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.16843614"
+         id="feGaussianBlur12377-3" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter12426-5">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.17413388"
+         id="feGaussianBlur12428-0" />
+    </filter>
+    <linearGradient
+       gradientTransform="translate(0,-16.000019)"
+       y2="41.858772"
+       x2="36.44883"
+       y1="42.742661"
+       x1="47.901314"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13751"
+       xlink:href="#linearGradient16339"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="343.66751"
+       y1="122.48"
+       x2="332.00931"
+       y2="108.939"
+       id="SG_GRAY_2"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6371-1-1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6373-2-8"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6375-7-1"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.73286879" />
+      <stop
+         id="stop6377-4-1"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.90309668" />
+      <stop
+         id="stop6379-7-5"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="359.05081"
+       y1="122.8501"
+       x2="346.7869"
+       y2="108.6055"
+       id="SG_GRAY_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6630-5-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6632-5"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6634-2-5"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.51010001" />
+      <stop
+         id="stop6636-90"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop6638-2-8"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient14137-8"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient14317-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient14200-4"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient14133-3"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient14210-2"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="2.1355548"
+       fy="77.608032"
+       fx="-151.26682"
+       cy="77.608032"
+       cx="-151.26682"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient14399"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16367"
+       id="linearGradient14555-5"
+       x1="33.09375"
+       y1="44.46875"
+       x2="32.90625"
+       y2="45.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16401"
+       id="linearGradient14598-7"
+       x1="23.306034"
+       y1="16.804766"
+       x2="25.131701"
+       y2="17.945391"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16391"
+       id="linearGradient14610-5"
+       x1="20.855797"
+       y1="37.477913"
+       x2="21.633329"
+       y2="40.352913"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16401"
+       id="linearGradient14618-2"
+       gradientUnits="userSpaceOnUse"
+       x1="23.571199"
+       y1="16.583796"
+       x2="25.175896"
+       y2="18.475721"
+       gradientTransform="translate(-2.219131,5.8807427)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16385"
+       id="linearGradient14832-8"
+       x1="28.806702"
+       y1="29.899004"
+       x2="26.924299"
+       y2="32.118977"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter14893-9"
+       x="-0.090544067"
+       width="1.1810881"
+       y="-0.1778625"
+       height="1.355725">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.13310025"
+         id="feGaussianBlur14895-3" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16379"
+       id="linearGradient14711-8-6"
+       x1="33.380337"
+       y1="30.742245"
+       x2="38.079845"
+       y2="32.429745"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient17275"
+       id="linearGradient14726-3-4"
+       x1="31.544201"
+       y1="31.991829"
+       x2="39.861095"
+       y2="34.023079"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter14820-6">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.17642133"
+         id="feGaussianBlur14822-4" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16373"
+       id="linearGradient14641-1"
+       x1="35.688416"
+       y1="34.630272"
+       x2="38.461941"
+       y2="34.630272"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter14691-4"
+       x="-0.05045481"
+       width="1.1009096"
+       y="-0.12565874"
+       height="1.2513175">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.16721641"
+         id="feGaussianBlur14693-9" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient14535-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5714285,0,0,1.5714285,-242.58928,-172.36528)"
+       x1="162.64774"
+       y1="122.41428"
+       x2="169.96591"
+       y2="133.55064" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15371"
+       id="radialGradient14543-1"
+       cx="20.82353"
+       cy="35.111259"
+       fx="20.82353"
+       fy="35.111259"
+       r="6"
+       gradientTransform="matrix(1.4093673,-0.84561977,0.74999985,1.2500007,-33.181442,10.719694)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient18227-5-4-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient18728-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1326893,0.10986245,-0.05157623,0.53175443,212.48813,-65.944457)"
+       cx="-143.17728"
+       cy="82.496986"
+       fx="-143.17728"
+       fy="82.496986"
+       r="10.547367" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient15369-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.78571426,0,0,0.78571426,-124.04464,-73.68266)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="168.05682"
+       y2="131.32336" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.696667"
+       fx="1.6416262"
+       cy="25.696667"
+       cx="1.6416262"
+       gradientTransform="matrix(1.3429281,-0.51651066,0.76449174,1.9876791,-16.349476,-27.228832)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient19188"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient19389"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3,0,0,3,-1,-160.00002)"
+       x1="5.4583392"
+       y1="55.000004"
+       x2="3.4583416"
+       y2="49.500011" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient19391"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3,0,0,3,-1,-142.00002)"
+       x1="5.4583392"
+       y1="54.999996"
+       x2="3.4583395"
+       y2="49.500004" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19393"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="47.901314"
+       y1="42.742661"
+       x2="36.44883"
+       y2="41.858772" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16357"
+       id="radialGradient19395"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.9531012,-0.0257675,0.018029,1.3665495,-17.948197,-21.724428)"
+       cx="19.861277"
+       cy="17.381275"
+       fx="19.861277"
+       fy="17.381275"
+       r="7.7812505" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19397"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="18.140011"
+       y1="22.628065"
+       x2="17.477951"
+       y2="19.921274" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19399"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="22.015011"
+       y1="19.815565"
+       x2="22.227951"
+       y2="17.671274" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16357"
+       id="radialGradient19401"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6140928,-0.63425299,0.39437033,1.0036219,-30.860428,2.8525346)"
+       cx="27.437141"
+       cy="33.426018"
+       fx="27.437141"
+       fy="33.426018"
+       r="6.8295865" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19403"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="24.390011"
+       y1="48.753067"
+       x2="25.665451"
+       y2="41.858776" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19405"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="19.113462"
+       y1="34.869453"
+       x2="19.683861"
+       y2="28.994453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16345"
+       id="linearGradient19407"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       spreadMethod="reflect"
+       x1="39.30175"
+       y1="37.842846"
+       x2="35.655174"
+       y2="42.393547" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16367"
+       id="linearGradient19409"
+       gradientUnits="userSpaceOnUse"
+       x1="33.09375"
+       y1="44.46875"
+       x2="32.90625"
+       y2="45.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16401"
+       id="linearGradient19411"
+       gradientUnits="userSpaceOnUse"
+       x1="23.306034"
+       y1="16.804766"
+       x2="25.131701"
+       y2="17.945391" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16391"
+       id="linearGradient19413"
+       gradientUnits="userSpaceOnUse"
+       x1="20.855797"
+       y1="37.477913"
+       x2="21.633329"
+       y2="40.352913" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16401"
+       id="linearGradient19415"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2.219131,5.8807427)"
+       x1="23.571199"
+       y1="16.583796"
+       x2="25.175896"
+       y2="18.475721" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16385"
+       id="linearGradient19417"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="28.806702"
+       y1="29.899004"
+       x2="26.924299"
+       y2="32.118977" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16379"
+       id="linearGradient19419"
+       gradientUnits="userSpaceOnUse"
+       x1="33.380337"
+       y1="30.742245"
+       x2="38.079845"
+       y2="32.429745" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient17275"
+       id="linearGradient19421"
+       gradientUnits="userSpaceOnUse"
+       x1="31.544201"
+       y1="31.991829"
+       x2="39.861095"
+       y2="34.023079" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16373"
+       id="linearGradient19423"
+       gradientUnits="userSpaceOnUse"
+       x1="35.688416"
+       y1="34.630272"
+       x2="38.461941"
+       y2="34.630272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19425"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19427"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19429"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient19431"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient19433"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19435"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       cx="-151.26682"
+       cy="77.608032"
+       fx="-151.26682"
+       fy="77.608032"
+       r="2.1355548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient19437"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5714285,0,0,1.5714285,-242.58928,-172.36528)"
+       x1="162.64774"
+       y1="122.41428"
+       x2="169.96591"
+       y2="133.55064" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15371"
+       id="radialGradient19439"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4093673,-0.84561977,0.74999985,1.2500007,-33.181442,10.719694)"
+       cx="20.82353"
+       cy="35.111259"
+       fx="20.82353"
+       fy="35.111259"
+       r="6" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient19703"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3,0,0,3,-1,-160.00002)"
+       x1="5.4583392"
+       y1="55.000004"
+       x2="3.4583416"
+       y2="49.500011" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient19705"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3,0,0,3,-1,-142.00002)"
+       x1="5.4583392"
+       y1="54.999996"
+       x2="3.4583395"
+       y2="49.500004" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19707"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="47.901314"
+       y1="42.742661"
+       x2="36.44883"
+       y2="41.858772" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16357"
+       id="radialGradient19709"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.9531012,-0.0257675,0.018029,1.3665495,-17.948197,-21.724428)"
+       cx="19.861277"
+       cy="17.381275"
+       fx="19.861277"
+       fy="17.381275"
+       r="7.7812505" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19711"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="18.140011"
+       y1="22.628065"
+       x2="17.477951"
+       y2="19.921274" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19713"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="22.015011"
+       y1="19.815565"
+       x2="22.227951"
+       y2="17.671274" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16357"
+       id="radialGradient19715"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6140928,-0.63425299,0.39437033,1.0036219,-30.860428,2.8525346)"
+       cx="27.437141"
+       cy="33.426018"
+       fx="27.437141"
+       fy="33.426018"
+       r="6.8295865" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19717"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="24.390011"
+       y1="48.753067"
+       x2="25.665451"
+       y2="41.858776" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16339"
+       id="linearGradient19719"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       x1="19.113462"
+       y1="34.869453"
+       x2="19.683861"
+       y2="28.994453" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16345"
+       id="linearGradient19721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-16.000019)"
+       spreadMethod="reflect"
+       x1="39.30175"
+       y1="37.842846"
+       x2="35.655174"
+       y2="42.393547" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16367"
+       id="linearGradient19723"
+       gradientUnits="userSpaceOnUse"
+       x1="33.09375"
+       y1="44.46875"
+       x2="32.90625"
+       y2="45.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16401"
+       id="linearGradient19725"
+       gradientUnits="userSpaceOnUse"
+       x1="23.306034"
+       y1="16.804766"
+       x2="25.131701"
+       y2="17.945391" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16391"
+       id="linearGradient19727"
+       gradientUnits="userSpaceOnUse"
+       x1="20.855797"
+       y1="37.477913"
+       x2="21.633329"
+       y2="40.352913" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16401"
+       id="linearGradient19729"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2.219131,5.8807427)"
+       x1="23.571199"
+       y1="16.583796"
+       x2="25.175896"
+       y2="18.475721" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16385"
+       id="linearGradient19731"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="28.806702"
+       y1="29.899004"
+       x2="26.924299"
+       y2="32.118977" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16379"
+       id="linearGradient19733"
+       gradientUnits="userSpaceOnUse"
+       x1="33.380337"
+       y1="30.742245"
+       x2="38.079845"
+       y2="32.429745" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient17275"
+       id="linearGradient19735"
+       gradientUnits="userSpaceOnUse"
+       x1="31.544201"
+       y1="31.991829"
+       x2="39.861095"
+       y2="34.023079" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient16373"
+       id="linearGradient19737"
+       gradientUnits="userSpaceOnUse"
+       x1="35.688416"
+       y1="34.630272"
+       x2="38.461941"
+       y2="34.630272" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19739"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19741"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19743"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient19745"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient19747"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       cx="-151.26682"
+       cy="77.608032"
+       fx="-151.26682"
+       fy="77.608032"
+       r="2.1355548" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient19751"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5714285,0,0,1.5714285,-242.58928,-172.36528)"
+       x1="162.64774"
+       y1="122.41428"
+       x2="169.96591"
+       y2="133.55064" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15371"
+       id="radialGradient19753"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4093673,-0.84561977,0.74999985,1.2500007,-33.181442,10.719694)"
+       cx="20.82353"
+       cy="35.111259"
+       fx="20.82353"
+       fy="35.111259"
+       r="6" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient19881"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3,0,0,3,-1,-160.00002)"
+       x1="5.4583392"
+       y1="55.000004"
+       x2="3.4583416"
+       y2="49.500011" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient19883"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3,0,0,3,-1,-142.00002)"
+       x1="5.4583392"
+       y1="54.999996"
+       x2="3.4583395"
+       y2="49.500004" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19917"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-141.15771"
+       y1="80.008202"
+       x2="-141.42906"
+       y2="78.070702" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient19919"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(179,-66.5)"
+       x1="-157.21254"
+       y1="78.955887"
+       x2="-156.69867"
+       y2="82.535614" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19921"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9157334,-0.02913976,0.01220173,0.38344632,176.94143,-69.901203)"
+       cx="-142.24686"
+       cy="87.848862"
+       fx="-142.24686"
+       fy="87.848862"
+       r="3.9532878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient19923"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(190,-140)"
+       x1="-151.36368"
+       y1="100.31637"
+       x2="-145.9137"
+       y2="91.831085" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14204"
+       id="radialGradient19925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0492986,-0.02898385,0.01732716,0.62729296,194.82734,-93.782187)"
+       cx="-142.63937"
+       cy="84.511887"
+       fx="-142.63937"
+       fy="84.511887"
+       r="10.547367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient19927"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0107413,-0.02460182,0.01574161,0.64672806,190.40465,-96.505124)"
+       cx="-151.26682"
+       cy="77.608032"
+       fx="-151.26682"
+       fy="77.608032"
+       r="2.1355548" />
+    <radialGradient
+       r="4.8401699"
+       fy="18.498997"
+       fx="11.69618"
+       cy="18.498997"
+       cx="11.69618"
+       gradientTransform="matrix(3.8670432,-2.1814095,3.4089675,6.0431679,-94.792128,-82.778352)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient19188-5"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient15369-8-93"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.78571426,0,0,0.78571426,-124.04464,-73.68266)"
+       x1="174.10225"
+       y1="106.82343"
+       x2="185.55679"
+       y2="124.00522" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="104"
+     inkscape:cy="64"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1127"
+     inkscape:window-x="-4"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid19743"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata18879">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,80)">
+    <g
+       transform="matrix(2.66667,0,0,2.66667,-8e-5,-37.333341)"
+       id="icon_128"
+       inkscape:label="#icon_128"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/128x128/vsPlay.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="48"
+         height="48"
+         x="0"
+         y="-16"
+         id="rect19265"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g19267">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750258,-11.499983 0,35.999955"
+           id="path19269"
+           sodipodi:nodetypes="cc" />
+        <rect
+           style="fill:url(#linearGradient19389);fill-opacity:1;stroke:#000000;stroke-width:2.99999619;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect19271"
+           width="20.999973"
+           height="17.999977"
+           x="9.3750248"
+           y="-11.499983" />
+        <rect
+           y="6.4999948"
+           x="9.3750181"
+           height="17.999977"
+           width="20.999973"
+           id="rect19273"
+           style="fill:url(#linearGradient19391);fill-opacity:1;stroke:#000000;stroke-width:2.99999619;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path19275"
+           d="m 36.374991,-11.499983 0,35.999955"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750324,-8.4999865 5.9999925,0"
+           id="path19277"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19279"
+           d="m 3.3750324,-2.499994 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750324,3.4999985 5.9999925,0"
+           id="path19281"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19283"
+           d="m 3.3750324,9.499991 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750324,15.499984 5.9999925,0"
+           id="path19285"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19287"
+           d="m 3.375032,21.499976 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19289"
+           d="m 30.374999,-8.4999865 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,-2.499994 5.999992,0"
+           id="path19291"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19293"
+           d="m 30.374999,3.4999985 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,9.499991 5.999992,0"
+           id="path19295"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19297"
+           d="m 30.374999,15.499984 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,21.499976 5.999992,0"
+           id="path19299"
+           sodipodi:nodetypes="cc" />
+      </g>
+      <g
+         id="g19301">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#576270;fill-opacity:1;stroke:none"
+           d="m 42.937476,30.499965 -25.499968,0 c 1.5,-2.5 8.562492,-4.499984 3.062492,-8.499984 -5.503549,-4.002581 -9,-9.5 -9,-14.5 0,-5.182584 12,-6.744933 12,-8 0,-1 -4.937491,-1.9374738 -6.437491,-2.9374738 l 6.374992,0 c 3,0.5 8.062499,1.4374738 8.062499,2.9374738 0,1.352742 -5,2.043705 -5,5 0,3 4.467761,9.48388 14.5,14.5 10,5 3.437476,9.999984 1.937476,11.499984 z"
+           id="path19303"
+           sodipodi:nodetypes="cczzzcczzzc" />
+        <path
+           sodipodi:nodetypes="cscc"
+           inkscape:connector-curvature="0"
+           id="path19305"
+           d="m 37.58839,27.393826 c 2.820295,0.998661 7.161822,1.66802 7.401769,-0.921865 0.204808,-2.210606 -3.738578,-1.002012 -8.17047,-5.32175 -1.729513,3.159983 -4.953201,6.145266 0.768701,6.243615 z"
+           style="color:#000000;fill:url(#linearGradient19393);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12426-5);enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="csscc"
+           inkscape:connector-curvature="0"
+           id="path19307"
+           d="m 11.687501,7.6874792 c 1.679613,0.594433 3.426505,1.556021 4.691277,2.8260238 1.325795,1.331277 3.283756,1.262435 5.063395,0.815867 3.081601,-0.773272 3.29337,-3.8990658 5.807829,-4.2043878 C 25.562503,1.7499856 11.875001,2.8124796 11.687501,7.6874792 z"
+           style="color:#000000;fill:url(#radialGradient19395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13568-0);enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="csc"
+           inkscape:connector-curvature="0"
+           id="path19309"
+           d="m 12.375001,5.7499792 c 1.599343,0.25688 4.563166,0.375314 5.990942,-0.7654616 0.593468,-0.474174 2.555991,-0.870334 3.634058,-0.859504 -1.0625,-5.12496604 -7.75,-0.937534 -9.625,1.6249656 z"
+           style="color:#000000;fill:url(#linearGradient19397);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13595-8);enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="cscsc"
+           inkscape:connector-curvature="0"
+           id="path19311"
+           d="m 18.250001,2.1249796 c 2.240047,-0.06599 3.610559,1.611483 5.874277,1.379237 1.426822,-0.146385 1.905467,-0.910094 3.250715,-0.87925 C 30.812485,0.93745356 28.187501,0.43747956 25.875001,-2.0436748e-5 23.562501,-0.43752044 22.250001,0.43747956 18.250001,2.1249796 z"
+           style="color:#000000;fill:url(#linearGradient19399);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13642-8);enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="csscsc"
+           inkscape:connector-curvature="0"
+           id="path19313"
+           d="m 22.406251,25.062481 c 0.936427,-0.08148 4.500858,-0.135827 5.919103,0.613676 0.85724,0.453028 3.634121,-0.531456 3.917608,-1.870784 0.309536,-1.462395 1.608322,-3.133949 2.882022,-3.68039 -2.406268,0.250003 -10.218733,-0.968753 -12.687483,0.281247 -2.46875,1.250001 0.625,2.781251 -0.03125,4.656251 z"
+           style="color:#000000;fill:url(#radialGradient19401);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12371-9);enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="csc"
+           inkscape:connector-curvature="0"
+           id="path19315"
+           d="m 21.031251,27.343731 c 1.718254,0.097 2.532337,1.993862 4.040907,2.143896 1.543651,0.153523 4.077628,-1.804297 5.896593,-1.768839 0,0 -1.4375,-3.937557 -4.9375,-3.906307 -3.5,0.03125 -5,3.53125 -5,3.53125 z"
+           style="color:#000000;fill:url(#linearGradient19403);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12379-1);enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="cscsscsc"
+           inkscape:connector-curvature="0"
+           id="path19317"
+           d="m 21.831923,12.421961 c 0.420977,1.443111 2.049355,2.707189 3.858585,2.965539 1.275693,0.182164 3.39318,1.168217 4.055853,2.211279 -0.292556,0.298582 -2.994482,1.507744 -4.71267,1.633775 -1.236979,0.09073 -3.464922,-0.317193 -4.713715,-1.384235 -1.428107,-1.220259 -3.990496,-1.217801 -5.319979,-1.160841 -2.028226,-2.761751 0.927795,-2.133371 1.676829,-3.46281 0.766225,-1.359951 3.200946,-1.675516 5.155097,-0.802707 z"
+           style="color:#000000;fill:url(#linearGradient19405);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12383-2);enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="cssscsssc"
+           inkscape:connector-curvature="0"
+           id="path19319"
+           d="m 34.515627,20.465311 c -0.04535,1.249695 0.48422,1.366551 0.419186,2.391226 -0.0749,1.180128 -0.28753,1.695807 -1.227689,2.270846 -0.743183,0.454561 -1.890737,1.278934 -1.698109,2.212226 0.145092,0.702981 0.743023,1.244132 1.860678,1.237352 -0.580598,-1.242188 1.218568,-1.965712 2.754455,-2.63768 0.995259,-0.435437 1.399404,-0.463836 1.904392,-2.011654 0.298265,-0.914196 -0.278427,-1.984763 -1.096074,-2.401666 -1.167219,-0.595144 -2.401325,-1.01161 -2.916839,-1.06065 z"
+           style="color:#000000;fill:url(#linearGradient19407);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12375-7);enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cczzzcczzzc"
+           id="path19321"
+           d="m 42.937476,30.499965 -25.499968,0 c 1.5,-2.5 8.562492,-4.499984 3.062492,-8.499984 -5.503549,-4.002581 -9,-9.5 -9,-14.5 0,-5.182584 12,-6.744933 12,-8 0,-1 -4.937491,-1.9374738 -6.437491,-2.9374738 l 6.374992,0 c 3,0.5 8.062499,1.4374738 8.062499,2.9374738 0,1.352742 -5,2.043705 -5,5 0,3 4.467761,9.48388 14.5,14.5 10,5 3.437476,9.999984 1.937476,11.499984 z"
+           style="fill:none;stroke:#464f5a;stroke-width:0.37499952;stroke-linejoin:round;stroke-opacity:1" />
+      </g>
+      <g
+         id="g19323"
+         transform="translate(1.5625293e-7,-16.000019)">
+        <path
+           style="fill:url(#linearGradient19409);fill-opacity:1;stroke:#17110d;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="m 30.8125,44.0625 4,-0.875 c 2.00588,0.666667 2.447551,1.333333 3.1875,2 -2.344089,0.979561 -0.971798,2.252609 -5.704505,2.019607 C 31.790042,45.79257 31.179998,44.667503 30.8125,44.0625 z"
+           id="path19325"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19411);fill-opacity:1;fill-rule:nonzero;stroke:#1c180d;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 21.743534,17.594408 c 2.472924,-0.25246 1.701806,0.406931 1.612436,0.716911 0.505313,-0.219453 0.626558,-0.398783 2.806981,-0.09819 -0.407551,-0.824958 -0.228504,-1.846643 -1.502602,-2.474874 -0.54222,-0.267357 -1.342534,1.117035 -2.916815,1.856155 z"
+           id="path19327"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccsc" />
+        <path
+           style="fill:url(#linearGradient19413);fill-opacity:1;stroke:#251f01;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 22.125,40.3125 c 0.487546,0.02002 2.5625,-0.625 2.625,-1 0.125,-0.75 -1.1875,-2.125 -1.875,-2.25 -0.6875,-0.125 -3.303951,0.02314 -3.4375,0.3125 -0.375,0.8125 1.422027,2.885528 2.6875,2.9375 z"
+           id="path19329"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+        <path
+           sodipodi:nodetypes="cccsc"
+           inkscape:connector-curvature="0"
+           id="path19331"
+           d="m 19.656986,23.475151 c 1.58904,0.0127 1.392446,0.539514 2.098571,0.849494 1.300809,0.399265 1.201083,-0.752337 3.381506,-0.451744 -0.407551,-0.824958 -0.979805,-1.669866 -2.695845,-2.253903 -0.572313,-0.194781 -1.209951,1.117035 -2.784232,1.856153 z"
+           style="color:#000000;fill:url(#linearGradient19415);fill-opacity:1;fill-rule:nonzero;stroke:#1c180d;stroke-width:0.37499952px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <g
+           id="g19333">
+          <path
+             sodipodi:nodetypes="sssss"
+             inkscape:connector-curvature="0"
+             id="path19335"
+             d="m 25.739493,31.301638 c 1.980199,0.281663 2.462619,1.304832 3.910563,1.150029 1.447943,-0.154802 3.404518,0.105567 2.995012,-0.995227 -0.570187,-1.532719 -2.060534,-1.857628 -4.176759,-1.393221 -2.116225,0.464407 -3.235442,1.166356 -2.728816,1.238419 z"
+             style="fill:url(#linearGradient19417);fill-opacity:1;stroke:none" />
+          <path
+             style="fill:#3b2825;fill-opacity:1;stroke:none;filter:url(#filter14893-9)"
+             d="m 28.661368,31.395388 c 0.137562,0.805692 0.228244,1.164207 1.176188,1.103154 1.453184,-0.09359 2.423998,0.05921 2.338762,-0.526477 -0.15433,-1.060455 -1.203133,-0.780806 -1.926759,-1.065096 -1.317512,-0.517609 -1.654414,0.10056 -1.588191,0.488419 z"
+             id="path19337"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssss" />
+          <path
+             style="fill:none;stroke:#211517;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 25.739493,31.301638 c 1.980199,0.281663 2.462619,1.304832 3.910563,1.150029 1.447943,-0.154802 3.404518,0.105567 2.995012,-0.995227 -0.570187,-1.532719 -2.060534,-1.857628 -4.176759,-1.393221 -2.116225,0.464407 -3.235442,1.166356 -2.728816,1.238419 z"
+             id="path19339"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssss" />
+        </g>
+        <g
+           id="g19341">
+          <path
+             sodipodi:nodetypes="ssssssssss"
+             inkscape:connector-curvature="0"
+             id="path19343"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.27607,-1.13523 0.562939,-1.888658 0.338664,-0.889461 1.757893,-0.878299 3.141926,-0.903018 1.329906,-0.02375 2.7061,0.216578 3.537798,1.122016 1.008646,1.098075 1.872448,1.489822 3.465953,1.495833 1.338899,0.0051 1.992069,1.471456 1.416985,2.670052 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             style="color:#000000;fill:url(#linearGradient19419);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             style="color:#000000;fill:url(#linearGradient19421);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter14820-6);enable-background:accumulate"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.180518,-2.392025 0.761813,-1.833415 0.327615,0.31483 1.145716,1.469373 2.998295,1.16306 1.589927,-0.262885 0.642804,0.160348 1.39438,0.514346 1.224428,0.576714 3.629167,1.401434 5.222672,1.407445 1.338899,0.0051 2.323525,0.04619 1.748441,1.244789 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             id="path19345"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ssssssssss" />
+          <path
+             style="fill:none;stroke:#302c2b;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.27607,-1.13523 0.562939,-1.888658 0.338664,-0.889461 1.757893,-0.878299 3.141926,-0.903018 1.329906,-0.02375 2.7061,0.216578 3.537798,1.122016 1.008646,1.098075 1.872448,1.489822 3.465953,1.495833 1.338899,0.0051 1.992069,1.471456 1.416985,2.670052 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             id="path19347"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ssssssssss" />
+        </g>
+        <path
+           style="fill:#738d22;fill-opacity:1;stroke:#263a05;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 38.225178,31.229951 c 0.613272,-0.37764 2.142095,-0.753201 2.652607,-0.373491 0.775329,0.576678 0.508739,2.011016 0.448516,2.608562 0.250093,0.256705 0.424041,0.141974 0.742848,0.09549 0.251995,-1.408465 0.48871,-2.129933 1.507731,-2.132999 0.77174,-0.0023 1.532663,0.430354 1.9403,0.775275 -0.411286,-1.608554 -1.276057,-1.849311 -2.578535,-1.953881 -0.0437,-1.057773 0.180939,-1.959729 0.59205,-3.392973 -1.122458,0.105104 -1.25465,1.673912 -1.494908,2.621195 -0.683255,-0.965804 -1.989662,-1.40494 -2.629148,-1.25639 0.05262,0.552196 1.17235,0.99375 1.506917,1.612448 -0.869801,-0.03515 -2.966501,0.04183 -2.688378,1.396764 z"
+           id="path19349"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csccsccccccc" />
+        <g
+           id="g19351"
+           transform="translate(4.25,0.625)">
+          <path
+             sodipodi:nodetypes="sssssss"
+             inkscape:connector-curvature="0"
+             id="path19353"
+             d="m 34.00358,34.614016 c 1.158247,-0.286737 2.259466,-1.807142 3.363992,-1.650892 1.104526,0.156251 3.686118,0.651811 4.632854,0.729936 0.946737,0.07813 0.681572,3.186585 0.523783,3.655336 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.629157,-0.07813 -3.708052,-0.937502 -0.07889,-0.859377 -1.131782,-1.946383 -0.473368,-2.10938 z"
+             style="fill:url(#linearGradient19423);fill-opacity:1;stroke:none" />
+          <path
+             style="fill:#362c21;fill-opacity:1;stroke:none;filter:url(#filter14691-4)"
+             d="m 37.697585,34.678737 c 0.672111,-0.286737 0.270728,-0.08671 1.375254,0.06954 1.104526,0.156251 2.492875,0.254063 3.483805,0.111217 0.940237,-0.135538 0.06285,1.957651 -0.09493,2.426402 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.010439,0.41115 -3.089334,-0.448225 -0.07889,-0.859377 2.040533,-2.205273 2.664414,-2.471436 z"
+             id="path19355"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssssss" />
+          <path
+             style="fill:none;stroke:#201c19;stroke-width:0.37499952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="m 34.00358,34.614016 c 1.158247,-0.286737 2.259466,-1.807142 3.363992,-1.650892 1.104526,0.156251 3.686118,0.651811 4.632854,0.729936 0.946737,0.07813 0.681572,3.186585 0.523783,3.655336 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.629157,-0.07813 -3.708052,-0.937502 -0.07889,-0.859377 -1.131782,-1.946383 -0.473368,-2.10938 z"
+             id="path19357"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssssss" />
+        </g>
+      </g>
+      <g
+         transform="translate(-11,37.499981)"
+         id="g19359">
+        <path
+           id="path19361"
+           transform="translate(11,-53.5)"
+           d="M 47.81247,9.7500278 32.71875,11.875 l 2.75,1.6875 12.34372,-2.312472 z"
+           style="color:#000000;fill:url(#linearGradient19425);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           id="path19363"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19365"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path19367"
+           transform="translate(11,-53.5)"
+           d="m 24.21875,12.84375 -24.03122023,4.40627 0,2.125 L 26.96875,15.25 z"
+           style="color:#000000;fill:url(#linearGradient19427);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           id="path19369"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19429);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           id="path19371"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssss" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19431);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path19373"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="ssssss"
+           inkscape:connector-curvature="0"
+           id="path19375"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           style="color:#000000;fill:url(#radialGradient19433);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19435);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.37499952;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           id="path19377"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+      </g>
+      <g
+         transform="translate(1.5625293e-7,-16.000019)"
+         id="g19379">
+        <path
+           style="fill:url(#linearGradient19437);fill-opacity:1;stroke:none"
+           d="m 13.5,21 0,24 18,-12 z"
+           id="path19381"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cccc"
+           style="opacity:0.5;fill:url(#radialGradient19439);fill-opacity:1;stroke:none"
+           d="m 13.5,40 c 3,-6 7,-10.5 14.5,-9.5 L 13.5,21 z"
+           id="path19383"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#435a36;fill-opacity:0.37647059;stroke:none"
+           d="m 15,44 0,-20 15,10 1.5,-1 -18,-12 0,24 z"
+           id="path19385"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           id="path19387"
+           d="m 13.5,21 0,24 18,-12 z"
+           style="fill:none;stroke:#435a36;stroke-width:0.74999905;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/64x64/vsPlay.png"
+       inkscape:label="#icon_64"
+       id="icon_64"
+       transform="matrix(1.333335,0,0,1.333335,128,-58.66672)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect19579"
+         y="-16"
+         x="0"
+         height="48"
+         width="48" />
+      <g
+         id="g19581">
+        <path
+           sodipodi:nodetypes="cc"
+           id="path19583"
+           d="m 3.3750258,-11.499983 0,35.999955"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="-11.499983"
+           x="9.3750248"
+           height="17.999977"
+           width="20.999973"
+           id="rect19585"
+           style="fill:url(#linearGradient19703);fill-opacity:1;stroke:#000000;stroke-width:2.99999625;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           style="fill:url(#linearGradient19705);fill-opacity:1;stroke:#000000;stroke-width:2.99999625;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect19587"
+           width="20.999973"
+           height="17.999977"
+           x="9.3750181"
+           y="6.4999948" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 36.374991,-11.499983 0,35.999955"
+           id="path19589"
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path19591"
+           d="m 3.3750324,-8.4999865 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750324,-2.499994 5.9999925,0"
+           id="path19593"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path19595"
+           d="m 3.3750324,3.4999985 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750324,9.499991 5.9999925,0"
+           id="path19597"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path19599"
+           d="m 3.3750324,15.499984 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.375032,21.499976 5.9999925,0"
+           id="path19601"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,-8.4999865 5.999992,0"
+           id="path19603"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path19605"
+           d="m 30.374999,-2.499994 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,3.4999985 5.999992,0"
+           id="path19607"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path19609"
+           d="m 30.374999,9.499991 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,15.499984 5.999992,0"
+           id="path19611"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path19613"
+           d="m 30.374999,21.499976 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g19615">
+        <path
+           sodipodi:nodetypes="cczzzcczzzc"
+           id="path19617"
+           d="m 42.937476,30.874965 -25.499968,0 c 1.5,-2.5 8.562492,-4.874984 3.062492,-8.874984 -5.503549,-4.002581 -9,-9.5 -9,-14.5 0,-5.182584 12,-6.744933 12,-8 0,-1 -4.937491,-2.1249365 -6.437491,-3.1249365 l 6.374992,0 c 3,0.5 8.062499,1.6249365 8.062499,3.1249365 0,1.352742 -5,2.043705 -5,5 0,3 4.467761,9.48388 14.5,14.5 10,5 3.437476,10.374984 1.937476,11.874984 z"
+           style="fill:#576270;fill-opacity:1;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19707);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12426-5);enable-background:accumulate"
+           d="m 37.58839,27.393826 c 2.820295,0.998661 7.161822,1.66802 7.401769,-0.921865 0.204808,-2.210606 -3.738578,-1.002012 -8.17047,-5.32175 -1.729513,3.159983 -4.953201,6.145266 0.768701,6.243615 z"
+           id="path19619"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cscc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19709);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13568-0);enable-background:accumulate"
+           d="m 11.687501,7.6874792 c 1.679613,0.594433 3.426505,1.556021 4.691277,2.8260238 1.325795,1.331277 3.283756,1.262435 5.063395,0.815867 3.081601,-0.773272 3.29337,-3.8990658 5.807829,-4.2043878 C 25.562503,1.7499856 11.875001,2.8124796 11.687501,7.6874792 z"
+           id="path19621"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csscc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19711);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13595-8);enable-background:accumulate"
+           d="m 12.375001,5.7499792 c 1.599343,0.25688 4.563166,0.375314 5.990942,-0.7654616 0.593468,-0.474174 2.555991,-0.870334 3.634058,-0.859504 -1.0625,-5.12496604 -7.75,-0.937534 -9.625,1.6249656 z"
+           id="path19623"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19713);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13642-8);enable-background:accumulate"
+           d="m 18.250001,2.1249796 c 2.240047,-0.06599 3.610559,1.611483 5.874277,1.379237 1.426822,-0.146385 1.905467,-0.910094 3.250715,-0.87925 C 30.812485,0.93745356 28.187501,0.43747956 25.875001,-2.0436748e-5 23.562501,-0.43752044 22.250001,0.43747956 18.250001,2.1249796 z"
+           id="path19625"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cscsc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19715);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12371-9);enable-background:accumulate"
+           d="m 22.406251,25.062481 c 0.936427,-0.08148 4.500858,-0.135827 5.919103,0.613676 0.85724,0.453028 3.634121,-0.531456 3.917608,-1.870784 0.309536,-1.462395 1.608322,-3.133949 2.882022,-3.68039 -2.406268,0.250003 -10.218733,-0.968753 -12.687483,0.281247 -2.46875,1.250001 0.625,2.781251 -0.03125,4.656251 z"
+           id="path19627"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csscsc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19717);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12379-1);enable-background:accumulate"
+           d="m 21.031251,27.343731 c 1.718254,0.097 2.532337,1.993862 4.040907,2.143896 1.543651,0.153523 4.077628,-1.804297 5.896593,-1.768839 0,0 -1.4375,-3.937557 -4.9375,-3.906307 -3.5,0.03125 -5,3.53125 -5,3.53125 z"
+           id="path19629"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19719);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12383-2);enable-background:accumulate"
+           d="m 21.831923,12.421961 c 0.420977,1.443111 2.049355,2.707189 3.858585,2.965539 1.275693,0.182164 3.39318,1.168217 4.055853,2.211279 -0.292556,0.298582 -2.994482,1.507744 -4.71267,1.633775 -1.236979,0.09073 -3.464922,-0.317193 -4.713715,-1.384235 -1.428107,-1.220259 -3.990496,-1.217801 -5.319979,-1.160841 -2.028226,-2.761751 0.927795,-2.133371 1.676829,-3.46281 0.766225,-1.359951 3.200946,-1.675516 5.155097,-0.802707 z"
+           id="path19631"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cscsscsc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19721);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12375-7);enable-background:accumulate"
+           d="m 34.515627,20.465311 c -0.04535,1.249695 0.48422,1.366551 0.419186,2.391226 -0.0749,1.180128 -0.28753,1.695807 -1.227689,2.270846 -0.743183,0.454561 -1.890737,1.278934 -1.698109,2.212226 0.145092,0.702981 0.743023,1.244132 1.860678,1.237352 -0.580598,-1.242188 1.218568,-1.965712 2.754455,-2.63768 0.995259,-0.435437 1.399404,-0.463836 1.904392,-2.011654 0.298265,-0.914196 -0.278427,-1.984763 -1.096074,-2.401666 -1.167219,-0.595144 -2.401325,-1.01161 -2.916839,-1.06065 z"
+           id="path19633"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cssscsssc" />
+        <path
+           style="fill:none;stroke:#464f5a;stroke-width:0.74999905;stroke-linejoin:round;stroke-opacity:1"
+           d="m 42.937476,30.874965 -25.499968,0 c 1.5,-2.5 8.562492,-4.874984 3.062492,-8.874984 -5.503549,-4.002581 -9,-9.5 -9,-14.5 0,-5.182584 12,-6.744933 12,-8 0,-1 -4.937491,-2.1249365 -6.437491,-3.1249365 l 6.374992,0 c 3,0.5 8.062499,1.6249365 8.062499,3.1249365 0,1.352742 -5,2.043705 -5,5 0,3 4.467761,9.48388 14.5,14.5 10,5 3.437476,10.374984 1.937476,11.874984 z"
+           id="path19635"
+           sodipodi:nodetypes="cczzzcczzzc"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="translate(1.5625293e-7,-16.000019)"
+         id="g19637">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19639"
+           d="m 30.8125,44.0625 4,-0.875 c 2.00588,0.666667 2.447551,1.333333 3.1875,2 -2.344089,0.979561 -0.971798,2.252609 -5.704505,2.019607 C 31.790042,45.79257 31.179998,44.667503 30.8125,44.0625 z"
+           style="fill:url(#linearGradient19723);fill-opacity:1;stroke:#17110d;stroke-width:0.74999905px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cccsc"
+           inkscape:connector-curvature="0"
+           id="path19641"
+           d="m 21.743534,17.594408 c 2.472924,-0.25246 1.701806,0.406931 1.612436,0.716911 0.505313,-0.219453 0.626558,-0.398783 2.806981,-0.09819 -0.407551,-0.824958 -0.228504,-1.846643 -1.502602,-2.474874 -0.54222,-0.267357 -1.342534,1.117035 -2.916815,1.856155 z"
+           style="color:#000000;fill:url(#linearGradient19725);fill-opacity:1;fill-rule:nonzero;stroke:#1c180d;stroke-width:0.74999905px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path19643"
+           d="m 22.125,40.3125 c 0.487546,0.02002 2.5625,-0.625 2.625,-1 0.125,-0.75 -1.1875,-2.125 -1.875,-2.25 -0.6875,-0.125 -3.303951,0.02314 -3.4375,0.3125 -0.375,0.8125 1.422027,2.885528 2.6875,2.9375 z"
+           style="fill:url(#linearGradient19727);fill-opacity:1;stroke:#251f01;stroke-width:0.74999905px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19729);fill-opacity:1;fill-rule:nonzero;stroke:#1c180d;stroke-width:0.74999905px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.656986,23.475151 c 1.58904,0.0127 1.392446,0.539514 2.098571,0.849494 1.300809,0.399265 1.201083,-0.752337 3.381506,-0.451744 -0.407551,-0.824958 -0.979805,-1.669866 -2.695845,-2.253903 -0.572313,-0.194781 -1.209951,1.117035 -2.784232,1.856153 z"
+           id="path19645"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccsc" />
+        <g
+           id="g19647">
+          <path
+             style="fill:url(#linearGradient19731);fill-opacity:1;stroke:none"
+             d="m 25.739493,31.301638 c 1.980199,0.281663 2.462619,1.304832 3.910563,1.150029 1.447943,-0.154802 3.404518,0.105567 2.995012,-0.995227 -0.570187,-1.532719 -2.060534,-1.857628 -4.176759,-1.393221 -2.116225,0.464407 -3.235442,1.166356 -2.728816,1.238419 z"
+             id="path19649"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssss" />
+          <path
+             sodipodi:nodetypes="sssss"
+             inkscape:connector-curvature="0"
+             id="path19651"
+             d="m 28.661368,31.395388 c 0.137562,0.805692 0.228244,1.164207 1.176188,1.103154 1.453184,-0.09359 2.423998,0.05921 2.338762,-0.526477 -0.15433,-1.060455 -1.203133,-0.780806 -1.926759,-1.065096 -1.317512,-0.517609 -1.654414,0.10056 -1.588191,0.488419 z"
+             style="fill:#3b2825;fill-opacity:1;stroke:none;filter:url(#filter14893-9)" />
+          <path
+             sodipodi:nodetypes="sssss"
+             inkscape:connector-curvature="0"
+             id="path19653"
+             d="m 25.739493,31.301638 c 1.980199,0.281663 2.462619,1.304832 3.910563,1.150029 1.447943,-0.154802 3.404518,0.105567 2.995012,-0.995227 -0.570187,-1.532719 -2.060534,-1.857628 -4.176759,-1.393221 -2.116225,0.464407 -3.235442,1.166356 -2.728816,1.238419 z"
+             style="fill:none;stroke:#211517;stroke-width:0.74999905px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <g
+           id="g19655">
+          <path
+             style="color:#000000;fill:url(#linearGradient19733);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.27607,-1.13523 0.562939,-1.888658 0.338664,-0.889461 1.757893,-0.878299 3.141926,-0.903018 1.329906,-0.02375 2.7061,0.216578 3.537798,1.122016 1.008646,1.098075 1.872448,1.489822 3.465953,1.495833 1.338899,0.0051 1.992069,1.471456 1.416985,2.670052 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             id="path19657"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ssssssssss" />
+          <path
+             sodipodi:nodetypes="ssssssssss"
+             inkscape:connector-curvature="0"
+             id="path19659"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.180518,-2.392025 0.761813,-1.833415 0.327615,0.31483 1.145716,1.469373 2.998295,1.16306 1.589927,-0.262885 0.642804,0.160348 1.39438,0.514346 1.224428,0.576714 3.629167,1.401434 5.222672,1.407445 1.338899,0.0051 2.323525,0.04619 1.748441,1.244789 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             style="color:#000000;fill:url(#linearGradient19735);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter14820-6);enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="ssssssssss"
+             inkscape:connector-curvature="0"
+             id="path19661"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.27607,-1.13523 0.562939,-1.888658 0.338664,-0.889461 1.757893,-0.878299 3.141926,-0.903018 1.329906,-0.02375 2.7061,0.216578 3.537798,1.122016 1.008646,1.098075 1.872448,1.489822 3.465953,1.495833 1.338899,0.0051 1.992069,1.471456 1.416985,2.670052 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             style="fill:none;stroke:#302c2b;stroke-width:0.74999905px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <path
+           sodipodi:nodetypes="csccsccccccc"
+           inkscape:connector-curvature="0"
+           id="path19663"
+           d="m 38.225178,31.229951 c 0.613272,-0.37764 2.142095,-0.753201 2.652607,-0.373491 0.775329,0.576678 0.508739,2.011016 0.448516,2.608562 0.250093,0.256705 0.424041,0.141974 0.742848,0.09549 0.251995,-1.408465 0.48871,-2.129933 1.507731,-2.132999 0.77174,-0.0023 1.532663,0.430354 1.9403,0.775275 -0.411286,-1.608554 -1.276057,-1.849311 -2.578535,-1.953881 -0.0437,-1.057773 0.180939,-1.959729 0.59205,-3.392973 -1.122458,0.105104 -1.25465,1.673912 -1.494908,2.621195 -0.683255,-0.965804 -1.989662,-1.40494 -2.629148,-1.25639 0.05262,0.552196 1.17235,0.99375 1.506917,1.612448 -0.869801,-0.03515 -2.966501,0.04183 -2.688378,1.396764 z"
+           style="fill:#738d22;fill-opacity:1;stroke:#263a05;stroke-width:0.74999905px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <g
+           transform="translate(4.25,0.625)"
+           id="g19665">
+          <path
+             style="fill:url(#linearGradient19737);fill-opacity:1;stroke:none"
+             d="m 34.00358,34.614016 c 1.158247,-0.286737 2.259466,-1.807142 3.363992,-1.650892 1.104526,0.156251 3.686118,0.651811 4.632854,0.729936 0.946737,0.07813 0.681572,3.186585 0.523783,3.655336 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.629157,-0.07813 -3.708052,-0.937502 -0.07889,-0.859377 -1.131782,-1.946383 -0.473368,-2.10938 z"
+             id="path19667"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssssss" />
+          <path
+             sodipodi:nodetypes="sssssss"
+             inkscape:connector-curvature="0"
+             id="path19669"
+             d="m 37.697585,34.678737 c 0.672111,-0.286737 0.270728,-0.08671 1.375254,0.06954 1.104526,0.156251 2.492875,0.254063 3.483805,0.111217 0.940237,-0.135538 0.06285,1.957651 -0.09493,2.426402 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.010439,0.41115 -3.089334,-0.448225 -0.07889,-0.859377 2.040533,-2.205273 2.664414,-2.471436 z"
+             style="fill:#362c21;fill-opacity:1;stroke:none;filter:url(#filter14691-4)" />
+          <path
+             sodipodi:nodetypes="sssssss"
+             inkscape:connector-curvature="0"
+             id="path19671"
+             d="m 34.00358,34.614016 c 1.158247,-0.286737 2.259466,-1.807142 3.363992,-1.650892 1.104526,0.156251 3.686118,0.651811 4.632854,0.729936 0.946737,0.07813 0.681572,3.186585 0.523783,3.655336 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.629157,-0.07813 -3.708052,-0.937502 -0.07889,-0.859377 -1.131782,-1.946383 -0.473368,-2.10938 z"
+             style="fill:none;stroke:#201c19;stroke-width:0.74999905px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+      </g>
+      <g
+         id="g19673"
+         transform="translate(-11,37.499981)">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient19739);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 47.62494,9.7500668 32.71875,11.875 l 2.75,1.6875 12.15619,-2.312435 z"
+           transform="translate(11,-53.5)"
+           id="path19675" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19677"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           id="path19679"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient19741);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 24.21875,12.84375 -23.84375047,4.406307 0,2.124963 L 26.96875,15.25 z"
+           transform="translate(11,-53.5)"
+           id="path19681" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19683"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssss"
+           inkscape:connector-curvature="0"
+           id="path19685"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           style="color:#000000;fill:url(#radialGradient19743);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path19687"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:url(#linearGradient19745);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19747);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           id="path19689"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssss" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path19691"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           style="color:#000000;fill:url(#radialGradient19749);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.74999905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+      <g
+         id="g19693"
+         transform="translate(-0.37499937,-16.000019)">
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           id="path19695"
+           d="m 13.5,21 0,24 18,-12 z"
+           style="fill:url(#linearGradient19751);fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19697"
+           d="m 13.5,40 c 3,-6 7,-10.5 14.5,-9.5 L 13.5,21 z"
+           style="opacity:0.5;fill:url(#radialGradient19753);fill-opacity:1;stroke:none"
+           sodipodi:nodetypes="cccc" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path19699"
+           d="m 15,44 0,-20 15,10 1.5,-1 -18,-12 0,24 z"
+           style="fill:#435a36;fill-opacity:0.37647059;stroke:none" />
+        <path
+           style="fill:none;stroke:#435a36;stroke-width:0.74999905;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 13.5,21 0,24 18,-12 z"
+           id="path19701"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/48x48/vsPlay.png"
+       inkscape:label="#icon_48"
+       id="icon_48"
+       transform="translate(128,1.9e-5)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8868-6"
+         y="-16"
+         x="0"
+         height="48"
+         width="48" />
+      <g
+         id="g13890">
+        <path
+           sodipodi:nodetypes="cc"
+           id="path8870-6"
+           d="m 3.5,-11.50002 0,36"
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="-11.500017"
+           x="9.5"
+           height="18"
+           width="21"
+           id="rect8872-4"
+           style="fill:url(#linearGradient8978-9);fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-opacity:1" />
+        <rect
+           style="fill:url(#linearGradient8980-1);fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-opacity:1"
+           id="rect8874-2"
+           width="21"
+           height="17.999996"
+           x="9.5"
+           y="6.4999828" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 36.5,-11.50002 0,36"
+           id="path8876-7"
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8878-1"
+           d="m 3.5,-8.50002 6,0"
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 3.5,-2.50002 6,0"
+           id="path8880-0"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8882-5"
+           d="m 3.5,3.49998 6,0"
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 3.5,9.49998 6,0"
+           id="path8884-3"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8886-4"
+           d="m 3.5,15.49998 6,0"
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 3.5,21.49998 6,0"
+           id="path8888-8"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 30.5,-8.50002 6,0"
+           id="path8890-1"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8892-9"
+           d="m 30.5,-2.50002 6,0"
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 30.5,3.49998 6,0"
+           id="path8894-8"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8896-9"
+           d="m 30.5,9.49998 6,0"
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 30.5,15.49998 6,0"
+           id="path8898-8"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8900-8"
+           d="m 30.5,21.49998 6,0"
+           style="fill:none;stroke:#000000;stroke-width:3px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g13753">
+        <path
+           sodipodi:nodetypes="cczzzcczzzc"
+           id="path21915"
+           d="m 43,30.499981 -25.5,0 c 1.5,-2.5 8.5,-4.5 3,-8.5 -5.503549,-4.002581 -9,-9.5 -9,-14.5 0,-5.182584 12,-6.744933 12,-8 0,-1 -5,-2 -6.5,-3 l 6.5,0 c 3,0.5 8,1.5 8,3 0,1.352742 -5,2.043705 -5,5 0,3 4.467761,9.48388 14.5,14.5 10,5 3.5,10 2,11.5 z"
+           style="fill:#576270;fill-opacity:1;stroke:none"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient13751);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12426-5);enable-background:accumulate"
+           d="m 37.58839,27.393826 c 2.820295,0.998661 7.161822,1.66802 7.401769,-0.921865 0.204808,-2.210606 -3.738578,-1.002012 -8.17047,-5.32175 -1.729513,3.159983 -4.953201,6.145266 0.768701,6.243615 z"
+           id="path12179"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cscc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient13566-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13568-0);enable-background:accumulate"
+           d="m 11.687501,7.6874792 c 1.679613,0.594433 3.426505,1.556021 4.691277,2.8260238 1.325795,1.331277 3.283756,1.262435 5.063395,0.815867 3.081601,-0.773272 3.29337,-3.8990658 5.807829,-4.2043878 C 25.562503,1.7499856 11.875001,2.8124796 11.687501,7.6874792 z"
+           id="path12181"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csscc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient12239-9-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13595-8);enable-background:accumulate"
+           d="m 12.375001,5.7499792 c 1.599343,0.25688 4.563166,0.375314 5.990942,-0.7654616 0.593468,-0.474174 2.555991,-0.870334 3.634058,-0.859504 -1.0625,-5.12496604 -7.75,-0.937534 -9.625,1.6249656 z"
+           id="path12183"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient13662-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13642-8);enable-background:accumulate"
+           d="m 18.250001,2.1249796 c 2.240047,-0.06599 3.610559,1.611483 5.874277,1.379237 1.426822,-0.146385 1.905467,-0.910094 3.250715,-0.87925 C 30.812485,0.93745356 28.187501,0.43747956 25.875001,-2.0436748e-5 23.562501,-0.43752044 22.250001,0.43747956 18.250001,2.1249796 z"
+           id="path12185"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cscsc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient12309-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12371-9);enable-background:accumulate"
+           d="m 22.406251,25.062481 c 0.936427,-0.08148 4.500858,-0.135827 5.919103,0.613676 0.85724,0.453028 3.634121,-0.531456 3.917608,-1.870784 0.309536,-1.462395 1.608322,-3.133949 2.882022,-3.68039 -2.406268,0.250003 -10.218733,-0.968753 -12.687483,0.281247 -2.46875,1.250001 0.625,2.781251 -0.03125,4.656251 z"
+           id="path12189"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csscsc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient12239-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12379-1);enable-background:accumulate"
+           d="m 21.031251,27.343731 c 1.718254,0.097 2.532337,1.993862 4.040907,2.143896 1.543651,0.153523 4.077628,-1.804297 5.896593,-1.768839 0,0 -1.4375,-3.937557 -4.9375,-3.906307 -3.5,0.03125 -5,3.53125 -5,3.53125 z"
+           id="path12191"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="csc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient12282-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12383-2);enable-background:accumulate"
+           d="m 21.831923,12.421961 c 0.420977,1.443111 2.049355,2.707189 3.858585,2.965539 1.275693,0.182164 3.39318,1.168217 4.055853,2.211279 -0.292556,0.298582 -2.994482,1.507744 -4.71267,1.633775 -1.236979,0.09073 -3.464922,-0.317193 -4.713715,-1.384235 -1.428107,-1.220259 -3.990496,-1.217801 -5.319979,-1.160841 -2.028226,-2.761751 0.927795,-2.133371 1.676829,-3.46281 0.766225,-1.359951 3.200946,-1.675516 5.155097,-0.802707 z"
+           id="path12241"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cscsscsc" />
+        <path
+           style="color:#000000;fill:url(#linearGradient12239-4-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter12375-7);enable-background:accumulate"
+           d="m 34.515627,20.465311 c -0.04535,1.249695 0.48422,1.366551 0.419186,2.391226 -0.0749,1.180128 -0.28753,1.695807 -1.227689,2.270846 -0.743183,0.454561 -1.890737,1.278934 -1.698109,2.212226 0.145092,0.702981 0.743023,1.244132 1.860678,1.237352 -0.580598,-1.242188 1.218568,-1.965712 2.754455,-2.63768 0.995259,-0.435437 1.399404,-0.463836 1.904392,-2.011654 0.298265,-0.914196 -0.278427,-1.984763 -1.096074,-2.401666 -1.167219,-0.595144 -2.401325,-1.01161 -2.916839,-1.06065 z"
+           id="path12323"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cssscsssc" />
+        <path
+           style="fill:none;stroke:#464f5a;stroke-linejoin:round;stroke-opacity:1"
+           d="m 43,30.499981 -25.5,0 c 1.5,-2.5 8.5,-4.5 3,-8.5 -5.503549,-4.002581 -9,-9.5 -9,-14.5 0,-5.182584 12,-6.744933 12,-8 0,-1 -5,-2 -6.5,-3 l 6.5,0 c 3,0.5 8,1.5 8,3 0,1.352742 -5,2.043705 -5,5 0,3 4.467761,9.48388 14.5,14.5 10,5 3.5,10 2,11.5 z"
+           id="path21937"
+           sodipodi:nodetypes="cczzzcczzzc"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="translate(3.5772991e-7,-16.000019)"
+         id="g14897">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path14547"
+           d="m 30.8125,44.0625 4,-0.875 c 2.00588,0.666667 2.447551,1.333333 3.1875,2 -2.344089,0.979561 -0.971798,2.252609 -5.704505,2.019607 C 31.790042,45.79257 31.179998,44.667503 30.8125,44.0625 z"
+           style="fill:url(#linearGradient14555-5);fill-opacity:1;stroke:#17110d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cccsc"
+           inkscape:connector-curvature="0"
+           id="path14557"
+           d="m 21.743534,17.594408 c 2.472924,-0.25246 1.701806,0.406931 1.612436,0.716911 0.505313,-0.219453 0.626558,-0.398783 2.806981,-0.09819 -0.407551,-0.824958 -0.228504,-1.846643 -1.502602,-2.474874 -0.54222,-0.267357 -1.342534,1.117035 -2.916815,1.856155 z"
+           style="color:#000000;fill:url(#linearGradient14598-7);fill-opacity:1;fill-rule:nonzero;stroke:#1c180d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path14602"
+           d="m 22.125,40.3125 c 0.487546,0.02002 2.5625,-0.625 2.625,-1 0.125,-0.75 -1.1875,-2.125 -1.875,-2.25 -0.6875,-0.125 -3.303951,0.02314 -3.4375,0.3125 -0.375,0.8125 1.422027,2.885528 2.6875,2.9375 z"
+           style="fill:url(#linearGradient14610-5);fill-opacity:1;stroke:#251f01;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           style="color:#000000;fill:url(#linearGradient14618-2);fill-opacity:1;fill-rule:nonzero;stroke:#1c180d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.656986,23.475151 c 1.58904,0.0127 1.392446,0.539514 2.098571,0.849494 1.300809,0.399265 1.201083,-0.752337 3.381506,-0.451744 -0.407551,-0.824958 -0.979805,-1.669866 -2.695845,-2.253903 -0.572313,-0.194781 -1.209951,1.117035 -2.784232,1.856153 z"
+           id="path14616"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccsc" />
+        <g
+           id="g14834">
+          <path
+             style="fill:url(#linearGradient14832-8);fill-opacity:1;stroke:none"
+             d="m 25.739493,31.301638 c 1.980199,0.281663 2.462619,1.304832 3.910563,1.150029 1.447943,-0.154802 3.404518,0.105567 2.995012,-0.995227 -0.570187,-1.532719 -2.060534,-1.857628 -4.176759,-1.393221 -2.116225,0.464407 -3.235442,1.166356 -2.728816,1.238419 z"
+             id="path14824"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssss" />
+          <path
+             sodipodi:nodetypes="sssss"
+             inkscape:connector-curvature="0"
+             id="path14839"
+             d="m 28.661368,31.395388 c 0.137562,0.805692 0.228244,1.164207 1.176188,1.103154 1.453184,-0.09359 2.423998,0.05921 2.338762,-0.526477 -0.15433,-1.060455 -1.203133,-0.780806 -1.926759,-1.065096 -1.317512,-0.517609 -1.654414,0.10056 -1.588191,0.488419 z"
+             style="fill:#3b2825;fill-opacity:1;stroke:none;filter:url(#filter14893-9)" />
+          <path
+             sodipodi:nodetypes="sssss"
+             inkscape:connector-curvature="0"
+             id="path14837"
+             d="m 25.739493,31.301638 c 1.980199,0.281663 2.462619,1.304832 3.910563,1.150029 1.447943,-0.154802 3.404518,0.105567 2.995012,-0.995227 -0.570187,-1.532719 -2.060534,-1.857628 -4.176759,-1.393221 -2.116225,0.464407 -3.235442,1.166356 -2.728816,1.238419 z"
+             style="fill:none;stroke:#211517;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <g
+           id="g14713">
+          <path
+             style="color:#000000;fill:url(#linearGradient14711-8-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.27607,-1.13523 0.562939,-1.888658 0.338664,-0.889461 1.757893,-0.878299 3.141926,-0.903018 1.329906,-0.02375 2.7061,0.216578 3.537798,1.122016 1.008646,1.098075 1.872448,1.489822 3.465953,1.495833 1.338899,0.0051 1.992069,1.471456 1.416985,2.670052 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             id="path14740"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ssssssssss" />
+          <path
+             sodipodi:nodetypes="ssssssssss"
+             inkscape:connector-curvature="0"
+             id="path14775"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.180518,-2.392025 0.761813,-1.833415 0.327615,0.31483 1.145716,1.469373 2.998295,1.16306 1.589927,-0.262885 0.642804,0.160348 1.39438,0.514346 1.224428,0.576714 3.629167,1.401434 5.222672,1.407445 1.338899,0.0051 2.323525,0.04619 1.748441,1.244789 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             style="color:#000000;fill:url(#linearGradient14726-3-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter14820-6);enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="ssssssssss"
+             inkscape:connector-curvature="0"
+             id="path14716"
+             d="m 40.25,35.125 c -0.428775,-0.278825 -1.99584,-0.709349 -2.938964,-1.023247 -1.376641,-0.458185 -1.232702,-1.032771 -2.678378,-0.763718 -0.888675,0.16539 -2.670076,-0.472259 -2.950423,-0.879479 -0.358236,-0.520357 0.27607,-1.13523 0.562939,-1.888658 0.338664,-0.889461 1.757893,-0.878299 3.141926,-0.903018 1.329906,-0.02375 2.7061,0.216578 3.537798,1.122016 1.008646,1.098075 1.872448,1.489822 3.465953,1.495833 1.338899,0.0051 1.992069,1.471456 1.416985,2.670052 C 43.229479,36.160197 41.326858,35.825263 40.25,35.125 z"
+             style="fill:none;stroke:#302c2b;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <path
+           sodipodi:nodetypes="csccsccccccc"
+           inkscape:connector-curvature="0"
+           id="path14620"
+           d="m 38.225178,31.229951 c 0.613272,-0.37764 2.142095,-0.753201 2.652607,-0.373491 0.775329,0.576678 0.508739,2.011016 0.448516,2.608562 0.250093,0.256705 0.424041,0.141974 0.742848,0.09549 0.251995,-1.408465 0.48871,-2.129933 1.507731,-2.132999 0.77174,-0.0023 1.532663,0.430354 1.9403,0.775275 -0.411286,-1.608554 -1.276057,-1.849311 -2.578535,-1.953881 -0.0437,-1.057773 0.180939,-1.959729 0.59205,-3.392973 -1.122458,0.105104 -1.25465,1.673912 -1.494908,2.621195 -0.683255,-0.965804 -1.989662,-1.40494 -2.629148,-1.25639 0.05262,0.552196 1.17235,0.99375 1.506917,1.612448 -0.869801,-0.03515 -2.966501,0.04183 -2.688378,1.396764 z"
+           style="fill:#738d22;fill-opacity:1;stroke:#263a05;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <g
+           transform="translate(4.25,0.625)"
+           id="g14629">
+          <path
+             style="fill:url(#linearGradient14641-1);fill-opacity:1;stroke:none"
+             d="m 34.00358,34.614016 c 1.158247,-0.286737 2.259466,-1.807142 3.363992,-1.650892 1.104526,0.156251 3.686118,0.651811 4.632854,0.729936 0.946737,0.07813 0.681572,3.186585 0.523783,3.655336 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.629157,-0.07813 -3.708052,-0.937502 -0.07889,-0.859377 -1.131782,-1.946383 -0.473368,-2.10938 z"
+             id="path14625"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="sssssss" />
+          <path
+             sodipodi:nodetypes="sssssss"
+             inkscape:connector-curvature="0"
+             id="path14627"
+             d="m 37.697585,34.678737 c 0.672111,-0.286737 0.270728,-0.08671 1.375254,0.06954 1.104526,0.156251 2.492875,0.254063 3.483805,0.111217 0.940237,-0.135538 0.06285,1.957651 -0.09493,2.426402 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.010439,0.41115 -3.089334,-0.448225 -0.07889,-0.859377 2.040533,-2.205273 2.664414,-2.471436 z"
+             style="fill:#362c21;fill-opacity:1;stroke:none;filter:url(#filter14691-4)" />
+          <path
+             sodipodi:nodetypes="sssssss"
+             inkscape:connector-curvature="0"
+             id="path14633"
+             d="m 34.00358,34.614016 c 1.158247,-0.286737 2.259466,-1.807142 3.363992,-1.650892 1.104526,0.156251 3.686118,0.651811 4.632854,0.729936 0.946737,0.07813 0.681572,3.186585 0.523783,3.655336 -0.15779,0.468751 -3.155788,0.234376 -4.339209,0.312502 -1.18342,0.07813 -3.629157,-0.07813 -3.708052,-0.937502 -0.07889,-0.859377 -1.131782,-1.946383 -0.473368,-2.10938 z"
+             style="fill:none;stroke:#201c19;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+      </g>
+      <g
+         id="g14257"
+         transform="translate(-11,37.499981)">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient14137-8);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.5,9.90625 -14.78125,1.96875 2.75,1.6875 12.03125,-2.15625 0,-1.5 z"
+           transform="translate(11,-53.5)"
+           id="path13921" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path13923"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           id="path14216"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient14317-7);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="M 24.21875,12.84375 0.5,17.0625 l 0,2.125 26.46875,-3.9375 -2.75,-2.40625 z"
+           transform="translate(11,-53.5)"
+           id="path13919" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path13925"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssss"
+           inkscape:connector-curvature="0"
+           id="path13929"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           style="color:#000000;fill:url(#radialGradient14200-4);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           sodipodi:nodetypes="ssssssssss"
+           inkscape:connector-curvature="0"
+           id="path13927"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           style="color:#000000;fill:url(#linearGradient14133-3);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient14210-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           id="path14202"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssss" />
+        <path
+           sodipodi:nodetypes="sssss"
+           inkscape:connector-curvature="0"
+           id="path13948"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           style="color:#000000;fill:url(#radialGradient14399);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+      <g
+         id="g14528"
+         transform="translate(0,-16.000019)">
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccc"
+           id="path14520"
+           d="m 13.5,21 0,24 18,-12 z"
+           style="fill:url(#linearGradient14535-0);fill-opacity:1;stroke:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path14526"
+           d="m 13.5,40 c 3,-6 7,-10.5 14.5,-9.5 L 13.5,21 z"
+           style="opacity:0.5;fill:url(#radialGradient14543-1);fill-opacity:1;stroke:none"
+           sodipodi:nodetypes="cccc" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path14524"
+           d="m 15,44 0,-20 15,10 1.5,-1 -18,-12 0,24 z"
+           style="fill:#435a36;fill-opacity:0.37647059;stroke:none" />
+        <path
+           style="fill:none;stroke:#435a36;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 13.5,21 0,24 18,-12 z"
+           id="path14533"
+           sodipodi:nodetypes="cccc"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.6666675,0,0,0.6666675,176,10.66664)"
+       id="icon_32"
+       inkscape:label="#icon_32"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/vsPlay.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="48"
+         height="48"
+         x="0"
+         y="-16"
+         id="rect19757"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g19759"
+         transform="translate(-0.37503615,3.7124937e-5)">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750258,-11.499983 0,35.999955"
+           id="path19761"
+           sodipodi:nodetypes="cc" />
+        <rect
+           style="fill:url(#linearGradient19881);fill-opacity:1;stroke:#000000;stroke-width:2.99999619;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect19763"
+           width="20.999973"
+           height="17.999977"
+           x="9.3750248"
+           y="-11.499983" />
+        <rect
+           y="6.4999948"
+           x="9.3750181"
+           height="17.999977"
+           width="20.999973"
+           id="rect19765"
+           style="fill:url(#linearGradient19883);fill-opacity:1;stroke:#000000;stroke-width:2.99999619;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path19767"
+           d="m 36.374991,-11.499983 0,35.999955"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750324,-8.4999865 5.9999925,0"
+           id="path19769"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19771"
+           d="m 3.3750324,-2.499994 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750324,3.4999985 5.9999925,0"
+           id="path19773"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19775"
+           d="m 3.3750324,9.499991 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 3.3750324,15.499984 5.9999925,0"
+           id="path19777"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19779"
+           d="m 3.375032,21.499976 5.9999925,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19781"
+           d="m 30.374999,-8.4999865 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,-2.499994 5.999992,0"
+           id="path19783"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19785"
+           d="m 30.374999,3.4999985 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,9.499991 5.999992,0"
+           id="path19787"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path19789"
+           d="m 30.374999,15.499984 5.999992,0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:2.99999619;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="m 30.374999,21.499976 5.999992,0"
+           id="path19791"
+           sodipodi:nodetypes="cc" />
+      </g>
+      <path
+         sodipodi:nodetypes="cczzzcczzzc"
+         id="path19795"
+         d="m 42.749946,31.250001 -25.499968,0 c 1.5,-2.5 8.750022,-5.25002 3.250022,-9.25002 -5.503549,-4.002581 -9,-9.5 -9,-14.5 0,-5.182584 12,-6.744933 12,-8 0,-1 -4.750022,-1.7499369 -6.250022,-2.7499369 l 6.374992,0 c 3,0.5 7.87503,1.2499369 7.87503,2.7499369 0,1.352742 -5,2.043705 -5,5 0,3 4.467761,9.48388 14.5,14.5 10,5 3.249946,10.75002 1.749946,12.25002 z"
+         style="color:#000000;fill:url(#radialGradient19188-5);fill-opacity:1.0;fill-rule:nonzero;stroke:#464f5a;stroke-width:1.49999813000000004;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="translate(-11,37.499981)"
+         id="g19851">
+        <path
+           id="path19853"
+           transform="translate(11,-53.5)"
+           d="M 47.249941,9.9000666 32.71875,11.875 l 2.75,1.6875 11.781191,-2.162435 z"
+           style="color:#000000;fill:url(#linearGradient19917);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.34999831;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#deded9;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.34999831;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 23.91829,-34.90112 8.3085,-7.601403 -0.97227,-1.149049 -8.39689,7.601402 z"
+           id="path19855"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path19857"
+           d="m 33.5968,-38.99122 0.13259,-3.314566 -0.7955,0 0.17678,3.402956 z"
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path19859"
+           transform="translate(11,-53.5)"
+           d="m 24.21875,12.84375 -23.46875094,4.256308 0,2.099997 L 26.96875,15.25 z"
+           style="color:#000000;fill:url(#linearGradient19919);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.34999831;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:#e9e9e6;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.34999831;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.75712,-46.568387 -0.88388,-3.358758 -0.7955,0.353553 0.7955,3.535535 z"
+           id="path19861"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19921);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.34999831;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           id="path19863"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssss" />
+        <path
+           style="color:#000000;fill:url(#linearGradient19923);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.34999831;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path19865"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="ssssss"
+           inkscape:connector-curvature="0"
+           id="path19867"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -1.31444,-0.863264 -1.82933,-1.297429 -1.24209,-1.047359 3.5729,-7.346753 5.8068,-5.596861 z"
+           style="color:#000000;fill:url(#radialGradient19925);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:url(#radialGradient19927);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.34999831;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           id="path19869"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path19873"
+         d="m 12.749984,5.0000337 0,23.9999703 17.999978,-11.999985 z"
+         style="color:#000000;fill:url(#linearGradient15369-8-93);fill-opacity:1.0;fill-rule:nonzero;stroke:#435a36;stroke-width:1.49999813000000004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/vsPlay.png"
+       inkscape:label="#icon_16"
+       id="icon_16"
+       transform="translate(176,-31.99998)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8868"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <g
+         id="g18414">
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path8870"
+           d="m 1.5,17.49998 0,12"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           y="17.499981"
+           x="3.5"
+           height="6"
+           width="7"
+           id="rect8872"
+           style="fill:url(#linearGradient8978);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+        <rect
+           style="fill:url(#linearGradient8980);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+           id="rect8874"
+           width="7"
+           height="5.999999"
+           x="3.5"
+           y="23.499981" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 12.5,17.49998 0,12"
+           id="path8876"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8878"
+           d="m 1.5,18.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,20.49998 2,0"
+           id="path8880" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8882"
+           d="m 1.5,22.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,24.49998 2,0"
+           id="path8884" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8886"
+           d="m 1.5,26.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,28.49998 2,0"
+           id="path8888" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,18.49998 2,0"
+           id="path8890" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8892"
+           d="m 10.5,20.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,22.49998 2,0"
+           id="path8894" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8896"
+           d="m 10.5,24.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,26.49998 2,0"
+           id="path8898" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8900"
+           d="m 10.5,28.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <path
+         sodipodi:nodetypes="cczzzcczzzc"
+         id="path18117-0"
+         d="m 14.33327,31.499918 -8.4999146,0 c 0.499995,-0.833325 2.666645,-1.499938 0.666645,-3.499938 -2,-2 -2,-3 -2,-4.25 0,-1.25 3,-2.25 3,-2.75 0,-0.5 -1.500005,-0.16667 -2,-0.5 l 2.5,0 c 0.99999,0.166665 2.4999996,0 2.4999996,0.5 0,0.5 -1.9999996,1.014579 -1.9999996,2 0,0.99999 1.4999996,2.5 4.9999996,4.5 3.5,2 1.333265,3.499943 0.83327,3.999938 z"
+         style="color:#000000;fill:url(#radialGradient19188);fill-opacity:1.0;fill-rule:nonzero;stroke:#464f5a;stroke-width:0.89999998000000003;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#linearGradient15369-8);fill-opacity:1.0;stroke:#435a36;stroke-width:0.89999998000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 5.5000004,23.49998 0,7 5.2499996,-3.5 z"
+         id="path15367"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(0.33333,0,0,0.33333,-3.6665496,33.833227)"
+         id="g18155">
+        <path
+           id="path18157"
+           d="m 57.433933,-42.502982 -14.908438,2.236966 1.68933,0.659976 13.219108,-2.457597 z"
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:2.700027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:2.70002699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 23.056495,-34.768536 9.137149,-8.032301"
+           id="path18159"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           id="path18163"
+           d="m 36.412004,-39.595579 -23.879083,4.153328 0,0.605074 25.10437,-3.810575 z"
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:2.70002699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:2.70002699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.454095,-45.214685 -1.274969,-4.373934"
+           id="path18165"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:2.10002085;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 47.58048,-30.1951 c 2.07118,0.14509 3.56273,-0.3215 2.96101,-2.56326 -0.42017,-1.56538 -6.61742,-1.04159 -6.76172,-0.0442 -0.13595,0.9397 1.07859,2.41677 3.80071,2.60746 z"
+           id="path18167"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssss" />
+        <path
+           style="color:#000000;fill:url(#linearGradient18227-5-4-7);fill-opacity:1.0;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.80001799999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 32.05001,-42.414135 c -0.74129,-0.708456 -1.26551,-1.873939 -0.75129,-3.005204 0.61411,-1.351012 2.02317,-1.309859 2.60745,-0.972272 2.22618,1.286237 5.05194,3.094684 7.11526,3.756506 2.3423,0.751301 3.8207,1.078533 6.0546,2.828425 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.61146 -4.85432,-1.19053 -2.47487,-1.5026 -3.36501,-2.80237 -5.12652,-5.03814 -1.14905,-1.4584 -4.40372,-3.012546 -5.92203,-4.463605 z"
+           id="path18169"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ssssssssss" />
+        <path
+           sodipodi:nodetypes="ssssss"
+           inkscape:connector-curvature="0"
+           id="path18171"
+           d="m 47.07603,-39.80668 c 2.49343,1.95319 4.17129,4.91612 4.11006,6.62913 -0.0372,1.04046 -1.44451,1.4044 -3.23321,1.45569 -2.56098,0.0734 -3.90057,-0.611465 -4.85432,-1.19053 -0.72527,-0.440341 -2.157239,-1.985917 -2.626213,-2.469316 -1.288965,-1.328612 4.369783,-6.174866 6.603683,-4.424974 z"
+           style="color:#000000;fill:url(#radialGradient18728-3);fill-opacity:1.0;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#c6c6bd;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.800018;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 36.64621,-42.988659 c -0.0105,-0.882583 0.39579,-1.294989 1.5468,-1.237437 0.88388,0.0442 1.68459,0.662606 1.72357,1.37002 0.0183,0.332107 -0.42478,0.705405 -1.67938,0.795495 -1.15174,0.0827 -1.58254,-0.215518 -1.59099,-0.928078 z"
+           id="path18173"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssss" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/Icons/icons-config.svg b/Icons/icons-config.svg
new file mode 100644
index 00000000..031314e9
--- /dev/null
+++ b/Icons/icons-config.svg
@@ -0,0 +1,824 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="152"
+   height="32"
+   id="svg6140"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="icons-config.svg">
+  <defs
+     id="defs6142">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6591"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6593"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6595"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient6662"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.9163711e-6,1.4006421,-1.4006413,-1.91637e-6,419.86161,-520.937)"
+       cx="388.28625"
+       cy="22.095467"
+       fx="388.28625"
+       fy="22.095467"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6664"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-189.61883,-71.437669)"
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6666"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-189.61883,-71.437669)"
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429" />
+    <linearGradient
+       gradientTransform="matrix(0.5,0,0,0.5,-1.25,15.24998)"
+       y2="17"
+       x2="20.5"
+       y1="22.5"
+       x1="22.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7327"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient7682"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-19.306704,61.792233,-37.604275,-10.831833,-12675.745,49872.141)"
+       cx="-795.84161"
+       cy="100.53116"
+       fx="-795.84161"
+       fy="100.53116"
+       r="9.7730999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient7684"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1904757,0,0,1.1904734,-549.09498,-42.333168)"
+       x1="517.5"
+       y1="62"
+       x2="516.73486"
+       y2="55.267769" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="radialGradient7686"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1904757,0,0,0.95309122,-549.09498,-30.865955)"
+       cx="510"
+       cy="49.797146"
+       fx="510"
+       fy="49.797146"
+       r="6.8698621" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient7688"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1904757,0,0,1.1904734,-549.09498,-42.333168)"
+       x1="525.5"
+       y1="47"
+       x2="519"
+       y2="44.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7690"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-452,-32)"
+       x1="2"
+       y1="25"
+       x2="10"
+       y2="25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient9001"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-4.341378e-6,1.295598,-1.2955938,-4.3413641e-6,417.5806,-480.11065)"
+       cx="388.65875"
+       cy="21.722965"
+       fx="388.65875"
+       fy="21.722965"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient9003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-189.61883,-71.437669)"
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient9005"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-189.61883,-71.437669)"
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429" />
+    <radialGradient
+       r="9.6155005"
+       fy="-39.827194"
+       fx="200.22023"
+       cy="-39.827194"
+       cx="200.22023"
+       gradientTransform="matrix(-3.0159632,-1.5619881e-7,-1.0772328e-7,2.079975,706.85685,87.839601)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9067-2"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient9152"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.0159632,1.5619881e-7,-1.0772328e-7,-2.079975,626.85685,-55.839601)"
+       cx="200.22023"
+       cy="-39.827194"
+       fx="200.22023"
+       fy="-39.827194"
+       r="9.6155005" />
+    <linearGradient
+       x1="359.05081"
+       y1="122.8501"
+       x2="346.7869"
+       y2="108.6055"
+       id="SG_GRAY_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6630-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6632-5"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6634-2"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.51010001" />
+      <stop
+         id="stop6636-90"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop6638-2"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999"
+       id="SG_BLUE_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6426-4-8"
+         style="stop-color:#99d6ff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6428-0-3"
+         style="stop-color:#4ab7ff;stop-opacity:1"
+         offset="0.47130001" />
+      <stop
+         id="stop6430-1-8"
+         style="stop-color:#15a1ff;stop-opacity:1"
+         offset="0.82730001" />
+      <stop
+         id="stop6432-9-0"
+         style="stop-color:#0099ff;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879"
+       id="SG_GREEN_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6305-3"
+         style="stop-color:#d1f0c2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6307-0"
+         style="stop-color:#66cc33;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="SG_GOLD_1"
+       y2="124.8127"
+       x2="23.477301"
+       y1="136.9731"
+       x1="26.1304">
+      <stop
+         offset="0"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         id="stop6510-5" />
+      <stop
+         id="stop6515-9"
+         style="stop-color:#ffd42a;stop-opacity:1"
+         offset="0.60644233" />
+      <stop
+         offset="0.72660697"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop6517-62" />
+      <stop
+         id="stop6519-17"
+         style="stop-color:#d4aa00;stop-opacity:1"
+         offset="0.84601015" />
+      <stop
+         offset="1"
+         style="stop-color:#806600;stop-opacity:1"
+         id="stop6512-8" />
+    </linearGradient>
+    <linearGradient
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127"
+       id="linearGradient11954"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop11956"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         offset="0" />
+      <stop
+         offset="0.25445721"
+         style="stop-color:#ffe581;stop-opacity:0.87843138;"
+         id="stop11958" />
+      <stop
+         offset="0.39923459"
+         style="stop-color:#ffd429;stop-opacity:0.50196081;"
+         id="stop11960" />
+      <stop
+         id="stop11962"
+         style="stop-color:#ffcc00;stop-opacity:0.75294119;"
+         offset="0.56616175" />
+      <stop
+         offset="0.71395278"
+         style="stop-color:#d4aa00;stop-opacity:0.25098041;"
+         id="stop11964" />
+      <stop
+         id="stop11966"
+         style="stop-color:#aa8800;stop-opacity:0.1254902;"
+         offset="0.78939378" />
+      <stop
+         id="stop11968"
+         style="stop-color:#806600;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127"
+       id="linearGradient11182"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop11184"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         offset="0" />
+      <stop
+         offset="0.60644233"
+         style="stop-color:#ffd429;stop-opacity:0.87843138;"
+         id="stop11186" />
+      <stop
+         id="stop11188"
+         style="stop-color:#ffcc00;stop-opacity:0.75294119;"
+         offset="0.72660697" />
+      <stop
+         offset="0.84601015"
+         style="stop-color:#d4aa00;stop-opacity:0.3764706;"
+         id="stop11190" />
+      <stop
+         id="stop11192"
+         style="stop-color:#806600;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient6662-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.9163711e-6,1.4006421,-1.4006413,-1.91637e-6,419.86161,-520.937)"
+       cx="388.28625"
+       cy="22.095467"
+       fx="388.28625"
+       fy="22.095467"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6664-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-189.61883,-71.437669)"
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999" />
+    <radialGradient
+       r="6.6429"
+       cy="140.0264"
+       cx="316.77731"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-189.61883,-71.437669)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9924"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient10149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.4569161e-5,16.999995,-16.999948,2.1857321e-4,534.92213,-316.07657)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient10155"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(12.020787,12.020836,-12.020624,12.020933,179.45324,-493.10124)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient10157"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-12.020836,12.020787,-12.020933,-12.020624,661.10124,60.45324)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient10159"
+       gradientUnits="userSpaceOnUse"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5"
+       gradientTransform="matrix(1.3076923,2.3076924e-8,-2.3076924e-8,1.3076923,-4.7692302,-7.5384619)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient10161"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(16.999995,3.4569161e-5,2.1857321e-4,16.999948,-197.07657,-366.92213)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="29.375"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="1127"
+     inkscape:window-x="-4"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid6259"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6145">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="32_data-providers"
+       inkscape:label="#data-providers"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         y="0"
+         x="0"
+         height="32"
+         width="32"
+         id="rect7375"
+         style="opacity:0.8;color:#000000;fill:none;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+         transform="translate(-1,1)"
+         id="g6656">
+        <path
+           transform="matrix(1.9166667,0,0,1.9166667,-737.41667,-35.916667)"
+           d="m 396.47827,25 c 0,3.02556 -2.45271,5.478261 -5.47827,5.478261 -3.02556,0 -5.47827,-2.452701 -5.47827,-5.478261 0,-3.02556 2.45271,-5.478261 5.47827,-5.478261 3.02556,0 5.47827,2.452701 5.47827,5.478261 z"
+           sodipodi:ry="5.478261"
+           sodipodi:rx="5.4782658"
+           sodipodi:cy="25"
+           sodipodi:cx="391"
+           id="path6497-26"
+           style="color:#000000;fill:url(#radialGradient6662);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.52173913;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4402"
+           y="4"
+           x="4"
+           height="16"
+           width="16" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cczzzcczzzc"
+           d="m 13.5,14 -3,0 c 0,-0.964286 0.01115,-1.511149 1,-2.5 1,-1 2,-1.388868 2,-2 0,-0.5 -0.558495,-1 -1.5,-1 -1,0 -1.5,0.857143 -1.5,1.5 l -3,-0.5 c 0.3214287,-2.892858 2,-4 4.5,-4 2.459001,0 4.5,1.571428 4.5,3.5 0,1.899076 -1.033575,2.355717 -2,3 -0.964286,0.642858 -1,1.035714 -1,2 z"
+           id="path6434-2"
+           style="fill:url(#radialGradient6664);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           width="3"
+           height="3"
+           x="10.5"
+           y="15.5"
+           id="rect6447-7"
+           style="fill:url(#radialGradient6666);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <g
+         id="g9896"
+         transform="matrix(2,0,0,2,2.5,-30.49996)">
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc"
+           id="path9759"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 6,-4 5,2 z"
+           style="color:#000000;fill:url(#linearGradient6591);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient6593);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 6,-4 z"
+           id="path9890"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc"
+           id="path9759-9"
+           d="m 8.5,28.49998 -5,-2 6,-4 5,2 z"
+           style="color:#000000;fill:url(#linearGradient6595);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 6,-4 5,2 z"
+           id="path9829"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           style="fill:none;stroke:#3d7b1f;stroke-width:0.5px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 7.75,29.49998 -0.5,-0.2"
+           id="path6671"
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path9894"
+           d="m 7.75,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:0.5px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           transform="matrix(0.5,0,0,0.5,-1.25,15.24998)"
+           inkscape:connector-curvature="0"
+           id="path7181"
+           d="m 12,26.5 0,-2"
+           style="opacity:0.8;color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           style="opacity:0.8;color:#000000;fill:none;stroke:#4b4b3c;stroke-width:0.5px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.5,28.74998 0,-1"
+           id="path7200"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:export-ydpi="90"
+           inkscape:export-xdpi="90"
+           inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+           inkscape:connector-curvature="0"
+           id="path7202"
+           d="m 6.25,28.99998 0,-1"
+           style="opacity:0.8;color:#000000;fill:none;stroke:#4b4b3c;stroke-width:0.5px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path7226"
+           d="m 4.5,26.49998 5,-3.25 4,1.5 -5,3.25 z"
+           style="fill:none;stroke:url(#linearGradient7327);stroke-width:0.5px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       id="32_display"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/display.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:label="#display"
+       transform="translate(4,0)">
+      <g
+         id="g7615"
+         transform="translate(-12,0)">
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:url(#radialGradient7682);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:36.01158905;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path21667"
+           sodipodi:cx="-1091.2587"
+           sodipodi:cy="-199.30086"
+           sodipodi:rx="385.69461"
+           sodipodi:ry="370.26682"
+           d="m -705.56406,-199.30086 c 0,204.4927179 -172.68136,370.26682 -385.69464,370.26682 -213.0132,0 -385.6946,-165.7741021 -385.6946,-370.26682 0,-204.49271 172.6814,-370.26681 385.6946,-370.26681 213.01328,0 385.69464,165.7741 385.69464,370.26681 z"
+           transform="matrix(0.032393,0,0,0.03373685,99.342972,22.732143)" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient7684);fill-opacity:1;fill-rule:nonzero;stroke:#435a36;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 62.743569,23.034997 c 0.723382,-0.242838 0.629346,1.247122 -0.120952,1.332594 -0.388071,0.963962 0.454346,1.859091 1.311393,2.290133 1.205607,0.04571 0.787762,1.369059 0.05821,1.784957 0.856844,0.112238 1.713713,-0.118714 2.542391,-0.311525 0.904655,-0.337264 1.774583,-0.733929 2.536273,-1.35173 1.178881,-0.43753 1.684142,-1.479778 2.383166,-2.417193 0.81925,-0.88955 -0.525679,-1.125323 -1.084024,-0.58631 -0.835154,0.04 -0.98838,-0.08912 -1.617606,0.238044 0.324393,-0.235448 0.297226,-0.950139 -0.336845,-0.969786 -0.972274,0.459804 -1.661333,-0.684438 -2.582975,-0.456189 -0.892178,0.0212 -1.420976,-0.445404 -2.145071,0.09492 -0.120571,0.156866 -0.431976,0.240919 -0.757083,0.24082"
+           id="path22086" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#radialGradient7686);fill-opacity:1;fill-rule:nonzero;stroke:#435a36;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 62.930451,22.923728 c -0.541382,-1.64e-4 -1.120762,-0.233673 -0.920239,-0.752885 0.397738,-1.023365 -1.533404,-0.434187 -0.922499,-1.237683 0.634666,-0.562338 -0.246429,-0.950674 -0.57875,-0.334487 -1.290523,0.646969 -1.617071,-1.918761 -0.434833,-2.182975 0.773928,0.331373 1.813356,-0.328836 2.274451,0.646013 -0.05012,0.743414 0.654596,0.652338 0.394262,-0.06506 -0.5295,-1.008296 1.210536,-1.06876 0.875025,-2.082705 0.150404,0.226997 0.369071,-0.763164 0.843642,-0.704185 0.02821,-0.266082 0.49769,-0.793738 0.975309,-0.969786 -0.308666,0.405739 -0.04405,0.549697 0.297798,0.208193 0.468273,-0.06058 -0.290619,-0.304096 -0.453976,-0.605446 0.100952,-0.220248 0.12169,-0.389989 0.09262,-0.507472 0.348607,-0.102869 0.714559,-0.201101 0.924785,-0.52814 0.255298,-0.595309 -0.307893,-0.484065 -0.35444,-0.509003 -0.378655,-0.07683 -0.576595,-0.666135 -0.881917,-1.0226 -0.175619,0.462332 -0.672821,0.484612 -0.602487,-0.114809 -0.660441,-0.868475 -1.087012,0.184413 -0.87656,0.794505 -0.389892,0.238741 -0.06571,1.572397 -0.521345,1.0226 0.165941,-1.018155 -1.466631,-0.930512 -1.259334,-1.922733 0.363595,-0.213887 0.340667,-0.867967 0.791583,-0.704951 -0.02524,-0.533654 1.113204,-0.445201 0.749477,-1.10603 0.251227,0.0067 0.488762,-0.08268 0.47081,0.264835 0.722119,0.206959 -0.06762,0.79157 -0.134738,0.897071 0.545916,-0.238683 0.439071,0.358902 0.963071,0.433993 0.478452,0.08731 -0.152405,-0.825926 -0.03214,-0.904726 0.219631,0.145961 0.388619,0.364823 0.38125,0.0085 -0.403429,-0.183049 -0.548429,-0.843313 -0.839821,-0.81364 C 63.985903,10.023791 63.981403,9.7587209 63.633939,9.8484017 63.32188,9.7426757 63.180523,9.6544176 62.983225,9.5276905 c -0.126393,-0.079893 -0.575977,0.086571 -0.469287,0.4584858 -0.0675,0.7124997 -0.286809,0.5569097 -0.629285,0.3153527 0.04036,-0.08932 0.02476,-0.262405 -0.0119,-0.3184134 0.327345,-0.5513951 -0.160857,-0.9613644 -0.458571,-0.8917134 0.08262,0.2855256 -0.443786,0.140864 -0.0375,0.422511 -0.20931,0.00976 -0.359083,0.05919 -0.458559,0.1301211 C 60.85526,9.5116643 60.795879,9.3910349 60.741272,9.3217934 60.111058,8.983693 59.784594,8.3317266 59.942035,7.5911809 59.822368,7.4369431 59.713189,7.3818278 59.610547,7.3783945 c -0.0095,-3.203e-4 -0.01881,-5.488e-4 -0.02833,0 l 3.93e-4,-3.93e-5 c -0.294785,0.017048 -0.536571,0.4346441 -0.811488,0.094143 -0.08345,0.3812264 -0.07845,0.4282298 -0.544309,0.3689324 -0.825714,-0.029809 -0.360333,1.0847129 -1.11388,0.8274183 -0.619655,0.1227854 0.711702,0.1917376 0.764785,0.3069326 0.649166,0.3672229 0.348381,1.3565595 0.20594,2.0444325 3.58e-4,0.817568 -0.69744,1.116619 -0.391202,1.846957 -0.482071,0.05089 -1.126047,1.462408 -1.146797,2.191395 0.216786,1.031014 0.238083,2.131158 0.481536,3.171896 0.464285,1.001251 0.05619,-0.642773 -7.62e-4,-1.014945 -0.100834,-1.016409 0.346107,0.0673 0.361345,0.481447 0.205333,0.744475 0.493369,1.4655 0.657607,2.24574 0.635618,0.942111 1.896701,1.120552 2.713879,1.814808 0.740595,0.273225 1.04175,1.630908 1.984309,1.277485"
+           id="path21928" />
+        <path
+           style="color:#000000;fill:url(#linearGradient7688);fill-opacity:1;fill-rule:nonzero;stroke:#435a36;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 74.905839,18.820177 c -0.877273,-0.274529 -0.841761,-1.295639 -1.121666,-2.057368 -0.161107,-0.786685 0.09167,-1.595822 -0.177071,-2.377417 -0.296667,-0.934723 0.294976,-1.783519 0.214357,-2.728997 -0.03381,-0.905735 0.808606,0.429376 0.880023,-0.516868 C 74.576006,10.291814 74.550113,9.3968789 73.915661,8.6823365 73.720994,8.4361002 73.34034,8.1497009 73.693459,8.6352414 c 0.223821,0.3666944 -0.01417,0.5757951 -0.309834,0.3865729 -0.07238,0.3875265 1.026155,0.9269538 0.118215,0.6594794 -0.373917,-0.2645208 -1.102714,0.2095019 -0.355322,0.2934112 0.442417,-0.1875495 0.493012,0.044286 0.655191,0.3487761 -1.26869,-0.4469592 -0.859702,1.232071 -0.439703,1.81708 0.575262,0.777072 -0.629595,1.63254 -0.89788,0.531108 -0.451631,-0.548812 0.685059,-1.220738 -0.279298,-1.539258 -0.711202,0.15323 -0.209559,-1.097217 -0.790916,-1.468053 C 71.643364,9.2567757 70.193436,8.5629332 71.073769,8.956474 71.751912,9.0996141 71.032103,7.5905083 70.451912,7.6062106 70.23196,7.2629959 70.025972,7.0355738 70.118698,7.6166868 69.753782,7.4756085 68.707532,6.9350836 69.567544,7.5472822 69.911841,7.8887086 71.286055,8.2591947 70.9454,8.6570747 70.670353,8.5224393 70.087877,8.5065429 70.548555,8.9092539 69.663163,8.9526704 69.499508,7.8460492 68.741996,7.5417917 68.159854,7.2836721 67.846521,6.4621526 68.472747,6.1564747 c 0.0644,0.2473732 0.551118,0.6983127 0.57794,0.2475899 C 68.638508,6.0526892 68.164723,6.0669952 67.992949,5.762203 67.578437,5.6149688 66.955521,5.0948855 66.703223,5.1298224 66.41364,5.3325576 66.298866,5.1279176 66.115498,5.0597035 65.455414,4.5901367 64.078403,5.5581344 63.763058,4.910011 63.422808,4.7965827 62.209772,4.663702 61.83332,5.1894782 61.105832,5.423511 60.328368,5.663133 59.918987,6.362204 59.648023,6.5625654 58.89513,7.6011356 58.842142,6.9816418 59.320154,6.6443629 58.954047,6.4660085 58.569547,6.6686235 58.286464,6.3578647 59.061678,5.4184586 58.202285,5.8148648 57.674536,5.2739411 59.032297,5.1073593 59.020214,5.7548292 59.334725,5.3985146 59.595868,4.8538813 60.16332,4.6615139 c 0.756881,-0.8457658 -0.820321,0.161683 -1.082809,-0.038178 0.697857,-0.2042173 1.27575,-0.7367899 2.072678,-0.7826362 4.645559,-1.1576663 9.853735,0.7057805 12.744793,4.5127274 0.488834,0.6134843 0.756024,1.3646635 1.243536,1.9758589 1.071618,2.103117 1.534618,4.514948 1.29807,6.864626 0.05143,-0.329472 -0.07083,-1.192177 -0.165273,-0.377377 -0.564488,0.536082 -0.295107,1.761284 -1.193619,2.012241 z"
+           id="path21878"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient7690);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 66.992545,11.708246 c -0.273357,-0.06486 -0.671012,-0.168523 -0.851,-0.492012 0.130631,-0.32611 -0.169107,0.06551 -0.236702,-0.391044 -0.302691,0.09979 -0.01667,-0.564094 -0.239321,-0.407159 C 65.888771,9.9290288 65.37645,10.104328 65.564093,9.8604683 65.232605,9.902123 65.207962,9.4827823 64.834355,9.182108 64.305058,9.113501 64.190498,9.0217512 64.286213,8.8606575 c -0.333036,-0.097595 0.319261,-0.8800931 0.24038,-0.7356566 -0.09238,-0.1775805 0.4855,-0.077595 0.266417,-0.321604 0.140667,-0.3986584 0.633333,-0.1543007 0.582893,-0.084952 0.249023,0.2838053 0.08417,-0.3901477 0.331809,0.02425 0.03143,0.039583 0.600952,0.5175273 0.585393,0.480062 0.364845,0.1965769 0.394964,0.3282587 0.566178,0.4803274 -0.382964,0.1747472 0.109762,0.2097424 0.445964,0.3979419 -0.609726,0.2334864 -0.155964,0.1094164 0.07464,0.2773196 -0.37056,0.4925096 -0.11381,0.7656682 -0.458726,1.2310312 0.0925,0.322754 0.06821,0.659433 0.246285,1.039104 0.07214,0.01227 -0.19769,0.20416 -0.174892,0.05976 z"
+           id="path21822" />
+      </g>
+      <rect
+         style="opacity:0.8;color:#000000;fill:none;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect7567"
+         width="32"
+         height="32"
+         x="36"
+         y="0" />
+    </g>
+    <g
+       transform="translate(80,0)"
+       id="32_qf"
+       inkscape:label="#qf"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/qf.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         y="0"
+         x="0"
+         height="32"
+         width="32"
+         id="rect9859"
+         style="opacity:0.8;color:#000000;fill:none;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+         transform="translate(4,3.9999999)"
+         id="g6656-8">
+        <path
+           transform="matrix(1.9166667,0,0,1.9166667,-737.41667,-35.916667)"
+           d="m 396.47827,25 c 0,3.02556 -2.45271,5.478261 -5.47827,5.478261 -3.02556,0 -5.47827,-2.452701 -5.47827,-5.478261 0,-3.02556 2.45271,-5.478261 5.47827,-5.478261 3.02556,0 5.47827,2.452701 5.47827,5.478261 z"
+           sodipodi:ry="5.478261"
+           sodipodi:rx="5.4782658"
+           sodipodi:cy="25"
+           sodipodi:cx="391"
+           id="path6497-26-2"
+           style="color:#000000;fill:url(#radialGradient6662-4);fill-opacity:1.0;stroke:#4b4b3c;stroke-width:0.52173913000000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <rect
+           style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4402-8"
+           y="4"
+           x="4"
+           height="16"
+           width="16" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cczzzcczzzc"
+           d="m 13.5,14 -3,0 c 0,-0.964286 0.01115,-1.511149 1,-2.5 1,-1 2,-1.388868 2,-2 0,-0.5 -0.558495,-1 -1.5,-1 -1,0 -1.5,0.857143 -1.5,1.5 l -3,-0.5 c 0.3214287,-2.892858 2,-4 4.5,-4 2.459001,0 4.5,1.571428 4.5,3.5 0,1.899076 -1.033575,2.355717 -2,3 -0.964286,0.642858 -1,1.035714 -1,2 z"
+           id="path6434-2-5"
+           style="fill:url(#radialGradient6664-8);fill-opacity:1.0;stroke:#2a4556;stroke-width:0.89999998000000003;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           width="3"
+           height="3"
+           x="10.5"
+           y="15.5"
+           id="rect6447-7-4"
+           style="fill:url(#radialGradient9924);fill-opacity:1.0;stroke:#2a4556;stroke-width:0.89999998000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <g
+         transform="translate(-123,-13)"
+         id="g11970">
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:url(#radialGradient10159);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path5617-8"
+           sodipodi:cx="15.5"
+           sodipodi:cy="24.5"
+           sodipodi:rx="8.5"
+           sodipodi:ry="8.5"
+           d="M 24,24.5 C 24,29.19442 20.19442,33 15.5,33 10.80558,33 7,29.19442 7,24.5 7,19.80558 10.80558,16 15.5,16 c 4.69442,0 8.5,3.80558 8.5,8.5 z"
+           transform="translate(128,0)" />
+        <path
+           style="fill:none;stroke:url(#radialGradient10161);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 143.5,16.5 0,16"
+           id="path4172-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path10147"
+           d="m 151.5,24.5 -16,0"
+           style="fill:none;stroke:url(#radialGradient10149);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path10151"
+           d="m 149.15685,18.843146 -11.3137,11.313708"
+           style="fill:none;stroke:url(#radialGradient10155);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           style="fill:none;stroke:url(#radialGradient10157);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 149.15685,30.156854 137.84315,18.843146"
+           id="path10153"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/iqr.png"
+       inkscape:label="#iqr"
+       id="32_iqr"
+       transform="translate(120,0)">
+      <rect
+         style="opacity:0.8;color:#000000;fill:none;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8967"
+         width="32"
+         height="32"
+         x="0"
+         y="0" />
+      <g
+         id="g8969"
+         transform="translate(4,4)"
+         inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/32x32/data-providers.png"
+         inkscape:export-xdpi="90"
+         inkscape:export-ydpi="90">
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:url(#radialGradient9001);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.52173913;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path8971"
+           sodipodi:cx="391"
+           sodipodi:cy="25"
+           sodipodi:rx="4.4347878"
+           sodipodi:ry="4.434783"
+           d="m 395.43479,25 c 0,2.449263 -1.98552,4.434783 -4.43479,4.434783 -2.44927,0 -4.43479,-1.98552 -4.43479,-4.434783 0,-2.449263 1.98552,-4.434783 4.43479,-4.434783 2.44927,0 4.43479,1.98552 4.43479,4.434783 z"
+           transform="matrix(1.9166667,0,0,1.9166667,-737.41667,-35.916667)" />
+        <rect
+           width="16"
+           height="16"
+           x="4"
+           y="4"
+           id="rect8973"
+           style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="fill:url(#radialGradient9003);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path8975"
+           d="m 13.5,14 -3,0 c 0,-0.964286 0.01115,-1.511149 1,-2.5 1,-1 2,-1.388868 2,-2 0,-0.5 -0.558495,-1 -1.5,-1 -1,0 -1.5,0.857143 -1.5,1.5 l -3,-0.5 c 0.3214287,-2.892858 2,-4 4.5,-4 2.459001,0 4.5,1.571428 4.5,3.5 0,1.899076 -1.033575,2.355717 -2,3 -0.964286,0.642858 -1,1.035714 -1,2 z"
+           sodipodi:nodetypes="cczzzcczzzc"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="fill:url(#radialGradient9005);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="rect8977"
+           y="15.5"
+           x="10.5"
+           height="3"
+           width="3" />
+      </g>
+      <path
+         id="path9039"
+         transform="matrix(-1,0,0,1,112,0)"
+         style="color:#000000;fill:url(#radialGradient9067-2);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 95.5,5.5 c -5.5,0 -10,5 -10,10 0,-8 3.5,-13 11,-13 5,0 10,2.5 12.5,8 l 2,0 -4.5,4.5 -4.5,-4.5 2.5,0 c -1,-2.5 -4,-5 -9,-5 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="scscccccs" />
+      <path
+         sodipodi:nodetypes="scscccccs"
+         inkscape:connector-curvature="0"
+         d="m 15.5,26.5 c -5.5,0 -10,-5 -10,-10 0,8 3.5,13 11,13 5,0 10,-2.5 12.5,-8 l 2,0 -4.5,-4.5 -4.5,4.5 2.5,0 c -1,2.5 -4,5 -9,5 z"
+         style="color:#000000;fill:url(#radialGradient9152);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path9150" />
+    </g>
+  </g>
+</svg>
diff --git a/Icons/icons-source.svg b/Icons/icons-source.svg
new file mode 100644
index 00000000..cafcf2c1
--- /dev/null
+++ b/Icons/icons-source.svg
@@ -0,0 +1,6126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="336"
+   height="64"
+   id="svg5336"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="icons-source.svg">
+  <defs
+     id="defs5338">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7027"
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651">
+      <stop
+         offset="0"
+         style="stop-color:#ff7b5a;stop-opacity:0.75294119;"
+         id="stop7029" />
+      <stop
+         offset="0.2"
+         style="stop-color:#ee6442;stop-opacity:0.75294119;"
+         id="stop7031" />
+      <stop
+         offset="1"
+         style="stop-color:#c53612;stop-opacity:0.75294119;"
+         id="stop7033" />
+    </linearGradient>
+    <linearGradient
+       id="SG_GRAYBLUE_1">
+      <stop
+         style="stop-color:#b7c6d9;stop-opacity:1;"
+         offset="0"
+         id="stop27541" />
+      <stop
+         id="stop27597"
+         offset="0.5"
+         style="stop-color:#788596;stop-opacity:1;" />
+      <stop
+         style="stop-color:#6e7c8d;stop-opacity:1"
+         offset="0.75"
+         id="stop27599" />
+      <stop
+         style="stop-color:#576270;stop-opacity:1;"
+         offset="1"
+         id="stop27543" />
+    </linearGradient>
+    <linearGradient
+       id="SG_BLACK_1">
+      <stop
+         style="stop-color:#111111;stop-opacity:1;"
+         offset="0"
+         id="stop3900" />
+      <stop
+         style="stop-color:#434343;stop-opacity:1;"
+         offset="1"
+         id="stop3902" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8997">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8999"
+         width="22"
+         height="22.000002"
+         x="0"
+         y="10" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8991">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8951);enable-background:accumulate"
+         id="rect8993"
+         width="14"
+         height="14"
+         x="289"
+         y="1"
+         transform="matrix(1.375,0,0,1.3750001,-396,10)" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter8951"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.42"
+         id="feGaussianBlur8953" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5678"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5680"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4096"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4098"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4100"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4336"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4338"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4340"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4342"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4344"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4458"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4460"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4462"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4464"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4584"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4586"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4588"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429"
+       id="SG_BLUE_2"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6437-1-5"
+         style="stop-color:#ccebff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6439-4-9"
+         style="stop-color:#9fd9ff;stop-opacity:1"
+         offset="0.1964" />
+      <stop
+         id="stop6441-9-2"
+         style="stop-color:#4ab7ff;stop-opacity:1"
+         offset="0.58850002" />
+      <stop
+         id="stop6443-1-6"
+         style="stop-color:#15a1ff;stop-opacity:1"
+         offset="0.86559999" />
+      <stop
+         id="stop6445-7-8"
+         style="stop-color:#0099ff;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient6037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-205.14922,-96.662543)"
+       cx="314.40698"
+       cy="180.903"
+       fx="314.40698"
+       fy="180.903"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient6039"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-205.14922,-96.662543)"
+       cx="317.72842"
+       cy="192.19595"
+       fx="317.72842"
+       fy="192.19595"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient6037-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-225.14922,-64.662523)"
+       cx="314.40698"
+       cy="180.903"
+       fx="314.40698"
+       fy="180.903"
+       r="6.6429" />
+    <radialGradient
+       r="6.6429"
+       fy="192.19595"
+       fx="317.72842"
+       cy="192.19595"
+       cx="317.72842"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-225.14922,-96.662543)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6076"
+       xlink:href="#SG_BLUE_2"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient6037-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-225.14922,-64.662523)"
+       cx="314.40698"
+       cy="180.903"
+       fx="314.40698"
+       fy="180.903"
+       r="6.6429" />
+    <radialGradient
+       r="6.6429"
+       fy="192.19595"
+       fx="317.72842"
+       cy="192.19595"
+       cx="317.72842"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-225.14922,-96.662543)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6076-8"
+       xlink:href="#SG_BLUE_2"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199"
+       id="SG_RED_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6415-6-8-3"
+         style="stop-color:#ffc2b2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6417-4-9-4"
+         style="stop-color:#ffb8a6;stop-opacity:1"
+         offset="0.068" />
+      <stop
+         id="stop6419-2-3-0"
+         style="stop-color:#ff3300;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient8864"
+       gradientUnits="userSpaceOnUse"
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient8978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient8980"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient8982"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient8984"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient8986"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient9064"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient9066"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient9068"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       y2="132.59604"
+       x2="169.32954"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="matrix(0.78571426,0,0,0.78571426,-121.04464,-74.682613)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9087"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="132.59604"
+       x2="169.32954"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="matrix(1.0803571,0,0,1.0803572,-166.43638,-114.68864)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9125"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="132.59604"
+       x2="169.32954"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="matrix(0.78571426,0,0,0.78571426,-121.04464,-74.682613)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9125-2"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9295"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9336"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9723-1"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       y2="21.999981"
+       x2="5.5"
+       y1="27.499981"
+       x1="9"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9851"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9892"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9723-1-2"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9892-6"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       y2="21.999981"
+       x2="5.5"
+       y1="27.499981"
+       x1="9"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9851-0"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9723-1-2-9"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9892-6-7"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       y2="21.999981"
+       x2="5.5"
+       y1="27.499981"
+       x1="9"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9851-0-3"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9723-1-2-9-4"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9892-6-7-9"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       y2="21.999981"
+       x2="5.5"
+       y1="27.499981"
+       x1="9"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9851-0-3-2"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9723-1-2-9-0"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9892-6-7-8"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       y2="21.999981"
+       x2="5.5"
+       y1="27.499981"
+       x1="9"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9851-0-3-7"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9723-1-2-7"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9892-6-4"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       y2="21.999981"
+       x2="5.5"
+       y1="27.499981"
+       x1="9"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9851-0-4"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient10537"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient10539"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient10541"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient10555"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient10557"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient10559"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient6037-9-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-215.14922,-44.662523)"
+       cx="300.45691"
+       cy="89.230858"
+       fx="300.45691"
+       fy="89.230858"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26538"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26540"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26542"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient26552"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-215.14922,-40.662523)"
+       cx="300.45691"
+       cy="89.230858"
+       fx="300.45691"
+       fy="89.230858"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26582"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26584"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26586"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26588"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26590"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26592"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient26596"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-222.14922,-40.662523)"
+       cx="300.45691"
+       cy="89.230858"
+       fx="300.45691"
+       fy="89.230858"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26626"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26628"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26630"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient26640"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-215.14922,-40.662523)"
+       cx="300.45691"
+       cy="89.230858"
+       fx="300.45691"
+       fy="89.230858"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26670"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26672"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26674"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26676"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26678"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26680"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient26552-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-215.14922,-40.662523)"
+       cx="291.15686"
+       cy="89.230858"
+       fx="291.15686"
+       fy="89.230858"
+       r="6.6429" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26820"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26822"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient26824"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26856"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26858"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient26860"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAYBLUE_1"
+       id="radialGradient27545"
+       cx="146"
+       cy="7.1008725"
+       fx="146"
+       fy="7.1008725"
+       r="6.9999657"
+       gradientTransform="matrix(1.1428627,-8.6807234e-8,1.4309263e-7,1.7142943,-20.857954,-4.1729711)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAYBLUE_1"
+       id="radialGradient27607"
+       cx="1.193305"
+       cy="25.579895"
+       fx="1.193305"
+       fy="25.579895"
+       r="4.8401699"
+       gradientTransform="matrix(0.98074883,-0.36324029,0.51651067,1.3945788,-13.382621,-9.2397458)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.98074883,-0.36324029,0.51651067,1.3945788,-13.382624,-9.2397446)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient27628"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.98074883,-0.36324029,0.51651067,1.3945788,-13.382624,-9.2397436)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient27672"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(1.3485296,-0.49945544,0.71020217,1.917546,-18.401107,-24.70469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient27672-0"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient28291"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient28293"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient28295"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       r="6.9999657"
+       fy="7.1008725"
+       fx="146"
+       cy="7.1008725"
+       cx="146"
+       gradientTransform="matrix(1.5714362,-1.1935996e-7,1.9675237e-7,2.3571548,-221.1797,4.2621002)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient28424"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.6429"
+       fy="89.230858"
+       fx="300.45691"
+       cy="89.230858"
+       cx="300.45691"
+       gradientTransform="matrix(1.0537596,6.9443069e-8,-6.9442869e-8,1.0537565,-305.60934,-67.527636)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient28470"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient6366"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient6368"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6370"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6372"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6374"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6376"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6378"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6380"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6382"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6384"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6386"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6388"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6390"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6392"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient6442"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient6444"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6446"
+       gradientUnits="userSpaceOnUse"
+       x1="10.5"
+       y1="28.999981"
+       x2="8.5"
+       y2="26.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6448"
+       gradientUnits="userSpaceOnUse"
+       x1="7.5"
+       y1="29.999981"
+       x2="8"
+       y2="28.499981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6450"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="27.499981"
+       x2="5.5"
+       y2="21.999981" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7027"
+       id="linearGradient7025"
+       x1="6.5"
+       y1="27.499981"
+       x2="8"
+       y2="29.999981"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient7037"
+       x1="6.5"
+       y1="27.499981"
+       x2="8"
+       y2="29.999981"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="29.999981"
+       x2="8"
+       y1="27.499981"
+       x1="6.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7060"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="29.999981"
+       x2="8"
+       y1="27.499981"
+       x1="6.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7062"
+       xlink:href="#linearGradient7027"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="29.999981"
+       x2="8"
+       y1="27.499981"
+       x1="6.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7060-0"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="29.999981"
+       x2="8"
+       y1="27.499981"
+       x1="6.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7062-0"
+       xlink:href="#linearGradient7027"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7027-7"
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651">
+      <stop
+         offset="0"
+         style="stop-color:#ffcd06;stop-opacity:0.75294119;"
+         id="stop7029-0" />
+      <stop
+         offset="0.2"
+         style="stop-color:#d1ab11;stop-opacity:0.75294119;"
+         id="stop7031-46" />
+      <stop
+         offset="1"
+         style="stop-color:#ba980d;stop-opacity:0.75294119;"
+         id="stop7033-6" />
+    </linearGradient>
+    <linearGradient
+       y2="30.999981"
+       x2="8"
+       y1="26.499981"
+       x1="6"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7060-00"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7027-7"
+       id="linearGradient7159"
+       x1="5.5999999"
+       y1="28.749981"
+       x2="8.8999996"
+       y2="28.749981"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879"
+       id="SG_GREEN_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6305-3"
+         style="stop-color:#d1f0c2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6307-0"
+         style="stop-color:#66cc33;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="359.05081"
+       y1="122.8501"
+       x2="346.7869"
+       y2="108.6055"
+       id="SG_GRAY_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6630-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6632-5"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6634-2"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.51010001" />
+      <stop
+         id="stop6636-90"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop6638-2"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="SG_GOLD_1"
+       y2="124.8127"
+       x2="23.477301"
+       y1="136.9731"
+       x1="26.1304">
+      <stop
+         offset="0"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         id="stop6510-5" />
+      <stop
+         id="stop6515-9"
+         style="stop-color:#ffd42a;stop-opacity:1"
+         offset="0.60644233" />
+      <stop
+         offset="0.72660697"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop6517-62" />
+      <stop
+         id="stop6519-17"
+         style="stop-color:#d4aa00;stop-opacity:1"
+         offset="0.84601015" />
+      <stop
+         offset="1"
+         style="stop-color:#806600;stop-opacity:1"
+         id="stop6512-8" />
+    </linearGradient>
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.98074883,-0.36324029,0.51651067,1.3945788,6.61738,-9.239744)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3878"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.98074883,-0.36324029,0.51651067,1.3945788,-13.38262,-9.239744)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4686"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.98074883,-0.36324029,0.51651067,1.3945788,-13.38262,-9.239744)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4686-5"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4835"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4878"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(20,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4907"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72727273,0,0,0.72727273,-134.2269,-64.060334)"
+       x1="199.68698"
+       y1="120.39543"
+       x2="199.68698"
+       y2="128.64543" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4923"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-26.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient4926"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-32.00002)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.98074883,-0.36324029,0.51651067,1.3945788,-13.38262,-9.239744)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4686-4"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(1.3485296,-0.49945544,0.71020217,1.917546,-18.401103,-24.704687)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4686-3"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(1.3485296,-0.49945545,0.71020217,1.917546,-18.401103,-24.704687)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5080"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(1.3485296,-0.49945545,0.71020217,1.917546,-18.401104,-24.704687)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5080-2"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(1.3485296,-0.49945545,0.71020217,1.917546,-18.4011,-24.704687)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5080-1"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.9807488,-0.3632403,0.51651067,1.3945788,-13.38262,-9.239744)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5080-4"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.9807488,-0.3632403,0.51651067,1.3945788,-13.38262,-9.2397436)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5183"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.9807488,-0.3632403,0.51651067,1.3945788,-13.38262,-9.2397436)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5183-3"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(0.9807488,-0.3632403,0.51651067,1.3945788,-13.38262,-9.2397436)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5183-4"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4899"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4901"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-19.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4903"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-593.17862,-13.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_2"
+       id="radialGradient4905"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75268435,-1.2034079e-8,1.2034048e-8,0.7526825,-215.14922,-40.662523)"
+       cx="300.45691"
+       cy="89.230858"
+       fx="300.45691"
+       fy="89.230858"
+       r="6.6429" />
+    <linearGradient
+       y2="128.64543"
+       x2="199.68698"
+       y1="120.39543"
+       x1="199.68698"
+       gradientTransform="translate(-184.56199,-100.083)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8946"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="128.64543"
+       x2="199.68698"
+       y1="120.39543"
+       x1="199.68698"
+       gradientTransform="matrix(0.72727273,0,0,0.72727273,-134.2269,-64.060335)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8946-6"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="168"
+     inkscape:cy="31.99998"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1656"
+     inkscape:window-height="1120"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5682"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5341">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/video.png"
+       inkscape:label="#source-video"
+       id="16_source-video"
+       transform="translate(0,1020.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8868"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1.5,17.49998 0,12"
+         id="path8870"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:url(#linearGradient8978);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+         id="rect8872"
+         width="7"
+         height="6"
+         x="3.5"
+         y="17.499981" />
+      <rect
+         y="23.499981"
+         x="3.5"
+         height="5.999999"
+         width="7"
+         id="rect8874"
+         style="fill:url(#linearGradient8980);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path8876"
+         d="m 12.5,17.49998 0,12"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1.5,18.49998 2,0"
+         id="path8878"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8880"
+         d="m 1.5,20.49998 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1.5,22.49998 2,0"
+         id="path8882"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8884"
+         d="m 1.5,24.49998 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1.5,26.49998 2,0"
+         id="path8886"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8888"
+         d="m 1.5,28.49998 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8890"
+         d="m 10.5,18.49998 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.5,20.49998 2,0"
+         id="path8892"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8894"
+         d="m 10.5,22.49998 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.5,24.49998 2,0"
+         id="path8896"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8898"
+         d="m 10.5,26.49998 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.5,28.49998 2,0"
+         id="path8900"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/video-stream-pending.png"
+       inkscape:label="#source-video-stream-pending"
+       id="16_source-video-stream-pending"
+       transform="translate(0,1020.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3108"
+         y="16"
+         x="20"
+         height="16"
+         width="16" />
+      <g
+         id="g4882">
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path3894"
+           d="m 21.5,17.49998 0,12"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           y="17.499981"
+           x="23.5"
+           height="6"
+           width="7"
+           id="rect3896"
+           style="fill:url(#linearGradient4878);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+        <rect
+           style="fill:url(#linearGradient4875);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+           id="rect3906"
+           width="7"
+           height="5.999999"
+           x="23.5"
+           y="23.499981" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 32.5,17.49998 0,12"
+           id="path3910"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3912"
+           d="m 21.5,18.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 21.5,20.49998 2,0"
+           id="path3914" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3916"
+           d="m 21.5,22.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 21.5,24.49998 2,0"
+           id="path3918" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3920"
+           d="m 21.5,26.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 21.5,28.49998 2,0"
+           id="path3922" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 30.5,18.49998 2,0"
+           id="path3924" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3926"
+           d="m 30.5,20.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 30.5,22.49998 2,0"
+           id="path3928" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3930"
+           d="m 30.5,24.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 30.5,26.49998 2,0"
+           id="path3932" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3934"
+           d="m 30.5,28.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <path
+         style="fill:url(#radialGradient3878);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 29.00003,31.500014 -5.75004,0 c 0.25,-0.499927 -0.50001,-1.249818 -1.50001,-2.249673 -1.02972,-1.029561 -1.25001,-1.771153 -1.25001,-2.499637 0,-0.749891 3.00002,-1.717871 3.00002,-1.99971 0,-0.281839 -1.00001,-0.249964 -1.50001,-0.249964 l 2.00001,0 c 0.50001,0 1.50002,0 1.50002,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.00001,0.999855 2.50002,1.99971 2.00001,2.499637 z"
+         id="path21915-5-0-72"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g6033"
+         transform="translate(-1,-17)">
+        <path
+           sodipodi:nodetypes="ccccccccc"
+           id="path4620"
+           d="m 33.5,43.49998 0,-0.5 2,-2 0,-1.5 -5,0 0,1.5 2,2 0,0.5 1,0 z"
+           style="color:#000000;fill:url(#radialGradient6037);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#radialGradient6039);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 33.5,43.49998 0,0.5 2,2 0,1.5 -5,0 0,-1.5 2,-2 0,-0.5 1,0 z"
+           id="path6029"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       transform="translate(40,1020.3622)"
+       id="16_source-video-stream-active"
+       inkscape:label="#source-video-stream-active"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/video-stream-active.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect3982"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g4839">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,17.49998 0,12"
+           id="path3984"
+           sodipodi:nodetypes="cc" />
+        <rect
+           style="fill:url(#linearGradient4835);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+           id="rect3986"
+           width="7"
+           height="6"
+           x="3.5"
+           y="17.499981" />
+        <rect
+           y="23.499981"
+           x="3.5"
+           height="5.999999"
+           width="7"
+           id="rect3988"
+           style="fill:url(#linearGradient4832);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path3990"
+           d="m 12.5,17.49998 0,12"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,18.49998 2,0"
+           id="path3992" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3994"
+           d="m 1.5,20.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,22.49998 2,0"
+           id="path3996" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3998"
+           d="m 1.5,24.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,26.49998 2,0"
+           id="path4000" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4002"
+           d="m 1.5,28.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4004"
+           d="m 10.5,18.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,20.49998 2,0"
+           id="path4006" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4008"
+           d="m 10.5,22.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,24.49998 2,0"
+           id="path4010" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4012"
+           d="m 10.5,26.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,28.49998 2,0"
+           id="path4014" />
+      </g>
+      <path
+         style="fill:url(#radialGradient4686-5);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.00003,31.500014 -5.75004,0 C 3.49999,31.000087 2.74998,30.250196 1.74998,29.250341 0.72026,28.22078 0.49997,27.479188 0.49997,26.750704 c 0,-0.749891 3.00002,-1.717871 3.00002,-1.99971 0,-0.281839 -1.00001,-0.249964 -1.50001,-0.249964 l 2.00001,0 c 0.50001,0 1.50002,0 1.50002,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.00001,0.999855 2.50002,1.99971 2.00001,2.499637 z"
+         id="path21915-5-0-72-6"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path4001-4"
+         d="m 8.5,22.500027 0,8 6.25,-4 -6.25,-4 z"
+         style="fill:url(#linearGradient9087);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/video-stream-idle.png"
+       inkscape:label="#source-video-stream-idle"
+       id="16_source-video-stream-idle"
+       transform="translate(60,1020.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4104"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <g
+         id="g4949">
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path4106"
+           d="m 1.5,17.49998 0,12"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           y="17.499981"
+           x="3.5"
+           height="6"
+           width="7"
+           id="rect4108"
+           style="fill:url(#linearGradient4926);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+        <rect
+           style="fill:url(#linearGradient4923);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+           id="rect4110"
+           width="7"
+           height="5.999999"
+           x="3.5"
+           y="23.499981" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 12.5,17.49998 0,12"
+           id="path4112"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4114"
+           d="m 1.5,18.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,20.49998 2,0"
+           id="path4116" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4118"
+           d="m 1.5,22.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,24.49998 2,0"
+           id="path4120" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4122"
+           d="m 1.5,26.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,28.49998 2,0"
+           id="path4124" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,18.49998 2,0"
+           id="path4126" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4128"
+           d="m 10.5,20.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,22.49998 2,0"
+           id="path4130" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4132"
+           d="m 10.5,24.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,26.49998 2,0"
+           id="path4134" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4136"
+           d="m 10.5,28.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <path
+         style="fill:url(#radialGradient4686-4);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.00003,31.500014 -5.75004,0 C 3.49999,31.000087 2.74998,30.250196 1.74998,29.250341 0.72026,28.22078 0.49997,27.479188 0.49997,26.750704 c 0,-0.749891 3.00002,-1.717871 3.00002,-1.99971 0,-0.281839 -1.00001,-0.249964 -1.50001,-0.249964 l 2.00001,0 c 0.50001,0 1.50002,0 1.50002,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.00001,0.999855 2.50002,1.99971 2.00001,2.499637 z"
+         id="path21915-5-0-72-4"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:url(#linearGradient4907);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-linecap:round;stroke-opacity:1"
+         id="rect8626"
+         y="23.499981"
+         x="8.5"
+         height="6.000001"
+         width="6" />
+    </g>
+    <g
+       transform="translate(80,1020.3622)"
+       id="16_source-video-stream-stopped"
+       inkscape:label="#source-video-stream-stopped"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/video-stream-stopped.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect4226"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g4772">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,17.49998 0,12"
+           id="path4228"
+           sodipodi:nodetypes="cc" />
+        <rect
+           style="fill:url(#linearGradient4336);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+           id="rect4230"
+           width="7"
+           height="6"
+           x="3.5"
+           y="17.499981" />
+        <rect
+           y="23.499981"
+           x="3.5"
+           height="5.999999"
+           width="7"
+           id="rect4232"
+           style="fill:url(#linearGradient4338);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path4234"
+           d="m 12.5,17.49998 0,12"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,18.49998 2,0"
+           id="path4236" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4238"
+           d="m 1.5,20.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,22.49998 2,0"
+           id="path4240" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4242"
+           d="m 1.5,24.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,26.49998 2,0"
+           id="path4244" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4246"
+           d="m 1.5,28.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4248"
+           d="m 10.5,18.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,20.49998 2,0"
+           id="path4250" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4252"
+           d="m 10.5,22.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,24.49998 2,0"
+           id="path4254" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4256"
+           d="m 10.5,26.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,28.49998 2,0"
+           id="path4258" />
+      </g>
+      <path
+         style="fill:url(#radialGradient4686);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.00003,31.500014 -5.75004,0 C 3.49999,31.000087 2.74998,30.250196 1.74998,29.250341 0.72026,28.22078 0.49997,27.479188 0.49997,26.750704 c 0,-0.749891 3.00002,-1.717871 3.00002,-1.99971 0,-0.281839 -1.00001,-0.249964 -1.50001,-0.249964 l 2.00001,0 c 0.50001,0 1.50002,0 1.50002,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.00001,0.999855 2.50002,1.99971 2.00001,2.499637 z"
+         id="path21915-5-0-72-0"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <polygon
+         style="fill:url(#linearGradient8864);stroke:#603b31;stroke-width:1.45109415;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="polygon6106-6"
+         transform="matrix(0.55130226,0,0,0.55131404,-136.04756,-45.377453)"
+         points="270.729,138.892 274.217,135.403 269.495,130.682 274.217,125.961 274.217,125.961 270.729,122.473 266.008,127.194 261.286,122.473 257.797,125.96 262.52,130.682 257.797,135.404 261.286,138.892 266.008,134.17 " />
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/video-archived.png"
+       inkscape:label="#source-video-archived"
+       id="16_source-video-archived"
+       transform="translate(140,1020.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4348"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <g
+         id="g4967">
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path4350"
+           d="m 1.5,17.49998 0,12"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           y="17.499981"
+           x="3.5"
+           height="6"
+           width="7"
+           id="rect4352"
+           style="fill:url(#linearGradient4458);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+        <rect
+           style="fill:url(#linearGradient4460);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+           id="rect4354"
+           width="7"
+           height="5.999999"
+           x="3.5"
+           y="23.499981" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 12.5,17.49998 0,12"
+           id="path4356"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4358"
+           d="m 1.5,18.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,20.49998 2,0"
+           id="path4360" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4362"
+           d="m 1.5,22.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,24.49998 2,0"
+           id="path4364" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4366"
+           d="m 1.5,26.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,28.49998 2,0"
+           id="path4368" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,18.49998 2,0"
+           id="path4370" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4372"
+           d="m 10.5,20.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,22.49998 2,0"
+           id="path4374" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4376"
+           d="m 10.5,24.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,26.49998 2,0"
+           id="path4378" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4380"
+           d="m 10.5,28.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         id="g9896"
+         transform="translate(1,1)">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path9759"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient9723-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient9892);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path9890"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path9759-9"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient9851);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path9829"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path9894"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       transform="translate(160,1020.3622)"
+       id="16_source-video-archived-active"
+       inkscape:label="#source-video-archived-active"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/video-archived-active.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect6220"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g4985">
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,17.49998 0,12"
+           id="path6222"
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="fill:url(#linearGradient6366);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+           id="rect6224"
+           width="7"
+           height="6"
+           x="3.5"
+           y="17.499981" />
+        <rect
+           y="23.499981"
+           x="3.5"
+           height="5.999999"
+           width="7"
+           id="rect6226"
+           style="fill:url(#linearGradient6368);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path6228"
+           d="m 12.5,17.49998 0,12"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,18.49998 2,0"
+           id="path6230"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path6232"
+           d="m 1.5,20.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,22.49998 2,0"
+           id="path6234"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path6236"
+           d="m 1.5,24.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,26.49998 2,0"
+           id="path6238"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path6240"
+           d="m 1.5,28.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path6242"
+           d="m 10.5,18.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,20.49998 2,0"
+           id="path6244"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path6246"
+           d="m 10.5,22.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,24.49998 2,0"
+           id="path6248"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path6250"
+           d="m 10.5,26.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,28.49998 2,0"
+           id="path6252"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="translate(1,1)"
+         id="g6254">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient6370);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path6256"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc"
+           id="path6258"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           style="color:#000000;fill:url(#linearGradient6372);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient6374);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           id="path6260"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc"
+           id="path6262"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient7037);fill-opacity:1;stroke:url(#linearGradient7025);stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.99958801;stroke-dasharray:none"
+           d="m 8.5,29.99998 0,-1.5 -2.5,-1 0,1.5 z"
+           id="path6264"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/video-archived-suspended.png"
+       inkscape:label="#source-video-archived-suspended"
+       id="16_source-video-archived-suspended"
+       transform="translate(180,1020.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6396"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <g
+         id="g5003">
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc"
+           id="path6398"
+           d="m 1.5,17.49998 0,12"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+        <rect
+           y="17.499981"
+           x="3.5"
+           height="6"
+           width="7"
+           id="rect6400"
+           style="fill:url(#linearGradient6442);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+        <rect
+           style="fill:url(#linearGradient6444);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+           id="rect6402"
+           width="7"
+           height="5.999999"
+           x="3.5"
+           y="23.499981" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 12.5,17.49998 0,12"
+           id="path6404"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6406"
+           d="m 1.5,18.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,20.49998 2,0"
+           id="path6408" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6410"
+           d="m 1.5,22.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,24.49998 2,0"
+           id="path6412" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6414"
+           d="m 1.5,26.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 1.5,28.49998 2,0"
+           id="path6416" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,18.49998 2,0"
+           id="path6418" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6420"
+           d="m 10.5,20.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,22.49998 2,0"
+           id="path6422" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6424"
+           d="m 10.5,24.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 10.5,26.49998 2,0"
+           id="path6426" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6428"
+           d="m 10.5,28.49998 2,0"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         id="g6430"
+         transform="translate(1,1)">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path6432"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient6446);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient6448);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path6434"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path6436"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient6450);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path6438"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient7060-00);fill-opacity:1;stroke:url(#linearGradient7159);stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.99958801;stroke-dasharray:none"
+           d="m 8.5,29.99998 0,-1.5 -2.5,-1 0,1.5 z"
+           id="path6264-2"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <g
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track.png"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:label="#source-track"
+       id="16_source-track"
+       transform="matrix(0.72727273,0,0,0.72727268,0,1005.0895)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8904"
+         y="10"
+         x="0"
+         height="22"
+         width="22" />
+      <g
+         id="g8906"
+         mask="url(#mask8991)"
+         clip-path="url(#clipPath8997)">
+        <rect
+           y="24.437502"
+           x="4.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect8908"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="27.187504"
+           x="6.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect8910"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           id="path8912"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8914"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8916"
+           width="4.125"
+           height="2.7500002"
+           x="2.0625"
+           y="27.187504" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8918"
+           width="2.75"
+           height="4.1250005"
+           x="3.4375"
+           y="29.937504" />
+        <path
+           id="path8920"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path8922"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="29.937504"
+           x="-0.6875"
+           height="2.7500002"
+           width="4.125"
+           id="rect8924"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8926"
+           width="4.125"
+           height="2.7500002"
+           x="7.5625"
+           y="21.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8928"
+           width="2.75"
+           height="4.1250005"
+           x="8.9375"
+           y="24.437502" />
+        <path
+           id="path8930"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path8932"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="18.937502"
+           x="10.3125"
+           height="2.7500002"
+           width="4.125"
+           id="rect8934"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="21.687502"
+           x="11.6875"
+           height="4.1250005"
+           width="2.75"
+           id="rect8936"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path8938"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8940"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8942"
+           width="4.125"
+           height="2.7500002"
+           x="13.0625"
+           y="16.187502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8944"
+           width="2.75"
+           height="4.1250005"
+           x="14.4375"
+           y="18.937502" />
+        <path
+           id="path8946"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path8948"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="13.437502"
+           x="15.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect8950"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="16.187502"
+           x="17.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect8952"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path8954"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8956"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8958"
+           width="4.125"
+           height="2.7500002"
+           x="18.5625"
+           y="10.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8960"
+           width="2.75"
+           height="4.1250005"
+           x="19.9375"
+           y="13.437502" />
+        <path
+           id="path8962"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path8964"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           id="path8966"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-stream-pending.png"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:label="#source-track-stream-pending"
+       id="16_source-track-stream-pending"
+       transform="matrix(0.72727273,0,0,0.72727268,20,1005.0895)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4880"
+         y="10"
+         x="0"
+         height="22"
+         width="22" />
+      <g
+         id="g8955"
+         mask="url(#mask8991)"
+         clip-path="url(#clipPath8997)">
+        <rect
+           y="24.437502"
+           x="4.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect7776-2"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="27.187504"
+           x="6.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect7786-9"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           id="path7788-1"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7790-7"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8867"
+           width="4.125"
+           height="2.7500002"
+           x="2.0625"
+           y="27.187504" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8869"
+           width="2.75"
+           height="4.1250005"
+           x="3.4375"
+           y="29.937504" />
+        <path
+           id="path8871"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path8873"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="29.937504"
+           x="-0.6875"
+           height="2.7500002"
+           width="4.125"
+           id="rect8875"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8877"
+           width="4.125"
+           height="2.7500002"
+           x="7.5625"
+           y="21.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8879"
+           width="2.75"
+           height="4.1250005"
+           x="8.9375"
+           y="24.437502" />
+        <path
+           id="path8881"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path8883"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="18.937502"
+           x="10.3125"
+           height="2.7500002"
+           width="4.125"
+           id="rect8885"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="21.687502"
+           x="11.6875"
+           height="4.1250005"
+           width="2.75"
+           id="rect8887"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path8889"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8891"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8893"
+           width="4.125"
+           height="2.7500002"
+           x="13.0625"
+           y="16.187502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8895"
+           width="2.75"
+           height="4.1250005"
+           x="14.4375"
+           y="18.937502" />
+        <path
+           id="path8897"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path8899"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="13.437502"
+           x="15.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect8901"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="16.187502"
+           x="17.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect8903"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path8905"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8907"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8909"
+           width="4.125"
+           height="2.7500002"
+           x="18.5625"
+           y="10.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect8911"
+           width="2.75"
+           height="4.1250005"
+           x="19.9375"
+           y="13.437502" />
+        <path
+           id="path8913"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path8915"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           id="path8917"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="fill:url(#radialGradient4686-3);fill-opacity:1;stroke:#464f5a;stroke-width:1.37490571;stroke-linejoin:round;stroke-opacity:1"
+         d="m 12.37504,31.312485 -7.9063047,0 c 0.34375,-0.687399 -0.687513,-1.718499 -2.062513,-3.0933 -1.41586497,-1.415647 -1.71876397,-2.435336 -1.71876397,-3.437001 0,-1.0311 4.12502697,-2.362073 4.12502697,-2.749602 0,-0.387528 -1.375013,-0.3437 -2.062513,-0.3437 l 2.750013,0 c 0.687514,0 2.062528,0 2.062528,0.3437 0,0.31395 -1.375014,0.696929 -1.375014,1.718502 0,1.0311 0.719208,2.765452 3.437528,4.1244 2.7500127,1.374801 3.4375267,2.749602 2.7500127,3.437001 z"
+         id="path21915-5-0-72-8"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g6033-5"
+         transform="matrix(1.375,0,0,1.3750001,-1.375,-35.375039)">
+        <path
+           sodipodi:nodetypes="ccccccccc"
+           transform="translate(0,-32.00002)"
+           id="path4620-7"
+           d="m 13.5,75.5 0,-0.5 2,-2 0,-1.5 -5,0 0,1.5 2,2 0,0.5 1,0 z"
+           style="color:#000000;fill:url(#radialGradient6037-3);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#radialGradient6076);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.5,43.49998 0,0.5 2,2 0,1.5 -5,0 0,-1.5 2,-2 0,-0.5 1,0 z"
+           id="path6029-4"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.72727273,0,0,0.72727268,40,1005.0895)"
+       id="16_source-track-stream-active"
+       inkscape:label="#source-track-stream-active"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-stream-active.png">
+      <rect
+         width="22"
+         height="22"
+         x="0"
+         y="10"
+         id="rect4018"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         clip-path="url(#clipPath8997)"
+         mask="url(#mask8991)"
+         id="g4020">
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4022"
+           width="4.125"
+           height="2.7500002"
+           x="4.8125"
+           y="24.437502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4024"
+           width="2.75"
+           height="4.1250005"
+           x="6.1875"
+           y="27.187504" />
+        <path
+           id="path4026"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4028"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="27.187504"
+           x="2.0625"
+           height="2.7500002"
+           width="4.125"
+           id="rect4030"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="29.937504"
+           x="3.4375"
+           height="4.1250005"
+           width="2.75"
+           id="rect4032"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4034"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4036"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4038"
+           width="4.125"
+           height="2.7500002"
+           x="-0.6875"
+           y="29.937504" />
+        <rect
+           y="21.687502"
+           x="7.5625"
+           height="2.7500002"
+           width="4.125"
+           id="rect4040"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="24.437502"
+           x="8.9375"
+           height="4.1250005"
+           width="2.75"
+           id="rect4042"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4044"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4046"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4048"
+           width="4.125"
+           height="2.7500002"
+           x="10.3125"
+           y="18.937502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4050"
+           width="2.75"
+           height="4.1250005"
+           x="11.6875"
+           y="21.687502" />
+        <path
+           id="path4052"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4054"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="16.187502"
+           x="13.0625"
+           height="2.7500002"
+           width="4.125"
+           id="rect4056"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="18.937502"
+           x="14.4375"
+           height="4.1250005"
+           width="2.75"
+           id="rect4058"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4060"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4062"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4064"
+           width="4.125"
+           height="2.7500002"
+           x="15.8125"
+           y="13.437502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4066"
+           width="2.75"
+           height="4.1250005"
+           x="17.1875"
+           y="16.187502" />
+        <path
+           id="path4068"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4070"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="10.687502"
+           x="18.5625"
+           height="2.7500002"
+           width="4.125"
+           id="rect4072"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="13.437502"
+           x="19.9375"
+           height="4.1250005"
+           width="2.75"
+           id="rect4074"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           id="path4076"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4078"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4080"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="fill:url(#radialGradient5080);fill-opacity:1;stroke:#464f5a;stroke-width:1.37490571;stroke-linejoin:round;stroke-opacity:1"
+         d="m 12.37504,31.312485 -7.906305,0 c 0.34375,-0.687399 -0.687513,-1.718499 -2.062513,-3.0933 -1.41586503,-1.415647 -1.71876403,-2.435336 -1.71876403,-3.437001 0,-1.0311 4.12502703,-2.362073 4.12502703,-2.749602 0,-0.387528 -1.375013,-0.3437 -2.062513,-0.3437 l 2.750013,0 c 0.6875139,0 2.0625279,0 2.0625279,0.3437 0,0.31395 -1.375014,0.696929 -1.375014,1.718502 0,1.0311 0.719208,2.765452 3.4375281,4.1244 2.750013,1.374801 3.437527,2.749602 2.750013,3.437001 z"
+         id="path21915-5-0-72-8-0"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path4001-4-5"
+         d="m 11.6875,18.937503 0,11 8.59375,-5.5 -8.59375,-5.5 z"
+         style="fill:url(#linearGradient9125);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-stream-idle.png"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:label="#source-track-stream-idle"
+       id="16_source-track-stream-idle"
+       transform="matrix(0.72727273,0,0,0.72727268,60,1005.0895)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4140"
+         y="10"
+         x="0"
+         height="22"
+         width="22" />
+      <g
+         id="g4142"
+         mask="url(#mask8991)"
+         clip-path="url(#clipPath8997)">
+        <rect
+           y="24.437502"
+           x="4.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect4144"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="27.187504"
+           x="6.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect4146"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           id="path4148"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4150"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4152"
+           width="4.125"
+           height="2.7500002"
+           x="2.0625"
+           y="27.187504" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4154"
+           width="2.75"
+           height="4.1250005"
+           x="3.4375"
+           y="29.937504" />
+        <path
+           id="path4156"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4158"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="29.937504"
+           x="-0.6875"
+           height="2.7500002"
+           width="4.125"
+           id="rect4160"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4162"
+           width="4.125"
+           height="2.7500002"
+           x="7.5625"
+           y="21.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4164"
+           width="2.75"
+           height="4.1250005"
+           x="8.9375"
+           y="24.437502" />
+        <path
+           id="path4166"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4168"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="18.937502"
+           x="10.3125"
+           height="2.7500002"
+           width="4.125"
+           id="rect4170"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="21.687502"
+           x="11.6875"
+           height="4.1250005"
+           width="2.75"
+           id="rect4172"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4174"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4176"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4178"
+           width="4.125"
+           height="2.7500002"
+           x="13.0625"
+           y="16.187502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4180"
+           width="2.75"
+           height="4.1250005"
+           x="14.4375"
+           y="18.937502" />
+        <path
+           id="path4182"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4184"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="13.437502"
+           x="15.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect4186"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="16.187502"
+           x="17.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect4188"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4190"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4192"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4194"
+           width="4.125"
+           height="2.7500002"
+           x="18.5625"
+           y="10.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4196"
+           width="2.75"
+           height="4.1250005"
+           x="19.9375"
+           y="13.437502" />
+        <path
+           id="path4198"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4200"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           id="path4202"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="fill:url(#radialGradient5080-2);fill-opacity:1;stroke:#464f5a;stroke-width:1.37490571;stroke-linejoin:round;stroke-opacity:1"
+         d="m 12.375041,31.312485 -7.906305,0 c 0.34375,-0.687399 -0.687513,-1.718499 -2.062513,-3.0933 -1.41586503,-1.415647 -1.71876403,-2.435336 -1.71876403,-3.437001 0,-1.0311 4.12502703,-2.362073 4.12502703,-2.749602 0,-0.387528 -1.375013,-0.3437 -2.062513,-0.3437 l 2.750013,0 c 0.6875139,0 2.0625279,0 2.0625279,0.3437 0,0.31395 -1.375014,0.696929 -1.375014,1.718502 0,1.0311 0.719208,2.765452 3.4375281,4.1244 2.750013,1.374801 3.437527,2.749602 2.750013,3.437001 z"
+         id="path21915-5-0-72-8-2"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:url(#linearGradient8946);fill-opacity:1;stroke:#4b4b3c;stroke-width:1.375;stroke-linecap:round;stroke-opacity:1"
+         id="rect8626-1"
+         y="20.312439"
+         x="11.6875"
+         height="8.2500019"
+         width="8.25" />
+    </g>
+    <g
+       transform="matrix(0.72727273,0,0,0.72727268,80,1005.0895)"
+       id="16_source-track-stream-stopped"
+       inkscape:label="#source-track-stream-stopped"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-stream-stopped.png">
+      <rect
+         width="22"
+         height="22"
+         x="0"
+         y="10"
+         id="rect4262"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         clip-path="url(#clipPath8997)"
+         mask="url(#mask8991)"
+         id="g4264">
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4266"
+           width="4.125"
+           height="2.7500002"
+           x="4.8125"
+           y="24.437502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4268"
+           width="2.75"
+           height="4.1250005"
+           x="6.1875"
+           y="27.187504" />
+        <path
+           id="path4270"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4272"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="27.187504"
+           x="2.0625"
+           height="2.7500002"
+           width="4.125"
+           id="rect4274"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="29.937504"
+           x="3.4375"
+           height="4.1250005"
+           width="2.75"
+           id="rect4276"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4278"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4280"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4282"
+           width="4.125"
+           height="2.7500002"
+           x="-0.6875"
+           y="29.937504" />
+        <rect
+           y="21.687502"
+           x="7.5625"
+           height="2.7500002"
+           width="4.125"
+           id="rect4284"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="24.437502"
+           x="8.9375"
+           height="4.1250005"
+           width="2.75"
+           id="rect4286"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4288"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4290"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4292"
+           width="4.125"
+           height="2.7500002"
+           x="10.3125"
+           y="18.937502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4294"
+           width="2.75"
+           height="4.1250005"
+           x="11.6875"
+           y="21.687502" />
+        <path
+           id="path4296"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4298"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="16.187502"
+           x="13.0625"
+           height="2.7500002"
+           width="4.125"
+           id="rect4300"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="18.937502"
+           x="14.4375"
+           height="4.1250005"
+           width="2.75"
+           id="rect4302"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4304"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4306"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4308"
+           width="4.125"
+           height="2.7500002"
+           x="15.8125"
+           y="13.437502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4310"
+           width="2.75"
+           height="4.1250005"
+           x="17.1875"
+           y="16.187502" />
+        <path
+           id="path4312"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4314"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="10.687502"
+           x="18.5625"
+           height="2.7500002"
+           width="4.125"
+           id="rect4316"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="13.437502"
+           x="19.9375"
+           height="4.1250005"
+           width="2.75"
+           id="rect4318"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           id="path4320"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4322"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4324"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="fill:url(#radialGradient5080-1);fill-opacity:1;stroke:#464f5a;stroke-width:1.37490571;stroke-linejoin:round;stroke-opacity:1"
+         d="m 12.375044,31.312485 -7.906305,0 c 0.34375,-0.687399 -0.68751,-1.718499 -2.06251,-3.0933 -1.41587003,-1.415647 -1.71877003,-2.435336 -1.71877003,-3.437001 0,-1.0311 4.12503003,-2.362073 4.12503003,-2.749602 0,-0.387528 -1.37501,-0.3437 -2.06251,-0.3437 l 2.75001,0 c 0.6875099,0 2.0625299,0 2.0625299,0.3437 0,0.31395 -1.37502,0.696929 -1.37502,1.718502 0,1.0311 0.71921,2.765452 3.4375301,4.1244 2.750015,1.374801 3.437529,2.749602 2.750015,3.437001 z"
+         id="path21915-5-0-72-8-05"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <polygon
+         style="fill:url(#linearGradient9295);fill-opacity:1;stroke:#603b31;stroke-width:1.45109415;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="polygon6106-6-8"
+         transform="matrix(0.7580406,0,0,0.75805685,-187.06539,-74.394038)"
+         points="266.008,134.17 270.729,138.892 274.217,135.403 269.495,130.682 274.217,125.961 274.217,125.961 270.729,122.473 266.008,127.194 261.286,122.473 257.797,125.96 262.52,130.682 257.797,135.404 261.286,138.892 " />
+    </g>
+    <g
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-archived.png"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:label="#source-track-archived"
+       id="16_source-track-archived"
+       transform="matrix(0.72727273,0,0,0.72727268,140,1005.0895)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4384"
+         y="10"
+         x="0"
+         height="22"
+         width="22" />
+      <g
+         id="g4386"
+         mask="url(#mask8991)"
+         clip-path="url(#clipPath8997)">
+        <rect
+           y="24.437502"
+           x="4.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect4388"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="27.187504"
+           x="6.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect4390"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           id="path4392"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4394"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4396"
+           width="4.125"
+           height="2.7500002"
+           x="2.0625"
+           y="27.187504" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4398"
+           width="2.75"
+           height="4.1250005"
+           x="3.4375"
+           y="29.937504" />
+        <path
+           id="path4400"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4402"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="29.937504"
+           x="-0.6875"
+           height="2.7500002"
+           width="4.125"
+           id="rect4404"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4406"
+           width="4.125"
+           height="2.7500002"
+           x="7.5625"
+           y="21.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4408"
+           width="2.75"
+           height="4.1250005"
+           x="8.9375"
+           y="24.437502" />
+        <path
+           id="path4410"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4412"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="18.937502"
+           x="10.3125"
+           height="2.7500002"
+           width="4.125"
+           id="rect4414"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="21.687502"
+           x="11.6875"
+           height="4.1250005"
+           width="2.75"
+           id="rect4416"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4418"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4420"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4422"
+           width="4.125"
+           height="2.7500002"
+           x="13.0625"
+           y="16.187502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4424"
+           width="2.75"
+           height="4.1250005"
+           x="14.4375"
+           y="18.937502" />
+        <path
+           id="path4426"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4428"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="13.437502"
+           x="15.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect4430"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="16.187502"
+           x="17.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect4432"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path4434"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path4436"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4438"
+           width="4.125"
+           height="2.7500002"
+           x="18.5625"
+           y="10.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4440"
+           width="2.75"
+           height="4.1250005"
+           x="19.9375"
+           y="13.437502" />
+        <path
+           id="path4442"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path4444"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           id="path4446"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(1.375,0,0,1.3750001,1.375,-10.625038)"
+         id="g9896-9">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path9759-0"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient9723-1-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient9892-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path9890-7"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path9759-9-7"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient9851-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path9829-4"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path9894-7"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.72727273,0,0,0.72727268,160,1005.0895)"
+       id="16_source-track-archived-active"
+       inkscape:label="#source-track-archived-active"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-archived-active.png">
+      <rect
+         width="22"
+         height="22"
+         x="0"
+         y="10"
+         id="rect6268"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         clip-path="url(#clipPath8997)"
+         mask="url(#mask8991)"
+         id="g6270">
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect6272"
+           width="4.125"
+           height="2.7500002"
+           x="4.8125"
+           y="24.437502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect6274"
+           width="2.75"
+           height="4.1250005"
+           x="6.1875"
+           y="27.187504" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6276"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path6278" />
+        <rect
+           y="27.187504"
+           x="2.0625"
+           height="2.7500002"
+           width="4.125"
+           id="rect6280"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="29.937504"
+           x="3.4375"
+           height="4.1250005"
+           width="2.75"
+           id="rect6282"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path6284" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6286"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect6288"
+           width="4.125"
+           height="2.7500002"
+           x="-0.6875"
+           y="29.937504" />
+        <rect
+           y="21.687502"
+           x="7.5625"
+           height="2.7500002"
+           width="4.125"
+           id="rect6290"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="24.437502"
+           x="8.9375"
+           height="4.1250005"
+           width="2.75"
+           id="rect6292"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path6294" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6296"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect6298"
+           width="4.125"
+           height="2.7500002"
+           x="10.3125"
+           y="18.937502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect6300"
+           width="2.75"
+           height="4.1250005"
+           x="11.6875"
+           y="21.687502" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6302"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path6304" />
+        <rect
+           y="16.187502"
+           x="13.0625"
+           height="2.7500002"
+           width="4.125"
+           id="rect6306"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="18.937502"
+           x="14.4375"
+           height="4.1250005"
+           width="2.75"
+           id="rect6308"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path6310" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6312"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect6314"
+           width="4.125"
+           height="2.7500002"
+           x="15.8125"
+           y="13.437502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect6316"
+           width="2.75"
+           height="4.1250005"
+           x="17.1875"
+           y="16.187502" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6318"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path6320" />
+        <rect
+           y="10.687502"
+           x="18.5625"
+           height="2.7500002"
+           width="4.125"
+           id="rect6322"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="13.437502"
+           x="19.9375"
+           height="4.1250005"
+           width="2.75"
+           id="rect6324"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           id="path6326" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6328"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path6330"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      </g>
+      <g
+         id="g6332"
+         transform="matrix(1.375,0,0,1.3750001,1.375,-10.625038)">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient6376);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path6334"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc"
+           id="path6336"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           style="color:#000000;fill:url(#linearGradient6378);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient6380);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           id="path6338"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc"
+           id="path6340"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient7060);fill-opacity:1;stroke:url(#linearGradient7062);stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.99958801;stroke-dasharray:none"
+           d="m 8.5,29.999979 0,-1.5 -2.5,-1 0,1.5 z"
+           id="path6264-3"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.72727273,0,0,0.72727268,220,1005.0895)"
+       id="16_source-track-multiple-sources-stream"
+       inkscape:label="#source-track-multiple-sources-stream"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-multiple-sources-stream.png">
+      <rect
+         width="22"
+         height="22"
+         x="0"
+         y="10"
+         id="rect28305"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         clip-path="url(#clipPath8997)"
+         mask="url(#mask8991)"
+         id="g28307">
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect28309"
+           width="4.125"
+           height="2.7500002"
+           x="4.8125"
+           y="24.437502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect28311"
+           width="2.75"
+           height="4.1250005"
+           x="6.1875"
+           y="27.187504" />
+        <path
+           id="path28313"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path28315"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="27.187504"
+           x="2.0625"
+           height="2.7500002"
+           width="4.125"
+           id="rect28317"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="29.937504"
+           x="3.4375"
+           height="4.1250005"
+           width="2.75"
+           id="rect28319"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path28321"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path28323"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect28325"
+           width="4.125"
+           height="2.7500002"
+           x="-0.6875"
+           y="29.937504" />
+        <rect
+           y="21.687502"
+           x="7.5625"
+           height="2.7500002"
+           width="4.125"
+           id="rect28327"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="24.437502"
+           x="8.9375"
+           height="4.1250005"
+           width="2.75"
+           id="rect28329"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path28331"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path28333"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect28335"
+           width="4.125"
+           height="2.7500002"
+           x="10.3125"
+           y="18.937502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect28337"
+           width="2.75"
+           height="4.1250005"
+           x="11.6875"
+           y="21.687502" />
+        <path
+           id="path28339"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path28341"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="16.187502"
+           x="13.0625"
+           height="2.7500002"
+           width="4.125"
+           id="rect28343"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="18.937502"
+           x="14.4375"
+           height="4.1250005"
+           width="2.75"
+           id="rect28345"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path28347"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path28349"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect28351"
+           width="4.125"
+           height="2.7500002"
+           x="15.8125"
+           y="13.437502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect28353"
+           width="2.75"
+           height="4.1250005"
+           x="17.1875"
+           y="16.187502" />
+        <path
+           id="path28355"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path28357"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="10.687502"
+           x="18.5625"
+           height="2.7500002"
+           width="4.125"
+           id="rect28359"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="13.437502"
+           x="19.9375"
+           height="4.1250005"
+           width="2.75"
+           id="rect28361"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           id="path28363"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path28365"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path28367"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="fill:url(#radialGradient28424);fill-opacity:1;stroke:#464f5a;stroke-width:1.37490571;stroke-linejoin:round;stroke-opacity:1"
+         d="m 2.7499941,21.687437 c 0.6875,0 2.0625,-0.04378 2.0625,0.34375 0,0.387528 -4.12500002,1.718899 -4.12500002,2.75 0,1.001665 0.30289,2.021853 1.71875002,3.4375 1.37502,1.374799 2.40625,2.406349 2.0625,3.093749 l 2.40625,0 5.4999999,0 2.40625,0 c -0.34375,-0.6874 0.68749,-1.71895 2.0625,-3.093749 1.41587,-1.415647 1.71875,-2.435835 1.71875,-3.4375 0,-1.031101 -4.125,-2.362472 -4.125,-2.75 0,-0.387528 1.375,-0.34375 2.0625,-0.34375 l -2.75,0 c -0.6875,0 -2.0625,5e-5 -2.0625,0.34375 0,0.31395 1.375,0.697177 1.375,1.718749 0,1.031101 -0.71918,2.766052 -3.4374999,4.125001 -2.71832,-1.358949 -3.4375,-3.0939 -3.4375,-4.125001 0,-1.021572 1.375,-1.404799 1.375,-1.718749 0,-0.3437 -1.375,-0.34375 -2.0625,-0.34375 l -2.75,0 z"
+         id="path21915-5-6-2"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-multiple-sources-archived.png"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:label="#source-track-multiple-sources-archived"
+       id="16_source-track-multiple-sources-archived"
+       transform="matrix(0.72727273,0,0,0.72727268,260,1005.0895)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8990"
+         y="10"
+         x="0"
+         height="22"
+         width="22" />
+      <g
+         id="g8992"
+         mask="url(#mask8991)"
+         clip-path="url(#clipPath8997)">
+        <rect
+           y="24.437502"
+           x="4.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect8994"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="27.187504"
+           x="6.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect8996"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           id="path8998"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path9000"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9002"
+           width="4.125"
+           height="2.7500002"
+           x="2.0625"
+           y="27.187504" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9004"
+           width="2.75"
+           height="4.1250005"
+           x="3.4375"
+           y="29.937504" />
+        <path
+           id="path9006"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path9008"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="29.937504"
+           x="-0.6875"
+           height="2.7500002"
+           width="4.125"
+           id="rect9010"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9012"
+           width="4.125"
+           height="2.7500002"
+           x="7.5625"
+           y="21.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9014"
+           width="2.75"
+           height="4.1250005"
+           x="8.9375"
+           y="24.437502" />
+        <path
+           id="path9016"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path9018"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="18.937502"
+           x="10.3125"
+           height="2.7500002"
+           width="4.125"
+           id="rect9020"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="21.687502"
+           x="11.6875"
+           height="4.1250005"
+           width="2.75"
+           id="rect9022"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path9024"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path9026"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9028"
+           width="4.125"
+           height="2.7500002"
+           x="13.0625"
+           y="16.187502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9030"
+           width="2.75"
+           height="4.1250005"
+           x="14.4375"
+           y="18.937502" />
+        <path
+           id="path9032"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path9034"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="13.437502"
+           x="15.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect9036"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="16.187502"
+           x="17.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect9038"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path9040"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path9042"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9044"
+           width="4.125"
+           height="2.7500002"
+           x="18.5625"
+           y="10.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect9046"
+           width="2.75"
+           height="4.1250005"
+           x="19.9375"
+           y="13.437502" />
+        <path
+           id="path9048"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path9050"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           id="path9052"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(1.375,0,0,1.3750001,1.375,-10.625039)"
+         id="g9896-9-8">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path9759-0-0"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient9723-1-2-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient9892-6-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path9890-7-8"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path9759-9-7-71"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient9851-0-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path9829-4-3"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path9894-7-2"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g10525"
+         transform="matrix(1.375,0,0,1.3750001,1.375,-14.062539)">
+        <path
+           style="color:#000000;fill:url(#linearGradient10537);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path10527"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cccccc"
+           id="path10529"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           style="color:#000000;fill:url(#linearGradient10539);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient10541);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           id="path10531"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path10533"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           id="path10535"
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/track-multiple-sources-stream-archived.png"
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:label="#source-track-multiple-sources-stream-archived"
+       id="16_source-track-multiple-sources-stream-archived"
+       transform="matrix(0.72727273,0,0,0.72727268,300,1005.0895)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect26742"
+         y="10"
+         x="0"
+         height="22"
+         width="22" />
+      <g
+         id="g26744"
+         mask="url(#mask8991)"
+         clip-path="url(#clipPath8997)">
+        <rect
+           y="24.437502"
+           x="4.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect26746"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="27.187504"
+           x="6.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect26748"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+           id="path26750"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path26752"
+           d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect26754"
+           width="4.125"
+           height="2.7500002"
+           x="2.0625"
+           y="27.187504" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect26756"
+           width="2.75"
+           height="4.1250005"
+           x="3.4375"
+           y="29.937504" />
+        <path
+           id="path26758"
+           d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path26760"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="29.937504"
+           x="-0.6875"
+           height="2.7500002"
+           width="4.125"
+           id="rect26762"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect26764"
+           width="4.125"
+           height="2.7500002"
+           x="7.5625"
+           y="21.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect26766"
+           width="2.75"
+           height="4.1250005"
+           x="8.9375"
+           y="24.437502" />
+        <path
+           id="path26768"
+           d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path26770"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="18.937502"
+           x="10.3125"
+           height="2.7500002"
+           width="4.125"
+           id="rect26772"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="21.687502"
+           x="11.6875"
+           height="4.1250005"
+           width="2.75"
+           id="rect26774"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path26776"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path26778"
+           d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect26780"
+           width="4.125"
+           height="2.7500002"
+           x="13.0625"
+           y="16.187502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect26782"
+           width="2.75"
+           height="4.1250005"
+           x="14.4375"
+           y="18.937502" />
+        <path
+           id="path26784"
+           d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path26786"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="13.437502"
+           x="15.8125"
+           height="2.7500002"
+           width="4.125"
+           id="rect26788"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="16.187502"
+           x="17.1875"
+           height="4.1250005"
+           width="2.75"
+           id="rect26790"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+           id="path26792"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path26794"
+           d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect26796"
+           width="4.125"
+           height="2.7500002"
+           x="18.5625"
+           y="10.687502" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect26798"
+           width="2.75"
+           height="4.1250005"
+           x="19.9375"
+           y="13.437502" />
+        <path
+           id="path26800"
+           d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+           id="path26802"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+           id="path26804"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="fill:url(#radialGradient27672-0);fill-opacity:1;stroke:#464f5a;stroke-width:1.37490571;stroke-linejoin:round;stroke-opacity:1"
+         d="m 12.375043,31.312482 -7.90631,0 c 0.34375,-0.687399 -0.68751,-1.718499 -2.06251,-3.093299 -1.41587003,-1.415647 -1.71877003,-2.435336 -1.71877003,-3.437001 0,-1.0311 4.12503003,-2.362074 4.12503003,-2.749602 0,-0.387528 -1.37501,-0.3437 -2.06251,-0.3437 l 2.75001,0 c 0.6875199,0 2.0625299,0 2.0625299,0.3437 0,0.31395 -1.37501,0.696928 -1.37501,1.718502 0,1.0311 0.7192,2.765452 3.4375201,4.1244 2.75002,1.3748 3.43753,2.749601 2.75002,3.437 z"
+         id="path21915-5-0-1"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g26806"
+         transform="matrix(1.375,0,0,1.3750001,1.375,-10.625039)">
+        <path
+           style="color:#000000;fill:url(#linearGradient26820);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path26808"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cccccc"
+           id="path26810"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           style="color:#000000;fill:url(#linearGradient26822);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient26824);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           id="path26812"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path26814"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           id="path26816"
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       transform="translate(0,972.3622)"
+       id="16_source-event"
+       inkscape:label="#source-event"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect8970"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient8982);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8972"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient8984);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8974"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect8976"
+         style="color:#000000;fill:url(#radialGradient8986);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       transform="translate(20,972.3622)"
+       id="16_source-event-stream-pending"
+       inkscape:label="#source-event-stream-pending"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-stream-pending.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect6435"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient5676);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6497"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient5678);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6521"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect6578"
+         style="color:#000000;fill:url(#radialGradient5680);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:url(#radialGradient5080-4);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.0000287,31.500015 -5.75004,0 c 0.25,-0.499927 -0.500009,-1.249818 -1.500009,-2.249673 -1.02972,-1.029561 -1.25001,-1.771153 -1.25001,-2.499637 0,-0.749891 3.000019,-1.717871 3.000019,-1.99971 0,-0.281839 -1.000009,-0.249964 -1.500009,-0.249964 l 2.000009,0 c 0.500011,0 1.500021,0 1.500021,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.000009,0.999855 2.500019,1.99971 2.000009,2.499637 z"
+         id="path21915-5-0-72-8-06"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g6033-1"
+         transform="translate(-1,-17)">
+        <path
+           sodipodi:nodetypes="ccccccccc"
+           transform="translate(0,-32.00002)"
+           id="path4620-6"
+           d="m 13.5,75.5 0,-0.5 2,-2 0,-1.5 -5,0 0,1.5 2,2 0,0.5 1,0 z"
+           style="color:#000000;fill:url(#radialGradient6037-9);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#radialGradient6076-8);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.5,43.49998 0,0.5 2,2 0,1.5 -5,0 0,-1.5 2,-2 0,-0.5 1,0 z"
+           id="path6029-48"
+           sodipodi:nodetypes="ccccccccc"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-stream-active.png"
+       inkscape:label="#source-event-stream-active"
+       id="16_source-event-stream-active"
+       transform="translate(40,972.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4084"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <path
+         transform="translate(-384.5,-2.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path4086"
+         style="color:#000000;fill:url(#radialGradient4096);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="18.5"
+         x="5.5"
+         height="6"
+         width="2"
+         id="rect4088"
+         style="color:#000000;fill:url(#radialGradient4098);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient4100);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4090"
+         width="2"
+         height="2"
+         x="5.5"
+         y="24.5" />
+      <path
+         style="fill:url(#radialGradient5183);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.000029,31.500015 -5.75004,0 C 3.499989,31.000088 2.74998,30.250197 1.74998,29.250342 0.72026,28.220781 0.49997,27.479189 0.49997,26.750705 c 0,-0.749891 3.000019,-1.717871 3.000019,-1.99971 0,-0.281839 -1.000009,-0.249964 -1.500009,-0.249964 l 2.000009,0 c 0.500011,0 1.500021,0 1.500021,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.000009,0.999855 2.500019,1.99971 2.000009,2.499637 z"
+         id="path21915-5-0-72-8-06-0"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path4001-4-7"
+         d="m 8.5,22.500027 0,8 6.25,-4 -6.25,-4 z"
+         style="fill:url(#linearGradient9125-2);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(60,972.3622)"
+       id="16_source-event-stream-idle"
+       inkscape:label="#source-event-stream-idle"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-stream-idle.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect4206"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4218);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4208"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient4220);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4210"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect4212"
+         style="color:#000000;fill:url(#radialGradient4222);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:url(#radialGradient5183-3);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.000029,31.500015 -5.75004,0 C 3.499989,31.000088 2.74998,30.250197 1.74998,29.250342 0.72026,28.220781 0.49997,27.479189 0.49997,26.750705 c 0,-0.749891 3.000019,-1.717871 3.000019,-1.99971 0,-0.281839 -1.000009,-0.249964 -1.500009,-0.249964 l 2.000009,0 c 0.500011,0 1.500021,0 1.500021,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.000009,0.999855 2.500019,1.99971 2.000009,2.499637 z"
+         id="path21915-5-0-72-8-06-8"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:url(#linearGradient8946-6);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-linecap:round;stroke-opacity:1"
+         id="rect8626-4"
+         y="23.499977"
+         x="8.5"
+         height="6.000001"
+         width="6" />
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-stream-stopped.png"
+       inkscape:label="#source-event-stream-stopped"
+       id="16_source-event-stream-stopped"
+       transform="translate(80,972.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4328"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <path
+         transform="translate(-384.5,-2.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path4330"
+         style="color:#000000;fill:url(#radialGradient4340);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="18.5"
+         x="5.5"
+         height="6"
+         width="2"
+         id="rect4332"
+         style="color:#000000;fill:url(#radialGradient4342);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient4344);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4334"
+         width="2"
+         height="2"
+         x="5.5"
+         y="24.5" />
+      <path
+         style="fill:url(#radialGradient5183-4);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.000029,31.500015 -5.75004,0 C 3.499989,31.000088 2.74998,30.250197 1.74998,29.250342 0.72026,28.220781 0.49997,27.479189 0.49997,26.750705 c 0,-0.749891 3.000019,-1.717871 3.000019,-1.99971 0,-0.281839 -1.000009,-0.249964 -1.500009,-0.249964 l 2.000009,0 c 0.500011,0 1.500021,0 1.500021,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.000009,0.999855 2.500019,1.99971 2.000009,2.499637 z"
+         id="path21915-5-0-72-8-06-6"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <polygon
+         style="fill:url(#linearGradient9336);fill-opacity:1;stroke:#603b31;stroke-width:1.45109415;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="polygon6106-6-8-0"
+         transform="matrix(0.55130226,0,0,0.55131404,-136.04756,-45.377451)"
+         points="269.495,130.682 274.217,125.961 274.217,125.961 270.729,122.473 266.008,127.194 261.286,122.473 257.797,125.96 262.52,130.682 257.797,135.404 261.286,138.892 266.008,134.17 270.729,138.892 274.217,135.403 " />
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-live-idle.png"
+       inkscape:label="#source-event-live-idle"
+       id="16_source-event-live-idle"
+       transform="translate(100,972.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect28255"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <path
+         transform="translate(-384.5,-2.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path28257"
+         style="color:#000000;fill:url(#radialGradient28291);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="18.5"
+         x="5.5"
+         height="6"
+         width="2"
+         id="rect28259"
+         style="color:#000000;fill:url(#radialGradient28293);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient28295);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect28261"
+         width="2"
+         height="2"
+         x="5.5"
+         y="24.5" />
+      <path
+         id="path26534-5"
+         d="m 13.500002,27.49998 2,-1.5 -1,-1.5 -2,1 0,-2 -2,0 -2e-6,2 -2,-1 -1,1.5 2,1.5 -2,1.5 1,1.5 2,-1 2e-6,2 2,0 0,-2 2,1 1,-1.5 -2,-1.5 z"
+         style="color:#000000;fill:url(#radialGradient28470);fill-opacity:1;fill-rule:nonzero;stroke:#60604c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path26536-1"
+         d="m 12.5,27.49998 c 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 0.55228,0 1,0.447715 1,1 z"
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(120,972.3622)"
+       id="16_source-event-live-active"
+       inkscape:label="#source-event-live-active"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-live-active.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect4887"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4899);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4889"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient4901);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4891"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect4893"
+         style="color:#000000;fill:url(#radialGradient4903);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:url(#radialGradient4905);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 13.500002,27.49998 2,-1.5 -1,-1.5 -2,1 0,-2 -2,0 -2e-6,2 -2,-1 -1,1.5 2,1.5 -2,1.5 1,1.5 2,-1 2e-6,2 2,0 0,-2 2,1 1,-1.5 -2,-1.5 z"
+         id="path4895" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 12.5,27.49998 c 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 0.55228,0 1,0.447715 1,1 z"
+         id="path4897" />
+    </g>
+    <g
+       transform="translate(140,972.3622)"
+       id="16_source-event-archived"
+       inkscape:label="#source-event-archived"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-archived.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect4450"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4462);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4452"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient4464);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4454"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect4456"
+         style="color:#000000;fill:url(#radialGradient4466);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g9896-9-7"
+         transform="translate(1,1)">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path9759-0-5"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient9723-1-2-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient9892-6-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path9890-7-9"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path9759-9-7-8"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient9851-0-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path9829-4-1"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path9894-7-4"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-archived-active.png"
+       inkscape:label="#source-event-archived-active"
+       id="16_source-event-archived-active"
+       transform="translate(160,972.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6346"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <path
+         transform="translate(-384.5,-2.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6348"
+         style="color:#000000;fill:url(#radialGradient6382);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="18.5"
+         x="5.5"
+         height="6"
+         width="2"
+         id="rect6350"
+         style="color:#000000;fill:url(#radialGradient6384);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient6386);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6352"
+         width="2"
+         height="2"
+         x="5.5"
+         y="24.5" />
+      <g
+         transform="translate(1,1)"
+         id="g6354">
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient6388);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path6356"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccc"
+           id="path6358"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           style="color:#000000;fill:url(#linearGradient6390);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:url(#linearGradient6392);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           id="path6360"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc"
+           id="path6362"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient7060-0);fill-opacity:1;stroke:url(#linearGradient7062-0);stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.99958801;stroke-dasharray:none"
+           d="m 8.5,29.99998 0,-1.5 -2.5,-1 0,1.5 z"
+           id="path6264-0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-multiple-sources.png"
+       inkscape:label="#source-event-multiple-sources"
+       id="16_source-event-multiple-sources"
+       transform="translate(200,972.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4572"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <path
+         transform="translate(-384.5,-2.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path4574"
+         style="color:#000000;fill:url(#radialGradient4584);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="18.5"
+         x="5.5"
+         height="6"
+         width="2"
+         id="rect4576"
+         style="color:#000000;fill:url(#radialGradient4586);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient4588);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4578"
+         width="2"
+         height="2"
+         x="5.5"
+         y="24.5" />
+      <path
+         style="fill:url(#radialGradient27607);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.0000329,31.500014 -5.7500455,0 C 3.4999894,31.000087 2.7499835,30.250196 1.7499756,29.250341 0.72025743,28.22078 0.49996569,27.479188 0.49996569,26.750704 c 0,-0.749891 3.00002371,-1.717871 3.00002371,-1.99971 0,-0.281839 -1.0000079,-0.249964 -1.5000119,-0.249964 l 2.0000159,0 c 0.5000039,0 1.5000118,0 1.5000118,0.249964 0,0.228327 -1.0000079,0.506857 -1.0000079,1.249819 0,0.749891 0.5230641,2.011238 2.5000198,2.999564 2.0000158,0.999855 2.5000197,1.99971 2.0000158,2.499637 z"
+         id="path21915-5"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g9896-9-7-9"
+         transform="translate(1,1)">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path9759-0-5-9"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient9723-1-2-9-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient9892-6-7-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path9890-7-9-0"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path9759-9-7-8-0"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient9851-0-3-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path9829-4-1-7"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path9894-7-4-7"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="color:#000000;fill:url(#radialGradient6037-9-1);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 13.500002,23.49998 2,-1.5 -1,-1.5 -2,1 0,-2 -2,0 -2e-6,2 -2,-1 -1,1.5 2,1.5 -2,1.5 1,1.5 2,-1 2e-6,2 2,0 0,-2 2,1 1,-1.5 -2,-1.5 z"
+         id="path26428"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 12.5,23.49998 c 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 0.55228,0 1,0.447715 1,1 z"
+         id="path26508"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(220,972.3622)"
+       id="16_source-event-multiple-sources-stream"
+       inkscape:label="#source-event-multiple-sources-stream"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-multiple-sources-stream.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect26830"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient26856);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26832"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient26858);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect26834"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect26836"
+         style="color:#000000;fill:url(#radialGradient26860);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:url(#radialGradient27545);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 142,8.5 c 0.5,0 1.5,-0.031839 1.5,0.25 0,0.281839 -3,1.250109 -3,2 0,0.728484 0.22028,1.470439 1.25,2.5 1.00001,0.999855 1.75,1.750073 1.5,2.25 l 1.75,0 4,0 1.75,0 c -0.25,-0.499927 0.49999,-1.250145 1.5,-2.25 1.02972,-1.029561 1.25,-1.771516 1.25,-2.5 0,-0.749891 -3,-1.718161 -3,-2 0,-0.281839 1,-0.25 1.5,-0.25 l -2,0 c -0.5,0 -1.5,3.6e-5 -1.5,0.25 0,0.228327 1,0.507038 1,1.25 0,0.749891 -0.52304,2.011674 -2.5,3 -1.97696,-0.988326 -2.5,-2.250109 -2.5,-3 0,-0.742962 1,-1.021673 1,-1.25 0,-0.249964 -1,-0.25 -1.5,-0.25 l -2,0 z"
+         transform="translate(-140,15.99998)"
+         id="path21915-5-6"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(240,972.3622)"
+       id="16_source-event-multiple-sources-live"
+       inkscape:label="#source-event-multiple-sources-live"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-multiple-sources-live.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect26512"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient26538);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26514"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient26540);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect26516"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect26518"
+         style="color:#000000;fill:url(#radialGradient26542);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:url(#radialGradient26552-3);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 4.500001,29.499981 1.5,2 1.5,-1 -1,-2 2,0 0,-2 -2,-2e-6 1,-2 -1.5,-1 -1.5,2 -1.5,-2 -1.5,1 1,2 -2,2e-6 0,2 2,0 -1,2 1.5,1 1.5,-2 z"
+         id="path26686"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path26534"
+         d="m 13.500002,27.49998 2,-1.5 -1,-1.5 -2,1 0,-2 -2,0 -2e-6,2 -2,-1 -1,1.5 2,1.5 -2,1.5 1,1.5 2,-1 2e-6,2 2,0 0,-2 2,1 1,-1.5 -2,-1.5 z"
+         style="color:#000000;fill:url(#radialGradient26552);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path26536"
+         d="m 12.5,27.49998 c 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 0.55228,0 1,0.447715 1,1 z"
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 5.5,27.49998 c 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 0.55228,0 1,0.447715 1,1 z"
+         id="path26688"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(260,972.3622)"
+       id="16_source-event-multiple-sources-archived"
+       inkscape:label="#source-event-multiple-sources-archived"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-multiple-sources-archived.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect9056"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient9064);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path9058"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient9066);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9060"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect9062"
+         style="color:#000000;fill:url(#radialGradient9068);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <g
+         id="g9896-9-7-2"
+         transform="translate(1,1)">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path9759-0-5-3"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient9723-1-2-9-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient9892-6-7-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path9890-7-9-6"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path9759-9-7-8-2"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient9851-0-3-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path9829-4-1-4"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path9894-7-4-1"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g10543"
+         transform="translate(1,-1.5)">
+        <path
+           style="color:#000000;fill:url(#linearGradient10555);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path10545"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cccccc"
+           id="path10547"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           style="color:#000000;fill:url(#linearGradient10557);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient10559);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           id="path10549"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path10551"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           id="path10553"
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       transform="translate(280,972.3622)"
+       id="16_source-event-multiple-sources-stream-live"
+       inkscape:label="#source-event-multiple-sources-stream-live"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-multiple-sources-stream-live.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90">
+      <rect
+         width="16"
+         height="16"
+         x="0"
+         y="16"
+         id="rect26600"
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient26626);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path26602"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-384.5,-2.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient26628);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect26604"
+         width="2"
+         height="6"
+         x="5.5"
+         y="18.5" />
+      <rect
+         y="24.5"
+         x="5.5"
+         height="2"
+         width="2"
+         id="rect26606"
+         style="color:#000000;fill:url(#radialGradient26630);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:url(#radialGradient27628);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.000026,31.500014 -5.75004,0 c 0.25,-0.499927 -0.50001,-1.249818 -1.50001,-2.249673 -1.02972,-1.029561 -1.25001,-1.771153 -1.25001,-2.499637 0,-0.749891 3.00002,-1.717871 3.00002,-1.99971 0,-0.281839 -1.00001,-0.249964 -1.50001,-0.249964 l 2.00001,0 c 0.50001,0 1.50002,0 1.50002,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.00001,0.999855 2.50002,1.99971 2.00001,2.499637 z"
+         id="path21915-5-0"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path26622"
+         d="m 13.500002,27.49998 2,-1.5 -1,-1.5 -2,1 0,-2 -2,0 -2e-6,2 -2,-1 -1,1.5 2,1.5 -2,1.5 1,1.5 2,-1 2e-6,2 2,0 0,-2 2,1 1,-1.5 -2,-1.5 z"
+         style="color:#000000;fill:url(#radialGradient26640);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path26624"
+         d="m 12.5,27.49998 c 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 0.55228,0 1,0.447715 1,1 z"
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-multiple-sources-stream-archived.png"
+       inkscape:label="#source-event-multiple-sources-stream-archived"
+       id="16_source-event-multiple-sources-stream-archived"
+       transform="translate(300,972.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect26644"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <path
+         transform="translate(-384.5,-2.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path26646"
+         style="color:#000000;fill:url(#radialGradient26670);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="18.5"
+         x="5.5"
+         height="6"
+         width="2"
+         id="rect26648"
+         style="color:#000000;fill:url(#radialGradient26672);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient26674);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect26650"
+         width="2"
+         height="2"
+         x="5.5"
+         y="24.5" />
+      <path
+         style="fill:url(#radialGradient27672);fill-opacity:1;stroke:#464f5a;stroke-width:0.9999314;stroke-linejoin:round;stroke-opacity:1"
+         d="m 9.000026,31.500014 -5.75004,0 c 0.25,-0.499927 -0.50001,-1.249818 -1.50001,-2.249673 -1.02972,-1.029561 -1.25001,-1.771153 -1.25001,-2.499637 0,-0.749891 3.00002,-1.717871 3.00002,-1.99971 0,-0.281839 -1.00001,-0.249964 -1.50001,-0.249964 l 2.00001,0 c 0.50001,0 1.50002,0 1.50002,0.249964 0,0.228327 -1.00001,0.506857 -1.00001,1.249819 0,0.749891 0.52306,2.011238 2.50002,2.999564 2.00001,0.999855 2.50002,1.99971 2.00001,2.499637 z"
+         id="path21915-5-0-7"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <g
+         id="g26652"
+         transform="translate(1,1)">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path26654"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient26676);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient26678);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path26656"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path26658"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient26680);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path26660"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path26662"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <g
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/source/16x16/event-multiple-sources-live-archived.png"
+       inkscape:label="#source-event-multiple-sources-live-archived"
+       id="16_source-event-multiple-sources-live-archived"
+       transform="translate(320,972.3622)">
+      <rect
+         style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect26556"
+         y="16"
+         x="0"
+         height="16"
+         width="16" />
+      <path
+         transform="translate(-384.5,-2.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path26558"
+         style="color:#000000;fill:url(#radialGradient26582);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="18.5"
+         x="5.5"
+         height="6"
+         width="2"
+         id="rect26560"
+         style="color:#000000;fill:url(#radialGradient26584);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient26586);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect26562"
+         width="2"
+         height="2"
+         x="5.5"
+         y="24.5" />
+      <g
+         id="g26564"
+         transform="translate(1,1)">
+        <path
+           sodipodi:nodetypes="ccccccc"
+           id="path26566"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           style="color:#000000;fill:url(#linearGradient26588);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:url(#linearGradient26590);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,28.49998 0,2 -5,-2 0,-2 5.5,-4 -0.5,6 z"
+           id="path26568"
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           id="path26570"
+           d="m 8.5,28.49998 -5,-2 5.5,-4 5.5,2 -6,4 z"
+           style="color:#000000;fill:url(#linearGradient26592);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,26.49998 -6,4 -5,-2 0,-2 5.5,-4 5.5,2 0,2 z"
+           id="path26572"
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path26574"
+           d="m 7.5,28.99998 -0.5,-0.2"
+           style="fill:none;stroke:#6dce3d;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="color:#000000;fill:url(#radialGradient26596);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 6.500002,27.49998 2,-1.5 -1,-1.5 -2,1 0,-2 -2,0 -2e-6,2 -2,-1 -1,1.5 2,1.5 -2,1.5 1,1.5 2,-1 2e-6,2 2,0 0,-2 2,1 1,-1.5 -2,-1.5 z"
+         id="path26578"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 5.5,27.49998 c 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 0.55228,0 1,0.447715 1,1 z"
+         id="path26580"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/Icons/icons.svg b/Icons/icons.svg
new file mode 100644
index 00000000..c8b9216d
--- /dev/null
+++ b/Icons/icons.svg
@@ -0,0 +1,17656 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="512"
+   height="264"
+   id="svg15655"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="icons.svg">
+  <metadata
+     id="metadata440">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview438"
+     showgrid="false"
+     inkscape:zoom="2"
+     inkscape:cx="166.25"
+     inkscape:cy="132"
+     inkscape:window-x="1918"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg15655"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="true"
+     showborder="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3248"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <defs
+     id="defs15657">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6354"
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982">
+      <stop
+         offset="0"
+         style="stop-color:#bedd92;stop-opacity:1;"
+         id="stop6356" />
+      <stop
+         offset="1"
+         style="stop-color:#7aa935;stop-opacity:1;"
+         id="stop6358" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6927">
+      <stop
+         style="stop-color:#2a4556;stop-opacity:1"
+         offset="0"
+         id="stop6929" />
+      <stop
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1"
+         id="stop6931" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6149">
+      <stop
+         style="stop-color:#6ac3ff;stop-opacity:1"
+         offset="0"
+         id="stop6151" />
+      <stop
+         style="stop-color:#f3f3f1;stop-opacity:1"
+         offset="1"
+         id="stop6153" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6943">
+      <stop
+         style="stop-color:#415564;stop-opacity:1;"
+         offset="0"
+         id="stop6945" />
+      <stop
+         id="stop6951"
+         offset="0.69999999"
+         style="stop-color:#839daf;stop-opacity:1" />
+      <stop
+         style="stop-color:#a7bac6;stop-opacity:1"
+         offset="1"
+         id="stop6947" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6911"
+       r="9.7730999"
+       cy="121.8931"
+       cx="310.94339">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0.50196081;"
+         id="stop6913" />
+      <stop
+         offset="0.69999999"
+         style="stop-color:#ffffff;stop-opacity:0.3764706;"
+         id="stop6917" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop6919" />
+    </radialGradient>
+    <radialGradient
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999"
+       id="radialGradient6847"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6849"
+         style="stop-color:#c1ced7;stop-opacity:0.50196081;"
+         offset="0" />
+      <stop
+         id="stop6851"
+         style="stop-color:#91a8b8;stop-opacity:0.3764706;"
+         offset="0.47130001" />
+      <stop
+         id="stop6853"
+         style="stop-color:#718fa3;stop-opacity:0.3137255;"
+         offset="0.82730001" />
+      <stop
+         id="stop6855"
+         style="stop-color:#64859b;stop-opacity:0.25098041;"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient12727"
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651">
+      <stop
+         offset="0"
+         style="stop-color:#a2381d;stop-opacity:0.98449594"
+         id="stop12729" />
+      <stop
+         offset="1"
+         style="stop-color:#673426;stop-opacity:1;"
+         id="stop12733" />
+    </linearGradient>
+    <linearGradient
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127"
+       id="linearGradient11954"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop11956"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         offset="0" />
+      <stop
+         offset="0.25445721"
+         style="stop-color:#ffe581;stop-opacity:0.87843138;"
+         id="stop11958" />
+      <stop
+         offset="0.39923459"
+         style="stop-color:#ffd429;stop-opacity:0.50196081;"
+         id="stop11960" />
+      <stop
+         id="stop11962"
+         style="stop-color:#ffcc00;stop-opacity:0.75294119;"
+         offset="0.56616175" />
+      <stop
+         offset="0.71395278"
+         style="stop-color:#d4aa00;stop-opacity:0.25098041;"
+         id="stop11964" />
+      <stop
+         id="stop11966"
+         style="stop-color:#aa8800;stop-opacity:0.1254902;"
+         offset="0.78939378" />
+      <stop
+         id="stop11968"
+         style="stop-color:#806600;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7121"
+       y2="108.6055"
+       x2="346.7869"
+       y1="122.8501"
+       x1="359.05081">
+      <stop
+         offset="0"
+         style="stop-color:#6f6f58;stop-opacity:0;"
+         id="stop7127" />
+      <stop
+         offset="0.01"
+         style="stop-color:#6f6f58;stop-opacity:0.75294119;"
+         id="stop7129" />
+      <stop
+         offset="1"
+         style="stop-color:#6f6f58;stop-opacity:0;"
+         id="stop7131" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6215"
+       r="9.7730999"
+       cy="121.8931"
+       cx="310.94339">
+      <stop
+         offset="0"
+         style="stop-color:#c1ced7;stop-opacity:0.75294119;"
+         id="stop6217" />
+      <stop
+         offset="0.47130001"
+         style="stop-color:#91a8b8;stop-opacity:0.56470591;"
+         id="stop6219" />
+      <stop
+         offset="0.82730001"
+         style="stop-color:#718fa3;stop-opacity:0.50196081;"
+         id="stop6221" />
+      <stop
+         offset="1"
+         style="stop-color:#64859b;stop-opacity:0.3764706;"
+         id="stop6223" />
+    </radialGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7528">
+      <stop
+         style="stop-color:#6282e0;stop-opacity:1;"
+         offset="0"
+         id="stop7530" />
+      <stop
+         style="stop-color:#82a3f8;stop-opacity:1"
+         offset="1"
+         id="stop7532" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7510">
+      <stop
+         style="stop-color:#d7d7d7;stop-opacity:1;"
+         offset="0"
+         id="stop7512" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop7514" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6582"
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982">
+      <stop
+         offset="0"
+         style="stop-color:#d9ebc7;stop-opacity:1;"
+         id="stop6584" />
+      <stop
+         offset="1"
+         style="stop-color:#72a541;stop-opacity:1"
+         id="stop6586" />
+    </linearGradient>
+    <radialGradient
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999"
+       id="radialGradient6292"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6294"
+         style="stop-color:#c1ced7;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6296"
+         style="stop-color:#91a8b8;stop-opacity:1"
+         offset="0.47130001" />
+      <stop
+         id="stop6299"
+         style="stop-color:#718fa3;stop-opacity:1"
+         offset="0.82730001" />
+      <stop
+         id="stop6301"
+         style="stop-color:#64859b;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127"
+       id="linearGradient5951"
+       xlink:href="#SG_BEIGE_1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)" />
+    <linearGradient
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954"
+       id="linearGradient5953"
+       xlink:href="#SG_BEIGE_1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)" />
+    <linearGradient
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127"
+       id="linearGradient6023"
+       xlink:href="#SG_BEIGE_1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)" />
+    <linearGradient
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954"
+       id="linearGradient6025"
+       xlink:href="#SG_BEIGE_1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)" />
+    <linearGradient
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199"
+       id="linearGradient6098"
+       xlink:href="#SG_RED_1"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199"
+       id="linearGradient6108"
+       xlink:href="#SG_RED_1"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="8"
+       cy="24"
+       r="9.7730999"
+       fx="8"
+       fy="24"
+       id="radialGradient5981-6"
+       xlink:href="#radialGradient6292"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="343.66751"
+       y1="122.48"
+       x2="332.00931"
+       y2="108.939"
+       id="SG_GRAY_2"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6371-1-1"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6373-2-8"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6375-7-1"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.73286879" />
+      <stop
+         id="stop6377-4-1"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.90309668" />
+      <stop
+         id="stop6379-7-5"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="6"
+       cy="26"
+       r="9.7730999"
+       fx="6"
+       fy="26"
+       id="radialGradient6486"
+       xlink:href="#SG_GRAY_2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4325035,1.4656546e-8,-1.3086202e-8,1.279021,-2.5950207,-14.254546)" />
+    <radialGradient
+       cx="6"
+       cy="26"
+       r="9.7730999"
+       fx="6"
+       fy="26"
+       id="radialGradient5596"
+       xlink:href="#SG_GRAY_2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.425051,1.4656546e-8,-1.3018122e-8,1.279021,-2.5581148,-6.2545461)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6292"
+       id="radialGradient3228-3"
+       gradientUnits="userSpaceOnUse"
+       cx="4.5"
+       cy="5"
+       fx="4.5"
+       fy="5"
+       r="9.7730999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient3230"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4325035,1.4656546e-8,-1.3086202e-8,1.279021,-2.3450207,0.245454)"
+       cx="4.6038427"
+       cy="16.617825"
+       fx="4.6038427"
+       fy="16.617825"
+       r="9.7730999" />
+    <linearGradient
+       gradientTransform="translate(-158.375,-109.687)"
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4262"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-171.93638,-120.18863)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4300"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient4503"
+       gradientUnits="userSpaceOnUse"
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429"
+       gradientTransform="translate(-302.90698,-109.403)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient4506"
+       gradientUnits="userSpaceOnUse"
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999"
+       gradientTransform="translate(-302.90698,-109.403)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient4503-7"
+       gradientUnits="userSpaceOnUse"
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-193.61883,-59.437669)" />
+    <radialGradient
+       r="9.7730999"
+       cy="121.8931"
+       cx="310.94339"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-193.61883,-59.437669)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4535"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5134-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.1950544,-118.19845,-61.58818)"
+       cx="127.1339"
+       cy="74.13665"
+       fx="127.1339"
+       fy="74.13665"
+       r="8.4942093" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient5134-5-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.1950544,-429.69845,-69.58818)"
+       cx="443.69846"
+       cy="69.108299"
+       fx="443.69846"
+       fy="69.108299"
+       r="8.4942093" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5134-5-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93775081,0,0,1.1206633,-107.65621,-56.355019)"
+       cx="127.1339"
+       cy="74.13665"
+       fx="127.1339"
+       fy="74.13665"
+       r="8.4942093" />
+    <radialGradient
+       r="8.4942093"
+       fy="69.108299"
+       fx="443.69846"
+       cy="69.108299"
+       cx="443.69846"
+       gradientTransform="matrix(0.93775081,0,0,1.1206633,-399.76561,-63.857025)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5426"
+       xlink:href="#SG_BEIGE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient5659"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient5744"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20"
+       gradientTransform="translate(-2,0)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient5762"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5768"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5772"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,6.5,-25.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient5780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,7.5,-27.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient5780-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,8.2323985,-22.974279)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5772-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,7.3176838,-21.144851)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5768-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,1.3720416,-9.2535714)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       r="6.25"
+       fy="16.9375"
+       fx="14.5"
+       cy="16.9375"
+       cx="14.5"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,1.3720416,-9.2535714)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5830"
+       xlink:href="#SG_BEIGE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6582"
+       id="linearGradient6477"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,0)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6582"
+       id="linearGradient6487"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-7.5463762,-11.220164)"
+       x1="1.4999989"
+       y1="15"
+       x2="12.999999"
+       y2="22.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6506"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6506-5"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-586.17862,-17.914331)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6580"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-586.17862,-11.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6596-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,0)"
+       x1="7.5"
+       y1="19"
+       x2="16.5"
+       y2="25.5" />
+    <radialGradient
+       r="7.4499998"
+       fy="20.999998"
+       fx="387.83865"
+       cy="20.999998"
+       cx="387.83865"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6738"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6580-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1179635,-6.2687995e-6,6.2687843e-6,2.1179583,-808.39357,-26.881409)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       r="7.4499998"
+       fy="26.182608"
+       fx="387.83862"
+       cy="26.182608"
+       cx="387.83862"
+       gradientTransform="matrix(2.1179635,-6.2687995e-6,6.2687843e-6,2.1179583,-808.39357,-33.741752)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6799"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="22.5"
+       x2="12.999999"
+       y1="15"
+       x1="1.4999989"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-7.5464791,-11.220166)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6880"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="22.5"
+       x2="12.999999"
+       y1="15"
+       x1="1.4999989"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-7.5464749,-11.220167)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6924"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6596-6-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,0)"
+       x1="7.5"
+       y1="19"
+       x2="16.5"
+       y2="25.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient7320"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-6,0)"
+       x1="13"
+       y1="16.5"
+       x2="20"
+       y2="33" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="linearGradient7322"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5"
+       y1="19"
+       x2="9.5"
+       y2="28.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="linearGradient7343-3"
+       gradientUnits="userSpaceOnUse"
+       x1="4.5"
+       y1="19"
+       x2="9.5"
+       y2="28.5"
+       gradientTransform="matrix(0.99786815,0,0,0.99786815,2.6437395e-6,0.06821905)" />
+    <linearGradient
+       y2="33"
+       x2="20"
+       y1="16.5"
+       x1="13"
+       gradientTransform="matrix(0.99786815,0,0,0.99786815,-5.9872174,0.06821905)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7409"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient7484"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(8,0)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient7488"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,2.0580054,-11.220167)"
+       x1="1.4999989"
+       y1="15"
+       x2="12.999999"
+       y2="22.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7510"
+       id="linearGradient7516"
+       x1="3.5"
+       y1="-17"
+       x2="13"
+       y2="-22"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2,-3)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient7534"
+       x1="3.5"
+       y1="-13"
+       x2="14.5"
+       y2="-15"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(2,-3)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient7534-8"
+       x1="4.5000067"
+       y1="-13"
+       x2="11.000007"
+       y2="-14"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-9.63947e-6,0.92964827)" />
+    <linearGradient
+       y2="-22.5"
+       x2="12.000007"
+       y1="-20.5"
+       x1="6.0000067"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-1.3720783,7.7899913)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7685"
+       xlink:href="#linearGradient7510"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7510"
+       id="linearGradient7762"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)"
+       x1="3.5"
+       y1="-17"
+       x2="13"
+       y2="-22" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient7764"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)"
+       x1="3.5"
+       y1="-13"
+       x2="14.5"
+       y2="-15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7510"
+       id="linearGradient7768"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-4.1162155,11.906197)"
+       x1="6.0000067"
+       y1="-20.5"
+       x2="12.000007"
+       y2="-22.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient7770"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-2.7441469,5.0458541)"
+       x1="4.5000067"
+       y1="-13"
+       x2="11.000007"
+       y2="-14" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6580-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-585.1786,-11.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6506-5-38"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-585.1786,-17.914331)" />
+    <radialGradient
+       r="7.4499998"
+       fy="20.999998"
+       fx="387.83865"
+       cy="20.999998"
+       cx="387.83865"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7816"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6580-1-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1179635,-6.2687997e-6,6.2687844e-6,2.1179583,-808.39364,-26.881411)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       r="7.4499998"
+       fy="26.182608"
+       fx="387.83862"
+       cy="26.182608"
+       cx="387.83862"
+       gradientTransform="matrix(2.1179635,-6.2687997e-6,6.2687844e-6,2.1179583,-808.39364,-33.741755)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6799-8"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.4499998"
+       fy="20.999998"
+       fx="387.83865"
+       cy="20.999998"
+       cx="387.83865"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7917"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6240-5"
+       cx="320"
+       cy="24.346153"
+       fx="320"
+       fy="24.346153"
+       r="3.5999999"
+       gradientTransform="matrix(1.3888889,6.3974885e-7,-1.087573e-6,2.361111,-435.44443,-39.984176)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6228-2"
+       cx="320"
+       cy="25.708334"
+       fx="320"
+       fy="25.708334"
+       r="2.75"
+       gradientTransform="matrix(1.8181827,-3.3913077e-7,5.7652201e-7,3.090909,-572.81849,-61.962012)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6180-5"
+       cx="320"
+       cy="31.714285"
+       fx="320"
+       fy="31.714285"
+       r="2.5"
+       gradientTransform="matrix(2.2000004,3.3789604e-8,-4.6076723e-8,2.9999997,-695.0001,-72.142857)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient6299-9"
+       cx="321"
+       cy="20.5"
+       fx="321"
+       fy="20.5"
+       r="2.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4000002,5.6310691e-7,-7.2399429e-7,1.7999995,-128.40005,-16.400172)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient6299-9-7"
+       cx="321"
+       cy="20.5"
+       fx="321"
+       fy="20.5"
+       r="2.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4000002,5.6310691e-7,-7.2399429e-7,1.7999995,-128.40005,-16.400172)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6180-5-9"
+       cx="320"
+       cy="31.714285"
+       fx="320"
+       fy="31.714285"
+       r="2.5"
+       gradientTransform="matrix(2.2000004,3.3789604e-8,-4.6076723e-8,2.9999997,-695.0001,-72.142857)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6228-2-0"
+       cx="320"
+       cy="25.708334"
+       fx="320"
+       fy="25.708334"
+       r="2.75"
+       gradientTransform="matrix(1.8181827,-3.3913077e-7,5.7652201e-7,3.090909,-572.81849,-61.962012)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6240-5-2"
+       cx="320"
+       cy="24.346153"
+       fx="320"
+       fy="24.346153"
+       r="3.5999999"
+       gradientTransform="matrix(1.3888889,6.3974885e-7,-1.087573e-6,2.361111,-435.44443,-39.984176)"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter8401"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.57"
+         id="feGaussianBlur8403" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8761">
+      <rect
+         width="19"
+         height="19"
+         x="1.5"
+         y="11.5"
+         id="rect8763"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8401);enable-background:accumulate" />
+    </mask>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8767">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8769"
+         width="22"
+         height="22"
+         x="0"
+         y="10" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter8951"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.42"
+         id="feGaussianBlur8953" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8991">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8951);enable-background:accumulate"
+         id="rect8993"
+         width="14"
+         height="14"
+         x="289"
+         y="1"
+         transform="matrix(1.375,0,0,1.3750001,-396,10)" />
+    </mask>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8997">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8999"
+         width="22"
+         height="22.000002"
+         x="0"
+         y="10" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8767-8">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8769-3"
+         width="22"
+         height="22"
+         x="0"
+         y="10" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8761-5">
+      <rect
+         width="19"
+         height="19"
+         x="1.5"
+         y="11.5"
+         id="rect8763-5"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8401-0);enable-background:accumulate" />
+    </mask>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter8401-0">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.57"
+         id="feGaussianBlur8403-1" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8997-1">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8999-4"
+         width="22"
+         height="22.000002"
+         x="0"
+         y="10" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8991-9">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8951-8);enable-background:accumulate"
+         id="rect8993-6"
+         width="14"
+         height="14"
+         x="289"
+         y="1"
+         transform="matrix(1.375,0,0,1.3750001,-396,10)" />
+    </mask>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter8951-8">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.42"
+         id="feGaussianBlur8953-8" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4003"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-161.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4005"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-174.68638,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4021"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-166.43638,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4035"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-158.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4051"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-155.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4053"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-169.18638,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       y2="138.20799"
+       x2="198.187"
+       y1="123.208"
+       x1="198.187"
+       gradientTransform="translate(-182.187,-109.708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4072"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.27049"
+       x2="197.6245"
+       y1="123.1455"
+       x1="197.6245"
+       gradientTransform="translate(-180.43699,-109.708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4110"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.20799"
+       x2="198.187"
+       y1="123.208"
+       x1="198.187"
+       gradientTransform="translate(-180.187,-109.708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4148"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.20799"
+       x2="198.187"
+       y1="123.208"
+       x1="198.187"
+       gradientTransform="translate(-194.187,-109.708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4186"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="translate(-152.375,-109.687)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4224"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.20799"
+       x2="198.187"
+       y1="123.208"
+       x1="198.187"
+       gradientTransform="translate(-192.187,-109.708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4262-9"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.27049"
+       x2="197.6245"
+       y1="123.1455"
+       x1="197.6245"
+       gradientTransform="translate(-192.81199,-109.708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5072"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.27049"
+       x2="197.6245"
+       y1="123.1455"
+       x1="197.6245"
+       gradientTransform="translate(-194.18699,-109.708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5110"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.27049"
+       x2="197.6245"
+       y1="123.1455"
+       x1="197.6245"
+       gradientTransform="translate(-179.06199,-109.708)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5072-8"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-171.93638,-120.18863)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5153"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,-2)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,-2)"
+       x1="7.5"
+       y1="19"
+       x2="16.5"
+       y2="25.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5224"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-586.17862,-17.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5226"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-586.17862,-11.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5230"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,-2.7441373)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5232"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,-2.7441373)"
+       x1="7.5"
+       y1="19"
+       x2="16.5"
+       y2="25.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5234"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5236"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1179635,-6.2687995e-6,6.2687843e-6,2.1179583,-808.39357,-33.741752)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5238"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1179635,-6.2687995e-6,6.2687843e-6,2.1179583,-808.39357,-26.881409)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8767-4">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8769-8"
+         width="22"
+         height="22"
+         x="0"
+         y="10" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8761-4">
+      <rect
+         width="19"
+         height="19"
+         x="1.5"
+         y="11.5"
+         id="rect8763-56"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8401-5);enable-background:accumulate" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter8401-5"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.57"
+         id="feGaussianBlur8403-19" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8997-0">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8999-1"
+         width="22"
+         height="22.000002"
+         x="0"
+         y="10" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8991-8">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8951-2);enable-background:accumulate"
+         id="rect8993-0"
+         width="14"
+         height="14"
+         x="289"
+         y="1"
+         transform="matrix(1.375,0,0,1.3750001,-396,10)" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter8951-2"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.42"
+         id="feGaussianBlur8953-9" />
+    </filter>
+    <radialGradient
+       r="5.5"
+       fy="88.097832"
+       fx="200"
+       cy="88.097832"
+       cx="200"
+       gradientTransform="matrix(1.9999992,-2.7321111e-6,2.7321117e-6,1.9999997,-387.00007,-153.19509)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient28048"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5.5"
+       fy="87.876671"
+       fx="198.91759"
+       cy="87.876671"
+       cx="198.91759"
+       gradientTransform="matrix(1.7500013,1.5691076e-6,-1.5691065e-6,1.7500001,-333.66839,-127.972)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient28098"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4653"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1179635,-6.2687995e-6,6.2687843e-6,2.1179583,-817.99799,-39.230024)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4655"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1179635,-6.2687995e-6,6.2687843e-6,2.1179583,-817.99799,-32.369681)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5482"
+       x1="8"
+       y1="30"
+       x2="16"
+       y2="30"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5490"
+       x1="2"
+       y1="25"
+       x2="10"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5603"
+       gradientUnits="userSpaceOnUse"
+       x1="2"
+       y1="25"
+       x2="10"
+       y2="25"
+       gradientTransform="translate(12,0)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5667"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688672e-6,4.5688561e-6,1.5436241,-594.17865,-15.91433)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5670"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688672e-6,4.5688561e-6,1.5436241,-594.17865,-20.91433)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient5674-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75642458,0,0,0.75644074,-185.54187,-79.201807)"
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199" />
+    <linearGradient
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-4.1976544e-6,-10.53413)"
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5490-3"
+       x1="2"
+       y1="25"
+       x2="6.5000029"
+       y2="25"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-5.4882787,-10.53413)"
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5482-6"
+       x1="8"
+       y1="30"
+       x2="16"
+       y2="30"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5818"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,10.976546,-10.53413)"
+       x1="2"
+       y1="25"
+       x2="6.5000029"
+       y2="25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4325035,1.4656546e-8,-1.3086202e-8,1.279021,-2.0950207,1.245454)"
+       cx="4.6038427"
+       cy="4.1082563"
+       fx="4.6038427"
+       fy="4.1082563"
+       r="9.7730999" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6196"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20"
+       gradientTransform="translate(1,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6201"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(4,0)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6215"
+       id="radialGradient6239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.375,-2.34375,-30.84375)"
+       cx="6.25"
+       cy="82.25"
+       fx="6.25"
+       fy="82.25"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6582"
+       id="linearGradient6247"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5,64)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="linearGradient6251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,64)"
+       x1="0"
+       y1="12"
+       x2="19.5"
+       y2="25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6582"
+       id="linearGradient6256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(7,64)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <linearGradient
+       y2="22.5"
+       x2="12.999999"
+       y1="15"
+       x1="1.4999989"
+       gradientTransform="translate(-7.4999928,40.499999)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6278"
+       xlink:href="#linearGradient6582"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="linearGradient6301"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-4.4999927,40.499999)"
+       x1="5.9999928"
+       y1="18.000002"
+       x2="18.499992"
+       y2="26.000002" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6305"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.3750001,-2.06249,-11.312503)"
+       x1="1.4999989"
+       y1="15"
+       x2="12.999999"
+       y2="22.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6582"
+       id="linearGradient6309"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.5000073,40.499999)"
+       x1="1.4999989"
+       y1="15"
+       x2="12.999999"
+       y2="22.5" />
+    <radialGradient
+       r="8"
+       fy="82.977272"
+       fx="7.340909"
+       cy="82.977272"
+       cx="7.340909"
+       gradientTransform="matrix(1.375,0,0,1.375,-2.34375,-30.84375)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6334"
+       xlink:href="#radialGradient6215"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6388"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,0)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6392"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-7.5464749,-11.220167)"
+       x1="1.4999989"
+       y1="15"
+       x2="12.999999"
+       y2="22.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6398"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20"
+       gradientTransform="translate(3,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6402"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(8,0)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6406"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-2.0582005,-11.220167)"
+       x1="1.4999989"
+       y1="15"
+       x2="12.999999"
+       y2="22.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6410"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,3.430074,-11.220167)"
+       x1="1.4999989"
+       y1="15"
+       x2="12.999999"
+       y2="22.5" />
+    <linearGradient
+       gradientTransform="matrix(0.75642455,0,0,0.75644071,-187.35263,-74.85319)"
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6461"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       gradientTransform="matrix(0.75642458,0,0,0.75644074,-187.35273,-74.853209)"
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6508-1"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientTransform="matrix(0.55130228,0,0,0.55131406,-130.54764,-46.877452)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6821"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6854"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.5)"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6856"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.5)"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5" />
+    <radialGradient
+       r="6.25"
+       fy="20.375"
+       fx="10.5"
+       cy="20.375"
+       cx="10.5"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6875"
+       xlink:href="#SG_BEIGE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientTransform="matrix(0.7564246,0,0,0.75644077,-185.2946,-76.225282)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6914"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientTransform="matrix(0.55130231,0,0,0.55131409,-129.04758,-50.877461)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6996"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6854-6"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5"
+       gradientTransform="translate(-0.49999999,0.49999999)" />
+    <radialGradient
+       r="6.25"
+       fy="20.375"
+       fx="10.5"
+       cy="20.375"
+       cx="10.5"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6875-5"
+       xlink:href="#SG_BEIGE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4222"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4225"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4247"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4249"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4253"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       y2="129.687"
+       x2="168.875"
+       y1="121.687"
+       x1="162.875"
+       gradientTransform="translate(-154.375,-109.687)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4270"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="129.687"
+       x2="168.875"
+       y1="121.687"
+       x1="162.875"
+       gradientTransform="matrix(1.3766667,0,0,1.3766667,-216.65289,-157.54909)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4304"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="129.687"
+       x2="168.875"
+       y1="121.687"
+       x1="162.875"
+       gradientTransform="translate(-154.375,-109.687)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4338"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="129.687"
+       x2="168.875"
+       y1="121.687"
+       x1="162.875"
+       gradientTransform="matrix(1.3766667,0,0,1.3766667,-216.65293,-158.92576)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4372"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7121"
+       id="linearGradient7119"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,1)"
+       x1="408"
+       y1="23.5"
+       x2="403"
+       y2="25.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7135"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,1)"
+       x1="397.5"
+       y1="26"
+       x2="402"
+       y2="43.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7121"
+       id="linearGradient7143"
+       x1="411"
+       y1="15.5"
+       x2="409"
+       y2="26.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7181"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-391.5,-3.5)"
+       x1="411"
+       y1="24"
+       x2="412.5"
+       y2="8.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7181-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.375,-545.875,-10.625)"
+       x1="411"
+       y1="24"
+       x2="412.5"
+       y2="8.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7121"
+       id="linearGradient7459"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74358975,0,0,0.74358975,100.64102,-13.871795)"
+       x1="409.98276"
+       y1="16.637932"
+       x2="407.29312"
+       y2="28.068966" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7121"
+       id="linearGradient7504"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.375,-540.375,-21.625001)"
+       x1="403"
+       y1="29"
+       x2="399.5"
+       y2="31" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7511"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0224359,0,0,1.0224359,-401.64102,-8.051283)"
+       x1="397.5"
+       y1="26"
+       x2="402"
+       y2="43.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient7554"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-153.875,-108.687)"
+       x1="161.875"
+       y1="122.687"
+       x2="170.375"
+       y2="131.687" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient7562"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-153.875,-108.687)"
+       x1="161.875"
+       y1="122.687"
+       x2="170.375"
+       y2="131.687" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient7638"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75642455,0,0,0.75644071,-190.35263,-77.853188)"
+       x1="256.93591"
+       y1="119.44517"
+       x2="270.81702"
+       y2="136.63092" />
+    <radialGradient
+       r="9.6155005"
+       cy="7.7695279"
+       cx="194.69131"
+       gradientTransform="matrix(-2.4261851e-7,-2.0799763,-2.0799752,2.4261842e-7,20.16047,423.45334)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8757"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always"
+       fx="194.69131"
+       fy="7.7695279" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient7627"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6,0,0,1.6,-260.8,-22.4)"
+       cx="168"
+       cy="24"
+       fx="168"
+       fy="24"
+       r="10" />
+    <linearGradient
+       y2="136.63092"
+       x2="270.81702"
+       y1="119.44517"
+       x1="256.93591"
+       gradientTransform="matrix(0.75642455,0,0,0.75644071,-192.35263,-73.853188)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7645"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient7672"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.2340779e-7,-1.5079831,-1.5079818,-8.2340707e-7,14.913873,315.7617)"
+       cx="194.47279"
+       cy="7.9006476"
+       fx="194.47279"
+       fy="7.9006476"
+       r="9.6155005" />
+    <linearGradient
+       y2="136.63092"
+       x2="270.81702"
+       y1="119.44517"
+       x1="256.93591"
+       gradientTransform="matrix(0.75642455,0,0,0.75644071,-192.35263,-73.853188)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7689"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient7714"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-43.966523)"
+       x1="256.53931"
+       y1="119.31297"
+       x2="270.42041"
+       y2="136.89531" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient7722"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-43.966523)"
+       x1="256.53931"
+       y1="119.31297"
+       x2="270.42041"
+       y2="136.89531" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient7799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4,0,0,1.4,-207.7,-19.1)"
+       cx="265.5"
+       cy="16.5"
+       fx="265.5"
+       fy="16.5"
+       r="10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4278"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4282"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4284"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4288"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6580-6-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-585.1786,-11.91433)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6506-5-38-9"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-585.1786,-17.91433)" />
+    <radialGradient
+       r="7.4499998"
+       fy="20.999998"
+       fx="387.83865"
+       cy="20.999998"
+       cx="387.83865"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5235"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient4423-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.9999992,-2.7321111e-6,2.7321117e-6,1.9999997,-604.00007,-284.19509)"
+       cx="303.99994"
+       cy="148.59798"
+       fx="303.99994"
+       fy="148.59798"
+       r="5.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient6580-1-3-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1224884,-6.282193e-6,6.2821773e-6,2.1224833,-810.1207,-27.007211)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       r="7.4499998"
+       fy="26.182608"
+       fx="387.83862"
+       cy="26.182608"
+       cx="387.83862"
+       gradientTransform="matrix(2.1224884,-6.282193e-6,6.2821773e-6,2.1224833,-810.1207,-33.882211)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6799-8-3"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.4499998"
+       fy="20.999998"
+       fx="387.83865"
+       cy="20.999998"
+       cx="387.83865"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5373"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5.5"
+       fy="148.59798"
+       fx="303.99994"
+       cy="148.59798"
+       cx="303.99994"
+       gradientTransform="matrix(2.7499989,-3.756653e-6,3.7566536e-6,2.7499998,-831.8751,-395.89328)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5448"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient17227"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient17229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient17231"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient17233"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17273-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-96)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17275-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-90)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17273-5-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-96)"
+       x1="5"
+       y1="53.5"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17465"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-92)"
+       x1="5"
+       y1="53.5"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient18696"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient18702"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient18704"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient18710"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8997-7-1">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8999-2-3"
+         width="22"
+         height="22.000002"
+         x="0"
+         y="10" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8991-6-7">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8951-9-6);enable-background:accumulate"
+         id="rect8993-62-7"
+         width="14"
+         height="14"
+         x="289"
+         y="1"
+         transform="matrix(1.375,0,0,1.3750001,-396,10)" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter8951-9-6"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.42"
+         id="feGaussianBlur8953-7-3" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter19745"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.39999918"
+         id="feGaussianBlur19747" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath19750">
+      <rect
+         y="15.49993"
+         x="-4.4614197e-07"
+         height="16.5"
+         width="16.5"
+         id="rect19752"
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask19754">
+      <rect
+         transform="matrix(1.375,0,0,1.3750001,-396,15.5)"
+         y="1"
+         x="289"
+         height="9.9999495"
+         width="10.00001"
+         id="rect19756"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter19745);enable-background:accumulate" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient19922"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient19924"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient19926"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient19928"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient20087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="388.16254"
+       cy="21.323912"
+       fx="388.16254"
+       fy="21.323912"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient20195"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="388.48645"
+       cy="21.647808"
+       fx="388.48645"
+       fy="21.647808"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient20267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="388.48645"
+       cy="21.647808"
+       fx="388.48645"
+       fy="21.647808"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5292"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="388.16254"
+       cy="21.323912"
+       fx="388.16254"
+       fy="21.323912"
+       r="7.4499998" />
+    <radialGradient
+       r="5.5"
+       fy="148.59798"
+       fx="303.99994"
+       cy="148.59798"
+       cx="303.99994"
+       gradientTransform="matrix(1.9999992,-2.7321111e-6,2.7321117e-6,1.9999997,-600.00007,-273.19509)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4712"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="5.5"
+       fy="148.59798"
+       fx="303.99994"
+       cy="148.59798"
+       cx="303.99994"
+       gradientTransform="matrix(2.7499989,-3.756653e-6,3.7566536e-6,2.7499998,-830.5001,-384.89328)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4758"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4554"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-43.966523)"
+       x1="256.53931"
+       y1="114.68603"
+       x2="275.04742"
+       y2="138.74609" />
+    <linearGradient
+       y2="138.74609"
+       x2="275.04742"
+       y1="114.68603"
+       x1="256.53931"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-43.966523)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4579"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4550"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-153.875,-109.687)"
+       x1="161.875"
+       y1="122.687"
+       x2="170.375"
+       y2="131.687" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient5339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-156.875,-107.687)"
+       x1="161.875"
+       y1="122.687"
+       x2="170.375"
+       y2="131.687" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient5341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-150.875,-107.687)"
+       x1="161.875"
+       y1="122.687"
+       x2="170.375"
+       y2="131.687" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5383"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.5)"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient5385"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       cx="10.5"
+       cy="20.375"
+       fx="10.5"
+       fy="20.375"
+       r="6.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient5387"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.5)"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient5389"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55130228,0,0,0.55131406,-130.54764,-46.877452)"
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199" />
+    <linearGradient
+       gradientTransform="translate(-183.687,-109.708)"
+       y2="137.20799"
+       x2="194.687"
+       y1="124.208"
+       x1="194.687"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5422"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="136.20799"
+       x2="193.687"
+       y1="127.208"
+       x1="193.687"
+       gradientTransform="matrix(1.375,0,0,1.375,-255.31963,-160.0985)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5460"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient6299-9-2"
+       cx="321"
+       cy="20.5"
+       fx="321"
+       fy="20.5"
+       r="2.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4000002,5.6310691e-7,-7.2399429e-7,1.7999995,-128.40005,-16.400172)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6180-5-93"
+       cx="320"
+       cy="31.714285"
+       fx="320"
+       fy="31.714285"
+       r="2.5"
+       gradientTransform="matrix(2.2000004,3.3789604e-8,-4.6076723e-8,2.9999997,-695.0001,-72.142857)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6228-2-05"
+       cx="320"
+       cy="25.708334"
+       fx="320"
+       fy="25.708334"
+       r="2.75"
+       gradientTransform="matrix(1.8181827,-3.3913077e-7,5.7652201e-7,3.090909,-572.81849,-61.962012)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6240-5-8"
+       cx="320"
+       cy="24.346153"
+       fx="320"
+       fy="24.346153"
+       r="3.5999999"
+       gradientTransform="matrix(1.3888889,6.3974885e-7,-1.087573e-6,2.361111,-435.44443,-39.984176)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient6299-9-7-5"
+       cx="321"
+       cy="20.5"
+       fx="321"
+       fy="20.5"
+       r="2.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4000002,5.6310691e-7,-7.2399429e-7,1.7999995,-128.40005,-16.400172)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6180-5-9-6"
+       cx="320"
+       cy="31.714285"
+       fx="320"
+       fy="31.714285"
+       r="2.5"
+       gradientTransform="matrix(2.2000004,3.3789604e-8,-4.6076723e-8,2.9999997,-695.0001,-72.142857)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6228-2-0-3"
+       cx="320"
+       cy="25.708334"
+       fx="320"
+       fy="25.708334"
+       r="2.75"
+       gradientTransform="matrix(1.8181827,-3.3913077e-7,5.7652201e-7,3.090909,-572.81849,-61.962012)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6240-5-2-6"
+       cx="320"
+       cy="24.346153"
+       fx="320"
+       fy="24.346153"
+       r="3.5999999"
+       gradientTransform="matrix(1.3888889,6.3974885e-7,-1.087573e-6,2.361111,-435.44443,-39.984176)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="radialGradient8690"
+       cx="456"
+       cy="79.75206"
+       fx="456"
+       fy="79.75206"
+       r="10.506738"
+       gradientTransform="matrix(1.5228323,1.881851e-6,-1.8818509e-6,1.5228322,-238.4114,-41.449869)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="radialGradient8802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3324799,6.4656147e-7,-6.5263925e-7,1.3324781,-153.11544,-45.550665)"
+       cx="454.12729"
+       cy="79.213585"
+       fx="454.12729"
+       fy="79.213585"
+       r="10.506738" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="SG_GOLD_1"
+       y2="124.8127"
+       x2="23.477301"
+       y1="136.9731"
+       x1="26.1304">
+      <stop
+         offset="0"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         id="stop6510-5-0" />
+      <stop
+         id="stop6515-9-7"
+         style="stop-color:#ffd42a;stop-opacity:1"
+         offset="0.60644233" />
+      <stop
+         offset="0.72660697"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop6517-62-7" />
+      <stop
+         id="stop6519-17-4"
+         style="stop-color:#d4aa00;stop-opacity:1"
+         offset="0.84601015" />
+      <stop
+         offset="1"
+         style="stop-color:#806600;stop-opacity:1"
+         id="stop6512-8-5" />
+    </linearGradient>
+    <linearGradient
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879"
+       id="SG_GREEN_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6305-3-0"
+         style="stop-color:#d1f0c2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6307-0-29"
+         style="stop-color:#66cc33;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="SG_BLACK_1">
+      <stop
+         style="stop-color:#111111;stop-opacity:1;"
+         offset="0"
+         id="stop3900" />
+      <stop
+         style="stop-color:#434343;stop-opacity:1;"
+         offset="1"
+         id="stop3902" />
+    </linearGradient>
+    <linearGradient
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199"
+       id="SG_RED_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6415-6-8-3"
+         style="stop-color:#ffc2b2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6417-4-9-4"
+         style="stop-color:#ffb8a6;stop-opacity:1"
+         offset="0.068" />
+      <stop
+         id="stop6419-2-3-0"
+         style="stop-color:#ff3300;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="359.05081"
+       y1="122.8501"
+       x2="346.7869"
+       y2="108.6055"
+       id="SG_GRAY_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6630-5-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6632-5"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6634-2-5"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.51010001" />
+      <stop
+         id="stop6636-90"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop6638-2-8"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999"
+       id="SG_BLUE_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6426-4-8-8"
+         style="stop-color:#99d6ff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6428-0-3-73"
+         style="stop-color:#4ab7ff;stop-opacity:1"
+         offset="0.47130001" />
+      <stop
+         id="stop6430-1-8-5"
+         style="stop-color:#15a1ff;stop-opacity:1"
+         offset="0.82730001" />
+      <stop
+         id="stop6432-9-0"
+         style="stop-color:#0099ff;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954"
+       id="SG_BEIGE_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6282-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6284-5"
+         style="stop-color:#ffdc8f;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient18573"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-181.812,-109.708)"
+       x1="197.6245"
+       y1="123.1455"
+       x2="197.6245"
+       y2="138.27049" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient18576"
+       gradientUnits="userSpaceOnUse"
+       x1="189.8745"
+       y1="123.1455"
+       x2="189.8745"
+       y2="138.27049"
+       gradientTransform="translate(-183.687,-109.708)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient18585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-183.187,-109.708)"
+       x1="198.187"
+       y1="123.208"
+       x2="198.187"
+       y2="138.20799" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient18588"
+       gradientUnits="userSpaceOnUse"
+       x1="189.687"
+       y1="123.208"
+       x2="189.67821"
+       y2="138.2153"
+       gradientTransform="translate(-183.687,-109.708)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4681"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-169.18638,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient5467"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-176.06138,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4673"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-171.93638,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient5463"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-165.06138,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4669"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-158.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient4677"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-155.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient5459"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-162.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="translate(-151.375,-109.687)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient10539"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127"
+       id="linearGradient11182"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop11184"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         offset="0" />
+      <stop
+         offset="0.60644233"
+         style="stop-color:#ffd429;stop-opacity:0.87843138;"
+         id="stop11186" />
+      <stop
+         id="stop11188"
+         style="stop-color:#ffcc00;stop-opacity:0.75294119;"
+         offset="0.72660697" />
+      <stop
+         offset="0.84601015"
+         style="stop-color:#d4aa00;stop-opacity:0.3764706;"
+         id="stop11190" />
+      <stop
+         id="stop11192"
+         style="stop-color:#806600;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6404"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-62.61883,-54.437669)"
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6406"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-62.61883,-54.437669)"
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999" />
+    <radialGradient
+       r="7.4499998"
+       fy="22.095467"
+       fx="388.28625"
+       cy="22.095467"
+       cx="388.28625"
+       gradientTransform="matrix(-1.9163711e-6,1.4006421,-1.4006413,-1.91637e-6,419.86161,-520.937)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7075"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       y2="130.11165"
+       x2="165.61473"
+       y1="121.89247"
+       x1="160.13528"
+       gradientTransform="matrix(1.0049667,0,0,1.0049667,-150.60563,-111.83621)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4149"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4221"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5126-7-7-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5128-9-1-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51160899,-7.0560549e-7,7.0560458e-7,0.51160832,-163.55769,-47.208648)"
+       cx="312.85141"
+       cy="126.48127"
+       r="9.7730999"
+       fx="312.85141"
+       fy="126.48127" />
+    <radialGradient
+       r="6.6429"
+       cy="140.0264"
+       cx="316.77731"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-67.437669)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3984"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4211"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient5345"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-152.375,-110.687)"
+       x1="159.875"
+       y1="122.187"
+       x2="165.875"
+       y2="130.187" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4215"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5126-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5128-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-63.937669)"
+       cx="312.85141"
+       cy="125.12522"
+       r="9.7730999"
+       fx="312.85141"
+       fy="125.12522" />
+    <radialGradient
+       r="6.6429"
+       cy="140.0264"
+       cx="316.77731"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-66.437669)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5279"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5126-7-7-7-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5128-9-1-0-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.51160899,-7.0560549e-7,7.0560458e-7,0.51160832,-163.55769,-47.208648)"
+       cx="312.85141"
+       cy="126.48127"
+       r="9.7730999"
+       fx="312.85141"
+       fy="126.48127" />
+    <radialGradient
+       r="6.6429"
+       cy="140.0264"
+       cx="316.77731"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-67.437669)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4077"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4209"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4199"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5126"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5128"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-63.937669)"
+       cx="312.85141"
+       cy="125.12522"
+       r="9.7730999"
+       fx="312.85141"
+       fy="125.12522" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5130"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-66.437669)"
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient4203"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient11995"
+       gradientUnits="userSpaceOnUse"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient11997"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(12.999985,6.4764499e-7,1.1255326e-4,12.999995,-116.93943,-274.82308)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient11999"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0833334,-1.9332332e-4,2.1121831e-7,1.0833333,131.78754,67.07337)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient12009"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(9.1923771,9.192378,-9.192305,9.1924642,170.99489,-371.31187)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient12011"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76616909,0.76589569,-0.76603217,0.76603247,105.11412,46.321959)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5126-7-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5128-9-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-63.937669)"
+       cx="312.85141"
+       cy="125.12522"
+       r="9.7730999"
+       fx="312.85141"
+       fy="125.12522" />
+    <radialGradient
+       r="6.6429"
+       cy="140.0264"
+       cx="316.77731"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-66.437669)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12077"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient11995-3"
+       gradientUnits="userSpaceOnUse"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5"
+       gradientTransform="matrix(0.69230752,0,0,0.69230769,4.7692332,7.5384616)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient11997-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.9999777,2.5479791e-5,1.2081937e-5,8.9999873,-36.802459,-182.72395)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient11999-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74999909,-6.417072e-5,9.3211965e-8,0.74999955,135.39138,53.9731)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient12302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.3639272,6.3639633,-6.3639435,6.3639606,162.53637,-249.52255)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient12304"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53037482,0.53028407,-0.5303297,0.53032983,116.92571,39.606969)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient12409"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0224359,0,0,1.0224359,-401.64102,-8.051283)"
+       x1="397.5"
+       y1="26"
+       x2="402"
+       y2="43.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7121"
+       id="linearGradient12411"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.375,-540.375,-21.625001)"
+       x1="403"
+       y1="29"
+       x2="399.5"
+       y2="31" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient12413"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.375,-545.875,-10.625)"
+       x1="411"
+       y1="24"
+       x2="412.5"
+       y2="8.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7121"
+       id="linearGradient12415"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74358975,0,0,0.74358975,100.64102,-13.871795)"
+       x1="409.98276"
+       y1="16.637932"
+       x2="407.29312"
+       y2="28.068966" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6292"
+       id="linearGradient12540"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.5000008,9.5624999)"
+       x1="10.499999"
+       y1="6.4375"
+       x2="34.5"
+       y2="38.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6292"
+       id="linearGradient12542"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.5000008,9.5624999)"
+       x1="6.499999"
+       y1="2.4375"
+       x2="26.5"
+       y2="26.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6292"
+       id="linearGradient12544"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1.5000008,9.5624999)"
+       x1="14.499999"
+       y1="14.4375"
+       x2="34.5"
+       y2="38.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7121"
+       id="linearGradient12555"
+       gradientUnits="userSpaceOnUse"
+       x1="411"
+       y1="15.5"
+       x2="409"
+       y2="26.5"
+       gradientTransform="translate(-392,-8)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7121"
+       id="linearGradient12562"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-393,-7)"
+       x1="408"
+       y1="23.5"
+       x2="403"
+       y2="25.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient12565"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-391.5,-3.5)"
+       x1="411"
+       y1="24"
+       x2="412.5"
+       y2="8.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient12568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-393,-7)"
+       x1="397.5"
+       y1="26"
+       x2="402"
+       y2="43.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6292"
+       id="linearGradient12540-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.499999,9.5624999)"
+       x1="10.499999"
+       y1="6.4375"
+       x2="34.5"
+       y2="38.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6292"
+       id="linearGradient12542-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.499999,9.5624999)"
+       x1="6.499999"
+       y1="2.4375"
+       x2="26.5"
+       y2="26.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6292"
+       id="linearGradient12544-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.499999,9.5624999)"
+       x1="14.499999"
+       y1="14.4375"
+       x2="34.5"
+       y2="38.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient12725"
+       x1="7"
+       y1="22"
+       x2="20"
+       y2="42"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.5,0)" />
+    <linearGradient
+       y2="138.74609"
+       x2="275.04742"
+       y1="114.68603"
+       x1="256.53931"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-43.966523)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4579-6"
+       xlink:href="#linearGradient12727"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient6239-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2499988,2.6914149e-7,-3.7017555e-5,1.2499998,46.037033,-14.94106)"
+       cx="307.17429"
+       cy="122.3528"
+       fx="307.17429"
+       fy="122.3528"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient6909"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81250011,2.705083e-7,-1.0362556e-5,0.81249999,179.72209,38.960485)"
+       cx="305.57431"
+       cy="121.2793"
+       fx="305.57431"
+       fy="121.2793"
+       r="8" />
+    <filter
+       inkscape:collect="always"
+       id="filter6939"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.25"
+         id="feGaussianBlur6941" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient6949"
+       x1="428"
+       y1="130"
+       x2="428"
+       y2="142"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7021"
+       x1="436"
+       y1="141.5"
+       x2="434.5"
+       y2="143"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient7031"
+       x1="439"
+       y1="147"
+       x2="440.5"
+       y2="145.5"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter6939-7">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.25"
+         id="feGaussianBlur6941-6" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient7343"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.187501,-1.6295412e-6,-2.9877675e-5,1.1874996,65.233889,-7.2933991)"
+       cx="306.7532"
+       cy="121.93175"
+       fx="306.7532"
+       fy="121.93175"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient7345"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.62499953,-5.6609882e-6,1.0674382e-6,0.62499998,237.01608,61.586783)"
+       cx="305.57431"
+       cy="120.66392"
+       fx="305.57431"
+       fy="120.66392"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient7347"
+       gradientUnits="userSpaceOnUse"
+       x1="428"
+       y1="131.5"
+       x2="428"
+       y2="141" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.375,-583,-168.75)"
+       spreadMethod="reflect"
+       x1="435"
+       y1="140.5"
+       x2="433.5"
+       y2="142" />
+    <filter
+       inkscape:collect="always"
+       id="filter7597"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.06734375"
+         id="feGaussianBlur7599" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7601"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.04953125"
+         id="feGaussianBlur7603" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7605"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.036484375"
+         id="feGaussianBlur7607" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7637"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.049765625"
+         id="feGaussianBlur7639" />
+    </filter>
+    <linearGradient
+       id="SG_GRAYBLUE_1">
+      <stop
+         style="stop-color:#b7c6d9;stop-opacity:1;"
+         offset="0"
+         id="stop27541" />
+      <stop
+         id="stop27597"
+         offset="0.5"
+         style="stop-color:#788596;stop-opacity:1;" />
+      <stop
+         style="stop-color:#6e7c8d;stop-opacity:1"
+         offset="0.75"
+         id="stop27599" />
+      <stop
+         style="stop-color:#576270;stop-opacity:1;"
+         offset="1"
+         id="stop27543" />
+    </linearGradient>
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(1.3485296,-0.49945544,0.71020217,1.917546,-18.401107,-24.70469)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient27672-0-6"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17273-5-9-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-96)"
+       x1="5"
+       y1="53.5"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       y2="49.5"
+       x2="3.5"
+       y1="53.5"
+       x1="5"
+       gradientTransform="translate(24,-92)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8168"
+       xlink:href="#SG_BLACK_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="linearGradient9026"
+       x1="140"
+       y1="1.5000005"
+       x2="144"
+       y2="9.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.3750001,-187,16.874931)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient9036"
+       x1="135.5"
+       y1="5.5"
+       x2="141"
+       y2="11.5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97227182,-0.97227189,0.97227183,0.97227189,-128.7885,145.97857)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAYBLUE_1"
+       id="radialGradient9078"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6970592,-0.99891088,1.4204043,3.835092,-37.48962,-80.721911)"
+       cx="1.193305"
+       cy="25.579895"
+       fx="1.193305"
+       fy="25.579895"
+       r="4.8401699" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient9080"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.97227182,-0.97227189,0.97227183,0.97227189,-121.9135,139.10357)"
+       x1="135.5"
+       y1="5.5"
+       x2="141"
+       y2="11.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="linearGradient9082"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.3750001,-182.875,14.124931)"
+       x1="139.5"
+       y1="0.5000006"
+       x2="145"
+       y2="11.500001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17273-5-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-96)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17275-4-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-90)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientTransform="matrix(0.75642455,0,0,0.75644071,-193.35263,-74.853187)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15034"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient4616"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.9163711e-6,1.4006421,-1.4006413,-1.91637e-6,419.86161,-520.937)"
+       cx="388.28625"
+       cy="22.095467"
+       fx="388.28625"
+       fy="22.095467"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient4618"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-62.61883,-54.437669)"
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient4620"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-62.61883,-54.437669)"
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient4632"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient4634"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-63.937669)"
+       cx="312.85141"
+       cy="125.12522"
+       fx="312.85141"
+       fy="125.12522"
+       r="9.7730999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient4636"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.64285734,0,0,0.64285734,-204.61883,-66.437669)"
+       cx="316.77731"
+       cy="140.0264"
+       r="6.6429" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient5544"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,129,-3.6)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5546"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,129,-3.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5548"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,135.5,-16.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient5550"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,136.5,-18.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       r="6.25"
+       fy="16.9375"
+       fx="14.5"
+       cy="16.9375"
+       cx="14.5"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,1.3720416,-9.2535714)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5830-8"
+       xlink:href="#SG_BEIGE_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5768-7-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,1.3720416,-9.2535714)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5772-7-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,7.3176838,-21.144851)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient5780-2-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,8.2323985,-22.974279)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient4802"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.9163711e-6,1.4006421,-1.4006413,-1.91637e-6,419.86161,-520.937)"
+       cx="388.28625"
+       cy="22.095467"
+       fx="388.28625"
+       fy="22.095467"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient4808"
+       gradientUnits="userSpaceOnUse"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4810"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(12.999985,6.4764499e-7,1.1255326e-4,12.999995,-116.93943,-274.82308)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4812"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0833334,-1.9332332e-4,2.1121831e-7,1.0833333,131.78754,67.07337)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4814"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(9.1923771,9.192378,-9.192305,9.1924642,170.99489,-371.31187)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4816"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76616909,0.76589569,-0.76603217,0.76603247,105.11412,46.321959)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient4824"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69230752,0,0,0.69230769,4.7692332,7.5384616)"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4826"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.9999777,2.5479791e-5,1.2081937e-5,8.9999873,-36.802459,-182.72395)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4828"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74999909,-6.417072e-5,9.3211965e-8,0.74999955,135.39138,53.9731)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4830"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.3639272,6.3639633,-6.3639435,6.3639606,162.53637,-249.52255)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4832"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53037482,0.53028407,-0.5303297,0.53032983,116.92571,39.606969)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6506-5-38-90"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-20.914339)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6580-6-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-14.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       r="7.4499998"
+       fy="20.999998"
+       fx="387.83865"
+       cy="20.999998"
+       cx="387.83865"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4880"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6580-6-9-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.9463116,1.8134622e-6,-1.8134594e-6,1.9463089,-617.35473,-16.721024)"
+       cx="387.83859"
+       cy="26.830439"
+       fx="387.83859"
+       fy="26.830439"
+       r="7.4499998" />
+    <radialGradient
+       r="7.4499998"
+       fy="25.210873"
+       fx="387.83859"
+       cy="25.210873"
+       cx="387.83859"
+       gradientTransform="matrix(2.2147699,-1.8599131e-7,1.8599131e-7,2.2147649,-721.47326,-30.336085)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5737"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient5810"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient5819"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-15.571,-110.141)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient5821"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient5829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-14.821826,-110.852)"
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954" />
+    <radialGradient
+       r="7.4499998"
+       fy="20.999998"
+       fx="387.83865"
+       cy="20.999998"
+       cx="387.83865"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4880-4"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6506-5-38-90-9"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-20.914339)" />
+    <radialGradient
+       r="7.4499998"
+       fy="26.182608"
+       fx="387.83862"
+       cy="26.182608"
+       cx="387.83862"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-14.914339)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5870"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6033"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6035"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1250611,-6.2898075e-6,6.2897922e-6,2.1250559,-958.40609,80.301311)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1250611,-6.2898075e-6,6.2897922e-6,2.1250559,-958.40609,87.184644)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient4723"
+       gradientUnits="userSpaceOnUse"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4725"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(12.999985,6.4764499e-7,1.1255326e-4,12.999995,-116.93943,-274.82308)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4727"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0833334,-1.9332332e-4,2.1121831e-7,1.0833333,131.78754,67.07337)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4729"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(9.1923771,9.192378,-9.192305,9.1924642,170.99489,-371.31187)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4731"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76616909,0.76589569,-0.76603217,0.76603247,105.11412,46.321959)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient4739"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69230752,0,0,0.69230769,4.7692332,7.5384616)"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4741"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.9999777,2.5479791e-5,1.2081937e-5,8.9999873,-36.802459,-182.72395)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4743"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74999909,-6.417072e-5,9.3211965e-8,0.74999955,135.39138,53.9731)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4745"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.3639272,6.3639633,-6.3639435,6.3639606,162.53637,-249.52255)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient4747"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53037482,0.53028407,-0.5303297,0.53032983,116.92571,39.606969)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(1.9614976,-0.72648059,1.0330213,2.7891576,100.73482,-41.979513)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4766"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17273-5-5-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-96)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17275-4-2-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-90)"
+       x1="5.5"
+       y1="55"
+       x2="3.5"
+       y2="49.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient17273-5-9-1-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(24,-96)"
+       x1="5"
+       y1="53.5"
+       x2="3.5"
+       y2="49.5" />
+    <radialGradient
+       r="4.8401699"
+       fy="25.579895"
+       fx="1.193305"
+       cy="25.579895"
+       cx="1.193305"
+       gradientTransform="matrix(1.3501642,-0.50006083,0.71106304,1.9198702,-18.423415,-24.773352)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient27672-0-6-1"
+       xlink:href="#SG_GRAYBLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="49.5"
+       x2="3.5"
+       y1="53.5"
+       x1="5"
+       gradientTransform="translate(24,-92)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5720"
+       xlink:href="#SG_BLACK_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient8564-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8120835,-8.8602878e-7,8.8602731e-7,1.8120805,-314.79603,-17.053344)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient8566-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-21.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       r="7.4499998"
+       fy="26.182608"
+       fx="387.83862"
+       cy="26.182608"
+       cx="387.83862"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-13.914339)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8762"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="matrix(0.78571426,0,0,0.78571426,8.95536,-69.68264)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8940"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="135.14151"
+       x2="171.87497"
+       y1="127.50515"
+       x1="166.14769"
+       gradientTransform="matrix(1.0816667,0,0,1.0816667,-168.7031,-117.61975)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient8974"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient8564-8-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient8566-2-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-20.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       r="7.4499998"
+       fy="26.182608"
+       fx="387.83862"
+       cy="26.182608"
+       cx="387.83862"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-14.914339)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9032"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient9239"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8120835,-8.8602878e-7,8.8602731e-7,1.8120805,-314.79603,-17.053344)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9241"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-21.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9243"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-13.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient9247"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9249"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-20.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9251"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-14.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient9263"
+       x1="415"
+       y1="28.5"
+       x2="415"
+       y2="37.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient9273"
+       x1="412"
+       y1="6.5"
+       x2="412"
+       y2="13.5"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient9527"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8120835,-8.8602878e-7,8.8602731e-7,1.8120805,-314.79603,-17.053344)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9529"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-21.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9531"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-13.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient9535"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9537"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-20.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9539"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-14.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient9543"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.8120835,-8.8602878e-7,8.8602731e-7,1.8120805,-314.79603,-17.053344)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9545"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-21.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9547"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-13.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient9551"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9553"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-20.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient9555"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-14.914339)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientTransform="matrix(0.75642455,0,0,0.75644071,-59.35263,-66.85319)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9683"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient9769"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.75895951,0,0,0.75897572,-187.98059,-75.211308)"
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient9776-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.55130228,0,0,0.55131406,-2.54764,-38.877452)"
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9647-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.5)"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient9649-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       cx="10.5"
+       cy="20.375"
+       fx="10.5"
+       fy="20.375"
+       r="6.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient9651-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-0.5)"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient9799-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.7589595,0,0,0.75897574,-185.91554,-76.587968)"
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient9944-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       cx="10.5"
+       cy="20.375"
+       fx="10.5"
+       fy="20.375"
+       r="6.25" />
+    <linearGradient
+       y2="19.5"
+       x2="19.5"
+       y1="14"
+       x1="14"
+       gradientTransform="translate(-0.49999999,0.49999999)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9982"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7510"
+       id="linearGradient12144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)"
+       x1="3.5"
+       y1="-17"
+       x2="13"
+       y2="-22" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient12146"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)"
+       x1="3.5"
+       y1="-13"
+       x2="14.5"
+       y2="-15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7510"
+       id="linearGradient12150"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-5.4882841,10.534129)"
+       x1="6.0000067"
+       y1="-20.5"
+       x2="12.000007"
+       y2="-22.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient12152"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-4.1162155,3.6737855)"
+       x1="4.5000067"
+       y1="-13"
+       x2="11.000007"
+       y2="-14" />
+    <radialGradient
+       r="7.4499998"
+       fy="20.999998"
+       fx="387.83865"
+       cy="20.999998"
+       cx="387.83865"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4880-4-8"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6506-5-38-90-9-2"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-20.914339)" />
+    <radialGradient
+       r="7.4499998"
+       fy="26.182608"
+       fx="387.83862"
+       cy="26.182608"
+       cx="387.83862"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-616.17861,-14.914339)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12195"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6033-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient6035-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1250611,-6.2898075e-6,6.2897922e-6,2.1250559,-958.40609,80.301311)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       r="7.4499998"
+       fy="26.182608"
+       fx="387.83862"
+       cy="26.182608"
+       cx="387.83862"
+       gradientTransform="matrix(2.1250611,-6.2898075e-6,6.2897922e-6,2.1250559,-958.40609,87.184644)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient12797"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient5989"
+       gradientUnits="userSpaceOnUse"
+       cx="8"
+       cy="24"
+       fx="8"
+       fy="24"
+       r="9.7730999"
+       gradientTransform="matrix(1.6883077,1.9233166e-8,-1.9233166e-8,1.6883077,-5.5064613,-16.519385)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="radialGradient5995"
+       gradientUnits="userSpaceOnUse"
+       cx="4.5"
+       cy="5"
+       fx="4.5"
+       fy="5"
+       r="9.7730999"
+       gradientTransform="matrix(1.3813427,-1.5348209e-8,1.5348209e-8,1.3813427,-1.7160422,-1.9067133)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5134-5-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.1950544,-118.19845,-61.58818)"
+       cx="127.1339"
+       cy="74.13665"
+       fx="127.1339"
+       fy="74.13665"
+       r="8.4942093" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient6147"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.1950544,-429.69845,-69.58818)"
+       cx="443.69846"
+       cy="69.108299"
+       fx="443.69846"
+       fy="69.108299"
+       r="8.4942093" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6149"
+       id="linearGradient6925"
+       x1="6"
+       y1="28"
+       x2="9"
+       y2="22"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6927"
+       id="linearGradient6933"
+       x1="6"
+       y1="28"
+       x2="9"
+       y2="22"
+       gradientUnits="userSpaceOnUse" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8767-40">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8769-5"
+         width="22"
+         height="22"
+         x="0"
+         y="10" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8761-9">
+      <rect
+         width="19"
+         height="19"
+         x="1.5"
+         y="11.5"
+         id="rect8763-4"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8401-6);enable-background:accumulate" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter8401-6"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.57"
+         id="feGaussianBlur8403-9" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8997-5">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8999-6"
+         width="22"
+         height="22.000002"
+         x="0"
+         y="10" />
+    </clipPath>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask8991-6">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8951-0);enable-background:accumulate"
+         id="rect8993-4"
+         width="14"
+         height="14"
+         x="289"
+         y="1"
+         transform="matrix(1.375,0,0,1.3750001,-396,10)" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter8951-0"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.42"
+         id="feGaussianBlur8953-0" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient5134-5-2-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93575166,0,0,1.1182741,-108.79882,-56.166658)"
+       cx="127.1339"
+       cy="74.13665"
+       fx="127.1339"
+       fy="74.13665"
+       r="8.4942093" />
+    <radialGradient
+       r="8.4942093"
+       fy="69.108299"
+       fx="443.69846"
+       cy="69.108299"
+       cx="443.69846"
+       gradientTransform="matrix(0.93575166,0,0,1.1182741,-400.28549,-63.652668)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7245"
+       xlink:href="#SG_BEIGE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6149"
+       id="linearGradient7284"
+       x1="6.8603435"
+       y1="26.511728"
+       x2="9.6044807"
+       y2="21.023453"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6927"
+       id="linearGradient7292"
+       x1="6.8603435"
+       y1="26.511728"
+       x2="9.6044807"
+       y2="21.023453"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="163.07053"
+       x2="289.32513"
+       y1="125.39408"
+       x1="262.22394"
+       gradientTransform="matrix(0.75642455,0,0,0.75644071,-190.85263,-77.35319)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9898"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="149.85072"
+       x2="281.39307"
+       y1="126.71606"
+       x1="262.88495"
+       gradientTransform="matrix(0.75642455,0,0,0.75644071,-193.85263,-74.35319)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9935"
+       xlink:href="#SG_GRAY_2"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8"
+       fy="82.25"
+       fx="6.25"
+       cy="82.25"
+       cx="6.25"
+       gradientTransform="matrix(1.375,0,0,1.375,-2.34375,-30.84375)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient9992"
+       xlink:href="#radialGradient6215"
+       inkscape:collect="always" />
+    <radialGradient
+       r="8"
+       fy="82.977272"
+       fx="7.340909"
+       cy="82.977272"
+       cx="7.340909"
+       gradientTransform="matrix(1.375,0,0,1.375,-2.34375,-30.84375)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient10205"
+       xlink:href="#radialGradient6215"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="131.187"
+       x2="169.375"
+       y1="125.187"
+       x1="163.375"
+       gradientTransform="translate(-157.375,-105.687)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5032"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="128.187"
+       x2="168.875"
+       y1="134.687"
+       x1="161.375"
+       gradientTransform="matrix(1,0,0,-1,-157.375,153.687)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5066"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient10123"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,-4,-12.6)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient10125"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,-4,-12.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient10127"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,2.5,-25.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient10129"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,3.5,-27.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient10133"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,-2.7441643,-9.2535714)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient10135"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,-2.7441643,-9.2535714)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient10137"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,3.201478,-21.144851)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient10139"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,4.1161927,-22.974279)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6275-3"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="38.5"
+       y1="144"
+       x2="44.5"
+       y2="144" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient6277-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4117649,1.5628248e-6,-7.3544693e-7,0.75000007,-15.889173,35.24993)"
+       cx="38.588234"
+       cy="147"
+       fx="38.588234"
+       fy="147"
+       r="4" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter6241-6"
+       x="-0.081490032"
+       width="1.1629801"
+       y="-0.1227144"
+       height="1.2454288">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.255655"
+         id="feGaussianBlur6243-8" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6598"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="38.5"
+       y1="133"
+       x2="43.5"
+       y2="133"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,82.448114,-105.76666)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6601"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="39"
+       y1="138"
+       x2="43"
+       y2="138"
+       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,82.448114,-105.76666)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient6607"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.9000641,1.9625644,-0.20856163,-0.20191974,52.374403,38.197035)"
+       cx="7.9272237"
+       cy="141.356"
+       fx="7.9272237"
+       fy="141.356"
+       r="2.75" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter6241-6-4"
+       x="-0.081490032"
+       width="1.1629801"
+       y="-0.1227144"
+       height="1.2454288">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.255655"
+         id="feGaussianBlur6243-8-1" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6789"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.72911398,0.72911398,-0.72911398,0.72911398,84.509797,-110.4959)"
+       spreadMethod="reflect"
+       x1="38.5"
+       y1="133"
+       x2="43.5"
+       y2="133" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6792"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.729114,0.729114,-0.729114,0.729114,84.509797,-110.4959)"
+       spreadMethod="reflect"
+       x1="39"
+       y1="138"
+       x2="43"
+       y2="138" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient6798"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.9591996,2.0236451,-0.21505267,-0.20820407,53.500109,37.948363)"
+       cx="7.9272237"
+       cy="141.356"
+       fx="7.9272237"
+       fy="141.356"
+       r="2.75" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient7308"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="38.5"
+       y1="144"
+       x2="44.5"
+       y2="144" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="radialGradient7310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4117649,1.5628248e-6,-7.3544693e-7,0.75000007,-15.889173,35.24993)"
+       cx="38.588234"
+       cy="147"
+       fx="38.588234"
+       fy="147"
+       r="4" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-589.1786,-20.91433)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5877"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-589.1786,-14.91433)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5881"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5883"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1224884,-6.282193e-6,6.2821773e-6,2.1224833,-814.2457,-36.632211)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5885"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.1224884,-6.282193e-6,6.2821773e-6,2.1224833,-814.2457,-29.757211)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="translate(-155.375,-109.687)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6955"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="135.24879"
+       x2="171.19769"
+       y1="126.4995"
+       x1="164.6982"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-169.18638,-120.18863)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6989"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient7020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-163.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient7022"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-176.06138,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient7036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-163.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient7038"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-176.06138,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       y2="138.74609"
+       x2="275.84064"
+       y1="114.95043"
+       x1="256.80371"
+       gradientTransform="matrix(0.57782392,0,0,0.57783626,-140.82482,-49.547522)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7055"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.74609"
+       x2="275.04742"
+       y1="114.68603"
+       x1="256.53931"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-133.10894,-43.96652)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7055-6"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="139.50322"
+       x2="275.88873"
+       y1="114.77016"
+       x1="255.86629"
+       gradientTransform="matrix(0.58372013,0,0,0.58373261,-142.4793,-50.120079)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7107"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="138.74609"
+       x2="275.04742"
+       y1="114.68603"
+       x1="256.53931"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-133.10894,-43.96652)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7107-0"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.25"
+       fy="20.375"
+       fx="10.5"
+       cy="20.375"
+       cx="10.5"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6875-5-2"
+       xlink:href="#SG_BEIGE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6854-6-1"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5"
+       gradientTransform="translate(-0.49999999,0.49999999)" />
+    <linearGradient
+       y2="134.90199"
+       x2="269.3223"
+       y1="120.6782"
+       x1="258.14651"
+       gradientTransform="matrix(0.7564246,0,0,0.75644077,-185.2946,-76.225282)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7214"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7510"
+       id="linearGradient5179"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)"
+       x1="3.5"
+       y1="-17"
+       x2="13"
+       y2="-22" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient5181"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,-1)"
+       x1="3.5"
+       y1="-13"
+       x2="14.5"
+       y2="-15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7510"
+       id="linearGradient5189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-2.7441469,11.906197)"
+       x1="6.0000067"
+       y1="-20.5"
+       x2="12.000007"
+       y2="-22.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7528"
+       id="linearGradient5191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3720687,0,0,1.3720687,-1.3720783,5.0458541)"
+       x1="4.5000067"
+       y1="-13"
+       x2="11.000007"
+       y2="-14" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8997-0-8">
+      <rect
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8999-1-5"
+         width="22"
+         height="22.000002"
+         x="0"
+         y="10" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter8951-2-5-8"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.42"
+         id="feGaussianBlur8953-9-3-0" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6231">
+      <rect
+         y="5.8750019"
+         x="2.9775393e-07"
+         height="22.000002"
+         width="22"
+         id="rect6233"
+         style="color:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter6244"
+       x="-0.12"
+       width="1.24"
+       y="-0.12"
+       height="1.24"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.65"
+         id="feGaussianBlur6246" />
+    </filter>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask6248">
+      <rect
+         y="17.5"
+         x="6.5"
+         height="13"
+         width="13"
+         id="rect6250"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6244);enable-background:accumulate"
+         transform="matrix(1.375,0,0,1.3750001,-6.875,-11.999997)" />
+    </mask>
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask6253">
+      <rect
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8951-2-5-8);enable-background:accumulate"
+         id="rect6255"
+         width="12.000026"
+         height="11.999997"
+         x="290.99997"
+         y="3.0000029"
+         transform="matrix(1.375,0,0,1.3750001,-395.99997,5.8749991)" />
+    </mask>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7333"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="436"
+       y1="141.5"
+       x2="434.5"
+       y2="143" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient7335"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2499988,2.6914149e-7,-3.7017555e-5,1.2499998,46.037033,-14.94106)"
+       cx="307.17429"
+       cy="122.3528"
+       fx="307.17429"
+       fy="122.3528"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient7337"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.81250011,2.705083e-7,-1.0362556e-5,0.81249999,179.72209,38.960485)"
+       cx="305.57431"
+       cy="121.2793"
+       fx="305.57431"
+       fy="121.2793"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient7339"
+       gradientUnits="userSpaceOnUse"
+       x1="428"
+       y1="130"
+       x2="428"
+       y2="142" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLACK_1"
+       id="linearGradient7341"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       x1="439"
+       y1="147"
+       x2="440.5"
+       y2="145.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7343"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.375,0,0,1.375,-583,-168.75)"
+       spreadMethod="reflect"
+       x1="435"
+       y1="140.5"
+       x2="433.5"
+       y2="142" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6847"
+       id="radialGradient7346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.187501,-1.6295412e-6,-2.9877675e-5,1.1874996,65.233889,-7.2933991)"
+       cx="306.7532"
+       cy="121.93175"
+       fx="306.7532"
+       fy="121.93175"
+       r="8" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#radialGradient6911"
+       id="radialGradient7348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.62499953,-5.6609882e-6,1.0674382e-6,0.62499998,237.01608,61.586783)"
+       cx="305.57431"
+       cy="120.66392"
+       fx="305.57431"
+       fy="120.66392"
+       r="8" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6943"
+       id="linearGradient7350"
+       gradientUnits="userSpaceOnUse"
+       x1="428"
+       y1="131.5"
+       x2="428"
+       y2="141" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient7374"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-150.875,-108.687)"
+       x1="162.875"
+       y1="121.687"
+       x2="170.375"
+       y2="132.187" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7612"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-438.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7614"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-443.31194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7616"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-447.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7618"
+       gradientUnits="userSpaceOnUse"
+       x1="-33.5"
+       y1="155"
+       x2="-27.5"
+       y2="159" />
+    <linearGradient
+       y2="129.687"
+       x2="168.875"
+       y1="121.687"
+       x1="162.875"
+       gradientTransform="matrix(1.3766667,0,0,1.3766667,-212.52292,-154.79579)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7635"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4310"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-436.81196)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4306"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-440.81195)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-444.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7715"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4310-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-436.81196)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4306-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-440.81195)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient4302-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.93741,-444.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.54167"
+       x2="-29.5"
+       y2="155.54167" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7851"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7612-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-438.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7614-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-443.31194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient7616-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9999963,0,0,2.9999963,108.9374,-447.81194)"
+       spreadMethod="reflect"
+       x1="-32.5"
+       y1="155.4375"
+       x2="-29.500002"
+       y2="155.4375" />
+    <linearGradient
+       y2="159"
+       x2="-27.5"
+       y1="155"
+       x1="-33.5"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7987"
+       xlink:href="#SG_GRAY_1"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient10133-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,1.3720416,-9.2535714)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient10135-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,1.3720416,-9.2535714)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient10137-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,7.3176838,-21.144851)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient10139-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,8.2323985,-22.974279)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6354"
+       id="linearGradient6334"
+       x1="470.99997"
+       y1="-34"
+       x2="473.49997"
+       y2="-29.5"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient6346"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,6.5,-27.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient6348"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,5.5,-25.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient6350"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,-1,-12.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient6352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,-1,-12.6)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <linearGradient
+       y2="-29.5"
+       x2="473.49997"
+       y1="-34"
+       x1="470.99997"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6381"
+       xlink:href="#linearGradient6354"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient5420"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,-1,-12.6)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5422"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,-1,-12.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5424"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,5.5,-25.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient5427"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,6.5,-27.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient5431"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,1.3720416,-9.2535714)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5433"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,1.3720416,-9.2535714)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient5435"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,7.3176838,-21.144851)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient5437"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91471381,0,0,1.4635421,8.2323985,-22.974279)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient5379"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-156.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient6151"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-156.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient6166"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-169.18638,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_2"
+       id="linearGradient6171"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-169.18638,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="linearGradient6257"
+       x1="464.5"
+       y1="246.5"
+       x2="470.5"
+       y2="260.5"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="linearGradient6316"
+       x1="461"
+       y1="228.5"
+       x2="464.5"
+       y2="238"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6330"
+       gradientUnits="userSpaceOnUse"
+       x1="464.5"
+       y1="246.5"
+       x2="470.5"
+       y2="260.5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6332"
+       gradientUnits="userSpaceOnUse"
+       x1="461"
+       y1="228.5"
+       x2="464.5"
+       y2="238" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient6304"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-255.81149,246.09219)"
+       x1="351.01041"
+       y1="24.196699"
+       x2="348.18198"
+       y2="34.096195" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="linearGradient6304-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-255.81149,246.09219)"
+       x1="349.69446"
+       y1="28.26795"
+       x2="347.2435"
+       y2="35.513142" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient7909"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-158.375,-109.687)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GREEN_1"
+       id="linearGradient7911"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0803571,0,0,1.0803571,-171.93638,-120.18863)"
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879" />
+    <radialGradient
+       r="7.4499998"
+       fy="21.647825"
+       fx="388.48648"
+       cy="21.647825"
+       cx="388.48648"
+       gradientTransform="matrix(1.4093996,-4.1022438e-7,4.1022339e-7,1.4093959,-158.53268,-8.5101969)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient7929"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.4499998"
+       fy="21.647825"
+       fx="388.16254"
+       cy="21.647825"
+       cx="388.16254"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient8734"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+  </defs>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/filter-show.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#filter-show"
+     id="22_filter-show"
+     transform="translate(0,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5834"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6247);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5.40625,81.59375 C 5.7935415,79.387036 4.5763221,77.125601 1,75.5 M 2.5625,86.125 C 0.2931475,89.405359 1.7366554,93.157855 8,94.5"
+       transform="translate(0,-64)"
+       id="path6437-9"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6251);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.6875,93.375 c 0.9005127,0.46582 2,0.84375 3.3125,1.125 M 8.46875,80.53125 C 8.3411813,78.676281 7.0069616,76.866801 4,75.5"
+       transform="translate(0,-64)"
+       id="path6190"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6196);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7,11.5 C 12.5,14 12.5,18 9.5,21 6,24.5 7,29 14,30.5"
+       id="path6194"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path6198"
+       d="M 10,11.5 C 15.5,14 15.5,18 12.5,21 9,24.5 10,29 17,30.5"
+       style="fill:none;stroke:url(#linearGradient6201);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6256);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,75.5 c 5.5,2.5 5.5,6.5 2.5,9.5 -0.0821,0.0821 -0.141622,0.166852 -0.21875,0.25 m -1.21875,5.8125 c 0.855766,1.496323 2.772937,2.730143 5.84375,3.40625"
+       transform="translate(0,-64)"
+       id="path6254"
+       sodipodi:nodetypes="csccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient6239);fill-opacity:1;stroke:#415564;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6042"
+       sodipodi:cx="9.25"
+       sodipodi:cy="85.25"
+       sodipodi:rx="6.5"
+       sodipodi:ry="6.5"
+       d="m 15.75,85.25 c 0,3.589851 -2.910149,6.5 -6.5,6.5 -3.5898509,0 -6.5,-2.910149 -6.5,-6.5 0,-3.589851 2.9101491,-6.5 6.5,-6.5 3.589851,0 6.5,2.910149 6.5,6.5 z"
+       transform="translate(-0.25,-62.25)" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727268,0,216.72727)"
+     id="16_filter-show"
+     inkscape:label="#filter-show"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/filter-show.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5924"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6278);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.5,64.5 c -1.50000008,2 -2.00000728,5 3.5,6 M 4.46875,61.28125 C 4.7665625,60.065071 4.3110259,58.783904 2,57.5"
+       transform="matrix(1.375,0,0,1.3750001,0,-67.000005)"
+       id="path6459-3"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6301);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5.8125,69.3125 C 6.5205488,69.805262 7.5365531,70.233919 9,70.5 M 7.5625,60.5625 C 7.5272501,59.566096 6.8567478,58.531527 5,57.5"
+       transform="matrix(1.375,0,0,1.3750001,0,-67.000005)"
+       id="path6299"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6305);stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 11,12.0625 c 6.1875,3.437501 2.75,6.875001 0.6875,9.625001 -2.0625,2.75 -2.75,6.875 4.81251,8.25"
+       id="path6303"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6309);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 10.59375,67.6875 C 10.892736,68.885034 12.104112,69.973476 15,70.5 m -4,-13 c 4.5,2.500001 2,5 0.5,7"
+       transform="matrix(1.375,0,0,1.3750001,0,-67.000005)"
+       id="path6307"
+       sodipodi:nodetypes="cccs"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient6334);fill-opacity:1;stroke:#415564;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6042-9"
+       sodipodi:cx="9.25"
+       sodipodi:cy="85.25"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5000019"
+       d="m 13.75,85.25 c 0,2.485282 -2.014719,4.500002 -4.5,4.500002 -2.4852814,0 -4.5,-2.01472 -4.5,-4.500002 0,-2.485282 2.0147186,-4.500002 4.5,-4.500002 2.485281,0 4.5,2.01472 4.5,4.500002 z"
+       transform="matrix(1.375,0,0,1.3750001,-3.09375,-94.843755)" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/mask-show-filtering.png"
+     inkscape:label="#mask-show-filtering"
+     id="22_mask-show-filtering"
+     transform="translate(24,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6045"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient9992);fill-opacity:1;stroke:#415564;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6042-3"
+       sodipodi:cx="9.25"
+       sodipodi:cy="85.25"
+       sodipodi:rx="6.5"
+       sodipodi:ry="6.5"
+       d="m 15.75,85.25 c 0,3.589851 -2.910149,6.5 -6.5,6.5 -3.5898509,0 -6.5,-2.910149 -6.5,-6.5 0,-3.589851 2.9101491,-6.5 6.5,-6.5 3.589851,0 6.5,2.910149 6.5,6.5 z"
+       transform="translate(4.75,-61.25)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#f3f3f1;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6043"
+       d="M 8.6201229,20.30753 C 8.2193033,19.56853 7.4196632,19.087093 6.5789453,19.088266 4.9513724,19.065659 3.2009841,20.396225 3.2630619,22.121503 3.8221535,22.638197 4.6434627,22.757802 5.3664204,22.593699 6.6738573,22.27395 7.9091912,21.462502 8.6201229,20.30753 z M 11.8218,18.457263 c 1.354739,-0.0388 2.674467,-0.703927 3.604831,-1.677415 0.503459,-0.544651 0.810631,-1.316411 0.643137,-2.059412 -1.461661,-0.916451 -3.48805,-0.0644 -4.282278,1.357782 -0.421374,0.728198 -0.404659,1.662092 0.0343,2.379045 z M 2.5369379,23.823038 C 1.9160089,22.267488 1.3274165,20.598169 1.509126,18.898719 1.5714556,18.164781 2.0808367,17.55444 2.7602752,17.29929 4.240885,16.564304 5.9207763,16.319831 7.3552531,15.473998 8.7691018,14.75494 9.9900207,13.731007 11.133203,12.643907 c 0.621013,-0.473242 1.237231,-1.088365 2.037049,-1.216991 1.251572,-0.02839 2.256036,0.898356 3.123402,1.690636 0.584345,0.58486 1.164509,1.193887 1.630505,1.875513 0.509793,1.542067 0.888779,3.311723 0.207014,4.860256 -0.597797,1.203048 -2.041159,1.734172 -3.317848,1.729469 -1.146634,-0.0093 -2.414098,-0.615131 -3.452506,0.139341 -1.185355,0.80662 -1.088836,2.459944 -2.0370821,3.459321 C 8.5637366,26.062877 7.3736665,26.734327 6.1853503,26.40156 4.7111307,26.023945 3.512704,24.945342 2.5369402,23.823041 z" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/mask-show-filtering.png"
+     inkscape:label="#mask-show-filtering"
+     id="16_mask-show-filtering"
+     transform="matrix(0.7288265,0,0,0.7288265,24,216.67755)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6051"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient10205);fill-opacity:1;stroke:#415564;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6042-9-6"
+       sodipodi:cx="9.25"
+       sodipodi:cy="85.25"
+       sodipodi:rx="4.5"
+       sodipodi:ry="4.5000019"
+       d="m 13.75,85.25 c 0,2.485282 -2.014719,4.500002 -4.5,4.500002 -2.4852814,0 -4.5,-2.01472 -4.5,-4.500002 0,-2.485282 2.0147186,-4.500002 4.5,-4.500002 2.485281,0 4.5,2.01472 4.5,4.500002 z"
+       transform="matrix(1.3720687,0,0,1.3720687,2.4008501,-91.8292)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#f3f3f1;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6053"
+       d="M 9.3061572,20.993564 C 8.9053376,20.254564 8.1056975,19.773127 7.2649796,19.7743 5.6374067,19.75169 3.8870184,21.082259 3.9490962,22.807537 c 0.5590916,0.516694 1.3804008,0.636299 2.1033585,0.472196 1.3074369,-0.319749 2.5427708,-1.131197 3.2537025,-2.286169 z m 3.2016768,-1.850267 c 1.354739,-0.0388 2.674467,-0.703927 3.604831,-1.677415 0.503459,-0.544651 0.810631,-1.316411 0.643137,-2.059412 -1.461661,-0.916451 -3.48805,-0.0644 -4.282278,1.357782 -0.421374,0.728198 -0.404659,1.662092 0.0343,2.379045 z m -9.2848618,5.365775 c -0.620929,-1.55555 -1.2095214,-3.224869 -1.0278119,-4.924319 0.06233,-0.733938 0.5717107,-1.344279 1.2511492,-1.599429 1.4806098,-0.734986 3.1605011,-0.979459 4.5949779,-1.825292 1.4138487,-0.719058 2.6347676,-1.742991 3.7779496,-2.830091 0.621013,-0.473242 1.237231,-1.088365 2.037049,-1.216991 1.251572,-0.02839 2.256036,0.898356 3.123402,1.690636 0.584345,0.58486 1.164509,1.193887 1.630505,1.875513 0.509793,1.542067 0.888779,3.311723 0.207014,4.860256 -0.597797,1.203048 -2.041159,1.734172 -3.317848,1.729469 -1.146634,-0.0093 -2.414098,-0.615131 -3.452506,0.139341 -1.185355,0.80662 -1.088836,2.459944 -2.037082,3.459321 C 9.2497709,26.748911 8.0597008,27.420361 6.8713846,27.087594 5.397165,26.709979 4.1987383,25.631376 3.2229745,24.509075 z" />
+  </g>
+  <g
+     transform="translate(48,232)"
+     id="22_mask-color"
+     inkscape:label="#mask-color"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/mask-color.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="M 8.6201229,24.30753 C 8.2193033,23.56853 7.4196632,23.087093 6.5789453,23.088266 4.9513724,23.065659 3.2009841,24.396225 3.2630619,26.121503 3.8221535,26.638197 4.6434627,26.757802 5.3664204,26.593699 6.6738573,26.27395 7.9091912,25.462502 8.6201229,24.30753 z M 11.8218,22.457263 c 1.354739,-0.0388 2.674467,-0.703927 3.604831,-1.677415 0.503459,-0.544651 0.810631,-1.316411 0.643137,-2.059412 -1.461661,-0.916451 -3.48805,-0.0644 -4.282278,1.357782 -0.421374,0.728198 -0.404659,1.662092 0.0343,2.379045 z M 2.5369379,27.823038 C 1.9160089,26.267488 1.3274165,24.598169 1.509126,22.898719 1.5714556,22.164781 2.0808367,21.55444 2.7602752,21.29929 4.240885,20.564304 5.9207763,20.319831 7.3552531,19.473998 8.7691018,18.75494 9.9900207,17.731007 11.133203,16.643907 c 0.621013,-0.473242 1.237231,-1.088365 2.037049,-1.216991 1.251572,-0.02839 2.256036,0.898356 3.123402,1.690636 0.584345,0.58486 1.164509,1.193887 1.630505,1.875513 0.509793,1.542067 0.888779,3.311723 0.207014,4.860256 -0.597797,1.203048 -2.041159,1.734172 -3.317848,1.729469 -1.146634,-0.0093 -2.414098,-0.615131 -3.452506,0.139341 -1.185355,0.80662 -1.088836,2.459944 -2.0370821,3.459321 C 8.5637366,30.062877 7.3736665,30.734327 6.1853503,30.40156 4.7111307,30.023945 3.512704,28.945342 2.5369402,27.823041 z"
+       id="path6023"
+       style="color:#000000;fill:url(#linearGradient6925);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient6933);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6025"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="color:#000000;fill:url(#radialGradient6147);fill-opacity:1;fill-rule:nonzero;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 12,27.5 C 12.5,26 19.5,16 19.5,13 c 0,-1 -1,-2 -2,-1 -2,2 -6.5,14 -7.5,15 -1.5,1.5 1,3.5 2,0.5 z"
+       id="path5216-7"
+       sodipodi:nodetypes="cccss"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#radialGradient5134-5-6);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 7.5,30.5 c 1,0 0.5,-1.5 1,-2.5 0.4819,-0.96379 2,-1.5 2.5,-1 0.5,0.5 1,1 0.5,2 -0.5,1 -2.5,2 -4,1.5 z"
+       id="path5146-4"
+       sodipodi:nodetypes="czssc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,48,216.67755)"
+     id="16_mask-color"
+     inkscape:label="#mask-color"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/mask-color.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect6031"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="M 9.3061572,23.7377 C 8.9053376,22.9987 8.1056975,22.517263 7.2649796,22.518436 5.6374067,22.495826 3.8870184,23.826395 3.9490962,25.551673 4.5081878,26.068367 5.329497,26.187972 6.0524547,26.023869 7.3598916,25.70412 8.5952255,24.892672 9.3061572,23.7377 z m 3.2016768,-1.850267 c 1.354739,-0.0388 2.674467,-0.703927 3.604831,-1.677415 0.503459,-0.544651 0.810631,-1.316411 0.643137,-2.059412 -1.461661,-0.916451 -3.48805,-0.0644 -4.282278,1.357782 -0.421374,0.728198 -0.404659,1.662092 0.0343,2.379045 z M 3.2229722,27.253208 C 2.6020432,25.697658 2.0134508,24.028339 2.1951603,22.328889 2.2574903,21.594951 2.766871,20.98461 3.4463095,20.72946 4.9269193,19.994474 6.6068106,19.750001 8.0412874,18.904168 9.4551361,18.18511 10.676055,17.161177 11.819237,16.074077 c 0.621013,-0.473242 1.237231,-1.088365 2.037049,-1.216991 1.251572,-0.02839 2.256036,0.898356 3.123402,1.690636 0.584345,0.58486 1.164509,1.193887 1.630505,1.875513 0.509793,1.542067 0.888779,3.311723 0.207014,4.860256 -0.597797,1.203048 -2.041159,1.734172 -3.317848,1.729469 -1.146634,-0.0093 -2.414098,-0.615131 -3.452506,0.139341 -1.185355,0.80662 -1.088836,2.459944 -2.037082,3.459321 C 9.2497709,29.493047 8.0597008,30.164497 6.8713846,29.83173 5.397165,29.454115 4.1987383,28.375512 3.2229745,27.253211 z"
+       id="path6033"
+       style="color:#000000;fill:url(#linearGradient7284);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7292);stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#radialGradient7245);fill-opacity:1;fill-rule:nonzero;stroke:#4c4c3d;stroke-width:1.23486185;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 13.034653,27.197752 c 0.46787,-1.40362 6.86034,-10.97654 6.86034,-13.72068 0,-1.37207 -2.0581,-2.0581 -2.74414,-0.68604 -1.10619,2.21239 -4.80224,12.34862 -6.174309,13.72069 -1.4036203,1.40363 1.122359,3.49329 2.058109,0.68603 z"
+       id="path5216-6-2"
+       sodipodi:nodetypes="cssss"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#radialGradient5134-5-2-6);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.23486185;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 8.9184444,29.941892 c 0.9357493,0 0.9041893,-1.80838 1.3720696,-2.74414 0.45094,-0.90187 1.43384,-1.07276 2.058099,-0.68603 0.62426,0.38673 1.15391,1.12235 0.68604,2.0581 -0.68604,1.37207 -2.712579,1.83995 -4.1162086,1.37207 z"
+       id="path5146-9-0"
+       sodipodi:nodetypes="czzsc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(88,232)"
+     id="22_track-show"
+     inkscape:label="#track-show"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/track-show.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4705"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g8833">
+      <g
+         id="g7830"
+         mask="url(#mask8761)"
+         clip-path="url(#clipPath8767)">
+        <rect
+           y="18.5"
+           x="10.5"
+           height="2"
+           width="3"
+           id="rect7657"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7705"
+           width="3"
+           height="2"
+           x="12.5"
+           y="16.5" />
+        <rect
+           y="14.5"
+           x="14.5"
+           height="2"
+           width="3"
+           id="rect7707"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7709"
+           width="3"
+           height="2"
+           x="16.5"
+           y="12.5" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7711"
+           width="2"
+           height="3"
+           x="13.5"
+           y="18.5" />
+        <rect
+           y="16.5"
+           x="15.5"
+           height="3"
+           width="2"
+           id="rect7713"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7715"
+           width="2"
+           height="3"
+           x="17.5"
+           y="14.5" />
+        <path
+           id="path7717"
+           d="m 10.5,18.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.5,16.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7764"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7766"
+           d="m 14.5,14.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 17.5,19.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7768"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7770"
+           d="m 19.5,17.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7772"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="12.5"
+           x="19.5"
+           height="3"
+           width="2"
+           id="rect7774"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7776"
+           width="3"
+           height="2"
+           x="8.5"
+           y="20.5" />
+        <rect
+           y="20.5"
+           x="11.5"
+           height="3"
+           width="2"
+           id="rect7778"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,20.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7780"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7782"
+           d="m 15.5,21.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="22.5"
+           x="6.5"
+           height="2"
+           width="3"
+           id="rect7784"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7786"
+           width="2"
+           height="3"
+           x="9.5"
+           y="22.5" />
+        <path
+           id="path7788"
+           d="m 6.5,22.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.5,23.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7790"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7792"
+           width="3"
+           height="2"
+           x="4.5"
+           y="24.5" />
+        <rect
+           y="24.5"
+           x="7.5"
+           height="3"
+           width="2"
+           id="rect7794"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 4.5,24.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7796"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7798"
+           d="m 11.5,25.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="26.5"
+           x="2.5"
+           height="2"
+           width="3"
+           id="rect7800"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7802"
+           width="2"
+           height="3"
+           x="5.5"
+           y="26.5" />
+        <path
+           id="path7804"
+           d="m 2.5,26.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 9.5,27.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7806"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 16.5,12.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7808"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="10.5"
+           x="18.5"
+           height="2"
+           width="3"
+           id="rect7810"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 0.5,28.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7812"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7814"
+           width="3"
+           height="2"
+           x="0.5"
+           y="28.5" />
+        <rect
+           y="28.5"
+           x="3.5"
+           height="3"
+           width="2"
+           id="rect7816"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path7818"
+           d="m 7.5,29.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7820"
+           width="2"
+           height="3"
+           x="1.5"
+           y="30.5" />
+        <rect
+           y="30.5"
+           x="-1.5"
+           height="2"
+           width="3"
+           id="rect7822"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.5,31.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7824"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7826"
+           d="m -1.5,30.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7828"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/track-show.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#track-show"
+     id="16_track-show"
+     transform="matrix(0.72727273,0,0,0.72727268,88,216.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4880"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g8955"
+       mask="url(#mask8991)"
+       clip-path="url(#clipPath8997)">
+      <rect
+         y="24.437502"
+         x="4.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect7776-2"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="27.187504"
+         x="6.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect7786-9"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+         id="path7788-1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7790-7"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8867"
+         width="4.125"
+         height="2.7500002"
+         x="2.0625"
+         y="27.187504" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8869"
+         width="2.75"
+         height="4.1250005"
+         x="3.4375"
+         y="29.937504" />
+      <path
+         id="path8871"
+         d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8873"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="29.937504"
+         x="-0.6875"
+         height="2.7500002"
+         width="4.125"
+         id="rect8875"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8877"
+         width="4.125"
+         height="2.7500002"
+         x="7.5625"
+         y="21.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8879"
+         width="2.75"
+         height="4.1250005"
+         x="8.9375"
+         y="24.437502" />
+      <path
+         id="path8881"
+         d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8883"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="18.937502"
+         x="10.3125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8885"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="21.687502"
+         x="11.6875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8887"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8889"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8891"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8893"
+         width="4.125"
+         height="2.7500002"
+         x="13.0625"
+         y="16.187502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8895"
+         width="2.75"
+         height="4.1250005"
+         x="14.4375"
+         y="18.937502" />
+      <path
+         id="path8897"
+         d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8899"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="13.437502"
+         x="15.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8901"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="16.187502"
+         x="17.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8903"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8905"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8907"
+         d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8909"
+         width="4.125"
+         height="2.7500002"
+         x="18.5625"
+         y="10.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8911"
+         width="2.75"
+         height="4.1250005"
+         x="19.9375"
+         y="13.437502" />
+      <path
+         id="path8913"
+         d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8915"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+         id="path8917"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/track-show-boxes.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#track-show-boxes"
+     id="22_track-show-boxes"
+     transform="translate(112,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6368"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <rect
+       style="color:#000000;fill:none;stroke:#72a541;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6133"
+       width="12"
+       height="19"
+       x="4.5"
+       y="11.5" />
+    <g
+       id="g6477"
+       style="opacity:0.5">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6143"
+         d="m 9.5,27.5 0,-4 2,0 0,4"
+         style="fill:none;stroke:#2a4556;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6145"
+         d="m 7.5,22.5 0,-4 6,0 0,4"
+         style="color:#000000;fill:none;stroke:#603b31;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="translate(-311.5,-6.5)"
+         d="m 324,22 c 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 1.10457,0 2,0.895431 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="22"
+         sodipodi:cx="322"
+         id="path6168"
+         style="color:#000000;fill:url(#radialGradient6299-9);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="fill:none;stroke:url(#radialGradient6180-5);stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 9.5,27.5 0,-4 2,0 0,4"
+         id="path6170"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="18"
+         x="8"
+         height="4.5"
+         width="5.5"
+         id="rect6182"
+         style="color:#000000;fill:url(#radialGradient6228-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:url(#radialGradient6240-5);stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 7.5,22.5 0,-4 6,0 0,4"
+         id="path6230"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6242"
+         d="m 8.5,19.5 0,3 4,0 0,-3"
+         style="fill:none;stroke:#603b31;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727268,112,216.72727)"
+     id="16_track-show-boxes"
+     inkscape:label="#track-show-boxes"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/track-show-boxes.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6382"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:none;stroke:#72a541;stroke-width:1.375;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6133-9"
+       width="13.75"
+       height="20.625002"
+       x="3.4375"
+       y="10.6875" />
+    <g
+       transform="matrix(0.98214285,0,0,0.98214292,-0.9821428,-0.01785713)"
+       id="g6477-6"
+       style="opacity:0.5">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6143-4"
+         d="m 10.1,27.699999 0,-4.2 2.8,0 0,4.2"
+         style="fill:none;stroke:#2a4556;stroke-width:3.92000008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6145-6"
+         d="m 8.7,22.099999 0,-3.5 5.6,0 0,3.5"
+         style="color:#000000;fill:none;stroke:#603b31;stroke-width:3.92000008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(1.05,0,0,1.1666662,-326.6,-10.566657)"
+         d="m 324,22 c 0,0.994113 -0.89543,1.800001 -2,1.800001 -1.10457,0 -2,-0.805888 -2,-1.800001 0,-0.994113 0.89543,-1.800001 2,-1.800001 1.10457,0 2,0.805888 2,1.800001 z"
+         sodipodi:ry="1.8000007"
+         sodipodi:rx="2"
+         sodipodi:cy="22"
+         sodipodi:cx="322"
+         id="path6168-7"
+         style="color:#000000;fill:url(#radialGradient6299-9-7);fill-opacity:1;fill-rule:nonzero;stroke:#6e6e58;stroke-width:1.13842022;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="fill:none;stroke:url(#radialGradient6180-5-9);stroke-width:1.53999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 10.1,27.699999 0,-4.2 2.8,0 0,4.2"
+         id="path6170-4"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="18.599998"
+         x="9.3999996"
+         height="3.500001"
+         width="4.2000003"
+         id="rect6182-6"
+         style="color:#000000;fill:url(#radialGradient6228-2-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:url(#radialGradient6240-5-2);stroke-width:1.53999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.7,22.099999 0,-3.5 5.6,0 0,3.5"
+         id="path6230-2"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6242-9"
+         d="m 10.1,19.299999 0,2.8 2.8,0 0,-2.8"
+         style="fill:none;stroke:#603b31;stroke-width:1.25999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/track-color.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#track-color"
+     id="22_track-color"
+     transform="translate(136,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5099"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g8833-6">
+      <g
+         id="g7830-5"
+         mask="url(#mask8761-5)"
+         clip-path="url(#clipPath8767-8)">
+        <rect
+           y="18.5"
+           x="10.5"
+           height="2"
+           width="3"
+           id="rect7657-9"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7705-3"
+           width="3"
+           height="2"
+           x="12.5"
+           y="16.5" />
+        <rect
+           y="14.5"
+           x="14.5"
+           height="2"
+           width="3"
+           id="rect7707-6"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7709-4"
+           width="3"
+           height="2"
+           x="16.5"
+           y="12.5" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7711-5"
+           width="2"
+           height="3"
+           x="13.5"
+           y="18.5" />
+        <rect
+           y="16.5"
+           x="15.5"
+           height="3"
+           width="2"
+           id="rect7713-2"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7715-3"
+           width="2"
+           height="3"
+           x="17.5"
+           y="14.5" />
+        <path
+           id="path7717-2"
+           d="m 10.5,18.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.5,16.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7764-1"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7766-6"
+           d="m 14.5,14.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 17.5,19.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7768-9"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7770-2"
+           d="m 19.5,17.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7772-7"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="12.5"
+           x="19.5"
+           height="3"
+           width="2"
+           id="rect7774-5"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#a6c8da;fill-opacity:1;fill-rule:nonzero;stroke:#545f59;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,20.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7780-0"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7782-7"
+           d="m 15.5,21.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="20.5"
+           x="11.5"
+           height="3"
+           width="2"
+           id="rect7778-8"
+           style="color:#000000;fill:#b5c8ce;fill-opacity:1;fill-rule:nonzero;stroke:#63685a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.988121;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#b5c8ce;fill-opacity:1;fill-rule:nonzero;stroke:#63685a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.988121;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7786-6"
+           width="2"
+           height="3"
+           x="9.5"
+           y="22.5" />
+        <rect
+           style="color:#000000;fill:#a6c8da;fill-opacity:1;fill-rule:nonzero;stroke:#545f59;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7776-0"
+           width="3"
+           height="2"
+           x="8.5"
+           y="20.5" />
+        <rect
+           y="22.5"
+           x="6.5"
+           height="2"
+           width="3"
+           id="rect7784-3"
+           style="color:#000000;fill:#a6c8da;fill-opacity:1;fill-rule:nonzero;stroke:#545f59;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#b5c8ce;fill-opacity:1;fill-rule:nonzero;stroke:#63685a;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.988121;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.5,23.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7790-0"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7788-4"
+           d="m 6.5,22.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#90c4e4;fill-opacity:1;fill-rule:nonzero;stroke:#384e57;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7798-3"
+           d="m 11.5,25.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#a6c8da;fill-opacity:1;fill-rule:nonzero;stroke:#545f59;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7792-8"
+           width="3"
+           height="2"
+           x="4.5"
+           y="24.5" />
+        <rect
+           y="24.5"
+           x="7.5"
+           height="3"
+           width="2"
+           id="rect7794-5"
+           style="color:#000000;fill:#90c4e4;fill-opacity:1;fill-rule:nonzero;stroke:#384e57;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 4.5,24.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7796-5"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="26.5"
+           x="2.5"
+           height="2"
+           width="3"
+           id="rect7800-0"
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7802-5"
+           width="2"
+           height="3"
+           x="5.5"
+           y="26.5" />
+        <path
+           id="path7804-6"
+           d="m 2.5,26.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 9.5,27.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7806-8"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 16.5,12.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7808-2"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="10.5"
+           x="18.5"
+           height="2"
+           width="3"
+           id="rect7810-7"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 0.5,28.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7812-1"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7814-8"
+           width="3"
+           height="2"
+           x="0.5"
+           y="28.5" />
+        <rect
+           y="28.5"
+           x="3.5"
+           height="3"
+           width="2"
+           id="rect7816-4"
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path7818-9"
+           d="m 7.5,29.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7820-2"
+           width="2"
+           height="3"
+           x="1.5"
+           y="30.5" />
+        <rect
+           y="30.5"
+           x="-1.5"
+           height="2"
+           width="3"
+           id="rect7822-7"
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.5,31.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7824-1"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7826-5"
+           d="m -1.5,30.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7828-5"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <path
+       style="color:#000000;fill:url(#radialGradient5134-5-1);fill-opacity:1;fill-rule:nonzero;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 12,27.5 C 12.5,26 19.5,16 19.5,13 c 0,-1 -1,-2 -2,-1 -2,2 -6.5,14 -7.5,15 -1.5,1.5 1,3.5 2,0.5 z"
+       id="path5216"
+       sodipodi:nodetypes="cccss"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#radialGradient5134-5);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 7.5,30.5 c 1,0 0.5,-1.5 1,-2.5 0.481899,-0.963797 2,-1.5 2.5,-1 0.5,0.5 1,1 0.5,2 -0.5,1 -2.5,2 -4,1.5 z"
+       id="path5146"
+       sodipodi:nodetypes="czssc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727268,136,216.72727)"
+     id="16_track-color"
+     inkscape:label="#track-color"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/track-color.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5113"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g8955-6"
+       mask="url(#mask8991-9)"
+       clip-path="url(#clipPath8997-1)">
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8893-9"
+         width="4.125"
+         height="2.7500002"
+         x="13.0625"
+         y="16.187502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8895-4"
+         width="2.75"
+         height="4.1250005"
+         x="14.4375"
+         y="18.937502" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8899-5"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8891-9"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#b5c8ce;fill-opacity:1;fill-rule:nonzero;stroke:#63685a;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="13.437502"
+         x="15.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8901-2"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="16.187502"
+         x="17.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8903-5"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8905-4"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8907-5"
+         d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8909-2"
+         width="4.125"
+         height="2.7500002"
+         x="18.5625"
+         y="10.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8911-5"
+         width="2.75"
+         height="4.1250005"
+         x="19.9375"
+         y="13.437502" />
+      <path
+         id="path8913-1"
+         d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8897-8"
+         d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#b5c8ce;fill-opacity:1;fill-rule:nonzero;stroke:#63685a;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8915-2"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 18.5625,10.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8917-3"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8869-2"
+         width="2.75"
+         height="4.1250005"
+         x="3.4375"
+         y="29.937502" />
+      <path
+         id="path8871-7"
+         d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8873-7"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="29.937502"
+         x="-0.6875"
+         height="2.7500002"
+         width="4.125"
+         id="rect8875-7"
+         style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="21.687502"
+         x="11.6875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8887-2"
+         style="color:#000000;fill:#b5c8ce;fill-opacity:1;fill-rule:nonzero;stroke:#63685a;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="18.937502"
+         x="10.3125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8885-4"
+         style="color:#000000;fill:#b5c8ce;fill-opacity:1;fill-rule:nonzero;stroke:#63685a;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#a6c8da;fill-opacity:1;fill-rule:nonzero;stroke:#545f59;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8889-4"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#a6c8da;fill-opacity:1;fill-rule:nonzero;stroke:#545f59;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8877-7"
+         width="4.125"
+         height="2.7500002"
+         x="7.5625"
+         y="21.687502" />
+      <path
+         style="color:#000000;fill:#a6c8da;fill-opacity:1;fill-rule:nonzero;stroke:#545f59;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8883-4"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#90c4e4;fill-opacity:1;fill-rule:nonzero;stroke:#384e57;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8879-1"
+         width="2.75"
+         height="4.1250005"
+         x="8.9375"
+         y="24.437502" />
+      <path
+         id="path7790-7-1"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8881-2"
+         d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#90c4e4;fill-opacity:1;fill-rule:nonzero;stroke:#384e57;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="24.437502"
+         x="4.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect7776-2-4"
+         style="color:#000000;fill:#90c4e4;fill-opacity:1;fill-rule:nonzero;stroke:#384e57;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+         id="path7788-1-7"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8867-5"
+         width="4.125"
+         height="2.7500002"
+         x="2.0625"
+         y="27.187502" />
+      <rect
+         y="27.187502"
+         x="6.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect7786-9-7"
+         style="color:#000000;fill:#6ac3ff;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       style="color:#000000;fill:url(#radialGradient5426);fill-opacity:1;fill-rule:nonzero;stroke:#4c4c3d;stroke-width:1.23750007;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 14.4375,27.187501 c 0.468875,-1.406627 6.875,-11.000001 6.875,-13.750001 0,-1.375 -2.0625,-2.0625 -2.75,-0.6875 -1.108556,2.217112 -4.8125,12.375001 -6.1875,13.750001 -1.406626,1.406626 1.124749,3.500752 2.0625,0.6875 z"
+       id="path5216-6"
+       sodipodi:nodetypes="cssss"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#radialGradient5134-5-2);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.23750007;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 10.3125,29.937501 c 0.937751,0 0.906124,-1.812249 1.375,-2.75 0.4519,-0.903802 1.436906,-1.075056 2.0625,-0.6875 0.625594,0.387556 1.156376,1.124749 0.6875,2.0625 -0.6875,1.375 -2.718374,1.843875 -4.125,1.375 z"
+       id="path5146-9"
+       sodipodi:nodetypes="czzsc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/mask-show-tracking.png"
+     inkscape:label="#mask-show-tracking"
+     id="22_mask-show-tracking"
+     transform="translate(160,232)">
+    <g
+       id="g8833-2">
+      <g
+         id="g7830-24"
+         mask="url(#mask8761-9)"
+         clip-path="url(#clipPath8767-40)">
+        <rect
+           y="18.5"
+           x="10.5"
+           height="2"
+           width="3"
+           id="rect7657-77"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7705-5"
+           width="3"
+           height="2"
+           x="12.5"
+           y="16.5" />
+        <rect
+           y="14.5"
+           x="14.5"
+           height="2"
+           width="3"
+           id="rect7707-4"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7709-81"
+           width="3"
+           height="2"
+           x="16.5"
+           y="12.5" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7711-2"
+           width="2"
+           height="3"
+           x="13.5"
+           y="18.5" />
+        <rect
+           y="16.5"
+           x="15.5"
+           height="3"
+           width="2"
+           id="rect7713-8"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7715-9"
+           width="2"
+           height="3"
+           x="17.5"
+           y="14.5" />
+        <path
+           id="path7717-3"
+           d="m 10.5,18.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.5,16.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7764-6"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7766-8"
+           d="m 14.5,14.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 17.5,19.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7768-0"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7770-21"
+           d="m 19.5,17.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7772-0"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="12.5"
+           x="19.5"
+           height="3"
+           width="2"
+           id="rect7774-51"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7776-1"
+           width="3"
+           height="2"
+           x="8.5"
+           y="20.5" />
+        <rect
+           y="20.5"
+           x="11.5"
+           height="3"
+           width="2"
+           id="rect7778-0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,20.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7780-8"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7782-5"
+           d="m 15.5,21.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="22.5"
+           x="6.5"
+           height="2"
+           width="3"
+           id="rect7784-06"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7786-4"
+           width="2"
+           height="3"
+           x="9.5"
+           y="22.5" />
+        <path
+           id="path7788-6"
+           d="m 6.5,22.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.5,23.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7790-2"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7792-5"
+           width="3"
+           height="2"
+           x="4.5"
+           y="24.5" />
+        <rect
+           y="24.5"
+           x="7.5"
+           height="3"
+           width="2"
+           id="rect7794-8"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 4.5,24.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7796-6"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7798-2"
+           d="m 11.5,25.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="26.5"
+           x="2.5"
+           height="2"
+           width="3"
+           id="rect7800-8"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7802-4"
+           width="2"
+           height="3"
+           x="5.5"
+           y="26.5" />
+        <path
+           id="path7804-7"
+           d="m 2.5,26.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 9.5,27.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7806-2"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 16.5,12.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7808-40"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="10.5"
+           x="18.5"
+           height="2"
+           width="3"
+           id="rect7810-6"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 0.5,28.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7812-2"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7814-9"
+           width="3"
+           height="2"
+           x="0.5"
+           y="28.5" />
+        <rect
+           y="28.5"
+           x="3.5"
+           height="3"
+           width="2"
+           id="rect7816-9"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path7818-0"
+           d="m 7.5,29.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7820-8"
+           width="2"
+           height="3"
+           x="1.5"
+           y="30.5" />
+        <rect
+           y="30.5"
+           x="-1.5"
+           height="2"
+           width="3"
+           id="rect7822-1"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.5,31.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7824-3"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7826-1"
+           d="m -1.5,30.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7828-1"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#f3f3f1;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6003"
+       d="M 8.6201229,20.30753 C 8.2193033,19.56853 7.4196632,19.087093 6.5789453,19.088266 4.9513724,19.065659 3.2009841,20.396225 3.2630619,22.121503 3.8221535,22.638197 4.6434627,22.757802 5.3664204,22.593699 6.6738573,22.27395 7.9091912,21.462502 8.6201229,20.30753 z M 11.8218,18.457263 c 1.354739,-0.0388 2.674467,-0.703927 3.604831,-1.677415 0.503459,-0.544651 0.810631,-1.316411 0.643137,-2.059412 -1.461661,-0.916451 -3.48805,-0.0644 -4.282278,1.357782 -0.421374,0.728198 -0.404659,1.662092 0.0343,2.379045 z M 2.5369379,23.823038 C 1.9160089,22.267488 1.3274165,20.598169 1.509126,18.898719 1.5714556,18.164781 2.0808367,17.55444 2.7602752,17.29929 4.240885,16.564304 5.9207763,16.319831 7.3552531,15.473998 8.7691018,14.75494 9.9900207,13.731007 11.133203,12.643907 c 0.621013,-0.473242 1.237231,-1.088365 2.037049,-1.216991 1.251572,-0.02839 2.256036,0.898356 3.123402,1.690636 0.584345,0.58486 1.164509,1.193887 1.630505,1.875513 0.509793,1.542067 0.888779,3.311723 0.207014,4.860256 -0.597797,1.203048 -2.041159,1.734172 -3.317848,1.729469 -1.146634,-0.0093 -2.414098,-0.615131 -3.452506,0.139341 -1.185355,0.80662 -1.088836,2.459944 -2.0370821,3.459321 C 8.5637366,26.062877 7.3736665,26.734327 6.1853503,26.40156 4.7111307,26.023945 3.512704,24.945342 2.5369402,23.823041 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6005"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/mask-show-tracking.png"
+     inkscape:label="#mask-show-tracking"
+     id="16_mask-show-tracking"
+     transform="matrix(0.7288265,0,0,0.7288265,160,216.67755)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6011"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <g
+       transform="matrix(0.99786812,0,0,0.99786805,-4.1394701e-6,0.06821955)"
+       id="g8955-46"
+       mask="url(#mask8991-6)"
+       clip-path="url(#clipPath8997-5)">
+      <rect
+         y="24.437502"
+         x="4.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect7776-2-2"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="27.187504"
+         x="6.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect7786-9-6"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+         id="path7788-1-75"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7790-7-6"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8867-9"
+         width="4.125"
+         height="2.7500002"
+         x="2.0625"
+         y="27.187504" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8869-87"
+         width="2.75"
+         height="4.1250005"
+         x="3.4375"
+         y="29.937504" />
+      <path
+         id="path8871-2"
+         d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8873-8"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="29.937504"
+         x="-0.6875"
+         height="2.7500002"
+         width="4.125"
+         id="rect8875-2"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8877-9"
+         width="4.125"
+         height="2.7500002"
+         x="7.5625"
+         y="21.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8879-9"
+         width="2.75"
+         height="4.1250005"
+         x="8.9375"
+         y="24.437502" />
+      <path
+         id="path8881-6"
+         d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8883-0"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="18.937502"
+         x="10.3125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8885-2"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="21.687502"
+         x="11.6875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8887-76"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8889-1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8891-3"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8893-21"
+         width="4.125"
+         height="2.7500002"
+         x="13.0625"
+         y="16.187502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8895-5"
+         width="2.75"
+         height="4.1250005"
+         x="14.4375"
+         y="18.937502" />
+      <path
+         id="path8897-9"
+         d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8899-9"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="13.437502"
+         x="15.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8901-1"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="16.187502"
+         x="17.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8903-4"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8905-91"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8907-07"
+         d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8909-5"
+         width="4.125"
+         height="2.7500002"
+         x="18.5625"
+         y="10.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8911-8"
+         width="2.75"
+         height="4.1250005"
+         x="19.9375"
+         y="13.437502" />
+      <path
+         id="path8913-7"
+         d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8915-0"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+         id="path8917-4"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#f3f3f1;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6013"
+       d="M 9.3061572,20.993564 C 8.9053376,20.254564 8.1056975,19.773127 7.2649796,19.7743 5.6374067,19.75169 3.8870184,21.082259 3.9490962,22.807537 c 0.5590916,0.516694 1.3804008,0.636299 2.1033585,0.472196 1.3074369,-0.319749 2.5427708,-1.131197 3.2537025,-2.286169 z m 3.2016768,-1.850267 c 1.354739,-0.0388 2.674467,-0.703927 3.604831,-1.677415 0.503459,-0.544651 0.810631,-1.316411 0.643137,-2.059412 -1.461661,-0.916451 -3.48805,-0.0644 -4.282278,1.357782 -0.421374,0.728198 -0.404659,1.662092 0.0343,2.379045 z m -9.2848618,5.365775 c -0.620929,-1.55555 -1.2095214,-3.224869 -1.0278119,-4.924319 0.06233,-0.733938 0.5717107,-1.344279 1.2511492,-1.599429 1.4806098,-0.734986 3.1605011,-0.979459 4.5949779,-1.825292 1.4138487,-0.719058 2.6347676,-1.742991 3.7779496,-2.830091 0.621013,-0.473242 1.237231,-1.088365 2.037049,-1.216991 1.251572,-0.02839 2.256036,0.898356 3.123402,1.690636 0.584345,0.58486 1.164509,1.193887 1.630505,1.875513 0.509793,1.542067 0.888779,3.311723 0.207014,4.860256 -0.597797,1.203048 -2.041159,1.734172 -3.317848,1.729469 -1.146634,-0.0093 -2.414098,-0.615131 -3.452506,0.139341 -1.185355,0.80662 -1.088836,2.459944 -2.037082,3.459321 C 9.2497709,26.748911 8.0597008,27.420361 6.8713846,27.087594 5.397165,26.709979 4.1987383,25.631376 3.2229745,24.509075 z" />
+  </g>
+  <g
+     transform="translate(184,232)"
+     id="22_track-show-id"
+     inkscape:label="#track-show-id"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/track-show-id.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4705-3"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g8833-0">
+      <g
+         id="g7830-2"
+         mask="url(#mask8761-4)"
+         clip-path="url(#clipPath8767-4)">
+        <rect
+           y="18.5"
+           x="10.5"
+           height="2"
+           width="3"
+           id="rect7657-7"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7705-1"
+           width="3"
+           height="2"
+           x="12.5"
+           y="16.5" />
+        <rect
+           y="14.5"
+           x="14.5"
+           height="2"
+           width="3"
+           id="rect7707-3"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7709-8"
+           width="3"
+           height="2"
+           x="16.5"
+           y="12.5" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7711-9"
+           width="2"
+           height="3"
+           x="13.5"
+           y="18.5" />
+        <rect
+           y="16.5"
+           x="15.5"
+           height="3"
+           width="2"
+           id="rect7713-1"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7715-6"
+           width="2"
+           height="3"
+           x="17.5"
+           y="14.5" />
+        <path
+           id="path7717-0"
+           d="m 10.5,18.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 12.5,16.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7764-8"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7766-3"
+           d="m 14.5,14.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 17.5,19.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7768-8"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7770-5"
+           d="m 19.5,17.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7772-8"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="12.5"
+           x="19.5"
+           height="3"
+           width="2"
+           id="rect7774-4"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7776-3"
+           width="3"
+           height="2"
+           x="8.5"
+           y="20.5" />
+        <rect
+           y="20.5"
+           x="11.5"
+           height="3"
+           width="2"
+           id="rect7778-5"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 8.5,20.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7780-9"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7782-1"
+           d="m 15.5,21.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="22.5"
+           x="6.5"
+           height="2"
+           width="3"
+           id="rect7784-0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7786-2"
+           width="2"
+           height="3"
+           x="9.5"
+           y="22.5" />
+        <path
+           id="path7788-0"
+           d="m 6.5,22.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 13.5,23.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7790-3"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7792-4"
+           width="3"
+           height="2"
+           x="4.5"
+           y="24.5" />
+        <rect
+           y="24.5"
+           x="7.5"
+           height="3"
+           width="2"
+           id="rect7794-9"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 4.5,24.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7796-3"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7798-8"
+           d="m 11.5,25.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="26.5"
+           x="2.5"
+           height="2"
+           width="3"
+           id="rect7800-04"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7802-3"
+           width="2"
+           height="3"
+           x="5.5"
+           y="26.5" />
+        <path
+           id="path7804-0"
+           d="m 2.5,26.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 9.5,27.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7806-80"
+           inkscape:connector-curvature="0" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 16.5,12.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7808-4"
+           inkscape:connector-curvature="0" />
+        <rect
+           y="10.5"
+           x="18.5"
+           height="2"
+           width="3"
+           id="rect7810-3"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 0.5,28.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path7812-8"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7814-3"
+           width="3"
+           height="2"
+           x="0.5"
+           y="28.5" />
+        <rect
+           y="28.5"
+           x="3.5"
+           height="3"
+           width="2"
+           id="rect7816-5"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           id="path7818-6"
+           d="m 7.5,29.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect7820-4"
+           width="2"
+           height="3"
+           x="1.5"
+           y="30.5" />
+        <rect
+           y="30.5"
+           x="-1.5"
+           height="2"
+           width="3"
+           id="rect7822-5"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 5.5,31.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path7824-14"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7826-0"
+           d="m -1.5,30.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path7828-9"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+    <path
+       style="fill:url(#radialGradient28048);fill-opacity:1;stroke:#5f5428;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 20.5,30.5 0,-7 -3.5,-3.5 -3,0 -3.5,3.5 0,7 10,0 z"
+       id="path28017"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path28013"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 14.5,26.5 -2,0 0,-2.5 m 2,0 0,5 m 4.5,-0.5 -2.5,0 c 0,-1 0,-1.25 1,-1.75 0.97628,-0.488141 1,-0.75 1,-1.25 0,-0.613965 0.004,-1 -1,-1 -1,0 -1,0.5 -1,1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/track-show-id.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#track-show-id"
+     id="16_track-show-id"
+     transform="matrix(0.72727273,0,0,0.72727268,184,216.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4880-5"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g8955-4"
+       mask="url(#mask8991-8)"
+       clip-path="url(#clipPath8997-0)">
+      <rect
+         y="24.437502"
+         x="4.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect7776-2-0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="27.187504"
+         x="6.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect7786-9-77"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+         id="path7788-1-2"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7790-7-7"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8867-0"
+         width="4.125"
+         height="2.7500002"
+         x="2.0625"
+         y="27.187504" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8869-8"
+         width="2.75"
+         height="4.1250005"
+         x="3.4375"
+         y="29.937504" />
+      <path
+         id="path8871-8"
+         d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8873-5"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="29.937504"
+         x="-0.6875"
+         height="2.7500002"
+         width="4.125"
+         id="rect8875-6"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8877-0"
+         width="4.125"
+         height="2.7500002"
+         x="7.5625"
+         y="21.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8879-11"
+         width="2.75"
+         height="4.1250005"
+         x="8.9375"
+         y="24.437502" />
+      <path
+         id="path8881-3"
+         d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8883-9"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="18.937502"
+         x="10.3125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8885-1"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="21.687502"
+         x="11.6875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8887-7"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8889-5"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8891-92"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8893-2"
+         width="4.125"
+         height="2.7500002"
+         x="13.0625"
+         y="16.187502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8895-7"
+         width="2.75"
+         height="4.1250005"
+         x="14.4375"
+         y="18.937502" />
+      <path
+         id="path8897-6"
+         d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8899-7"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="13.437502"
+         x="15.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8901-8"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="16.187502"
+         x="17.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8903-2"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8905-9"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8907-0"
+         d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8909-3"
+         width="4.125"
+         height="2.7500002"
+         x="18.5625"
+         y="10.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8911-4"
+         width="2.75"
+         height="4.1250005"
+         x="19.9375"
+         y="13.437502" />
+      <path
+         id="path8913-4"
+         d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8915-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+         id="path8917-33"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:url(#radialGradient28098);fill-opacity:1;stroke:#5f5428;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 21.3125,31.312502 0,-6.94375 -4.125,-4.056251 -1.375,0 -4.125,4.056251 0,6.94375 9.625,0 z"
+       id="path28017-5"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path28013-5"
+       style="fill:none;stroke:#000000;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.8125,27.875001 -2.75,0 0,-2.75 m 2.75,0 0,5.500001 m 4.60625,-0.6875 -3.23125,0 c 0,-0.6875 0,-2.062501 1.375,-2.062501 1.375427,-1e-6 1.375,-0.464581 1.375,-1.16875 0,-0.687499 -0.643192,-0.89375 -1.375,-0.89375 -0.6875,0 -1.375,0.34375 -1.375,1.03125"
+       sodipodi:nodetypes="ccccccczzzc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/track-show-pvo.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#track-show-pvo"
+     id="22_track-show-pvo"
+     transform="translate(208,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4513"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g4515">
+      <g
+         clip-path="url(#clipPath8767-4)"
+         mask="url(#mask8761-4)"
+         id="g4517">
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4519"
+           width="3"
+           height="2"
+           x="10.5"
+           y="18.5" />
+        <rect
+           y="16.5"
+           x="12.5"
+           height="2"
+           width="3"
+           id="rect4521"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4523"
+           width="3"
+           height="2"
+           x="14.5"
+           y="14.5" />
+        <rect
+           y="12.5"
+           x="16.5"
+           height="2"
+           width="3"
+           id="rect4525"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="18.5"
+           x="13.5"
+           height="3"
+           width="2"
+           id="rect4527"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4529"
+           width="2"
+           height="3"
+           x="15.5"
+           y="16.5" />
+        <rect
+           y="14.5"
+           x="17.5"
+           height="3"
+           width="2"
+           id="rect4531"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 10.5,18.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path4533" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4535"
+           d="m 12.5,16.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 14.5,14.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path4537" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4539"
+           d="m 17.5,19.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 19.5,17.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path4541" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4543"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4545"
+           width="2"
+           height="3"
+           x="19.5"
+           y="12.5" />
+        <rect
+           y="20.5"
+           x="8.5"
+           height="2"
+           width="3"
+           id="rect4547"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4549"
+           width="2"
+           height="3"
+           x="11.5"
+           y="20.5" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4551"
+           d="m 8.5,20.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 15.5,21.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path4553" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4555"
+           width="3"
+           height="2"
+           x="6.5"
+           y="22.5" />
+        <rect
+           y="22.5"
+           x="9.5"
+           height="3"
+           width="2"
+           id="rect4557"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 6.5,22.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path4559" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4561"
+           d="m 13.5,23.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="24.5"
+           x="4.5"
+           height="2"
+           width="3"
+           id="rect4563"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4565"
+           width="2"
+           height="3"
+           x="7.5"
+           y="24.5" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4567"
+           d="m 4.5,24.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 11.5,25.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path4569" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4571"
+           width="3"
+           height="2"
+           x="2.5"
+           y="26.5" />
+        <rect
+           y="26.5"
+           x="5.5"
+           height="3"
+           width="2"
+           id="rect4573"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2.5,26.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path4575" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4577"
+           d="m 9.5,27.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4579"
+           d="m 16.5,12.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4581"
+           width="3"
+           height="2"
+           x="18.5"
+           y="10.5" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4583"
+           d="m 0.5,28.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           y="28.5"
+           x="0.5"
+           height="2"
+           width="3"
+           id="rect4585"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4587"
+           width="2"
+           height="3"
+           x="3.5"
+           y="28.5" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 7.5,29.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path4589" />
+        <rect
+           y="30.5"
+           x="1.5"
+           height="3"
+           width="2"
+           id="rect4591"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect4593"
+           width="3"
+           height="2"
+           x="-1.5"
+           y="30.5" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path4595"
+           d="m 5.5,31.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -1.5,30.5 2,0 0,-2 -1,-1 -2,2 1,1 z"
+           id="path4597" />
+        <path
+           inkscape:connector-curvature="0"
+           style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 21.5,15.5 -2,0 0,2 1,1 2,-2 -1,-1 z"
+           id="path4599" />
+      </g>
+    </g>
+    <rect
+       style="opacity:0.5;color:#000000;fill:url(#radialGradient4712);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5311-2"
+       width="15"
+       height="8"
+       x="5.5"
+       y="22.5" />
+    <rect
+       y="22.5"
+       x="5.5"
+       height="8"
+       width="15"
+       id="rect5474-0"
+       style="opacity:0.5;color:#000000;fill:#2a4556;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       d="M 14,24 12.5,29 11,24 m 6,4.5 c -1,0 -1.5,-1 -1.5,-2 0,-1 0.5,-2 1.5,-2 1,0 1.5,1 1.5,2 0,1 -0.5,2 -1.5,2 z m -9.5,-2 c 1.5,0 2,-0.254644 2,-1 0,-0.745356 -0.5,-1 -2,-1 m 0,-0.5 0,5"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1"
+       id="path4351-5"
+       sodipodi:nodetypes="ccczzzzzczccc" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727268,208,216.72727)"
+     id="16_track-show-pvo"
+     inkscape:label="#track-show-pvo"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/track-show-pvo.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4607"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       clip-path="url(#clipPath8997-0)"
+       mask="url(#mask8991-8)"
+       id="g4609">
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4612"
+         width="4.125"
+         height="2.7500002"
+         x="4.8125"
+         y="24.437502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4614"
+         width="2.75"
+         height="4.1250005"
+         x="6.1875"
+         y="27.187504" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4616"
+         d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path4618" />
+      <rect
+         y="27.187504"
+         x="2.0625"
+         height="2.7500002"
+         width="4.125"
+         id="rect4620"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="29.937504"
+         x="3.4375"
+         height="4.1250005"
+         width="2.75"
+         id="rect4622"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path4625" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4627"
+         d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4629"
+         width="4.125"
+         height="2.7500002"
+         x="-0.6875"
+         y="29.937504" />
+      <rect
+         y="21.687502"
+         x="7.5625"
+         height="2.7500002"
+         width="4.125"
+         id="rect4631"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="24.437502"
+         x="8.9375"
+         height="4.1250005"
+         width="2.75"
+         id="rect4634"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path4636" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4638"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4640"
+         width="4.125"
+         height="2.7500002"
+         x="10.3125"
+         y="18.937502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4642"
+         width="2.75"
+         height="4.1250005"
+         x="11.6875"
+         y="21.687502" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4644"
+         d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path4646" />
+      <rect
+         y="16.187502"
+         x="13.0625"
+         height="2.7500002"
+         width="4.125"
+         id="rect4648"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="18.937502"
+         x="14.4375"
+         height="4.1250005"
+         width="2.75"
+         id="rect4650"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path4652" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4654"
+         d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4656"
+         width="4.125"
+         height="2.7500002"
+         x="15.8125"
+         y="13.437502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4658"
+         width="2.75"
+         height="4.1250005"
+         x="17.1875"
+         y="16.187502" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4660"
+         d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path4662" />
+      <rect
+         y="10.687502"
+         x="18.5625"
+         height="2.7500002"
+         width="4.125"
+         id="rect4664"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="13.437502"
+         x="19.9375"
+         height="4.1250005"
+         width="2.75"
+         id="rect4666"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+         id="path4668" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4670"
+         d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4672"
+         d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <rect
+       style="opacity:0.5;color:#000000;fill:url(#radialGradient4758);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5311-2-2"
+       width="17.875"
+       height="9.625001"
+       x="3.4375"
+       y="21.687506" />
+    <rect
+       y="21.687506"
+       x="3.4375"
+       height="9.625001"
+       width="17.875"
+       id="rect5474-0-5"
+       style="opacity:0.5;color:#000000;fill:#294455;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 14.4375,23.749996 -2.0625,5.50001 -2.0625,-5.50001 m 6.875,4.8125 c -0.6875,-10e-6 -1.375,-0.6875 -1.375,-2.0625 0,-1.375 0.6875,-2.062509 1.375,-2.0625 0.6875,9e-6 1.375,0.6875 1.375,2.0625 0,1.375 -0.6875,2.06251 -1.375,2.0625 z m -11,-1.375 c 2.0625,0 2.75,-0.35013 2.75,-1.375 0,-1.02486 -0.6875,-1.375 -2.75,-1.375 m 0,-0.549991 0,5.362501"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path4351-5-7"
+       sodipodi:nodetypes="ccczzzzzczccc" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/track-list.png"
+     inkscape:label="#track-list"
+     id="22_track-list"
+     transform="translate(232,232)"
+     mask="none">
+    <rect
+       transform="scale(1,-1)"
+       y="-28.5"
+       x="2.5"
+       height="12"
+       width="11"
+       id="rect5136"
+       style="color:#000000;fill:url(#linearGradient5179);fill-opacity:1;fill-rule:nonzero;stroke:#717171;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient5181);fill-opacity:1;fill-rule:nonzero;stroke:#3e53a5;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5138"
+       width="11"
+       height="3"
+       x="2.5"
+       y="-16.5"
+       transform="scale(1,-1)" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5140"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 2.5,18.5 11,0"
+       id="path5142"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5144"
+       d="m 2.5,20.5 11,0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 2.5,22.5 11,0"
+       id="path5147"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5149"
+       d="m 2.5,24.5 11,0"
+       style="fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="m 2.5,26.5 11,0"
+       id="path5151"
+       sodipodi:nodetypes="cc" />
+    <g
+       transform="matrix(0.72727273,0,0,0.72727268,5,8.72727)"
+       id="g8955-4-8"
+       mask="url(#mask6248)"
+       clip-path="url(#clipPath8997-0-8)">
+      <rect
+         y="24.437502"
+         x="4.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect7776-2-0-8"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="27.187504"
+         x="6.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect7786-9-77-3"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+         id="path7788-1-2-1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7790-7-7-8"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8867-0-9"
+         width="4.125"
+         height="2.7500002"
+         x="2.0625"
+         y="27.187504" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8869-8-6"
+         width="2.75"
+         height="4.1250005"
+         x="3.4375"
+         y="29.937504" />
+      <path
+         id="path8871-8-4"
+         d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8873-5-3"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="29.937504"
+         x="-0.6875"
+         height="2.7500002"
+         width="4.125"
+         id="rect8875-6-3"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8877-0-3"
+         width="4.125"
+         height="2.7500002"
+         x="7.5625"
+         y="21.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8879-11-8"
+         width="2.75"
+         height="4.1250005"
+         x="8.9375"
+         y="24.437502" />
+      <path
+         id="path8881-3-6"
+         d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8883-9-0"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="18.937502"
+         x="10.3125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8885-1-4"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="21.687502"
+         x="11.6875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8887-7-8"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8889-5-8"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8891-92-8"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8893-2-9"
+         width="4.125"
+         height="2.7500002"
+         x="13.0625"
+         y="16.187502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8895-7-7"
+         width="2.75"
+         height="4.1250005"
+         x="14.4375"
+         y="18.937502" />
+      <path
+         id="path8897-6-7"
+         d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8899-7-6"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="13.437502"
+         x="15.8125"
+         height="2.7500002"
+         width="4.125"
+         id="rect8901-8-4"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="16.187502"
+         x="17.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8903-2-3"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8905-9-0"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8907-0-3"
+         d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8909-3-0"
+         width="4.125"
+         height="2.7500002"
+         x="18.5625"
+         y="10.687502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8911-4-9"
+         width="2.75"
+         height="4.1250005"
+         x="19.9375"
+         y="13.437502" />
+      <path
+         id="path8913-4-2"
+         d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8915-5-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+         id="path8917-33-4"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/track-list.png"
+     inkscape:label="#track-list"
+     id="16_track-list"
+     transform="matrix(0.7288265,0,0,0.7288265,232,216.67755)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5161"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <rect
+       transform="scale(1,-1)"
+       y="-25.825686"
+       x="4.8022404"
+       height="13.720686"
+       width="9.6044807"
+       id="rect5163"
+       style="color:#000000;fill:url(#linearGradient5189);fill-opacity:1;fill-rule:nonzero;stroke:#717171;stroke-width:1.37206864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient5191);fill-opacity:1;fill-rule:nonzero;stroke:#3e53a5;stroke-width:1.37206864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5165"
+       width="9.6044807"
+       height="2.7441373"
+       x="4.8022404"
+       y="-14.849138"
+       transform="scale(1,-1)" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 4.8022405,17.593282 9.6044805,-10e-7"
+       id="path5167"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5169"
+       d="m 4.8022405,20.337419 9.6044805,-1e-6"
+       style="fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="m 4.8022405,23.081556 9.6044805,0"
+       id="path5171"
+       sodipodi:nodetypes="cc" />
+    <g
+       transform="matrix(0.99786812,0,0,0.99786805,-2.6052999e-7,4.1844261)"
+       id="g8955-4-8-2"
+       mask="url(#mask6253)"
+       clip-path="url(#clipPath6231)">
+      <rect
+         y="27.187504"
+         x="6.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect7786-9-77-3-0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 6.1875,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path7788-1-2-1-5"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7790-7-7-8-1"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8871-8-4-8"
+         d="m 3.4375,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8879-11-8-4"
+         width="2.75"
+         height="4.1250005"
+         x="8.9375"
+         y="24.437502" />
+      <path
+         id="path8881-3-6-6"
+         d="m 8.9375,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8883-9-0-2"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="21.687502"
+         x="11.6875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8887-7-8-8"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 11.6875,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8889-5-8-6"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8891-92-8-2"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8895-7-7-4"
+         width="2.75"
+         height="4.1250005"
+         x="14.4375"
+         y="18.937502" />
+      <path
+         id="path8897-6-7-7"
+         d="m 14.4375,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8899-7-6-2"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="16.187502"
+         x="17.1875"
+         height="4.1250005"
+         width="2.75"
+         id="rect8903-2-3-0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 17.1875,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8905-9-0-6"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8907-0-3-2"
+         d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8911-4-9-9"
+         width="2.75"
+         height="4.1250005"
+         x="19.9375"
+         y="13.437502" />
+      <path
+         id="path8913-4-2-0"
+         d="m 19.9375,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8915-5-5-8"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 22.6875,10.687502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500005 1.375,1.3749999 z"
+         id="path6222" />
+      <rect
+         y="10.687502"
+         x="22.6875"
+         height="4.1250005"
+         width="2.75"
+         id="rect6224"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+  <g
+     transform="translate(272,232)"
+     id="22_event-show-as-path"
+     inkscape:label="#event-show-as-path"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/event-show-as-path.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6435"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6477);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4,11.5 C 9.5,14 9.5,18 6.5,21 3,24.5 4,29 11,30.5"
+       id="path6437"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:none;stroke:url(#linearGradient6596-6);stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 8,19 C 7.5,20 7,20.5 6.5,21 4.5,23 4,25 5,27"
+       id="path6670"
+       sodipodi:nodetypes="css"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient6506);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6497"
+       sodipodi:cx="391"
+       sodipodi:cy="25"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+       transform="translate(-377.5,-0.5)" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient6506-5);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6521"
+       width="2"
+       height="6"
+       x="12.5"
+       y="20.5" />
+    <rect
+       y="26.5"
+       x="12.5"
+       height="2"
+       width="2"
+       id="rect6578"
+       style="color:#000000;fill:url(#radialGradient6580);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,272,216.67755)"
+     id="16_event-show-as-path"
+     inkscape:label="#event-show-as-path"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/event-show-as-path.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect6457"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6487);stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.4882747,12.105004 c 6.1743093,3.430172 2.7441373,6.860344 0.6860343,9.604481 -2.058103,2.744137 -2.7441373,6.860343 4.802241,8.232412"
+       id="path6459"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="css"
+       id="path6949"
+       d="M 8.1345892,19.017272 C 7.5623637,19.965811 6.8040971,20.869768 6.174309,21.709485 4.933776,23.363529 4.1917351,25.516065 5.450531,27.265687"
+       style="color:#000000;fill:none;stroke:url(#linearGradient6596-6-2);stroke-width:3.01855111;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient6738);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6497-1"
+       sodipodi:cx="391"
+       sodipodi:cy="25"
+       sodipodi:rx="4.9999995"
+       sodipodi:ry="4.9999995"
+       d="m 396,25 c 0,2.761423 -2.23858,5 -5,5 -2.76142,0 -5,-2.238577 -5,-5 0,-2.761423 2.23858,-5 5,-5 2.76142,0 5,2.238577 5,5 z"
+       transform="matrix(1.3720687,0,0,1.3720687,-522.07215,-9.8480957)" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient6799);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6521-0"
+       width="2.7441368"
+       height="5.4882755"
+       x="13.034653"
+       y="20.337416" />
+    <rect
+       y="25.825684"
+       x="13.034652"
+       height="2.7441373"
+       width="2.7441373"
+       id="rect6578-0"
+       style="color:#000000;fill:url(#radialGradient6580-1);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/event-show-as-region.png"
+     inkscape:label="#event-show-as-region"
+     id="22_event-show-as-region"
+     transform="translate(296,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5186"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="color:#000000;fill:none;stroke:url(#linearGradient5218);stroke-width:6.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 8,17 C 7.5,18 7,18.5 6.5,19 4.5,21 4,23 5,25"
+       id="path5190"
+       sodipodi:nodetypes="css"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="css"
+       id="path5192"
+       d="M 8,17 C 7.5,18 7,18.5 6.5,19 4.5,21 4,23 5,25"
+       style="color:#000000;fill:none;stroke:url(#linearGradient5220);stroke-width:4.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="translate(-377.5,-0.5)"
+       d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="25"
+       sodipodi:cx="391"
+       id="path5194"
+       style="color:#000000;fill:url(#radialGradient5222);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <rect
+       y="20.5"
+       x="12.5"
+       height="6"
+       width="2"
+       id="rect5196"
+       style="color:#000000;fill:url(#radialGradient5224);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient5226);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5198"
+       width="2"
+       height="2"
+       x="12.5"
+       y="26.5" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/event-show-as-region.png"
+     inkscape:label="#event-show-as-region"
+     id="16_event-show-as-region"
+     transform="matrix(0.7288265,0,0,0.7288265,296,216.67755)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5202"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <path
+       sodipodi:nodetypes="css"
+       id="path5206"
+       d="M 8.1345892,16.273136 C 7.5623637,17.221675 6.8040971,18.125632 6.174309,18.965349 4.933776,20.619393 4.1917351,22.771929 5.450531,24.521551"
+       style="color:#000000;fill:none;stroke:url(#linearGradient5230);stroke-width:7.54637766;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:none;stroke:url(#linearGradient5232);stroke-width:5.48827457;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 8.1345892,16.273136 C 7.5623637,17.221675 6.8040971,18.125632 6.174309,18.965349 4.933776,20.619393 4.1917351,22.771929 5.450531,24.521551"
+       id="path5208"
+       sodipodi:nodetypes="css"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(1.3720687,0,0,1.3720687,-522.07215,-9.8480957)"
+       d="m 396,25 c 0,2.761423 -2.23858,5 -5,5 -2.76142,0 -5,-2.238577 -5,-5 0,-2.761423 2.23858,-5 5,-5 2.76142,0 5,2.238577 5,5 z"
+       sodipodi:ry="4.9999995"
+       sodipodi:rx="4.9999995"
+       sodipodi:cy="25"
+       sodipodi:cx="391"
+       id="path5210"
+       style="color:#000000;fill:url(#radialGradient5234);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <rect
+       y="20.337416"
+       x="13.034653"
+       height="5.4882755"
+       width="2.7441368"
+       id="rect5212"
+       style="color:#000000;fill:url(#radialGradient5236);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient5238);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5214"
+       width="2.7441373"
+       height="2.7441373"
+       x="13.034652"
+       y="25.825684" />
+  </g>
+  <g
+     transform="translate(320,232)"
+     id="22_event-show-boxes"
+     inkscape:label="#event-show-boxes"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/event-show-boxes.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5841"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       transform="translate(-380.5,-3.5)"
+       d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+       sodipodi:ry="6"
+       sodipodi:rx="6"
+       sodipodi:cy="25"
+       sodipodi:cx="391"
+       id="path5849"
+       style="color:#000000;fill:url(#radialGradient5873);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <rect
+       y="17.5"
+       x="9.5"
+       height="6"
+       width="2"
+       id="rect5851"
+       style="color:#000000;fill:url(#radialGradient5875);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient5877);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5853"
+       width="2"
+       height="2"
+       x="9.5"
+       y="23.5" />
+    <rect
+       style="color:#000000;fill:none;stroke:#72a541;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6133-3"
+       width="16"
+       height="16"
+       x="2.5"
+       y="13.5" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/event-show-boxes.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#event-show-boxes"
+     id="16_event-show-boxes"
+     transform="matrix(0.72727273,0,0,0.72727268,320,216.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5857"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       transform="matrix(1.375,0,0,1.3750001,-527.3126,-12.687501)"
+       d="m 396,25 c 0,2.761423 -2.23858,5 -5,5 -2.76142,0 -5,-2.238577 -5,-5 0,-2.761423 2.23858,-5 5,-5 2.76142,0 5,2.238577 5,5 z"
+       sodipodi:ry="4.9999995"
+       sodipodi:rx="4.9999995"
+       sodipodi:cy="25"
+       sodipodi:cx="391"
+       id="path5865"
+       style="color:#000000;fill:url(#radialGradient5881);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <rect
+       y="17.56251"
+       x="8.9375229"
+       height="5.500001"
+       width="2.7499995"
+       id="rect5867"
+       style="color:#000000;fill:url(#radialGradient5883);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient5885);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5869"
+       width="2.75"
+       height="2.7500002"
+       x="8.9375229"
+       y="23.062494" />
+    <rect
+       style="color:#000000;fill:none;stroke:#72a541;stroke-width:1.375;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6133-9-9"
+       width="19.25"
+       height="19.250004"
+       x="0.6875"
+       y="12.062505" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/event-show-label.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#event-show-label"
+     id="22_event-show-label"
+     transform="translate(344,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4260"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <rect
+       style="opacity:0.5;color:#000000;fill:url(#radialGradient4423-6);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5311"
+       width="15"
+       height="8"
+       x="1.5"
+       y="11.5" />
+    <rect
+       y="11.5"
+       x="1.5"
+       height="8"
+       width="15"
+       id="rect5474"
+       style="opacity:0.5;color:#000000;fill:#2a4556;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 11.5,13.5 -4,0 m 2,-0.5 0,5 m 5.5,-0.5 -3,0 m 0.5,0.5 0,-5 m -5,5 -2,-4.8 -2,4.8 m 0.5,-1.5 3,0"
+       style="fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:bevel;stroke-opacity:1"
+       id="path4351"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient5235);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6497-2-7"
+       sodipodi:cx="391"
+       sodipodi:cy="25"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+       transform="translate(-376.5,-0.5)" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient6506-5-38-9);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6521-02-2"
+       width="2"
+       height="6"
+       x="13.5"
+       y="20.5" />
+    <rect
+       y="26.5"
+       x="13.5"
+       height="2"
+       width="2"
+       id="rect6578-4-8"
+       style="color:#000000;fill:url(#radialGradient6580-6-4);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727268,344,216.72727)"
+     id="16_event-show-label"
+     inkscape:label="#event-show-label"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/event-show-label.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4355"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="opacity:0.5;color:#000000;fill:url(#radialGradient5448);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5311-5"
+       width="17.875"
+       height="9.6249971"
+       x="0.6875"
+       y="10.687508" />
+    <rect
+       y="10.687508"
+       x="0.6875"
+       height="9.6249971"
+       width="17.875"
+       id="rect5476"
+       style="opacity:0.5;color:#000000;fill:#294455;fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 12.375,13.437505 -4.125,0 m 2.0625,-0.687509 0,5.50001 m 6.1875,-0.687501 -2.75,-9e-6 m 0.6875,0.68751 0,-5.500001 M 7.5625,18.250006 5.5,13.024996 3.4375,18.250006 m 0.6875,-2.06251 2.75,0"
+       style="fill:none;stroke:#ffffff;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path4351-4"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient5373);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6497-1-8-8"
+       sodipodi:cx="391"
+       sodipodi:cy="25"
+       sodipodi:rx="4.9999995"
+       sodipodi:ry="4.9999995"
+       d="m 396,25 c 0,2.761423 -2.23858,5 -5,5 -2.76142,0 -5,-2.238577 -5,-5 0,-2.761423 2.23858,-5 5,-5 2.76142,0 5,2.238577 5,5 z"
+       transform="matrix(1.375,0,0,1.3750001,-523.1876,-9.9375005)" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient6799-8-3);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6521-0-3-4"
+       width="2.7499995"
+       height="5.500001"
+       x="13.062523"
+       y="20.31251" />
+    <rect
+       y="25.812494"
+       x="13.062523"
+       height="2.7500002"
+       width="2.75"
+       id="rect6578-0-1-8"
+       style="color:#000000;fill:url(#radialGradient6580-1-3-1);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="translate(368,232)"
+     id="22_event-show-probability"
+     inkscape:label="#event-show-probability"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/event-show-probability.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4611"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient5670);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4633-8"
+       width="1.9999996"
+       height="4.0000005"
+       x="4.5000048"
+       y="18.5" />
+    <rect
+       y="22.499996"
+       x="4.5000048"
+       height="2"
+       width="2"
+       id="rect4635-1"
+       style="color:#000000;fill:url(#radialGradient5667);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#603b31;stroke-width:0.80000001;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 14.00001,23.500001 1.49999,1.499997 2.00001,-2 1.99999,2 1.50001,-1.499997 -2.00001,-2 2.00001,-1.999999 -1.50001,-1.500003 -1.99999,2 -2.00001,-2 -1.49999,1.500003 1.99999,1.999999 -1.99999,2 z"
+       id="polygon6106-3-5-3-7"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#a0a091;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 161.03125,88 165.5,76.5 170,88"
+       id="path5496"
+       transform="translate(-160,-64)"
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path5498"
+       d="M 13.03125,24 17.5,12.5 22,24"
+       style="fill:none;stroke:#a0a091;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#linearGradient5490);fill-opacity:1;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1.5,24.5 8,0 c 0,1 -1.5,2 -4,2 -2.4837742,0 -4,-1 -4,-2 z"
+       id="path4694"
+       sodipodi:nodetypes="cczc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cczc"
+       id="path5601"
+       d="m 13.5,24.5 8,0 c 0,1 -1.5,2 -4,2 -2.483774,0 -4,-1 -4,-2 z"
+       style="color:#000000;fill:url(#linearGradient5603);fill-opacity:1;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 165.5,76.5 12,0"
+       id="path4663"
+       transform="translate(-160,-64)"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 171.5,94.5 0,-18"
+       id="path4661"
+       transform="translate(-160,-64)"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#linearGradient5482);fill-opacity:1;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 6.5,30.5 10,0 -5,-2 -5,2 z"
+       id="path4659"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,368,216.67755)"
+     id="16_event-show-probability"
+     inkscape:label="#event-show-probability"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/event-show-probability.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect4625"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient4653);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4633"
+       width="2.7441368"
+       height="5.4882755"
+       x="3.4301746"
+       y="14.849136" />
+    <rect
+       y="20.337402"
+       x="3.4301727"
+       height="2.7441373"
+       width="2.7441373"
+       id="rect4635"
+       style="color:#000000;fill:url(#radialGradient4655);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:url(#linearGradient5674-9);fill-opacity:1;stroke:#603b31;stroke-width:1.09765494;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 19.894998,17.593279 -2.0581,-2.058103 -2.0581,2.058103 -2.05811,-2.058103 -2.0581,2.058103 2.0581,2.058103 -2.0581,2.058103 2.0581,2.058103 2.05811,-2.058103 2.0581,2.058103 2.0581,-2.058103 -2.0581,-2.058103 2.0581,-2.058103 z"
+       id="polygon6106-6-6-1"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#a0a091;stroke-width:0.68603432;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 1.4149458,22.395519 4.8022385,12.105005 8.2324113,22.395519"
+       id="path5496-0"
+       sodipodi:nodetypes="ccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccc"
+       id="path5814"
+       d="m 12.391496,22.395519 3.387293,-10.290514 3.430173,10.290514"
+       style="fill:none;stroke:#a0a091;stroke-width:0.68603432;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#linearGradient5490-3);fill-opacity:1;stroke:#6f6f58;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 2.0581058,23.081554 5.4882755,0 c 0,1.372068 -0.686038,2.744137 -2.7441428,2.744137 -2.1027314,0 -2.7441327,-1.372069 -2.7441327,-2.744137 z"
+       id="path4694-2"
+       sodipodi:nodetypes="cczc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cczc"
+       id="path5816"
+       d="m 13.034656,23.081554 5.488276,0 c 0,1.372068 -0.686038,2.744137 -2.744143,2.744137 -2.102731,0 -2.744133,-1.372069 -2.744133,-2.744137 z"
+       style="color:#000000;fill:url(#linearGradient5818);fill-opacity:1;stroke:#6f6f58;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6f6f58;stroke-width:1.37206864px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4.8022385,12.105005 10.9765555,0"
+       id="path4663-7"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 10.290524,31.313966 0,-19.20896"
+       id="path4661-0"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:url(#linearGradient5482-6);fill-opacity:1;stroke:#6f6f58;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 4.8022401,31.313966 10.9765549,0 -5.488271,-2.744138 -5.4882839,2.744138 z"
+       id="path4659-3"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(392,232)"
+     id="22_event-list"
+     inkscape:label="#event-list"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/event-list.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       style="color:#000000;fill:url(#linearGradient7762);fill-opacity:1;fill-rule:nonzero;stroke:#717171;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7728"
+       width="11"
+       height="12"
+       x="2.5"
+       y="-28.5"
+       transform="scale(1,-1)" />
+    <rect
+       transform="scale(1,-1)"
+       y="-16.5"
+       x="2.5"
+       height="3"
+       width="11"
+       id="rect7730"
+       style="color:#000000;fill:url(#linearGradient7764);fill-opacity:1;fill-rule:nonzero;stroke:#3e53a5;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7732"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7734"
+       d="m 2.5,18.5 11,0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 2.5,20.5 11,0"
+       id="path7736"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7738"
+       d="m 2.5,22.5 11,0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="m 2.5,24.5 11,0"
+       id="path7740"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7742"
+       d="m 2.5,26.5 11,0"
+       style="fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient7816);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6497-2"
+       sodipodi:cx="391"
+       sodipodi:cy="25"
+       sodipodi:rx="6"
+       sodipodi:ry="6"
+       d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+       transform="translate(-376.5,-0.5)" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient6506-5-38);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6521-02"
+       width="2"
+       height="6"
+       x="13.5"
+       y="20.5" />
+    <rect
+       y="26.5"
+       x="13.5"
+       height="2"
+       width="2"
+       id="rect6578-4"
+       style="color:#000000;fill:url(#radialGradient6580-6);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,392,216.67755)"
+     id="16_event-list"
+     inkscape:label="#event-list"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/event-list.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect7748"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient7768);fill-opacity:1;fill-rule:nonzero;stroke:#717171;stroke-width:1.37206864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7750"
+       width="9.6044807"
+       height="13.720686"
+       x="3.4301717"
+       y="-25.825686"
+       transform="scale(1,-1)" />
+    <rect
+       transform="scale(1,-1)"
+       y="-14.849138"
+       x="3.4301717"
+       height="2.7441373"
+       width="9.6044807"
+       id="rect7752"
+       style="color:#000000;fill:url(#linearGradient7770);fill-opacity:1;fill-rule:nonzero;stroke:#3e53a5;stroke-width:1.37206864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7754"
+       d="m 3.4301719,17.593282 9.6044811,-10e-7"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="m 3.4301719,20.337419 9.6044811,-1e-6"
+       id="path7756"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7758"
+       d="m 3.4301719,23.081556 9.6044811,0"
+       style="fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient7917);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6497-1-8"
+       sodipodi:cx="391"
+       sodipodi:cy="25"
+       sodipodi:rx="4.9999995"
+       sodipodi:ry="4.9999995"
+       d="m 396,25 c 0,2.761423 -2.23858,5 -5,5 -2.76142,0 -5,-2.238577 -5,-5 0,-2.761423 2.23858,-5 5,-5 2.76142,0 5,2.238577 5,5 z"
+       transform="matrix(1.3720687,0,0,1.3720687,-522.07224,-9.8480956)" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient6799-8);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6521-0-3"
+       width="2.7441368"
+       height="5.4882755"
+       x="13.034654"
+       y="20.337414" />
+    <rect
+       y="25.825684"
+       x="13.034654"
+       height="2.7441373"
+       width="2.7441373"
+       id="rect6578-0-1"
+       style="color:#000000;fill:url(#radialGradient6580-1-3);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/pin.png"
+     inkscape:label="#pin"
+     id="22_pin"
+     transform="translate(432,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5040"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="fill:url(#radialGradient6607);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-opacity:1"
+       d="M 7.8483487,23.987434 3.2521546,28.583628 3.0450501,30.204946 4.6663682,29.997842 9.2625623,25.401648 z"
+       id="path5332"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#linearGradient6275-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6114"
+       sodipodi:cx="40"
+       sodipodi:cy="143"
+       sodipodi:rx="4.7551465"
+       sodipodi:ry="3"
+       d="m 44.755147,143 c 0,1.65685 -2.128952,3 -4.755147,3 -2.626195,0 -4.755147,-1.34315 -4.755147,-3 0,-1.65685 2.128952,-3 4.755147,-3 2.626195,0 4.755147,1.34315 4.755147,3 z"
+       transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,82.801667,-106.12021)" />
+    <path
+       transform="matrix(0.75130095,0.75130095,-0.6363961,0.6363961,71.806157,-98.660237)"
+       d="m 43.764706,143 c 0,1.38071 -1.685516,2.5 -3.764706,2.5 -2.07919,0 -3.764706,-1.11929 -3.764706,-2.5 0,-1.38071 1.685516,-2.5 3.764706,-2.5 2.07919,0 3.764706,1.11929 3.764706,2.5 z"
+       sodipodi:ry="2.5"
+       sodipodi:rx="3.7647059"
+       sodipodi:cy="143"
+       sodipodi:cx="40"
+       id="path6125"
+       style="color:#000000;fill:url(#radialGradient6277-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6241-6);enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       style="color:#000000;fill:none;stroke:#2a4556;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 12.444543,20.805454 C 10.952353,19.313264 9.1350667,18.839792 8.0030283,19.324949 L 6.6109118,19.92157 c -1.522888,0.652667 -0.6195634,3.623077 1.2374369,5.480078 1.8570003,1.857 4.8274103,2.760325 5.4800773,1.237437 l 0.596622,-1.392117 c 0.485157,-1.132038 0.01168,-2.949325 -1.480505,-4.441514 z"
+       id="path6187"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient6601);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 14.21231,15.502153 9.6161157,19.39124 c -0.781049,0.781049 -0.464466,2.363961 0.7071063,3.535534 1.171573,1.171573 2.754485,1.488156 3.535534,0.707107 l 3.889088,-4.596194 -3.535534,-3.535534 z"
+       id="path6128" />
+    <path
+       style="color:#000000;fill:url(#linearGradient6598);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 18.45495,14.795046 c -1.464466,-1.464466 -3.126522,-2.176779 -3.71231,-1.59099 0,0 -0.810663,0.457109 -0.883884,0.53033 -0.585788,0.585788 0.20567,2.32699 1.767767,3.889087 1.562097,1.562097 3.303299,2.353556 3.889088,1.767767 0.07322,-0.07322 0.53033,-0.883883 0.53033,-0.883883 0.585788,-0.585789 -0.126524,-2.247845 -1.590991,-3.712311 z"
+       id="path6118"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zcczssz" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#099cff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6116"
+       sodipodi:cx="40"
+       sodipodi:cy="132"
+       sodipodi:rx="3.5"
+       sodipodi:ry="1.5"
+       d="m 43.5,132 c 0,0.82843 -1.567003,1.5 -3.5,1.5 -1.932997,0 -3.5,-0.67157 -3.5,-1.5 0,-0.82843 1.567003,-1.5 3.5,-1.5 1.932997,0 3.5,0.67157 3.5,1.5 z"
+       transform="matrix(0.70710678,0.70710678,-0.58925565,0.58925565,67.068542,-90.387088)" />
+    <path
+       style="color:#000000;fill:none;stroke:#2a4556;stroke-width:1;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 18.45495,14.795046 c -1.464466,-1.464466 -3.001934,-2.017217 -3.71231,-1.59099 l -0.883884,0.53033 c -0.710376,0.426227 0.20567,2.32699 1.767767,3.889087 1.562097,1.562097 3.462861,2.478144 3.889088,1.767767 l 0.53033,-0.883883 C 20.472168,17.79698 19.919417,16.259512 18.45495,14.795046 z"
+       id="path6192"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssss" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/pin.png"
+     inkscape:label="#pin"
+     id="16_pin"
+     transform="matrix(0.7288265,0,0,0.7288265,432,216.67755)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5060"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <path
+       style="fill:url(#radialGradient6798);fill-opacity:1;stroke:#4b4b3c;stroke-width:1.23486173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 7.5882709,23.296524 2.8490251,28.035762 2.6354761,29.70754 4.3072545,29.493992 9.0464927,24.754754 z"
+       id="path5332-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#linearGradient7308);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6114-5"
+       sodipodi:cx="40"
+       sodipodi:cy="143"
+       sodipodi:rx="4.7551465"
+       sodipodi:ry="3"
+       d="m 44.755147,143 c 0,1.65685 -2.128952,3 -4.755147,3 -2.626195,0 -4.755147,-1.34315 -4.755147,-3 0,-1.65685 2.128952,-3 4.755147,-3 2.626195,0 4.755147,1.34315 4.755147,3 z"
+       transform="matrix(0.72911398,0.72911398,-0.72911398,0.72911398,84.874355,-110.86045)" />
+    <path
+       transform="matrix(0.77468361,0.77468361,-0.65620258,0.65620258,73.536627,-103.16829)"
+       d="m 43.764706,143 c 0,1.38071 -1.685516,2.5 -3.764706,2.5 -2.07919,0 -3.764706,-1.11929 -3.764706,-2.5 0,-1.38071 1.685516,-2.5 3.764706,-2.5 2.07919,0 3.764706,1.11929 3.764706,2.5 z"
+       sodipodi:ry="2.5"
+       sodipodi:rx="3.7647059"
+       sodipodi:cy="143"
+       sodipodi:cx="40"
+       id="path6125-0"
+       style="color:#000000;fill:url(#radialGradient7310);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6241-6-4);enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       style="color:#000000;fill:none;stroke:#2a4556;stroke-width:1.23486173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 12.327509,20.015508 C 10.788875,18.476882 8.9150311,17.988671 7.7477638,18.488929 l -1.4354439,0.615186 c -1.570287,0.672984 -0.6388508,3.735837 1.275951,5.650639 1.914794,1.914794 4.9776471,2.84623 5.6506311,1.27595 l 0.615186,-1.435443 c 0.500257,-1.167275 0.01202,-3.04112 -1.526579,-4.579753 z"
+       id="path6187-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient6792);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:1.23486173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 14.150296,14.547155 -4.7392459,4.010124 c -0.8053554,0.805363 -0.4789221,2.437536 0.7291149,3.645573 1.208037,1.208037 2.84021,1.53447 3.645573,0.729115 l 4.010124,-4.739238 -3.645566,-3.645574 z"
+       id="path6128-4" />
+    <path
+       style="color:#000000;fill:url(#linearGradient6789);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 18.524976,13.818041 c -1.510046,-1.510046 -3.223826,-2.244527 -3.827844,-1.640508 0,0 -0.835897,0.471339 -0.911394,0.546836 -0.604018,0.604018 0.212069,2.399412 1.822787,4.01013 1.610711,1.610711 3.406105,2.426806 4.010123,1.82278 0.0755,-0.0755 0.546836,-0.911386 0.546836,-0.911386 0.604019,-0.604026 -0.130462,-2.317806 -1.640508,-3.827852 z"
+       id="path6118-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zcczssz" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#099cff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6116-7"
+       sodipodi:cx="40"
+       sodipodi:cy="132"
+       sodipodi:rx="3.5"
+       sodipodi:ry="1.5"
+       d="m 43.5,132 c 0,0.82843 -1.567003,1.5 -3.5,1.5 -1.932997,0 -3.5,-0.67157 -3.5,-1.5 0,-0.82843 1.567003,-1.5 3.5,-1.5 1.932997,0 3.5,0.67157 3.5,1.5 z"
+       transform="matrix(0.72911398,0.72911398,-0.60759498,0.60759498,68.651559,-94.637659)" />
+    <path
+       style="color:#000000;fill:none;stroke:#2a4556;stroke-width:1.23486173;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 18.524976,13.818041 C 17.01493,12.307995 15.429613,11.738042 14.697132,12.177533 l -0.911394,0.546836 c -0.732489,0.43949 0.212069,2.399412 1.822787,4.01013 1.610711,1.610711 3.570633,2.555269 4.010123,1.82278 l 0.546836,-0.911386 c 0.439491,-0.732489 -0.130462,-2.317806 -1.640508,-3.827852 z"
+       id="path6192-0"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssss" />
+  </g>
+  <g
+     transform="translate(456,232)"
+     id="22_star"
+     inkscape:label="#star"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/star.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5385"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:url(#linearGradient6257);fill-opacity:1.0;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5444"
+       sodipodi:sides="5"
+       sodipodi:cx="468"
+       sodipodi:cy="252"
+       sodipodi:r1="9.5"
+       sodipodi:r2="4"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-0.94247783"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 468,242.5 2.35114,6.26393 6.6839,0.30041 -5.23081,4.17173 1.77973,6.44959 L 468,256 l -5.58396,3.68566 1.77973,-6.44959 -5.23081,-4.17173 6.6839,-0.30041 z"
+       transform="translate(-457.5,-229.5)"
+       inkscape:transform-center-y="-0.76393202" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,456,216.67755)"
+     id="16_star"
+     inkscape:label="#star"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/star.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect5405"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       transform="matrix(1.3720687,0,0,1.3720687,-625.66333,-297.29648)"
+       sodipodi:type="star"
+       style="color:#000000;fill:url(#linearGradient6316);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:0.89999998000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6289"
+       sodipodi:sides="5"
+       sodipodi:cx="463.5"
+       sodipodi:cy="232.5"
+       sodipodi:r1="6"
+       sodipodi:r2="2.5263157"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-0.9424778"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 463.5,226.5 1.48493,3.95617 4.22141,0.18973 -3.30367,2.63477 1.12404,4.07343 -3.52671,-2.32778 -3.52671,2.32778 1.12404,-4.07343 -3.30367,-2.63477 4.22141,-0.18973 z"
+       inkscape:transform-center-y="-0.78612119"
+       inkscape:transform-center-x="-2.2384085e-05" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/star-off.png"
+     inkscape:label="#star-off"
+     id="22_star-off"
+     transform="translate(480,232)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6320"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:transform-center-y="-0.76393202"
+       transform="translate(-457.5,-229.5)"
+       d="m 468,242.5 2.35114,6.26393 6.6839,0.30041 -5.23081,4.17173 1.77973,6.44959 L 468,256 l -5.58396,3.68566 1.77973,-6.44959 -5.23081,-4.17173 6.6839,-0.30041 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="-0.94247783"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:r2="4"
+       sodipodi:r1="9.5"
+       sodipodi:cy="252"
+       sodipodi:cx="468"
+       sodipodi:sides="5"
+       id="path6322"
+       style="color:#000000;fill:url(#linearGradient6330);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1"
+       sodipodi:type="star" />
+    <path
+       sodipodi:type="star"
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1"
+       id="path6336"
+       sodipodi:sides="5"
+       sodipodi:cx="468"
+       sodipodi:cy="252"
+       sodipodi:r1="9.5"
+       sodipodi:r2="4"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-0.94247783"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 468,242.5 2.35114,6.26393 6.6839,0.30041 -5.23081,4.17173 1.77973,6.44959 L 468,256 l -5.58396,3.68566 1.77973,-6.44959 -5.23081,-4.17173 6.6839,-0.30041 z"
+       transform="translate(-457.5,-229.5)"
+       inkscape:transform-center-y="-0.76393202" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/star-off.png"
+     inkscape:label="#star-off"
+     id="16_star-off"
+     transform="matrix(0.7288265,0,0,0.7288265,480,216.67755)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6326"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <path
+       inkscape:transform-center-x="-2.2384085e-05"
+       inkscape:transform-center-y="-0.78612119"
+       d="m 463.5,226.5 1.48493,3.95617 4.22141,0.18973 -3.30367,2.63477 1.12404,4.07343 -3.52671,-2.32778 -3.52671,2.32778 1.12404,-4.07343 -3.30367,-2.63477 4.22141,-0.18973 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="false"
+       sodipodi:arg2="-0.9424778"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:r2="2.5263157"
+       sodipodi:r1="6"
+       sodipodi:cy="232.5"
+       sodipodi:cx="463.5"
+       sodipodi:sides="5"
+       id="path6328"
+       style="color:#000000;fill:url(#linearGradient6332);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.89999998000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1"
+       sodipodi:type="star"
+       transform="matrix(1.3720687,0,0,1.3720687,-625.66333,-297.29648)" />
+    <path
+       transform="matrix(1.3720687,0,0,1.3720687,-625.66333,-297.29648)"
+       sodipodi:type="star"
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.89999998000000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.1"
+       id="path6334"
+       sodipodi:sides="5"
+       sodipodi:cx="463.5"
+       sodipodi:cy="232.5"
+       sodipodi:r1="6"
+       sodipodi:r2="2.5263157"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-0.9424778"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m 463.5,226.5 1.48493,3.95617 4.22141,0.18973 -3.30367,2.63477 1.12404,4.07343 -3.52671,-2.32778 -3.52671,2.32778 1.12404,-4.07343 -3.30367,-2.63477 4.22141,-0.18973 z"
+       inkscape:transform-center-y="-0.78612119"
+       inkscape:transform-center-x="-2.2384085e-05" />
+  </g>
+  <g
+     transform="translate(0,176)"
+     id="22_quit"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/quit.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:label="#quit">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6228"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="M 20,29 A 9,9 0 1 1 2,29 9,9 0 1 1 20,29 z"
+       transform="translate(-0.5,-7.5)"
+       id="path6234"
+       style="color:#000000;fill:url(#radialGradient5981-6);fill-opacity:1;fill-rule:nonzero;stroke:#415564;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="2"
+       height="9"
+       x="9.5"
+       y="14.5"
+       id="rect6381"
+       style="color:#000000;fill:url(#radialGradient6486);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="m 7.5,24.3125 c -1.7933705,1.037441 -3,2.96669 -3,5.1875 0,3.31369 2.6862915,6 6,6 3.313708,0 6,-2.68631 6,-6 0,-2.22081 -1.206629,-4.150059 -3,-5.1875 l 0,2.53125 c 0.623526,0.705409 1,1.640752 1,2.65625 0,2.20912 -1.790864,4 -4,4 -2.209136,0 -4,-1.79088 -4,-4 0,-1.015498 0.376474,-1.950841 1,-2.65625 l 0,-2.53125 z"
+       transform="translate(0,-8)"
+       id="path6429"
+       style="color:#000000;fill:url(#radialGradient5596);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.0026114;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="16_quit"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/quit.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:label="#quit"
+     transform="translate(0,152)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3218"
+       y="16"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient3228-3);fill-opacity:1;fill-rule:nonzero;stroke:#415564;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3236"
+       sodipodi:cx="7.5"
+       sodipodi:cy="8.5"
+       sodipodi:rx="7"
+       sodipodi:ry="7"
+       d="m 14.5,8.5 c 0,3.865993 -3.134007,7 -7,7 -3.8659932,0 -7,-3.134007 -7,-7 0,-3.8659932 3.1340068,-7 7,-7 3.865993,0 7,3.1340068 7,7 z"
+       transform="translate(0,16)" />
+    <path
+       style="color:#000000;fill:url(#radialGradient6149);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 5.5,3.9375 c -1.7595219,0.7742722 -3,2.5168075 -3,4.5625 0,2.761424 2.2385763,5 5,5 2.761424,0 5,-2.238576 5,-5 0,-2.0456925 -1.240478,-3.7882278 -3,-4.5625 l 0,2.34375 c 0.608905,0.5490738 1,1.3342822 1,2.21875 0,1.656854 -1.3431458,3 -3,3 -1.6568542,0 -3,-1.343146 -3,-3 0,-0.8844678 0.3910945,-1.6696762 1,-2.21875 l 0,-2.34375 z"
+       transform="translate(0,16)"
+       id="path6094"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:url(#radialGradient3230);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3327"
+       width="2"
+       height="7"
+       x="6.5"
+       y="18.5" />
+  </g>
+  <g
+     inkscape:label="#help"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/help.png"
+     id="22_help"
+     transform="translate(24,176)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4390"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="fill:url(#radialGradient4506);fill-opacity:1;stroke:#2a4556;stroke-width:1;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6434"
+       d="m 13.5,23.5 -5,0 c 0,-1.5 -0.00967,-2.490333 1,-3.5 1,-1 4,-1.491605 4,-3 0,-1.5 -1,-1.5 -2,-1.5 -1.01771,0 -2,1 -2,2 l -5,-1 C 5,12 9,11.5 12,11.5 c 3.008936,0 5.5,1.5 5.5,4.5 0,2.954116 -0.996673,3.497782 -2.5,4.5 -1.5,1 -1.5,1.5 -1.5,3 z"
+       sodipodi:nodetypes="cczzzcczzzc"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:url(#radialGradient4503);fill-opacity:1;stroke:#2a4556;stroke-opacity:1"
+       id="rect6447"
+       y="25.5"
+       x="8.5"
+       height="5.0000038"
+       width="5.0000086" />
+  </g>
+  <g
+     inkscape:label="#help"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/help.png"
+     transform="translate(24,152)"
+     id="16_help">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect4402"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:url(#radialGradient4535);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path6434-2"
+       d="m 9.5,26 -3,0 c 0,-0.964286 0.011149,-1.511149 1,-2.5 1,-1 2,-1.388868 2,-2 0,-0.5 -0.5584955,-1 -1.5,-1 -1,0 -1.5,0.857143 -1.5,1.5 l -3,-0.5 c 0.3214287,-2.892858 2,-4 4.5,-4 2.459001,0 4.5,1.571428 4.5,3.5 0,1.899076 -1.033575,2.355717 -2,3 -0.9642859,0.642858 -1,1.035714 -1,2 z"
+       sodipodi:nodetypes="cczzzcczzzc"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="fill:url(#radialGradient4503-7);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect6447-7"
+       y="27.5"
+       x="6.5"
+       height="3"
+       width="3" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/configure.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#configure"
+     id="22_configure"
+     transform="translate(48,176)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4115"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       id="path7117"
+       transform="translate(-392,-8)"
+       d="m 409,19.5 c -1.5,0 -3,1.5 -3.5,3.5 -0.5,2 -2,3.5 -2.5,4 -0.5,0.5 -8.5,7.5 -9.5,8.5 -1,1 -1,1.5 -1,2 0,1.104569 0.89543,2 2,2 0.5,0 1,0 2,-1 1,-1 8,-9 8.5,-9.5 0.5,-0.5 2,-2 6,-1.5 l -2,-5 0.5,-1 2.5,-1 c -0.5,-0.5 -1.5,-1 -3,-1 z m -14.5,17 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+       style="color:#000000;fill:url(#linearGradient7135);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path7035"
+       d="m 21.5,16 -2.5,1 -0.5,1 0.5,1.5 c 2.5,-1 2.5,-2.5 2.5,-3.5 z"
+       style="color:#000000;fill:url(#linearGradient7181);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="color:#000000;fill:url(#linearGradient7119);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 409,19.5 c -1.5,0 -3,1.5 -3.5,3.5 -0.5,2 -2,3.5 -2.5,4 -0.5,0.5 -8.5,7.5 -9.5,8.5 -1,1 -1,1.5 -1,2 0,1.104569 0.89543,2 2,2 0.5,0 1,0 2,-1 1,-1 8,-9 8.5,-9.5 0.5,-0.5 2,-2 6,-1.5 l -2,-5 0.5,-1 2.5,-1 c -0.5,-0.5 -1.5,-1 -3,-1 z m -14.5,17 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+       transform="translate(-392,-8)"
+       id="path4915"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="M 4.5,27.5 12,20"
+       id="path7033"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 13.5,17.5 2,-0.5"
+       id="path7063"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16.5,18.5 -2,0.5"
+       id="path7041"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7065"
+       d="m 14,18.25 2,-0.5"
+       style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="cc" />
+    <path
+       id="path7133"
+       transform="translate(-392,-8)"
+       d="m 409,19.5 c -1.5,0 -3,1.5 -3.5,3.5 -0.5,2 -2,3.5 -2.5,4 -0.5,0.5 -8.5,7.5 -9.5,8.5 -1,1 -1,1.5 -1,2 0,1.104569 0.89543,2 2,2 0.5,0 1,0 2,-1 1,-1 8,-9 8.5,-9.5 0.5,-0.5 2,-2 6,-1.5 l -2,-5 0.5,-1 2.5,-1 c -0.5,-0.5 -1.5,-1 -3,-1 z m -14.5,17 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+       style="color:#000000;fill:url(#linearGradient7143);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/configure.png"
+     inkscape:label="#configure"
+     id="16_configure"
+     transform="matrix(0.72727273,0,0,0.72727273,48,160.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:0.99962503;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4129"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       id="path7117-1"
+       style="color:#000000;fill:url(#linearGradient7511);fill-opacity:1;stroke:none;stroke-width:1.23749995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16.5,12.0625 c -1.375,0 -2.75,1.375 -3.4375,3.4375 C 12.375,17.5625 11,18.9375 10.3125,19.625 9.625,20.3125 2.75,26.15625 1.71875,27.1875 0.68750003,28.21875 0.68750003,28.738781 0.68750003,29.25 c 0,1.129352 0.93315697,2.0625 2.06249997,2.0625 0.511211,0 1.03125,0 2.0625,-1.03125 C 5.84375,29.25 11.6875,22.375 12.375,21.6875 13.0625,21 14.4375,19.625 18.5625,20.3125 L 15.8125,15.5 16.5,14.125 19.25,12.75 C 18.5625,12.0625 17.875,12.0625 16.5,12.0625 z m -13.75,16.5 c 0.379692,0 0.6875,0.307804 0.6875,0.6875 0,0.379695 -0.307808,0.6875 -0.6875,0.6875 -0.379693,0 -0.6875,-0.307805 -0.6875,-0.6875 0,-0.379696 0.307807,-0.6875 0.6875,-0.6875 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssssccccssssss" />
+    <path
+       id="path4915-4"
+       style="color:#000000;fill:url(#linearGradient7504);fill-opacity:1;stroke:none;stroke-width:0.99962503;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 16.5,12.0625 c -1.375,0 -2.75,1.375 -3.4375,3.4375 C 12.375,17.5625 11,18.9375 10.3125,19.625 9.625,20.3125 2.75,26.15625 1.71875,27.1875 0.68750003,28.21875 0.68750003,28.738781 0.68750003,29.25 c 0,1.129352 0.93315697,2.0625 2.06249997,2.0625 0.511211,0 1.03125,0 2.0625,-1.03125 C 5.84375,29.25 11.6875,22.375 12.375,21.6875 13.0625,21 14.4375,19.625 18.5625,20.3125 L 15.8125,15.5 16.5,14.125 19.25,12.75 C 18.5625,12.0625 17.875,12.0625 16.5,12.0625 z m -13.75,16.5 c 0.379692,0 0.6875,0.307804 0.6875,0.6875 0,0.379695 -0.307808,0.6875 -0.6875,0.6875 -0.379693,0 -0.6875,-0.307805 -0.6875,-0.6875 0,-0.379696 0.307807,-0.6875 0.6875,-0.6875 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssssccccssssss" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path7035-1"
+       d="m 21.3125,16.1875 -2.75,1.375 -0.6875,1.375 0.6875,1.375 c 2.75,-1.375 2.75,-2.75 2.75,-4.125 z"
+       style="color:#000000;fill:url(#linearGradient7181-0);fill-opacity:1;stroke:#4b4b3c;stroke-width:1.10000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:#4b4b3c;stroke-width:1.23749995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none"
+       d="M 4.46875,27.53125 11,21"
+       id="path7033-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient7459);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.80000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 404,1.5 c -1,0 -2,1 -2.5,2.5 -0.5,1.5 -1.5,2.5 -2,3 -0.5,0.5 -5.5,4.75 -6.25,5.5 -0.75,0.75 -0.75,1.128205 -0.75,1.5 0,0.821347 0.67866,1.5 1.5,1.5 0.37179,0 0.75,0 1.5,-0.75 0.75,-0.75 5,-5.75 5.5,-6.25 0.5,-0.5 1.5,-1.5 4.5,-1 l -2,-3.5 0.5,-1 2,-1 c -0.5,-0.5 -1,-0.5 -2,-0.5 z m -10,12 c 0.27614,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.22386,-0.5 0.5,-0.5 z"
+       transform="matrix(1.375,0,0,1.375,-539,9.9999996)"
+       id="path7133-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssssssssccccssssss" />
+    <path
+       style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1.23749995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15.8125,18.9375 -2.75,0.6875"
+       id="path7041-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path7065-9"
+       d="M 12.375,18.9375 15.125,18.25"
+       style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1.23749995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="cc" />
+  </g>
+  <g
+     transform="translate(72,176)"
+     id="22_configure-shortcuts"
+     inkscape:label="#configure-shortcuts"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/configure-shortcuts.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect12365"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g12464"
+       transform="translate(-1,-1)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:url(#linearGradient12540);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.5,31.5 0,-8 5.000001,0.0625 L 13.5,19.5 l 8,0 0,12 z"
+         id="path6440-7-8"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient12542);fill-opacity:1;stroke:none"
+         d="m 8.5,30 11.5,0 0,-10.5 1.5,0 0,12 -13,0 z"
+         id="path12515"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         id="path12469"
+         d="m 8.5,31.5 0,-8 5.000001,0.0625 L 13.5,19.5 l 8,0 -1.5,1.5 -5,0 0,4 -5,0 0,5 z"
+         style="fill:url(#linearGradient12544);fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path12467"
+         d="m 8.5,31.5 0,-8 5.000001,0.0625 L 13.5,19.5 l 8,0 0,12 z"
+         style="fill:none;stroke:#415564;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path12519"
+         transform="translate(-384,-120)"
+         style="fill:none;stroke:#415564;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 396,147.5 5.5,0 0,-5.5 m -4,3.5 -2,2 2,2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+    </g>
+    <g
+       id="g12576">
+      <path
+         id="path12367"
+         d="m 17,11.5 c -1.5,0 -3,1.5 -3.5,3.5 -0.5,2 -2,3.5 -2.5,4 -0.5,0.5 -8.5,7.5 -9.5,8.5 -1,1 -1,1.5 -1,2 0,1.104569 0.89543,2 2,2 0.5,0 1,0 2,-1 1,-1 8,-9 8.5,-9.5 0.5,-0.5 2,-2 6,-1.5 l -2,-5 0.5,-1 2.5,-1 c -0.5,-0.5 -1.5,-1 -3,-1 z m -14.5,17 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+         style="color:#000000;fill:url(#linearGradient12568);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path12369"
+         d="m 21.5,16 -2.5,1 -0.5,1 0.5,1.5 c 2.5,-1 2.5,-2.5 2.5,-3.5 z"
+         style="color:#000000;fill:url(#linearGradient12565);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:url(#linearGradient12562);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 17,11.5 c -1.5,0 -3,1.5 -3.5,3.5 -0.5,2 -2,3.5 -2.5,4 -0.5,0.5 -8.5,7.5 -9.5,8.5 -1,1 -1,1.5 -1,2 0,1.104569 0.89543,2 2,2 0.5,0 1,0 2,-1 1,-1 8,-9 8.5,-9.5 0.5,-0.5 2,-2 6,-1.5 l -2,-5 0.5,-1 2.5,-1 c -0.5,-0.5 -1.5,-1 -3,-1 z m -14.5,17 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+         id="path12371"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.62745098"
+         d="M 4.5,27.5 12,20"
+         id="path12373"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 13.5,17.5 2,-0.5"
+         id="path12375"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 16.5,18.5 -2,0.5"
+         id="path12377"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path12379"
+         d="m 14,18.25 2,-0.5"
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:nodetypes="cc" />
+      <path
+         id="path12381"
+         d="m 17,11.5 c -1.5,0 -3,1.5 -3.5,3.5 -0.5,2 -2,3.5 -2.5,4 -0.5,0.5 -8.5,7.5 -9.5,8.5 -1,1 -1,1.5 -1,2 0,1.104569 0.89543,2 2,2 0.5,0 1,0 2,-1 1,-1 8,-9 8.5,-9.5 0.5,-0.5 2,-2 6,-1.5 l -2,-5 0.5,-1 2.5,-1 c -0.5,-0.5 -1.5,-1 -3,-1 z m -14.5,17 c 0.55228,0 1,0.447715 1,1 0,0.552285 -0.44772,1 -1,1 -0.55228,0 -1,-0.447715 -1,-1 0,-0.552285 0.44772,-1 1,-1 z"
+         style="color:#000000;fill:url(#linearGradient12555);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,72,160.72727)"
+     id="16_configure-shortcuts"
+     inkscape:label="#configure-shortcuts"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/configure-shortcuts.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect12385"
+       style="color:#000000;fill:none;stroke:none;stroke-width:0.99962503;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g12464-1"
+       transform="matrix(1.375,0,0,1.375,19.25,-11.999996)">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:url(#linearGradient12540-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -8.5,31.5 0,-6 4.000001,0.0625 -1e-6,-3.0625 6,0 0,9 z"
+         id="path6440-7-8-0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient12542-9);fill-opacity:1;stroke:none"
+         d="M -8.5,30 1.8750029e-8,30 l 0,-7.5 L 1.5,22.5 l 0,9 -10,0 z"
+         id="path12515-0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         id="path12469-9"
+         d="m -8.5,31.5 0,-6 4.000001,0.0625 -1e-6,-3.0625 6,0 L 1.8750029e-8,24 -3,24 l 0,3 -4,0 0,3 z"
+         style="fill:url(#linearGradient12544-4);fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         id="path12467-8"
+         d="m -8.5,31.5 0,-6 4.000001,0.0625 -1e-6,-3.0625 6,0 0,9 z"
+         style="fill:none;stroke:#415564;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path12519-1"
+         style="fill:none;stroke:#415564;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -5.5,28.5 4,0 0,-3.5 m -2.5,1.5 -2,2 2,2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+    </g>
+    <g
+       id="g12586">
+      <path
+         id="path12387"
+         style="color:#000000;fill:url(#linearGradient12409);fill-opacity:1;stroke:none;stroke-width:1.23749995;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 16.5,12.0625 c -1.375,0 -2.75,1.375 -3.4375,3.4375 C 12.375,17.5625 11,18.9375 10.3125,19.625 9.625,20.3125 2.75,26.15625 1.71875,27.1875 0.68750003,28.21875 0.68750003,28.738781 0.68750003,29.25 c 0,1.129352 0.93315697,2.0625 2.06249997,2.0625 0.511211,0 1.03125,0 2.0625,-1.03125 C 5.84375,29.25 11.6875,22.375 12.375,21.6875 13.0625,21 14.4375,19.625 18.5625,20.3125 L 15.8125,15.5 16.5,14.125 19.25,12.75 C 18.5625,12.0625 17.875,12.0625 16.5,12.0625 z m -13.75,16.5 c 0.379692,0 0.6875,0.307804 0.6875,0.6875 0,0.379695 -0.307808,0.6875 -0.6875,0.6875 -0.379693,0 -0.6875,-0.307805 -0.6875,-0.6875 0,-0.379696 0.307807,-0.6875 0.6875,-0.6875 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssssssssccccssssss" />
+      <path
+         id="path12389"
+         style="color:#000000;fill:url(#linearGradient12411);fill-opacity:1;stroke:none;stroke-width:0.99962503;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 16.5,12.0625 c -1.375,0 -2.75,1.375 -3.4375,3.4375 C 12.375,17.5625 11,18.9375 10.3125,19.625 9.625,20.3125 2.75,26.15625 1.71875,27.1875 0.68750003,28.21875 0.68750003,28.738781 0.68750003,29.25 c 0,1.129352 0.93315697,2.0625 2.06249997,2.0625 0.511211,0 1.03125,0 2.0625,-1.03125 C 5.84375,29.25 11.6875,22.375 12.375,21.6875 13.0625,21 14.4375,19.625 18.5625,20.3125 L 15.8125,15.5 16.5,14.125 19.25,12.75 C 18.5625,12.0625 17.875,12.0625 16.5,12.0625 z m -13.75,16.5 c 0.379692,0 0.6875,0.307804 0.6875,0.6875 0,0.379695 -0.307808,0.6875 -0.6875,0.6875 -0.379693,0 -0.6875,-0.307805 -0.6875,-0.6875 0,-0.379696 0.307807,-0.6875 0.6875,-0.6875 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssssssssccccssssss" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path12391"
+         d="m 21.3125,16.1875 -2.75,1.375 -0.6875,1.375 0.6875,1.375 c 2.75,-1.375 2.75,-2.75 2.75,-4.125 z"
+         style="color:#000000;fill:url(#linearGradient12413);fill-opacity:1;stroke:#4b4b3c;stroke-width:1.10000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:none;stroke:#4b4b3c;stroke-width:1.23749995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none"
+         d="M 4.46875,27.53125 11,21"
+         id="path12393"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="color:#000000;fill:url(#linearGradient12415);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.80000001;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 404,1.5 c -1,0 -2,1 -2.5,2.5 -0.5,1.5 -1.5,2.5 -2,3 -0.5,0.5 -5.5,4.75 -6.25,5.5 -0.75,0.75 -0.75,1.128205 -0.75,1.5 0,0.821347 0.67866,1.5 1.5,1.5 0.37179,0 0.75,0 1.5,-0.75 0.75,-0.75 5,-5.75 5.5,-6.25 0.5,-0.5 1.5,-1.5 4.5,-1 l -2,-3.5 0.5,-1 2,-1 c -0.5,-0.5 -1,-0.5 -2,-0.5 z m -10,12 c 0.27614,0 0.5,0.223858 0.5,0.5 0,0.276142 -0.22386,0.5 -0.5,0.5 -0.27614,0 -0.5,-0.223858 -0.5,-0.5 0,-0.276142 0.22386,-0.5 0.5,-0.5 z"
+         transform="matrix(1.375,0,0,1.375,-539,9.9999996)"
+         id="path12395"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ssssssssccccssssss" />
+      <path
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1.23749995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 15.8125,18.9375 -2.75,0.6875"
+         id="path12397"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path12399"
+         d="M 12.375,18.9375 15.125,18.25"
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1.23749995;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+  <g
+     transform="translate(96,176)"
+     id="22_edit"
+     inkscape:label="#edit"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/edit.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect10079"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#radialGradient10123);fill-opacity:1;stroke:none"
+       d="m 10,28.5 5.5,-11 -4,-2 -5.5,11 1.5,2 2.5,0 z"
+       id="path10083"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path10085"
+       d="m 8,27.5 5.5,-11"
+       style="fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path10087"
+       d="m 10,28.5 -4,-2 0.5,4 3.5,-2 z"
+       style="fill:url(#radialGradient10125);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#radialGradient10127);fill-opacity:1;stroke:none"
+       d="m 16.5,15.5 -4,-2 -1,2 4,2 1,-2 z"
+       id="path10089"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="path10091"
+       d="m 17.5,13.5 -4,-2 -1,2 4,2 1,-2 z"
+       style="fill:url(#radialGradient10129);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       d="m 16.5,15.5 1,-2 -4,-2 -1,2"
+       id="path10093"
+       sodipodi:nodetypes="cccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc"
+       id="path10095"
+       d="m 16.5,15.5 -4,-2 -6.5,13 0.5,4 3.5,-2 6.5,-13 z"
+       style="fill:none;stroke:#4c4c3d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path10097"
+       d="m 11.5,15.5 4,2"
+       style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,96,160.67755)"
+     id="16_edit"
+     inkscape:label="#edit"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/edit.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect10101"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#radialGradient10133);fill-opacity:1;stroke:none"
+       d="m 10.06183,28.341165 5.030927,-10.061852 -3.658859,-1.829428 -5.0309218,10.061852 1.3720686,1.829428 2.2867852,0 z"
+       id="path10105"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path10107"
+       d="M 8.2324131,27.19776 13.034654,17.593279"
+       style="fill:none;stroke:#6f6f58;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path10109"
+       d="M 10.290517,28.569828 6.1743092,26.511725 6.8603435,29.941897 10.290517,28.569828 z"
+       style="fill:url(#radialGradient10135);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#radialGradient10137);fill-opacity:1;stroke:none"
+       d="m 16.464826,16.22121 -4.116206,-2.058103 -1.372069,2.744138 4.116206,2.058103 1.372069,-2.744138 z"
+       id="path10111"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="path10113"
+       d="m 17.15086,14.849142 -4.116206,-2.058103 -1.029051,2.058102 4.116206,2.058104 1.029051,-2.058103 z"
+       style="fill:url(#radialGradient10139);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#603b31;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.778792,17.593279 1.372068,-2.744137 -4.116206,-2.058103 -1.372068,2.744137"
+       id="path10115"
+       sodipodi:nodetypes="cccc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc"
+       id="path10117"
+       d="M 10.290517,28.569828 16.121809,16.907245 12.005603,14.849142 6.1743092,26.511725 6.8603435,29.941897 10.290517,28.569828 z"
+       style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path10119"
+       d="m 10.976551,16.907245 4.116206,2.058103"
+       style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/search.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#search"
+     id="22_search"
+     transform="translate(120,176)">
+    <path
+       style="fill:url(#linearGradient7021);fill-opacity:1;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 436.5,140.5 2,2 6.5,6 -2.5,2.5 -6,-6.5 -2,-2"
+       id="path7013"
+       inkscape:connector-curvature="0"
+       transform="translate(-424,-120)"
+       sodipodi:nodetypes="cccccc" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5945"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g7039">
+      <path
+         transform="translate(-421,-119)"
+         d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+         sodipodi:ry="6.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="136"
+         sodipodi:cx="428"
+         id="path6806"
+         style="color:#000000;fill:url(#radialGradient6239-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient6909);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6907"
+         sodipodi:cx="428"
+         sodipodi:cy="136"
+         sodipodi:rx="6.5"
+         sodipodi:ry="6.5"
+         d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+         transform="translate(-421,-119)" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:url(#linearGradient6949);stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6939);enable-background:accumulate"
+         id="path6905"
+         sodipodi:cx="428"
+         sodipodi:cy="136"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 434,136 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 3.31371,0 6,2.68629 6,6 z"
+         transform="translate(-421,-119)" />
+      <path
+         transform="translate(-421,-119)"
+         d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+         sodipodi:ry="6.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="136"
+         sodipodi:cx="428"
+         id="path6921"
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7637);enable-background:accumulate"
+         d="m 7,11.5 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,0.25674 0.02846,0.50262 0.0625,0.75 -0.0021,-0.45763 0.06335,-0.91165 0.1875,-1.375 0.75044,-2.8007 3.60555,-4.46919 6.40625,-3.71875 2.8007,0.75044 4.46919,3.6368 3.71875,6.4375 -0.12837,0.4791 -0.32061,0.90642 -0.5625,1.3125 C 12.0553,19.46855 12.5,18.28917 12.5,17 12.5,13.96243 10.03757,11.5 7,11.5 z"
+         id="path7609"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7597);enable-background:accumulate"
+         d="m 7,12 c -1.64808,0 -3.08913,0.83249 -4,2.0625 1.40812,-1.00322 3.2308,-1.41993 5.03125,-0.9375 0.31676,0.08488 0.6163,0.18223 0.90625,0.3125 L 9.1875,12.5 C 8.52925,12.17878 7.78163,12 7,12 z m 3.0625,1.09375 -0.21875,0.875 c 0.94547,0.63904 1.673,1.5097 2.125,2.53125 -0.14086,-1.38702 -0.86841,-2.58673 -1.90625,-3.40625 z"
+         id="path7454"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:url(#linearGradient7031);fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 436.5,144.5 2,-2 6.5,6 -2.5,2.5 z"
+       id="path7023"
+       inkscape:connector-curvature="0"
+       transform="translate(-424,-120)"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/search.png"
+     inkscape:label="#search"
+     id="16_search"
+     transform="matrix(0.72727273,0,0,0.72727273,120,160.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:0.99962503;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5979"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       id="path7013-0"
+       d="m 13.75,21.000004 6.875,6.875 -2.75,2.75 -6.875,-6.875"
+       style="fill:url(#linearGradient7357);fill-opacity:1;stroke:#4b4b3c;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <g
+       id="g7335"
+       transform="matrix(1.375,0,0,1.375,0,-3.7499959)">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient7343);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path7049"
+         sodipodi:cx="428"
+         sodipodi:cy="136"
+         sodipodi:rx="5"
+         sodipodi:ry="5.0000005"
+         d="m 433,136 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
+         transform="translate(-422.5,-120.5)" />
+      <path
+         transform="translate(-422.5,-120.5)"
+         d="m 433,136 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
+         sodipodi:ry="5.0000005"
+         sodipodi:rx="5"
+         sodipodi:cy="136"
+         sodipodi:cx="428"
+         id="path7051"
+         style="color:#000000;fill:url(#radialGradient7345);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-422.5,-120.5)"
+         d="m 432.5,136 c 0,2.48528 -2.01472,4.5 -4.5,4.5 -2.48528,0 -4.5,-2.01472 -4.5,-4.5 0,-2.48528 2.01472,-4.5 4.5,-4.5 2.48528,0 4.5,2.01472 4.5,4.5 z"
+         sodipodi:ry="4.5000005"
+         sodipodi:rx="4.5"
+         sodipodi:cy="136"
+         sodipodi:cx="428"
+         id="path7053"
+         style="color:#000000;fill:none;stroke:url(#linearGradient7347);stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6939-7);enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path7055"
+         sodipodi:cx="428"
+         sodipodi:cy="136"
+         sodipodi:rx="5"
+         sodipodi:ry="5.0000005"
+         d="m 433,136 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
+         transform="translate(-422.5,-120.5)" />
+      <path
+         style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7605);enable-background:accumulate"
+         d="m 5.5,11.5 c -2.20914,0 -4,1.79086 -4,4 0,0.17012 0.04189,0.33547 0.0625,0.5 0.01493,-0.24873 0.058,-0.49994 0.125,-0.75 0.53603,-2.0005 2.59325,-3.19228 4.59375,-2.65625 2.0005,0.53603 3.19228,2.59325 2.65625,4.59375 -0.08622,0.32177 -0.21668,0.63035 -0.375,0.90625 C 9.15124,17.39718 9.5,16.48346 9.5,15.5 c 0,-2.20914 -1.79086,-4 -4,-4 z"
+         id="path7271"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7601);enable-background:accumulate"
+         d="m 5.5,12 c -1.2684,0 -2.35486,0.6774 -2.96875,1.6875 1.03377,-0.67472 2.33873,-0.9384 3.625,-0.59375 0.15241,0.04084 0.29374,0.10115 0.4375,0.15625 l 0.25,-0.96875 C 6.4286,12.10775 5.97804,12 5.5,12 z M 7.75,12.8125 7.5,13.71875 C 8.13865,14.15766 8.65961,14.75401 9,15.4375 8.98155,14.38302 8.50384,13.44211 7.75,12.8125 z"
+         id="path7299"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="translate(160,176)"
+     id="22_reset"
+     inkscape:label="#reset"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/reset.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect8734"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path6399"
+       style="fill:url(#radialGradient8757);fill-opacity:1;stroke:#5f5428;stroke-linecap:round;stroke-opacity:1"
+       d="M 16,19.5 C 14.5,18 12,18 10,20 l -1,1 3,3 -11,2 2,-11 3,3 1,-1 c 3.5,-3.5 7.5,-4 11,-1 3,2.541422 3.5,8 0.5,11 -2.5,2.5 -6.5,1.5 -6.5,1.5 2.5,0 3.5,-1 4,-1.5 2,-2 2,-5.5 0,-7.5 z"
+       sodipodi:nodetypes="sscccccssscss" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/reset.png"
+     inkscape:label="#reset"
+     id="16_reset"
+     transform="translate(160,152)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7668"
+       y="16"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       sodipodi:nodetypes="sscccccssscss"
+       d="m 12,23.5 c -1,-1 -2.5,-1 -4,0.5 L 7,25 9.5,27 1,28 2,19.5 4,22 5,21 c 2.5,-2.5 7,-2.5 9,-0.5 1.5,1.5 2.5,5.5 0,8 -1.5,1.5 -4.9333334,1 -4.9333334,1 C 11,29.5 11.5,29 12,28.5 13.5,27 13.5,25 12,23.5 z"
+       style="fill:url(#radialGradient7672);fill-opacity:1;stroke:#5f5428;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path7670"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/okay.png"
+     inkscape:label="#okay"
+     id="22_okay"
+     transform="translate(184,176)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6743"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       id="path7578-2"
+       d="M 8.999997,28.999995 21,16.999999 17.499997,13.5 l -8.5,8.499998 -4.5,-4.499998 -3.5,3.499999 z"
+       style="fill:url(#linearGradient7645);fill-opacity:1;stroke:#435a36;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(184,152)"
+     id="16_okay"
+     inkscape:label="#okay"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/okay.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect7710"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:url(#linearGradient7714);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 6.5,29.5 15,21 l -2.5,-2.5 -6,6 -3,-3 L 1,24 z"
+       id="path7712"
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(208,176)"
+     id="22_apply"
+     inkscape:label="#apply"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/apply.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6751"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       id="path7578-2-1"
+       d="M 9,28.999995 21,16.999999 17.5,13.5 9,21.999998 4.5,17.5 1,20.999999 z"
+       style="fill:url(#linearGradient7689);fill-opacity:1;stroke:#2a4556;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/apply.png"
+     inkscape:label="#apply"
+     id="16_apply"
+     transform="translate(208,152)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7718"
+       y="16"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc"
+       id="path7720"
+       d="M 6.5,29.5 15,21 l -2.5,-2.5 -6,6 -3,-3 L 1,24 z"
+       style="fill:url(#linearGradient7722);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/cancel.png"
+     inkscape:label="#cancel"
+     id="22_cancel"
+     transform="translate(232,176)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6759"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="color:#000000;fill:url(#radialGradient7627);fill-opacity:1;fill-rule:nonzero;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 11,11.5 c -5.24671,0 -9.5,4.253295 -9.5,9.5 0,5.246705 4.25329,9.5 9.5,9.5 5.24671,0 9.5,-4.253295 9.5,-9.5 0,-5.246705 -4.25329,-9.5 -9.5,-9.5 z m 0,4 c 0.73603,0 1.45211,0.143946 2.09375,0.40625 l -7.1875,7.1875 C 5.64395,22.45211 5.5,21.736026 5.5,21 5.5,17.962434 7.96243,15.5 11,15.5 z m 5.09375,3.40625 C 16.35605,19.54789 16.5,20.263974 16.5,21 c 0,3.037566 -2.46243,5.5 -5.5,5.5 -0.73603,0 -1.45211,-0.143946 -2.09375,-0.40625 l 7.1875,-7.1875 z"
+       id="path6808"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,232,160.72727)"
+     id="16_cancel"
+     inkscape:label="#cancel"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/cancel.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7726"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="color:#000000;fill:url(#radialGradient7799);fill-opacity:1;fill-rule:nonzero;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 168,1.5 c -3.58985,0 -6.5,2.9101491 -6.5,6.5 0,3.589851 2.91015,6.5 6.5,6.5 3.58985,0 6.5,-2.910149 6.5,-6.5 0,-3.5898509 -2.91015,-6.5 -6.5,-6.5 z m 0,3 c 0.43838,0 0.86328,0.1028211 1.25,0.25 l -4.5,4.5 C 164.60282,8.8632799 164.5,8.438376 164.5,8 c 0,-1.9329966 1.567,-3.5 3.5,-3.5 z m 3.25,2.25 c 0.14718,0.3867201 0.25,0.811624 0.25,1.25 0,1.9329966 -1.567,3.5 -3.5,3.5 -0.43838,0 -0.86328,-0.102821 -1.25,-0.25 l 4.5,-4.5 z"
+       transform="matrix(1.375,0,0,1.375,-220,10)"
+       id="path7735"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/refresh.png"
+     inkscape:label="#refresh"
+     id="22_refresh"
+     transform="translate(256,176)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7825"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="color:#000000;fill:url(#radialGradient8690);fill-opacity:1;fill-rule:nonzero;stroke:#435a36;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 458.625,75.5 c -4.04669,0.160932 -7.70917,2.913559 -8.8125,7.03125 -1.35795,5.067928 1.65082,10.298303 6.71875,11.65625 5.06793,1.357947 10.2983,-1.650822 11.65625,-6.71875 l -3.875,-1.03125 c -0.78618,2.934064 -3.81594,4.66118 -6.75,3.875 -2.93406,-0.78618 -4.66118,-3.815936 -3.875,-6.75 0.78618,-2.934064 3.81594,-4.66118 6.75,-3.875 0.93255,0.249877 1.75482,0.754823 2.4375,1.4375 l -2.375,2.375 9,1.5 -2,-8.5 -1.78125,1.78125 c -1.17917,-1.17917 -2.63922,-2.037144 -4.25,-2.46875 -0.95024,-0.254615 -1.9099,-0.349638 -2.84375,-0.3125 z"
+       transform="translate(-448,-64)"
+       id="path7827"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(256,152)"
+     id="16_refresh"
+     inkscape:label="#refresh"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/refresh.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect7831"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="color:#000000;fill:url(#radialGradient8802);fill-opacity:1;fill-rule:nonzero;stroke:#435a36;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 455.75,57.5 c -2.76879,0.110111 -5.27634,1.995132 -6.03125,4.8125 -0.92912,3.46753 1.12622,7.039628 4.59375,7.96875 3.46753,0.929122 7.03963,-1.12622 7.96875,-4.59375 L 459.375,64.90625 c -0.5003,1.867131 -2.41412,2.969046 -4.28125,2.46875 -1.86713,-0.500296 -2.96905,-2.414119 -2.46875,-4.28125 0.5003,-1.867131 2.41412,-2.969046 4.28125,-2.46875 0.59344,0.159013 1.12807,0.471819 1.5625,0.90625 L 457,63 l 6.5,1 -1.5,-6 -1.40625,1.40625 c -0.8068,-0.8068 -1.80414,-1.392191 -2.90625,-1.6875 C 457.03734,57.54454 456.38895,57.47459 455.75,57.5 z"
+       transform="translate(-448,-40)"
+       id="path7827-3"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:label="#close"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/close.png"
+     id="22_close"
+     transform="translate(280,176)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5971"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#radialGradient5989);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5973"
+       transform="translate(-0.5,-7.5)"
+       d="M 20,29 A 9,9 0 1 1 2,29 9,9 0 1 1 20,29 z" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path7578-3"
+       d="m 10.5,23.499995 3,2.999999 2,-1.999999 -3,-2.999998 3,-2.999998 L 13.5,16.5 10.5,19.499998 7.5,16.5 5.5,18.499999 8.50001,21.499997 5.5,24.499995 l 2,1.999999 z"
+       style="fill:url(#linearGradient9898);fill-opacity:1;stroke:#6f6f58;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(280,152)"
+     inkscape:label="#close"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/close.png"
+     id="16_close">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect5981"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       transform="translate(0,16)"
+       d="m 14.5,8.5 c 0,3.865993 -3.134007,7 -7,7 -3.8659932,0 -7,-3.134007 -7,-7 0,-3.8659932 3.1340068,-7 7,-7 3.865993,0 7,3.1340068 7,7 z"
+       sodipodi:ry="7"
+       sodipodi:rx="7"
+       sodipodi:cy="8.5"
+       sodipodi:cx="7.5"
+       id="path5983"
+       style="color:#000000;fill:url(#radialGradient5995);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path7578-3-2"
+       d="M 7.5,25.999995 10,28.499994 11.5,26.999995 9,24.499997 11.5,21.999999 10,20.5 7.5,22.999998 5,20.5 3.5,21.999999 6.00001,24.499997 3.5,26.999995 5,28.499994 z"
+       style="fill:url(#linearGradient9935);fill-opacity:1;stroke:#6f6f58;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(320,176)"
+     id="22_arrow-up"
+     inkscape:label="#arrow-up"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/arrow-up.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       id="path4163"
+       d="m 8.5,28.5 0,-8 -4,0 6.5,-8 6.5,8 -4,0 0,8 z"
+       style="fill:url(#linearGradient7554);fill-opacity:1;stroke:#435a36;stroke-opacity:1" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4167"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/arrow-up.png"
+     inkscape:label="#arrow-up"
+     id="16_arrow-up"
+     transform="translate(320,152)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5003"
+       y="16"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       id="path4163-4"
+       d="m 4.5,29.5 0,-5 -2.5,0 5.5,-6 5.5,6 -2.5,0 0,5 z"
+       style="fill:url(#linearGradient5032);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/arrow-down.png"
+     inkscape:label="#arrow-down"
+     id="22_arrow-down"
+     transform="translate(344,176)">
+    <path
+       style="fill:url(#linearGradient7562);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       d="m 8.5,13.5 0,8 -4,0 6.5,8 6.5,-8 -4,0 0,-8 z"
+       id="path7558"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7560"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+  </g>
+  <g
+     transform="translate(344,152)"
+     id="16_arrow-down"
+     inkscape:label="#arrow-down"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/arrow-down.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect5009"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       id="path4163-4-1"
+       d="m 4.5,18.5 0,5 -2.5,0 5.5,6 5.5,-6 -2.5,0 0,-5 z"
+       style="fill:url(#linearGradient5066);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="translate(368,176)"
+     id="22_arrow-down-multi"
+     inkscape:label="#arrow-down-multi"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/arrow-down-multi.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <g
+       id="g5334"
+       style="opacity:0.6">
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc"
+         id="path4554"
+         d="m 5.5,14.5 0,8 -4,0 6.5,8 6.5,-8 -4,0 0,-8 z"
+         style="fill:url(#linearGradient5339);fill-opacity:1;stroke:#435a36;stroke-opacity:1" />
+      <path
+         style="fill:url(#linearGradient5341);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+         d="m 11.5,14.5 0,8 -4,0 6.5,8 6.5,-8 -4,0 0,-8 z"
+         id="path4558"
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       id="path4546"
+       d="m 8.5,12.5 0,8 -4,0 6.5,8 6.5,-8 -4,0 0,-8 z"
+       style="fill:url(#linearGradient4550);fill-opacity:1;stroke:#435a36;stroke-opacity:1" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4548"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/delete.png"
+     inkscape:label="#delete"
+     id="22_delete"
+     transform="translate(392,176)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7576"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path7578"
+       d="M 10.999998,24.999995 15.499997,29.499994 19.5,25.499995 15.000001,20.999997 19.5,16.499999 15.499997,12.5 10.999998,16.999998 6.499999,12.5 l -4.000002,3.999999 4.500006,4.499998 -4.500006,4.499998 4.000002,3.999999 z"
+       style="fill:url(#linearGradient7638);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(392,152)"
+     id="16_delete"
+     inkscape:label="#delete"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/delete.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect14465"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:url(#linearGradient15034);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 8,27 3.5,3.5 3,-3 -3.5,-3.5 3.5,-3.5 -3,-3 L 8,21 4.5,17.5 1.5,20.5 5.00001,24 1.5,27.5 l 3,3 L 8,27 z"
+       id="polygon6421-0-18-4"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/add.png"
+     inkscape:label="#add"
+     id="16_add"
+     transform="translate(416,152)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4550"
+       y="16"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path4552"
+       d="m 5.5,26.5 0,5 4,0 0,-5 5,0 0,-4 -5,0 0,-5 -4,0 0,5 -5,0 0,4 z"
+       style="fill:url(#linearGradient4554);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="translate(440,152)"
+     id="16_remove"
+     inkscape:label="#remove"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/remove.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect4558"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="path4552-8"
+       d="m 14.5,26.5 0,-4 -14.00000001,0 0,4 z"
+       style="fill:url(#linearGradient4579);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/clear-lineedit.png"
+     inkscape:label="#clear-lineedit"
+     id="16_clear-lineedit"
+     transform="translate(464,152)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12708"
+       y="16"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       style="color:#000000;fill:url(#linearGradient4579-6);fill-opacity:1;fill-rule:nonzero;stroke:#442a23;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 14.5,28.5 0,-8 -8.7749206,0 L 2,24.5 l 4.5,4 z"
+       id="path12710"
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path12716"
+       style="fill:none;stroke:url(#linearGradient12725);stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 12.5,27 -5,-5 m 0,5 5,-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+  <g
+     transform="translate(488,176)"
+     id="22_clear"
+     inkscape:label="#clear"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/clear.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5347"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="translate(-3,0)"
+       id="g5355">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient5383);fill-opacity:1;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 12.5,21 5,-10 2,1 -5,10 -2,-1 z"
+         id="path5357"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path5359"
+         d="m 15,31 c 0,-3 2.5,-9 -0.5,-10.5 l -1,-0.5 c -3,-1.5 -6,4 -8.5,6 l 10,5 z"
+         style="color:#000000;fill:url(#radialGradient5385);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5361"
+         d="m 10,20.5 6,3"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 12.5,23.5 -2.5,5"
+         id="path5363"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path5365"
+         d="m 10.5,22.5 c -1,2 -1.5,3 -3,4.5"
+         style="fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14.5,24.5 c -1,2 -1.5,3 -2,5"
+         id="path5367"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 345,86 7,3.5"
+         id="path5369"
+         transform="translate(-336,-64)" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path5371"
+         d="m 15,31 c 0,-3 2.5,-9 -0.5,-10.5 l -1,-0.5 c -3,-1.5 -6,4 -8.5,6 l 10,5 z"
+         style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:url(#linearGradient5387);fill-opacity:1;fill-rule:nonzero;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 349,84 1,-2 2,1 -1,2 -2,-1 z"
+         id="path5373"
+         transform="translate(-336,-64)"
+         sodipodi:nodetypes="ccccc" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path5375"
+       d="m 11.49995,27.5 2,1.999997 2.5,-2.5 2.5,2.5 2,-1.999997 -2.5,-2.5 2.5,-2.499999 -2,-2.000003 -2.5,2.5 -2.5,-2.5 -2,2.000003 L 13.99994,25 11.49995,27.5 z"
+       style="fill:url(#linearGradient5389);fill-opacity:1;stroke:#603b31;stroke-width:0.80000001;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/clear.png"
+     inkscape:label="#clear"
+     id="16_clear"
+     transform="matrix(0.7288265,0,0,0.7288265,488,160.67755)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6384-4"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <g
+       id="g6844-6-1"
+       transform="matrix(1.3720687,0,0,1.3720687,-6.8603434,-11.906198)">
+      <path
+         style="color:#000000;fill:url(#radialGradient6875-5-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14,30.5 c 0,-3 2.5,-6.5 -0.5,-8 l -1,-0.5 c -3,-1.5 -4,2.5 -6.5,4.5 l 8,4 z"
+         id="path6416-3-6"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 11,24 c -1,2 -1,2 -2.5,3.5"
+         id="path6639-8-6"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path6641-3-2"
+         d="m 13,25 c -1,2 -1,2 -1.5,4"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6728-3-1"
+         d="m 9,23 6,3"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14,30.5 c 0,-3 2.5,-6.5 -0.5,-8 l -1,-0.5 c -3,-1.5 -4,2.5 -6.5,4.5 l 8,4 z"
+         id="path6760-8-9"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path6440-7-6"
+         d="m 12,22 2.5,-5 2,1 -2.5,5 -2,-1 z"
+         style="fill:url(#linearGradient6854-6-1);fill-opacity:1;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:url(#linearGradient7214);fill-opacity:1;stroke:#603b31;stroke-width:1.09765494;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 10.976484,25.825695 2.058095,2.058099 2.744146,-2.744137 2.744136,2.744137 2.058105,-2.058099 -2.744145,-2.744137 2.744145,-2.744136 -2.058105,-2.058107 -2.744136,2.744138 -2.744146,-2.744138 -2.058095,2.058107 2.744125,2.744136 -2.744125,2.744137 z"
+       id="polygon6106-3-5-3-4"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/load.png"
+     inkscape:label="#load"
+     id="22_load"
+     transform="translate(0,120)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4218);fill-opacity:1;stroke:#6f6f58"
+       id="path4200"
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <path
+       style="fill:url(#linearGradient4270);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       d="m 8.5,21.5 0,-5 -2.5,0 4.5,-5 4.5,5 -2.5,0 0,5 z"
+       id="polygon6309-8"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4220);fill-opacity:1;stroke:#6f6f58"
+       id="path4204"
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4206"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/load.png"
+     inkscape:label="#load"
+     id="16_load"
+     transform="matrix(0.72639225,0,0,0.72639225,0,104.75545)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4222);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4210"
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <path
+       style="fill:url(#linearGradient4304);fill-opacity:1;stroke:#435a36;stroke-width:1.37666667;stroke-opacity:1"
+       d="m 8.9483354,21.675 0,-5.506666 -2.0650009,0 4.1300015,-4.818333 4.130001,4.818333 -2.065001,0 0,5.506666 z"
+       id="polygon6309-8-0"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4225);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4214"
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4216"
+       y="9.9733334"
+       x="0"
+       height="22.026667"
+       width="22.026667" />
+  </g>
+  <g
+     transform="translate(24,120)"
+     id="22_save"
+     inkscape:label="#save"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/save.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path4229"
+       style="fill:url(#linearGradient4247);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient4338);fill-opacity:1;stroke:#2a4556;stroke-opacity:1"
+       d="m 8.5,11.5 0,5 -2.5,0 4.5,5 4.5,-5 -2.5,0 0,-5 z"
+       id="polygon6309-8-09"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path4233"
+       style="fill:url(#linearGradient4249);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4235"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,24,104.75545)"
+     id="16_save"
+     inkscape:label="#save"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/save.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path4239"
+       style="fill:url(#linearGradient4251);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient4372);fill-opacity:1;stroke:#2a4556;stroke-width:1.37666667;stroke-opacity:1"
+       d="m 8.9483338,10.661668 0,4.13 -2.064999,0 4.1300002,4.818334 4.129999,-4.818334 -2.065001,0 0,-4.13 z"
+       id="polygon6309-8-0-8"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path4243"
+       style="fill:url(#linearGradient4253);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect4245"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="translate(64,120)"
+     id="22_browse"
+     inkscape:label="#browse"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/browse.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path4260"
+       style="fill:url(#linearGradient4278);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path4264"
+       style="fill:url(#linearGradient4282);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4266"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:#ff5a31;fill-opacity:1;fill-rule:nonzero;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4345"
+       width="2"
+       height="2"
+       x="8.5"
+       y="25.5" />
+    <rect
+       y="25.5"
+       x="12.5"
+       height="2"
+       width="2"
+       id="rect5133"
+       style="color:#000000;fill:#ff5a31;fill-opacity:1;fill-rule:nonzero;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:#ff5a31;fill-opacity:1;fill-rule:nonzero;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5135"
+       width="2"
+       height="2"
+       x="16.5"
+       y="25.5" />
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,64,104.75545)"
+     id="16_browse"
+     inkscape:label="#browse"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/browse.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path4270"
+       style="fill:url(#linearGradient4284);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path4274"
+       style="fill:url(#linearGradient4288);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect4276"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:#ff5a31;fill-opacity:1;fill-rule:nonzero;stroke:#603b31;stroke-width:1.37666667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4345-7"
+       width="2.7533333"
+       height="2.7533333"
+       x="7.5716658"
+       y="24.428328" />
+    <rect
+       y="24.428328"
+       x="13.078333"
+       height="2.7533333"
+       width="2.7533333"
+       id="rect5133-9"
+       style="color:#000000;fill:#ff5a31;fill-opacity:1;fill-rule:nonzero;stroke:#603b31;stroke-width:1.37666667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:#ff5a31;fill-opacity:1;fill-rule:nonzero;stroke:#603b31;stroke-width:1.37666667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5135-3"
+       width="2.7533333"
+       height="2.7533333"
+       x="18.585001"
+       y="24.428328" />
+  </g>
+  <g
+     transform="translate(104,120)"
+     id="22_playback-play-reverse"
+     inkscape:label="#playback-play-reverse"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-play-reverse.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6862"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path6880"
+       d="m 15.5,13.5 0,15 L 5,21 15.5,13.5 z"
+       style="fill:url(#linearGradient6955);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,104,104.72727)"
+     id="16_playback-play-reverse"
+     inkscape:label="#playback-play-reverse"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-play-reverse.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6868"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:url(#linearGradient6989);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.8125,13.437504 0,15.125 -11.34375,-7.5625 11.34375,-7.5625 z"
+       id="path6888"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-play.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#playback-play"
+     id="22_playback-play"
+     transform="translate(128,120)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4202"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="fill:url(#linearGradient4262);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       d="m 6.5,13.5 0,15 L 17,21 6.5,13.5 z"
+       id="polygon6309"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-play.png"
+     inkscape:label="#playback-play"
+     id="16_playback-play"
+     transform="matrix(0.72727273,0,0,0.72727273,128,104.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4304"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="fill:url(#linearGradient4300);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 6.1875,13.4375 0,15.125 L 17.53125,21 6.1875,13.4375 z"
+       id="polygon6309-6"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(152,120)"
+     id="22_playback-pause"
+     inkscape:label="#playback-pause"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-pause.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6114"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="fill:url(#linearGradient18588);fill-opacity:1;stroke:#435a36;stroke-linecap:round;stroke-opacity:1"
+       id="rect6295-4"
+       y="13.5"
+       x="3.4999964"
+       height="15.000008"
+       width="4.9999967" />
+    <rect
+       style="fill:url(#linearGradient18585);fill-opacity:1;stroke:#435a36;stroke-linecap:round;stroke-opacity:1"
+       id="rect6302-8"
+       y="13.5"
+       x="12.499996"
+       height="15.000008"
+       width="4.9999967" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,152,104.72727)"
+     id="16_playback-pause"
+     inkscape:label="#playback-pause"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-pause.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6196"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="fill:url(#linearGradient18576);fill-opacity:1;stroke:#435a36;stroke-width:1.375;stroke-linecap:round;stroke-opacity:1"
+       id="rect6206"
+       y="13.4375"
+       x="3.4374962"
+       height="15.125"
+       width="5.5000033" />
+    <rect
+       style="fill:url(#linearGradient18573);fill-opacity:1;stroke:#435a36;stroke-width:1.375;stroke-linecap:round;stroke-opacity:1"
+       id="rect6214"
+       y="13.4375"
+       x="13.062496"
+       height="15.125008"
+       width="5.4999967" />
+  </g>
+  <g
+     transform="translate(176,120)"
+     id="22_playback-stop"
+     inkscape:label="#playback-stop"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-stop.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5393"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="13"
+       height="13"
+       x="4.5"
+       y="14.5"
+       id="rect6295-4-7"
+       style="fill:url(#linearGradient5422);fill-opacity:1;stroke:#435a36;stroke-linecap:round;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,176,104.72727)"
+     id="16_playback-stop"
+     inkscape:label="#playback-stop"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-stop.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5399"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="12.375"
+       height="12.374999"
+       x="4.8125"
+       y="14.8125"
+       id="rect6295-4-7-4"
+       style="fill:url(#linearGradient5460);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-frame-backward.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#playback-fast-backward"
+     id="22_playback-fast-backward"
+     transform="translate(200,120)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4638"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.6;fill:url(#linearGradient4669);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       d="m 12.5,13.5 0,15 L 2,21 12.5,13.5 z"
+       id="path4640"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path5453"
+       d="m 19.5,13.5 0,15 L 9,21 19.5,13.5 z"
+       style="fill:url(#linearGradient10539);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-frame-backward.png"
+     inkscape:label="#playback-fast-backward"
+     id="16_playback-fast-backward"
+     transform="matrix(0.72727273,0,0,0.72727273,200,104.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4647"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path4649"
+       d="m 13.0625,13.4375 0,15.125 L 1.71875,21 13.0625,13.4375 z"
+       style="opacity:0.6;fill:url(#linearGradient4673);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="fill:url(#linearGradient5463);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 19.9375,13.4375 0,15.125 L 8.59375,21 19.9375,13.4375 z"
+       id="path5461"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(224,120)"
+     id="22_playback-fast-forward"
+     inkscape:label="#playback-fast-forward"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-frame-forward.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4655"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path4657"
+       d="m 9.5,13.5 0,15 L 20,21 9.5,13.5 z"
+       style="opacity:0.6;fill:url(#linearGradient4677);fill-opacity:1;stroke:#435a36;stroke-opacity:1" />
+    <path
+       style="fill:url(#linearGradient5459);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       d="m 2.5,13.5 0,15 L 13,21 2.5,13.5 z"
+       id="path5457"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,224,104.72727)"
+     id="16_playback-fast-forward"
+     inkscape:label="#playback-fast-forward"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-frame-forward.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4663"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path4665"
+       d="m 8.9375,13.4375 0,15.125 L 20.28125,21 8.9375,13.4375 z"
+       style="opacity:0.6;fill:url(#linearGradient4681);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="fill:url(#linearGradient5467);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 2.0625,13.4375 0,15.125 L 13.40625,21 2.0625,13.4375 z"
+       id="path5465"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-speed-decrease.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#playback-speed-decrease"
+     id="22_playback-speed-decrease"
+     transform="translate(248,120)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7026"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path5377"
+       d="m 8.5,13.5 0,15 L 19,21 8.5,13.5 z"
+       style="opacity:0.6;fill:url(#linearGradient5379);fill-opacity:1;stroke:#6f6f58;stroke-opacity:1" />
+    <path
+       style="fill:url(#linearGradient7036);fill-opacity:1;stroke:#6f6f58;stroke-opacity:1"
+       d="m 1.5,13.5 0,15 L 12,21 1.5,13.5 z"
+       id="path7028"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="path4552-8-9"
+       d="m 18.5,26.5 0,-4 -14,0 0,4 z"
+       style="fill:url(#linearGradient7107-0);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-speed-decrease.png"
+     inkscape:label="#playback-speed-decrease"
+     id="16_playback-speed-decrease"
+     transform="matrix(0.72727273,0,0,0.72727273,248,104.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7032"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path6164"
+       d="m 8.9375,13.4375 0,15.125 L 20.28125,21 8.9375,13.4375 z"
+       style="opacity:0.6;fill:url(#linearGradient6166);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="fill:url(#linearGradient7038);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 2.0625,13.4375 0,15.125 L 13.40625,21 2.0625,13.4375 z"
+       id="path7034"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="path4552-8-8"
+       d="m 21.3125,25.812504 0,-4.125 -15.125,0 0,4.125 z"
+       style="fill:url(#linearGradient7107);fill-opacity:1;stroke:#603b31;stroke-width:1.23749995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="translate(272,120)"
+     id="22_playback-speed-increase"
+     inkscape:label="#playback-speed-increase"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-speed-increase.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7010"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="opacity:0.6;fill:url(#linearGradient6151);fill-opacity:1;stroke:#6f6f58;stroke-opacity:1"
+       d="m 8.5,13.5 0,15 L 19,21 8.5,13.5 z"
+       id="path6149"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path7012"
+       d="m 1.5,13.5 0,15 L 12,21 1.5,13.5 z"
+       style="fill:url(#linearGradient7020);fill-opacity:1;stroke:#6f6f58;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path4552-4"
+       d="m 9.5,26.5 0,5 4,0 0,-5 5,0 0,-4 -5,0 0,-5 -4,0 0,5 -5,0 0,4 z"
+       style="fill:url(#linearGradient7055-6);fill-opacity:1;stroke:#435a36;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,272,104.72727)"
+     id="16_playback-speed-increase"
+     inkscape:label="#playback-speed-increase"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-speed-increase.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7016"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="opacity:0.6;fill:url(#linearGradient6171);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 8.9375,13.4375 0,15.125 L 20.28125,21 8.9375,13.4375 z"
+       id="path6169"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path7018"
+       d="m 2.0625,13.4375 0,15.125 L 13.40625,21 2.0625,13.4375 z"
+       style="fill:url(#linearGradient7022);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path4552-85"
+       d="m 11.6875,25.812504 0,5.5 4.125,0 0,-5.5 5.5,0 0,-4.125 -5.5,0 0,-5.5 -4.125,0 0,5.5 -5.5,0 0,4.125 z"
+       style="fill:url(#linearGradient7055);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-skip-backward.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#playback-skip-backward"
+     id="22_playback-skip-backward"
+     transform="translate(312,120)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4009"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path4027-2"
+       d="m 18.5,13.5 0,15 L 8,21 18.5,13.5 z"
+       style="fill:url(#linearGradient4224);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="4.9999967"
+       height="15.000008"
+       x="3.5"
+       y="13.5"
+       id="rect6302-8-7-4"
+       style="fill:url(#linearGradient4262-9);fill-opacity:1;stroke:#435a36;stroke-linecap:round;stroke-opacity:1" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-skip-backward.png"
+     inkscape:label="#playback-skip-backward"
+     id="16_playback-skip-backward"
+     transform="matrix(0.72727273,0,0,0.72727273,312,104.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4015"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="fill:url(#linearGradient4021);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 18.5625,13.4375 0,15.125 L 7.2187501,21 18.5625,13.4375 z"
+       id="path4017"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="5.4999967"
+       height="15.125008"
+       x="2.0625"
+       y="13.4375"
+       id="rect6214-4-1"
+       style="fill:url(#linearGradient5072);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="translate(336,120)"
+     id="22_playback-skip-forward"
+     inkscape:label="#playback-skip-forward"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-skip-forward.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect3993"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path3995"
+       d="m 3.5,13.5 0,15 L 14,21 3.5,13.5 z"
+       style="fill:url(#linearGradient4003);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="4.9999967"
+       height="15.000008"
+       x="13.5"
+       y="13.5"
+       id="rect6302-8-7"
+       style="fill:url(#linearGradient4072);fill-opacity:1;stroke:#435a36;stroke-linecap:round;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,336,104.72727)"
+     id="16_playback-skip-forward"
+     inkscape:label="#playback-skip-forward"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-skip-forward.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect3999"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path4001"
+       d="m 3.4375,13.4375 0,15.125 L 14.78125,21 3.4375,13.4375 z"
+       style="fill:url(#linearGradient4005);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="5.4999967"
+       height="15.125008"
+       x="14.4375"
+       y="13.4375"
+       id="rect6214-4"
+       style="fill:url(#linearGradient4110);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="translate(360,120)"
+     id="22_playback-frame-backward"
+     inkscape:label="#playback-frame-backward"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-frame-backward.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4025"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path4027"
+       d="m 12.5,13.5 0,15 L 2,21 12.5,13.5 z"
+       style="fill:url(#linearGradient4035);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="4.9999967"
+       height="15.000008"
+       x="15.5"
+       y="13.5"
+       id="rect6302-8-7-1"
+       style="fill:url(#linearGradient4148);fill-opacity:1;stroke:#435a36;stroke-linecap:round;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,360,104.72727)"
+     id="16_playback-frame-backward"
+     inkscape:label="#playback-frame-backward"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-frame-backward.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4031"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:url(#linearGradient5153);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 13.0625,13.4375 0,15.125 L 1.71875,21 13.0625,13.4375 z"
+       id="path4017-6"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="5.4999967"
+       height="15.125008"
+       x="15.8125"
+       y="13.4375"
+       id="rect6214-4-1-3"
+       style="fill:url(#linearGradient5072-8);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-frame-forward.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#playback-frame-forward"
+     id="22_playback-frame-forward"
+     transform="translate(384,120)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4041"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="fill:url(#linearGradient4051);fill-opacity:1;stroke:#435a36;stroke-opacity:1"
+       d="m 9.5,13.5 0,15 L 20,21 9.5,13.5 z"
+       id="path4043"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="4.9999967"
+       height="15.000008"
+       x="1.5"
+       y="13.5"
+       id="rect6302-8-7-1-0"
+       style="fill:url(#linearGradient4186);fill-opacity:1;stroke:#435a36;stroke-linecap:round;stroke-opacity:1" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-frame-forward.png"
+     inkscape:label="#playback-frame-forward"
+     id="16_playback-frame-forward"
+     transform="matrix(0.72727273,0,0,0.72727273,384,104.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4047"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="fill:url(#linearGradient4053);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 8.9375,13.4375 0,15.125 L 20.28125,21 8.9375,13.4375 z"
+       id="path4049"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="5.4999967"
+       height="15.125008"
+       x="0.6875"
+       y="13.4375"
+       id="rect6214-4-4"
+       style="fill:url(#linearGradient5110);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="translate(424,120)"
+     id="22_playback-play-live"
+     inkscape:label="#playback-play-live"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/playback-play-live.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7899"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path7901"
+       d="m 6.5,13.5 0,15 L 17,21 6.5,13.5 z"
+       style="fill:url(#linearGradient7909);fill-opacity:1;stroke:#435a36;stroke-opacity:1" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient7929);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path6497-2-77-1-7-1"
+       sodipodi:cx="391"
+       sodipodi:cy="25"
+       sodipodi:rx="5"
+       sodipodi:ry="5"
+       d="m 396,25 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z"
+       transform="translate(-376.5,1.5)" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,424,104.72727)"
+     id="16_playback-play-live"
+     inkscape:label="#playback-play-live"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/playback-play-live.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7905"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path7907"
+       d="m 6.1875,13.4375 0,15.125 L 17.53125,21 6.1875,13.4375 z"
+       style="fill:url(#linearGradient7911);fill-opacity:1;stroke:#435a36;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       transform="matrix(1.375,0,0,1.375,-523.1875,-8.5624964)"
+       d="m 395,25 c 0,2.209139 -1.79086,4 -4,4 -2.20914,0 -4,-1.790861 -4,-4 0,-2.209139 1.79086,-4 4,-4 2.20914,0 4,1.790861 4,4 z"
+       sodipodi:ry="4"
+       sodipodi:rx="4"
+       sodipodi:cy="25"
+       sodipodi:cx="391"
+       id="path6497-1-8-8-9-9"
+       style="color:#000000;fill:url(#radialGradient8734);fill-opacity:1.0;stroke:#603b31;stroke-width:0.89999998000000003;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     transform="translate(464,120)"
+     id="22_view-reset"
+     inkscape:label="#view-reset"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/view-reset.png">
+    <path
+       sodipodi:nodetypes="cc"
+       id="path19525"
+       d="M 6,16 16,26"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 16,16 6,26"
+       id="line6834-9"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect18907"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="21"
+       height="21"
+       x="0.5"
+       y="10.5"
+       id="rect6818-4"
+       style="fill:none;stroke:#717171;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 8.5,28 -6,1.5 1.5,-6 4.5,4.5 z"
+       id="polygon6832-1"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path19513"
+       d="m 13.5,14 6,-1.5 -1.5,6 -4.5,-4.5 z"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 8.5,14 2.5,12.5 4,18.5 8.5,14 z"
+       id="path19517"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path19521"
+       d="m 13.5,28 6,1.5 -1.5,-6 -4.5,4.5 z"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,464,104.72727)"
+     id="16_view-reset"
+     inkscape:label="#view-reset"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/view-reset.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect18915"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="20.625"
+       height="20.625"
+       x="0.6875"
+       y="10.6875"
+       id="rect6818-4-7"
+       style="fill:none;stroke:#717171;stroke-width:1.23749995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path19525-3"
+       d="m 6.1875,16.187499 9.625,9.625"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:2.47500014;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:2.47500014;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15.8125,16.187499 -9.625,9.625"
+       id="line6834-9-1"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 8.25,27.874999 -5.5,1.374999 1.375,-5.499999 4.125,4.125 z"
+       id="polygon6832-1-5"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 8.25,14.124999 -5.5,-1.375 1.375,5.5 4.125,-4.125 z"
+       id="path19517-0"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path19739"
+       d="m 13.75,27.874999 5.5,1.374999 -1.375,-5.499999 -4.125,4.125 z"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path19741"
+       d="m 13.75,14.124999 5.5,-1.375 -1.375,5.5 -4.125,-4.125 z"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1.10000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/view-track.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#view-track"
+     id="22_view-track"
+     transform="translate(488,120)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5485"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g6477-2"
+       style="opacity:0.5"
+       transform="translate(0,1)">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6143-8"
+         d="m 9.5,27.5 0,-4 2,0 0,4"
+         style="fill:none;stroke:#2a4556;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6145-7"
+         d="m 7.5,22.5 0,-4 6,0 0,4"
+         style="color:#000000;fill:none;stroke:#603b31;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="translate(-311.5,-6.5)"
+         d="m 324,22 c 0,1.104569 -0.89543,2 -2,2 -1.10457,0 -2,-0.895431 -2,-2 0,-1.104569 0.89543,-2 2,-2 1.10457,0 2,0.895431 2,2 z"
+         sodipodi:ry="2"
+         sodipodi:rx="2"
+         sodipodi:cy="22"
+         sodipodi:cx="322"
+         id="path6168-6"
+         style="color:#000000;fill:url(#radialGradient6299-9-2);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="fill:none;stroke:url(#radialGradient6180-5-93);stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 9.5,27.5 0,-4 2,0 0,4"
+         id="path6170-8"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="18"
+         x="8"
+         height="4.5"
+         width="5.5"
+         id="rect6182-4"
+         style="color:#000000;fill:url(#radialGradient6228-2-05);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:url(#radialGradient6240-5-8);stroke-width:1.20000005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 7.5,22.5 0,-4 6,0 0,4"
+         id="path6230-8"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6242-98"
+         d="m 8.5,19.5 0,3 4,0 0,-3"
+         style="fill:none;stroke:#603b31;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5618"
+       sodipodi:cx="284"
+       sodipodi:cy="84"
+       sodipodi:rx="10"
+       sodipodi:ry="10"
+       d="m 294,84 c 0,5.522847 -4.47715,10 -10,10 -5.52285,0 -10,-4.477153 -10,-10 0,-5.522847 4.47715,-10 10,-10 5.52285,0 10,4.477153 10,10 z"
+       transform="translate(-273.5,-62.5)" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path5493"
+       d="m 5.5,16.5 -1,-3 -2,2 z"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:transform-center-x="6.5"
+       inkscape:transform-center-y="-6.5" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path5658"
+       d="m 20.5,21.5 -20,0"
+       style="opacity:0.6;color:#000000;fill:none;stroke:#687a4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="opacity:0.6;color:#000000;fill:none;stroke:#687a4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 10.5,31.5 0,-20"
+       id="path5660"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 15.5,16.5 3,-1 -2,-2 z"
+       id="path5662"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-6.5"
+       inkscape:transform-center-y="-6.5" />
+    <path
+       inkscape:transform-center-y="6.5"
+       inkscape:transform-center-x="6.5"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 5.5,26.5 -1,3 -2,-2 z"
+       id="path5664"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:transform-center-y="6.5"
+       inkscape:transform-center-x="-6.5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path5666"
+       d="m 15.5,26.5 3,1 -2,2 z"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/view-track.png"
+     inkscape:label="#view-track"
+     id="16_view-track"
+     transform="matrix(0.72727273,0,0,0.72727273,488,104.72727)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5499"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       transform="matrix(0.98214285,0,0,0.98214285,-0.98214003,1.357139)"
+       id="g6477-6-0"
+       style="opacity:0.5">
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6143-4-6"
+         d="m 10.1,27.699999 0,-4.2 2.8,0 0,4.2"
+         style="fill:none;stroke:#2a4556;stroke-width:3.92000008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path6145-6-4"
+         d="m 8.7,22.099999 0,-3.5 5.6,0 0,3.5"
+         style="color:#000000;fill:none;stroke:#603b31;stroke-width:3.92000008;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(1.05,0,0,1.1666662,-326.6,-10.566657)"
+         d="m 324,22 c 0,0.994113 -0.89543,1.800001 -2,1.800001 -1.10457,0 -2,-0.805888 -2,-1.800001 0,-0.994113 0.89543,-1.800001 2,-1.800001 1.10457,0 2,0.805888 2,1.800001 z"
+         sodipodi:ry="1.8000007"
+         sodipodi:rx="2"
+         sodipodi:cy="22"
+         sodipodi:cx="322"
+         id="path6168-7-3"
+         style="color:#000000;fill:url(#radialGradient6299-9-7-5);fill-opacity:1;fill-rule:nonzero;stroke:#6e6e58;stroke-width:1.13842022;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="fill:none;stroke:url(#radialGradient6180-5-9-6);stroke-width:1.53999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 10.1,27.699999 0,-4.2 2.8,0 0,4.2"
+         id="path6170-4-0"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="18.599998"
+         x="9.3999996"
+         height="3.500001"
+         width="4.2000003"
+         id="rect6182-6-5"
+         style="color:#000000;fill:url(#radialGradient6228-2-0-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:none;stroke:url(#radialGradient6240-5-2-6);stroke-width:1.53999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 8.7,22.099999 0,-3.5 5.6,0 0,3.5"
+         id="path6230-2-4"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6242-9-1"
+         d="m 10.1,19.299999 0,2.8 2.8,0 0,-2.8"
+         style="fill:none;stroke:#603b31;stroke-width:1.25999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path5618-2"
+       sodipodi:cx="284"
+       sodipodi:cy="84"
+       sodipodi:rx="7"
+       sodipodi:ry="6.9999995"
+       d="m 291,84 c 0,3.865993 -3.13401,7 -7,7 -3.86599,0 -7,-3.134007 -7,-7 0,-3.865993 3.13401,-7 7,-7 3.86599,0 7,3.134007 7,7 z"
+       transform="matrix(1.375,0,0,1.375,-380.1875,-93.812501)" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path5493-1"
+       d="M 5.84375,17.21875 4.8125,13.78125 2.40625,16.1875 z"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:0.96249998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:transform-center-x="4.5"
+       inkscape:transform-center-y="-4.4999997" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path5658-7"
+       d="m 19.9375,21.687499 -19.25,0"
+       style="opacity:0.6;color:#000000;fill:none;stroke:#687a4f;stroke-width:1.23749995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="opacity:0.6;color:#000000;fill:none;stroke:#687a4f;stroke-width:1.23749995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 10.3125,31.312499 0,-19.25"
+       id="path5660-2"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:transform-center-y="-4.4999997"
+       inkscape:transform-center-x="-4.5"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:0.96249998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 14.78125,17.21875 18.21875,16.1875 15.8125,13.78125 z"
+       id="path5832"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:transform-center-y="4.4999996"
+       inkscape:transform-center-x="4.5"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:0.96249998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 5.84375,26.156249 -1.03125,3.4375 -2.40625,-2.40625 z"
+       id="path5834"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       id="path5836"
+       d="m 14.78125,26.156249 3.4375,1.03125 -2.40625,2.40625 z"
+       style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:0.96249998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:transform-center-x="-4.5"
+       inkscape:transform-center-y="4.4999996" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/load-video.png"
+     inkscape:label="#load-video"
+     id="22_load-video"
+     transform="translate(0,64)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient17227);fill-opacity:1;stroke:#6f6f58"
+       id="path17209"
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <g
+       id="g17255"
+       transform="translate(-21,59)">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-46.5 0,12"
+         id="path8870"
+         sodipodi:nodetypes="cc" />
+      <rect
+         style="fill:url(#linearGradient17273-5);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+         id="rect8872"
+         width="7"
+         height="6"
+         x="27.5"
+         y="-46.5" />
+      <rect
+         y="-40.5"
+         x="27.5"
+         height="5.999999"
+         width="7"
+         id="rect8874"
+         style="fill:url(#linearGradient17275-4);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path8876"
+         d="m 36.5,-46.5 0,12"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-45.5 2,0"
+         id="path8878" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8880"
+         d="m 25.5,-43.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-41.5 2,0"
+         id="path8882" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8884"
+         d="m 25.5,-39.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-37.5 2,0"
+         id="path8886" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8888"
+         d="m 25.5,-35.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8890"
+         d="m 34.5,-45.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-43.5 2,0"
+         id="path8892" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8894"
+         d="m 34.5,-41.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-39.5 2,0"
+         id="path8896" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8898"
+         d="m 34.5,-37.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-35.5 2,0"
+         id="path8900" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient17229);fill-opacity:1;stroke:#6f6f58"
+       id="path17213"
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect17215"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/load-video.png"
+     inkscape:label="#load-video"
+     id="16_load-video"
+     transform="matrix(0.72639225,0,0,0.72639225,0,48.755448)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient17231);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path17219"
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <g
+       id="g17255-3"
+       transform="matrix(1.3766667,0,0,1.3766667,-30.286667,76.053334)">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-46.5 0,8"
+         id="path8870-7"
+         sodipodi:nodetypes="cc" />
+      <rect
+         style="fill:url(#linearGradient17273-5-9);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-opacity:1"
+         id="rect8872-6"
+         width="5"
+         height="4.0000005"
+         x="27.5"
+         y="-46.5" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path8876-5"
+         d="m 34.5,-46.5 0,8"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-45.5 2,0"
+         id="path8878-0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8880-6"
+         d="m 25.5,-43.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-41.5 2,0"
+         id="path8882-5" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8884-0"
+         d="m 25.5,-39.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8890-2"
+         d="m 32.5,-45.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 32.5,-43.5 2,0"
+         id="path8892-2" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8894-6"
+         d="m 32.5,-41.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 32.5,-39.5 2,0"
+         id="path8896-9" />
+      <rect
+         y="-42.5"
+         x="27.5"
+         height="4.0000005"
+         width="5"
+         id="rect17463"
+         style="fill:url(#linearGradient17465);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-opacity:1" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient17233);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path17223"
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect17225"
+       y="9.9733334"
+       x="0"
+       height="22.026667"
+       width="22.026667" />
+  </g>
+  <g
+     transform="translate(24,64)"
+     id="22_load-tracks"
+     inkscape:label="#load-tracks"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/load-tracks.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path18622"
+       style="fill:url(#linearGradient18696);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <g
+       clip-path="url(#clipPath8997-7-1)"
+       mask="url(#mask8991-6-7)"
+       id="g8906"
+       transform="matrix(0.72727273,0,0,0.72727268,2,3.727323)">
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8908"
+         width="4.125"
+         height="2.7500002"
+         x="4.8125"
+         y="24.437502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8910"
+         width="2.75"
+         height="4.1250005"
+         x="6.1875"
+         y="27.187504" />
+      <path
+         id="path8912"
+         d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8914"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="27.187504"
+         x="2.0625"
+         height="2.7500002"
+         width="4.125"
+         id="rect8916"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="29.937504"
+         x="3.4375"
+         height="4.1250005"
+         width="2.75"
+         id="rect8918"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8920"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8922"
+         d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8924"
+         width="4.125"
+         height="2.7500002"
+         x="-0.6875"
+         y="29.937504" />
+      <rect
+         y="21.687502"
+         x="7.5625"
+         height="2.7500002"
+         width="4.125"
+         id="rect8926"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="24.437502"
+         x="8.9375"
+         height="4.1250005"
+         width="2.75"
+         id="rect8928"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8930"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8932"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8934"
+         width="4.125"
+         height="2.7500002"
+         x="10.3125"
+         y="18.937502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8936"
+         width="2.75"
+         height="4.1250005"
+         x="11.6875"
+         y="21.687502" />
+      <path
+         id="path8938"
+         d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8940"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="16.187502"
+         x="13.0625"
+         height="2.7500002"
+         width="4.125"
+         id="rect8942"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="18.937502"
+         x="14.4375"
+         height="4.1250005"
+         width="2.75"
+         id="rect8944"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8946"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8948"
+         d="m 19.9375,20.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8950"
+         width="4.125"
+         height="2.7500002"
+         x="15.8125"
+         y="13.437502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8952"
+         width="2.75"
+         height="4.1250005"
+         x="17.1875"
+         y="16.187502" />
+      <path
+         id="path8954"
+         d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 22.6875,17.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8956"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="10.687502"
+         x="18.5625"
+         height="2.7500002"
+         width="4.125"
+         id="rect8958"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="13.437502"
+         x="19.9375"
+         height="4.1250005"
+         width="2.75"
+         id="rect8960"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 15.8125,13.437502 2.75,0 0,-2.75 -1.375,-1.3750004 -2.75,2.7500004 1.375,1.375 z"
+         id="path8962"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8964"
+         d="m 25.4375,14.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8966"
+         d="m 18.5625,10.687502 2.75,0 0,-2.7500004 -1.375,-1.375 -2.75,2.75 1.375,1.3750004 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path18658"
+       style="fill:url(#linearGradient18702);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect18660"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,24,48.755448)"
+     id="16_load-tracks"
+     inkscape:label="#load-tracks"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/load-tracks.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path18664"
+       style="fill:url(#linearGradient18704);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <g
+       clip-path="url(#clipPath19750)"
+       mask="url(#mask19754)"
+       id="g8906-9"
+       transform="matrix(1.0012121,0,0,1.0012121,2.7533333,-5.5453854)">
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8908-9"
+         width="4.125"
+         height="2.7500002"
+         x="4.8125"
+         y="24.437502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8910-5"
+         width="2.75"
+         height="4.1250005"
+         x="6.1875"
+         y="27.187504" />
+      <path
+         id="path8912-2"
+         d="m 2.0625,27.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75000002,2.75 1.37500002,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 11.6875,28.562502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8914-0"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="27.187504"
+         x="2.0625"
+         height="2.7500002"
+         width="4.125"
+         id="rect8916-8"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="29.937504"
+         x="3.4375"
+         height="4.1250005"
+         width="2.75"
+         id="rect8918-3"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m -0.6875,29.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8920-5"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8922-9"
+         d="m 8.9375,31.312502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8924-6"
+         width="4.125"
+         height="2.7500002"
+         x="-0.6875"
+         y="29.937504" />
+      <rect
+         y="21.687502"
+         x="7.5625"
+         height="2.7500002"
+         width="4.125"
+         id="rect8926-5"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="24.437502"
+         x="8.9375"
+         height="4.1250005"
+         width="2.75"
+         id="rect8928-6"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 4.8125,24.437502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8930-3"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8932-0"
+         d="m 14.4375,25.812502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8934-2"
+         width="4.125"
+         height="2.7500002"
+         x="10.3125"
+         y="18.937502" />
+      <rect
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8936-0"
+         width="2.75"
+         height="4.1250005"
+         x="11.6875"
+         y="21.687502" />
+      <path
+         id="path8938-7"
+         d="m 7.5625,21.687502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 17.1875,23.062502 -2.75,0 0,2.750001 1.375,1.375 2.75,-2.750001 -1.375,-1.375 z"
+         id="path8940-4"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="16.187502"
+         x="13.0625"
+         height="2.7500002"
+         width="4.125"
+         id="rect8942-7"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="18.937502"
+         x="14.4375"
+         height="4.1250005"
+         width="2.75"
+         id="rect8944-3"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 10.3125,18.937502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         id="path8946-0"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path8954-5"
+         d="m 13.0625,16.187502 2.75,0 0,-2.75 -1.375,-1.375 -2.75,2.75 1.375,1.375 z"
+         style="color:#000000;fill:#cbcbc3;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path18692"
+       style="fill:url(#linearGradient18710);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect18694"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/load-events.png"
+     inkscape:label="#load-events"
+     id="22_load-events"
+     transform="translate(48,64)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient19922);fill-opacity:1;stroke:#6f6f58"
+       id="path19802"
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect19868"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g20082"
+       transform="translate(-2,-3)">
+      <path
+         transform="translate(-379,-4)"
+         d="m 396.5,25 c 0,3.037566 -2.46243,5.5 -5.5,5.5 -3.03757,0 -5.5,-2.462434 -5.5,-5.5 0,-3.037566 2.46243,-5.5 5.5,-5.5 3.03757,0 5.5,2.462434 5.5,5.5 z"
+         sodipodi:ry="5.5"
+         sodipodi:rx="5.5"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-5"
+         style="color:#000000;fill:url(#radialGradient20087);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient5292);fill-opacity:1;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5290"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="5.5"
+         sodipodi:ry="5.5"
+         d="m 395.76314,27.75 c -1.51878,2.630609 -4.88253,3.531923 -7.51314,2.01314 -2.63061,-1.518783 -3.53192,-4.88253 -2.01314,-7.51314"
+         transform="translate(-379,-4)"
+         sodipodi:start="0.52359878"
+         sodipodi:end="3.6651914"
+         sodipodi:open="true" />
+      <path
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 7.2368603,18.25 9.5262797,5.5"
+         id="path20295"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4478-7"
+         sodipodi:cx="96"
+         sodipodi:cy="24"
+         sodipodi:rx="1.500002"
+         sodipodi:ry="1.50001"
+         d="m 97.500002,24 c 0,0.828433 -0.671574,1.50001 -1.500002,1.50001 -0.828428,0 -1.500002,-0.671577 -1.500002,-1.50001 0,-0.828433 0.671574,-1.50001 1.500002,-1.50001 0.828428,0 1.500002,0.671577 1.500002,1.50001 z"
+         transform="translate(-83.999998,-2.99999)" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient19924);fill-opacity:1;stroke:#6f6f58"
+       id="path19866"
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/load-events.png"
+     inkscape:label="#load-events"
+     id="16_load-events"
+     transform="matrix(0.72639225,0,0,0.72639225,48,48.755448)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient19926);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path19872"
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <g
+       id="g20190"
+       transform="translate(-37.169998,-161.06996)">
+      <path
+         transform="matrix(1.3766667,0,0,1.3766667,-490.78169,144.19833)"
+         d="m 394.99999,25 c 0,2.209154 -1.79085,4.000027 -3.99999,4.000027 -2.20914,0 -3.99999,-1.790873 -3.99999,-4.000027 0,-2.209154 1.79085,-4.000027 3.99999,-4.000027 2.20914,0 3.99999,1.790873 3.99999,4.000027 z"
+         sodipodi:ry="4.0000272"
+         sodipodi:rx="3.9999938"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-1-7"
+         style="color:#000000;fill:url(#radialGradient20195);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient20267);fill-opacity:1;stroke:#2a4556;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path20245"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="3.9999938"
+         sodipodi:ry="4.0000272"
+         d="m 394.4641,27.000014 c -1.10457,1.913183 -3.55093,2.568688 -5.4641,1.464111 -1.91316,-1.104577 -2.56866,-3.550955 -1.4641,-5.464138"
+         transform="matrix(1.3766667,0,0,1.3766667,-490.78169,144.19833)"
+         sodipodi:start="0.52359878"
+         sodipodi:end="3.6651914"
+         sodipodi:open="true" />
+      <path
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.37666667;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 42.726084,175.86163 9.537826,5.50666"
+         id="path20287"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#f0f0ee;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4478"
+         sodipodi:cx="96"
+         sodipodi:cy="24"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 97,24 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+         transform="matrix(1.3766667,0,0,1.3766667,-84.665002,145.57496)" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient19928);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path19918"
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect19920"
+       y="9.9733334"
+       x="0"
+       height="22.026667"
+       width="22.026667" />
+  </g>
+  <g
+     transform="translate(72,64)"
+     id="22_load-mask"
+     inkscape:label="#load-mask"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/load-mask.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path6277"
+       style="fill:url(#linearGradient6023);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <path
+       d="M 9.781801,19.257885 C 9.428013,18.606225 8.7222015,18.181687 7.9801322,18.182721 6.5435364,18.162786 4.9985361,19.336097 5.0533298,20.85747 5.5468184,21.313098 6.2717563,21.418567 6.9098832,21.273859 8.0639074,20.9919 9.154289,20.276354 9.781801,19.257885 z m 2.825997,-1.63159 c 1.195776,-0.03421 2.360649,-0.620733 3.181845,-1.479167 0.444384,-0.480281 0.715513,-1.160829 0.567673,-1.816017 -1.290152,-0.808139 -3.078768,-0.05679 -3.779802,1.19731 -0.371931,0.642135 -0.357177,1.465655 0.03028,2.097874 z M 4.4124081,22.357906 C 3.864338,20.986202 3.3448102,19.514174 3.5051981,18.015576 3.5602141,17.36838 4.0098251,16.830173 4.6095393,16.605179 5.9164165,15.957058 7.3991918,15.741479 8.6653492,14.995612 9.913299,14.361537 10.990957,13.458619 12,12.5 c 0.548144,-0.417311 1.092056,-0.959735 1.798025,-1.073159 1.104714,-0.02503 1.991316,0.792182 2.756906,1.490825 0.515779,0.515738 1.027867,1.052786 1.439184,1.653853 0.449975,1.359815 0.784491,2.920321 0.182723,4.285838 -0.527652,1.060864 -1.801652,1.529216 -2.928536,1.525069 -1.01209,-0.0082 -2.130831,-0.542431 -3.047394,0.122873 -1.046267,0.711288 -0.961074,2.169211 -1.798054,3.050475 C 9.732031,24.333026 8.681602,24.92512 7.6327211,24.631681 6.3314843,24.298695 5.2736792,23.347569 4.4124101,22.357909 z"
+       id="path5117"
+       style="color:#000000;fill:#f3f3f1;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path6286"
+       style="fill:url(#linearGradient6025);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5911"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,72,48.755448)"
+     id="16_load-mask"
+     inkscape:label="#load-mask"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/load-mask.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path5943"
+       style="fill:url(#linearGradient5951);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 11.219308,19.923549 c -0.353788,-0.65166 -1.059599,-1.076198 -1.8016686,-1.075164 -1.4365958,-0.01994 -2.9815961,1.153376 -2.9268024,2.674749 0.4934886,0.455628 1.2184265,0.561097 1.8565534,0.416389 1.1540242,-0.281959 2.2444066,-0.997505 2.8719176,-2.015974 z m 2.825997,-1.63159 c 1.195776,-0.03421 2.360649,-0.620733 3.181845,-1.479167 0.444384,-0.480281 0.715513,-1.160829 0.567673,-1.816017 -1.290152,-0.808139 -3.078768,-0.05679 -3.779802,1.19731 -0.371931,0.642135 -0.357177,1.465655 0.03028,2.097874 z M 5.8499153,23.02357 c -0.5480701,-1.371704 -1.0675979,-2.843732 -0.90721,-4.34233 0.055016,-0.647196 0.504627,-1.185403 1.1043412,-1.410397 1.3068772,-0.648121 2.7896525,-0.8637 4.0558105,-1.609567 1.247949,-0.634075 2.325607,-1.536993 3.33465,-2.495612 0.548144,-0.417311 1.092056,-0.959735 1.798025,-1.073159 1.104714,-0.02503 1.991316,0.792182 2.756906,1.490825 0.515779,0.515738 1.027867,1.052786 1.439184,1.653853 0.449975,1.359815 0.784491,2.920321 0.182723,4.285838 -0.527652,1.060864 -1.801652,1.529216 -2.928536,1.525069 -1.01209,-0.0082 -2.130831,-0.542431 -3.047394,0.122873 -1.046267,0.711288 -0.961074,2.169211 -1.798054,3.050475 -0.670823,0.777252 -1.721251,1.369346 -2.7701327,1.075907 -1.3012368,-0.332986 -2.3590419,-1.284112 -3.220311,-2.273772 z"
+       id="path5945"
+       style="color:#000000;fill:#f3f3f1;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.23899996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path5947"
+       style="fill:url(#linearGradient5953);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect5949"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="translate(96,64)"
+     id="22_clear-mask"
+     inkscape:label="#clear-mask"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/clear-mask.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="M 8.6201229,20.30753 C 8.2193033,19.56853 7.4196632,19.087093 6.5789453,19.088266 4.9513724,19.065659 3.2009841,20.396225 3.2630619,22.121503 3.8221535,22.638197 4.6434627,22.757802 5.3664204,22.593699 6.6738573,22.27395 7.9091912,21.462502 8.6201229,20.30753 z M 11.8218,18.457263 c 1.354739,-0.0388 2.674467,-0.703927 3.604831,-1.677415 0.503459,-0.544651 0.810631,-1.316411 0.643137,-2.059412 -1.461661,-0.916451 -3.48805,-0.0644 -4.282278,1.357782 -0.421374,0.728198 -0.404659,1.662092 0.0343,2.379045 z M 2.5369379,23.823038 C 1.9160089,22.267488 1.3274165,20.598169 1.509126,18.898719 1.5714556,18.164781 2.0808367,17.55444 2.7602752,17.29929 4.240885,16.564304 5.9207763,16.319831 7.3552531,15.473998 8.7691018,14.75494 9.9900207,13.731007 11.133203,12.643907 c 0.621013,-0.473242 1.237231,-1.088365 2.037049,-1.216991 1.251572,-0.02839 2.256036,0.898356 3.123402,1.690636 0.584345,0.58486 1.164509,1.193887 1.630505,1.875513 0.509793,1.542067 0.888779,3.311723 0.207014,4.860256 -0.597797,1.203048 -2.041159,1.734172 -3.317848,1.729469 -1.146634,-0.0093 -2.414098,-0.615131 -3.452506,0.139341 -1.185355,0.80662 -1.088836,2.459944 -2.0370821,3.459321 C 8.5637366,26.062877 7.3736665,26.734327 6.1853503,26.40156 4.7111307,26.023945 3.512704,24.945342 2.5369402,23.823041 z"
+       id="path6031"
+       style="color:#000000;fill:#f3f3f1;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6035"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       transform="matrix(0.75642455,0,0,0.75644071,-187.35263,-74.853185)"
+       style="fill:url(#linearGradient6098);fill-opacity:1;stroke:#603b31;stroke-width:1.32199478;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 266.18997,134.64794 4.62703,4.62693 3.96603,-3.96594 -4.62703,-4.62693 4.62703,-4.62693 -3.96603,-3.96594 -4.62703,4.62693 -4.62703,-4.62693 -3.96603,3.96594 4.62704,4.62693 -4.62704,4.62693 3.96603,3.96594 4.62703,-4.62693 z"
+       id="polygon6421-0"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,96,48.677552)"
+     id="16_clear-mask"
+     inkscape:label="#clear-mask"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/clear-mask.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect6104"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       d="M 9.3061572,20.993564 C 8.9053376,20.254564 8.1056975,19.773127 7.2649796,19.7743 5.6374067,19.75169 3.8870184,21.082259 3.9490962,22.807537 c 0.5590916,0.516694 1.3804008,0.636299 2.1033585,0.472196 1.3074369,-0.319749 2.5427708,-1.131197 3.2537025,-2.286169 z m 3.2016768,-1.850267 c 1.354739,-0.0388 2.674467,-0.703927 3.604831,-1.677415 0.503459,-0.544651 0.810631,-1.316411 0.643137,-2.059412 -1.461661,-0.916451 -3.48805,-0.0644 -4.282278,1.357782 -0.421374,0.728198 -0.404659,1.662092 0.0343,2.379045 z m -9.2848618,5.365775 c -0.620929,-1.55555 -1.2095214,-3.224869 -1.0278119,-4.924319 0.06233,-0.733938 0.5717107,-1.344279 1.2511492,-1.599429 1.4806098,-0.734986 3.1605011,-0.979459 4.5949779,-1.825292 1.4138487,-0.719058 2.6347676,-1.742991 3.7779496,-2.830091 0.621013,-0.473242 1.237231,-1.088365 2.037049,-1.216991 1.251572,-0.02839 2.256036,0.898356 3.123402,1.690636 0.584345,0.58486 1.164509,1.193887 1.630505,1.875513 0.509793,1.542067 0.888779,3.311723 0.207014,4.860256 -0.597797,1.203048 -2.041159,1.734172 -3.317848,1.729469 -1.146634,-0.0093 -2.414098,-0.615131 -3.452506,0.139341 -1.185355,0.80662 -1.088836,2.459944 -2.037082,3.459321 C 9.2497709,26.748911 8.0597008,27.420361 6.8713846,27.087594 5.397165,26.709979 4.1987383,25.631376 3.2229745,24.509075 z"
+       id="path6102"
+       style="color:#000000;fill:#f3f3f1;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient6108);fill-opacity:1;stroke:#603b31;stroke-width:1.45109415;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 257.65823,134.90938 3.62777,3.62769 4.53472,-4.53462 4.53472,4.53462 3.62777,-3.62769 -4.53472,-4.53462 4.53472,-4.53462 -3.62777,-3.6277 -4.53472,4.53462 -4.53472,-4.53462 -3.62777,3.6277 4.53471,4.53462 -4.53471,4.53462 z"
+       id="polygon6106"
+       sodipodi:nodetypes="ccccccccccccc"
+       transform="matrix(0.75642455,0,0,0.75644071,-187.35263,-74.853185)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727268,136,72.727323)"
+     id="22_connect-stream-video"
+     inkscape:label="#connect-stream-video"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/connect-stream-video.png">
+    <rect
+       width="30.25"
+       height="30.250002"
+       x="0"
+       y="1.749931"
+       id="rect9040"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g17255-9"
+       transform="matrix(1.375,0,0,1.3750001,-20.625,66.374936)">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-46.5 0,12"
+         id="path8870-77"
+         sodipodi:nodetypes="cc" />
+      <rect
+         style="fill:url(#linearGradient17273-5-5);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+         id="rect8872-68"
+         width="7"
+         height="6"
+         x="27.5"
+         y="-46.5" />
+      <rect
+         y="-40.5"
+         x="27.5"
+         height="5.999999"
+         width="7"
+         id="rect8874-1"
+         style="fill:url(#linearGradient17275-4-2);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path8876-2"
+         d="m 36.5,-46.5 0,12"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-45.5 2,0"
+         id="path8878-03" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8880-2"
+         d="m 25.5,-43.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-41.5 2,0"
+         id="path8882-8" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8884-7"
+         d="m 25.5,-39.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-37.5 2,0"
+         id="path8886-4" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8888-6"
+         d="m 25.5,-35.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8890-3"
+         d="m 34.5,-45.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-43.5 2,0"
+         id="path8892-8" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8894-0"
+         d="m 34.5,-41.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-39.5 2,0"
+         id="path8896-4" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8898-9"
+         d="m 34.5,-37.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-35.5 2,0"
+         id="path8900-7" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cczzzcczzzc"
+       id="path9068"
+       d="m 24.06268,31.312433 -15.8126199,0 c 0.6875,-1.374798 -1.37502,-3.436998 -4.12502,-6.186598 C 1.2933,22.294541 0.6875,20.255163 0.6875,18.251833 c 0,-2.0622 8.2500601,-4.724148 8.2500601,-5.499204 0,-0.775056 -2.75002,-0.6874 -4.12502,-0.6874 l 5.5000199,0 c 1.37504,0 4.12506,0 4.12506,0.6874 0,0.6279 -2.75002,1.393856 -2.75002,3.437004 0,2.0622 1.4384,5.530904 6.87504,8.2488 5.50004,2.7496 6.87506,5.499202 5.50004,6.874 z"
+       style="fill:url(#radialGradient9078);fill-opacity:1;stroke:#464f5a;stroke-width:1.375;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0"
+       id="path9070"
+       d="m 12.375,24.437432 -3.4375,-3.4375 7.5625,-7.5625 -3.4375,0 0,-4.125 11,0 0,11 -4.125,0 0,-3.4375 z"
+       style="fill:url(#linearGradient9080);fill-opacity:1;stroke:#435a36;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path9072"
+       d="m 6.875,24.437432 4.8125,-9.625001 4.125,0 -2.75,5.500001 5.865241,0 -5.177741,9.625 -4.125,0 2.75,-5.5 z"
+       style="color:#000000;fill:url(#linearGradient9082);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+  <g
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/connect-stream-video.png"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:label="#connect-stream-video"
+     id="16_connect-stream-video"
+     transform="matrix(0.72727273,0,0,0.72727268,136,48.727323)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect26742"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g17255-3-3"
+       transform="matrix(1.375,0,0,1.3750001,-26.125,75.999936)">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-46.5 0,8"
+         id="path8870-7-9"
+         sodipodi:nodetypes="cc" />
+      <rect
+         style="fill:url(#linearGradient17273-5-9-1);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-opacity:1"
+         id="rect8872-6-1"
+         width="5"
+         height="4.0000005"
+         x="27.5"
+         y="-46.5" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path8876-5-9"
+         d="m 34.5,-46.5 0,8"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-45.5 2,0"
+         id="path8878-0-6" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8880-6-9"
+         d="m 25.5,-43.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-41.5 2,0"
+         id="path8882-5-3" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8884-0-3"
+         d="m 25.5,-39.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8890-2-8"
+         d="m 32.5,-45.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 32.5,-43.5 2,0"
+         id="path8892-2-0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8894-6-5"
+         d="m 32.5,-41.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 32.5,-39.5 2,0"
+         id="path8896-9-6" />
+      <rect
+         y="-42.5"
+         x="27.5"
+         height="4.0000005"
+         width="5"
+         id="rect17463-6"
+         style="fill:url(#linearGradient8168);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:url(#radialGradient27672-0-6);fill-opacity:1;stroke:#464f5a;stroke-width:1.37490571;stroke-linejoin:round;stroke-opacity:1"
+       d="m 12.375043,31.312482 -7.90631,0 c 0.34375,-0.687399 -0.68751,-1.718499 -2.06251,-3.093299 -1.41587003,-1.415647 -1.71877003,-2.435336 -1.71877003,-3.437001 0,-1.0311 4.12503003,-2.362074 4.12503003,-2.749602 0,-0.387528 -1.37501,-0.3437 -2.06251,-0.3437 l 2.75001,0 c 0.6875199,0 2.0625299,0 2.0625299,0.3437 0,0.31395 -1.37501,0.696928 -1.37501,1.718502 0,1.0311 0.7192,2.765452 3.4375201,4.1244 2.75002,1.3748 3.43753,2.749601 2.75002,3.437 z"
+       id="path21915-5-0-1"
+       sodipodi:nodetypes="cczzzcczzzc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient9036);fill-opacity:1;stroke:#435a36;stroke-width:1.23750007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 9.625,25.812432 -2.0625,-2.0625 4.8125,-4.8125 -2.0625,0 0,-2.75 6.875,0 0,6.875 -2.75,0 0,-2.0625 z"
+       id="path9028"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient9026);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1.23750007;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 4.8125,25.812432 3.4375,-6.875001 2.75,0 -2.0625,4.125001 4.490241,0 -3.802741,6.875 -2.75,0 2.0625,-4.125 z"
+       id="path8989"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(32,56)"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/new-stream-video.png"
+     inkscape:label="#new-stream-video"
+     id="22_new-stream-video">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4671"
+       y="18"
+       x="128"
+       height="22"
+       width="22" />
+    <g
+       id="g17255-9-0"
+       transform="translate(109,69)">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-46.5 0,12"
+         id="path8870-77-6"
+         sodipodi:nodetypes="cc" />
+      <rect
+         style="fill:url(#linearGradient17273-5-5-7);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1"
+         id="rect8872-68-1"
+         width="7"
+         height="6"
+         x="27.5"
+         y="-46.5" />
+      <rect
+         y="-40.5"
+         x="27.5"
+         height="5.999999"
+         width="7"
+         id="rect8874-1-5"
+         style="fill:url(#linearGradient17275-4-2-1);fill-opacity:1;stroke:#000000;stroke-linecap:square;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path8876-2-9"
+         d="m 36.5,-46.5 0,12"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-45.5 2,0"
+         id="path8878-03-4" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8880-2-9"
+         d="m 25.5,-43.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-41.5 2,0"
+         id="path8882-8-0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8884-7-9"
+         d="m 25.5,-39.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-37.5 2,0"
+         id="path8886-4-1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8888-6-7"
+         d="m 25.5,-35.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8890-3-7"
+         d="m 34.5,-45.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-43.5 2,0"
+         id="path8892-8-1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8894-0-1"
+         d="m 34.5,-41.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-39.5 2,0"
+         id="path8896-4-5" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path8898-9-9"
+         d="m 34.5,-37.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-35.5 2,0"
+         id="path8900-7-7" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cczzzcczzzc"
+       id="path9068-4"
+       d="m 145.50013,39.500005 -11.50009,0 c 0.5,-0.999853 -1.00001,-2.499635 -3.00001,-4.499344 C 128.94058,32.941538 128.5,31.458354 128.5,30.001387 c 0,-1.499781 6.00004,-3.435743 6.00004,-3.999421 0,-0.563677 -2.00001,-0.499927 -3.00001,-0.499927 l 4.00001,0 c 1.00003,0 3.00005,0 3.00005,0.499927 0,0.456655 -2.00002,1.013714 -2.00002,2.49964 0,1.499781 1.04611,4.022475 5.00003,5.999126 4.00003,1.999709 5.00005,3.99942 4.00003,4.999273 z"
+       style="fill:url(#radialGradient4766);fill-opacity:1;stroke:#464f5a;stroke-width:0.99999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <g
+       id="g4681">
+      <path
+         transform="translate(128,0)"
+         d="M 22,24.5 C 22,28.089851 19.089851,31 15.5,31 11.910149,31 9,28.089851 9,24.5 9,20.910149 11.910149,18 15.5,18 c 3.589851,0 6.5,2.910149 6.5,6.5 z"
+         sodipodi:ry="6.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="24.5"
+         sodipodi:cx="15.5"
+         id="path4683"
+         style="color:#000000;fill:url(#radialGradient4723);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4685"
+         d="m 143.5,18.5 0,12"
+         style="fill:none;stroke:url(#radialGradient4725);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:url(#radialGradient4727);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 149.5,24.5 -12,0"
+         id="path4687"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient4729);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 147.74264,20.257359 -8.48528,8.485282"
+         id="path4689"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4691"
+         d="m 147.74264,28.742641 -8.48528,-8.485282"
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient4731);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,160,48.755448)"
+     id="16_new-stream-video"
+     inkscape:label="#new-stream-video"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/new-stream-video.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect4695"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="matrix(1.3766667,0,0,1.3766667,-30.286663,80.183333)"
+       id="g5650">
+      <path
+         sodipodi:nodetypes="cc"
+         id="path5652"
+         d="m 25.5,-46.5 0,8"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="-46.5"
+         x="27.5"
+         height="4.0000005"
+         width="5"
+         id="rect5654"
+         style="fill:url(#linearGradient17273-5-9-1-6);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 34.5,-46.5 0,8"
+         id="path5656"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5659"
+         d="m 25.5,-45.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-43.5 2,0"
+         id="path5661"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5663"
+         d="m 25.5,-41.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.5,-39.5 2,0"
+         id="path5665"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 32.5,-45.5 2,0"
+         id="path5667"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5669"
+         d="m 32.5,-43.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 32.5,-41.5 2,0"
+         id="path5671"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path5673"
+         d="m 32.5,-39.5 2,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:url(#linearGradient5720);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-opacity:1"
+         id="rect5675"
+         width="5"
+         height="4.0000005"
+         x="27.5"
+         y="-42.5" />
+    </g>
+    <g
+       id="g4705"
+       transform="matrix(1.3766667,0,0,1.3766667,-183.09667,-16.183334)">
+      <path
+         transform="translate(128,0)"
+         d="m 20.000001,24.5 c 0,2.485281 -2.014719,4.5 -4.500001,4.5 -2.485282,0 -4.500001,-2.014719 -4.500001,-4.5 0,-2.485281 2.014719,-4.5 4.500001,-4.5 2.485282,0 4.500001,2.014719 4.500001,4.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.500001"
+         sodipodi:cy="24.5"
+         sodipodi:cx="15.5"
+         id="path4707"
+         style="color:#000000;fill:url(#radialGradient4739);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4709"
+         d="m 143.5,20.5 0,8"
+         style="fill:none;stroke:url(#radialGradient4741);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:url(#radialGradient4743);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 147.5,24.5 -8,0"
+         id="path4711"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient4745);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 146.32843,21.671573 -5.65686,5.656854"
+         id="path4713"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4715"
+         d="m 146.32843,27.328427 -5.65686,-5.656854"
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient4747);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cczzzcczzzc"
+       id="path5677"
+       d="m 12.390046,31.311718 -7.9159004,0 c 0.3441699,-0.688233 -0.68834,-1.720582 -2.06501,-3.097049 -1.41758044,-1.417362 -1.72085044,-2.438287 -1.72085044,-3.441167 0,-1.032349 4.13003034,-2.364937 4.13003034,-2.752934 0,-0.387998 -1.3766799,-0.344117 -2.0650099,-0.344117 l 2.7533399,0 c 0.68836,0 2.0650301,0 2.0650301,0.344117 0,0.31433 -1.3766701,0.697772 -1.3766701,1.720585 0,1.032349 0.7200701,2.768804 3.4416812,4.129399 2.7533593,1.376466 3.4416993,2.752933 2.7533593,3.441166 z"
+       style="fill:url(#radialGradient27672-0-6-1);fill-opacity:1;stroke:#464f5a;stroke-width:1.37657225;stroke-linejoin:round;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(200,64)"
+     id="22_load-database"
+     inkscape:label="#load-database"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/load-database.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7360"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="matrix(1.0000012,0,0,1.0000012,-4.9874817,-1.8125034)"
+       id="g11872-9-1">
+      <path
+         style="color:#000000;fill:url(#linearGradient4310);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 5.437531,25.812475 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+         id="path4308"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssscc" />
+      <path
+         sodipodi:nodetypes="cssscc"
+         inkscape:connector-curvature="0"
+         id="path4304"
+         d="m 5.437531,21.812479 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+         style="color:#000000;fill:url(#linearGradient4306);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:url(#linearGradient4302);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 5.437531,17.812483 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+         id="path11109-7-8-0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssscc" />
+      <path
+         transform="matrix(2.9999963,0,0,2.9999963,108.9374,-450.18693)"
+         d="m -29.5,156 c 0,0.64433 -1.119288,1.16667 -2.5,1.16667 -1.380712,0 -2.5,-0.52234 -2.5,-1.16667 0,-0.64433 1.119288,-1.16667 2.5,-1.16667 1.380712,0 2.5,0.52234 2.5,1.16667 z"
+         sodipodi:ry="1.1666679"
+         sodipodi:rx="2.5"
+         sodipodi:cy="156"
+         sodipodi:cx="-32"
+         id="path11099-5-5-4"
+         style="color:#000000;fill:url(#linearGradient7715);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.33333334;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       id="path7356"
+       d="m 11.5,25.5 0,-6 -4,0 6.5,-7.5 6.5,7.5 -4,0 0,6 z"
+       style="fill:url(#linearGradient7374);fill-opacity:1;stroke:#435a36;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,200,48.75545)"
+     id="16_load-database"
+     inkscape:label="#load-database"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/load-database.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <g
+       transform="matrix(0.91777893,0,0,0.91777893,-2.9254498,2.8032542)"
+       id="g11872-9">
+      <path
+         id="path11885-2"
+         style="color:#000000;fill:url(#linearGradient7612);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 12.937518,31.062471 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sccccs" />
+      <path
+         sodipodi:nodetypes="sccccs"
+         inkscape:connector-curvature="0"
+         d="m 12.937518,26.562475 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+         style="color:#000000;fill:url(#linearGradient7614);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path11881-6" />
+      <path
+         id="path11109-7-8"
+         style="color:#000000;fill:url(#linearGradient7616);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 12.937518,22.062479 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sccccs" />
+      <path
+         transform="matrix(2.9999963,0,0,2.9999963,108.9374,-453.81193)"
+         d="m -29.5,156 c 0,0.62132 -1.119288,1.125 -2.5,1.125 -1.380712,0 -2.5,-0.50368 -2.5,-1.125 0,-0.62132 1.119288,-1.125 2.5,-1.125 1.380712,0 2.5,0.50368 2.5,1.125 z"
+         sodipodi:ry="1.1250012"
+         sodipodi:rx="2.5"
+         sodipodi:cy="156"
+         sodipodi:cx="-32"
+         id="path11099-5-5"
+         style="color:#000000;fill:url(#linearGradient7618);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect7370"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc"
+       id="path7356-4"
+       d="m 11.701668,25.804997 0,-6.883333 -3.4416709,0 6.1950009,-6.883335 6.195,6.883335 -3.44167,0 0,6.883333 z"
+       style="fill:url(#linearGradient7635);fill-opacity:1;stroke:#435a36;stroke-width:1.37666667;stroke-opacity:1" />
+  </g>
+  <g
+     transform="translate(224,64)"
+     id="22_search-database"
+     inkscape:label="#search-database"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/search-database.png">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7294"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="matrix(1.0000012,0,0,1.0000012,-2.987484,-1.8125005)"
+       id="g11872-9-1-1">
+      <path
+         style="color:#000000;fill:url(#linearGradient4310-9);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 5.437531,25.812475 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+         id="path4308-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssscc" />
+      <path
+         sodipodi:nodetypes="cssscc"
+         inkscape:connector-curvature="0"
+         id="path4304-9"
+         d="m 5.437531,21.812479 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+         style="color:#000000;fill:url(#linearGradient4306-7);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="color:#000000;fill:url(#linearGradient4302-0);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 5.437531,17.812483 0,3.999995 c 0,1.932996 3.357856,3.499995 7.499991,3.499995 4.142135,0 7.499991,-1.566999 7.499991,-3.499995 l 0,-3.999995 z"
+         id="path11109-7-8-0-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cssscc" />
+      <path
+         transform="matrix(2.9999963,0,0,2.9999963,108.9374,-450.18693)"
+         d="m -29.5,156 c 0,0.64433 -1.119288,1.16667 -2.5,1.16667 -1.380712,0 -2.5,-0.52234 -2.5,-1.16667 0,-0.64433 1.119288,-1.16667 2.5,-1.16667 1.380712,0 2.5,0.52234 2.5,1.16667 z"
+         sodipodi:ry="1.1666679"
+         sodipodi:rx="2.5"
+         sodipodi:cy="156"
+         sodipodi:cx="-32"
+         id="path11099-5-5-4-8"
+         style="color:#000000;fill:url(#linearGradient7851);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.33333334;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccccc"
+       transform="translate(-424,-120)"
+       inkscape:connector-curvature="0"
+       id="path7292"
+       d="m 436.5,140.5 2,2 6.5,6 -2.5,2.5 -6,-6.5 -2,-2"
+       style="fill:url(#linearGradient7333);fill-opacity:1;stroke:#4b4b3c;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <g
+       id="g7296">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient7335);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path7298"
+         sodipodi:cx="428"
+         sodipodi:cy="136"
+         sodipodi:rx="6.5"
+         sodipodi:ry="6.5"
+         d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+         transform="translate(-421,-119)" />
+      <path
+         transform="translate(-421,-119)"
+         d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+         sodipodi:ry="6.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="136"
+         sodipodi:cx="428"
+         id="path7300"
+         style="color:#000000;fill:url(#radialGradient7337);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-421,-119)"
+         d="m 434,136 c 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 3.31371,0 6,2.68629 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="136"
+         sodipodi:cx="428"
+         id="path7302"
+         style="color:#000000;fill:none;stroke:url(#linearGradient7339);stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6939);enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path7305"
+         sodipodi:cx="428"
+         sodipodi:cy="136"
+         sodipodi:rx="6.5"
+         sodipodi:ry="6.5"
+         d="m 434.5,136 c 0,3.58985 -2.91015,6.5 -6.5,6.5 -3.58985,0 -6.5,-2.91015 -6.5,-6.5 0,-3.58985 2.91015,-6.5 6.5,-6.5 3.58985,0 6.5,2.91015 6.5,6.5 z"
+         transform="translate(-421,-119)" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7307"
+         d="m 7,11.5 c -3.03757,0 -5.5,2.46243 -5.5,5.5 0,0.25674 0.02846,0.50262 0.0625,0.75 -0.0021,-0.45763 0.06335,-0.91165 0.1875,-1.375 0.75044,-2.8007 3.60555,-4.46919 6.40625,-3.71875 2.8007,0.75044 4.46919,3.6368 3.71875,6.4375 -0.12837,0.4791 -0.32061,0.90642 -0.5625,1.3125 C 12.0553,19.46855 12.5,18.28917 12.5,17 12.5,13.96243 10.03757,11.5 7,11.5 z"
+         style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7637);enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7309"
+         d="m 7,12 c -1.64808,0 -3.08913,0.83249 -4,2.0625 1.40812,-1.00322 3.2308,-1.41993 5.03125,-0.9375 0.31676,0.08488 0.6163,0.18223 0.90625,0.3125 L 9.1875,12.5 C 8.52925,12.17878 7.78163,12 7,12 z m 3.0625,1.09375 -0.21875,0.875 c 0.94547,0.63904 1.673,1.5097 2.125,2.53125 -0.14086,-1.38702 -0.86841,-2.58673 -1.90625,-3.40625 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7597);enable-background:accumulate" />
+    </g>
+    <path
+       sodipodi:nodetypes="ccccc"
+       transform="translate(-424,-120)"
+       inkscape:connector-curvature="0"
+       id="path7311"
+       d="m 436.5,144.5 2,-2 6.5,6 -2.5,2.5 z"
+       style="fill:url(#linearGradient7341);fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.72727273,0,0,0.72727273,224,48.72727)"
+     id="16_search-database"
+     inkscape:label="#search-database"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/search-database.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect7315"
+       style="color:#000000;fill:none;stroke:none;stroke-width:0.99962503;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="matrix(0.91666781,0,0,0.91666781,-1.546906,2.8386078)"
+       id="g11872-9-11">
+      <path
+         id="path11885-2-9"
+         style="color:#000000;fill:url(#linearGradient7612-0);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 12.937518,31.062471 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sccccs" />
+      <path
+         sodipodi:nodetypes="sccccs"
+         inkscape:connector-curvature="0"
+         d="m 12.937518,26.562475 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+         style="color:#000000;fill:url(#linearGradient7614-0);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path11881-6-0" />
+      <path
+         id="path11109-7-8-5"
+         style="color:#000000;fill:url(#linearGradient7616-7);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.49999809;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 12.937518,22.062479 c -4.1421305,0 -7.4999903,-1.511038 -7.4999903,-3.374995 l 0,-4.499994 14.9999813,0 0,4.499994 c 0,1.863957 -3.35786,3.374995 -7.499991,3.374995 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sccccs" />
+      <path
+         transform="matrix(2.9999963,0,0,2.9999963,108.9374,-453.81193)"
+         d="m -29.5,156 c 0,0.62132 -1.119288,1.125 -2.5,1.125 -1.380712,0 -2.5,-0.50368 -2.5,-1.125 0,-0.62132 1.119288,-1.125 2.5,-1.125 1.380712,0 2.5,0.50368 2.5,1.125 z"
+         sodipodi:ry="1.1250012"
+         sodipodi:rx="2.5"
+         sodipodi:cy="156"
+         sodipodi:cx="-32"
+         id="path11099-5-5-6"
+         style="color:#000000;fill:url(#linearGradient7987);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="fill:url(#linearGradient7343);fill-opacity:1;stroke:#4b4b3c;stroke-width:1.375px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.75,21.000004 6.875,6.875 -2.75,2.75 -6.875,-6.875"
+       id="path7317"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <g
+       transform="matrix(1.375,0,0,1.375,0,-3.7499959)"
+       id="g7319">
+      <path
+         transform="translate(-422.5,-120.5)"
+         d="m 433,136 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
+         sodipodi:ry="5.0000005"
+         sodipodi:rx="5"
+         sodipodi:cy="136"
+         sodipodi:cx="428"
+         id="path7321"
+         style="color:#000000;fill:url(#radialGradient7346);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient7348);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path7323"
+         sodipodi:cx="428"
+         sodipodi:cy="136"
+         sodipodi:rx="5"
+         sodipodi:ry="5.0000005"
+         d="m 433,136 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
+         transform="translate(-422.5,-120.5)" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:url(#linearGradient7350);stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6939-7);enable-background:accumulate"
+         id="path7325"
+         sodipodi:cx="428"
+         sodipodi:cy="136"
+         sodipodi:rx="4.5"
+         sodipodi:ry="4.5000005"
+         d="m 432.5,136 c 0,2.48528 -2.01472,4.5 -4.5,4.5 -2.48528,0 -4.5,-2.01472 -4.5,-4.5 0,-2.48528 2.01472,-4.5 4.5,-4.5 2.48528,0 4.5,2.01472 4.5,4.5 z"
+         transform="translate(-422.5,-120.5)" />
+      <path
+         transform="translate(-422.5,-120.5)"
+         d="m 433,136 c 0,2.76142 -2.23858,5 -5,5 -2.76142,0 -5,-2.23858 -5,-5 0,-2.76142 2.23858,-5 5,-5 2.76142,0 5,2.23858 5,5 z"
+         sodipodi:ry="5.0000005"
+         sodipodi:rx="5"
+         sodipodi:cy="136"
+         sodipodi:cx="428"
+         id="path7327"
+         style="color:#000000;fill:none;stroke:#4b4b3c;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7329"
+         d="m 5.5,11.5 c -2.20914,0 -4,1.79086 -4,4 0,0.17012 0.04189,0.33547 0.0625,0.5 0.01493,-0.24873 0.058,-0.49994 0.125,-0.75 0.53603,-2.0005 2.59325,-3.19228 4.59375,-2.65625 2.0005,0.53603 3.19228,2.59325 2.65625,4.59375 -0.08622,0.32177 -0.21668,0.63035 -0.375,0.90625 C 9.15124,17.39718 9.5,16.48346 9.5,15.5 c 0,-2.20914 -1.79086,-4 -4,-4 z"
+         style="color:#000000;fill:#688090;fill-opacity:0.37647059;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7605);enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7331"
+         d="m 5.5,12 c -1.2684,0 -2.35486,0.6774 -2.96875,1.6875 1.03377,-0.67472 2.33873,-0.9384 3.625,-0.59375 0.15241,0.04084 0.29374,0.10115 0.4375,0.15625 l 0.25,-0.96875 C 6.4286,12.10775 5.97804,12 5.5,12 z M 7.75,12.8125 7.5,13.71875 C 8.13865,14.15766 8.65961,14.75401 9,15.4375 8.98155,14.38302 8.50384,13.44211 7.75,12.8125 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:0.50196078;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7601);enable-background:accumulate" />
+    </g>
+  </g>
+  <g
+     id="22_new-query"
+     inkscape:label="#new-query"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/new-query.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     transform="translate(136,56)">
+    <rect
+       width="22"
+       height="22"
+       x="128"
+       y="18"
+       id="rect6290"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g11977">
+      <path
+         transform="matrix(1.9166667,0,0,1.9166667,-610.41667,-18.916667)"
+         d="m 395.95653,25 c 0,2.737412 -2.21912,4.956522 -4.95653,4.956522 -2.73741,0 -4.95653,-2.21911 -4.95653,-4.956522 0,-2.737412 2.21912,-4.956522 4.95653,-4.956522 2.73741,0 4.95653,2.21911 4.95653,4.956522 z"
+         sodipodi:ry="4.956522"
+         sodipodi:rx="4.9565268"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-26-8-6"
+         style="color:#000000;fill:url(#radialGradient7075);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.52173913;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="fill:url(#radialGradient6406);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path6434-2-7"
+         d="m 140.5,31 -3,0 c 0,-0.964286 0.0112,-1.511149 1,-2.5 1,-1 2,-1.388868 2,-2 0,-0.5 -0.55849,-1 -1.5,-1 -1,0 -1.5,0.857143 -1.5,1.5 l -3,-0.5 c 0.32143,-2.892858 2,-4 4.5,-4 2.459,0 4.5,1.571428 4.5,3.5 0,1.899076 -1.03357,2.355717 -2,3 -0.96429,0.642858 -1,1.035714 -1,2 z"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:url(#radialGradient6404);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect6447-7-3"
+         y="32.5"
+         x="137.5"
+         height="3"
+         width="3" />
+    </g>
+    <g
+       id="g11970">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient11995);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5617"
+         sodipodi:cx="15.5"
+         sodipodi:cy="24.5"
+         sodipodi:rx="6.5"
+         sodipodi:ry="6.5"
+         d="M 22,24.5 C 22,28.089851 19.089851,31 15.5,31 11.910149,31 9,28.089851 9,24.5 9,20.910149 11.910149,18 15.5,18 c 3.589851,0 6.5,2.910149 6.5,6.5 z"
+         transform="translate(128,0)" />
+      <path
+         style="fill:none;stroke:url(#radialGradient11997);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 143.5,18.5 0,12"
+         id="path4172"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4176"
+         d="m 149.5,24.5 -12,0"
+         style="fill:none;stroke:url(#radialGradient11999);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path12005"
+         d="m 147.74264,20.257359 -8.48528,8.485282"
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient12009);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient12011);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 147.74264,28.742641 -8.48528,-8.485282"
+         id="path12007"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/new-query.png"
+     inkscape:label="#new-query"
+     id="16_new-query"
+     transform="matrix(0.72639225,0,0,0.72639225,264,48.755448)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12027"
+       y="9.9733334"
+       x="0"
+       height="22.026667"
+       width="22.026667" />
+    <g
+       id="g5121-9-4"
+       transform="matrix(1.3766667,0,0,1.3766667,13.766671,-5.1700006)">
+      <path
+         transform="translate(-393.5,-5.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-26-6-6"
+         style="color:#000000;fill:url(#radialGradient5126-7-6);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczzzcczzzc"
+         d="m -1.5,21.5 -2,0 c 0,-0.964286 0,-1.5 0.5,-2 0.5,-0.5 1.5,-0.388868 1.5,-1 0,-0.5 0,-1 -1,-1 -1,0 -1,0.357143 -1,1 l -2,0 c 0,-1 0,-3 3,-3 3,0 3,2 3,2.5 0,0.5 0,1.5 -1,2 -1,0.5 -1,0.950154 -1,1.5 z"
+         id="path6434-2-5-3-4"
+         style="fill:url(#radialGradient5128-9-9);fill-opacity:1;stroke:#2a4556;stroke-width:0.79999995;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         width="2"
+         height="2"
+         x="-3.5"
+         y="21.5"
+         id="rect6447-7-8-8-14"
+         style="fill:url(#radialGradient12077);fill-opacity:1;stroke:#2a4556;stroke-width:0.79999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       transform="matrix(1.3766667,0,0,1.3766667,-183.09667,-16.183334)"
+       id="g11970-6">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient11995-3);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5617-5"
+         sodipodi:cx="15.5"
+         sodipodi:cy="24.5"
+         sodipodi:rx="4.500001"
+         sodipodi:ry="4.5"
+         d="m 20.000001,24.5 c 0,2.485281 -2.014719,4.5 -4.500001,4.5 -2.485282,0 -4.500001,-2.014719 -4.500001,-4.5 0,-2.485281 2.014719,-4.5 4.500001,-4.5 2.485282,0 4.500001,2.014719 4.500001,4.5 z"
+         transform="translate(128,0)" />
+      <path
+         style="fill:none;stroke:url(#radialGradient11997-3);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 143.5,20.5 0,8"
+         id="path4172-3"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4176-4"
+         d="m 147.5,24.5 -8,0"
+         style="fill:none;stroke:url(#radialGradient11999-1);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path12298"
+         d="m 146.32843,21.671573 -5.65686,5.656854"
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient12302);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient12304);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 146.32843,27.328427 -5.65686,-5.656854"
+         id="path12300"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+  <g
+     transform="translate(160,56)"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/edit-query.png"
+     inkscape:label="#edit-query"
+     id="22_edit-query">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4561"
+       y="18"
+       x="128"
+       height="22"
+       width="22" />
+    <g
+       id="g4563">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4616);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.52173913;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4565"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="4.9565268"
+         sodipodi:ry="4.956522"
+         d="m 395.95653,25 c 0,2.737412 -2.21912,4.956522 -4.95653,4.956522 -2.73741,0 -4.95653,-2.21911 -4.95653,-4.956522 0,-2.737412 2.21912,-4.956522 4.95653,-4.956522 2.73741,0 4.95653,2.21911 4.95653,4.956522 z"
+         transform="matrix(1.9166667,0,0,1.9166667,-610.41667,-18.916667)" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczzzcczzzc"
+         d="m 140.5,31 -3,0 c 0,-0.964286 0.0112,-1.511149 1,-2.5 1,-1 2,-1.388868 2,-2 0,-0.5 -0.55849,-1 -1.5,-1 -1,0 -1.5,0.857143 -1.5,1.5 l -3,-0.5 c 0.32143,-2.892858 2,-4 4.5,-4 2.459,0 4.5,1.571428 4.5,3.5 0,1.899076 -1.03357,2.355717 -2,3 -0.96429,0.642858 -1,1.035714 -1,2 z"
+         id="path4568"
+         style="fill:url(#radialGradient4618);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         width="3"
+         height="3"
+         x="137.5"
+         y="32.5"
+         id="rect4570"
+         style="fill:url(#radialGradient4620);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       id="g5534"
+       transform="translate(-1,0)">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient5544);fill-opacity:1;stroke:none"
+         d="m 143,37.5 5.5,-11 -4,-2 -5.5,11 1.5,2 2.5,0 z"
+         id="path5754-6"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path5752-3"
+         d="m 141,36.5 5.5,-11"
+         style="fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path5766-8"
+         d="m 143,37.5 -4,-2 0.5,4 3.5,-2 z"
+         style="fill:url(#radialGradient5546);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient5548);fill-opacity:1;stroke:none"
+         d="m 149.5,24.5 -4,-2 -1,2 4,2 1,-2 z"
+         id="path5770-56"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path5778-1"
+         d="m 150.5,22.5 -4,-2 -1,2 4,2 1,-2 z"
+         style="fill:url(#radialGradient5550);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+         d="m 149.5,24.5 1,-2 -4,-2 -1,2"
+         id="path5901-1"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc"
+         id="path5764-5"
+         d="m 149.5,24.5 -4,-2 -6.5,13 0.5,4 3.5,-2 6.5,-13 z"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5774-9"
+         d="m 144.5,24.5 4,2"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,288,48.755448)"
+     id="16_edit-query"
+     inkscape:label="#edit-query"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/edit-query.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect4589"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="matrix(1.3766667,0,0,1.3766667,13.766671,-5.1700006)"
+       id="g4591">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4632);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4593"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-393.5,-5.5)" />
+      <path
+         style="fill:url(#radialGradient4634);fill-opacity:1;stroke:#2a4556;stroke-width:0.79999995;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4600"
+         d="m -1.5,21.5 -2,0 c 0,-0.964286 0,-1.5 0.5,-2 0.5,-0.5 1.5,-0.388868 1.5,-1 0,-0.5 0,-1 -1,-1 -1,0 -1,0.357143 -1,1 l -2,0 c 0,-1 0,-3 3,-3 3,0 3,2 3,2.5 0,0.5 0,1.5 -1,2 -1,0.5 -1,0.950154 -1,1.5 z"
+         sodipodi:nodetypes="cczzzcczzzc"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:url(#radialGradient4636);fill-opacity:1;stroke:#2a4556;stroke-width:0.79999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4602"
+         y="21.5"
+         x="-3.5"
+         height="2"
+         width="2" />
+    </g>
+    <g
+       transform="matrix(1.0033512,0,0,1.0033512,3.0924946e-5,1.2694944)"
+       id="g5552">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient5830-8);fill-opacity:1;stroke:none"
+         d="m 14.178034,28.341165 5.030927,-10.061852 -3.658859,-1.829428 -5.03092,10.061852 1.372068,1.829428 2.286784,0 z"
+         id="path5754-7-4"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path5752-5-6"
+         d="m 12.348618,27.19776 4.80224,-9.604481"
+         style="fill:none;stroke:#6f6f58;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path5766-1-9"
+         d="m 14.406721,28.569828 -4.116206,-2.058103 0.686034,3.430172 3.430172,-1.372069 z"
+         style="fill:url(#radialGradient5768-7-7);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient5772-7-2);fill-opacity:1;stroke:none"
+         d="m 20.58103,16.22121 -4.116206,-2.058103 -1.372069,2.744138 4.116206,2.058103 1.372069,-2.744138 z"
+         id="path5770-5-2"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path5778-0-2"
+         d="m 21.267064,14.849142 -4.116206,-2.058103 -1.029051,2.058102 4.116206,2.058104 1.029051,-2.058103 z"
+         style="fill:url(#radialGradient5780-2-5);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#603b31;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+         d="m 19.894996,17.593279 1.372068,-2.744137 -4.116206,-2.058103 -1.372068,2.744137"
+         id="path5903-4"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc"
+         id="path5764-7-7"
+         d="m 14.406721,28.569828 5.831292,-11.662583 -4.116206,-2.058103 -5.831292,11.662583 0.686034,3.430172 3.430172,-1.372069 z"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path5774-4-7"
+         d="m 15.092755,16.907245 4.116206,2.058103"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+  <g
+     transform="translate(312,64)"
+     id="22_load-query"
+     inkscape:label="#load-query"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/load-query.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path4161"
+       style="fill:url(#linearGradient4199);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g5121"
+       transform="translate(12,-2)">
+      <path
+         transform="translate(-393.5,-5.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-26"
+         style="color:#000000;fill:url(#radialGradient5126);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczzzcczzzc"
+         d="m -1.5,21.5 -2,0 c 0,-0.964286 0,-1.5 0.5,-2 0.5,-0.5 1.5,-0.388868 1.5,-1 0,-0.5 0,-1 -1,-1 -1,0 -1,0.357143 -1,1 l -2,0 c 0,-1 0,-3 3,-3 3,0 3,2 3,2.5 0,0.5 0,1.5 -1,2 -1,0.5 -1,0.950154 -1,1.5 z"
+         id="path6434-2-5"
+         style="fill:url(#radialGradient5128);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         width="2"
+         height="2"
+         x="-3.5"
+         y="21.5"
+         id="rect6447-7-8"
+         style="fill:url(#radialGradient5130);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path4165"
+       style="fill:url(#linearGradient4203);fill-opacity:1;stroke:#6f6f58"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect4167-6"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,312,48.755448)"
+     id="16_load-query"
+     inkscape:label="#load-query"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/load-query.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <path
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z"
+       id="path4171"
+       style="fill:url(#linearGradient4205);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g5121-9-1-3"
+       transform="matrix(1.3766667,0,0,1.3766667,15.143338,-9.3000002)">
+      <path
+         transform="translate(-393.5,-5.5)"
+         d="m 396,25 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-26-6-7-8"
+         style="color:#000000;fill:url(#radialGradient5126-7-7-7-0);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccszcc"
+         d="m -1.5,20.5 -2,0 c 0,-1 1.25,-1.5 1.25,-2 0,-0.5 -0.5,-0.5 -0.5,0.5 l -1.75,0 0,-0.5 c 0,-1 0.5,-2 2,-2 1.5,0 2,1 2,2 0,1 -1,1.5 -1,2 z"
+         id="path6434-2-5-3-7-7"
+         style="fill:url(#radialGradient5128-9-1-0-0);fill-opacity:1;stroke:#2a4556;stroke-width:0.79999995;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         width="2"
+         height="2"
+         x="-3.5"
+         y="20.5"
+         id="rect6447-7-8-8-1-3"
+         style="fill:url(#radialGradient4077);fill-opacity:1;stroke:#2a4556;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <path
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z"
+       id="path4175"
+       style="fill:url(#linearGradient4209);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect4177"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/save-query.png"
+     inkscape:label="#save-query"
+     id="22_save-query"
+     transform="translate(336,64)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4211);fill-opacity:1;stroke:#6f6f58"
+       id="path4181"
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <path
+       id="path4183"
+       style="fill:url(#linearGradient5345);fill-opacity:1;stroke:#2a4556;stroke-opacity:1"
+       d="m 7.5,14 c -2.5,0 -4.5,2 -4,4.5 -1,-3.5 1,-6 4,-7 3,-1 6,0.5 7,3.5 l 3,-0.75 -3.75,6.25 -6.25,-3.75 3,-0.75 c 0,-0.5 -0.5,-2 -3,-2 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zczcccccz" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4215);fill-opacity:1;stroke:#6f6f58"
+       id="path4185"
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4187"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <g
+       id="g5121-9"
+       transform="translate(9,6)">
+      <path
+         transform="translate(-393.5,-5.5)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-26-6"
+         style="color:#000000;fill:url(#radialGradient5126-7);fill-opacity:1;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczzzcczzzc"
+         d="m -1.5,21.5 -2,0 c 0,-0.964286 0,-1.5 0.5,-2 0.5,-0.5 1.5,-0.388868 1.5,-1 0,-0.5 0,-1 -1,-1 -1,0 -1,0.357143 -1,1 l -2,0 c 0,-1 0,-3 3,-3 3,0 3,2 3,2.5 0,0.5 0,1.5 -1,2 -1,0.5 -1,0.950154 -1,1.5 z"
+         id="path6434-2-5-3"
+         style="fill:url(#radialGradient5128-9);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         width="2"
+         height="2"
+         x="-3.5"
+         y="21.5"
+         id="rect6447-7-8-8"
+         style="fill:url(#radialGradient5279);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/save-query.png"
+     inkscape:label="#save-query"
+     id="16_save-query"
+     transform="matrix(0.72639225,0,0,0.72639225,336,48.755448)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4217);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4191"
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <path
+       id="path4183-0"
+       style="fill:url(#linearGradient4149);fill-opacity:1;stroke:#2a4556;stroke-width:1.10133338;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 10.325,13.415 c -2.065,0 -4.8183334,2.065 -4.13,4.818333 -1.0325,-3.441666 0.8535332,-6.270716 3.868433,-7.275683 3.0149,-1.0049671 6.1124,0.39235 7.1449,3.48985 l 2.753334,-0.688333 -3.61375,6.022916 L 10.325,16.168333 13.078333,15.48 c 0,-0.688333 -0.688333,-2.065 -2.753333,-2.065 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zczcccccz" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4221);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path4195"
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4197"
+       y="9.9733334"
+       x="0"
+       height="22.026667"
+       width="22.026667" />
+    <g
+       id="g5121-9-1"
+       transform="matrix(1.3766667,0,0,1.3766667,11.013336,-2.4166673)">
+      <path
+         transform="translate(-393.5,-5.5)"
+         d="m 396,25 c 0,2.761424 -2.23858,5 -5,5 -2.76142,0 -5,-2.238576 -5,-5 0,-2.761424 2.23858,-5 5,-5 2.76142,0 5,2.238576 5,5 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-26-6-7"
+         style="color:#000000;fill:url(#radialGradient5126-7-7-7);fill-opacity:1;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccszcc"
+         d="m -1.5,20.5 -2,0 c 0,-1 1.25,-1.5 1.25,-2 0,-0.5 -0.5,-0.5 -0.5,0.5 l -1.75,0 0,-0.5 c 0,-1 0.5,-2 2,-2 1.5,0 2,1 2,2 0,1 -1,1.5 -1,2 z"
+         id="path6434-2-5-3-7"
+         style="fill:url(#radialGradient5128-9-1-0);fill-opacity:1;stroke:#2a4556;stroke-width:0.79999995;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         width="2"
+         height="2"
+         x="-3.5"
+         y="20.5"
+         id="rect6447-7-8-8-1"
+         style="fill:url(#radialGradient3984);fill-opacity:1;stroke:#2a4556;stroke-width:0.69999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+  <g
+     transform="translate(376,64)"
+     id="22_edit-location"
+     inkscape:label="#edit-location"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/edit-location.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect10079-1"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g5541-6"
+       transform="matrix(0.7288265,0,0,0.7288265,2.9999972,21.677549)">
+      <path
+         transform="matrix(1.3720687,0,0,1.3720687,-637.32587,43.662588)"
+         d="m 477.50003,-32 c 0,3.037566 -2.46245,5.499999 -5.50003,5.499999 -3.03758,0 -5.50003,-2.462433 -5.50003,-5.499999 0,-3.037566 2.46245,-5.499999 5.50003,-5.499999 3.03758,0 5.50003,2.462433 5.50003,5.499999 z"
+         sodipodi:ry="5.499999"
+         sodipodi:rx="5.5000272"
+         sodipodi:cy="-32"
+         sodipodi:cx="472"
+         id="path5531-2"
+         style="color:#000000;fill:none;stroke:#687a4f;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#linearGradient6381);fill-opacity:1;stroke:#687a4f;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5558-2"
+         sodipodi:cx="472"
+         sodipodi:cy="-32"
+         sodipodi:rx="2.5000274"
+         sodipodi:ry="2.4999993"
+         d="m 474.50003,-32 c 0,1.380711 -1.1193,2.499999 -2.50003,2.499999 -1.38073,0 -2.50003,-1.119288 -2.50003,-2.499999 0,-1.380711 1.1193,-2.499999 2.50003,-2.499999 1.38073,0 2.50003,1.119288 2.50003,2.499999 z"
+         transform="matrix(1.3720687,0,0,1.3720687,-637.32587,43.662588)" />
+      <rect
+         style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6412"
+         width="5.4882746"
+         height="2.7441373"
+         x="-2.0580993"
+         y="-1.6156781" />
+      <rect
+         y="-1.6156781"
+         x="17.15086"
+         height="2.7441373"
+         width="5.4882746"
+         id="rect6434"
+         style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6436"
+         width="2.7441397"
+         height="5.4882746"
+         x="8.9184484"
+         y="-12.592227" />
+      <rect
+         y="6.6167345"
+         x="8.9184484"
+         height="5.4882746"
+         width="2.7441397"
+         id="rect6438"
+         style="color:#000000;fill:#aed476;fill-opacity:1;fill-rule:nonzero;stroke:#687a4f;stroke-width:1.37206864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#aed476;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6432"
+         sodipodi:cx="472"
+         sodipodi:cy="-32"
+         sodipodi:rx="5.5000272"
+         sodipodi:ry="5.499999"
+         d="m 477.50003,-32 c 0,3.037566 -2.46245,5.499999 -5.50003,5.499999 -3.03758,0 -5.50003,-2.462433 -5.50003,-5.499999 0,-3.037566 2.46245,-5.499999 5.50003,-5.499999 3.03758,0 5.50003,2.462433 5.50003,5.499999 z"
+         transform="matrix(1.3720687,0,0,1.3720687,-637.32587,43.662588)" />
+    </g>
+    <g
+       id="g6336"
+       transform="translate(1,0)">
+      <path
+         sodipodi:nodetypes="cccccc"
+         id="path10083-0"
+         d="m 13,28.5 5.5,-11 -4,-2 -5.5,11 1.5,2 2.5,0 z"
+         style="fill:url(#radialGradient6352);fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 11,27.5 5.5,-11"
+         id="path10085-6"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#radialGradient6350);fill-opacity:1;stroke:none"
+         d="m 13,28.5 -4,-2 0.5,4 3.5,-2 z"
+         id="path10087-1"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path10089-5"
+         d="m 19.5,15.5 -4,-2 -1,2 4,2 1,-2 z"
+         style="fill:url(#radialGradient6348);fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#radialGradient6346);fill-opacity:1;stroke:none"
+         d="m 20.5,13.5 -4,-2 -1,2 4,2 1,-2 z"
+         id="path10091-9"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path10093-4"
+         d="m 19.5,15.5 1,-2 -4,-2 -1,2"
+         style="fill:none;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+         d="m 19.5,15.5 -4,-2 -6.5,13 0.5,4 3.5,-2 6.5,-13 z"
+         id="path10095-9"
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.5,15.5 4,2"
+         id="path10097-0"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,376,48.67755)"
+     id="16_edit-location"
+     inkscape:label="#edit-location"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/edit-location.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect10101-1"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g5541"
+       transform="translate(1.3720687,21.953098)">
+      <path
+         transform="matrix(1.3720687,0,0,1.3720687,-638.0119,42.976554)"
+         d="m 476.50003,-32 c 0,2.485282 -2.01473,4.5 -4.50003,4.5 -2.4853,0 -4.50003,-2.014718 -4.50003,-4.5 0,-2.485282 2.01473,-4.5 4.50003,-4.5 2.4853,0 4.50003,2.014718 4.50003,4.5 z"
+         sodipodi:ry="4.5000005"
+         sodipodi:rx="4.5000334"
+         sodipodi:cy="-32"
+         sodipodi:cx="472"
+         id="path5531"
+         style="color:#000000;fill:none;stroke:#687a4f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5533"
+         d="m 1.761947e-5,-0.92964594 4.11620608053,0"
+         style="fill:none;stroke:#687a4f;stroke-width:2.74413729;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#687a4f;stroke-width:2.74413729;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 15.09277,-0.92964594 4.116206,0"
+         id="path5535"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#687a4f;stroke-width:2.74413729;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 9.6044967,-10.534125 0,4.1162061"
+         id="path5537"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5539"
+         d="m 9.6044967,4.5586268 0,4.1162063"
+         style="fill:none;stroke:#687a4f;stroke-width:2.74413729;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#linearGradient6334);fill-opacity:1;stroke:#687a4f;stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5558"
+         sodipodi:cx="472"
+         sodipodi:cy="-32"
+         sodipodi:rx="2.5000334"
+         sodipodi:ry="2.5000005"
+         d="m 474.50003,-32 c 0,1.380712 -1.1193,2.5 -2.50003,2.5 -1.38073,0 -2.50003,-1.119288 -2.50003,-2.5 0,-1.380712 1.1193,-2.5 2.50003,-2.5 1.38073,0 2.50003,1.119288 2.50003,2.5 z"
+         transform="matrix(1.3720687,0,0,1.3720687,-638.0119,42.976554)" />
+    </g>
+    <g
+       id="g5548">
+      <path
+         sodipodi:nodetypes="cccccc"
+         id="path10105-7"
+         d="m 14.178034,28.341165 5.030927,-10.061852 -3.658859,-1.829428 -5.03092,10.061852 1.372068,1.829428 2.286784,0 z"
+         style="fill:url(#radialGradient10133-2);fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#6f6f58;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 12.348618,27.19776 4.80224,-9.604481"
+         id="path10107-7"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#radialGradient10135-9);fill-opacity:1;stroke:none"
+         d="m 14.406721,28.569828 -4.116206,-2.058103 0.686034,3.430172 3.430172,-1.372069 z"
+         id="path10109-1"
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path10111-1"
+         d="m 20.58103,16.22121 -4.116206,-2.058103 -1.372069,2.744138 4.116206,2.058103 1.372069,-2.744138 z"
+         style="fill:url(#radialGradient10137-0);fill-opacity:1;stroke:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:url(#radialGradient10139-4);fill-opacity:1;stroke:none"
+         d="m 21.267064,14.849142 -4.116206,-2.058103 -1.029051,2.058102 4.116206,2.058104 1.029051,-2.058103 z"
+         id="path10113-5"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path10115-9"
+         d="m 19.894996,17.593279 1.372068,-2.744137 -4.116206,-2.058103 -1.372068,2.744137"
+         style="fill:none;stroke:#603b31;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+         d="m 14.406721,28.569828 5.831292,-11.662583 -4.116206,-2.058103 -5.831292,11.662583 0.686034,3.430172 3.430172,-1.372069 z"
+         id="path10117-7"
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 15.092755,16.907245 4.116206,2.058103"
+         id="path10119-7"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/edit-number.png"
+     inkscape:label="#edit-number"
+     id="22_edit-number"
+     transform="translate(400,64)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5345"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       id="path6263"
+       style="color:#000000;fill:#d7d7d0;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 11.833333,19.5 -2.9999997,0 -0.6666666,4 3.0000003,0 z M 4.5,30.5 l 0.6666667,-4 -4,0 0.5,-3 4,0 0.6666666,-4 -4,0 0.5,-3 4,0 0.6666667,-4 2.5,0 -0.6666667,4 2.9999997,0 0.666667,-4 2.5,0 -0.666667,4 3.5,0 -0.5,3 -3.5,0 -0.666666,4 3.5,0 -0.5,3 -3.5,0 -0.666667,4 -2.5,0 0.666667,-4 -3.0000003,0 L 7,30.5 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
+    <g
+       transform="translate(1,0)"
+       id="g5364">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient5420);fill-opacity:1;stroke:none"
+         d="m 13,28.5 5.5,-11 -4,-2 -5.5,11 1.5,2 2.5,0 z"
+         id="path5366"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path5368"
+         d="m 11,27.5 5.5,-11"
+         style="fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path5370"
+         d="m 13,28.5 -4,-2 0.5,4 3.5,-2 z"
+         style="fill:url(#radialGradient5422);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient5424);fill-opacity:1;stroke:none"
+         d="m 19.5,15.5 -4,-2 -1,2 4,2 1,-2 z"
+         id="path5372"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path5374"
+         d="m 20.5,13.5 -4,-2 -1,2 4,2 1,-2 z"
+         style="fill:url(#radialGradient5427);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+         d="m 19.5,15.5 1,-2 -4,-2 -1,2"
+         id="path5376"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc"
+         id="path5378"
+         d="m 19.5,15.5 -4,-2 -6.5,13 0.5,4 3.5,-2 6.5,-13 z"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5380"
+         d="m 14.5,15.5 4,2"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/edit-number.png"
+     inkscape:label="#edit-number"
+     id="16_edit-number"
+     transform="matrix(0.7288265,0,0,0.7288265,400,48.67755)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path6263-3"
+       style="color:#000000;fill:#d7d7d0;fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 11.979218,18.965351 -2.7441407,0 -0.6332624,4.116206 2.7441411,0 z M 4.8022474,29.9419 l 0.6332625,-4.116206 -4.1162099,0 0.422175,-2.744137 4.1162099,0 0.6332624,-4.116206 -4.1162099,0 0.4221752,-2.744138 4.1162099,0 0.6332625,-4.116206 2.74413,0 -0.6332625,4.116206 2.7441405,0 0.633263,-4.116206 2.74414,0 -0.633263,4.116206 3.43017,0 -0.422175,2.744138 -3.43017,0 -0.633262,4.116205 3.43017,0 -0.422175,2.744138 -3.43017,0 -0.633263,4.116206 -2.74414,0 0.633263,-4.116206 -2.7441411,0 -0.6332625,4.116206 z"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccc" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5384"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <g
+       id="g5400">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient5431);fill-opacity:1;stroke:none"
+         d="m 14.178034,28.341165 5.030927,-10.061852 -3.658859,-1.829428 -5.03092,10.061852 1.372068,1.829428 2.286784,0 z"
+         id="path5402"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path5404"
+         d="m 12.348618,27.19776 4.80224,-9.604481"
+         style="fill:none;stroke:#6f6f58;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="path5406"
+         d="m 14.406721,28.569828 -4.116206,-2.058103 0.686034,3.430172 3.430172,-1.372069 z"
+         style="fill:url(#radialGradient5433);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#radialGradient5435);fill-opacity:1;stroke:none"
+         d="m 20.58103,16.22121 -4.116206,-2.058103 -1.372069,2.744138 4.116206,2.058103 1.372069,-2.744138 z"
+         id="path5408"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path5410"
+         d="m 21.267064,14.849142 -4.116206,-2.058103 -1.029051,2.058102 4.116206,2.058104 1.029051,-2.058103 z"
+         style="fill:url(#radialGradient5437);fill-opacity:1;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#603b31;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+         d="m 19.894996,17.593279 1.372068,-2.744137 -4.116206,-2.058103 -1.372068,2.744137"
+         id="path5412"
+         sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc"
+         id="path5414"
+         d="m 14.406721,28.569828 5.831292,-11.662583 -4.116206,-2.058103 -5.831292,11.662583 0.686034,3.430172 3.430172,-1.372069 z"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path5416"
+         d="m 15.092755,16.907245 4.116206,2.058103"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+  <g
+     transform="translate(-128,0)"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/new-alert.png"
+     inkscape:label="#new-alert"
+     id="22_new-alert">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4756"
+       y="18"
+       x="128"
+       height="22"
+       width="22" />
+    <g
+       id="g4758">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4802);fill-opacity:1;stroke:#603b31;stroke-width:0.52173913;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4760"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="4.9565268"
+         sodipodi:ry="4.956522"
+         d="m 395.95653,25 c 0,2.737412 -2.21912,4.956522 -4.95653,4.956522 -2.73741,0 -4.95653,-2.21911 -4.95653,-4.956522 0,-2.737412 2.21912,-4.956522 4.95653,-4.956522 2.73741,0 4.95653,2.21911 4.95653,4.956522 z"
+         transform="matrix(1.9166667,0,0,1.9166667,-610.41667,-18.916667)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient5737);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6521-02-6-1"
+         width="3"
+         height="8.5"
+         x="137.5"
+         y="22.5" />
+      <rect
+         y="32.5"
+         x="137.5"
+         height="3"
+         width="3"
+         id="rect6578-4-7-8"
+         style="color:#000000;fill:url(#radialGradient6580-6-9-4);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       id="g4766">
+      <path
+         transform="translate(128,0)"
+         d="M 22,24.5 C 22,28.089851 19.089851,31 15.5,31 11.910149,31 9,28.089851 9,24.5 9,20.910149 11.910149,18 15.5,18 c 3.589851,0 6.5,2.910149 6.5,6.5 z"
+         sodipodi:ry="6.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="24.5"
+         sodipodi:cx="15.5"
+         id="path4768"
+         style="color:#000000;fill:url(#radialGradient4808);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4770"
+         d="m 143.5,18.5 0,12"
+         style="fill:none;stroke:url(#radialGradient4810);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:url(#radialGradient4812);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 149.5,24.5 -12,0"
+         id="path4772"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient4814);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 147.74264,20.257359 -8.48528,8.485282"
+         id="path4774"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4776"
+         d="m 147.74264,28.742641 -8.48528,-8.485282"
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient4816);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,0,-7.244552)"
+     id="16_new-alert"
+     inkscape:label="#new-alert"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/new-alert.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect4780"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="matrix(1.3766667,0,0,1.3766667,31.663335,-6.5466672)"
+       id="g4782">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4880);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6497-2-77"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-407.5,-3.4999997)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient6506-5-38-90);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6521-02-6"
+         width="2"
+         height="6"
+         x="-17.500011"
+         y="17.5" />
+      <rect
+         y="23.5"
+         x="-17.500011"
+         height="2"
+         width="2"
+         id="rect6578-4-7"
+         style="color:#000000;fill:url(#radialGradient6580-6-9);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       id="g4790"
+       transform="matrix(1.3766667,0,0,1.3766667,-183.09667,-16.183334)">
+      <path
+         transform="translate(128,0)"
+         d="m 20.000001,24.5 c 0,2.485281 -2.014719,4.5 -4.500001,4.5 -2.485282,0 -4.500001,-2.014719 -4.500001,-4.5 0,-2.485281 2.014719,-4.5 4.500001,-4.5 2.485282,0 4.500001,2.014719 4.500001,4.5 z"
+         sodipodi:ry="4.5"
+         sodipodi:rx="4.500001"
+         sodipodi:cy="24.5"
+         sodipodi:cx="15.5"
+         id="path4792"
+         style="color:#000000;fill:url(#radialGradient4824);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4794"
+         d="m 143.5,20.5 0,8"
+         style="fill:none;stroke:url(#radialGradient4826);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="fill:none;stroke:url(#radialGradient4828);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 147.5,24.5 -8,0"
+         id="path4796"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient4830);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 146.32843,21.671573 -5.65686,5.656854"
+         id="path4798"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4800"
+         d="m 146.32843,27.328427 -5.65686,-5.656854"
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient4832);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/load-alert.png"
+     inkscape:label="#load-alert"
+     id="22_load-alert"
+     transform="translate(24,8)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient5810);fill-opacity:1;stroke:#6f6f58"
+       id="path5780"
+       d="M 16.225,15.93 8.063,17.179 7.562,16.063 C 7.433,15.827 7.327,15.668 7.037,15.668 L 2.248,16.325 C 1.944,16.407 1.79,16.561 1.722,16.851 L 1.5,18.249 c 0,0.088 0.031,0.42 0.031,0.441 L 2.78,29.935 c 0,0.29 0.235,0.526 0.526,0.526 l 12.331,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <g
+       transform="translate(26,-4)"
+       id="g4782-5">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4880-4);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6497-2-77-1"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-407.5,-3.4999997)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient6506-5-38-90-9);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6521-02-6-10"
+         width="2"
+         height="6"
+         x="-17.500011"
+         y="17.5" />
+      <rect
+         y="23.5"
+         x="-17.500011"
+         height="2"
+         width="2"
+         id="rect6578-4-7-85"
+         style="color:#000000;fill:url(#radialGradient5870);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient5819);fill-opacity:1;stroke:#6f6f58"
+       id="path5790"
+       d="m 19.142,18.422 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.724,0.493 -3.401,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.413,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5792"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/load-alert.png"
+     inkscape:label="#load-alert"
+     id="16_load-alert"
+     transform="matrix(0.72639225,0,0,0.72639225,24,-7.244552)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5808"
+       y="9.9733334"
+       x="0"
+       height="22.026667"
+       width="22.026667" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient5821);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path5796"
+       d="m 16.974174,15.218998 -8.1620001,1.249 -0.501,-1.116 c -0.129,-0.236 -0.235,-0.395 -0.525,-0.395 l -4.789,0.657 c -0.304,0.082 -0.458,0.236 -0.526,0.526 l -0.222,1.398 c 0,0.088 0.031,0.42 0.031,0.441 l 1.249,11.245 c 0,0.29 0.235,0.526 0.526,0.526 l 12.3310001,-3.003 c 0.153,-0.026 0.371,-0.315 0.445,-0.489 l 0.669,-10.511 c 0,-0.291 -0.235,-0.528 -0.526,-0.528 z" />
+    <g
+       id="g6028"
+       transform="translate(144.54998,-121.14667)">
+      <path
+         transform="matrix(1.3766667,0,0,1.3766667,-671.12514,104.27505)"
+         d="m 396,25 c 0,2.761423 -2.23858,5 -5,5 -2.76142,0 -5,-2.238577 -5,-5 0,-2.761423 2.23858,-5 5,-5 2.76142,0 5,2.238577 5,5 z"
+         sodipodi:ry="4.9999995"
+         sodipodi:rx="4.9999995"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-1-8-8-9"
+         style="color:#000000;fill:url(#radialGradient6033);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="134.56171"
+         x="-134.22502"
+         height="5.5066671"
+         width="2.7533329"
+         id="rect6521-0-3-4-6"
+         style="color:#000000;fill:url(#radialGradient6035);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.23899996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient6037);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.23899996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6578-0-1-8-9"
+         width="2.7533333"
+         height="2.7533333"
+         x="-134.22502"
+         y="140.06836" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient5829);fill-opacity:1;stroke:#6f6f58;stroke-width:1.23899996;stroke-miterlimit:4;stroke-dasharray:none"
+       id="path5806"
+       d="m 19.891174,17.710998 -8.373,1.353 -0.364,0.912 c -0.165,0.287 -0.375,0.493 -0.719,0.546 0,0 -2.7240001,0.493 -3.4010001,0.613 -0.4,0.071 -0.544,0.417 -0.689,0.838 -0.143,0.416 -2.564,7.181 -2.564,7.181 0,0.291 0.174,0.635 0.464,0.635 l 12.4130001,-3.105 c 0.28,-0.062 0.462,-0.326 0.526,-0.526 l 3.233,-7.92 c 0,-0.291 -0.235,-0.527 -0.526,-0.527 z" />
+  </g>
+  <g
+     id="22_alert-activate"
+     inkscape:label="#alert-activate"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/alert-activate.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     transform="translate(-64,0)">
+    <rect
+       width="22"
+       height="22"
+       x="128"
+       y="18"
+       id="rect8452"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="translate(154,5.9999997)"
+       id="g8715">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient8564-8);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8717"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="8"
+         sodipodi:ry="8"
+         d="m 399,25 c 0,4.418278 -3.58172,8 -8,8 -4.41828,0 -8,-3.581722 -8,-8 0,-4.418278 3.58172,-8 8,-8 4.41828,0 8,3.581722 8,8 z"
+         transform="translate(-407.5,-3.4999997)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient8566-2);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8719"
+         width="2.0000114"
+         height="6.5000005"
+         x="-17.500011"
+         y="16.5" />
+      <rect
+         y="24.5"
+         x="-17.500011"
+         height="2"
+         width="2"
+         id="rect8721"
+         style="color:#000000;fill:url(#radialGradient8762);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       style="fill:url(#linearGradient8940);fill-opacity:1;stroke:#435a36;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 138.5,27.5 0,11 8.25,-5.5 -8.25,-5.5 z"
+       id="polygon6309-6-0"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/alert-activate.png"
+     inkscape:label="#alert-activate"
+     id="16_alert-activate"
+     transform="matrix(0.72639225,0,0,0.72639225,64,-7.244552)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect8476"
+       y="9.9733334"
+       x="0"
+       height="22.026667"
+       width="22.026667" />
+    <g
+       transform="matrix(1.3766667,0,0,1.3766667,31.66335,-10.676668)"
+       id="g8715-1">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient8564-8-7);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8717-5"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-407.5,-3.4999997)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient8566-2-1);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect8719-8"
+         width="2"
+         height="6"
+         x="-17.500011"
+         y="17.5" />
+      <rect
+         y="23.5"
+         x="-17.500011"
+         height="2"
+         width="2"
+         id="rect8721-8"
+         style="color:#000000;fill:url(#radialGradient9032);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       style="fill:url(#linearGradient8974);fill-opacity:1;stroke:#435a36;stroke-width:1.23899996;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 11.701668,17.545004 0,12.39 9.292501,-6.195 z"
+       id="polygon6309-6-0-1"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(-40,0)"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/alert-deactivate.png"
+     inkscape:label="#alert-deactivate"
+     id="22_alert-deactivate">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect9213"
+       y="18"
+       x="128"
+       height="22"
+       width="22" />
+    <g
+       id="g9215"
+       transform="translate(154,5.9999997)">
+      <path
+         transform="translate(-407.5,-3.4999997)"
+         d="m 399,25 c 0,4.418278 -3.58172,8 -8,8 -4.41828,0 -8,-3.581722 -8,-8 0,-4.418278 3.58172,-8 8,-8 4.41828,0 8,3.581722 8,8 z"
+         sodipodi:ry="8"
+         sodipodi:rx="8"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path9217"
+         style="color:#000000;fill:url(#radialGradient9239);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="16.5"
+         x="-17.500011"
+         height="6.5000005"
+         width="2.0000114"
+         id="rect9219"
+         style="color:#000000;fill:url(#radialGradient9241);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient9243);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9221"
+         width="2"
+         height="2"
+         x="-17.500011"
+         y="24.5" />
+    </g>
+    <rect
+       style="color:#000000;fill:url(#linearGradient9263);fill-opacity:1;fill-rule:nonzero;stroke:#435a36;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect9255"
+       width="9"
+       height="9"
+       x="410.5"
+       y="28.5"
+       transform="translate(-272,0)" />
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,88,-7.244552)"
+     id="16_alert-deactivate"
+     inkscape:label="#alert-deactivate"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/alert-deactivate.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect9227"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g9229"
+       transform="matrix(1.3766667,0,0,1.3766667,31.66335,-10.676668)">
+      <path
+         transform="translate(-407.5,-3.4999997)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path9231"
+         style="color:#000000;fill:url(#radialGradient9247);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="17.5"
+         x="-17.500011"
+         height="6"
+         width="2"
+         id="rect9233"
+         style="color:#000000;fill:url(#radialGradient9249);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient9251);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9235"
+         width="2"
+         height="2"
+         x="-17.500011"
+         y="23.5" />
+    </g>
+    <rect
+       style="color:#000000;fill:url(#linearGradient9273);fill-opacity:1;fill-rule:nonzero;stroke:#435a36;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect9265"
+       width="7"
+       height="7"
+       x="408.5"
+       y="6.5"
+       transform="matrix(1.3766667,0,0,1.3766667,-550.66667,9.9733333)" />
+  </g>
+  <g
+     transform="translate(-16,0)"
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/alert-clear.png"
+     inkscape:label="#alert-clear"
+     id="22_alert-clear">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect9473"
+       y="18"
+       x="128"
+       height="22"
+       width="22" />
+    <g
+       id="g9475"
+       transform="translate(154,5.9999997)"
+       style="opacity:0.65">
+      <path
+         transform="translate(-407.5,-3.4999997)"
+         d="m 399,25 c 0,4.418278 -3.58172,8 -8,8 -4.41828,0 -8,-3.581722 -8,-8 0,-4.418278 3.58172,-8 8,-8 4.41828,0 8,3.581722 8,8 z"
+         sodipodi:ry="8"
+         sodipodi:rx="8"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path9477"
+         style="color:#000000;fill:url(#radialGradient9527);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="16.5"
+         x="-17.500011"
+         height="6.5000005"
+         width="2.0000114"
+         id="rect9479"
+         style="color:#000000;fill:url(#radialGradient9529);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient9531);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9481"
+         width="2"
+         height="2"
+         x="-17.500011"
+         y="24.5" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path9565"
+       d="m 142,34.999995 3.5,3.499998 3,-2.999998 -3.5,-3.499998 3.5,-3.499999 L 145.5,25.5 142,28.999998 138.5,25.5 l -3,2.999998 3.50001,3.499999 -3.50001,3.499998 3,2.999998 3.5,-3.499998 z"
+       style="fill:url(#linearGradient9683);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1" />
+  </g>
+  <g
+     transform="matrix(0.72639225,0,0,0.72639225,112,-7.244552)"
+     id="16_alert-clear"
+     inkscape:label="#alert-clear"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/alert-clear.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22.026667"
+       height="22.026667"
+       x="0"
+       y="9.9733334"
+       id="rect9487"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g9489"
+       transform="matrix(1.3766667,0,0,1.3766667,31.66335,-10.676668)"
+       style="opacity:0.65">
+      <path
+         transform="translate(-407.5,-3.4999997)"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path9491"
+         style="color:#000000;fill:url(#radialGradient9535);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="17.5"
+         x="-17.500011"
+         height="6"
+         width="2"
+         id="rect9493"
+         style="color:#000000;fill:url(#radialGradient9537);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient9539);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9495"
+         width="2"
+         height="2"
+         x="-17.500011"
+         y="23.5" />
+    </g>
+    <path
+       style="fill:url(#linearGradient9769);fill-opacity:1;stroke:#603b31;stroke-width:1.10133338;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 7.5716005,27.181666 2.7533295,2.75333 3.441666,-3.441666 3.441678,3.441666 2.753326,-2.75333 -3.441665,-3.441665 3.441665,-3.441667 -2.753326,-2.753336 -3.441678,3.441666 -3.441666,-3.441666 -2.7533295,2.753336 3.4416585,3.441667 -3.4416585,3.441665 z"
+       id="path9573"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="22_alert-clear-all"
+     inkscape:label="#alert-clear-all"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/alert-clear-all.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90"
+     transform="translate(8,0)">
+    <rect
+       width="22"
+       height="22"
+       x="128"
+       y="18"
+       id="rect9501"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       transform="translate(154,5.9999997)"
+       id="g9503"
+       style="opacity:0.65">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient9543);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path9505"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="8"
+         sodipodi:ry="8"
+         d="m 399,25 c 0,4.418278 -3.58172,8 -8,8 -4.41828,0 -8,-3.581722 -8,-8 0,-4.418278 3.58172,-8 8,-8 4.41828,0 8,3.581722 8,8 z"
+         transform="translate(-407.5,-3.4999997)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient9545);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9507"
+         width="2.0000114"
+         height="6.5000005"
+         x="-17.500011"
+         y="16.5" />
+      <rect
+         y="24.5"
+         x="-17.500011"
+         height="2"
+         width="2"
+         id="rect9509"
+         style="color:#000000;fill:url(#radialGradient9547);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       id="g9585"
+       transform="translate(125,8)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path9587"
+         d="m 12.5,21 5,-10 2,1 -5,10 -2,-1 z"
+         style="fill:url(#linearGradient9647-6);fill-opacity:1;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#radialGradient9649-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 15,31 c 0,-3 2.5,-9 -0.5,-10.5 l -1,-0.5 c -3,-1.5 -6,4 -8.5,6 l 10,5 z"
+         id="path9589"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10,20.5 6,3"
+         id="path9591"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path9593"
+         d="m 12.5,23.5 -2.5,5"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.5,22.5 c -1,2 -1.5,3 -3,4.5"
+         id="path9595"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path9597"
+         d="m 14.5,24.5 c -1,2 -1.5,3 -2,5"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="translate(-336,-64)"
+         id="path9599"
+         d="m 345,86 7,3.5"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 15,31 c 0,-3 2.5,-9 -0.5,-10.5 l -1,-0.5 c -3,-1.5 -6,4 -8.5,6 l 10,5 z"
+         id="path9601"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         transform="translate(-336,-64)"
+         id="path9603"
+         d="m 349,84 1,-2 2,1 -1,2 -2,-1 z"
+         style="color:#000000;fill:url(#linearGradient9651-3);fill-opacity:1;fill-rule:nonzero;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:url(#linearGradient9776-8);fill-opacity:1;stroke:#603b31;stroke-width:0.80000001;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 139.49995,35.5 2,1.999997 2.5,-2.5 2.5,2.5 2,-1.999997 -2.5,-2.5 2.5,-2.499999 -2,-2.000003 -2.5,2.5 -2.5,-2.5 -2,2.000003 2.49999,2.499999 -2.49999,2.5 z"
+       id="path9605"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/alert-clear-all.png"
+     inkscape:label="#alert-clear-all"
+     id="16_alert-clear-all"
+     transform="matrix(0.72639225,0,0,0.72639225,136,-7.244552)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect9515"
+       y="9.9733334"
+       x="0"
+       height="22.026667"
+       width="22.026667" />
+    <g
+       transform="matrix(1.3766667,0,0,1.3766667,31.66335,-10.676668)"
+       id="g9517"
+       style="opacity:0.65">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient9551);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path9519"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-407.5,-3.4999997)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient9553);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect9521"
+         width="2"
+         height="6"
+         x="-17.500011"
+         y="17.5" />
+      <rect
+         y="23.5"
+         x="-17.500011"
+         height="2"
+         width="2"
+         id="rect9523"
+         style="color:#000000;fill:url(#radialGradient9555);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       id="g9617"
+       transform="matrix(1.3766667,0,0,1.3766667,-6.8833335,-12.053334)">
+      <path
+         style="color:#000000;fill:url(#radialGradient9944-3);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14,30.5 c 0,-3 2.5,-6.5 -0.5,-8 l -1,-0.5 c -3,-1.5 -4,2.5 -6.5,4.5 l 8,4 z"
+         id="path9619"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 11,24 c -1,2 -1,2 -2.5,3.5"
+         id="path9621"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path9623"
+         d="m 13,25 c -1,2 -1,2 -1.5,4"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path9625"
+         d="m 9,23 6,3"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14,30.5 c 0,-3 2.5,-6.5 -0.5,-8 l -1,-0.5 c -3,-1.5 -4,2.5 -6.5,4.5 l 8,4 z"
+         id="path9627"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path9629"
+         d="m 12,22 2.5,-5 2,1 -2.5,5 -2,-1 z"
+         style="fill:url(#linearGradient9982);fill-opacity:1;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:url(#linearGradient9799-2);fill-opacity:1;stroke:#603b31;stroke-width:1.10133338;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 11.013266,25.805005 2.065,2.064996 2.75333,-2.753333 2.75333,2.753333 2.065,-2.064996 -2.75333,-2.753333 2.75333,-2.753332 -2.065,-2.065004 -2.75333,2.753334 -2.75333,-2.753334 -2.065,2.065004 2.75332,2.753332 -2.75332,2.753333 z"
+       id="path9631"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(160,8)"
+     id="22_alert-list"
+     inkscape:label="#alert-list"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/alert-list.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       style="color:#000000;fill:url(#linearGradient12144);fill-opacity:1;fill-rule:nonzero;stroke:#717171;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12110"
+       width="11"
+       height="12"
+       x="2.5"
+       y="-28.5"
+       transform="scale(1,-1)" />
+    <rect
+       transform="scale(1,-1)"
+       y="-16.5"
+       x="2.5"
+       height="3"
+       width="11"
+       id="rect12112"
+       style="color:#000000;fill:url(#linearGradient12146);fill-opacity:1;fill-rule:nonzero;stroke:#3e53a5;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect12114"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path12116"
+       d="m 2.5,18.5 11,0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 2.5,20.5 11,0"
+       id="path12118" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path12120"
+       d="m 2.5,22.5 11,0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="m 2.5,24.5 11,0"
+       id="path12122" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path12124"
+       d="m 2.5,26.5 11,0"
+       style="fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098" />
+    <g
+       transform="translate(32,4)"
+       id="g4782-5-7">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient4880-4-8);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6497-2-77-1-7"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 c 0,3.313708 -2.68629,6 -6,6 -3.31371,0 -6,-2.686292 -6,-6 0,-3.313708 2.68629,-6 6,-6 3.31371,0 6,2.686292 6,6 z"
+         transform="translate(-407.5,-3.4999997)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient6506-5-38-90-9-2);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6521-02-6-10-4"
+         width="2"
+         height="6"
+         x="-17.500011"
+         y="17.5" />
+      <rect
+         y="23.5"
+         x="-17.500011"
+         height="2"
+         width="2"
+         id="rect6578-4-7-85-9"
+         style="color:#000000;fill:url(#radialGradient12195);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,160,-7.32245)"
+     id="16_alert-list"
+     inkscape:label="#alert-list"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/alert-list.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="22"
+       x="0"
+       y="10"
+       id="rect12130"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient12150);fill-opacity:1;fill-rule:nonzero;stroke:#717171;stroke-width:1.37206864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12132"
+       width="9.6044807"
+       height="13.720686"
+       x="2.0581028"
+       y="-27.197756"
+       transform="scale(1,-1)" />
+    <rect
+       transform="scale(1,-1)"
+       y="-16.221207"
+       x="2.0581028"
+       height="2.7441373"
+       width="9.6044807"
+       id="rect12134"
+       style="color:#000000;fill:url(#linearGradient12152);fill-opacity:1;fill-rule:nonzero;stroke:#3e53a5;stroke-width:1.37206864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path12136"
+       d="m 2.0581033,18.96535 9.6044817,-1e-6"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       style="fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="m 2.0581033,21.709487 9.6044817,-1e-6"
+       id="path12138" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       id="path12140"
+       d="m 2.0581033,24.453624 9.6044817,0"
+       style="fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098" />
+    <g
+       id="g6028-0"
+       transform="matrix(0.99666004,0,0,0.99666004,146.81129,-113.77488)">
+      <path
+         transform="matrix(1.3766667,0,0,1.3766667,-671.12514,104.27505)"
+         d="m 396,25 c 0,2.761423 -2.23858,5 -5,5 -2.76142,0 -5,-2.238577 -5,-5 0,-2.761423 2.23858,-5 5,-5 2.76142,0 5,2.238577 5,5 z"
+         sodipodi:ry="4.9999995"
+         sodipodi:rx="4.9999995"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path6497-1-8-8-9-7"
+         style="color:#000000;fill:url(#radialGradient6033-1);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="134.56171"
+         x="-134.22502"
+         height="5.5066671"
+         width="2.7533329"
+         id="rect6521-0-3-4-6-1"
+         style="color:#000000;fill:url(#radialGradient6035-8);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.23899996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient12797);fill-opacity:1;fill-rule:nonzero;stroke:#4b4b3c;stroke-width:1.23899996;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6578-0-1-8-9-5"
+         width="2.7533333"
+         height="2.7533333"
+         x="-134.22502"
+         y="140.06836" />
+    </g>
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/path-draw.png"
+     inkscape:label="#path-draw"
+     id="22_path-draw"
+     transform="translate(200,8)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5730"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path5732"
+       d="M 4,11.5 C 9.5,14 9.5,18 6.5,21 3,24.5 4,29 11,30.5"
+       style="fill:none;stroke:url(#linearGradient5744);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       id="path5754"
+       d="m 14,28.5 5.5,-11 -4,-2 -5.5,11 1.5,2 2.5,0 z"
+       style="fill:url(#radialGradient5762);fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12,27.5 5.5,-11"
+       id="path5752"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient5768);fill-opacity:1;stroke:none"
+       d="m 14,28.5 -4,-2 0.5,4 3.5,-2 z"
+       id="path5766"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path5770"
+       d="m 20.5,15.5 -4,-2 -1,2 4,2 1,-2 z"
+       style="fill:url(#radialGradient5772);fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient5780);fill-opacity:1;stroke:none"
+       d="m 21.5,13.5 -4,-2 -1,2 4,2 1,-2 z"
+       id="path5778"
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path5901"
+       d="m 20.5,15.5 1,-2 -4,-2 -1,2"
+       style="fill:none;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4c4c3d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       d="m 20.5,15.5 -4,-2 -6.5,13 0.5,4 3.5,-2 6.5,-13 z"
+       id="path5764"
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 607.5,23.5 4,2"
+       id="path5774"
+       transform="translate(-592,-8)"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/path-draw.png"
+     inkscape:label="#path-draw"
+     id="16_path-draw"
+     transform="matrix(0.7288265,0,0,0.7288265,200,-7.32245)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5738"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6880);stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.4881775,12.105004 c 6.1743125,3.430172 2.74414,6.860344 0.68604,9.604481 -2.0581033,2.744137 -2.7441433,6.860343 4.8022395,8.232411"
+       id="path6459-7"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       id="path5754-7"
+       d="m 14.178034,28.341165 5.030927,-10.061852 -3.658859,-1.829428 -5.03092,10.061852 1.372068,1.829428 2.286784,0 z"
+       style="fill:url(#radialGradient5830);fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6f6f58;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 12.348618,27.19776 4.80224,-9.604481"
+       id="path5752-5"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient5768-7);fill-opacity:1;stroke:none"
+       d="m 14.406721,28.569828 -4.116206,-2.058103 0.686034,3.430172 3.430172,-1.372069 z"
+       id="path5766-1"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path5770-5"
+       d="m 20.58103,16.22121 -4.116206,-2.058103 -1.372069,2.744138 4.116206,2.058103 1.372069,-2.744138 z"
+       style="fill:url(#radialGradient5772-7);fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient5780-2);fill-opacity:1;stroke:none"
+       d="m 21.267064,14.849142 -4.116206,-2.058103 -1.029051,2.058102 4.116206,2.058104 1.029051,-2.058103 z"
+       id="path5778-0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path5903"
+       d="m 19.894996,17.593279 1.372068,-2.744137 -4.116206,-2.058103 -1.372068,2.744137"
+       style="fill:none;stroke:#603b31;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       d="m 14.406721,28.569828 5.831292,-11.662583 -4.116206,-2.058103 -5.831292,11.662583 0.686034,3.430172 3.430172,-1.372069 z"
+       id="path5764-7"
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4c4c3d;stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 15.092755,16.907245 4.116206,2.058103"
+       id="path5774-4"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/path-close.png"
+     inkscape:label="#path-close"
+     id="22_path-close"
+     transform="translate(224,8)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7302"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       sodipodi:nodetypes="czzzc"
+       id="path7304"
+       d="m 4,20.5 c -2.5,0 -5.5,10 4,10 9.282052,0 12.5,-3.574275 12.5,-7.5 0,-4 -1.618718,-5 -3.5,-5 -2,0 -3,2.5 -6,2.5"
+       style="fill:none;stroke:url(#linearGradient7320);stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path7306"
+       d="m 4,20.5 7,0"
+       style="fill:none;stroke:url(#linearGradient7322);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path7308"
+       d="M 10,15.5 7.5000034,19.000003 5,15.5 l 5,0 z"
+       style="fill:#aed476;stroke:#687a4f;stroke-width:1;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7310"
+       d="m 7.5,11 0,4.5"
+       style="fill:#ffffff;stroke:#687a4f;stroke-width:2;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,224,-7.32245)"
+     id="16_path-close"
+     inkscape:label="#path-close"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/path-close.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect7107"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="czzzc"
+       id="path7328"
+       d="m 4.116206,20.337416 c -2.058103,0 -4.80224033,9.604481 4.116206,9.604481 9.050148,0 11.662584,-2.256953 11.662584,-6.174309 0,-3.991472 -1.552902,-4.80224 -3.430172,-4.80224 -1.99574,0 -2.494665,1.372068 -5.488275,1.372068"
+       style="fill:none;stroke:url(#linearGradient7409);stroke-width:1.23486173;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path7330"
+       d="m 4.116206,20.337416 6.860343,0"
+       style="fill:none;stroke:url(#linearGradient7343-3);stroke-width:1.23486173;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path7332"
+       d="m 9.6044807,16.22121 -2.0581031,2.744138 -2.058103,-2.744138 4.1162061,0 z"
+       style="fill:#aed476;stroke:#687a4f;stroke-width:0.99786812;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cc"
+       id="path7334"
+       d="m 7.5463776,11.41897 0,4.80224"
+       style="fill:#ffffff;stroke:#687a4f;stroke-width:2.4697237;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(248,8)"
+     id="22_path-clear"
+     inkscape:label="#path-clear"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/path-clear.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect6035-4"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:url(#linearGradient5659);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 4,11.5 C 9.5,14 9.5,18 6.5,21 3,24.5 4,29 11,30.5"
+       id="path5629"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:#603b31;stroke-width:1;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 14,26.999998 3.5,3.499998 3,-2.999998 L 17,24 20.5,20.500001 17.5,17.500003 14,21.000001 10.5,17.500003 7.5,20.500001 11.00001,24 7.5,27.499998 l 3,2.999998 3.5,-3.499998 z"
+       id="polygon6421-0-18"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,248,-7.32245)"
+     id="16_path-clear"
+     inkscape:label="#path-clear"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/path-clear.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="21.953098"
+       x="0"
+       y="10.046902"
+       id="rect6104-7"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6924);stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5.4881757,12.105004 c 6.1743213,3.430172 2.7441404,6.860344 0.68604,9.604481 -2.0581,2.744137 -2.74414,6.860343 4.8022413,8.232411"
+       id="path6459-7-1"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#linearGradient6508-1);fill-opacity:1;stroke:#603b31;stroke-width:1.09765494;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 7.5463113,27.19776 2.7441337,2.744133 3.43017,-3.430171 3.430183,3.430171 2.74413,-2.744133 -3.43017,-3.430171 3.43017,-3.430171 -2.74413,-2.744141 -3.430183,3.430172 -3.43017,-3.430172 -2.7441337,2.744141 3.4301637,3.430171 -3.4301637,3.430171 z"
+       id="polygon6106-3"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/path-clear-all.png"
+     inkscape:label="#path-clear-all"
+     id="22_path-clear-all"
+     transform="translate(272,8)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6374"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path6376"
+       d="M 4,11.5 C 9.5,14 9.5,18 6.5,21 3,24.5 4,29 11,30.5"
+       style="fill:none;stroke:url(#linearGradient6388);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6398);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 9,11.5 C 14.5,14 14.5,18 11.5,21 8,24.5 9,29 16,30.5"
+       id="path6396"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path6400"
+       d="M 14,11.5 C 19.5,14 19.5,18 16.5,21 13,24.5 14,29 21,30.5"
+       style="fill:none;stroke:url(#linearGradient6402);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6844"
+       transform="translate(-3,0)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path6440"
+         d="m 12.5,21 5,-10 2,1 -5,10 -2,-1 z"
+         style="fill:url(#linearGradient6854);fill-opacity:1;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:url(#radialGradient6875);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 15,31 c 0,-3 2.5,-9 -0.5,-10.5 l -1,-0.5 c -3,-1.5 -6,4 -8.5,6 l 10,5 z"
+         id="path6416"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10,20.5 6,3"
+         id="path6730"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path6637"
+         d="m 12.5,23.5 -2.5,5"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.5,22.5 c -1,2 -1.5,3 -3,4.5"
+         id="path6639"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path6641"
+         d="m 14.5,24.5 c -1,2 -1.5,3 -2,5"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="translate(-336,-64)"
+         id="path6728"
+         d="m 345,86 7,3.5"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 15,31 c 0,-3 2.5,-9 -0.5,-10.5 l -1,-0.5 c -3,-1.5 -6,4 -8.5,6 l 10,5 z"
+         id="path6760"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         transform="translate(-336,-64)"
+         id="path6680"
+         d="m 349,84 1,-2 2,1 -1,2 -2,-1 z"
+         style="color:#000000;fill:url(#linearGradient6856);fill-opacity:1;fill-rule:nonzero;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:url(#linearGradient6821);fill-opacity:1;stroke:#603b31;stroke-width:0.80000001;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 11.49995,27.5 2,1.999997 2.5,-2.5 2.5,2.5 2,-1.999997 -2.5,-2.5 2.5,-2.499999 -2,-2.000003 -2.5,2.5 -2.5,-2.5 -2,2.000003 L 13.99994,25 11.49995,27.5 z"
+       id="polygon6106-3-5"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/path-clear-all.png"
+     inkscape:label="#path-clear-all"
+     id="16_path-clear-all"
+     transform="matrix(0.7288265,0,0,0.7288265,272,-7.32245)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6384"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path6382"
+       d="m 5.4881757,12.105004 c 6.1743213,3.430172 2.7441404,6.860344 0.68604,9.604481 -2.0581,2.744137 -2.74414,6.860343 4.8022413,8.232411"
+       style="fill:none;stroke:url(#linearGradient6392);stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:url(#linearGradient6406);stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 10.97645,12.105004 c 6.174319,3.430172 2.744139,6.860344 0.68604,9.604481 -2.0580999,2.744137 -2.7441399,6.860343 4.802239,8.232411"
+       id="path6404"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path6408"
+       d="m 16.464722,12.105004 c 6.174319,3.430172 2.744139,6.860344 0.68604,9.604481 -2.0581,2.744137 -2.744139,6.860343 4.802239,8.232411"
+       style="fill:none;stroke:url(#linearGradient6410);stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g6844-6"
+       transform="matrix(1.3720687,0,0,1.3720687,-6.8603434,-11.906198)">
+      <path
+         style="color:#000000;fill:url(#radialGradient6875-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14,30.5 c 0,-3 2.5,-6.5 -0.5,-8 l -1,-0.5 c -3,-1.5 -4,2.5 -6.5,4.5 l 8,4 z"
+         id="path6416-3"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 11,24 c -1,2 -1,2 -2.5,3.5"
+         id="path6639-8"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path6641-3"
+         d="m 13,25 c -1,2 -1,2 -1.5,4"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6728-3"
+         d="m 9,23 6,3"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14,30.5 c 0,-3 2.5,-6.5 -0.5,-8 l -1,-0.5 c -3,-1.5 -4,2.5 -6.5,4.5 l 8,4 z"
+         id="path6760-8"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path6440-7"
+         d="m 12,22 2.5,-5 2,1 -2.5,5 -2,-1 z"
+         style="fill:url(#linearGradient6854-6);fill-opacity:1;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:url(#linearGradient6914);fill-opacity:1;stroke:#603b31;stroke-width:1.09765494;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1"
+       d="m 10.976484,25.825695 2.058095,2.058099 2.744146,-2.744137 2.744136,2.744137 2.058105,-2.058099 -2.744145,-2.744137 2.744145,-2.744136 -2.058105,-2.058107 -2.744136,2.744138 -2.744146,-2.744138 -2.058095,2.058107 2.744125,2.744136 -2.744125,2.744137 z"
+       id="polygon6106-3-5-3"
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/path-list.png"
+     inkscape:label="#path-list"
+     id="22_path-list"
+     transform="translate(296,8)">
+    <rect
+       transform="scale(1,-1)"
+       y="-30.5"
+       x="5.5"
+       height="12"
+       width="11"
+       id="rect7494"
+       style="color:#000000;fill:url(#linearGradient7516);fill-opacity:1;fill-rule:nonzero;stroke:#717171;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient7534);fill-opacity:1;fill-rule:nonzero;stroke:#3e53a5;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7492"
+       width="11"
+       height="3"
+       x="5.5"
+       y="-18.5"
+       transform="scale(1,-1)" />
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7470"
+       y="10"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 5.5,20.5 11,0"
+       id="path7518"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path7520"
+       d="m 5.5,22.5 11,0"
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 5.5,24.5 11,0"
+       id="path7522"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path7524"
+       d="m 5.5,26.5 11,0"
+       style="fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#717171;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="m 5.5,28.5 11,0"
+       id="path7557"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path7472"
+       d="M 14,11.5 C 19.5,14 19.5,18 16.5,21 13,24.5 14,29 21,30.5"
+       style="fill:none;stroke:url(#linearGradient7484);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/path-list.png"
+     inkscape:label="#path-list"
+     id="16_path-list"
+     transform="matrix(0.7288265,0,0,0.7288265,296,-7.32245)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7480"
+       y="10"
+       x="0"
+       height="22"
+       width="21.953098" />
+    <rect
+       transform="scale(1,-1)"
+       y="-29.941896"
+       x="6.1743088"
+       height="13.720686"
+       width="9.6044807"
+       id="rect7494-9"
+       style="color:#000000;fill:url(#linearGradient7685);fill-opacity:1;fill-rule:nonzero;stroke:#717171;stroke-width:1.37206864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient7534-8);fill-opacity:1;fill-rule:nonzero;stroke:#3e53a5;stroke-width:1.37206864;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect7492-9"
+       width="9.6044807"
+       height="2.7441373"
+       x="6.1743088"
+       y="-18.965347"
+       transform="scale(1,-1)" />
+    <path
+       style="color:#000000;fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.62745098;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 6.1743091,21.709486 9.6044799,-10e-7"
+       id="path7522-0"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path7524-3"
+       d="m 6.1743091,24.453623 9.6044799,-1e-6"
+       style="fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#717171;stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.62745098"
+       d="m 6.1743091,27.19776 9.6044799,0"
+       id="path7557-1"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path7478"
+       d="m 15.092654,12.105004 c 6.174319,3.430172 2.744139,6.860344 0.68604,9.604481 -2.0581,2.744137 -2.744139,6.860343 4.802239,8.232411"
+       style="fill:none;stroke:url(#linearGradient7488);stroke-width:1.37206864px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     transform="translate(336,8)"
+     id="22_measure"
+     inkscape:label="#measure"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/22x22/measure.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5428"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g6292"
+       transform="matrix(0.96592583,0.25881905,-0.25881905,0.96592583,6.8100159,-3.1314518)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect6253"
+         d="M 1.9877894,26.003005 15.372051,14.134494 19.822742,19.153591 6.4384811,31.022103 z"
+         style="color:#000000;fill:url(#linearGradient6304);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 8.1115137,29.538539 7.3697318,28.702022"
+         id="path6276"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path6306"
+         d="M 9.7845463,28.054973 8.3009824,26.38194"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 11.457578,26.571407 10.715796,25.73489"
+         id="path6308"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 13.130611,25.087841 10.905266,22.578292"
+         id="path6310"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path6312"
+         d="M 14.803645,23.604286 14.061863,22.767769"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 16.476677,22.12072 14.993114,20.447687"
+         id="path6314"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path6316"
+         d="M 18.149709,20.637154 17.407927,19.800637"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+  <g
+     transform="matrix(0.7288265,0,0,0.7288265,336,-7.32245)"
+     id="16_measure"
+     inkscape:label="#measure"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Icons/16x16/measure.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="21.953098"
+       height="22"
+       x="0"
+       y="10"
+       id="rect5444"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g6292-0"
+       transform="matrix(1.3253166,0.35511751,-0.35511751,1.3253166,7.9717408,-13.458626)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect6253-4"
+         d="m 3.4713532,27.676037 8.3651638,-7.417819 2.967127,3.346065 -8.3651629,7.41782 z"
+         style="color:#000000;fill:url(#linearGradient6304-2);fill-opacity:1;fill-rule:nonzero;stroke:#6f6f58;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 8.1115137,29.538539 7.3697318,28.702022"
+         id="path6276-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path6306-7"
+         d="M 9.7845463,28.054973 8.3009824,26.38194"
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 11.457578,26.571407 10.715796,25.73489"
+         id="path6308-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 13.130611,25.087841 11.647048,23.414808"
+         id="path6310-3"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+</svg>
diff --git a/Icons/source/16x16/event-archived-active.png b/Icons/source/16x16/event-archived-active.png
new file mode 100644
index 00000000..4e43a141
Binary files /dev/null and b/Icons/source/16x16/event-archived-active.png differ
diff --git a/Icons/source/16x16/event-archived.png b/Icons/source/16x16/event-archived.png
new file mode 100644
index 00000000..9d4f8cc7
Binary files /dev/null and b/Icons/source/16x16/event-archived.png differ
diff --git a/Icons/source/16x16/event-live-active.png b/Icons/source/16x16/event-live-active.png
new file mode 100644
index 00000000..4a5cd3dd
Binary files /dev/null and b/Icons/source/16x16/event-live-active.png differ
diff --git a/Icons/source/16x16/event-live-idle.png b/Icons/source/16x16/event-live-idle.png
new file mode 100644
index 00000000..227b2e98
Binary files /dev/null and b/Icons/source/16x16/event-live-idle.png differ
diff --git a/Icons/source/16x16/event-multiple-sources-archived.png b/Icons/source/16x16/event-multiple-sources-archived.png
new file mode 100644
index 00000000..92ad255b
Binary files /dev/null and b/Icons/source/16x16/event-multiple-sources-archived.png differ
diff --git a/Icons/source/16x16/event-multiple-sources-live-archived.png b/Icons/source/16x16/event-multiple-sources-live-archived.png
new file mode 100644
index 00000000..f2c1d0b9
Binary files /dev/null and b/Icons/source/16x16/event-multiple-sources-live-archived.png differ
diff --git a/Icons/source/16x16/event-multiple-sources-live.png b/Icons/source/16x16/event-multiple-sources-live.png
new file mode 100644
index 00000000..097ffd33
Binary files /dev/null and b/Icons/source/16x16/event-multiple-sources-live.png differ
diff --git a/Icons/source/16x16/event-multiple-sources-stream-archived.png b/Icons/source/16x16/event-multiple-sources-stream-archived.png
new file mode 100644
index 00000000..ca08e42d
Binary files /dev/null and b/Icons/source/16x16/event-multiple-sources-stream-archived.png differ
diff --git a/Icons/source/16x16/event-multiple-sources-stream-live.png b/Icons/source/16x16/event-multiple-sources-stream-live.png
new file mode 100644
index 00000000..6191878f
Binary files /dev/null and b/Icons/source/16x16/event-multiple-sources-stream-live.png differ
diff --git a/Icons/source/16x16/event-multiple-sources-stream.png b/Icons/source/16x16/event-multiple-sources-stream.png
new file mode 100644
index 00000000..4c2e94eb
Binary files /dev/null and b/Icons/source/16x16/event-multiple-sources-stream.png differ
diff --git a/Icons/source/16x16/event-multiple-sources.png b/Icons/source/16x16/event-multiple-sources.png
new file mode 100644
index 00000000..1bd432a1
Binary files /dev/null and b/Icons/source/16x16/event-multiple-sources.png differ
diff --git a/Icons/source/16x16/event-stream-active.png b/Icons/source/16x16/event-stream-active.png
new file mode 100644
index 00000000..9047b976
Binary files /dev/null and b/Icons/source/16x16/event-stream-active.png differ
diff --git a/Icons/source/16x16/event-stream-idle.png b/Icons/source/16x16/event-stream-idle.png
new file mode 100644
index 00000000..ad1d22cb
Binary files /dev/null and b/Icons/source/16x16/event-stream-idle.png differ
diff --git a/Icons/source/16x16/event-stream-pending.png b/Icons/source/16x16/event-stream-pending.png
new file mode 100644
index 00000000..fe166c93
Binary files /dev/null and b/Icons/source/16x16/event-stream-pending.png differ
diff --git a/Icons/source/16x16/event-stream-stopped.png b/Icons/source/16x16/event-stream-stopped.png
new file mode 100644
index 00000000..a8f67495
Binary files /dev/null and b/Icons/source/16x16/event-stream-stopped.png differ
diff --git a/Icons/source/16x16/event.png b/Icons/source/16x16/event.png
new file mode 100644
index 00000000..4bd44b0a
Binary files /dev/null and b/Icons/source/16x16/event.png differ
diff --git a/Icons/source/16x16/track-archived-active.png b/Icons/source/16x16/track-archived-active.png
new file mode 100644
index 00000000..83ea27d3
Binary files /dev/null and b/Icons/source/16x16/track-archived-active.png differ
diff --git a/Icons/source/16x16/track-archived.png b/Icons/source/16x16/track-archived.png
new file mode 100644
index 00000000..18348fb5
Binary files /dev/null and b/Icons/source/16x16/track-archived.png differ
diff --git a/Icons/source/16x16/track-multiple-sources-archived.png b/Icons/source/16x16/track-multiple-sources-archived.png
new file mode 100644
index 00000000..38b670a0
Binary files /dev/null and b/Icons/source/16x16/track-multiple-sources-archived.png differ
diff --git a/Icons/source/16x16/track-multiple-sources-stream-archived.png b/Icons/source/16x16/track-multiple-sources-stream-archived.png
new file mode 100644
index 00000000..9bab1210
Binary files /dev/null and b/Icons/source/16x16/track-multiple-sources-stream-archived.png differ
diff --git a/Icons/source/16x16/track-multiple-sources-stream.png b/Icons/source/16x16/track-multiple-sources-stream.png
new file mode 100644
index 00000000..93da423c
Binary files /dev/null and b/Icons/source/16x16/track-multiple-sources-stream.png differ
diff --git a/Icons/source/16x16/track-stream-active.png b/Icons/source/16x16/track-stream-active.png
new file mode 100644
index 00000000..503d8a91
Binary files /dev/null and b/Icons/source/16x16/track-stream-active.png differ
diff --git a/Icons/source/16x16/track-stream-idle.png b/Icons/source/16x16/track-stream-idle.png
new file mode 100644
index 00000000..66af3fdb
Binary files /dev/null and b/Icons/source/16x16/track-stream-idle.png differ
diff --git a/Icons/source/16x16/track-stream-pending.png b/Icons/source/16x16/track-stream-pending.png
new file mode 100644
index 00000000..125e643f
Binary files /dev/null and b/Icons/source/16x16/track-stream-pending.png differ
diff --git a/Icons/source/16x16/track-stream-stopped.png b/Icons/source/16x16/track-stream-stopped.png
new file mode 100644
index 00000000..4e01f642
Binary files /dev/null and b/Icons/source/16x16/track-stream-stopped.png differ
diff --git a/Icons/source/16x16/track.png b/Icons/source/16x16/track.png
new file mode 100644
index 00000000..3e1c0b38
Binary files /dev/null and b/Icons/source/16x16/track.png differ
diff --git a/Icons/source/16x16/video-archived-active.png b/Icons/source/16x16/video-archived-active.png
new file mode 100644
index 00000000..e0eaf612
Binary files /dev/null and b/Icons/source/16x16/video-archived-active.png differ
diff --git a/Icons/source/16x16/video-archived-suspended.png b/Icons/source/16x16/video-archived-suspended.png
new file mode 100644
index 00000000..1eb80d42
Binary files /dev/null and b/Icons/source/16x16/video-archived-suspended.png differ
diff --git a/Icons/source/16x16/video-archived.png b/Icons/source/16x16/video-archived.png
new file mode 100644
index 00000000..f882c19e
Binary files /dev/null and b/Icons/source/16x16/video-archived.png differ
diff --git a/Icons/source/16x16/video-stream-active.png b/Icons/source/16x16/video-stream-active.png
new file mode 100644
index 00000000..138b2ec0
Binary files /dev/null and b/Icons/source/16x16/video-stream-active.png differ
diff --git a/Icons/source/16x16/video-stream-idle.png b/Icons/source/16x16/video-stream-idle.png
new file mode 100644
index 00000000..3ef3a389
Binary files /dev/null and b/Icons/source/16x16/video-stream-idle.png differ
diff --git a/Icons/source/16x16/video-stream-pending.png b/Icons/source/16x16/video-stream-pending.png
new file mode 100644
index 00000000..b1bc3adb
Binary files /dev/null and b/Icons/source/16x16/video-stream-pending.png differ
diff --git a/Icons/source/16x16/video-stream-stopped.png b/Icons/source/16x16/video-stream-stopped.png
new file mode 100644
index 00000000..9c7635aa
Binary files /dev/null and b/Icons/source/16x16/video-stream-stopped.png differ
diff --git a/Icons/source/16x16/video.png b/Icons/source/16x16/video.png
new file mode 100644
index 00000000..d7bfe03d
Binary files /dev/null and b/Icons/source/16x16/video.png differ
diff --git a/Icons/stdbutton.qrc b/Icons/stdbutton.qrc
new file mode 100644
index 00000000..2d2b4831
--- /dev/null
+++ b/Icons/stdbutton.qrc
@@ -0,0 +1,16 @@
+<RCC>
+  <qresource prefix="icons/16x16">
+    <file alias="apply">16x16/apply.png</file>
+    <file alias="cancel">16x16/cancel.png</file>
+    <file alias="close">16x16/close.png</file>
+    <file alias="okay">16x16/okay.png</file>
+    <file alias="reset">16x16/reset.png</file>
+  </qresource>
+  <qresource prefix="icons/22x22">
+    <file alias="apply">22x22/apply.png</file>
+    <file alias="cancel">22x22/cancel.png</file>
+    <file alias="close">22x22/close.png</file>
+    <file alias="okay">22x22/okay.png</file>
+    <file alias="reset">22x22/reset.png</file>
+  </qresource>
+</RCC>
diff --git a/Icons/vgvideo.qrc b/Icons/vgvideo.qrc
new file mode 100644
index 00000000..d9c48ca6
--- /dev/null
+++ b/Icons/vgvideo.qrc
@@ -0,0 +1,25 @@
+<RCC>
+  <qresource prefix="icons/16x16">
+    <file alias="add">16x16/add.png</file>
+    <file alias="load">16x16/load.png</file>
+    <file alias="load-video">16x16/load-video.png</file>
+    <file alias="refresh">16x16/refresh.png</file>
+    <file alias="remove">16x16/remove.png</file>
+    <file alias="save">16x16/save.png</file>
+  </qresource>
+  <qresource prefix="icons/22x22">
+    <file alias="arrow-down">22x22/arrow-down.png</file>
+    <file alias="arrow-up">22x22/arrow-up.png</file>
+    <file alias="clear">22x22/clear.png</file>
+    <file alias="playback-frame-backward">22x22/playback-frame-backward.png</file>
+    <file alias="playback-frame-forward">22x22/playback-frame-forward.png</file>
+    <file alias="playback-pause">22x22/playback-pause.png</file>
+    <file alias="playback-play">22x22/playback-play.png</file>
+    <file alias="playback-speed-decrease">22x22/playback-speed-decrease.png</file>
+    <file alias="playback-speed-increase">22x22/playback-speed-increase.png</file>
+    <file alias="playback-stop">22x22/playback-stop.png</file>
+    <file alias="show-boxes">22x22/track-show-boxes.png</file>
+    <file alias="view-reset">22x22/view-reset.png</file>
+    <file alias="view-track">22x22/view-track.png</file>
+  </qresource>
+</RCC>
diff --git a/Icons/viqui.qrc b/Icons/viqui.qrc
new file mode 100644
index 00000000..d41436ec
--- /dev/null
+++ b/Icons/viqui.qrc
@@ -0,0 +1,66 @@
+<RCC>
+  <qresource prefix="icons/16x16">
+    <file alias="pin">16x16/pin.png</file>
+    <file alias="add">16x16/add.png</file>
+    <file alias="arrow-down">16x16/arrow-down.png</file>
+    <file alias="arrow-up">16x16/arrow-up.png</file>
+    <file alias="blank">16x16/blank.png</file>
+    <file alias="browse">16x16/browse.png</file>
+    <file alias="clear">16x16/clear.png</file>
+    <file alias="configure">16x16/configure.png</file>
+    <file alias="delete">16x16/delete.png</file>
+    <file alias="edit-location">16x16/edit-location.png</file>
+    <file alias="edit-number">16x16/edit-number.png</file>
+    <file alias="edit-query">16x16/edit-query.png</file>
+    <file alias="load">16x16/load.png</file>
+    <file alias="load-query">16x16/load-query.png</file>
+    <file alias="load-video">16x16/load-video.png</file>
+    <file alias="new-query">16x16/new-query.png</file>
+    <file alias="open-video-external">16x16/open-video-external.png</file>
+    <file alias="path-draw">16x16/path-draw.png</file>
+    <file alias="quit">16x16/quit.png</file>
+    <file alias="refresh">16x16/refresh.png</file>
+    <file alias="remove">16x16/remove.png</file>
+    <file alias="save">16x16/save.png</file>
+    <file alias="save-query">16x16/save-query.png</file>
+    <file alias="search">16x16/search.png</file>
+    <file alias="star">16x16/star.png</file>
+    <file alias="star-off">16x16/star-off.png</file>
+    <file alias="viqui">16x16/viqui.png</file>
+  </qresource>
+  <qresource prefix="icons/22x22">
+    <file alias="arrow-up">22x22/arrow-up.png</file>
+    <file alias="arrow-down">22x22/arrow-down.png</file>
+    <file alias="arrow-down-multi">22x22/arrow-down-multi.png</file>
+    <file alias="clear">22x22/clear.png</file>
+    <file alias="configure">22x22/configure.png</file>
+    <file alias="delete">22x22/delete.png</file>
+    <file alias="edit-query">22x22/edit-query.png</file>
+    <file alias="load">22x22/load.png</file>
+    <file alias="load-query">22x22/load-query.png</file>
+    <file alias="new-query">22x22/new-query.png</file>
+    <file alias="open-video-external">22x22/open-video-external.png</file>
+    <file alias="quit">22x22/quit.png</file>
+    <file alias="save">22x22/save.png</file>
+    <file alias="save-query">22x22/save-query.png</file>
+    <file alias="show-boxes">22x22/track-show-boxes.png</file>
+    <file alias="view-reset">22x22/view-reset.png</file>
+    <file alias="view-track">22x22/view-track.png</file>
+  </qresource>
+  <qresource prefix="icons/32x32">
+    <file alias="data-providers">32x32/data-providers.png</file>
+    <file alias="display">32x32/display.png</file>
+    <file alias="iqr">32x32/iqr.png</file>
+    <file alias="qf">32x32/qf.png</file>
+    <file alias="viqui">32x32/viqui.png</file>
+  </qresource>
+  <qresource prefix="icons/48x48">
+    <file alias="viqui">48x48/viqui.png</file>
+  </qresource>
+  <qresource prefix="icons/64x64">
+    <file alias="viqui">64x64/viqui.png</file>
+  </qresource>
+  <qresource prefix="icons/128x128">
+    <file alias="viqui">128x128/viqui.png</file>
+  </qresource>
+</RCC>
diff --git a/Icons/vpView.qrc b/Icons/vpView.qrc
new file mode 100644
index 00000000..b51d17e4
--- /dev/null
+++ b/Icons/vpView.qrc
@@ -0,0 +1,60 @@
+<RCC>
+  <qresource prefix="icons/16x16">
+    <file alias="pin">16x16/pin.png</file>
+    <file alias="add">16x16/add.png</file>
+    <file alias="apply">16x16/apply.png</file>
+    <file alias="blank">16x16/blank.png</file>
+    <file alias="browse">16x16/browse.png</file>
+    <file alias="cancel">16x16/cancel.png</file>
+    <file alias="close">16x16/close.png</file>
+    <file alias="configure">16x16/configure.png</file>
+    <file alias="delete">16x16/delete.png</file>
+    <file alias="edit-query">16x16/edit-query.png</file>
+    <file alias="load">16x16/load.png</file>
+    <file alias="load-query">16x16/load-query.png</file>
+    <file alias="load-video">16x16/load-video.png</file>
+    <file alias="new-query">16x16/new-query.png</file>
+    <file alias="okay">16x16/okay.png</file>
+    <file alias="quit">16x16/quit.png</file>
+    <file alias="refresh">16x16/refresh.png</file>
+    <file alias="remove">16x16/remove.png</file>
+    <file alias="reset">16x16/reset.png</file>
+    <file alias="save">16x16/save.png</file>
+    <file alias="save-query">16x16/save-query.png</file>
+  </qresource>
+  <qresource prefix="icons/22x22">
+    <file alias="arrow-up">22x22/arrow-up.png</file>
+    <file alias="arrow-down">22x22/arrow-down.png</file>
+    <file alias="arrow-down-multi">22x22/arrow-down-multi.png</file>
+    <file alias="clear">22x22/clear.png</file>
+    <file alias="configure">22x22/configure.png</file>
+    <file alias="delete">22x22/delete.png</file>
+    <file alias="edit-query">22x22/edit-query.png</file>
+    <file alias="load">22x22/load.png</file>
+    <file alias="load-query">22x22/load-query.png</file>
+    <file alias="new-query">22x22/new-query.png</file>
+    <file alias="playback-frame-backward">22x22/playback-frame-backward.png</file>
+    <file alias="playback-frame-forward">22x22/playback-frame-forward.png</file>
+    <file alias="playback-pause">22x22/playback-pause.png</file>
+    <file alias="playback-play">22x22/playback-play.png</file>
+    <file alias="playback-stop">22x22/playback-stop.png</file>
+    <file alias="quit">22x22/quit.png</file>
+    <file alias="save">22x22/save.png</file>
+    <file alias="save-query">22x22/save-query.png</file>
+    <file alias="show-boxes">22x22/track-show-boxes.png</file>
+    <file alias="view-reset">22x22/view-reset.png</file>
+    <file alias="view-track">22x22/view-track.png</file>
+    <file alias="playback-fast-backward">22x22/playback-fast-backward.png</file>
+    <file alias="playback-fast-forward">22x22/playback-fast-forward.png</file>
+    <file alias="playback-play-reverse">22x22/playback-play-reverse.png</file>
+  </qresource>
+  <qresource prefix="icons/32x32">
+    <file alias="data-providers">32x32/data-providers.png</file>
+    <file alias="display">32x32/display.png</file>
+    <file alias="iqr">32x32/iqr.png</file>
+    <file alias="qf">32x32/qf.png</file>
+  </qresource>
+  <qresource prefix="icons/128x128">
+    <file alias="vpView">128x128/vpView.png</file>
+  </qresource>
+</RCC>
diff --git a/Icons/vsp.qrc b/Icons/vsp.qrc
new file mode 100644
index 00000000..401bbace
--- /dev/null
+++ b/Icons/vsp.qrc
@@ -0,0 +1,167 @@
+<RCC>
+  <qresource prefix="icons/16x16">
+    <file alias="add">16x16/add.png</file>
+    <file alias="alert-activate">16x16/alert-activate.png</file>
+    <file alias="alert-clear">16x16/alert-clear.png</file>
+    <file alias="alert-clear-all">16x16/alert-clear-all.png</file>
+    <file alias="alert-deactivate">16x16/alert-deactivate.png</file>
+    <file alias="alert-list">16x16/alert-list.png</file>
+    <file alias="browse">16x16/browse.png</file>
+    <file alias="connect-stream-video">16x16/connect-stream-video.png</file>
+    <file alias="delete">16x16/delete.png</file>
+    <file alias="edit">16x16/edit.png</file>
+    <file alias="edit-location">16x16/edit-location.png</file>
+    <file alias="event-show-boxes">16x16/event-show-boxes.png</file>
+    <file alias="event-show-label">16x16/event-show-label.png</file>
+    <file alias="event-show-probability">16x16/event-show-probability.png</file>
+    <file alias="event-show-tracks">16x16/event-show-tracks.png</file>
+    <file alias="filter-show">16x16/filter-show.png</file>
+    <file alias="load">16x16/load.png</file>
+    <file alias="load-alert">16x16/load-alert.png</file>
+    <file alias="load-database">16x16/load-database.png</file>
+    <file alias="load-events">16x16/load-events.png</file>
+    <file alias="load-tracks">16x16/load-tracks.png</file>
+    <file alias="load-video">16x16/load-video.png</file>
+    <file alias="mask-color">16x16/mask-color.png</file>
+    <file alias="mask-show-filtering">16x16/mask-show-filtering.png</file>
+    <file alias="mask-show-tracking">16x16/mask-show-tracking.png</file>
+    <file alias="measure">16x16/measure.png</file>
+    <file alias="new-alert">16x16/new-alert.png</file>
+    <file alias="new-stream-video">16x16/new-stream-video.png</file>
+    <file alias="path-clear-all">16x16/path-clear-all.png</file>
+    <file alias="path-clear">16x16/path-clear.png</file>
+    <file alias="path-close">16x16/path-close.png</file>
+    <file alias="path-draw">16x16/path-draw.png</file>
+    <file alias="path-list">16x16/path-list.png</file>
+    <file alias="playback-fast-backward">16x16/playback-fast-backward.png</file>
+    <file alias="playback-fast-forward">16x16/playback-fast-forward.png</file>
+    <file alias="playback-frame-backward">16x16/playback-frame-backward.png</file>
+    <file alias="playback-frame-forward">16x16/playback-frame-forward.png</file>
+    <file alias="playback-pause">16x16/playback-pause.png</file>
+    <file alias="playback-play">16x16/playback-play.png</file>
+    <file alias="playback-play-live">16x16/playback-play-live.png</file>
+    <file alias="playback-play-reverse">16x16/playback-play-reverse.png</file>
+    <file alias="playback-skip-backward">16x16/playback-skip-backward.png</file>
+    <file alias="playback-skip-forward">16x16/playback-skip-forward.png</file>
+    <file alias="playback-speed-decrease">16x16/playback-speed-decrease.png</file>
+    <file alias="playback-speed-increase">16x16/playback-speed-increase.png</file>
+    <file alias="playback-stop">16x16/playback-stop.png</file>
+    <file alias="quit">16x16/quit.png</file>
+    <file alias="save">16x16/save.png</file>
+    <file alias="search">16x16/search.png</file>
+    <file alias="search-database">16x16/search-database.png</file>
+    <file alias="star">16x16/star.png</file>
+    <file alias="star-off">16x16/star-off.png</file>
+    <file alias="track-color">16x16/track-color.png</file>
+    <file alias="track-list">16x16/track-list.png</file>
+    <file alias="track-show-boxes">16x16/track-show-boxes.png</file>
+    <file alias="track-show-id">16x16/track-show-id.png</file>
+    <file alias="track-show-pvo">16x16/track-show-pvo.png</file>
+    <file alias="track-show">16x16/track-show.png</file>
+    <file alias="view-reset">16x16/view-reset.png</file>
+    <file alias="vsPlay">16x16/vsPlay.png</file>
+  </qresource>
+  <qresource prefix="icons/source/16x16">
+    <file alias="event-archived-active">source/16x16/event-archived-active.png</file>
+    <file alias="event-archived">source/16x16/event-archived.png</file>
+    <file alias="event-live-active">source/16x16/event-live-active.png</file>
+    <file alias="event-live-idle">source/16x16/event-live-idle.png</file>
+    <file alias="event-multiple-sources">source/16x16/event-multiple-sources.png</file>
+    <file alias="event-multiple-sources-archived">source/16x16/event-multiple-sources-archived.png</file>
+    <file alias="event-multiple-sources-live">source/16x16/event-multiple-sources-live.png</file>
+    <file alias="event-multiple-sources-live-archived">source/16x16/event-multiple-sources-live-archived.png</file>
+    <file alias="event-multiple-sources-stream">source/16x16/event-multiple-sources-stream.png</file>
+    <file alias="event-multiple-sources-stream-archived">source/16x16/event-multiple-sources-stream-archived.png</file>
+    <file alias="event-multiple-sources-stream-live">source/16x16/event-multiple-sources-stream-live.png</file>
+    <file alias="event-stream-active">source/16x16/event-stream-active.png</file>
+    <file alias="event-stream-idle">source/16x16/event-stream-idle.png</file>
+    <file alias="event-stream-pending">source/16x16/event-stream-pending.png</file>
+    <file alias="event-stream-stopped">source/16x16/event-stream-stopped.png</file>
+    <file alias="event">source/16x16/event.png</file>
+    <file alias="track-archived-active">source/16x16/track-archived-active.png</file>
+    <file alias="track-archived">source/16x16/track-archived.png</file>
+    <file alias="track-multiple-sources-archived">source/16x16/track-multiple-sources-archived.png</file>
+    <file alias="track-multiple-sources-stream">source/16x16/track-multiple-sources-stream.png</file>
+    <file alias="track-multiple-sources-stream-archived">source/16x16/track-multiple-sources-stream-archived.png</file>
+    <file alias="track-stream-active">source/16x16/track-stream-active.png</file>
+    <file alias="track-stream-idle">source/16x16/track-stream-idle.png</file>
+    <file alias="track-stream-pending">source/16x16/track-stream-pending.png</file>
+    <file alias="track-stream-stopped">source/16x16/track-stream-stopped.png</file>
+    <file alias="track">source/16x16/track.png</file>
+    <file alias="video-archived-active">source/16x16/video-archived-active.png</file>
+    <file alias="video-archived-suspended">source/16x16/video-archived-suspended.png</file>
+    <file alias="video-archived">source/16x16/video-archived.png</file>
+    <file alias="video-stream-active">source/16x16/video-stream-active.png</file>
+    <file alias="video-stream-idle">source/16x16/video-stream-idle.png</file>
+    <file alias="video-stream-pending">source/16x16/video-stream-pending.png</file>
+    <file alias="video-stream-stopped">source/16x16/video-stream-stopped.png</file>
+    <file alias="video">source/16x16/video.png</file>
+  </qresource>
+  <qresource prefix="icons/22x22">
+    <file alias="alert-activate">22x22/alert-activate.png</file>
+    <file alias="alert-clear">22x22/alert-clear.png</file>
+    <file alias="alert-clear-all">22x22/alert-clear-all.png</file>
+    <file alias="alert-deactivate">22x22/alert-deactivate.png</file>
+    <file alias="alert-list">22x22/alert-list.png</file>
+    <file alias="connect-stream-video">22x22/connect-stream-video.png</file>
+    <file alias="delete">22x22/delete.png</file>
+    <file alias="edit">22x22/edit.png</file>
+    <file alias="event-show-boxes">22x22/event-show-boxes.png</file>
+    <file alias="event-show-label">22x22/event-show-label.png</file>
+    <file alias="event-show-probability">22x22/event-show-probability.png</file>
+    <file alias="event-show-tracks">22x22/event-show-tracks.png</file>
+    <file alias="filter-show">22x22/filter-show.png</file>
+    <file alias="load">22x22/load.png</file>
+    <file alias="load-alert">22x22/load-alert.png</file>
+    <file alias="load-database">22x22/load-database.png</file>
+    <file alias="load-events">22x22/load-events.png</file>
+    <file alias="load-tracks">22x22/load-tracks.png</file>
+    <file alias="load-video">22x22/load-video.png</file>
+    <file alias="mask-color">22x22/mask-color.png</file>
+    <file alias="mask-show-filtering">22x22/mask-show-filtering.png</file>
+    <file alias="mask-show-tracking">22x22/mask-show-tracking.png</file>
+    <file alias="measure">22x22/measure.png</file>
+    <file alias="new-alert">22x22/new-alert.png</file>
+    <file alias="new-stream-video">22x22/new-stream-video.png</file>
+    <file alias="path-clear-all">22x22/path-clear-all.png</file>
+    <file alias="path-clear">22x22/path-clear.png</file>
+    <file alias="path-close">22x22/path-close.png</file>
+    <file alias="path-draw">22x22/path-draw.png</file>
+    <file alias="path-list">22x22/path-list.png</file>
+    <file alias="playback-fast-backward">22x22/playback-fast-backward.png</file>
+    <file alias="playback-fast-forward">22x22/playback-fast-forward.png</file>
+    <file alias="playback-frame-backward">22x22/playback-frame-backward.png</file>
+    <file alias="playback-frame-forward">22x22/playback-frame-forward.png</file>
+    <file alias="playback-pause">22x22/playback-pause.png</file>
+    <file alias="new-query">22x22/new-query.png</file>
+    <file alias="playback-play">22x22/playback-play.png</file>
+    <file alias="playback-play-live">22x22/playback-play-live.png</file>
+    <file alias="playback-play-reverse">22x22/playback-play-reverse.png</file>
+    <file alias="playback-skip-backward">22x22/playback-skip-backward.png</file>
+    <file alias="playback-skip-forward">22x22/playback-skip-forward.png</file>
+    <file alias="playback-speed-decrease">22x22/playback-speed-decrease.png</file>
+    <file alias="playback-speed-increase">22x22/playback-speed-increase.png</file>
+    <file alias="playback-stop">22x22/playback-stop.png</file>
+    <file alias="quit">22x22/quit.png</file>
+    <file alias="save">22x22/save.png</file>
+    <file alias="track-color">22x22/track-color.png</file>
+    <file alias="track-list">22x22/track-list.png</file>
+    <file alias="track-show-boxes">22x22/track-show-boxes.png</file>
+    <file alias="track-show-id">22x22/track-show-id.png</file>
+    <file alias="track-show-pvo">22x22/track-show-pvo.png</file>
+    <file alias="track-show">22x22/track-show.png</file>
+    <file alias="view-reset">22x22/view-reset.png</file>
+  </qresource>
+  <qresource prefix="icons/32x32">
+    <file alias="vsPlay">32x32/vsPlay.png</file>
+  </qresource>
+  <qresource prefix="icons/48x48">
+    <file alias="vsPlay">48x48/vsPlay.png</file>
+  </qresource>
+  <qresource prefix="icons/64x64">
+    <file alias="vsPlay">64x64/vsPlay.png</file>
+  </qresource>
+  <qresource prefix="icons/128x128">
+    <file alias="vsPlay">128x128/vsPlay.png</file>
+  </qresource>
+</RCC>
diff --git a/Icons/vvwidgets.qrc b/Icons/vvwidgets.qrc
new file mode 100644
index 00000000..ba17fec0
--- /dev/null
+++ b/Icons/vvwidgets.qrc
@@ -0,0 +1,15 @@
+<RCC>
+  <qresource prefix="icons/16x16">
+    <file alias="add">16x16/add.png</file>
+    <file alias="arrow-down">16x16/arrow-down.png</file>
+    <file alias="arrow-up">16x16/arrow-up.png</file>
+    <file alias="browse">16x16/browse.png</file>
+    <file alias="delete">16x16/delete.png</file>
+    <file alias="search">16x16/search.png</file>
+  </qresource>
+  <qresource prefix="icons/22x22">
+    <file alias="arrow-down">22x22/arrow-down.png</file>
+    <file alias="arrow-up">22x22/arrow-up.png</file>
+    <file alias="delete">22x22/delete.png</file>
+  </qresource>
+</RCC>
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..00ab4729
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,27 @@
+Copyright 2013-2014 Kitware, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither name of Kitware, Inc. nor the names of any contributors may be used
+   to endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/Libraries/CMakeLists.txt b/Libraries/CMakeLists.txt
new file mode 100644
index 00000000..d95d7009
--- /dev/null
+++ b/Libraries/CMakeLists.txt
@@ -0,0 +1,58 @@
+# Qt dependent libraries
+add_subdirectory(QtExtensions)
+add_subdirectory(VgCommon)
+add_subdirectory(QtVgCommon)
+add_subdirectory(QtVgWidgets)
+
+if(VISGUI_ENABLE_VSPLAY OR VISGUI_ENABLE_VIQUI OR VISGUI_ENABLE_WEB)
+  set(VISGUI_ENABLE_VVIO TRUE)
+  add_subdirectory(VvData)
+  add_subdirectory(VvIO)
+  if(VISGUI_ENABLE_VSPLAY OR VISGUI_ENABLE_VIQUI)
+    if(VISGUI_ENABLE_VIDTK)
+      add_subdirectory(VvVidtk)
+    endif()
+    add_subdirectory(VvWidgets)
+  endif()
+else()
+  set(VISGUI_ENABLE_VVIO FALSE)
+endif()
+
+add_subdirectory(VgVideo)
+
+# VTK dependent libraries
+add_subdirectory(VtkVgCore)
+
+if(VISGUI_ENABLE_GDAL)
+  add_subdirectory(VtkVgIO)
+endif(VISGUI_ENABLE_GDAL)
+
+add_subdirectory(VtkVgModelView)
+add_subdirectory(VtkVgSceneGraph)
+add_subdirectory(VtkVgQtUtil)
+add_subdirectory(VtkVgQtWidgets)
+
+add_subdirectory(VtkVgVideo)
+add_subdirectory(VgVtkVideo)
+
+if(VISGUI_ENABLE_VSPLAY OR VISGUI_ENABLE_VIQUI)
+  add_subdirectory(VvVtkWidgets)
+endif()
+
+if(VISGUI_ENABLE_WEB)
+  add_subdirectory(VtkVwCore)
+endif()
+
+add_subdirectory(VgDataFramework)
+
+# Qt testing support
+if(QtTesting_FOUND)
+  add_subdirectory(QtTestingSupport)
+endif()
+
+# vsPlay support libraries
+if(VISGUI_ENABLE_VSPLAY)
+  add_subdirectory(VspData)
+  add_subdirectory(VspSourceUtil)
+  add_subdirectory(VspUserInterface)
+endif()
diff --git a/Libraries/QtExtensions/CMake/Modules/UseQtExtensions.cmake b/Libraries/QtExtensions/CMake/Modules/UseQtExtensions.cmake
new file mode 100644
index 00000000..36e14a45
--- /dev/null
+++ b/Libraries/QtExtensions/CMake/Modules/UseQtExtensions.cmake
@@ -0,0 +1,20 @@
+# - Use Module for VISGUI QtExtensions
+# Provides CMake macros to use qte-amc.
+
+# qte_amc_wrap_ui(outfiles_var dialog_class_name input_ui_file ... )
+function(qte_amc_wrap_ui outvar name)
+  set(infiles)
+  set(outfiles)
+  foreach(it ${ARGN})
+    get_filename_component(outfile ${it} NAME_WE)
+    get_filename_component(infile ${it} ABSOLUTE)
+    list(APPEND infiles "${infile}")
+    list(APPEND outfiles "${CMAKE_CURRENT_BINARY_DIR}/am_${outfile}.h")
+  endforeach()
+  set(outfile "${CMAKE_CURRENT_BINARY_DIR}/${name}.h")
+  set_source_files_properties(${outfiles} ${outfile} PROPERTIES GENERATED TRUE)
+  add_custom_command(OUTPUT ${outfiles} ${outfile}
+    COMMAND ${QTE_AMC_EXECUTABLE} ${outfile} ${infiles}
+    DEPENDS ${QTE_AMC_EXECUTABLE} ${infiles})
+  set(${outvar} ${outfiles} ${outfile} PARENT_SCOPE)
+endfunction()
diff --git a/Libraries/QtExtensions/CMakeLists.txt b/Libraries/QtExtensions/CMakeLists.txt
new file mode 100644
index 00000000..816e60e0
--- /dev/null
+++ b/Libraries/QtExtensions/CMakeLists.txt
@@ -0,0 +1,341 @@
+project(qtExtensions)
+
+###############################################################################
+
+# BEGIN action manager compiler
+
+include(qteVersion.cmake)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qteVersion.h.in
+               ${CMAKE_CURRENT_BINARY_DIR}/qteVersion.h @ONLY)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+add_executable(qte-amc Tools/qtActionManagerCompiler.cxx)
+target_link_libraries(qte-amc ${QT_LIBRARIES})
+
+get_property(QTE_AMC_EXECUTABLE TARGET qte-amc PROPERTY LOCATION)
+set(QTE_AMC_EXECUTABLE "${QTE_AMC_EXECUTABLE}"
+    CACHE INTERNAL "Location of the qte-amc executable" FORCE
+)
+
+# END action manager compiler
+
+###############################################################################
+
+# BEGIN qtExtensions library sources
+
+set(qtExtensionsSources
+    # Core
+    Core/qtCliArgs.cxx
+    Core/qtCliOption.cxx
+    Core/qtCliOptions.cxx
+    Core/qtDebug.cxx
+    Core/qtOnce.cxx
+    Core/qtScopedValueChange.cxx
+    Core/qtStlUtil.cxx
+    Core/qtTest.cxx
+    Core/qtThread.cxx
+    Core/qtUtil.cxx
+    # Util
+    Util/qtAbstractAnimation.cxx
+    Util/qtAbstractSetting.cxx
+    Util/qtActionFactory.cxx
+    Util/qtActionManager.cxx
+    Util/qtActionPriorityList.cxx
+    Util/qtColorUtil.cxx
+    Util/qtDockController.cxx
+    Util/qtGradient.cxx
+    Util/qtJson.cxx
+    Util/qtPrioritizedMenuProxy.cxx
+    Util/qtPrioritizedToolBarProxy.cxx
+    Util/qtScopedSettingGroup.cxx
+    Util/qtSettings.cxx
+    Util/qtStatusForwarder.cxx
+    Util/qtStatusManager.cxx
+    Util/qtStatusNotifier.cxx
+    Util/qtStatusSource.cxx
+    Util/qtUiState.cxx
+    # IO
+    IO/qtKstReader.cxx
+    IO/qtKstParser.cxx
+    IO/qtKstSeparator.cxx
+    IO/qtTemporaryFile.cxx
+    # Widgets
+    Widgets/qtColorButton.cxx
+    Widgets/qtDoubleSlider.cxx
+    Widgets/qtDrawer.cxx
+    Widgets/qtDrawerWidget.cxx
+    Widgets/qtExpander.cxx
+    Widgets/qtGradientWidget.cxx
+    Widgets/qtOverlayWidget.cxx
+    Widgets/qtSqueezedLabel.cxx
+    Widgets/qtThrobber.cxx
+    # ItemViews
+    ItemViews/qtAbstractListDelegate.cxx
+    ItemViews/qtColorButtonItemWidget.cxx
+    ItemViews/qtComboBoxDelegate.cxx
+    ItemViews/qtDoubleSpinBoxDelegate.cxx
+    ItemViews/qtListDelegate.cxx
+    ItemViews/qtRichTextDelegate.cxx
+    ItemViews/qtSpinBoxDelegate.cxx
+    # Dialogs
+    Dialogs/qtActionManagerDialog.cxx
+    Dialogs/qtConfirmationDialog.cxx
+    Dialogs/qtDoubleInputDialog.cxx
+    # Dom
+    Dom/qtDom.cxx
+    Dom/qtDomElement.cxx
+    # Sax
+    Sax/qtSaxNodes.cxx
+    Sax/qtSaxTraversal.cxx
+    Sax/qtSaxWriter.cxx
+)
+
+set(qtExtensionsMocHeaders
+    # Util
+    Util/qtAbstractAnimation.h
+    Util/qtActionManager.h
+    Util/qtDockControllerPrivate.h
+    Util/qtStatusForwarder.h
+    Util/qtStatusManager.h
+    Util/qtStatusNotifier.h
+    Util/qtStatusSourcePrivate.h
+    # Widgets
+    Widgets/qtColorButton.h
+    Widgets/qtDoubleSlider.h
+    Widgets/qtDrawer.h
+    Widgets/qtDrawerWidget.h
+    Widgets/qtExpander.h
+    Widgets/qtGradientWidget.h
+    Widgets/qtOverlayWidget.h
+    Widgets/qtSqueezedLabel.h
+    Widgets/qtThrobber.h
+    # ItemViews
+    ItemViews/qtAbstractListDelegate.h
+    ItemViews/qtColorButtonItemWidget.h
+    ItemViews/qtComboBoxDelegate.h
+    ItemViews/qtDoubleSpinBoxDelegate.h
+    ItemViews/qtListDelegate.h
+    ItemViews/qtRichTextDelegate.h
+    ItemViews/qtSpinBoxDelegate.h
+    # Dialogs
+    Dialogs/qtActionManagerDialog.h
+    Dialogs/qtConfirmationDialog.h
+    Dialogs/qtDoubleInputDialog.h
+)
+
+set(qtExtensionsUiFiles
+    Dialogs/qtActionManagerDialog.ui
+    Dialogs/qtConfirmationDialog.ui
+)
+
+set(qtExtensionsInstallHeaders
+    # Core
+    Core/qtCliArgs.h
+    Core/qtCliOption.h
+    Core/qtCliOptions.h
+    Core/qtDebug.h
+    Core/qtDebugArea.h
+    Core/qtDebugHelper.h
+    Core/qtDebugImpl.h
+    Core/qtGlobal.h
+    Core/qtMath.h
+    Core/qtOnce.h
+    Core/qtScopedValueChange.h
+    Core/qtStlUtil.h
+    Core/qtTest.h
+    Core/qtThread.h
+    Core/qtTransferablePointerArray.h
+    Core/qtTransferablePointer.h
+    Core/qtUtil.h
+    # Util
+    Util/qtAbstractAnimation.h
+    Util/qtAbstractSetting.h
+    Util/qtActionFactory.h
+    Util/qtActionManager.h
+    Util/qtColorUtil.h
+    Util/qtDockController.h
+    Util/qtGradient.h
+    Util/qtJson.h
+    Util/qtMap.h
+    Util/qtMapImpl.h
+    Util/qtPrioritizedMenuProxy.h
+    Util/qtPrioritizedToolBarProxy.h
+    Util/qtRand.h
+    Util/qtScopedSettingGroup.h
+    Util/qtSettings.h
+    Util/qtSettingsImpl.h
+    Util/qtStatusForwarder.h
+    Util/qtStatusManager.h
+    Util/qtStatusNotifier.h
+    Util/qtStatusSource.h
+    Util/qtUiState.h
+    Util/qtUtilNamespace.h
+    # IO
+    IO/qtKstReader.h
+    IO/qtStringStream.h
+    IO/qtTemporaryFile.h
+    # Widgets
+    Widgets/qtColorButton.h
+    Widgets/qtDoubleSlider.h
+    Widgets/qtDrawer.h
+    Widgets/qtDrawerWidget.h
+    Widgets/qtExpander.h
+    Widgets/qtGradientWidget.h
+    Widgets/qtOverlayWidget.h
+    Widgets/qtSqueezedLabel.h
+    Widgets/qtThrobber.h
+    # ItemViews
+    ItemViews/qtAbstractListDelegate.h
+    ItemViews/qtColorButtonItemWidget.h
+    ItemViews/qtComboBoxDelegate.h
+    ItemViews/qtDoubleSpinBoxDelegate.h
+    ItemViews/qtFlagListDelegate.h
+    ItemViews/qtListDelegate.h
+    ItemViews/qtNumericTreeWidgetItem.h
+    ItemViews/qtRichTextDelegate.h
+    ItemViews/qtSpinBoxDelegate.h
+    # Dialogs
+    Dialogs/qtActionManagerDialog.h
+    Dialogs/qtConfirmationDialog.h
+    Dialogs/qtDoubleInputDialog.h
+    # Dom
+    Dom/qtDom.h
+    Dom/qtDomElement.h
+    # Sax
+    Sax/qtSax.h
+    Sax/qtSaxNamespace.h
+    Sax/qtSaxNodes.h
+    Sax/qtSaxTraversal.h
+    Sax/qtSaxWriter.h
+)
+
+# END qtExtensions library build sources
+
+###############################################################################
+
+# BEGIN qtExtensions library build rules
+
+qt4_wrap_ui(qtExtensionsUiSources ${qtExtensionsUiFiles})
+qt4_wrap_cpp(qtExtensionsMocSources ${qtExtensionsMocHeaders})
+
+source_group("Generated" FILES
+  ${qtExtensionsMocSources}
+  ${qtExtensionsUiSources}
+)
+
+add_library(${PROJECT_NAME}
+  ${qtExtensionsSources} ${qtExtensionsMocSources} ${qtExtensionsUiSources}
+)
+
+if(WIN32)
+  set(ONCE_THREAD_LIBRARY)
+else()
+  set(ONCE_THREAD_LIBRARY -lpthread)
+endif()
+
+target_link_libraries(${PROJECT_NAME}
+  ${QT_LIBRARIES}
+  ${ONCE_THREAD_LIBRARY}
+)
+
+if(MSVC)
+  set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS /Zc:wchar_t-)
+endif()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${qtExtensionsInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/QtE)
+
+# END qtExtensions library build rules
+
+###############################################################################
+
+# BEGIN qtExtensions library python wrapping rules
+
+set(qtExtensionsWrapObjects
+    # Core
+    qtCliOptions
+    #qtDebug - not wrapped for now; need to figure out how to wrap areas
+    #qtTest - not wrapped for now; needs special handling to pass suites
+    qtThread qtBareThread
+    # Util
+    qtAbstractAnimation
+    qtActionFactory
+    qtActionManager
+    qtDockController
+    qtPrioritizedMenuProxy
+    qtPrioritizedToolBarProxy
+    qtScopedSettingGroup
+    qtStatusForwarder
+    qtStatusManager
+    qtStatusNotifier
+    qtStatusSource
+    # IO
+    qtTemporaryFile
+    # Widgets
+    qtColorButton
+    qtDrawerWidget
+    qtExpander
+    qtGradientWidget
+    qtOverlayWidget
+    qtThrobber
+    # ItemViews
+    qtAbstractListDelegate
+    qtColorButtonItemWidget
+    qtComboBoxDelegate
+    qtDoubleSpinBoxDelegate
+    #qtFlagListDelegate - not wrapped for now; template class, maybe impossible
+    qtListDelegate
+    qtNumericTreeWidgetItem
+    qtRichTextDelegate
+    qtSpinBoxDelegate
+    # Dialogs
+    qtActionManagerDialog
+    # Dom
+    qtDomElement
+)
+
+vg_wrap_library(${PROJECT_NAME}
+  TYPESYSTEM typesystem.xml
+  OBJECTS ${qtExtensionsWrapObjects}
+  HEADERS ${qtExtensionsInstallHeaders}
+  DEPENDS PySide:Gui
+)
+
+# END qtExtensions library python wrapping rules
+
+###############################################################################
+
+# BEGIN doxytag helper
+
+add_executable(qte-makedoxytag Tools/qtMakeDoxyTags.cxx)
+target_link_libraries(qte-makedoxytag ${PROJECT_NAME} ${QT_LIBRARIES})
+
+# List of extra tags (pages) to extract
+set(qt4_extra_tags
+  implicit-sharing
+)
+
+# Create dependency list
+set(qt4_extra_tag_files)
+foreach(tag ${qt4_extra_tags})
+  list(APPEND qt4_extra_tag_files "${QT_DOC_DIR}/html/${tag}.html")
+endforeach()
+
+# Add target to generate extra tags file
+add_custom_command(
+  OUTPUT "${QT4_EXTRA_TAG_FILE}"
+  COMMAND qte-makedoxytag -o "${QT4_EXTRA_TAG_FILE}" -d "${QT_DOC_DIR}/html"
+                          ${qt4_extra_tags}
+  DEPENDS qte-makedoxytag ${qt4_extra_tag_files}
+)
+add_custom_target(doxygen-qt4-extra-tag DEPENDS "${QT4_EXTRA_TAG_FILE}")
+
+# END doxytag helper
+
+###############################################################################
+
+vg_add_documentation(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} Qt)
+
+vg_add_test_subdirectory()
diff --git a/Libraries/QtExtensions/Core/qtCliArgs.cxx b/Libraries/QtExtensions/Core/qtCliArgs.cxx
new file mode 100644
index 00000000..2d1d7169
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtCliArgs.cxx
@@ -0,0 +1,816 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtCliArgs.h"
+
+#ifdef Q_OS_WIN
+#include <windows.h>
+#endif
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFileInfo>
+#include <QHash>
+#include <QStringList>
+#include <QTextStream>
+
+#include <cstdlib>
+
+QTE_IMPLEMENT_D_FUNC(qtCliArgs)
+
+#define qOut() QTextStream(stdout, QIODevice::WriteOnly)
+#define qErr() QTextStream(stderr, QIODevice::WriteOnly)
+
+//BEGIN qtCliArgsPrivate
+
+//-----------------------------------------------------------------------------
+class qtCliArgsPrivate
+{
+public:
+  struct OptionGroup
+    {
+    QString name;
+    QList<qtCliOption> options;
+    };
+
+  qtCliArgsPrivate() : parsed(false), multiNamedArg(-1) {}
+
+  bool checkRequired();
+  void generateQtArgs();
+
+  static void addQtOptions(qtCliArgs* args);
+
+  QStringList originalArgs;
+  QStringList parsedArgs;
+  QString processName;
+
+  bool parsed;
+  bool parseResult;
+  QString parseError;
+
+  QStringList optionGroups;
+  QStringList commonOptionGroups;
+  QHash<QString, OptionGroup> options;
+  QList<qtCliOption> namedArgs;
+  int multiNamedArg;
+
+  QHash<QString, qtCliOption*> optionMap;
+  QHash<QString, qtCliOption*> shortOptions;
+  QHash<QString, qtCliOption*> longOptions;
+
+  QStringList qtArgs;
+  QList<int*> qtArgc;
+  QList<char**> qtArgv;
+};
+
+//-----------------------------------------------------------------------------
+bool qtCliArgsPrivate::checkRequired()
+{
+  // Check that required options were specified
+  foreach (const qtCliArgsPrivate::OptionGroup& og, this->options)
+    {
+    foreach (const qtCliOption& option, og.options)
+      {
+      if (option.isRequired() && !option.isSet())
+        {
+        this->parseError = QString("Required option '%1' was not specified.")
+                             .arg(option.preferredName());
+        return false;
+        }
+      }
+    }
+
+  // Check that required arguments were specified
+  foreach (const qtCliOption& narg, this->namedArgs)
+    {
+    if (narg.isRequired() && !narg.isSet())
+      {
+      this->parseError = QString("Required argument '%1' was not specified.")
+                           .arg(narg.preferredName());
+      return false;
+      }
+    }
+
+  // All required options/arguments are present
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgsPrivate::generateQtArgs()
+{
+  this->qtArgs.append(originalArgs[0]);
+  foreach (const qtCliOption& option, this->options.value("qt").options)
+    {
+    QString name = option.preferredName();
+    if (option.isSet())
+      {
+      if (name == "display")
+        {
+        qputenv("DISPLAY", option.value().toLocal8Bit());
+        }
+      else
+        {
+        this->qtArgs.append('-' + name);
+        this->qtArgs.append(option.value());
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgsPrivate::addQtOptions(qtCliArgs* args)
+{
+  qtCliOptions qtOptions;
+  // \TODO declare Qt options
+#ifdef Q_WS_X11
+  qtOptions.add("display <name>", "Use the X server display 'name'");
+#endif
+  qtOptions.add("style <style>", "Default widget style for the application");
+  qtOptions.add("nograb", "Tells Qt to never grab the mouse or the keyboard");
+  qtOptions.add("dograb", "Running under a debugger can cause Qt to add an"
+                          " implicit --nograb; use --dograb to force Qt to"
+                          " allow grabbing");
+  args->addOptions(qtOptions, "Qt", false);
+}
+
+//END qtCliArgsPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtCliArgs
+
+//-----------------------------------------------------------------------------
+qtCliArgs::qtCliArgs(int argc, char** argv)
+  : d_ptr(new qtCliArgsPrivate)
+{
+  QTE_D(qtCliArgs);
+
+#ifndef Q_OS_WIN
+  // Convert argument list to QStringList
+  for (int i = 0; i < argc; ++i)
+    {
+    d->originalArgs.append(QString::fromLocal8Bit(argv[i]));
+    }
+#else
+  // On Windows, argv is inadequate for dealing with Unicode input; we ignore
+  // it and use GetCommandLineW() instead
+  LPWSTR* wArgv = CommandLineToArgvW(GetCommandLineW(), &argc);
+  for (int i = 0; i < argc; ++i)
+    {
+    d->originalArgs.append(QString::fromWCharArray(wArgv[i]));
+    }
+  LocalFree(wArgv);
+#endif
+
+  // Better have at least argv[0]
+  Q_ASSERT(d->originalArgs.count());
+
+  // Extract first arg as process name, with path removed
+  QFileInfo fi(d->originalArgs[0]);
+  d->processName = fi.fileName();
+
+  // Add Qt specific options
+  qtCliArgsPrivate::addQtOptions(this);
+}
+
+//-----------------------------------------------------------------------------
+qtCliArgs::~qtCliArgs()
+{
+  QTE_D(qtCliArgs);
+
+  qDeleteAll(d->qtArgc);
+  int k = d->qtArgv.count();
+  while (k--)
+    {
+    char** v = d->qtArgv[k];
+    int i = 0;
+    while (v[i])
+      {
+      delete[] v[i++];
+      }
+    delete[] v;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::addOptions(const qtCliOptions& options, QString group,
+                           bool includeWithCommon)
+{
+  if (options.isEmpty())
+    {
+    return;
+    }
+
+  QTE_D(qtCliArgs);
+
+  if (d->parsed)
+    {
+    qWarning() << "qtCliArgs: warning: calling" << __FUNCTION__
+               << "after parse has been called is not supported";
+    return;
+    }
+
+  // Add group to group lists, if we haven't seen it before
+  const QString lgroup = group.toLower();
+  if (!d->options.contains(lgroup))
+    {
+    d->optionGroups.append(group);
+    if (includeWithCommon)
+      {
+      d->commonOptionGroups.append(group);
+      }
+    }
+
+  // Add options to maps
+  qtCliArgsPrivate::OptionGroup& og = d->options[lgroup];
+  og.name = group;
+  foreach (const qtCliOption& option, options.options())
+    {
+    og.options.append(option);
+    qtCliOption* po = &og.options.last();
+    foreach (QString sn, po->shortNames())
+      {
+      d->optionMap.insert(sn, po);
+      d->shortOptions.insert(sn, po);
+      }
+    foreach (QString ln, po->longNames())
+      {
+      d->optionMap.insert(ln, po);
+      d->longOptions.insert(ln, po);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::addNamedArguments(const qtCliOptions& args)
+{
+  if (args.isEmpty())
+    {
+    return;
+    }
+
+  QTE_D(qtCliArgs);
+
+  if (d->parsed)
+    {
+    qWarning() << "qtCliArgs: warning: calling" << __FUNCTION__
+               << "after parse has been called is not supported";
+    return;
+    }
+
+  // Add named arguments to maps
+  foreach (const qtCliOption& arg, args.options())
+    {
+    if (d->multiNamedArg < 0)
+      {
+      if (arg.isNamedList())
+        {
+        d->multiNamedArg = d->namedArgs.count();
+        }
+      d->namedArgs.append(arg);
+      qtCliOption* pa = &d->namedArgs.last();
+      foreach (QString name, pa->longNames())
+        d->optionMap.insert(name, pa);
+      }
+    else
+      {
+      const QString multiArgName = d->namedArgs.last().preferredName();
+      qWarning() << "qtCliArgs::addNamedArguments: previous named argument"
+                 << multiArgName << "consumes all remaining arguments;"
+                 << "named argument" << arg.preferredName()
+                 << "not added";
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool qtCliArgs::parse(ParseOptions options)
+{
+  QTE_D(qtCliArgs);
+
+  // Don't parse twice
+  if (d->parsed)
+    {
+    // If asked, and we haven't already failed, check required options/arguments
+    if (!options.testFlag(qtCliArgs::IgnoreRequired))
+      {
+      d->parseResult = d->parseResult && d->checkRequired();
+      }
+    return d->parseResult;
+    }
+
+  d->parsed = true;
+  d->parseResult = false;
+
+  bool considerOptions = true;
+  int argc = d->originalArgs.count();
+  for (int n = 1; n < argc; ++n)
+    {
+    const QString arg = d->originalArgs[n];
+
+#ifdef Q_OS_MAC
+    // OS X passes a process identifier argument when opening an app bundle
+    // from the GUI or by using the "open" CLI command. Ignore this.
+    if (arg.startsWith("-psn"))
+      {
+      continue;
+      }
+#endif
+
+    if (considerOptions)
+      {
+      // Handle built-in options
+      if (arg == "--")
+        {
+        considerOptions = false;
+        continue;
+        }
+      else if (arg == "--help" || arg.startsWith("--help-"))
+        {
+        // Check for option match, so that users can add options starting with
+        // "--help-"
+        const int xe = arg.indexOf('=');
+        const QString name = arg.mid(2, xe > 0 ? xe - 2 : -1);
+        qtCliOption* option = d->longOptions.value(name);
+
+        if (!option)
+          {
+          this->usage(arg.mid(7).toLower());
+          exit(0);
+          }
+        }
+      else if (arg == "-v" || arg == "--version")
+        {
+        qOut() << QString("Qt: %1\n%2: %3\n")
+                    .arg(QString::fromLatin1(qVersion()))
+                    .arg(QCoreApplication::applicationName())
+                    .arg(QCoreApplication::applicationVersion());
+        exit(0);
+        }
+
+      // Handle other options
+      if (arg.startsWith('-'))
+        {
+        // Handle long options
+        if (arg.startsWith("--"))
+          {
+          // Check for option match
+          const int xe = arg.indexOf('=');
+          const QString name = arg.mid(2, xe > 0 ? xe - 2 : -1);
+          qtCliOption* option = d->longOptions.value(name);
+          // Check for flag negation
+          if (!option)
+            {
+            if (arg.startsWith("--no-"))
+              {
+              option = d->longOptions.value(arg.mid(5));
+              if (option && option->isFlag())
+                {
+                option->setValue("0");
+                continue;
+                }
+              }
+            // Check for negation of an implicitly true option
+            else
+              {
+              option = d->longOptions.value("no-" + name);
+              if (option && option->isFlag())
+                {
+                option->setValue("0");
+                continue;
+                }
+              }
+            }
+          // Get and set option value
+          if (option)
+            {
+            if (option->isFlag())
+              {
+              option->setValue("1");
+              continue;
+              }
+            else
+              {
+              if (xe > 0)
+                {
+                // Option value provided GNU-style ('--option=value')
+                option->appendValue(arg.mid(xe + 1));
+                continue;
+                }
+              else
+                {
+                // Option value provided as separate argument following option;
+                // get next argument as option value
+                if (++n < argc)
+                  {
+                  option->appendValue(d->originalArgs[n]);
+                  continue;
+                  }
+
+                // No value was given following option that requires a value
+                d->parseError =
+                  QString("Option '%1' missing required value '%2'.")
+                    .arg(arg, option->valueName());
+                return false;
+                }
+              }
+            }
+
+          // Unknown option
+          d->parseError = QString("Unknown option '%1'.").arg(arg);
+          return false;
+          }
+        // Handle short options
+        else if (arg != "-")
+          {
+          // Check for option match; shorter short options first
+          int start = 1, length = 1;
+          while (start < arg.length())
+            {
+            const QString sarg = arg.mid(start, length);
+            qtCliOption* option = d->shortOptions.value(sarg);
+            if (option)
+              {
+              // Get and set option value
+              if (option->isFlag())
+                {
+                option->setValue("1");
+                ++start;
+                length = 1;
+                continue;
+                }
+              else
+                {
+                if (start + length < arg.length())
+                  {
+                  // Option value concatenated to short option
+                  option->appendValue(arg.mid(start + length));
+                  break;
+                  }
+                else
+                  {
+                  // Option value provided as separate argument following
+                  // option; get next argument as option value
+                  if (++n < argc)
+                    {
+                    option->appendValue(d->originalArgs[n]);
+                    break;
+                    }
+                  }
+
+                // No value was given following option that requires a value
+                d->parseError =
+                  QString("Option '-%1' missing required value '%2'.")
+                    .arg(arg.mid(start), option->valueName());
+                return false;
+                }
+              }
+            // No match yet...
+            else if (start + length < arg.length())
+              {
+              // ...but try again looking for a longer match
+              ++length;
+              continue;
+              }
+
+            // Unknown option
+            d->parseError =
+              QString("Unknown option '-%1'.").arg(arg.mid(start));
+            return false;
+            }
+
+          // Found something and ran out of argument; move on to next argument
+          continue;
+          }
+        }
+      }
+
+    // Handle non-option arguments
+    int pos = d->parsedArgs.count();
+    d->parsedArgs.append(arg);
+    if (d->multiNamedArg >= 0 && pos >= d->multiNamedArg)
+      {
+      d->namedArgs[d->multiNamedArg].appendValue(arg);
+      }
+    else if (pos < d->namedArgs.count())
+      {
+      d->namedArgs[pos].setValue(arg);
+      }
+    }
+
+  // If asked, check required options/arguments
+  if (!options.testFlag(qtCliArgs::IgnoreRequired))
+    {
+    if (!d->checkRequired())
+      {
+      return false;
+      }
+    }
+
+  // Finalize parsing
+  d->generateQtArgs();
+  d->parseResult = true;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::parseOrDie(int exitCode)
+{
+  this->parseOrDie(static_cast<ParseOptions>(0), exitCode);
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::parseOrDie(ParseOption option, int exitCode)
+{
+  this->parseOrDie(ParseOptions(option), exitCode);
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::parseOrDie(ParseOptions options, int exitCode)
+{
+  if (!this->parse(options))
+    {
+    this->parseError();
+    exit(exitCode);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::parseError() const
+{
+  QTE_D_CONST(qtCliArgs);
+  this->usageError(d->parseError);
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::shortUsage() const
+{
+  QTE_D_CONST(qtCliArgs);
+
+  // Build options groups list
+  QStringList args;
+  foreach (QString group, d->optionGroups)
+    {
+    if (!group.isEmpty())
+      {
+      args.append(QString("[%1-options]").arg(group));
+      }
+    }
+  if (d->optionGroups.contains(""))
+    {
+    args.append("[options]");
+    }
+
+  // Build list of named options
+  foreach (const qtCliOption& narg, d->namedArgs)
+    {
+    QString format;
+    if (narg.isRequired())
+      {
+      format = (narg.isNamedList() ? "%1 [%1...]" : "%1");
+      }
+    else
+      {
+      format = (narg.isNamedList() ? "[%1...]" : "[%1]");
+      }
+    args.append(format.arg(narg.preferredName()));
+    }
+
+  // Show short usage
+  int ghIndent = 8 + d->processName.length();
+  QString argsText = qtCliArgs::joinWrapped(args, ghIndent, ghIndent);
+  qOut() << "Usage: " << d->processName << ' ' << argsText << "\n";
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::usage(QString group) const
+{
+  QTE_D_CONST(qtCliArgs);
+
+  // Set up options list for built-in options
+  qtCliOptions genericOptions;
+  genericOptions.add("help", "Show help for common options");
+
+  // Build help options for generic help
+  foreach (QString group, d->optionGroups)
+    {
+    if (!group.isEmpty())
+      {
+      genericOptions.add(QString("help-%1").arg(group.toLower()),
+                         QString("Show %1 specific options").arg(group));
+      }
+    }
+
+  // Add remaining generic options
+  genericOptions.add("help-all", "Show all options");
+  genericOptions.add("v").add("version", "Show version information");
+  genericOptions.add("-", "End of options");
+
+  // Show short usage and help for generic options
+  this->shortUsage();
+  qOut() << "\nGeneric options:\n";
+  foreach (const qtCliOption& option, genericOptions.options())
+    qOut() << option.optionUsage() << '\n';
+
+  // Show help for requested group(s)
+  if (!group.isEmpty() && group != "all")
+    {
+    const QString lgroup = group.toLower();
+    if (d->options.contains(lgroup))
+      {
+      const qtCliArgsPrivate::OptionGroup& og = d->options[lgroup];
+
+      // Show header
+      qOut() << '\n' << og.name << " options:\n";
+
+      // Show options for this group
+      foreach (const qtCliOption& option, og.options)
+        qOut() << option.optionUsage() << '\n';
+      }
+    }
+  else
+    {
+    // Show help for basic/all group(s)
+    QStringList groups =
+      (group == "all" ? d->optionGroups : d->commonOptionGroups);
+    foreach (QString groupName, groups)
+      {
+      const QString lgn = groupName.toLower();
+      const qtCliArgsPrivate::OptionGroup& og = d->options[lgn];
+
+      // Show header
+      if (groupName.isEmpty())
+        {
+        qOut() << "\nOptions:\n";
+        }
+      else
+        {
+        qOut() << '\n' << og.name << " options:\n";
+        }
+
+      // Show options for this group
+      foreach (const qtCliOption& option, og.options)
+        qOut() << option.optionUsage() << '\n';
+      }
+
+    // Show help for named arguments
+    if (!d->namedArgs.isEmpty())
+      {
+      // Show header
+      qOut() << "\nArguments:\n";
+
+      // Show named arguments
+      foreach (const qtCliOption& narg, d->namedArgs)
+        qOut() << narg.namedArgUsage() << '\n';
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtCliArgs::usageError(const QString& message) const
+{
+  QTE_D_CONST(qtCliArgs);
+  const QString prefix = d->processName + ": ";
+  qErr() << prefix << message << '\n' << prefix
+         << "Use --help to get a list of available command line options.\n";
+}
+
+//-----------------------------------------------------------------------------
+bool qtCliArgs::isSet(const QString& name) const
+{
+  QTE_D_CONST(qtCliArgs);
+  qtCliOption* option = d->optionMap.value(name, 0);
+  if (option)
+    {
+    return option->isSet();
+    }
+  else if (name.length() > 4 && name.startsWith("no-"))
+    {
+    qtCliOption* option = d->optionMap.value(name.mid(3), 0);
+    return (option ? !option->isSet() : false);
+    }
+  else
+    {
+    qtCliOption* option = d->optionMap.value("no-" + name, 0);
+    return (option ? !option->isSet() : false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliArgs::value(const QString& name) const
+{
+  QTE_D_CONST(qtCliArgs);
+  qtCliOption* option = d->optionMap.value(name, 0);
+  return (option ? option->value() : QString());
+}
+
+//-----------------------------------------------------------------------------
+QStringList qtCliArgs::values(const QString& name) const
+{
+  QTE_D_CONST(qtCliArgs);
+  qtCliOption* option = d->optionMap.value(name, 0);
+  return (option ? option->values() : QStringList());
+}
+
+//-----------------------------------------------------------------------------
+int qtCliArgs::count() const
+{
+  QTE_D_CONST(qtCliArgs);
+  return d->parsedArgs.count();
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliArgs::arg(int index) const
+{
+  QTE_D_CONST(qtCliArgs);
+  return d->parsedArgs.at(index);
+}
+
+//-----------------------------------------------------------------------------
+QStringList qtCliArgs::args() const
+{
+  QTE_D_CONST(qtCliArgs);
+  return d->parsedArgs;
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliArgs::executableName() const
+{
+  QTE_D_CONST(qtCliArgs);
+  return d->processName;
+}
+
+//-----------------------------------------------------------------------------
+int& qtCliArgs::qtArgc()
+{
+  QTE_D(qtCliArgs);
+
+  // Create new mutable argc
+  int* argc = new int(d->qtArgs.count());
+
+  // Add to bookkeeping (for later deletion) and return
+  d->qtArgc.append(argc);
+  return *argc;
+}
+
+//-----------------------------------------------------------------------------
+char** qtCliArgs::qtArgv()
+{
+  QTE_D(qtCliArgs);
+
+  // Build new mutable argv vector
+  int k = d->qtArgs.count();
+  char** argv = new char*[k + 1];
+  argv[k] = 0;
+  while (k--)
+    {
+    QByteArray arg = d->qtArgs[k].toLocal8Bit();
+    int al = arg.size();
+    char* parg = new char[al + 1];
+    memcpy(parg, arg.constData(), sizeof(char) * (al + 1));
+    argv[k] = parg;
+    }
+
+  // Add to bookkeeping (for later deletion) and return
+  d->qtArgv.append(argv);
+  return argv;
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliArgs::joinWrapped(QStringList words, int indent, int prefixSize)
+{
+  // Try to get tty width (really, best guess based on hoping $COLUMNS is set)
+  int columns = qgetenv("COLUMNS").toInt();
+  if (!columns)
+    {
+    columns = 80;
+    }
+
+  // Join description words to wrapped text
+  QString result;
+  int remaining = columns - prefixSize;
+  while (words.count())
+    {
+    const int wl = words.first().length();
+    if ((wl + (result.isEmpty() ? 0 : 1)) > remaining)
+      {
+      result += '\n' + QString(indent, ' ');
+      remaining = columns - indent;
+      }
+    else if (!result.isEmpty())
+      {
+      result += ' ';
+      --remaining;
+      }
+    result += words.takeFirst();
+    remaining -= wl;
+    }
+
+  // Return wrapped text
+  return result;
+}
+
+//END qtCliArgs
diff --git a/Libraries/QtExtensions/Core/qtCliArgs.h b/Libraries/QtExtensions/Core/qtCliArgs.h
new file mode 100644
index 00000000..8dcf846c
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtCliArgs.h
@@ -0,0 +1,91 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtCliArgs_h
+#define __qtCliArgs_h
+
+#include <QString>
+
+#include "qtCliOptions.h"
+#include "qtGlobal.h"
+
+class qtCliOptions;
+
+class qtCliArgsPrivate;
+
+class QTE_EXPORT qtCliArgs
+{
+public:
+  enum ParseOption
+    {
+    IgnoreRequired = 0x1,
+    };
+  Q_DECLARE_FLAGS(ParseOptions, ParseOption)
+
+  qtCliArgs(int argc, char** argv);
+  ~qtCliArgs();
+
+  void addOptions(const qtCliOptions&, QString group = QString(),
+                  bool includeWithCommon = true);
+  void addNamedArguments(const qtCliOptions&);
+
+  bool parse(ParseOptions = static_cast<qtCliArgs::ParseOptions>(0));
+  void parseOrDie(int exitCode = 1);
+  void parseOrDie(ParseOption, int exitCode = 1);
+  void parseOrDie(ParseOptions, int exitCode = 1);
+
+  void parseError() const;
+  void shortUsage() const;
+  void usage(QString group = QString()) const;
+  void usageError(const QString& message) const;
+
+  bool isSet(const QString& name) const;
+  QString value(const QString& name) const;
+  QStringList values(const QString& name) const;
+
+  int count() const;
+  QString arg(int index) const;
+  QStringList args() const;
+
+  /// Return the file name of the executing process.
+  /// This method returns the file name of current process executable, without
+  /// path. This is the name displayed with usage information, which may be
+  /// useful to users for displaying error messages.
+  QString executableName() const;
+
+  /// Return argc suitable for passing to QCoreApplication constructor.
+  /// WARNING: The return value points to internal storage that may be different
+  /// each time this method is called. Callers must ensure that this object
+  /// remains in scope as long as any other objects refer to the returned value
+  /// (typically, by ensuring that this object remains in scope for the life of
+  /// the QCoreApplication).
+  int& qtArgc();
+
+  /// Return argv suitable for passing to QCoreApplication constructor.
+  /// WARNING: The return value points to internal storage that may be different
+  /// each time this method is called. Callers must ensure that this object
+  /// remains in scope as long as any other objects refer to the returned value
+  /// (typically, by ensuring that this object remains in scope for the life of
+  /// the QCoreApplication).
+  char** qtArgv();
+
+  /// Join a list of words, wrapped to the TTY width, indenting by \p indent
+  /// after each new line, wrapping as if the first line starts \p prefixSize
+  /// characters after the first column
+  static QString joinWrapped(QStringList words, int indent,
+                             int prefixSize = 0);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtCliArgs);
+
+private:
+  QTE_DECLARE_PRIVATE(qtCliArgs);
+  Q_DISABLE_COPY(qtCliArgs);
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(qtCliArgs::ParseOptions)
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtCliOption.cxx b/Libraries/QtExtensions/Core/qtCliOption.cxx
new file mode 100644
index 00000000..e76054e4
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtCliOption.cxx
@@ -0,0 +1,300 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtCliOption.h"
+
+#include <QRegExp>
+#include <QStringList>
+
+#include "qtCliArgs.h"
+
+QTE_IMPLEMENT_D_FUNC(qtCliOption)
+
+//-----------------------------------------------------------------------------
+class qtCliOptionPrivate
+{
+public:
+  QStringList shortNames, longNames;
+  QStringList values;
+  QString defaultValue;
+  QString argText, description;
+  bool required;
+  bool allowEmpty;
+  bool namedList;
+
+  QString usage(const QString& namesText) const;
+};
+
+//-----------------------------------------------------------------------------
+QString qtCliOptionPrivate::usage(const QString& namesText) const
+{
+  // Generate word list for option description
+  QStringList descWords;
+  descWords.append(this->description.split(QRegExp("\\s+")));
+  if (this->required)
+    {
+    if (!this->defaultValue.isEmpty())
+      {
+      descWords.append("(required;");
+      descWords.append(QString("default '%1')").arg(this->defaultValue));
+      }
+    else
+      {
+      descWords.append("(required)");
+      }
+    }
+  else if (!this->defaultValue.isEmpty())
+    {
+    descWords.append(QString("(default '%1')").arg(this->defaultValue));
+    }
+
+  // Join description words to wrapped text
+  QString descText =
+    qtCliArgs::joinWrapped(descWords, 28, qMax(28, namesText.length()));
+
+  // Combine
+  return QString("  %1 ").arg(namesText, -25) + descText;
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption::qtCliOption() : d_ptr(new qtCliOptionPrivate)
+{
+  QTE_D(qtCliOption);
+  d->required = false;
+  d->allowEmpty = false;
+  d->namedList = false;
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption::qtCliOption(const qtCliOption& other)
+  : d_ptr(new qtCliOptionPrivate(*other.d_func()))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption::~qtCliOption()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption& qtCliOption::operator=(const qtCliOption& other)
+{
+  QTE_D(qtCliOption);
+  *d = *other.d_func();
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption& qtCliOption::add(const QString& name, Flags flags)
+{
+  return this->add(name, QString(), QString(), flags);
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption& qtCliOption::add(const QString& name, const QString& description,
+                              Flags flags)
+{
+  return this->add(name, description, QString(), flags);
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption& qtCliOption::add(QString name, QString description,
+                              QString defaultValue, Flags flags)
+{
+  QTE_D(qtCliOption);
+
+  // Extract argument text, if given
+  name = name.trimmed();
+  int i = name.indexOf(' ');
+  if (i > 0)
+    {
+    d->argText = name.mid(i + 1);
+    name = name.left(i);
+    }
+
+  // Use override default value for implicitly true flags (mostly so we will
+  // give nice usage text)
+  const bool implicitTrueFlag =
+    !flags.testFlag(Short) && d->argText.isEmpty() &&
+    name.length() > 3 && name.startsWith("no-");
+  if (implicitTrueFlag)
+    {
+    defaultValue = name.mid(3);
+    }
+
+  // Add name
+  (!flags.testFlag(Short) && (name.length() > 1)
+   ? d->longNames.append(name)
+   : d->shortNames.append(name));
+
+  // Fill other values, if specified
+  if (!description.isEmpty())
+    {
+    d->description = description;
+    }
+  if (!defaultValue.isEmpty())
+    {
+    d->defaultValue = defaultValue;
+    }
+  d->required = d->required || flags.testFlag(Required);
+  d->allowEmpty = d->allowEmpty || flags.testFlag(AllowEmpty);
+  d->namedList = d->namedList || flags.testFlag(NamedList);
+
+  // Return self so aliases can be added
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliOption::preferredName() const
+{
+  QTE_D_CONST(qtCliOption);
+  return (d->longNames.count() ? d->longNames[0] : d->shortNames[0]);
+}
+
+//-----------------------------------------------------------------------------
+QStringList qtCliOption::shortNames() const
+{
+  QTE_D_CONST(qtCliOption);
+  return d->shortNames;
+}
+
+//-----------------------------------------------------------------------------
+QStringList qtCliOption::longNames() const
+{
+  QTE_D_CONST(qtCliOption);
+  return d->longNames;
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliOption::optionUsage() const
+{
+  QTE_D_CONST(qtCliOption);
+
+  // Generate text for option names
+  QStringList names;
+  foreach (QString sn, d->shortNames)
+    names.append("-" + sn);
+  foreach (QString ln, d->longNames)
+    names.append("--" + ln);
+  QString namesText =
+    QString("%1 %2").arg(names.join(", "), d->argText).trimmed();
+
+  // Add description and return result
+  return d->usage(namesText);
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliOption::namedArgUsage() const
+{
+  QTE_D_CONST(qtCliOption);
+  return d->usage(this->preferredName());
+}
+
+//-----------------------------------------------------------------------------
+bool qtCliOption::isFlag() const
+{
+  QTE_D_CONST(qtCliOption);
+  return d->argText.isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+bool qtCliOption::isRequired() const
+{
+  QTE_D_CONST(qtCliOption);
+  return d->required;
+}
+
+//-----------------------------------------------------------------------------
+bool qtCliOption::isNamedList() const
+{
+  QTE_D_CONST(qtCliOption);
+  return d->namedList;
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliOption::valueName() const
+{
+  QTE_D_CONST(qtCliOption);
+  return d->argText;
+}
+
+//-----------------------------------------------------------------------------
+bool qtCliOption::isSet() const
+{
+  QTE_D_CONST(qtCliOption);
+
+  if (this->isFlag())
+    {
+    // Implicitly true options are handled specially; if no value is set, don't
+    // treat a default of <the flag name without 'no-'> as set
+    const QString n = this->preferredName();
+    if (n.startsWith("no-"))
+      {
+      if (d->values.isEmpty() && d->defaultValue == n.mid(3))
+        {
+        return false;
+        }
+      }
+    // Otherwise, for flags, we only care about the value()... if it is empty,
+    // the flag is not set...
+    const QString v = this->value();
+    if (v.isEmpty())
+      {
+      return false;
+      }
+    // ...or if value() is any of a set of values that mean 'not set', then the
+    // flag is not set; for any other non-empty value(), it is considered set
+    const QString vl = v.toLower();
+    return !(vl == "0" || vl == "no" || vl == "false" || vl == "off");
+    }
+  else
+    {
+    // For non-flags, if it is required and AllowEmpty was not specified, it
+    // is set if the value (which may be a default value) is non-empty...
+    if (d->required && !d->allowEmpty)
+      {
+      return !this->value().isEmpty();
+      }
+    // ...otherwise it is set if any value (even an explicitly empty value) was
+    // given, or if the default value is non-empty
+    return !(d->values.isEmpty() && d->defaultValue.isEmpty());
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString qtCliOption::value() const
+{
+  QTE_D_CONST(qtCliOption);
+  return d->values.isEmpty() ? d->defaultValue : d->values.last();
+}
+
+//-----------------------------------------------------------------------------
+void qtCliOption::setValue(const QString& value)
+{
+  QTE_D(qtCliOption);
+  d->values.clear();
+  d->values.append(value);
+}
+
+//-----------------------------------------------------------------------------
+QStringList qtCliOption::values() const
+{
+  QTE_D_CONST(qtCliOption);
+  if (d->values.isEmpty() && !d->defaultValue.isEmpty())
+    {
+    QStringList result;
+    result.append(d->defaultValue);
+    return result;
+    }
+  return d->values;
+}
+
+//-----------------------------------------------------------------------------
+void qtCliOption::appendValue(const QString& value)
+{
+  QTE_D(qtCliOption);
+  d->values.append(value);
+}
diff --git a/Libraries/QtExtensions/Core/qtCliOption.h b/Libraries/QtExtensions/Core/qtCliOption.h
new file mode 100644
index 00000000..5cfb16f9
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtCliOption.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtCliOption_h
+#define __qtCliOption_h
+
+#include <QScopedPointer>
+#include <QString>
+
+#include "qtGlobal.h"
+
+class qtCliOptionPrivate;
+
+class QTE_EXPORT qtCliOption
+{
+public:
+  enum Flag
+    {
+    Required = 0x1,
+    AllowEmpty = 0x2,
+    NamedList = 0x8,
+    Short = 0x10
+    };
+  Q_DECLARE_FLAGS(Flags, Flag)
+
+  qtCliOption();
+  qtCliOption(const qtCliOption&);
+  ~qtCliOption();
+
+  qtCliOption& operator=(const qtCliOption&);
+
+  qtCliOption& add(const QString& name, Flags);
+  qtCliOption& add(const QString& name, const QString& description, Flags);
+  qtCliOption& add(QString name, QString description = QString(),
+                   QString defaultValue = QString(),
+                   Flags = static_cast<qtCliOption::Flags>(0));
+
+  QString preferredName() const;
+  QStringList shortNames() const;
+  QStringList longNames() const;
+
+  QString optionUsage() const;
+  QString namedArgUsage() const;
+
+  bool isFlag() const;
+  bool isRequired() const;
+  bool isNamedList() const;
+  QString valueName() const;
+
+  bool isSet() const;
+  QString value() const;
+  void setValue(const QString&);
+  QStringList values() const;
+  void appendValue(const QString&);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtCliOption);
+
+private:
+  QTE_DECLARE_PRIVATE(qtCliOption);
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(qtCliOption::Flags)
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtCliOptions.cxx b/Libraries/QtExtensions/Core/qtCliOptions.cxx
new file mode 100644
index 00000000..35085e44
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtCliOptions.cxx
@@ -0,0 +1,77 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtCliOptions.h"
+
+QTE_IMPLEMENT_D_FUNC(qtCliOptions)
+
+//-----------------------------------------------------------------------------
+class qtCliOptionsPrivate
+{
+public:
+  QList<qtCliOption> options;
+};
+
+//-----------------------------------------------------------------------------
+qtCliOptions::qtCliOptions() : d_ptr(new qtCliOptionsPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtCliOptions::qtCliOptions(const qtCliOptions& other)
+  : d_ptr(new qtCliOptionsPrivate(*other.d_func()))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtCliOptions::~qtCliOptions()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtCliOptions& qtCliOptions::operator=(const qtCliOptions& other)
+{
+  QTE_D(qtCliOptions);
+  *d = *other.d_func();
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption& qtCliOptions::add(const QString& name, qtCliOption::Flags flags)
+{
+  return this->add(name, QString(), QString(), flags);
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption& qtCliOptions::add(const QString& name, const QString& description,
+                               qtCliOption::Flags flags)
+{
+  return this->add(name, description, QString(), flags);
+}
+
+//-----------------------------------------------------------------------------
+qtCliOption& qtCliOptions::add(const QString& name, QString description,
+                               QString defaultValue, qtCliOption::Flags flags)
+{
+  QTE_D(qtCliOptions);
+  d->options.append(qtCliOption());
+  qtCliOption& option = d->options.last();
+  return option.add(name, description, defaultValue, flags);
+}
+
+//-----------------------------------------------------------------------------
+bool qtCliOptions::isEmpty() const
+{
+  QTE_D_CONST(qtCliOptions);
+  return d->options.isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+QList<qtCliOption> qtCliOptions::options() const
+{
+  QTE_D_CONST(qtCliOptions);
+  return d->options;
+}
diff --git a/Libraries/QtExtensions/Core/qtCliOptions.h b/Libraries/QtExtensions/Core/qtCliOptions.h
new file mode 100644
index 00000000..ec3034c1
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtCliOptions.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtCliOptions_h
+#define __qtCliOptions_h
+
+#include <QList>
+
+#include "qtCliOption.h"
+#include "qtGlobal.h"
+
+class qtCliOptionsPrivate;
+
+class QTE_EXPORT qtCliOptions
+{
+public:
+  qtCliOptions();
+  qtCliOptions(const qtCliOptions&);
+  ~qtCliOptions();
+
+  qtCliOptions& operator=(const qtCliOptions&);
+
+  qtCliOption& add(const QString& name, qtCliOption::Flags);
+  qtCliOption& add(const QString& name, const QString& description,
+                   qtCliOption::Flags);
+  qtCliOption& add(const QString& name, QString description = QString(),
+                   QString defaultValue = QString(), qtCliOption::Flags = 0);
+
+  bool isEmpty() const;
+  QList<qtCliOption> options() const;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtCliOptions);
+
+private:
+  QTE_DECLARE_PRIVATE(qtCliOptions);
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtDebug.cxx b/Libraries/QtExtensions/Core/qtDebug.cxx
new file mode 100644
index 00000000..0dd77813
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtDebug.cxx
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtDebugImpl.h"
+
+#include <QSettings>
+
+#undef qtDebug
+
+const qtDebugAreaAccessor qtDebug::InvalidArea = 0;
+
+//-----------------------------------------------------------------------------
+class qtDebugAreaPrivate
+{
+public:
+  qtDebugAreaPrivate(const char* name, bool defaultActive);
+
+  QString Name;
+  bool Active;
+};
+
+//-----------------------------------------------------------------------------
+qtDebugAreaPrivate::qtDebugAreaPrivate(const char* name, bool defaultActive) :
+  Name(name)
+{
+  // Get user active value
+  QSettings settings;
+  settings.beginGroup("Debug");
+  this->Active = settings.value(this->Name, defaultActive).toBool();
+}
+
+//-----------------------------------------------------------------------------
+qtDebugArea::qtDebugArea(const char* name, bool defaultActive) :
+  d_ptr(new qtDebugAreaPrivate(name, defaultActive))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtDebugArea::~qtDebugArea()
+{
+  delete this->d_ptr;
+}
+
+//-----------------------------------------------------------------------------
+qtDebug::qtDebug(qtDebugAreaAccessor areaAccessor)
+{
+  if (areaAccessor)
+    {
+    const qtDebugAreaPrivate* area = (*areaAccessor)()->d_ptr;
+    if (area->Active)
+      {
+      this->d = QSharedPointer<QDebug>(new QDebug(QtDebugMsg));
+      QString header = "qtDebug(%1):";
+      (*this->d) << qPrintable(header.arg(area->Name));
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool qtDebug::isAreaActive(qtDebugAreaAccessor areaAccessor)
+{
+  if (areaAccessor)
+    {
+    const qtDebugAreaPrivate* area = (*areaAccessor)()->d_ptr;
+    return area->Active;
+    }
+  return false;
+}
diff --git a/Libraries/QtExtensions/Core/qtDebug.h b/Libraries/QtExtensions/Core/qtDebug.h
new file mode 100644
index 00000000..8957e529
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtDebug.h
@@ -0,0 +1,200 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDebug_h
+#define __qtDebug_h
+
+/// \file
+
+#include <QDebug>
+#include <QSharedPointer>
+#include <QString>
+
+#include "qtDebugArea.h"
+#include "qtGlobal.h"
+
+#ifndef __QTE_FUNCTION__
+#  if defined DOXYGEN
+/// Complete name of the current execution context.
+///
+/// This macro is a convenience symbol which evaluates to a string literal
+/// giving the name of the current execution context (function). Where
+/// supported by the compiler, it expands to the full function signature with
+/// return and argument types. Otherwise it expands to the undecorated function
+/// name.
+#    define __QTE_FUNCTION__
+#  elif defined Q_CC_MSVC
+#    define __QTE_FUNCTION__ __FUNCDNAME__
+#  elif defined Q_CC_GNU
+#    define __QTE_FUNCTION__ __PRETTY_FUNCTION__
+#  else
+#    define __QTE_FUNCTION__ __FUNCTION__
+#  endif
+#endif
+
+#ifndef QTE_EXPORT_DEBUG_AREA
+/// Declare an exported qtDebug area.
+///
+/// This macro is used to declare or define a qtDebug area that is exported by
+/// a library. It is the same as #QTE_DEBUG_AREA, except that the ABI
+/// decoration symbol for your library may be given as the first parameter
+/// (\p abi).
+#  define QTE_EXPORT_DEBUG_AREA(abi, prefix, area, default_state) \
+    extern abi const qtDebugAreaAccessor& prefix##area
+#endif
+
+/// Declare a qtDebug area.
+///
+/// This macro is used to declare or define a qtDebug area. The area name is
+/// the concatenation of \p prefix and \p area. Only \p area will appear in
+/// debug output. The default state (enabled or disabled) may be specified by
+/// \p default_state. Both \p prefix and \p area must be valid C++ identifiers.
+/// \p default_state must be an expression returning a \c bool which can be
+/// evaluated in the scope where the debug areas are defined, and is safely
+/// executable from an arbitrary thread (using \c true or \c false is
+/// recommended).
+///
+/// \par Example
+/// \code{.cpp}
+/// QTE_DEBUG_AREA(qtd, KstReader,     true)
+/// QTE_DEBUG_AREA(qtd, StatusManager, false)
+/// \endcode
+#define QTE_DEBUG_AREA(prefix, area, default_state) \
+  QTE_EXPORT_DEBUG_AREA(,prefix, area, default_state)
+
+//-----------------------------------------------------------------------------
+/// Area-based debug object.
+///
+/// The qtDebug class provides area-based debug logging by allowing the user
+/// to instantiate an instance from a registered debug area. Areas can be
+/// turned on or off by the user via QSettings. The returned qtDebug instance
+/// will either display a debug message if the area is enabled, or silently
+/// consume input if the area is disabled. Output is prefixed with the name of
+/// the area.
+///
+/// Debug areas are declared in a header file using the #QTE_DEBUG_AREA macro,
+/// and have the user-opaque type ::qtDebugAreaAccessor. Areas must have a
+/// unique instantiation in a source file, which is usually done by including
+/// \c <qtDebugImpl.h> before the header that declares the debug areas. This
+/// special header contains a definition of #QTE_DEBUG_AREA that creates
+/// definitions of the debug areas rather than declarations. Areas are
+/// initialized (and their enabled state set) at first use in a thread-safe
+/// manner. After initialization, an area's enabled state cannot be changed.
+///
+/// Writing output to qtDebug works in the same manner as QDebug; that is,
+/// spaces and a newline are added automatically. qtDebug uses QDebug
+/// internally, and so it able to output any object type that QDebug can
+/// output. Adding support for new object types should be done by overloading
+/// \c operator<<(QDebug&, \c T).
+///
+/// qtDebug employs a clever redirection trick such that code following a
+/// qtDebug instantiation will not execute if the debug area is disabled. This
+/// also applies if QT_NO_DEBUG_OUTPUT (which disables all debugging output) is
+/// defined. As a consequence, you should take care that the evaluation of
+/// expressions serialized to qtDebug do not have side effects.
+///
+/// \sa QDebug, QTE_DEBUG_AREA
+class QTE_EXPORT qtDebug
+{
+public:
+  /// Create instance from specified area.
+  ///
+  /// This constructor creates a qtDebug instance from the specified debug
+  /// area. If the area is enabled, the qtDebug instance will write output
+  /// via QDebug, prefixed with the area name. Otherwise, the instance will
+  /// produce no output. The line will be terminated when all copies of an
+  /// instance are destroyed or reassigned.
+  qtDebug(qtDebugAreaAccessor);
+
+  /// Copy constructor.
+  ///
+  /// Create a copy of a qtDebug instance. The instance will write to the same
+  /// output line as the original instance. The line will be terminated when
+  /// all copies of an instance are destroyed or reassigned.
+  qtDebug(const qtDebug& other) : d(other.d) {}
+
+  ~qtDebug() {}
+
+  /// Assignment operator.
+  ///
+  /// Assign another qtDebug instance to this instance. This instance will
+  /// begin writing to the same output line as the other instance. The line
+  /// will be terminated when all copies of an instance are destroyed or
+  /// reassigned.
+  qtDebug& operator=(const qtDebug& other)
+    { this->d = other.d; return *this; }
+
+#if !defined(QT_NO_DEBUG_OUTPUT) || defined(DOXYGEN)
+  /// Write object to the debug stream.
+  ///
+  /// This operator writes a string representation of the specified object to
+  /// the debug stream, if the instance's area is enabled; otherwise it does
+  /// nothing. The object is converted to a string using
+  /// \c operator<<(QDebug&, \c T).
+  template <typename T> inline qtDebug& operator<<(const T& t)
+    { if (this->d) { (*this->d) << t; } return *this; }
+#else
+  template <typename T> inline qtDebug& operator<<(const T&)
+    { return *this; }
+#endif
+
+  /// Test if object is valid.
+  ///
+  /// This method tests if a qtDebug instance is valid (i.e. will produce
+  /// output). Generally, an instance is valid if it was constructed from an
+  /// active debug area, or from another valid instance.
+  bool isValid() const { return this->d; }
+
+  /// Test if area is active.
+  ///
+  /// This method tests if the specified area is active. This may be useful to
+  /// if debugging requires performing steps that are complex and/or time
+  /// consuming that cannot be done inline, to avoid such overhead if the
+  /// debugging area is disabled.
+  static bool isAreaActive(qtDebugAreaAccessor);
+
+  /// Static instance of an invalid area.
+  ///
+  /// This variable declares a debug area which is invalid (always disabled).
+  static const qtDebugAreaAccessor InvalidArea;
+
+protected:
+  QSharedPointer<QDebug> d;
+};
+
+#ifdef QT_NO_DEBUG_OUTPUT
+
+#  define qtDebug_DEBUG_MACRO while(false) qtDebug
+
+#else
+
+#  define qtDebug_DEBUG_MACRO(area) \
+  for (qtDebugHelper _dbg(area); _dbg; _dbg.finish()) _dbg.debug()
+
+#  ifndef DOXYGEN
+
+//-----------------------------------------------------------------------------
+class qtDebugHelper
+{
+public:
+  inline explicit qtDebugHelper(qtDebugAreaAccessor area) :
+    Debug(area), Active(this->Debug.isValid()) {}
+  inline operator bool() const { return this->Active; }
+  inline void finish() { this->Active = false; }
+  inline qtDebug& debug() { return this->Debug; }
+
+protected:
+  qtDebug Debug;
+  bool Active;
+};
+
+#  endif
+
+#endif
+
+#define qtDebug(area) qtDebug_DEBUG_MACRO(area)
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtDebugArea.h b/Libraries/QtExtensions/Core/qtDebugArea.h
new file mode 100644
index 00000000..a388a97a
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtDebugArea.h
@@ -0,0 +1,24 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDebugArea_h
+#define __qtDebugArea_h
+
+/// \file
+
+class qtDebugArea;
+
+/// Accessor type for a debug area.
+///
+/// This type defines an accessor for a debug area, representing both the type
+/// of the externally declared debug area variables, and the type taken by
+/// ::qtDebug's constructor. It is assignable and copyable (both operations are
+/// inexpensive and reentrant), but should be considered opaque. New instances
+/// should be initialized to an existing instance, a registered debug area, or
+/// qtDebug::InvalidArea.
+typedef qtDebugArea* (*qtDebugAreaAccessor)();
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtDebugHelper.h b/Libraries/QtExtensions/Core/qtDebugHelper.h
new file mode 100644
index 00000000..83d31766
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtDebugHelper.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDebugHelper_h
+#define __qtDebugHelper_h
+
+#include <QDebug>
+
+#define QDEBUG_ENUM_HANDLER_BEGIN(type) \
+  QDebug& operator<<(QDebug& dbg, type _value) \
+    { \
+    if (0);
+
+#define QDEBUG_HANDLE_ENUM(value) \
+    else if (_value == value) dbg << #value;
+
+#define QDEBUG_ENUM_HANDLER_END(type) \
+    else \
+      { \
+      QString s(#type "::(unknown enum value %1)"); \
+      dbg << qPrintable(s.arg(_value)); \
+      } \
+    return dbg; \
+    }
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtDebugImpl.h b/Libraries/QtExtensions/Core/qtDebugImpl.h
new file mode 100644
index 00000000..3bcf5e69
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtDebugImpl.h
@@ -0,0 +1,34 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDebugImpl_h
+#define __qtDebugImpl_h
+
+#include "qtDebug.h"
+#include "qtGlobal.h"
+
+// Override definition from qtDebug.h; see documentation in that file
+#undef QTE_EXPORT_DEBUG_AREA
+#define QTE_EXPORT_DEBUG_AREA(abi, prefix, area, default_state) \
+  QTE_PRIVATE_SINGLETON_WITH_ARGS(qtDebugArea, _##prefix##area, \
+                                  (#area, default_state)) \
+  abi const qtDebugAreaAccessor& prefix##area = &_##prefix##area
+
+//-----------------------------------------------------------------------------
+class qtDebugAreaPrivate;
+
+class QTE_EXPORT qtDebugArea
+{
+public:
+  qtDebugArea(const char* name, bool defaultActive);
+  ~qtDebugArea();
+
+protected:
+  friend class qtDebug;
+  QTE_DECLARE_PRIVATE_PTR(const qtDebugArea);
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtGlobal.h b/Libraries/QtExtensions/Core/qtGlobal.h
new file mode 100644
index 00000000..58b5f13f
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtGlobal.h
@@ -0,0 +1,538 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtGlobal_h
+#define __qtGlobal_h
+
+/// \file
+
+#include <vgExport.h> // for QTE_EXPORT
+
+#if __cplusplus >= 201103L || defined(DOXYGEN)
+
+/// Annotation for overrides of virtual methods.
+/// \showinitializer
+///
+/// This symbol can be used to annotate overrides of virtual methods. As well
+/// as serving as a hint to developers, it will also request compiler
+/// verification that a method is being overridden, where supported (e.g. C++11
+/// compilers).
+#  define QTE_OVERRIDE override
+#  define QTE_CONSTEXPR constexpr
+
+/// Declare a class non-copyable.
+///
+/// This macro is used to make a class non-copyable. Where supported by the
+/// compiler (C++11), it delete the default copy constructor and assignment
+/// operator. Otherwise, it is a synonym for Q_DISABLE_COPY, which provides
+/// explicit declarations with the expectation that they are never implemented.
+///
+/// This macro should be used in a private access section.
+///
+/// \param class_name Name of the class in which the macro is used.
+///
+/// \par Example:
+/// \code{.cpp}
+/// class Foo
+/// {
+/// public:
+///   ...
+/// private:
+///   QTE_DISABLE_COPY(Foo)
+/// };
+/// \endcode
+///
+/// \note Although the compiler will not generate a default copy constructor
+///       and assignment if the base class does not provide public versions of
+///       the same, it is recommended that you use this macro for \em all
+///       non-copyable classes, even if they are implicitly non-copyable due to
+///       a non-copyable base class. Doing so produces better error messages
+///       when trying to copy or assign such a class, and makes it more obvious
+///       to users that your class is not intended to be copyable.
+#  define QTE_DISABLE_COPY(class_name) \
+  class_name(const class_name&) = delete; \
+  class_name& operator=(const class_name&) = delete; \
+
+/// Declare a private singleton.
+///
+/// This macro declares a private singleton instance. The singleton is created
+/// on first use in a thread-safe manner; that is, it is guaranteed that the
+/// accessor function will return the same instance when called from multiple
+/// threads simultaneously. The singleton will be destroyed in an unspecified
+/// order when your application or library unloads.
+///
+/// The singleton accessor function is private to the execution unit in which
+/// the singleton is declared.
+///
+/// \param type
+///   The typename of the singleton. The return type of the accessor will be
+///   \c type*. Note that \p type must not contain commas; use a typedef if you
+///   need to declare a singleton of a template type taking more than one
+///   template argument.
+/// \param name Name of the accessor function.
+///
+/// \note If multiple threads try to simultaneously access the not-yet-created
+///       singleton, the constructor for \p type may be called more than once.
+///       If this occurs, one instance will be chosen as the One True
+///       Singleton, and the others will be immediately destroyed. You should
+///       ensure that your singleton class is well behaved if this occurs.
+///
+/// \par Example:
+/// \code{.cpp}
+/// class MySingleton
+/// {
+/// public:
+///   void greet() { qDebug() << "Hello, world!"; }
+/// };
+/// QTE_PRIVATE_SINGLETON(MySingleton, myself)
+///
+/// int main()
+/// {
+///   myself()->greet();
+///   return 0;
+/// }
+/// \endcode
+#  define QTE_PRIVATE_SINGLETON(type, name) \
+  namespace \
+    { \
+    type* name() \
+      { \
+      static type theInstance; \
+      return &theInstance; \
+      } \
+    }
+
+/// Declare a private singleton, with arguments.
+///
+/// This macro is the same as #QTE_PRIVATE_SINGLETON, except that an argument
+/// list may also be given. The argument list must be enclosed in parentheses.
+///
+/// \par Example:
+/// \code{.cpp}
+/// QTE_PRIVATE_SINGLETON_WITH_ARGS(complex<double>, imaginary, (0.0, 1.0))
+/// \endcode
+#  define QTE_PRIVATE_SINGLETON_WITH_ARGS(type, name, args) \
+  namespace \
+    { \
+    type* name() \
+      { \
+      static type theInstance args; \
+      return &theInstance; \
+      } \
+    }
+
+#else
+
+#  include <QtGlobal>
+
+#  define QTE_OVERRIDE
+#  define QTE_CONSTEXPR const
+#  define QTE_DISABLE_COPY(class_name) Q_DISABLE_COPY(class_name)
+
+#  define QTE_PRIVATE_SINGLETON(type, name) \
+  namespace { Q_GLOBAL_STATIC(type, name) }
+#  define QTE_PRIVATE_SINGLETON_WITH_ARGS(type, name, args) \
+  namespace { Q_GLOBAL_STATIC_WITH_ARGS(type, name, args) }
+
+#endif
+
+/// Implement constant d-function with aliased name of private class.
+///
+/// This is equivalent to #QTE_IMPLEMENT_D_FUNC_CONST, but allows the type name
+/// of the private class to be specified with \p private_name, which is
+/// necessary if the private class is not named <i>Base</i>Private.
+#define QTE_IMPLEMENT_ALIASED_D_FUNC_CONST(public_name, private_name) \
+  inline const private_name* public_name::d_func() const \
+    { return static_cast<const private_name*>(qGetPtrHelper(this->d_ptr)); }
+
+/// Implement d-function with aliased name of private class.
+///
+/// This is equivalent to #QTE_IMPLEMENT_D_FUNC, but allows the type name of
+/// the private class to be specified with \p private_name, which is necessary
+/// if the private class is not named <i>Base</i>Private.
+#define QTE_IMPLEMENT_ALIASED_D_FUNC(public_name, private_name) \
+  inline private_name* public_name::d_func() \
+    { return static_cast<private_name*>(qGetPtrHelper(this->d_ptr)); } \
+  QTE_IMPLEMENT_ALIASED_D_FUNC_CONST(public_name, private_name)
+
+/// Implement constant d-function.
+///
+/// \copydetails #QTE_IMPLEMENT_D_FUNC
+/// Unlike QTE_IMPLEMENT_D_FUNC, only the \c const flavor of
+/// <code>d_func()</code> is defined. This is useful if your class does not
+/// provide a mutable implementation.
+#define QTE_IMPLEMENT_D_FUNC_CONST(class_name) \
+  QTE_IMPLEMENT_ALIASED_D_FUNC_CONST(class_name, class_name##Private)
+
+/// Implement d-function.
+///
+/// This implements the d-function (<code>d_func()</code>) of a class using
+/// \ref QTE_D.
+#define QTE_IMPLEMENT_D_FUNC(class_name) \
+  QTE_IMPLEMENT_ALIASED_D_FUNC(class_name, class_name##Private)
+
+/// Implement d-function for implicitly shared class.
+///
+/// This implements the d-function (<code>d_func()</code>) for
+/// \ref qte_d_implicitly_shared using QtExtensions' support for the same.
+#define QTE_IMPLEMENT_D_FUNC_SHARED(class_name) \
+  inline class_name##Data* class_name::d_func(bool detach) \
+    { \
+    if (detach) this->d_ptr.detach(); \
+    return static_cast<class_name##Data*>(this->d_ptr.data()); \
+    } \
+  inline const class_name##Data* class_name::d_func() const \
+    { return static_cast<const class_name##Data*>(this->d_ptr.constData()); }
+
+/// Declare accessor functions for private class.
+///
+/// This declares normal (\c const and non-\c const) accessor functions for the
+/// private class of \p class_name. The private class is also declared as a
+/// friend.
+#define QTE_DECLARE_PRIVATE(class_name) \
+  inline class_name##Private* d_func(); \
+  inline const class_name##Private* d_func() const; \
+  friend class class_name##Private;
+
+/// Declare \c const accessor function for private class.
+///
+/// This declares a \c const accessor function for the private class of
+/// \p class_name. The private class is also declared as a friend. No
+/// non-\c const accessor is declared.
+///
+/// Use this when mutable access to the class's is not permitted.
+#define QTE_DECLARE_PRIVATE_CONST(class_name) \
+  inline const class_name##Private* d_func() const; \
+  friend class class_name##Private;
+
+/// Declare accessor functions for implicitly shared class.
+///
+/// This declares the data class accessor functions for an implicitly shared
+/// class \p class_name. The data class is also declared as a friend.
+#define QTE_DECLARE_SHARED(class_name) \
+  inline class_name##Data* d_func(bool); \
+  inline const class_name##Data* d_func() const; \
+  friend class class_name##Data;
+
+/// Define accessor functions for public class.
+///
+/// This declares and defines accessor functions for the public class
+/// \p class_name of a corresponding private class. The public class is also
+/// declared as a friend.
+#define QTE_DECLARE_PUBLIC(class_name) \
+  inline class_name* q_func() \
+    { return static_cast<class_name*>(q_ptr); } \
+  inline const class_name* q_func() const \
+    { return static_cast<class_name*>(q_ptr); } \
+  friend class class_name;
+
+/// Declare simple pointer to private class.
+///
+/// This declares a simple pointer (<code>Private* const</code>) to the private
+/// class of \p class_name. The private class must be freed when the public
+/// class is destroyed to avoid a memory leak.
+///
+/// In most cases, you should use #QTE_DECLARE_PRIVATE_RPTR instead, to reduce
+/// the risk of errors due to the need to perform manual memory management.
+#define QTE_DECLARE_PRIVATE_PTR(class_name) \
+  class_name##Private* const d_ptr;
+
+/// Declare mutable simple pointer to private class.
+///
+/// This declares a simple pointer (<code>Private*</code>) to the private class
+/// of \p class_name. The private class must be freed when the public class
+/// is destroyed to avoid a memory leak.
+///
+/// Unlike #QTE_DECLARE_PRIVATE_PTR, the pointer can be modified after class
+/// construction.
+///
+/// In most cases, you should use #QTE_DECLARE_PRIVATE_MRPTR instead, to reduce
+/// the risk of errors due to the need to perform manual memory management.
+#define QTE_DECLARE_PRIVATE_MPTR(class_name) \
+  class_name##Private* d_ptr;
+
+/// Declare shared pointer to private class.
+///
+/// This declares a shared pointer
+/// (<code>QSharedPointer\<Private\> const</code>) to the private class of
+/// \p class_name. The header for QSharedPointer must be included.
+/// QSharedPointer will automatically free the private class when the public
+/// class is destroyed.
+///
+/// This should only be used in special situations; for example, when creating
+/// \ref qte_d_shared_explicit.
+#define QTE_DECLARE_PRIVATE_SPTR(class_name) \
+  QSharedPointer<class_name##Private> d_ptr;
+
+/// Declare scoped pointer to private class.
+///
+/// This declares a scoped pointer
+/// (<code>QScopedPointer\<Private\> const</code>) to the private class of
+/// \p class_name. The header for QScopedPointer must be included, and
+/// QScopedPointer will automatically free the private class when the public
+/// class is destroyed.
+///
+/// The use of QScopedPointer does not change the semantics of the d-pointer
+/// beyond the convenience of ensuring clean-up for you. Therefore, this is
+/// preferred over #QTE_DECLARE_PRIVATE_PTR in most cases.
+#define QTE_DECLARE_PRIVATE_RPTR(class_name) \
+  QScopedPointer<class_name##Private> const d_ptr;
+
+/// Declare mutable scoped pointer to private class.
+///
+/// This declares a scoped pointer
+/// (<code>QScopedPointer\<Private\> const</code>) to the private class of
+/// \p class_name. The header for QScopedPointer must be included, and
+/// QScopedPointer will automatically free the private class when the public
+/// class is destroyed.
+///
+/// The use of QScopedPointer does not change the semantics of the d-pointer
+/// beyond the convenience of ensuring clean-up for you. Therefore, this is
+/// preferred over #QTE_DECLARE_PRIVATE_MPTR in most cases.
+///
+/// Unlike #QTE_DECLARE_PRIVATE_RPTR, the pointer can be modified after class
+/// construction.
+#define QTE_DECLARE_PRIVATE_MRPTR(class_name) \
+  QScopedPointer<class_name##Private> d_ptr;
+
+/// Declare implicitly-managed pointer to data class of implicitly shared class.
+///
+/// This declares an implicitly managed shared data pointer to the data class
+/// of a class that implements \ref implicit-sharing. The pointer is a
+/// QSharedDataPointer.
+///
+/// The data class is automatically copied when requesting a mutable instance
+/// (e.g. via #QTE_D_MUTABLE), and freed when its last reference is released.
+#define QTE_DECLARE_SHARED_PTR(class_name) \
+  QSharedDataPointer<class_name##Data> d_ptr;
+
+/// Declare explicitly-managed pointer to data class of implicitly shared class.
+///
+/// This declares an explicitly managed shared data pointer to the data class
+/// of a class that implements \ref implicit-sharing. The pointer is a
+/// QExplicitlySharedDataPointer.
+///
+/// The data class is freed when its last reference is released.
+///
+/// Unlike #QTE_DECLARE_SHARED_PTR, copying of the data class is managed
+/// explicitly. Retrieving the data class pointer with #QTE_D_MUTABLE will
+/// \em not make a copy of the data class, even if the data is shared between
+/// multiple objects. Use #QTE_D_DETACH to obtain a non-shared instance of the
+/// data class (which will make a copy if necessary).
+#define QTE_DECLARE_SHARED_EPTR(class_name) \
+  QExplicitlySharedDataPointer<class_name##Data> d_ptr;
+
+/// Declare pointer to public class.
+///
+/// This declares a simple pointer (<code>Public* const</code>) to the public
+/// class \p class_name of a private class.
+#define QTE_DECLARE_PUBLIC_PTR(class_name) \
+  class_name* const q_ptr;
+
+/// Get pointer to mutable private class.
+///
+/// This declares a local variable \c d, which is a pointer to the private
+/// class of \p class_name. The pointer allows the private class to be
+/// modified, but is itself immutable (that is, cannot be reassigned).
+///
+/// This cannot normally be used in \c const members. While it is possible to
+/// work around this limitation by prefixing \p class_name with \c const, using
+/// #QTE_D_CONST instead is preferred.
+#define QTE_D(class_name)         class_name##Private* const d = d_func()
+
+/// Get pointer to immutable private class.
+///
+/// This declares a local variable \c d, which is a pointer to the private
+/// class of \p class_name. Both the pointer and its referent are immutable.
+/// This should be used instead of #QTE_D in \c const members and/or when you
+/// wish to avoid unintentional modification of the private class.
+#define QTE_D_CONST(class_name)   const class_name##Private* const d = d_func()
+
+/// Get pointer to shared (immutable) data class.
+///
+/// This declares a local variable \c d, which is a pointer to the data
+/// class of an implicitly shared class \p class_name. Neither the pointer nor
+/// the data class may be modified. The referenced data class may be shared
+/// with other instances.
+#define QTE_D_SHARED(class_name)  const class_name##Data* const d = d_func()
+
+/// Get pointer to mutable data class.
+///
+/// This declares a local variable \c d, which is a pointer to the data
+/// class of an implicitly shared class \p class_name. The pointer allows the
+/// data class to be modified, but is itself immutable (that is, cannot be
+/// reassigned).
+///
+/// Before returning, the data pointer is explicitly detached; that is, if it
+/// was shared with any other instances, a copy is made to ensure that the
+/// returned pointer is not shared. This is intended to be used by classes that
+/// use explicitly managed data pointers (i.e. declared with
+/// #QTE_DECLARE_SHARED_EPTR). For implicitly managed data pointers, it is
+/// functionally equivalent to #QTE_D_SHARED, but may be marginally less
+/// efficient.
+#define QTE_D_DETACH(class_name)  class_name##Data* const d = d_func(true)
+
+/// Get pointer to mutable data class.
+///
+/// This declares a local variable \c d, which is a pointer to the data
+/// class of an implicitly shared class \p class_name. The pointer allows the
+/// data class to be modified, but is itself immutable (that is, cannot be
+/// reassigned).
+///
+/// If the data class pointer is implicitly managed (i.e. was declared with
+/// #QTE_DECLARE_SHARED_PTR), the referenced data class is detached; that is,
+/// it is guaranteed that no other instances refer to the same data class (a
+/// copy of the data class is made if necessary to ensure this). If the pointer
+/// is explicitly managed, it is possible that the data class is shared with
+/// other instances. Use #QTE_D_DETACH when dealing with an explicitly managed
+/// data pointer when a non-shared data instance is required.
+#define QTE_D_MUTABLE(class_name) class_name##Data* const d = d_func(false)
+
+/// Get pointer to mutable public class.
+///
+/// This declares a local variable \c q, which is a pointer to the public class
+/// \p class_name of a private class. The pointer allows the public class to be
+/// modified, but is itself immutable (that is, cannot be reassigned).
+///
+/// This cannot normally be used in \c const members. While it is possible to
+/// work around this limitation by prefixing \p class_name with \c const, using
+/// #QTE_Q_CONST instead is preferred.
+#define QTE_Q(class_name)         class_name* const q = q_func()
+
+/// Get pointer to immutable public class.
+///
+/// This declares a local variable \c q, which is a pointer to the public class
+/// \p class_name of a private class. Both the pointer and its referent are
+/// immutable. This should be used instead of #QTE_Q in \c const members and/or
+/// when you wish to avoid unintentional modification of the public class.
+#define QTE_Q_CONST(class_name)   const class_name* const q = q_func()
+
+/// Alias for #foreach_child.
+///
+/// This macro is a synonym for #foreach_child that is guaranteed to be
+/// available. (If QT_NO_KEYWORDS is defined, the more convenient
+/// #foreach_child is hidden to avoid namespace pollution.)
+#define QTE_FOREACH_CHILD(variable, parent) \
+  for (int _ii = 0, _ij = 0, _ik = (parent)->childCount(); \
+       _ii == _ij && _ii < _ik; ++_ij) \
+    for (variable = (parent)->child(_ii); _ii == _ij; ++_ii)
+
+/// Alias for #foreach_iter.
+///
+/// This macro is a synonym for #foreach_iter that is guaranteed to be
+/// available. (If QT_NO_KEYWORDS is defined, the more convenient #foreach_iter
+/// is hidden to avoid namespace pollution.)
+#define QTE_FOREACH_ITER(iterator_type, variable, container) \
+  for (iterator_type variable = (container).begin(), _end = (container).end(); \
+       variable != _end; ++variable)
+
+/// Alias for #synchronized.
+///
+/// This macro is a synonym for #synchronized that is guaranteed to be
+/// available. (If QT_NO_KEYWORDS is defined, the more convenient #synchronized
+/// is hidden to avoid namespace pollution.)
+#define QTE_SYNCHRONIZED(mutex) \
+  for (int _qte_critical_section_flag = 0; !_qte_critical_section_flag;) \
+    for (QMutexLocker _qte_critical_section_lock(mutex); \
+         !_qte_critical_section_flag; ++_qte_critical_section_flag)
+
+#ifdef DOXYGEN
+/// Iterate over children.
+///
+/// This macro iterates over the children of any class that implements the
+/// methods <code>int childCount()</code> and <code>child(int)</code>; e.g.
+/// QTreeWidgetItem.
+///
+/// \param variable
+///   Name of variable that receives the child. The type of \p variable must
+///   be assignable from the return of <code>parent.child()</code>.
+/// \param parent Parent of children over which to iterate.
+///
+/// \par Example:
+/// \code{.cpp}
+/// // Iterate over each top-level item in 'tree'
+/// QTreeWidget* tree;
+/// foreach_child (QTreeWidgetItem* item, tree->invisibleRootItem())
+///   processItem(item);
+/// \endcode
+#  define foreach_child(variable, parent)
+/// Iterate over container using an iterator.
+///
+/// This macro simplifies iterating over a container using an iterator. This
+/// has the advantage over %Qt's foreach in that it works also with STL
+/// containers, and can be used on maps (ordered or otherwise, e.g. QHash)
+/// where knowing the key is required, and iterating over the key set is
+/// undesirable either to avoid the extra cost of value look-up, or the
+/// inconvenience of dealing with maps with non-unique keys (e.g. QMultiMap).
+///
+/// \param iterator_type
+///   The typename of the iterator object; typically \c T::const_iterator where
+///   \c T is the container type. Note that \p iterator_type must not contain
+///   commas; use a typedef if you need to declare an iterator on a container
+///   type taking more than one template argument.
+/// \param variable Name of the iterator variable.
+/// \param container
+///   Container over which to iterate. This should be a constant expression
+///   (usually a variable name), as it is evaluated more than once.
+///
+/// \note Unlike foreach, foreach_iter does \em not make a copy of
+///       \p container. You should not modify \p container within the loop.
+///
+/// \par Example:
+/// \code{.cpp}
+/// typedef QHash<int, QString> MyMap;
+/// MyMap map = createMap();
+/// foreach_iter(MyMap::const_iterator, iter, map)
+///   qDebug() << "key" << iter.key() << "value" << iter.value();
+/// \endcode
+#  define foreach_iter(iterator_type, variable, container)
+/// Declare a critical code section.
+///
+/// This macro declares a critical section of code that is protected by the
+/// named mutex. It is similar to the Java keyword, except that only a QMutex
+/// may be used as the lock object. If the code section is a single statement,
+/// the use of braces around the code section is optional.
+///
+/// \param mutex Pointer to a QMutex used to synchronize execution of the
+///              critical section.
+#  define synchronized(mutex)
+#else
+#  ifndef QT_NO_KEYWORDS
+#    ifndef foreach_child
+#      define foreach_child QTE_FOREACH_CHILD
+#    endif
+#    ifndef foreach_iter
+#      define foreach_iter QTE_FOREACH_ITER
+#    endif
+#    ifndef synchronized
+#      define synchronized QTE_SYNCHRONIZED
+#    endif
+#  endif
+#endif
+
+#if __cplusplus >= 201103L || defined(DOXYGEN)
+/// Thread-safe constant with opportunistic static storage.
+///
+/// This macro declares a constant variable, using static storage if it is
+/// known that such will be thread safe, and local storage otherwise. This is
+/// meant to be used as an opportunistic optimization for constant variables
+/// with non-trivial initialization for which a static is desirable, but not
+/// required.
+///
+/// \param T Data type of variable to be declared.
+#  define QTE_THREADSAFE_STATIC_CONST(T) static T const
+#else
+#  define QTE_THREADSAFE_STATIC_CONST(T) T const
+#endif
+
+/// Shorthand to register a metatype with %Qt.
+///
+/// This macro provides a convenient shorthand to register a %Qt metatype
+/// using qRegisterMetaType. It passes the stringified type \p type as the
+/// textual name, saving the users having to type the name twice.
+#define QTE_REGISTER_METATYPE(type) qRegisterMetaType<type>(#type)
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtMath.h b/Libraries/QtExtensions/Core/qtMath.h
new file mode 100644
index 00000000..fb83f72b
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtMath.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtMath_h
+#define __qtMath_h
+
+#include <cmath>
+
+#include <QtCore>
+
+#ifdef _WIN32
+
+// Replacements for C99 standard math functions that are missing on Windows
+
+inline double round(double a)
+{ return floor(a + 0.5); }
+
+inline double trunc(double a)
+{ return (a < 0.0 ? ceil(a) : floor(a)); }
+
+#endif
+
+/// Return a value representing the sign of a real number.
+///
+/// This function will return a value that is loosely equivalent to
+/// <code>a / abs(\p a)</code>; that is, 1.0 for positive numbers, or -1.0 for
+/// negative numbers, including ±infinity. Numbers that are exactly zero will
+/// be returned as-is (preserving the sign bit), as will NaN's. Small values,
+/// including denormalized numbers, will return ±1.0.
+inline float qtSign(float a)
+{ return (qIsNaN(a) ? a : a > 0.0 ? 1.0 : a < 0.0 ? -1.0 : a); }
+
+/// \copydoc qtSign(float)
+inline double qtSign(double a)
+{ return (qIsNaN(a) ? a : a > 0.0 ? 1.0 : a < 0.0 ? -1.0 : a); }
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtOnce.cxx b/Libraries/QtExtensions/Core/qtOnce.cxx
new file mode 100644
index 00000000..27220c8b
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtOnce.cxx
@@ -0,0 +1,114 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtOnce.h"
+
+#ifdef Q_OS_WIN
+
+#include <windows.h>
+
+//-----------------------------------------------------------------------------
+class qtOnceLock
+{
+public:
+  static qtOnceLock* enqueue(qtOnceGuard& container);
+  static void dequeue(qtOnceLock* lock, qtOnceGuard& container);
+
+protected:
+  qtOnceLock();
+  ~qtOnceLock();
+
+  CRITICAL_SECTION cs;
+};
+
+//-----------------------------------------------------------------------------
+qtOnceLock::qtOnceLock()
+{
+  InitializeCriticalSection(&this->cs);
+  EnterCriticalSection(&this->cs);
+}
+
+//-----------------------------------------------------------------------------
+qtOnceLock::~qtOnceLock()
+{
+  DeleteCriticalSection(&this->cs);
+}
+
+//-----------------------------------------------------------------------------
+qtOnceLock* qtOnceLock::enqueue(qtOnceGuard& container)
+{
+  qtOnceLock* lock = new qtOnceLock;
+  qtOnceLock* prev = static_cast<qtOnceLock*>(
+                       InterlockedExchangePointer(&container.mutex, lock));
+
+  // If there was a previous caller...
+  if (prev)
+    {
+    // ...wait for the previous caller to dequeue...
+    EnterCriticalSection(&prev->cs);
+    LeaveCriticalSection(&prev->cs);
+    // ..then destroy the previous caller
+    delete prev;
+    }
+
+  return lock;
+}
+
+//-----------------------------------------------------------------------------
+void qtOnceLock::dequeue(qtOnceLock* lock, qtOnceGuard& container)
+{
+  // Try to remove self from the queue
+  qtOnceLock* last = static_cast<qtOnceLock*>(
+                       InterlockedCompareExchangePointer(&container.mutex, 0,
+                                                         lock));
+
+  // Release critical section, allowing next thread in the queue to proceed
+  LeaveCriticalSection(&lock->cs);
+
+  if (last == lock)
+    {
+    // If the queue was pointing to us, the queue is now empty and it is safe
+    // to delete our lock (otherwise the next lock, with a pointer to our lock,
+    // is already on the queue, and will delete our lock when it wakes)
+    delete lock;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtOnce(qtOnceGuard& guard, void(*func)(void))
+{
+  if (guard.init)
+    {
+    // Function has already been called; nothing to do
+    return;
+    }
+
+  // Insert into wait queue
+  qtOnceLock* lock = qtOnceLock::enqueue(guard);
+
+  // Check if we are the first caller to lock the mutex
+  if (!guard.init)
+    {
+    // Yes; go ahead and execute the function...
+    (*func)();
+    // ...and set the initialization flag so no one else will try to execute
+    // it a second time
+    InterlockedIncrement(&guard.init);
+    }
+
+  // Remove from wait queue
+  qtOnceLock::dequeue(lock, guard);
+}
+
+#else
+
+//-----------------------------------------------------------------------------
+void qtOnce(qtOnceGuard& guard, void(*func)(void))
+{
+  pthread_once(&guard, func);
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtOnce.h b/Libraries/QtExtensions/Core/qtOnce.h
new file mode 100644
index 00000000..d3e2f5b9
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtOnce.h
@@ -0,0 +1,63 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtOnce_h
+#define __qtOnce_h
+
+/// \file
+
+#include <QtGlobal> // for platform test symbols
+
+#include "qtGlobal.h"
+
+#ifdef Q_OS_WIN
+
+#include <windows.h>
+
+struct QTE_EXPORT qtOnceGuard
+{
+  volatile LONG init;
+  volatile PVOID mutex;
+};
+
+#define QTE_ONCE_INIT { 0, 0 }
+
+#else
+
+#include <pthread.h>
+
+typedef pthread_once_t qtOnceGuard;
+
+#define QTE_ONCE_INIT PTHREAD_ONCE_INIT
+
+#endif
+
+/// Call a function exactly once.
+///
+/// qtOnce is a thread-safe function that can be used to perform one-time
+/// initialization. It is guaranteed that \p func will be called exactly once
+/// for the same \p guard, regardless of how many times, or by how many threads
+/// (concurrently), qtOnce is called. On return, it is guaranteed that \p func
+/// has executed to completion in some thread (not necessarily the calling
+/// thread). \p func must not throw.
+///
+/// \note On POSIX platforms, this is a wrapper around pthread_once. On
+///       Windows, a custom implementation is provided that implements FIFO
+///       behavior (that is, concurrent calls to qtOnce will return in the same
+///       order in which they are dispatched, and the first caller will execute
+///       \p func).
+///
+/// \sa QTE_ONCE
+QTE_EXPORT void qtOnce(qtOnceGuard& guard, void(*func)(void));
+
+/// Declare guard for qtOnce.
+///
+/// This declares a guard named \p name for qtOnce. The macro takes care of
+/// declaring the guard as the proper type and providing an appropriate static
+/// initializer for the guard.
+#define QTE_ONCE(name) qtOnceGuard name = QTE_ONCE_INIT
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtScopedValueChange.cxx b/Libraries/QtExtensions/Core/qtScopedValueChange.cxx
new file mode 100644
index 00000000..b2b10b15
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtScopedValueChange.cxx
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QTreeWidget>
+
+#include "qtScopedValueChange.h"
+
+//-----------------------------------------------------------------------------
+bool qtSvcWidgetUpdateHelper::get(QWidget* widget)
+{
+  return widget->updatesEnabled();
+}
+
+//-----------------------------------------------------------------------------
+void qtSvcWidgetUpdateHelper::set(QWidget* widget, bool value)
+{
+  return widget->setUpdatesEnabled(value);
+}
+
+//-----------------------------------------------------------------------------
+bool qtSvcTreeSortHelper::get(QTreeWidget* tree)
+{
+  return tree->isSortingEnabled();
+}
+
+//-----------------------------------------------------------------------------
+void qtSvcTreeSortHelper::set(QTreeWidget* tree, bool value)
+{
+  tree->setSortingEnabled(value);
+}
diff --git a/Libraries/QtExtensions/Core/qtScopedValueChange.h b/Libraries/QtExtensions/Core/qtScopedValueChange.h
new file mode 100644
index 00000000..24f3fd9d
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtScopedValueChange.h
@@ -0,0 +1,143 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtScopedValueChange_h
+#define __qtScopedValueChange_h
+
+#include <QObject>
+#include <QString>
+#include <QVariant>
+
+#include "qtGlobal.h"
+
+class QTreeWidget;
+class QObject;
+
+// Generic class template
+template <typename ObjectType, typename Helper, typename ValueType>
+class qtGenericScopedValueChange
+{
+public:
+  qtGenericScopedValueChange(ObjectType* o, ValueType value)
+    : object(o), oldValue(Helper::get(o))
+    { Helper::set(o, value); }
+
+  ~qtGenericScopedValueChange()
+    { Helper::set(this->object, this->oldValue); }
+
+protected:
+  ObjectType* object;
+  ValueType oldValue;
+
+private:
+  Q_DISABLE_COPY(qtGenericScopedValueChange)
+};
+
+// Generic class template acting on a POD reference
+template <typename ValueType>
+class qtScopedValueChange
+{
+public:
+  qtScopedValueChange(ValueType& valueRef, ValueType newValue)
+    : vref(valueRef), oldValue(valueRef)
+    { valueRef = newValue; }
+
+  ~qtScopedValueChange()
+    { this->vref = this->oldValue; }
+
+protected:
+  ValueType& vref;
+  ValueType oldValue;
+
+private:
+  Q_DISABLE_COPY(qtScopedValueChange)
+};
+
+// Generic class template with fixed value
+template <typename ObjectType, typename Helper,
+          typename ValueType, ValueType Value>
+class qtGenericScopedValueFixedChange
+  : public qtGenericScopedValueChange<ObjectType, Helper, ValueType>
+{
+public:
+  qtGenericScopedValueFixedChange(ObjectType* o)
+    : qtGenericScopedValueChange<ObjectType, Helper, ValueType>(o, Value) {}
+
+  ~qtGenericScopedValueFixedChange() {}
+
+private:
+  Q_DISABLE_COPY(qtGenericScopedValueFixedChange)
+};
+
+// Generic class for QObject properties
+class QTE_EXPORT qtScopedPropertyChange
+{
+public:
+  qtScopedPropertyChange(QObject* o, const QString& name, QVariant value)
+    : object(o), propertyName(name)
+    {
+    oldValue = object->property(qPrintable(name));
+    object->setProperty(qPrintable(name), value);
+    }
+
+  ~qtScopedPropertyChange()
+    {
+    this->object->setProperty(qPrintable(this->propertyName),
+                              this->oldValue);
+    }
+
+protected:
+  QObject* object;
+  QString propertyName;
+  QVariant oldValue;
+
+private:
+  Q_DISABLE_COPY(qtScopedPropertyChange)
+};
+
+// Generic class to block QObject signals
+class QTE_EXPORT qtScopedBlockSignals
+{
+public:
+  qtScopedBlockSignals(QObject* o) : object(o)
+    { oldValue = o->blockSignals(true); }
+
+  ~qtScopedBlockSignals()
+    { this->object->blockSignals(this->oldValue); }
+
+protected:
+  QObject* object;
+  bool oldValue;
+
+private:
+  Q_DISABLE_COPY(qtScopedBlockSignals)
+};
+
+// Helper for QWidget updating
+class QTE_EXPORT qtSvcWidgetUpdateHelper
+{
+public:
+  static bool get(QWidget*);
+  static void set(QWidget*, bool);
+};
+
+// Helper for QTreeWidget sorting
+class QTE_EXPORT qtSvcTreeSortHelper
+{
+public:
+  static bool get(QTreeWidget*);
+  static void set(QTreeWidget*, bool);
+};
+
+// Specialization typedefs
+typedef qtGenericScopedValueFixedChange<
+          QWidget, qtSvcWidgetUpdateHelper, bool, false>
+        qtScopedBlockUpdates;
+typedef qtGenericScopedValueFixedChange<
+          QTreeWidget, qtSvcTreeSortHelper, bool, false>
+        qtDelayTreeSorting;
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtStlUtil.cxx b/Libraries/QtExtensions/Core/qtStlUtil.cxx
new file mode 100644
index 00000000..117eed9f
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtStlUtil.cxx
@@ -0,0 +1,24 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtStlUtil.h"
+
+#if QT_VERSION < 0x040800
+#include <QLocale>
+#include <QTextCodec>
+
+//-----------------------------------------------------------------------------
+std::string stdString(const QStringRef& qs)
+{
+  QTextCodec* codec = QTextCodec::codecForLocale();
+  if (!codec)
+    {
+    codec = QTextCodec::codecForName("ISO-8859-1"); // a.k.a. latin1
+    }
+  const QByteArray data = codec->fromUnicode(qs.constData(), qs.length());
+  return std::string(data.constData(), data.size());
+}
+#endif
diff --git a/Libraries/QtExtensions/Core/qtStlUtil.h b/Libraries/QtExtensions/Core/qtStlUtil.h
new file mode 100644
index 00000000..2ba187ed
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtStlUtil.h
@@ -0,0 +1,79 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtStlUtil_h
+#define __qtStlUtil_h
+
+#include <string>
+#include <vector>
+
+#include <QList>
+#include <QString>
+#include <QUrl>
+
+#include <vgExport.h>
+
+//-----------------------------------------------------------------------------
+inline QByteArray qtBytes(const std::string& ss)
+{
+  return QByteArray(ss.data(), static_cast<int>(ss.size()));
+}
+
+//-----------------------------------------------------------------------------
+inline QString qtString(const std::string& ss)
+{
+  return QString::fromLocal8Bit(ss.data(), static_cast<int>(ss.size()));
+}
+
+//-----------------------------------------------------------------------------
+inline QUrl qtUrl(const std::string& ss)
+{
+  return QUrl::fromEncoded(qtBytes(ss));
+}
+
+//-----------------------------------------------------------------------------
+inline std::string stdString(const QString& qs)
+{
+  const QByteArray data = qs.toLocal8Bit();
+  return std::string(data.constData(), data.size());
+}
+
+//-----------------------------------------------------------------------------
+#if QT_VERSION < 0x040800
+extern QTE_EXPORT std::string stdString(const QStringRef& qs);
+#else
+inline std::string stdString(const QStringRef& qs)
+{
+  const QByteArray data = qs.toLocal8Bit();
+  return std::string(data.constData(), data.size());
+}
+#endif
+
+//-----------------------------------------------------------------------------
+inline std::string stdString(const QUrl& qu)
+{
+  const QByteArray data = qu.toEncoded();
+  return std::string(data.constData(), data.size());
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline QList<T> qtList(const std::vector<T>& in)
+{
+  const size_t k = in.size();
+
+  QList<T> out;
+  out.reserve(static_cast<int>(k));
+
+  for (size_t n = 0; n < k; ++n)
+    {
+    out.append(in[n]);
+    }
+
+  return out;
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtTest.cxx b/Libraries/QtExtensions/Core/qtTest.cxx
new file mode 100644
index 00000000..ffa8b4c6
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtTest.cxx
@@ -0,0 +1,346 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QFileInfo>
+#include <QRegExp>
+#include <QStack>
+#include <QThreadStorage>
+
+#include "qtStlUtil.h"
+#include "qtTest.h"
+#include "qtUtil.h"
+
+namespace // anonymous
+{
+
+static void qtMessageHandler(QtMsgType, const char* msg,
+                             qtTest::StreamPointer stream)
+{
+  static QThreadStorage<qtTest::StreamPointer*> ts;
+  qtTest::StreamPointer* tsp = ts.localData();
+
+  if (stream || msg == 0)
+    {
+    if (tsp)
+      {
+      (*tsp) = stream;
+      }
+    else
+      {
+      ts.setLocalData(new qtTest::StreamPointer(stream));
+      }
+    }
+  else
+    {
+    if (tsp && *tsp)
+      {
+      (**tsp) << msg << '\n';
+      }
+    }
+}
+
+static void qtMessageHandler(QtMsgType type, const char* msg)
+{
+  qtMessageHandler(type, msg, qtTest::StreamPointer());
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class qtTestPrivate
+{
+public:
+  qtTestPrivate()
+    : testResult(0), collectedResult(0), totalTests(0), totalPassed(0),
+      err(new QTextStream(stderr, QIODevice::WriteOnly))
+    {}
+
+  int testResult, collectedResult;
+  int totalTests, totalPassed;
+  qtTest::StreamPointer err;
+  QTextStream* out;
+  QStack<qtTest::StreamPointer> streamStack;
+  QStack<QString> traceStack;
+};
+
+QTE_IMPLEMENT_D_FUNC(qtTest)
+
+//-----------------------------------------------------------------------------
+qtTest::qtTest() : d_ptr(new qtTestPrivate)
+{
+  QTE_D(qtTest);
+
+  qtTest::init();
+
+  this->pushMessageStream(d->err);
+}
+
+//-----------------------------------------------------------------------------
+qtTest::~qtTest()
+{
+  QTE_D(qtTest);
+
+  (*d->err) << '\n' << d->totalPassed << " of " << d->totalTests << " passed";
+  if (d->totalPassed < d->totalTests)
+    {
+    (*d->err) << ", " << (d->totalTests - d->totalPassed) << " failed";
+    }
+  (*d->err) << '\n';
+  d->err->flush();
+
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+void qtTest::init()
+{
+  static volatile bool initialized = false;
+  if (!initialized)
+    {
+    initialized = true;
+    qInstallMsgHandler(&qtMessageHandler);
+    }
+}
+
+//-----------------------------------------------------------------------------
+int qtTest::result() const
+{
+  QTE_D_CONST(qtTest);
+  return d->collectedResult;
+}
+
+//-----------------------------------------------------------------------------
+int qtTest::runSuite(const QString& name, qtTest::Suite suite)
+{
+  QTE_D(qtTest);
+
+  // Display banner
+  ++d->totalTests;
+  QString buffer(60 - name.length(), '.');
+  (*d->err) << name << ' ' << buffer;
+
+  // Register stream for QDebug handler
+  buffer.clear();
+  StreamPointer out(new QTextStream(&buffer));
+  d->out = out.data();
+  uint token = this->pushMessageStream(out);
+
+  // Execute the test
+  d->testResult = 0;
+  int result = (*suite)(*this) | d->testResult;
+
+  // Restore stream for QDebug handler
+  this->popMessageStream(token);
+  d->out = d->err.data();
+
+  // Print test result and output
+  (*d->err) << (result ? "***Failed" : "   Passed") << '\n' << buffer;
+
+  // Update statistics
+  if (result == 0)
+    {
+    ++d->totalPassed;
+    }
+  d->collectedResult |= result;
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+QTextStream& qtTest::out()
+{
+  QTE_D(qtTest);
+  return (d->out ? *d->out : *d->err);
+}
+
+//-----------------------------------------------------------------------------
+uint qtTest::pushMessageStream(qtTest::StreamPointer stream)
+{
+  QTE_D(qtTest);
+
+  // Register new stream with handler
+  qtMessageHandler(QtSystemMsg, 0, stream);
+
+  // Add stream to stack
+  uint token = d->streamStack.count();
+  d->streamStack.push(stream);
+  return token;
+}
+
+//-----------------------------------------------------------------------------
+void qtTest::popMessageStream(uint token)
+{
+  QTE_D(qtTest);
+
+  // Remove stream(s) from stack to get back to token
+  while (uint(d->streamStack.count()) > token)
+    {
+    d->streamStack.pop();
+    }
+
+  // Register old stream with handler
+  StreamPointer stream;
+  if (d->streamStack.count())
+    {
+    stream = d->streamStack.top();
+    }
+  qtMessageHandler(QtSystemMsg, 0, stream);
+}
+
+//-----------------------------------------------------------------------------
+QString qtTest::where() const
+{
+  QTE_D_CONST(qtTest);
+  if (!d->traceStack.isEmpty())
+    {
+    QString trace = "in " + d->traceStack.top() + '\n';
+    for (int i = d->traceStack.count() - 2; i >= 0; --i)
+      {
+      trace += "  from " + d->traceStack[i] + '\n';
+      }
+    return trace;
+    }
+  return QString();
+}
+
+//-----------------------------------------------------------------------------
+int qtTest::testEqual(float expectedValue, float actualValue,
+                      const QString& exprText,
+                      int line, const char* file, const char* func)
+{
+  if (!qFuzzyCompare(actualValue, expectedValue))
+    {
+    return this->failedEqualityTest(expectedValue, actualValue, exprText,
+                                    line, file, func);
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int qtTest::testEqual(double expectedValue, double actualValue,
+                      const QString& exprText,
+                      int line, const char* file, const char* func)
+{
+  if (!qFuzzyCompare(actualValue, expectedValue))
+    {
+    return this->failedEqualityTest(expectedValue, actualValue, exprText,
+                                    line, file, func);
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int qtTest::failedEqualityTest(
+  const std::string& expectedValue, const std::string& actualValue,
+  const QString& exprText, int line, const char* file, const char* func)
+{
+  return this->failedEqualityTest(qtString(expectedValue),
+                                  qtString(actualValue),
+                                  exprText, line, file, func);
+}
+
+//-----------------------------------------------------------------------------
+int qtTest::testResult() const
+{
+  QTE_D_CONST(qtTest);
+  return d->testResult;
+}
+
+//-----------------------------------------------------------------------------
+int qtTest::setTestResult(int result)
+{
+  QTE_D(qtTest);
+  return (d->testResult |= result);
+}
+
+//-----------------------------------------------------------------------------
+class qtTestTracePrivate
+{
+public:
+  qtTest* test;
+  int depth;
+};
+
+QTE_IMPLEMENT_D_FUNC(qtTestTrace)
+
+//-----------------------------------------------------------------------------
+qtTestTrace::qtTestTrace(qtTest& test, int line, const char* file,
+                         const char* func)
+  : d_ptr(new qtTestTracePrivate)
+{
+  QTE_D(qtTestTrace);
+
+  d->test = &test;
+
+  if (line)
+    {
+    // Get trace size so we can remove ourselves later
+    qtTestPrivate* td = test.d_func();
+    d->depth = td->traceStack.count();
+
+    // Get function name without return type, if function name was given
+    QString shortFunc;
+    if (func)
+      {
+      shortFunc = QString::fromLocal8Bit(func);
+      if (shortFunc.contains(' '))
+        {
+        QRegExp re("[^ (]+([(][^)]*[)])?$");
+        int n = re.indexIn(shortFunc);
+        if (n > 0)
+          {
+          shortFunc.remove(0, n);
+          }
+        }
+      }
+
+    // Get short file name, if file name was given
+    if (file)
+      {
+      QFileInfo fi(QString::fromLocal8Bit(file));
+      QString shortFile = fi.fileName();
+      QString trace("%2:%1");
+      trace = trace.arg(line).arg(shortFile);
+      if (func)
+        {
+        td->traceStack.push(shortFunc + " (" + trace + ')');
+        }
+      else
+        {
+        td->traceStack.push(trace);
+        }
+      }
+    else
+      {
+      if (func)
+        {
+        QString trace("%2 (%1)");
+        td->traceStack.push(trace.arg(line).arg(shortFunc));
+        }
+      else
+        {
+        td->traceStack.push(QString::number(line));
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtTestTrace::~qtTestTrace()
+{
+  QTE_D(qtTestTrace);
+
+  if (d->depth >= 0)
+    {
+    qtTestPrivate* td = d->test->d_func();
+    while (td->traceStack.count() > d->depth)
+      {
+      td->traceStack.pop();
+      }
+    }
+
+  delete d;
+}
diff --git a/Libraries/QtExtensions/Core/qtTest.h b/Libraries/QtExtensions/Core/qtTest.h
new file mode 100644
index 00000000..4be6a907
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtTest.h
@@ -0,0 +1,178 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtTest_h
+#define __qtTest_h
+
+#include <QDebug>
+#include <QSharedPointer>
+#include <QString>
+#include <QTextStream>
+
+#include <cstdio>
+
+#include "qtGlobal.h"
+
+class qtTestPrivate;
+class qtTestTracePrivate;
+
+//-----------------------------------------------------------------------------
+class QTE_EXPORT qtTest
+{
+public:
+  typedef QSharedPointer<QTextStream> StreamPointer;
+  typedef int (* Suite)(qtTest&);
+
+  qtTest();
+  virtual ~qtTest();
+
+  static void init();
+
+  int result() const;
+  int runSuite(const QString& name, Suite);
+
+  QTextStream& out();
+  uint pushMessageStream(StreamPointer);
+  void popMessageStream(uint token);
+
+  QString where() const;
+
+  inline int test(
+    bool exprValue, const QString& exprText, int line = 0,
+    const char* file = 0, const char* func = 0);
+  template <typename T>
+  inline int testEqual(
+    T expectedValue, T actualValue, const QString& exprText,
+    int line = 0, const char* file = 0, const char* func = 0);
+  int testEqual(
+    float expectedValue, float actualValue, const QString& exprText,
+    int line = 0, const char* file = 0, const char* func = 0);
+  int testEqual(
+    double expectedValue, double actualValue, const QString& exprText,
+    int line = 0, const char* file = 0, const char* func = 0);
+
+  int testResult() const;
+  int setTestResult(int);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(qtTest)
+  friend class qtTestTrace;
+
+  template <typename T>
+  inline int failedEqualityTest(
+    T expectedValue, T actualValue, const QString& exprText,
+    int line, const char* file, const char* func);
+  int failedEqualityTest(
+    const std::string& expectedValue, const std::string& actualValue,
+    const QString& exprText, int line, const char* file, const char* func);
+
+private:
+  QTE_DECLARE_PRIVATE(qtTest)
+  Q_DISABLE_COPY(qtTest)
+};
+
+//-----------------------------------------------------------------------------
+class QTE_EXPORT qtTestTrace
+{
+public:
+  qtTestTrace(qtTest& test, int line = 0, const char* file = 0,
+              const char* func = 0);
+  ~qtTestTrace();
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(qtTestTrace)
+
+private:
+  QTE_DECLARE_PRIVATE(qtTestTrace)
+};
+
+//-----------------------------------------------------------------------------
+
+#ifndef _QT_TEST_FUNCTION_
+#if defined Q_CC_MSVC
+#define _QT_TEST_FUNCTION_ __FUNCDNAME__
+#elif defined Q_CC_GNU
+#define _QT_TEST_FUNCTION_ __PRETTY_FUNCTION__
+#else
+#define _QT_TEST_FUNCTION_ __FUNCTION__
+#endif
+#endif
+
+#ifndef TEST_OBJECT_NAME
+#define TEST_OBJECT_NAME testObject
+#endif
+
+#define _QT_TEST_WHERE_ \
+  __LINE__, __FILE__, _QT_TEST_FUNCTION_
+
+#define TEST(_expr) \
+  TEST_OBJECT_NAME.test((_expr), #_expr, _QT_TEST_WHERE_)
+#define TEST_EQUAL(_expr, _value) \
+  TEST_OBJECT_NAME.testEqual((_value), (_expr), #_expr, _QT_TEST_WHERE_)
+#define TEST_CALL(_func, ...) do { \
+  qtTestTrace _trace(TEST_OBJECT_NAME, _QT_TEST_WHERE_); \
+  _func(TEST_OBJECT_NAME, __VA_ARGS__); \
+  } while(0)
+
+#define TEST_QUIET_XFAIL(_expr) do { \
+  qtTest::StreamPointer _stream(new qtStringStream); \
+  uint _token = TEST_OBJECT_NAME.pushMessageStream(_stream); \
+  bool _test = (_expr); \
+  TEST_OBJECT_NAME.test(!_test, "(XFAIL) " #_expr, _QT_TEST_WHERE_); \
+  if(_test) \
+    TEST_OBJECT_NAME.out() << *_stream->string(); \
+  TEST_OBJECT_NAME.popMessageStream(_token); \
+  } while(0)
+
+//-----------------------------------------------------------------------------
+int qtTest::test(bool exprValue, const QString& exprText,
+                 int line, const char* file, const char* func)
+{
+  if (!exprValue)
+    {
+    qtTestTrace t(*this, line, file, func);
+    this->out() << this->where() << "assertion (" << exprText << ") failed\n";
+    return this->setTestResult(1);
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+int qtTest::testEqual(T expectedValue, T actualValue, const QString& exprText,
+                      int line, const char* file, const char* func)
+{
+  if (actualValue != expectedValue)
+    return this->failedEqualityTest(expectedValue, actualValue, exprText,
+                                    line, file, func);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+int qtTest::failedEqualityTest(
+  T expectedValue, T actualValue, const QString& exprText,
+  int line, const char* file, const char* func)
+{
+  qtTestTrace t(*this, line, file, func);
+
+  QString expectedStr;
+  QDebug dbgExpected(&expectedStr);
+  dbgExpected << expectedValue;
+  expectedStr = expectedStr.trimmed();
+
+  QString buffer;
+  QDebug dbg(&buffer);
+  dbg.nospace() << qPrintable(this->where()) << "expression " << exprText;
+  dbg.space() << "gave value" << actualValue << "(expected";
+  dbg.nospace() << qPrintable(expectedStr) << ")\n";
+  this->out() << buffer;
+
+  return this->setTestResult(1);
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtThread.cxx b/Libraries/QtExtensions/Core/qtThread.cxx
new file mode 100644
index 00000000..8a79b6e1
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtThread.cxx
@@ -0,0 +1,91 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtThread.h"
+
+QTE_IMPLEMENT_D_FUNC(qtBareThread)
+
+//-----------------------------------------------------------------------------
+class qtBareThreadPrivate : public QThread
+{
+public:
+  qtBareThreadPrivate(qtBareThread* parent) : q_ptr(parent) {}
+  virtual ~qtBareThreadPrivate() {}
+
+  virtual void run() { QTE_Q(qtBareThread); q->run(); }
+
+private:
+  QTE_DECLARE_PUBLIC(qtBareThread)
+  QTE_DECLARE_PUBLIC_PTR(qtBareThread)
+};
+
+//-----------------------------------------------------------------------------
+qtBareThread::qtBareThread(QObject* self)
+  : d_ptr(new qtBareThreadPrivate(this))
+{
+  QTE_D(qtBareThread);
+  self->moveToThread(d);
+}
+
+//-----------------------------------------------------------------------------
+qtBareThread::~qtBareThread()
+{
+  QTE_D(qtBareThread);
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+void qtBareThread::start()
+{
+  QTE_D(qtBareThread);
+  d->start();
+}
+
+//-----------------------------------------------------------------------------
+void qtBareThread::quit()
+{
+  QTE_D(qtBareThread);
+  d->quit();
+}
+
+//-----------------------------------------------------------------------------
+bool qtBareThread::wait(long unsigned int time)
+{
+  QTE_D(qtBareThread);
+  return d->wait(time);
+}
+
+//-----------------------------------------------------------------------------
+void qtBareThread::run()
+{
+  QTE_D(qtBareThread);
+  d->exec();
+}
+
+//-----------------------------------------------------------------------------
+bool qtBareThread::isRunning() const
+{
+  QTE_D_CONST(qtBareThread);
+  return d->isRunning();
+}
+
+//-----------------------------------------------------------------------------
+void qtBareThread::sleep(unsigned long seconds)
+{
+  qtBareThreadPrivate::sleep(seconds);
+}
+
+//-----------------------------------------------------------------------------
+void qtBareThread::msleep(unsigned long milliseconds)
+{
+  qtBareThreadPrivate::msleep(milliseconds);
+}
+
+//-----------------------------------------------------------------------------
+void qtBareThread::usleep(unsigned long microseconds)
+{
+  qtBareThreadPrivate::usleep(microseconds);
+}
diff --git a/Libraries/QtExtensions/Core/qtThread.h b/Libraries/QtExtensions/Core/qtThread.h
new file mode 100644
index 00000000..33437b34
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtThread.h
@@ -0,0 +1,143 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtThread_h
+#define __qtThread_h
+
+/// \file
+
+#include <QThread>
+
+#include "qtGlobal.h"
+
+class qtBareThreadPrivate;
+
+//-----------------------------------------------------------------------------
+/// Base class for creating QObject's that live in their own thread.
+///
+/// Unlike QThread, qtBareThread subclasses are self-hosting; that is, the
+/// object 'lives' in the thread it represents. This makes it easy to write
+/// worker classes that live in their own threads. Object slots (as long as
+/// they are dispatched using Qt::AutoConnection or Qt::QueuedConnection) will
+/// be invoked in the object's own thread.
+///
+/// qtBareThread is not meant to be used directly. Use one of the subclasses
+/// instead.
+///
+/// \sa qtThread, qtThreadedObject, qtInternallyThreadedObject
+class QTE_EXPORT qtBareThread
+{
+public:
+  /// Destructor.
+  ///
+  /// Note that the default destructor does not wait on the thread to end.
+  /// Users should ensure that objects derived from qtBareThread are not
+  /// destroyed while their thread is still active.
+  virtual ~qtBareThread();
+
+  /// Begin execution of the thread.
+  virtual void start();
+
+  /// Notify the thread's event loop to exit.
+  virtual void quit();
+
+  /// Wait for the thread to exit.
+  ///
+  /// This method blocks the caller until the thread associated with the owning
+  /// instance has completed execution, or the specified timeout (in
+  /// milliseconds) has elapsed. If \p time is \c ULONG_MAX (the default), the
+  /// call will never time out. If the thread is not running, the call returns
+  /// immediately.
+  ///
+  /// \return \c true if the thread is not running on return, \c false if the
+  ///         call timed out.
+  virtual bool wait(unsigned long time = ULONG_MAX);
+
+  /// Test if the thread is running.
+  virtual bool isRunning() const;
+
+  /// Block execution for specified number of seconds.
+  static void sleep(unsigned long seconds);
+  /// Block execution for specified number of milliseconds.
+  static void msleep(unsigned long milliseconds);
+  /// Block execution for specified number of microseconds.
+  static void usleep(unsigned long microseconds);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(qtBareThread)
+
+  explicit qtBareThread(QObject* self);
+
+  /// Starting point for the thread.
+  ///
+  /// This method executes in the object-thread context after start() is
+  /// called. The default implementation executes the thread's event loop,
+  /// and can be called explicitly for that purpose. Reimplement it to do other
+  /// useful work, or to add startup and shutdown code in the thread's context.
+  ///
+  /// The thread ends when the reimplemented call to this method returns.
+  ///
+  /// \sa QThread::run
+  virtual void run();
+
+private:
+  QTE_DECLARE_PRIVATE(qtBareThread)
+  Q_DISABLE_COPY(qtBareThread)
+};
+
+//-----------------------------------------------------------------------------
+/// Template class to wrap a QObject subclass in a protected thread.
+///
+/// The qtInternallyThreadedObject template class is used to wrap a QObject
+/// subclass in a thread. The thread-related methods will have \c protected
+/// access level. See qtBareThread for more details.
+///
+/// \sa qtBareThread, qtThreadedObject
+template <typename T>
+class qtInternallyThreadedObject : public T, protected qtBareThread
+{
+protected:
+  /// Constructs the threaded object.
+  ///
+  /// On return, the QObject represented by \c this is owned by the thread
+  /// represented by its qtBareThread.
+  qtInternallyThreadedObject() : qtBareThread(this) {}
+};
+
+//-----------------------------------------------------------------------------
+/// Template class to wrap a QObject subclass in a public thread.
+///
+/// The qtThreadedObject template class is used to wrap a QObject subclass in a
+/// thread. The thread-related methods will have \c public access level. See
+/// qtBareThread for more details.
+///
+/// It is possible to wrap a plain QObject, however it is recommended to use
+/// the already-existing qtThread instantiation of this template for that
+/// purpose.
+///
+/// \sa qtBareThread, qtInternallyThreadedObject, qtThread
+template <typename T>
+class qtThreadedObject : public T, public qtBareThread
+{
+protected:
+  /// Constructs the threaded object.
+  ///
+  /// On return, the QObject represented by \c this is owned by the thread
+  /// represented by its qtBareThread.
+  qtThreadedObject() : qtBareThread(this) {}
+};
+
+//-----------------------------------------------------------------------------
+/// Base class for a QObject wrapped in a public thread.
+///
+/// qtThread is a convenience typedef for a qtThreadedObject deriving from
+/// QObject. It is useful for self-hosting threaded objects that do not need
+/// additional functionality from a QObject-derived base class.
+///
+/// \sa qtThreadedObject, qtBareThread
+typedef qtThreadedObject<QObject> qtThread;
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtTransferablePointer.h b/Libraries/QtExtensions/Core/qtTransferablePointer.h
new file mode 100644
index 00000000..bde0e11c
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtTransferablePointer.h
@@ -0,0 +1,99 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtTransferablePointer_h
+#define __qtTransferablePointer_h
+
+#include <QScopedPointer>
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4521) // multiple copy ctors specified
+#endif
+
+//-----------------------------------------------------------------------------
+/// Class to hold a "transferable", automatically deleted pointer to a
+/// dynamically allocated object.
+///
+/// The qtTransferablePointer class stores a pointer to a dynamically
+/// allocated object, and deletes it when the reference goes out of scope. It
+/// is similar to (and in fact, a subclass of) QScopedPointer, but adds a
+/// "transferable" property. Making a copy of a mutable qtTransferablePointer
+/// "transfers" ownership of the object to the new qtTransferablePointer
+/// instance. This property allows dynamically allocated objects to be safely
+/// passed to a single receiver across threads, without the overhead of using
+/// an atomically reference-counted pointer like QSharedPointer. Using a
+/// qtTransferablePointer ensures that the object will still be deleted if the
+/// receiving method never executes (e.g. because its event loop is no longer
+/// executing).
+///
+/// When declaring a qtTransferablePointer, an optional \p Cleanup functor
+/// may be specified. This must be a class or struct having a method
+/// \c cleanup(\c T*) which is invoked to destroy the object. The default
+/// functor simply invokes <code>operator delete</code> on the object.
+///
+/// \note In order to support transference via Qt queued method invocation
+///       (i.e. QMetaObject::invokeMethod), qtTransferablePointer allows Qt's
+///       metatype system to access its standard copy constructor, which
+///       violates const-correctness by modifying the source instance. The
+///       public "transfer" constructor correctly takes a mutable reference to
+///       the source instance.
+///
+/// \par Thread Safety:
+/// qtTransferablePointer is reentrant, but not generally thread safe. Using
+/// qtTransferablePointer to pass an object pointer to another thread is safe,
+/// provided that the underlying object is not accessed by the original thread
+/// once it has been handed off, and that the qtTransferablePointer seen by the
+/// receiving thread is not accessed in any way (again, by the original thread)
+/// once it becomes visible to the receiving thread.
+template <typename T, typename Cleanup = QScopedPointerDeleter<T> >
+class qtTransferablePointer : public QScopedPointer<T, Cleanup>
+{
+public:
+  /// Default constructor.
+  ///
+  /// Create a new qtTransferablePointer instance, owning the specified object.
+  /// If \p data is null, the instance will be invalid.
+  explicit inline qtTransferablePointer(T* data = 0)
+    : QScopedPointer<T, Cleanup>(data) {}
+
+  /// Destroy this instance.
+  ///
+  /// If the instance owns an object, it is destroyed, using the cleanup
+  /// handler specified when the instance was declared.
+  inline ~qtTransferablePointer() {}
+
+  /// Transfer constructor.
+  ///
+  /// Create a new qtTransferablePointer instance from an existing instance.
+  /// The new instance takes ownership of the other instance's object. On
+  /// completion, \p other becomes invalid.
+  inline qtTransferablePointer(qtTransferablePointer<T, Cleanup>& other)
+    : QScopedPointer<T, Cleanup>(0)
+    {
+    this->swap(other);
+    }
+
+protected:
+  template <typename FT> friend void* qMetaTypeConstructHelper(const FT*);
+
+  inline qtTransferablePointer(qtTransferablePointer<T, Cleanup> const& o)
+    : QScopedPointer<T, Cleanup>(0)
+    {
+    qtTransferablePointer<T, Cleanup>& other =
+      const_cast<qtTransferablePointer<T, Cleanup>&>(o);
+    this->swap(other);
+    }
+
+private:
+  qtTransferablePointer& operator=(const qtTransferablePointer&);
+};
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtTransferablePointerArray.h b/Libraries/QtExtensions/Core/qtTransferablePointerArray.h
new file mode 100644
index 00000000..4bd0e8ca
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtTransferablePointerArray.h
@@ -0,0 +1,201 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtTransferablePointerArray_h
+#define __qtTransferablePointerArray_h
+
+#include <QScopedPointer>
+#include <QtAlgorithms>
+
+template <typename T> class QList;
+
+//-----------------------------------------------------------------------------
+/// \cond implementation_details
+template <typename T, typename ItemCleanup>
+struct qtTransferablePointerArrayDeleter
+{
+  static inline void cleanup(QList<T*>* list)
+    {
+    if (list)
+      {
+      foreach (T* item, *list)
+        ItemCleanup::cleanup(item);
+      delete list;
+      }
+    }
+};
+/// \endcond
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4521) // multiple copy ctors specified
+#endif
+
+//-----------------------------------------------------------------------------
+/// Class to hold a "transferable" list of automatically deleted pointers to
+/// dynamically allocated objects.
+///
+/// The qtTransferablePointerArray class stores a dynamic list of pointers to
+/// dynamically allocated objects, and deletes them when the reference goes out
+/// of scope. It is a conceptual extension of qtTransferablePointer to a list
+/// of pointers rather than a single pointer.
+///
+/// qtTransferablePointerArray is similar to a list of QScopedPointer's, with
+/// the addition of a "transferable" property. Making a copy of a mutable
+/// qtTransferablePointerArray "transfers" ownership of the objects to the new
+/// qtTransferablePointerArray instance. This property allows dynamically
+/// allocated objects to be safely passed to a single receiver across threads,
+/// without the overhead of using an atomically reference-counted pointer like
+/// QSharedPointer. Using a qtTransferablePointerArray ensures that the objects
+/// will still be deleted if the receiving method never executes (e.g. because
+/// its event loop is no longer executing).
+///
+/// When declaring a qtTransferablePointerArray, an optional \p Cleanup functor
+/// may be specified. This must be a class or struct having a method
+/// \c cleanup(\c T*) which is invoked to destroy each object. The default
+/// functor simply invokes <code>operator delete</code> on each object.
+///
+/// \note In order to support transference via Qt queued method invocation
+///       (i.e. QMetaObject::invokeMethod), qtTransferablePointerArray allows
+///       Qt's metatype system to access its standard copy constructor, which
+///       violates const-correctness by modifying the source instance. The
+///       public "transfer" constructor correctly takes a mutable reference to
+///       the source instance.
+///
+/// \par Thread Safety:
+/// qtTransferablePointerArray is reentrant, but not generally thread safe.
+/// Using qtTransferablePointerArray to pass a list of object pointers to
+/// another thread is safe, provided that the underlying object is not accessed
+/// by the original thread once it has been handed off, and that the
+/// qtTransferablePointerArray seen by the receiving thread is not accessed in
+/// any way (again, by the original thread) once it becomes visible to the
+/// receiving thread.
+template <typename T, typename Cleanup = QScopedPointerDeleter<T> >
+class qtTransferablePointerArray
+  : public QScopedPointer <QList<T*>,
+                           qtTransferablePointerArrayDeleter<T, Cleanup> >
+{
+protected:
+  typedef qtTransferablePointerArrayDeleter<T, Cleanup> Deleter;
+  typedef QScopedPointer<QList<T*>, Deleter> BaseClass;
+  typedef qtTransferablePointerArray<T, Cleanup> ThisClass;
+
+public:
+  /// Construct an empty instance.
+  ///
+  /// This default constructor creates a new qtTransferablePointerArray
+  /// intance that initially has no data.
+  explicit inline qtTransferablePointerArray()
+    : BaseClass(0) {}
+
+  /// Construct an instance from an initial object list.
+  ///
+  /// This constructor creates a new qtTransferablePointerArray instance,
+  /// setting its initial data to \p data. The instance takes ownership of the
+  /// objects referenced by \p data, after which \p data is cleared.
+  ///
+  /// \sa reset()
+  explicit inline qtTransferablePointerArray(QList<T*>& data)
+    : BaseClass(0)
+    {
+    this->reset(data);
+    }
+
+  /// Destroy this instance.
+  ///
+  /// Objects owned by the qtTransferablePointerArray instance are destroyed,
+  /// using the cleanup handler specified when the instance was declared.
+  inline ~qtTransferablePointerArray() {}
+
+  /// Transfer constructor.
+  ///
+  /// Create a new qtTransferablePointerArray instance from an existing
+  /// instance. The new instance takes ownership of the other instance's
+  /// objects. On completion, \p other becomes empty.
+  inline qtTransferablePointerArray(ThisClass& other)
+    : BaseClass(0)
+    {
+    this->swap(other);
+    }
+
+  /// Set this qtTransferablePointerArray instance's object list.
+  ///
+  /// The qtTransferablePointerArray takes ownership of the objects referenced
+  /// by \p data, after which \p data is cleared. Any objects previously owned
+  /// by this instance are deleted, using the cleanup handler specified when
+  /// the instance was declared.
+  void reset(QList<T*>& data)
+    {
+    this->BaseClass::reset(new QList<T*>(data));
+    data.clear();
+    }
+
+  /// Test if the object list is empty.
+  ///
+  /// \return \c true if the array is empty (contains no objects), \c false
+  ///         otherwise.
+  inline bool isEmpty() const
+    {
+    return (this->isNull() || this->data()->isEmpty());
+    }
+
+  /// Get number of objects in the object list.
+  ///
+  /// This method returns the number of objects held by the instance.
+  inline int count() const
+    {
+    return (this->isNull() ? 0 : this->data()->count());
+    }
+
+  /// Append \p item to object list.
+  ///
+  /// This method appends \p item to this instance's object list. The
+  /// qtTransferablePointerArray instance takes ownership of \p item.
+  void append(T* item)
+    {
+    if (this->isNull())
+      {
+      this->BaseClass::reset(new QList<T*>);
+      }
+    this->data()->append(item);
+    }
+
+  /// Take object list.
+  ///
+  /// This method returns the list of objects owned by this
+  /// qtTransferablePointerArray instance, transferring ownership of the same
+  /// to the caller. On return, the qtTransferablePointerArray instance will be
+  /// empty. The caller is responsible for destroying the objects.
+  QList<T*> take()
+    {
+    if (this->isNull())
+      {
+      return QList<T*>();
+      }
+
+    QScopedPointer<QList<T*> > p(this->BaseClass::take());
+    return *p.data();
+    }
+
+protected:
+  template <typename FT> friend void* qMetaTypeConstructHelper(const FT*);
+
+  inline qtTransferablePointerArray(const ThisClass& o)
+    : BaseClass(0)
+    {
+    ThisClass& other = const_cast<ThisClass&>(o);
+    this->swap(other);
+    }
+
+private:
+  qtTransferablePointerArray& operator=(const qtTransferablePointerArray&);
+};
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif
diff --git a/Libraries/QtExtensions/Core/qtUtil.cxx b/Libraries/QtExtensions/Core/qtUtil.cxx
new file mode 100644
index 00000000..e9720bbf
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtUtil.cxx
@@ -0,0 +1,192 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QAction>
+#include <QApplication>
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QFontMetrics>
+#include <QMainWindow>
+#include <QPushButton>
+#include <QSettings>
+#include <QTreeWidget>
+#include <QTreeWidgetItemIterator>
+
+#include "qtUtil.h"
+
+namespace qtUtil
+{
+
+//-----------------------------------------------------------------------------
+bool localeLess(const QString& a, const QString& b)
+{
+  return a.localeAwareCompare(b) < 0;
+}
+
+//-----------------------------------------------------------------------------
+QStringList localeSort(const QStringList& list)
+{
+  QStringList result = list;
+  qSort(result.begin(), result.end(), &localeLess);
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+QString standardIconResource(const QString& name, int size)
+{
+  return QString(":icons/%1x%1/%2").arg(size).arg(name);
+}
+
+//-----------------------------------------------------------------------------
+QIcon standardIcon(const QString& name, int size)
+{
+  return QIcon(standardIconResource(name, size));
+}
+
+//-----------------------------------------------------------------------------
+QIcon standardIcon(const QString& name, QList<int> sizes)
+{
+  QIcon icon;
+  foreach (int size, sizes)
+    icon.addFile(standardIconResource(name, size));
+  return icon;
+}
+
+//-----------------------------------------------------------------------------
+QIcon standardActionIcon(const QString& name)
+{
+  QIcon icon(standardIconResource(name, 16));
+  icon.addFile(standardIconResource(name, 22));
+  icon.addFile(standardIconResource(name, 24));
+  icon.addFile(standardIconResource(name, 32));
+  return icon;
+}
+
+//-----------------------------------------------------------------------------
+QIcon standardApplicationIcon(const QString& name)
+{
+  QIcon icon(standardIconResource(name, 16));
+  icon.addFile(standardIconResource(name, 32));
+  icon.addFile(standardIconResource(name, 48));
+  icon.addFile(standardIconResource(name, 64));
+  icon.addFile(standardIconResource(name, 128));
+  return icon;
+}
+
+//-----------------------------------------------------------------------------
+void setStandardIcon(
+  QDialogButtonBox* buttons,
+  QDialogButtonBox::StandardButton which,
+  QString name)
+{
+  if (buttons->button(which))
+    {
+    QIcon icon = standardActionIcon(name);
+    if (icon.availableSizes().count())
+      {
+      buttons->button(which)->setIcon(icon);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void setStandardIcons(QDialogButtonBox* buttons)
+{
+  setStandardIcon(buttons, QDialogButtonBox::Ok, "okay");
+  setStandardIcon(buttons, QDialogButtonBox::Cancel, "cancel");
+  setStandardIcon(buttons, QDialogButtonBox::Apply, "apply");
+  setStandardIcon(buttons, QDialogButtonBox::Reset, "reset");
+  setStandardIcon(buttons, QDialogButtonBox::RestoreDefaults, "reset");
+  setStandardIcon(buttons, QDialogButtonBox::Close, "close");
+}
+
+//-----------------------------------------------------------------------------
+void setApplicationIcon(const QString& name, QMainWindow* mainWindow)
+{
+  const QIcon icon = standardApplicationIcon(name);
+  qApp->setWindowIcon(icon);
+  mainWindow && (mainWindow->setWindowIcon(icon), false);
+}
+
+//-----------------------------------------------------------------------------
+void resizeColumnsToContents(QTreeWidget* tree, bool includeCollapsedItems)
+{
+  QList<QTreeWidgetItem*> collapsedItems;
+
+  // If including collapsed items, first expand the entire tree
+  if (includeCollapsedItems)
+    {
+    for (QTreeWidgetItemIterator iter(tree); *iter; ++iter)
+      {
+      QTreeWidgetItem* item = *iter;
+      if (item->childCount() && !item->isExpanded())
+        {
+        item->setExpanded(true);
+        collapsedItems.append(item);
+        }
+      }
+    }
+
+  int i = tree->columnCount();
+  while (i--)
+    {
+    // Resize to data
+    tree->resizeColumnToContents(i);
+
+    // Also resize to header, if applicable
+    if (!tree->isHeaderHidden())
+      {
+      // Get current size
+      int cw = tree->columnWidth(i);
+
+      // Get header text and icon
+      QString text = tree->headerItem()->text(i);
+      QIcon icon = tree->headerItem()->icon(i);
+
+      // Get header font, using widget font if unset
+      QFont font = tree->font();
+      QVariant hfd = tree->headerItem()->data(i, Qt::FontRole);
+      if (hfd.isValid() && hfd.canConvert(QVariant::Font))
+        {
+        font = hfd.value<QFont>();
+        }
+
+      // Calculate size of text and icon
+      QFontMetrics fm(font);
+      int tw = fm.width(text);
+      if (!icon.isNull())
+        {
+        tw += icon.actualSize(tree->iconSize()).width();
+        }
+
+      // Add space for margins and sort indicator
+      tw += 2 * tree->style()->pixelMetric(QStyle::PM_HeaderMargin);
+      tw += 2 * tree->style()->pixelMetric(QStyle::PM_HeaderGripMargin);
+      tw += tree->style()->pixelMetric(QStyle::PM_HeaderMarkSize);
+
+      // Use header size, if larger
+      if (tw > cw)
+        {
+        tree->setColumnWidth(i, tw);
+        }
+      }
+    }
+
+  // Restore collapsed state of anything we expanded
+  foreach (QTreeWidgetItem* item, collapsedItems)
+    item->setExpanded(false);
+}
+
+//-----------------------------------------------------------------------------
+void makeTransparent(QWidget* widget)
+{
+  QPalette::ColorRole cr = widget->backgroundRole();
+  QPalette palette = widget->palette();
+  palette.setBrush(cr, QBrush());
+  widget->setPalette(palette);
+}
+
+} // namespace qtUtil
diff --git a/Libraries/QtExtensions/Core/qtUtil.h b/Libraries/QtExtensions/Core/qtUtil.h
new file mode 100644
index 00000000..805561dc
--- /dev/null
+++ b/Libraries/QtExtensions/Core/qtUtil.h
@@ -0,0 +1,96 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtUtil_h
+#define __qtUtil_h
+
+#include "qtGlobal.h"
+
+class QDialogButtonBox;
+class QIcon;
+class QMainWindow;
+class QString;
+class QStringList;
+class QTreeWidget;
+class QWidget;
+
+template <typename T> class QList;
+
+namespace qtUtil
+{
+  /// Sort a list of strings in a locale-aware manner.
+  ///
+  /// This function sorts a ::QStringList using QString::localeAwareCompare as
+  /// the comparison function.
+  QTE_EXPORT QStringList localeSort(const QStringList&);
+
+  /// Retrieve icon resource by name.
+  ///
+  /// This function retrieves an icon from an applications resource pool based
+  /// on the icon's short name, assuming that the resource name follows the
+  /// standard template ':icons/<i>size</i>x<i>size</i>/<i>name</i>. The
+  /// returned icon has a single pixmap matching the requested size.
+  ///
+  /// \param name Short name of the icon to retrieve.
+  /// \param size Size to retrieve.
+  QTE_EXPORT QIcon standardIcon(const QString& name, int size);
+
+  /// Retrieve icon resource by name.
+  ///
+  /// This function retrieves an icon from an applications resource pool based
+  /// on the icon's short name. It will attempt to load multiple pixmaps for
+  /// the icon matching the list of requested sizes.
+  ///
+  /// \param name Short name of the icon to retrieve.
+  /// \param sizes List of sizes to retrieve.
+  QTE_EXPORT QIcon standardIcon(const QString& name, QList<int> sizes);
+
+  /// Retrieve action icon resource by name.
+  ///
+  /// This function retrieves an icon from an applications resource pool based
+  /// on the icon's short name, automatically loading multiple pixmaps for
+  /// standard action icon resolutions.
+  ///
+  /// \param name Short name of the icon to retrieve.
+  ///
+  /// \sa qtUtil::standardIcon
+  QTE_EXPORT QIcon standardActionIcon(const QString& name);
+
+  /// Retrieve application icon resource by name.
+  ///
+  /// This function retrieves an icon from an applications resource pool based
+  /// on the icon's short name, automatically loading multiple pixmaps for
+  /// standard application icon resolutions.
+  ///
+  /// \param name Short name of the icon to retrieve.
+  ///
+  /// \sa qtUtil::standardIcon
+  QTE_EXPORT QIcon standardApplicationIcon(const QString& name);
+
+  /// Apply "standard" action icons to dialog buttons.
+  ///
+  /// This function applies the "standard" icons (as returned by
+  /// standardActionIcon) to the standard buttons of a QDialogButtonBox. This
+  /// provides greater consistency for applications that use their own
+  /// "standard" icons for okay, cancel, etc. rather than the system icons.
+  QTE_EXPORT void setStandardIcons(QDialogButtonBox*);
+
+  QTE_EXPORT void setApplicationIcon(const QString& name, QMainWindow* = 0);
+
+  QTE_EXPORT void resizeColumnsToContents(QTreeWidget*,
+                                          bool includeCollapsedItems = true);
+
+  /// Make widget transparent.
+  ///
+  /// This function makes a widget "transparent" by setting the background
+  /// brush used to paint the widget's background (as determined by
+  /// QWidget::backgroundRole()) to a default-constructed (transparent) brush.
+  /// For most widgets, this will result in the widget not painting a
+  /// background, making it effectively transparent.
+  QTE_EXPORT void makeTransparent(QWidget*);
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.cxx b/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.cxx
new file mode 100644
index 00000000..6ed49c11
--- /dev/null
+++ b/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.cxx
@@ -0,0 +1,88 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtActionManagerDialog.h"
+#include "ui_qtActionManagerDialog.h"
+
+#include <QApplication>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QHash>
+#include <QLabel>
+#include <QLineEdit>
+
+#include "../Core/qtUtil.h"
+
+#include "../Util/qtActionManager.h"
+
+QTE_IMPLEMENT_D_FUNC(qtActionManagerDialog)
+
+//-----------------------------------------------------------------------------
+class qtActionManagerDialogPrivate
+{
+public:
+  Ui::qtActionManagerDialog UI;
+};
+
+//-----------------------------------------------------------------------------
+qtActionManagerDialog::qtActionManagerDialog(
+  QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags), d_ptr(new qtActionManagerDialogPrivate)
+{
+  QTE_D(qtActionManagerDialog);
+  d->UI.setupUi(this);
+  this->setWindowTitle("Configure Shortcuts - "
+                       + QApplication::applicationName());
+
+  d->UI.clearFilter->setIcon(qtUtil::standardIcon("clear-lineedit", 16));
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  connect(d->UI.filter, SIGNAL(textEdited(QString)),
+          this, SLOT(filterChanged(QString)));
+  connect(d->UI.clearFilter, SIGNAL(clicked()),
+          this, SLOT(filterChanged()));
+
+  if (qtAm)
+    {
+    qtAm->addDynamicActions(this);
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtActionManagerDialog::~qtActionManagerDialog()
+{
+  delete this->d_ptr;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionManagerDialog::registerAction(
+  QString key, QString displayGroup, QString text, QString icon,
+  QKeySequence defaultShortcut)
+{
+  QList<QKeySequence> defaultShortcuts;
+  defaultShortcuts.append(defaultShortcut);
+  this->registerAction(key, displayGroup, text, icon, defaultShortcuts);
+}
+
+//-----------------------------------------------------------------------------
+void qtActionManagerDialog::registerAction(
+  QString key, QString displayGroup, QString text, QString icon,
+  QList<QKeySequence> defaultShortcut)
+{
+  // \TODO not implemented yet!
+  Q_UNUSED(key);
+  Q_UNUSED(displayGroup);
+  Q_UNUSED(text);
+  Q_UNUSED(icon);
+  Q_UNUSED(defaultShortcut);
+}
+
+//-----------------------------------------------------------------------------
+void qtActionManagerDialog::filterChanged(QString text)
+{
+  QTE_D(qtActionManagerDialog);
+  d->UI.clearFilter->setEnabled(!text.isEmpty());
+}
diff --git a/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.h b/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.h
new file mode 100644
index 00000000..5c6059e9
--- /dev/null
+++ b/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtActionManagerDialog_h
+#define __qtActionManagerDialog_h
+
+#include <QDialog>
+#include <QString>
+
+#include "../Core/qtGlobal.h"
+
+class qtActionManagerDialogPrivate;
+
+class QTE_EXPORT qtActionManagerDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  qtActionManagerDialog(QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  virtual ~qtActionManagerDialog();
+
+protected slots:
+  void filterChanged(QString text = QString());
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(qtActionManagerDialog)
+  friend class qtActionFactory;
+
+  void registerAction(QString key, QString displayGroup, QString text,
+                      QString icon, QKeySequence defaultShortcut);
+  void registerAction(QString key, QString displayGroup, QString text,
+                      QString icon, QList<QKeySequence> defaultShortcuts);
+
+private:
+  QTE_DECLARE_PRIVATE(qtActionManagerDialog)
+  Q_DISABLE_COPY(qtActionManagerDialog)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.ui b/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.ui
new file mode 100644
index 00000000..431e875d
--- /dev/null
+++ b/Libraries/QtExtensions/Dialogs/qtActionManagerDialog.ui
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>qtActionManagerDialog</class>
+ <widget class="QDialog" name="qtActionManagerDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>342</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Configure Shortcuts</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Search:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QLineEdit" name="filter"/>
+     </item>
+     <item>
+      <widget class="QToolButton" name="clearFilter">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>.</string>
+       </property>
+       <property name="autoRaise">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QTreeView" name="shortcuts">
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::RestoreDefaults</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qtActionManagerDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qtActionManagerDialog</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>
+  <connection>
+   <sender>clearFilter</sender>
+   <signal>clicked()</signal>
+   <receiver>filter</receiver>
+   <slot>clear()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>375</x>
+     <y>18</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>200</x>
+     <y>18</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.cxx b/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.cxx
new file mode 100644
index 00000000..662e97dc
--- /dev/null
+++ b/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.cxx
@@ -0,0 +1,219 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtConfirmationDialog.h"
+#include "ui_qtConfirmationDialog.h"
+
+#include <QLayout>
+#include <QPushButton>
+#include <QSettings>
+
+#include "../Core/qtUtil.h"
+
+QTE_IMPLEMENT_D_FUNC(qtConfirmationDialog)
+
+//-----------------------------------------------------------------------------
+class qtConfirmationDialogPrivate
+{
+public:
+  QString AskKey;
+  qtConfirmationDialog::AskPreferenceScope Scope;
+  Ui::qtConfirmationDialog UI;
+};
+
+//-----------------------------------------------------------------------------
+qtConfirmationDialog::qtConfirmationDialog(
+  const QString& askKey, QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags), d_ptr(new qtConfirmationDialogPrivate)
+{
+  QTE_D(qtConfirmationDialog);
+
+  d->AskKey = askKey;
+
+  // Create UI
+  d->UI.setupUi(this);
+  this->setConfirmText("Continue");
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  // Set dialog icon
+  QStyle* style = this->style();
+  int iconSize = style->pixelMetric(QStyle::PM_MessageBoxIconSize, 0, this);
+  QIcon icon = style->standardIcon(QStyle::SP_MessageBoxWarning, 0, this);
+  QPixmap pixmap = icon.pixmap(iconSize, iconSize);
+  d->UI.image->setPixmap(pixmap);
+  d->UI.image->setFixedSize(pixmap.size());
+
+  // Hide unneeded "don't ask" controls
+  d->UI.noAsk->setHidden(askKey.isEmpty());
+  d->UI.noAskSession->hide();
+  d->UI.noAskEver->hide();
+}
+
+//-----------------------------------------------------------------------------
+qtConfirmationDialog::~qtConfirmationDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::setPrompt(const QString& text)
+{
+  QTE_D(qtConfirmationDialog);
+  d->UI.label->setText(text);
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::setScope(AskPreferenceScope scope)
+{
+  QTE_D(qtConfirmationDialog);
+
+  d->Scope = scope;
+
+  switch (scope)
+    {
+    case qtConfirmationDialog::RememberSession:
+      d->UI.noAskSession->setChecked(true);
+    case qtConfirmationDialog::RememberForever:
+      d->UI.noAskEver->setChecked(true);
+    default:
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::setConfirmText(const QString& text)
+{
+  QTE_D(qtConfirmationDialog);
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setText(text);
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::updateLabelSize()
+{
+  QTE_D(qtConfirmationDialog);
+  d->UI.label->setMinimumHeight(0);
+  d->UI.label->setMinimumHeight(
+    d->UI.label->heightForWidth(d->UI.label->width()));
+  this->setMinimumSize(this->layout()->minimumSize());
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::updateNoAskPreference(bool noAsk)
+{
+  QTE_D(qtConfirmationDialog);
+
+  // Enable or disable cancel (do not allow to cancel but also set 'no ask')
+  d->UI.buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(!noAsk);
+
+  if (d->Scope == qtConfirmationDialog::UserCanChoose)
+    {
+    // Show/hide 'when to not ask' controls
+    d->UI.noAskSession->setVisible(noAsk);
+    d->UI.noAskEver->setVisible(noAsk);
+
+    // Recalculate minimum size and update current size
+    this->setMinimumSize(this->layout()->minimumSize());
+    this->resize(this->size().expandedTo(this->minimumSize()));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::resizeEvent(QResizeEvent* e)
+{
+  QDialog::resizeEvent(e);
+  this->updateLabelSize();
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::showEvent(QShowEvent* e)
+{
+  QDialog::showEvent(e);
+  this->updateLabelSize();
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::accept()
+{
+  QTE_D(qtConfirmationDialog);
+  bool ask = !d->UI.noAsk->isChecked();
+  qtConfirmationDialog::setAsk(
+    d->AskKey, ask, ask || !d->UI.noAskEver->isChecked());
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+bool qtConfirmationDialog::getConfirmation(
+  QWidget* parent, const QString& askKey, const QString& prompt, QString title,
+  QString confirmText, AskPreferenceScope scope, Qt::WindowFlags flags)
+{
+  return qtConfirmationDialog::getConfirmation(
+    parent, askKey, prompt, confirmText, scope, title, flags);
+}
+
+//-----------------------------------------------------------------------------
+bool qtConfirmationDialog::getConfirmation(
+  QWidget* parent, const QString& askKey, const QString& prompt,
+  const QString& confirmText, qtConfirmationDialog::AskPreferenceScope scope,
+  QString title, Qt::WindowFlags flags)
+{
+  if (!qtConfirmationDialog::willAsk(askKey))
+    {
+    return true;
+    }
+
+  // Set up dialog
+  QScopedPointer<qtConfirmationDialog>self(
+    new qtConfirmationDialog(askKey, parent, flags));
+  self->setWindowTitle(title.isEmpty() ? qApp->applicationName() : title);
+  self->setPrompt(prompt);
+  if (!confirmText.isEmpty())
+    {
+    self->setConfirmText(confirmText);
+    }
+  self->setScope(scope);
+
+  // Execute dialog
+  return (self->exec() == QDialog::Accepted);
+}
+
+//-----------------------------------------------------------------------------
+bool qtConfirmationDialog::willAsk(const QString& key)
+{
+  if (key.isEmpty())
+    {
+    return true;
+    }
+
+  QVariantHash hash = qApp->property("ConfirmationDialogs").toHash();
+  if (hash.contains(key))
+    {
+    return hash[key].toBool();
+    }
+
+  QSettings settings;
+  settings.beginGroup("ConfirmationDialogs");
+  return settings.value(key, true).toBool();
+}
+
+//-----------------------------------------------------------------------------
+void qtConfirmationDialog::setAsk(
+  const QString& key, bool ask, bool persistent)
+{
+  if (key.isEmpty())
+    {
+    return;
+    }
+
+  QVariantHash hash = qApp->property("ConfirmationDialogs").toHash();
+  hash.insert(key, ask);
+  qApp->setProperty("ConfirmationDialogs", hash);
+
+  if (persistent)
+    {
+    QSettings settings;
+    settings.beginGroup("ConfirmationDialogs");
+    settings.setValue(key, ask);
+    }
+}
diff --git a/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.h b/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.h
new file mode 100644
index 00000000..96b7e64b
--- /dev/null
+++ b/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.h
@@ -0,0 +1,66 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtConfirmationDialog_h
+#define __qtConfirmationDialog_h
+
+#include <QDialog>
+
+#include "../Core/qtGlobal.h"
+
+class qtConfirmationDialogPrivate;
+
+class QTE_EXPORT qtConfirmationDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  enum AskPreferenceScope
+    {
+    RememberSession,
+    RememberForever,
+    UserCanChoose
+    };
+
+  qtConfirmationDialog(
+    const QString& askKey, QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  virtual ~qtConfirmationDialog();
+
+  void setPrompt(const QString&);
+  void setScope(AskPreferenceScope);
+  void setConfirmText(const QString&);
+
+  virtual void accept();
+
+  virtual void resizeEvent(QResizeEvent*);
+  virtual void showEvent(QShowEvent*);
+
+  static bool getConfirmation(
+    QWidget* parent, const QString& askKey, const QString& prompt,
+    const QString& confirmText, AskPreferenceScope scope,
+    QString title = QString(), Qt::WindowFlags flags = 0);
+  static bool getConfirmation(
+    QWidget* parent, const QString& askKey, const QString& prompt,
+    QString title = QString(), QString confirmText = QString(),
+    AskPreferenceScope scope = UserCanChoose, Qt::WindowFlags flags = 0);
+
+  static bool willAsk(const QString& key);
+  static void setAsk(const QString& key, bool ask, bool persistent);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtConfirmationDialog)
+
+  void updateLabelSize();
+
+protected slots:
+  void updateNoAskPreference(bool);
+
+private:
+  QTE_DECLARE_PRIVATE(qtConfirmationDialog)
+  Q_DISABLE_COPY(qtConfirmationDialog)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.ui b/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.ui
new file mode 100644
index 00000000..4e1c193b
--- /dev/null
+++ b/Libraries/QtExtensions/Dialogs/qtConfirmationDialog.ui
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>qtConfirmationDialog</class>
+ <widget class="QDialog" name="qtConfirmationDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>327</width>
+    <height>102</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="image">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" rowspan="2">
+    <widget class="QLabel" name="label">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+     <property name="margin">
+      <number>6</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>14</width>
+       <height>3</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QCheckBox" name="noAsk">
+       <property name="text">
+        <string>Do not ask again</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="noAskSession">
+       <property name="text">
+        <string>This Session</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="noAskEver">
+       <property name="text">
+        <string>Ever</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>qtConfirmationDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>322</x>
+     <y>147</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>153</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>qtConfirmationDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>254</x>
+     <y>147</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>248</x>
+     <y>96</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>noAsk</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>qtConfirmationDialog</receiver>
+   <slot>updateNoAskPreference(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>74</x>
+     <y>51</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>163</x>
+     <y>50</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+ <slots>
+  <slot>updateNoAskPreference(bool)</slot>
+ </slots>
+</ui>
diff --git a/Libraries/QtExtensions/Dialogs/qtDoubleInputDialog.cxx b/Libraries/QtExtensions/Dialogs/qtDoubleInputDialog.cxx
new file mode 100644
index 00000000..6eac97b5
--- /dev/null
+++ b/Libraries/QtExtensions/Dialogs/qtDoubleInputDialog.cxx
@@ -0,0 +1,140 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtDoubleInputDialog.h"
+
+#include <QDialogButtonBox>
+#include <QDoubleSpinBox>
+#include <QGridLayout>
+#include <QLabel>
+
+#include "../Core/qtUtil.h"
+
+QTE_IMPLEMENT_D_FUNC(qtDoubleInputDialog)
+
+//-----------------------------------------------------------------------------
+class qtDoubleInputDialogPrivate
+{
+public:
+  QLabel* label_;
+  QDoubleSpinBox* spinBox_;
+  QDialogButtonBox* buttons_;
+  QGridLayout* layout_;
+};
+
+//-----------------------------------------------------------------------------
+qtDoubleInputDialog::qtDoubleInputDialog(QWidget* parent,
+                                         Qt::WindowFlags flags)
+  : QDialog(parent, flags), d_ptr(new qtDoubleInputDialogPrivate)
+{
+  QTE_D(qtDoubleInputDialog);
+  d->layout_ = new QGridLayout;
+
+  // Create controls (properties are set by getDouble)
+  d->label_ = new QLabel;
+  d->spinBox_ = new QDoubleSpinBox;
+  d->buttons_ = new QDialogButtonBox(QDialogButtonBox::Ok |
+                                     QDialogButtonBox::Cancel);
+  qtUtil::setStandardIcons(d->buttons_);
+
+  // Connect buttons
+  connect(d->buttons_, SIGNAL(accepted()), this, SLOT(accept()));
+  connect(d->buttons_, SIGNAL(rejected()), this, SLOT(reject()));
+
+  // Layout controls
+  d->layout_->addWidget(d->label_, 0, 0);
+  d->layout_->addWidget(d->spinBox_, 0, 1);
+  d->layout_->addWidget(d->buttons_, 1, 0, 1, -1);
+  this->setLayout(d->layout_);
+}
+
+//-----------------------------------------------------------------------------
+qtDoubleInputDialog::~qtDoubleInputDialog()
+{
+  delete this->d_ptr;
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleInputDialog::setLabel(const QString& label)
+{
+  QTE_D(qtDoubleInputDialog);
+  d->label_->setText(label);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleInputDialog::setSpinProperties(
+  double value, double minValue, double maxValue, int decimals, double step)
+{
+  QTE_D(qtDoubleInputDialog);
+  d->spinBox_->setRange(minValue, maxValue);
+  d->spinBox_->setDecimals(decimals);
+  d->spinBox_->setSingleStep(step);
+  d->spinBox_->setValue(value);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleInputDialog::setSpecialValueText(const QString& special)
+{
+  QTE_D(qtDoubleInputDialog);
+  d->spinBox_->setSpecialValueText(special);
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleInputDialog::value()
+{
+  QTE_D(qtDoubleInputDialog);
+  return d->spinBox_->value();
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleInputDialog::getDouble(
+  QWidget* parent, const QString& title, const QString& label, double value,
+  double minValue, double maxValue, bool* okay, Qt::WindowFlags flags)
+{
+  return qtDoubleInputDialog::getDouble(
+    parent, title, label, value, minValue, maxValue,
+    QString(), 1, 1.0, okay, flags);
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleInputDialog::getDouble(
+  QWidget* parent, const QString& title, const QString& label, double value,
+  double minValue, double maxValue, int decimals, double step, bool* okay,
+  Qt::WindowFlags flags)
+{
+  return qtDoubleInputDialog::getDouble(
+    parent, title, label, value, minValue, maxValue,
+    QString(), decimals, step, okay, flags);
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleInputDialog::getDouble(
+  QWidget* parent, const QString& title, const QString& label, double value,
+  double minValue, double maxValue, const QString& specialValueText,
+  int decimals, double step, bool* okay, Qt::WindowFlags flags)
+{
+  // Set up dialog
+  qtDoubleInputDialog* self = new qtDoubleInputDialog(parent, flags);
+  self->setWindowTitle(title);
+  self->setLabel(label);
+  self->setSpinProperties(value, minValue, maxValue, decimals, step);
+  self->setSpecialValueText(specialValueText);
+
+  // Execute dialog
+  int result = self->exec();
+  if (okay)
+    {
+    *okay = (result == QDialog::Accepted);
+    }
+  if (result == QDialog::Accepted)
+    {
+    value = self->value();
+    }
+
+  // Done
+  delete self;
+  return value;
+}
diff --git a/Libraries/QtExtensions/Dialogs/qtDoubleInputDialog.h b/Libraries/QtExtensions/Dialogs/qtDoubleInputDialog.h
new file mode 100644
index 00000000..25b23835
--- /dev/null
+++ b/Libraries/QtExtensions/Dialogs/qtDoubleInputDialog.h
@@ -0,0 +1,58 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDoubleInputDialog_h
+#define __qtDoubleInputDialog_h
+
+#include <QDialog>
+#include <QPair>
+
+#include "../Core/qtGlobal.h"
+
+class QDoubleSpinBox;
+class qtDoubleInputDialogPrivate;
+
+class QTE_EXPORT qtDoubleInputDialog : protected QDialog
+{
+  Q_OBJECT
+
+public:
+  static double getDouble(
+    QWidget* parent, const QString& title, const QString& label, double value,
+    double minValue, double maxValue, bool* okay = 0,
+    Qt::WindowFlags flags = 0);
+
+  static double getDouble(
+    QWidget* parent, const QString& title, const QString& label, double value,
+    double minValue, double maxValue, int decimals = 1, double step = 1.0,
+    bool* okay = 0, Qt::WindowFlags flags = 0);
+
+  static double getDouble(
+    QWidget* parent, const QString& title, const QString& label, double value,
+    double minValue, double maxValue, const QString& specialValueText,
+    int decimals = 1, double step = 1.0, bool* okay = 0,
+    Qt::WindowFlags flags = 0);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(qtDoubleInputDialog)
+
+  qtDoubleInputDialog(QWidget* parent, Qt::WindowFlags flags);
+  virtual ~qtDoubleInputDialog();
+
+  void setLabel(const QString&);
+
+  void setSpinProperties(double value, double minValue, double maxValue,
+                         int decimals, double step);
+
+  void setSpecialValueText(const QString&);
+  double value();
+
+private:
+  QTE_DECLARE_PRIVATE(qtDoubleInputDialog)
+  Q_DISABLE_COPY(qtDoubleInputDialog)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Dom/qtDom.cxx b/Libraries/QtExtensions/Dom/qtDom.cxx
new file mode 100644
index 00000000..8b56d966
--- /dev/null
+++ b/Libraries/QtExtensions/Dom/qtDom.cxx
@@ -0,0 +1,58 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QDomElement>
+#include <QList>
+#include <QStringList>
+
+#include "qtDom.h"
+
+namespace qtDom
+{
+
+//-----------------------------------------------------------------------------
+QList<QDomElement> findElements(
+  QList<QDomElement>& result, const QDomNode& root,
+  const QStringList& selectors, int selectorIndex = 0)
+{
+  const QString selector = selectors[selectorIndex];
+
+  // Test root for match
+  if (root.isElement() && root.toElement().tagName() == selector)
+    {
+    if (selectors.count() == selectorIndex + 1)
+      {
+      // Node is a terminal match; add to result list
+      result.append(root.toElement());
+      }
+    else
+      {
+      // Node is an acceptable part of a match chain; continue search against
+      // children with shortened selector list
+      findElements(result, root, selectors, selectorIndex + 1);
+      }
+    }
+
+  // Iterate over child nodes
+  const QDomNodeList childNodes = root.childNodes();
+  for (int i = 0, k = childNodes.count(); i < k; ++i)
+    {
+    findElements(result, childNodes.at(i), selectors, selectorIndex);
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+QList<QDomElement> findElements(const QDomNode& root,
+                                const QString& selector)
+{
+  const QStringList selectors = selector.split(' ', QString::SkipEmptyParts);
+  QList<QDomElement> result;
+  return findElements(result, root, selectors);
+}
+
+} // namespace qtDom
diff --git a/Libraries/QtExtensions/Dom/qtDom.h b/Libraries/QtExtensions/Dom/qtDom.h
new file mode 100644
index 00000000..d1a11722
--- /dev/null
+++ b/Libraries/QtExtensions/Dom/qtDom.h
@@ -0,0 +1,34 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDom_h
+#define __qtDom_h
+
+#include "../Core/qtGlobal.h"
+
+class QDomElement;
+class QDomNode;
+
+template<typename T> class QList;
+
+namespace qtDom
+{
+  /// Find descendant nodes matching a specified selector.
+  ///
+  /// This function selects all descendant nodes that match \p selector. Unlike
+  /// qtDom::childElements, any descendants, not just immediate children, will
+  /// be returned. \p selector is a space-separated list of tag names, that
+  /// will be matched in the manner of CSS. The results will be ordered as they
+  /// appear in a depth-first traversal of \p root.
+  ///
+  /// \param root Root node to be searched.
+  /// \param selector Tag name, or space separated list of tag names, to match.
+  /// \return List of matching DOM elements.
+  QTE_EXPORT QList<QDomElement> findElements(const QDomNode& root,
+                                             const QString& selector);
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Dom/qtDomElement.cxx b/Libraries/QtExtensions/Dom/qtDomElement.cxx
new file mode 100644
index 00000000..422a9761
--- /dev/null
+++ b/Libraries/QtExtensions/Dom/qtDomElement.cxx
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtDomElement.h"
+
+//-----------------------------------------------------------------------------
+qtDomElement::qtDomElement() : Document(*reinterpret_cast<QDomDocument*>(0))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtDomElement::qtDomElement(
+  QDomDocument& doc, const QString& type, const QString& id) :
+  QDomElement(doc.createElement(type)), Document(doc)
+{
+  if (!id.isEmpty())
+    {
+    this->QDomElement::setAttribute("id", id);
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtDomElement::qtDomElement(QDomDocument& doc, const QDomElement& other) :
+  QDomElement(other), Document(doc)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtDomElement& qtDomElement::add(const QDomNode& node)
+{
+  this->appendChild(node);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+qtDomElement& qtDomElement::addText(const QString& text)
+{
+  this->appendChild(this->Document.createTextNode(text));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+#define SET_ATTRIBUTE(type) \
+qtDomElement& qtDomElement::setAttribute(const QString& name, type value) \
+{ \
+  this->QDomElement::setAttribute(name, value); \
+  return *this; \
+}
+
+SET_ATTRIBUTE(const QString&)
+SET_ATTRIBUTE(int)
+SET_ATTRIBUTE(uint)
+SET_ATTRIBUTE(qlonglong)
+SET_ATTRIBUTE(qulonglong)
+SET_ATTRIBUTE(float)
+SET_ATTRIBUTE(double)
diff --git a/Libraries/QtExtensions/Dom/qtDomElement.h b/Libraries/QtExtensions/Dom/qtDomElement.h
new file mode 100644
index 00000000..28ee8873
--- /dev/null
+++ b/Libraries/QtExtensions/Dom/qtDomElement.h
@@ -0,0 +1,147 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDomElement_h
+#define __qtDomElement_h
+
+#include <QDomElement>
+
+#include "../Core/qtGlobal.h"
+
+/// Convenience class for creating DOM documents.
+///
+/// qtDomElement is a convenience subclass of QDomElement that makes creating
+/// DOM documents more convenient. The main feature that qtDomElement provides
+/// is the ability to chain element addition. This makes it possible to create
+/// simple DOM trees without allocating local variables to every node.
+///
+/// As an example, consider the following pure-Qt code to create a simple HTML
+/// document:
+/// \code{.cpp}
+/// QDomDocument doc;
+/// QDomElement html = doc.createElement("html");
+///
+/// // Create header
+/// QDomElement head = doc.createElement("head");
+/// QDomElement contentType = doc.createElement("meta");
+/// contentType.setAttribute("http-equiv", "Content-Type")
+/// contentType.setAttribute("content", "text/xhtml;charset=UTF-8")
+/// head.appendChild(contentType);
+/// QDomElement title = doc.createElement("title");
+/// QDomText titleText = doc.createText("Example");
+/// title.appendChild(titleText);
+/// head.appendChild(title);
+/// html.appendChild(head);
+///
+/// // Create body
+/// QDomElement body = doc.createElement("body");
+/// QDomElement para = doc.createElement("p");
+/// para.setAttribute("id", "content");
+/// QDomText paraText = doc.createText("Hello, world!");
+/// para.appendChild(paraText);
+/// body.appendChild(para);
+/// html.appendChild(body);
+///
+/// // Set document content
+/// doc.appendChild(html);
+/// \endcode
+///
+/// As you can see, this requires a large number of local variables to be
+/// declared and given unique names. It is also inconvenient to add multiple
+/// children and/or attributes to a node, as the node variable must be
+/// specified each time.
+///
+/// Using qtDomElement, the above example can be rewritten as follows:
+/// \code{.cpp}
+/// QDomDocument doc;
+/// qtDomElement html(doc, "html");
+///
+/// // Create header
+/// html.add(qtDomElement(doc, "head")
+///            .add(qtDomElement(doc, "meta")
+///                   .setAttribute("http-equiv", "Content-Type")
+///                   .setAttribute("content", "text/xhtml;charset=UTF-8"))
+///            .add(qtDomElement(doc, "title").addText("Example")));
+///
+/// // Create body
+/// qtDomElement body(doc, "body");
+/// body.add(qtDomElement(doc, "p", "content")
+///            .addText("Hello, world!"));
+/// html.add(qtDomElement(doc, "body")
+///
+/// // Set document content
+/// doc.appendChild(html);
+/// \endcode
+class QTE_EXPORT qtDomElement : public QDomElement
+{
+public:
+  /// Create null element node.
+  qtDomElement();
+
+  /// Create a new element.
+  ///
+  /// This constructs a new element, using the QDomDocument \p doc. The new
+  /// element has the tag name \p tagName. If \p id is non-empty, the new
+  /// element's "id" attribute is set to \p id.
+  explicit qtDomElement(QDomDocument& doc,
+                        const QString& tagName,
+                        const QString& id = QString());
+
+  /// Construct a qtDomElement from a QDomElement.
+  ///
+  /// The new element is a copy of \p other. The QDomDocument \p doc is used
+  /// if the element needs to create additional nodes, as in addText(), and
+  /// should be the same document used to create \p other.
+  explicit qtDomElement(QDomDocument& doc, const QDomElement& other);
+
+  /// Append a new node to this element.
+  ///
+  /// This method appends the specified node to this element's children. Except
+  /// for the return value, this is equivalent to QDomNode::appendChild().
+  ///
+  /// \return Reference to this element.
+  qtDomElement& add(const QDomNode&);
+
+  /// Append text to this element.
+  ///
+  /// This method creates a new QDomText node with text \p text using the
+  /// document used to create this element, and appends the new node to this
+  /// element's children.
+  ///
+  /// \return Reference to this element.
+  qtDomElement& addText(const QString& text);
+
+  /// Define an attribute.
+  ///
+  /// Adds an attribute called \p name with value \p value. If an attribute
+  /// with the same name exists, its value is replaced by \p value.
+  ///
+  /// \return Reference to this element.
+  qtDomElement& setAttribute(const QString& name, const QString& value);
+
+  /// \{
+  /// Define an attribute.
+  ///
+  /// Adds an attribute called \p name with value \p value. If an attribute
+  /// with the same name exists, its value is replaced by \p value.
+  ///
+  /// The number is formatted according to the current locale.
+  ///
+  /// \return Reference to this element.
+  qtDomElement& setAttribute(const QString& name, int value);
+  qtDomElement& setAttribute(const QString& name, uint value);
+  qtDomElement& setAttribute(const QString& name, qlonglong value);
+  qtDomElement& setAttribute(const QString& name, qulonglong value);
+  qtDomElement& setAttribute(const QString& name, float value);
+  qtDomElement& setAttribute(const QString& name, double value);
+  /// \}
+
+protected:
+  /// Reference to the document from which this node was created
+  QDomDocument& Document;
+};
+
+#endif
diff --git a/Libraries/QtExtensions/IO/qtKstParser.cxx b/Libraries/QtExtensions/IO/qtKstParser.cxx
new file mode 100644
index 00000000..be38eeae
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtKstParser.cxx
@@ -0,0 +1,555 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtKstParser.h"
+
+#include <QRegExp>
+
+#include <cerrno>
+#include <cmath>
+#include <cstdlib>
+
+#include "../Core/qtMath.h"
+
+// Don't use these; they assert on MSVC when fed non-ASCII characters
+#define isspace { ERROR: isspace is broken on MSVC }
+#define isdigit { ERROR: isdigit is broken on MSVC }
+
+#ifdef Q_OS_WIN
+  #define strtoll _strtoi64
+#endif
+
+typedef const char* regex_pattern;
+
+#define XD "[\\dabcdef]"
+
+static regex_pattern
+reCommonNumber  = "([+-])?"                 // [1] significand sign
+                  "(\\d+)"                  // [2] significand integer part
+                  "([.,](\\d*))?"           // [4] significand fractional part
+                  "(e([+-]?\\d+))?"         // [6] exponent
+                  "(b(\\d+))?",             // [8] base value
+
+reHexNumber     = "([+-])?"                 // [1] significand sign
+                  "0x(" XD "+)"             // [2] significand integer part
+                  "([.,](" XD "*))?"        // [4] significand fractional part
+                  "([p^]([+-]?" XD "+))?",  // [6] exponent
+
+reExtBaseNumber = "([+-])?"                 // [1] significand sign
+                  "(\\w+)"                  // [2] significand integer part
+                  "([.,](\\w*))?"           // [4] significand fractional part
+                  "(\\^([+-]?\\w+))?"       // [6] exponent
+                  "(@(\\d+))?",             // [8] base value
+
+reArcNumberS    = "([+-])?"                 // [1] sign
+                  "((\\d+)"                 // [3] degrees
+                  "[d\xc2\xb0])?"           //     degree marker
+                  "((\\d+)"                 // [5] minutes
+                  "['\xe2\x80\xb2])?"       //     minute marker
+                  "((\\d+)"                 // [7] seconds integer part
+                  "([.,](\\d*))?"           // [9] seconds fractional part
+                  "[\"\xe2\x80\xb3])?",     //     second marker
+
+reArcNumberD    = "((\\d+)"                 // [2] degrees
+                  "[d\xc2\xb0])?"           //     degree marker
+                  "((\\d+)"                 // [4] minutes
+                  "['\xe2\x80\xb2])?"       //     minute marker
+                  "((\\d+)"                 // [6] seconds integer part
+                  "([.,](\\d*))?"           // [8] seconds fractional part
+                  "[\"\xe2\x80\xb3])?"      //     second marker
+                  "([nsew])";               // [9] direction
+
+//-----------------------------------------------------------------------------
+double infinity(bool negative)
+{
+  return (negative ? -qInf() : qInf());
+}
+
+//-----------------------------------------------------------------------------
+double zero(bool negative)
+{
+  return 1.0 / infinity(negative);
+}
+
+//-----------------------------------------------------------------------------
+static bool digitsValid(const QString& str, int base = 10)
+{
+  bool okay;
+
+  int n = str.length();
+  while (n--)
+    {
+    str.mid(n, 1).toInt(&okay, base);
+    if (!okay)
+      {
+      return false;
+      }
+    }
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+static bool parseBasicLong(qint64& out, const QString& in)
+{
+  const QByteArray inAscii = in.toAscii();
+
+  const int k = inAscii.length();
+  if (k < 1 || !in[0].isDigit())
+    {
+    return false;
+    }
+
+  char* end;
+  errno = 0;
+  out = strtoll(inAscii.constData(), &end, 10);
+  return (*end == 0 && errno == 0);
+}
+
+//-----------------------------------------------------------------------------
+static bool parseLong(qint64& out, const QString& ss, QString sip, QString sfp,
+                      const QString& exp, const QString& b, int bmax = 36)
+{
+  bool okay;
+
+  // Read base, if any
+  int base = 10;
+  if (!b.isEmpty())
+    {
+    base = b.toInt(&okay);
+    if (!okay || base > bmax || base < 2)
+      {
+      return false;
+      }
+    }
+
+  // Read exponent, if any
+  qint64 exponent = 0;
+  if (!exp.isEmpty())
+    {
+    exponent = exp.toLongLong(&okay, base);
+    if (!okay)
+      {
+      return false;
+      }
+    }
+  // If an exponent is present, shift digits between the integer part and
+  // fractional part accordingly
+  while (exponent > 0)
+    {
+    if (sfp.isEmpty())
+      {
+      sip += '0';
+      }
+    else
+      {
+      sip += sfp.left(1);
+      sfp = sfp.mid(1);
+      }
+    --exponent;
+    }
+  while (exponent < 0)
+    {
+    if (sip.isEmpty())
+      {
+      if (digitsValid(sfp, base))
+        {
+        out = 0;
+        return true;
+        }
+      return false;
+      }
+    sfp = sip.right(1) + sfp;
+    sip = sip.left(sip.length() - 1);
+    ++exponent;
+    }
+
+  // Okay, we have the normalized (exponent == 0) integer part; discard the
+  // fractional part, add the sign, and convert
+  if (!digitsValid(sfp, base))
+    {
+    return false;
+    }
+  if (sip.isEmpty())
+    {
+    out = 0;
+    return true;
+    }
+  sip = ss + sip;
+  out = sip.toLongLong(&okay, base);
+  return okay;
+}
+
+//-----------------------------------------------------------------------------
+static bool parseBasicReal(double& out, const QString& in)
+{
+  const int k = in.length();
+  if (k < 1)
+    {
+    return false;
+    }
+
+  double result = 0.0;
+  double sign = 1.0;
+  double exp = 1.0;
+  int pos = 0;
+
+  // Test for sign
+  if (in[pos] == '-')
+    {
+    sign = -1.0;
+    ++pos; // skip sign
+    }
+  else if (in[pos] == '+')
+    {
+    ++pos; // skip sign
+    }
+
+  // Read integer part
+  while (pos < k)
+    {
+    const QChar d = in[pos];
+    if (!d.isDigit())
+      {
+      break;
+      }
+
+    result = 10.0 * result + d.digitValue();
+    ++pos;
+    }
+
+  // Check for decimal part
+  if (pos < k)
+    {
+    const QChar n = in[pos];
+    if (n == '.' || n == ',')
+      {
+      ++pos;
+
+      // Read fractional part
+      int dp = -1;
+      while (pos < k)
+        {
+        const QChar d = in[pos];
+        if (!d.isDigit())
+          {
+          break;
+          }
+
+        result += pow(10.0, dp) * d.digitValue();
+        ++pos;
+        --dp;
+        }
+      }
+
+    // Check for exponent
+    if (pos < k && result != 0.0 && in[pos].toLower() == 'e')
+      {
+      // Parse exponent part
+      qint64 e;
+      if (!parseBasicLong(e, in.mid(pos + 1)))
+        {
+        return false;
+        }
+      exp = pow(10.0, static_cast<double>(e));
+      }
+    }
+
+  // Either we're done, or ran into something we can't parse
+  if (pos < k)
+    {
+    return false;
+    }
+
+  // Success
+  out = sign * result * exp;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+static bool parseReal(double& out, const QString& ss, QString sip, QString sfp,
+                      const QString& exp, const QString& b, int bmax = 36)
+{
+  bool okay;
+
+  // Read base, if any
+  int base = 10;
+  if (!b.isEmpty())
+    {
+    base = b.toInt(&okay);
+    if (!okay || base > bmax || base < 2)
+      {
+      return false;
+      }
+    }
+
+  // Evaluate the sign
+  bool negative = (ss == "-");
+
+  // Read exponent, if any
+  qint64 exponent = 0;
+  if (!exp.isEmpty())
+    {
+    exponent = exp.toLongLong(&okay, base);
+    if (!okay)
+      {
+      if (digitsValid(exp, base) &&
+          digitsValid(sip, base) && digitsValid(sfp, base))
+        {
+        // If the number is all valid digits, but the exponent is unreasonably
+        // large or small, then return our respective overflow or underflow
+        // value, i.e. +/- infinity or +/- 0.0
+        if (exp.startsWith('-'))
+          {
+          out = zero(negative);
+          }
+        else
+          {
+          out = infinity(negative);
+          }
+        return true;
+        }
+      return false;
+      }
+    }
+
+  // Calculate a cutoff; up to this value we will shift around digits and
+  // adjust the exponent so that the accumulator is always an integer, to
+  // minimize rounding error
+  quint64 cutoff = (1LL << 48) / base;
+  long double macc = 0.0;
+
+  while (!sip.isEmpty() || !sfp.isEmpty())
+    {
+    long double acc = 0.0;
+    while (!sip.isEmpty() || !sfp.isEmpty())
+      {
+      // If the integer part runs out of digits, swipe the first one from the
+      // fractional part and adjust the exponent
+      if (sip.isEmpty())
+        {
+        sip = sfp.left(1);
+        sfp = sfp.mid(1);
+        exponent--;
+        }
+      // Accumulate next digit
+      int d = sip.left(1).toInt(&okay, base);
+      sip = sip.mid(1);
+      if (!okay)
+        {
+        return false;
+        }
+      acc = (acc * base) + d;
+      if (acc > cutoff)
+        {
+        break;
+        }
+      }
+
+    // At this point, we are either out of digits, or the remaining digits will
+    // start losing precision... in either case apply the exponent to what we
+    // have so far
+    long double ev = pow(static_cast<long double>(base),
+                         static_cast<long double>(exponent));
+    acc *= ev;
+
+    if (macc == 0.0)
+      {
+      // If this is the first pass, reduce the cutoff so we process only a
+      // handful more digits, then bail since we won't be contributing
+      // meaningfully to the result after that
+      cutoff = 1 << 24;
+      macc = acc;
+      }
+    else
+      {
+      // After the second pass, add the next grouping to the previous value and
+      // bail, since whatever is left isn't going to contribute meaningfully to
+      // the result
+      macc += acc;
+      if (!(digitsValid(sip, base) && digitsValid(sfp, base)))
+        {
+        return false;
+        }
+      break;
+      }
+    }
+
+  out = (negative ? -macc : macc);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+static bool parseArcLong(qint64& out, const QString& sign,
+                         QString deg, const QString& min,
+                         const QString& sip, const QString& sfp)
+{
+  bool okay;
+
+  if (!digitsValid(sfp))
+    {
+    return false;
+    }
+  if (deg.isEmpty() && min.isEmpty() && sip.isEmpty() && sfp.isEmpty())
+    {
+    return false;
+    }
+
+  out = 0;
+  if (!deg.isEmpty())
+    {
+    out += deg.toLongLong(&okay);
+    if (!okay)
+      {
+      return false;
+      }
+    }
+
+  if (!min.isEmpty())
+    {
+    quint64 acc = min.left(min.length() - 1).toLongLong(&okay) / 6;
+    if (!okay)
+      {
+      return false;
+      }
+    out += static_cast<qint64>(acc);
+    if (out < 0)
+      {
+      return false;
+      }
+    }
+
+  if (!sip.isEmpty())
+    {
+    quint64 acc = sip.left(sip.length() - 2).toLongLong(&okay) / 36;
+    if (!okay)
+      {
+      return false;
+      }
+    out += static_cast<qint64>(acc);
+    if (out < 0)
+      {
+      return false;
+      }
+    }
+
+  if (QRegExp("[-sw]").exactMatch(sign))
+    {
+    out = -out;
+    }
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+static bool parseArcReal(double& out, const QString& sign,
+                         const QString& deg, const QString& min,
+                         const QString& sip, const QString& sfp)
+{
+  bool okay;
+
+  if (deg.isEmpty() && min.isEmpty() && sip.isEmpty() && sfp.isEmpty())
+    {
+    return false;
+    }
+
+  out = 0;
+  if (!deg.isEmpty())
+    {
+    out += deg.toDouble(&okay);
+    if (!okay)
+      {
+      return false;
+      }
+    }
+
+  if (!min.isEmpty())
+    {
+    out += min.toDouble(&okay) / 60.0;
+    if (!okay)
+      {
+      return false;
+      }
+    }
+
+  if (!(sip.isEmpty() && sfp.isEmpty()))
+    {
+    QString sec = sip + '.' + sfp;
+    out += sec.toDouble(&okay) / 3600.0;
+    if (!okay)
+      {
+      return false;
+      }
+    }
+
+  if (QRegExp("[-sw]").exactMatch(sign))
+    {
+    out = -out;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+#define PARSE_NUMBER(_pat, _func, ...) do { \
+  QRegExp re(QString::fromUtf8(_pat)); \
+  if (re.exactMatch(str)) \
+    return _func(out, __VA_ARGS__); \
+  } while (0)
+
+//-----------------------------------------------------------------------------
+bool qtKstParser::parseLong(const QString& str, qint64& out)
+{
+  // Handle trivial case
+  if (parseBasicLong(out, str))
+    {
+    return true;
+    }
+
+  // Handle common, hexadecimal and high-base numbers
+  PARSE_NUMBER(reCommonNumber, parseLong,
+               re.cap(1), re.cap(2), re.cap(4), re.cap(6), re.cap(8), 10);
+  PARSE_NUMBER(reHexNumber, parseLong,
+               re.cap(1), re.cap(2), re.cap(4), re.cap(6), "16");
+  PARSE_NUMBER(reExtBaseNumber, parseLong,
+               re.cap(1), re.cap(2), re.cap(4), re.cap(6), re.cap(8));
+
+  // Handle arc-length numbers
+  PARSE_NUMBER(reArcNumberS, parseArcLong,
+               re.cap(1), re.cap(3), re.cap(5), re.cap(7), re.cap(9));
+  PARSE_NUMBER(reArcNumberD, parseArcLong,
+               re.cap(9), re.cap(2), re.cap(4), re.cap(6), re.cap(8));
+
+  // No match
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstParser::parseReal(const QString& str, double& out)
+{
+  // Handle trivial case
+  if (parseBasicReal(out, str))
+    {
+    return true;
+    }
+
+  QRegExp re;
+
+  // Handle common, hexadecimal and high-base numbers
+  PARSE_NUMBER(reCommonNumber, parseReal,
+               re.cap(1), re.cap(2), re.cap(4), re.cap(6), re.cap(8), 10);
+  PARSE_NUMBER(reHexNumber, parseReal,
+               re.cap(1), re.cap(2), re.cap(4), re.cap(6), "16");
+  PARSE_NUMBER(reExtBaseNumber, parseReal,
+               re.cap(1), re.cap(2), re.cap(4), re.cap(6), re.cap(8));
+
+  // Handle arc-length numbers
+  PARSE_NUMBER(reArcNumberS, parseArcReal,
+               re.cap(1), re.cap(3), re.cap(5), re.cap(7), re.cap(9));
+  PARSE_NUMBER(reArcNumberD, parseArcReal,
+               re.cap(9), re.cap(2), re.cap(4), re.cap(6), re.cap(8));
+
+  // No match
+  return false;
+}
diff --git a/Libraries/QtExtensions/IO/qtKstParser.h b/Libraries/QtExtensions/IO/qtKstParser.h
new file mode 100644
index 00000000..d602ccb6
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtKstParser.h
@@ -0,0 +1,13 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QString>
+
+namespace qtKstParser
+{
+  bool parseLong(const QString& str, qint64& out);
+  bool parseReal(const QString& str, double& out);
+}
diff --git a/Libraries/QtExtensions/IO/qtKstReader.cxx b/Libraries/QtExtensions/IO/qtKstReader.cxx
new file mode 100644
index 00000000..05cf4a76
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtKstReader.cxx
@@ -0,0 +1,740 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QFile>
+#include <QDebug>
+
+#include <limits>
+
+#include "qtKstReader.h"
+#include "qtKstParser.h"
+#include "qtKstSeparator.h"
+
+QTE_IMPLEMENT_D_FUNC(qtKstReader)
+
+//BEGIN qtKstReader value
+
+//-----------------------------------------------------------------------------
+class qtKstReader::Value
+{
+public:
+  QString value;
+  qtKstReader::Record array;
+
+  bool isEmpty() const;
+  bool readString(QString& out) const;
+  bool readInt(int& out) const;
+  bool readLong(qint64& out) const;
+  bool readReal(double& out) const;
+  bool readIntArray(QList<int>& out) const;
+  bool readLongArray(QList<qint64>& out) const;
+  bool readRealArray(QList<double>& out) const;
+};
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::Value::isEmpty() const
+{
+  return this->array.isEmpty() && this->value.isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::Value::readString(QString& out) const
+{
+  if (this->array.count() > 1)
+    {
+    return false;
+    }
+
+  if (this->array.count())
+    {
+    return this->array[0].readString(out);
+    }
+
+  out = this->value;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::Value::readLong(qint64& out) const
+{
+  QString v;
+  if (!this->readString(v))
+    {
+    return false;
+    }
+  return qtKstParser::parseLong(v.toLower(), out);
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::Value::readInt(int& out) const
+{
+  qint64 l;
+  if (!this->readLong(l))
+    {
+    return false;
+    }
+  if (l > std::numeric_limits<int>::max())
+    {
+    return false;
+    }
+  if (l < std::numeric_limits<int>::min())
+    {
+    return false;
+    }
+  out = static_cast<int>(l);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::Value::readReal(double& out) const
+{
+  QString v;
+  if (!this->readString(v))
+    {
+    return false;
+    }
+  return qtKstParser::parseReal(v.toLower(), out);
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::Value::readIntArray(QList<int>& out) const
+{
+  if (this->array.isEmpty())
+    {
+    return false;
+    }
+
+  out.clear();
+  if (this->array.count() == 1 && this->array[0].isEmpty())
+    {
+    return true;
+    }
+
+  foreach (Value v, this->array)
+    {
+    int e;
+    if (!v.readInt(e))
+      {
+      return false;
+      }
+    out.append(e);
+    }
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::Value::readLongArray(QList<qint64>& out) const
+{
+  if (this->array.isEmpty())
+    {
+    return false;
+    }
+
+  out.clear();
+  if (this->array.count() == 1 && this->array[0].isEmpty())
+    {
+    return true;
+    }
+
+  foreach (Value v, this->array)
+    {
+    qint64 e;
+    if (!v.readLong(e))
+      {
+      return false;
+      }
+    out.append(e);
+    }
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::Value::readRealArray(QList<double>& out) const
+{
+  if (this->array.isEmpty())
+    {
+    return false;
+    }
+
+  out.clear();
+  if (this->array.count() == 1 && this->array[0].isEmpty())
+    {
+    return true;
+    }
+
+  foreach (Value v, this->array)
+    {
+    double e;
+    if (!v.readReal(e))
+      {
+      return false;
+      }
+    out.append(e);
+    }
+  return true;
+}
+
+//END qtKstReader value
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtKstReader reader
+
+//-----------------------------------------------------------------------------
+class qtKstReaderPrivate
+{
+public:
+
+  explicit qtKstReaderPrivate(const QUrl& url,
+                              const QRegExp& separator,
+                              const QRegExp& terminator);
+  explicit qtKstReaderPrivate(const QString& data,
+                              const QRegExp& separator,
+                              const QRegExp& terminator);
+  explicit qtKstReaderPrivate(const qtKstReader::Record& record);
+  explicit qtKstReaderPrivate(const QList<qtKstReader::Record>& records);
+
+  bool valid_;
+  int record_;
+  int value_;
+
+  QList<qtKstReader::Record> records_;
+
+protected:
+  void init(const QString& data,
+            const QRegExp& separator, const QRegExp& terminator);
+  bool readRecord(const QString& data, int& pos, qtKstReader::Record& record,
+                  qtKstSeparator separator, qtKstSeparator terminator) const;
+  bool readString(const QString& data, int& pos, QString& value) const;
+  bool readComment(const QString& data, int& pos) const;
+};
+
+//-----------------------------------------------------------------------------
+qtKstReaderPrivate::qtKstReaderPrivate(
+  const QUrl& url, const QRegExp& separator, const QRegExp& terminator)
+  : valid_(false), record_(0), value_(0)
+{
+  QFile file(url.toLocalFile());
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    return;
+    }
+
+  init(QString::fromUtf8(file.readAll()), separator, terminator);
+}
+
+//-----------------------------------------------------------------------------
+qtKstReaderPrivate::qtKstReaderPrivate(
+  const QString& data, const QRegExp& separator, const QRegExp& terminator)
+  : valid_(false), record_(0), value_(0)
+{
+  init(data, separator, terminator);
+}
+
+//-----------------------------------------------------------------------------
+qtKstReaderPrivate::qtKstReaderPrivate(const qtKstReader::Record& record)
+  : valid_(true), record_(0), value_(0)
+{
+  this->records_.append(record);
+}
+
+//-----------------------------------------------------------------------------
+qtKstReaderPrivate::qtKstReaderPrivate(
+  const QList<qtKstReader::Record>& records)
+  : valid_(true), record_(0), value_(0), records_(records)
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtKstReaderPrivate::init(
+  const QString& data, const QRegExp& separator, const QRegExp& terminator)
+{
+  if (data.isEmpty())
+    {
+    return;
+    }
+
+  int pos = 0;
+  while (pos < data.length())
+    {
+    qtKstReader::Record record;
+    if (!this->readRecord(data, pos, record, separator, terminator))
+      {
+      return;
+      }
+    if (record.count())
+      {
+      this->records_.append(record);
+      }
+    }
+  this->valid_ = !this->records_.isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReaderPrivate::readRecord(
+  const QString& data, int& pos, qtKstReader::Record& record,
+  qtKstSeparator separator, qtKstSeparator terminator) const
+{
+  bool acceptString = true;
+  bool acceptValue = true;
+  bool acceptArray = true;
+
+  qtKstReader::Value value;
+  while (pos < data.length())
+    {
+    // Check for end of record
+    if (terminator.matches(data, pos))
+      {
+      pos += terminator.matchedLength();
+      record.append(value);
+      return true;
+      }
+
+    // Check for end of value
+    if (separator.matches(data, pos))
+      {
+      pos += separator.matchedLength();
+      record.append(value);
+      value = qtKstReader::Value();
+      acceptString = true;
+      acceptValue = true;
+      acceptArray = true;
+      continue;
+      }
+
+    // Take character
+    QChar c = data[pos++];
+    if (c.isSpace())
+      {
+      acceptString = true;
+      continue;
+      }
+
+    // Check for comment
+    if (c == '#')
+      {
+      if (!this->readComment(data, pos))
+        {
+        return false;
+        }
+      continue;
+      }
+
+    // Check for array
+    if (acceptArray && c == '[')
+      {
+      const QRegExp arrayTerminator("]", Qt::CaseSensitive,
+                                    QRegExp::FixedString);
+      if (!this->readRecord(data, pos, value.array,
+                            separator, arrayTerminator))
+        {
+        return false;
+        }
+      if (value.array.isEmpty())
+        {
+        qDebug() << "KST parse error: end of file encountered"
+                    " while looking for record terminator" << QChar(']');
+        return false;
+        }
+      acceptValue = false;
+      acceptArray = false;
+      continue;
+      }
+
+    // Check for value after array
+    if (!acceptValue)
+      {
+      qDebug() << "KST parse error at" << pos
+               << ": value not expected at this time";
+      return false;
+      }
+
+    // Check for string
+    if (acceptString && c == '"')
+      {
+      if (!this->readString(data, pos, value.value))
+        {
+        return false;
+        }
+      acceptArray = false;
+      continue;
+      }
+
+    // Value
+    acceptString = false;
+    acceptArray = false;
+    value.value += c;
+    }
+
+  // A file may end with a comment or extra whitespace
+  if (acceptValue && record.isEmpty() &&
+      value.value.isEmpty() && this->records_.count())
+    {
+    return true;
+    }
+
+  qDebug() << "KST parse error: end of file encountered"
+              " while looking for record terminator"
+           << terminator.pattern();
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReaderPrivate::readString(const QString& data, int& pos,
+                                    QString& value) const
+{
+  while (pos < data.length())
+    {
+    // Take character
+    QChar c = data[pos++];
+
+    // Check for escape
+    if (c == '\\')
+      {
+      if (pos + 1 >= data.length())
+        {
+        qDebug() << "KST parse error: escape character occurred at end of file";
+        return false;
+        }
+      c = data[pos++];
+      // Treat escaped newline as line continuation
+      if (c == '\n')
+        {
+        continue;
+        }
+      }
+    // Check for end of string
+    else if (c == '"')
+      {
+      return true;
+      }
+    value += c;
+    }
+
+  qDebug() << "KST parse error: end of file encountered"
+              " while looking for string terminator" << QChar('"');
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReaderPrivate::readComment(const QString& data, int& pos) const
+{
+  while (pos < data.length())
+    {
+    // Take character
+    QChar c = data[pos++];
+
+    // Check for end of line
+    if (c == '\n')
+      {
+      return true;
+      }
+    }
+
+  qDebug() << "KST parse error: end of file encountered"
+              " while looking end of line following comment";
+  return false;
+}
+
+//END qtKstReader reader
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtKstReader API
+
+//-----------------------------------------------------------------------------
+QRegExp qtKstReader::defaultSeparator()
+{
+  return QRegExp(",", Qt::CaseSensitive, QRegExp::FixedString);
+}
+
+//-----------------------------------------------------------------------------
+QRegExp qtKstReader::defaultTerminator()
+{
+  return QRegExp(";", Qt::CaseSensitive, QRegExp::FixedString);
+}
+
+//-----------------------------------------------------------------------------
+qtKstReader::qtKstReader() : d_ptr(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtKstReader::qtKstReader(
+  const QUrl& url, const QRegExp& separator, const QRegExp& terminator)
+  : d_ptr(new qtKstReaderPrivate(url, separator, terminator))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtKstReader::qtKstReader(
+  const QString& data, const QRegExp& separator, const QRegExp& terminator)
+  : d_ptr(new qtKstReaderPrivate(data, separator, terminator))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtKstReader::~qtKstReader()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::isValid() const
+{
+  QTE_D_CONST(qtKstReader);
+  return d && d->valid_;
+}
+
+//-----------------------------------------------------------------------------
+#define TEST_RECORD_POINTER() do { \
+  if (record < 0) \
+    record = this->currentRecord(); \
+  if (this->isEndOfFile(record)) \
+    return false; \
+  } while(0)
+
+#define TEST_VALUE_POINTER() do { \
+  if(value < 0) \
+    value = this->currentValue(); \
+  if(this->isEndOfRecord(value, record)) \
+    return false; \
+  } while(0)
+
+#define TEST_POINTER() do { \
+  TEST_RECORD_POINTER(); \
+  TEST_VALUE_POINTER(); \
+  } while(0)
+
+//-----------------------------------------------------------------------------
+int qtKstReader::recordCount() const
+{
+  if (!this->isValid())
+    {
+    return -1;
+    }
+
+  QTE_D_CONST(qtKstReader);
+  return d->records_.count();
+}
+
+//-----------------------------------------------------------------------------
+int qtKstReader::valueCount(int record) const
+{
+  if (this->isEndOfFile(record))
+    {
+    return -1;
+    }
+
+  QTE_D_CONST(qtKstReader);
+
+  if (record < 0)
+    {
+    record = d->record_;
+    }
+
+  return d->records_[record].count();
+}
+
+//-----------------------------------------------------------------------------
+int qtKstReader::currentRecord() const
+{
+  if (!this->isValid())
+    {
+    return -1;
+    }
+
+  QTE_D_CONST(qtKstReader);
+  return d->record_;
+}
+
+//-----------------------------------------------------------------------------
+int qtKstReader::currentValue() const
+{
+  if (!this->isValid())
+    {
+    return -1;
+    }
+
+  QTE_D_CONST(qtKstReader);
+  return d->value_;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::nextValue()
+{
+  if (isEndOfRecord())
+    {
+    return false;
+    }
+
+  QTE_D(qtKstReader);
+  d->value_++;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::nextRecord()
+{
+  if (isEndOfFile())
+    {
+    return false;
+    }
+
+  QTE_D(qtKstReader);
+  d->record_++;
+  d->value_ = 0;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::seek(int record, int value)
+{
+  if (record < 0 || value < 0)
+    {
+    return false;
+    }
+  TEST_POINTER();
+
+  QTE_D(qtKstReader);
+  d->record_ = record;
+  d->value_ = value;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::isEndOfRecord(int value, int record) const
+{
+  if (value < 0)
+    {
+    value = this->currentValue();
+    }
+  return (value >= this->valueCount(record));
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::isEndOfFile(int record) const
+{
+  if (record < 0)
+    {
+    record = this->currentRecord();
+    }
+  return (record >= this->recordCount());
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::isValueEmpty(int value, int record) const
+{
+  if (this->isEndOfRecord(value, record))
+    {
+    return true;
+    }
+
+  TEST_POINTER();
+
+  QTE_D_CONST(qtKstReader);
+  return d->records_[record][value].isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::isArrayEmpty(int value, int record) const
+{
+  if (this->isValueEmpty(value, record))
+    {
+    return true;
+    }
+
+  TEST_POINTER();
+
+  QTE_D_CONST(qtKstReader);
+  const Record& r = d->records_[record][value].array;
+
+  if (r.count() == 0)
+    {
+    return d->records_[record][value].value.isEmpty();
+    }
+
+  if (r.count() > 1)
+    {
+    return false;
+    }
+
+  return r[0].isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+#define READ_TYPE(_name, _type) \
+  bool qtKstReader::read##_name(_type& out, int value, int record) const \
+    { \
+    TEST_POINTER(); \
+    QTE_D_CONST(qtKstReader); \
+    return d->records_[record][value].read##_name(out); \
+    }
+#define READ_TYPE_ARRAY(_name, _type) \
+  READ_TYPE(_name##Array, QList<_type>)
+
+READ_TYPE(String, QString)
+READ_TYPE(Int,    int)
+READ_TYPE(Long,   qint64)
+READ_TYPE(Real,   double)
+READ_TYPE_ARRAY(Int,  int)
+READ_TYPE_ARRAY(Long, qint64)
+READ_TYPE_ARRAY(Real, double)
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::readArray(qtKstReader& out, int value, int record) const
+{
+  QTE_D_CONST(qtKstReader);
+
+  if (out.d_ptr)
+    {
+    return false;
+    }
+
+  TEST_POINTER();
+
+  const qtKstReader::Value& v = d->records_[record][value];
+  if (v.array.isEmpty())
+    {
+    return false;
+    }
+
+  out.d_ptr.reset(new qtKstReaderPrivate(v.array));
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstReader::readTable(qtKstReader& out, int value, int record) const
+{
+  if (out.d_ptr)
+    {
+    return false;
+    }
+
+  TEST_POINTER();
+
+  QTE_D_CONST(qtKstReader);
+
+  const qtKstReader::Value& v = d->records_[record][value];
+  if (v.array.isEmpty())
+    {
+    return false;
+    }
+
+  QList<qtKstReader::Record> records;
+  foreach (const qtKstReader::Value& r, v.array)
+    {
+    if (r.array.isEmpty())
+      {
+      return false;
+      }
+    records.append(r.array);
+    }
+
+  out.d_ptr.reset(new qtKstReaderPrivate(records));
+  return true;
+}
+
+//END qtKstReader API
diff --git a/Libraries/QtExtensions/IO/qtKstReader.h b/Libraries/QtExtensions/IO/qtKstReader.h
new file mode 100644
index 00000000..441bf9d9
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtKstReader.h
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtKstReader_h
+#define __qtKstReader_h
+
+#include <QString>
+#include <QRegExp>
+#include <QList>
+#include <QUrl>
+
+#include "../Core/qtGlobal.h"
+
+class qtKstReaderPrivate;
+
+class QTE_EXPORT qtKstReader
+{
+public:
+  qtKstReader();
+  explicit qtKstReader(const QUrl& url,
+                       const QRegExp& separator = defaultSeparator(),
+                       const QRegExp& terminator = defaultTerminator());
+  explicit qtKstReader(const QString& data,
+                       const QRegExp& separator = defaultSeparator(),
+                       const QRegExp& terminator = defaultTerminator());
+  ~qtKstReader();
+
+  static QRegExp defaultSeparator();
+  static QRegExp defaultTerminator();
+
+  bool isValid() const;
+
+  int recordCount() const;
+  int valueCount(int record = -1) const;
+  int currentRecord() const;
+  int currentValue() const;
+
+  bool nextValue();
+  bool nextRecord();
+  bool seek(int record = 0, int value = 0);
+
+  bool isEndOfRecord(int value = -1, int record = -1) const;
+  bool isEndOfFile(int record = -1) const;
+
+  bool isValueEmpty(int value = -1, int record = -1) const;
+  bool isArrayEmpty(int value = -1, int record = -1) const;
+
+  bool readInt(int& out, int value = -1, int record = -1) const;
+  bool readLong(qint64& out, int value = -1, int record = -1) const;
+  bool readReal(double& out, int value = -1, int record = -1) const;
+  bool readString(QString& out, int value = -1, int record = -1) const;
+  bool readIntArray(QList<int>& out, int value = -1, int record = -1) const;
+  bool readLongArray(QList<qint64>& out, int value = -1, int record = -1) const;
+  bool readRealArray(QList<double>& out, int value = -1, int record = -1) const;
+
+  bool readArray(qtKstReader& out, int value = -1, int record = -1) const;
+  bool readTable(qtKstReader& out, int value = -1, int record = -1) const;
+
+private:
+  QTE_DECLARE_PRIVATE(qtKstReader)
+  QTE_DECLARE_PRIVATE_MRPTR(qtKstReader)
+  Q_DISABLE_COPY(qtKstReader)
+
+  class Value;
+  typedef QList<Value> Record;
+
+};
+
+#endif
diff --git a/Libraries/QtExtensions/IO/qtKstSeparator.cxx b/Libraries/QtExtensions/IO/qtKstSeparator.cxx
new file mode 100644
index 00000000..d1e0a7c8
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtKstSeparator.cxx
@@ -0,0 +1,136 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtKstSeparator.h"
+
+#include <QRegExp>
+
+QTE_IMPLEMENT_D_FUNC(qtKstSeparator)
+
+//BEGIN qtKstSeparatorPrivate and implementation subclasses
+
+//-----------------------------------------------------------------------------
+class qtKstSeparatorPrivate
+{
+public:
+  static qtKstSeparatorPrivate* create(const QRegExp&);
+  virtual qtKstSeparatorPrivate* clone() const = 0;
+
+  virtual ~qtKstSeparatorPrivate() {};
+
+  virtual bool matches(const QString& data, int pos) = 0;
+  virtual int matchedLength() const = 0;
+
+  const QString pattern;
+
+protected:
+  qtKstSeparatorPrivate(const QString& pattern) : pattern(pattern) {}
+};
+
+//-----------------------------------------------------------------------------
+class qtKstBasicSeparator : public qtKstSeparatorPrivate
+{
+public:
+  qtKstBasicSeparator(const QString& pattern)
+    : qtKstSeparatorPrivate(pattern), patternLength(pattern.length()) {}
+
+  virtual qtKstSeparatorPrivate* clone() const
+    { return new qtKstBasicSeparator(*this); }
+
+  virtual bool matches(const QString& data, int pos)
+    { return data.mid(pos, this->patternLength) == this->pattern; }
+
+  virtual int matchedLength() const
+    { return this->patternLength; }
+
+  const int patternLength;
+};
+
+//-----------------------------------------------------------------------------
+class qtKstRegExpSeparator : public qtKstSeparatorPrivate
+{
+public:
+  qtKstRegExpSeparator(const QRegExp& exp);
+
+  virtual qtKstSeparatorPrivate* clone() const
+    { return new qtKstRegExpSeparator(*this); }
+
+  virtual bool matches(const QString& data, int pos)
+    { return exp.indexIn(data, pos, QRegExp::CaretAtOffset) == pos; }
+
+  virtual int matchedLength() const
+    { return exp.matchedLength(); }
+
+  QRegExp exp;
+};
+
+//-----------------------------------------------------------------------------
+qtKstRegExpSeparator::qtKstRegExpSeparator(const QRegExp& exp)
+  : qtKstSeparatorPrivate(exp.pattern()), exp(exp)
+{
+  if (!this->exp.pattern().startsWith('^'))
+    {
+    this->exp.setPattern('^' + this->exp.pattern());
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtKstSeparatorPrivate* qtKstSeparatorPrivate::create(const QRegExp& exp)
+{
+  if (exp.patternSyntax() == QRegExp::FixedString)
+    {
+    return new qtKstBasicSeparator(exp.pattern());
+    }
+  return new qtKstRegExpSeparator(exp);
+}
+
+//END qtKstSeparatorPrivate and implementation subclasses
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtKstSeparator
+
+//-----------------------------------------------------------------------------
+qtKstSeparator::qtKstSeparator(const QRegExp& regexp)
+  : d_ptr(qtKstSeparatorPrivate::create(regexp))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtKstSeparator::qtKstSeparator(const qtKstSeparator& other)
+  : d_ptr(other.d_func()->clone())
+{
+}
+
+//-----------------------------------------------------------------------------
+qtKstSeparator::~qtKstSeparator()
+{
+  QTE_D(qtKstSeparator);
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+bool qtKstSeparator::matches(const QString& data, int pos)
+{
+  QTE_D(qtKstSeparator);
+  return d->matches(data, pos);
+}
+
+//-----------------------------------------------------------------------------
+int qtKstSeparator::matchedLength() const
+{
+  QTE_D_CONST(qtKstSeparator);
+  return d->matchedLength();
+}
+
+//-----------------------------------------------------------------------------
+QString qtKstSeparator::pattern() const
+{
+  QTE_D_CONST(qtKstSeparator);
+  return d->pattern;
+}
+
+//END qtKstSeparator
\ No newline at end of file
diff --git a/Libraries/QtExtensions/IO/qtKstSeparator.h b/Libraries/QtExtensions/IO/qtKstSeparator.h
new file mode 100644
index 00000000..25dcb098
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtKstSeparator.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "../Core/qtGlobal.h"
+
+class QRegExp;
+class QString;
+
+class qtKstSeparatorPrivate;
+
+class qtKstSeparator
+{
+public:
+  qtKstSeparator(const QRegExp& regexp);
+  qtKstSeparator(const qtKstSeparator&);
+  ~qtKstSeparator();
+
+  bool matches(const QString& data, int pos);
+  int matchedLength() const;
+
+  QString pattern() const;
+
+private:
+  QTE_DECLARE_PRIVATE_PTR(qtKstSeparator)
+  QTE_DECLARE_PRIVATE(qtKstSeparator)
+
+  qtKstSeparator& operator=(const qtKstSeparator&);
+};
diff --git a/Libraries/QtExtensions/IO/qtStringStream.h b/Libraries/QtExtensions/IO/qtStringStream.h
new file mode 100644
index 00000000..c5dd9684
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtStringStream.h
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtStringStream_h
+#define __qtStringStream_h
+
+#include <QString>
+#include <QTextStream>
+
+class qtStringStream : public QTextStream
+{
+public:
+  qtStringStream() { this->setString(&this->buffer); }
+
+protected:
+  QString buffer;
+
+private:
+  Q_DISABLE_COPY(qtStringStream)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/IO/qtTemporaryFile.cxx b/Libraries/QtExtensions/IO/qtTemporaryFile.cxx
new file mode 100644
index 00000000..006eda34
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtTemporaryFile.cxx
@@ -0,0 +1,237 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QDir>
+#include <QScopedArrayPointer>
+
+static const int MAX_RETRIES = 500;
+
+#ifdef Q_OS_WIN
+
+  #include <QFileInfo>
+  #include <QRegExp>
+  #include <QUuid>
+
+  #include <io.h>
+  #include <fcntl.h>
+
+#else
+
+  #include <cstdio>
+  #include <cstdlib>
+  #include <unistd.h>
+
+#endif
+
+#include <sys/stat.h>
+
+#include <cerrno>
+
+#include "qtTemporaryFile.h"
+
+QTE_IMPLEMENT_D_FUNC(qtTemporaryFile)
+
+//-----------------------------------------------------------------------------
+class qtTemporaryFilePrivate
+{
+public:
+  QString templatePath;
+};
+
+//-----------------------------------------------------------------------------
+qtTemporaryFile::qtTemporaryFile() : d_ptr(new qtTemporaryFilePrivate)
+{
+  this->setTemplateName(".qte_temp.XXXXXX");
+}
+
+//-----------------------------------------------------------------------------
+qtTemporaryFile::qtTemporaryFile(const QString& templateName)
+  : d_ptr(new qtTemporaryFilePrivate)
+{
+  (QDir::isAbsolutePath(templateName)
+   ? this->setTemplatePath(templateName)
+   : this->setTemplateName(templateName));
+}
+
+//-----------------------------------------------------------------------------
+qtTemporaryFile::~qtTemporaryFile()
+{
+  QTE_D(qtTemporaryFile);
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+QString qtTemporaryFile::templatePath() const
+{
+  QTE_D_CONST(qtTemporaryFile);
+  return d->templatePath;
+}
+
+//-----------------------------------------------------------------------------
+void qtTemporaryFile::setTemplateName(const QString& name)
+{
+  this->setTemplatePath(QDir::tempPath() + '/' + name);
+}
+
+//-----------------------------------------------------------------------------
+void qtTemporaryFile::setTemplatePath(const QString& path)
+{
+  QTE_D(qtTemporaryFile);
+  d->templatePath = path;
+}
+
+//-----------------------------------------------------------------------------
+bool qtTemporaryFile::open()
+{
+  return this->open(QIODevice::ReadWrite);
+}
+
+//-----------------------------------------------------------------------------
+#ifdef Q_OS_WIN
+namespace
+{
+
+QString mktemp(QString templatePath)
+{
+  QFileInfo fi(templatePath);
+  QDir dir(fi.path());
+  if (!dir.exists())
+    {
+    return QString();
+    }
+
+  QString fileName = fi.fileName();
+  QString prefix = dir.canonicalPath() + '/' +
+                   fileName.left(fileName.count() - 6);
+  QString seed = QUuid::createUuid().toString().toLower();
+  seed = seed.remove(QRegExp("[^0123456789abcdef]"));
+  QByteArray suffix = QByteArray::fromHex(seed.toAscii()).toBase64();
+  suffix = suffix.left(6).replace('/', ',');
+  return prefix + QString::fromAscii(suffix.toLower());
+}
+
+}
+#endif
+
+//-----------------------------------------------------------------------------
+bool qtTemporaryFile::open(OpenMode flags)
+{
+  if ((flags & QIODevice::ReadWrite) != QIODevice::ReadWrite)
+    {
+    this->setErrorString("Bad mode");
+    return false;
+    }
+
+  QTE_D(qtTemporaryFile);
+
+  if (!d->templatePath.endsWith("XXXXXX"))
+    {
+    this->setErrorString("Bad template");
+    return false;
+    }
+
+  int fd = -1;
+
+#ifdef Q_OS_WIN
+
+  int tries = MAX_RETRIES;
+  while (--tries)
+    {
+    // Generate name of a non-existing file
+    QString t = mktemp(d->templatePath);
+    if (t.isEmpty())
+      {
+      break;
+      }
+
+    // Try to open the file:
+    // - _O_RDWR | _O_BINARY should be obvious
+    // - _O_CREAT | _O_EXCL specifies it must not exist
+    // - _O_SHORT_LIVED says to keep it in cache only, if possible
+    // - _O_TEMPORARY says to delete it on close; best we can do on Windows
+    // - _O_NOINHERIT says "prevent creation of a shared file descriptor"
+    int oflags = _O_RDWR | _O_BINARY | _O_CREAT | _O_EXCL |
+                 _O_SHORT_LIVED | _O_TEMPORARY | _O_NOINHERIT;
+    errno_t e = _wsopen_s(&fd, t.toStdWString().c_str(),
+                          oflags, _SH_DENYRW, _S_IWRITE | _S_IREAD);
+
+    if (e == EEXIST)
+      {
+      fd = -1;
+      continue;
+      }
+    else if (e != 0)
+      {
+      // Unable to open the file; try again
+      this->setErrorString("Failed to open temporary file: " +
+                           qt_error_string(errno));
+      return false;
+      }
+    else
+      {
+      break;
+      }
+    }
+
+  // No dice...
+  if (fd < 0)
+    {
+    this->setErrorString("Unable to create temporary file name");
+    return false;
+    }
+
+#else
+
+  // Create the temporary file
+  QByteArray path = d->templatePath.toLocal8Bit();
+  fd = mkstemp(path.data());
+
+  // Check for failure, and set error string accordingly
+  if (fd < 0)
+    {
+    this->setErrorString("Failed to open temporary file: " +
+                         qt_error_string(errno));
+    return false;
+    }
+
+  // Remove the file immediately. This way, if anything goes wrong, at worst we
+  // litter an empty file. By removing it immediately, we ensure that the file
+  // system will garbage collect it when we die (even abnormally), and it also
+  // serves as an additional measure of security.
+  if (unlink(path.constData()) < 0)
+    {
+    this->setErrorString("Failed to unlink temporary file: " +
+                         qt_error_string(errno));
+    return false;
+    }
+
+  // Set the permissions so that the file is not writable by other users...
+  // just in case someone is able to recover a link to the descriptor (the
+  // specification of mkstemp does not include the mode with which the file is
+  // created)
+  if (fchmod(fd, S_IRUSR | S_IWUSR) < 0)
+    {
+    this->setErrorString("Failed to change permissions of temporary file: " +
+                         qt_error_string(errno));
+    return false;
+    }
+
+  // Now that the file is as safe as we can make it, ensure it is empty and we
+  // are not seeing anything that might possibly have been written to it by a
+  // malicious user
+  if (ftruncate(fd, 0) < 0)
+    {
+    this->setErrorString("Failed to truncate temporary file: " +
+                         qt_error_string(errno));
+    return false;
+    }
+
+#endif
+
+  // At this point, the file descriptor has been opened successfully, so now
+  // all we need to do is wrap the fd with QFile so that we can use it normally
+  return (QFile::open(fd, flags));
+}
diff --git a/Libraries/QtExtensions/IO/qtTemporaryFile.h b/Libraries/QtExtensions/IO/qtTemporaryFile.h
new file mode 100644
index 00000000..4d68a2e7
--- /dev/null
+++ b/Libraries/QtExtensions/IO/qtTemporaryFile.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtTemporaryFile_h
+#define __qtTemporaryFile_h
+
+#include <QFile>
+
+#include "../Core/qtGlobal.h"
+
+class qtTemporaryFilePrivate;
+
+class QTE_EXPORT qtTemporaryFile : public QFile
+{
+public:
+  qtTemporaryFile();
+  explicit qtTemporaryFile(const QString& templateName);
+  virtual ~qtTemporaryFile();
+
+  bool open();
+  virtual bool open(OpenMode flags) QTE_OVERRIDE;
+
+  QString templatePath() const;
+  void setTemplateName(const QString& name);
+  void setTemplatePath(const QString& path);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(qtTemporaryFile)
+
+private:
+  QTE_DECLARE_PRIVATE(qtTemporaryFile)
+  QTE_DISABLE_COPY(qtTemporaryFile)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtAbstractListDelegate.cxx b/Libraries/QtExtensions/ItemViews/qtAbstractListDelegate.cxx
new file mode 100644
index 00000000..ca9df2ea
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtAbstractListDelegate.cxx
@@ -0,0 +1,121 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtAbstractListDelegate.h"
+
+#include "../Core/qtScopedValueChange.h"
+
+QTE_IMPLEMENT_D_FUNC(qtAbstractListDelegate)
+
+//-----------------------------------------------------------------------------
+class qtAbstractListDelegatePrivate
+{
+public:
+  QStringList names;
+  QHash<QString, QVariant> dataMap;
+};
+
+//-----------------------------------------------------------------------------
+qtAbstractListDelegate::qtAbstractListDelegate(QObject* parent)
+  : QStyledItemDelegate(parent), d_ptr(new qtAbstractListDelegatePrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtAbstractListDelegate::~qtAbstractListDelegate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractListDelegate::setMapping(
+  QStringList names, QVariantList values)
+{
+  QTE_D(qtAbstractListDelegate);
+  d->names = names;
+  d->dataMap.clear();
+  for (int i = 0; i < names.count(); ++i)
+    {
+    QVariant v = (i < values.count() ? values[i] : QVariant(i));
+    d->dataMap.insert(names[i], v);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool qtAbstractListDelegate::compareData(
+  const QVariant& a, const QVariant& b) const
+{
+  return a == b;
+}
+
+//-----------------------------------------------------------------------------
+QStringList qtAbstractListDelegate::valueNames() const
+{
+  QTE_D_CONST(qtAbstractListDelegate);
+  return d->names;
+}
+
+//-----------------------------------------------------------------------------
+QVariant qtAbstractListDelegate::valueData(const QString& name) const
+{
+  QTE_D_CONST(qtAbstractListDelegate);
+  return d->dataMap.value(name);
+}
+
+//-----------------------------------------------------------------------------
+QWidget* qtAbstractListDelegate::createEditor(
+  QWidget* parent, const QStyleOptionViewItem&, const QModelIndex&) const
+{
+  QWidget* editor = this->createListEditor(parent);
+  editor->setProperty("ignoreUpdate", false);
+  return editor;
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractListDelegate::setEditorData(
+  QWidget* editor, const QModelIndex& index) const
+{
+  if (editor->property("ignoreUpdate").toBool())
+    {
+    return;
+    }
+
+  QVariant data = index.model()->data(index, Qt::UserRole);
+  this->setListEditorData(editor, data);
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractListDelegate::setModelData(
+  QWidget* editor, const QString& newText, const QVariant& newData,
+  QAbstractItemModel* model, const QModelIndex& index) const
+{
+  // Update the model
+  model->setData(index, newText, Qt::DisplayRole);
+  model->setData(index, newData, Qt::UserRole);
+
+  // Check if the model rejected or altered the change
+  if (!this->compareData(model->data(index, Qt::UserRole), newData))
+    {
+    // Reset the editor, disabling ignoreUpdate since we're likely being called
+    // by way of valueChanged()
+    qtScopedPropertyChange p(editor, "ignoreUpdate", false);
+    this->setEditorData(editor, index);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractListDelegate::editorValueChanged()
+{
+  // Get the editor
+  QWidget* editor = qobject_cast<QWidget*>(this->sender());
+  if (!editor)
+    {
+    return;
+    }
+
+  // Commit the changed data on value selection
+  qtScopedPropertyChange p(editor, "ignoreUpdate", true);
+  emit this->commitData(editor);
+}
diff --git a/Libraries/QtExtensions/ItemViews/qtAbstractListDelegate.h b/Libraries/QtExtensions/ItemViews/qtAbstractListDelegate.h
new file mode 100644
index 00000000..200596cf
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtAbstractListDelegate.h
@@ -0,0 +1,54 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtAbstractListDelegate_h
+#define __qtAbstractListDelegate_h
+
+#include <QStyledItemDelegate>
+
+#include "../Core/qtGlobal.h"
+
+class qtAbstractListDelegatePrivate;
+
+class QTE_EXPORT qtAbstractListDelegate : public QStyledItemDelegate
+{
+  Q_OBJECT
+
+public:
+  qtAbstractListDelegate(QObject* parent = 0);
+  virtual ~qtAbstractListDelegate();
+
+  virtual QWidget* createEditor(QWidget* parent, const QStyleOptionViewItem&,
+                                const QModelIndex&) const;
+
+  using QStyledItemDelegate::setModelData;
+  virtual void setEditorData(QWidget* editor, const QModelIndex&) const;
+
+protected slots:
+  void editorValueChanged();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtAbstractListDelegate)
+
+  virtual QWidget* createListEditor(QWidget* parent) const = 0;
+  virtual void setListEditorData(QWidget* editor, const QVariant&) const = 0;
+
+  void setMapping(QStringList names, QVariantList values = QVariantList());
+  QStringList valueNames() const;
+  QVariant valueData(const QString&) const;
+
+  virtual void setModelData(QWidget* editor, const QString& text,
+                            const QVariant& data, QAbstractItemModel* model,
+                            const QModelIndex& index) const;
+
+  virtual bool compareData(const QVariant&, const QVariant&) const;
+
+private:
+  QTE_DECLARE_PRIVATE(qtAbstractListDelegate)
+  Q_DISABLE_COPY(qtAbstractListDelegate)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtColorButtonItemWidget.cxx b/Libraries/QtExtensions/ItemViews/qtColorButtonItemWidget.cxx
new file mode 100644
index 00000000..28b1be49
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtColorButtonItemWidget.cxx
@@ -0,0 +1,83 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtColorButtonItemWidget.h"
+
+#include <QTreeWidgetItem>
+
+QTE_IMPLEMENT_D_FUNC(qtColorButtonItemWidget)
+
+//-----------------------------------------------------------------------------
+class qtColorButtonItemWidgetPrivate
+{
+public:
+  qtColorButtonItemWidgetPrivate(QTreeWidgetItem* item, int column) :
+    Item(item), Column(column) {}
+
+  QTreeWidgetItem* const Item;
+  const int Column;
+
+  QColor color();
+  void setColor(QColor);
+};
+
+//-----------------------------------------------------------------------------
+QColor qtColorButtonItemWidgetPrivate::color()
+{
+  if (this->Item)
+    {
+    const QVariant data = this->Item->data(this->Column, Qt::EditRole);
+    if (data.isValid() && data.canConvert<QColor>())
+      {
+      return data.value<QColor>();
+      }
+    }
+  return QColor();
+}
+
+//-----------------------------------------------------------------------------
+void qtColorButtonItemWidgetPrivate::setColor(QColor c)
+{
+  if (this->Item)
+    {
+    this->Item->setData(this->Column, Qt::EditRole, c);
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtColorButtonItemWidget::qtColorButtonItemWidget(
+  QTreeWidgetItem* item, int column) :
+  qtColorButton(item->treeWidget()),
+  d_ptr(new qtColorButtonItemWidgetPrivate(item, column))
+{
+  QTE_D(qtColorButtonItemWidget);
+
+  this->setColor(d->color());
+  this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+
+  if (item->treeWidget())
+    {
+    item->treeWidget()->setItemWidget(item, column, this);
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtColorButtonItemWidget::~qtColorButtonItemWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtColorButtonItemWidget::setColor(QColor c)
+{
+  QTE_D(qtColorButtonItemWidget);
+
+  if (c != d->color())
+    {
+    d->setColor(c);
+    }
+
+  qtColorButton::setColor(c);
+}
diff --git a/Libraries/QtExtensions/ItemViews/qtColorButtonItemWidget.h b/Libraries/QtExtensions/ItemViews/qtColorButtonItemWidget.h
new file mode 100644
index 00000000..5bed3638
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtColorButtonItemWidget.h
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtColorButtonItemWidget_h
+#define __qtColorButtonItemWidget_h
+
+#include "../Widgets/qtColorButton.h"
+
+class QTreeWidgetItem;
+
+class qtColorButtonItemWidgetPrivate;
+
+/// Item view widget based on qtColorButton.
+///
+/// qtColorButtonItemWidget is a subclass of qtColorButton that is designed to
+/// be used as the item widget for an index in an item view. In addition to the
+/// features of qtColorButton, it automatically sets its initial color to the
+/// data of its corresponding item index, and updates the same when the user
+/// selects a different color.
+///
+/// The item color should be stored in Qt::EditRole.
+class QTE_EXPORT qtColorButtonItemWidget : public qtColorButton
+{
+  Q_OBJECT
+
+public:
+  /// Create item widget for QTreeWidgetItem.
+  ///
+  /// This constructs a color button for use by a QTreeWidgetItem. If the item
+  /// has been added to the tree (item->treeWidget() is not null), the widget
+  /// will be parented to the QTreeWidget and will set itself as the item
+  /// widget for the specified item and column.
+  ///
+  /// \param item QTreeWidgetItem for which the item widget will be used.
+  /// \param column Data column for which the item widget will be used.
+  qtColorButtonItemWidget(QTreeWidgetItem* item, int column);
+  virtual ~qtColorButtonItemWidget();
+
+  /// \copydoc qtColorButton::setColor
+  ///
+  /// This also sets the color in the corresponding item's data.
+  virtual void setColor(QColor) QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtColorButtonItemWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(qtColorButtonItemWidget)
+  Q_DISABLE_COPY(qtColorButtonItemWidget)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtComboBoxDelegate.cxx b/Libraries/QtExtensions/ItemViews/qtComboBoxDelegate.cxx
new file mode 100644
index 00000000..f6c28576
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtComboBoxDelegate.cxx
@@ -0,0 +1,84 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtComboBoxDelegate.h"
+
+#include <QComboBox>
+
+//-----------------------------------------------------------------------------
+qtComboBoxDelegate::qtComboBoxDelegate(QObject* parent)
+  : qtAbstractListDelegate(parent)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtComboBoxDelegate::~qtComboBoxDelegate()
+{
+}
+
+//-----------------------------------------------------------------------------
+QWidget* qtComboBoxDelegate::createListEditor(QWidget* parent) const
+{
+  // Create combo box
+  QComboBox* box = new QComboBox(parent);
+  box->setFocusPolicy(Qt::StrongFocus);
+  connect(box, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(editorValueChanged()));
+
+  // Fill combo box
+  foreach (QString name, this->valueNames())
+    box->addItem(name, this->valueData(name));
+
+  // Flag box to show pop-up once we know the geometry
+  box->setProperty("firstShow", true);
+
+  // Done
+  return box;
+}
+
+//-----------------------------------------------------------------------------
+void qtComboBoxDelegate::setListEditorData(
+  QWidget* editor, const QVariant& newData) const
+{
+  QComboBox* box = qobject_cast<QComboBox*>(editor);
+
+  int i = -1;
+  for (int j = 0; j < box->count(); ++j)
+    {
+    if (this->compareData(newData, box->itemData(j)))
+      {
+      i = j;
+      break;
+      }
+    }
+  box->setCurrentIndex(i);
+}
+
+//-----------------------------------------------------------------------------
+void qtComboBoxDelegate::setModelData(
+  QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+{
+  QComboBox* box = qobject_cast<QComboBox*>(editor);
+  QVariant newData = box->itemData(box->currentIndex());
+  this->setModelData(editor, box->currentText(), newData, model, index);
+}
+
+//-----------------------------------------------------------------------------
+void qtComboBoxDelegate::updateEditorGeometry(
+  QWidget* editor,
+  const QStyleOptionViewItem& option,
+  const QModelIndex&) const
+{
+  QComboBox* box = qobject_cast<QComboBox*>(editor);
+  box->setGeometry(option.rect);
+
+  // Show pop-up at creation after the geometry is initialized
+  if (box->property("firstShow").toBool())
+    {
+    box->showPopup();
+    box->setProperty("firstShow", false);
+    }
+}
diff --git a/Libraries/QtExtensions/ItemViews/qtComboBoxDelegate.h b/Libraries/QtExtensions/ItemViews/qtComboBoxDelegate.h
new file mode 100644
index 00000000..d7b3ac00
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtComboBoxDelegate.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtComboBoxDelegate_h
+#define __qtComboBoxDelegate_h
+
+#include "qtAbstractListDelegate.h"
+
+class QTE_EXPORT qtComboBoxDelegate : public qtAbstractListDelegate
+{
+  Q_OBJECT
+
+public:
+  qtComboBoxDelegate(QObject* parent = 0);
+  virtual ~qtComboBoxDelegate();
+
+  virtual void setModelData(QWidget* editor, QAbstractItemModel*,
+                            const QModelIndex&) const;
+
+  virtual void updateEditorGeometry(QWidget* editor,
+                                    const QStyleOptionViewItem&,
+                                    const QModelIndex&) const;
+
+protected:
+  using qtAbstractListDelegate::setModelData;
+
+  virtual QWidget* createListEditor(QWidget* parent) const;
+  virtual void setListEditorData(QWidget* editor, const QVariant&) const;
+
+private:
+  Q_DISABLE_COPY(qtComboBoxDelegate);
+};
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtDoubleSpinBoxDelegate.cxx b/Libraries/QtExtensions/ItemViews/qtDoubleSpinBoxDelegate.cxx
new file mode 100644
index 00000000..96c2e852
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtDoubleSpinBoxDelegate.cxx
@@ -0,0 +1,129 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtDoubleSpinBoxDelegate.h"
+
+#include <QDoubleSpinBox>
+
+#include "../Core/qtMath.h"
+
+QTE_IMPLEMENT_D_FUNC(qtDoubleSpinBoxDelegate)
+
+//-----------------------------------------------------------------------------
+class qtDoubleSpinBoxDelegatePrivate
+{
+public:
+  qtDoubleSpinBoxDelegatePrivate();
+
+  int precision;
+  double minimum, maximum;
+  Qt::ItemDataRole dataRole;
+};
+
+//-----------------------------------------------------------------------------
+qtDoubleSpinBoxDelegatePrivate::qtDoubleSpinBoxDelegatePrivate()
+  : precision(-1), minimum(qQNaN()), maximum(qQNaN()),
+    dataRole(Qt::EditRole)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtDoubleSpinBoxDelegate::qtDoubleSpinBoxDelegate(QObject* parent)
+  : QStyledItemDelegate(parent), d_ptr(new qtDoubleSpinBoxDelegatePrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtDoubleSpinBoxDelegate::~qtDoubleSpinBoxDelegate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSpinBoxDelegate::setRange(double minimum, double maximum)
+{
+  QTE_D(qtDoubleSpinBoxDelegate);
+  d->minimum = minimum;
+  d->maximum = maximum;
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSpinBoxDelegate::setPrecision(int precision)
+{
+  QTE_D(qtDoubleSpinBoxDelegate);
+  d->precision = precision;
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSpinBoxDelegate::setDataRole(Qt::ItemDataRole role)
+{
+  QTE_D(qtDoubleSpinBoxDelegate);
+  d->dataRole = role;
+}
+
+//-----------------------------------------------------------------------------
+QWidget* qtDoubleSpinBoxDelegate::createEditor(
+  QWidget* parent, const QStyleOptionViewItem&, const QModelIndex&) const
+{
+  QTE_D_CONST(qtDoubleSpinBoxDelegate);
+
+  QDoubleSpinBox* editor = new QDoubleSpinBox(parent);
+
+  if (qIsFinite(d->minimum))
+    {
+    editor->setMinimum(d->minimum);
+    }
+  if (qIsFinite(d->maximum))
+    {
+    editor->setMaximum(d->maximum);
+    }
+
+  if (d->precision >= 0)
+    {
+    editor->setDecimals(d->precision);
+    editor->setSingleStep(1.0 / pow(1e1, d->precision));
+    }
+
+  return editor;
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSpinBoxDelegate::updateEditorGeometry(
+  QWidget* editor, const QStyleOptionViewItem& opt, const QModelIndex&) const
+{
+  editor->setGeometry(opt.rect);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSpinBoxDelegate::setEditorData(
+  QWidget* editor, const QModelIndex& index) const
+{
+  QTE_D_CONST(qtDoubleSpinBoxDelegate);
+
+  QDoubleSpinBox* spinBox = qobject_cast<QDoubleSpinBox*>(editor);
+  Q_ASSERT(spinBox);
+  spinBox->setValue(index.model()->data(index, d->dataRole).toDouble());
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSpinBoxDelegate::setModelData(
+  QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+{
+  QTE_D_CONST(qtDoubleSpinBoxDelegate);
+
+  QDoubleSpinBox* spinBox = qobject_cast<QDoubleSpinBox*>(editor);
+  Q_ASSERT(spinBox);
+
+  spinBox->interpretText();
+  if (d->dataRole != Qt::EditRole)
+    {
+    model->setData(index, spinBox->value(), d->dataRole);
+    model->setData(index, spinBox->text(), Qt::EditRole);
+    }
+  else
+    {
+    model->setData(index, spinBox->value(), Qt::EditRole);
+    }
+}
diff --git a/Libraries/QtExtensions/ItemViews/qtDoubleSpinBoxDelegate.h b/Libraries/QtExtensions/ItemViews/qtDoubleSpinBoxDelegate.h
new file mode 100644
index 00000000..e8607c1c
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtDoubleSpinBoxDelegate.h
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDoubleSpinBoxDelegate_h
+#define __qtDoubleSpinBoxDelegate_h
+
+#include <QStyledItemDelegate>
+
+#include "../Core/qtGlobal.h"
+
+class qtDoubleSpinBoxDelegatePrivate;
+
+class QTE_EXPORT qtDoubleSpinBoxDelegate : public QStyledItemDelegate
+{
+  Q_OBJECT
+
+public:
+  qtDoubleSpinBoxDelegate(QObject* parent = 0);
+  virtual ~qtDoubleSpinBoxDelegate();
+
+  void setRange(double minimum, double maximum);
+  void setPrecision(int precision);
+  void setDataRole(Qt::ItemDataRole);
+
+  virtual QWidget* createEditor(QWidget* parent,
+                                const QStyleOptionViewItem&,
+                                const QModelIndex&) const;
+
+  virtual void setModelData(QWidget* editor,
+                            QAbstractItemModel*,
+                            const QModelIndex&) const;
+
+  virtual void setEditorData(QWidget* editor, const QModelIndex&) const;
+
+  virtual void updateEditorGeometry(QWidget* editor,
+                                    const QStyleOptionViewItem&,
+                                    const QModelIndex&) const;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtDoubleSpinBoxDelegate)
+
+private:
+  QTE_DECLARE_PRIVATE(qtDoubleSpinBoxDelegate)
+  Q_DISABLE_COPY(qtDoubleSpinBoxDelegate)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtFlagListDelegate.h b/Libraries/QtExtensions/ItemViews/qtFlagListDelegate.h
new file mode 100644
index 00000000..00ca9bda
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtFlagListDelegate.h
@@ -0,0 +1,121 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtFlagListDelegate_h
+#define __qtFlagListDelegate_h
+
+#include <QListWidgetItem>
+
+#include "qtListDelegate.h"
+
+template <typename Flag, typename Flags>
+class qtFlagListDelegate : public qtListDelegate
+{
+public:
+  qtFlagListDelegate(QObject* parent = 0) : qtListDelegate(parent) {}
+  virtual ~qtFlagListDelegate() {}
+
+  virtual void setModelData(QWidget* editor, QAbstractItemModel*,
+                            const QModelIndex&) const;
+
+protected:
+  using qtListDelegate::setModelData;
+
+  virtual QListWidgetItem* createListItem(const QString& name,
+                                          const QVariant& data) const;
+  virtual void setListEditorData(QWidget* editor, const QVariant&) const;
+
+  virtual bool compareData(const QVariant&, const QVariant&) const;
+
+private:
+  Q_DISABLE_COPY(qtFlagListDelegate);
+};
+
+//-----------------------------------------------------------------------------
+template <typename Flag, typename Flags>
+QListWidgetItem* qtFlagListDelegate<Flag, Flags>::createListItem(
+  const QString& name, const QVariant& data) const
+{
+  QListWidgetItem* item = qtListDelegate::createListItem(name, data);
+  item->setCheckState(Qt::Unchecked);
+  item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+  return item;
+}
+
+//-----------------------------------------------------------------------------
+template <typename Flag, typename Flags>
+void qtFlagListDelegate<Flag, Flags>::setListEditorData(
+  QWidget* editor, const QVariant& data) const
+{
+  if (data.canConvert<Flags>())
+    {
+    QListWidget* list = qobject_cast<QListWidget*>(editor);
+    Flags dataFlags = data.value<Flags>();
+
+    // Set check state of appropriate items
+    for (int i = 0; i < list->count(); ++i)
+      {
+      QListWidgetItem* item = list->item(i);
+      bool check = false;
+      QVariant itemData = item->data(Qt::UserRole);
+      if (itemData.canConvert<Flag>())
+        {
+        Flag itemFlag = itemData.value<Flag>();
+        check = dataFlags.testFlag(itemFlag);
+        }
+      item->setCheckState(check ? Qt::Checked : Qt::Unchecked);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename Flag, typename Flags>
+void qtFlagListDelegate<Flag, Flags>::setModelData(
+  QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+{
+  QListWidget* list = qobject_cast<QListWidget*>(editor);
+  QStringList flagTexts;
+  Flags newData = 0;
+
+  // Generate text and data
+  for (int i = 0; i < list->count(); ++i)
+    {
+    QListWidgetItem* item = list->item(i);
+    if (item->checkState())
+      {
+      QVariant itemData = item->data(Qt::UserRole);
+      if (itemData.canConvert<Flag>())
+        {
+        newData |= itemData.value<Flag>();
+        flagTexts.append(item->text());
+        }
+      }
+    }
+
+  // Update model
+  QString text = (flagTexts.isEmpty() ? "(None)" : flagTexts.join(", "));
+  qtListDelegate::setModelData(editor, text,
+                               QVariant::fromValue<Flags>(newData),
+                               model, index);
+}
+
+//-----------------------------------------------------------------------------
+template <typename Flag, typename Flags>
+bool qtFlagListDelegate<Flag, Flags>::compareData(
+  const QVariant& a, const QVariant& b) const
+{
+  if (a.canConvert<Flag>() && b.canConvert<Flag>())
+    {
+    return a.value<Flag>() == b.value<Flag>();
+    }
+  else if (a.canConvert<Flag>() && b.canConvert<Flag>())
+    {
+    return a.value<Flag>() == b.value<Flag>();
+    }
+  return qtListDelegate::compareData(a, b);
+}
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtListDelegate.cxx b/Libraries/QtExtensions/ItemViews/qtListDelegate.cxx
new file mode 100644
index 00000000..e12ce604
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtListDelegate.cxx
@@ -0,0 +1,123 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtListDelegate.h"
+
+#include <QEvent>
+#include <QListWidget>
+
+//-----------------------------------------------------------------------------
+qtListDelegate::qtListDelegate(QObject* parent)
+  : qtAbstractListDelegate(parent)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtListDelegate::~qtListDelegate()
+{
+}
+
+//-----------------------------------------------------------------------------
+QWidget* qtListDelegate::createListEditor(QWidget* parent) const
+{
+  // Create list widget
+  QListWidget* list = new QListWidget(parent);
+  connect(list, SIGNAL(currentRowChanged(int)),
+          this, SLOT(editorValueChanged()));
+
+  // Fill list widget
+  QStringList names = this->valueNames();
+  foreach (QString name, names)
+    list->addItem(this->createListItem(name, this->valueData(name)));
+
+  // Set a reasonable minimum size
+  int rowHeight = list->sizeHintForRow(0);
+  int showRows = qMin(names.count(), 6);
+  int margin = 4 * list->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+  list->setMinimumHeight((showRows * rowHeight) + margin + 2);
+  list->setMinimumWidth(list->minimumSizeHint().width());
+
+  // Done
+  return list;
+}
+
+//-----------------------------------------------------------------------------
+QListWidgetItem* qtListDelegate::createListItem(
+  const QString& name, const QVariant& data) const
+{
+  QListWidgetItem* item = new QListWidgetItem;
+  item->setText(name);
+  item->setData(Qt::UserRole, data);
+  return item;
+}
+
+//-----------------------------------------------------------------------------
+void qtListDelegate::setListEditorData(
+  QWidget* editor, const QVariant& newData) const
+{
+  QListWidget* list = qobject_cast<QListWidget*>(editor);
+
+  int i = -1;
+  for (int j = 0; j < list->count(); ++j)
+    {
+    if (this->compareData(newData, list->item(j)->data(Qt::UserRole)))
+      {
+      i = j;
+      break;
+      }
+    }
+  list->setCurrentRow(i);
+}
+
+//-----------------------------------------------------------------------------
+void qtListDelegate::setModelData(
+  QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+{
+  QListWidget* list = qobject_cast<QListWidget*>(editor);
+  QListWidgetItem* item = list->currentItem();
+  if (item)
+    {
+    this->setModelData(editor, item->text(), item->data(Qt::UserRole),
+                       model, index);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtListDelegate::updateEditorGeometry(
+  QWidget* editor, const QStyleOptionViewItem& opt, const QModelIndex&) const
+{
+  QWidget* parent = editor->parentWidget();
+  QRect geom(QPoint(0, 0), parent->size());
+  QRect rect = opt.rect;
+
+  // Grow rect to fit editor
+  rect = rect.united(QRect(rect.topLeft(), editor->minimumSize()));
+
+  // Translate to fit within parent
+  if (geom.top() > rect.top())
+    {
+    rect.moveTop(geom.top());
+    }
+  if (geom.left() > rect.left())
+    {
+    rect.moveLeft(geom.left());
+    }
+  if (geom.bottom() < rect.bottom())
+    {
+    rect.moveBottom(geom.bottom());
+    }
+  if (geom.right() < rect.right())
+    {
+    rect.moveRight(geom.right());
+    }
+
+  // Reduce size to fit within parent (in case editor's size > parent's size)
+  rect = rect.intersected(geom);
+
+  // Set editor geometry
+  editor->setFixedSize(rect.size()); // Override minimum size
+  editor->setGeometry(rect);
+}
diff --git a/Libraries/QtExtensions/ItemViews/qtListDelegate.h b/Libraries/QtExtensions/ItemViews/qtListDelegate.h
new file mode 100644
index 00000000..5ab29f19
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtListDelegate.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtListDelegate_h
+#define __qtListDelegate_h
+
+#include "qtAbstractListDelegate.h"
+
+class QListWidgetItem;
+
+class QTE_EXPORT qtListDelegate : public qtAbstractListDelegate
+{
+  Q_OBJECT
+
+public:
+  qtListDelegate(QObject* parent = 0);
+  virtual ~qtListDelegate();
+
+  virtual void setModelData(QWidget* editor, QAbstractItemModel*,
+                            const QModelIndex&) const;
+  virtual void updateEditorGeometry(QWidget* editor,
+                                    const QStyleOptionViewItem&,
+                                    const QModelIndex&) const;
+
+protected:
+  using qtAbstractListDelegate::setModelData;
+
+  virtual QWidget* createListEditor(QWidget* parent) const;
+  virtual QListWidgetItem* createListItem(const QString& name,
+                                          const QVariant& data) const;
+  virtual void setListEditorData(QWidget* editor, const QVariant&) const;
+
+private:
+  Q_DISABLE_COPY(qtListDelegate);
+};
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtNumericTreeWidgetItem.h b/Libraries/QtExtensions/ItemViews/qtNumericTreeWidgetItem.h
new file mode 100644
index 00000000..4f2d78ca
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtNumericTreeWidgetItem.h
@@ -0,0 +1,24 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtNumericTreeWidgetItem_h
+#define __qtNumericTreeWidgetItem_h
+
+#include <QTreeWidgetItem>
+
+class qtNumericTreeWidgetItem : public QTreeWidgetItem
+{
+public:
+  /// Sets the value to be displayed in \p column to \p value.
+  ///
+  /// Tree items whose values have been set to the same data type will be
+  /// sorted numerically. \p value must be of a type that can be converted to a
+  /// QVariant.
+  template <typename T> void setValue(int column, T value)
+    { this->setData(column, Qt::DisplayRole, QVariant::fromValue<T>(value)); }
+};
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtRichTextDelegate.cxx b/Libraries/QtExtensions/ItemViews/qtRichTextDelegate.cxx
new file mode 100644
index 00000000..f64420ee
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtRichTextDelegate.cxx
@@ -0,0 +1,101 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtRichTextDelegate.h"
+
+#include <QAbstractTextDocumentLayout>
+#include <QApplication>
+#include <QPainter>
+#include <QTextDocument>
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+int itemMargin(const QStyleOptionViewItemV4& opt)
+{
+  QStyle* const style =
+    (opt.widget ? opt.widget->style() : QApplication::style());
+  return style->pixelMetric(QStyle::PM_FocusFrameHMargin, &opt, opt.widget);
+}
+
+//-----------------------------------------------------------------------------
+void buildItemDocument(QTextDocument& doc, const QStyleOptionViewItemV4& opt)
+{
+  doc.setHtml(opt.text);
+  doc.setDocumentMargin(0);
+  doc.setTextWidth(opt.rect.width() - (2 * itemMargin(opt)));
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+qtRichTextDelegate::qtRichTextDelegate(QObject* parent) :
+  QStyledItemDelegate(parent)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtRichTextDelegate::~qtRichTextDelegate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtRichTextDelegate::paint(
+  QPainter* painter, const QStyleOptionViewItem& option,
+  const QModelIndex& index) const
+{
+  QStyleOptionViewItemV4 opt = option;
+  this->initStyleOption(&opt, index);
+
+  QStyle* const style =
+    (opt.widget ? opt.widget->style() : QApplication::style());
+
+  // Build HTML document from text
+  QTextDocument doc;
+  buildItemDocument(doc, opt);
+
+  // Paint item without text
+  opt.text.clear();
+  style->drawControl(QStyle::CE_ItemViewItem, &opt, painter);
+
+  QAbstractTextDocumentLayout::PaintContext ctx;
+
+  // Use selected text color if item is selected
+  if (opt.state & QStyle::State_Selected)
+    {
+    const QColor selectedTextColor =
+      opt.palette.color(QPalette::Active, QPalette::HighlightedText);
+    ctx.palette.setColor(QPalette::Text, selectedTextColor);
+    }
+
+  // Render text
+  const QRect textRect =
+    style->subElementRect(QStyle::SE_ItemViewItemText, &opt);
+  painter->save();
+  painter->translate(textRect.topLeft());
+  painter->setClipRect(textRect.translated(-textRect.topLeft()));
+  doc.documentLayout()->draw(painter, ctx);
+  painter->restore();
+}
+
+//-----------------------------------------------------------------------------
+QSize qtRichTextDelegate::sizeHint(
+  const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+  QStyleOptionViewItemV4 opt = option;
+  this->initStyleOption(&opt, index);
+
+  // Build HTML document from text
+  QTextDocument doc;
+  buildItemDocument(doc, opt);
+
+  // Get document size
+  const QSize documentSize(doc.idealWidth(), doc.size().height());
+
+  // Return document size adjusted by item margin
+  return documentSize + QSize(2 * itemMargin(opt), 0);
+}
diff --git a/Libraries/QtExtensions/ItemViews/qtRichTextDelegate.h b/Libraries/QtExtensions/ItemViews/qtRichTextDelegate.h
new file mode 100644
index 00000000..0de75899
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtRichTextDelegate.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtRichTextDelegate_h
+#define __qtRichTextDelegate_h
+
+#include <QStyledItemDelegate>
+
+#include "../Core/qtGlobal.h"
+
+class QTE_EXPORT qtRichTextDelegate : public QStyledItemDelegate
+{
+  Q_OBJECT
+
+public:
+  qtRichTextDelegate(QObject* parent = 0);
+  virtual ~qtRichTextDelegate();
+
+protected:
+  virtual void paint(QPainter* painter, const QStyleOptionViewItem& option,
+                     const QModelIndex& index) const QTE_OVERRIDE;
+  virtual QSize sizeHint(const QStyleOptionViewItem& option,
+                         const QModelIndex& index) const QTE_OVERRIDE;
+
+private:
+  Q_DISABLE_COPY(qtRichTextDelegate);
+};
+
+#endif
diff --git a/Libraries/QtExtensions/ItemViews/qtSpinBoxDelegate.cxx b/Libraries/QtExtensions/ItemViews/qtSpinBoxDelegate.cxx
new file mode 100644
index 00000000..b09cec8f
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtSpinBoxDelegate.cxx
@@ -0,0 +1,116 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtSpinBoxDelegate.h"
+
+#include <QSpinBox>
+
+#include "../Core/qtMath.h"
+
+QTE_IMPLEMENT_D_FUNC(qtSpinBoxDelegate)
+
+//-----------------------------------------------------------------------------
+class qtSpinBoxDelegatePrivate
+{
+public:
+  qtSpinBoxDelegatePrivate();
+
+  int Minimum, Maximum;
+  Qt::ItemDataRole DataRole;
+  Qt::Alignment Alignment;
+};
+
+//-----------------------------------------------------------------------------
+qtSpinBoxDelegatePrivate::qtSpinBoxDelegatePrivate() :
+  Minimum(0), Maximum(99), DataRole(Qt::EditRole),
+  Alignment(Qt::AlignLeft | Qt::AlignVCenter)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSpinBoxDelegate::qtSpinBoxDelegate(QObject* parent)
+  : QStyledItemDelegate(parent), d_ptr(new qtSpinBoxDelegatePrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSpinBoxDelegate::~qtSpinBoxDelegate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtSpinBoxDelegate::setDataRole(Qt::ItemDataRole role)
+{
+  QTE_D(qtSpinBoxDelegate);
+  d->DataRole = role;
+}
+
+//-----------------------------------------------------------------------------
+void qtSpinBoxDelegate::setRange(int minimum, int maximum)
+{
+  QTE_D(qtSpinBoxDelegate);
+  d->Minimum = minimum;
+  d->Maximum = maximum;
+}
+
+//-----------------------------------------------------------------------------
+void qtSpinBoxDelegate::setAlignment(Qt::Alignment alignment)
+{
+  QTE_D(qtSpinBoxDelegate);
+  d->Alignment = alignment;
+}
+
+//-----------------------------------------------------------------------------
+QWidget* qtSpinBoxDelegate::createEditor(
+  QWidget* parent, const QStyleOptionViewItem&, const QModelIndex&) const
+{
+  QTE_D_CONST(qtSpinBoxDelegate);
+
+  QSpinBox* editor = new QSpinBox(parent);
+  editor->setRange(d->Minimum, d->Maximum);
+  editor->setAlignment(d->Alignment);
+
+  return editor;
+}
+
+//-----------------------------------------------------------------------------
+void qtSpinBoxDelegate::updateEditorGeometry(
+  QWidget* editor, const QStyleOptionViewItem& opt, const QModelIndex&) const
+{
+  editor->setGeometry(opt.rect);
+}
+
+//-----------------------------------------------------------------------------
+void qtSpinBoxDelegate::setEditorData(
+  QWidget* editor, const QModelIndex& index) const
+{
+  QTE_D_CONST(qtSpinBoxDelegate);
+
+  QSpinBox* spinBox = qobject_cast<QSpinBox*>(editor);
+  Q_ASSERT(spinBox);
+  spinBox->setValue(index.model()->data(index, d->DataRole).toInt());
+}
+
+//-----------------------------------------------------------------------------
+void qtSpinBoxDelegate::setModelData(
+  QWidget* editor, QAbstractItemModel* model, const QModelIndex& index) const
+{
+  QTE_D_CONST(qtSpinBoxDelegate);
+
+  QSpinBox* spinBox = qobject_cast<QSpinBox*>(editor);
+  Q_ASSERT(spinBox);
+
+  spinBox->interpretText();
+  if (d->DataRole != Qt::EditRole)
+    {
+    model->setData(index, spinBox->value(), d->DataRole);
+    model->setData(index, spinBox->text(), Qt::EditRole);
+    }
+  else
+    {
+    model->setData(index, spinBox->value(), Qt::EditRole);
+    }
+}
diff --git a/Libraries/QtExtensions/ItemViews/qtSpinBoxDelegate.h b/Libraries/QtExtensions/ItemViews/qtSpinBoxDelegate.h
new file mode 100644
index 00000000..c534c024
--- /dev/null
+++ b/Libraries/QtExtensions/ItemViews/qtSpinBoxDelegate.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSpinBoxDelegate_h
+#define __qtSpinBoxDelegate_h
+
+#include <QStyledItemDelegate>
+
+#include "../Core/qtGlobal.h"
+
+class qtSpinBoxDelegatePrivate;
+
+class QTE_EXPORT qtSpinBoxDelegate : public QStyledItemDelegate
+{
+  Q_OBJECT
+
+public:
+  qtSpinBoxDelegate(QObject* parent = 0);
+  virtual ~qtSpinBoxDelegate();
+
+  void setDataRole(Qt::ItemDataRole);
+
+  void setRange(int minimum, int maximum);
+  void setAlignment(Qt::Alignment);
+
+  virtual QWidget* createEditor(QWidget* parent,
+                                const QStyleOptionViewItem&,
+                                const QModelIndex&) const;
+
+  virtual void setModelData(QWidget* editor,
+                            QAbstractItemModel*,
+                            const QModelIndex&) const;
+
+  virtual void setEditorData(QWidget* editor, const QModelIndex&) const;
+
+  virtual void updateEditorGeometry(QWidget* editor,
+                                    const QStyleOptionViewItem&,
+                                    const QModelIndex&) const;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtSpinBoxDelegate)
+
+private:
+  QTE_DECLARE_PRIVATE(qtSpinBoxDelegate)
+  Q_DISABLE_COPY(qtSpinBoxDelegate)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Sax/qtSax.h b/Libraries/QtExtensions/Sax/qtSax.h
new file mode 100644
index 00000000..81b12600
--- /dev/null
+++ b/Libraries/QtExtensions/Sax/qtSax.h
@@ -0,0 +1,23 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSax_h
+#define __qtSax_h
+
+#include "qtSaxNamespace.h"
+#include "qtSaxNodes.h"
+#include "qtSaxWriter.h"
+
+namespace qtSax
+{
+  typedef ::qtSaxWriter Writer;
+
+  typedef ::qtSaxElement Element;
+  typedef ::qtSaxEmptyElement EmptyElement;
+  typedef ::qtSaxAttribute Attribute;
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Sax/qtSaxNamespace.h b/Libraries/QtExtensions/Sax/qtSaxNamespace.h
new file mode 100644
index 00000000..1e045596
--- /dev/null
+++ b/Libraries/QtExtensions/Sax/qtSaxNamespace.h
@@ -0,0 +1,18 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSaxNamespace_h
+#define __qtSaxNamespace_h
+
+namespace qtSax
+{
+  enum Directive
+    {
+    EndElement,
+    };
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Sax/qtSaxNodes.cxx b/Libraries/QtExtensions/Sax/qtSaxNodes.cxx
new file mode 100644
index 00000000..c46e2308
--- /dev/null
+++ b/Libraries/QtExtensions/Sax/qtSaxNodes.cxx
@@ -0,0 +1,101 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtSaxNodes.h"
+
+#include <QXmlStreamReader>
+
+//BEGIN qtSaxElement
+
+//-----------------------------------------------------------------------------
+class qtSaxElementPrivate
+{
+public:
+  qtSaxElementPrivate(const QString& name) : Name(name) {}
+
+  QString Name;
+};
+QTE_IMPLEMENT_D_FUNC(qtSaxElement)
+
+//-----------------------------------------------------------------------------
+qtSaxElement::qtSaxElement(const QString& name) :
+  d_ptr(new qtSaxElementPrivate(name))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSaxElement::~qtSaxElement()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtSaxElement::write(QXmlStreamWriter& stream) const
+{
+  QTE_D_CONST(qtSaxElement);
+  stream.writeStartElement(d->Name);
+}
+
+//END qtSaxElement
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtSaxEmptyElement
+
+//-----------------------------------------------------------------------------
+qtSaxEmptyElement::qtSaxEmptyElement(const QString& name) :
+  qtSaxElement(name)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSaxEmptyElement::~qtSaxEmptyElement()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtSaxEmptyElement::write(QXmlStreamWriter& stream) const
+{
+  QTE_D_CONST(qtSaxElement);
+  stream.writeEmptyElement(d->Name);
+}
+
+//END qtSaxEmptyElement
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtSaxAttribute
+
+//-----------------------------------------------------------------------------
+class qtSaxAttributePrivate
+{
+public:
+  qtSaxAttributePrivate(const QString& name, const QString& value) :
+    Name(name), Value(value) {}
+
+  QString Name;
+  QString Value;
+};
+QTE_IMPLEMENT_D_FUNC(qtSaxAttribute)
+
+//-----------------------------------------------------------------------------
+qtSaxAttribute::qtSaxAttribute(const QString& name, const QString& value) :
+  d_ptr(new qtSaxAttributePrivate(name, value))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSaxAttribute::~qtSaxAttribute()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtSaxAttribute::write(QXmlStreamWriter& stream) const
+{
+  QTE_D_CONST(qtSaxAttribute);
+  stream.writeAttribute(d->Name, d->Value);
+}
+
+//END qtSaxAttribute
diff --git a/Libraries/QtExtensions/Sax/qtSaxNodes.h b/Libraries/QtExtensions/Sax/qtSaxNodes.h
new file mode 100644
index 00000000..b971726f
--- /dev/null
+++ b/Libraries/QtExtensions/Sax/qtSaxNodes.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSaxNodes_h
+#define __qtSaxNodes_h
+
+#include "../Core/qtGlobal.h"
+
+#include <QScopedPointer>
+
+class QString;
+class QXmlStreamWriter;
+
+class qtSaxWriter;
+
+class qtSaxDocumentPrivate;
+class qtSaxElementPrivate;
+class qtSaxAttributePrivate;
+
+//-----------------------------------------------------------------------------
+class qtSaxNode
+{
+public:
+  virtual ~qtSaxNode() {}
+
+  virtual void write(QXmlStreamWriter&) const = 0;
+};
+
+//-----------------------------------------------------------------------------
+class QTE_EXPORT qtSaxElement : public qtSaxNode
+{
+public:
+  explicit qtSaxElement(const QString& name);
+  virtual ~qtSaxElement();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtSaxElement)
+  QTE_DECLARE_PRIVATE(qtSaxElement)
+
+  virtual void write(QXmlStreamWriter&) const QTE_OVERRIDE;
+};
+
+//-----------------------------------------------------------------------------
+class QTE_EXPORT qtSaxEmptyElement : public qtSaxElement
+{
+public:
+  explicit qtSaxEmptyElement(const QString& name);
+  virtual ~qtSaxEmptyElement();
+
+protected:
+  virtual void write(QXmlStreamWriter&) const QTE_OVERRIDE;
+};
+
+//-----------------------------------------------------------------------------
+class QTE_EXPORT qtSaxAttribute : public qtSaxNode
+{
+public:
+  explicit qtSaxAttribute(const QString& name, const QString& value);
+  virtual ~qtSaxAttribute();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtSaxAttribute)
+  QTE_DECLARE_PRIVATE(qtSaxAttribute)
+
+  virtual void write(QXmlStreamWriter&) const QTE_OVERRIDE;
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Sax/qtSaxTraversal.cxx b/Libraries/QtExtensions/Sax/qtSaxTraversal.cxx
new file mode 100644
index 00000000..77b6cb63
--- /dev/null
+++ b/Libraries/QtExtensions/Sax/qtSaxTraversal.cxx
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtSaxTraversal.h"
+
+//-----------------------------------------------------------------------------
+qtSaxTraversal::qtSaxTraversal(QXmlStreamReader& stream) :
+  Stream(stream), Depth(1), Flag(false), Offset(stream.characterOffset())
+{
+}
+
+//-----------------------------------------------------------------------------
+QXmlStreamReader::TokenType qtSaxTraversal::next()
+{
+  if (this->Stream.atEnd())
+    {
+    this->Depth = -1;
+    return QXmlStreamReader::NoToken;
+    }
+
+  // If someone else advanced the stream, process the current token; this is
+  // required so that nested loops unwind correctly as we will see the start
+  // token, but not otherwise the end token
+  const bool advanced = (this->Stream.characterOffset() != this->Offset);
+  const QXmlStreamReader::TokenType token =
+    (advanced ? this->Stream.tokenType() : this->Stream.readNext());
+
+  switch (token)
+    {
+    case QXmlStreamReader::StartElement:
+      ++this->Depth;
+      break;
+    case QXmlStreamReader::EndElement:
+      --this->Depth;
+      break;
+    default:
+      break;
+    }
+
+  this->Offset = this->Stream.characterOffset();
+
+  return token;
+}
diff --git a/Libraries/QtExtensions/Sax/qtSaxTraversal.h b/Libraries/QtExtensions/Sax/qtSaxTraversal.h
new file mode 100644
index 00000000..bb95e821
--- /dev/null
+++ b/Libraries/QtExtensions/Sax/qtSaxTraversal.h
@@ -0,0 +1,113 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSaxTraversal_h
+#define __qtSaxTraversal_h
+
+/// \file
+
+#include <vgExport.h>
+
+#include <QXmlStreamReader>
+
+/// Streaming XML traversal helper class.
+///
+/// This class is used to traverse the child nodes of an XML stream. It is used
+/// in the implementation of #foreach_sax_child and should not normally be used
+/// directly.
+class QTE_EXPORT qtSaxTraversal
+{
+public:
+  /// Construct traversal helper.
+  ///
+  /// This constructs a traversal helper for \p stream. The traversal begins at
+  /// the current token (normally a QXmlStreamReader::StartElement) and ends
+  /// when the node stack unwinds past its starting point.
+  explicit qtSaxTraversal(QXmlStreamReader& stream);
+
+  /// Get inner iteration flag.
+  ///
+  /// \return \c true if inner iteration should proceed, otherwise \c false.
+  inline operator bool() { return this->Depth > 0 && this->Flag; }
+
+  /// Begin iteration step.
+  ///
+  /// This begins an iteration step by setting the inner iteration flag to
+  /// \c true.
+  ///
+  /// \return \c true if iteration may proceed (i.e. the traversal remains
+  ///         within the scope in which it was started), otherwise \c false.
+  inline bool begin() { this->Flag = true; return this->Depth > 0; }
+
+  /// End iteration step.
+  ///
+  /// This ends the current iteration step, making the inner iteration flag
+  /// \c false.
+  inline void end() { this->Flag = false; }
+
+  /// Obtain the next token to be processed.
+  ///
+  /// This obtains the next token to be processed. If the stream position has
+  /// changed since the previous call to next() (or since construction, if
+  /// next() has not yet been called on this instance), then the current token
+  /// is processed. Otherwise QXmlStreamReader::readNext() is called to obtain
+  /// the next token.
+  QXmlStreamReader::TokenType next();
+
+private:
+  QXmlStreamReader& Stream;
+  int Depth;
+  bool Flag;
+  qint64 Offset;
+};
+
+/// Alias for #foreach_sax_child.
+///
+/// This macro is a synonym for #foreach_sax_child that is guaranteed to be
+/// available. (If QT_NO_KEYWORDS is defined, the more convenient
+/// #foreach_sax_child is hidden to avoid namespace pollution.)
+#define QTE_FOREACH_SAX_CHILD(decl, stream) \
+  for (qtSaxTraversal __t(stream); __t.begin();) \
+    for (decl = __t.next(); __t; __t.end())
+
+#ifdef DOXYGEN
+/// Iterate over XML child nodes.
+///
+/// This macro iterates over the child nodes of the current XML node, stopping
+/// when the current node ends. The end of the current node is not processed,
+/// however it may normally be assumed that, when the loop exits, the XML
+/// stream points to the end of the node at which iteration was started.
+///
+/// It is safe to nest foreach_sax_child loops. However, care must be taken
+/// when calling QXmlStreamReader::readNext() from within such a loop to avoid
+/// corrupting the iteration state. Additionally, it is recommended to only
+/// begin iteration when the current token is a QXmlStreamReader::StartElement.
+///
+/// \param decl
+///   Name or declaration of variable that receives the XML token for each
+///   iteration step.
+/// \param stream QXmlStreamReader over which to iterate.
+///
+/// \par Example:
+/// \code{.cpp}
+/// readFooElement(QXmlStreamReader& stream)
+/// {
+///   foreach_sax_child (const QXmlStreamReader::TokenType token, stream)
+///   {
+///     // Do something with the child tokens...
+///   }
+/// }
+/// \endcode
+#  define foreach_sax_child(decl, stream)
+#else
+#  ifndef QT_NO_KEYWORDS
+#    ifndef foreach_sax_child
+#      define foreach_sax_child QTE_FOREACH_SAX_CHILD
+#    endif
+#  endif
+#endif
+
+#endif
diff --git a/Libraries/QtExtensions/Sax/qtSaxWriter.cxx b/Libraries/QtExtensions/Sax/qtSaxWriter.cxx
new file mode 100644
index 00000000..e19b3ba3
--- /dev/null
+++ b/Libraries/QtExtensions/Sax/qtSaxWriter.cxx
@@ -0,0 +1,94 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtSaxWriter.h"
+
+#include "qtSaxNodes.h"
+
+#include <QDebug>
+#include <QXmlStreamReader>
+
+//-----------------------------------------------------------------------------
+class qtSaxWriterPrivate
+{
+public:
+  qtSaxWriterPrivate(QXmlStreamWriter* stream) : Stream(stream) {}
+
+  const QScopedPointer<QXmlStreamWriter> Stream;
+};
+QTE_IMPLEMENT_D_FUNC(qtSaxWriter)
+
+//-----------------------------------------------------------------------------
+qtSaxWriter::qtSaxWriter(QIODevice* device) :
+  d_ptr(new qtSaxWriterPrivate(new QXmlStreamWriter(device)))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSaxWriter::qtSaxWriter(QString* buffer) :
+  d_ptr(new qtSaxWriterPrivate(new QXmlStreamWriter(buffer)))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSaxWriter::qtSaxWriter(QByteArray* buffer) :
+  d_ptr(new qtSaxWriterPrivate(new QXmlStreamWriter(buffer)))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSaxWriter::~qtSaxWriter()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSaxWriter& qtSaxWriter::start(const QString& version)
+{
+  QTE_D(qtSaxWriter);
+  d->Stream->writeStartDocument(version);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+void qtSaxWriter::end()
+{
+  QTE_D(qtSaxWriter);
+  d->Stream->writeEndDocument();
+}
+
+//-----------------------------------------------------------------------------
+qtSaxWriter& qtSaxWriter::operator<<(const QString& characters)
+{
+  QTE_D(qtSaxWriter);
+  d->Stream->writeCharacters(characters);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+qtSaxWriter& qtSaxWriter::operator<<(const qtSaxNode& node)
+{
+  QTE_D(qtSaxWriter);
+  node.write(*d->Stream);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+qtSaxWriter& qtSaxWriter::operator<<(qtSax::Directive directive)
+{
+  QTE_D(qtSaxWriter);
+
+  switch (directive)
+    {
+    case qtSax::EndElement:
+      d->Stream->writeEndElement();
+      break;
+    default:
+      qDebug() << "qtSaxWriter: warning: unrecognized directive" << directive;
+      break;
+    }
+
+  return *this;
+}
diff --git a/Libraries/QtExtensions/Sax/qtSaxWriter.h b/Libraries/QtExtensions/Sax/qtSaxWriter.h
new file mode 100644
index 00000000..bfb81452
--- /dev/null
+++ b/Libraries/QtExtensions/Sax/qtSaxWriter.h
@@ -0,0 +1,47 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSaxWriter_h
+#define __qtSaxWriter_h
+
+#include "../Core/qtGlobal.h"
+
+#include "qtSaxNamespace.h"
+
+#include <QScopedPointer>
+#include <QString>
+
+class QByteArray;
+class QIODevice;
+
+class qtSaxNode;
+
+class qtSaxWriterPrivate;
+
+//-----------------------------------------------------------------------------
+class QTE_EXPORT qtSaxWriter
+{
+public:
+  explicit qtSaxWriter(QIODevice* device);
+  explicit qtSaxWriter(QString* buffer);
+  explicit qtSaxWriter(QByteArray* buffer);
+  virtual ~qtSaxWriter();
+
+  qtSaxWriter& start(const QString& version = QString("1.0"));
+  void end();
+
+  qtSaxWriter& operator<<(const QString&);
+  qtSaxWriter& operator<<(const qtSaxNode&);
+  qtSaxWriter& operator<<(qtSax::Directive);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtSaxWriter)
+
+private:
+  QTE_DECLARE_PRIVATE(qtSaxWriter)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Testing/CMakeLists.txt b/Libraries/QtExtensions/Testing/CMakeLists.txt
new file mode 100644
index 00000000..c8c44ea1
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/CMakeLists.txt
@@ -0,0 +1,40 @@
+set(VGTEST_LINK_LIBRARIES qtExtensions ${QT_LIBRARIES})
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+vg_include_library_sdk_directories(qtExtensions)
+
+# Interactive tests
+vg_add_test(testDrawers INTERACTIVE
+  SOURCES TestDrawers.cxx qtEditableLabel.cxx
+  MOC_HEADERS TestDrawers.h qtEditableLabel.h
+  RESOURCES icons.qrc
+)
+
+vg_add_test(testExpander INTERACTIVE
+  SOURCES TestExpander.cxx
+  MOC_HEADERS TestExpander.h
+)
+
+vg_add_test(testDoubleSlider INTERACTIVE
+  SOURCES TestDoubleSlider.cxx
+  MOC_HEADERS TestDoubleSlider.h
+  UI testDoubleSlider.ui
+)
+
+vg_add_test(testSqueezedLabel INTERACTIVE
+  SOURCES TestSqueezedLabel.cxx
+  MOC_HEADERS TestSqueezedLabel.h
+)
+
+vg_add_test(testColorButton         INTERACTIVE TestColorButton.cxx)
+vg_add_test(testConfirmationDialog  INTERACTIVE TestConfirmationDialog.cxx)
+vg_add_test(testGradientWidget      INTERACTIVE TestGradientWidget.cxx)
+vg_add_test(testThrobber            INTERACTIVE TestThrobber.cxx)
+
+# Automated tests
+vg_add_test(qtExtensions-Kst testKst
+            SOURCES TestKst.cxx ../IO/qtKstParser.cxx
+            ARGS ${CMAKE_CURRENT_SOURCE_DIR}/testdata.kst
+)
+
+vg_add_test(qtExtensions-UiState testUiState TestUiState.cxx)
diff --git a/Libraries/QtExtensions/Testing/TestColorButton.cxx b/Libraries/QtExtensions/Testing/TestColorButton.cxx
new file mode 100644
index 00000000..0e0a1f5c
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestColorButton.cxx
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QApplication>
+#include <QCheckBox>
+#include <QFormLayout>
+#include <QLabel>
+
+#include "../Widgets/qtColorButton.h"
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  QWidget window;
+  QFormLayout* layout = new QFormLayout;
+  window.setMinimumSize(160, 0);
+  window.setLayout(layout);
+
+  qtColorButton* button = new qtColorButton;
+  QCheckBox* alpha = new QCheckBox;
+
+  window.connect(alpha, SIGNAL(toggled(bool)),
+                 button, SLOT(setAlphaShown(bool)));
+
+  layout->addRow(new QLabel("Color:"), button);
+  layout->addRow(new QLabel("Alpha:"), alpha);
+
+  window.show();
+  return app.exec();
+}
diff --git a/Libraries/QtExtensions/Testing/TestConfirmationDialog.cxx b/Libraries/QtExtensions/Testing/TestConfirmationDialog.cxx
new file mode 100644
index 00000000..2194f911
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestConfirmationDialog.cxx
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QApplication>
+#include <QLabel>
+
+#include "../Dialogs/qtConfirmationDialog.h"
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication::setOrganizationName("Kitware");
+  QApplication::setApplicationName("Confirmation Dialog Test");
+  QApplication app(argc, argv);
+
+  QString prompt =
+    "This is a really long confirmation prompt. It needs to be long so that it"
+    " will fully test the dialog's handling of size issues and word wrapping"
+    " of the prompt.\n\nNotice that there is no check box to suppress this"
+    " confirmation; that is because the setting key is blank.\n\nWhen you"
+    " select a button, the dialog will go away and the test will end. There"
+    " will be no persistent effect either way.";
+  qtConfirmationDialog::getConfirmation(0, "Test", prompt);
+
+  return 0;
+}
diff --git a/Libraries/QtExtensions/Testing/TestDoubleSlider.cxx b/Libraries/QtExtensions/Testing/TestDoubleSlider.cxx
new file mode 100644
index 00000000..562ce545
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestDoubleSlider.cxx
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "TestDoubleSlider.h"
+
+#include "../Core/qtScopedValueChange.h"
+
+//-----------------------------------------------------------------------------
+TestDoubleSliderWidget::TestDoubleSliderWidget(QWidget* parent)
+  : QWidget(parent)
+{
+  this->UI.setupUi(this);
+
+  connect(this->UI.slider, SIGNAL(valueChanged(double)),
+          this, SLOT(setValue(double)));
+  connect(this->UI.qmode, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(setQuantizeMode(int)));
+
+  this->setValue(this->UI.slider->value());
+}
+
+//-----------------------------------------------------------------------------
+void TestDoubleSliderWidget::setQuantizeMode(int mode)
+{
+  qtDoubleSlider::QuantizeMode qmode =
+    (mode == 1 ? qtDoubleSlider::QuantizeAbsolute
+               : qtDoubleSlider::QuantizeRelative);
+  this->UI.slider->setQuantizeMode(qmode);
+}
+
+//-----------------------------------------------------------------------------
+void TestDoubleSliderWidget::setValue(double value)
+{
+  qtScopedBlockSignals bs(this->UI.sval);
+  this->UI.sval->setValue(value);
+  this->UI.val->setText(QString::number(value));
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  TestDoubleSliderWidget window;
+  window.show();
+  return app.exec();
+}
diff --git a/Libraries/QtExtensions/Testing/TestDoubleSlider.h b/Libraries/QtExtensions/Testing/TestDoubleSlider.h
new file mode 100644
index 00000000..b7c01fc9
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestDoubleSlider.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __TestDoubleSlider_h
+#define __TestDoubleSlider_h
+
+#include "ui_testDoubleSlider.h"
+
+class TestDoubleSliderWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit TestDoubleSliderWidget(QWidget* parent = 0);
+  ~TestDoubleSliderWidget() {}
+
+protected slots:
+  void setQuantizeMode(int);
+  void setValue(double);
+
+protected:
+  Ui::TestDoubleSliderWidget UI;
+
+private:
+  Q_DISABLE_COPY(TestDoubleSliderWidget)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Testing/TestDrawers.cxx b/Libraries/QtExtensions/Testing/TestDrawers.cxx
new file mode 100644
index 00000000..6fa846c4
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestDrawers.cxx
@@ -0,0 +1,161 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "TestDrawers.h"
+
+#include <QApplication>
+#include <QGridLayout>
+#include <QScrollArea>
+#include <QToolButton>
+#include <QVBoxLayout>
+
+#include "../Widgets/qtDrawer.h"
+#include "../Widgets/qtDrawerWidget.h"
+
+#include "qtEditableLabel.h"
+
+//-----------------------------------------------------------------------------
+QString makeText(void* p)
+{
+  quintptr n = reinterpret_cast<quintptr>(p);
+  return QString("drawer 0x%1").arg(n, 0, 16);
+}
+
+//-----------------------------------------------------------------------------
+TestDrawersWidget::TestDrawersWidget(QWidget* parent)
+  : QWidget(parent), drawerWidget(new qtDrawerWidget)
+{
+  // Set up UI
+  QGridLayout* lo = new QGridLayout;
+  this->setLayout(lo);
+
+  QScrollArea* sa = new QScrollArea;
+  QWidget* sac = new QWidget;
+  sa->setFrameShape(QFrame::NoFrame);
+  sa->setWidget(sac);
+  sa->setWidgetResizable(true);
+
+  QVBoxLayout* li = new QVBoxLayout;
+  sac->setLayout(li);
+  li->addWidget(this->drawerWidget);
+  li->addStretch();
+  lo->addWidget(sa, 0, 0, 1, 3);
+
+  QToolButton* bar = new QToolButton;
+  bar->setIcon(QIcon(":icons/add"));
+  bar->setText("Add new drawer to root");
+  bar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+  lo->addWidget(bar, 1, 0);
+  connect(bar, SIGNAL(clicked(bool)), this, SLOT(addRootDrawer()));
+
+  QToolButton* bc = new QToolButton;
+  bc->setIcon(QIcon(":icons/clear"));
+  bc->setText("Remove all drawers");
+  bc->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+  lo->addWidget(bc, 1, 1);
+  connect(bc, SIGNAL(clicked(bool)), this, SLOT(clearDrawers()));
+
+  lo->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding), 1, 2);
+
+  connect(&this->mapAddBefore, SIGNAL(mapped(QWidget*)),
+          this, SLOT(addDrawerBefore(QWidget*)));
+  connect(&this->mapAddChild, SIGNAL(mapped(QWidget*)),
+          this, SLOT(addDrawerChild(QWidget*)));
+  connect(&this->mapRemove, SIGNAL(mapped(QWidget*)),
+          this, SLOT(removeDrawer(QWidget*)));
+
+  this->addRootDrawer();
+}
+
+//-----------------------------------------------------------------------------
+TestDrawersWidget::~TestDrawersWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void TestDrawersWidget::addRootDrawer()
+{
+  qtDrawer* d = this->drawerWidget->addDrawer();
+  this->setupDrawer(d);
+}
+
+//-----------------------------------------------------------------------------
+void TestDrawersWidget::clearDrawers()
+{
+  this->drawerWidget->clear();
+}
+
+//-----------------------------------------------------------------------------
+void TestDrawersWidget::addDrawerBefore(QWidget* object)
+{
+  qtDrawer* d = qobject_cast<qtDrawer*>(object);
+  if (d)
+    {
+    qtDrawer* s = d;
+    d = new qtDrawer(s->parent(), s);
+    this->setupDrawer(d);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void TestDrawersWidget::addDrawerChild(QWidget* object)
+{
+  qtDrawer* d = qobject_cast<qtDrawer*>(object);
+  if (d)
+    {
+    qtDrawer* p = d;
+    d = new qtDrawer(p);
+    this->setupDrawer(d);
+    p->setExpanded(true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void TestDrawersWidget::removeDrawer(QWidget* object)
+{
+  qtDrawer* d = qobject_cast<qtDrawer*>(object);
+  d && (d->deleteLater(), false);
+}
+
+//-----------------------------------------------------------------------------
+void TestDrawersWidget::setupDrawer(qtDrawer* d)
+{
+  // Add label
+  qtEditableLabel* label = new qtEditableLabel;
+  label->setText(makeText(d));
+  d->addWidget(label);
+
+  // Set up 'add before' button
+  QToolButton* bab = new QToolButton;
+  bab->setIcon(QIcon(":icons/add-before"));
+  d->addWidget(bab, 1);
+  this->mapAddBefore.setMapping(bab, d);
+  connect(bab, SIGNAL(clicked(bool)), &this->mapAddBefore, SLOT(map()));
+
+  // Set up 'add child' button
+  QToolButton* bac = new QToolButton;
+  bac->setIcon(QIcon(":icons/add-child"));
+  d->addWidget(bac, 2);
+  this->mapAddChild.setMapping(bac, d);
+  connect(bac, SIGNAL(clicked(bool)), &this->mapAddChild, SLOT(map()));
+
+  // Set up 'remove' button
+  QToolButton* br = new QToolButton;
+  br->setIcon(QIcon(":icons/remove"));
+  d->addWidget(br, 3);
+  this->mapRemove.setMapping(br, d);
+  connect(br, SIGNAL(clicked(bool)), &this->mapRemove, SLOT(map()));
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  TestDrawersWidget window;
+  window.show();
+  return app.exec();
+}
diff --git a/Libraries/QtExtensions/Testing/TestDrawers.h b/Libraries/QtExtensions/Testing/TestDrawers.h
new file mode 100644
index 00000000..79210fd7
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestDrawers.h
@@ -0,0 +1,41 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __TestDrawers_h
+#define __TestDrawers_h
+
+#include <QWidget>
+#include <QSignalMapper>
+
+class qtDrawer;
+class qtDrawerWidget;
+
+class TestDrawersWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  TestDrawersWidget(QWidget* parent = 0);
+  virtual ~TestDrawersWidget();
+
+public slots:
+  void addDrawerBefore(QWidget*);
+  void addDrawerChild(QWidget*);
+  void removeDrawer(QWidget*);
+  void addRootDrawer();
+  void clearDrawers();
+
+protected:
+  void setupDrawer(qtDrawer*);
+
+  QSignalMapper mapAddBefore, mapAddChild, mapRemove;
+  qtDrawerWidget* drawerWidget;
+
+private:
+  Q_DISABLE_COPY(TestDrawersWidget)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Testing/TestExpander.cxx b/Libraries/QtExtensions/Testing/TestExpander.cxx
new file mode 100644
index 00000000..d3fe5a9e
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestExpander.cxx
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "TestExpander.h"
+
+#include <QApplication>
+#include <QLabel>
+#include <QLineEdit>
+#include <QVBoxLayout>
+
+#include "../Widgets/qtExpander.h"
+
+//-----------------------------------------------------------------------------
+TestExpanderWidget::TestExpanderWidget(QWidget* parent) : QWidget(parent)
+{
+  QVBoxLayout* layout = new QVBoxLayout;
+
+  this->label = new QLabel("Hello, world!", this);
+  this->expander = new qtExpander(true, this);
+  this->lineEdit = new QLineEdit(this);
+
+  layout->addWidget(this->lineEdit);
+  layout->addWidget(this->expander);
+  layout->addWidget(this->label);
+
+  this->setLayout(layout);
+
+  connect(this->lineEdit, SIGNAL(textChanged(QString)),
+          this, SLOT(setExpanderText(QString)));
+  connect(this->expander, SIGNAL(toggled(bool)),
+          this->label, SLOT(setVisible(bool)));
+}
+
+//-----------------------------------------------------------------------------
+void TestExpanderWidget::setExpanderText(QString newText)
+{
+  this->expander->setText(newText);
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  TestExpanderWidget window;
+  window.show();
+  return app.exec();
+}
diff --git a/Libraries/QtExtensions/Testing/TestExpander.h b/Libraries/QtExtensions/Testing/TestExpander.h
new file mode 100644
index 00000000..153ddebf
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestExpander.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __TestExpander_h
+#define __TestExpander_h
+
+#include <QWidget>
+
+class QLabel;
+class QLineEdit;
+
+class qtExpander;
+
+class TestExpanderWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  TestExpanderWidget(QWidget* parent = 0);
+  virtual ~TestExpanderWidget() {}
+
+public slots:
+  void setExpanderText(QString);
+
+protected:
+  QLineEdit* lineEdit;
+  qtExpander* expander;
+  QLabel* label;
+
+private:
+  Q_DISABLE_COPY(TestExpanderWidget)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Testing/TestGradientWidget.cxx b/Libraries/QtExtensions/Testing/TestGradientWidget.cxx
new file mode 100644
index 00000000..3adc15b9
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestGradientWidget.cxx
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QApplication>
+
+#include "../Widgets/qtGradientWidget.h"
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  qtGradientWidget widget;
+
+  widget.show();
+  return app.exec();
+}
diff --git a/Libraries/QtExtensions/Testing/TestKst.cxx b/Libraries/QtExtensions/Testing/TestKst.cxx
new file mode 100644
index 00000000..331455bb
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestKst.cxx
@@ -0,0 +1,637 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <cstdio>
+
+#define TEST_OBJECT_NAME t_obj
+
+#include "../Core/qtTest.h"
+#include "../Core/qtMath.h"
+
+#include "../IO/qtKstParser.h"
+#include "../IO/qtKstReader.h"
+#include "../IO/qtStringStream.h"
+
+QUrl testFile;
+
+//-----------------------------------------------------------------------------
+bool compareReal(double a, double b)
+{
+  // Fail if either value is NaN
+  if (qIsNaN(a) || qIsNaN(b))
+    return false;
+
+  // Return true if both values are infinite and of the same sign; technically
+  // such a comparison is meaningless, but the purpose of this test is to
+  // validate that parseReal returns infinity when we expect it to
+  if (qIsInf(a) && qIsInf(b))
+    return (a > 0.0) == (b > 0.0);
+
+  // For finite numbers, use Qt's fuzzy comparison (which basically tests for
+  // equality within a very small epsilon relative to the magnitude of the
+  // numbers being tested)
+  return qFuzzyCompare(a, b);
+}
+
+//-----------------------------------------------------------------------------
+int testLong(qtTest& t_obj, const QString& str, qint64 xpv, bool xrv = true)
+{
+  qint64 apv;
+  bool arv = qtKstParser::parseLong(str.toLower(), apv);
+
+  // Check return value
+  if (arv != xrv)
+    {
+    t_obj.out() << t_obj.where() << "parseLong(\"" << str << "\") ";
+    if (xrv)
+      t_obj.out() << "failed (expected success)\n";
+    else
+      t_obj.out() << "succeeded (expected failure)\n";
+    return t_obj.setTestResult(1);
+    }
+
+  // Check parsed value
+  if (xrv && apv != xpv)
+    {
+    t_obj.out() << t_obj.where() << "parseLong(\"" << str << "\")"
+                << " gave value " << apv << " (expected " << xpv << ")\n";
+    return t_obj.setTestResult(1);
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testReal(qtTest& t_obj, const QString& str, double xpv, bool xrv = true)
+{
+  double apv;
+  bool arv = qtKstParser::parseReal(str.toLower(), apv);
+
+  // Check return value
+  if (arv != xrv)
+    {
+    t_obj.out() << t_obj.where() << "parseReal(\"" << str << "\") ";
+    if (xrv)
+      t_obj.out() << "failed (expected success)\n";
+    else
+      t_obj.out() << "succeeded (expected failure)\n";
+    return t_obj.setTestResult(1);
+    }
+
+  // Check parsed value
+  if (xpv && !compareReal(apv, xpv))
+    {
+    t_obj.out() << t_obj.where() << "parseReal(\"" << str << "\")"
+                << " gave value " << apv << "(expected " << xpv << ")\n";
+    return t_obj.setTestResult(1);
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testParse(qtTest& t_obj, const QString& data, const QString& xsv,
+              bool xrv = true)
+{
+  qtKstReader r(data);
+  if (xrv != r.isValid())
+    {
+    t_obj.out() << t_obj.where() << "testParse(\"" << data << "\") ";
+    if (xrv)
+      t_obj.out() << "produced an invalid reader (expected a valid reader)\n";
+    else
+      t_obj.out() << "produced a valid reader (expected an invalid reader)\n";
+    return t_obj.setTestResult(1);
+    }
+
+  if (r.isValid())
+    {
+    QString asv;
+    if (!r.readString(asv))
+      {
+      t_obj.out() << t_obj.where() << "testParse(\"" << data << "\")"
+                  << " failed to read value\n";
+      return t_obj.setTestResult(1);
+      }
+    if (asv != xsv)
+      {
+      t_obj.out() << t_obj.where() << "testParse(\"" << data << "\")"
+                  << " got value \"" << asv << "\" "
+                  << "(expected " << xsv << ")\n";
+      return t_obj.setTestResult(1);
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testInvalid(qtTest& t_obj, const QString& data)
+{
+  // Set up stream to catch any qDebug() output from the KST parsing
+  qtTest::StreamPointer stream(new qtStringStream);
+  uint token = t_obj.pushMessageStream(stream);
+
+  // Execute the test
+  qtTestTrace t(TEST_OBJECT_NAME, __LINE__ + 1, __FILE__, _QT_TEST_FUNCTION_);
+  int result = testParse(t_obj, data, QString(), false);
+
+  // If the KST was unexpectedly parsed successfully, emit any output
+  if (result)
+    t_obj.out() << *stream->string();
+
+  // Restore the stream and return the result
+  t_obj.popMessageStream(token);
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+int testBasicLong(qtTest& t_obj)
+{
+  TEST_CALL(testLong, "12345", 12345);
+  TEST_CALL(testLong, "+12345", 12345);
+  TEST_CALL(testLong, "-12345", -12345);
+  TEST_CALL(testLong, "1.2345e4", 12345);
+  TEST_CALL(testLong, "1.2345^4", 12345);
+  TEST_CALL(testLong, "123450e-1", 12345);
+  TEST_CALL(testLong, "0x1.2345^4", 0x12345);
+  TEST_CALL(testLong, "0x1,2345p4", 0x12345);
+  TEST_CALL(testLong, "-5.36705214244372261e+21b8", -12345678987654321LL);
+  TEST_CALL(testLong, "z.xq551^7@36", 2816160313680LL);
+  TEST_CALL(testLong, "-z,xq551^7@36", -2816160313680LL);
+  TEST_CALL(testLong, "zzz^-1@36", 1295);
+  TEST_CALL(testLong, "1e010", 10000000000);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testBasicReal(qtTest& t_obj)
+{
+  TEST_CALL(testReal, "12345.67", 12345.67);
+  TEST_CALL(testReal, "12345,67", 12345.67);
+  TEST_CALL(testReal, "+12345.67", 12345.67);
+  TEST_CALL(testReal, "-12345.67", -12345.67);
+  TEST_CALL(testReal, "1.234567e4", 12345.67);
+  TEST_CALL(testReal, "1.234567^4", 12345.67);
+  TEST_CALL(testReal, "12345670e-3", 12345.67);
+  TEST_CALL(testReal, "0x1.234567^4", 74565.40234375);
+  TEST_CALL(testReal, "0x1,234567p4", 74565.40234375);
+  TEST_CALL(testReal, "-1.3376673360061e+13b8", -12345653120.765625);
+  TEST_CALL(testReal, "z.xq551^3@36", 1676669.139660494);
+  TEST_CALL(testReal, "-z,xq551^3@36", -1676669.139660494);
+  TEST_CALL(testReal, "zzz^-1@36", 1295.972222222222);
+  TEST_CALL(testReal, "1e010", 1e10);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testArcLong(qtTest& t_obj)
+{
+  TEST_CALL(testLong,  "55d12'9.21\"",   55);
+  TEST_CALL(testLong, "+55d12'9.21\"",   55);
+  TEST_CALL(testLong, "-55d12'9.21\"",  -55);
+  TEST_CALL(testLong,  "55d12'9.21\"N",  55);
+  TEST_CALL(testLong,  "55d12'9.21\"S", -55);
+  TEST_CALL(testLong,  "55d12'9.21\"E",  55);
+  TEST_CALL(testLong,  "55d12'9.21\"W", -55);
+  TEST_CALL(testLong, "655'", 10);
+  TEST_CALL(testLong, "7288\"", 2);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testArcReal(qtTest& t_obj)
+{
+  TEST_CALL(testReal,  "55d12'9.21\"",   55.202558333333333);
+  TEST_CALL(testReal, "+55d12'9.21\"",   55.202558333333333);
+  TEST_CALL(testReal, "-55d12'9.21\"",  -55.202558333333333);
+  TEST_CALL(testReal,  "55d12'9.21\"N",  55.202558333333333);
+  TEST_CALL(testReal,  "55d12'9.21\"S", -55.202558333333333);
+  TEST_CALL(testReal,  "55d12'9.21\"E",  55.202558333333333);
+  TEST_CALL(testReal,  "55d12'9.21\"W", -55.202558333333333);
+  TEST_CALL(testReal, "655'", 10.91666666666667);
+  TEST_CALL(testReal, "7288\"", 2.024444444444444);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testBasicFailure(qtTest& t_obj)
+{
+  // Long
+  TEST_CALL(testLong, "1234c.678", 0, false);
+  TEST_CALL(testLong, "12345.67a", 0, false);
+  TEST_CALL(testLong, "12345. 78", 0, false);
+  TEST_CALL(testLong, " 2345.678", 0, false);
+  TEST_CALL(testLong, "12 45.678", 0, false);
+  TEST_CALL(testLong, "128b8", 0, false);
+  TEST_CALL(testLong, "127e18b8", 0, false);
+  TEST_CALL(testLong, "128b1", 0, false);
+  TEST_CALL(testLong, "128b11", 0, false);
+  TEST_CALL(testLong, "128@1", 0, false);
+  TEST_CALL(testLong, "128@37", 0, false);
+  TEST_CALL(testLong, "12345e0x10", 0, false);
+  // Real
+  TEST_CALL(testReal, "1234c.678", 0, false);
+  TEST_CALL(testReal, "12345.67a", 0, false);
+  TEST_CALL(testReal, "12345. 78", 0, false);
+  TEST_CALL(testReal, " 2345.678", 0, false);
+  TEST_CALL(testReal, "12 45.678", 0, false);
+  TEST_CALL(testReal, "128b8", 0, false);
+  TEST_CALL(testReal, "127e18b8", 0, false);
+  TEST_CALL(testReal, "128b1", 0, false);
+  TEST_CALL(testReal, "128b11", 0, false);
+  TEST_CALL(testReal, "128@1", 0, false);
+  TEST_CALL(testReal, "128@37", 0, false);
+  TEST_CALL(testReal, "12345e0x10", 0, false);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testArcFailure(qtTest& t_obj)
+{
+  // Long
+  TEST_CALL(testLong,  "5cd12'9.21\"",  0, false);
+  TEST_CALL(testLong,  "55d1a'9.21\"",  0, false);
+  TEST_CALL(testLong,  "55d12'9.q1\"",  0, false);
+  TEST_CALL(testLong, "+55d12'9.21\"N", 0, false);
+  TEST_CALL(testLong, "-55d12'9.21\"N", 0, false);
+  // Real
+  TEST_CALL(testReal,  "5cd12'9.21\"",  0, false);
+  TEST_CALL(testReal,  "55d1a'9.21\"",  0, false);
+  TEST_CALL(testReal,  "55d12'9.q1\"",  0, false);
+  TEST_CALL(testReal, "+55d12'9.21\"N", 0, false);
+  TEST_CALL(testReal, "-55d12'9.21\"N", 0, false);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testOverflowUnderflow(qtTest& t_obj)
+{
+  // Long
+  TEST_CALL(testLong,  "0x7f^e", 0x7F00000000000000LL);
+  TEST_CALL(testLong, "-0x80^e", 0x8000000000000000LL);
+  TEST_CALL(testLong,  "0x80^e", 0, false);
+  TEST_CALL(testLong, "-0x81^e", 0, false);
+  TEST_CALL(testLong, "1e19", 0, false);
+  TEST_CALL(testLong, "1e-1", 0);
+  TEST_CALL(testLong,  "9223372036854775807", 0x7FFFFFFFFFFFFFFFLL);
+  TEST_CALL(testLong,  "9223372036854775808", 0, false);
+  TEST_CALL(testLong, "-9223372036854775808", 0x8000000000000000LL);
+  TEST_CALL(testLong, "-9223372036854775809", 0, false);
+  // Real
+  TEST_CALL(testReal,  "1e400",  qInf());
+  TEST_CALL(testReal, "-1e400", -qInf());
+  TEST_CALL(testReal,  "1e2000b8",  qInf());
+  TEST_CALL(testReal, "-1e2000b8", -qInf());
+  TEST_CALL(testReal,  "1e-400", 0.0);
+  TEST_CALL(testReal, "-1e-400", 0.0);
+  QString bigNum = QString().fill('9', 400);
+  TEST_CALL(testReal,       bigNum,  qInf());
+  TEST_CALL(testReal, "-" + bigNum, -qInf());
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testValidity(qtTest& t_obj)
+{
+  TEST_CALL(testInvalid, "");
+  TEST_CALL(testInvalid, ",");
+  TEST_CALL(testInvalid, "1");
+  TEST_CALL(testInvalid, "[;");
+  TEST_CALL(testInvalid, "\"");
+  TEST_CALL(testInvalid, "\"\\");
+  TEST_CALL(testInvalid, "\"\"");
+  TEST_CALL(testInvalid, "[1] j;");
+  TEST_CALL(testInvalid, "[1] \"\";");
+  TEST_CALL(testInvalid, "[1][]");
+  TEST_CALL(testInvalid, "#\n");
+  TEST_CALL(testInvalid, ";,\n#\n");
+  TEST_CALL(testInvalid, "1#;\n");
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testBasicParsing(qtTest& t_obj)
+{
+  TEST_CALL(testParse, ";", "");
+  TEST_CALL(testParse, ",;", "");
+  TEST_CALL(testParse, "1;", "1");
+  TEST_CALL(testParse, "[];", "");
+  TEST_CALL(testParse, "[1];", "1");
+  TEST_CALL(testParse, "[[[[1]]]];", "1");
+  TEST_CALL(testParse, "\"\";", "");
+  TEST_CALL(testParse, "\"\\\"\";", "\"");
+  TEST_CALL(testParse, "\"1\\\n2\";", "12");
+  TEST_CALL(testParse, "1 2;", "12");
+  TEST_CALL(testParse, "1 [2];", "1[2]");
+  TEST_CALL(testParse, "\\ \"\\\\\\q\\x05\";", "\\\\qx05");
+  TEST_CALL(testParse, "3\" \" pipe wrench\";", "3\" pipe wrench");
+  TEST_CALL(testParse, "\t\n  ;  \t\n", "");
+  TEST_CALL(testParse, "hello; # world?\n", "hello");
+  TEST_CALL(testParse, "# a\n 1 # b\n # c\n 2; # d\n", "12");
+  TEST_CALL(testParse, "1#;[]\"\n;", "1");
+  TEST_CALL(testParse, "\"a # b\"; # c\n", "a # b");
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testCountSeek(qtTest& t_obj)
+{
+  qtKstReader r("1, 2; 3; 4, 5, 6, 7; 8; ; ,,; ");
+  if (TEST(r.isValid()))
+    return 1;
+
+  TEST_EQUAL(r.recordCount(), 6);
+  TEST_EQUAL(r.valueCount(0), 2);
+  TEST_EQUAL(r.valueCount(1), 1);
+  TEST_EQUAL(r.valueCount(2), 4);
+  TEST_EQUAL(r.valueCount(3), 1);
+  TEST_EQUAL(r.valueCount(4), 1);
+  TEST_EQUAL(r.valueCount(5), 3);
+
+  TEST(r.isEndOfRecord(1, 0) == false);
+  TEST(r.isEndOfRecord(1, 1) == true);
+  TEST(r.isEndOfFile(5) == false);
+  TEST(r.isEndOfFile(6) == true);
+
+  TEST_EQUAL(r.currentRecord(), 0);
+  TEST_EQUAL(r.currentValue(), 0);
+
+  TEST(r.nextValue());
+  TEST_EQUAL(r.currentRecord(), 0);
+  TEST_EQUAL(r.currentValue(), 1);
+  TEST(!r.isEndOfRecord());
+  TEST(r.nextValue());
+  TEST_EQUAL(r.currentRecord(), 0);
+  TEST_EQUAL(r.currentValue(), 2);
+  TEST(r.isEndOfRecord());
+  TEST(!r.nextValue());
+
+  TEST(r.nextRecord());
+  TEST_EQUAL(r.currentRecord(), 1);
+  TEST_EQUAL(r.currentValue(), 0);
+  TEST(r.seek(5, 1));
+  TEST_EQUAL(r.currentRecord(), 5);
+  TEST_EQUAL(r.currentValue(), 1);
+  TEST(!r.isEndOfRecord());
+  TEST(!r.isEndOfFile());
+  TEST(!r.seek(5, 5));
+  TEST_EQUAL(r.currentRecord(), 5);
+  TEST_EQUAL(r.currentValue(), 1);
+  TEST(!r.seek(6, 0));
+  TEST_EQUAL(r.currentRecord(), 5);
+  TEST_EQUAL(r.currentValue(), 1);
+  TEST(r.nextRecord());
+  TEST_EQUAL(r.currentRecord(), 6);
+  TEST_EQUAL(r.currentValue(), 0);
+  TEST(r.isEndOfFile());
+  TEST(!r.nextRecord());
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testArray(qtTest& t_obj)
+{
+  qtKstReader r("[ 1, [ 2, 3, 4 ], [ 5, [ 6, 7 ], [ [ 8 ], 9 ] ] ];"
+                "[ [ 11 ], [ 12 ], [ 13, 14 ] ];");
+  if (TEST(r.isValid()))
+    return 1;
+
+  TEST_EQUAL(r.recordCount(), 2);
+  TEST_EQUAL(r.valueCount(0), 1);
+  TEST_EQUAL(r.valueCount(1), 1);
+
+  int iv;
+  QList<int> ia;
+  qtKstReader ra1;
+  qtKstReader ra2;
+  qtKstReader rt;
+
+  // Reading value as array
+  if (TEST(!ra1.isValid()))
+    return 1;
+  TEST(r.readArray(ra1));
+  TEST_EQUAL(ra1.recordCount(), 1);
+  TEST_EQUAL(ra1.valueCount(0), 3);
+
+  // Can't read non-array as array
+  TEST(!ra1.readArray(ra2));
+
+  // Reading values from array
+  TEST(ra1.readInt(iv));
+  TEST_EQUAL(iv, 1);
+  TEST(ra1.nextValue());
+  TEST(ra1.readIntArray(ia));
+  TEST_EQUAL(ia.count(), 3);
+  TEST_EQUAL(ia[0], 2);
+  TEST_EQUAL(ia[1], 3);
+  TEST_EQUAL(ia[2], 4);
+  TEST(ra1.nextValue());
+
+  // Can't read array with nested array
+  TEST(!ra1.readIntArray(ia));
+
+  // Reading multiply-nested array
+  TEST(ra1.readArray(ra2));
+  TEST_EQUAL(ra2.recordCount(), 1);
+  TEST_EQUAL(ra2.valueCount(0), 3);
+
+  // Can't read into already-initialized reader
+  TEST(!ra1.readArray(ra2));
+
+  // Reading values from multiply-nested array
+  TEST(ra2.readInt(iv));
+  TEST_EQUAL(iv, 5);
+  TEST(ra2.nextValue());
+  TEST(ra2.readIntArray(ia));
+  TEST_EQUAL(ia.count(), 2);
+  TEST_EQUAL(ia[0], 6);
+  TEST_EQUAL(ia[1], 7);
+  TEST(ra2.nextValue());
+
+  // Reading as array when nested array is one-value
+  TEST(ra2.readIntArray(ia));
+  TEST_EQUAL(ia.count(), 2);
+  TEST_EQUAL(ia[0], 8);
+  TEST_EQUAL(ia[1], 9);
+  TEST(ra2.nextValue());
+
+  // End of record on nested array
+  TEST(ra2.isEndOfRecord());
+  TEST(ra2.nextRecord());
+  TEST(ra2.isEndOfFile());
+
+  // Can't read not-table as table
+  TEST(!r.readTable(rt));
+
+  // Reading value as table
+  TEST(r.nextRecord());
+  TEST(r.readTable(rt));
+  TEST_EQUAL(rt.recordCount(), 3);
+  TEST_EQUAL(rt.valueCount(0), 1);
+  TEST_EQUAL(rt.valueCount(1), 1);
+  TEST_EQUAL(rt.valueCount(2), 2);
+
+  // Reading values from table
+  TEST(rt.readInt(iv));
+  TEST_EQUAL(iv, 11);
+  TEST(rt.nextValue());
+  TEST(rt.isEndOfRecord());
+  TEST(rt.nextRecord());
+  TEST(rt.readInt(iv));
+  TEST_EQUAL(iv, 12);
+  TEST(rt.nextRecord());
+  TEST(rt.readInt(iv));
+  TEST_EQUAL(iv, 13);
+  TEST(rt.nextValue());
+  TEST(rt.readInt(iv));
+  TEST_EQUAL(iv, 14);
+  TEST(rt.nextRecord());
+  TEST(rt.isEndOfFile());
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testEmpty(qtTest& t_obj)
+{
+  qtKstReader r(", 1, [], [1];");
+  if (TEST(r.isValid()))
+    return 1;
+
+  TEST_EQUAL(r.isValueEmpty(0), true);
+  TEST_EQUAL(r.isValueEmpty(1), false);
+  TEST_EQUAL(r.isValueEmpty(2), false);
+  TEST_EQUAL(r.isValueEmpty(3), false);
+
+  TEST_EQUAL(r.isArrayEmpty(0), true);
+  TEST_EQUAL(r.isArrayEmpty(1), false);
+  TEST_EQUAL(r.isArrayEmpty(2), true);
+  TEST_EQUAL(r.isArrayEmpty(3), false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testFileValues(qtTest& t_obj)
+{
+  qtKstReader r(testFile);
+  if (TEST(r.isValid()))
+    return 1;
+
+  TEST_EQUAL(r.recordCount(), 5);
+  TEST_EQUAL(r.valueCount(0), 3);
+  TEST_EQUAL(r.valueCount(1), 2);
+  TEST_EQUAL(r.valueCount(2), 1);
+  TEST_EQUAL(r.valueCount(3), 1);
+  TEST_EQUAL(r.valueCount(4), 1);
+
+  int iv;
+  double rv;
+  QList<int> ia;
+  QList<qint64> la;
+  QList<double> ra;
+
+  // Reading array with one value as 1-value and as array
+  TEST(r.readInt(iv));
+  TEST_EQUAL(iv, 1);
+  TEST(r.readIntArray(ia));
+  TEST_EQUAL(ia.count(), 1);
+  TEST_EQUAL(ia[0], 1);
+  TEST(r.nextValue());
+
+  // Reading int array
+  TEST(r.readIntArray(ia));
+  TEST_EQUAL(ia.count(), 3);
+  TEST_EQUAL(ia[0], 2);
+  TEST_EQUAL(ia[1], 3);
+  TEST_EQUAL(ia[2], 4);
+  TEST(r.nextValue());
+
+  // Can't read nested array
+  TEST(!r.readIntArray(ia));
+  TEST(r.nextRecord());
+
+  // Overflow test of int
+  TEST(r.readInt(iv));
+  TEST_EQUAL(iv, 2147483647);
+  TEST(r.nextValue());
+  TEST(!r.readInt(iv));
+  TEST(r.nextRecord());
+
+  // Reading UTF-8 arc length
+  TEST(r.readReal(rv));
+  TEST_EQUAL(rv, 55.202558333333333);
+  TEST(r.nextRecord());
+
+  // Reading long array
+  TEST(r.readLongArray(la));
+  TEST_EQUAL(la.count(), 2);
+  TEST_EQUAL(la[0], 12345678987654321LL);
+  TEST_EQUAL(la[1], 14725836963852741LL);
+  TEST(r.nextRecord());
+
+  // Reading real array
+  TEST(r.readRealArray(ra));
+  TEST_EQUAL(ra.count(), 2);
+  TEST_EQUAL(ra[0], 3.1416);
+  TEST_EQUAL(ra[1], 55.202558333333333);
+  TEST(r.readIntArray(ia));
+  TEST_EQUAL(ia.count(), 2);
+  TEST_EQUAL(ia[0], 3);
+  TEST_EQUAL(ia[1], 55);
+  TEST(r.nextRecord());
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testSeparator(qtTest& t_obj)
+{
+  qtKstReader r("1 2  3\n4\t5\n", QRegExp("\\s+"), QRegExp("\n"));
+  if (TEST(r.isValid()))
+    return 1;
+
+  TEST_EQUAL(r.recordCount(), 2);
+  TEST_EQUAL(r.valueCount(0), 3);
+  TEST_EQUAL(r.valueCount(1), 2);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  qtTest t_obj;
+
+  if (argc < 2)
+    {
+    t_obj.out() << "invocation error, path to test data file required\n";
+    return 1;
+    }
+  testFile = QUrl::fromLocalFile(argv[1]);
+
+  // Parser tests
+  t_obj.runSuite("Basic Long Tests", testBasicLong);
+  t_obj.runSuite("Basic Real Tests", testBasicReal);
+  t_obj.runSuite("Arc Long Tests", testArcLong);
+  t_obj.runSuite("Arc Real Tests", testArcReal);
+  t_obj.runSuite("Basic Failure Tests", testBasicFailure);
+  t_obj.runSuite("Arc Failure Tests", testArcFailure);
+  t_obj.runSuite("Overflow/Underflow Tests", testOverflowUnderflow);
+  // Reader tests
+  t_obj.runSuite("Reader Validity Tests", testValidity);
+  t_obj.runSuite("Reader Basic Parsing Tests", testBasicParsing);
+  t_obj.runSuite("Reader Count/Seek Tests", testCountSeek);
+  t_obj.runSuite("Reader Array Tests", testArray);
+  t_obj.runSuite("Reader Empty Tests", testEmpty);
+  t_obj.runSuite("Reader File Value Tests", testFileValues);
+  t_obj.runSuite("Reader Separator Tests", testSeparator);
+  return t_obj.result();
+}
diff --git a/Libraries/QtExtensions/Testing/TestSqueezedLabel.cxx b/Libraries/QtExtensions/Testing/TestSqueezedLabel.cxx
new file mode 100644
index 00000000..d47ac7dc
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestSqueezedLabel.cxx
@@ -0,0 +1,89 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "TestSqueezedLabel.h"
+
+#include <QApplication>
+#include <QCheckBox>
+#include <QFormLayout>
+#include <QLabel>
+#include <QTextEdit>
+
+#include "../Widgets/qtSqueezedLabel.h"
+
+static const char* defaultText =
+  "Hello, world!\n\nThis is an example of long text that does not fit.";
+
+//-----------------------------------------------------------------------------
+TestSqueezedLabelWidget::TestSqueezedLabelWidget(QWidget* parent)
+  : QWidget(parent)
+{
+  QFormLayout* layout = new QFormLayout;
+  this->setLayout(layout);
+
+  this->label = new qtSqueezedLabel;
+  this->elideStart = new QCheckBox("Elide Start");
+  this->elideEnd = new QCheckBox("Elide End");
+  this->elideFade = new QCheckBox("Elide Fade");
+  this->textEdit = new QTextEdit;
+
+  this->elideStart->setEnabled(false);
+  this->elideEnd->setEnabled(false);
+  this->elideEnd->setChecked(true);
+
+  connect(this->elideStart, SIGNAL(toggled(bool)),
+          this, SLOT(setElideMode()));
+  connect(this->elideEnd, SIGNAL(toggled(bool)),
+          this, SLOT(setElideMode()));
+  connect(this->elideFade, SIGNAL(toggled(bool)),
+          this, SLOT(setElideMode()));
+  connect(this->textEdit, SIGNAL(textChanged()),
+          this, SLOT(setLabelText()));
+
+  layout->addRow("Label:", label);
+  layout->addRow(this->elideStart);
+  layout->addRow(this->elideEnd);
+  layout->addRow(this->elideFade);
+  layout->addRow("Text:", this->textEdit);
+
+  this->resize(320, 240);
+
+  this->textEdit->setText(defaultText);
+  this->setElideMode();
+}
+
+//-----------------------------------------------------------------------------
+void TestSqueezedLabelWidget::setElideMode()
+{
+  qtSqueezedLabel::ElideMode mode = 0;
+//   if (this->elideStart->isChecked())
+//     mode |= qtSqueezedLabel::ElideStart;
+  if (this->elideEnd->isChecked())
+    mode |= qtSqueezedLabel::ElideEnd;
+  if (this->elideFade->isChecked())
+    mode |= qtSqueezedLabel::ElideFade;
+
+  this->label->setElideMode(mode);
+}
+
+//-----------------------------------------------------------------------------
+void TestSqueezedLabelWidget::setLabelText()
+{
+  this->label->setText(this->textEdit->toPlainText(),
+                       qtSqueezedLabel::SetFullText |
+                       qtSqueezedLabel::SetToolTip |
+                       qtSqueezedLabel::SimplifyText);
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+  TestSqueezedLabelWidget window;
+
+  window.show();
+  return app.exec();
+}
diff --git a/Libraries/QtExtensions/Testing/TestSqueezedLabel.h b/Libraries/QtExtensions/Testing/TestSqueezedLabel.h
new file mode 100644
index 00000000..39305154
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestSqueezedLabel.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __TestSqueezedLabel_h
+#define __TestSqueezedLabel_h
+
+#include <QWidget>
+
+class QCheckBox;
+class QLabel;
+class QTextEdit;
+
+class qtSqueezedLabel;
+
+class TestSqueezedLabelWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  TestSqueezedLabelWidget(QWidget* parent = 0);
+  virtual ~TestSqueezedLabelWidget() {}
+
+public slots:
+  void setElideMode();
+  void setLabelText();
+
+protected:
+  qtSqueezedLabel* label;
+  QTextEdit* textEdit;
+  QCheckBox* elideStart, *elideEnd, *elideFade;
+
+private:
+  Q_DISABLE_COPY(TestSqueezedLabelWidget)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Testing/TestThrobber.cxx b/Libraries/QtExtensions/Testing/TestThrobber.cxx
new file mode 100644
index 00000000..0af17767
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestThrobber.cxx
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QApplication>
+#include <QLabel>
+
+#include "../Widgets/qtOverlayWidget.h"
+#include "../Widgets/qtThrobber.h"
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  qtOverlayWidget overlay;
+
+  qtThrobber* throbber = new qtThrobber(&overlay);
+  throbber->setActive(true);
+  throbber->setMaxThrobberSize(200);
+
+  QLabel* label = new QLabel(&overlay);
+  label->setText("Throbber and Overlay Test");
+  label->setAlignment(Qt::AlignCenter | Qt::AlignVCenter);
+
+  overlay.addWidget(label);
+  overlay.addWidget(throbber);
+
+  overlay.show();
+  return app.exec();
+}
diff --git a/Libraries/QtExtensions/Testing/TestUiState.cxx b/Libraries/QtExtensions/Testing/TestUiState.cxx
new file mode 100644
index 00000000..28982a08
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/TestUiState.cxx
@@ -0,0 +1,335 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#define TEST_OBJECT_NAME t_obj
+
+#include <QAction>
+#include <QApplication>
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QGroupBox>
+#include <QLineEdit>
+#include <QScopedPointer>
+#include <QSettings>
+#include <QSpinBox>
+#include <QTemporaryFile>
+
+#include <ctime>
+
+#include "../Core/qtTest.h"
+
+#include "../Util/qtRand.h"
+#include "../Util/qtUiState.h"
+
+#define MAKE_STATE(_tempFile, _state) \
+  QTemporaryFile _tempFile("settings-XXXXXX.ini"); \
+  if (TEST_EQUAL(_tempFile.open(), true)) return 1; \
+  qtUiState _state(new QSettings(_tempFile.fileName(), QSettings::IniFormat))
+
+
+//-----------------------------------------------------------------------------
+class IntItem : public qtUiState::AbstractItem
+{
+public:
+  IntItem(int& value) :
+    Value(value) {}
+
+  virtual QVariant value() const
+    { return this->Value; }
+
+  virtual void setValue(const QVariant& data)
+    { this->Value = data.toInt(); }
+
+protected:
+  int& Value;
+};
+
+//-----------------------------------------------------------------------------
+int testCustomItem(qtTest& t_obj)
+{
+  MAKE_STATE(tf, s);
+
+  int value = 2;
+  s.map("value", new IntItem(value));
+
+  s.restore();
+  TEST_EQUAL(value, 2);
+
+  value = 3;
+  s.restore();
+  TEST_EQUAL(value, 3);
+
+  value = 4;
+  s.save();
+  TEST_EQUAL(value, 4);
+
+  value = 2;
+  s.restore();
+  TEST_EQUAL(value, 4);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int randomize(int other, int max)
+{
+  int data = qtRand(max);
+  return (data == other ? randomize(other, max) : data);
+}
+
+//-----------------------------------------------------------------------------
+QString randomize(const QString& other)
+{
+  static const char chars[] =
+    "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    "0123456789,./;'[]\\`-=<>?:\"{}|~!@#$%^&*()_+";
+
+  QString data;
+  for (int i = qtRand(64); i; --i)
+    {
+    data += QChar::fromAscii(chars[qtRand(sizeof(chars) / sizeof(char))]);
+    }
+  return (data == other ? randomize(other) : data);
+}
+
+//-----------------------------------------------------------------------------
+int testBuiltin(qtTest& t_obj)
+{
+  MAKE_STATE(tf, s);
+
+  // Create widgets
+  QScopedPointer<QObject> object(new QObject);
+  QScopedPointer<QAction> action(new QAction(object.data()));
+  QScopedPointer<QCheckBox> checkBox(new QCheckBox);
+  QScopedPointer<QGroupBox> groupBox(new QGroupBox);
+  QScopedPointer<QLineEdit> lineEdit(new QLineEdit);
+  QScopedPointer<QSpinBox> spinBox(new QSpinBox);
+  QScopedPointer<QDoubleSpinBox> doubleSpinBox(new QDoubleSpinBox);
+  action->setCheckable(true);
+  groupBox->setCheckable(true);
+  doubleSpinBox->setDecimals(2);
+
+  const int maxDoubleInt =
+    static_cast<int>(floor(doubleSpinBox->maximum() * 1e2));
+
+  // Create random data
+  const bool actionChecked = (qtRandD() < 0.5);
+  const bool checkBoxChecked = (qtRandD() < 0.5);
+  const bool groupBoxChecked = (qtRandD() < 0.5);
+  const QString lineEditText = randomize(QString());
+  const int spinBoxValue = qtRand(spinBox->maximum());
+  const int doubleSpinBoxValue = qtRand(maxDoubleInt);
+
+  // Set initial data on widgets
+  action->setChecked(actionChecked);
+  checkBox->setChecked(checkBoxChecked);
+  groupBox->setChecked(groupBoxChecked);
+  lineEdit->setText(lineEditText);
+  spinBox->setValue(spinBoxValue);
+  doubleSpinBox->setValue(doubleSpinBoxValue * 1e-2);
+
+  // Define map and save states
+  s.mapChecked("action", action.data());
+  s.mapChecked("checkBox", checkBox.data());
+  s.mapChecked("groupBox", groupBox.data());
+  s.mapText("lineEdit", lineEdit.data());
+  s.mapValue("spinBox", spinBox.data());
+  s.mapValue("doubleSpinBox", doubleSpinBox.data());
+  s.save();
+
+  // Set different values
+  action->setChecked(!actionChecked);
+  checkBox->setChecked(!checkBoxChecked);
+  groupBox->setChecked(!groupBoxChecked);
+  lineEdit->setText(randomize(lineEditText));
+  spinBox->setValue(randomize(spinBoxValue, spinBox->maximum()));
+  doubleSpinBox->setValue(randomize(doubleSpinBoxValue, maxDoubleInt) * 1e-2);
+
+  // Restore states
+  s.restore();
+
+  // Test restored values
+  TEST_EQUAL(action->isChecked(), actionChecked);
+  TEST_EQUAL(checkBox->isChecked(), checkBoxChecked);
+  TEST_EQUAL(groupBox->isChecked(), groupBoxChecked);
+  TEST_EQUAL(lineEdit->text(), lineEditText);
+  TEST_EQUAL(spinBox->value(), spinBoxValue);
+  TEST_EQUAL(doubleSpinBox->value(), doubleSpinBoxValue * 1e-2);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testCurrentGroup(qtTest& t_obj)
+{
+  MAKE_STATE(tf, s);
+
+  int dog = 2, cat = 3, cow = 4;
+  QString house("house"), barn("barn/stall");
+
+  TEST_EQUAL(s.currentGroup(), QString(""));
+  s.map("dog", new IntItem(dog));
+
+  s.setCurrentGroup(house);
+  TEST_EQUAL(s.currentGroup(), house);
+  s.map("cat", new IntItem(cat));
+
+  s.setCurrentGroup(barn);
+  TEST_EQUAL(s.currentGroup(), barn);
+  s.map("cow", new IntItem(cow));
+
+  s.save();
+
+  QSettings rawSettings(tf.fileName(), QSettings::IniFormat);
+
+  TEST_EQUAL(rawSettings.value("dog", 0).toInt(), 2);
+  TEST_EQUAL(rawSettings.value(house + "/cat", 0).toInt(), 3);
+  TEST_EQUAL(rawSettings.value(barn + "/cow", 0).toInt(), 4);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testExpected(qtTest& t_obj, int actual, int expected, const QString& name)
+{
+  // Check parsed value
+  if (actual != expected)
+    {
+    t_obj.out() << t_obj.where() << qPrintable(name) << " has value "
+                << actual << " (expected " << expected << ")\n";
+    return t_obj.setTestResult(1);
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testNamed(
+  qtTest& t_obj, int a, int b, int c, int d, int xa, int xb, int xc, int xd)
+{
+  TEST_CALL(testExpected, a, xa, "'a'");
+  TEST_CALL(testExpected, b, xb, "'b'");
+  TEST_CALL(testExpected, c, xc, "'c'");
+  TEST_CALL(testExpected, d, xd, "'d'");
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+#define NAMED_RESET() do { \
+  a = 1; b = 2; c = 3; d = 4; \
+  s.save(); \
+  a = b = c = d = 0; \
+  } while(0)
+
+#define TEST_NAMED(_xa, _xb, _xc, _xd) \
+  TEST_CALL(testNamed, a, b, c, d, _xa, _xb, _xc, _xd)
+
+//-----------------------------------------------------------------------------
+int testNamedSave(qtTest& t_obj)
+{
+  MAKE_STATE(tf, s);
+
+  int a, b, c, d;
+
+  s.map("fubar", new IntItem(a));
+  s.map("metal/bar", new IntItem(b));
+  s.map("bar/none", new IntItem(c));
+  s.map("full/metal/jacket", new IntItem(d));
+
+  // Test non-matching key
+  NAMED_RESET();
+  s.save("a");
+  s.restore();
+  TEST_NAMED(1,2,3,4);
+
+  // Test matching-anywhere key
+  NAMED_RESET();
+  s.save("bar");
+  s.restore();
+  TEST_NAMED(1,0,0,4);
+
+  // Test matches-prefix keys
+  NAMED_RESET();
+  s.save("/bar");
+  s.restore();
+  TEST_NAMED(1,2,0,4);
+  NAMED_RESET();
+  s.save("/fubar");
+  s.restore();
+  TEST_NAMED(0,2,3,4);
+
+  // Test matches-group key
+  NAMED_RESET();
+  s.save("metal/");
+  s.restore();
+  TEST_NAMED(1,0,3,0);
+
+  // Test matches-initial-group key
+  NAMED_RESET();
+  s.save("/metal/");
+  s.restore();
+  TEST_NAMED(1,0,3,4);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testNamedRestore(qtTest& t_obj)
+{
+  MAKE_STATE(tf, s);
+
+  int a, b, c, d;
+
+  s.map("fubar", new IntItem(a));
+  s.map("metal/bar", new IntItem(b));
+  s.map("bar/none", new IntItem(c));
+  s.map("full/metal/jacket", new IntItem(d));
+
+  // Test non-matching key
+  NAMED_RESET();
+  s.restore("a");
+  TEST_NAMED(0,0,0,0);
+
+  // Test matching-anywhere key
+  NAMED_RESET();
+  s.restore("bar");
+  TEST_NAMED(0,2,3,0);
+
+  // Test matches-prefix keys
+  NAMED_RESET();
+  s.restore("/bar");
+  TEST_NAMED(0,0,3,0);
+  NAMED_RESET();
+  s.restore("/fubar");
+  TEST_NAMED(1,0,0,0);
+
+  // Test matches-group key
+  NAMED_RESET();
+  s.restore("metal/");
+  TEST_NAMED(0,2,0,4);
+
+  // Test matches-initial-group key
+  NAMED_RESET();
+  s.restore("/metal/");
+  TEST_NAMED(0,2,0,0);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char* argv[])
+{
+  QApplication app(argc, argv); // Needed to construct widgets
+  qtTest t_obj;
+
+  qsrand(static_cast<uint>(time(0)));
+
+  t_obj.runSuite("Custom Mapping Test", testCustomItem);
+  t_obj.runSuite("Built-in Mapping Tests", testBuiltin);
+  t_obj.runSuite("Current Group Tests", testCurrentGroup);
+  t_obj.runSuite("Save Named Tests", testNamedSave);
+  t_obj.runSuite("Restore Named Tests", testNamedRestore);
+  return t_obj.result();
+}
diff --git a/Libraries/QtExtensions/Testing/add-before.png b/Libraries/QtExtensions/Testing/add-before.png
new file mode 100644
index 00000000..1d053d11
Binary files /dev/null and b/Libraries/QtExtensions/Testing/add-before.png differ
diff --git a/Libraries/QtExtensions/Testing/add-child.png b/Libraries/QtExtensions/Testing/add-child.png
new file mode 100644
index 00000000..83d7e33d
Binary files /dev/null and b/Libraries/QtExtensions/Testing/add-child.png differ
diff --git a/Libraries/QtExtensions/Testing/add.png b/Libraries/QtExtensions/Testing/add.png
new file mode 100644
index 00000000..1368d445
Binary files /dev/null and b/Libraries/QtExtensions/Testing/add.png differ
diff --git a/Libraries/QtExtensions/Testing/clear.png b/Libraries/QtExtensions/Testing/clear.png
new file mode 100644
index 00000000..bc5d0689
Binary files /dev/null and b/Libraries/QtExtensions/Testing/clear.png differ
diff --git a/Libraries/QtExtensions/Testing/icons.qrc b/Libraries/QtExtensions/Testing/icons.qrc
new file mode 100644
index 00000000..d7d884ce
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/icons.qrc
@@ -0,0 +1,9 @@
+<RCC>
+  <qresource prefix="icons">
+    <file alias="add">add.png</file>
+    <file alias="add-before">add-before.png</file>
+    <file alias="add-child">add-child.png</file>
+    <file alias="remove">remove.png</file>
+    <file alias="clear">clear.png</file>
+  </qresource>
+</RCC>
diff --git a/Libraries/QtExtensions/Testing/icons.svg b/Libraries/QtExtensions/Testing/icons.svg
new file mode 100644
index 00000000..fc7fcf3e
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/icons.svg
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="80"
+   height="16"
+   id="svg15655"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="icons.svg">
+  <metadata
+     id="metadata440">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1649"
+     inkscape:window-height="1120"
+     id="namedview438"
+     showgrid="false"
+     inkscape:zoom="16"
+     inkscape:cx="40"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg15655"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-center="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3248"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <defs
+     id="defs15657">
+    <radialGradient
+       cx="310.94339"
+       cy="121.8931"
+       r="9.7730999"
+       id="SG_BLUE_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6426-4"
+         style="stop-color:#99d6ff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6428-0"
+         style="stop-color:#4ab7ff;stop-opacity:1"
+         offset="0.47130001" />
+      <stop
+         id="stop6430-1"
+         style="stop-color:#15a1ff;stop-opacity:1"
+         offset="0.82730001" />
+      <stop
+         id="stop6432-9"
+         style="stop-color:#0099ff;stop-opacity:1"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       y2="138.74609"
+       x2="275.04742"
+       y1="114.68603"
+       x1="256.53931"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-43.966523)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4579"
+       xlink:href="#SG_RED_1"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199"
+       id="SG_RED_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6415-6-8-3"
+         style="stop-color:#ffc2b2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6417-4-9-4"
+         style="stop-color:#ffb8a6;stop-opacity:1"
+         offset="0.068" />
+      <stop
+         id="stop6419-2-3-0"
+         style="stop-color:#ff3300;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="164.6982"
+       y1="126.4995"
+       x2="171.19769"
+       y2="135.24879"
+       id="SG_GREEN_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6305-3-0"
+         style="stop-color:#d1f0c2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6307-0-29"
+         style="stop-color:#66cc33;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6759"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-43.966523)"
+       x1="260.24094"
+       y1="112.83525"
+       x2="280.59988"
+       y2="139.67148" />
+    <linearGradient
+       y2="133.19377"
+       x2="270.42041"
+       y1="114.68603"
+       x1="256.53931"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-44.966523)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6822"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="133.19377"
+       x2="270.42041"
+       y1="114.68603"
+       x1="256.53931"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-40.966523)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6896"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="88.775192"
+       x2="274.12204"
+       y1="81.372093"
+       x1="272.27121"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-139.10894,-43.466523)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient6858-8"
+       xlink:href="#SG_BLUE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BLUE_1"
+       id="linearGradient6959"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-139.10894,-43.466523)"
+       x1="271.34583"
+       y1="119.31297"
+       x2="281.5253"
+       y2="136.89531" />
+    <linearGradient
+       y2="138.74609"
+       x2="275.04742"
+       y1="114.68603"
+       x1="256.53931"
+       gradientTransform="matrix(0.54030294,0,0,0.54031449,-137.10894,-43.966523)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7095"
+       xlink:href="#SG_GREEN_1"
+       inkscape:collect="always" />
+    <radialGradient
+       r="6.25"
+       fy="20.375"
+       fx="10.5"
+       cy="20.375"
+       cx="10.5"
+       gradientTransform="matrix(1,0,0,1.6,0,-12.6)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient6875-5"
+       xlink:href="#SG_BEIGE_1"
+       inkscape:collect="always" />
+    <linearGradient
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954"
+       id="SG_BEIGE_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6282-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6284-5"
+         style="stop-color:#ffdc8f;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="linearGradient6854-6"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="14"
+       x2="19.5"
+       y2="19.5"
+       gradientTransform="translate(-0.49999999,0.49999999)" />
+    <linearGradient
+       x1="359.05081"
+       y1="122.8501"
+       x2="346.7869"
+       y2="108.6055"
+       id="SG_GRAY_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6630-5-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6632-5"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6634-2-5"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.51010001" />
+      <stop
+         id="stop6636-90"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop6638-2-8"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Libraries/QtExtensions/Testing/add.png"
+     inkscape:label="#add"
+     id="16_add"
+     transform="translate(0,-16)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4550-5"
+       y="16"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path4552"
+       d="m 5.5,26.5 0,5 4,0 0,-5 5,0 0,-4 -5,0 0,-5 -4,0 0,5 -5,0 0,4 z"
+       style="fill:url(#linearGradient7095);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Libraries/QtExtensions/Testing/add-before.png"
+     inkscape:label="#add-before"
+     id="16_add-before"
+     transform="translate(16,-16)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4550"
+       y="16"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       style="fill:url(#linearGradient6959);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 11.5,29.5 0,-6 2.5,0 -4,-4 -4,4 2.5,0 0,6 z"
+       id="path6757-2"
+       sodipodi:nodetypes="cccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path4552-2-7"
+       d="m 3.5,27.5 0,3 3,0 0,-3 3,0 0,-3 -3,0 0,-3 -3,0 0,3 -3,0 0,3 z"
+       style="fill:url(#linearGradient6896);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       style="color:#000000;fill:url(#linearGradient6858-8);fill-opacity:1;fill-rule:nonzero;stroke:#2a4556;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 5.5,1.5 9,0 0,2 -9,0 z"
+       id="path6915"
+       inkscape:connector-curvature="0"
+       transform="translate(0,16)"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+  <g
+     transform="translate(32,-16)"
+     id="16_add-child"
+     inkscape:label="#add-child"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Libraries/QtExtensions/Testing/add-child.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect6755"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       style="fill:url(#linearGradient6759);fill-opacity:1;stroke:#2a4556;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 5.5,28.5 6,0 0,2 3.5,-3.5 -3.5,-3.5 0,2 -3,0 0,-9 -3,0 z"
+       id="path6757"
+       sodipodi:nodetypes="cccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc"
+       id="path4552-2"
+       d="m 3.5,23.5 0,3 3,0 0,-3 3,0 0,-3 -3,0 0,-3 -3,0 0,3 -3,0 0,3 z"
+       style="fill:url(#linearGradient6822);fill-opacity:1;stroke:#435a36;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     transform="translate(48,-16)"
+     id="16_remove"
+     inkscape:label="#remove"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Libraries/QtExtensions/Testing/remove.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="16"
+       height="16"
+       x="0"
+       y="16"
+       id="rect4558"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc"
+       id="path4552-8"
+       d="m 14.5,26.5 0,-4 -14.00000001,0 0,4 z"
+       style="fill:url(#linearGradient4579);fill-opacity:1;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <g
+     inkscape:export-ydpi="90"
+     inkscape:export-xdpi="90"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Libraries/QtExtensions/Testing/clear.png"
+     inkscape:label="#clear"
+     id="16_clear"
+     transform="matrix(0.7288265,0,0,0.7288265,64,-7.3224481)">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect6384"
+       y="10.046902"
+       x="0"
+       height="21.953098"
+       width="21.953098" />
+    <g
+       id="g6844-6"
+       transform="matrix(1.3720687,0,0,1.3720687,-4.1162062,-11.906198)">
+      <path
+         style="color:#000000;fill:url(#radialGradient6875-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14,30.5 c 0,-3 2.5,-6.5 -0.5,-8 l -1,-0.5 c -3,-1.5 -4,2.5 -6.5,4.5 l 8,4 z"
+         id="path6416-3"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 11,24 c -1,2 -1,2 -2.5,3.5"
+         id="path6639-8"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cc"
+         id="path6641-3"
+         d="m 13,25 c -1,2 -1,2 -1.5,4"
+         style="color:#000000;fill:none;stroke:#bdaf86;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path6728-3"
+         d="m 9,23 6,3"
+         style="fill:none;stroke:#9d381e;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 14,30.5 c 0,-3 2.5,-6.5 -0.5,-8 l -1,-0.5 c -3,-1.5 -4,2.5 -6.5,4.5 l 8,4 z"
+         id="path6760-8"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         id="path6440-7"
+         d="m 12,22 2.5,-5 2,1 -2.5,5 -2,-1 z"
+         style="fill:url(#linearGradient6854-6);fill-opacity:1;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/Libraries/QtExtensions/Testing/qtEditableLabel.cxx b/Libraries/QtExtensions/Testing/qtEditableLabel.cxx
new file mode 100644
index 00000000..3b3bc5e8
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/qtEditableLabel.cxx
@@ -0,0 +1,89 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtEditableLabel.h"
+
+#include <QBoxLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
+
+QTE_IMPLEMENT_D_FUNC(qtEditableLabel)
+
+//-----------------------------------------------------------------------------
+class qtEditableLabelPrivate : public QLineEdit
+{
+public:
+  explicit qtEditableLabelPrivate(qtEditableLabel*);
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(qtEditableLabel)
+
+  virtual void keyPressEvent(QKeyEvent*);
+};
+
+//-----------------------------------------------------------------------------
+qtEditableLabelPrivate::qtEditableLabelPrivate(qtEditableLabel* q)
+  : QLineEdit(q), q_ptr(q)
+{
+  this->setFrame(false);
+  this->setVisible(false);
+
+  connect(this, SIGNAL(editingFinished()), q, SLOT(endEditing()));
+}
+
+//-----------------------------------------------------------------------------
+qtEditableLabel::qtEditableLabel(QWidget* parent)
+  : QLabel(parent), d_ptr(new qtEditableLabelPrivate(this))
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtEditableLabelPrivate::keyPressEvent(QKeyEvent* event)
+{
+  if (event->key() == Qt::Key_Escape)
+    q_ptr->cancelEditing();
+  else
+    QLineEdit::keyPressEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+qtEditableLabel::~qtEditableLabel()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtEditableLabel::beginEditing()
+{
+  QTE_D(qtEditableLabel);
+  d->setText(this->text());
+  d->selectAll();
+  d->show();
+  d->setFocus();
+  d->setGeometry(0, 0, this->width(), this->height());
+}
+
+//-----------------------------------------------------------------------------
+void qtEditableLabel::endEditing()
+{
+  this->setText(this->d_ptr->text());
+  this->cancelEditing();
+}
+
+//-----------------------------------------------------------------------------
+void qtEditableLabel::cancelEditing()
+{
+  QTE_D(qtEditableLabel);
+  d->blockSignals(true);
+  d->hide();
+  d->blockSignals(false);
+}
+
+//-----------------------------------------------------------------------------
+void qtEditableLabel::mouseDoubleClickEvent(QMouseEvent* event)
+{
+  this->beginEditing();
+  QWidget::mouseDoubleClickEvent(event);
+}
diff --git a/Libraries/QtExtensions/Testing/qtEditableLabel.h b/Libraries/QtExtensions/Testing/qtEditableLabel.h
new file mode 100644
index 00000000..56421033
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/qtEditableLabel.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtEditableLabel_h
+#define __qtEditableLabel_h
+
+#include <QLabel>
+
+#include "../Core/qtGlobal.h"
+
+class qtEditableLabelPrivate;
+
+class qtEditableLabel : public QLabel
+{
+  Q_OBJECT
+
+public:
+  qtEditableLabel(QWidget* parent = 0);
+  virtual ~qtEditableLabel();
+
+public slots:
+  void beginEditing();
+  void endEditing();
+  void cancelEditing();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtEditableLabel)
+
+  void mouseDoubleClickEvent(QMouseEvent* event);
+
+private:
+  QTE_DECLARE_PRIVATE(qtEditableLabel)
+  Q_DISABLE_COPY(qtEditableLabel)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Testing/remove.png b/Libraries/QtExtensions/Testing/remove.png
new file mode 100644
index 00000000..87c82a0f
Binary files /dev/null and b/Libraries/QtExtensions/Testing/remove.png differ
diff --git a/Libraries/QtExtensions/Testing/testDoubleSlider.ui b/Libraries/QtExtensions/Testing/testDoubleSlider.ui
new file mode 100644
index 00000000..0dc96cb4
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/testDoubleSlider.ui
@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TestDoubleSliderWidget</class>
+ <widget class="QWidget" name="TestDoubleSliderWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>393</width>
+    <height>173</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="qtDoubleSlider" name="slider" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <layout class="QFormLayout" name="formLayout_2">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>Minimum:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QDoubleSpinBox" name="min">
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="minimum">
+        <double>-99.998999999999995</double>
+       </property>
+       <property name="maximum">
+        <double>99.998999999999995</double>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>Maximum:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QDoubleSpinBox" name="max">
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="minimum">
+        <double>-99.998999999999995</double>
+       </property>
+       <property name="maximum">
+        <double>99.998999999999995</double>
+       </property>
+       <property name="value">
+        <double>1.000000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Single Step:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QDoubleSpinBox" name="sStep">
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="maximum">
+        <double>99.998999999999995</double>
+       </property>
+       <property name="value">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Page Step:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QDoubleSpinBox" name="pStep">
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="maximum">
+        <double>99.998999999999995</double>
+       </property>
+       <property name="value">
+        <double>0.100000000000000</double>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="1">
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>Value:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>Set Value:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QDoubleSpinBox" name="sval">
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="minimum">
+        <double>-99.998999999999995</double>
+       </property>
+       <property name="maximum">
+        <double>99.998999999999995</double>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Quantize:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QDoubleSpinBox" name="quant">
+       <property name="decimals">
+        <number>3</number>
+       </property>
+       <property name="maximum">
+        <double>99.998999999999995</double>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QComboBox" name="qmode">
+       <property name="currentIndex">
+        <number>1</number>
+       </property>
+       <item>
+        <property name="text">
+         <string>Relative</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Absolute</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_9">
+       <property name="text">
+        <string>Quantize Mode:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="val">
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtDoubleSlider</class>
+   <extends>QWidget</extends>
+   <header location="global">qtDoubleSlider.h</header>
+   <container>1</container>
+   <slots>
+    <signal>valueChanged(double)</signal>
+    <slot>setMinimum(double)</slot>
+    <slot>setMaximum(double)</slot>
+    <slot>setSingleStep(double)</slot>
+    <slot>setPageStep(double)</slot>
+    <slot>setQuantize(double)</slot>
+    <slot>setValue(double)</slot>
+   </slots>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>min</sender>
+   <signal>valueChanged(double)</signal>
+   <receiver>slider</receiver>
+   <slot>setMinimum(double)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>119</x>
+     <y>45</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>39</x>
+     <y>12</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>max</sender>
+   <signal>valueChanged(double)</signal>
+   <receiver>slider</receiver>
+   <slot>setMaximum(double)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>98</x>
+     <y>73</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>338</x>
+     <y>15</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sStep</sender>
+   <signal>valueChanged(double)</signal>
+   <receiver>slider</receiver>
+   <slot>setSingleStep(double)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>119</x>
+     <y>101</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>130</x>
+     <y>12</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>pStep</sender>
+   <signal>valueChanged(double)</signal>
+   <receiver>slider</receiver>
+   <slot>setPageStep(double)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>112</x>
+     <y>130</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>108</x>
+     <y>13</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>quant</sender>
+   <signal>valueChanged(double)</signal>
+   <receiver>slider</receiver>
+   <slot>setQuantize(double)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>333</x>
+     <y>107</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>167</x>
+     <y>14</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>sval</sender>
+   <signal>valueChanged(double)</signal>
+   <receiver>slider</receiver>
+   <slot>setValue(double)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>317</x>
+     <y>73</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>211</x>
+     <y>13</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Libraries/QtExtensions/Testing/testdata.kst b/Libraries/QtExtensions/Testing/testdata.kst
new file mode 100644
index 00000000..7958b406
--- /dev/null
+++ b/Libraries/QtExtensions/Testing/testdata.kst
@@ -0,0 +1,6 @@
+# KST test data
+[ 1 ], [ 2, [ 3 ], 4 ], [ 5, [ 6, 7 ] ];
+2147483647, 2147483648;
+55°12′9.21″;
+[ 12345678987654321, 14725836963852741 ];
+[ 3.1416, 55°12′9.21″ ];
diff --git a/Libraries/QtExtensions/Tools/qtActionManagerCompiler.cxx b/Libraries/QtExtensions/Tools/qtActionManagerCompiler.cxx
new file mode 100644
index 00000000..10774ac3
--- /dev/null
+++ b/Libraries/QtExtensions/Tools/qtActionManagerCompiler.cxx
@@ -0,0 +1,435 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QCoreApplication>
+#include <QDateTime>
+#include <QDebug>
+#include <QDomDocument>
+#include <QDomNode>
+#include <QFile>
+#include <QFileInfo>
+#include <QMultiHash>
+#include <QRegExp>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
+
+#include <cstdio>
+
+#include "qteVersion.h"
+
+typedef QHash<QString, QString> ObjectProperties;
+typedef QHash<QString, ObjectProperties> ActionMap;
+typedef QMultiHash<QString, QString> ActionGroupMap;
+
+//-----------------------------------------------------------------------------
+QDebug out(QtMsgType type = QtDebugMsg, QString file = QString(),
+           uint line = 0, uint col = 0)
+{
+  QString prefix = "qte-amc:";
+  if (!file.isEmpty())
+    {
+    prefix += ' ' + file + ':';
+    if (line > 0)
+      {
+      prefix += QString::number(line) + ':';
+      if (col > 0)
+        {
+        prefix += QString::number(col) + ':';
+        }
+      }
+    }
+
+  if (type == QtDebugMsg)
+    {
+    return QDebug(type);
+    }
+  return QDebug(type) << qPrintable(prefix);
+}
+
+//-----------------------------------------------------------------------------
+QDebug err(QString file = QString(), uint line = 0, uint col = 0)
+{
+  return out(QtCriticalMsg, file, line, col) << "error:";
+}
+
+//-----------------------------------------------------------------------------
+QDebug warn(QString file = QString(), uint line = 0, uint col = 0)
+{
+  return out(QtWarningMsg, file, line, col) << "warning:";
+}
+
+//-----------------------------------------------------------------------------
+QString makeIdentifier(QString identifier)
+{
+  for (int n = 0; n < identifier.size(); ++n)
+    {
+    if (!identifier[n].isLetter())
+      {
+      identifier[n] = '_';
+      }
+    }
+  return identifier;
+}
+
+//-----------------------------------------------------------------------------
+QString removeAccel(QString text)
+{
+  // Need our own function because QString::remove is self-modifying
+  return text.remove('&');
+}
+
+//-----------------------------------------------------------------------------
+QString iconName(const ObjectProperties& properties)
+{
+  if (!properties.contains("icon"))
+    {
+    return QString();
+    }
+
+  QString name = properties.value("icon");
+  name = name.mid(name.lastIndexOf('/') + 1);
+  return name;
+}
+
+//-----------------------------------------------------------------------------
+QString codeString(QString value)
+{
+  if (value.isEmpty())
+    {
+    return "QString()";
+    }
+  return '\"' + value + '\"';
+}
+
+//-----------------------------------------------------------------------------
+void writeGeneratedFileHeader(QTextStream& s, QStringList inFiles)
+{
+  int w = (inFiles.count() > 1 ? 81 : 80);
+  s << '/' << QString(w, '*') << '\n'
+    << "** Form generated from reading UI file";
+  if (inFiles.count() == 1)
+    {
+    s << " '" << QFileInfo(inFiles[0]).fileName() << "'\n";
+    }
+  else
+    {
+    s << "s:\n";
+    foreach (QString inFile, inFiles)
+      s << "**    '" << QFileInfo(inFile).fileName() << "'\n";
+    }
+  s << "** Created: " << QDateTime::currentDateTime().toString() << '\n'
+    << "**      by: QtExtensions Action Manager Compiler"
+    << " version " << QTE_AMC_VERSION_STR << '\n'
+    << "**\n"
+    << "** WARNING! All changes made in this file will be lost"
+       " when recompiling UI file";
+  if (inFiles.count() > 1)
+    {
+    s << 's';
+    }
+  s << "!\n" << QString(w, '*') << "/\n\n";
+}
+
+//-----------------------------------------------------------------------------
+ObjectProperties extractProperties(const QDomNode& object)
+{
+  ObjectProperties properties;
+  QDomNodeList childNodes = object.childNodes();
+  for (int ci = 0; ci < childNodes.count(); ++ci)
+    {
+    // Get property
+    QDomElement element = childNodes.at(ci).toElement();
+    if (element.tagName() != "property")
+      {
+      continue;
+      }
+    // Get name
+    QString propertyName = element.attribute("name");
+    if (propertyName.isEmpty())
+      {
+      continue;
+      }
+    // Get value
+    QString propertyValue;
+    QDomNodeList propertyChildNodes = element.childNodes();
+    for (int pi = 0; pi < propertyChildNodes.count(); ++pi)
+      {
+      QDomNode n = propertyChildNodes.at(pi);
+      QString tagName = n.toElement().tagName();
+      if (tagName == "string" || tagName == "iconset")
+        {
+        int k = n.childNodes().count() - 1;
+        if (k < 0)
+          {
+          continue;
+          }
+        propertyValue = n.childNodes().at(k).toText().data();
+        break;
+        }
+      }
+    // Add property
+    if (!propertyValue.isEmpty())
+      {
+      properties.insert(propertyName, propertyValue);
+      }
+    }
+
+  return properties;
+}
+
+//-----------------------------------------------------------------------------
+bool processUi(QString uiName, QTextStream& managerSource)
+{
+  QFile uiFile(uiName);
+  if (!uiFile.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    err(uiName) << "unable to open file";
+    return false;
+    }
+
+  QByteArray data = uiFile.readAll();
+  if (!data.startsWith("<?xml"))
+    {
+    err(uiName) << "file does not appear to be a valid .ui file";
+    return false;
+    }
+
+  QDomDocument doc;
+  int el, ec;
+  QString et;
+  if (!doc.setContent(data, &et, &el, &ec))
+    {
+    err(uiName, el, ec) << qPrintable(et);
+    err(uiName) << "file is not a valid XML document";
+    return false;
+    }
+
+  // Get UI class name
+  QString uiClassName =
+    doc.elementsByTagName("class").at(0).childNodes().at(0).toText().data();
+
+  // Get UI window title
+  QString uiWindowTitle;
+  QDomNodeList widgetNodes = doc.elementsByTagName("widget");
+  for (int wi = 0; wi < widgetNodes.count(); ++wi)
+    {
+    if (widgetNodes.at(wi).toElement().attribute("name") == uiClassName)
+      {
+      ObjectProperties properties = extractProperties(widgetNodes.at(wi));
+      uiWindowTitle = properties.value("windowTitle");
+      break;
+      }
+    }
+  if (uiWindowTitle.isEmpty())
+    {
+    uiWindowTitle = uiClassName;
+    }
+
+  // Get actions
+  QDomNodeList actionNodes = doc.elementsByTagName("action");
+  if (actionNodes.isEmpty())
+    {
+    warn(uiName) << "no actions found; no output will be produced";
+    return true;
+    }
+  ActionMap actions;
+  ActionGroupMap actionGroups;
+  for (int ai = 0; ai < actionNodes.count(); ++ai)
+    {
+    QDomNode actionNode = actionNodes.at(ai);
+    QString actionName = actionNode.toElement().attribute("name");
+    ObjectProperties properties = extractProperties(actionNode);
+    actions.insert(actionName, properties);
+    if (properties.contains("actionGroup"))
+      {
+      actionGroups.insert(properties["actionGroup"], actionName);
+      }
+    }
+
+  // Open .ui output file
+  QFileInfo uiFileInfo(uiName);
+  QString amName = QString("am_%1.h").arg(uiFileInfo.completeBaseName());
+  QFile amFile(amName);
+  if (!amFile.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+    err(amName) << "unable to open file for writing";
+    return false;
+    }
+
+  // Write header
+  QTextStream am(&amFile);
+  writeGeneratedFileHeader(am, QStringList(uiName));
+
+  // Write inclusion guard and base include headers
+  QString inclusionGuardSymbol = makeIdentifier(amName.toUpper());
+  am << "#ifndef " << inclusionGuardSymbol << '\n'
+     << "#define " << inclusionGuardSymbol << '\n'
+     << '\n';
+  if (!actionGroups.isEmpty())
+    {
+    am << "#include <QActionGroup>\n";
+    }
+  am << "#include <qtActionManager.h>\n"
+     << "#include \"ui_" << amName.mid(3) << "\"\n"
+     << "\nQT_BEGIN_NAMESPACE\n\n"
+     << "class Am_" << uiClassName << "\n{\n"
+     << "public:\n";
+
+  // Write action group declarations
+  foreach (QString actionGroup, actionGroups.uniqueKeys())
+    am << "    QActionGroup *" << actionGroup << ";\n";
+  am << '\n';
+
+  // Write setupActions method header
+  am << "    void setupActions(Ui_" << uiClassName << " &ui, "
+                              "QObject *actionGroupParent, "
+                              "QSettings &settings)\n"
+     << "    {\n";
+
+  // Write code to set up action groups
+  if (actionGroups.isEmpty())
+    {
+    am << "        Q_UNUSED(actionGroupParent);\n\n";
+    }
+  else
+    {
+    foreach (QString actionGroup, actionGroups.uniqueKeys())
+      {
+      am << "        " << actionGroup
+         << " = new QActionGroup(actionGroupParent);\n";
+      foreach (QString actionInGroup, actionGroups.values(actionGroup))
+        am << "        " << actionGroup << "->addAction(ui."
+           << actionInGroup << ");\n";
+      am << '\n';
+      }
+    }
+
+  // Write code to set up actions
+  ActionMap::const_iterator iter, actionsEnd = actions.end();
+  for (iter = actions.begin(); iter != actionsEnd; ++iter)
+    {
+    am << "        qtAm->setupAction(settings, ui." << iter.key()
+       << ", \"" << uiClassName << '/' << iter.key() << '\"';
+    QString icon = iconName(iter.value());
+    if (!icon.isEmpty())
+      {
+      am << ", \"" << icon << '\"';
+      }
+    am << ");\n";
+    }
+
+  // Write setupActions method footer
+  am << "    } // setupActions\n\n"
+     << "    void setupActions(Ui_" << uiClassName << " &ui, "
+                              "QObject *actionGroupParent)\n"
+     << "    {\n"
+     << "        QSettings settings;\n"
+     << "        setupActions(ui, actionGroupParent, settings);\n"
+     << "    } // setupActions\n";
+
+  // Write footer
+  am << "\n};\n\n"
+     << "namespace Am {\n"
+     << "    class " << uiClassName
+     << ": public Am_" << uiClassName << " {};\n"
+     << "} // namespace Am"
+     << "\n\nQT_END_NAMESPACE\n\n"
+     << "#endif // " << inclusionGuardSymbol << '\n';
+
+  // Write manager code
+  QTextStream& ms = managerSource; // alias parameter
+  for (iter = actions.begin(); iter != actionsEnd; ++iter)
+    {
+    QString icon = iconName(iter.value());
+    QString defaultShortcut = iter.value().value("shortcut");
+    QString displayGroup = iter.value().value("displayGroup", uiWindowTitle);
+    ms << "        registerAction(\""
+       << uiClassName << '/' << iter.key() << "\", \"" << displayGroup
+       << "\", \"" << removeAccel(iter.value().value("text")) << "\", "
+       << codeString(icon) << ", QKeySequence("
+       << codeString(defaultShortcut) << ", QKeySequence::PortableText)"
+       << ");\n";
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void usage()
+{
+  out() << "usage: qte-amc <manager header> <ui file> [ <ui file> ... ]";
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  int retval = 0;
+
+  QCoreApplication app(argc, argv);
+  QStringList args = app.arguments().mid(1);
+
+  if (args.count() < 1)
+    {
+    err() << "no output file specified";
+    usage();
+    retval = 2;
+    }
+  else if (args.count() < 2)
+    {
+    err() << "no input files specified";
+    usage();
+    retval = 2;
+    }
+  else
+    {
+    // Open manager file
+    QString managerName = args.takeFirst();
+    QFile managerFile(managerName);
+    if (!managerFile.open(QIODevice::WriteOnly | QIODevice::Text))
+      {
+      err(managerName) << "unable to open file";
+      retval = 1;
+      }
+    else
+      {
+      // Write manager header
+      QString managerClass = QFileInfo(managerName).baseName();
+      QTextStream ms(&managerFile);
+      writeGeneratedFileHeader(ms, args);
+      QString inclusionGuardSymbol =
+        makeIdentifier(QFileInfo(managerName).fileName().toUpper());
+      ms << "#ifndef " << inclusionGuardSymbol << '\n'
+         << "#define " << inclusionGuardSymbol << '\n'
+         << "\n#include <qtActionManagerDialog.h>\n\n"
+         << "class " << managerClass << ": public qtActionManagerDialog\n{\n"
+         << "public:\n    " << managerClass
+         << "(QWidget *parent = 0, Qt::WindowFlags flags = 0)"
+            ": qtActionManagerDialog(parent, flags)\n"
+         << "    {\n";
+
+      // Process .ui files
+      foreach (QString uiFile, args)
+        {
+        if (!processUi(uiFile, ms))
+          {
+          retval = 1;
+          }
+        }
+
+      // Write manager footer
+      ms << "    }\n};\n\n"
+         << "#endif // " << inclusionGuardSymbol << '\n';
+      }
+
+    if (retval)
+      {
+      out() << "error(s) occurred";
+      }
+    }
+
+  return retval;
+}
diff --git a/Libraries/QtExtensions/Tools/qtMakeDoxyTags.cxx b/Libraries/QtExtensions/Tools/qtMakeDoxyTags.cxx
new file mode 100644
index 00000000..a6dfbe8c
--- /dev/null
+++ b/Libraries/QtExtensions/Tools/qtMakeDoxyTags.cxx
@@ -0,0 +1,126 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QDebug>
+#include <QDomDocument>
+#include <QFile>
+#include <QStringList>
+#include <QTextStream>
+
+#include "../Core/qtCliArgs.h"
+#include "../Dom/qtDom.h"
+#include "../Dom/qtDomElement.h"
+#include "qteVersion.h"
+
+//-----------------------------------------------------------------------------
+QDomNode parseInput(
+  const QString& tag, const QString& filename, QDomDocument& doc)
+{
+  QFile file(filename);
+  if (!file.open(QIODevice::ReadOnly))
+    {
+    qWarning().nospace()
+      << "Error opening page " << filename << ": " << file.errorString();
+    return QDomNode();
+    }
+
+  QDomDocument html;
+  QString error;
+  int el, ec;
+  if (!html.setContent(&file, &error, &el, &ec))
+    {
+    qWarning().nospace()
+      << qPrintable(filename) << ':' << el << ':' << ec
+      << ": " << qPrintable(error);
+    return QDomNode();
+    }
+
+  QList<QDomElement> title = qtDom::findElements(html, "h1");
+  if (title.isEmpty())
+    {
+    qWarning() << "Could not find page title in" << filename;
+    return QDomNode();
+    }
+
+  // TODO extract sections?
+  // <docanchor file="${tag}">${anchor-name}</docanchor>
+
+  qtDomElement node(doc, "compound");
+  node.setAttribute("kind", "page");
+  node.add(qtDomElement(doc, "name").addText(tag))
+      .add(qtDomElement(doc, "title").addText(title[0].text()))
+      .add(qtDomElement(doc, "filename").addText(tag));
+
+  return node;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  qtCliArgs args(argc, argv);
+
+  // Set up options
+  qtCliOptions options;
+  options.add("o <file>", "Name of output tag file to create",
+              qtCliOption::Required);
+  options.add("d <dir>", "Location of Qt HTML documentation",
+              qtCliOption::Required);
+  args.addOptions(options);
+
+  qtCliOptions nargs;
+  nargs.add("tags", "List of tags (page names) to extract",
+            qtCliOption::NamedList);
+  args.addNamedArguments(nargs);
+
+  // Parse arguments
+  args.parseOrDie();
+  const QString outname = args.value("o");
+  const QString docdir = args.value("d");
+
+  // Create tagfile root
+  QDomDocument tags;
+  static const char* const processing =
+    "version='1.0' encoding='utf-8' standalone='yes' ";
+  tags.appendChild(tags.createProcessingInstruction("xml", processing));
+  QDomElement root = tags.createElement("tagfile");
+
+  // Extract tags
+  int errors = 0;
+  foreach(const QString& tag, args.values("tags"))
+    {
+    qDebug() << "Extracting tag" << tag;
+    QDomNode node = parseInput(tag, docdir + '/' + tag + ".html", tags);
+    if (node.isNull())
+      {
+      ++errors;
+      continue;
+      }
+    root.appendChild(node);
+    }
+
+  if (errors)
+    {
+    qWarning() << "Error(s) occurred; no output was written";
+    return 1;
+    }
+
+  tags.appendChild(root);
+
+  // Write output tag file
+  QFile out(outname);
+  if (!out.open(QIODevice::WriteOnly))
+    {
+    qWarning().nospace()
+      << "Error opening output file " << outname << ": " << out.errorString();
+    return 1;
+    }
+
+  QTextStream stream(&out);
+  stream.setCodec("UTF-8");
+  stream << tags.toString(2);
+
+  return 0;
+}
diff --git a/Libraries/QtExtensions/Util/qtAbstractAnimation.cxx b/Libraries/QtExtensions/Util/qtAbstractAnimation.cxx
new file mode 100644
index 00000000..1d063737
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtAbstractAnimation.cxx
@@ -0,0 +1,214 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <cmath>
+
+#include "qtAbstractAnimation.h"
+
+QTE_IMPLEMENT_D_FUNC(qtAbstractAnimation)
+
+//-----------------------------------------------------------------------------
+class qtAbstractAnimationPrivate : protected QAbstractAnimation
+{
+public:
+  qtAbstractAnimationPrivate(qtAbstractAnimation* q)
+    : QAbstractAnimation(q), q_ptr(q), absRate(1.0), dirRate(1.0) {}
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(qtAbstractAnimation)
+
+  virtual int duration() const;
+  virtual void updateCurrentTime(int currentTime);
+
+  qreal absRate;
+  qreal dirRate;
+
+private:
+  QTE_DECLARE_PUBLIC(qtAbstractAnimation)
+};
+
+//-----------------------------------------------------------------------------
+int qtAbstractAnimationPrivate::duration() const
+{
+  QTE_Q_CONST(qtAbstractAnimation);
+  return static_cast<int>(q->duration() * 1e3 / this->absRate);
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimationPrivate::updateCurrentTime(int currentTime)
+{
+  QTE_Q(qtAbstractAnimation);
+  double currentTimeReal = currentTime;
+  q->updateCurrentTime(currentTimeReal * 1e-3 * this->absRate);
+}
+
+//-----------------------------------------------------------------------------
+qtAbstractAnimation::qtAbstractAnimation(QObject* parent)
+  : QObject(parent), d_ptr(new qtAbstractAnimationPrivate(this))
+{
+  QTE_D(qtAbstractAnimation);
+  connect(d, SIGNAL(finished()), this, SIGNAL(finished()));
+  connect(d, SIGNAL(stateChanged(QAbstractAnimation::State,
+                                 QAbstractAnimation::State)),
+          this, SIGNAL(stateChanged(QAbstractAnimation::State,
+                                    QAbstractAnimation::State)));
+  connect(d, SIGNAL(currentLoopChanged(int)),
+          this, SIGNAL(currentLoopChanged(int)));
+}
+
+//-----------------------------------------------------------------------------
+qtAbstractAnimation::~qtAbstractAnimation()
+{
+}
+
+//-----------------------------------------------------------------------------
+QAbstractAnimation::State qtAbstractAnimation::state() const
+{
+  QTE_D_CONST(qtAbstractAnimation);
+  return d->state();
+}
+
+//-----------------------------------------------------------------------------
+qreal qtAbstractAnimation::rate() const
+{
+  QTE_D_CONST(qtAbstractAnimation);
+  return d->dirRate;
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::setRate(qreal rate)
+{
+  QTE_D(qtAbstractAnimation);
+  if (rate == d->dirRate)
+    {
+    return;
+    }
+
+  if (fabs(rate) != d->absRate)
+    {
+    double t = this->currentTime();
+    d->absRate = fabs(rate);
+    this->setCurrentTime(t);
+    }
+  d->dirRate = rate;
+  d->setDirection(rate > 0 ? QAbstractAnimation::Forward
+                           : QAbstractAnimation::Backward);
+
+  emit this->rateChanged(rate);
+}
+
+//-----------------------------------------------------------------------------
+double qtAbstractAnimation::currentTime() const
+{
+  QTE_D_CONST(qtAbstractAnimation);
+  double currentTimeReal = d->currentTime();
+  return currentTimeReal * 1e-3 * d->absRate;
+}
+
+//-----------------------------------------------------------------------------
+double qtAbstractAnimation::currentLoopTime() const
+{
+  QTE_D_CONST(qtAbstractAnimation);
+  double currentLoopTimeReal = d->currentLoopTime();
+  return currentLoopTimeReal * 1e-3 * d->absRate;
+}
+
+//-----------------------------------------------------------------------------
+int qtAbstractAnimation::loopCount() const
+{
+  QTE_D_CONST(qtAbstractAnimation);
+  return d->loopCount();
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::setLoopCount(int loopCount)
+{
+  QTE_D(qtAbstractAnimation);
+  d->setLoopCount(loopCount);
+}
+
+//-----------------------------------------------------------------------------
+int qtAbstractAnimation::currentLoop() const
+{
+  QTE_D_CONST(qtAbstractAnimation);
+  return d->currentLoop();
+}
+
+//-----------------------------------------------------------------------------
+double qtAbstractAnimation::totalDuration() const
+{
+  double dur = this->duration();
+  if (dur <= 0.0)
+    {
+    return dur;
+    }
+  int lc = this->loopCount();
+  if (lc < 0)
+    {
+    return -1.0;
+    }
+  double lcr = lc;
+  return dur * lcr;
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::start()
+{
+  QTE_D(qtAbstractAnimation);
+  d->start();
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::pause()
+{
+  QTE_D(qtAbstractAnimation);
+  d->pause();
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::resume()
+{
+  QTE_D(qtAbstractAnimation);
+  d->resume();
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::setPaused(bool paused)
+{
+  QTE_D(qtAbstractAnimation);
+  d->setPaused(paused);
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::stop()
+{
+  QTE_D(qtAbstractAnimation);
+  d->stop();
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::setCurrentTime(double secs)
+{
+  QTE_D(qtAbstractAnimation);
+  double currentTimeReal = d->currentTime();
+  if (secs == (currentTimeReal * 1e-3 * d->absRate))
+    {
+    return;
+    }
+
+  d->setCurrentTime(static_cast<int>(secs * 1e3 / d->absRate));
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::updateState(QAbstractAnimation::State,
+                                      QAbstractAnimation::State)
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractAnimation::updateRate(qreal)
+{
+}
diff --git a/Libraries/QtExtensions/Util/qtAbstractAnimation.h b/Libraries/QtExtensions/Util/qtAbstractAnimation.h
new file mode 100644
index 00000000..2028c686
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtAbstractAnimation.h
@@ -0,0 +1,74 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtAbstractAnimation_h
+#define __qtAbstractAnimation_h
+
+#include <QAbstractAnimation>
+
+#include "../Core/qtGlobal.h"
+
+class qtAbstractAnimationPrivate;
+
+class QTE_EXPORT qtAbstractAnimation : public QObject
+{
+  Q_OBJECT
+
+  Q_PROPERTY(QAbstractAnimation::State state READ state NOTIFY stateChanged)
+  Q_PROPERTY(int loopCount READ loopCount WRITE setLoopCount)
+  Q_PROPERTY(double currentTime READ currentTime WRITE setCurrentTime)
+  Q_PROPERTY(int currentLoop READ currentLoop NOTIFY currentLoopChanged)
+  Q_PROPERTY(qreal rate READ rate WRITE setRate NOTIFY rateChanged)
+  Q_PROPERTY(double duration READ duration)
+
+public:
+  qtAbstractAnimation(QObject* parent = 0);
+  virtual ~qtAbstractAnimation();
+
+  QAbstractAnimation::State state() const;
+  qreal rate() const;
+
+  double currentTime() const;
+  double currentLoopTime() const;
+
+  int loopCount() const;
+  void setLoopCount(int loopCount);
+  int currentLoop() const;
+
+  virtual double duration() const = 0;
+  double totalDuration() const;
+
+signals:
+  void finished();
+  void stateChanged(QAbstractAnimation::State newState,
+                    QAbstractAnimation::State oldState);
+  void currentLoopChanged(int currentLoop);
+  void rateChanged(qreal);
+
+public slots:
+  void start();
+  void pause();
+  void resume();
+  void setPaused(bool);
+  void stop();
+  void setCurrentTime(double secs);
+  void setRate(qreal rate);
+
+protected:
+  virtual void updateCurrentTime(double currentTime) = 0;
+  virtual void updateState(QAbstractAnimation::State newState,
+                           QAbstractAnimation::State oldState);
+  virtual void updateRate(qreal rate);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(qtAbstractAnimation)
+
+private:
+  QTE_DECLARE_PRIVATE(qtAbstractAnimation)
+  Q_DISABLE_COPY(qtAbstractAnimation)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtAbstractSetting.cxx b/Libraries/QtExtensions/Util/qtAbstractSetting.cxx
new file mode 100644
index 00000000..2d4577a6
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtAbstractSetting.cxx
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtAbstractSetting.h"
+
+#include <QSettings>
+
+//-----------------------------------------------------------------------------
+qtAbstractSetting::qtAbstractSetting() : modified(false)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtAbstractSetting::~qtAbstractSetting()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractSetting::initialize(const QSettings&)
+{
+  this->currentValue = this->originalValue;
+}
+
+//-----------------------------------------------------------------------------
+bool qtAbstractSetting::isModified()
+{
+  return this->modified;
+}
+
+//-----------------------------------------------------------------------------
+QVariant qtAbstractSetting::value() const
+{
+  return this->currentValue;
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractSetting::setValue(const QVariant& value)
+{
+  this->currentValue = value;
+  this->modified = (this->currentValue != this->originalValue);
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractSetting::commit(QSettings& store)
+{
+  store.setValue(this->key(), this->currentValue);
+  this->originalValue = this->currentValue;
+  this->modified = false;
+}
+
+//-----------------------------------------------------------------------------
+void qtAbstractSetting::discard()
+{
+  this->currentValue = this->originalValue;
+  this->modified = false;
+}
diff --git a/Libraries/QtExtensions/Util/qtAbstractSetting.h b/Libraries/QtExtensions/Util/qtAbstractSetting.h
new file mode 100644
index 00000000..2aa5ecc8
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtAbstractSetting.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtAbstractSetting_h
+#define __qtAbstractSetting_h
+
+#include "qtSettings.h"
+
+class QSettings;
+
+class QTE_EXPORT qtAbstractSetting
+{
+public:
+  qtAbstractSetting();
+  virtual ~qtAbstractSetting();
+
+  virtual qtSettings::Scope scope() const = 0;
+
+  virtual bool isModified();
+  virtual QVariant value() const;
+  virtual void setValue(const QVariant& value);
+  virtual void commit(QSettings& store);
+  virtual void discard();
+
+protected:
+  friend class qtSettings;
+
+  virtual void initialize(const QSettings& store);
+  virtual QString key() const = 0;
+
+  QVariant originalValue;
+  QVariant currentValue;
+  bool modified;
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtActionFactory.cxx b/Libraries/QtExtensions/Util/qtActionFactory.cxx
new file mode 100644
index 00000000..450bbb40
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtActionFactory.cxx
@@ -0,0 +1,144 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtActionFactory.h"
+
+#include "../Dialogs/qtActionManagerDialog.h"
+
+#include "qtActionManager.h"
+
+QTE_IMPLEMENT_D_FUNC(qtActionFactory)
+
+//-----------------------------------------------------------------------------
+class qtActionFactoryPrivate
+{
+public:
+  qtActionFactoryPrivate(QString settingsKey, QString text,
+                         QString displayGroup, QString icon,
+                         QList<QKeySequence> defaultShortcuts);
+
+  QString settingsKey;
+  QString text, displayGroup, icon;
+  QList<QKeySequence> defaultShortcuts;
+
+  Qt::ShortcutContext shortcutContext;
+  bool checkable;
+  QString toolTip, statusTip, whatsThis;
+  QAction::Priority priority;
+};
+
+//-----------------------------------------------------------------------------
+qtActionFactoryPrivate::qtActionFactoryPrivate(
+  QString k, QString t, QString dg, QString i, QList<QKeySequence> ds)
+  : settingsKey(k), text(t), displayGroup(dg), icon(i),
+    defaultShortcuts(ds), shortcutContext(Qt::WindowShortcut),
+    checkable(false), priority(QAction::NormalPriority)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtActionFactory::qtActionFactory(QString settingsKey, QString text,
+                                 QString displayGroup, QString icon,
+                                 QList<QKeySequence> defaultShortcuts)
+  : d_ptr(new qtActionFactoryPrivate(settingsKey, text, displayGroup, icon,
+                                     defaultShortcuts))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtActionFactory::~qtActionFactory()
+{
+  QTE_D(qtActionFactory);
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+QAction* qtActionFactory::createAction(QObject* parent,
+                                       QActionGroup* group) const
+{
+  QSettings settings;
+  return this->createAction(settings, parent, group);
+}
+
+//-----------------------------------------------------------------------------
+QAction* qtActionFactory::createAction(QSettings& settings, QObject* parent,
+                                       QActionGroup* group) const
+{
+  QTE_D_CONST(qtActionFactory);
+
+  // Create action
+  QAction* action = new QAction(d->text, parent);
+  action->setShortcuts(d->defaultShortcuts);
+
+  // Set managed properties
+  qtAm->setupAction(settings, action, d->settingsKey, d->icon);
+
+  // Set additional properties
+  if (group)
+    {
+    action->setActionGroup(group);
+    }
+  action->setShortcutContext(d->shortcutContext);
+  action->setCheckable(d->checkable);
+  action->setToolTip(d->toolTip);
+  action->setStatusTip(d->statusTip);
+  action->setWhatsThis(d->whatsThis);
+  action->setPriority(d->priority);
+
+  // Return the newly created action
+  return action;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionFactory::setShortcutContext(Qt::ShortcutContext shortcutContext)
+{
+  QTE_D(qtActionFactory);
+  d->shortcutContext = shortcutContext;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionFactory::setCheckable(bool checkable)
+{
+  QTE_D(qtActionFactory);
+  d->checkable = checkable;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionFactory::setToolTip(const QString& toolTip)
+{
+  QTE_D(qtActionFactory);
+  d->toolTip = toolTip;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionFactory::setStatusTip(const QString& statusTip)
+{
+  QTE_D(qtActionFactory);
+  d->statusTip = statusTip;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionFactory::setWhatsThis(const QString& whatsThis)
+{
+  QTE_D(qtActionFactory);
+  d->whatsThis = whatsThis;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionFactory::setPriority(QAction::Priority priority)
+{
+  QTE_D(qtActionFactory);
+  d->priority = priority;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionFactory::addToDialog(qtActionManagerDialog* dialog) const
+{
+  QTE_D_CONST(qtActionFactory);
+  QString text = QString(d->text).remove('&');
+  dialog->registerAction(d->settingsKey, d->displayGroup, text, d->icon,
+                         d->defaultShortcuts);
+}
diff --git a/Libraries/QtExtensions/Util/qtActionFactory.h b/Libraries/QtExtensions/Util/qtActionFactory.h
new file mode 100644
index 00000000..8053b842
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtActionFactory.h
@@ -0,0 +1,52 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtActionFactory_h
+#define __qtActionFactory_h
+
+#include <QAction>
+#include <QSettings>
+#include <QString>
+
+#include "../Core/qtGlobal.h"
+
+class qtActionFactoryPrivate;
+class qtActionManagerDialog;
+
+class QTE_EXPORT qtActionFactory
+{
+public:
+  QAction* createAction(QObject* parent, QActionGroup* group = 0) const;
+  QAction* createAction(QSettings&, QObject* parent,
+                        QActionGroup* group = 0) const;
+
+  void setShortcutContext(Qt::ShortcutContext);
+  void setCheckable(bool);
+  void setToolTip(const QString&);
+  void setStatusTip(const QString&);
+  void setWhatsThis(const QString&);
+  void setPriority(QAction::Priority);
+
+protected:
+  QTE_DECLARE_PRIVATE(qtActionFactory)
+  friend class qtActionManager;
+
+  explicit qtActionFactory(QString settingsKey, QString text,
+                           QString displayGroup, QString icon,
+                           QList<QKeySequence> defaultShortcuts);
+
+  ~qtActionFactory();
+
+  void addToDialog(qtActionManagerDialog*) const;
+
+private:
+  QTE_DECLARE_PRIVATE_PTR(qtActionFactory)
+  Q_DISABLE_COPY(qtActionFactory)
+};
+
+#define qtAm (qtActionManager::instance())
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtActionManager.cxx b/Libraries/QtExtensions/Util/qtActionManager.cxx
new file mode 100644
index 00000000..c25c9b78
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtActionManager.cxx
@@ -0,0 +1,166 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtActionManager.h"
+
+#include <QCoreApplication>
+#include <QHash>
+
+#include "../Core/qtUtil.h"
+
+#include "qtActionFactory.h"
+
+QTE_IMPLEMENT_D_FUNC(qtActionManager)
+
+namespace
+{
+typedef QHash<QAction*, QString> StaticActionMap;
+}
+
+//-----------------------------------------------------------------------------
+class qtActionManagerPrivate
+{
+public:
+  QList<qtActionFactory*> actions;
+  StaticActionMap staticActions;
+};
+
+//-----------------------------------------------------------------------------
+qtActionManager* qtActionManager::instance()
+{
+  static qtActionManager* theInstance = 0;
+
+  // Create global instance, if it doesn't exist. The global QCoreApplication
+  // instance must be created first, as we parent ourselves to it so that it
+  // will garbage collect us on shutdown.
+  if (!theInstance)
+    {
+    QCoreApplication* app = QCoreApplication::instance();
+    if (app)
+      {
+      // Take this opportunity to register QKeySequence as a metatype
+      qRegisterMetaType<QKeySequence>("QKeySequence");
+      qRegisterMetaTypeStreamOperators<QKeySequence>("QKeySequence");
+      theInstance = new qtActionManager(app);
+      }
+    }
+
+  return theInstance;
+}
+
+//-----------------------------------------------------------------------------
+qtActionManager::qtActionManager(QObject* parent)
+  : QObject(parent), d_ptr(new qtActionManagerPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtActionManager::~qtActionManager()
+{
+  QTE_D(qtActionManager);
+  foreach (qtActionFactory* f, d->actions)
+    delete f;
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+qtActionFactory* qtActionManager::registerAction(
+  QString settingsKey, QString text, QString displayGroup, QString icon,
+  QKeySequence defaultShortcut)
+{
+  QList<QKeySequence> defaultShortcuts;
+  defaultShortcuts.append(defaultShortcut);
+  return this->registerAction(settingsKey, text, displayGroup, icon,
+                              defaultShortcuts);
+}
+
+//-----------------------------------------------------------------------------
+qtActionFactory* qtActionManager::registerAction(
+  QString settingsKey, QString text, QString displayGroup, QString icon,
+  QList<QKeySequence> defaultShortcuts)
+{
+  if (settingsKey.isEmpty())
+    {
+    return 0;
+    }
+
+  if (displayGroup.isEmpty())
+    {
+    displayGroup = qApp->applicationName();
+    }
+
+  QTE_D(qtActionManager);
+  qtActionFactory* f = new qtActionFactory(settingsKey, text, displayGroup,
+                                           icon, defaultShortcuts);
+  d->actions.append(f);
+  return f;
+}
+
+//-----------------------------------------------------------------------------
+void qtActionManager::setupAction(QSettings& settings, QAction* action,
+                                  QString settingsKey, QString icon)
+{
+  QTE_D(qtActionManager);
+
+  // Set shortcut from settings
+  this->loadShortcut(action, settings, settingsKey);
+
+  // Set up proper icon
+  if (!icon.isEmpty())
+    {
+    action->setIcon(qtUtil::standardActionIcon(icon));
+    }
+
+  // Register static action so we can automatically reload its shortcut
+  d->staticActions.insert(action, settingsKey);
+  connect(action, SIGNAL(destroyed(QObject*)),
+          this, SLOT(unregisterStaticAction(QObject*)));
+}
+
+//-----------------------------------------------------------------------------
+void qtActionManager::unregisterStaticAction(QObject* object)
+{
+  QTE_D(qtActionManager);
+  d->staticActions.remove(qobject_cast<QAction*>(object));
+}
+
+//-----------------------------------------------------------------------------
+void qtActionManager::addDynamicActions(qtActionManagerDialog* dialog) const
+{
+  QTE_D_CONST(qtActionManager);
+  foreach (qtActionFactory* f, d->actions)
+    f->addToDialog(dialog);
+}
+
+//-----------------------------------------------------------------------------
+void qtActionManager::reloadActions(QSettings& settings) const
+{
+  QTE_D_CONST(qtActionManager);
+  foreach_iter (StaticActionMap::const_iterator, iter, d->staticActions)
+    this->loadShortcut(iter.key(), settings, iter.value());
+}
+
+//-----------------------------------------------------------------------------
+void qtActionManager::loadShortcut(QAction* action, QSettings& settings,
+                                   QString settingsKey)
+{
+  // Get default shortcut(s)
+  QVariantList values;
+  foreach (QKeySequence seq, action->shortcuts())
+    values.append(seq);
+
+  // Load shortcut(s)
+  QList<QKeySequence> shortcuts;
+  values = settings.value("Shortcuts/" + settingsKey, values).toList();
+  foreach (QVariant value, values)
+    {
+    if (value.canConvert<QKeySequence>())
+      {
+      shortcuts.append(value.value<QKeySequence>());
+      }
+    }
+  action->setShortcuts(shortcuts);
+}
diff --git a/Libraries/QtExtensions/Util/qtActionManager.h b/Libraries/QtExtensions/Util/qtActionManager.h
new file mode 100644
index 00000000..f112ad8c
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtActionManager.h
@@ -0,0 +1,61 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtActionManager_h
+#define __qtActionManager_h
+
+#include <QAction>
+#include <QSettings>
+#include <QString>
+
+#include "../Core/qtGlobal.h"
+
+class qtActionFactory;
+class qtActionManagerDialog;
+class qtActionManagerPrivate;
+
+class QTE_EXPORT qtActionManager : public QObject
+{
+  Q_OBJECT
+
+public:
+  static qtActionManager* instance();
+
+  virtual ~qtActionManager();
+
+  qtActionFactory* registerAction(
+    QString settingsKey, QString text,
+    QString displayGroup = QString(), QString icon = QString(),
+    QKeySequence defaultShortcut = QKeySequence());
+  qtActionFactory* registerAction(
+    QString settingsKey, QString text, QString displayGroup, QString icon,
+    QList<QKeySequence> defaultShortcuts);
+
+  void setupAction(QSettings& settings, QAction* action, QString settingsKey,
+                   QString icon = QString());
+
+protected slots:
+  void unregisterStaticAction(QObject*);
+
+protected:
+  QTE_DECLARE_PRIVATE(qtActionManager)
+  friend class qtActionManagerDialog;
+
+  void addDynamicActions(qtActionManagerDialog*) const;
+  void reloadActions(QSettings&) const;
+
+  static void loadShortcut(QAction*, QSettings&, QString settingsKey);
+
+private:
+  QTE_DECLARE_PRIVATE_PTR(qtActionManager)
+  Q_DISABLE_COPY(qtActionManager)
+
+  explicit qtActionManager(QObject* parent);
+};
+
+#define qtAm (qtActionManager::instance())
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtActionPriorityList.cxx b/Libraries/QtExtensions/Util/qtActionPriorityList.cxx
new file mode 100644
index 00000000..d0a2fc77
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtActionPriorityList.cxx
@@ -0,0 +1,65 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtActionPriorityList.h"
+
+#include <QMap>
+#include <QMenu>
+
+#include <limits>
+
+QTE_IMPLEMENT_D_FUNC_SHARED(qtActionPriorityList)
+
+//-----------------------------------------------------------------------------
+class qtActionPriorityListData :
+  public QSharedData, public QMultiMap<int, QAction*>
+{
+};
+
+//-----------------------------------------------------------------------------
+qtActionPriorityList::qtActionPriorityList(QAction* followingAction) :
+  d_ptr(new qtActionPriorityListData)
+{
+  QTE_D_MUTABLE(qtActionPriorityList);
+  d->insert(std::numeric_limits<int>::max(), followingAction);
+}
+
+//-----------------------------------------------------------------------------
+qtActionPriorityList::qtActionPriorityList(const qtActionPriorityList& other) :
+  d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtActionPriorityList::~qtActionPriorityList()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtActionPriorityList& qtActionPriorityList::operator=(
+  const qtActionPriorityList& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+QAction* qtActionPriorityList::insertAction(QAction* action, int priority)
+{
+  QTE_D_MUTABLE(qtActionPriorityList);
+
+  const qtActionPriorityListData::iterator iter = ++d->insert(priority, action);
+  return (iter == d->end() ? 0 : iter.value());
+}
+
+//-----------------------------------------------------------------------------
+QAction* qtActionPriorityList::followingAction(int priority) const
+{
+  QTE_D_SHARED(qtActionPriorityList);
+
+  const qtActionPriorityListData::const_iterator iter = d->lowerBound(priority);
+  return (iter == d->constEnd() ? 0 : iter.value());
+}
diff --git a/Libraries/QtExtensions/Util/qtActionPriorityList.h b/Libraries/QtExtensions/Util/qtActionPriorityList.h
new file mode 100644
index 00000000..2948397a
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtActionPriorityList.h
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtActionPriorityList_h
+#define __qtActionPriorityList_h
+
+#include <QSharedDataPointer>
+
+#include "../Core/qtGlobal.h"
+
+class QAction;
+
+class qtActionPriorityListData;
+
+/// Action list with priority.
+///
+/// This class implements a simple action list with priority-based insertion.
+/// Inserted actions are ordered according to an integer priority value.
+/// New actions are inserted after existing actions of lower priority, and
+/// before actions of lesser or equal priority.
+///
+/// This class is used to implement qtPrioritizedMenuProxy and
+/// qtPrioritizedToolBarProxy.
+class QTE_EXPORT qtActionPriorityList
+{
+public:
+  /// Create action list.
+  ///
+  /// \param followingAction Pointer to an action which will follow (come
+  ///                        after) actions inserted into this list.
+  qtActionPriorityList(QAction* followingAction = 0);
+
+  /// Copy constructor.
+  qtActionPriorityList(const qtActionPriorityList&);
+
+  ~qtActionPriorityList();
+
+  /// Assignment operator.
+  qtActionPriorityList& operator=(const qtActionPriorityList&);
+
+  /// Insert a new action into the list.
+  ///
+  /// \return Pointer to the action immediately following the newly inserted
+  ///         action, or 0 if the action was inserted at the end of the list.
+  QAction* insertAction(QAction*, int priority = 0);
+
+  /// Obtain action following specified priority.
+  ///
+  /// \return Pointer to the action that would immediately follow a newly
+  ///         inserted action of \p priority, or 0 if the action would be
+  ///         inserted at the end of the list.
+  QAction* followingAction(int priority) const;
+
+protected:
+  QTE_DECLARE_SHARED_PTR(qtActionPriorityList)
+
+private:
+  QTE_DECLARE_SHARED(qtActionPriorityList)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtColorUtil.cxx b/Libraries/QtExtensions/Util/qtColorUtil.cxx
new file mode 100644
index 00000000..8789f998
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtColorUtil.cxx
@@ -0,0 +1,105 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtColorUtil.h"
+
+namespace qtColorUtil
+{
+
+//-----------------------------------------------------------------------------
+qreal blend(qreal a, qreal b, qreal t)
+{
+  return (a * (1.0 - t)) + (b * t);
+}
+
+//-----------------------------------------------------------------------------
+qreal blend(qreal p0, qreal p1, qreal p2, qreal p3, qreal t)
+{
+  double t2 = t * t;
+  double t3 = t2 * t;
+
+  double m0 = (p2 - p0) * 0.5;
+  double m1 = (p3 - p1) * 0.5;
+  double a0 =  2 * t3  +  -3 * t2  + 1;
+  double a1 =  1 * t3  +  -2 * t2  + t;
+  double a2 =  1 * t3  +  -1 * t2;
+  double a3 = -2 * t3  +   3 * t2;
+
+  return (a0 * p1) + (a1 * m0) + (a2 * m1) + (a3 * p2);
+}
+
+//-----------------------------------------------------------------------------
+QColor blend(const QColor& a, const QColor& b, qreal t, QColor::Spec s)
+{
+  QColor result;
+
+  switch (s)
+    {
+    case QColor::Cmyk:
+      result.setCmykF(
+        blend(a.cyanF(),    b.cyanF(),    t),
+        blend(a.magentaF(), b.magentaF(), t),
+        blend(a.yellowF(),  b.yellowF(),  t),
+        blend(a.blackF(),   b.blackF(),   t));
+      break;
+    case QColor::Hsv:
+      result.setHsvF(
+        blend(a.hsvHueF(),        b.hsvHueF(),        t),
+        blend(a.hsvSaturationF(), b.hsvSaturationF(), t),
+        blend(a.valueF(),         b.valueF(),         t));
+      break;
+    case QColor::Hsl:
+      result.setHslF(
+        blend(a.hslHueF(),        b.hslHueF(),        t),
+        blend(a.hslSaturationF(), b.hslSaturationF(), t),
+        blend(a.lightnessF(),     b.lightnessF(),     t));
+      break;
+    default: // RGB
+      result.setRgbF(
+        blend(a.redF(),   b.redF(),   t),
+        blend(a.greenF(), b.greenF(), t),
+        blend(a.blueF(),  b.blueF(),  t));
+      break;
+    }
+
+  // Blend alpha and return result
+  result.setAlphaF(blend(a.alphaF(), b.alphaF(), t));
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+#define BLEND4(_c) \
+  qBound(0.0, blend(a._c##F(), b._c##F(), c._c##F(), d._c##F(), t), 1.0)
+QColor blend(const QColor& a, const QColor& b, const QColor& c,
+             const QColor& d, qreal t, QColor::Spec s)
+{
+  QColor result;
+
+  switch (s)
+    {
+    case QColor::Cmyk:
+      result.setCmykF(
+        BLEND4(cyan), BLEND4(magenta), BLEND4(yellow), BLEND4(black));
+      break;
+    case QColor::Hsv:
+      result.setHsvF(
+        BLEND4(hsvHue), BLEND4(hsvSaturation), BLEND4(value));
+      break;
+    case QColor::Hsl:
+      result.setHslF(
+        BLEND4(hslHue), BLEND4(hslSaturation), BLEND4(lightness));
+      break;
+    default: // RGB
+      result.setRgbF(BLEND4(red), BLEND4(green), BLEND4(blue));
+      break;
+    }
+
+  // Blend alpha and return result
+  result.setAlphaF(BLEND4(alpha));
+  return result;
+}
+
+} // namespace qtColorUtil
diff --git a/Libraries/QtExtensions/Util/qtColorUtil.h b/Libraries/QtExtensions/Util/qtColorUtil.h
new file mode 100644
index 00000000..9617628e
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtColorUtil.h
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtColorUtil_h
+#define __qtColorUtil_h
+
+#include <QColor>
+
+#include "../Core/qtGlobal.h"
+
+namespace qtColorUtil
+{
+  QTE_EXPORT qreal blend(qreal a, qreal b, qreal t);
+  QTE_EXPORT qreal blend(qreal a, qreal b, qreal c, qreal d, qreal t);
+  QTE_EXPORT QColor blend(const QColor& a, const QColor& b,
+                          qreal t, QColor::Spec s = QColor::Rgb);
+  QTE_EXPORT QColor blend(const QColor& a, const QColor& b,
+                          const QColor& c, const QColor& d,
+                          qreal t, QColor::Spec s = QColor::Rgb);
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtDockController.cxx b/Libraries/QtExtensions/Util/qtDockController.cxx
new file mode 100644
index 00000000..8c6bb643
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtDockController.cxx
@@ -0,0 +1,61 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QAction>
+#include <QDebug>
+#include <QDockWidget>
+
+#include "qtDockControllerPrivate.h"
+
+QTE_IMPLEMENT_D_FUNC(qtDockController)
+
+//-----------------------------------------------------------------------------
+qtDockControllerPrivate::qtDockControllerPrivate()
+{
+  mapper = new QSignalMapper(this);
+
+  connect(mapper, SIGNAL(mapped(QObject*)),
+          this, SLOT(toggled(QObject*)));
+}
+
+//-----------------------------------------------------------------------------
+void qtDockControllerPrivate::toggled(QObject* obj)
+{
+  QAction* internal = qobject_cast<QAction*>(obj);
+  QAction* external = this->map[obj];
+  bool restore = external->blockSignals(true);
+  external->setChecked(internal->isChecked());
+  external->blockSignals(restore);
+}
+
+//-----------------------------------------------------------------------------
+qtDockController::qtDockController(QObject* parent)
+  : QObject(parent), d_ptr(new qtDockControllerPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtDockController::~qtDockController()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtDockController::addToggleAction(QAction* external, QDockWidget* dock)
+{
+  QTE_D(qtDockController);
+
+  QAction* internal = dock->toggleViewAction();
+
+  d->mapper->setMapping(internal, internal);
+  d->map.insert(internal, external);
+
+  connect(external, SIGNAL(toggled(bool)),
+          internal, SIGNAL(triggered(bool)));
+  connect(internal, SIGNAL(toggled(bool)),
+          d->mapper, SLOT(map()));
+
+  external->setChecked(internal->isChecked());
+}
diff --git a/Libraries/QtExtensions/Util/qtDockController.h b/Libraries/QtExtensions/Util/qtDockController.h
new file mode 100644
index 00000000..21a1ff00
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtDockController.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDockController_h
+#define __qtDockController_h
+
+#include <QObject>
+
+#include "../Core/qtGlobal.h"
+
+class QAction;
+class QDockWidget;
+
+class qtDockControllerPrivate;
+
+class QTE_EXPORT qtDockController : public QObject
+{
+public:
+  qtDockController(QObject* parent);
+  virtual ~qtDockController();
+
+  void addToggleAction(QAction*, QDockWidget*);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtDockController)
+
+private:
+  QTE_DECLARE_PRIVATE(qtDockController)
+  Q_DISABLE_COPY(qtDockController)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtDockControllerPrivate.h b/Libraries/QtExtensions/Util/qtDockControllerPrivate.h
new file mode 100644
index 00000000..b943bb52
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtDockControllerPrivate.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDockControllerPrivate_h
+#define __qtDockControllerPrivate_h
+
+#include <QSignalMapper>
+#include <QHash>
+
+#include "qtDockController.h"
+
+class qtDockControllerPrivate : public QObject
+{
+  Q_OBJECT
+
+public:
+  qtDockControllerPrivate();
+
+  QSignalMapper* mapper;
+  QHash<QObject*, QAction*> map;
+
+public slots:
+  void toggled(QObject*);
+
+private:
+  Q_DISABLE_COPY(qtDockControllerPrivate)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtGradient.cxx b/Libraries/QtExtensions/Util/qtGradient.cxx
new file mode 100644
index 00000000..e9298d81
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtGradient.cxx
@@ -0,0 +1,359 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtGradient.h"
+
+#include <QSharedData>
+
+#include "../Core/qtMath.h"
+
+#include "qtColorUtil.h"
+
+QTE_IMPLEMENT_D_FUNC_SHARED(qtGradient)
+
+//BEGIN qtGradientData
+
+//-----------------------------------------------------------------------------
+class qtGradientData : public QSharedData
+{
+public:
+  QMap<qreal, qtGradient::Stop> stops;
+  qtGradient::InterpolationMode interpolateMode;
+  qtGradient::Spread spread;
+
+  QColor blend(const QColor& a, const QColor& b, qreal t) const;
+  QColor linearBlend(const QColor& a, const QColor& b,
+                     qreal t, qreal w) const;
+  QColor cubicBlend(const qtGradient::Stop& a, const qtGradient::Stop& b,
+                    const qtGradient::Stop& c, const qtGradient::Stop& d,
+                    qreal t) const;
+
+  QColor::Spec blendSpace() const;
+};
+
+//-----------------------------------------------------------------------------
+QColor::Spec qtGradientData::blendSpace() const
+{
+  switch (this->interpolateMode & qtGradient::InterpolateColorspaceMask)
+    {
+    case qtGradient::InterpolateCmyk:
+      return QColor::Cmyk;
+    case qtGradient::InterpolateHsv:
+      return QColor::Hsv;
+    case qtGradient::InterpolateHsl:
+      return QColor::Hsl;
+    default: // RGB
+      return QColor::Rgb;
+    }
+}
+
+//-----------------------------------------------------------------------------
+QColor qtGradientData::blend(const QColor& a, const QColor& b, qreal t) const
+{
+  return qtColorUtil::blend(a, b, t, this->blendSpace());
+}
+
+//-----------------------------------------------------------------------------
+QColor qtGradientData::linearBlend(
+  const QColor& a, const QColor& b, qreal t, qreal w) const
+{
+  // Apply weighting
+  t = (t > w ? qtColorUtil::blend(0.5, 1.0, (t - w) / (1.0 - w))
+             : qtColorUtil::blend(0.0, 0.5, t / w));
+
+  // Perform blend
+  return this->blend(a, b, t);
+}
+
+//-----------------------------------------------------------------------------
+QColor qtGradientData::cubicBlend(
+  const qtGradient::Stop& a, const qtGradient::Stop& b,
+  const qtGradient::Stop& c, const qtGradient::Stop& d, qreal t) const
+{
+  // Calculate intermediary stops
+  const QColor cb = b.Color, cc = c.Color;
+  const QColor ca = this->blend(a.Color, cb, 0.5);
+  const QColor cd = this->blend(d.Color, cc, 0.5);
+  const QColor cm = this->blend(cb, cc, 0.5);
+  const qreal w = b.Weight;
+  const qreal pb = b.Position, pc = c.Position;
+  const qreal pa = qtColorUtil::blend(a.Position, pb, a.Weight);
+  const qreal pd = qtColorUtil::blend(d.Position, pc, c.Weight);
+  const qreal pm = qtColorUtil::blend(pb, pc, w);
+
+  if (t > w)
+    {
+    t = (t - w) / (1.0 - w);
+    t = qtColorUtil::blend(pb, pm, pc, pd, t);
+    t = qBound(0.0, (t - pm) / (pc - pm), 1.0);
+    return qtColorUtil::blend(cb, cm, cc, cd, t, this->blendSpace());
+    }
+  else
+    {
+    t /= w;
+    t = qtColorUtil::blend(pa, pb, pm, pc, t);
+    t = qBound(0.0, (t - pb) / (pm - pb), 1.0);
+    return qtColorUtil::blend(ca, cb, cm, cc, t, this->blendSpace());
+    }
+}
+
+//END qtGradientData
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtGradient
+
+//-----------------------------------------------------------------------------
+qtGradient::qtGradient() : d_ptr(new qtGradientData)
+{
+  QTE_D_MUTABLE(qtGradient);
+  d->interpolateMode = qtGradient::InterpolateLinear |
+                       qtGradient::InterpolateRgb;
+  d->spread = QGradient::PadSpread;
+  this->insertStop(0.0, Qt::black);
+  this->insertStop(1.0, Qt::white);
+}
+
+//-----------------------------------------------------------------------------
+qtGradient::qtGradient(const QList<Stop>& stops, InterpolationMode im,
+                       QGradient::Spread spread, NormalizeMode nm)
+  : d_ptr(new qtGradientData)
+{
+  QTE_D_MUTABLE(qtGradient);
+  d->interpolateMode = im;
+  d->spread = spread;
+  this->setStops(stops, nm);
+}
+
+//-----------------------------------------------------------------------------
+qtGradient::qtGradient(const qtGradient& other) : d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtGradient::~qtGradient()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtGradient& qtGradient::operator=(const qtGradient& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+qtGradient::InterpolationMode qtGradient::interpolationMode() const
+{
+  QTE_D_SHARED(qtGradient);
+  return d->interpolateMode;
+}
+
+//-----------------------------------------------------------------------------
+void qtGradient::setInterpolationMode(qtGradient::InterpolationMode im)
+{
+  QTE_D_MUTABLE(qtGradient);
+  d->interpolateMode = im;
+}
+
+//-----------------------------------------------------------------------------
+qtGradient::Spread qtGradient::spread() const
+{
+  QTE_D_SHARED(qtGradient);
+  return d->spread;
+}
+
+//-----------------------------------------------------------------------------
+void qtGradient::setSpread(qtGradient::Spread spread)
+{
+  QTE_D_MUTABLE(qtGradient);
+  d->spread = spread;
+}
+
+//-----------------------------------------------------------------------------
+QMap<qreal, qtGradient::Stop> qtGradient::stops() const
+{
+  QTE_D_SHARED(qtGradient);
+  return d->stops;
+}
+
+//-----------------------------------------------------------------------------
+void qtGradient::setStops(const QList<qtGradient::Stop>& stops,
+                          qtGradient::NormalizeMode nm)
+{
+  QTE_D_MUTABLE(qtGradient);
+
+  // Handle empty set
+  if (stops.isEmpty())
+    {
+    d->stops.clear();
+    return;
+    }
+
+  // Handle set with exactly one stop
+  if (stops.count() == 1)
+    {
+    d->stops.clear();
+    d->stops.insert(0.0, stops.first());
+    return;
+    }
+
+  // Convert to map
+  QMap<qreal, qtGradient::Stop> stopsMap;
+  foreach (const Stop& stop, stops)
+    stopsMap.insert(stop.Position, stop);
+
+  // Handle 'regular' stop sets, based on normalization mode
+  if (nm == qtGradient::NormalizeStops)
+    {
+    // Calculate coefficients to normalize stops to [0.0, 1.0]
+    double offset = stopsMap.constBegin().key();
+    double scale = 1.0 / ((--stopsMap.constEnd()).key() - offset);
+
+    // Recreate stop set, normalized
+    d->stops.clear();
+    foreach (Stop stop, stops)
+      {
+      stop.Position = (stop.Position - offset) * scale;
+      d->stops.insert(stop.Position, stop);
+      }
+    }
+  else
+    {
+    QMap<qreal, qtGradient::Stop>::iterator iter;
+
+    // Truncate stops outside of normalized range
+    while (!stopsMap.isEmpty() && (iter = stopsMap.begin()).key() < 0.0)
+      {
+      stopsMap.erase(iter);
+      }
+    while (!stopsMap.isEmpty() && (iter = stopsMap.end()).key() > 1.0)
+      {
+      stopsMap.erase(iter);
+      }
+
+    // Add stops at 0.0, 1.0 if needed
+    if (!stopsMap.isEmpty())
+      {
+      if ((iter = stopsMap.begin()).key() > 0.0)
+        {
+        stopsMap.insert(0.0, iter.value());
+        }
+      if ((iter = stopsMap.end()).key() < 1.0)
+        {
+        stopsMap.insert(1.0, iter.value());
+        }
+      }
+
+    // Set stops to modified set
+    d->stops = stopsMap;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool qtGradient::insertStop(qtGradient::Stop stop)
+{
+  if (!(0.0 < stop.Position || stop.Position < 1.0))
+    {
+    return false;
+    }
+
+  QTE_D_MUTABLE(qtGradient);
+  d->stops.insert(stop.Position, stop);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool qtGradient::removeStop(qreal position)
+{
+  QTE_D_MUTABLE(qtGradient);
+  return (d->stops.remove(position) > 0);
+}
+
+//-----------------------------------------------------------------------------
+QColor qtGradient::at(qreal pos) const
+{
+  QTE_D_SHARED(qtGradient);
+
+  if (d->stops.isEmpty())
+    {
+    return Qt::transparent;
+    }
+  else if (d->stops.count() < 2)
+    {
+    return d->stops.begin().value().Color;
+    }
+
+  // Apply spread to get normalized position
+  switch (d->spread)
+    {
+    case QGradient::RepeatSpread:
+      pos = fmod(pos, 1.0);
+      (pos < 0.0) && (pos = 1.0 + pos);
+      break;
+    case QGradient::ReflectSpread:
+      pos = fabs(fmod(pos, 2.0));
+      (pos > 1.0) && (pos = 2.0 - pos);
+      break;
+    default:
+      pos = qBound(0.0, pos, 1.0);
+      break;
+    }
+
+  // Find next stop
+  typedef QMap<qreal, qtGradient::Stop>::const_iterator Iterator;
+  Iterator su = d->stops.lowerBound(pos);
+
+  // Check for exact (or 'close enough') match
+  if (qFuzzyCompare(pos, su.key()))
+    {
+    return su.value().Color;
+    }
+
+  // Find previous stop and calculate relative position
+  Iterator sl = su - 1;
+  const qreal rpos = (pos - sl.key()) / (su.key() - sl.key());
+
+  // Check (again) for exact (or 'close enough') match, this time against the
+  // previous stop (in case we are off 'just enough' that lowerBound didn't
+  // consider it a match)
+  if (qFuzzyCompare(pos, sl.key()))
+    {
+    return sl.value().Color;
+    }
+
+  // Calculate blended color
+  switch (d->interpolateMode & qtGradient::InterpolateFunctionMask)
+    {
+    case qtGradient::InterpolateDiscrete:
+      return (rpos < sl->Weight ? sl->Color : su->Color);
+    case qtGradient::InterpolateCubic:
+      {
+      Iterator sll = (sl == d->stops.begin() ? sl : sl - 1);
+      Iterator suu = (su + 1 == d->stops.end() ? su : su + 1);
+      return d->cubicBlend(*sll, *sl, *su, *suu, rpos);
+      }
+    default: // qtGradient::InterpolateLinear
+      return d->linearBlend(sl->Color, su->Color, rpos, sl->Weight);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QList<QColor> qtGradient::render(int size) const
+{
+  QList<QColor> out;
+  out.reserve(size);
+
+  qreal k = 1.0 / (size - 1);
+  for (int i = 0; i < size; ++i)
+    {
+    out.append(this->at(i * k));
+    }
+
+  return out;
+}
+
+//END qtGradient
diff --git a/Libraries/QtExtensions/Util/qtGradient.h b/Libraries/QtExtensions/Util/qtGradient.h
new file mode 100644
index 00000000..ad9364f2
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtGradient.h
@@ -0,0 +1,91 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtGradient_h
+#define __qtGradient_h
+
+#include <QGradient>
+#include <QMap>
+#include <QSharedDataPointer>
+
+#include "../Core/qtGlobal.h"
+
+class qtGradientData;
+
+class QTE_EXPORT qtGradient
+{
+public:
+  struct Stop
+    {
+    Stop(qreal position = 0.0,
+         QColor color = Qt::transparent,
+         qreal weight = 0.5)
+      : Color(color), Position(position), Weight(weight)
+      {}
+
+    QColor Color;
+    qreal Position;
+    qreal Weight;
+    };
+
+  enum InterpolationFlag
+    {
+    InterpolateDiscrete = 0x0,
+    InterpolateLinear = 0x1,
+    InterpolateCubic = 0x2,
+    InterpolateRgb = 0x00,
+    InterpolateCmyk = 0x10,
+    InterpolateHsv = 0x20,
+    InterpolateHsl = 0x30,
+    InterpolateFunctionMask = 0xf,
+    InterpolateColorspaceMask = 0xf0
+    };
+  Q_DECLARE_FLAGS(InterpolationMode, InterpolationFlag)
+
+  typedef QGradient::Spread Spread;
+
+  enum NormalizeMode
+    {
+    NormalizeStops,
+    PadStops
+    };
+
+  qtGradient();
+  qtGradient(const QList<Stop>& stops,
+             InterpolationMode = InterpolateLinear,
+             Spread = QGradient::PadSpread,
+             NormalizeMode = NormalizeStops);
+  qtGradient(const qtGradient&);
+  ~qtGradient();
+
+  qtGradient& operator=(const qtGradient&);
+
+  InterpolationMode interpolationMode() const;
+  void setInterpolationMode(InterpolationMode);
+  Spread spread() const;
+  void setSpread(Spread);
+
+  QMap<qreal, Stop> stops() const;
+  void setStops(const QList<Stop>&, NormalizeMode = NormalizeStops);
+  bool insertStop(Stop stop);
+  bool removeStop(qreal position);
+
+  bool insertStop(qreal position, QColor color, qreal weight = 0.5)
+    { return this->insertStop(qtGradient::Stop(position, color, weight)); }
+
+  QColor at(qreal) const;
+  QList<QColor> render(int size) const;
+
+protected:
+  QTE_DECLARE_SHARED_PTR(qtGradient)
+
+private:
+  QTE_DECLARE_SHARED(qtGradient)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(qtGradient::InterpolationMode)
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtJson.cxx b/Libraries/QtExtensions/Util/qtJson.cxx
new file mode 100644
index 00000000..93ef7626
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtJson.cxx
@@ -0,0 +1,161 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtJson.h"
+
+#include "../Core/qtMath.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+qtJson::JsonData join(QList<qtJson::JsonData> list, char prefix, char suffix)
+{
+  qtJson::JsonData result;
+
+  result += prefix;
+  for (int i = 0, k = list.count(); i < k; ++i)
+    {
+    if (i)
+      {
+      result += ',';
+      }
+    result += list[i];
+    }
+  result += suffix;
+
+  return result;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+qtJson::JsonData qtJson::encode(QString value)
+{
+  const int k = value.length();
+
+  JsonData result;
+  result.reserve(k + 2);
+
+  result += "\"";
+  for (int i = 0; i < k; ++i)
+    {
+    const QChar& c = value[i];
+    if (c == '\\')
+      {
+      result += "\\\\";
+      }
+    else if (c == '\"')
+      {
+      result += "\\\"";
+      }
+    else if (!c.isPrint())
+      {
+      result += QString().sprintf("\\u%04x", c.unicode()).toUtf8();
+      }
+    else if (c.unicode() < 128)
+      {
+      result += c.toAscii();
+      }
+    else
+      {
+      result += QString(c).toUtf8();
+      }
+    }
+  result += "\"";
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::JsonData qtJson::encode(const qtJson::Array& array)
+{
+  QList<JsonData> encodedValues;
+  encodedValues.reserve(array.count());
+
+  foreach (const Value& value, array)
+    {
+    encodedValues.append(encode(value));
+    }
+
+  return join(encodedValues, '[', ']');
+}
+
+//-----------------------------------------------------------------------------
+qtJson::JsonData qtJson::encode(const qtJson::Object& object)
+{
+  QList<JsonData> encodedPairs;
+  encodedPairs.reserve(object.count());
+
+  const Object::const_iterator end = object.constEnd();
+  for (Object::const_iterator iter = object.constBegin(); iter != end; ++iter)
+    {
+    encodedPairs.append(encode(iter.key()) + ':' + encode(iter.value()));
+    }
+
+  return join(encodedPairs, '{', '}');
+}
+
+//-----------------------------------------------------------------------------
+qtJson::JsonData qtJson::encode(const Value& value)
+{
+  switch (static_cast<QMetaType::Type>(value.type()))
+    {
+    // Already encoded data
+    case QVariant::ByteArray:
+      return value.toByteArray();
+
+    // Special values
+    case QVariant::Invalid:
+      return "null";
+    case QVariant::Bool:
+      return (value.toBool() ? "true" : "false");
+
+    // Integer types
+    case QMetaType::Char:
+      return QByteArray::number(value.value<char>());
+    case QMetaType::UChar:
+      return QByteArray::number(value.value<uchar>());
+    case QMetaType::Short:
+      return QByteArray::number(value.value<short>());
+    case QMetaType::UShort:
+      return QByteArray::number(value.value<ushort>());
+    case QVariant::Int:
+      return QByteArray::number(value.toInt());
+    case QVariant::UInt:
+      return QByteArray::number(value.toUInt());
+    case QVariant::LongLong:
+      return QByteArray::number(value.toLongLong());
+    case QVariant::ULongLong:
+      return QByteArray::number(value.toULongLong());
+
+    // Floating point types
+    case QMetaType::Float:
+      {
+      const float fv = value.value<float>();
+      return (qIsFinite(fv) ? QByteArray::number(fv, 'g', 8) : "null");
+      }
+    case QVariant::Double:
+      {
+      const double dv = value.toDouble();
+      return (qIsFinite(dv) ? QByteArray::number(dv, 'g', 8) : "null");
+      }
+
+    // String
+    case QVariant::String:
+      return encode(value.toString());
+
+    // Array or object
+    case QVariant::List:
+      return encode(value.toList());
+    case QVariant::Map:
+      return encode(value.toMap());
+
+    // Anything else is not supported
+    default:
+      return JsonData();
+    }
+}
diff --git a/Libraries/QtExtensions/Util/qtJson.h b/Libraries/QtExtensions/Util/qtJson.h
new file mode 100644
index 00000000..b04a906a
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtJson.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtJson_h
+#define __qtJson_h
+
+/// \file
+
+#include <QMap>
+#include <QString>
+#include <QVariant>
+
+#include <vgExport.h>
+
+/// Methods for encoding JSON.
+///
+/// This namespace provides methods for converting C++ structures into JSON
+/// strings. An arbitrary value is represented as a ::QVariant, which may be
+/// a JSON array or object, or a simple value type. An array is represented
+/// as a list of values (i.e. ::QList&lt;::QVariant&gt;), while an object is
+/// represented as an ordered set of keys and values (i.e.
+/// ::QMap&lt;::QString, ::QVariant&gt;); both of which are themselves value
+/// types.
+///
+/// Additionally, a QVariant containing a qtJson::JsonData is assumed to
+/// represent already-encoded JSON data. This is intended as a convenience for
+/// users that wish to pre-encode JSON objects and later use the encoded
+/// objects in other objects or arrays.
+///
+/// Supported simple value types are q[u]int{8,16,32,64}, float, double,
+/// boolean, and QString. Additionally, an invalid QVariant is encoded as
+/// "null". Unsupported types are encoded to empty JsonData.
+///
+/// JSON representations are stored in UTF-8.
+namespace qtJson
+{
+  /// Convenience typedef for a JSON value.
+  typedef QVariant Value;
+
+  /// Convenience typedef for a JSON array.
+  typedef QVariantList Array;
+
+  /// Convenience typedef for a JSON object.
+  typedef QVariantMap Object;
+
+  /// Convenience typedef for an encoded JSON string.
+  typedef QByteArray JsonData;
+
+  /// Encode a string into JSON representation.
+  ///
+  /// The returned string is enclosed in quotes, and special characters have
+  /// been escaped.
+  QTE_EXPORT JsonData encode(QString);
+
+  /// Encode an array into JSON representation.
+  QTE_EXPORT JsonData encode(const Array&);
+
+  /// Encode an object into JSON representation.
+  QTE_EXPORT JsonData encode(const Object&);
+
+  /// Encode a value into JSON representation.
+  ///
+  /// This encodes a value into a JSON string.
+  ///
+  /// \li If the value is invalid (QVariant::isNull returns \c true), the
+  ///     result is "null".
+  /// \li If the value is a boolean, the result is "true" or "false".
+  /// \li If the value is a numeric type, result is equivalent to
+  ///     QByteArray::number(value) for integers and finite reals, "null" for
+  ///     infinities or NaN's.
+  /// \li If the value is a QString, qtJson::Array, or qtJson::Object, the
+  ///     result is equivalent to calling the respective overload of
+  ///     \c qtJson::encode.
+  /// \li If the value is a JsonData, it is returned unaltered.
+  /// \li For all other values, the result is an empty JsonData.
+  QTE_EXPORT JsonData encode(const Value&);
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtMap.h b/Libraries/QtExtensions/Util/qtMap.h
new file mode 100644
index 00000000..bf0912e9
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtMap.h
@@ -0,0 +1,127 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtMap_h
+#define __qtMap_h
+
+#include <QtGlobal>
+
+#include "qtGlobal.h"
+
+namespace qtUtil
+{
+
+#if defined(DOXYGEN)
+
+// Human-readable template declarations. The declarations here are intended to
+// provide a conceptual view of the templates provided by this header, whereas
+// the actual definitions are more finely specified (i.e. each declaration in
+// this section corresponds to two or more definitions as seen by the compiler,
+// for various container flavors).
+//
+// For similar reasons, these declarations, rather than the compiler-visible
+// definitions, are used to generate the documentation.
+
+/// Execute a function for each item in a container.
+///
+/// This function iterates over each item in \p list, and executes \p func for
+/// each item, where \p func takes as its first parameter an argument of type
+/// equal to the item type. Additional parameters may be specified, and are
+/// passed directly to \p func for each item. The \p list may be any of QList,
+/// QHash, QMap or QSet. For keyed containers (QHash, QMap), only the value is
+/// passed to \p func.
+///
+/// \sa qtUtil::mapWithKey
+template <typename LT, typename MF>
+void map(const QtGenericContainer<LT>& list, MF func, ...);
+
+/// Execute a function for each item in a keyed container.
+///
+/// This function iterates over each item in \p list, and executes \p func for
+/// each item, where \p func takes as its first parameter an argument of type
+/// equal to the container's key type, and as its second parameter an argument
+/// of type equal to the container's value type. Additional parameters may be
+/// specified, and are passed directly to \p func for each item. The \p list
+/// may be either a QHash or QMap.
+///
+/// \sa qtUtil::map
+template <typename KT, typename VT, typename MF>
+void mapWithKey(QtKeyedContainer<KT, VT> const& list, MF func, ...);
+
+/// Execute a bound method for each item in a container.
+///
+/// This function is equivalent to qtUtil::map, except that \p func is a
+/// pointer to a bound member function, which will be called against the object
+/// instance \p mapObject. The object instance may be passed by reference, or
+/// as a pointer.
+///
+/// \sa qtUtil::mapBoundWithKey
+template <typename LT, typename MO, typename MF>
+void mapBound(const QtGenericContainer<LT>& list, MO mapObject,
+              MF func, ...);
+
+/// Execute a bound method for each item in a keyed container.
+///
+/// This function is equivalent to qtUtil::mapWithKey, except that \p func is a
+/// pointer to a bound member function, which will be called against the object
+/// instance \p mapObject. The object instance may be passed by reference, or
+/// as a pointer.
+///
+/// \sa qtUtil::mapBound
+template <typename KT, typename VT, typename MO, typename MF>
+void mapBoundWithKey(QtKeyedContainer<KT, VT> const& list, MO mapObject,
+                     MF func, ...);
+
+#elif __cplusplus >= 201103L
+
+// C++11 variadac-template declarations.
+
+#define QTMAP_EXTRA_TEMPLATE , typename... Args
+#define QTMAP_EXTRA_ARGS , const Args&... args
+#define QTMAP_EXTRA_INVOKE , args...
+#include "qtMapImpl.h"
+#undef QTMAP_EXTRA_TEMPLATE
+#undef QTMAP_EXTRA_ARGS
+#undef QTMAP_EXTRA_INVOKE
+
+#else
+
+// Pre-C++11 template definitions. Since we don't have variadic templates, we
+// 'fake it' by declaring several versions, taking zero to (currently) two
+// additional arguments. Support for more arguments can be added easily, by
+// replicating later invocations of the "implementation" header inclusion.
+// Repeated inclusion of the implementation header is used to expand each set
+// of variations.
+
+#define QTMAP_EXTRA_TEMPLATE
+#define QTMAP_EXTRA_ARGS
+#define QTMAP_EXTRA_INVOKE
+#include "qtMapImpl.h"
+#undef QTMAP_EXTRA_TEMPLATE
+#undef QTMAP_EXTRA_ARGS
+#undef QTMAP_EXTRA_INVOKE
+
+#define QTMAP_EXTRA_TEMPLATE , typename X1
+#define QTMAP_EXTRA_ARGS , const X1& x1
+#define QTMAP_EXTRA_INVOKE , x1
+#include "qtMapImpl.h"
+#undef QTMAP_EXTRA_TEMPLATE
+#undef QTMAP_EXTRA_ARGS
+#undef QTMAP_EXTRA_INVOKE
+
+#define QTMAP_EXTRA_TEMPLATE , typename X1, typename X2
+#define QTMAP_EXTRA_ARGS , const X1& x1, const X2& x2
+#define QTMAP_EXTRA_INVOKE , x1, x2
+#include "qtMapImpl.h"
+#undef QTMAP_EXTRA_TEMPLATE
+#undef QTMAP_EXTRA_ARGS
+#undef QTMAP_EXTRA_INVOKE
+
+#endif
+
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtMapImpl.h b/Libraries/QtExtensions/Util/qtMapImpl.h
new file mode 100644
index 00000000..21f5047d
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtMapImpl.h
@@ -0,0 +1,160 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// templates for static function pointer
+template <typename LT, typename MF QTMAP_EXTRA_TEMPLATE>
+void map(const QList<LT>& list, MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template <typename KT, typename LT, typename MF QTMAP_EXTRA_TEMPLATE>
+void map(QHash<KT, LT> const& list, MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template <typename KT, typename LT, typename MF QTMAP_EXTRA_TEMPLATE>
+void map(QMap<KT, LT> const& list, MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template <typename LT, typename MF QTMAP_EXTRA_TEMPLATE>
+void map(const QSet<LT>& list, MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template <typename KT, typename VT, typename MF QTMAP_EXTRA_TEMPLATE>
+void mapWithKey(QHash<KT, VT> const& list, MF func QTMAP_EXTRA_ARGS)
+{
+  typedef QHash<KT, VT> LT;
+  QTE_FOREACH_ITER (typename LT::const_iterator, iter, list)
+    (*func)(iter.key(), iter.value() QTMAP_EXTRA_INVOKE);
+}
+
+template <typename KT, typename VT, typename MF QTMAP_EXTRA_TEMPLATE>
+void mapWithKey(QMap<KT, VT> const& list, MF func QTMAP_EXTRA_ARGS)
+{
+  typedef QMap<KT, VT> LT;
+  QTE_FOREACH_ITER (typename LT::const_iterator, iter, list)
+    (*func)(iter.key(), iter.value() QTMAP_EXTRA_INVOKE);
+}
+
+// templates for bound (member) function pointer; pointer to object
+template <typename LT, typename MO, typename MF QTMAP_EXTRA_TEMPLATE>
+void mapBound(const QList<LT>& list, MO* mapObject,
+              MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (*mapObject.*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template < typename KT, typename LT, typename MO,
+         typename MF QTMAP_EXTRA_TEMPLATE >
+void mapBound(QHash<KT, LT> const& list, MO* mapObject,
+              MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (*mapObject.*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template < typename KT, typename LT, typename MO,
+         typename MF QTMAP_EXTRA_TEMPLATE >
+void mapBound(QMap<KT, LT> const& list, MO* mapObject,
+              MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (*mapObject.*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template <typename LT, typename MO, typename MF QTMAP_EXTRA_TEMPLATE>
+void mapBound(const QSet<LT>& list, MO* mapObject,
+              MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (*mapObject.*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template < typename KT, typename VT, typename MO,
+         typename MF QTMAP_EXTRA_TEMPLATE >
+void mapBoundWithKey(QHash<KT, VT> const& list, MO* mapObject,
+                     MF func QTMAP_EXTRA_ARGS)
+{
+  typedef QHash<KT, VT> LT;
+  QTE_FOREACH_ITER (typename LT::const_iterator, iter, list)
+    (*mapObject.*func)(iter.key(), iter.value() QTMAP_EXTRA_INVOKE);
+}
+
+template < typename KT, typename VT, typename MO,
+         typename MF QTMAP_EXTRA_TEMPLATE >
+void mapBoundWithKey(QMap<KT, VT> const& list, MO* mapObject,
+                     MF func QTMAP_EXTRA_ARGS)
+{
+  typedef QMap<KT, VT> LT;
+  QTE_FOREACH_ITER (typename LT::const_iterator, iter, list)
+    (*mapObject.*func)(iter.key(), iter.value() QTMAP_EXTRA_INVOKE);
+}
+
+// templates for bound (member) function pointer; reference to object
+template <typename LT, typename MO, typename MF QTMAP_EXTRA_TEMPLATE>
+void mapBound(const QList<LT>& list, MO& mapObject,
+              MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (mapObject.*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template < typename KT, typename LT, typename MO,
+         typename MF QTMAP_EXTRA_TEMPLATE >
+void mapBound(QHash<KT, LT> const& list, MO& mapObject,
+              MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (mapObject.*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template < typename KT, typename LT, typename MO,
+         typename MF QTMAP_EXTRA_TEMPLATE >
+void mapBound(QMap<KT, LT> const& list, MO& mapObject,
+              MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (mapObject.*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template <typename LT, typename MO, typename MF QTMAP_EXTRA_TEMPLATE>
+void mapBound(const QSet<LT>& list, MO& mapObject,
+              MF func QTMAP_EXTRA_ARGS)
+{
+  Q_FOREACH(const LT& item, list)
+  (mapObject.*func)(item QTMAP_EXTRA_INVOKE);
+}
+
+template < typename KT, typename VT, typename MO,
+         typename MF QTMAP_EXTRA_TEMPLATE >
+void mapBoundWithKey(QHash<KT, VT> const& list, MO& mapObject,
+                     MF func QTMAP_EXTRA_ARGS)
+{
+  typedef QHash<KT, VT> LT;
+  QTE_FOREACH_ITER (typename LT::const_iterator, iter, list)
+    (mapObject.*func)(iter.key(), iter.value() QTMAP_EXTRA_INVOKE);
+}
+
+template < typename KT, typename VT, typename MO,
+         typename MF QTMAP_EXTRA_TEMPLATE >
+void mapBoundWithKey(QMap<KT, VT> const& list, MO& mapObject,
+                     MF func QTMAP_EXTRA_ARGS)
+{
+  typedef QMap<KT, VT> LT;
+  QTE_FOREACH_ITER (typename LT::const_iterator, iter, list)
+    (mapObject.*func)(iter.key(), iter.value() QTMAP_EXTRA_INVOKE);
+}
diff --git a/Libraries/QtExtensions/Util/qtPrioritizedActionContainerProxy.h b/Libraries/QtExtensions/Util/qtPrioritizedActionContainerProxy.h
new file mode 100644
index 00000000..1b59b814
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtPrioritizedActionContainerProxy.h
@@ -0,0 +1,134 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtPrioritizedActionContainerProxy_h
+#define __qtPrioritizedActionContainerProxy_h
+
+#include <QAction>
+
+#include <limits>
+
+#include "qtActionPriorityList.h"
+#include "qtUtilNamespace.h"
+
+//-----------------------------------------------------------------------------
+template <typename ContainerType>
+class qtPrioritizedActionContainerProxy : protected qtActionPriorityList
+{
+public:
+  qtPrioritizedActionContainerProxy(
+    ContainerType* container, QAction* followingAction,
+    qtUtil::SeparatorBehavior separators);
+
+  void insertAction(QAction* action, int priority);
+  QAction* insertSeparator(int priority);
+
+  template <typename T>
+  QAction* insertObject(T* object, int priority,
+                        QAction* (ContainerType::*method)(QAction*, T*));
+
+  ContainerType* const Container;
+
+protected:
+  void addInitialSeparator();
+
+  qtUtil::SeparatorBehavior Separators;
+};
+
+//-----------------------------------------------------------------------------
+template <typename ContainerType>
+qtPrioritizedActionContainerProxy<ContainerType>::
+qtPrioritizedActionContainerProxy(
+  ContainerType* container, QAction* followingAction,
+  qtUtil::SeparatorBehavior separators) :
+  qtActionPriorityList(followingAction),
+  Container(container),
+  Separators(separators)
+{
+}
+
+//-----------------------------------------------------------------------------
+template <typename ContainerType>
+void qtPrioritizedActionContainerProxy<ContainerType>::addInitialSeparator()
+{
+  if (this->Separators)
+    {
+    const qtUtil::SeparatorBehavior separators = this->Separators;
+    this->Separators = qtUtil::NoSeparators; // Prevent recursion
+
+    if (separators & qtUtil::AddSeparatorBefore)
+      {
+      const int firstPriority = std::numeric_limits<int>::min();
+      QAction* const first = this->followingAction(firstPriority);
+      this->Container->insertSeparator(first);
+      }
+
+    if (separators & qtUtil::AddSeparatorAfter)
+      {
+      const int lastPriority = std::numeric_limits<int>::max();
+      QAction* const last = this->followingAction(lastPriority);
+      QAction* const separator = this->Container->insertSeparator(last);
+      this->insertAction(separator, lastPriority);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename ContainerType>
+void qtPrioritizedActionContainerProxy<ContainerType>::insertAction(
+  QAction* action, int priority)
+{
+  // Add separators, if not already present
+  this->addInitialSeparator();
+
+  // Get action to follow the one being inserted
+  QAction* const before = this->followingAction(priority);
+
+  // Insert new action and update map of inserted actions
+  this->Container->insertAction(before, action);
+  this->qtActionPriorityList::insertAction(action, priority);
+}
+
+//-----------------------------------------------------------------------------
+template <typename ContainerType>
+QAction* qtPrioritizedActionContainerProxy<ContainerType>::insertSeparator(
+  int priority)
+{
+  // Add separators, if not already present
+  this->addInitialSeparator();
+
+  // Get action to follow the one being inserted
+  QAction* const before = this->followingAction(priority);
+
+  // Insert new action and update map of inserted actions
+  QAction* const action = this->Container->insertSeparator(before);
+  this->insertAction(action, priority);
+
+  // Return action
+  return action;
+}
+
+//-----------------------------------------------------------------------------
+template <typename ContainerType>
+template <typename T>
+QAction* qtPrioritizedActionContainerProxy<ContainerType>::insertObject(
+  T* object, int priority, QAction* (ContainerType::*method)(QAction*, T*))
+{
+  // Add separators, if not already present
+  this->addInitialSeparator();
+
+  // Get action to follow the one being inserted
+  QAction* const before = this->followingAction(priority);
+
+  // Insert new action and update map of inserted actions
+  QAction* const action = (this->Container->*method)(before, object);
+  this->insertAction(action, priority);
+
+  // Return action
+  return action;
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtPrioritizedMenuProxy.cxx b/Libraries/QtExtensions/Util/qtPrioritizedMenuProxy.cxx
new file mode 100644
index 00000000..d416cd1f
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtPrioritizedMenuProxy.cxx
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtPrioritizedMenuProxy.h"
+
+#include <QMenu>
+
+#include "qtPrioritizedActionContainerProxy.h"
+
+QTE_IMPLEMENT_D_FUNC(qtPrioritizedMenuProxy)
+
+//-----------------------------------------------------------------------------
+class qtPrioritizedMenuProxyPrivate :
+  public qtPrioritizedActionContainerProxy<QMenu>
+{
+public:
+  qtPrioritizedMenuProxyPrivate(QMenu* menu, QAction* followingAction,
+                                qtUtil::SeparatorBehavior seps) :
+    qtPrioritizedActionContainerProxy<QMenu>(menu, followingAction, seps)
+    {}
+};
+
+//-----------------------------------------------------------------------------
+qtPrioritizedMenuProxy::qtPrioritizedMenuProxy(
+  QMenu* menu, QAction* followingAction, qtUtil::SeparatorBehavior seps) :
+  d_ptr(new qtPrioritizedMenuProxyPrivate(menu, followingAction, seps))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtPrioritizedMenuProxy::~qtPrioritizedMenuProxy()
+{
+}
+
+//-----------------------------------------------------------------------------
+const QMenu* qtPrioritizedMenuProxy::menu() const
+{
+  QTE_D_CONST(qtPrioritizedMenuProxy);
+  return d->Container;
+}
+
+//-----------------------------------------------------------------------------
+void qtPrioritizedMenuProxy::insertAction(QAction* action, int priority)
+{
+  QTE_D(qtPrioritizedMenuProxy);
+  d->insertAction(action, priority);
+}
+
+//-----------------------------------------------------------------------------
+QAction* qtPrioritizedMenuProxy::insertSeparator(int priority)
+{
+  QTE_D(qtPrioritizedMenuProxy);
+  return d->insertSeparator(priority);
+}
+
+//-----------------------------------------------------------------------------
+QAction* qtPrioritizedMenuProxy::insertMenu(QMenu* menu, int priority)
+{
+  QTE_D(qtPrioritizedMenuProxy);
+  return d->insertObject(menu, priority, &QMenu::insertMenu);
+}
diff --git a/Libraries/QtExtensions/Util/qtPrioritizedMenuProxy.h b/Libraries/QtExtensions/Util/qtPrioritizedMenuProxy.h
new file mode 100644
index 00000000..61bc3bcc
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtPrioritizedMenuProxy.h
@@ -0,0 +1,84 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtPrioritizedMenuProxy_h
+#define __qtPrioritizedMenuProxy_h
+
+#include <QScopedPointer>
+
+#include "../Core/qtGlobal.h"
+
+#include "qtUtilNamespace.h"
+
+class QMenu;
+class QAction;
+
+class qtPrioritizedMenuProxyPrivate;
+
+/// Menu proxy supporting prioritized insertions.
+///
+/// This class wraps a QMenu to provide prioritized insertion of actions into
+/// the menu. This is mainly of use to applications implementing plugin
+/// interfaces that wish to allow the plugins to add actions to menus, but do
+/// not want to deal with prioritizing calls to the plugins in order to
+/// maintain ordering consistency. The use of a prioritized proxy allows
+/// plugins to specify a unique priority in order to ensure consistent ordering
+/// of menu actions.
+class QTE_EXPORT qtPrioritizedMenuProxy
+{
+public:
+  /// Create proxy.
+  ///
+  /// \param menu QMenu which this qtPrioritizedMenuProxy wraps.
+  /// \param followingAction
+  ///   Action before which action inserted by this proxy will be inserted. If
+  ///   omitted or 0, actions will be added to the end of the menu.
+  /// \param separators
+  ///   Flags specifying if and where separators should be added to the menu
+  ///   when actions are inserted via the proxy.
+  qtPrioritizedMenuProxy(
+    QMenu* menu, QAction* followingAction = 0,
+    qtUtil::SeparatorBehavior separators = qtUtil::NoSeparators);
+
+  ~qtPrioritizedMenuProxy();
+
+  /// Get the QMenu associated with this proxy.
+  const QMenu* menu() const;
+
+  /// Insert action.
+  ///
+  /// This inserts the specified QAction into the menu with the specified
+  /// priority. The action will be inserted after actions of lesser priority,
+  /// and before actions of equal or greater priority.
+  void insertAction(QAction*, int priority = 0);
+
+  /// Insert separator.
+  ///
+  /// This inserts a separator into the menu with the specified priority. The
+  /// separator will be inserted after actions of lesser priority, and before
+  /// actions of equal or greater priority.
+  ///
+  /// \return The QAction which wraps the separator in the menu.
+  QAction* insertSeparator(int priority = 0);
+
+  /// Insert menu.
+  ///
+  /// This inserts the specified QMenu into the menu with the specified
+  /// priority. The menu will be inserted after actions of lesser priority,
+  /// and before actions of equal or greater priority.
+  ///
+  /// \return The QAction which wraps the child menu in the parent menu.
+  QAction* insertMenu(QMenu*, int priority = 0);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtPrioritizedMenuProxy)
+
+private:
+  QTE_DECLARE_PRIVATE(qtPrioritizedMenuProxy)
+  QTE_DISABLE_COPY(qtPrioritizedMenuProxy)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtPrioritizedToolBarProxy.cxx b/Libraries/QtExtensions/Util/qtPrioritizedToolBarProxy.cxx
new file mode 100644
index 00000000..546d6324
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtPrioritizedToolBarProxy.cxx
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtPrioritizedToolBarProxy.h"
+
+#include <QToolBar>
+
+#include "qtPrioritizedActionContainerProxy.h"
+
+QTE_IMPLEMENT_D_FUNC(qtPrioritizedToolBarProxy)
+
+//-----------------------------------------------------------------------------
+class qtPrioritizedToolBarProxyPrivate :
+  public qtPrioritizedActionContainerProxy<QToolBar>
+{
+public:
+  qtPrioritizedToolBarProxyPrivate(QToolBar* toolBar, QAction* followingAction,
+                                   qtUtil::SeparatorBehavior seps) :
+    qtPrioritizedActionContainerProxy<QToolBar>(toolBar, followingAction, seps)
+    {}
+};
+
+//-----------------------------------------------------------------------------
+qtPrioritizedToolBarProxy::qtPrioritizedToolBarProxy(
+  QToolBar* toolBar, QAction* followingAction, qtUtil::SeparatorBehavior seps) :
+  d_ptr(new qtPrioritizedToolBarProxyPrivate(toolBar, followingAction, seps))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtPrioritizedToolBarProxy::~qtPrioritizedToolBarProxy()
+{
+}
+
+//-----------------------------------------------------------------------------
+const QToolBar* qtPrioritizedToolBarProxy::toolBar() const
+{
+  QTE_D_CONST(qtPrioritizedToolBarProxy);
+  return d->Container;
+}
+
+//-----------------------------------------------------------------------------
+void qtPrioritizedToolBarProxy::insertAction(QAction* action, int priority)
+{
+  QTE_D(qtPrioritizedToolBarProxy);
+  d->insertAction(action, priority);
+}
+
+//-----------------------------------------------------------------------------
+QAction* qtPrioritizedToolBarProxy::insertSeparator(int priority)
+{
+  QTE_D(qtPrioritizedToolBarProxy);
+  return d->insertSeparator(priority);
+}
+
+//-----------------------------------------------------------------------------
+QAction* qtPrioritizedToolBarProxy::insertWidget(QWidget* widget, int priority)
+{
+  QTE_D(qtPrioritizedToolBarProxy);
+  return d->insertObject(widget, priority, &QToolBar::insertWidget);
+}
diff --git a/Libraries/QtExtensions/Util/qtPrioritizedToolBarProxy.h b/Libraries/QtExtensions/Util/qtPrioritizedToolBarProxy.h
new file mode 100644
index 00000000..e557ea95
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtPrioritizedToolBarProxy.h
@@ -0,0 +1,86 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtPrioritizedToolBarProxy_h
+#define __qtPrioritizedToolBarProxy_h
+
+#include <QScopedPointer>
+
+#include "../Core/qtGlobal.h"
+
+#include "qtUtilNamespace.h"
+
+class QToolBar;
+class QAction;
+class QWidget;
+
+class qtPrioritizedToolBarProxyPrivate;
+
+/// Tool bar proxy supporting prioritized insertions.
+///
+/// This class wraps a QToolBar to provide prioritized insertion of actions
+/// into the tool bar. This is mainly of use to applications implementing
+/// plugin interfaces that wish to allow the plugins to add actions and/or
+/// widgets to tool bars, but do not want to deal with prioritizing calls to
+/// the plugins in order to maintain ordering consistency. The use of a
+/// prioritized proxy allows plugins to specify a unique priority in order to
+/// ensure consistent ordering of tool bar actions and widgets.
+class QTE_EXPORT qtPrioritizedToolBarProxy
+{
+public:
+  /// Create proxy.
+  ///
+  /// \param toolBar QToolBar which this qtPrioritizedToolBarProxy wraps.
+  /// \param followingAction
+  ///   Action before which action inserted by this proxy will be inserted. If
+  ///   omitted or 0, actions and widgets will be added to the end of the tool
+  ///   bar.
+  /// \param separators
+  ///   Flags specifying if and where separators should be added to the menu
+  ///   when actions are inserted via the proxy.
+  qtPrioritizedToolBarProxy(
+    QToolBar* toolBar, QAction* followingAction = 0,
+    qtUtil::SeparatorBehavior separators = qtUtil::NoSeparators);
+
+  ~qtPrioritizedToolBarProxy();
+
+  /// Get the QToolBar associated with this proxy.
+  const QToolBar* toolBar() const;
+
+  /// Insert action.
+  ///
+  /// This inserts the specified QAction into the tool bar with the specified
+  /// priority. The action will be inserted after actions of lesser priority,
+  /// and before actions of equal or greater priority.
+  void insertAction(QAction*, int priority = 0);
+
+  /// Insert separator.
+  ///
+  /// This inserts a separator into the tool bar with the specified priority.
+  /// The separator will be inserted after actions of lesser priority, and
+  /// before actions of equal or greater priority.
+  ///
+  /// \return The QAction which wraps the separator in the tool bar.
+  QAction* insertSeparator(int priority = 0);
+
+  /// Insert widget.
+  ///
+  /// This inserts the specified QWidget into the tool bar with the specified
+  /// priority. The widget will be inserted after actions of lesser priority,
+  /// and before actions of equal or greater priority.
+  ///
+  /// \return The QAction which wraps the widget in the tool bar.
+  QAction* insertWidget(QWidget*, int priority = 0);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtPrioritizedToolBarProxy)
+
+private:
+  QTE_DECLARE_PRIVATE(qtPrioritizedToolBarProxy)
+  QTE_DISABLE_COPY(qtPrioritizedToolBarProxy)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtRand.h b/Libraries/QtExtensions/Util/qtRand.h
new file mode 100644
index 00000000..f1739610
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtRand.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtRand_h
+#define __qtRand_h
+
+/// \file
+
+#include <QtGlobal>
+
+#include <cmath>
+#include <cstdlib>
+
+/// Return a pseudo-random number in the range [0.0, 1.0).
+///
+/// This function internally computes qrand()<code> / (RAND_MAX+1)</code> and
+/// will have corresponding distribution characteristics and quality of
+/// randomness. Similarly, it is affected by qsrand().
+///
+/// \sa qrand()
+inline double qtRandD()
+{
+  static const double divisor = 1.0 / (static_cast<double>(RAND_MAX) + 1.0);
+  return static_cast<double>(qrand()) * divisor;
+}
+
+/// Return a pseudo-random number in the range [0, \p max).
+///
+/// This function computes a pseudo-random number using qtRandD() mapped to the
+/// desired range, yielding similar distribution characteristics and quality of
+/// randomness (which may differ from using the modulo operator to perform
+/// range reduction). The result is less than \p max. This function is affected
+/// by qsrand().
+inline int qtRand(int max)
+{
+  return static_cast<int>(floor(qtRandD() * max));
+}
+
+/// Return a pseudo-random number in the range [\p min, \p max).
+/// \copydetails qtRand(int)
+///
+/// If \p max is less than \p min, the result is undefined.
+inline int qtRand(int min, int max)
+{
+  return min + static_cast<int>(floor(qtRandD() * (max - min)));
+}
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtScopedSettingGroup.cxx b/Libraries/QtExtensions/Util/qtScopedSettingGroup.cxx
new file mode 100644
index 00000000..81a5f82b
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtScopedSettingGroup.cxx
@@ -0,0 +1,22 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtScopedSettingGroup.h"
+
+#include <QSettings>
+
+//-----------------------------------------------------------------------------
+qtScopedSettingGroup::qtScopedSettingGroup(QSettings& s, const QString& g)
+  : store(s)
+{
+  s.beginGroup(g);
+}
+
+//-----------------------------------------------------------------------------
+qtScopedSettingGroup::~qtScopedSettingGroup()
+{
+  this->store.endGroup();
+}
diff --git a/Libraries/QtExtensions/Util/qtScopedSettingGroup.h b/Libraries/QtExtensions/Util/qtScopedSettingGroup.h
new file mode 100644
index 00000000..ffc420d7
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtScopedSettingGroup.h
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtScopedSettingGroup_h
+#define __qtScopedSettingGroup_h
+
+#include "../Core/qtGlobal.h"
+
+class QSettings;
+class QString;
+
+class QTE_EXPORT qtScopedSettingGroup
+{
+public:
+  explicit qtScopedSettingGroup(QSettings&, const QString&);
+  ~qtScopedSettingGroup();
+
+protected:
+  QSettings& store;
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtSettings.cxx b/Libraries/QtExtensions/Util/qtSettings.cxx
new file mode 100644
index 00000000..9a79dc93
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtSettings.cxx
@@ -0,0 +1,245 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtSettings.h"
+#include "qtSettingsImpl.h"
+
+#include <QCoreApplication>
+#include <QSettings>
+#include <QHash>
+#include <QSet>
+
+#include "qtAbstractSetting.h"
+
+QTE_IMPLEMENT_D_FUNC(qtSettings)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtSettingsPrivate
+
+//-----------------------------------------------------------------------------
+class qtSettingsPrivate
+{
+public:
+  class Setting;
+
+  ~qtSettingsPrivate();
+
+  QSettings& store(qtSettings::Scope);
+
+  QHash<qtSettings::Scope, QSettings*> stores;
+  QHash<QString, qtAbstractSetting*> settings;
+  QSet<QString> modifiedSettings;
+  bool wasCommitted;
+};
+
+//-----------------------------------------------------------------------------
+qtSettingsPrivate::~qtSettingsPrivate()
+{
+  qDeleteAll(this->settings.values());
+  qDeleteAll(this->stores.values());
+}
+
+//-----------------------------------------------------------------------------
+QSettings& qtSettingsPrivate::store(qtSettings::Scope s)
+{
+  if (!this->stores.contains(s))
+    {
+    QSettings::Scope ss = (s.testFlag(qtSettings::UserScope)
+                           ? QSettings::UserScope
+                           : QSettings::SystemScope);
+    QString appName = (s.testFlag(qtSettings::ApplicationScope)
+                       ? qApp->applicationName() : QString());
+    QSettings* settings = new QSettings(ss, qApp->organizationName(), appName);
+    this->stores.insert(s, settings);
+    return *settings;
+    }
+
+  return *this->stores[s];
+}
+
+//END qtSettingsPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN Setting
+
+//-----------------------------------------------------------------------------
+class qtSettingsPrivate::Setting : public qtAbstractSetting
+{
+public:
+  Setting() {}
+  Setting(qtSettings::Scope, const QString& key,
+          const QVariant& defaultValue, const QSettings& store);
+
+  virtual qtSettings::Scope scope() const;
+
+protected:
+  virtual QString key() const;
+
+  qtSettings::Scope storeScope;
+  QString storeKey;
+};
+
+//-----------------------------------------------------------------------------
+qtSettingsPrivate::Setting::Setting(
+  qtSettings::Scope s,
+  const QString& k,
+  const QVariant& defaultValue,
+  const QSettings& store)
+  : storeScope(s), storeKey(k)
+{
+  this->originalValue = store.value(k, defaultValue);
+  this->initialize(store);
+}
+
+//-----------------------------------------------------------------------------
+qtSettings::Scope qtSettingsPrivate::Setting::scope() const
+{
+  return this->storeScope;
+}
+
+//-----------------------------------------------------------------------------
+QString qtSettingsPrivate::Setting::key() const
+{
+  return this->storeKey;
+}
+
+//END Setting
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtSettings
+
+//-----------------------------------------------------------------------------
+qtSettings::qtSettings() : d_ptr(new qtSettingsPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSettings::~qtSettings()
+{
+  QTE_D(qtSettings);
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+bool qtSettings::hasUncommittedChanges() const
+{
+  QTE_D_CONST(qtSettings);
+  return !d->modifiedSettings.isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+bool qtSettings::wasCommitted() const
+{
+  QTE_D_CONST(qtSettings);
+  return d->wasCommitted;
+}
+
+//-----------------------------------------------------------------------------
+void qtSettings::commit()
+{
+  if (!this->hasUncommittedChanges())
+    {
+    return;
+    }
+
+  QTE_D(qtSettings);
+
+  QSet<qtSettings::Scope> modifiedScopes;
+  foreach (const QString& key, d->modifiedSettings.values())
+    {
+    qtAbstractSetting* s = d->settings[key];
+    qtSettings::Scope scope = s->scope();
+    s->commit(d->store(scope));
+    modifiedScopes.insert(scope);
+    }
+
+  foreach (qtSettings::Scope s, modifiedScopes)
+    d->store(s).sync();
+
+  d->modifiedSettings.clear();
+  d->wasCommitted = true;
+}
+
+//-----------------------------------------------------------------------------
+void qtSettings::discard()
+{
+  QTE_D(qtSettings);
+
+  foreach (const QString& key, d->modifiedSettings.values())
+    d->settings[key]->discard();
+
+  d->modifiedSettings.clear();
+}
+
+//-----------------------------------------------------------------------------
+void qtSettings::clear()
+{
+  QTE_D(qtSettings);
+
+  d->settings.clear();
+  d->modifiedSettings.clear();
+
+  foreach (QSettings* settings, d->stores.values())
+    settings->clear();
+}
+
+//-----------------------------------------------------------------------------
+void qtSettings::declareSetting(
+  const QString& key, const QVariant& defaultValue, Scope scope)
+{
+  QTE_D(qtSettings);
+  QSettings& store = d->store(scope);
+  d->settings.insert(
+    key, new qtSettingsPrivate::Setting(scope, key, defaultValue, store));
+}
+
+//-----------------------------------------------------------------------------
+void qtSettings::declareSetting(const QString& key, qtAbstractSetting* s)
+{
+  QTE_D(qtSettings);
+  QSettings& store = d->store(s->scope());
+  s->initialize(store);
+  d->settings.insert(key, s);
+}
+
+//-----------------------------------------------------------------------------
+QVariant qtSettings::value(const QString& key) const
+{
+  QTE_D_CONST(qtSettings);
+  if (!d->settings.contains(key))
+    {
+    return QVariant();
+    }
+  return d->settings[key]->value();
+}
+
+//-----------------------------------------------------------------------------
+void qtSettings::setValue(const QString& key, const QVariant& value)
+{
+  QTE_D(qtSettings);
+
+  if (!d->settings.contains(key))
+    {
+    return;
+    }
+
+  qtAbstractSetting* s = d->settings[key];
+  s->setValue(value);
+
+  if (s->isModified())
+    {
+    d->modifiedSettings.insert(key);
+    }
+  else
+    {
+    d->modifiedSettings.remove(key);
+    }
+}
+
+//END qtSettings
diff --git a/Libraries/QtExtensions/Util/qtSettings.h b/Libraries/QtExtensions/Util/qtSettings.h
new file mode 100644
index 00000000..a418f8cd
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtSettings.h
@@ -0,0 +1,62 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSettings_h
+#define __qtSettings_h
+
+#include <QString>
+#include <QVariant>
+
+#include "../Core/qtGlobal.h"
+
+#define qtSettings_declare(_type_, _get_, _set_) \
+  _type_ _get_() const; void _set_(_type_)
+
+class qtAbstractSetting;
+
+class qtSettingsPrivate;
+
+class QTE_EXPORT qtSettings
+{
+public:
+  enum ScopeFlag
+    {
+    UserScope           = 0x1,
+    ApplicationScope    = 0x2,
+    OrganizationScope   = 0x0,
+    SystemScope         = 0x0,
+    DefaultScope        = UserScope | ApplicationScope
+    };
+  Q_DECLARE_FLAGS(Scope, ScopeFlag)
+
+  qtSettings();
+  virtual ~qtSettings();
+
+  bool hasUncommittedChanges() const;
+  bool wasCommitted() const;
+
+  void commit();
+  void discard();
+  void clear();
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(qtSettings)
+
+  void declareSetting(const QString& key,
+                      const QVariant& defaultValue = QVariant(),
+                      Scope = DefaultScope);
+  void declareSetting(const QString& key, qtAbstractSetting*);
+  QVariant value(const QString& key) const;
+  void setValue(const QString& key, const QVariant& value);
+
+private:
+  QTE_DECLARE_PRIVATE(qtSettings)
+  Q_DISABLE_COPY(qtSettings)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(qtSettings::Scope)
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtSettingsImpl.h b/Libraries/QtExtensions/Util/qtSettingsImpl.h
new file mode 100644
index 00000000..ffdf46a7
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtSettingsImpl.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSettingsImpl_h
+#define __qtSettingsImpl_h
+
+#include "qtSettings.h"
+
+#define qtSettings_implement(_name_, _Name_, _type_) \
+  _type_ QTSETTINGS_SUBCLASS_NAME::_name_() const { \
+    return this->value(key##_Name_).value<_type_>(); \
+  } \
+  void QTSETTINGS_SUBCLASS_NAME::set##_Name_(_type_ value) { \
+    this->setValue(key##_Name_, QVariant::fromValue(value)); \
+  }
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtStatusForwarder.cxx b/Libraries/QtExtensions/Util/qtStatusForwarder.cxx
new file mode 100644
index 00000000..4f697d81
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusForwarder.cxx
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtStatusForwarder.h"
+
+//-----------------------------------------------------------------------------
+qtStatusForwarder::qtStatusForwarder()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtStatusForwarder::~qtStatusForwarder()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusForwarder::connect(qtStatusNotifier* other)
+{
+  connect(other, SIGNAL(statusMessageAvailable(qtStatusSource, QString)),
+          this, SLOT(forwardStatusMessage(qtStatusSource, QString)));
+  connect(other, SIGNAL(progressAvailable(qtStatusSource, bool, qreal)),
+          this, SLOT(forwardProgress(qtStatusSource, bool, qreal)));
+  connect(other, SIGNAL(progressAvailable(qtStatusSource, bool, int, int)),
+          this, SLOT(forwardProgress(qtStatusSource, bool, int, int)));
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusForwarder::forwardStatusMessage(
+  qtStatusSource ss, QString message)
+{
+  Q_UNUSED(ss)
+  emit this->statusMessageAvailable(this->statusSource(), message);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusForwarder::forwardProgress(
+  qtStatusSource ss, bool available, qreal progress)
+{
+  Q_UNUSED(ss)
+  emit this->progressAvailable(this->statusSource(), available, progress);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusForwarder::forwardProgress(
+  qtStatusSource ss, bool available, int progressValue, int progressSteps)
+{
+  Q_UNUSED(ss)
+  emit this->progressAvailable(this->statusSource(), available,
+                               progressValue, progressSteps);
+}
diff --git a/Libraries/QtExtensions/Util/qtStatusForwarder.h b/Libraries/QtExtensions/Util/qtStatusForwarder.h
new file mode 100644
index 00000000..ff5cfb37
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusForwarder.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtStatusForwarder_h
+#define __qtStatusForwarder_h
+
+#include "qtStatusNotifier.h"
+
+/// Helper class to redirect status notifications from one source to itself.
+///
+/// This class provides a base class for users that wish to both send their own
+/// status notifications, and also pass on notifications from another source as
+/// if the other source's notifications had come from themselves. This works by
+/// connecting other status notifiers to the forwarder class and reemitting
+/// their notifications with the original qtStatusSource replaces by the
+/// qtStatusSource of the forwarder instance.
+class QTE_EXPORT qtStatusForwarder : public qtStatusNotifier
+{
+  Q_OBJECT
+
+public:
+  qtStatusForwarder();
+  virtual ~qtStatusForwarder();
+
+  /// Connect another notifier to this forwarder.
+  ///
+  /// This connects the notifications of the specified notifier to this
+  /// forwarder instance. The notifications of the specified notifier will be
+  /// reemitted from this forwarder using its status source.
+  void connect(qtStatusNotifier*);
+  using QObject::connect;
+
+protected slots:
+  void forwardStatusMessage(qtStatusSource, QString);
+  void forwardProgress(qtStatusSource, bool, qreal);
+  void forwardProgress(qtStatusSource, bool, int, int);
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtStatusManager.cxx b/Libraries/QtExtensions/Util/qtStatusManager.cxx
new file mode 100644
index 00000000..00030992
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusManager.cxx
@@ -0,0 +1,328 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QtCore>
+
+#include <QApplication>
+#include <QHash>
+#include <QLabel>
+#include <QList>
+#include <QProgressBar>
+
+#include "../Core/qtDebug.h"
+
+#include "qtStatusManager.h"
+#include "qtStatusSourcePrivate.h"
+
+QTE_IMPLEMENT_D_FUNC(qtStatusManager)
+
+//-----------------------------------------------------------------------------
+class qtStatusManagerPrivate
+{
+public:
+  struct StatusInfo
+    {
+    StatusInfo()
+      : progressAvailable(false), progressMinimum(0), progressMaximum(0),
+        progressValue(-1)
+      {}
+
+    QString text;
+    bool progressAvailable;
+    int progressMinimum;
+    int progressMaximum;
+    int progressValue;
+    QString progressFormat;
+    };
+
+  qtStatusManagerPrivate(qtStatusManager* q)
+    : q_ptr(q), debugArea(qtDebug::InvalidArea) {}
+
+  void setLastSender(qtStatusSource&);
+  void removeSendersByObject(const QObject*);
+  void update();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(qtStatusManager)
+
+  qtDebugAreaAccessor debugArea;
+
+  QList<QLabel*> labels;
+  QList<QProgressBar*>progressBars;
+
+  QList<qtStatusSource> senders;
+  QHash<const QObject*, StatusInfo> status;
+
+private:
+  QTE_DECLARE_PUBLIC(qtStatusManager)
+};
+
+//-----------------------------------------------------------------------------
+QDebug& operator<<(QDebug& dbg, qtStatusManagerPrivate::StatusInfo si)
+{
+  dbg.nospace();
+  dbg << "( text = " << si.text
+      << ", progressAvailable = " << si.progressAvailable
+      << ", progressMinimum = " << si.progressMinimum
+      << ", progressMaximum = " << si.progressMaximum
+      << ", progressValue = " << si.progressValue
+      << ", progressFormat = " << si.progressFormat
+      << " )";
+  return dbg.space();
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManagerPrivate::setLastSender(qtStatusSource& source)
+{
+  QTE_Q(qtStatusManager);
+
+  // Clear this sender's status when it goes away
+  q->connect(source.d_ptr.data(), SIGNAL(ownerDestroyed(qtStatusSource)),
+             q, SLOT(removeSource(qtStatusSource)), Qt::UniqueConnection);
+
+  // Move sender to top of the list, if not already there
+  this->senders.removeAll(source);
+  this->senders.append(source);
+
+  // Check if the sender was deleted while we were adding it
+  if (source.isOwnerDestroyed())
+    {
+    q->removeSource(source);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManagerPrivate::removeSendersByObject(const QObject* obj)
+{
+  QList<qtStatusSource>::iterator iter = this->senders.begin();
+  while (iter != this->senders.end())
+    {
+    if (iter->owner() == obj)
+      {
+      iter = this->senders.erase(iter);
+      }
+    else
+      {
+      ++iter;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManagerPrivate::update()
+{
+  StatusInfo si;
+
+  if (!this->senders.isEmpty())
+    {
+    si = this->status[this->senders.last().owner()];
+
+    qtDebug(this->debugArea)
+        << "updating status using sender" << this->senders.last()
+        << "status" << si;
+    }
+  else
+    {
+    qtDebug(this->debugArea) << "clearing status";
+    }
+
+  foreach (QLabel* label, this->labels)
+    label->setText(si.text);
+
+  foreach (QProgressBar* progressBar, this->progressBars)
+    {
+    progressBar->setVisible(si.progressAvailable);
+    if (si.progressAvailable)
+      {
+      if (si.progressValue < 0)
+        {
+        if (progressBar->minimum() != 0 || progressBar->maximum() != 0)
+          {
+          progressBar->setRange(0, 0);
+          }
+        }
+      else
+        {
+        progressBar->setFormat(si.progressFormat);
+        progressBar->setRange(si.progressMinimum, si.progressMaximum);
+        progressBar->setValue(si.progressValue);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtStatusManager::qtStatusManager(QObject* parent)
+  : QObject(parent), d_ptr(new qtStatusManagerPrivate(this))
+{
+  qRegisterMetaType<qtStatusSource>("qtStatusSource");
+}
+
+//-----------------------------------------------------------------------------
+qtStatusManager::~qtStatusManager()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::setDebugArea(qtDebugAreaAccessor area)
+{
+  QTE_D(qtStatusManager);
+  d->debugArea = area;
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::addStatusLabel(QLabel* obj)
+{
+  QTE_D(qtStatusManager);
+
+  qtDebug(d->debugArea) << "adding label" << obj;
+
+  d->labels.append(obj);
+  connect(obj, SIGNAL(destroyed(QObject*)),
+          this, SLOT(removeObject(QObject*)));
+
+  d->update();
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::addProgressBar(QProgressBar* obj)
+{
+  QTE_D(qtStatusManager);
+
+  qtDebug(d->debugArea) << "adding progress bar" << obj;
+
+  d->progressBars.append(obj);
+  connect(obj, SIGNAL(destroyed(QObject*)),
+          this, SLOT(removeObject(QObject*)));
+
+  d->update();
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::removeStatusLabel(QLabel* obj)
+{
+  QTE_D(qtStatusManager);
+  qtDebug(d->debugArea) << "removing label" << obj;
+  d->labels.removeAll(obj);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::removeProgressBar(QProgressBar* obj)
+{
+  QTE_D(qtStatusManager);
+  qtDebug(d->debugArea) << "removing progress bar" << obj;
+  d->progressBars.removeAll(obj);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::removeObject(QObject* obj)
+{
+  QTE_D(qtStatusManager);
+
+  qtDebug(d->debugArea) << "removing object" << obj;
+
+  d->labels.removeAll(static_cast<QLabel*>(obj));
+  d->progressBars.removeAll(static_cast<QProgressBar*>(obj));
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::removeSource(qtStatusSource source)
+{
+  QTE_D(qtStatusManager);
+
+  qtDebug(d->debugArea) << "removing source" << source;
+
+  // Clear this object's status
+  if (d->status.contains(source.owner()))
+    {
+    bool needUpdate = (d->senders.last() == source);
+    d->status.remove(source.owner());
+    d->senders.removeAll(source);
+    if (needUpdate)
+      {
+      d->update();
+      }
+    }
+
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::transferOwnership(const QObject* from,
+                                        qtStatusSource to)
+{
+  QTE_D(qtStatusManager);
+
+  if (d->status.contains(from))
+    {
+    qtDebug(d->debugArea)
+        << "transferring status ownership from" << from << "to" << to;
+
+    d->status.insert(to.owner(), d->status[from]);
+    d->removeSendersByObject(from);
+    d->setLastSender(to);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::setStatusText(qtStatusSource source, QString text)
+{
+  QTE_D(qtStatusManager);
+
+  qtDebug(d->debugArea) << "setting status text" << source << text;
+
+  if (text.isEmpty())
+    {
+    // No text means we should clear this sender's status
+    d->senders.removeAll(source);
+    d->status.remove(source.owner());
+    }
+  else
+    {
+    qtStatusManagerPrivate::StatusInfo& si = d->status[source.owner()];
+    si.text = text;
+    d->setLastSender(source);
+    }
+
+  d->update();
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::setProgress(qtStatusSource source, bool available,
+                                  qreal value)
+{
+  this->setProgress(source, available, value * 10000.0, 0, 10000);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::setProgress(qtStatusSource source, bool available,
+                                  int value, int steps, QString format)
+{
+  this->setProgress(source, available, value, 0, steps, format);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusManager::setProgress(qtStatusSource source, bool available,
+                                  int value, int minimum, int maximum,
+                                  QString format)
+{
+  QTE_D(qtStatusManager);
+
+  qtDebug(d->debugArea)
+      << "setting progress" << source
+      << "( available =" << available
+      << "value =" << value << '/' << minimum << '-' << maximum
+      << "format =" << format << ')';
+
+  qtStatusManagerPrivate::StatusInfo& si = d->status[source.owner()];
+  si.progressAvailable = available;
+  si.progressMinimum = minimum;
+  si.progressMaximum = maximum;
+  si.progressValue = value;
+  si.progressFormat = format;
+
+  d->setLastSender(source);
+  d->update();
+}
diff --git a/Libraries/QtExtensions/Util/qtStatusManager.h b/Libraries/QtExtensions/Util/qtStatusManager.h
new file mode 100644
index 00000000..da4c2e15
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusManager.h
@@ -0,0 +1,61 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtStatusManager_h
+#define __qtStatusManager_h
+
+#include <QObject>
+#include <QString>
+
+#include "../Core/qtDebugArea.h"
+
+#include "qtStatusSource.h"
+
+class QLabel;
+class QProgressBar;
+
+class qtStatusManagerPrivate;
+
+class QTE_EXPORT qtStatusManager : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit qtStatusManager(QObject* parent = 0);
+  ~qtStatusManager();
+
+  void addStatusLabel(QLabel*);
+  void addProgressBar(QProgressBar*);
+
+  void removeStatusLabel(QLabel*);
+  void removeProgressBar(QProgressBar*);
+
+  void setDebugArea(qtDebugAreaAccessor area);
+
+  void transferOwnership(const QObject* from, qtStatusSource to);
+
+public slots:
+  void setStatusText(qtStatusSource source, QString text = QString());
+  void setProgress(qtStatusSource source, bool available = false,
+                   qreal value = -1);
+  void setProgress(qtStatusSource source, bool available, int value,
+                   int steps, QString format = "%v / %m");
+  void setProgress(qtStatusSource source, bool available, int value,
+                   int minimum, int maximum, QString format = "%p%");
+
+protected slots:
+  void removeObject(QObject*);
+  void removeSource(qtStatusSource);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtStatusManager)
+
+private:
+  QTE_DECLARE_PRIVATE(qtStatusManager)
+  Q_DISABLE_COPY(qtStatusManager)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtStatusNotifier.cxx b/Libraries/QtExtensions/Util/qtStatusNotifier.cxx
new file mode 100644
index 00000000..e2b1e9af
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusNotifier.cxx
@@ -0,0 +1,81 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtStatusNotifier.h"
+
+#include "qtStatusManager.h"
+
+QTE_IMPLEMENT_D_FUNC(qtStatusNotifier)
+
+//-----------------------------------------------------------------------------
+class qtStatusNotifierPrivate
+{
+public:
+  qtStatusNotifierPrivate(qtStatusNotifier* q) : statusSource(q) {}
+
+  qtStatusSource statusSource;
+};
+
+//-----------------------------------------------------------------------------
+qtStatusNotifier::qtStatusNotifier()
+  : d_ptr(new qtStatusNotifierPrivate(this))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtStatusNotifier::~qtStatusNotifier()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusNotifier::addReceiver(qtStatusManager* manager) const
+{
+  connect(this, SIGNAL(statusMessageAvailable(qtStatusSource, QString)),
+          manager, SLOT(setStatusText(qtStatusSource, QString)));
+  connect(this, SIGNAL(progressAvailable(qtStatusSource, bool, qreal)),
+          manager, SLOT(setProgress(qtStatusSource, bool, qreal)));
+  connect(this, SIGNAL(progressAvailable(qtStatusSource, bool, int, int)),
+          manager, SLOT(setProgress(qtStatusSource, bool, int, int)));
+}
+
+//-----------------------------------------------------------------------------
+qtStatusSource& qtStatusNotifier::statusSource()
+{
+  QTE_D(qtStatusNotifier);
+  return d->statusSource;
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusNotifier::postStatus(QString message, bool clearProgress)
+{
+  if (clearProgress)
+    {
+    emit this->progressAvailable(this->statusSource());
+    }
+  emit this->statusMessageAvailable(this->statusSource(), message);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusNotifier::postStatus(QString message, qreal progress)
+{
+  emit this->statusMessageAvailable(this->statusSource(), message);
+  emit this->progressAvailable(this->statusSource(), true, progress);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusNotifier::postStatus(QString message, int progressValue,
+                                  int progressSteps)
+{
+  emit this->statusMessageAvailable(this->statusSource(), message);
+  emit this->progressAvailable(this->statusSource(), true,
+                               progressValue, progressSteps);
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusNotifier::clearStatus()
+{
+  emit this->statusMessageAvailable(this->statusSource());
+}
diff --git a/Libraries/QtExtensions/Util/qtStatusNotifier.h b/Libraries/QtExtensions/Util/qtStatusNotifier.h
new file mode 100644
index 00000000..da35bb33
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusNotifier.h
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtStatusNotifier_h
+#define __qtStatusNotifier_h
+
+#include <QObject>
+
+#include "qtStatusSource.h"
+
+class qtStatusManager;
+
+class qtStatusNotifierPrivate;
+
+class QTE_EXPORT qtStatusNotifier : public QObject
+{
+  Q_OBJECT
+
+public:
+  qtStatusNotifier();
+  virtual ~qtStatusNotifier();
+
+  void addReceiver(qtStatusManager*) const;
+
+signals:
+  void statusMessageAvailable(qtStatusSource, QString = QString());
+  void progressAvailable(qtStatusSource, bool = false, qreal value = -1);
+  void progressAvailable(qtStatusSource, bool, int value, int steps);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtStatusNotifier)
+
+  qtStatusSource& statusSource();
+
+  void postStatus(QString message, bool clearProgress = false);
+  void postStatus(QString message, qreal progress);
+  void postStatus(QString message, int progressValue, int progressSteps);
+
+  void clearStatus();
+
+private:
+  QTE_DECLARE_PRIVATE(qtStatusNotifier)
+  Q_DISABLE_COPY(qtStatusNotifier)
+};
+
+#endif // __qtStatusNotifier_h
diff --git a/Libraries/QtExtensions/Util/qtStatusSource.cxx b/Libraries/QtExtensions/Util/qtStatusSource.cxx
new file mode 100644
index 00000000..2dccb809
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusSource.cxx
@@ -0,0 +1,110 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QDebug>
+
+#include "qtStatusSourcePrivate.h"
+
+QTE_IMPLEMENT_D_FUNC(qtStatusSource)
+
+//-----------------------------------------------------------------------------
+qtStatusSourcePrivate::qtStatusSourcePrivate(QObject* obj)
+  : owner(obj), ownerRef(obj)
+{
+  if (obj)
+    {
+    // Use a direct connection to force our signal to be called, even if our
+    // owner object is being destroyed after its thread's event loop has shut
+    // down. The slot is thread-safe.
+    connect(obj, SIGNAL(destroyed(QObject*)),
+            this, SLOT(ownerDestroyed()),
+            Qt::DirectConnection);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusSourcePrivate::ownerDestroyed()
+{
+  emit this->ownerDestroyed(qtStatusSource(this));
+}
+
+//-----------------------------------------------------------------------------
+qtStatusSource::qtStatusSource(QObject* owner)
+  : d_ptr(new qtStatusSourcePrivate(owner))
+{
+  this->setName(owner);
+}
+
+//-----------------------------------------------------------------------------
+qtStatusSource::qtStatusSource(const qtStatusSource& other)
+  : d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+qtStatusSource::qtStatusSource(qtStatusSourcePrivate* d)
+  : d_ptr(QWeakPointer<qtStatusSourcePrivate>(d).toStrongRef())
+{
+}
+
+//-----------------------------------------------------------------------------
+qtStatusSource::~qtStatusSource()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtStatusSource::setName(QObject* obj)
+{
+  QTE_D(qtStatusSource);
+
+  d->displayIdentifier.clear();
+  QDebug debug(&d->displayIdentifier);
+  debug << obj;
+  if (obj == d->owner)
+    {
+    d->displayIdentifier = d->displayIdentifier.trimmed();
+    d->ownerIdentifier = d->displayIdentifier;
+    }
+  else
+    {
+    debug << '(' << qPrintable(d->ownerIdentifier) << ')';
+    d->displayIdentifier = d->displayIdentifier.trimmed();
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtStatusSource& qtStatusSource::operator=(const qtStatusSource& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+bool qtStatusSource::operator==(const qtStatusSource& other) const
+{
+  return this->owner() == other.owner();
+}
+
+//-----------------------------------------------------------------------------
+const QObject* qtStatusSource::owner() const
+{
+  QTE_D_CONST(qtStatusSource);
+  return d->owner;
+}
+
+//-----------------------------------------------------------------------------
+bool qtStatusSource::isOwnerDestroyed() const
+{
+  QTE_D_CONST(qtStatusSource);
+  return d->ownerRef.isNull();
+}
+
+//-----------------------------------------------------------------------------
+QDebug& operator<<(QDebug& dbg, const qtStatusSource& ss)
+{
+  dbg << qPrintable(ss.d_ptr->displayIdentifier);
+  return dbg.space();
+}
diff --git a/Libraries/QtExtensions/Util/qtStatusSource.h b/Libraries/QtExtensions/Util/qtStatusSource.h
new file mode 100644
index 00000000..da4b3321
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusSource.h
@@ -0,0 +1,52 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtStatusSource_h
+#define __qtStatusSource_h
+
+#include <QObject>
+#include <QSharedPointer>
+
+#include "../Core/qtGlobal.h"
+
+class QDebug;
+
+class qtStatusSourcePrivate;
+
+class QTE_EXPORT qtStatusSource
+{
+public:
+  /*implicit*/ qtStatusSource(QObject* = 0);
+  qtStatusSource(const qtStatusSource& other);
+
+  ~qtStatusSource();
+
+  void setName(QObject*);
+
+  qtStatusSource& operator=(const qtStatusSource& other);
+
+  bool operator==(const qtStatusSource& other) const;
+
+protected:
+  QTE_DECLARE_PRIVATE_SPTR(qtStatusSource)
+
+  friend class qtStatusManager;
+  friend class qtStatusManagerPrivate;
+
+  friend QDebug& operator<<(QDebug&, const qtStatusSource&);
+
+  qtStatusSource(qtStatusSourcePrivate* d);
+
+  const QObject* owner() const;
+  bool isOwnerDestroyed() const;
+
+private:
+  QTE_DECLARE_PRIVATE(qtStatusSource)
+};
+
+extern QDebug& operator<<(QDebug&, const qtStatusSource&);
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtStatusSourcePrivate.h b/Libraries/QtExtensions/Util/qtStatusSourcePrivate.h
new file mode 100644
index 00000000..63178e1d
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtStatusSourcePrivate.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QObject>
+#include <QWeakPointer>
+
+#include "qtStatusSource.h"
+
+class qtStatusSourcePrivate : public QObject
+{
+  Q_OBJECT
+
+public:
+  qtStatusSourcePrivate(QObject* owner);
+
+signals:
+  void ownerDestroyed(qtStatusSource);
+
+protected slots:
+  void ownerDestroyed();
+
+private:
+  Q_DISABLE_COPY(qtStatusSourcePrivate)
+
+  friend class qtStatusSource;
+  friend QDebug& operator<<(QDebug&, const qtStatusSource&);
+
+  QObject* owner;
+  QWeakPointer<QObject> ownerRef;
+  QString ownerIdentifier;
+  QString displayIdentifier;
+};
diff --git a/Libraries/QtExtensions/Util/qtUiState.cxx b/Libraries/QtExtensions/Util/qtUiState.cxx
new file mode 100644
index 00000000..732679c7
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtUiState.cxx
@@ -0,0 +1,494 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtUiState.h"
+
+#include <QAbstractButton>
+#include <QAction>
+#include <QDebug>
+#include <QDoubleSpinBox>
+#include <QGroupBox>
+#include <QHash>
+#include <QLineEdit>
+#include <QMainWindow>
+#include <QRegExp>
+#include <QSettings>
+#include <QSpinBox>
+#include <QSplitter>
+#include <QStringList>
+#include <QWeakPointer>
+
+QTE_IMPLEMENT_D_FUNC(qtUiState)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtUiStatePrivate
+
+//-----------------------------------------------------------------------------
+class qtUiStatePrivate
+{
+public:
+  template <typename T, typename O> class Item;
+  template <typename O> class StateItem;
+
+  qtUiStatePrivate(QSettings* s) : store(s ? s : new QSettings) {}
+  ~qtUiStatePrivate();
+
+  void map(QString key, qtUiState::AbstractItem* item);
+  QString resolveKey(QString input) const;
+  QStringList matchingKeys(const QString& pattern) const;
+
+  void save(const QStringList& keys) const;
+  void restore(const QStringList& keys) const;
+
+  QString currentGroup;
+
+  const QScopedPointer<QSettings> store;
+  QHash<QString, qtUiState::AbstractItem*> items;
+};
+
+//-----------------------------------------------------------------------------
+qtUiStatePrivate::~qtUiStatePrivate()
+{
+  qDeleteAll(this->items);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiStatePrivate::map(QString key, qtUiState::AbstractItem* item)
+{
+  key = this->resolveKey(key);
+
+  if (this->items.contains(key))
+    {
+    qWarning() << "qtUiState: replacing existing mapping for" << key;
+    delete this->items.take(key);
+    }
+
+  this->items.insert(key, item);
+}
+
+//-----------------------------------------------------------------------------
+QString qtUiStatePrivate::resolveKey(QString input) const
+{
+  if (input.startsWith('/'))
+    {
+    while (input.startsWith('/'))
+      {
+      input = input.mid(1);
+      }
+    return input;
+    }
+
+  if (currentGroup.isEmpty())
+    {
+    return input;
+    }
+
+  return QString("%1/%2").arg(this->currentGroup, input);
+}
+
+//-----------------------------------------------------------------------------
+QStringList qtUiStatePrivate::matchingKeys(const QString& pattern) const
+{
+  QRegExp re(
+    (pattern.startsWith('/') ? "^" + pattern.mid(1) : "(^|/)" + pattern) +
+    (pattern.endsWith('/') ? "" : "(/|$)"));
+  QStringList matches;
+
+  foreach (QString key, this->items.keys())
+    {
+    if (re.indexIn(key) >= 0)
+      {
+      matches.append(key);
+      }
+    }
+
+  return matches;
+}
+
+//-----------------------------------------------------------------------------
+void qtUiStatePrivate::save(const QStringList& keys) const
+{
+  foreach (QString key, keys)
+    {
+    qtUiState::AbstractItem* item = this->items.value(key, 0);
+    if (item)
+      {
+      this->store->setValue(key, item->value());
+      }
+    }
+
+  this->store->sync();
+}
+
+//-----------------------------------------------------------------------------
+void qtUiStatePrivate::restore(const QStringList& keys) const
+{
+  this->store->sync();
+
+  foreach (QString key, keys)
+    {
+    qtUiState::AbstractItem* item = this->items.value(key, 0);
+    if (item)
+      {
+      item->setValue(this->store->value(key, item->value()));
+      }
+    }
+}
+
+//END qtUiStatePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtUiStatePrivate::Item
+
+//-----------------------------------------------------------------------------
+template <typename T, typename O>
+class qtUiStatePrivate::Item : public qtUiState::AbstractItem
+{
+public:
+  typedef T(O::*ReadMethod)() const;
+  typedef void (O::*WriteRefMethod)(const T&);
+  typedef void (O::*WriteValMethod)(T);
+
+  Item(O*, ReadMethod, WriteRefMethod);
+  Item(O*, ReadMethod, WriteValMethod);
+
+  virtual QVariant value() const;
+  virtual void setValue(const QVariant&);
+
+protected:
+  QWeakPointer<O> object;
+  const ReadMethod read;
+  const WriteRefMethod writeRef;
+  const WriteValMethod writeVal;
+};
+
+//-----------------------------------------------------------------------------
+template <typename T, typename O>
+qtUiStatePrivate::Item<T, O>::Item(
+  O* object, ReadMethod read, WriteRefMethod write)
+  : object(object), read(read), writeRef(write), writeVal(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+template <typename T, typename O>
+qtUiStatePrivate::Item<T, O>::Item(
+  O* object, ReadMethod read, WriteValMethod write)
+  : object(object), read(read), writeRef(0), writeVal(write)
+{
+}
+
+//-----------------------------------------------------------------------------
+template <typename T, typename O>
+QVariant qtUiStatePrivate::Item<T, O>::value() const
+{
+  if (!this->object)
+    {
+    return QVariant();
+    }
+
+  return (*(object.data()).*this->read)();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T, typename O>
+void qtUiStatePrivate::Item<T, O>::setValue(const QVariant& data)
+{
+  if (!this->object)
+    {
+    return;
+    }
+
+  if (this->writeVal)
+    {
+    (*(object.data()).*this->writeVal)(data.value<T>());
+    }
+  else
+    {
+    (*(object.data()).*this->writeRef)(data.value<T>());
+    }
+}
+
+//END qtUiStatePrivate::Item
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtUiStatePrivate::StateItem
+
+//-----------------------------------------------------------------------------
+template <typename O>
+class qtUiStatePrivate::StateItem : public qtUiState::AbstractItem
+{
+public:
+  typedef QByteArray(O::*ReadMethod)() const;
+  typedef QByteArray(O::*ReadVersionedMethod)(int) const;
+  typedef bool (O::*WriteMethod)(const QByteArray&);
+  typedef bool (O::*WriteVersionedMethod)(const QByteArray&, int);
+
+  StateItem(O*, ReadMethod, WriteMethod);
+  StateItem(O*, ReadVersionedMethod, WriteVersionedMethod, int);
+
+  virtual QVariant value() const;
+  virtual void setValue(const QVariant&);
+
+protected:
+  QWeakPointer<O> object;
+  int version;
+  const ReadMethod read;
+  const ReadVersionedMethod readVersioned;
+  const WriteMethod write;
+  const WriteVersionedMethod writeVersioned;
+};
+
+//-----------------------------------------------------------------------------
+template <typename O>
+qtUiStatePrivate::StateItem<O>::StateItem(
+  O* object, ReadMethod read, WriteMethod write)
+  : object(object), version(0),
+    read(read), readVersioned(0),
+    write(write), writeVersioned(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+template <typename O>
+qtUiStatePrivate::StateItem<O>::StateItem(
+  O* object, ReadVersionedMethod read, WriteVersionedMethod write, int version)
+  : object(object), version(version),
+    read(0), readVersioned(read),
+    write(0), writeVersioned(write)
+{
+}
+
+//-----------------------------------------------------------------------------
+template <typename O>
+QVariant qtUiStatePrivate::StateItem<O>::value() const
+{
+  if (!this->object)
+    {
+    return QVariant();
+    }
+
+  if (this->read)
+    {
+    return (*(object.data()).*this->read)();
+    }
+  else
+    {
+    return (*(object.data()).*this->readVersioned)(this->version);
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename O>
+void qtUiStatePrivate::StateItem<O>::setValue(const QVariant& data)
+{
+  if (!this->object)
+    {
+    return;
+    }
+
+  if (this->write)
+    {
+    (*(object.data()).*this->write)(data.toByteArray());
+    }
+  else
+    (*(object.data()).*this->writeVersioned)(data.toByteArray(),
+                                             this->version);
+}
+
+//END qtUiStatePrivate::StateItem
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtUiState
+
+//-----------------------------------------------------------------------------
+qtUiState::qtUiState(QSettings* s) : d_ptr(new qtUiStatePrivate(s))
+{
+}
+
+//-----------------------------------------------------------------------------
+qtUiState::~qtUiState()
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::save() const
+{
+  QTE_D_CONST(qtUiState);
+  d->save(d->items.keys());
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::save(const QString& key) const
+{
+  QTE_D_CONST(qtUiState);
+  d->save(d->matchingKeys(key));
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::save(const QStringList& keys) const
+{
+  QTE_D_CONST(qtUiState);
+
+  QSet<QString> matchingKeys;
+  foreach (QString pattern, keys)
+    {
+    matchingKeys += QSet<QString>::fromList(d->matchingKeys(pattern));
+    }
+  d->save(matchingKeys.toList());
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::restore() const
+{
+  QTE_D_CONST(qtUiState);
+  d->restore(d->items.keys());
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::restore(const QString& key) const
+{
+  QTE_D_CONST(qtUiState);
+  d->restore(d->matchingKeys(key));
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::restore(const QStringList& keys) const
+{
+  QTE_D_CONST(qtUiState);
+
+  QSet<QString> matchingKeys;
+  foreach (QString pattern, keys)
+    {
+    matchingKeys += QSet<QString>::fromList(d->matchingKeys(pattern));
+    }
+  d->restore(matchingKeys.toList());
+}
+
+//-----------------------------------------------------------------------------
+QString qtUiState::currentGroup()
+{
+  QTE_D_CONST(qtUiState);
+  return d->currentGroup;
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::setCurrentGroup(const QString& group)
+{
+  QTE_D(qtUiState);
+  d->currentGroup = group;
+  while (d->currentGroup.startsWith('/'))
+    {
+    d->currentGroup = d->currentGroup.mid(1);
+    }
+  while (d->currentGroup.endsWith('/'))
+    {
+    d->currentGroup = d->currentGroup.left(d->currentGroup.size() - 1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapChecked(const QString& key, QAction* action)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::Item<bool, QAction>(
+    action, &QAction::isChecked, &QAction::setChecked);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapChecked(const QString& key, QAbstractButton* widget)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::Item<bool, QAbstractButton>(
+    widget, &QAbstractButton::isChecked, &QAbstractButton::setChecked);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapChecked(const QString& key, QGroupBox* widget)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::Item<bool, QGroupBox>(
+    widget, &QGroupBox::isChecked, &QGroupBox::setChecked);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapText(const QString& key, QLineEdit* widget)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::Item<QString, QLineEdit>(
+    widget, &QLineEdit::text, &QLineEdit::setText);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapValue(const QString& key, QSpinBox* widget)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::Item<int, QSpinBox>(
+    widget, &QSpinBox::value, &QSpinBox::setValue);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapValue(const QString& key, QDoubleSpinBox* widget)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::Item<double, QDoubleSpinBox>(
+    widget, &QDoubleSpinBox::value, &QDoubleSpinBox::setValue);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapState(const QString& key, QMainWindow* window, int version)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::StateItem<QMainWindow>(
+    window, &QMainWindow::saveState, &QMainWindow::restoreState, version);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapState(const QString& key, QSplitter* widget)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::StateItem<QSplitter>(
+    widget, &QSplitter::saveState, &QSplitter::restoreState);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::mapGeometry(const QString& key, QWidget* widget)
+{
+  QTE_D(qtUiState);
+  qtUiState::AbstractItem* item =
+    new qtUiStatePrivate::StateItem<QWidget>(
+    widget, &QMainWindow::saveGeometry, &QMainWindow::restoreGeometry);
+  d->map(key, item);
+}
+
+//-----------------------------------------------------------------------------
+void qtUiState::map(const QString& key, qtUiState::AbstractItem* mapper)
+{
+  QTE_D(qtUiState);
+  d->map(key, mapper);
+}
+
+//END qtUiState
diff --git a/Libraries/QtExtensions/Util/qtUiState.h b/Libraries/QtExtensions/Util/qtUiState.h
new file mode 100644
index 00000000..cfdbbda1
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtUiState.h
@@ -0,0 +1,193 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtUiState_h
+#define __qtUiState_h
+
+#include <QScopedPointer>
+
+class QAbstractButton;
+class QAction;
+class QDoubleSpinBox;
+class QGroupBox;
+class QLineEdit;
+class QMainWindow;
+class QSettings;
+class QSpinBox;
+class QSplitter;
+class QString;
+class QStringList;
+class QWidget;
+
+#include "../Core/qtGlobal.h"
+
+class QVariant;
+
+class qtUiStatePrivate;
+
+//-----------------------------------------------------------------------------
+/// Save and restore UI state.
+///
+/// qtUiState functions as a UI state container, allowing users to easily save
+/// and restore UI statue with minimal code duplication.
+///
+/// Traditional state management uses direct calls to QSettings::value and
+/// QSettings::setValue. In addition to duplicating key strings (with
+/// corresponding potential for errors), the various steps needed to convert
+/// from QVariant, interact with the appropriate widget property, and define
+/// default values can result in lengthy code.
+///
+/// qtUiState allows the user to instead define a map of widget-property pairs
+/// to setting keys. Once this is done, saving and restoring of settings can be
+/// done with a single method. Additionally, the built-in map handlers use the
+/// widget's current property value as the default, allowing default-value
+/// changes to be made in .ui files (where used) rather than code.
+///
+/// \section key_naming Key Naming
+///
+/// Like QSettings, qtUiState supports storing of data in a tree structure.
+/// Each qtUiState instance has a <em>current group</em> that is prepended to
+/// any non-absolute key names when creating a mapping. Key names may specify
+/// zero or more tree levels by separating each level with '/'. Keys starting
+/// with '/' are \em absolute, and ignore the current group.
+///
+/// When matching key names:
+/// \li A key specification starting with '/' matches keys or groups starting
+///     with the specified text.
+/// \li A key specification ending with '/' matches all keys within a group
+///     that matches the specified text.
+/// \li A key specification neither starting nor ending with '/' matches all
+///     keys and groups that contain the specified text.
+///
+/// Matching is always performed on complete group names. That is, the
+/// specification "bar" matches keys "sand/bar" and "bar/none", but not
+/// "fubar".
+class QTE_EXPORT qtUiState
+{
+public:
+  /// Abstract class to save and restore UI state of an object.
+  ///
+  /// qtUiState::AbstractItem defines an interface through which qtUiState can
+  /// save or restore the state of any object that provides an implementation
+  /// of such interface. Marshaling the data to/from QSettings is handled by
+  /// qtUiState; the interface is only responsible for creating the data from
+  /// the object's state and using the data to restore the object's state. As
+  /// qtUiState is not responsible for managing the object itself, most
+  /// implementations will have an internal pointer to the object.
+  class AbstractItem
+    {
+    public:
+      virtual ~AbstractItem() {}
+
+      /// Serialize the object's state.
+      /// \return A QVariant representing the object's state.
+      virtual QVariant value() const = 0;
+
+      /// Restore the object's state.
+      /// \param data A QVariant containing the serialized representation of
+      ///             the object's state.
+      virtual void setValue(const QVariant& data) = 0;
+    };
+
+  /// Construct a qtUiState, using the specified QSettings as the backing
+  /// store.
+  ///
+  /// If \p store is non-null, the qtUiState takes ownership of the QSettings
+  /// object and uses it to save and restore the UI state. Otherwise, qtUiState
+  /// uses a default-constructed QSettings.
+  explicit qtUiState(QSettings* store = 0);
+
+  virtual ~qtUiState();
+
+  /// Save settings for all items.
+  ///
+  /// This method saves the settings for all items registered with the
+  /// qtUiState instance.
+  void save() const;
+  /// Save settings for named item(s).
+  ///
+  /// This method saves the settings for one or more items matching the
+  /// specified \p key, as described in \ref key_naming.
+  void save(const QString& key) const;
+  /// \copydoc save(const QString&) const
+  void save(const QStringList& keys) const;
+
+  /// Restore settings for all items.
+  ///
+  /// This method restores the settings for all items registered with the
+  /// qtUiState instance.
+  void restore() const;
+  /// Restore settings for named item(s).
+  ///
+  /// This method restores the settings for one or more items matching the
+  /// specified \p keys, as described in \ref key_naming.
+  void restore(const QString& key) const;
+  /// \copydoc restore(const QString&) const
+  void restore(const QStringList& keys) const;
+
+  /// Get current settings group.
+  ///
+  /// This method returns the current settings group. The current group is
+  /// prefixed to all non-absolute keys when defining a new mapping.
+  QString currentGroup();
+  /// Set current settings group.
+  ///
+  /// This method sets the current settings group. The current group is
+  /// prefixed to all non-absolute keys when defining a new mapping.
+  void setCurrentGroup(const QString&);
+
+  /// Define mapping of a QAction's checked state.
+  void mapChecked(const QString& key, QAction*);
+  /// Define mapping of a QAbstractButton's checked state.
+  void mapChecked(const QString& key, QAbstractButton*);
+  /// Define mapping of a QGroupBox's checked state.
+  void mapChecked(const QString& key, QGroupBox*);
+
+  /// Define mapping of a QLineEdit's text property.
+  void mapText(const QString& key, QLineEdit*);
+
+  /// Define mapping of a QSpinBox's value property.
+  void mapValue(const QString& key, QSpinBox*);
+  /// Define mapping of a QDoubleSpinBox's value property.
+  void mapValue(const QString& key, QDoubleSpinBox*);
+
+  /// Define mapping of a QMainWindow's state.
+  ///
+  /// This method defines a mapping to save and restore the state (position and
+  /// layout of tool bars and dock widgets) of a QMainWindow.
+  /// \sa QMainWindow::saveState, QMainWindow::restoreState
+  void mapState(const QString& key, QMainWindow*, int version = 0);
+  /// Define mapping of a QSplitter's state.
+  ///
+  /// This method defines a mapping to save and restore the state (size and
+  /// layout of children) of a QSplitter.
+  /// \sa QSplitter::saveState, QSplitter::restoreState
+  void mapState(const QString& key, QSplitter*);
+
+  /// Define mapping of a widget's geometry.
+  ///
+  /// This method defines a mapping to save and restore the geometry of a
+  /// QWidget. While this can be used for any widget, it would be most commonly
+  /// used for an application window or dialog.
+  void mapGeometry(const QString& key, QWidget*);
+
+  /// Map the state of a generic object.
+  ///
+  /// The qtUiState instance assumes ownership of \p mapper.
+  ///
+  /// \param mapper Pointer to an implementation of qtUiState::AbstractItem
+  ///               that encapsulates the state management of an object.
+  void map(const QString& key, AbstractItem* mapper);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtUiState)
+
+private:
+  QTE_DECLARE_PRIVATE(qtUiState)
+  Q_DISABLE_COPY(qtUiState)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Util/qtUtilNamespace.h b/Libraries/QtExtensions/Util/qtUtilNamespace.h
new file mode 100644
index 00000000..da016468
--- /dev/null
+++ b/Libraries/QtExtensions/Util/qtUtilNamespace.h
@@ -0,0 +1,34 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtUtilNamespace_h
+#define __qtUtilNamespace_h
+
+#include <QtGlobal>
+
+namespace qtUtil
+{
+  /// Separator behavior for prioritized action container proxies.
+  ///
+  /// This describes the behavior of prioritized action container proxies with
+  /// respect to inserting separators around inserted actions.
+  ///
+  /// \sa qtPrioritizedMenuProxy, qtPrioritizedToolBarProxy
+  enum SeparatorBehaviorFlag
+    {
+    /// Add separator before inserted actions
+    AddSeparatorBefore = 0x1,
+    /// Add separator after inserted actions
+    AddSeparatorAfter = 0x2,
+    /// Do not add separators
+    NoSeparators = 0x0
+    };
+  Q_DECLARE_FLAGS(SeparatorBehavior, SeparatorBehaviorFlag)
+}
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(qtUtil::SeparatorBehavior)
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtColorButton.cxx b/Libraries/QtExtensions/Widgets/qtColorButton.cxx
new file mode 100644
index 00000000..61758011
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtColorButton.cxx
@@ -0,0 +1,172 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtColorButton.h"
+
+#include <QBrush>
+#include <QColorDialog>
+#include <QImage>
+#include <QStyle>
+#include <QStyleOptionFrameV3>
+#include <QPainter>
+#include <QPixmap>
+
+#include "../Util/qtColorUtil.h"
+
+QTE_IMPLEMENT_D_FUNC(qtColorButton)
+
+//-----------------------------------------------------------------------------
+class qtColorButtonPrivate
+{
+public:
+  QBrush brush;
+  QColor color;
+  bool alphaShown;
+
+  QPalette fillPalette(QPalette ref) const;
+};
+
+//-----------------------------------------------------------------------------
+QPalette qtColorButtonPrivate::fillPalette(QPalette ref) const
+{
+  for (int n = 0; n < QPalette::NColorGroups; ++n)
+    {
+    QPalette::ColorGroup cg = static_cast<QPalette::ColorGroup>(n);
+    QColor c =
+      qtColorUtil::blend(ref.color(cg, QPalette::Button), this->color, 0.5);
+    ref.setBrush(cg, QPalette::Base, this->brush);
+    ref.setColor(cg, QPalette::Window, c);
+    }
+  return ref;
+}
+
+//-----------------------------------------------------------------------------
+qtColorButton::qtColorButton(QWidget* parent)
+  : QPushButton(parent), d_ptr(new qtColorButtonPrivate)
+{
+  QTE_D(qtColorButton);
+  connect(this, SIGNAL(clicked()), this, SLOT(pickColor()));
+
+  d->alphaShown = false;
+  d->color = Qt::black;
+  d->brush = Qt::black;
+}
+
+//-----------------------------------------------------------------------------
+qtColorButton::~qtColorButton()
+{
+}
+
+//-----------------------------------------------------------------------------
+QSize qtColorButton::minimumSizeHint() const
+{
+  QSize hint = QPushButton::minimumSizeHint();
+  hint.setWidth(qMax(hint.width(), 20));
+  return hint;
+}
+
+//-----------------------------------------------------------------------------
+QSize qtColorButton::sizeHint() const
+{
+  QSize hint = QPushButton::sizeHint();
+  hint.setWidth(qMax(hint.width(), 20));
+  return hint;
+}
+
+//-----------------------------------------------------------------------------
+QColor qtColorButton::color() const
+{
+  QTE_D_CONST(qtColorButton);
+  return d->color;
+}
+
+//-----------------------------------------------------------------------------
+void qtColorButton::setColor(QColor color)
+{
+  QTE_D(qtColorButton);
+  if (d->color != color)
+    {
+    d->color = color;
+    if (color.alpha() == 255)
+      {
+      d->brush = color;
+      }
+    else
+      {
+      const qreal k = color.alphaF();
+      QImage tex(8, 8, QImage::Format_RGB32);
+      for (int i = 0; i < 4; ++i)
+        {
+        for (int j = 0; j < 4; ++j)
+          {
+          QColor c1 = this->palette().color(QPalette::Button);
+          QColor c2 = this->palette().color(QPalette::ButtonText);
+          c2 = qtColorUtil::blend(c1, c2, 0.4);
+          c1 = qtColorUtil::blend(c1, color, k);
+          c2 = qtColorUtil::blend(c2, color, k);
+          tex.setPixel(i + 0, j + 0, c1.rgb());
+          tex.setPixel(i + 4, j + 4, c1.rgb());
+          tex.setPixel(i + 0, j + 4, c2.rgb());
+          tex.setPixel(i + 4, j + 0, c2.rgb());
+          }
+        }
+      d->brush.setTexture(QPixmap::fromImage(tex));
+      }
+    emit this->colorChanged(color);
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool qtColorButton::isAlphaShown() const
+{
+  QTE_D_CONST(qtColorButton);
+  return d->alphaShown;
+}
+
+//-----------------------------------------------------------------------------
+void qtColorButton::setAlphaShown(bool shown)
+{
+  QTE_D(qtColorButton);
+  d->alphaShown = shown;
+}
+
+//-----------------------------------------------------------------------------
+void qtColorButton::pickColor()
+{
+  QTE_D(qtColorButton);
+
+  QColorDialog dlg;
+  dlg.setOption(QColorDialog::ShowAlphaChannel, d->alphaShown);
+  dlg.setCurrentColor(d->color);
+
+  if (dlg.exec() == QDialog::Accepted)
+    {
+    this->setColor(dlg.currentColor());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtColorButton::paintEvent(QPaintEvent* e)
+{
+  QTE_D_CONST(qtColorButton);
+
+  QPushButton::paintEvent(e);
+
+  QPainter painter(this);
+  QStyle* s = this->style();
+  QStyleOptionFrameV3 opt;
+
+  opt.frameShape = QFrame::StyledPanel;
+  opt.state |= QStyle::State_Sunken;
+  opt.lineWidth = s->pixelMetric(QStyle::PM_DefaultFrameWidth, &opt);
+  opt.palette = d->fillPalette(this->palette());
+
+  int adjust = s->pixelMetric(QStyle::PM_ButtonMargin);
+  opt.rect = this->rect().adjusted(adjust, adjust, -adjust, -adjust);
+
+  s->drawPrimitive(QStyle::PE_PanelLineEdit, &opt, &painter);
+}
diff --git a/Libraries/QtExtensions/Widgets/qtColorButton.h b/Libraries/QtExtensions/Widgets/qtColorButton.h
new file mode 100644
index 00000000..81a8a573
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtColorButton.h
@@ -0,0 +1,52 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtColorButton_h
+#define __qtColorButton_h
+
+#include <QPushButton>
+
+#include "../Core/qtGlobal.h"
+
+class qtColorButtonPrivate;
+
+class QTE_EXPORT qtColorButton : public QPushButton
+{
+  Q_OBJECT
+
+  Q_PROPERTY(QColor color READ color WRITE setColor)
+  Q_PROPERTY(bool alphaShown READ isAlphaShown WRITE setAlphaShown)
+
+public:
+  qtColorButton(QWidget* parent = 0);
+  virtual ~qtColorButton();
+
+  virtual QSize minimumSizeHint() const QTE_OVERRIDE;
+  virtual QSize sizeHint() const QTE_OVERRIDE;
+
+  virtual QColor color() const;
+  virtual void setColor(QColor);
+
+  virtual bool isAlphaShown() const;
+
+signals:
+  void colorChanged(QColor);
+
+public slots:
+  virtual void pickColor();
+  virtual void setAlphaShown(bool);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtColorButton)
+
+  void paintEvent(QPaintEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(qtColorButton)
+  Q_DISABLE_COPY(qtColorButton)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtDoubleSlider.cxx b/Libraries/QtExtensions/Widgets/qtDoubleSlider.cxx
new file mode 100644
index 00000000..ad802718
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtDoubleSlider.cxx
@@ -0,0 +1,676 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtDoubleSlider.h"
+
+#include <QApplication>
+#include <QHoverEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOptionSlider>
+#include <QWheelEvent>
+
+#include "../Core/qtMath.h"
+
+QTE_IMPLEMENT_D_FUNC(qtDoubleSlider)
+
+//BEGIN qtDoubleSliderPrivate
+
+//-----------------------------------------------------------------------------
+class qtDoubleSliderPrivate
+{
+public:
+  explicit qtDoubleSliderPrivate(qtDoubleSlider* q) : q_ptr(q) {}
+
+  void setValue(double val);
+
+  double valueFromPosition(const QPoint& pos) const;
+
+  QStyle::SubControl hitTest(const QPoint& pos) const;
+  bool isAbsoluteSetButton(Qt::MouseButtons) const;
+  bool isPageSetButton(Qt::MouseButtons) const;
+
+  qtDoubleSlider::QuantizeMode qmode;
+  double min, max, value, sStep, pStep, quant, iRange;
+  int iMin, iMax;
+  QStyle::SubControl pressedControl, hoverControl;
+  double wRVal, wDelta;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(qtDoubleSlider)
+
+private:
+  QTE_DECLARE_PUBLIC(qtDoubleSlider)
+};
+
+//-----------------------------------------------------------------------------
+void qtDoubleSliderPrivate::setValue(double val)
+{
+  // Quantize value
+  if (!qFuzzyIsNull(this->quant))
+    {
+    const double qo =
+      (this->qmode == qtDoubleSlider::QuantizeRelative ? this->min : 0.0);
+    const double qval =
+      qo + (round((val - qo) / this->quant) * this->quant);
+    const double qvDist = fabs(qval - val);
+
+    // Round to the nearest of { min, max, qval }
+    if ((val - this->min) < qvDist)
+      {
+      val = this->min;
+      }
+    else if ((this->max - val) < qvDist)
+      {
+      val = this->max;
+      }
+    else
+      {
+      val = qval;
+      }
+    }
+
+  // Bound value to range
+  val = qBound(this->min, val, this->max);
+
+  // Update value, if changed
+  if (!qFuzzyCompare(val, this->value))
+    {
+    QTE_Q(qtDoubleSlider);
+
+    this->value = val;
+    q->update();
+    emit q->valueChanged(val);
+    }
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleSliderPrivate::valueFromPosition(const QPoint& pos) const
+{
+  const double nval = (pos.x() - this->iMin) / this->iRange;
+  return this->min + (nval * (this->max - this->min));
+}
+
+//-----------------------------------------------------------------------------
+QStyle::SubControl qtDoubleSliderPrivate::hitTest(const QPoint& pos) const
+{
+  QTE_Q_CONST(qtDoubleSlider);
+
+  QStyleOptionSlider opt;
+  q->initStyleOption(&opt);
+  return q->style()->hitTestComplexControl(QStyle::CC_Slider, &opt, pos, q);
+}
+
+//-----------------------------------------------------------------------------
+bool qtDoubleSliderPrivate::isAbsoluteSetButton(Qt::MouseButtons b) const
+{
+  QTE_Q_CONST(qtDoubleSlider);
+  int sh = q->style()->styleHint(QStyle::SH_Slider_AbsoluteSetButtons);
+  return ((sh & b) == b);
+}
+
+//-----------------------------------------------------------------------------
+bool qtDoubleSliderPrivate::isPageSetButton(Qt::MouseButtons b) const
+{
+  QTE_Q_CONST(qtDoubleSlider);
+  int sh = q->style()->styleHint(QStyle::SH_Slider_PageSetButtons);
+  return ((sh & b) == b);
+}
+
+//END qtDoubleSliderPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtDoubleSlider ctor/dtor
+
+//-----------------------------------------------------------------------------
+qtDoubleSlider::qtDoubleSlider(QWidget* parent)
+  : QWidget(parent), d_ptr(new qtDoubleSliderPrivate(this))
+{
+  QTE_D(qtDoubleSlider);
+  d->min = 0.0;
+  d->max = 1.0;
+  d->value = 0.0;
+  d->sStep = 0.01;
+  d->pStep = 0.1;
+  d->quant = 0.0;
+  d->qmode = QuantizeAbsolute;
+  d->iMin = 0;
+  d->iMax = 1;
+  d->iRange = 1.0;
+  d->wRVal = qQNaN();
+  d->wDelta = 0.0;
+
+  d->pressedControl = QStyle::SC_None;
+  d->hoverControl = QStyle::SC_None;
+
+  int focusPolicyHint =
+    this->style()->styleHint(QStyle::SH_Button_FocusPolicy);
+  QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed,
+                         QSizePolicy::Slider);
+
+  this->setAttribute(Qt::WA_Hover);
+  this->setFocusPolicy(Qt::StrongFocus);
+  this->setFocusPolicy(static_cast<Qt::FocusPolicy>(focusPolicyHint));
+  this->setSizePolicy(sizePolicy);
+}
+
+//-----------------------------------------------------------------------------
+qtDoubleSlider::~qtDoubleSlider()
+{
+}
+
+//END qtDoubleSlider ctor/dtor
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtDoubleSlider data interface (accessors)
+
+//-----------------------------------------------------------------------------
+double qtDoubleSlider::minimum() const
+{
+  QTE_D_CONST(qtDoubleSlider);
+  return d->min;
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleSlider::maximum() const
+{
+  QTE_D_CONST(qtDoubleSlider);
+  return d->max;
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleSlider::singleStep() const
+{
+  QTE_D_CONST(qtDoubleSlider);
+  return d->sStep;
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleSlider::pageStep() const
+{
+  QTE_D_CONST(qtDoubleSlider);
+  return d->pStep;
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleSlider::quantize() const
+{
+  QTE_D_CONST(qtDoubleSlider);
+  return d->quant;
+}
+
+//-----------------------------------------------------------------------------
+qtDoubleSlider::QuantizeMode qtDoubleSlider::quantizeMode() const
+{
+  QTE_D_CONST(qtDoubleSlider);
+  return d->qmode;
+}
+
+//-----------------------------------------------------------------------------
+double qtDoubleSlider::value() const
+{
+  QTE_D_CONST(qtDoubleSlider);
+  return d->value;
+}
+
+//END qtDoubleSlider data interface (accessors)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtDoubleSlider data interface (manipulators)
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setMinimum(double min)
+{
+  QTE_D(qtDoubleSlider);
+  this->setRange(min, d->max);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setMaximum(double max)
+{
+  QTE_D(qtDoubleSlider);
+  this->setRange(d->min, max);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setRange(double min, double max)
+{
+  if (!(qIsFinite(min) && qIsFinite(max)))
+    {
+    return;
+    }
+
+  min = qMin(min, max);
+  max = qMax(min, max);
+
+  QTE_D(qtDoubleSlider);
+  if (!(qFuzzyCompare(d->min, min) && qFuzzyCompare(d->max, max)))
+    {
+    // Update range
+    d->min = min;
+    d->max = max;
+    this->update();
+    emit this->rangeChanged(min, max);
+
+    // Check if value needs to be adjusted to remain in range
+    const double boundValue = qBound(min, d->value, max);
+    if (!qFuzzyCompare(d->value, boundValue))
+      {
+      this->setValue(boundValue);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setSingleStep(double ss)
+{
+  if (!qIsFinite(ss))
+    {
+    return;
+    }
+
+  QTE_D(qtDoubleSlider);
+  d->sStep = ss;
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setPageStep(double ps)
+{
+  if (!qIsFinite(ps))
+    {
+    return;
+    }
+
+  QTE_D(qtDoubleSlider);
+  d->pStep = ps;
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setQuantize(double quant)
+{
+  QTE_D(qtDoubleSlider);
+  this->setQuantize(quant, d->qmode);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setQuantize(double quant, QuantizeMode qmode)
+{
+  if (!qIsFinite(quant))
+    {
+    return;
+    }
+
+  QTE_D(qtDoubleSlider);
+  d->quant = quant;
+  d->qmode = qmode;
+  this->setValue(d->value);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setQuantizeMode(QuantizeMode qmode)
+{
+  QTE_D(qtDoubleSlider);
+  this->setQuantize(d->quant, qmode);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::setValue(double val)
+{
+  if (!qIsFinite(val))
+    {
+    return;
+    }
+
+  QTE_D(qtDoubleSlider);
+
+  if (!qFuzzyCompare(val, d->value))
+    {
+    // If a request (either external, or internal not associated with a wheel
+    // event) to change the value occurs, and the request is not to set the
+    // value to the current value, then invalidate the relative value for
+    // accumulating change from wheel events
+    d->wRVal = qQNaN();
+
+    // Go ahead and try to change the value (might still have no effect due to
+    // bounds and/or quantizing)
+    d->setValue(val);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::triggerAction(qtDoubleSlider::SliderAction action)
+{
+  QTE_D(qtDoubleSlider);
+
+  double val = d->value;
+
+  switch (action)
+    {
+    case QAbstractSlider::SliderSingleStepAdd:
+      val += d->sStep;
+      break;
+    case QAbstractSlider::SliderSingleStepSub:
+      val -= d->sStep;
+      break;
+    case QAbstractSlider::SliderPageStepAdd:
+      val += d->pStep;
+      break;
+    case QAbstractSlider::SliderPageStepSub:
+      val -= d->pStep;
+      break;
+    case QAbstractSlider::SliderToMinimum:
+      val = d->min;
+      break;
+    case QAbstractSlider::SliderToMaximum:
+      val = d->max;
+      break;
+    default:
+      return;
+    }
+  emit this->actionTriggered(action);
+  this->setValue(val);
+}
+
+//END qtDoubleSlider data interface (manipulators)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtDoubleSlider painting
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::initStyleOption(QStyleOptionSlider* opt) const
+{
+  QTE_D_CONST(qtDoubleSlider);
+
+  // Size/position information
+  opt->initFrom(this);
+  opt->orientation = Qt::Horizontal;
+  opt->subControls = QStyle::SC_SliderGroove | QStyle::SC_SliderHandle;
+  opt->tickPosition = QSlider::NoTicks;
+  opt->upsideDown = false;
+
+  // Value information
+  const double range = (d->max - d->min);
+  const double nval = (range > 0.0 ? (d->value - d->min) / range : 0.0);
+  opt->minimum = d->iMin;
+  opt->maximum = d->iMax;
+  opt->sliderValue = d->iMin + qRound(nval * d->iRange);
+  opt->sliderPosition = opt->sliderValue;
+
+  // Current state information
+  if (d->pressedControl)
+    {
+    opt->activeSubControls = d->pressedControl;
+    opt->state |= QStyle::State_Sunken;
+    }
+  else
+    {
+    opt->activeSubControls = d->hoverControl;
+    }
+}
+
+//-----------------------------------------------------------------------------
+QSize qtDoubleSlider::sizeHint() const
+{
+  QStyleOptionSlider opt;
+  this->initStyleOption(&opt);
+
+  QStyle* s = this->style();
+  QSize size(64, s->pixelMetric(QStyle::PM_SliderThickness, &opt, this));
+#ifndef Q_OS_MAC
+  return s->sizeFromContents(QStyle::CT_Slider, &opt, size, this);
+#else
+  // QMacStyle::sizeFromContents is broken... rather than using the
+  // QStyleOptionSlider to check attributes such as orientation, tick
+  // information, etc., it tries to qobject_cast the (optional!) widget pointer
+  // to a QSlider (which we are not), and proceeds to test the orientation
+  // without checking if the cast succeeded. Since SEGV's are not nice, just
+  // punt on trying to get the 'correct' size hint on OS/X.
+  return size;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+QSize qtDoubleSlider::minimumSizeHint() const
+{
+  QStyleOptionSlider opt;
+  this->initStyleOption(&opt);
+
+  return QSize(
+    this->style()->pixelMetric(QStyle::PM_SliderLength, &opt, this),
+    this->style()->pixelMetric(QStyle::PM_SliderThickness, &opt, this));
+}
+
+//-----------------------------------------------------------------------------
+bool qtDoubleSlider::event(QEvent* e)
+{
+  switch (e->type())
+    {
+    case QEvent::HoverEnter:
+    case QEvent::HoverLeave:
+    case QEvent::HoverMove:
+      {
+      QTE_D(qtDoubleSlider);
+
+      const QHoverEvent* he = static_cast<const QHoverEvent*>(e);
+      QStyle::SubControl hc = d->hitTest(he->pos());
+
+      if (hc != d->hoverControl)
+        {
+        d->hoverControl = hc;
+        this->update();
+        }
+      break;
+      }
+    default:
+      break;
+    }
+
+  return QWidget::event(e);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::paintEvent(QPaintEvent*)
+{
+  QPainter p(this);
+  QStyleOptionSlider opt;
+  this->initStyleOption(&opt);
+  this->style()->drawComplexControl(QStyle::CC_Slider, &opt, &p, this);
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::resizeEvent(QResizeEvent* e)
+{
+  QTE_D(qtDoubleSlider);
+
+  QStyleOptionSlider opt;
+  this->initStyleOption(&opt);
+
+  QRect scr = this->style()->subControlRect(
+    QStyle::CC_Slider, &opt, QStyle::SC_SliderGroove, this);
+  d->iMin = scr.left();
+  d->iMax = scr.right();
+  d->iRange = (d->iMax - d->iMin);
+
+  QWidget::resizeEvent(e);
+}
+
+//END qtDoubleSlider painting
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtDoubleSlider data manipulation event handlers
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::keyPressEvent(QKeyEvent* e)
+{
+  SliderAction action = QAbstractSlider::SliderNoAction;
+  switch (e->key())
+    {
+    case Qt::Key_Up:
+    case Qt::Key_Right:
+      action = QAbstractSlider::SliderSingleStepAdd;
+      break;
+    case Qt::Key_Down:
+    case Qt::Key_Left:
+      action = QAbstractSlider::SliderSingleStepSub;
+      break;
+    case Qt::Key_PageUp:
+      action = QAbstractSlider::SliderPageStepAdd;
+      break;
+    case Qt::Key_PageDown:
+      action = QAbstractSlider::SliderPageStepSub;
+      break;
+    case Qt::Key_Home:
+      action = QAbstractSlider::SliderToMinimum;
+      break;
+    case Qt::Key_End:
+      action = QAbstractSlider::SliderToMaximum;
+      break;
+    default:
+      e->ignore();
+      break;
+    }
+
+  if (action)
+    {
+    this->triggerAction(action);
+    e->accept();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::mousePressEvent(QMouseEvent* e)
+{
+  const Qt::MouseButton b = e->button();
+  if (e->buttons() ^ b)
+    {
+    e->ignore();
+    return;
+    }
+
+  QTE_D(qtDoubleSlider);
+
+  if (d->isAbsoluteSetButton(b))
+    {
+    e->accept();
+    emit this->actionTriggered(QAbstractSlider::SliderMove);
+    this->setValue(d->valueFromPosition(e->pos()));
+    }
+  else if (d->isPageSetButton(b))
+    {
+    d->pressedControl = d->hitTest(e->pos());
+    switch (d->pressedControl)
+      {
+      case QStyle::SC_SliderGroove:
+        if (d->valueFromPosition(e->pos()) > d->value)
+          {
+          this->triggerAction(QAbstractSlider::SliderPageStepAdd);
+          }
+        else
+          {
+          this->triggerAction(QAbstractSlider::SliderPageStepSub);
+          }
+        e->accept();
+        break;
+      case QStyle::SC_SliderHandle:
+        d->wRVal = qQNaN();
+        e->accept();
+        this->update();
+        break;
+      default:
+        e->ignore();
+        break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::mouseReleaseEvent(QMouseEvent* e)
+{
+  QTE_D(qtDoubleSlider);
+
+  e->ignore();
+  if (d->isPageSetButton(e->button()))
+    {
+    d->pressedControl = QStyle::SC_None;
+    this->update();
+    e->accept();
+    }
+  else if (d->isAbsoluteSetButton(e->button()))
+    {
+    e->accept();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::mouseMoveEvent(QMouseEvent* e)
+{
+  QTE_D(qtDoubleSlider);
+
+  e->ignore();
+  if (d->isAbsoluteSetButton(e->buttons()))
+    {
+    emit this->actionTriggered(QAbstractSlider::SliderMove);
+    this->setValue(d->valueFromPosition(e->pos()));
+    e->accept();
+    }
+  else if (d->pressedControl == QStyle::SC_SliderHandle &&
+           d->isPageSetButton(e->buttons()))
+    {
+    emit this->actionTriggered(QAbstractSlider::SliderMove);
+    this->setValue(d->valueFromPosition(e->pos()));
+    e->accept();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDoubleSlider::wheelEvent(QWheelEvent* e)
+{
+  if (!e->delta())
+    {
+    return;
+    }
+
+  QTE_D(qtDoubleSlider);
+
+  // Calculate the amount by which to change the value
+  const double step =
+    ((e->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier))
+      ? d->pStep : d->sStep * QApplication::wheelScrollLines());
+  const double scroll = e->delta();
+  const double delta = scroll * step / 120.0;
+
+  // Set the relative position, if it is unset
+  if (!qIsFinite(d->wRVal))
+    {
+    d->wRVal = d->value;
+    d->wDelta = 0.0;
+    }
+
+  // Modify the value, capped to the slider's range
+  d->wDelta += delta;
+  if (d->wRVal + d->wDelta < d->min)
+    {
+    d->wRVal = d->min;
+    d->wDelta = 0.0;
+    }
+  if (d->wRVal + d->wDelta > d->max)
+    {
+    d->wRVal = d->max;
+    d->wDelta = 0.0;
+    }
+  emit this->actionTriggered(QAbstractSlider::SliderMove);
+  d->setValue(d->wRVal + d->wDelta);
+  e->accept();
+}
+
+//END qtDoubleSlider data manipulation event handlers
diff --git a/Libraries/QtExtensions/Widgets/qtDoubleSlider.h b/Libraries/QtExtensions/Widgets/qtDoubleSlider.h
new file mode 100644
index 00000000..7d26692e
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtDoubleSlider.h
@@ -0,0 +1,104 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDoubleSlider_h
+#define __qtDoubleSlider_h
+
+#include <QAbstractSlider>
+
+#include "../Core/qtGlobal.h"
+
+class QStyleOptionSlider;
+
+class qtDoubleSliderPrivate;
+
+class QTE_EXPORT qtDoubleSlider : public QWidget
+{
+  Q_OBJECT
+
+  Q_ENUMS(QuantizeMode)
+
+  Q_PROPERTY(double minimum READ minimum WRITE setMinimum)
+  Q_PROPERTY(double maximum READ maximum WRITE setMaximum)
+  Q_PROPERTY(double singleStep READ singleStep WRITE setSingleStep)
+  Q_PROPERTY(double pageStep READ pageStep WRITE setPageStep)
+  Q_PROPERTY(double quantize READ quantize WRITE setQuantize)
+  Q_PROPERTY(QuantizeMode quantizeMode READ quantizeMode WRITE setQuantizeMode)
+  Q_PROPERTY(double value READ value WRITE setValue NOTIFY valueChanged
+                          USER true)
+
+public:
+  enum QuantizeMode
+    {
+    QuantizeRelative,
+    QuantizeAbsolute
+    };
+
+  explicit qtDoubleSlider(QWidget* parent = 0);
+  virtual ~qtDoubleSlider();
+
+  double minimum() const;
+  double maximum() const;
+
+  double singleStep() const;
+  double pageStep() const;
+  double quantize() const;
+  QuantizeMode quantizeMode() const;
+
+  double value() const;
+
+  void setRange(double min, double max);
+  void setQuantize(double, QuantizeMode);
+  void setQuantizeMode(QuantizeMode);
+
+  typedef QAbstractSlider::SliderAction SliderAction;
+  void triggerAction(SliderAction action);
+
+  virtual QSize sizeHint() const;
+  virtual QSize minimumSizeHint() const;
+
+public slots:
+  void setMinimum(double);
+  void setMaximum(double);
+
+  void setSingleStep(double);
+  void setPageStep(double);
+  void setQuantize(double);
+
+  void setValue(double);
+
+signals:
+  void valueChanged(double);
+
+  void sliderPressed();
+  void sliderMoved(double position);
+  void sliderReleased();
+
+  void rangeChanged(double min, double max);
+
+  void actionTriggered(int action);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtDoubleSlider)
+
+  void initStyleOption(QStyleOptionSlider*) const;
+
+  virtual bool event(QEvent*);
+
+  virtual void paintEvent(QPaintEvent*);
+  virtual void resizeEvent(QResizeEvent*);
+  virtual void keyPressEvent(QKeyEvent*);
+  virtual void mousePressEvent(QMouseEvent*);
+  virtual void mouseReleaseEvent(QMouseEvent*);
+  virtual void mouseMoveEvent(QMouseEvent*);
+  virtual void wheelEvent(QWheelEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(qtDoubleSlider)
+  Q_DISABLE_COPY(qtDoubleSlider)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtDrawer.cxx b/Libraries/QtExtensions/Widgets/qtDrawer.cxx
new file mode 100644
index 00000000..ca0a332f
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtDrawer.cxx
@@ -0,0 +1,552 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtDrawer.h"
+
+#include <QApplication>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QMap>
+#include <QStyle>
+
+#include "../Core/qtGlobal.h"
+
+#include "qtDrawerWidget.h"
+#include "qtExpander.h"
+
+QTE_IMPLEMENT_D_FUNC(qtDrawer)
+
+//-----------------------------------------------------------------------------
+class qtDrawerPrivate
+{
+public:
+  qtDrawerPrivate(qtDrawer*);
+
+  void setExpander(bool shouldExist, bool shouldEnable);
+  void setIndent(int);
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(qtDrawer)
+
+  qtExpander* expander;
+  bool expanded;
+  qtDrawer::ExpanderPolicy expanderPolicy;
+
+  qtDrawerWidget* container;
+  QGridLayout* containerLayout;
+
+  qtDrawer* parent;
+  QList<qtDrawer*> children;
+  QMap<int, QWidget*> contentWidgets;
+  QHBoxLayout* indentLayout;
+
+  int row;
+  int indent;
+
+  bool visibilityFlag;
+
+private:
+  QTE_DECLARE_PUBLIC(qtDrawer)
+};
+
+//-----------------------------------------------------------------------------
+qtDrawerPrivate::qtDrawerPrivate(qtDrawer* q)
+  : q_ptr(q), expander(0), expanded(false),
+    expanderPolicy(qtDrawer::ExpanderAsNeeded),
+    container(0), containerLayout(0), parent(0),
+    indentLayout(0), row(-1), indent(-1),
+    visibilityFlag(true)
+{
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawerPrivate::setExpander(bool shouldExist, bool shouldEnable)
+{
+  if (!!this->expander != shouldExist)
+    {
+    if (this->expander)
+      {
+      // Remove expander
+      delete this->expander;
+      this->expander = 0;
+      }
+    else
+      {
+      // Create expander
+      QTE_Q(qtDrawer);
+      this->expander = new qtExpander(false, q);
+      this->expander->setChecked(this->expanded);
+      q->connect(this->expander, SIGNAL(toggled(bool)),
+                 q, SLOT(setExpanded(bool)));
+      }
+
+    // Reindent to add/remove expander in indent layout
+    this->setIndent(this->indent);
+    }
+
+  if (this->expander)
+    {
+    this->expander->setEnabled(shouldEnable);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawerPrivate::setIndent(int newIndent)
+{
+  QTE_Q(qtDrawer);
+
+  this->indent = newIndent;
+
+  if (this->indentLayout)
+    {
+    // Temporarily remove expander and main content widget
+    if (this->expander)
+      {
+      this->indentLayout->removeWidget(this->expander);
+      }
+    if (this->contentWidgets.contains(0))
+      {
+      this->indentLayout->removeWidget(this->contentWidgets.value(0));
+      }
+    // Remove existing spacing
+    delete this->indentLayout->takeAt(0);
+    }
+  else
+    {
+    this->indentLayout = new QHBoxLayout;
+    this->indentLayout->setContentsMargins(0, 0, 0, 0);
+    q->setLayout(this->indentLayout);
+    }
+
+  // Add spacing for indentation
+  if (newIndent > 0)
+    {
+    int s = this->indentLayout->spacing();
+    // If layout spacing is unset, try to get the spacing value from the style
+    if (s < 0)
+      {
+      QStyle* style = QApplication::style();
+      s = style->layoutSpacing(QSizePolicy::ToolButton,
+                               QSizePolicy::DefaultType,
+                               Qt::Horizontal);
+      if (s < 0)
+        {
+        s = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing);
+        }
+      }
+    int iw = (qtExpander::size(q->style()).width() + s);
+    this->indentLayout->addSpacing(iw * indent);
+    }
+
+  // (Re)add expander and main content widget
+  if (this->expander)
+    {
+    this->indentLayout->addWidget(expander);
+    }
+  if (this->contentWidgets.contains(0))
+    {
+    this->indentLayout->addWidget(this->contentWidgets.value(0));
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer::qtDrawer(qtDrawerWidget* container, QGridLayout* layout)
+  : QWidget(container), d_ptr(new qtDrawerPrivate(this))
+{
+  QTE_D(qtDrawer);
+  d->container = container;
+  d->containerLayout = layout;
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer::qtDrawer(qtDrawer* parent, qtDrawer* nextSibling)
+  : QWidget(parent), d_ptr(new qtDrawerPrivate(this))
+{
+  QTE_D(qtDrawer);
+  qtDrawerPrivate* p = parent->d_func();
+
+  d->container = p->container;
+  d->containerLayout = p->containerLayout;
+  d->parent = parent;
+
+  d->setIndent(p->indent + 1);
+
+  parent->addChild(this, nextSibling);
+
+  parent->setChildVisibility(this);
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer::~qtDrawer()
+{
+  QTE_D(qtDrawer);
+
+  // Remove children
+  while (d->children.count())
+    {
+    qtDrawer* child = d->children.last();
+    this->removeChild(child);
+    delete child;
+    }
+
+  // Remove content widgets
+  d->containerLayout->removeWidget(this);
+  foreach (int col, d->contentWidgets.keys())
+    {
+    if (col != 0)
+      {
+      QWidget* widget = d->contentWidgets.value(col);
+      d->containerLayout->removeWidget(widget);
+      delete widget;
+      }
+    }
+
+  // Remove ourself from our parent
+  if (d->parent)
+    {
+    d->parent->removeChild(this);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::addWidget(QWidget* widget, int col)
+{
+  QTE_D(qtDrawer);
+
+  if (col == 0)
+    {
+    if (d->contentWidgets.contains(0))
+      {
+      d->indentLayout->removeWidget(d->contentWidgets.value(0));
+      }
+    d->indentLayout->addWidget(widget);
+    }
+  else
+    {
+    if (d->contentWidgets.contains(col))
+      {
+      d->containerLayout->removeWidget(d->contentWidgets.value(col));
+      }
+    d->containerLayout->addWidget(widget, d->row, col);
+    }
+
+  d->contentWidgets.insert(col, widget);
+  widget->setVisible(this->isVisibleTo(d->container));
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer::ExpanderPolicy qtDrawer::expanderPolicy() const
+{
+  QTE_D_CONST(qtDrawer);
+  return d->expanderPolicy;
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::setExpanderPolicy(qtDrawer::ExpanderPolicy newPolicy)
+{
+  QTE_D(qtDrawer);
+
+  if (d->expanderPolicy == newPolicy)
+    {
+    return;
+    }
+
+  // Set new policy
+  d->expanderPolicy = newPolicy;
+
+  // Set expander visibility based on policy and need
+  if (d->parent)
+    {
+    bool needExpander = d->children.count();
+    bool wantExpander = (newPolicy == ExpanderAlwaysShown);
+    d->setExpander(wantExpander || needExpander, needExpander);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::addChild(qtDrawer* child, qtDrawer* before)
+{
+  QTE_D(qtDrawer);
+
+  // Create expander if not already created
+  if (d->parent)
+    {
+    d->setExpander(true, true);
+    }
+
+  // Determine insertion point
+  int row;
+  int index = (before ? d->children.indexOf(before) : -1);
+  if (index >= 0)
+    {
+    // Add at 'before's row, shifting children down
+    row = before->d_func()->row;
+    this->shiftChildrenDown(before);
+    before->shiftDown();
+    }
+  else
+    {
+    // 'before' is 0 or not a sibling; add to bottom and shift later siblings
+    if (d->parent)
+      {
+      d->parent->shiftChildrenDown(this);
+      }
+    row = d->row + this->countDescendants() + 1;
+    index = d->children.count();
+    }
+
+  // Set child's row
+  child->d_func()->row = row;
+
+  // Add new drawer to layout
+  d->containerLayout->addWidget(child, row, 0);
+
+  // Add new drawer to children
+  d->children.insert(index, child);
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::removeChild(qtDrawer* child)
+{
+  QTE_D(qtDrawer);
+
+  // Find child's index
+  int index = d->children.indexOf(child);
+  if (index < 0)
+    {
+    return;
+    }
+
+  // Shift later siblings and remove child
+  this->shiftChildrenUp(child);
+  d->children.removeAt(index);
+
+  // Remove expander if no longer needed
+  if (d->parent && d->children.isEmpty())
+    {
+    d->setExpander(d->expanderPolicy == ExpanderAlwaysShown, false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+int qtDrawer::countDescendants() const
+{
+  QTE_D_CONST(qtDrawer);
+
+  int count = d->children.count();
+  foreach (const qtDrawer* child, d->children)
+    count += child->countDescendants();
+
+  return count;
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::shiftChildrenDown(qtDrawer* afterChild)
+{
+  QTE_D(qtDrawer);
+
+  // Disable updates while we rearrange things
+  bool enableUpdates = d->container->updatesEnabled();
+  d->container->setUpdatesEnabled(false);
+
+  // Shift later siblings, but only when shifting a partial set; shiftDown()
+  // shifts everyone, and we don't want to walk up in that case or things will
+  // get shifted twice
+  if (afterChild && d->parent)
+    {
+    d->parent->shiftChildrenDown(this);
+    }
+
+  // Shift down own children
+  int n = d->children.count();
+  while (n-- && d->children[n] != afterChild)
+    {
+    d->children[n]->shiftDown();
+    }
+
+  // Restore updates state
+  d->container->setUpdatesEnabled(enableUpdates);
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::shiftChildrenUp(qtDrawer* afterChild)
+{
+  QTE_D(qtDrawer);
+
+  // Disable updates while we rearrange things
+  bool enableUpdates = d->container->updatesEnabled();
+  d->container->setUpdatesEnabled(false);
+
+  // Shift down own children
+  int n = (afterChild ? d->children.indexOf(afterChild) : -1);
+  while (++n < d->children.count())
+    {
+    d->children[n]->shiftUp();
+    }
+
+  // Shift later siblings, but only when shifting a partial set; shiftUp()
+  // shifts everyone, and we don't want to walk up in that case or things will
+  // get shifted twice
+  if (afterChild && d->parent)
+    {
+    d->parent->shiftChildrenUp(this);
+    }
+
+  // Restore updates state
+  d->container->setUpdatesEnabled(enableUpdates);
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::shiftDown()
+{
+  QTE_D(qtDrawer);
+
+  d->row++;
+  this->shiftChildrenDown();
+  this->shift();
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::shiftUp()
+{
+  QTE_D(qtDrawer);
+
+  d->row++;
+  this->shiftChildrenUp();
+  this->shift();
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::shift()
+{
+  QTE_D(qtDrawer);
+
+  // Shift self
+  d->containerLayout->removeWidget(this);
+  d->containerLayout->addWidget(this, d->row, 0);
+
+  // Shift other content widgets
+  foreach (int col, d->contentWidgets.keys())
+    {
+    if (col != 0)
+      {
+      QWidget* widget = d->contentWidgets.value(col);
+      d->containerLayout->removeWidget(widget);
+      d->containerLayout->addWidget(widget, d->row, col);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::clear()
+{
+  QTE_D(qtDrawer);
+
+  foreach (qtDrawer* child, d->children)
+    {
+    child->clear();
+    delete child;
+    }
+  d->children.clear();
+
+  qDeleteAll(d->contentWidgets);
+  d->contentWidgets.clear();
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer* qtDrawer::parent()
+{
+  QTE_D(qtDrawer);
+  return d->parent;
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::setExpanded(bool expanded)
+{
+  QTE_D(qtDrawer);
+
+  if (!d->expander)
+    {
+    d->expanded = expanded;
+    return;
+    }
+
+  if (d->expanded != expanded)
+    {
+    d->expanded = expanded;
+    d->expander->setChecked(expanded);
+    this->setChildVisibility();
+    emit this->expandToggled(expanded);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::setVisibility(bool visibility)
+{
+  QTE_D(qtDrawer);
+
+  if (d->visibilityFlag == visibility)
+    {
+    return;
+    }
+
+  d->visibilityFlag = visibility;
+
+  if (!visibility)
+    {
+    this->setVisible(false);
+    }
+  else
+    {
+    if (d->parent)
+      {
+      d->parent->setChildVisibility(this);
+      }
+    else
+      {
+      this->setVisible(true);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::setVisible(bool visibility)
+{
+  QTE_D(qtDrawer);
+
+  visibility = visibility && d->visibilityFlag;
+
+  this->setUpdatesEnabled(false);
+  QWidget::setVisible(visibility);
+  foreach (QWidget* widget, d->contentWidgets)
+    widget->setVisible(visibility);
+
+  this->setChildVisibility();
+
+  this->setUpdatesEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawer::setChildVisibility(qtDrawer* child)
+{
+  QTE_D(qtDrawer);
+
+  bool visibility = this->isVisibleTo(d->container);
+  if (d->expander)
+    {
+    visibility = visibility && d->expander->isChecked();
+    }
+
+  if (child)
+    {
+    child->setVisible(visibility);
+    }
+  else
+    {
+    foreach (child, d->children)
+      child->setVisible(visibility);
+    }
+}
diff --git a/Libraries/QtExtensions/Widgets/qtDrawer.h b/Libraries/QtExtensions/Widgets/qtDrawer.h
new file mode 100644
index 00000000..438f92d7
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtDrawer.h
@@ -0,0 +1,74 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDrawer_h
+#define __qtDrawer_h
+
+#include <QWidget>
+
+#include "../Core/qtGlobal.h"
+
+class QGridLayout;
+
+class qtDrawerWidget;
+class qtDrawerPrivate;
+
+class QTE_EXPORT qtDrawer : public QWidget
+{
+  Q_OBJECT
+  Q_PROPERTY(ExpanderPolicy expanderPolicy READ expanderPolicy
+                                           WRITE setExpanderPolicy)
+
+public:
+  enum ExpanderPolicy
+    {
+    ExpanderAsNeeded = 0,
+    ExpanderAlwaysShown = 1
+    };
+
+  explicit qtDrawer(qtDrawer* parent, qtDrawer* nextSibling = 0);
+  virtual ~qtDrawer();
+
+  qtDrawer* parent();
+
+  virtual void addWidget(QWidget* widget, int col = 0);
+
+  ExpanderPolicy expanderPolicy() const;
+  void setExpanderPolicy(ExpanderPolicy);
+
+signals:
+  void expandToggled(bool);
+
+public slots:
+  void setExpanded(bool);
+  virtual void setVisible(bool);
+  virtual void setVisibility(bool);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtDrawer)
+  friend class qtDrawerWidget;
+
+  qtDrawer(qtDrawerWidget* container, QGridLayout* layout);
+
+  virtual void addChild(qtDrawer* child, qtDrawer* before = 0);
+  virtual void removeChild(qtDrawer* child);
+  void setChildVisibility(qtDrawer* child = 0);
+
+  int countDescendants() const;
+  void shiftChildrenDown(qtDrawer* afterChild = 0);
+  void shiftChildrenUp(qtDrawer* afterChild = 0);
+  void shiftDown();
+  void shiftUp();
+  void shift();
+
+  virtual void clear();
+
+private:
+  QTE_DECLARE_PRIVATE(qtDrawer)
+  Q_DISABLE_COPY(qtDrawer)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtDrawerWidget.cxx b/Libraries/QtExtensions/Widgets/qtDrawerWidget.cxx
new file mode 100644
index 00000000..42d66247
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtDrawerWidget.cxx
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QGridLayout>
+
+#include "qtDrawer.h"
+#include "qtDrawerWidget.h"
+
+QTE_IMPLEMENT_D_FUNC(qtDrawerWidget)
+
+//-----------------------------------------------------------------------------
+class qtDrawerWidgetPrivate
+{
+public:
+  qtDrawerWidgetPrivate() : root(0) {}
+
+  qtDrawer* root;
+};
+
+//-----------------------------------------------------------------------------
+qtDrawerWidget::qtDrawerWidget(QWidget* parent)
+  : QWidget(parent), d_ptr(new qtDrawerWidgetPrivate)
+{
+  this->setLayout(new QGridLayout);
+}
+
+//-----------------------------------------------------------------------------
+qtDrawerWidget::~qtDrawerWidget()
+{
+  // Explicitly remove drawers... if we rely on QObject to reap its children,
+  // our layout can be deleted before the drawers, which need the layout to
+  // clean themselves up
+  qtDrawer* r = this->root();
+  r->clear();
+  delete r;
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer* qtDrawerWidget::addDrawer(qtDrawer* nextSibling)
+{
+  return new qtDrawer(this->root(), nextSibling);
+}
+
+//-----------------------------------------------------------------------------
+void qtDrawerWidget::clear()
+{
+  this->root()->clear();
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer* qtDrawerWidget::root()
+{
+  QTE_D(qtDrawerWidget);
+
+  if (!d->root)
+    {
+    d->root = this->createRoot();
+    }
+
+  return d->root;
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer* qtDrawerWidget::createRoot()
+{
+  QGridLayout* layout = qobject_cast<QGridLayout*>(this->layout());
+  return new qtDrawer(this, layout);
+}
diff --git a/Libraries/QtExtensions/Widgets/qtDrawerWidget.h b/Libraries/QtExtensions/Widgets/qtDrawerWidget.h
new file mode 100644
index 00000000..e3edfa56
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtDrawerWidget.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtDrawerWidget_h
+#define __qtDrawerWidget_h
+
+#include <QWidget>
+
+#include "../Core/qtGlobal.h"
+
+class qtDrawer;
+class qtDrawerWidgetPrivate;
+
+class QTE_EXPORT qtDrawerWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  qtDrawerWidget(QWidget* parent = 0);
+  virtual ~qtDrawerWidget();
+
+  virtual qtDrawer* addDrawer(qtDrawer* nextSibling = 0);
+  virtual void clear();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtDrawerWidget)
+
+  qtDrawer* root();
+  virtual qtDrawer* createRoot();
+
+private:
+  QTE_DECLARE_PRIVATE(qtDrawerWidget)
+  Q_DISABLE_COPY(qtDrawerWidget)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtExpander.cxx b/Libraries/QtExtensions/Widgets/qtExpander.cxx
new file mode 100644
index 00000000..f6feeeca
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtExpander.cxx
@@ -0,0 +1,136 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QApplication>
+#include <QStyle>
+#include <QStylePainter>
+#include <QStyleOptionToolButton>
+
+#include "qtExpander.h"
+
+//-----------------------------------------------------------------------------
+qtExpander::qtExpander(QWidget* parent)
+  : QToolButton(parent)
+{
+  this->init();
+}
+
+//-----------------------------------------------------------------------------
+qtExpander::qtExpander(bool initiallyExpanded, QWidget* parent)
+  : QToolButton(parent)
+{
+  this->init();
+  this->setChecked(initiallyExpanded);
+}
+
+//-----------------------------------------------------------------------------
+void qtExpander::init()
+{
+  this->setAutoRaise(true);
+  this->setCheckable(true);
+}
+
+//-----------------------------------------------------------------------------
+QSize qtExpander::sizeHint() const
+{
+  return qtExpander::size(this->style(), this->text(), this->font());
+}
+
+//-----------------------------------------------------------------------------
+QSize qtExpander::minimumSizeHint() const
+{
+  return qtExpander::size(this->style(), this->text(), this->font());
+}
+
+//-----------------------------------------------------------------------------
+QSize qtExpander::arrowSize()
+{
+  // Ideally, we'd use the actual size of the indicator arrow plus some
+  // padding, but that doesn't seem to be available. The indicator (checkbox)
+  // size seems like it would be a reasonable choice, but it is too big with
+  // Oxygen and too small with many of Qt's built-in styles. So just use 15 and
+  // hope for the best.
+  //int aw = style->pixelMetric(QStyle::PM_IndicatorWidth);
+  //int ah = style->pixelMetric(QStyle::PM_IndicatorHeight);
+  return QSize(15, 15);
+}
+
+//-----------------------------------------------------------------------------
+int qtExpander::margin(QStyle* style, bool hasText)
+{
+  QStyle::PixelMetric pm =
+    (hasText ? QStyle::PM_ButtonMargin : QStyle::PM_ToolBarItemMargin);
+  return style->pixelMetric(pm);
+}
+
+//-----------------------------------------------------------------------------
+QSize qtExpander::size(QStyle* style, QString text, QFont font)
+{
+  style || (style = QApplication::style());
+
+  int m = qtExpander::margin(style, !text.isEmpty());
+  QSize size = qtExpander::arrowSize() + QSize(2 * m, 2 * m);
+  if (!text.isEmpty())
+    {
+    QFontMetrics fm(font);
+    QSize textSize = fm.size(Qt::TextShowMnemonic, text);
+    textSize += QSize(size.width() + m, 2 * m);
+    size = size.expandedTo(textSize);
+    }
+  return size;
+}
+
+//-----------------------------------------------------------------------------
+void qtExpander::paintEvent(QPaintEvent*)
+{
+  // Initialize drawing options
+  QStylePainter p(this);
+  QStyleOptionToolButton opt;
+  this->initStyleOption(&opt);
+  opt.icon = QIcon();
+
+  // Adjust state to compensate for overloading of 'checked' to mean 'expanded'
+  QStyle::State raiseFlags = QStyle::State_AutoRaise & QStyle::State_MouseOver;
+  if ((opt.state & raiseFlags) == raiseFlags)
+    {
+    opt.state |= QStyle::State_Raised;
+    }
+  opt.state &= ~(QStyle::State_On);
+
+  // Hand off to the style to draw the widget base
+  QString text = opt.text;
+  opt.text.clear();
+  p.drawComplexControl(QStyle::CC_ToolButton, opt);
+
+  // Get margin
+  int m = qtExpander::margin(this->style(), !text.isEmpty());
+
+  // Draw text
+  if (!text.isEmpty())
+    {
+    // Get arrow size
+    int aw = qtExpander::arrowSize().width();
+
+    // Draw text
+    p.drawItemText(opt.rect.adjusted(aw, 0, 0, 0), Qt::AlignCenter,
+                   this->palette(), this->isEnabledToTLW(), text,
+                   QPalette::ButtonText);
+
+    // Shrink rect to just cover arrow
+    opt.rect.setWidth(aw + (2 * m));
+    }
+
+  // Remove margins and draw arrow
+  opt.rect.adjust(m, m, -m, -m);
+  if (this->isChecked())
+    {
+    p.drawPrimitive(QStyle::PE_IndicatorArrowDown, opt);
+    }
+  else
+    {
+    p.drawPrimitive(QStyle::PE_IndicatorArrowRight, opt);
+    }
+}
diff --git a/Libraries/QtExtensions/Widgets/qtExpander.h b/Libraries/QtExtensions/Widgets/qtExpander.h
new file mode 100644
index 00000000..1cee4443
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtExpander.h
@@ -0,0 +1,41 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtExpander_h
+#define __qtExpander_h
+
+#include <QToolButton>
+
+#include "../Core/qtGlobal.h"
+
+class QTE_EXPORT qtExpander : public QToolButton
+{
+  Q_OBJECT
+
+public:
+  qtExpander(QWidget* parent = 0);
+  qtExpander(bool initiallyExpanded, QWidget* parent = 0);
+
+  QSize sizeHint() const;
+  QSize minimumSizeHint() const;
+  using QWidget::size;
+
+  static QSize size(QStyle* style,
+                    QString text = QString(),
+                    QFont font = QFont());
+
+protected:
+  static QSize arrowSize();
+  static int margin(QStyle*, bool hasText);
+
+  void init();
+  void paintEvent(QPaintEvent*);
+
+private:
+  Q_DISABLE_COPY(qtExpander)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtGradientWidget.cxx b/Libraries/QtExtensions/Widgets/qtGradientWidget.cxx
new file mode 100644
index 00000000..fdba148e
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtGradientWidget.cxx
@@ -0,0 +1,138 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtGradientWidget.h"
+
+#include <QImage>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QPixmap>
+
+#include "../Util/qtColorUtil.h"
+
+QTE_IMPLEMENT_D_FUNC(qtGradientWidget)
+
+//-----------------------------------------------------------------------------
+class qtGradientWidgetPrivate
+{
+public:
+  Qt::Orientation orientation;
+  qtGradient gradient;
+  QPixmap pixmap;
+};
+
+//-----------------------------------------------------------------------------
+qtGradientWidget::qtGradientWidget(QWidget* parent)
+  : QWidget(parent), d_ptr(new qtGradientWidgetPrivate)
+{
+  QTE_D(qtGradientWidget);
+  d->orientation = Qt::Horizontal;
+}
+
+//-----------------------------------------------------------------------------
+qtGradientWidget::~qtGradientWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+Qt::Orientation qtGradientWidget::orientation() const
+{
+  QTE_D_CONST(qtGradientWidget);
+  return d->orientation;
+}
+
+//-----------------------------------------------------------------------------
+void qtGradientWidget::setOrientation(Qt::Orientation newOrientation)
+{
+  QTE_D(qtGradientWidget);
+  if (d->orientation != newOrientation)
+    {
+    d->pixmap = QPixmap();
+    d->orientation = newOrientation;
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtGradient qtGradientWidget::gradient() const
+{
+  QTE_D_CONST(qtGradientWidget);
+  return d->gradient;
+}
+
+//-----------------------------------------------------------------------------
+void qtGradientWidget::setGradient(qtGradient gradient)
+{
+  QTE_D(qtGradientWidget);
+  d->gradient = gradient;
+  d->pixmap = QPixmap();
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+QSize qtGradientWidget::minimumSizeHint() const
+{
+  QTE_D_CONST(qtGradientWidget);
+  const bool horizontal = (d->orientation == Qt::Horizontal);
+  return (horizontal ? QSize(32, 12) : QSize(12, 32));
+}
+
+//-----------------------------------------------------------------------------
+QSize qtGradientWidget::sizeHint() const
+{
+  QTE_D_CONST(qtGradientWidget);
+  const bool horizontal = (d->orientation == Qt::Horizontal);
+  return (horizontal ? QSize(192, 24) : QSize(24, 192));
+}
+
+//-----------------------------------------------------------------------------
+void qtGradientWidget::paintEvent(QPaintEvent*)
+{
+  QTE_D(qtGradientWidget);
+
+  // Get relevant dimension of pixmap and widget
+  int lastSize, currentSize;
+  if (d->orientation == Qt::Horizontal)
+    {
+    lastSize = d->pixmap.width();
+    currentSize = this->width();
+    }
+  else
+    {
+    lastSize = d->pixmap.height();
+    currentSize = this->height();
+    }
+
+  // Regenerate pixmap, if needed
+  if (lastSize != currentSize || d->pixmap.isNull())
+    {
+    QImage image(this->width(), 12, QImage::Format_RGB32);
+    QColor c1 = this->palette().color(QPalette::Window);
+    QColor c2 = this->palette().color(QPalette::WindowText);
+    c2 = qtColorUtil::blend(c1, c2, 0.4);
+
+    const int k = this->width();
+    QList<QColor> g = d->gradient.render(k);
+
+    for (int i = 0; i < k; ++i)
+      {
+      const QColor& color = g[i];
+      const qreal a = color.alphaF();
+      const QColor cg1 = qtColorUtil::blend(c1, color, a);
+      const QColor cg2 = qtColorUtil::blend(c2, color, a);
+      for (int j = 0; j < 12; ++j)
+        {
+        const QColor& cb = (((i % 12) > 5) != ((j % 12) > 5) ? cg1 : cg2);
+        image.setPixel(i, j, cb.rgb());
+        }
+      }
+
+    d->pixmap = QPixmap::fromImage(image);
+    }
+
+  QPainter painter(this);
+  painter.drawTiledPixmap(this->rect(), d->pixmap);
+}
diff --git a/Libraries/QtExtensions/Widgets/qtGradientWidget.h b/Libraries/QtExtensions/Widgets/qtGradientWidget.h
new file mode 100644
index 00000000..1a5ea38d
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtGradientWidget.h
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtGradientWidget_h
+#define __qtGradientWidget_h
+
+#include <QWidget>
+
+#include "../Core/qtGlobal.h"
+
+#include "../Util/qtGradient.h"
+
+class QPaintEvent;
+
+class qtGradientWidgetPrivate;
+
+class QTE_EXPORT qtGradientWidget : public QWidget
+{
+  Q_OBJECT
+  Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
+
+public:
+  qtGradientWidget(QWidget* parent = 0);
+  virtual ~qtGradientWidget();
+
+  Qt::Orientation orientation() const;
+  void setOrientation(Qt::Orientation);
+
+  qtGradient gradient() const;
+
+  virtual QSize minimumSizeHint() const;
+  virtual QSize sizeHint() const;
+
+public slots:
+  void setGradient(qtGradient);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtGradientWidget)
+
+  virtual void paintEvent(QPaintEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(qtGradientWidget)
+  Q_DISABLE_COPY(qtGradientWidget)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtOverlayWidget.cxx b/Libraries/QtExtensions/Widgets/qtOverlayWidget.cxx
new file mode 100644
index 00000000..9cf4bc87
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtOverlayWidget.cxx
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QStackedLayout>
+
+#include "qtOverlayWidget.h"
+
+//-----------------------------------------------------------------------------
+qtOverlayWidget::qtOverlayWidget(QWidget* parent)
+  : QStackedWidget(parent)
+{
+  QStackedLayout* layout = qobject_cast<QStackedLayout*>(this->layout());
+  if (layout)
+    {
+    layout->setStackingMode(QStackedLayout::StackAll);
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtOverlayWidget::~qtOverlayWidget()
+{
+}
diff --git a/Libraries/QtExtensions/Widgets/qtOverlayWidget.h b/Libraries/QtExtensions/Widgets/qtOverlayWidget.h
new file mode 100644
index 00000000..4e4deddc
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtOverlayWidget.h
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtOverlayWidget_h
+#define __qtOverlayWidget_h
+
+#include <QStackedWidget>
+
+#include "../Core/qtGlobal.h"
+
+class QTE_EXPORT qtOverlayWidget : public QStackedWidget
+{
+  Q_OBJECT
+
+public:
+  qtOverlayWidget(QWidget* parent = 0);
+  virtual ~qtOverlayWidget();
+
+private:
+  Q_DISABLE_COPY(qtOverlayWidget)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtSqueezedLabel.cxx b/Libraries/QtExtensions/Widgets/qtSqueezedLabel.cxx
new file mode 100644
index 00000000..d0249888
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtSqueezedLabel.cxx
@@ -0,0 +1,439 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "qtSqueezedLabel.h"
+
+#include <QApplication>
+#include <QClipboard>
+#include <QFontMetrics>
+#include <QMenu>
+#include <QPaintEvent>
+#include <QPainter>
+#include <QResizeEvent>
+#include <QStyle>
+#include <QStyleOption>
+#include <QTextDocument>
+
+#include "../Core/qtScopedValueChange.h"
+
+QTE_IMPLEMENT_D_FUNC(qtSqueezedLabel)
+
+//BEGIN qtSqueezedLabelPrivate
+
+//-----------------------------------------------------------------------------
+class qtSqueezedLabelPrivate
+{
+public:
+  qtSqueezedLabelPrivate() : cacheBackground(false)
+    { this->invalidate(0); }
+
+  bool isValid(const QString& text);
+
+  void invalidate(QWidget* self);
+  void recalculate(const QSize&, const QFontMetrics&);
+
+  static QString ellipsis();
+
+  QString cachedText;
+  QString fullText;
+  qtSqueezedLabel::ElideMode elideMode;
+
+  bool cacheBackground;
+  QImage background;
+
+  int fadeWidth;
+  int offset, length;
+  bool elided;
+};
+
+//-----------------------------------------------------------------------------
+bool qtSqueezedLabelPrivate::isValid(const QString& text)
+{
+  return (length >= 0 && text == this->cachedText);
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabelPrivate::invalidate(QWidget* self)
+{
+  this->offset = -1;
+  this->length = -1;
+  this->elided = true;
+
+  if (self)
+    {
+    // Prepare to repaint our underlay background
+    this->background =
+      QImage(self->size(), QImage::Format_ARGB32_Premultiplied);
+    qtScopedValueChange<bool> cb(this->cacheBackground, true);
+
+    // Calculate our rect relative to our top level widget
+    QWidget* tlw = self->topLevelWidget();
+    QRect rect = self->rect();
+    rect.setTopLeft(self->mapTo(tlw, rect.topLeft()));
+    rect.setBottomRight(self->mapTo(tlw, rect.bottomRight()));
+
+    // Render underlay background
+    tlw->render(&this->background, QPoint(), rect);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabelPrivate::recalculate(
+  const QSize& size, const QFontMetrics& fm)
+{
+  // Check if text fits
+  const int fullWidth = fm.width(this->cachedText);
+  if (fullWidth <= size.width())
+    {
+    this->length = this->cachedText.length();
+    this->offset = 0;
+    this->elided = false;
+    return;
+    }
+
+  this->elided = true;
+
+  // How are we eliding?
+  if (elideMode.testFlag(qtSqueezedLabel::ElideFade))
+    {
+    this->fadeWidth = fm.height() * 3;
+
+    // \TODO support modes other then ElideEnd
+    const int availableWidth = size.width();
+
+    // Determine number of characters needed to fill label
+    this->offset = 0;
+    this->length = 0;
+    int width = 0;
+    while (width < availableWidth)
+      {
+      ++this->length;
+      width = fm.width(this->cachedText, this->length);
+      }
+    }
+  else
+    {
+    // \TODO support modes other then ElideEnd
+    const int availableWidth =
+      size.width() - fm.width(qtSqueezedLabelPrivate::ellipsis());
+    if (availableWidth < 0)
+      {
+      // Nothing at all fits... will only happen if we are smaller than our
+      // minimumSizeHint(), but deal with it
+      this->length = 0;
+      this->offset = 0;
+      return;
+      }
+
+    // Determine maximum number of characters that can fit
+    this->offset = 0;
+    this->length = this->fullText.length();
+    int width = fullWidth;
+    while (width > availableWidth)
+      {
+      --this->length;
+      width = fm.width(this->cachedText, this->length);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString qtSqueezedLabelPrivate::ellipsis()
+{
+  return QString::fromUtf8("\xe2\x80\xa6");
+}
+
+//END qtSqueezedLabelPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN qtSqueezedLabel
+
+//-----------------------------------------------------------------------------
+qtSqueezedLabel::qtSqueezedLabel(QWidget* parent, Qt::WindowFlags f)
+  : QLabel(parent, f), d_ptr(new qtSqueezedLabelPrivate)
+{
+  QTE_D(qtSqueezedLabel);
+  d->elideMode = ElideEnd;
+}
+
+//-----------------------------------------------------------------------------
+qtSqueezedLabel::qtSqueezedLabel(
+  const QString& text, QWidget* parent, Qt::WindowFlags f)
+  : QLabel(text, parent, f), d_ptr(new qtSqueezedLabelPrivate)
+{
+  QTE_D(qtSqueezedLabel);
+  d->elideMode = ElideEnd;
+}
+
+//-----------------------------------------------------------------------------
+qtSqueezedLabel::~qtSqueezedLabel()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtSqueezedLabel::ElideMode qtSqueezedLabel::elideMode() const
+{
+  QTE_D_CONST(qtSqueezedLabel);
+  return d->elideMode;
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::setElideMode(qtSqueezedLabel::ElideMode mode)
+{
+  QTE_D(qtSqueezedLabel);
+  if (d->elideMode != mode)
+    {
+    d->elideMode = mode;
+    d->length = -1;
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString qtSqueezedLabel::fullText() const
+{
+  QTE_D_CONST(qtSqueezedLabel);
+  return (d->fullText.isNull() ? this->text() : d->fullText);
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::setFullText(const QString& text)
+{
+  QTE_D(qtSqueezedLabel);
+  d->fullText = text;
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::setText(
+  const QString& text, qtSqueezedLabel::SetTextMode mode)
+{
+  this->setText(mode.testFlag(SimplifyText) ? text.simplified() : text);
+  if (mode.testFlag(SetFullText))
+    {
+    this->setFullText(text);
+    }
+  if (mode.testFlag(SetToolTip))
+    {
+    this->setToolTip(text);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::setToolTip(const QString& text, SetToolTipMode mode)
+{
+  if (mode.testFlag(PlainText))
+    {
+    QString formattedText = Qt::convertFromPlainText(text);
+    if (mode.testFlag(AutoWrap))
+      {
+      const QRegExp re(QString::fromUtf8("(\xc2\xa0*)\xc2\xa0"));
+      formattedText.replace(re, "\\1 ");
+      }
+    this->setToolTip(formattedText);
+    }
+  else
+    {
+    this->setToolTip(text);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::copy()
+{
+  qApp->clipboard()->setText(this->fullText());
+}
+
+//-----------------------------------------------------------------------------
+QSize qtSqueezedLabel::minimumSizeHint() const
+{
+  const QString& text = this->text();
+  if (text.isEmpty())
+    {
+    return QSize(0, 0);
+    }
+
+  QTE_D_CONST(qtSqueezedLabel);
+
+  const QFontMetrics& fm = this->fontMetrics();
+
+  // Calculate minimum width; lesser of full text (in case it is very short) or
+  // enough to elide the text
+  int width = fm.width(text);
+  if (d->elideMode.testFlag(ElideFade))
+    {
+    // Fade minimum size is 3x height
+    width = qMin(width, fm.height() * 3);
+    }
+  else
+    {
+    // Ellipsis minimum size is enough to show just the ellipsis
+    width = qMin(width, fm.width(qtSqueezedLabelPrivate::ellipsis()));
+    }
+  return QSize(width, fm.height());
+}
+
+//-----------------------------------------------------------------------------
+bool qtSqueezedLabel::event(QEvent* e)
+{
+  if (e->type() == QEvent::WindowActivate ||
+      e->type() == QEvent::WindowDeactivate)
+    {
+    QTE_D(qtSqueezedLabel);
+    d->invalidate(this);
+    }
+
+  return QLabel::event(e);
+}
+
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::changeEvent(QEvent* e)
+{
+  if (e->type() == QEvent::FontChange || e->type() == QEvent::EnabledChange)
+    {
+    QTE_D(qtSqueezedLabel);
+    d->invalidate(this);
+    }
+
+  QLabel::changeEvent(e);
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::contextMenuEvent(QContextMenuEvent* e)
+{
+  if (this->contextMenuPolicy() == Qt::DefaultContextMenu)
+    {
+    QMenu* menu = new QMenu(this);
+    menu->setAttribute(Qt::WA_DeleteOnClose);
+
+    QAction* action = menu->addAction("&Copy Full Text");
+    action->setEnabled(!this->fullText().isEmpty());
+    connect(action, SIGNAL(triggered()), this, SLOT(copy()));
+
+    menu->popup(e->globalPos());
+    e->accept();
+    return;
+    }
+
+  QLabel::contextMenuEvent(e);
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::moveEvent(QMoveEvent* e)
+{
+  QTE_D(qtSqueezedLabel);
+
+  // Parent render calls move; don't get stuck in a recursion loop!
+  if (!d->cacheBackground)
+    {
+    d->invalidate(this);
+    }
+
+  QLabel::moveEvent(e);
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::resizeEvent(QResizeEvent* e)
+{
+  QTE_D(qtSqueezedLabel);
+
+  // Parent render calls resize; don't get stuck in a recursion loop!
+  if (!d->cacheBackground)
+    {
+    d->invalidate(this);
+    }
+
+  QLabel::resizeEvent(e);
+}
+
+//-----------------------------------------------------------------------------
+void qtSqueezedLabel::paintEvent(QPaintEvent* e)
+{
+  QTE_D(qtSqueezedLabel);
+
+  // Do nothing if drawing background for cache
+  if (d->cacheBackground)
+    {
+    return;
+    }
+
+  // If invalid, or text has changed, recalculate portion to elide
+  const QString& text = this->text();
+  if (!d->isValid(text))
+    {
+    d->cachedText = text;
+    d->recalculate(this->size(), this->fontMetrics());
+    }
+
+  // Check if text fits
+  if (!d->elided)
+    {
+    // If so, let ordinary label handle the painting
+    QLabel::paintEvent(e);
+    return;
+    }
+
+  e->accept();
+
+  // Prepare to paint text
+  QStyle* style = this->style();
+  QPainter painter(this);
+
+  const Qt::Alignment align =
+    QStyle::visualAlignment(this->layoutDirection(), this->alignment());
+  const QPalette::ColorRole role = this->foregroundRole();
+
+  QStyleOption opt;
+  opt.initFrom(this);
+
+  // Paint text
+  if (d->elideMode.testFlag(ElideFade))
+    {
+    const QRect rect = this->rect();
+    const int width = rect.width();
+    const QString elidedText = text.mid(d->offset, d->length);
+
+    // Draw text
+    style->drawItemText(&painter, rect, align, opt.palette,
+                        this->isEnabled(), elidedText, role);
+
+    // Set up fade gradient
+    int x1, x2;
+    if (align.testFlag(Qt::AlignLeft))
+      {
+      x1 = qMax(0, width - d->fadeWidth);
+      x2 = width;
+      }
+    else
+      {
+      x1 = qMin(width, d->fadeWidth);
+      x2 = 0;
+      }
+    QLinearGradient grad(x1, 0, x2, 0);
+    grad.setColorAt(0.0, Qt::transparent);
+    grad.setColorAt(0.9, Qt::black);
+
+    // Fade out background for overpainting
+    QImage fadeImage(d->background);
+    QBrush brush(grad);
+    QPainter imagePainter(&fadeImage);
+    imagePainter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    imagePainter.fillRect(0, 0, rect.width(), rect.height(), brush);
+
+    // Fade out text by overpainting with blended fade image
+    painter.drawImage(rect.topLeft(), fadeImage);
+    }
+  else
+    {
+    const QString elidedText =
+      text.mid(d->offset, d->length) + qtSqueezedLabelPrivate::ellipsis();
+    style->drawItemText(&painter, this->rect(), align, opt.palette,
+                        this->isEnabled(), elidedText, role);
+    }
+}
+
+//END qtSqueezedLabel
diff --git a/Libraries/QtExtensions/Widgets/qtSqueezedLabel.h b/Libraries/QtExtensions/Widgets/qtSqueezedLabel.h
new file mode 100644
index 00000000..cf11d011
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtSqueezedLabel.h
@@ -0,0 +1,90 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtSqueezedLabel_h
+#define __qtSqueezedLabel_h
+
+#include <QLabel>
+
+#include "../Core/qtGlobal.h"
+
+class qtSqueezedLabelPrivate;
+
+class QTE_EXPORT qtSqueezedLabel : public QLabel
+{
+  Q_OBJECT
+
+  Q_PROPERTY(ElideMode elideMode READ elideMode WRITE setElideMode)
+  Q_PROPERTY(QString fullText READ fullText WRITE setFullText)
+
+public:
+  enum ElideFlag
+    {
+    // ElideMiddle   = 0x0,
+    // ElideStart    = 0x1,
+    ElideEnd      = 0x2,
+    ElideEllipsis = 0x0,
+    ElideFade     = 0x8
+    };
+  Q_DECLARE_FLAGS(ElideMode, ElideFlag)
+
+  enum SetTextFlag
+    {
+    SetFullText = 0x1,
+    SetToolTip = 0x2,
+    SimplifyText = 0x8
+    };
+  Q_DECLARE_FLAGS(SetTextMode, SetTextFlag)
+
+  enum SetToolTipFlag
+    {
+    PlainText = 0x1,
+    AutoWrap = 0x2
+    };
+  Q_DECLARE_FLAGS(SetToolTipMode, SetToolTipFlag)
+
+  qtSqueezedLabel(QWidget* parent = 0, Qt::WindowFlags = 0);
+  qtSqueezedLabel(const QString& text, QWidget* parent = 0,
+                  Qt::WindowFlags = 0);
+  virtual ~qtSqueezedLabel();
+
+  ElideMode elideMode() const;
+  void setElideMode(ElideMode);
+
+  QString fullText() const;
+
+  using QLabel::setText;
+  void setText(const QString&, SetTextMode);
+
+  using QLabel::setToolTip;
+  void setToolTip(const QString&, SetToolTipMode);
+
+  virtual QSize minimumSizeHint() const;
+
+public slots:
+  void setFullText(const QString&);
+  void copy();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtSqueezedLabel)
+
+  virtual bool event(QEvent*);
+  virtual void changeEvent(QEvent*);
+  virtual void contextMenuEvent(QContextMenuEvent*);
+  virtual void moveEvent(QMoveEvent*);
+  virtual void resizeEvent(QResizeEvent*);
+  virtual void paintEvent(QPaintEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(qtSqueezedLabel)
+  Q_DISABLE_COPY(qtSqueezedLabel)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(qtSqueezedLabel::ElideMode)
+Q_DECLARE_OPERATORS_FOR_FLAGS(qtSqueezedLabel::SetTextMode)
+Q_DECLARE_OPERATORS_FOR_FLAGS(qtSqueezedLabel::SetToolTipMode)
+
+#endif
diff --git a/Libraries/QtExtensions/Widgets/qtThrobber.cxx b/Libraries/QtExtensions/Widgets/qtThrobber.cxx
new file mode 100644
index 00000000..05aa068e
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtThrobber.cxx
@@ -0,0 +1,143 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QPainter>
+#include <QTimer>
+
+#include <cmath>
+
+#include "qtThrobber.h"
+
+QTE_IMPLEMENT_D_FUNC(qtThrobber)
+
+//-----------------------------------------------------------------------------
+class qtThrobberPrivate
+{
+public:
+  static const int dotCount = 12;
+
+  QTimer timer;
+  int step;
+  int maxSize;
+
+  QBrush brushAt(int pos);
+};
+
+//-----------------------------------------------------------------------------
+QBrush qtThrobberPrivate::brushAt(int pos)
+{
+  qreal a = ((dotCount + pos - this->step) % dotCount);
+  a = 0.1 + (0.75 * pow(a / dotCount, 2.2));
+  int c = qRound(a * 255.0);
+  return QColor(c, c, c);
+}
+
+//-----------------------------------------------------------------------------
+qtThrobber::qtThrobber(QWidget* parent)
+  : QWidget(parent), d_ptr(new qtThrobberPrivate)
+{
+  QTE_D(qtThrobber);
+  connect(&d->timer, SIGNAL(timeout()), this, SLOT(step()));
+  d->timer.setInterval(120);
+  d->step = -1;
+  d->maxSize = -1;
+}
+
+//-----------------------------------------------------------------------------
+qtThrobber::~qtThrobber()
+{
+}
+
+//-----------------------------------------------------------------------------
+QSize qtThrobber::minimumSizeHint() const
+{
+  return QSize(12, 12);
+}
+
+//-----------------------------------------------------------------------------
+void qtThrobber::setActive(bool active)
+{
+  QTE_D(qtThrobber);
+  if (active)
+    {
+    d->step = 0;
+    d->timer.start();
+    }
+  else
+    {
+    d->timer.stop();
+    d->step = -1;
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool qtThrobber::isActive() const
+{
+  QTE_D_CONST(qtThrobber);
+  return d->timer.isActive();
+}
+
+//-----------------------------------------------------------------------------
+void qtThrobber::setMaxThrobberSize(int s)
+{
+  QTE_D(qtThrobber);
+  d->maxSize = s;
+}
+
+//-----------------------------------------------------------------------------
+int qtThrobber::maxThrobberSize() const
+{
+  QTE_D_CONST(qtThrobber);
+  return d->maxSize;
+}
+
+//-----------------------------------------------------------------------------
+void qtThrobber::step()
+{
+  QTE_D(qtThrobber);
+  d->step = (d->step + 1) % qtThrobberPrivate::dotCount;
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void qtThrobber::paintEvent(QPaintEvent* e)
+{
+  QTE_D(qtThrobber);
+
+  // Do nothing if inactive
+  if (d->step < 0)
+    {
+    QWidget::paintEvent(e);
+    return;
+    }
+
+  qreal x = this->width() * 0.5, y = this->height() * 0.5;
+  qreal s = qMin(x, y), m = d->maxSize;
+  const qreal r = 3.0;
+
+  if (m > 0)
+    {
+    s = qMin(s, m);
+    }
+
+  QPainter painter(this);
+
+  painter.setRenderHint(QPainter::Antialiasing);
+  painter.translate(x, y);
+  painter.scale(s * 0.04, s * 0.04);
+
+  painter.setPen(Qt::NoPen);
+
+  for (int i = 0; i < qtThrobberPrivate::dotCount; ++i)
+    {
+    painter.save();
+    painter.setBrush(d->brushAt(i));
+    painter.rotate((360.0 / qtThrobberPrivate::dotCount) * i);
+    painter.drawEllipse(QRectF(-20.0 - r, -r, 2.0 * r, 2.0 * r));
+    painter.restore();
+    }
+}
diff --git a/Libraries/QtExtensions/Widgets/qtThrobber.h b/Libraries/QtExtensions/Widgets/qtThrobber.h
new file mode 100644
index 00000000..76706cbf
--- /dev/null
+++ b/Libraries/QtExtensions/Widgets/qtThrobber.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __qtThrobber_h
+#define __qtThrobber_h
+
+#include <QWidget>
+
+#include "../Core/qtGlobal.h"
+
+class qtThrobberPrivate;
+
+class QTE_EXPORT qtThrobber : public QWidget
+{
+  Q_OBJECT
+
+  Q_PROPERTY(bool active READ isActive WRITE setActive)
+  Q_PROPERTY(int maxThrobberSize READ maxThrobberSize WRITE setMaxThrobberSize)
+
+public:
+  qtThrobber(QWidget* parent = 0);
+  virtual ~qtThrobber();
+
+  QSize minimumSizeHint() const;
+  bool isActive() const;
+  int maxThrobberSize() const;
+
+signals:
+  void toggled(bool);
+
+public slots:
+  void setActive(bool);
+  void setMaxThrobberSize(int);
+
+protected slots:
+  void step();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(qtThrobber)
+
+  void paintEvent(QPaintEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(qtThrobber)
+  Q_DISABLE_COPY(qtThrobber)
+};
+
+#endif
diff --git a/Libraries/QtExtensions/qteDParadigm.dox b/Libraries/QtExtensions/qteDParadigm.dox
new file mode 100644
index 00000000..6e461c3f
--- /dev/null
+++ b/Libraries/QtExtensions/qteDParadigm.dox
@@ -0,0 +1,340 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+/**
+\page QTE_D QtExtensions' D-Pointer Paradigm
+
+\section qte_d_overview Overview
+
+An implementation pointer provides a way to separate implementation details
+from a class's public API. This provides a number of advantages, but the
+following two are of particular interest:
+
+<ul>
+  <li><b>ABI compatibility and reduced compile time</b></li>
+  <li style="list-style-type: none">
+    By storing your class's member variables in a private structure/class with
+    only a pointer to these details in the class's ABI, members may be added
+    or removed without changing your class's ABI, which would require users of
+    your class to be recompiled; not only because the build tool sees a
+    modified header, but because <code>sizeof(YourClass)</code> may have
+    changed.
+  </li>
+</ul>
+<ul>
+  <li><b>Hide implementation details from users</b></li>
+  <li style="list-style-type: none">
+    Rather than relying on access specifiers, implementation details can be
+    moved out of the header entirely. In some cases, this will reduce the
+    headers or forward declarations required in your class's public header.
+  </li>
+</ul>
+
+Additionally, using a private data structure for data storage is an integral
+part of \ref implicit-sharing, which is provided by %Qt and used extensively
+therein. QtExtensions not only also makes use of this excellent system, but
+provides macros to make it easier to use, which are closely related to its
+D-pointer system.
+
+This provides a starting point for further discussion of QtExtensions' system.
+The concept of an implementation pointer is sufficiently well known and covered
+in detail elsewhere, such that further discussion of the general principles is
+unnecessary. The reader is encouraged to seek other resources as desired.
+
+\par Why extend Qt?
+
+The system used by QtExtensions is based on the system used by %Qt, but with
+one major (and important) different; %Qt's system, although the macros are
+generally available, is undocumented and therefore intended to be "for internal
+use only" and "subject to change". This was the original reason for creating a
+new system for QtExtensions.
+
+Since then, some further enhancements have been made, providing additional
+functionality above and beyond what is in %Qt.
+
+\internal
+
+\subsection qte_d_policies Policies
+
+All non-trivial classes in the \c qtExtensions and \c qtVgWidgets modules
+should use this system. For this purpose, "trivial" is defined as any class
+that does not have a pointer to a class-private data structure, and should
+generally imply few if any (oftentimes, exactly one) member variables, and/or
+one which needs to behave as much like POD as possible. It is desirable for
+application classes to use this system as well, especially those derived from
+%Qt classes.
+
+Classes that are data containers should usually implement \ref implicit-sharing
+unless the cost of a copy is very low, or the meaning of a copy is special
+(e.g. qtStatusSource). Classes that are not copyable (including most widgets)
+should disable copying by expanding #QTE_DISABLE_COPY after declaring private
+access. Do so <i>even if your base class is non-copyable</i>, as this produces
+a better error message in case of an attempt to copy/assign the class
+(especially in C++11 mode).
+
+\endinternal
+
+\section qte_d_usage Usage
+
+The %Qt and QtExtensions d-pointer systems are based on three steps:
+<ol>
+  <li>Declare the d-pointer as a member of the class.</li>
+  <li>Declare and implement accessor functions.</li>
+  <li>Wrap access to the class's implementation via the accessor function.</li>
+</ol>
+
+The first is, obviously, a prerequisite of any similar system. The others
+represent a means of allowing the implementation to be subclassed. This can be
+useful for implementing abstract classes, especially when the implementation
+has an interface whose externals can be well defined, but whose internals may
+differ.
+
+\subsection qte_d_usage_common_case Common Case
+
+The QtExtensions macros all take the base class name, and will automatically
+translate to the implementation class name, which is of the form
+\c MyClassPrivate (for public class \c MyClass). Usually you will need to
+forward declare this in your class's public header.
+
+The d-pointer accessor functions should be declared with private access, using
+the macro #QTE_DECLARE_PRIVATE(\c MyClass). Derived classes that require access
+to \c d, but do not have their own implementation subclassed from
+\c MyClassPrivate, may redeclare the accessors using the base class name. The
+d-pointer itself should be declared with one of the macros described below. The
+access for the d-pointer should be either private (if the implementation may
+not be subclassed) or protected. Declaring the d-pointer protected is
+suggested, even if the implementation is not available to subclasses, as
+absence of the implementation definition will prevent use, and this makes it
+slightly easier to permit subclassed implementations in the future.
+
+%Qt uses \c reinterpret_cast to convert from the base class's \c d_ptr to the
+implementation instance used by subclasses. However, this places restrictions
+on subclassing (namely, that the subclassed implementation must subclass from
+the base implementation first, which can prevent the implementation subclassing
+QObject). Since some users of the system were not able to easily satisfy these
+restrictions, QtExtensions instead uses \c static_cast. This has the advantage
+of being safer, and also allowing more flexibility when subclassing an
+implementation. The down side is that it prevents forward definition of the
+accessor functions.
+
+QtExtensions works around this problem by requiring separate definition of the
+accessor functions in an appropriate scope. This is done via the macro
+#QTE_IMPLEMENT_D_FUNC(\c MyClass), placed in the class's definition file (e.g.
+\c MyClass.cpp) at the earliest possible location. For base classes, this is
+typically immediately following the list of <code>\#include</code>'s. For
+derived classes, it may need to follow the (non-forward) declaration of the
+implementation class, when located in the class's definition file.
+
+\subsubsection qte_d_flavors D-pointer Flavors
+
+<dl>
+  <dt>#QTE_DECLARE_PRIVATE_PTR</dt>
+  <dd>
+    This declares \c d_ptr as a basic, immutable pointer
+    (<code>MyClassPrivate * const d_ptr</code>), and is used in classes that
+    do not implement shared data. The pointer must be assigned in the
+    constructor and deleted in the destructor.
+  </dd>
+</dl><dl>
+  <dt>#QTE_DECLARE_PRIVATE_RPTR</dt>
+  <dd>
+    This declares \c d_ptr as an immutable QScopedPointer
+    (<code>QScopedPointer\<MyClassPrivate\> const d_ptr</code>). It is similar
+    to PTR, but requires that \c \<QScopedPointer\> be included. The pointer
+    must be assigned in the constructor; deletion is handled automatically by
+    QScopedPointer. This is the preferred method for most uses.
+  </dd>
+</dl><dl>
+  <dt>#QTE_DECLARE_PRIVATE_MPTR</dt>
+  <dd>
+    This declares \c d_ptr as a mutable pointer
+    (<code>MyClassPrivate * d_ptr</code>). Many users create a private instance
+    in their constructor, and do not need to (and generally \em should not)
+    ever assign a different instance to their d-pointer. In cases where this is
+    necessary (usually non-shared classes with assignment operators, or
+    assignment-like operations), this replaces PTR.
+  </dd>
+</dl><dl>
+  <dt>#QTE_DECLARE_PRIVATE_MRPTR</dt>
+  <dd>
+    This declares \c d_ptr as a mutable QScopedPointer
+    (<code>QScopedPointer\<MyClassPrivate\> d_ptr</code>). It is similar to
+    MPTR, but requires that \c \<QScopedPointer\> be included. Deletion is
+    handled automatically by QScopedPointer. This replaces RPTR where MPTR
+    replaces PTR.
+  </dd>
+</dl><dl>
+  <dt>#QTE_DECLARE_PRIVATE_SPTR</dt>
+  <dd>
+    This declares \c d_ptr as a QSharedPointer
+    (<code>QSharedPointer\<MyClassPrivate\> d_ptr</code>). The pointer is
+    mutable, as use of a shared pointer typically implies an assignment
+    operator which will modify \c d_ptr. The implementation instance is deleted
+    when all referenced to it have been released. See \ref qte_d_advanced for
+    examples of when using a QSharedPointer for the d-pointer might be
+    appropriate.
+  </dd>
+</dl>
+
+\subsubsection qte_d_common_access Accessing the D-pointer
+
+Access to the d-pointer is obtained via the accessor function. For convenience,
+and to avoid multiple calls to the accessor function, it is typical to use one
+of two macros to store the pointer to the implementation in the immutable local
+variable \c d.
+
+\par Example:
+\code{.cpp}
+int MyClass::value() const
+{
+  QTE_D_CONST(MyClass);
+  return d->value;
+}
+\endcode
+
+The two macros are #QTE_D and (as above) #QTE_D_CONST. The latter is used to
+retrieve a pointer to an immutable implementation, which is required in
+\c const member functions; the pointer from the former gives a mutable
+implementation.
+
+\subsection qte_d_implicitly_shared Implicitly Shared Classes
+
+The most convenient way to add \ref implicit-sharing to a class is to store its
+shared data in an implementation class which is derived from QSharedData and
+implements a copy constructor (in some cases, the default copy constructor may
+suffice). The shared data is then accessed in much the same manner as a private
+implementation, and generally replaces the private implementation. The public
+class will have no data members except the QSharedDataPointer, and can use a
+default copy constructor and assignment operator.
+
+To declare the pointer to the shared data, replace
+#QTE_DECLARE_PRIVATE(\c MyClass) with #QTE_DECLARE_SHARED(\c MyClass), and use
+one of the following macros to declare the pointer to the shared data:
+
+\li #QTE_DECLARE_SHARED_PTR(\c MyClass), to declare the pointer as a
+    QSharedDataPointer.
+\li #QTE_DECLARE_SHARED_EPTR(\c MyClass), to declare the pointer as a
+    QExplicitlySharedDataPointer.
+
+The former will automatically create a private copy of the shared data (by
+calling <code>d_ptr.detach()</code>) whenever the pointer is accessed in a
+non-\c const manner. The latter will only create a copy when detach() is called
+explicitly (hence "explicit" in the name). In most cases, however, you will use
+the <code>QTE_D_<i>access-type</i></code> macros, such that \c d_func will take
+the appropriate action for you. Keep in mind that explicit sharing doesn't mean
+your class can't be implicitly shared, just that the sharing is explicit to you
+as the class writer; it need not be explicit to your users.
+
+\note The name of the internal class for an implicitly shared class is of the
+      form \c MyClassData rather than \c MyClassPrivate.
+
+\subsubsection qte_d_shared_access Accessing the D-pointer
+
+Accessing the shared data is done via accessor function, in very much the same
+way as non-shared classes. Due to the different name of the private class, and
+slightly increased complexity of sharing data, there are three accessor macros
+used by implicitly shared classes:
+
+\li #QTE_D_SHARED is equivalent to #QTE_D_CONST, and gives an immutable view of
+    the shared data without creating a copy.
+\li #QTE_D_MUTABLE gives a mutable (writable) view of the shared data.
+    \n If using QSharedDataPointer, a copy will be made automatically. If using
+    QExplicitlySharedDataPointer, no copy will be made. In the former case, you
+    will generally want to use this accessor. In the latter, you should only
+    use this accessor in special circumstances where it is okay to have a
+    writable but potentially shared pointer to the data.
+\li #QTE_D_DETACH gives a mutable (writable), private view of the shared data.
+    \n This accessor explicitly calls detach(), so the pointer is guaranteed to
+    point to a private instance of the data. It is usually necessary only when
+    using QExplicitlySharedDataPointer.
+
+\subsection qte_d_public Reverse Access
+
+In some cases it is useful for the private implementation to have access to the
+public class instance. This is especially useful if portions of your
+implementation code live in the implementation class, but need to access the
+public class (for example, to emit signals or to invoke virtual methods). This
+is done with a "q-pointer", which is very similar to a d-pointer in reverse.
+
+#QTE_DECLARE_PUBLIC and #QTE_DECLARE_PUBLIC_PTR are used in much the same
+manner as #QTE_DECLARE_PRIVATE and #QTE_DECLARE_PRIVATE_PTR, and should be
+placed at corresponding access levels (that is, private and protected,
+respectively). The main difference here is that #QTE_DECLARE_PUBLIC(\c MyClass)
+will also implement the accessor functions, as the definition of the public
+class is typically known when the implementation class is defined. Since the
+public class owns the implementation instance, rather than the other way
+around, \c q_ptr is always a bare pointer (<code>MyClass * const q_ptr</code>)
+and does not need to be deleted, although it does need to be initialized in the
+constructor.
+
+The accessor macros #QTE_Q and #QTE_Q_CONST are semantically equivalent to
+#QTE_D and #QTE_D_CONST, respectively.
+
+Subclassable implementations can also use this technique, keeping in mind that
+the base implementation will only be able to access the corresponding base
+public class. The implementation subclass will be able to access its
+corresponding public subclass in the same way the public subclass can access
+the implementation subclass. In general, only the root implementation class
+should declare the q-pointer.
+
+For obvious reasons, implicitly shared classes, or classes otherwise using a
+shared implementation, usually cannot use this technique.
+
+\subsection qte_d_advanced Advanced Usage
+
+\subsubsection qte_d_shared_explicit Explicitly Shared Classes
+
+Although explicit sharing can be implemented using QSharedData with explicit
+management of the data pointer, this is not the only option. In the case where
+it is desired that all copies of a class refer to the same (mutable) underlying
+data, the implementation can be shared. This is a case for using a shared
+pointer to a mutable implementation, which is done with
+#QTE_DECLARE_PRIVATE_SPTR (accessor functions are declared normally).
+
+Bear in mind that access to shared data is not magically protected. When
+writing a shared data class with multiple instances referring to the same
+writable view (that is, where writes made to object A by thread X should be
+visible via object B in thread Y), you must provide your own access protection
+of both reads and writes. The inherent thread safety of QSharedData only
+applies to copy-on-write access.
+
+The same technique could also be used to implement "write once" classes, where
+the class is not read-only as such and where all copies of a class must refer
+to the same implementation object, but where it is acceptable to impose write
+restrictions either after a copy has been made, or if any copies exist.
+
+\subsubsection qte_d_shared_immutable Implicitly Shared Immutable Classes
+
+In cases where implicit sharing is desired (because a copy would be expensive),
+but the class is immutable, sharing can be achieved by using a QSharedPointer
+to hold the implementation pointer, similar to the case of explicitly shared
+classes (above). This only works if users are not permitted to modify the
+class, and implies that the d-pointer target should be
+<code>const</code>-decorated. Such classes are usually created from other
+classes. An example would be a read-only view into a class, where the
+implementation of the view is sufficiently complex to warrant sharing
+(especially if it is expected that many copies of the view will be made, for
+example if it will be passed through signals/slots across threads).
+
+When creating such a class, there are three rules:
+
+<ol>
+  <li>
+    The d-pointer target should be declared immutable
+    (#QTE_DECLARE_PRIVATE_SPTR(<code>const MyClass</code>).
+  </li>
+  <li>
+    Replace #QTE_DECLARE_PRIVATE with #QTE_DECLARE_PRIVATE_CONST; this will add
+    the appropriate decoration and omit the non-\c const accessor.
+  </li>
+  <li>
+    Correspondingly, replace #QTE_IMPLEMENT_D_FUNC with
+    #QTE_IMPLEMENT_D_FUNC_CONST.
+  </li>
+</ol>
+
+*/
+// kate: hl c++
diff --git a/Libraries/QtExtensions/qteVersion.cmake b/Libraries/QtExtensions/qteVersion.cmake
new file mode 100644
index 00000000..03e49df3
--- /dev/null
+++ b/Libraries/QtExtensions/qteVersion.cmake
@@ -0,0 +1,5 @@
+SET(QTE_AMC_VERSION_MAJOR ${VISGUI_VERSION_MAJOR})
+SET(QTE_AMC_VERSION_MINOR ${VISGUI_VERSION_MINOR})
+SET(QTE_AMC_VERSION_PATCH ${VISGUI_VERSION_PATCH})
+
+SET(QTE_AMC_VERSION_STR "${QTE_AMC_VERSION_MAJOR}.${QTE_AMC_VERSION_MINOR}.${QTE_AMC_VERSION_PATCH}")
diff --git a/Libraries/QtExtensions/qteVersion.h.in b/Libraries/QtExtensions/qteVersion.h.in
new file mode 100644
index 00000000..e23e603a
--- /dev/null
+++ b/Libraries/QtExtensions/qteVersion.h.in
@@ -0,0 +1,6 @@
+#ifndef qt_Version_H
+#define qt_Version_H
+
+#define QTE_AMC_VERSION_STR "@QTE_AMC_VERSION_STR@"
+
+#endif
diff --git a/Libraries/QtExtensions/typesystem.xml b/Libraries/QtExtensions/typesystem.xml
new file mode 100644
index 00000000..be4c468a
--- /dev/null
+++ b/Libraries/QtExtensions/typesystem.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0"?>
+<typesystem package="@TYPESYSTEM_NAME@">
+
+  @EXTRA_TYPESYSTEMS@
+
+  <!-- Namespaces -->
+  <namespace-type name="qtUtil">
+    <enum-type name="SeparatorBehaviorFlag" flags="SeparatorBehavior"/>
+  </namespace-type>
+
+  <namespace-type name="qtColorUtil"/>
+  <namespace-type name="qtJson"/>
+  <namespace-type name="qtDom"/>
+
+  <!-- qtRand.h -->
+  <function signature="qtRandD()"/>
+  <function signature="qtRand(int)"/>
+  <function signature="qtRand(int,int)"/>
+
+  <!-- Object types in Core -->
+  <object-type name="qtCliArgs">
+    <enum-type name="ParseOption" flags="ParseOptions"/>
+    <modify-function signature="qtCliArgs(int,char**)" access="private"/>
+    <add-function signature="qtCliArgs(PySequence)">
+      <inject-code>
+        int tmp_argc;
+        char** tmp_argv = 0;
+        if (Shiboken::sequenceToArgcArgv(%1, &amp;tmp_argc, &amp;tmp_argv, 0))
+          {
+          %0 = new %CPPTYPE(tmp_argc, tmp_argv);
+          }
+        delete[] tmp_argv;
+      </inject-code>
+    </add-function>
+  </object-type>
+
+  <object-type name="qtCliOption">
+    <enum-type name="Flag" flags="Flags"/>
+  </object-type>
+
+  <!-- Object types in Util -->
+  <value-type name="qtGradient">
+    <value-type name="Stop"/>
+    <enum-type name="InterpolationFlag" flags="InterpolationMode"/>
+    <enum-type name="NormalizeMode"/>
+    <inject-code class="target" position="end">
+      #define ADD_SPREAD_ENUM(name) \
+        if (!Shiboken::Enum::createScopedEnumItem( \
+               SbkPySide_QtGuiTypes[SBK_QGRADIENT_SPREAD_IDX], \
+               &amp;Sbk_qtGradient_Type, #name, (long)QGradient::name)) \
+          return
+      ADD_SPREAD_ENUM(PadSpread);
+      ADD_SPREAD_ENUM(RepeatSpread);
+      ADD_SPREAD_ENUM(ReflectSpread);
+    </inject-code>
+  </value-type>
+
+  <interface-type name="qtAbstractSetting"/>
+  <object-type name="qtSettings">
+    <enum-type name="ScopeFlag" flags="Scope"/>
+  </object-type>
+
+  <object-type name="qtUiState">
+    <interface-type name="AbstractItem"/>
+  </object-type>
+
+  <!-- Object types in IO -->
+  <object-type name="qtKstReader">
+    <inject-code class="native" position="beginning">
+      QRegExp defaultSeparator() { return qtKstReader::defaultSeparator(); }
+      QRegExp defaultTerminator() { return qtKstReader::defaultTerminator(); }
+    </inject-code>
+  </object-type>
+
+  <!-- Object types in Widgets -->
+  <object-type name="qtDoubleSlider">
+    <enum-type name="QuantizeMode"/>
+  </object-type>
+
+  <object-type name="qtDrawer">
+    <enum-type name="ExpanderPolicy"/>
+  </object-type>
+
+  <object-type name="qtSqueezedLabel">
+    <enum-type name="ElideFlag" flags="ElideMode"/>
+    <enum-type name="SetTextFlag" flags="SetTextMode"/>
+    <enum-type name="SetToolTipFlag" flags="SetToolTipMode"/>
+  </object-type>
+
+  <!-- Object types in Dialogs -->
+  <object-type name="qtConfirmationDialog">
+    <enum-type name="AskPreferenceScope"/>
+  </object-type>
+
+  <object-type name="qtDoubleInputDialog">
+    <modify-function signature="getDouble(QWidget*,QString,QString,double,double,double,bool*,QFlags&lt;Qt::WindowType&gt;)">
+      <modify-argument index="7">
+        <remove-argument/>
+      </modify-argument>
+      <modify-argument index="return">
+        <replace-type modified-type="(int, bool ok)"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        bool ok_;
+        %BEGIN_ALLOW_THREADS
+        %RETURN_TYPE retval_ =
+          %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, &amp;ok_, %8);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="getDouble(QWidget*,QString,QString,double,double,double,int,double,bool*,QFlags&lt;Qt::WindowType&gt;)">
+      <modify-argument index="9">
+        <remove-argument/>
+      </modify-argument>
+      <modify-argument index="return">
+        <replace-type modified-type="(int, bool ok)"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        bool ok_;
+        %BEGIN_ALLOW_THREADS
+        %RETURN_TYPE retval_ =
+          %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, %8, &amp;ok_,
+                                  %10);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
+      </inject-code>
+    </modify-function>
+    <modify-function signature="getDouble(QWidget*,QString,QString,double,double,double,QString,int,double,bool*,QFlags&lt;Qt::WindowType&gt;)">
+      <modify-argument index="10">
+        <remove-argument/>
+      </modify-argument>
+      <modify-argument index="return">
+        <replace-type modified-type="(int, bool ok)"/>
+      </modify-argument>
+      <inject-code class="target" position="beginning">
+        bool ok_;
+        %BEGIN_ALLOW_THREADS
+        %RETURN_TYPE retval_ =
+          %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, %6, %7, %8, %9, &amp;ok_,
+                                  %11);
+        %END_ALLOW_THREADS
+        <insert-template name="tuple_retval_ok"/>
+      </inject-code>
+    </modify-function>
+  </object-type>
+
+  <!-- Object types declared in CMakeLists.txt -->
+  @EXTRA_OBJECTS@
+
+  <!-- qtAm macro -->
+  <inject-code class="native" position="beginning">
+    PyObject* moduleQtExtensions;
+  </inject-code>
+  <inject-code class="target" position="end">
+    // Initialize qtAm object.
+    if (qtAm)
+      {
+      PyObject* pyQtAm = %CONVERTTOPYTHON[qtActionManager*](qtAm);
+      Py_INCREF(pyQtAm);
+      PyModule_AddObject(module, "qtAm", pyQtAm);
+      }
+    else
+      {
+      Py_INCREF(Py_None);
+      PyModule_AddObject(module, "qApp", Py_None);
+      }
+    moduleQtExtensions = module;
+  </inject-code>
+
+</typesystem>
diff --git a/Libraries/QtTestingSupport/CMakeLists.txt b/Libraries/QtTestingSupport/CMakeLists.txt
new file mode 100644
index 00000000..4efb3417
--- /dev/null
+++ b/Libraries/QtTestingSupport/CMakeLists.txt
@@ -0,0 +1,74 @@
+# Name of the project.
+project(qtTestingSupport)
+
+# Requires Qt and QtTesting.
+include_directories(
+  ${QtTesting_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${vtkGUISupportQt_INCLUDE_DIRS}
+  )
+
+link_directories( ${QtTesting_LIBRARY_DIR} )
+
+# Source files.
+qt4_wrap_cpp(qtTestingSupportMocSrcs
+  pqCoreTestUtility.h
+  pqFileDialogEventPlayer.h
+  pqFileDialogEventTranslator.h
+  pqInvokeMethodEventPlayer.h
+  pqQDialogButtonBoxEventPlayer.h
+  pqQDialogButtonBoxEventTranslator.h
+  pqQteDoubleSliderEventPlayer.h
+  pqQteDoubleSliderEventTranslator.h
+  pqQVTKWidgetEventTranslator.h
+  pqVgMixerEventPlayer.h
+  pqVgMixerEventTranslator.h
+  pqXMLEventObserver.h
+  pqXMLEventSource.h
+)
+
+set(qtTestingSupportSrcs
+  pqCoreTestUtility.cxx
+  pqFileDialogEventPlayer.cxx
+  pqFileDialogEventTranslator.cxx
+  pqInvokeMethodEventPlayer.cxx
+  pqQDialogButtonBoxEventPlayer.cxx
+  pqQDialogButtonBoxEventTranslator.cxx
+  pqQteDoubleSliderEventPlayer.cxx
+  pqQteDoubleSliderEventTranslator.cxx
+  pqQVTKWidgetEventPlayer.cxx
+  pqQVTKWidgetEventTranslator.cxx
+  pqVgMixerEventPlayer.cxx
+  pqVgMixerEventTranslator.cxx
+  pqXMLEventObserver.cxx
+  pqXMLEventSource.cxx
+)
+
+source_group("Generated" FILES
+  ${qtTestingSupportMocSrcs}
+)
+
+# Build and link library.
+add_library(${PROJECT_NAME}
+  ${qtTestingSupportSrcs}
+  ${qtTestingSupportMocSrcs}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  LINK_LIBRARIES
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+  ${QtTesting_LIBRARIES}
+  LINK_PRIVATE
+  vtkGUISupportQt
+  vtkRenderingCore
+  vtkRenderingFreeTypeOpenGL
+  vtkTestingRendering
+  vtksys
+  PRIVATE_INTERFACE_TARGETS
+  qtExtensions
+  qtVgWidgets
+)
+vg_target_include_directories(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR})
+
+install_library_targets(${PROJECT_NAME})
diff --git a/Libraries/QtTestingSupport/pqCoreTestUtility.cxx b/Libraries/QtTestingSupport/pqCoreTestUtility.cxx
new file mode 100644
index 00000000..e40a704b
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqCoreTestUtility.cxx
@@ -0,0 +1,566 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqCoreTestUtility.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqCoreTestUtility.h"
+
+#include "pqFileDialogEventPlayer.h"
+#include "pqFileDialogEventTranslator.h"
+#include "pqInvokeMethodEventPlayer.h"
+#include "pqQDialogButtonBoxEventPlayer.h"
+#include "pqQDialogButtonBoxEventTranslator.h"
+#include "pqQteDoubleSliderEventPlayer.h"
+#include "pqQteDoubleSliderEventTranslator.h"
+#include "pqQVTKWidgetEventPlayer.h"
+#include "pqQVTKWidgetEventTranslator.h"
+#include "pqVgMixerEventPlayer.h"
+#include "pqVgMixerEventTranslator.h"
+#include "pqXMLEventSource.h"
+#include "pqXMLEventObserver.h"
+
+#include <QAction>
+#include <QApplication>
+#include <QFileDialog>
+#include <QMainWindow>
+#include <QMenuBar>
+#include <QMenu>
+#include <QString>
+
+#include <qtCliArgs.h>
+
+#include "QtTestingConfigure.h"
+
+#include "QVTKWidget.h"
+#include "vtkSmartPointer.h"
+#include "vtkRenderWindow.h"
+#include "vtkTesting.h"
+
+#include "vtksys/SystemTools.hxx"
+
+//BEGIN helper classes
+
+//-----------------------------------------------------------------------------
+class pqCoreTestUtility::MakeActive
+{
+public:
+  MakeActive(pqCoreTestUtility* parent) : Parent(parent)
+    {
+    this->Parent->SetActive(true);
+    }
+
+  ~MakeActive()
+    {
+    this->Parent->SetActive(false);
+    }
+
+private:
+  pqCoreTestUtility* Parent;
+};
+
+//-----------------------------------------------------------------------------
+class pqCoreTestUtility::FixViewportSize
+{
+public:
+  FixViewportSize(pqCoreTestUtility* parent) : Parent(parent)
+    {
+    // Save the current window state and geometry. We do not want running a
+    // test to mess up a layout the user has configured.
+    this->State = this->Parent->Window->saveState();
+    this->Geometry = this->Parent->Window->saveGeometry();
+
+    this->Parent->SetViewportSize();
+    }
+
+  ~FixViewportSize()
+    {
+    // 'Unlock' the viewport window to allow resizing
+    this->Parent->Viewport->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+
+    // Restore the saved state/geometry.
+    this->Parent->Window->restoreGeometry(this->Geometry);
+    this->Parent->Window->restoreState(this->State);
+    }
+
+private:
+  QByteArray State;
+  QByteArray Geometry;
+  pqCoreTestUtility* Parent;
+};
+
+//END helper classes
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN pqCoreTestUtility
+
+//-----------------------------------------------------------------------------
+pqCoreTestUtility::pqCoreTestUtility(QMainWindow* window, QVTKWidget* viewport,
+                                     QObject* p)
+  : pqTestUtility(p), TestTempRootEnvironment("TEST_TEMP_ROOT"),
+    Window(window), Viewport(viewport),
+    Active(false), ExitOnTestComplete(false)
+{
+  this->addEventSource("xml", new pqXMLEventSource(this));
+  this->addEventObserver("xml", new pqXMLEventObserver(this));
+
+  this->eventTranslator()->addWidgetEventTranslator(
+    new pqQVTKWidgetEventTranslator(this));
+  this->eventTranslator()->addWidgetEventTranslator(
+    new pqQDialogButtonBoxEventTranslator(this));
+  this->eventTranslator()->addWidgetEventTranslator(
+    new pqQteDoubleSliderEventTranslator(this));
+  this->eventTranslator()->addWidgetEventTranslator(
+    new pqVgMixerEventTranslator(this));
+  this->eventTranslator()->addWidgetEventTranslator(
+    new pqFileDialogEventTranslator(this, this));
+
+  this->eventPlayer()->addWidgetEventPlayer(
+    new pqInvokeMethodEventPlayer(this));
+  this->eventPlayer()->addWidgetEventPlayer(
+    new pqQVTKWidgetEventPlayer(this));
+  this->eventPlayer()->addWidgetEventPlayer(
+    new pqQDialogButtonBoxEventPlayer(this));
+  this->eventPlayer()->addWidgetEventPlayer(
+    new pqQteDoubleSliderEventPlayer(this));
+  this->eventPlayer()->addWidgetEventPlayer(
+    new pqVgMixerEventPlayer(this));
+  this->eventPlayer()->addWidgetEventPlayer(
+    new pqFileDialogEventPlayer(this, this));
+
+  connect(&this->Translator, SIGNAL(stopped()),
+          this, SLOT(OnRecordingStopped()));
+}
+
+//-----------------------------------------------------------------------------
+pqCoreTestUtility::~pqCoreTestUtility()
+{
+  // Avoid trying to invoke slot on partly destroyed object (i.e. us); this is
+  // necessary as the translator may emit signals when it is destroyed (by our
+  // base class destructor)
+  disconnect(&this->Translator, 0, this, 0);
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::SetDataRootEnvironment(const QString& env)
+{
+  this->DataRootEnvironment = env;
+}
+
+//-----------------------------------------------------------------------------
+QString pqCoreTestUtility::GetDataRootEnvironment()
+{
+  return this->DataRootEnvironment;
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::SetTestTempRootEnvironment(const QString& env)
+{
+  this->TestTempRootEnvironment = env;
+}
+
+//-----------------------------------------------------------------------------
+QString pqCoreTestUtility::GetTestTempRootEnvironment()
+{
+  return this->TestTempRootEnvironment;
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::SetDataRoot(const QString& root)
+{
+  QString result = root;
+
+  // Let the user override the defaults by setting an environment variable ...
+  if (result.isEmpty() && !this->DataRootEnvironment.isEmpty())
+    {
+    result =
+      QString::fromLocal8Bit(qgetenv(qPrintable(this->DataRootEnvironment)));
+    }
+
+  // Ensure all slashes face forward ...
+  result.replace('\\', '/');
+
+  // Remove any trailing slashes ...
+  if (result.size() && result.at(result.size() - 1) == '/')
+    {
+    result.chop(1);
+    }
+
+  // Trim excess whitespace ...
+  result = result.trimmed();
+
+  this->DataRoot = result;
+}
+
+//-----------------------------------------------------------------------------
+QString pqCoreTestUtility::GetDataRoot()
+{
+  return this->DataRoot;
+}
+
+//-----------------------------------------------------------------------------
+QString pqCoreTestUtility::GetTestTempRoot()
+{
+  return this->TestTempRoot;
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::SetTestDirectory(const QString& dir)
+{
+  this->TestDirectory = dir;
+}
+
+//-----------------------------------------------------------------------------
+QString pqCoreTestUtility::GetTestDirectory()
+{
+  return this->TestDirectory;
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::SetBaselineDirectory(const QString& dir)
+{
+  this->BaselineDirectory = dir;
+}
+
+//-----------------------------------------------------------------------------
+bool pqCoreTestUtility::CompareImage(vtkRenderWindow* RenderWindow,
+                                     const QString& ReferenceImage,
+                                     double Threshold, std::ostream& Output)
+{
+  vtkSmartPointer<vtkTesting> testing = vtkSmartPointer<vtkTesting>::New();
+  testing->AddArgument("-D");
+  testing->AddArgument(qPrintable(pqCoreTestUtility::BaselineDirectory));
+  testing->AddArgument("-T");
+  testing->AddArgument(qPrintable(pqCoreTestUtility::TestDirectory));
+  testing->AddArgument("-V");
+  testing->AddArgument(qPrintable(ReferenceImage));
+  testing->SetRenderWindow(RenderWindow);
+  return testing->RegressionTest(Threshold, Output) == vtkTesting::PASSED;
+}
+
+//-----------------------------------------------------------------------------
+bool pqCoreTestUtility::TakeArgValue(QMutableStringListIterator& iter,
+                                     QString& value)
+{
+  if (!iter.hasNext())
+    {
+    std::cerr << "Not enough arguments." << std::endl;
+    return false;
+    }
+
+  value = iter.next();
+  iter.remove();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::ParseCommandLine(QStringList& args)
+{
+  QMutableStringListIterator iter(args);
+
+  while (iter.hasNext())
+    {
+    QString arg = iter.next();
+
+    // check if test script to play was supplied
+    if (arg == "--test-script")
+      {
+      iter.remove();
+      if (!this->TakeArgValue(iter, this->TestFileName))
+        {
+        return;
+        }
+      // check if test baseline image was supplied
+      if (iter.hasNext() && iter.peekNext() == "--test-baseline")
+        {
+        iter.next();
+        iter.remove();
+        if (!this->TakeArgValue(iter, this->TestBaselineFileName))
+          {
+          return;
+          }
+        }
+      }
+    // check if data root directory was supplied
+    else if (arg == "-D")
+      {
+      iter.remove();
+      if (!this->TakeArgValue(iter, this->DataRoot))
+        {
+        return;
+        }
+      }
+    // check if directory for test output images was supplied
+    else if (arg == "-T")
+      {
+      iter.remove();
+      if (!this->TakeArgValue(iter, this->TestTempRoot))
+        {
+        return;
+        }
+      }
+    // check if we want to exit after playing test
+    else if (arg == "--exit")
+      {
+      iter.remove();
+      this->ExitOnTestComplete = true;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::ParseCommandLine(const qtCliArgs& args)
+{
+  this->TestFileName = args.value("test-script");
+  this->TestBaselineFileName = args.value("test-baseline");
+  this->DataRoot = args.value("test-data-root");
+  this->TestTempRoot = args.value("test-temp-root");
+  this->ExitOnTestComplete = args.isSet("exit");
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::ProcessCommandLine()
+{
+  this->SetDataRoot(this->DataRoot);
+
+  if (this->TestFileName.isEmpty())
+    {
+    return;
+    }
+
+  // execute the test script
+  bool success = this->PlayTest(this->TestFileName);
+
+  // compare against the baseline render if one was supplied
+  if (this->Viewport && !this->TestBaselineFileName.isEmpty())
+    {
+    // specify directory for output images
+    if (this->TestTempRoot.isEmpty())
+      {
+      this->TestTempRoot = "../../Testing/Temporary";
+      }
+
+    this->SetTestDirectory(this->TestTempRoot);
+
+    // 'unlock' the viewport window to allow resizing
+    this->Viewport->setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+    QApplication::processEvents();
+
+    // resize viewport to set the baseline image dimensions
+    QSize prevSize = this->Viewport->size();
+    this->Viewport->resize(300, 300);
+
+    // \NOTE: This call is mandatory as else tests will fail. Because
+    // if not then the image rendered from the last viewport size
+    // will be squeezed to fit into 300,300 but will fail to
+    // capture updated size of tracks, icons because of this resize.
+    // This is to process deferred QT resize events.
+    QApplication::processEvents();
+
+    // compare current contents of render window against our baseline
+    bool passed =
+      this->CompareImage(this->Viewport->GetRenderWindow(),
+                         qPrintable(this->TestBaselineFileName),
+                         10.0, std::cout);
+    success = success && passed;
+
+    this->Viewport->resize(prevSize);
+    }
+
+  if (this->ExitOnTestComplete)
+    {
+    QApplication::instance()->exit(success ? 0 : 1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::AddCommandLineOptions(qtCliArgs& args)
+{
+  qtCliOptions options;
+  options.add("test-script <file>", "Execute test '<script>'");
+  options.add("test-baseline <image>", "After executing test script, compare"
+                                       " view against baseline '<image>'");
+  options.add("D").add("test-data-root <dir>",
+                       "Use '<dir>' as the base directory for test data files");
+  options.add("T").add("test-temp-root <dir>",
+                       "Use '<dir>' as the location in which to store"
+                       " temporary files related to testing");
+  options.add("exit", "Exit the application on completion of the test script");
+  args.addOptions(options, "Testing", false);
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::AddTestingMenu(QMenuBar* menuBar, QMenu* before)
+{
+  this->AddTestingMenu(menuBar, "T", before);
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::AddTestingMenu(QMenu* menu, QAction* before)
+{
+  this->AddTestingMenu(menu, "T", before);
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::AddTestingMenu(
+  QMenuBar* menuBar, const QString& availableAccelerators, QMenu* before)
+{
+  QMenu* testMenu = this->CreateTestMenu(availableAccelerators, menuBar);
+  QAction* beforeAction = before ? before->menuAction() : 0;
+  menuBar->insertMenu(beforeAction, testMenu);
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::AddTestingMenu(
+  QMenu* menu, const QString& availableAccelerators, QAction* before)
+{
+  QMenu* testMenu = this->CreateTestMenu(availableAccelerators, menu);
+  menu->insertMenu(before, testMenu);
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::OnPlayTest()
+{
+  QString filters;
+  filters += "XML Files (*.xml);;";
+  filters += "All Files (*)";
+
+  QFileDialog fileDialog(0, tr("Play Test"), QString(), filters);
+  fileDialog.setObjectName("PlayTestDialog");
+  fileDialog.setFileMode(QFileDialog::ExistingFile);
+  fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
+  fileDialog.setDefaultSuffix("xml");
+
+  if (fileDialog.exec() == QDialog::Accepted)
+    {
+    this->PlayTests(fileDialog.selectedFiles());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::OnRecordTest()
+{
+  QString filters;
+  filters += "XML Files (*.xml);;";
+  filters += "All Files (*)";
+
+  QFileDialog fileDialog(0, tr("Record Test"), QString(), filters);
+  fileDialog.setObjectName("RecordTestDialog");
+  fileDialog.setFileMode(QFileDialog::AnyFile);
+  fileDialog.setAcceptMode(QFileDialog::AcceptSave);
+  fileDialog.setDefaultSuffix("xml");
+
+  if (fileDialog.exec() == QDialog::Accepted)
+    {
+    this->RecordTest(fileDialog.selectedFiles()[0]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::OnRecordingStopped()
+{
+  this->ViewportSizeFixer.reset();
+  this->ActiveMaker.reset();
+}
+
+
+//-----------------------------------------------------------------------------
+bool pqCoreTestUtility::PlayTest(const QString& filename)
+{
+  MakeActive ma(this);
+  FixViewportSize fvs(this);
+  return this->playTests(filename);
+}
+
+//-----------------------------------------------------------------------------
+bool pqCoreTestUtility::PlayTests(const QStringList& filenames)
+{
+  MakeActive ma(this);
+  FixViewportSize fvs(this);
+  return this->playTests(filenames);
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::RecordTest(const QString& filename)
+{
+  this->ActiveMaker.reset(new MakeActive(this));
+  this->ViewportSizeFixer.reset(new FixViewportSize(this));
+  this->recordTests(filename);
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::SetActive(bool active)
+{
+  qApp->setProperty("testingActive", active);
+  this->Active = active;
+
+  if (active)
+    {
+    emit this->StartedTesting();
+    }
+  else
+    {
+    emit this->StoppedTesting();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void pqCoreTestUtility::SetViewportSize()
+{
+  // Give the viewport a fixed initial size (and aspect ratio). Since the user
+  // can resize the window, we do not know the size of the viewport, but for
+  // testing, we want the viewports to be the same initial size and aspect ratio.
+  // Changing this size is likely to break tests on one or more platforms.
+  this->Viewport->setFixedSize(500, 500);
+  this->Window->adjustSize();
+}
+
+//-----------------------------------------------------------------------------
+QMenu* pqCoreTestUtility::CreateTestMenu(
+  const QString& availableAccelerators, QWidget* parent)
+{
+  QString name = "Test", lname = name.toLower();
+  foreach (QChar a, availableAccelerators.toLower())
+    {
+    int ai = lname.indexOf(a);
+    if (ai >= 0)
+      {
+      name.insert(ai, '&');
+      break;
+      }
+    }
+  QMenu* menu = new QMenu(name, parent);
+  menu->addAction("&Play Test...", this, SLOT(OnPlayTest()));
+  menu->addAction("&Record Test...", this, SLOT(OnRecordTest()));
+
+  return menu;
+}
+
+//END pqCoreTestUtility
diff --git a/Libraries/QtTestingSupport/pqCoreTestUtility.h b/Libraries/QtTestingSupport/pqCoreTestUtility.h
new file mode 100644
index 00000000..e1f49027
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqCoreTestUtility.h
@@ -0,0 +1,182 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqCoreTestUtility.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqCoreTestUtility_h
+#define _pqCoreTestUtility_h
+
+#include "pqTestUtility.h"
+
+#include <vgExport.h>
+
+class QAction;
+class QMainWindow;
+class QMenu;
+class QMenuBar;
+
+class qtCliArgs;
+
+class QVTKWidget;
+class vtkRenderWindow;
+
+/// Provides ParaView-specific functionality for regression testing
+class QT_TESTINGSUPPORT_EXPORT pqCoreTestUtility : public pqTestUtility
+{
+  Q_OBJECT
+  typedef pqTestUtility Superclass;
+
+public:
+  pqCoreTestUtility(QMainWindow* window, QVTKWidget* viewport = 0,
+                    QObject* parent = 0);
+  ~pqCoreTestUtility();
+
+public:
+  /// Set environment variable containing data root (e.g. $VISGUI_DATA_ROOT).
+  /// This will also be used as a replacement "tag" in file open dialog paths.
+  void SetDataRootEnvironment(const QString& env);
+  QString GetDataRootEnvironment();
+
+  /// Set environment variable containing test root (e.g. $TEST_TEMP_ROOT).
+  /// This will also be used as a replacement "tag" in file open dialog paths.
+  void SetTestTempRootEnvironment(const QString& env);
+  QString GetTestTempRootEnvironment();
+
+  /// Set the absolute path to the data root directory
+  void SetDataRoot(const QString& root);
+  QString GetDataRoot();
+
+  /// Set the absolute path to the data root directory
+  QString GetTestTempRoot();
+
+  /// Sets the temporary test directory in which tests can write
+  /// temporary outputs, difference images etc.
+  void SetTestDirectory(const QString& dir);
+  QString GetTestDirectory();
+
+  /// Sets the directory where baseline images are stored.
+  void SetBaselineDirectory(const QString& dir);
+
+  /// Compares the contents of a render window to a reference image,
+  /// returning true iff the two match within a given threshold
+  bool CompareImage(vtkRenderWindow* RenderWindow,
+                    const QString& ReferenceImage,
+                    double Threshold,
+                    std::ostream& Output);
+
+  /// Adds a standard testing menu to supplied \p menubar. If \p before is
+  /// specified, the menu will be added before \p before; otherwise it is added
+  /// to the end.
+  void AddTestingMenu(QMenuBar* menuBar, QMenu* before = 0);
+
+  /// Adds a standard testing menu to supplied \p menubar. If \p before is
+  /// specified, the menu will be added before \p before; otherwise it is added
+  /// to the end. The menu will have an accelerator that is the first character
+  /// in \p availableAccelerators that is also in the menu name.
+  void AddTestingMenu(QMenuBar* menuBar,
+                      const QString& availableAccelerators,
+                      QMenu* before = 0);
+
+  /// Adds a standard testing menu as a sub-menu of the supplied \p menu. If
+  /// \p before is specified, the menu will be added before \p before;
+  /// otherwise it is added to the end.
+  void AddTestingMenu(QMenu* menu, QAction* before = 0);
+
+  /// Adds a standard testing menu as a sub-menu of the supplied \p menu. If
+  /// \p before is specified, the menu will be added before \p before;
+  /// otherwise it is added to the end. The menu will have an accelerator that
+  /// is the first character in \p availableAccelerators that is also in the menu
+  /// name.
+  void AddTestingMenu(QMenu* menu,
+                      const QString& availableAccelerators,
+                      QAction* before = 0);
+
+  bool PlayTest(const QString& filename);
+  bool PlayTests(const QStringList& filenames);
+  void RecordTest(const QString& filename);
+
+  bool IsActive()
+    { return this->Active; }
+
+  /// Parse application command line and remove test-specific arguments.
+  void ParseCommandLine(QStringList& args);
+
+  /// Parse CLI options from qtCliArgs.
+  void ParseCommandLine(const qtCliArgs& args);
+
+  /// Run any test scripts discovered by ParseCommandLine().
+  void ProcessCommandLine();
+
+  /// Register command line options with qtCliArgs.
+  static void AddCommandLineOptions(qtCliArgs& args);
+
+signals:
+  void StartedTesting();
+  void StoppedTesting();
+
+protected slots:
+  void OnPlayTest();
+  void OnRecordTest();
+  void OnRecordingStopped();
+
+protected:
+  bool TakeArgValue(QMutableStringListIterator& iter, QString& value);
+  void SetActive(bool active);
+  void SetViewportSize();
+
+  // Helper function.
+  QMenu* CreateTestMenu(const QString& availableAccelerators,
+                        QWidget* parent = 0);
+
+private:
+  QString DataRoot;
+  QString DataRootEnvironment;
+  QString TestDirectory;
+  QString BaselineDirectory;
+
+  QString TestTempRoot;
+  QString TestTempRootEnvironment;
+  QString TestFileName;
+  QString TestBaselineFileName;
+
+  QMainWindow* Window;
+  QVTKWidget* Viewport;
+
+  bool Active;
+  bool ExitOnTestComplete;
+
+  class MakeActive;
+  class FixViewportSize;
+
+  QScopedPointer<MakeActive> ActiveMaker;
+  QScopedPointer<FixViewportSize> ViewportSizeFixer;
+};
+
+#endif // !_pqCoreTestUtility_h
diff --git a/Libraries/QtTestingSupport/pqFileDialog.h b/Libraries/QtTestingSupport/pqFileDialog.h
new file mode 100644
index 00000000..91f82f23
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqFileDialog.h
@@ -0,0 +1,157 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef _pqFileDialog_h
+#define _pqFileDialog_h
+
+#include <QFileDialog>
+
+#include <QApplication>
+#include <QVariant>
+
+class pqFileDialog : public QFileDialog
+{
+public:
+  inline pqFileDialog(QWidget* parent, Qt::WindowFlags f);
+  inline explicit pqFileDialog(QWidget* parent = 0,
+                               const QString& caption = QString(),
+                               const QString& directory = QString(),
+                               const QString& filter = QString());
+
+  inline void setOption(Option option, bool on = true);
+  inline void setOptions(Options options);
+
+  inline static QString getOpenFileName(
+    QWidget* parent = 0,
+    const QString& caption = QString(),
+    const QString& dir = QString(),
+    const QString& filter = QString(),
+    QString* selectedFilter = 0,
+    Options options = 0);
+
+  inline static QString getSaveFileName(
+    QWidget* parent = 0,
+    const QString& caption = QString(),
+    const QString& dir = QString(),
+    const QString& filter = QString(),
+    QString* selectedFilter = 0,
+    Options options = 0);
+
+  inline static QString getExistingDirectory(
+    QWidget* parent = 0,
+    const QString& caption = QString(),
+    const QString& dir = QString(),
+    Options options = ShowDirsOnly);
+
+  inline static QStringList getOpenFileNames(
+    QWidget* parent = 0,
+    const QString& caption = QString(),
+    const QString& dir = QString(),
+    const QString& filter = QString(),
+    QString* selectedFilter = 0,
+    Options options = 0);
+
+protected:
+  inline void setNativeMode();
+  inline static void setNativeMode(Options&);
+};
+
+//-----------------------------------------------------------------------------
+void pqFileDialog::setNativeMode()
+{
+  QVariant t = qApp->property("testingActive");
+  if (t.isValid() && t.toBool())
+    {
+    this->setOption(DontUseNativeDialog, true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void pqFileDialog::setNativeMode(QFileDialog::Options& options)
+{
+  QVariant t = qApp->property("testingActive");
+  if (t.isValid() && t.toBool())
+    {
+    options |= DontUseNativeDialog;
+    }
+}
+
+//-----------------------------------------------------------------------------
+pqFileDialog::pqFileDialog(QWidget* parent, Qt::WindowFlags f)
+  : QFileDialog(parent, f)
+{
+  this->setNativeMode();
+}
+
+//-----------------------------------------------------------------------------
+pqFileDialog::pqFileDialog(QWidget* parent, const QString& caption,
+                           const QString& directory, const QString& filter)
+  : QFileDialog(parent, caption, directory, filter)
+{
+  this->setNativeMode();
+}
+
+//-----------------------------------------------------------------------------
+void pqFileDialog::setOption(QFileDialog::Option option, bool on)
+{
+  if (option == DontUseNativeDialog)
+    {
+    QVariant t = qApp->property("testingActive");
+    if (t.isValid() && t.toBool())
+      {
+      on = true;
+      }
+    }
+  QFileDialog::setOption(option, on);
+}
+
+//-----------------------------------------------------------------------------
+void pqFileDialog::setOptions(QFileDialog::Options options)
+{
+  setNativeMode(options);
+  QFileDialog::setOptions(options);
+}
+
+//-----------------------------------------------------------------------------
+QString pqFileDialog::getOpenFileName(
+  QWidget* parent, const QString& caption, const QString& dir,
+  const QString& filter, QString* selectedFilter, QFileDialog::Options options)
+{
+  setNativeMode(options);
+  return QFileDialog::getOpenFileName(
+           parent, caption, dir, filter, selectedFilter, options);
+}
+
+//-----------------------------------------------------------------------------
+QString pqFileDialog::getSaveFileName(
+  QWidget* parent, const QString& caption, const QString& dir,
+  const QString& filter, QString* selectedFilter, QFileDialog::Options options)
+{
+  setNativeMode(options);
+  return QFileDialog::getSaveFileName(
+           parent, caption, dir, filter, selectedFilter, options);
+}
+
+//-----------------------------------------------------------------------------
+QString pqFileDialog::getExistingDirectory(
+  QWidget* parent, const QString& caption, const QString& dir,
+  QFileDialog::Options options)
+{
+  setNativeMode(options);
+  return QFileDialog::getExistingDirectory(parent, caption, dir, options);
+}
+
+//-----------------------------------------------------------------------------
+QStringList pqFileDialog::getOpenFileNames(
+  QWidget* parent, const QString& caption, const QString& dir,
+  const QString& filter, QString* selectedFilter, QFileDialog::Options options)
+{
+  setNativeMode(options);
+  return QFileDialog::getOpenFileNames(
+           parent, caption, dir, filter, selectedFilter, options);
+}
+
+#endif
diff --git a/Libraries/QtTestingSupport/pqFileDialogEventPlayer.cxx b/Libraries/QtTestingSupport/pqFileDialogEventPlayer.cxx
new file mode 100644
index 00000000..9974976d
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqFileDialogEventPlayer.cxx
@@ -0,0 +1,143 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqFileDialogEventPlayer.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqFileDialogEventPlayer.h"
+
+#include "pqEventDispatcher.h"
+#include "pqCoreTestUtility.h"
+
+#include <vtksys/SystemTools.hxx>
+
+#include <QFileDialog>
+#include <QApplication>
+#include <QtDebug>
+
+//-----------------------------------------------------------------------------
+pqFileDialogEventPlayer::pqFileDialogEventPlayer(pqCoreTestUtility* t,
+                                                 QObject* p)
+  : pqWidgetEventPlayer(p), TestUtility(t)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool pqFileDialogEventPlayer::playEvent(QObject* Object, const QString& Command,
+                                        const QString& Arguments, bool& Error)
+{
+  // Handle playback for pqFileDialog and all its children ...
+  QFileDialog* object = 0;
+  for (QObject* o = Object; o; o = o->parent())
+    {
+    object = qobject_cast<QFileDialog*>(o);
+    if (object)
+      {
+      break;
+      }
+    }
+  if (!object)
+    {
+    return false;
+    }
+
+  QString fileString = Arguments;
+  QString dataEnv = this->TestUtility->GetDataRootEnvironment();
+  QString dataDirectory = this->TestUtility->GetDataRoot();
+
+  if (!this->expandEnvToken(fileString, dataEnv, dataDirectory))
+    {
+    qCritical() << "You must set the " << dataEnv
+                << " environment variable to play-back file selections.";
+    Error = true;
+    return true;
+    }
+
+  QString testTempEnv = this->TestUtility->GetTestTempRootEnvironment();
+  QString testTempDirectory = this->TestUtility->GetTestTempRoot();
+
+  if (!this->expandEnvToken(fileString, testTempEnv, testTempDirectory))
+    {
+    qCritical() << "You must set the " << testTempEnv
+                << " environment variable to play-back file selections.";
+    Error = true;
+    return true;
+    }
+
+  if (Command == "filesSelected")
+    {
+    // For some reason the dialog must be hidden for the selectFile call to work...
+    object->setVisible(false);
+    object->selectFile(fileString);
+    object->setConfirmOverwrite(false);
+
+    connect(this, SIGNAL(accept()), object, SLOT(accept()));
+    emit accept();
+
+    if (object && object->result() == QDialog::Accepted)
+      {
+      pqEventDispatcher::processEventsAndWait(0);
+      return true;
+      }
+
+    qCritical() << "Dialog couldn't accept " << fileString;
+    Error = true;
+    return true;
+    }
+
+  if (Command == "cancelled")
+    {
+    object->reject();
+    return true;
+    }
+  if (Command == "remove")
+    {
+    vtksys::SystemTools::RemoveFile(qPrintable(fileString));
+    return true;
+    }
+
+  qCritical() << "Unknown QFileDialog command: " << Object << " " << Command << " " << Arguments;
+  Error = true;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool pqFileDialogEventPlayer::expandEnvToken(QString& path,
+                                             QString token,
+                                             const QString& expansion)
+{
+  if (path.contains(token) && expansion.isEmpty())
+    {
+    return false;
+    }
+
+  path.replace(token.prepend('$'),
+               QDir::cleanPath(QDir::fromNativeSeparators(expansion)));
+  return true;
+}
diff --git a/Libraries/QtTestingSupport/pqFileDialogEventPlayer.h b/Libraries/QtTestingSupport/pqFileDialogEventPlayer.h
new file mode 100644
index 00000000..5ee60a24
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqFileDialogEventPlayer.h
@@ -0,0 +1,71 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqFileDialogEventPlayer.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqFileDialogEventPlayer_h
+#define _pqFileDialogEventPlayer_h
+
+#include <pqWidgetEventPlayer.h>
+
+#include <vgExport.h>
+
+class pqCoreTestUtility;
+
+/**
+Concrete implementation of pqWidgetEventPlayer that handles playback of recorded file dialog user input.
+
+\sa pqEventPlayer
+*/
+class QT_TESTINGSUPPORT_EXPORT pqFileDialogEventPlayer :
+  public pqWidgetEventPlayer
+{
+  Q_OBJECT
+
+public:
+  pqFileDialogEventPlayer(pqCoreTestUtility* t, QObject* p = 0);
+
+  bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
+
+signals:
+  void accept();
+
+protected:
+  static bool expandEnvToken(
+    QString& path, QString token, const QString& expansion);
+
+private:
+  pqFileDialogEventPlayer(const pqFileDialogEventPlayer&);
+  pqFileDialogEventPlayer& operator=(const pqFileDialogEventPlayer&);
+
+  pqCoreTestUtility* TestUtility;
+};
+
+#endif // !_pqFileDialogEventPlayer_h
\ No newline at end of file
diff --git a/Libraries/QtTestingSupport/pqFileDialogEventTranslator.cxx b/Libraries/QtTestingSupport/pqFileDialogEventTranslator.cxx
new file mode 100644
index 00000000..01b21ec7
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqFileDialogEventTranslator.cxx
@@ -0,0 +1,105 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqFileDialogEventTranslator.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqFileDialogEventTranslator.h"
+
+#include "pqCoreTestUtility.h"
+
+#include <QFileDialog>
+#include <QEvent>
+#include <QDir>
+#include <QtDebug>
+
+pqFileDialogEventTranslator::pqFileDialogEventTranslator(pqCoreTestUtility* t,
+    QObject* p)
+  : pqWidgetEventTranslator(p), TestUtility(t)
+{
+}
+
+bool pqFileDialogEventTranslator::translateEvent(QObject* Object, QEvent* Event, bool& /*Error*/)
+{
+  // Capture input for QFileDialog and all its children ...
+  QFileDialog* object = 0;
+  for (QObject* o = Object; o; o = o->parent())
+    {
+    object = qobject_cast<QFileDialog*>(o);
+    if (object)
+      {
+      break;
+      }
+    }
+
+  if (!object)
+    {
+    return false;
+    }
+
+  if (Event->type() == QEvent::FocusIn && !this->CurrentObject)
+    {
+    this->CurrentObject = object;
+    connect(object, SIGNAL(fileSelected(const QString&)), this, SLOT(onFilesSelected(const QString&)));
+    connect(object, SIGNAL(rejected()), this, SLOT(onCancelled()));
+    }
+
+  return true;
+}
+
+void pqFileDialogEventTranslator::onFilesSelected(const QString& file)
+{
+  QString data_directory = this->TestUtility->GetDataRoot();
+  data_directory = QDir::cleanPath(QDir::fromNativeSeparators(data_directory));
+
+  QString dataEnv = this->TestUtility->GetDataRootEnvironment();
+  QString cleanedFile = QDir::cleanPath(QDir::fromNativeSeparators(file));
+
+  if (data_directory.isEmpty())
+    {
+    qWarning() << "You must set the "
+               << dataEnv << " environment variable to play-back file selections.";
+    }
+  else if (cleanedFile.indexOf(data_directory, 0, Qt::CaseInsensitive) == 0)
+    {
+    cleanedFile.replace(data_directory, dataEnv.prepend('$'), Qt::CaseInsensitive);
+    }
+  else
+    {
+    qWarning() << "You must choose a file under the "
+               << dataEnv << " directory to record file selections.";
+    }
+
+  emit recordEvent(this->CurrentObject, "filesSelected", cleanedFile);
+}
+
+void pqFileDialogEventTranslator::onCancelled()
+{
+  emit recordEvent(this->CurrentObject, "cancelled", "");
+}
diff --git a/Libraries/QtTestingSupport/pqFileDialogEventTranslator.h b/Libraries/QtTestingSupport/pqFileDialogEventTranslator.h
new file mode 100644
index 00000000..ec846a5a
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqFileDialogEventTranslator.h
@@ -0,0 +1,74 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqFileDialogEventTranslator.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqFileDialogEventTranslator_h
+#define _pqFileDialogEventTranslator_h
+
+#include <pqWidgetEventTranslator.h>
+#include <QPointer>
+
+#include <vgExport.h>
+
+class QFileDialog;
+
+class pqCoreTestUtility;
+
+/**
+Translates low-level Qt events into high-level ParaView events that can be recorded as test cases.
+
+\sa pqEventTranslator
+*/
+
+class QT_TESTINGSUPPORT_EXPORT pqFileDialogEventTranslator :
+  public pqWidgetEventTranslator
+{
+  Q_OBJECT
+
+public:
+  pqFileDialogEventTranslator(pqCoreTestUtility* t, QObject* p = 0);
+
+  virtual bool translateEvent(QObject* Object, QEvent* Event, bool& Error);
+
+private:
+  pqFileDialogEventTranslator(const pqFileDialogEventTranslator&);
+  pqFileDialogEventTranslator& operator=(const pqFileDialogEventTranslator&);
+
+  QPointer<QFileDialog> CurrentObject;
+
+  pqCoreTestUtility* TestUtility;
+
+private slots:
+  void onFilesSelected(const QString&);
+  void onCancelled();
+};
+
+#endif // !_pqFileDialogEventTranslator_h
\ No newline at end of file
diff --git a/Libraries/QtTestingSupport/pqInvokeMethodEventPlayer.cxx b/Libraries/QtTestingSupport/pqInvokeMethodEventPlayer.cxx
new file mode 100644
index 00000000..d08972f0
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqInvokeMethodEventPlayer.cxx
@@ -0,0 +1,114 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "pqInvokeMethodEventPlayer.h"
+
+#include <QDebug>
+#include <QStringList>
+
+#include <pqEventDispatcher.h>
+
+namespace
+{
+
+struct IgnoreBlocking
+{
+  IgnoreBlocking()
+    {
+    pqEventDispatcher::setIgnoreBlocking(true);
+    }
+  ~IgnoreBlocking()
+    {
+    pqEventDispatcher::setIgnoreBlocking(false);
+    }
+};
+
+}
+
+//-----------------------------------------------------------------------------
+pqInvokeMethodEventPlayer::pqInvokeMethodEventPlayer(QObject* p)
+  : pqWidgetEventPlayer(p)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool pqInvokeMethodEventPlayer::playEvent(
+  QObject* Object, const QString& Command,
+  const QString& Arguments, bool& Error)
+{
+  if (Command == "invokeMethod")
+    {
+    // Get split argument list and prepare argument object list
+    QStringList strargs = Arguments.split(",");
+    QGenericArgument qargs[10];
+
+    // Extract and convert arguments
+    for (int n = 0, i = 1, k = strargs.count(); i < k && n < 10; ++n, ++i)
+      {
+      // Get argument type and value strings
+      const QString type = strargs[i];
+      if (++i >= k)
+        {
+        qCritical() << "wrong number of arguments to invokeMethod";
+        Error = true;
+        return false;
+        }
+      const QString value = strargs[i];
+
+      // Parse argument value
+      if (type == "string")
+        {
+        qargs[n] = Q_ARG(QString, value);
+        }
+      else if (type == "int")
+        {
+        qargs[n] = Q_ARG(int, value.toInt());
+        }
+      else if (type == "long")
+        {
+        qargs[n] = Q_ARG(long, value.toLong());
+        }
+      else if (type == "long long" || type == "longlong")
+        {
+        qargs[n] = Q_ARG(long long, value.toLongLong());
+        }
+      else if (type == "float")
+        {
+        qargs[n] = Q_ARG(float, value.toFloat());
+        }
+      else if (type == "double")
+        {
+        qargs[n] = Q_ARG(double, value.toDouble());
+        }
+      else
+        {
+        qCritical() << "invokeMethod given unhandled argument type" << type;
+        Error = true;
+        return false;
+        }
+      }
+
+    // Prevent QtTesting from interleaving playback of other events with this
+    // one. If the invokeMethod call happens to create a modal dialog this will
+    // need to be revisited.
+    IgnoreBlocking ib;
+
+    // Invoke method
+    if (!QMetaObject::invokeMethod(
+           Object, qPrintable(strargs[0]), Qt::AutoConnection,
+           qargs[0], qargs[1], qargs[2], qargs[3], qargs[4],
+           qargs[5], qargs[6], qargs[7], qargs[8], qargs[9]))
+      {
+      qCritical() << "calling invokeMethod" << strargs
+                  << "on object" << Object << "failed";
+      Error = true;
+      return false;
+      }
+    return true;
+    }
+
+  return false;
+}
diff --git a/Libraries/QtTestingSupport/pqInvokeMethodEventPlayer.h b/Libraries/QtTestingSupport/pqInvokeMethodEventPlayer.h
new file mode 100644
index 00000000..ca2a2e4c
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqInvokeMethodEventPlayer.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef _pqInvokeMethodEventPlayer_h
+#define _pqInvokeMethodEventPlayer_h
+
+#include <pqWidgetEventPlayer.h>
+
+#include <vgExport.h>
+
+/**
+Concrete implementation of pqWidgetEventPlayer that handles playback of the
+invokeMethod command.
+
+\sa pqEventPlayer
+*/
+class QT_TESTINGSUPPORT_EXPORT pqInvokeMethodEventPlayer :
+  public pqWidgetEventPlayer
+{
+  Q_OBJECT
+
+public:
+  pqInvokeMethodEventPlayer(QObject* p = 0);
+
+  virtual bool playEvent(QObject* Object, const QString& Command,
+                         const QString& Arguments, bool& Error);
+
+private:
+  Q_DISABLE_COPY(pqInvokeMethodEventPlayer)
+};
+
+#endif
diff --git a/Libraries/QtTestingSupport/pqQDialogButtonBoxEventPlayer.cxx b/Libraries/QtTestingSupport/pqQDialogButtonBoxEventPlayer.cxx
new file mode 100644
index 00000000..e9ded3aa
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQDialogButtonBoxEventPlayer.cxx
@@ -0,0 +1,72 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQDialogButtonBoxEventPlayer.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqQDialogButtonBoxEventPlayer.h"
+
+#include <QDialogButtonBox>
+#include <QPushButton>
+#include <QtDebug>
+
+//-----------------------------------------------------------------------------
+pqQDialogButtonBoxEventPlayer::pqQDialogButtonBoxEventPlayer(QObject* p)
+  : pqWidgetEventPlayer(p)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool pqQDialogButtonBoxEventPlayer::playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error)
+{
+  if (Command != "activate" || Arguments.isEmpty())
+    {
+    return false;
+    }
+
+  if (QDialogButtonBox* const object = qobject_cast<QDialogButtonBox*>(Object))
+    {
+    int arg = Arguments.toInt(0, 0);
+    QPushButton* const button =
+      object->button(static_cast<QDialogButtonBox::StandardButton>(arg));
+
+    if (!button)
+      {
+      qCritical() << "couldn't find QDialogButtonBox button" << Arguments;
+      Error = true;
+      return true;
+      }
+
+    button->click();
+    return true;
+    }
+
+  // let pqAbstractActivateEventPlayer handle it if possible.
+  return false;
+}
diff --git a/Libraries/QtTestingSupport/pqQDialogButtonBoxEventPlayer.h b/Libraries/QtTestingSupport/pqQDialogButtonBoxEventPlayer.h
new file mode 100644
index 00000000..12a8c226
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQDialogButtonBoxEventPlayer.h
@@ -0,0 +1,59 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQDialogButtonBoxEventPlayer.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqQDialogButtonBoxEventPlayer_h
+#define _pqQDialogButtonBoxEventPlayer_h
+
+#include <pqWidgetEventPlayer.h>
+
+#include <vgExport.h>
+
+/**
+Concrete implementation of pqWidgetEventPlayer that handles playback of recorded qtDoubleSlider user input.
+
+\sa pqEventPlayer
+*/
+class QT_TESTINGSUPPORT_EXPORT pqQDialogButtonBoxEventPlayer :
+  public pqWidgetEventPlayer
+{
+  Q_OBJECT
+
+public:
+  pqQDialogButtonBoxEventPlayer(QObject* p = 0);
+
+  bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
+
+private:
+  Q_DISABLE_COPY(pqQDialogButtonBoxEventPlayer)
+};
+
+#endif // !_pqQDialogButtonBoxEventPlayer_h
\ No newline at end of file
diff --git a/Libraries/QtTestingSupport/pqQDialogButtonBoxEventTranslator.cxx b/Libraries/QtTestingSupport/pqQDialogButtonBoxEventTranslator.cxx
new file mode 100644
index 00000000..606373a7
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQDialogButtonBoxEventTranslator.cxx
@@ -0,0 +1,171 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQDialogButtonBoxEventTranslator.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqQDialogButtonBoxEventTranslator.h"
+
+#include <QAbstractButton>
+#include <QDialogButtonBox>
+#include <QEvent>
+#include <QPushButton>
+
+//-----------------------------------------------------------------------------
+static int ButtonStandardButtonId(QAbstractButton* Button, QDialogButtonBox* Box)
+{
+  QPushButton* const button = qobject_cast<QPushButton*>(Button);
+  if (button)
+    {
+    if (Box->button(QDialogButtonBox::Ok) == button)
+      {
+      return QDialogButtonBox::Ok;
+      }
+    if (Box->button(QDialogButtonBox::Open) == button)
+      {
+      return QDialogButtonBox::Open;
+      }
+    if (Box->button(QDialogButtonBox::Save) == button)
+      {
+      return QDialogButtonBox::Save;
+      }
+    if (Box->button(QDialogButtonBox::Cancel) == button)
+      {
+      return QDialogButtonBox::Cancel;
+      }
+    if (Box->button(QDialogButtonBox::Close) == button)
+      {
+      return QDialogButtonBox::Close;
+      }
+    if (Box->button(QDialogButtonBox::Discard) == button)
+      {
+      return QDialogButtonBox::Discard;
+      }
+    if (Box->button(QDialogButtonBox::Apply) == button)
+      {
+      return QDialogButtonBox::Apply;
+      }
+    if (Box->button(QDialogButtonBox::Reset) == button)
+      {
+      return QDialogButtonBox::Reset;
+      }
+    if (Box->button(QDialogButtonBox::RestoreDefaults) == button)
+      {
+      return QDialogButtonBox::RestoreDefaults;
+      }
+    if (Box->button(QDialogButtonBox::Help) == button)
+      {
+      return QDialogButtonBox::Help;
+      }
+    if (Box->button(QDialogButtonBox::SaveAll) == button)
+      {
+      return QDialogButtonBox::SaveAll;
+      }
+    if (Box->button(QDialogButtonBox::Yes) == button)
+      {
+      return QDialogButtonBox::Yes;
+      }
+    if (Box->button(QDialogButtonBox::YesToAll) == button)
+      {
+      return QDialogButtonBox::YesToAll;
+      }
+    if (Box->button(QDialogButtonBox::No) == button)
+      {
+      return QDialogButtonBox::No;
+      }
+    if (Box->button(QDialogButtonBox::NoToAll) == button)
+      {
+      return QDialogButtonBox::NoToAll;
+      }
+    if (Box->button(QDialogButtonBox::Abort) == button)
+      {
+      return QDialogButtonBox::Abort;
+      }
+    if (Box->button(QDialogButtonBox::Retry) == button)
+      {
+      return QDialogButtonBox::Retry;
+      }
+    if (Box->button(QDialogButtonBox::Ignore) == button)
+      {
+      return QDialogButtonBox::Ignore;
+      }
+    }
+  return QDialogButtonBox::NoButton;
+}
+
+//-----------------------------------------------------------------------------
+pqQDialogButtonBoxEventTranslator::pqQDialogButtonBoxEventTranslator(QObject* p)
+  : pqWidgetEventTranslator(p),
+    CurrentObject(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool pqQDialogButtonBoxEventTranslator::translateEvent(QObject* Object, QEvent* Event, bool& /*Error*/)
+{
+  QAbstractButton* const object = qobject_cast<QAbstractButton*>(Object);
+  if (!object || !qobject_cast<QDialogButtonBox*>(object->parent()))
+    {
+    return false;
+    }
+
+  switch (Event->type())
+    {
+    case QEvent::Enter:
+      this->CurrentObject = object;
+      connect(object, SIGNAL(pressed()),
+              this, SLOT(onActivate()));
+      break;
+    case QEvent::Leave:
+      disconnect(Object, 0, this, 0);
+      this->CurrentObject = 0;
+      break;
+    default:
+      break;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void pqQDialogButtonBoxEventTranslator::onActivate()
+{
+  QDialogButtonBox* const parent =
+    qobject_cast<QDialogButtonBox*>(this->CurrentObject->parent());
+  // Determine if this is a standard button
+  int id = ButtonStandardButtonId(this->CurrentObject, parent);
+  if (id)
+    {
+    emit recordEvent(parent, "activate", QString("0x%1").arg(id, 0, 16));
+    return;
+    }
+
+  // Not a standard button; emit a regular "activate"
+  emit recordEvent(this->CurrentObject, "activate", QString());
+}
diff --git a/Libraries/QtTestingSupport/pqQDialogButtonBoxEventTranslator.h b/Libraries/QtTestingSupport/pqQDialogButtonBoxEventTranslator.h
new file mode 100644
index 00000000..b691065b
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQDialogButtonBoxEventTranslator.h
@@ -0,0 +1,67 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQDialogButtonBoxEventTranslator.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqQDialogButtonBoxEventTranslator_h
+#define _pqQDialogButtonBoxEventTranslator_h
+
+#include "pqWidgetEventTranslator.h"
+
+#include <vgExport.h>
+
+class QAbstractButton;
+
+/**
+Translates low-level Qt events into high-level ParaView events that can be recorded as test cases.
+
+\sa pqEventTranslator
+*/
+
+class QT_TESTINGSUPPORT_EXPORT pqQDialogButtonBoxEventTranslator :
+  public pqWidgetEventTranslator
+{
+  Q_OBJECT
+
+public:
+  pqQDialogButtonBoxEventTranslator(QObject* p = 0);
+
+  virtual bool translateEvent(QObject* Object, QEvent* Event, bool& Error);
+
+private:
+  Q_DISABLE_COPY(pqQDialogButtonBoxEventTranslator)
+
+  QAbstractButton* CurrentObject;
+
+private slots:
+  void onActivate();
+};
+
+#endif // !_pqQDialogButtonBoxEventTranslator_h
diff --git a/Libraries/QtTestingSupport/pqQVTKWidgetEventPlayer.cxx b/Libraries/QtTestingSupport/pqQVTKWidgetEventPlayer.cxx
new file mode 100644
index 00000000..9bb28439
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQVTKWidgetEventPlayer.cxx
@@ -0,0 +1,100 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQVTKWidgetEventPlayer.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqQVTKWidgetEventPlayer.h"
+
+#include <QApplication>
+#include <QContextMenuEvent>
+#include <QtDebug>
+#include <QRegExp>
+
+#include <QtDebug>
+
+#include "QVTKWidget.h"
+#include "pqEventDispatcher.h"
+pqQVTKWidgetEventPlayer::pqQVTKWidgetEventPlayer(QObject* p)
+  : pqWidgetEventPlayer(p)
+{
+}
+
+bool pqQVTKWidgetEventPlayer::playEvent(QObject* Object, const QString& Command,
+                                        const QString& Arguments, bool& /*Error*/)
+{
+  QVTKWidget* widget = qobject_cast<QVTKWidget*>(Object);
+  if (widget)
+    {
+    if (Command == "mousePress" || Command == "mouseRelease" || Command == "mouseMove")
+      {
+      QRegExp mouseRegExp("\\(([^,]*),([^,]*),([^,]),([^,]),([^,]*)\\)");
+      if (mouseRegExp.indexIn(Arguments) != -1)
+        {
+        QVariant v = mouseRegExp.cap(1);
+        int x = static_cast<int>(v.toDouble() * widget->size().width());
+        v = mouseRegExp.cap(2);
+        int y = static_cast<int>(v.toDouble() * widget->size().height());
+        v = mouseRegExp.cap(3);
+        Qt::MouseButton button = static_cast<Qt::MouseButton>(v.toInt());
+        v = mouseRegExp.cap(4);
+        Qt::MouseButtons buttons = static_cast<Qt::MouseButton>(v.toInt());
+        v = mouseRegExp.cap(5);
+        Qt::KeyboardModifiers keym = static_cast<Qt::KeyboardModifier>(v.toInt());
+        QEvent::Type type = (Command == "mousePress") ? QEvent::MouseButtonPress :
+                            (Command == "mouseMove")  ? QEvent::MouseMove :
+                                                        QEvent::MouseButtonRelease;
+        QMouseEvent e(type, QPoint(x, y), button, buttons, keym);
+        QCoreApplication::sendEvent(widget, &e);
+        }
+      return true;
+      }
+    else if (Command == "mouseWheel")
+      {
+      QRegExp mouseRegExp("\\(([^,]*),([^,]*),([^,]*),([^,]),([^,]*)\\)");
+      if (mouseRegExp.indexIn(Arguments) != -1)
+        {
+        QVariant v = mouseRegExp.cap(1);
+        int x = static_cast<int>(v.toDouble() * widget->size().width());
+        v = mouseRegExp.cap(2);
+        int y = static_cast<int>(v.toDouble() * widget->size().height());
+        v = mouseRegExp.cap(3);
+        int delta = v.toInt();
+        v = mouseRegExp.cap(4);
+        Qt::MouseButtons buttons = static_cast<Qt::MouseButton>(v.toInt());
+        v = mouseRegExp.cap(5);
+        Qt::KeyboardModifiers keym = static_cast<Qt::KeyboardModifier>(v.toInt());
+        QWheelEvent e(QPoint(x, y), delta, buttons, keym);
+        QCoreApplication::sendEvent(widget, &e);
+        }
+      return true;
+      }
+    }
+  return false;
+}
diff --git a/Libraries/QtTestingSupport/pqQVTKWidgetEventPlayer.h b/Libraries/QtTestingSupport/pqQVTKWidgetEventPlayer.h
new file mode 100644
index 00000000..c17d93b8
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQVTKWidgetEventPlayer.h
@@ -0,0 +1,58 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQVTKWidgetEventPlayer.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqQVTKWidgetEventPlayer_h
+#define _pqQVTKWidgetEventPlayer_h
+
+#include "pqWidgetEventPlayer.h"
+
+#include <vgExport.h>
+
+/**
+Concrete implementation of pqWidgetEventPlayer that handles playback of "activate" events for buttons and menus.
+
+\sa pqEventPlayer
+*/
+class QT_TESTINGSUPPORT_EXPORT pqQVTKWidgetEventPlayer :
+  public pqWidgetEventPlayer
+{
+public:
+  pqQVTKWidgetEventPlayer(QObject* p = 0);
+
+  bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
+
+private:
+  pqQVTKWidgetEventPlayer(const pqQVTKWidgetEventPlayer&);
+  pqQVTKWidgetEventPlayer& operator=(const pqQVTKWidgetEventPlayer&);
+};
+
+#endif // !_pqQVTKWidgetEventPlayer_h
\ No newline at end of file
diff --git a/Libraries/QtTestingSupport/pqQVTKWidgetEventTranslator.cxx b/Libraries/QtTestingSupport/pqQVTKWidgetEventTranslator.cxx
new file mode 100644
index 00000000..ae97bfb9
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQVTKWidgetEventTranslator.cxx
@@ -0,0 +1,151 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQVTKWidgetEventTranslator.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqQVTKWidgetEventTranslator.h"
+
+#include <QEvent>
+#include <QMouseEvent>
+
+#include "QVTKWidget.h"
+pqQVTKWidgetEventTranslator::pqQVTKWidgetEventTranslator(QObject* p)
+  : pqWidgetEventTranslator(p)
+{
+}
+
+pqQVTKWidgetEventTranslator::~pqQVTKWidgetEventTranslator()
+{
+}
+
+bool pqQVTKWidgetEventTranslator::translateEvent(QObject* Object,
+                                                 QEvent* Event,
+                                                 bool& /*Error*/)
+{
+  QVTKWidget* const object = qobject_cast<QVTKWidget*>(Object);
+  if (!object)
+    {
+    return false;
+    }
+
+  bool handled = false;
+  switch (Event->type())
+    {
+    case QEvent::ContextMenu:
+      handled = true;
+      break;
+
+    case QEvent::MouseButtonPress:
+      {
+      QMouseEvent* mouseEvent = dynamic_cast<QMouseEvent*>(Event);
+      if (mouseEvent)
+        {
+        QSize size = object->size();
+        double normalized_x = mouseEvent->x() / static_cast<double>(size.width());
+        double normalized_y = mouseEvent->y() / static_cast<double>(size.height());
+        emit recordEvent(Object, "mousePress", QString("(%1,%2,%3,%4,%5)")
+                         .arg(normalized_x)
+                         .arg(normalized_y)
+                         .arg(mouseEvent->button())
+                         .arg(mouseEvent->buttons())
+                         .arg(mouseEvent->modifiers()));
+        }
+      }
+    handled = true;
+    break;
+
+    case QEvent::MouseButtonRelease:
+      {
+      QMouseEvent* mouseEvent = dynamic_cast<QMouseEvent*>(Event);
+      if (mouseEvent)
+        {
+        QSize size = object->size();
+        double normalized_x = mouseEvent->x() / static_cast<double>(size.width());
+        double normalized_y = mouseEvent->y() / static_cast<double>(size.height());
+        // Move to the place where the mouse was released and then release it.
+        // This mimicks drag without actually having to save all the intermediate
+        // mouse move positions.
+        emit recordEvent(Object, "mouseMove", QString("(%1,%2,%3,%4,%5)")
+                         .arg(normalized_x)
+                         .arg(normalized_y)
+                         .arg(mouseEvent->button())
+                         .arg(mouseEvent->buttons())
+                         .arg(mouseEvent->modifiers()));
+        emit recordEvent(Object, "mouseRelease", QString("(%1,%2,%3,%4,%5)")
+                         .arg(normalized_x)
+                         .arg(normalized_y)
+                         .arg(mouseEvent->button())
+                         .arg(mouseEvent->buttons())
+                         .arg(mouseEvent->modifiers()));
+        }
+      }
+    handled = true;
+    break;
+
+    case QEvent::Wheel:
+      {
+      QWheelEvent* wheelEvent = dynamic_cast<QWheelEvent*>(Event);
+      if (wheelEvent)
+        {
+        QSize size = object->size();
+        double normalized_x = wheelEvent->x() / static_cast<double>(size.width());
+        double normalized_y = wheelEvent->y() / static_cast<double>(size.height());
+        emit recordEvent(Object, "mouseWheel", QString("(%1,%2,%3,%4,%5)")
+                         .arg(normalized_x)
+                         .arg(normalized_y)
+                         .arg(wheelEvent->delta())
+                         .arg(wheelEvent->buttons())
+                         .arg(wheelEvent->modifiers()));
+        }
+      }
+    handled = true;
+    break;
+
+    case QEvent::KeyPress:
+    case QEvent::KeyRelease:
+      {
+      QKeyEvent* ke = static_cast<QKeyEvent*>(Event);
+      QString data = QString("%1:%2:%3:%4:%5:%6")
+                     .arg(ke->type())
+                     .arg(ke->key())
+                     .arg(static_cast<int>(ke->modifiers()))
+                     .arg(ke->text())
+                     .arg(ke->isAutoRepeat())
+                     .arg(ke->count());
+      emit recordEvent(Object, "keyEvent", data);
+      }
+    break;
+
+    default:
+      break;
+    }
+
+  return handled;
+}
\ No newline at end of file
diff --git a/Libraries/QtTestingSupport/pqQVTKWidgetEventTranslator.h b/Libraries/QtTestingSupport/pqQVTKWidgetEventTranslator.h
new file mode 100644
index 00000000..0963bc6b
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQVTKWidgetEventTranslator.h
@@ -0,0 +1,63 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQVTKWidgetEventTranslator.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqQVTKWidgetEventTranslator_h
+#define _pqQVTKWidgetEventTranslator_h
+
+#include "pqWidgetEventTranslator.h"
+
+#include <vgExport.h>
+
+/**
+Translates low-level Qt events into high-level ParaView events that can be recorded as test cases.
+
+\sa pqEventTranslator
+*/
+
+class QT_TESTINGSUPPORT_EXPORT pqQVTKWidgetEventTranslator :
+  public pqWidgetEventTranslator
+{
+  Q_OBJECT
+
+public:
+  pqQVTKWidgetEventTranslator(QObject* p = 0);
+  ~pqQVTKWidgetEventTranslator();
+
+  virtual bool translateEvent(QObject* Object, QEvent* Event, bool& Error);
+
+private:
+  pqQVTKWidgetEventTranslator(const pqQVTKWidgetEventTranslator&);
+  pqQVTKWidgetEventTranslator& operator=(const pqQVTKWidgetEventTranslator&);
+
+};
+
+#endif // !_pqQVTKWidgetEventTranslator_h
\ No newline at end of file
diff --git a/Libraries/QtTestingSupport/pqQteDoubleSliderEventPlayer.cxx b/Libraries/QtTestingSupport/pqQteDoubleSliderEventPlayer.cxx
new file mode 100644
index 00000000..9d4b78ee
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQteDoubleSliderEventPlayer.cxx
@@ -0,0 +1,83 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQteDoubleSliderEventPlayer.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqQteDoubleSliderEventPlayer.h"
+
+#include "pqEventDispatcher.h"
+
+#include <QApplication>
+#include <QtDebug>
+
+#include <qtDoubleSlider.h>
+
+//-----------------------------------------------------------------------------
+pqQteDoubleSliderEventPlayer::pqQteDoubleSliderEventPlayer(QObject* p)
+  : pqWidgetEventPlayer(p)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool pqQteDoubleSliderEventPlayer::playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error)
+{
+  double value = 0.0;
+
+  if (Command == "set_double")
+    {
+    value = Arguments.toDouble();
+    }
+  else if (Command == "set_xdouble")
+    {
+    QByteArray data = QByteArray::fromHex(Arguments.toAscii());
+    QDataStream stream(data);
+    stream >> value;
+    }
+  else
+    {
+    return false;
+    }
+
+  if (qtDoubleSlider* const object = qobject_cast<qtDoubleSlider*>(Object))
+    {
+    object->setValue(value);
+    return true;
+    }
+
+  if (Command == "set_double")
+    {
+    // let pqAbstractDoubleEventPlayer handle it if possible.
+    return false;
+    }
+
+  qCritical() << "calling set_xdouble on unhandled type" << Object;
+  Error = true;
+  return true;
+}
diff --git a/Libraries/QtTestingSupport/pqQteDoubleSliderEventPlayer.h b/Libraries/QtTestingSupport/pqQteDoubleSliderEventPlayer.h
new file mode 100644
index 00000000..7826c975
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQteDoubleSliderEventPlayer.h
@@ -0,0 +1,59 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQteDoubleSliderEventPlayer.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqQteDoubleSliderEventPlayer_h
+#define _pqQteDoubleSliderEventPlayer_h
+
+#include <pqWidgetEventPlayer.h>
+
+#include <vgExport.h>
+
+/**
+Concrete implementation of pqWidgetEventPlayer that handles playback of recorded qtDoubleSlider user input.
+
+\sa pqEventPlayer
+*/
+class QT_TESTINGSUPPORT_EXPORT pqQteDoubleSliderEventPlayer :
+  public pqWidgetEventPlayer
+{
+  Q_OBJECT
+
+public:
+  pqQteDoubleSliderEventPlayer(QObject* p = 0);
+
+  bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
+
+private:
+  Q_DISABLE_COPY(pqQteDoubleSliderEventPlayer)
+};
+
+#endif // !_pqQteDoubleSliderEventPlayer_h
\ No newline at end of file
diff --git a/Libraries/QtTestingSupport/pqQteDoubleSliderEventTranslator.cxx b/Libraries/QtTestingSupport/pqQteDoubleSliderEventTranslator.cxx
new file mode 100644
index 00000000..65f1cce1
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQteDoubleSliderEventTranslator.cxx
@@ -0,0 +1,91 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQteDoubleSliderEventTranslator.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqQteDoubleSliderEventTranslator.h"
+
+#include <QEvent>
+
+#include <qtDoubleSlider.h>
+
+//-----------------------------------------------------------------------------
+pqQteDoubleSliderEventTranslator::pqQteDoubleSliderEventTranslator(QObject* p)
+  : pqWidgetEventTranslator(p),
+    CurrentObject(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool pqQteDoubleSliderEventTranslator::translateEvent(QObject* Object, QEvent* Event, bool& /*Error*/)
+{
+  qtDoubleSlider* const object = qobject_cast<qtDoubleSlider*>(Object);
+  if (!object)
+    {
+    return false;
+    }
+
+  switch (Event->type())
+    {
+    case QEvent::Enter:
+      this->CurrentObject = Object;
+      connect(object, SIGNAL(valueChanged(double)),
+              this, SLOT(onValueChanged(double)));
+      break;
+    case QEvent::Leave:
+      disconnect(Object, 0, this, 0);
+      this->CurrentObject = 0;
+      break;
+    default:
+      break;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void pqQteDoubleSliderEventTranslator::onValueChanged(double Value)
+{
+  QString value = QString::number(Value);
+  if (qFuzzyCompare(value.toDouble(), Value))
+    {
+    emit recordEvent(this->CurrentObject, "set_double", value);
+    }
+  else
+    {
+    // QString::number() is not precise enough... use a raw representation of
+    // the value.
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+    stream << Value;
+    emit recordEvent(this->CurrentObject, "set_xdouble",
+                     QString::fromAscii(data.toHex()));
+    }
+}
diff --git a/Libraries/QtTestingSupport/pqQteDoubleSliderEventTranslator.h b/Libraries/QtTestingSupport/pqQteDoubleSliderEventTranslator.h
new file mode 100644
index 00000000..3a3059ad
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqQteDoubleSliderEventTranslator.h
@@ -0,0 +1,65 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqQteDoubleSliderEventTranslator.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqQteDoubleSliderEventTranslator_h
+#define _pqQteDoubleSliderEventTranslator_h
+
+#include "pqWidgetEventTranslator.h"
+
+#include <vgExport.h>
+
+/**
+Translates low-level Qt events into high-level ParaView events that can be recorded as test cases.
+
+\sa pqEventTranslator
+*/
+
+class QT_TESTINGSUPPORT_EXPORT pqQteDoubleSliderEventTranslator :
+  public pqWidgetEventTranslator
+{
+  Q_OBJECT
+
+public:
+  pqQteDoubleSliderEventTranslator(QObject* p = 0);
+
+  virtual bool translateEvent(QObject* Object, QEvent* Event, bool& Error);
+
+private:
+  Q_DISABLE_COPY(pqQteDoubleSliderEventTranslator)
+
+  QObject* CurrentObject;
+
+private slots:
+  void onValueChanged(double);
+};
+
+#endif // !_pqQteDoubleSliderEventTranslator_h
diff --git a/Libraries/QtTestingSupport/pqVgMixerEventPlayer.cxx b/Libraries/QtTestingSupport/pqVgMixerEventPlayer.cxx
new file mode 100644
index 00000000..8ff01526
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqVgMixerEventPlayer.cxx
@@ -0,0 +1,80 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqVgMixerEventPlayer.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqVgMixerEventPlayer.h"
+
+#include "pqEventDispatcher.h"
+
+#include <QApplication>
+#include <QtDebug>
+
+#include <vgMixerWidget.h>
+
+//-----------------------------------------------------------------------------
+pqVgMixerEventPlayer::pqVgMixerEventPlayer(QObject* p)
+  : pqWidgetEventPlayer(p)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool pqVgMixerEventPlayer::playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error)
+{
+  vgMixerWidget* const mixer = qobject_cast<vgMixerWidget*>(Object);
+
+  if (Command == "mixer_set_state")
+    {
+    if (mixer)
+      {
+      const QStringList args = Arguments.split(',');
+      mixer->setState(args.value(0).toInt(), !!args.value(1).toInt());
+      return true;
+      }
+    }
+  else if (Command == "mixer_set_value")
+    {
+    if (mixer)
+      {
+      const QStringList args = Arguments.split(',');
+      mixer->setValue(args.value(0).toInt(), args.value(1).toDouble());
+      return true;
+      }
+    }
+  else
+    {
+    return false;
+    }
+
+  qCritical() << "calling" << qPrintable(Command)
+              << "on unhandled type " << Object;
+  Error = true;
+  return true;
+}
diff --git a/Libraries/QtTestingSupport/pqVgMixerEventPlayer.h b/Libraries/QtTestingSupport/pqVgMixerEventPlayer.h
new file mode 100644
index 00000000..567df3a7
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqVgMixerEventPlayer.h
@@ -0,0 +1,59 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqVgMixerEventPlayer.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqVgMixerEventPlayer_h
+#define _pqVgMixerEventPlayer_h
+
+#include <pqWidgetEventPlayer.h>
+
+#include <vgExport.h>
+
+/**
+Concrete implementation of pqWidgetEventPlayer that handles playback of recorded qtDoubleSlider user input.
+
+\sa pqEventPlayer
+*/
+class QT_TESTINGSUPPORT_EXPORT pqVgMixerEventPlayer :
+  public pqWidgetEventPlayer
+{
+  Q_OBJECT
+
+public:
+  pqVgMixerEventPlayer(QObject* p = 0);
+
+  bool playEvent(QObject* Object, const QString& Command, const QString& Arguments, bool& Error);
+
+private:
+  Q_DISABLE_COPY(pqVgMixerEventPlayer)
+};
+
+#endif // !_pqVgMixerEventPlayer_h
\ No newline at end of file
diff --git a/Libraries/QtTestingSupport/pqVgMixerEventTranslator.cxx b/Libraries/QtTestingSupport/pqVgMixerEventTranslator.cxx
new file mode 100644
index 00000000..6d82b428
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqVgMixerEventTranslator.cxx
@@ -0,0 +1,109 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqVgMixerEventTranslator.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqVgMixerEventTranslator.h"
+
+#include <QEvent>
+
+#include <vgMixerWidget.h>
+
+//-----------------------------------------------------------------------------
+template <typename T> static bool childOf(QObject* Object)
+{
+  while (Object)
+    {
+    if (qobject_cast<T>(Object->parent()))
+      {
+      return true;
+      }
+    Object = Object->parent();
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+pqVgMixerEventTranslator::pqVgMixerEventTranslator(QObject* p)
+  : pqWidgetEventTranslator(p),
+    CurrentObject(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool pqVgMixerEventTranslator::translateEvent(QObject* Object, QEvent* Event, bool& /*Error*/)
+{
+  // Suppress recording events from individual mixer widgets
+  if (childOf<vgMixerWidget*>(Object))
+    {
+    return true;
+    }
+
+  vgMixerWidget* const object = qobject_cast<vgMixerWidget*>(Object);
+  if (!object)
+    {
+    return false;
+    }
+
+  switch (Event->type())
+    {
+    case QEvent::Enter:
+      this->CurrentObject = Object;
+      connect(object, SIGNAL(stateChanged(int, bool)),
+              this, SLOT(onStateChanged(int, bool)));
+      connect(object, SIGNAL(valueChanged(int, double)),
+              this, SLOT(onValueChanged(int, double)));
+      break;
+    case QEvent::Leave:
+      disconnect(Object, 0, this, 0);
+      this->CurrentObject = 0;
+      break;
+    default:
+      break;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void pqVgMixerEventTranslator::onStateChanged(int Key, bool State)
+{
+  QStringList args;
+  args << QString::number(Key) << QString::number(State);
+  emit recordEvent(this->CurrentObject, "mixer_set_state", args.join(","));
+}
+
+//-----------------------------------------------------------------------------
+void pqVgMixerEventTranslator::onValueChanged(int Key, double Value)
+{
+  QStringList args;
+  args << QString::number(Key) << QString::number(Value);
+  emit recordEvent(this->CurrentObject, "mixer_set_value", args.join(","));
+}
diff --git a/Libraries/QtTestingSupport/pqVgMixerEventTranslator.h b/Libraries/QtTestingSupport/pqVgMixerEventTranslator.h
new file mode 100644
index 00000000..1d7c789a
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqVgMixerEventTranslator.h
@@ -0,0 +1,66 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqVgMixerEventTranslator.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqVgMixerEventTranslator_h
+#define _pqVgMixerEventTranslator_h
+
+#include "pqWidgetEventTranslator.h"
+
+#include <vgExport.h>
+
+/**
+Translates low-level Qt events into high-level ParaView events that can be recorded as test cases.
+
+\sa pqEventTranslator
+*/
+
+class QT_TESTINGSUPPORT_EXPORT pqVgMixerEventTranslator :
+  public pqWidgetEventTranslator
+{
+  Q_OBJECT
+
+public:
+  pqVgMixerEventTranslator(QObject* p = 0);
+
+  virtual bool translateEvent(QObject* Object, QEvent* Event, bool& Error);
+
+private:
+  Q_DISABLE_COPY(pqVgMixerEventTranslator)
+
+  QObject* CurrentObject;
+
+private slots:
+  void onStateChanged(int, bool);
+  void onValueChanged(int, double);
+};
+
+#endif // !_pqVgMixerEventTranslator_h
diff --git a/Libraries/QtTestingSupport/pqXMLEventObserver.cxx b/Libraries/QtTestingSupport/pqXMLEventObserver.cxx
new file mode 100644
index 00000000..67977a85
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqXMLEventObserver.cxx
@@ -0,0 +1,107 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqXMLEventObserver.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqXMLEventObserver.h"
+
+#include <QDomDocument>
+#include <QDomElement>
+#include <QDomNode>
+#include <QTextStream>
+
+///////////////////////////////////////////////////////////////////////////////
+// pqXMLEventObserver::pqImplementation
+
+class pqXMLEventObserver::pqImplementation
+{
+public:
+  void initialize();
+
+  QDomDocument XML;
+  QDomNode RootNode;
+};
+
+void pqXMLEventObserver::pqImplementation::initialize()
+{
+  static const char* header = "version='1.0' encoding='UTF-8'";
+
+  // Note: the Qt documentation says not to use createProcessingInstruction to
+  // create the XML declaration, but there does not seem to be any other way to
+  // do so (short of writing the declaration as a preformatted string literal
+  // and using QDomDocument::setContent, which seems to defeat the purpose).
+
+  this->XML.clear();
+  this->XML.appendChild(this->XML.createProcessingInstruction("xml", header));
+  this->XML.appendChild(this->XML.createElement("pqevents"));
+  this->RootNode = this->XML.firstChildElement();
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// pqXMLEventObserver
+
+pqXMLEventObserver::pqXMLEventObserver(QObject* p)
+  : pqEventObserver(p), Implementation(new pqXMLEventObserver::pqImplementation)
+{
+}
+
+pqXMLEventObserver::~pqXMLEventObserver()
+{
+  this->setStream(0);
+}
+
+void pqXMLEventObserver::setStream(QTextStream* stream)
+{
+  if (this->Stream)
+    {
+    *this->Stream << this->Implementation->XML;
+    }
+  pqEventObserver::setStream(stream);
+  if (this->Stream)
+    {
+    this->Implementation->initialize();
+    }
+}
+
+void pqXMLEventObserver::onRecordEvent(
+  const QString& Widget,
+  const QString& Command,
+  const QString& Arguments)
+{
+  if (this->Stream)
+    {
+    QDomElement elem = this->Implementation->XML.createElement("pqevent");
+    elem.setAttribute("object", Widget);
+    elem.setAttribute("command", Command);
+    elem.setAttribute("arguments", Arguments);
+    this->Implementation->RootNode.appendChild(elem);
+    }
+}
diff --git a/Libraries/QtTestingSupport/pqXMLEventObserver.h b/Libraries/QtTestingSupport/pqXMLEventObserver.h
new file mode 100644
index 00000000..3946bc49
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqXMLEventObserver.h
@@ -0,0 +1,73 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqXMLEventObserver.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqXMLEventObserver_h
+#define _pqXMLEventObserver_h
+
+#include "pqEventObserver.h"
+
+#include <vgExport.h>
+
+/**
+Observes high-level ParaView events, and serializes them to a stream as XML
+for possible playback (as a test-case, demo, tutorial, etc).  To use,
+connect the onRecordEvent() slot to the pqEventTranslator::recordEvent()
+signal.
+
+\note Output is sent to the stream from this object's destructor, so you
+must ensure that it goes out of scope before trying to playback the stream.
+
+\sa pqEventTranslator, pqStdoutEventObserver, pqXMLEventSource.
+*/
+
+class QT_TESTINGSUPPORT_EXPORT pqXMLEventObserver : public pqEventObserver
+{
+  Q_OBJECT
+
+public:
+  pqXMLEventObserver(QObject* p);
+  ~pqXMLEventObserver();
+
+  virtual void setStream(QTextStream* stream);
+
+public slots:
+  void onRecordEvent(
+    const QString& Widget,
+    const QString& Command,
+    const QString& Arguments);
+
+private:
+  class pqImplementation;
+  const QScopedPointer<pqImplementation> Implementation;
+};
+
+#endif // !_pqXMLEventObserver_h
diff --git a/Libraries/QtTestingSupport/pqXMLEventSource.cxx b/Libraries/QtTestingSupport/pqXMLEventSource.cxx
new file mode 100644
index 00000000..b9315697
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqXMLEventSource.cxx
@@ -0,0 +1,116 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqXMLEventSource.cxx
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#include "pqXMLEventSource.h"
+
+#include <QDomDocument>
+#include <QDomElement>
+#include <QFile>
+#include <QtDebug>
+
+///////////////////////////////////////////////////////////////////////////////
+// pqXMLEventSource::pqImplementation
+
+class pqXMLEventSource::pqImplementation
+{
+public:
+  QDomDocument XML;
+  QDomNodeList Events;
+  int CurrentEvent;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// pqXMLEventSource
+
+pqXMLEventSource::pqXMLEventSource(QObject* p) :
+  pqEventSource(p),
+  Implementation(new pqImplementation())
+{
+}
+
+pqXMLEventSource::~pqXMLEventSource()
+{
+  delete this->Implementation;
+}
+
+void pqXMLEventSource::setContent(const QString& xmlfilename)
+{
+  QFile xml(xmlfilename);
+  if (!xml.open(QIODevice::ReadOnly))
+    {
+    qDebug() << "Failed to load" << xmlfilename;
+    return;
+    }
+
+  QString error;
+  int el, ec;
+  if (!this->Implementation->XML.setContent(&xml, &error, &el, &ec))
+    {
+    qDebug() << "Failed to parse" << xmlfilename;
+    qDebug() << "At" << qPrintable(QString("%1:%2:").arg(el).arg(ec))
+             << qPrintable(error);
+    return;
+    }
+
+  QDomElement elem = this->Implementation->XML.firstChildElement();
+  if (elem.tagName() != "pqevents")
+    {
+    qCritical() << xmlfilename << "is not an XML test case document";
+    return;
+    }
+
+  this->Implementation->Events = elem.childNodes();
+  this->Implementation->CurrentEvent = 0;
+}
+
+int pqXMLEventSource::getNextEvent(
+  QString& object,
+  QString& command,
+  QString& arguments)
+{
+  if (this->Implementation->Events.count() ==
+      this->Implementation->CurrentEvent)
+    {
+    return DONE;
+    }
+
+  QDomElement elem = this->Implementation->Events.at(
+    this->Implementation->CurrentEvent).toElement();
+
+  object = elem.attribute("object");
+  command = elem.attribute("command");
+  arguments = elem.attribute("arguments");
+
+  this->Implementation->CurrentEvent++;
+
+  return SUCCESS;
+}
diff --git a/Libraries/QtTestingSupport/pqXMLEventSource.h b/Libraries/QtTestingSupport/pqXMLEventSource.h
new file mode 100644
index 00000000..1d5c8370
--- /dev/null
+++ b/Libraries/QtTestingSupport/pqXMLEventSource.h
@@ -0,0 +1,65 @@
+/*=========================================================================
+
+   Program: ParaView
+   Module:    pqXMLEventSource.h
+
+   Copyright (c) 2005-2008 Sandia Corporation, Kitware Inc.
+   All rights reserved.
+
+   ParaView is a free software; you can redistribute it and/or modify it
+   under the terms of the ParaView license version 1.2.
+
+   See License_v1.2.txt for the full ParaView license.
+   A copy of this license can be obtained by contacting
+   Kitware Inc.
+   28 Corporate Drive
+   Clifton Park, NY 12065
+   USA
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+=========================================================================*/
+
+#ifndef _pqXMLEventSource_h
+#define _pqXMLEventSource_h
+
+#include "pqEventSource.h"
+//#include "pqCoreExport.h"
+
+#include <vgExport.h>
+
+class QString;
+
+/** Concrete implementation of pqEventSource that retrieves events recorded
+by pqXMLEventObserver */
+class QT_TESTINGSUPPORT_EXPORT /*PQCORE_EXPORT*/ pqXMLEventSource :
+  public pqEventSource
+{
+  Q_OBJECT
+public:
+  pqXMLEventSource(QObject* p = 0);
+  ~pqXMLEventSource();
+
+  virtual void setContent(const QString& path);
+
+  virtual int getNextEvent(
+    QString& object,
+    QString& command,
+    QString& arguments);
+
+private:
+  class pqImplementation;
+  pqImplementation* const Implementation;
+};
+
+#endif // !_pqXMLEventSource_h
diff --git a/Libraries/QtVgCommon/CMakeLists.txt b/Libraries/QtVgCommon/CMakeLists.txt
new file mode 100644
index 00000000..8cd00233
--- /dev/null
+++ b/Libraries/QtVgCommon/CMakeLists.txt
@@ -0,0 +1,43 @@
+project(qtVgCommon)
+
+include_directories("${CMAKE_CURRENT_BINARY_DIR}")
+
+set(sources
+    vgColor.cxx
+    vgGeoUtil.cxx
+    vgPluginLoader.cxx
+    vgRegionKeyframe.cxx
+    vgSwatchCache.cxx
+    vgTimeBase.cxx
+    "${CMAKE_CURRENT_BINARY_DIR}/vgPluginPaths.cxx"
+)
+
+set(qtVgCommonInstallHeaders
+  vgColor.h
+  vgDebug.h
+  vgFileDialog.h
+  vgGeoUtil.h
+  vgPluginLoader.h
+  vgRegionKeyframe.h
+  vgSwatchCache.h
+  vgTimeBase.h
+  vgTime.h
+  vgTimeMap.h
+  vgUnixTime.h
+)
+
+configure_file(
+  vgPluginPaths.cxx.in
+  "${CMAKE_CURRENT_BINARY_DIR}/vgPluginPaths.cxx"
+)
+
+add_library(${PROJECT_NAME} ${sources})
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS qtExtensions vgCommon
+  LINK_LIBRARIES LINK_PUBLIC ${QT_LIBRARIES}
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${qtVgCommonInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/QtVgCommon)
diff --git a/Libraries/QtVgCommon/vgColor.cxx b/Libraries/QtVgCommon/vgColor.cxx
new file mode 100644
index 00000000..a174b2ee
--- /dev/null
+++ b/Libraries/QtVgCommon/vgColor.cxx
@@ -0,0 +1,220 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgColor.h"
+
+#include <QColor>
+#include <QSettings>
+#include <QString>
+
+//-----------------------------------------------------------------------------
+vgColor::vgColor()
+{
+  this->d.color.red   = 0.0;
+  this->d.color.green = 0.0;
+  this->d.color.blue  = 0.0;
+  this->d.color.alpha = 0.0;
+}
+
+//-----------------------------------------------------------------------------
+vgColor::vgColor(const vgColor& other)
+{
+  *this = other;
+}
+
+//-----------------------------------------------------------------------------
+vgColor::vgColor(const QColor& qc)
+{
+  *this = qc;
+}
+
+//-----------------------------------------------------------------------------
+vgColor::vgColor(int red, int green, int blue, int alpha)
+{
+  *this = QColor(red, green, blue, alpha);
+}
+
+//-----------------------------------------------------------------------------
+vgColor::vgColor(double red, double green, double blue, double alpha)
+{
+  this->d.color.red   = red;
+  this->d.color.green = green;
+  this->d.color.blue  = blue;
+  this->d.color.alpha = alpha;
+}
+
+//-----------------------------------------------------------------------------
+vgColor& vgColor::operator=(const vgColor& other)
+{
+  this->d.color.red   = other.d.color.red;
+  this->d.color.green = other.d.color.green;
+  this->d.color.blue  = other.d.color.blue;
+  this->d.color.alpha = other.d.color.alpha;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vgColor& vgColor::operator=(const QColor& qc)
+{
+  this->d.color.red   = qc.redF();
+  this->d.color.green = qc.greenF();
+  this->d.color.blue  = qc.blueF();
+  this->d.color.alpha = qc.alphaF();
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vgColor::ComponentData& vgColor::data()
+{
+  return this->d;
+}
+
+//-----------------------------------------------------------------------------
+const vgColor::ComponentData& vgColor::constData() const
+{
+  return this->d;
+}
+
+//-----------------------------------------------------------------------------
+vgColor::ComponentData vgColor::value() const
+{
+  return this->d;
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::fillArray(double (&out)[3]) const
+{
+  out[0] = this->d.array[0];
+  out[1] = this->d.array[1];
+  out[2] = this->d.array[2];
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::fillArray(double (&out)[4]) const
+{
+  out[0] = this->d.array[0];
+  out[1] = this->d.array[1];
+  out[2] = this->d.array[2];
+  out[3] = this->d.array[3];
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::fillArray(unsigned char (&out)[3]) const
+{
+  vgColor::fillArray(this->toQColor(), out);
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::fillArray(unsigned char (&out)[4]) const
+{
+  vgColor::fillArray(this->toQColor(), out);
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::fillArray(const QColor& color, double (&out)[3])
+{
+  out[0] = color.redF();
+  out[1] = color.greenF();
+  out[2] = color.blueF();
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::fillArray(const QColor& color, double (&out)[4])
+{
+  out[0] = color.redF();
+  out[1] = color.greenF();
+  out[2] = color.blueF();
+  out[3] = color.alphaF();
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::fillArray(const QColor& color, unsigned char (&out)[3])
+{
+  out[0] = static_cast<unsigned char>(color.red());
+  out[1] = static_cast<unsigned char>(color.green());
+  out[2] = static_cast<unsigned char>(color.blue());
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::fillArray(const QColor& color, unsigned char (&out)[4])
+{
+  out[0] = static_cast<unsigned char>(color.red());
+  out[1] = static_cast<unsigned char>(color.green());
+  out[2] = static_cast<unsigned char>(color.blue());
+  out[3] = static_cast<unsigned char>(color.alpha());
+}
+
+//-----------------------------------------------------------------------------
+QString vgColor::toString(vgColor::StringType t) const
+{
+  bool haveAlpha = (this->d.color.alpha > 0.0);
+  int c[4] =
+    {
+    qRound(255.0 * this->d.color.red),
+    qRound(255.0 * this->d.color.green),
+    qRound(255.0 * this->d.color.blue),
+    qRound(255.0 * this->d.color.alpha)
+    };
+
+  if (t == vgColor::WithAlpha || (t == vgColor::AutoAlpha && haveAlpha))
+    {
+    QString f("%1,%2,%3,%4");
+    return f.arg(c[0]).arg(c[1]).arg(c[2]).arg(c[3]);
+    }
+  else
+    {
+    QString f("%1,%2,%3");
+    return f.arg(c[0]).arg(c[1]).arg(c[2]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QColor vgColor::toQColor() const
+{
+  return QColor::fromRgbF(this->d.color.red,  this->d.color.green,
+                          this->d.color.blue, this->d.color.alpha);
+}
+
+//-----------------------------------------------------------------------------
+vgColor vgColor::read(
+  const QSettings& settings, const QString& key, vgColor defaultValue)
+{
+  defaultValue.read(settings, key);
+  return defaultValue;
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::write(
+  QSettings& settings, const QString& key, const vgColor& value)
+{
+  value.write(settings, key);
+}
+
+//-----------------------------------------------------------------------------
+bool vgColor::read(const QSettings& settings, const QString& key)
+{
+  QString s = settings.value(key).toString();
+
+  if (!s.isEmpty())
+    {
+    QStringList parts = s.split(',');
+    int k = parts.count();
+    if (k == 3 || k == 4)
+      {
+      *this = QColor(parts[0].toInt(), parts[1].toInt(), parts[2].toInt(),
+                     k == 4 ? parts[3].toInt() : 255);
+      return true;
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vgColor::write(QSettings& settings, const QString& key) const
+{
+  settings.setValue(key, this->toString());
+}
diff --git a/Libraries/QtVgCommon/vgColor.h b/Libraries/QtVgCommon/vgColor.h
new file mode 100644
index 00000000..459c04a5
--- /dev/null
+++ b/Libraries/QtVgCommon/vgColor.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgColor_h
+#define __vgColor_h
+
+#include <vgExport.h>
+
+class QColor;
+class QSettings;
+class QString;
+
+class QTVG_COMMON_EXPORT vgColor
+{
+public:
+  typedef union
+    {
+    double array[4];
+    struct { double red, green, blue, alpha; } color;
+    } ComponentData;
+
+  vgColor();
+  vgColor(const vgColor&);
+  vgColor(const QColor&);
+
+  explicit vgColor(int red, int green, int blue, int alpha = 255);
+  explicit vgColor(double red, double green, double blue, double alpha = 1.0);
+
+  vgColor& operator=(const vgColor&);
+  vgColor& operator=(const QColor&);
+
+  ComponentData& data();
+  const ComponentData& constData() const;
+
+  ComponentData value() const;
+
+  void fillArray(double (&)[3]) const;
+  void fillArray(double (&)[4]) const;
+  void fillArray(unsigned char (&)[3]) const;
+  void fillArray(unsigned char (&)[4]) const;
+
+  static void fillArray(const QColor&, double (&)[3]);
+  static void fillArray(const QColor&, double (&)[4]);
+  static void fillArray(const QColor&, unsigned char (&)[3]);
+  static void fillArray(const QColor&, unsigned char (&)[4]);
+
+  enum StringType
+    {
+    NoAlpha,
+    WithAlpha,
+    AutoAlpha
+    };
+
+  QString toString(StringType = AutoAlpha) const;
+  QColor toQColor() const;
+
+  static vgColor read(const QSettings&, const QString& key,
+                      vgColor defaultValue);
+  static void write(QSettings&, const QString& key, const vgColor& value);
+
+  bool read(const QSettings&, const QString& key);
+  void write(QSettings&, const QString& key) const;
+
+protected:
+  ComponentData d;
+};
+
+#endif
diff --git a/Libraries/QtVgCommon/vgDebug.h b/Libraries/QtVgCommon/vgDebug.h
new file mode 100644
index 00000000..4ddf756c
--- /dev/null
+++ b/Libraries/QtVgCommon/vgDebug.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgDebug_h
+#define __vgDebug_h
+
+#include <QDebug>
+
+#ifdef __vgTimeStamp_h
+
+//-----------------------------------------------------------------------------
+inline QDebug& operator<<(QDebug& dbg, const vgTimeStamp& ts)
+{
+  dbg.nospace() << "(time ";
+  if (ts.HasTime())
+    {
+    dbg << qPrintable(QString::number(ts.Time, 'g', 12));
+    }
+  else
+    {
+    dbg << "<invalid>";
+    }
+  dbg << ", frame ";
+  if (ts.HasFrameNumber())
+    {
+    dbg << ts.FrameNumber;
+    }
+  else
+    {
+    dbg << "<invalid>";
+    }
+  dbg << ')';
+  return dbg.space();
+}
+
+#endif
+
+#ifdef __vgRange_h
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline QDebug& operator<<(QDebug& dbg, const vgRange<T>& r)
+{
+  dbg.nospace() << "(lower " << r.lower << ", upper " << r.upper << ')';
+  return dbg.space();
+}
+
+#endif
+
+#endif
diff --git a/Libraries/QtVgCommon/vgFileDialog.h b/Libraries/QtVgCommon/vgFileDialog.h
new file mode 100644
index 00000000..518f3b42
--- /dev/null
+++ b/Libraries/QtVgCommon/vgFileDialog.h
@@ -0,0 +1,22 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgFileDialog_h
+#define __vgFileDialog_h
+
+#if defined(ENABLE_QTTESTING)
+
+#include <pqFileDialog.h>
+typedef pqFileDialog vgFileDialog;
+
+#else
+
+#include <QFileDialog>
+typedef QFileDialog vgFileDialog;
+
+#endif
+
+#endif
diff --git a/Libraries/QtVgCommon/vgGeoUtil.cxx b/Libraries/QtVgCommon/vgGeoUtil.cxx
new file mode 100644
index 00000000..67eb22d3
--- /dev/null
+++ b/Libraries/QtVgCommon/vgGeoUtil.cxx
@@ -0,0 +1,298 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgGeoUtil.h"
+
+#include <QSettings>
+#include <QString>
+
+#include <qtKstReader.h>
+#include <qtMath.h>
+#include <qtStlUtil.h>
+
+#include <vgGeodesy.h>
+#include <vgGeoTypes.h>
+
+namespace // anonymous
+{
+
+#define die(_msg_) do { \
+  if (error) *error = _msg_; \
+  return vgGeocodedCoordinate(); \
+  } while(0)
+
+//-----------------------------------------------------------------------------
+const char* UTM_REGEXP =
+  "(?:[1-9]|[1-5][0-9]|60)[NS]\\s+\\d+(?:\\.\\d*)?[,\\s]\\s*\\d+(?:\\.\\d*)?";
+const char* UPS_REGEXP =
+  "[ABYZ]\\s+\\d+(?:\\.\\d*)?[,\\s]\\s*\\d+(?:\\.\\d*)?";
+const char* LLC_REGEXP =
+  "([+-]?\\d+):(\\d+):(\\d+(?:\\.\\d*)?)\\s*([nsew])?";
+
+//-----------------------------------------------------------------------------
+void resolveFormatMode(vgGeodesy::CoordFormatMode& fm)
+{
+  if (fm == vgGeodesy::FormatFromSettings)
+    {
+    const int ifm =
+      QSettings().value("CoordFormatMode", vgGeodesy::FormatDmsLatin1).toInt();
+    fm = static_cast<vgGeodesy::CoordFormatMode>(ifm);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedCoordinate parseUcs(const QString& text, QString& zone)
+{
+  const QStringList parts =
+    text.split(QRegExp("[,\\s]"), QString::SkipEmptyParts);
+
+  if (parts.count() != 3)
+    {
+    return vgGeocodedCoordinate();
+    }
+
+  // Extract northing and easting
+  vgGeocodedCoordinate result;
+  result.Easting = parts[1].toDouble();
+  result.Northing = parts[2].toDouble();
+
+  // Extract zone
+  zone = parts[0];
+
+  // Return result
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+bool parseLlPart(QString part, double& out)
+{
+  QRegExp re(LLC_REGEXP);
+  if (re.exactMatch(part))
+    {
+    part = QString("%1d%2'%3\"%4").arg(re.cap(1), re.cap(2),
+                                       re.cap(3), re.cap(4));
+    }
+  qtKstReader kst(part + ";\n");
+  return kst.readReal(out);
+}
+
+//-----------------------------------------------------------------------------
+qint64 decompose(double& value, double divisor, double tol)
+{
+  // Test for integer value
+  if (fabs(round(value) - value) < tol)
+    {
+    // Close to integer; return value as integer and set remainder to 0
+    const qint64 result = qRound64(value);
+    value = 0.0;
+    return result;
+    }
+  else
+    {
+    // Not an integer; get integer part and calculate remainder
+    const double ipart = trunc(value);
+    value = (value - ipart) * divisor;
+    return qRound64(ipart);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString dmsString(double coord, const QString& dp, const QString& dn,
+                  vgGeodesy::CoordFormatMode fm)
+{
+  QString resultTemplate;
+
+  switch (fm)
+    {
+    case vgGeodesy::FormatDmsColon:
+      resultTemplate = QString::fromAscii("%1:%2:%3 %4");
+      break;
+    case vgGeodesy::FormatDmsAscii:
+      resultTemplate = QString::fromAscii("%1d%2\'%3\"%4");
+      break;
+    case vgGeodesy::FormatDmsLatin1:
+      resultTemplate = QString::fromUtf8("%1\xc2\xb0%2\'%3\"%4");
+      break;
+    case vgGeodesy::FormatDmsUnicode:
+      resultTemplate =
+        QString::fromUtf8("%1\xc2\xb0%2\xe2\x80\xb2%3\xe2\x80\xb3%4");
+      break;
+    default:
+      qWarning().nospace() << __FUNCTION__ << ": invalid format mode " << fm;
+      return QString();
+    }
+
+  // Decompose into D,M,S parts, using a 'close to integer' tolerance roughly
+  // equal to our display precision, so that we avoid showing silly things
+  // like '19:59:60'
+  const QString& ds = (coord > 0.0 ? dp : dn);
+  double sp = fabs(coord);
+  const qint64 dv = decompose(sp, 60.0, 0.005 / 3600.0);
+  const qint64 mv = decompose(sp, 60.0, 0.005 / 60.0);
+  sp = 0.01 * round(sp * 100.0);
+
+  return resultTemplate.arg(dv).arg(mv).arg(sp, 0, 'f', 2).arg(ds);
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vgGeocodedCoordinate vgGeodesy::parseCoordinate(
+  const QString& text, int gcs, QString* error)
+{
+  // Ensure coordinate system is valid
+  if (gcs != LatLon_Wgs84 && gcs != LatLon_Nad83)
+    {
+    die("Coordinate system not recognized.");
+    }
+
+  // Check if this looks like UTM
+  const QString utext = text.toUpper();
+  if (QRegExp(UTM_REGEXP).exactMatch(utext))
+    {
+    QString zone;
+    vgGeocodedCoordinate result = parseUcs(text, zone);
+
+    // Extract zone
+    const bool north = (zone.endsWith('N'));
+    const int zoneNum = zone.mid(0, zone.length() - 1).toInt();
+
+    if (gcs == LatLon_Nad83)
+      {
+      // Handle NAD '83 zone (different base for 1-23, 59-60; others invalid)
+      if (north && zoneNum <= 23)
+        {
+        result.GCS = UTM_Nad83NorthWest + zoneNum;
+        }
+      else if (north && zoneNum >= 59)
+        {
+        result.GCS = UTM_Nad83NorthEast + zoneNum;
+        }
+      else
+        {
+        static const char* format = "UTM zone %1 not supported with NAD '83.";
+        die(QString(format).arg(zoneNum));
+        }
+      }
+    else
+      {
+      // Handle WGS '84 zone
+      const int base = (north ? UTM_Wgs84North : UTM_Wgs84South);
+      result.GCS = base + zoneNum ;
+      }
+
+    return result;
+    }
+
+  // Check if this looks like UPS
+  if (QRegExp(UPS_REGEXP).exactMatch(utext))
+    {
+    if (gcs == LatLon_Nad83)
+      {
+      die("UPS coordinates not supported with NAD '83.");
+      }
+
+    QString zone;
+    vgGeocodedCoordinate result = parseUcs(text, zone);
+    // \TODO set coordinate GCS and return result; might have to adjust
+    //       depending on zone
+    Q_UNUSED(result);
+    die("UPS coordinates not supported at this time");
+    }
+
+  // Try to parse as lat/long, which we do by taking advantage of qtKstParser's
+  // built-in support for arc-length number forms; must have exactly two parts!
+  const QStringList llParts =
+    text.toLower().split(QRegExp("[,\\s]"), QString::SkipEmptyParts);
+  if (llParts.count() == 2)
+    {
+    vgGeocodedCoordinate result;
+    double& lat = result.Latitude, &lon = result.Longitude;
+
+    // Check if coordinates are named in reverse
+    const bool switched =
+      llParts[0].endsWith('e') || llParts[0].endsWith('w');
+
+    // Attempt to extract coordinates
+    if (parseLlPart(llParts[0], switched ? lon : lat) &&
+        parseLlPart(llParts[1], switched ? lat : lon))
+      {
+      // Success
+      result.GCS = gcs;
+      return result;
+      }
+    }
+
+  die("Coordinate syntax not recognized.");
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedPoly vgGeodesy::regionFromMgrs(const QString& mgrs)
+{
+  return regionFromMgrs(qPrintable(mgrs));
+}
+
+//-----------------------------------------------------------------------------
+QString vgGeodesy::coordString(
+  double latitude, double longitude, CoordFormatMode fm)
+{
+  resolveFormatMode(fm);
+
+  if (fm == FormatDecimal)
+    {
+    return QString().sprintf("%+.6f, %+.6f", latitude, longitude);
+    }
+  else if (fm == FormatMgrs)
+    {
+    const vgGeocodedCoordinate c(latitude, longitude, LatLon_Wgs84);
+    return qtString(vgGeodesy::mgrs(c));
+    }
+  else
+    {
+    return dmsString(latitude,  "N", "S", fm) + ", " +
+           dmsString(longitude, "E", "W", fm);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vgGeodesy::coordString(
+  const vgGeocodedCoordinate& coord, bool* isValid, CoordFormatMode fm)
+{
+  resolveFormatMode(fm);
+
+  bool dummy;
+  bool& valid = (isValid ? *isValid : dummy);
+  valid = true;
+
+  if (fm == FormatMgrs)
+    {
+    // MGRS conversion handles GCS conversion
+    return qtString(mgrs(coord));
+    }
+
+  // TODO handle UTM coordinates
+  switch (coord.GCS)
+    {
+    case LatLon_Wgs84:
+      return coordString(coord.Latitude, coord.Longitude, fm) + " (WGS '84)";
+    case LatLon_Nad83:
+      return coordString(coord.Latitude, coord.Longitude, fm) + " (NAD '83)";
+    case -1:
+      valid = false;
+      return "(empty or invalid)";
+    default:
+      // TODO convert to lat/lon?
+      valid = false;
+      return QString("(Unable to convert from GCS %1)").arg(coord.GCS);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vgGeodesy::coordString(
+  const vgGeocodedCoordinate& coord, vgGeodesy::CoordFormatMode fm)
+{
+  return coordString(coord, 0, fm);
+}
diff --git a/Libraries/QtVgCommon/vgGeoUtil.h b/Libraries/QtVgCommon/vgGeoUtil.h
new file mode 100644
index 00000000..6fbd1074
--- /dev/null
+++ b/Libraries/QtVgCommon/vgGeoUtil.h
@@ -0,0 +1,48 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgGeoUtil_h
+#define __vgGeoUtil_h
+
+#include <vgExport.h>
+
+class QString;
+
+struct vgGeocodedCoordinate;
+struct vgGeocodedPoly;
+
+namespace vgGeodesy
+{
+  enum CoordFormatMode
+    {
+    FormatFromSettings = -1,
+    FormatDecimal = 0,
+    FormatDmsAscii,     // Use only ASCII characters for separators
+    FormatDmsLatin1,    // Use Latin-1 degree symbol only
+    FormatDmsUnicode,   // Use UNICODE separators, including (double) prime
+    FormatDmsColon,     // Use colons for separators
+    FormatMgrs
+    // TODO should use QFlags to separate formatting of already-lat-lon versus
+    //      forcing GCS conversion
+    };
+
+  QTVG_COMMON_EXPORT vgGeocodedCoordinate parseCoordinate(
+    const QString&, int gcs, QString* error);
+
+  QTVG_COMMON_EXPORT vgGeocodedPoly regionFromMgrs(const QString&);
+
+  QTVG_COMMON_EXPORT QString coordString(
+    double latitude, double longitude, CoordFormatMode = FormatFromSettings);
+
+  QTVG_COMMON_EXPORT QString coordString(
+    const vgGeocodedCoordinate&, bool* isValid = 0,
+    CoordFormatMode = FormatFromSettings);
+
+  QTVG_COMMON_EXPORT QString coordString(
+    const vgGeocodedCoordinate&, CoordFormatMode);
+}
+
+#endif
diff --git a/Libraries/QtVgCommon/vgPluginLoader.cxx b/Libraries/QtVgCommon/vgPluginLoader.cxx
new file mode 100644
index 00000000..89e1286c
--- /dev/null
+++ b/Libraries/QtVgCommon/vgPluginLoader.cxx
@@ -0,0 +1,139 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgPluginLoader.h"
+
+#include <QDir>
+#include <QHash>
+#include <QLibrary>
+#include <QObject>
+#include <QSettings>
+#include <QStringList>
+#include <QPluginLoader>
+
+#include <qtDebugImpl.h>
+#include <qtGlobal.h>
+#include <qtMap.h>
+
+QTE_DEBUG_AREA(vgDebug, PluginLoader, false);
+
+#define vgplDebug() qtDebug(vgDebugPluginLoader)
+
+namespace vgPluginLoader
+{
+  extern const char* const builtinPaths[];
+}
+
+//-----------------------------------------------------------------------------
+class vgPluginLoaderInstance
+{
+public:
+  vgPluginLoaderInstance();
+
+  void loadAll(const QDir& path);
+  void load(const QString& name);
+  void load(QObject*);
+
+  QObjectList PluginInstanceObjects;
+};
+
+QTE_PRIVATE_SINGLETON(vgPluginLoaderInstance, plInstance)
+
+//-----------------------------------------------------------------------------
+vgPluginLoaderInstance::vgPluginLoaderInstance()
+{
+  // Load plugins, starting with those in our built-in paths...
+  for (const char* const* dirp = vgPluginLoader::builtinPaths; *dirp; ++dirp)
+    {
+    const QString dir = QString::fromLocal8Bit(*dirp);
+    vgplDebug() << "Searching built-in path" << dir << "for plugins";
+    this->loadAll(dir + "/plugins");
+    }
+  // ...then those in VG_PLUGIN_PATH
+  QByteArray envPath = qgetenv("VG_PLUGIN_PATH");
+  if (!envPath.isEmpty())
+    {
+    vgplDebug() << "Searching environment path(s)" << envPath << "for plugins";
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
+    QChar pathSep(';');
+#else
+    QChar pathSep(':');
+#endif
+    const QStringList paths =
+      QString::fromLocal8Bit(envPath).split(pathSep, QString::SkipEmptyParts);
+    foreach (const QString& path, paths)
+      {
+      this->loadAll(path + "/plugins");
+      }
+    }
+
+  // Also load plugins specified by QSettings but not in VG_PLUGIN_PATH
+  QSettings settings;
+  settings.beginGroup("Plugins");
+  foreach (const QString& key, settings.childKeys())
+    {
+    const QString name = settings.value(key).toString();
+    vgplDebug() << "Attempting to load plugin" << name
+                << "specified in settings";
+    this->load(name);
+    }
+
+  // Finally, load any imported plugins
+  foreach (QObject* plugin, QPluginLoader::staticInstances())
+    {
+    vgplDebug() << "Registering static plugin" << plugin;
+    this->load(plugin);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgPluginLoaderInstance::loadAll(const QDir& path)
+{
+  foreach (const QString& file, path.entryList(QDir::Files))
+    {
+    if (QLibrary::isLibrary(file))
+      {
+      vgplDebug() << "Attempting to load possible plugin" << file
+                  << "from environment path";
+      this->load(path.absoluteFilePath(file));
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgPluginLoaderInstance::load(const QString& name)
+{
+  QPluginLoader loader(name);
+  this->load(loader.instance());
+  if (qtDebug::isAreaActive(vgDebugPluginLoader))
+    {
+    if (loader.isLoaded())
+      {
+      vgplDebug() << "Loading of plugin" << name << "succeeded";
+      }
+    else
+      {
+      vgplDebug() << "Loading of plugin" << name << "failed:"
+                  << loader.errorString();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgPluginLoaderInstance::load(QObject* plugin)
+{
+  if (plugin)
+    {
+    this->PluginInstanceObjects.append(plugin);
+    vgplDebug() << "Plugin" << plugin << "registered";
+    }
+}
+
+//-----------------------------------------------------------------------------
+QObjectList vgPluginLoader::plugins()
+{
+  return plInstance()->PluginInstanceObjects;
+}
diff --git a/Libraries/QtVgCommon/vgPluginLoader.h b/Libraries/QtVgCommon/vgPluginLoader.h
new file mode 100644
index 00000000..d858155b
--- /dev/null
+++ b/Libraries/QtVgCommon/vgPluginLoader.h
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgPluginLoader_h
+#define __vgPluginLoader_h
+
+#include <QObject>
+
+#include <vgExport.h>
+
+//-----------------------------------------------------------------------------
+namespace vgPluginLoader
+{
+  /// Get list of all plugin instance objects.
+  ///
+  /// This method returns the list of all plugin instance objects that can be
+  /// successfully loaded. If plugins have already been loaded, it returns
+  /// quickly. Otherwise, plugins are loaded when the function is called.
+  QTVG_COMMON_EXPORT QObjectList plugins();
+};
+
+#endif
diff --git a/Libraries/QtVgCommon/vgPluginPaths.cxx.in b/Libraries/QtVgCommon/vgPluginPaths.cxx.in
new file mode 100644
index 00000000..bac1cc0f
--- /dev/null
+++ b/Libraries/QtVgCommon/vgPluginPaths.cxx.in
@@ -0,0 +1,8 @@
+namespace vgPluginLoader
+{
+  extern const char* const builtinPaths[] =
+    {
+    "${CMAKE_INSTALL_PREFIX}",
+    0
+    };
+}
diff --git a/Libraries/QtVgCommon/vgRegionKeyframe.cxx b/Libraries/QtVgCommon/vgRegionKeyframe.cxx
new file mode 100644
index 00000000..32bbdd81
--- /dev/null
+++ b/Libraries/QtVgCommon/vgRegionKeyframe.cxx
@@ -0,0 +1,117 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgRegionKeyframe.h"
+
+#include <QApplication>
+#include <QDebug>
+#include <QDomDocument>
+#include <QDomNode>
+#include <QFile>
+#include <QMessageBox>
+
+//-----------------------------------------------------------------------------
+QList<vgRegionKeyframe> vgRegionKeyframe::readFromFile(QString fileName)
+{
+  QFile file(fileName);
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    QString msg = "Unable to open file \"%1\" for reading: %2";
+    QMessageBox::critical(qApp->activeWindow(), "Error reading file",
+                          msg.arg(fileName).arg(file.errorString()));
+    return QList<vgRegionKeyframe>();
+    }
+
+  QList<vgRegionKeyframe> loadedKeyframes;
+
+  QByteArray data = file.readAll();
+  if (data.startsWith("<?xml"))
+    {
+    QDomDocument doc;
+    int el, ec;
+    QString et;
+    if (!doc.setContent(data, &et, &el, &ec))
+      {
+      QString msg =
+        "The file \"%1\" does not appear to be a valid XML document"
+        "\n\n%2:%3: %4";
+      msg = msg.arg(fileName).arg(el).arg(ec).arg(et);
+      QMessageBox::critical(qApp->activeWindow(), "Error reading file", msg);
+      return QList<vgRegionKeyframe>();
+      }
+    int readErrors = 0;
+
+    // Get the block
+    QDomNodeList blocks = doc.elementsByTagName("queryRegionElements");
+    if (blocks.isEmpty())
+      {
+      QMessageBox::warning(qApp->activeWindow(), "Error reading file",
+                           "No query region was found");
+      return QList<vgRegionKeyframe>();
+      }
+
+    // Get the region elements
+    QDomNodeList elements = blocks.item(0).childNodes();
+    for (uint i = 0; i < elements.length(); ++i)
+      {
+      // Check if this element is the correct tag
+      QDomElement e = elements.item(i).toElement();
+      if (e.tagName() != "regionElement")
+        {
+        continue;
+        }
+
+      // Get image region
+      QRect rect;
+      if (!(e.hasAttribute("x") && e.hasAttribute("y") &&
+            e.hasAttribute("width") && e.hasAttribute("height")))
+        {
+        qDebug() << "At block 0, element" << i
+                 << "- missing one or more attributes"
+                    " describing the image region";
+        ++readErrors;
+        continue;
+        }
+      rect.setTop(e.attribute("y").toInt());
+      rect.setLeft(e.attribute("x").toInt());
+      rect.setWidth(e.attribute("width").toInt());
+      rect.setHeight(e.attribute("height").toInt());
+
+      // Get frame number
+      if (!e.hasAttribute("frameNumber"))
+        {
+        qDebug() << "At block 0, element" << i
+                 << "- missing 'frameNumber' attribute";
+        ++readErrors;
+        continue;
+        }
+      unsigned int frameNumber = e.attribute("frameNumber").toUInt();
+
+      // Add keyframe
+      vgRegionKeyframe kf;
+      kf.Region = rect;
+      kf.Time = vgTimeStamp::fromFrameNumber(frameNumber);
+      loadedKeyframes.append(kf);
+      }
+
+    if (readErrors)
+      {
+      QString msg = (readErrors > 1
+                     ? "%1 keyframes were not valid and have been discarded."
+                     : "%1 keyframe was not valid and has been discarded.");
+      QMessageBox::warning(qApp->activeWindow(), "Errors occurred",
+                           msg.arg(readErrors));
+      }
+    }
+  else
+    {
+    // \TODO KST-based file format not implemented yet!
+    QMessageBox::warning(qApp->activeWindow(), "Not implemented",
+                         "Reading of .vvk files is not implemented yet");
+    }
+
+  return loadedKeyframes;
+}
diff --git a/Libraries/QtVgCommon/vgRegionKeyframe.h b/Libraries/QtVgCommon/vgRegionKeyframe.h
new file mode 100644
index 00000000..14fef260
--- /dev/null
+++ b/Libraries/QtVgCommon/vgRegionKeyframe.h
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgRegionKeyframe_h
+#define __vgRegionKeyframe_h
+
+#include <QList>
+#include <QRect>
+#include <QString>
+
+#include <vgExport.h>
+
+#include <vgTimeStamp.h>
+
+struct QTVG_COMMON_EXPORT vgRegionKeyframe
+{
+  vgTimeStamp Time;
+  QRect Region;
+
+  static QList<vgRegionKeyframe> readFromFile(QString fileName);
+};
+
+#endif
diff --git a/Libraries/QtVgCommon/vgSwatchCache.cxx b/Libraries/QtVgCommon/vgSwatchCache.cxx
new file mode 100644
index 00000000..eaf89758
--- /dev/null
+++ b/Libraries/QtVgCommon/vgSwatchCache.cxx
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgSwatchCache.h"
+
+#include <QCache>
+#include <QColor>
+#include <QPixmap>
+
+QTE_IMPLEMENT_D_FUNC(vgSwatchCache)
+
+//-----------------------------------------------------------------------------
+class vgSwatchCachePrivate
+{
+public:
+  vgSwatchCachePrivate(int ssize, int csize) :
+    size(ssize), cache(csize > 0 ? csize : 100) {}
+
+  int size;
+  mutable QCache<quint32, QPixmap> cache;
+};
+
+//-----------------------------------------------------------------------------
+vgSwatchCache::vgSwatchCache(int swatchSize, int cacheSize) :
+  d_ptr(new vgSwatchCachePrivate(swatchSize, cacheSize))
+{
+}
+
+//-----------------------------------------------------------------------------
+vgSwatchCache::~vgSwatchCache()
+{
+}
+
+//-----------------------------------------------------------------------------
+QPixmap vgSwatchCache::swatch(const QColor& color) const
+{
+  QTE_D_CONST(vgSwatchCache);
+
+  quint32 key = color.rgba();
+  if (!d->cache.contains(key))
+    {
+    QPixmap* pixmap = new QPixmap(d->size, d->size);
+    pixmap->fill(color);
+    d->cache.insert(key, pixmap);
+    }
+  return *d->cache[key];
+}
diff --git a/Libraries/QtVgCommon/vgSwatchCache.h b/Libraries/QtVgCommon/vgSwatchCache.h
new file mode 100644
index 00000000..65288561
--- /dev/null
+++ b/Libraries/QtVgCommon/vgSwatchCache.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgSwatchCache_h
+#define __vgSwatchCache_h
+
+#include <QScopedPointer>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class QColor;
+class QPixmap;
+
+class vgSwatchCachePrivate;
+
+class QTVG_COMMON_EXPORT vgSwatchCache
+{
+public:
+  explicit vgSwatchCache(int swatchSize = 10, int cacheSize = 100);
+  ~vgSwatchCache();
+
+  QPixmap swatch(const QColor&) const;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgSwatchCache)
+
+private:
+  QTE_DECLARE_PRIVATE(vgSwatchCache)
+  Q_DISABLE_COPY(vgSwatchCache)
+};
+
+#endif
diff --git a/Libraries/QtVgCommon/vgTime.h b/Libraries/QtVgCommon/vgTime.h
new file mode 100644
index 00000000..428f670e
--- /dev/null
+++ b/Libraries/QtVgCommon/vgTime.h
@@ -0,0 +1,66 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgTime_h
+#define __vgTime_h
+
+#include "vgTimeBase.h"
+
+// NOTE: This class is not intended to be used directly. See vgUnixTime.h for
+// a usable specialization of this template.
+
+template <typename TimeTraits>
+class vgTime : public vgTimeBase
+{
+public:
+  vgTime(const vgTime& other) : vgTimeBase(other) {}
+
+  explicit vgTime(qint64 microseconds) :
+    vgTimeBase(microseconds + TimeTraits::EpochOffset) {}
+
+  explicit vgTime(const QDateTime& dateTime) : vgTimeBase(dateTime) {}
+
+  inline vgTime(double time, double unitsPerSecond = 1e6)
+    : vgTimeBase(fromDouble(time, unitsPerSecond)) {}
+
+  inline qint64 toInt64() const;
+  inline double toDouble(double unitsPerSecond) const;
+
+  inline vgTime fromDouble(double time, double unitsPerSecond = 1e6);
+};
+
+//-----------------------------------------------------------------------------
+template <typename TimeTraits>
+vgTime<TimeTraits> vgTime<TimeTraits>::fromDouble(
+  double time, double unitsPerSecond)
+{
+  if (!qFuzzyCompare(unitsPerSecond, 1e6))
+    {
+    time *= 1e6 / unitsPerSecond;
+    }
+  return vgTime(qRound64(time));
+}
+
+//-----------------------------------------------------------------------------
+template <typename TimeTraits>
+qint64 vgTime<TimeTraits>::toInt64() const
+{
+  return this->unixTime - TimeTraits::EpochOffset;
+}
+
+//-----------------------------------------------------------------------------
+template <typename TimeTraits>
+double vgTime<TimeTraits>::toDouble(double unitsPerSecond) const
+{
+  double time = this->toInt64();
+  if (!qFuzzyCompare(unitsPerSecond, 1e6))
+    {
+    time *= unitsPerSecond / 1e6;
+    }
+  return time;
+}
+
+#endif
diff --git a/Libraries/QtVgCommon/vgTimeBase.cxx b/Libraries/QtVgCommon/vgTimeBase.cxx
new file mode 100644
index 00000000..7529e3b6
--- /dev/null
+++ b/Libraries/QtVgCommon/vgTimeBase.cxx
@@ -0,0 +1,34 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgTimeBase.h"
+
+#include <QDateTime>
+#include <QString>
+
+//-----------------------------------------------------------------------------
+vgTimeBase::vgTimeBase(const QDateTime& dateTime) :
+  unixTime(dateTime.toMSecsSinceEpoch() * 1000)
+{
+}
+
+//-----------------------------------------------------------------------------
+QDateTime vgTimeBase::toDateTime() const
+{
+  return QDateTime::fromMSecsSinceEpoch(this->unixTime / 1000);
+}
+
+//-----------------------------------------------------------------------------
+QString vgTimeBase::dateString() const
+{
+  return this->toDateTime().toUTC().toString("yyyy-MM-dd");
+}
+
+//-----------------------------------------------------------------------------
+QString vgTimeBase::timeString() const
+{
+  return this->toDateTime().toUTC().toString("hh:mm:ss.zzz");
+}
diff --git a/Libraries/QtVgCommon/vgTimeBase.h b/Libraries/QtVgCommon/vgTimeBase.h
new file mode 100644
index 00000000..346a9b62
--- /dev/null
+++ b/Libraries/QtVgCommon/vgTimeBase.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgTimeBase_h
+#define __vgTimeBase_h
+
+#include <QtGlobal> // for qint64
+
+#include <vgExport.h>
+
+class QDateTime;
+class QString;
+
+// NOTE
+// The time values used by this class are based on the UNIX standard epoch
+// (1970-01-01).
+
+class QTVG_COMMON_EXPORT vgTimeBase
+{
+public:
+  vgTimeBase(const vgTimeBase& other) : unixTime(other.unixTime) {}
+
+  explicit vgTimeBase(qint64 microseconds) : unixTime(microseconds) {}
+
+  explicit vgTimeBase(const QDateTime& dateTime);
+
+  qint64    toInt64() const { return this->unixTime; }
+  QDateTime toDateTime() const;
+
+  QString dateString() const;
+  QString timeString() const;
+
+protected:
+  qint64 unixTime;
+};
+
+#endif
diff --git a/Libraries/QtVgCommon/vgTimeMap.h b/Libraries/QtVgCommon/vgTimeMap.h
new file mode 100644
index 00000000..3b3fec2e
--- /dev/null
+++ b/Libraries/QtVgCommon/vgTimeMap.h
@@ -0,0 +1,132 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgTimeMap_h
+#define __vgTimeMap_h
+
+#include <QMap>
+
+#include <vgTimeStamp.h>
+#include <vgNamespace.h>
+
+//-----------------------------------------------------------------------------
+template <typename Value>
+class vgTimeMap : public QMap<vgTimeStamp, Value>
+{
+public:
+  typedef typename QMap<vgTimeStamp, Value>::iterator iterator;
+  typedef typename QMap<vgTimeStamp, Value>::const_iterator const_iterator;
+
+  vgTimeMap() {}
+  vgTimeMap(const vgTimeMap<Value>& other) : QMap<vgTimeStamp, Value>(other) {}
+  ~vgTimeMap() {}
+
+  using QMap<vgTimeStamp, Value>::find;
+  using QMap<vgTimeStamp, Value>::constFind;
+
+  iterator find(vgTimeStamp pos, vg::SeekMode direction);
+  const_iterator find(vgTimeStamp pos, vg::SeekMode direction) const;
+  const_iterator constFind(vgTimeStamp pos, vg::SeekMode direction) const;
+};
+
+//-----------------------------------------------------------------------------
+template <typename Value>
+typename vgTimeMap<Value>::const_iterator vgTimeMap<Value>::constFind(
+  vgTimeStamp pos, vg::SeekMode direction) const
+{
+  // Check for empty map or invalid request
+  if (this->count() < 1 || !pos.IsValid())
+    {
+    return this->constEnd();
+    }
+
+  const_iterator iter;
+
+  switch (direction)
+    {
+    case vg::SeekExact:
+      // Exact is easy, find() does what we need
+      return this->find(pos);
+
+    case vg::SeekLowerBound:
+      // Lower is easy, lowerBound() does what we need
+      return this->lowerBound(pos);
+
+    case vg::SeekNext:
+      // Next is easy, upperBound() does what we need
+      return this->upperBound(pos);
+
+    case vg::SeekUpperBound:
+      // Check first for exact match
+      iter = this->find(pos);
+      if (iter != this->end())
+        {
+        return iter;
+        }
+
+      // Check for an answer
+      if (pos < this->begin().key())
+        {
+        return this->end();
+        }
+
+      // upperBound() gets us the position *after* the one we want, so return
+      // the preceding position (we know this exists because count() > 0)
+      return --this->upperBound(pos);
+
+    case vg::SeekPrevious:
+      // Check for an answer
+      if (pos <= this->begin().key())
+        {
+        return this->end();
+        }
+
+      // lowerBound() gets us the position *after* the one we want, so return
+      // the preceding position (we know this exists because of the previous
+      // test)
+      return --this->lowerBound(pos);
+
+
+    default: // Nearest
+      // Find the first item >= pos; it will be this or the one preceding
+      iter = this->upperBound(pos);
+      // If upperBound() falls off the end, we want the last valid position
+      if (iter == this->end())
+        {
+        return --iter;
+        }
+      // If item == pos, return that
+      else if (iter == this->begin())
+        {
+        return iter;
+        }
+      else
+        {
+        // Check if the distance to next is less than to previous
+        return ((iter.key() - pos) < (pos - (iter - 1).key()))
+                 ? iter // Yes; return next
+                 : --iter; // No; return previous
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename Value>
+typename vgTimeMap<Value>::const_iterator vgTimeMap<Value>::find(
+  vgTimeStamp pos, vg::SeekMode direction) const
+{
+  return this->constFind(pos, direction);
+}
+
+//-----------------------------------------------------------------------------
+template <typename Value>
+typename vgTimeMap<Value>::iterator vgTimeMap<Value>::find(
+  vgTimeStamp pos, vg::SeekMode direction)
+{
+  return iterator(this->constFind(pos, direction));
+}
+
+#endif
diff --git a/Libraries/QtVgCommon/vgUnixTime.h b/Libraries/QtVgCommon/vgUnixTime.h
new file mode 100644
index 00000000..3708daac
--- /dev/null
+++ b/Libraries/QtVgCommon/vgUnixTime.h
@@ -0,0 +1,19 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgUnixTime_h
+#define __vgUnixTime_h
+
+#include "vgTime.h"
+
+struct UnixTimeTraits
+{
+  enum { EpochOffset = 0 };
+};
+
+typedef vgTime<UnixTimeTraits> vgUnixTime;
+
+#endif
diff --git a/Libraries/QtVgWidgets/CMakeLists.txt b/Libraries/QtVgWidgets/CMakeLists.txt
new file mode 100644
index 00000000..e6e16d48
--- /dev/null
+++ b/Libraries/QtVgWidgets/CMakeLists.txt
@@ -0,0 +1,60 @@
+project(qtVgWidgets)
+
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+set(qtvgWidgetsSources
+    ctkRangeSlider.cpp
+    vgAboutAction.cxx
+    vgAboutDialog.cxx
+    vgFrameScrubber.cxx
+    vgFrameSpinBox.cxx
+    vgMixerDrawer.cxx
+    vgMixerItem.cxx
+    vgMixerWidget.cxx
+    vgTextEditDialog.cxx
+    vgVideoScrubber.cxx
+)
+
+set(qtvgWidgetsMocHeaders
+    ctkRangeSlider.h
+    vgAboutAction.h
+    vgAboutDialog.h
+    vgFrameScrubber.h
+    vgFrameSpinBox.h
+    vgMixerDrawer.h
+    vgMixerItem.h
+    vgMixerWidget.h
+    vgTextEditDialog.h
+    vgVideoScrubber.h
+)
+
+set(qtVgWidgetsInstallHeaders
+  vgAboutAction.h
+  vgAboutDialog.h
+  vgFrameScrubber.h
+  vgFrameSpinBox.h
+  vgMixerWidget.h
+  vgTextEditDialog.h
+  vgVideoScrubber.h
+)
+
+qt4_wrap_ui(qtVgWidgetsUiSources vgAboutDialog.ui vgTextEditDialog.ui)
+qt4_wrap_cpp(qtvgWidgetsMocSources ${qtvgWidgetsMocHeaders})
+
+source_group("Generated" FILES
+  ${qtVgWidgetsUiSources}
+  ${qtvgWidgetsMocSources}
+)
+
+add_library(${PROJECT_NAME}
+  ${qtvgWidgetsSources} ${qtVgWidgetsUiSources} ${qtvgWidgetsMocSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS qtExtensions vgCommon
+  LINK_LIBRARIES LINK_PUBLIC ${QT_LIBRARIES}
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${qtVgWidgetsInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/QtVgWidgets)
diff --git a/Libraries/QtVgWidgets/ctkRangeSlider.cpp b/Libraries/QtVgWidgets/ctkRangeSlider.cpp
new file mode 100644
index 00000000..3008aeaf
--- /dev/null
+++ b/Libraries/QtVgWidgets/ctkRangeSlider.cpp
@@ -0,0 +1,819 @@
+/*=========================================================================
+
+  Library:   CTK
+
+  Copyright (c) Kitware Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0.txt
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=========================================================================*/
+
+// Qt includes
+#include <QDebug>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QStyleOptionSlider>
+#include <QApplication>
+#include <QStylePainter>
+#include <QStyle>
+
+// CTK includes
+#include "ctkRangeSlider.h"
+
+class ctkRangeSliderPrivate
+{
+  Q_DECLARE_PUBLIC(ctkRangeSlider);
+protected:
+  ctkRangeSlider* const q_ptr;
+public:
+  /// Boolean indicates the selected handle
+  ///   True for the minimum range handle, false for the maximum range handle
+  enum Handle {
+    NoHandle = 0x0,
+    MinimumHandle = 0x1,
+    MaximumHandle = 0x2
+  };
+  Q_DECLARE_FLAGS(Handles, Handle);
+
+  ctkRangeSliderPrivate(ctkRangeSlider& object);
+  void init();
+
+  /// Return the handle at the given pos, or none if no handle is at the pos.
+  /// If a handle is selected, handleRect is set to the handle rect.
+  /// otherwise return NoHandle and handleRect is set to the combined rect of
+  /// the min and max handles
+  Handle handleAtPos(const QPoint& pos, QRect& handleRect)const;
+
+  /// Copied verbatim from QSliderPrivate class (see QSlider.cpp)
+  int pixelPosToRangeValue(int pos) const;
+  int pixelPosFromRangeValue(int val) const;
+
+  /// Draw the bottom and top sliders.
+  void drawMinimumSlider( QStylePainter* painter ) const;
+  void drawMaximumSlider( QStylePainter* painter ) const;
+
+  /// End points of the range on the Model
+  int m_MaximumValue;
+  int m_MinimumValue;
+
+  /// End points of the range on the GUI. This is synced with the model.
+  int m_MaximumPosition;
+  int m_MinimumPosition;
+
+  /// Controls selected ?
+  QStyle::SubControl m_MinimumSliderSelected;
+  QStyle::SubControl m_MaximumSliderSelected;
+
+  /// See QSliderPrivate::clickOffset.
+  /// Overrides this ivar
+  int m_SubclassClickOffset;
+
+  /// See QSliderPrivate::position
+  /// Overrides this ivar.
+  int m_SubclassPosition;
+
+  /// Original width between the 2 bounds before any moves
+  int m_SubclassWidth;
+
+  ctkRangeSliderPrivate::Handles m_SelectedHandles;
+
+  /// When symmetricMoves is true, moving a handle will move the other handle
+  /// symmetrically, otherwise the handles are independent.
+  bool m_SymmetricMoves;
+
+  /// When the min handle is not shown, the slider behaves like a normal
+  /// QSlider.
+  bool m_MinHandleShown;
+};
+
+// --------------------------------------------------------------------------
+ctkRangeSliderPrivate::ctkRangeSliderPrivate(ctkRangeSlider& object)
+  :q_ptr(&object)
+{
+  this->m_MinimumValue = 0;
+  this->m_MaximumValue = 100;
+  this->m_MinimumPosition = 0;
+  this->m_MaximumPosition = 100;
+  this->m_MinimumSliderSelected = QStyle::SC_None;
+  this->m_MaximumSliderSelected = QStyle::SC_None;
+  this->m_SubclassClickOffset = 0;
+  this->m_SubclassPosition = 0;
+  this->m_SubclassWidth = 0;
+  this->m_SelectedHandles = 0;
+  this->m_SymmetricMoves = false;
+  this->m_MinHandleShown = false;
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSliderPrivate::init()
+{
+  Q_Q(ctkRangeSlider);
+  this->m_MinimumValue = q->minimum();
+  this->m_MaximumValue = q->maximum();
+  this->m_MinimumPosition = q->minimum();
+  this->m_MaximumPosition = q->maximum();
+  q->connect(q, SIGNAL(rangeChanged(int, int)), q, SLOT(onRangeChanged(int, int)));
+}
+
+// --------------------------------------------------------------------------
+ctkRangeSliderPrivate::Handle ctkRangeSliderPrivate::handleAtPos(const QPoint& pos, QRect& handleRect)const
+{
+  Q_Q(const ctkRangeSlider);
+
+  QStyleOptionSlider option;
+  q->initStyleOption( &option );
+
+  // The functinos hitTestComplexControl only know about 1 handle. As we have
+  // 2, we change the position of the handle and test if the pos correspond to
+  // any of the 2 positions.
+  QStyle::SubControl minimumControl = QStyle::SC_None;
+  QRect minimumHandleRect;
+
+  if (this->m_MinHandleShown)
+    {
+    // Test the MinimumHandle
+    option.sliderPosition = this->m_MinimumPosition;
+    option.sliderValue    = this->m_MinimumValue;
+
+    minimumControl = q->style()->hitTestComplexControl(
+      QStyle::CC_Slider, &option, pos, q);
+    minimumHandleRect = q->style()->subControlRect(
+        QStyle::CC_Slider, &option, QStyle::SC_SliderHandle, q);
+    }
+
+  // Test if the pos is under the Maximum handle
+  option.sliderPosition = this->m_MaximumPosition;
+  option.sliderValue    = this->m_MaximumValue;
+
+  QStyle::SubControl maximumControl = q->style()->hitTestComplexControl(
+    QStyle::CC_Slider, &option, pos, q);
+  QRect maximumHandleRect = q->style()->subControlRect(
+      QStyle::CC_Slider, &option, QStyle::SC_SliderHandle, q);
+
+  // The pos is above both handles, select the closest handle
+  if (minimumControl == QStyle::SC_SliderHandle &&
+      maximumControl == QStyle::SC_SliderHandle)
+    {
+    int minDist = 0;
+    int maxDist = 0;
+    if (q->orientation() == Qt::Horizontal)
+      {
+      minDist = pos.x() - minimumHandleRect.left();
+      maxDist = maximumHandleRect.right() - pos.x();
+      }
+    else //if (q->orientation() == Qt::Vertical)
+      {
+      minDist = minimumHandleRect.bottom() - pos.y();
+      maxDist = pos.y() - maximumHandleRect.top();
+      }
+    Q_ASSERT( minDist >= 0 && maxDist >= 0);
+    minimumControl = minDist < maxDist ? minimumControl : QStyle::SC_None;
+    }
+
+  if (minimumControl == QStyle::SC_SliderHandle)
+    {
+    handleRect = minimumHandleRect;
+    return MinimumHandle;
+    }
+  else if (maximumControl == QStyle::SC_SliderHandle)
+    {
+    handleRect = maximumHandleRect;
+    return MaximumHandle;
+    }
+  handleRect = minimumHandleRect.united(maximumHandleRect);
+  return NoHandle;
+}
+
+// --------------------------------------------------------------------------
+// Copied verbatim from QSliderPrivate::pixelPosToRangeValue. See QSlider.cpp
+//
+int ctkRangeSliderPrivate::pixelPosToRangeValue( int pos ) const
+{
+  Q_Q(const ctkRangeSlider);
+  QStyleOptionSlider option;
+  q->initStyleOption( &option );
+
+  QRect gr = q->style()->subControlRect( QStyle::CC_Slider,
+                                            &option,
+                                            QStyle::SC_SliderGroove,
+                                            q );
+  QRect sr = q->style()->subControlRect( QStyle::CC_Slider,
+                                            &option,
+                                            QStyle::SC_SliderHandle,
+                                            q );
+  int sliderMin, sliderMax, sliderLength;
+  if (option.orientation == Qt::Horizontal)
+    {
+    sliderLength = sr.width();
+    sliderMin = gr.x();
+    sliderMax = gr.right() - sliderLength + 1;
+    }
+  else
+    {
+    sliderLength = sr.height();
+    sliderMin = gr.y();
+    sliderMax = gr.bottom() - sliderLength + 1;
+    }
+
+  return QStyle::sliderValueFromPosition( q->minimum(),
+                                          q->maximum(),
+                                          pos - sliderMin,
+                                          sliderMax - sliderMin,
+                                          option.upsideDown );
+}
+
+//---------------------------------------------------------------------------
+int ctkRangeSliderPrivate::pixelPosFromRangeValue( int val ) const
+{
+  Q_Q(const ctkRangeSlider);
+  QStyleOptionSlider option;
+  q->initStyleOption( &option );
+
+  QRect gr = q->style()->subControlRect( QStyle::CC_Slider,
+                                            &option,
+                                            QStyle::SC_SliderGroove,
+                                            q );
+  QRect sr = q->style()->subControlRect( QStyle::CC_Slider,
+                                            &option,
+                                            QStyle::SC_SliderHandle,
+                                            q );
+  int sliderMin, sliderMax, sliderLength;
+  if (option.orientation == Qt::Horizontal)
+    {
+    sliderLength = sr.width();
+    sliderMin = gr.x();
+    sliderMax = gr.right() - sliderLength + 1;
+    }
+  else
+    {
+    sliderLength = sr.height();
+    sliderMin = gr.y();
+    sliderMax = gr.bottom() - sliderLength + 1;
+    }
+
+  return QStyle::sliderPositionFromValue( q->minimum(),
+                                          q->maximum(),
+                                          val,
+                                          sliderMax - sliderMin,
+                                          option.upsideDown ) + sliderMin;
+}
+
+//---------------------------------------------------------------------------
+// Draw slider at the bottom end of the range
+void ctkRangeSliderPrivate::drawMinimumSlider( QStylePainter* painter ) const
+{
+  Q_Q(const ctkRangeSlider);
+  QStyleOptionSlider option;
+  q->initMinimumSliderStyleOption( &option );
+
+  option.subControls = QStyle::SC_SliderHandle;
+  option.sliderValue = m_MinimumValue;
+  option.sliderPosition = m_MinimumPosition;
+  if (this->m_SelectedHandles & MinimumHandle)
+    {
+    option.activeSubControls = QStyle::SC_SliderHandle;
+    option.state |= QStyle::State_Sunken;
+    }
+
+  painter->drawComplexControl(QStyle::CC_Slider, option);
+}
+
+//---------------------------------------------------------------------------
+// Draw slider at the top end of the range
+void ctkRangeSliderPrivate::drawMaximumSlider( QStylePainter* painter ) const
+{
+  Q_Q(const ctkRangeSlider);
+  QStyleOptionSlider option;
+  q->initMaximumSliderStyleOption( &option );
+
+  option.subControls = QStyle::SC_SliderHandle;
+  option.sliderValue = m_MaximumValue;
+  option.sliderPosition = m_MaximumPosition;
+  if (this->m_SelectedHandles & MaximumHandle)
+    {
+    option.activeSubControls = QStyle::SC_SliderHandle;
+    option.state |= QStyle::State_Sunken;
+    }
+  painter->drawComplexControl(QStyle::CC_Slider, option);
+}
+
+// --------------------------------------------------------------------------
+ctkRangeSlider::ctkRangeSlider(QWidget* parent)
+  : QSlider(parent)
+  , d_ptr(new ctkRangeSliderPrivate(*this))
+{
+  Q_D(ctkRangeSlider);
+  d->init();
+}
+
+// --------------------------------------------------------------------------
+ctkRangeSlider::ctkRangeSlider( Qt::Orientation o,
+                                  QWidget* parentObject )
+  :QSlider(o, parentObject)
+  , d_ptr(new ctkRangeSliderPrivate(*this))
+{
+  Q_D(ctkRangeSlider);
+  d->init();
+}
+
+// --------------------------------------------------------------------------
+ctkRangeSlider::ctkRangeSlider(ctkRangeSliderPrivate* impl, QWidget* parent)
+  : QSlider(parent)
+  , d_ptr(impl)
+{
+  Q_D(ctkRangeSlider);
+  d->init();
+}
+
+// --------------------------------------------------------------------------
+ctkRangeSlider::ctkRangeSlider( ctkRangeSliderPrivate* impl, Qt::Orientation o,
+                                QWidget* parentObject )
+  :QSlider(o, parentObject)
+  , d_ptr(impl)
+{
+  Q_D(ctkRangeSlider);
+  d->init();
+}
+
+// --------------------------------------------------------------------------
+ctkRangeSlider::~ctkRangeSlider()
+{
+}
+
+// --------------------------------------------------------------------------
+int ctkRangeSlider::minimumValue() const
+{
+  Q_D(const ctkRangeSlider);
+  return d->m_MinimumValue;
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::setMinimumValue( int min )
+{
+  Q_D(ctkRangeSlider);
+  this->setValues( min, qMax(d->m_MaximumValue,min) );
+}
+
+// --------------------------------------------------------------------------
+int ctkRangeSlider::maximumValue() const
+{
+  Q_D(const ctkRangeSlider);
+  return d->m_MaximumValue;
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::setMaximumValue( int max )
+{
+  Q_D(ctkRangeSlider);
+  this->setValues( qMin(d->m_MinimumValue, max), max );
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::setValues(int l, int u)
+{
+  Q_D(ctkRangeSlider);
+  const int minimumValue =
+    qBound(this->minimum(), qMin(l,u), this->maximum());
+  const int maximumValue =
+    qBound(this->minimum(), qMax(l,u), this->maximum());
+  bool emitMinValChanged = (minimumValue != d->m_MinimumValue);
+  bool emitMaxValChanged = (maximumValue != d->m_MaximumValue);
+
+  d->m_MinimumValue = minimumValue;
+  d->m_MaximumValue = maximumValue;
+
+  bool emitMinPosChanged =
+    (minimumValue != d->m_MinimumPosition);
+  bool emitMaxPosChanged =
+    (maximumValue != d->m_MaximumPosition);
+  d->m_MinimumPosition = minimumValue;
+  d->m_MaximumPosition = maximumValue;
+
+  if (isSliderDown())
+    {
+    if (emitMinPosChanged || emitMaxPosChanged)
+      {
+      emit positionsChanged(d->m_MinimumPosition, d->m_MaximumPosition);
+      }
+    if (emitMinPosChanged)
+      {
+      emit minimumPositionChanged(d->m_MinimumPosition);
+      }
+    if (emitMaxPosChanged)
+      {
+      emit maximumPositionChanged(d->m_MaximumPosition);
+      }
+    }
+  if (emitMinValChanged || emitMaxValChanged)
+    {
+    emit valuesChanged(d->m_MinimumValue,
+                       d->m_MaximumValue);
+    }
+  if (emitMinValChanged)
+    {
+    emit minimumValueChanged(d->m_MinimumValue);
+    }
+  if (emitMaxValChanged)
+    {
+    emit maximumValueChanged(d->m_MaximumValue);
+    }
+  if (emitMinPosChanged || emitMaxPosChanged ||
+      emitMinValChanged || emitMaxValChanged)
+    {
+    this->update();
+    }
+}
+
+// --------------------------------------------------------------------------
+int ctkRangeSlider::minimumPosition() const
+{
+  Q_D(const ctkRangeSlider);
+  return d->m_MinimumPosition;
+}
+
+// --------------------------------------------------------------------------
+int ctkRangeSlider::maximumPosition() const
+{
+  Q_D(const ctkRangeSlider);
+  return d->m_MaximumPosition;
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::setMinimumPosition(int l)
+{
+  Q_D(const ctkRangeSlider);
+  this->setPositions(l, qMax(l, d->m_MaximumPosition));
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::setMaximumPosition(int u)
+{
+  Q_D(const ctkRangeSlider);
+  this->setPositions(qMin(d->m_MinimumPosition, u), u);
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::setPositions(int min, int max)
+{
+  Q_D(ctkRangeSlider);
+  const int minPosition =
+    qBound(this->minimum(), qMin(min, max), this->maximum());
+  const int maxPosition =
+    qBound(this->minimum(), qMax(min, max), this->maximum());
+
+  bool emitMinPosChanged = (minPosition != d->m_MinimumPosition);
+  bool emitMaxPosChanged = (maxPosition != d->m_MaximumPosition);
+
+  if (!emitMinPosChanged && !emitMaxPosChanged)
+    {
+    return;
+    }
+
+  d->m_MinimumPosition = minPosition;
+  d->m_MaximumPosition = maxPosition;
+
+  if (!this->hasTracking())
+    {
+    this->update();
+    }
+  if (isSliderDown())
+    {
+    if (emitMinPosChanged)
+      {
+      emit minimumPositionChanged(d->m_MinimumPosition);
+      }
+    if (emitMaxPosChanged)
+      {
+      emit maximumPositionChanged(d->m_MaximumPosition);
+      }
+    if (emitMinPosChanged || emitMaxPosChanged)
+      {
+      emit positionsChanged(d->m_MinimumPosition, d->m_MaximumPosition);
+      }
+    }
+  if (this->hasTracking())
+    {
+    this->triggerAction(SliderMove);
+    this->setValues(d->m_MinimumPosition, d->m_MaximumPosition);
+    }
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::setSymmetricMoves(bool symmetry)
+{
+  Q_D(ctkRangeSlider);
+  d->m_SymmetricMoves = symmetry;
+}
+
+// --------------------------------------------------------------------------
+bool ctkRangeSlider::symmetricMoves()const
+{
+  Q_D(const ctkRangeSlider);
+  return d->m_SymmetricMoves;
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::setMinHandleShown(bool shown)
+{
+  Q_D(ctkRangeSlider);
+  d->m_MinHandleShown = shown;
+  this->update();
+}
+
+// --------------------------------------------------------------------------
+bool ctkRangeSlider::minHandleShown()const
+{
+  Q_D(const ctkRangeSlider);
+  return d->m_MinHandleShown;
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::onRangeChanged(int minimum, int maximum)
+{
+  Q_UNUSED(minimum);
+  Q_UNUSED(maximum);
+  Q_D(ctkRangeSlider);
+  this->setValues(d->m_MinimumValue, d->m_MaximumValue);
+}
+
+// --------------------------------------------------------------------------
+// Render
+void ctkRangeSlider::paintEvent( QPaintEvent* )
+{
+  Q_D(ctkRangeSlider);
+  QStyleOptionSlider option;
+  this->initStyleOption(&option);
+
+  QStylePainter painter(this);
+  option.subControls = QStyle::SC_SliderGroove;
+  option.sliderPosition = this->minimum(); // don't highlight the SliderGroove
+  painter.drawComplexControl(QStyle::CC_Slider, option);
+
+  option.sliderPosition = d->m_MinimumPosition;
+  const QRect lr = style()->subControlRect( QStyle::CC_Slider,
+                                            &option,
+                                            QStyle::SC_SliderHandle,
+                                            this);
+  option.sliderPosition = d->m_MaximumPosition;
+
+  const QRect ur = style()->subControlRect( QStyle::CC_Slider,
+                                            &option,
+                                            QStyle::SC_SliderHandle,
+                                            this);
+
+  QRect sr = style()->subControlRect( QStyle::CC_Slider,
+                                      &option,
+                                      QStyle::SC_SliderGroove,
+                                      this);
+  QRect rangeBox;
+  if (option.orientation == Qt::Horizontal)
+    {
+    rangeBox = QRect(
+      QPoint(qMin( lr.center().x(), ur.center().x() ), sr.center().y() - 2),
+      QPoint(qMax( lr.center().x(), ur.center().x() ), sr.center().y() + 1));
+    }
+  else
+    {
+    rangeBox = QRect(
+      QPoint(sr.center().x() - 2, qMin( lr.center().y(), ur.center().y() )),
+      QPoint(sr.center().x() + 1, qMax( lr.center().y(), ur.center().y() )));
+    }
+
+  // -----------------------------
+  // Render the range
+  //
+  if (d->m_MinHandleShown)
+    {
+    QRect groove = this->style()->subControlRect( QStyle::CC_Slider,
+                                                  &option,
+                                                  QStyle::SC_SliderGroove,
+                                                  this );
+    groove.adjust(0, 0, -1, 0);
+
+    // Create default colors based on the transfer function.
+    //
+    QColor highlight = this->palette().color(QPalette::Normal, QPalette::Highlight);
+    QLinearGradient gradient;
+    if (option.orientation == Qt::Horizontal)
+      {
+      gradient = QLinearGradient( groove.center().x(), groove.top(),
+                                  groove.center().x(), groove.bottom());
+      }
+    else
+      {
+      gradient = QLinearGradient( groove.left(), groove.center().y(),
+                                  groove.right(), groove.center().y());
+      }
+
+    gradient.setColorAt(0, highlight.darker(120));
+    gradient.setColorAt(1, highlight.lighter(160));
+
+    painter.setPen(QPen(highlight.darker(150), 0));
+    painter.setBrush(gradient);
+    painter.drawRect( rangeBox.intersected(groove) );
+    }
+
+  //  -----------------------------------
+  // Render the sliders
+  //
+  if (d->m_SelectedHandles & ctkRangeSliderPrivate::MinimumHandle)
+    {
+    d->drawMaximumSlider( &painter );
+    if (d->m_MinHandleShown)
+      {
+      d->drawMinimumSlider( &painter );
+      }
+    }
+  else
+    {
+    if (d->m_MinHandleShown)
+      {
+      d->drawMinimumSlider( &painter );
+      }
+    d->drawMaximumSlider( &painter );
+    }
+}
+
+// --------------------------------------------------------------------------
+// Standard Qt UI events
+void ctkRangeSlider::mousePressEvent(QMouseEvent* mouseEvent)
+{
+  Q_D(ctkRangeSlider);
+  if (minimum() == maximum() || (mouseEvent->buttons() ^ mouseEvent->button()))
+    {
+    mouseEvent->ignore();
+    return;
+    }
+  int pos = this->orientation() == Qt::Horizontal ?
+    mouseEvent->pos().x() : mouseEvent->pos().y();
+
+  QStyleOptionSlider option;
+  this->initStyleOption( &option );
+
+  QRect handleRect;
+  ctkRangeSliderPrivate::Handle handle = d->handleAtPos(mouseEvent->pos(), handleRect);
+
+  if (handle != ctkRangeSliderPrivate::NoHandle)
+    {
+    d->m_SubclassPosition = (handle == ctkRangeSliderPrivate::MinimumHandle)?
+      d->m_MinimumPosition : d->m_MaximumPosition;
+
+    // save the position of the mouse inside the handle for later
+    d->m_SubclassClickOffset = pos - (this->orientation() == Qt::Horizontal ?
+      handleRect.left() : handleRect.top());
+
+    this->setSliderDown(true);
+
+    if (d->m_SelectedHandles != handle)
+      {
+      d->m_SelectedHandles = handle;
+      this->update(handleRect);
+      }
+    // Accept the mouseEvent
+    mouseEvent->accept();
+    return;
+    }
+
+  // if we are here, no handles have been pressed
+  // Check if we pressed on the groove between the 2 handles
+
+  QStyle::SubControl control = this->style()->hitTestComplexControl(
+    QStyle::CC_Slider, &option, mouseEvent->pos(), this);
+  QRect sr = style()->subControlRect(
+    QStyle::CC_Slider, &option, QStyle::SC_SliderGroove, this);
+  int minCenter = (this->orientation() == Qt::Horizontal ?
+    handleRect.left() : handleRect.top());
+  int maxCenter = (this->orientation() == Qt::Horizontal ?
+    handleRect.right() : handleRect.bottom());
+  if (control == QStyle::SC_SliderGroove &&
+      pos > minCenter && pos < maxCenter)
+
+    {
+    d->m_SubclassPosition = d->m_MaximumPosition;
+    d->m_SubclassClickOffset = pos - d->pixelPosFromRangeValue(d->m_SubclassPosition);
+    d->m_SubclassWidth = d->m_MaximumPosition - d->m_MinimumPosition;
+    qMax(d->m_SubclassPosition - d->m_MinimumPosition, d->m_MaximumPosition - d->m_SubclassPosition);
+    this->setSliderDown(true);
+    if (!(d->m_SelectedHandles & QFlags<ctkRangeSliderPrivate::Handle>(
+            ctkRangeSliderPrivate::MinimumHandle)) ||
+        !(d->m_SelectedHandles & QFlags<ctkRangeSliderPrivate::Handle>(ctkRangeSliderPrivate::MaximumHandle)))
+      {
+      d->m_SelectedHandles =
+        QFlags<ctkRangeSliderPrivate::Handle>(ctkRangeSliderPrivate::MinimumHandle) |
+        QFlags<ctkRangeSliderPrivate::Handle>(ctkRangeSliderPrivate::MaximumHandle);
+      this->update(handleRect.united(sr));
+      }
+    mouseEvent->accept();
+    return;
+    }
+  mouseEvent->ignore();
+}
+
+// --------------------------------------------------------------------------
+// Standard Qt UI events
+void ctkRangeSlider::mouseMoveEvent(QMouseEvent* mouseEvent)
+{
+  Q_D(ctkRangeSlider);
+  if (!d->m_SelectedHandles)
+    {
+    mouseEvent->ignore();
+    return;
+    }
+  int pos = this->orientation() == Qt::Horizontal ?
+    mouseEvent->pos().x() : mouseEvent->pos().y();
+
+  QStyleOptionSlider option;
+  this->initStyleOption(&option);
+
+  const int m = style()->pixelMetric( QStyle::PM_MaximumDragDistance, &option, this );
+
+  int newPosition = d->pixelPosToRangeValue(pos - d->m_SubclassClickOffset);
+
+  if (m >= 0)
+    {
+    const QRect r = rect().adjusted(-m, -m, m, m);
+    if (!r.contains(mouseEvent->pos()))
+      {
+      newPosition = d->m_SubclassPosition;
+      }
+    }
+
+  // The lower/left slider is down
+  if (d->m_SelectedHandles == ctkRangeSliderPrivate::MinimumHandle)
+    {
+    double newMinPos = qMin(newPosition,d->m_MaximumPosition);
+    this->setPositions(newMinPos, d->m_MaximumPosition +
+      (d->m_SymmetricMoves ? d->m_MinimumPosition - newMinPos : 0));
+    }
+  // The upper/right slider is down
+  else if (d->m_SelectedHandles == ctkRangeSliderPrivate::MaximumHandle)
+    {
+    if (d->m_MinHandleShown)
+      {
+      double newMaxPos = qMax(d->m_MinimumPosition, newPosition);
+      this->setPositions(d->m_MinimumPosition -
+        (d->m_SymmetricMoves ? newMaxPos - d->m_MaximumPosition: 0),
+        newMaxPos);
+      }
+    else
+      {
+      this->setPositions(newPosition, newPosition);
+      }
+    }
+  // Both handles are down (the user clicked in between the handles)
+  else if (d->m_SelectedHandles & ctkRangeSliderPrivate::MinimumHandle &&
+           d->m_SelectedHandles & ctkRangeSliderPrivate::MaximumHandle)
+    {
+    this->setPositions(newPosition - d->m_SubclassWidth, newPosition);
+    }
+  mouseEvent->accept();
+}
+
+// --------------------------------------------------------------------------
+// Standard Qt UI mouseEvents
+void ctkRangeSlider::mouseReleaseEvent(QMouseEvent* mouseEvent)
+{
+  Q_D(ctkRangeSlider);
+  this->QSlider::mouseReleaseEvent(mouseEvent);
+
+  setSliderDown(false);
+  d->m_SelectedHandles = 0;
+
+  this->update();
+}
+
+// --------------------------------------------------------------------------
+bool ctkRangeSlider::isMinimumSliderDown()const
+{
+  Q_D(const ctkRangeSlider);
+  return d->m_SelectedHandles & ctkRangeSliderPrivate::MinimumHandle;
+}
+
+// --------------------------------------------------------------------------
+bool ctkRangeSlider::isMaximumSliderDown()const
+{
+  Q_D(const ctkRangeSlider);
+  return d->m_SelectedHandles & ctkRangeSliderPrivate::MaximumHandle;
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::initMinimumSliderStyleOption(QStyleOptionSlider* option) const
+{
+  this->initStyleOption(option);
+}
+
+// --------------------------------------------------------------------------
+void ctkRangeSlider::initMaximumSliderStyleOption(QStyleOptionSlider* option) const
+{
+  this->initStyleOption(option);
+}
diff --git a/Libraries/QtVgWidgets/ctkRangeSlider.h b/Libraries/QtVgWidgets/ctkRangeSlider.h
new file mode 100644
index 00000000..368405d1
--- /dev/null
+++ b/Libraries/QtVgWidgets/ctkRangeSlider.h
@@ -0,0 +1,199 @@
+/*=========================================================================
+
+  Library:   CTK
+
+  Copyright (c) Kitware Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0.txt
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=========================================================================*/
+
+#ifndef __ctkRangeSlider_h
+#define __ctkRangeSlider_h
+
+// Qt includes
+#include <QSlider>
+
+#include <vgExport.h>
+
+// CTK includes
+//#include <ctkPimpl.h>
+
+class QStylePainter;
+class ctkRangeSliderPrivate;
+
+///
+/// A ctkRangeSlider is a slider that lets you input 2 values instead of one
+/// (see QSlider). These values are typically a lower and upper bound.
+/// Values are comprised between the range of the slider. See setRange(),
+/// minimum() and maximum(). The upper bound can't be smaller than the
+/// lower bound and vice-versa.
+/// When setting new values (setMinimumValue(), setMaximumValue() or
+/// setValues()), make sure they lie between the range (minimum(), maximum())
+/// of the slider, they would be forced otherwised. If it is not the behavior
+/// you desire, you can set the range first (setRange(), setMinimum(),
+/// setMaximum())
+/// TODO: support triggerAction(QAbstractSlider::SliderSingleStepSub) that
+/// moves both values at a time.
+/// \sa ctkDoubleRangeSlider, ctkDoubleSlider, ctkRangeWidget
+class QTVG_WIDGETS_EXPORT ctkRangeSlider : public QSlider
+{
+  Q_OBJECT
+  Q_PROPERTY(int minimumValue READ minimumValue WRITE setMinimumValue)
+  Q_PROPERTY(int maximumValue READ maximumValue WRITE setMaximumValue)
+  Q_PROPERTY(int minimumPosition READ minimumPosition WRITE setMinimumPosition)
+  Q_PROPERTY(int maximumPosition READ maximumPosition WRITE setMaximumPosition)
+  Q_PROPERTY(bool symmetricMoves READ symmetricMoves WRITE setSymmetricMoves)
+  Q_PROPERTY(bool minHandleShown READ minHandleShown WRITE setMinHandleShown)
+
+public:
+  // Superclass typedef
+  typedef QSlider Superclass;
+  /// Constructor, builds a ctkRangeSlider that ranges from 0 to 100 and has
+  /// a lower and upper values of 0 and 100 respectively, other properties
+  /// are set the QSlider default properties.
+  explicit ctkRangeSlider( Qt::Orientation o, QWidget* par= 0 );
+  explicit ctkRangeSlider( QWidget* par = 0 );
+  virtual ~ctkRangeSlider();
+
+  ///
+  /// This property holds the slider's current minimum value.
+  /// The slider silently forces minimumValue to be within the legal range:
+  /// minimum() <= minimumValue() <= maximumValue() <= maximum().
+  /// Changing the minimumValue also changes the minimumPosition.
+  int minimumValue() const;
+
+  ///
+  /// This property holds the slider's current maximum value.
+  /// The slider forces the maximum value to be within the legal range:
+  /// The slider silently forces maximumValue to be within the legal range:
+  /// Changing the maximumValue also changes the maximumPosition.
+  int maximumValue() const;
+
+  ///
+  /// This property holds the current slider minimum position.
+  /// If tracking is enabled (the default), this is identical to minimumValue.
+  int minimumPosition() const;
+  void setMinimumPosition(int min);
+
+  ///
+  /// This property holds the current slider maximum position.
+  /// If tracking is enabled (the default), this is identical to maximumValue.
+  int maximumPosition() const;
+  void setMaximumPosition(int max);
+
+  ///
+  /// Utility function that set the minimum position and
+  /// maximum position at once.
+  void setPositions(int min, int max);
+
+  ///
+  /// When symmetricMoves is true, moving a handle will move the other handle
+  /// symmetrically, otherwise the handles are independent. False by default
+  bool symmetricMoves()const;
+  void setSymmetricMoves(bool symmetry);
+
+  /// VISGUI specific:
+  /// Hide or show the min handle. Hidden by default.
+  bool minHandleShown()const;
+  void setMinHandleShown(bool enabled);
+
+signals:
+  ///
+  /// This signal is emitted when the slider minimum value has changed,
+  /// with the new slider value as argument.
+  void minimumValueChanged(int min);
+  ///
+  /// This signal is emitted when the slider maximum value has changed,
+  /// with the new slider value as argument.
+  void maximumValueChanged(int max);
+  ///
+  /// Utility signal that is fired when minimum or maximum values have changed.
+  void valuesChanged(int min, int max);
+
+  ///
+  /// This signal is emitted when sliderDown is true and the slider moves.
+  /// This usually happens when the user is dragging the minimum slider.
+  /// The value is the new slider minimum position.
+  /// This signal is emitted even when tracking is turned off.
+  void minimumPositionChanged(int min);
+
+  ///
+  /// This signal is emitted when sliderDown is true and the slider moves.
+  /// This usually happens when the user is dragging the maximum slider.
+  /// The value is the new slider maximum position.
+  /// This signal is emitted even when tracking is turned off.
+  void maximumPositionChanged(int max);
+
+  ///
+  /// Utility signal that is fired when minimum or maximum positions
+  /// have changed.
+  void positionsChanged(int min, int max);
+
+public slots:
+  ///
+  /// This property holds the slider's current minimum value.
+  /// The slider silently forces min to be within the legal range:
+  /// minimum() <= min <= maximumValue() <= maximum().
+  /// Note: Changing the minimumValue also changes the minimumPosition.
+  /// \sa stMaximumValue, setValues, setMinimum, setMaximum, setRange
+  void setMinimumValue(int min);
+
+  ///
+  /// This property holds the slider's current maximum value.
+  /// The slider silently forces max to be within the legal range:
+  /// minimum() <= minimumValue() <= max <= maximum().
+  /// Note: Changing the maximumValue also changes the maximumPosition.
+  /// \sa stMinimumValue, setValues, setMinimum, setMaximum, setRange
+  void setMaximumValue(int max);
+
+  ///
+  /// Utility function that set the minimum value and maximum value at once.
+  /// The slider silently forces min and max to be within the legal range:
+  /// minimum() <= min <= max <= maximum().
+  /// Note: Changing the minimumValue and maximumValue also changes the
+  /// minimumPosition and maximumPosition.
+  /// \sa setMinimumValue, setMaximumValue, setMinimum, setMaximum, setRange
+  void setValues(int min, int max);
+
+protected slots:
+  void onRangeChanged(int minimum, int maximum);
+
+protected:
+  ctkRangeSlider( ctkRangeSliderPrivate* impl, Qt::Orientation o, QWidget* par= 0 );
+  ctkRangeSlider( ctkRangeSliderPrivate* impl, QWidget* par = 0 );
+
+  // Description:
+  // Standard Qt UI events
+  virtual void mousePressEvent(QMouseEvent* ev);
+  virtual void mouseMoveEvent(QMouseEvent* ev);
+  virtual void mouseReleaseEvent(QMouseEvent* ev);
+
+  bool isMinimumSliderDown()const;
+  bool isMaximumSliderDown()const;
+
+  // Description:
+  // Rendering is done here.
+  virtual void paintEvent(QPaintEvent* ev);
+  virtual void initMinimumSliderStyleOption(QStyleOptionSlider* option) const;
+  virtual void initMaximumSliderStyleOption(QStyleOptionSlider* option) const;
+
+protected:
+  QScopedPointer<ctkRangeSliderPrivate> d_ptr;
+
+private:
+  Q_DECLARE_PRIVATE(ctkRangeSlider);
+  Q_DISABLE_COPY(ctkRangeSlider);
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgAboutAction.cxx b/Libraries/QtVgWidgets/vgAboutAction.cxx
new file mode 100644
index 00000000..831dedde
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgAboutAction.cxx
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgAboutAction.h"
+
+#include <QApplication>
+
+#include "vgAboutDialog.h"
+
+//-----------------------------------------------------------------------------
+vgAboutAction::vgAboutAction(QObject* parent) : QAction(parent)
+{
+  this->setText("&About " + qApp->applicationName());
+  connect(this, SIGNAL(triggered()), this, SLOT(showDialog()));
+}
+
+//-----------------------------------------------------------------------------
+vgAboutAction::~vgAboutAction()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vgAboutAction::showDialog()
+{
+  vgAboutDialog dialog;
+  dialog.exec();
+}
diff --git a/Libraries/QtVgWidgets/vgAboutAction.h b/Libraries/QtVgWidgets/vgAboutAction.h
new file mode 100644
index 00000000..ebbfd311
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgAboutAction.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgAboutAction_h
+#define __vgAboutAction_h
+
+#include <QAction>
+
+#include <vgExport.h>
+
+class QTVG_WIDGETS_EXPORT vgAboutAction : public QAction
+{
+  Q_OBJECT
+
+public:
+  explicit vgAboutAction(QObject* parent);
+  virtual ~vgAboutAction();
+
+protected slots:
+  void showDialog();
+
+private:
+  Q_DISABLE_COPY(vgAboutAction)
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgAboutDialog.cxx b/Libraries/QtVgWidgets/vgAboutDialog.cxx
new file mode 100644
index 00000000..e9c166d6
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgAboutDialog.cxx
@@ -0,0 +1,143 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgAboutDialog.h"
+
+#include <QAction>
+#include <QClipboard>
+#include <QMenu>
+#include <QPushButton>
+
+#include <qtUtil.h>
+
+#include <vgFingerprint.h>
+
+#include "ui_vgAboutDialog.h"
+
+QTE_IMPLEMENT_D_FUNC(vgAboutDialog)
+
+namespace // anonymous
+{
+
+const char* clipTextTemplate =
+  "Application Name: @APP_TITLE@\n"
+  "Application Version: @APP_VERSION@\n"
+  "Qt Version: @QT_VERSION@\n"
+  "Copyright: @COPY_YEAR@ @APP_ORGANIZATION@\n"
+  "Build Identifier: @BUILD@\n";
+
+//-----------------------------------------------------------------------------
+QString genBuildDisplayString()
+{
+  QString str = QString::fromLocal8Bit(GetVisguiSha1()).left(12);
+  QString status = QString::fromLocal8Bit(GetVisguiStatus());
+  return (status.isEmpty() ? str : str + " *");
+}
+
+//-----------------------------------------------------------------------------
+QString genBuildCopyString()
+{
+  QString hash = QString::fromLocal8Bit(GetVisguiSha1());
+  QString status = QString::fromLocal8Bit(GetVisguiStatus());
+  return QString("%2 (%1)").arg(status.isEmpty() ? "clean" : "dirty")
+                           .arg(hash);
+}
+
+//-----------------------------------------------------------------------------
+QString genText(
+  QString formatStr, QString copyrightOrganization, QString buildIdentifier)
+{
+  formatStr.replace("@APP_TITLE@", qApp->applicationName());
+  formatStr.replace("@APP_VERSION@", qApp->applicationVersion());
+  formatStr.replace("@QT_VERSION@", QString::fromLocal8Bit(qVersion()));
+  formatStr.replace("@COPY_YEAR@", qApp->property("COPY_YEAR").toString());
+  formatStr.replace("@APP_ORGANIZATION@", copyrightOrganization);
+  formatStr.replace("@BUILD@", buildIdentifier);
+  return formatStr;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vgAboutDialogPrivate
+{
+public:
+  Ui::vgAboutDialog UI;
+  QString copyText;
+  QMenu* contextMenu;
+};
+
+//-----------------------------------------------------------------------------
+vgAboutDialog::vgAboutDialog(QWidget* parent, Qt::WindowFlags f) :
+  QDialog(parent, f),
+  d_ptr(new vgAboutDialogPrivate)
+{
+  QTE_D(vgAboutDialog);
+
+  // Set up UI
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+  this->setWindowTitle(QString("About %1").arg(qApp->applicationName()));
+
+  // Get copyright organization name
+  QString organization = qApp->property("COPY_ORGANIZATION").toString();
+  organization.isEmpty() && (organization = qApp->organizationName(), false);
+
+  // Replace placeholders in templates with real information
+  d->UI.label->setText(
+    genText(d->UI.label->text(), organization, genBuildDisplayString()));
+  d->copyText =
+    genText(clipTextTemplate, organization, genBuildCopyString());
+
+  // Load application about icon
+  QIcon icon = qApp->windowIcon();
+  if (icon.isNull())
+    {
+    d->UI.image->hide();
+    }
+  else
+    {
+    QPixmap pixmap = icon.pixmap(128, 128);
+    d->UI.image->setPixmap(pixmap);
+    d->UI.image->setFixedSize(pixmap.size());
+    }
+
+  // Set up context menu
+  d->UI.label->setContextMenuPolicy(Qt::CustomContextMenu);
+  connect(d->UI.label, SIGNAL(customContextMenuRequested(QPoint)),
+          this, SLOT(showContextMenu(QPoint)));
+
+  d->contextMenu = new QMenu(this);
+  QAction* copyAction = new QAction("&Copy to clipboard", this);
+  connect(copyAction, SIGNAL(triggered()), this, SLOT(copyToClipboard()));
+  d->contextMenu->addAction(copyAction);
+}
+
+//-----------------------------------------------------------------------------
+vgAboutDialog::~vgAboutDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vgAboutDialog::exec()
+{
+  this->resize(this->minimumSize());
+  return QDialog::exec();
+}
+
+//-----------------------------------------------------------------------------
+void vgAboutDialog::showContextMenu(QPoint pos)
+{
+  QTE_D(vgAboutDialog);
+  d->contextMenu->exec(d->UI.label->mapToGlobal(pos));
+}
+
+//-----------------------------------------------------------------------------
+void vgAboutDialog::copyToClipboard()
+{
+  QTE_D_CONST(vgAboutDialog);
+  QApplication::clipboard()->setText(d->copyText);
+}
diff --git a/Libraries/QtVgWidgets/vgAboutDialog.h b/Libraries/QtVgWidgets/vgAboutDialog.h
new file mode 100644
index 00000000..ccc5073a
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgAboutDialog.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgAboutDialog_h
+#define __vgAboutDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class QAction;
+
+class vgAboutDialogPrivate;
+
+class QTVG_WIDGETS_EXPORT vgAboutDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit vgAboutDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
+  virtual ~vgAboutDialog();
+
+  int exec();
+
+protected slots:
+  void showContextMenu(QPoint);
+  void copyToClipboard();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgAboutDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vgAboutDialog)
+  Q_DISABLE_COPY(vgAboutDialog)
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgAboutDialog.ui b/Libraries/QtVgWidgets/vgAboutDialog.ui
new file mode 100644
index 00000000..cd91d047
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgAboutDialog.ui
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vgAboutDialog</class>
+ <widget class="QDialog" name="vgAboutDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>492</width>
+    <height>193</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="horizontalSpacing">
+    <number>12</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="image">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>128</width>
+       <height>128</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>128</width>
+       <height>128</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" rowspan="2">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head&gt;&lt;style type=&quot;text/css&quot;&gt;
+p { margin-top: 0px; margin-bottom: 0px; }
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;
+&lt;body&gt;
+&lt;p style=&quot;font-size:14pt; margin-bottom:1em&quot;&gt;@APP_TITLE@&lt;/p&gt;
+&lt;p&gt;Version @APP_VERSION@&lt;/p&gt;
+&lt;p&gt;Using Qt @QT_VERSION@&lt;/p&gt;
+&lt;p&gt;&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;Copyright @COPY_YEAR@ @APP_ORGANIZATION@&lt;/p&gt;
+&lt;p&gt;&amp;nbsp;&lt;/p&gt;
+&lt;p&gt;@BUILD@&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>11</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vgAboutDialog</receiver>
+   <slot>close()</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>
diff --git a/Libraries/QtVgWidgets/vgFrameScrubber.cxx b/Libraries/QtVgWidgets/vgFrameScrubber.cxx
new file mode 100644
index 00000000..30ed52f6
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgFrameScrubber.cxx
@@ -0,0 +1,516 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <limits>
+
+#include <QSlider>
+#include <QHBoxLayout>
+#include <QLayoutItem>
+
+#include <qtMath.h>
+
+#include "vgFrameScrubber.h"
+#include "vgFrameSpinBox.h"
+
+#include "ctkRangeSlider.h"
+
+QTE_IMPLEMENT_D_FUNC(vgFrameScrubber)
+
+//-----------------------------------------------------------------------------
+class vgFrameScrubberPrivate
+{
+public:
+  vgFrameScrubberPrivate(vgFrameScrubber* parent);
+
+  void updateFrameNumberRange(int minimum, int maximum);
+  void updateTimeRange(double minimum, double maximum, double resolution);
+
+  void setFrameNumber(int value);
+  void setFrameNumbers(int minVal, int maxVal);
+  void setTime(double value);
+  void setTimes(double minVal, double maxVal);
+
+  void setMinFrameNumber(int value);
+  void setMinTime(double value);
+
+  void setMinValue(int value,
+                   bool keepWidth = false);
+
+  void setValue(int value,
+                bool keepWidth = false,
+                bool forceSignal = false);
+
+  void setValues(int minVal, int maxVal,
+                 bool resized = false,
+                 bool forceSignal = false);
+
+  double timeFromSliderPosition(int value);
+
+  void setIntervalModeEnabled(bool enabled);
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vgFrameScrubber)
+
+  void setFrameNumberMode();
+  void setTimeMode();
+
+  QHBoxLayout* layout_;
+  ctkRangeSlider* slider_;
+  vgFrameSpinBox* spinBox_;
+  double timeScale_, timeOffset_;
+
+private:
+  QTE_DECLARE_PUBLIC(vgFrameScrubber)
+};
+
+//-----------------------------------------------------------------------------
+vgFrameScrubberPrivate::vgFrameScrubberPrivate(vgFrameScrubber* parent) :
+  q_ptr(parent), spinBox_(0), timeScale_(0.0), timeOffset_(0.0)
+{
+  QTE_Q(vgFrameScrubber);
+
+  this->layout_ = new QHBoxLayout();
+  this->slider_ = new ctkRangeSlider(Qt::Horizontal);
+  this->layout_->addWidget(this->slider_);
+  q->setLayout(this->layout_);
+
+  q->connect(this->slider_, SIGNAL(valueChanged(int)),
+             q, SLOT(updateValueFromSlider(int)));
+
+  q->connect(this->slider_, SIGNAL(valuesChanged(int, int)),
+             q, SLOT(updateValuesFromSlider(int, int)));
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setFrameNumberMode()
+{
+  if (this->spinBox_)
+    {
+    return;
+    }
+
+  QTE_Q(vgFrameScrubber);
+
+  this->spinBox_ = new vgFrameSpinBox();
+  this->layout_->addWidget(this->spinBox_);
+
+  q->connect(this->spinBox_, SIGNAL(valueChanged(int)),
+             q, SLOT(updateValueFromSlider(int)));
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setTimeMode()
+{
+  if (!this->spinBox_)
+    {
+    return;
+    }
+
+  QLayoutItem* item = this->layout_->takeAt(1);
+  delete item;
+  delete this->spinBox_;
+  this->spinBox_ = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::updateFrameNumberRange(int minimum, int maximum)
+{
+  QTE_Q(vgFrameScrubber);
+
+  const int oldMinVal = this->slider_->minimumValue();
+  const int oldMaxVal = this->slider_->maximumValue();
+
+  this->setFrameNumberMode();
+  this->slider_->blockSignals(true);
+  this->spinBox_->blockSignals(true);
+
+  if (maximum < 0)
+    {
+    minimum = maximum = -1;
+    }
+  if (minimum > maximum)
+    {
+    minimum = maximum;
+    }
+
+  this->slider_->setEnabled(maximum > minimum);
+  this->slider_->setRange(minimum, maximum);
+  this->spinBox_->setRange(minimum, maximum);
+
+  // Since signals are blocked, the ctkRangeSlider doesn't get the message that
+  // the QAbstractSlider's range has changed, and thus doesn't 'fix' the
+  // previous values to fit into the new range. So we need to make it happen
+  // here, by re-setting the values and letting them get clamped appropriately.
+  this->slider_->setValues(this->slider_->minimumValue(),
+                           this->slider_->maximumValue());
+
+  this->slider_->blockSignals(false);
+  this->spinBox_->blockSignals(false);
+
+  const int minVal = this->slider_->minimumValue();
+  const int maxVal = this->slider_->maximumValue();
+
+  bool minChanged = minVal != oldMinVal;
+  bool maxChanged = maxVal != oldMaxVal;
+
+  if (minChanged || maxChanged)
+    {
+    emit q->frameNumbersChanged(minVal, maxVal, false);
+    if (minChanged)
+      {
+      emit q->minFrameNumberChanged(minVal);
+      }
+    if (maxChanged)
+      {
+      emit q->frameNumberChanged(maxVal);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::updateTimeRange(
+  double minimum, double maximum, double resolution)
+{
+  QTE_Q(vgFrameScrubber);
+
+  const double oldMinTime =
+    this->timeFromSliderPosition(this->slider_->minimumValue());
+
+  const double oldMaxTime =
+    this->timeFromSliderPosition(this->slider_->maximumValue());
+
+  this->setTimeMode();
+  this->slider_->blockSignals(true);
+
+  if (minimum > maximum)
+    {
+    maximum = qQNaN();
+    }
+
+  if (!qIsFinite(minimum) || !qIsFinite(maximum))
+    {
+    this->slider_->setEnabled(false);
+    this->slider_->setRange(0, 0);
+    }
+  else
+    {
+    this->timeOffset_ = minimum;
+    this->slider_->setEnabled(true);
+
+    static const int max_int = std::numeric_limits<int>::max();
+    const double delta = maximum - minimum, ri = 1.0 / resolution;
+    if (delta * ri >= (double)max_int)
+      {
+      this->timeScale_ = delta / (double)max_int;
+      this->slider_->setRange(0, max_int);
+      }
+    else
+      {
+      this->timeScale_ = resolution;
+      this->slider_->setRange(0, static_cast<int>(ceil(delta * ri)));
+      }
+    }
+
+  // Since signals are blocked, the ctkRangeSlider doesn't get the message that
+  // the QAbstractSlider's range has changed, and thus doesn't 'fix' the
+  // previous values to fit into the new range. So we need to make it happen
+  // here, by re-setting the values and letting them get clamped appropriately.
+  this->slider_->setValues(this->slider_->minimumValue(),
+                           this->slider_->maximumValue());
+
+  this->slider_->blockSignals(false);
+
+  double minTime = this->timeFromSliderPosition(this->slider_->minimumValue());
+  double maxTime = this->timeFromSliderPosition(this->slider_->maximumValue());
+
+  bool minChanged = minTime != oldMinTime;
+  bool maxChanged = maxTime != oldMaxTime;
+
+  if (minChanged || maxChanged)
+    {
+    emit q->timesChanged(minTime, maxTime, false);
+    if (minChanged)
+      {
+      emit q->minTimeChanged(minTime);
+      }
+    if (maxChanged)
+      {
+      emit q->timeChanged(maxTime);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setFrameNumber(int value)
+{
+  if (!this->spinBox_)
+    {
+    return;
+    }
+
+  this->setValue(value);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setFrameNumbers(int minVal, int maxVal)
+{
+  if (!this->spinBox_)
+    {
+    return;
+    }
+
+  this->setValues(minVal, maxVal);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setTime(double value)
+{
+  if (this->spinBox_)
+    {
+    return;
+    }
+
+  static const int max_int = std::numeric_limits<int>::max();
+  const double pos = (value - this->timeOffset_) / this->timeScale_;
+  this->setValue(pos > max_int ? max_int : qRound(pos));
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setTimes(double minVal, double maxVal)
+{
+  if (this->spinBox_)
+    {
+    return;
+    }
+
+  static const int max_int = std::numeric_limits<int>::max();
+  const double pos1 = (minVal - this->timeOffset_) / this->timeScale_;
+  const double pos2 = (maxVal - this->timeOffset_) / this->timeScale_;
+  this->setValues(pos1 > max_int ? max_int : qRound(pos1),
+                  pos2 > max_int ? max_int : qRound(pos2));
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setMinFrameNumber(int value)
+{
+  if (!this->spinBox_)
+    {
+    return;
+    }
+
+  this->setMinValue(value);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setMinTime(double value)
+{
+  if (this->spinBox_)
+    {
+    return;
+    }
+
+  static const int max_int = std::numeric_limits<int>::max();
+  const double pos = (value - this->timeOffset_) / this->timeScale_;
+  this->setMinValue(pos > max_int ? max_int : qRound(pos));
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setValue(int value,
+                                      bool keepWidth,
+                                      bool forceSignal)
+{
+  if (keepWidth)
+    {
+    int width = this->slider_->maximumValue() - this->slider_->minimumValue();
+    this->setValues(value - width, value);
+    }
+  else
+    {
+    this->setValues(value, value, forceSignal);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setMinValue(int value,
+                                         bool keepWidth)
+{
+  if (keepWidth)
+    {
+    int width = this->slider_->maximumValue() - this->slider_->minimumValue();
+    this->setValues(value, value + width);
+    }
+  else
+    {
+    this->setValues(value, this->slider_->maximumValue());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setValues(int minVal,
+                                       int maxVal,
+                                       bool resized,
+                                       bool forceSignal)
+{
+  int prevMin = this->slider_->minimumValue();
+  int prevMax = this->slider_->maximumValue();
+  this->slider_->blockSignals(true);
+  this->slider_->setValues(minVal, maxVal);
+  this->slider_->setValue(maxVal); // value == maximumValue
+  this->slider_->blockSignals(false);
+
+  bool minChanged = this->slider_->minimumValue() != prevMin;
+  bool maxChanged = this->slider_->maximumValue() != prevMax;
+
+  if (this->spinBox_)
+    {
+    this->spinBox_->blockSignals(true);
+    this->spinBox_->setValue(maxVal);
+    this->spinBox_->blockSignals(false);
+    }
+
+  if (forceSignal || minChanged || maxChanged)
+    {
+    QTE_Q(vgFrameScrubber);
+
+    if (this->spinBox_)
+      {
+      emit q->frameNumbersChanged(minVal, maxVal, resized);
+      if (minChanged || forceSignal)
+        {
+        emit q->minFrameNumberChanged(minVal);
+        }
+      if (maxChanged || forceSignal)
+        {
+        emit q->frameNumberChanged(maxVal);
+        }
+      }
+    else
+      {
+      double minTime = this->timeFromSliderPosition(minVal);
+      double maxTime = this->timeFromSliderPosition(maxVal);
+
+      emit q->timesChanged(minTime, maxTime, resized);
+      if (minChanged || forceSignal)
+        {
+        emit q->minTimeChanged(minTime);
+        }
+      if (maxChanged || forceSignal)
+        {
+        emit q->timeChanged(maxTime);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+double vgFrameScrubberPrivate::timeFromSliderPosition(int value)
+{
+  if (this->spinBox_)
+    {
+    return qQNaN();
+    }
+
+  return this->timeOffset_ + (this->timeScale_ * (double)value);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubberPrivate::setIntervalModeEnabled(bool enabled)
+{
+  this->slider_->setMinHandleShown(enabled);
+}
+
+//-----------------------------------------------------------------------------
+vgFrameScrubber::vgFrameScrubber(QWidget* parent) :
+  QWidget(parent),
+  d_ptr(new vgFrameScrubberPrivate(this))
+{
+}
+
+//-----------------------------------------------------------------------------
+vgFrameScrubber::~vgFrameScrubber()
+{
+  QTE_D(vgFrameScrubber);
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setFrameNumberRange(int minimumFrameNumber,
+                                          int maximumFrameNumber)
+{
+  QTE_D(vgFrameScrubber);
+  d->updateFrameNumberRange(minimumFrameNumber, maximumFrameNumber);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setFrameNumber(int value)
+{
+  QTE_D(vgFrameScrubber);
+  d->setFrameNumber(value);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setFrameNumbers(int minVal, int maxVal)
+{
+  QTE_D(vgFrameScrubber);
+  d->setFrameNumbers(minVal, maxVal);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setMinFrameNumber(int value)
+{
+  QTE_D(vgFrameScrubber);
+  d->setMinFrameNumber(value);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setTimeRange(double minimumTime, double maximumTime,
+                                   double resolution)
+{
+  QTE_D(vgFrameScrubber);
+  d->updateTimeRange(minimumTime, maximumTime, resolution);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setTime(double value)
+{
+  QTE_D(vgFrameScrubber);
+  d->setTime(value);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setTimes(double minVal, double maxVal)
+{
+  QTE_D(vgFrameScrubber);
+  d->setTimes(minVal, maxVal);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setMinTime(double value)
+{
+  QTE_D(vgFrameScrubber);
+  d->setMinTime(value);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::setIntervalModeEnabled(bool enabled)
+{
+  QTE_D(vgFrameScrubber);
+  d->setIntervalModeEnabled(enabled);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::updateValueFromSlider(int value)
+{
+  QTE_D(vgFrameScrubber);
+  d->setValue(value, true, true);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameScrubber::updateValuesFromSlider(int minVal, int maxVal)
+{
+  QTE_D(vgFrameScrubber);
+  d->setValues(minVal, maxVal, true, true);
+}
diff --git a/Libraries/QtVgWidgets/vgFrameScrubber.h b/Libraries/QtVgWidgets/vgFrameScrubber.h
new file mode 100644
index 00000000..2b0b2806
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgFrameScrubber.h
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgFrameScrubber_h
+#define __vgFrameScrubber_h
+
+#include <QAbstractSlider>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class vgFrameScrubberPrivate;
+
+class QTVG_WIDGETS_EXPORT vgFrameScrubber : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit vgFrameScrubber(QWidget* parent = 0);
+  virtual ~vgFrameScrubber();
+
+signals:
+  void timeChanged(double value);
+  void timesChanged(double minVal, double maxVal, bool resized);
+  void frameNumberChanged(int value);
+  void frameNumbersChanged(int minVal, int maxVal, bool resized);
+
+  void minTimeChanged(double value);
+  void minFrameNumberChanged(int value);
+
+  void frameNumberRangeChanged(int min, int max);
+  void timeRangeChanged(double min, double max);
+
+public slots:
+  void setFrameNumberRange(int minimumFrameNumber, int maximumFrameNumber);
+  void setFrameNumber(int value);
+  void setFrameNumbers(int minVal, int maxVal);
+  void setMinFrameNumber(int value);
+
+  void setTimeRange(double minimumTime, double maximumTime,
+                    double resolution = 1e3);
+  void setTime(double value);
+  void setTimes(double minVal, double maxVal);
+  void setMinTime(double value);
+
+  void setIntervalModeEnabled(bool enable);
+
+protected slots:
+  void updateValueFromSlider(int);
+  void updateValuesFromSlider(int, int);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(vgFrameScrubber)
+
+private:
+  QTE_DECLARE_PRIVATE(vgFrameScrubber)
+  Q_DISABLE_COPY(vgFrameScrubber)
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgFrameSpinBox.cxx b/Libraries/QtVgWidgets/vgFrameSpinBox.cxx
new file mode 100644
index 00000000..17ba0aa8
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgFrameSpinBox.cxx
@@ -0,0 +1,112 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgFrameSpinBox.h"
+
+#include <QDebug>
+#include <QLineEdit>
+
+QTE_IMPLEMENT_D_FUNC(vgFrameSpinBox)
+
+//-----------------------------------------------------------------------------
+class vgFrameSpinBoxPrivate
+{
+public:
+  vgFrameSpinBoxPrivate() : nextDirection(vg::SeekUnspecified) {}
+
+  // Bypass Qt API's 'const' modifier on QSpinBox valueFromText()/fixup()
+  mutable vg::SeekMode nextDirection;
+};
+
+//-----------------------------------------------------------------------------
+vgFrameSpinBox::vgFrameSpinBox(QWidget* parent) :
+  QSpinBox(parent),
+  d_ptr(new vgFrameSpinBoxPrivate)
+{
+  this->setAlignment(Qt::AlignRight);
+  connect(this, SIGNAL(valueChanged(int)),
+          this, SLOT(emitValueChangeWithDirection(int)));
+}
+
+//-----------------------------------------------------------------------------
+vgFrameSpinBox::~vgFrameSpinBox()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameSpinBox::setRange(int minimum, int maximum)
+{
+  QTE_D(vgFrameSpinBox);
+
+  // Set formatting options and read-only flag
+  if (maximum == minimum)
+    {
+    this->lineEdit()->setReadOnly(true);
+    this->setSpecialValueText(minimum < 0 ? QString("(N/A)") : QString());
+    this->setSuffix(QString());
+    }
+  else
+    {
+    this->lineEdit()->setReadOnly(this->isReadOnly());
+    this->setSpecialValueText(QString());
+    if (minimum <= 1)
+      {
+      this->setSuffix(QString(" / %1").arg(maximum));
+      }
+    else
+      {
+      this->setSuffix(QString(" / (%2 - %1)").arg(maximum).arg(minimum));
+      }
+    }
+
+  // Update the range, and temporarily set seek direction in case the value
+  // changes as a result
+  d->nextDirection = vg::SeekNearest;
+  QSpinBox::setRange(minimum, maximum);
+  d->nextDirection = vg::SeekUnspecified;
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameSpinBox::stepBy(int steps)
+{
+  if (steps)
+    {
+    QTE_D(vgFrameSpinBox);
+    d->nextDirection = (steps > 0 ? vg::SeekLowerBound : vg::SeekUpperBound);
+    QAbstractSpinBox::stepBy(steps);
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vgFrameSpinBox::valueFromText(const QString& text) const
+{
+  QTE_D_CONST(vgFrameSpinBox);
+  d->nextDirection = vg::SeekNearest;
+  return QSpinBox::valueFromText(text);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameSpinBox::fixup(QString& str) const
+{
+  QTE_D_CONST(vgFrameSpinBox);
+  d->nextDirection = vg::SeekNearest;
+  QSpinBox::fixup(str);
+}
+
+//-----------------------------------------------------------------------------
+void vgFrameSpinBox::emitValueChangeWithDirection(int newValue)
+{
+  QTE_D(vgFrameSpinBox);
+
+  if (d->nextDirection == vg::SeekUnspecified)
+    {
+    qWarning() << "vgFrameSpinBox: valueChanged() was emitted"
+                  " but direction is not set";
+    }
+
+  emit this->valueChanged(newValue, d->nextDirection);
+  d->nextDirection = vg::SeekUnspecified;
+}
diff --git a/Libraries/QtVgWidgets/vgFrameSpinBox.h b/Libraries/QtVgWidgets/vgFrameSpinBox.h
new file mode 100644
index 00000000..f7f553a1
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgFrameSpinBox.h
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgFrameSpinBox_h
+#define __vgFrameSpinBox_h
+
+#include <QSpinBox>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+
+class vgFrameSpinBoxPrivate;
+
+class QTVG_WIDGETS_EXPORT vgFrameSpinBox : public QSpinBox
+{
+  Q_OBJECT
+
+public:
+  explicit vgFrameSpinBox(QWidget* parent = 0);
+  virtual ~vgFrameSpinBox();
+
+  void setRange(int minimum, int maximum);
+
+signals:
+  void valueChanged(int, vg::SeekMode);
+
+protected slots:
+  void emitValueChangeWithDirection(int);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgFrameSpinBox)
+
+  virtual void stepBy(int steps);
+  virtual int valueFromText(const QString& text) const;
+  virtual void fixup(QString& str) const;
+
+  using QSpinBox::valueChanged;
+
+private:
+  QTE_DECLARE_PRIVATE(vgFrameSpinBox)
+  Q_DISABLE_COPY(vgFrameSpinBox)
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgMixerDrawer.cxx b/Libraries/QtVgWidgets/vgMixerDrawer.cxx
new file mode 100644
index 00000000..c8e506ae
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgMixerDrawer.cxx
@@ -0,0 +1,167 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgMixerDrawer.h"
+
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QLabel>
+
+#include "vgMixerWidget.h"
+
+QTE_IMPLEMENT_D_FUNC(vgMixerDrawer)
+
+//-----------------------------------------------------------------------------
+class vgMixerDrawerPrivate
+{
+public:
+  vgMixerDrawerPrivate();
+
+  int id_;
+
+  QLabel* label_;
+  QCheckBox* checkbox_;
+  QWidget* textWidget_;
+
+  vgMixerDrawer* parent_;
+  vgMixerWidget* widget_;
+};
+
+//-----------------------------------------------------------------------------
+vgMixerDrawerPrivate::vgMixerDrawerPrivate() :
+  id_(0), label_(0), checkbox_(0), textWidget_(0),  parent_(0), widget_(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgMixerDrawer::vgMixerDrawer(vgMixerWidget* widget) :
+  qtDrawer(widget, qobject_cast<QGridLayout*>(widget->layout())),
+  d_ptr(new vgMixerDrawerPrivate)
+{
+  QTE_D(vgMixerDrawer);
+  d->widget_ = widget;
+}
+
+//-----------------------------------------------------------------------------
+vgMixerDrawer::vgMixerDrawer(int id, const QString& text,
+                             vgMixerDrawer* parent, bool checkable) :
+  qtDrawer(parent),
+  d_ptr(new vgMixerDrawerPrivate)
+{
+  QTE_D(vgMixerDrawer);
+
+  d->id_ = id;
+  d->parent_ = parent;
+  d->widget_ = parent->d_func()->widget_;
+
+  if (checkable)
+    {
+    d->textWidget_ = d->checkbox_ = new QCheckBox(text);
+    d->checkbox_->setCheckState(Qt::PartiallyChecked);
+    connect(d->checkbox_, SIGNAL(clicked(bool)),
+            this, SLOT(setChecked(bool)));
+    }
+  else
+    {
+    d->textWidget_ = d->label_ = new QLabel(text);
+    }
+  d->textWidget_->setEnabled(false);
+
+  this->addWidget(d->textWidget_);
+  this->setExpanderPolicy(qtDrawer::ExpanderAlwaysShown);
+}
+
+//-----------------------------------------------------------------------------
+vgMixerDrawer::~vgMixerDrawer()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vgMixerDrawer::id() const
+{
+  QTE_D_CONST(vgMixerDrawer);
+  return d->id_;
+}
+
+//-----------------------------------------------------------------------------
+vgMixerWidget* vgMixerDrawer::widget()
+{
+  QTE_D(vgMixerDrawer);
+  return d->widget_;
+}
+
+//-----------------------------------------------------------------------------
+vgMixerDrawer* vgMixerDrawer::parent()
+{
+  QTE_D(vgMixerDrawer);
+  return d->parent_;
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerDrawer::setCheckState(Qt::CheckState state)
+{
+  QTE_D(vgMixerDrawer);
+  if (d->checkbox_)
+    {
+    d->checkbox_->setCheckState(state);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerDrawer::setChecked(bool checked)
+{
+  QTE_D(vgMixerDrawer);
+
+  if (d->checkbox_)
+    {
+    d->checkbox_->setChecked(checked);
+    emit this->checkToggled(d->id_, checked);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerDrawer::addChild(qtDrawer* child, qtDrawer* before)
+{
+  QTE_D(vgMixerDrawer);
+  if (d->textWidget_)
+    {
+    d->textWidget_->setEnabled(true);
+    }
+  qtDrawer::addChild(child, before);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerDrawer::removeChild(qtDrawer* child)
+{
+  QTE_D(vgMixerDrawer);
+  qtDrawer::removeChild(child);
+  if (d->textWidget_)
+    {
+    if (this->countDescendants() > 0)
+      {
+      d->textWidget_->setEnabled(true);
+      }
+    else
+      {
+      d->textWidget_->setEnabled(false);
+      if (d->checkbox_)
+        {
+        d->checkbox_->setCheckState(Qt::PartiallyChecked);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerDrawer::clear()
+{
+  QTE_D(vgMixerDrawer);
+  if (d->textWidget_)
+    {
+    d->textWidget_->setEnabled(false);
+    }
+  qtDrawer::clear();
+}
diff --git a/Libraries/QtVgWidgets/vgMixerDrawer.h b/Libraries/QtVgWidgets/vgMixerDrawer.h
new file mode 100644
index 00000000..3a43bcec
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgMixerDrawer.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgMixerDrawer_h
+#define __vgMixerDrawer_h
+
+#include <qtDrawer.h>
+
+class vgMixerWidget;
+
+class vgMixerDrawerPrivate;
+
+class vgMixerDrawer : public qtDrawer
+{
+  Q_OBJECT
+
+public:
+  vgMixerDrawer(vgMixerWidget* widget);
+  vgMixerDrawer(int id, const QString& text, vgMixerDrawer* parent,
+                bool checkable = false);
+  virtual ~vgMixerDrawer();
+
+  int id() const;
+  vgMixerWidget* widget();
+  vgMixerDrawer* parent();
+
+signals:
+  void checkToggled(int id, bool);
+
+public slots:
+  void setCheckState(Qt::CheckState);
+
+protected slots:
+  virtual void setChecked(bool);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgMixerDrawer)
+
+  virtual void addChild(qtDrawer* child, qtDrawer* before = 0);
+  virtual void removeChild(qtDrawer* child);
+  virtual void clear();
+
+private:
+  QTE_DECLARE_PRIVATE(vgMixerDrawer)
+  Q_DISABLE_COPY(vgMixerDrawer)
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgMixerItem.cxx b/Libraries/QtVgWidgets/vgMixerItem.cxx
new file mode 100644
index 00000000..59447dae
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgMixerItem.cxx
@@ -0,0 +1,362 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgMixerItem.h"
+
+#include <QCheckBox>
+#include <QDoubleSpinBox>
+#include <QtCore>
+
+#include <qtDoubleSlider.h>
+#include <qtScopedValueChange.h>
+
+#include <cmath>
+
+#include "vgMixerDrawer.h"
+#include "vgMixerWidget.h"
+
+QTE_IMPLEMENT_D_FUNC(vgMixerItem)
+
+//BEGIN vgMixerItemPrivate
+
+//-----------------------------------------------------------------------------
+class vgMixerItemPrivate
+{
+public:
+  void setWidgetRangeAndStep();
+  void setWidgetValue(double value);
+
+  vgMixerDrawer* parent_;
+
+  QCheckBox* checkbox_;
+  QCheckBox* checkboxInverted_;
+  qtDoubleSlider* slider_;
+  QDoubleSpinBox* spinbox_;
+
+  int key_;
+  double value_;
+  double minimum_, maximum_, range_;
+  double singleStep_, pageStep_;
+};
+
+//-----------------------------------------------------------------------------
+void vgMixerItemPrivate::setWidgetRangeAndStep()
+{
+  qtScopedBlockSignals bsSlider(this->slider_), bsSpinBox(this->spinbox_);
+
+  this->slider_->setRange(this->minimum_, this->maximum_);
+  this->slider_->setSingleStep(this->singleStep_);
+  this->slider_->setPageStep(this->pageStep_);
+
+  this->spinbox_->setRange(this->minimum_, this->maximum_);
+  this->spinbox_->setSingleStep(this->singleStep_);
+
+  // Determine number of decimal places to display
+  int precision = 0;
+  double ss = this->singleStep_;
+  while (!qFuzzyCompare(ss, floor(ss + 0.5)))
+    {
+    ++precision;
+    ss *= 10;
+    }
+
+  this->spinbox_->setDecimals(precision);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItemPrivate::setWidgetValue(double value)
+{
+  qtScopedBlockSignals bsSlider(this->slider_), bsSpinBox(this->spinbox_);
+
+  this->spinbox_->setValue(value);
+  this->slider_->setValue(value);
+}
+
+//END vgMixerItemPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgMixerItem
+
+//-----------------------------------------------------------------------------
+vgMixerItem::vgMixerItem(int key, const QString& text, vgMixerDrawer* drawer) :
+  qtDrawer(drawer),
+  d_ptr(new vgMixerItemPrivate)
+{
+  QTE_D(vgMixerItem);
+
+  d->parent_ = drawer;
+  d->key_ = key;
+  d->value_ = 0.0;
+
+  d->checkbox_ = new QCheckBox(text.trimmed());
+  d->checkboxInverted_ = new QCheckBox("Invert");
+  d->slider_ = new qtDoubleSlider();
+  d->spinbox_ = new QDoubleSpinBox();
+
+  d->slider_->setMinimumSize(QSize(40, 4));
+
+  this->setRange(0.0, 1.0, 0.01, 0.1);
+  d->setWidgetValue(d->value_);
+
+  d->checkbox_->setCheckState(Qt::Checked);
+  d->checkboxInverted_->setCheckState(Qt::Unchecked);
+
+  connect(d->slider_, SIGNAL(valueChanged(double)),
+          this, SLOT(setValueFromSlider(double)));
+  connect(d->spinbox_, SIGNAL(valueChanged(double)),
+          this, SLOT(setValueFromSpinBox(double)));
+
+  connect(d->checkbox_, SIGNAL(toggled(bool)),
+          this, SLOT(emitStateChanged(bool)));
+  connect(d->checkboxInverted_, SIGNAL(toggled(bool)),
+          this, SLOT(emitInvertedChanged(bool)) );
+
+  this->addWidget(d->checkbox_, 0);
+  this->addWidget(d->slider_, 1);
+  this->addWidget(d->spinbox_, 2);
+   this->addWidget(d->checkboxInverted_, 3);
+}
+
+//-----------------------------------------------------------------------------
+vgMixerItem::~vgMixerItem()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vgMixerItem::key() const
+{
+  QTE_D_CONST(vgMixerItem);
+  return d->key_;
+}
+
+//-----------------------------------------------------------------------------
+bool vgMixerItem::state() const
+{
+  QTE_D_CONST(vgMixerItem);
+  return d->checkbox_->isChecked();
+}
+
+//-----------------------------------------------------------------------------
+bool vgMixerItem::isInverted() const
+{
+  QTE_D_CONST(vgMixerItem);
+  return d->checkboxInverted_->isChecked();
+}
+
+//-----------------------------------------------------------------------------
+double vgMixerItem::value() const
+{
+  QTE_D_CONST(vgMixerItem);
+  return d->slider_->value();
+}
+
+//-----------------------------------------------------------------------------
+double vgMixerItem::minimum() const
+{
+  QTE_D_CONST(vgMixerItem);
+  return d->slider_->minimum();
+}
+
+//-----------------------------------------------------------------------------
+double vgMixerItem::maximum() const
+{
+  QTE_D_CONST(vgMixerItem);
+  return d->slider_->maximum();
+}
+
+//-----------------------------------------------------------------------------
+double vgMixerItem::singleStep() const
+{
+  QTE_D_CONST(vgMixerItem);
+  return d->slider_->singleStep();
+}
+
+//-----------------------------------------------------------------------------
+double vgMixerItem::pageStep() const
+{
+  QTE_D_CONST(vgMixerItem);
+  return d->slider_->pageStep();
+}
+
+//-----------------------------------------------------------------------------
+vgMixerDrawer* vgMixerItem::parent()
+{
+  QTE_D(vgMixerItem);
+  return d->parent_;
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setText(const QString& text)
+{
+  QTE_D(vgMixerItem);
+  d->checkbox_->setText(text.trimmed());
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setInvertedText(const QString& text)
+{
+  QTE_D(vgMixerItem);
+  d->checkboxInverted_->setText(text.trimmed());
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setMinimum(double minimum)
+{
+  QTE_D(vgMixerItem);
+  this->setRange(minimum, d->maximum_, d->singleStep_, d->pageStep_);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setMaximum(double maximum)
+{
+  QTE_D(vgMixerItem);
+  this->setRange(d->minimum_, maximum, d->singleStep_, d->pageStep_);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setSingleStep(double step)
+{
+  QTE_D(vgMixerItem);
+  this->setRange(d->minimum_, d->maximum_, step, d->pageStep_);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setPageStep(double step)
+{
+  QTE_D(vgMixerItem);
+  this->setRange(d->minimum_, d->maximum_, d->singleStep_, step);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setRange(double minimum, double maximum)
+{
+  QTE_D(vgMixerItem);
+  this->setRange(minimum, maximum, d->singleStep_, d->pageStep_);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setRange(
+  double minimum, double maximum, double singleStep, double pageStep)
+{
+  QTE_D(vgMixerItem);
+
+  // First, make sure our range is reasonable
+  if (!(qIsFinite(minimum) && qIsFinite(maximum)))
+    {
+    return;
+    }
+  minimum = qMin(minimum, maximum);
+  maximum = qMax(minimum, maximum);
+  d->minimum_ = minimum;
+  d->maximum_ = maximum;
+  const double range = d->range_ = maximum - minimum;
+
+  // Next make sure our steps are reasonable
+  qIsFinite(pageStep) || (pageStep = range * 0.1);
+  qIsFinite(singleStep) || (singleStep = pageStep * 0.1);
+  pageStep = qMin(fabs(pageStep), range);
+  singleStep = qMin(fabs(singleStep), pageStep);
+  d->singleStep_ = singleStep;
+  d->pageStep_ = pageStep;
+
+  // Update the widgets
+  d->setWidgetRangeAndStep();
+
+  // Reset the widgets' displayed values, and check if the value changed
+  const double value = qBound(minimum, d->value_, maximum);
+  d->setWidgetValue(value);
+
+  if (!qFuzzyCompare(value, d->value_))
+    {
+    // Value changed due to range change
+    d->value_ = value;
+    emit this->valueChanged(d->key_, value);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setState(bool v)
+{
+  QTE_D(vgMixerItem);
+
+  if (d->checkbox_->isChecked() != v)
+    {
+    d->checkbox_->setChecked(v);
+    emit this->stateChanged(d->key_, v);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setInverted(bool v)
+{
+  QTE_D(vgMixerItem);
+
+  if (d->checkboxInverted_->isChecked() != v)
+    {
+    d->checkboxInverted_->setChecked(v);
+    emit this->invertedChanged(d->key_, v);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setValue(double t)
+{
+  QTE_D(vgMixerItem);
+
+  if (!qFuzzyCompare(d->value_, t))
+    {
+    d->value_ = t;
+    d->setWidgetValue(t);
+    emit this->valueChanged(d->key_, t);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setValueFromSlider(double newValue)
+{
+  QTE_D(vgMixerItem);
+
+  qtScopedBlockSignals bs(d->spinbox_);
+  d->spinbox_->setValue(newValue);
+
+  if (!qFuzzyCompare(d->value_, newValue))
+    {
+    d->value_ = newValue;
+    emit this->valueChanged(d->key_, newValue);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::setValueFromSpinBox(double newValue)
+{
+  QTE_D(vgMixerItem);
+
+  qtScopedBlockSignals bs(d->slider_);
+  d->slider_->setValue(newValue);
+
+  if (!qFuzzyCompare(d->value_, newValue))
+    {
+    d->value_ = newValue;
+    emit this->valueChanged(d->key_, newValue);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::emitStateChanged(bool state)
+{
+  QTE_D(vgMixerItem);
+  emit this->stateChanged(d->key_, state);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerItem::emitInvertedChanged(bool state)
+{
+  QTE_D(vgMixerItem);
+  emit this->invertedChanged(d->key_, state);
+}
+
+//END vgMixerItem
diff --git a/Libraries/QtVgWidgets/vgMixerItem.h b/Libraries/QtVgWidgets/vgMixerItem.h
new file mode 100644
index 00000000..09a5f12d
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgMixerItem.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgMixerItem_h
+#define __vgMixerItem_h
+
+#include <qtDrawer.h>
+#include <qtGlobal.h>
+
+class vgMixerDrawer;
+
+class vgMixerItemPrivate;
+
+class vgMixerItem : public qtDrawer
+{
+  Q_OBJECT
+
+public:
+  vgMixerItem(int key, const QString& text, vgMixerDrawer* drawer);
+  virtual ~vgMixerItem();
+
+  int key() const;
+  bool state() const;
+  bool isInverted() const;
+  double value() const;
+
+  double minimum() const;
+  double maximum() const;
+  double singleStep() const;
+  double pageStep() const;
+
+  vgMixerDrawer* parent();
+
+  void setText(const QString&);
+  void setInvertedText(const QString&);
+  void setMinimum(double minimum);
+  void setMaximum(double maximum);
+  void setSingleStep(double step);
+  void setPageStep(double step);
+  void setRange(double minimum, double maximum);
+  void setRange(double minimum, double maximum,
+                double singleStep, double pageStep);
+
+signals:
+  void stateChanged(int key, bool);
+  void invertedChanged(int key, bool);
+  void valueChanged(int key, double);
+
+public slots:
+  void setState(bool);
+  void setInverted(bool);
+  void setValue(double);
+
+protected slots:
+  void setValueFromSlider(double);
+  void setValueFromSpinBox(double);
+  void emitStateChanged(bool);
+  void emitInvertedChanged(bool);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgMixerItem)
+
+private:
+  QTE_DECLARE_PRIVATE(vgMixerItem)
+  Q_DISABLE_COPY(vgMixerItem)
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgMixerWidget.cxx b/Libraries/QtVgWidgets/vgMixerWidget.cxx
new file mode 100644
index 00000000..3fd00ff1
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgMixerWidget.cxx
@@ -0,0 +1,507 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgMixerWidget.h"
+
+#include <QDebug>
+#include <QHash>
+#include <QList>
+#include <QMultiHash>
+#include <QStack>
+#include <QtCore>
+
+#include <qtDrawerWidget.h>
+#include <qtScopedValueChange.h>
+
+#include "vgMixerDrawer.h"
+#include "vgMixerItem.h"
+
+QTE_IMPLEMENT_D_FUNC(vgMixerWidget)
+
+//BEGIN vgMixerWidgetPrivate
+
+//-----------------------------------------------------------------------------
+class vgMixerWidgetPrivate
+{
+public:
+  QHash<int, vgMixerItem*> items_;
+  QHash<int, vgMixerDrawer*> groups_;
+  QMultiHash<vgMixerDrawer*, vgMixerItem*> groupItems_;
+  QMultiHash<vgMixerDrawer*, vgMixerDrawer*> groupGroups_;
+  QStack<vgMixerDrawer*> group_;
+  bool enableUpdates_;
+
+  void removeItem(int key);
+  void removeGroup(vgMixerDrawer* group);
+  void setGroupState(vgMixerDrawer* group, bool state);
+  void setGroupInverted(vgMixerDrawer* group, bool state);
+  void updateParentState(vgMixerItem*);
+  void updateParentState(vgMixerDrawer*);
+  Qt::CheckState groupState(vgMixerDrawer*);
+
+  void setGroupValue(vgMixerDrawer* group, double value);
+};
+
+//-----------------------------------------------------------------------------
+void vgMixerWidgetPrivate::removeItem(int key)
+{
+  vgMixerItem* item = this->items_.take(key);
+  this->groupItems_.remove(item->parent(), item);
+  this->updateParentState(item);
+  delete item;
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidgetPrivate::removeGroup(vgMixerDrawer* group)
+{
+  foreach (vgMixerItem* item, this->groupItems_.values(group))
+    {
+    this->removeItem(item->key());
+    }
+  this->groupItems_.remove(group);
+
+  foreach (vgMixerDrawer* drawer, this->groupGroups_.values(group))
+    {
+    this->removeGroup(drawer);
+    }
+  this->groupGroups_.remove(group);
+
+  this->groups_.remove(group->id());
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidgetPrivate::setGroupState(vgMixerDrawer* group, bool state)
+{
+  foreach (vgMixerDrawer* subgroup, this->groupGroups_.values(group))
+    {
+    this->setGroupState(subgroup, state);
+    }
+  foreach (vgMixerItem* item, this->groupItems_.values(group))
+    {
+    item->setState(state);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidgetPrivate::setGroupInverted(vgMixerDrawer* group, bool state)
+{
+  foreach (vgMixerDrawer* subgroup, this->groupGroups_.values(group))
+    {
+    this->setGroupInverted(subgroup, state);
+    }
+  foreach (vgMixerItem* item, this->groupItems_.values(group))
+    {
+    item->setInverted(state);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidgetPrivate::updateParentState(vgMixerItem* i)
+{
+  vgMixerDrawer* parent = i->parent();
+  parent->setCheckState(this->groupState(parent));
+  this->updateParentState(parent);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidgetPrivate::updateParentState(vgMixerDrawer* g)
+{
+  vgMixerDrawer* parent = g->parent();
+  if (parent)
+    {
+    parent->setCheckState(this->groupState(parent));
+    this->updateParentState(parent);
+    }
+}
+
+//-----------------------------------------------------------------------------
+Qt::CheckState
+vgMixerWidgetPrivate::groupState(vgMixerDrawer* group)
+{
+  Qt::CheckState state = Qt::PartiallyChecked;
+
+  foreach (vgMixerDrawer* subgroup, this->groupGroups_.values(group))
+    {
+    Qt::CheckState s = this->groupState(subgroup);
+    if (s == Qt::PartiallyChecked)
+      {
+      return Qt::PartiallyChecked;
+      }
+    else if (state == Qt::PartiallyChecked)
+      {
+      state = s;
+      }
+    else if (state != s)
+      {
+      return Qt::PartiallyChecked;
+      }
+    }
+  foreach (vgMixerItem* item, this->groupItems_.values(group))
+    {
+    Qt::CheckState s = (item->state() ? Qt::Checked : Qt::Unchecked);
+    if (state == Qt::PartiallyChecked)
+      {
+      state = s;
+      }
+    else if (state != s)
+      {
+      return Qt::PartiallyChecked;
+      }
+    }
+  return state;
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidgetPrivate::setGroupValue(vgMixerDrawer* group, double value)
+{
+  foreach (vgMixerDrawer* subgroup, this->groupGroups_.values(group))
+    {
+    this->setGroupValue(subgroup, value);
+    }
+  foreach (vgMixerItem* item, this->groupItems_.values(group))
+    {
+    item->setValue(value);
+    }
+}
+
+//END vgMixerWidgetPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgMixerWidget
+
+//-----------------------------------------------------------------------------
+vgMixerWidget::vgMixerWidget(QWidget* parent) :
+  qtDrawerWidget(parent),
+  d_ptr(new vgMixerWidgetPrivate)
+{
+  QTE_D(vgMixerWidget);
+  d->enableUpdates_ = true;
+  this->clear();
+}
+
+//-----------------------------------------------------------------------------
+vgMixerWidget::~vgMixerWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtDrawer* vgMixerWidget::createRoot()
+{
+  qtDrawer* r = new vgMixerDrawer(this);
+  return r;
+}
+
+//-----------------------------------------------------------------------------
+int vgMixerWidget::beginGroup(const QString& text, bool checkable)
+{
+  QTE_D(vgMixerWidget);
+
+  int id = this->addGroup(text, checkable, d->group_.top()->id());
+  d->group_.push(d->groups_.value(id));
+  return id;
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::endGroup()
+{
+  QTE_D(vgMixerWidget);
+
+  if (d->group_.size() <= 1)
+    {
+    qDebug() << "vgMixerWidget: error: endGroup called without matching call"
+                " to beginGroup";
+    return;
+    }
+
+  d->group_.pop();
+}
+
+//-----------------------------------------------------------------------------
+int vgMixerWidget::addGroup(const QString& text, int parent)
+{
+  return this->addGroup(text, false, parent);
+}
+
+//-----------------------------------------------------------------------------
+int vgMixerWidget::addGroup(const QString& text, bool checkable, int group)
+{
+  QTE_D(vgMixerWidget);
+
+  vgMixerDrawer* parent = d->groups_.value((group < 0 ? 0 : group), 0);
+  if (!parent)
+    {
+    qDebug() << "vgMixerWidget: error: cannot add group" << text <<
+                " to parent group" << group << "- no such parent group exists";
+    return -1;
+    }
+
+  int id = d->groupGroups_.count();
+  vgMixerDrawer* drawer = new vgMixerDrawer(id, text, parent, checkable);
+
+  connect(drawer, SIGNAL(checkToggled(int, bool)),
+          this, SLOT(setGroupState(int, bool)));
+
+  d->groups_.insert(id, drawer);
+  d->groupGroups_.insert(parent, drawer);
+  return id;
+}
+
+//-----------------------------------------------------------------------------
+bool vgMixerWidget::addItem(int key, const QString& text, int group)
+{
+  QTE_D(vgMixerWidget);
+  if (d->items_.contains(key))
+    {
+    qDebug() << "vgMixerWidget: error: cannot add item" << text
+             << "with ID" << key << "- an item with that key already exists";
+    return false;
+    }
+
+  vgMixerDrawer* parent =
+    (group < 0 ? d->group_.top() : d->groups_.value(group, 0));
+  if (group >= 0 && !parent)
+    {
+    qDebug() << "vgMixerWidget: error: cannot add item to group" << group
+             << "- no such group exists";
+    return false;
+    }
+
+  vgMixerItem* item = new vgMixerItem(key, text, parent);
+  d->items_.insert(key, item);
+  d->groupItems_.insert(parent, item);
+
+  connect(item, SIGNAL(stateChanged(int, bool)),
+          this, SIGNAL(stateChanged(int, bool)));
+  connect(item, SIGNAL(invertedChanged(int, bool)),
+          this, SIGNAL(invertedChanged(int, bool)));
+  connect(item, SIGNAL(valueChanged(int, double)),
+          this, SIGNAL(valueChanged(int, double)));
+
+  connect(item, SIGNAL(stateChanged(int, bool)),
+          this, SLOT(updateItemParentState(int)));
+  connect(item, SIGNAL(invertedChanged(int,bool)),
+          this, SLOT(updateItemParentState(int)));
+  d->updateParentState(item);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vgMixerWidget::removeGroup(int group)
+{
+  QTE_D(vgMixerWidget);
+
+  vgMixerDrawer* drawer = d->groups_.value(group, 0);
+  if (!drawer)
+    {
+    qDebug() << "vgMixerWidget: error: cannot remove group" << group
+             << "- no such group exists";
+    return false;
+    }
+
+  d->removeGroup(drawer);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vgMixerWidget::removeItem(int key)
+{
+  QTE_D(vgMixerWidget);
+  if (!d->items_.contains(key))
+    {
+    qDebug() << "vgMixerWidget: error: cannot remove item with ID" << key
+             << "- no such item exists";
+    return false;
+    }
+
+  d->removeItem(key);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::clear()
+{
+  QTE_D(vgMixerWidget);
+  qtDrawerWidget::clear();
+
+  d->items_.clear();
+  d->groupItems_.clear();
+  d->group_.clear();
+  d->groups_.clear();
+  d->groupGroups_.clear();
+
+  vgMixerDrawer* r = qobject_cast<vgMixerDrawer*>(this->root());
+  d->group_.push(r);
+  d->groups_.insert(0, r);
+  d->groupGroups_.insert(0, r);
+}
+
+//-----------------------------------------------------------------------------
+QList<int> vgMixerWidget::keys()
+{
+  QTE_D(vgMixerWidget);
+  return d->items_.keys();
+}
+
+//-----------------------------------------------------------------------------
+#define WRAP_ITEM_GET(_type, _func, _default) \
+  _type vgMixerWidget::_func(int key) const \
+    { \
+    QTE_D_CONST(vgMixerWidget); \
+    if(!d->items_.contains(key)) \
+      return _default; \
+    return d->items_[key]->_func(); \
+    }
+
+WRAP_ITEM_GET(bool, state, false)
+WRAP_ITEM_GET(bool, isInverted, false)
+WRAP_ITEM_GET(double, value, qSNaN())
+WRAP_ITEM_GET(double, minimum, qSNaN())
+WRAP_ITEM_GET(double, maximum, qSNaN())
+WRAP_ITEM_GET(double, singleStep, qSNaN())
+WRAP_ITEM_GET(double, pageStep, qSNaN())
+
+//-----------------------------------------------------------------------------
+#define ITEM_SET_PROLOGUE \
+  QTE_D(vgMixerWidget); \
+  if(!d->items_.contains(key)) return;
+
+#define GROUP_SET_PROLOGUE \
+  QTE_D(vgMixerWidget); \
+  if(!d->groups_.contains(group)) return;
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setText(int key, const QString& text)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setText(text);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setInvertedText(int key, const QString& text)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setInvertedText(text);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setMinimum(int key, double minimum)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setMinimum(minimum);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setMaximum(int key, double maximum)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setMaximum(maximum);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setSingleStep(int key, double step)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setSingleStep(step);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setPageStep(int key, double step)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setPageStep(step);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setRange(int key, double minimum, double maximum)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setRange(minimum, maximum);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setRange(
+  int key, double minimum, double maximum, double singleStep, double pageStep)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setRange(minimum, maximum, singleStep, pageStep);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setState(int key, bool state)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setState(state);
+  if (d->enableUpdates_)
+    {
+    d->updateParentState(d->items_[key]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setInverted(int key, bool state)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setInverted(state);
+  if (d->enableUpdates_)
+    {
+    d->updateParentState(d->items_[key]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setValue(int key, double value)
+{
+  ITEM_SET_PROLOGUE
+  d->items_[key]->setValue(value);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setGroupVisible(int group, bool visible)
+{
+  GROUP_SET_PROLOGUE
+  d->groups_[group]->setVisibility(visible);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setGroupState(int group, bool state)
+{
+  GROUP_SET_PROLOGUE
+  qtScopedValueChange<bool> disableUpdates(d->enableUpdates_, false);
+  d->setGroupState(d->groups_[group], state);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setGroupInverted(int group, bool state)
+{
+  GROUP_SET_PROLOGUE
+  qtScopedValueChange<bool> disableUpdates(d->enableUpdates_, false);
+  d->setGroupInverted(d->groups_[group], state);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setGroupValue(int group, double value)
+{
+  GROUP_SET_PROLOGUE
+  d->setGroupValue(d->groups_[group], value);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::setExpanded(int group, bool expanded)
+{
+  GROUP_SET_PROLOGUE
+  d->groups_[group]->setExpanded(expanded);
+}
+
+//-----------------------------------------------------------------------------
+void vgMixerWidget::updateItemParentState(int key)
+{
+  ITEM_SET_PROLOGUE
+  d->updateParentState(d->items_[key]);
+}
+
+//END vgMixerWidget
diff --git a/Libraries/QtVgWidgets/vgMixerWidget.h b/Libraries/QtVgWidgets/vgMixerWidget.h
new file mode 100644
index 00000000..4ddc63f7
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgMixerWidget.h
@@ -0,0 +1,87 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgMixerWidget_h
+#define __vgMixerWidget_h
+
+#include <QList>
+
+#include <qtDrawerWidget.h>
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class vgMixerWidgetPrivate;
+
+class QTVG_WIDGETS_EXPORT vgMixerWidget : public qtDrawerWidget
+{
+  Q_OBJECT
+
+public:
+  vgMixerWidget(QWidget* parent = 0);
+  virtual ~vgMixerWidget();
+
+  virtual int beginGroup(const QString& text, bool checkable = false);
+  virtual void endGroup();
+
+  virtual int addGroup(const QString& text, int parent = 0);
+  virtual int addGroup(const QString& text, bool checkable, int parent = 0);
+  virtual bool addItem(int key, const QString& text, int group = -1);
+  virtual bool removeGroup(int group);
+  virtual bool removeItem(int key);
+  virtual void clear();
+
+  virtual QList<int> keys();
+
+  virtual bool state(int key) const;
+  virtual bool isInverted(int key) const;
+  virtual double value(int key) const;
+  virtual double minimum(int key) const;
+  virtual double maximum(int key) const;
+  virtual double singleStep(int key) const;
+  virtual double pageStep(int key) const;
+
+  virtual void setText(int key, const QString& text);
+  virtual void setInvertedText(int key, const QString& text);
+  virtual void setMinimum(int key, double minimum);
+  virtual void setMaximum(int key, double maximum);
+  virtual void setSingleStep(int key, double step);
+  virtual void setPageStep(int key, double step);
+  virtual void setRange(int key, double minimum, double maximum);
+  virtual void setRange(int key, double minimum, double maximum,
+                        double singleStep, double pageStep);
+
+signals:
+  void stateChanged(int key, bool state);
+  void invertedChanged(int key, bool state);
+  void valueChanged(int key, double value);
+
+public slots:
+  virtual void setState(int key, bool state);
+  virtual void setInverted(int key, bool state);
+  virtual void setValue(int key, double value);
+
+  virtual void setGroupVisible(int group, bool visible);
+  virtual void setGroupState(int group, bool state);
+  virtual void setGroupInverted(int group, bool state);
+  virtual void setGroupValue(int group, double value);
+
+  virtual void setExpanded(int group, bool expanded = true);
+
+protected slots:
+  virtual void updateItemParentState(int key);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgMixerWidget)
+
+  virtual qtDrawer* createRoot();
+
+private:
+  QTE_DECLARE_PRIVATE(vgMixerWidget)
+  Q_DISABLE_COPY(vgMixerWidget)
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgTextEditDialog.cxx b/Libraries/QtVgWidgets/vgTextEditDialog.cxx
new file mode 100644
index 00000000..af2ab8c5
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgTextEditDialog.cxx
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgTextEditDialog.h"
+#include "ui_vgTextEditDialog.h"
+
+#include <qtUtil.h>
+
+QTE_IMPLEMENT_D_FUNC(vgTextEditDialog)
+
+//-----------------------------------------------------------------------------
+class vgTextEditDialogPrivate
+{
+public:
+  Ui::vgTextEditDialog UI;
+};
+
+//-----------------------------------------------------------------------------
+vgTextEditDialog::vgTextEditDialog(QWidget* parent, Qt::WindowFlags f) :
+  QDialog(parent, f),
+  d_ptr(new vgTextEditDialogPrivate)
+{
+  QTE_D(vgTextEditDialog);
+
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+}
+
+//-----------------------------------------------------------------------------
+vgTextEditDialog::~vgTextEditDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vgTextEditDialog::setText(const QString& text)
+{
+  QTE_D(vgTextEditDialog);
+
+  d->UI.textEdit->setPlainText(text);
+  d->UI.textEdit->selectAll();
+}
+
+//-----------------------------------------------------------------------------
+QString vgTextEditDialog::text() const
+{
+  QTE_D_CONST(vgTextEditDialog);
+
+  return d->UI.textEdit->toPlainText();
+}
+
+//-----------------------------------------------------------------------------
+QString vgTextEditDialog::getText(QWidget* parent,
+                                  const QString& title,
+                                  const QString& text,
+                                  bool* ok, Qt::WindowFlags flags)
+{
+  vgTextEditDialog dialog(parent, flags);
+  dialog.setWindowTitle(title);
+  dialog.setText(text);
+
+  int result = dialog.exec();
+  if (ok)
+    {
+    *ok = result == QDialog::Accepted;
+    }
+
+  return dialog.text();
+}
diff --git a/Libraries/QtVgWidgets/vgTextEditDialog.h b/Libraries/QtVgWidgets/vgTextEditDialog.h
new file mode 100644
index 00000000..1302281f
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgTextEditDialog.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgTextEditDialog_h
+#define __vgTextEditDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class vgTextEditDialogPrivate;
+
+class QTVG_WIDGETS_EXPORT vgTextEditDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit vgTextEditDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
+  virtual ~vgTextEditDialog();
+
+  void setText(const QString& text);
+  QString text() const;
+
+  static QString getText(QWidget* parent,
+                         const QString& title,
+                         const QString& text = QString(),
+                         bool* ok = 0, Qt::WindowFlags flags = 0);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgTextEditDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vgTextEditDialog)
+  Q_DISABLE_COPY(vgTextEditDialog)
+};
+
+#endif
diff --git a/Libraries/QtVgWidgets/vgTextEditDialog.ui b/Libraries/QtVgWidgets/vgTextEditDialog.ui
new file mode 100644
index 00000000..a241ea83
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgTextEditDialog.ui
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vgTextEditDialog</class>
+ <widget class="QDialog" name="vgTextEditDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Edit text...</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QPlainTextEdit" name="textEdit">
+     <property name="tabChangesFocus">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vgTextEditDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vgTextEditDialog</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>
diff --git a/Libraries/QtVgWidgets/vgVideoScrubber.cxx b/Libraries/QtVgWidgets/vgVideoScrubber.cxx
new file mode 100644
index 00000000..e83d0759
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgVideoScrubber.cxx
@@ -0,0 +1,445 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideoScrubber.h"
+
+#include <QApplication>
+#include <QResizeEvent>
+#include <QSlider>
+#include <QWheelEvent>
+
+#include <qtDoubleSlider.h>
+#include <qtMath.h>
+#include <qtScopedValueChange.h>
+
+QTE_IMPLEMENT_D_FUNC(vgVideoScrubber)
+
+//BEGIN vgVideoScrubberPrivate
+
+//-----------------------------------------------------------------------------
+class vgVideoScrubberPrivate : public QObject
+{
+public:
+  vgVideoScrubberPrivate(vgVideoScrubber* q);
+
+  void useTimeSlider();
+  void useFrameSlider();
+
+  void setValue(vgTimeStamp, vg::SeekMode);
+
+  virtual bool eventFilter(QObject*, QEvent*);
+
+  QScopedPointer<QSlider> frameSlider;
+  QScopedPointer<qtDoubleSlider> timeSlider;
+
+  vgTimeStamp min, max, val, sStep, wStep, pStep;
+  double wAccum;
+  bool wAccumNoClear;
+
+  vg::SeekMode seekDirection;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vgVideoScrubber)
+
+private:
+  QTE_DECLARE_PUBLIC(vgVideoScrubber)
+};
+
+//-----------------------------------------------------------------------------
+vgVideoScrubberPrivate::vgVideoScrubberPrivate(vgVideoScrubber* q) :
+  wAccum(0.0),
+  wAccumNoClear(false),
+  q_ptr(q)
+{
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubberPrivate::useTimeSlider()
+{
+  QTE_Q(vgVideoScrubber);
+
+  this->frameSlider.reset();
+
+  if (!this->timeSlider)
+    {
+    this->timeSlider.reset(new qtDoubleSlider(q));
+    this->timeSlider->setGeometry(QRect(QPoint(0, 0), q->size()));
+    this->timeSlider->installEventFilter(this);
+
+    this->timeSlider->setRange(this->min.Time, this->max.Time);
+    this->timeSlider->setValue(this->val.Time);
+    this->timeSlider->setSingleStep(this->sStep.Time);
+    this->timeSlider->setPageStep(this->pStep.Time);
+
+    q->connect(this->timeSlider.data(), SIGNAL(valueChanged(double)),
+               q, SLOT(updateValue()));
+    q->connect(this->timeSlider.data(), SIGNAL(actionTriggered(int)),
+               q, SLOT(setDirectionFromSliderAction(int)));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubberPrivate::useFrameSlider()
+{
+  QTE_Q(vgVideoScrubber);
+
+  this->timeSlider.reset();
+
+  if (!this->frameSlider)
+    {
+    this->frameSlider.reset(new QSlider(q));
+    this->frameSlider->setGeometry(QRect(QPoint(0, 0), q->size()));
+    this->frameSlider->installEventFilter(this);
+
+    this->frameSlider->setRange(this->min.FrameNumber, this->max.FrameNumber);
+    this->frameSlider->setValue(this->val.FrameNumber);
+    this->frameSlider->setSingleStep(this->sStep.FrameNumber);
+    this->frameSlider->setPageStep(this->pStep.FrameNumber);
+
+    q->connect(this->frameSlider.data(), SIGNAL(valueChanged(int)),
+               q, SLOT(updateValue()));
+    q->connect(this->frameSlider.data(), SIGNAL(actionTriggered(int)),
+               q, SLOT(setDirectionFromSliderAction(int)));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubberPrivate::setValue(vgTimeStamp ts, vg::SeekMode sd)
+{
+  QTE_Q(vgVideoScrubber);
+
+  this->val = ts;
+  if (!this->wAccumNoClear)
+    {
+    this->wAccum = 0.0;
+    }
+
+  emit q->valueChanged(ts, sd);
+}
+
+//-----------------------------------------------------------------------------
+bool vgVideoScrubberPrivate::eventFilter(QObject*, QEvent* e)
+{
+  if (e->type() == QEvent::Wheel)
+    {
+    QTE_Q(vgVideoScrubber);
+    q->wheelEvent(static_cast<QWheelEvent*>(e));
+    return true;
+    }
+  return false;
+}
+
+//END vgVideoScrubberPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgVideoScrubber
+
+//-----------------------------------------------------------------------------
+vgVideoScrubber::vgVideoScrubber(QWidget* parent) :
+  QWidget(parent),
+  d_ptr(new vgVideoScrubberPrivate(this))
+{
+  QTE_D(vgVideoScrubber);
+  d->sStep = vgTimeStamp(1e-4, 1);
+  d->pStep = vgTimeStamp(1.0, 10);
+  this->setRange(vgTimeStamp(0u), vgTimeStamp(0u));
+}
+
+//-----------------------------------------------------------------------------
+vgVideoScrubber::~vgVideoScrubber()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideoScrubber::minimum() const
+{
+  QTE_D_CONST(vgVideoScrubber);
+  return d->min;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideoScrubber::maximum() const
+{
+  QTE_D_CONST(vgVideoScrubber);
+  return d->max;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideoScrubber::singleStep() const
+{
+  QTE_D_CONST(vgVideoScrubber);
+  return d->sStep;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideoScrubber::wheelStep() const
+{
+  QTE_D_CONST(vgVideoScrubber);
+  return d->wStep;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideoScrubber::pageStep() const
+{
+  QTE_D_CONST(vgVideoScrubber);
+  return d->pStep;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideoScrubber::value() const
+{
+  QTE_D_CONST(vgVideoScrubber);
+  return d->val;
+}
+
+//-----------------------------------------------------------------------------
+bool vgVideoScrubber::isRangeEmpty() const
+{
+  QTE_D_CONST(vgVideoScrubber);
+
+  if (!(d->min.IsValid() && d->max.IsValid()))
+    {
+    return true;
+    }
+
+  const vgTimeStamp range = d->max - d->min;
+  if (!range.IsValid())
+    {
+    return true;
+    }
+
+  return !((range.HasTime() && range.Time > 0) ||
+           (range.HasFrameNumber() && range.FrameNumber > 0));
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::setMinimum(vgTimeStamp min)
+{
+  this->setRange(min, this->maximum());
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::setMaximum(vgTimeStamp max)
+{
+  this->setRange(this->minimum(), max);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::setRange(vgTimeStamp min, vgTimeStamp max)
+{
+  QTE_D(vgVideoScrubber);
+
+  min = qMin(min, max);
+  max = qMax(min, max);
+
+  if (min != d->min || max != d->max)
+    {
+    // Update internal range
+    d->min = min;
+    d->max = max;
+
+    // Make sure we are using the appropriate widget, and update its range
+    if (min.HasTime() && max.HasTime())
+      {
+      d->useTimeSlider();
+      d->timeSlider->setRange(min.Time, max.Time);
+      }
+    else if (min.HasFrameNumber() && max.HasFrameNumber())
+      {
+      d->useFrameSlider();
+      d->frameSlider->setRange(min.FrameNumber, max.FrameNumber);
+      }
+
+    emit this->rangeChanged(min, max);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::setSingleStep(vgTimeStamp step)
+{
+  QTE_D(vgVideoScrubber);
+
+  step.HasTime() && (d->sStep.Time = step.Time);
+  step.HasFrameNumber() && (d->sStep.FrameNumber = step.FrameNumber);
+
+  (d->timeSlider
+   ? d->timeSlider->setSingleStep(d->sStep.Time)
+   : d->frameSlider->setSingleStep(d->sStep.FrameNumber));
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::setWheelStep(vgTimeStamp step)
+{
+  QTE_D(vgVideoScrubber);
+
+  // Set regardless; unlike single/page step, wheel step can be set to 'none'
+  d->wStep = step;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::setPageStep(vgTimeStamp step)
+{
+  QTE_D(vgVideoScrubber);
+
+  step.HasTime() && (d->pStep.Time = step.Time);
+  step.HasFrameNumber() && (d->pStep.FrameNumber = step.FrameNumber);
+
+  d->timeSlider
+  ? d->timeSlider->setPageStep(d->pStep.Time)
+  : d->frameSlider->setPageStep(d->pStep.FrameNumber);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::setValue(vgTimeStamp val, vg::SeekMode mode)
+{
+  QTE_D(vgVideoScrubber);
+  if (d->timeSlider && val.HasTime())
+    {
+    qtScopedBlockSignals bs(d->timeSlider.data());
+    d->timeSlider->setValue(val.Time);
+    d->setValue(val, mode);
+    }
+  else if (d->frameSlider && val.HasFrameNumber())
+    {
+    qtScopedBlockSignals bs(d->frameSlider.data());
+    d->frameSlider->setValue(val.FrameNumber);
+    d->setValue(val, mode);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::setDirectionFromSliderAction(int action)
+{
+  QTE_D(vgVideoScrubber);
+
+  switch (action)
+    {
+    case QAbstractSlider::SliderSingleStepAdd:
+    case QAbstractSlider::SliderPageStepAdd:
+      d->seekDirection = vg::SeekLowerBound;
+      break;
+    case QAbstractSlider::SliderSingleStepSub:
+    case QAbstractSlider::SliderPageStepSub:
+      d->seekDirection = vg::SeekUpperBound;
+      break;
+    default:
+      d->seekDirection = vg::SeekNearest;
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::updateValue()
+{
+  QTE_D(vgVideoScrubber);
+  vgTimeStamp ts = (d->timeSlider
+                    ? vgTimeStamp::fromTime(d->timeSlider->value())
+                    : vgTimeStamp::fromFrameNumber(d->frameSlider->value()));
+  d->setValue(ts, d->seekDirection);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::wheelEvent(QWheelEvent* e)
+{
+  if (!e->delta())
+    {
+    return;
+    }
+
+  QTE_D(vgVideoScrubber);
+
+  // Mark event as handled
+  e->accept();
+
+  // Calculate amount by which to change the value
+  const double delta = d->wAccum + (e->delta() / 120.0);
+  vgTimeStamp step;
+  if (e->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier))
+    {
+    step = d->pStep;
+    }
+  else
+    {
+    if (d->timeSlider ? d->wStep.HasTime() : d->wStep.HasFrameNumber())
+      {
+      step = d->wStep;
+      }
+    else
+      {
+      const unsigned int wsl = QApplication::wheelScrollLines();
+      step.FrameNumber = wsl * d->sStep.FrameNumber;
+      step.Time = wsl * d->sStep.Time;
+      }
+    }
+
+  // Calculate new position
+  vgTimeStamp ts;
+  vg::SeekMode sd = (delta > 0 ? vg::SeekLowerBound : vg::SeekUpperBound);
+  if (d->timeSlider)
+    {
+    // Calculate new time
+    const double t =
+      qBound(d->min.Time, d->max.Time, d->val.Time + (delta * step.Time));
+    ts = vgTimeStamp::fromTime(t);
+
+    // Time is continuous; no need to accumulate small changes until we have
+    // enough to produce a change
+    d->wAccum = 0.0;
+    }
+  else
+    {
+    // Accumulate partial frames so we will eventually generate a whole frame
+    // step, in case of many events with very small delta
+    d->wAccum += delta * step.FrameNumber;
+    const double sf = floor(d->wAccum);
+    d->wAccum -= sf;
+    qint64 stepFrames = qRound64(sf);
+    if (!stepFrames)
+      {
+      // We haven't accumulated a full frame yet, so there is nothing to do
+      return;
+      }
+
+    // Calculate new frame number
+    const qint64 min = d->min.FrameNumber, max = d->max.FrameNumber;
+    qint64 frame = d->val.FrameNumber + stepFrames;
+    if (frame < min)
+      {
+      // Clear accumulator if at lower bound
+      d->wAccum = 0.0;
+      frame = min;
+      }
+    else if (sf + frame > max)
+      {
+      // Clear accumulator if at upper bound
+      d->wAccum = 0.0;
+      frame = max;
+      }
+    ts = vgTimeStamp::fromFrameNumber(static_cast<unsigned int>(frame));
+    }
+
+  // Set new value
+  qtScopedValueChange<bool> bca(d->wAccumNoClear, true);
+  this->setValue(ts, sd);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoScrubber::resizeEvent(QResizeEvent* e)
+{
+  QTE_D(vgVideoScrubber);
+  if (d->timeSlider)
+    {
+    d->timeSlider->resize(e->size());
+    }
+  else
+    {
+    d->frameSlider->resize(e->size());
+    }
+  e->accept();
+}
+
+//END vgVideoScrubber
diff --git a/Libraries/QtVgWidgets/vgVideoScrubber.h b/Libraries/QtVgWidgets/vgVideoScrubber.h
new file mode 100644
index 00000000..f738824f
--- /dev/null
+++ b/Libraries/QtVgWidgets/vgVideoScrubber.h
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoScrubber_h
+#define __vgVideoScrubber_h
+
+#include <QWidget>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+#include <vgTimeStamp.h>
+
+class vgVideoScrubberPrivate;
+
+class QTVG_WIDGETS_EXPORT vgVideoScrubber : public QWidget
+{
+  Q_OBJECT
+
+  Q_PROPERTY(vgTimeStamp minimum READ minimum WRITE setMinimum)
+  Q_PROPERTY(vgTimeStamp maximum READ maximum WRITE setMaximum)
+  Q_PROPERTY(vgTimeStamp singleStep READ singleStep WRITE setSingleStep)
+  Q_PROPERTY(vgTimeStamp wheelStep READ wheelStep WRITE setWheelStep)
+  Q_PROPERTY(vgTimeStamp pageStep READ pageStep WRITE setPageStep)
+  Q_PROPERTY(vgTimeStamp value READ value WRITE setValue NOTIFY valueChanged
+                               USER true)
+
+public:
+  explicit vgVideoScrubber(QWidget* parent = 0);
+  virtual ~vgVideoScrubber();
+
+  vgTimeStamp minimum() const;
+  vgTimeStamp maximum() const;
+
+  vgTimeStamp singleStep() const;
+  vgTimeStamp wheelStep() const;
+  vgTimeStamp pageStep() const;
+
+  vgTimeStamp value() const;
+
+  bool isRangeEmpty() const;
+
+signals:
+  void valueChanged(vgTimeStamp, vg::SeekMode);
+  void rangeChanged(vgTimeStamp min, vgTimeStamp max);
+
+public slots:
+  void setMinimum(vgTimeStamp);
+  void setMaximum(vgTimeStamp);
+  void setRange(vgTimeStamp min, vgTimeStamp max);
+
+  void setSingleStep(vgTimeStamp);
+  void setWheelStep(vgTimeStamp);
+  void setPageStep(vgTimeStamp);
+
+  void setValue(vgTimeStamp, vg::SeekMode = vg::SeekExact);
+
+protected slots:
+  void setDirectionFromSliderAction(int action);
+  void updateValue();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgVideoScrubber)
+
+  virtual void resizeEvent(QResizeEvent*);
+  virtual void wheelEvent(QWheelEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(vgVideoScrubber)
+  Q_DISABLE_COPY(vgVideoScrubber)
+};
+
+#endif
diff --git a/Libraries/VgCommon/.gitattributes b/Libraries/VgCommon/.gitattributes
new file mode 100644
index 00000000..2b663cc8
--- /dev/null
+++ b/Libraries/VgCommon/.gitattributes
@@ -0,0 +1 @@
+CMakeLists.txt export-subst
diff --git a/Libraries/VgCommon/CMakeLists.txt b/Libraries/VgCommon/CMakeLists.txt
new file mode 100644
index 00000000..c1477e0c
--- /dev/null
+++ b/Libraries/VgCommon/CMakeLists.txt
@@ -0,0 +1,96 @@
+project(vgCommon)
+
+find_package(Git REQUIRED)
+
+set(vgCommonSources
+  vgAttributeSet.cxx
+  vgActivityType.cxx
+  vgEntityType.cxx
+  vgEventType.cxx
+  vgFingerprint.cxx
+  vgGeodesy.cxx
+)
+
+set(vgCommonInstallHeaders
+  vgAbstractFactory.h
+  vgActivityType.h
+  vgAttributeSet.h
+  vgCheckArg.h
+  vgEntityType.h
+  vgEventType.h
+  vgFingerprint.h
+  vgFlags.h
+  vgGeodesy.h
+  vgGeoTypes.h
+  vgNamespace.h
+  vgPointerInt.h
+  vgRange.h
+  vgStringUtils.h
+  vgTimeStamp.h
+  vgTrackType.h
+  vgTypes.h
+  vgUtil.h
+)
+
+set(vgCommonWrapObjects
+  vgGeocodedPoly
+  BY_VALUE
+  vgGeocodedCoordinate
+  vgGeoRawCoordinate
+  vgGeoSystem
+)
+
+include_directories(
+  ${PROJECT_SOURCE_DIR}
+  ${GeographicLib_INCLUDE_DIRS}
+  ${PROJ4_INCLUDE_DIR}
+)
+
+if ("" STREQUAL "")
+  set(GIT_SHA1   "898b62bbfea7a5d03b35e9c1abdc39aa9c2a2891")
+  set(GIT_STATUS "<generated tarball>")
+
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/vgFingerprint.cxx.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/vgFingerprint.cxx"
+    @ONLY)
+else ()
+  add_custom_target(update_fingerprint
+    ${CMAKE_COMMAND}
+    -D GIT_EXECUTABLE:STRING=${GIT_EXECUTABLE}
+    -D GIT_STATUS_WORKING_DIR:PATH="${CMAKE_SOURCE_DIR}"
+    -D GIT_STATUS_INPUT_FILE:PATH="${CMAKE_CURRENT_SOURCE_DIR}/vgFingerprint.cxx.in"
+    -D GIT_STATUS_OUTPUT_FILE:PATH="${CMAKE_CURRENT_BINARY_DIR}/vgFingerprint.cxx"
+    -P ${CMAKE_SOURCE_DIR}/CMake/GetGitStatus.cmake
+    COMMENT "Generating build identification"
+  )
+  set_source_files_properties(
+    "${CMAKE_CURRENT_BINARY_DIR}/vgFingerprint.cxx"
+    PROPERTIES GENERATED TRUE
+  )
+endif ()
+
+add_library(${PROJECT_NAME}
+  ${vgCommonSources}
+  "${CMAKE_CURRENT_BINARY_DIR}/vgFingerprint.cxx"
+)
+
+target_link_libraries(${PROJECT_NAME} LINK_PRIVATE
+  ${GeographicLib_LIBRARIES}
+  ${PROJ4_LIBRARY}
+)
+
+# Tell CMake that building vgCommon depends on the target that creates the
+# generated vgFingerprint.cxx source.
+add_dependencies(${PROJECT_NAME} update_fingerprint)
+
+vg_add_test_subdirectory()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vgCommonInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VgCommon)
+
+vg_wrap_library(${PROJECT_NAME}
+  TYPESYSTEM typesystem.xml
+  OBJECTS ${vgCommonWrapObjects}
+  HEADERS ${vgCommonInstallHeaders}
+)
diff --git a/Libraries/VgCommon/Testing/CMakeLists.txt b/Libraries/VgCommon/Testing/CMakeLists.txt
new file mode 100644
index 00000000..fae74783
--- /dev/null
+++ b/Libraries/VgCommon/Testing/CMakeLists.txt
@@ -0,0 +1,7 @@
+vg_include_library_sdk_directories(qtExtensions)
+set(VGTEST_LINK_LIBRARIES qtExtensions vgCommon ${QT_LIBRARIES})
+
+vg_add_test(vgCommon-Geodesy testVgGeodesy SOURCES TestGeodesy.cxx)
+vg_add_test(vgCommon-Timestamp testVgTimestamp SOURCES TestTimestamp.cxx)
+vg_add_test(vgCommon-PointerInt testVgPointerInt SOURCES TestPointerInt.cxx)
+vg_add_test(vgCommon-AttributeSet testVgAttributeSet SOURCES TestAttributeSet.cxx)
diff --git a/Libraries/VgCommon/Testing/TestAttributeSet.cxx b/Libraries/VgCommon/Testing/TestAttributeSet.cxx
new file mode 100644
index 00000000..93b7611a
--- /dev/null
+++ b/Libraries/VgCommon/Testing/TestAttributeSet.cxx
@@ -0,0 +1,106 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtTest.h>
+
+#include "../vgAttributeSet.h"
+
+enum { NumGroups = 2, NumAttrsPerGroup = 3 };
+
+const char* Groups[NumGroups] = { "GroupA", "GroupB" };
+const char* Attrs[][NumAttrsPerGroup] =
+{
+  { "a1", "a2", "a3" },
+  { "b1", "b2", "b3" }
+};
+
+unsigned int Masks[][NumAttrsPerGroup] =
+{
+  { 1, 2, 4 },
+  { 4, 8, 16 }
+};
+
+unsigned int GroupMasks[NumGroups] =
+{
+  Masks[0][0] | Masks[0][1] | Masks[0][2],
+  Masks[1][0] | Masks[1][1] | Masks[1][2]
+};
+
+//-----------------------------------------------------------------------------
+int testAll(qtTest& testObject)
+{
+  vgAttributeSet as;
+  TEST(as.GetGroups().empty());
+  TEST(as.GetEnabledGroups().empty());
+  TEST(as.GetAttributes("foo").empty());
+  TEST(as.GetGroupMask("foo") == 0);
+  TEST(as.GetMask("foo", "bar") == 0);
+
+  for (int i = 0; i < NumGroups; ++i)
+    {
+    if (i == 0)
+      {
+      as.SetGroupEnabled(Groups[i], false);
+      }
+    for (int j = 0; j < NumAttrsPerGroup; ++j)
+      {
+      as.SetMask(Groups[i], Attrs[i][j], Masks[i][j]);
+      TEST(as.GetMask(Groups[i], Attrs[i][j]) == Masks[i][j]);
+      }
+    }
+
+  for (int i = 0; i < NumGroups; ++i)
+    {
+    TEST(as.GetGroupMask(Groups[i]) == GroupMasks[i]);
+    std::vector<vgAttribute> attrs = as.GetAttributes(Groups[i]);
+    TEST(attrs.size() == NumAttrsPerGroup);
+    TEST(as.IsGroupEnabled(Groups[i]) == (i != 0));
+
+    for (int j = 0; j < NumAttrsPerGroup; ++j)
+      {
+      TEST(as.GetMask(Groups[i], Attrs[i][j]) == Masks[i][j]);
+      TEST(attrs[j].Name == Attrs[i][j]);
+      TEST(attrs[j].Mask == Masks[i][j]);
+      }
+    }
+
+    {
+    std::vector<std::string> groups = as.GetGroups();
+    TEST(groups.size() == NumGroups);
+    for (size_t i = 0, size = groups.size(); i < size; ++i)
+      {
+      TEST(groups[i] == Groups[i]);
+      }
+    }
+
+    {
+    std::vector<std::string> groups = as.GetEnabledGroups();
+    TEST(groups.size() == NumGroups - 1);
+    for (size_t i = 0, size = groups.size(); i < size; ++i)
+      {
+      TEST(groups[i] == Groups[i + 1]);
+      }
+    }
+
+  as.Clear();
+  TEST(as.GetGroups().empty());
+  TEST(as.GetEnabledGroups().empty());
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  Q_UNUSED(argc);
+  Q_UNUSED(argv);
+
+  qtTest testObject;
+
+  testObject.runSuite("All Tests", testAll);
+
+  return testObject.result();
+}
diff --git a/Libraries/VgCommon/Testing/TestGeodesy.cxx b/Libraries/VgCommon/Testing/TestGeodesy.cxx
new file mode 100644
index 00000000..9f469064
--- /dev/null
+++ b/Libraries/VgCommon/Testing/TestGeodesy.cxx
@@ -0,0 +1,164 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtTest.h>
+
+#include "../vgGeodesy.h"
+#include "../vgGeoTypes.h"
+
+static const double TestNorthingLatLonWgs84 = 42.849787;
+static const double TestEastingLatLonWgs84 = -73.758967;
+
+static const double TestNorthingUtmWgs84 = 4744881.0280075;
+static const double TestEastingUtmWgs84 =   601401.2262888;
+
+const int TestUtmZoneGcs = vgGeodesy::UTM_Wgs84North + 18;
+
+//-----------------------------------------------------------------------------
+bool operator!=(const vgGeocodedCoordinate& a, const vgGeocodedCoordinate& b)
+{
+  return (a.GCS != b.GCS ||
+          !qFuzzyCompare(a.Northing, b.Northing) ||
+          !qFuzzyCompare(a.Easting, b.Easting));
+}
+
+//-----------------------------------------------------------------------------
+QDebug& operator<<(QDebug& dbg, const vgGeocodedCoordinate& coord)
+{
+  if (coord.GCS != -1)
+    {
+    dbg << '{' << coord.GCS
+        << coord.Northing << 'N'
+        << coord.Easting << 'E'
+        << '}';
+    }
+  else
+    {
+    dbg << "(invalid)";
+    }
+  return dbg;
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedCoordinate llCoord()
+{
+  return vgGeocodedCoordinate(TestNorthingLatLonWgs84, TestEastingLatLonWgs84,
+                              vgGeodesy::LatLon_Wgs84);
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedCoordinate utmCoord()
+{
+  return vgGeocodedCoordinate(TestNorthingUtmWgs84, TestEastingUtmWgs84,
+                              TestUtmZoneGcs);
+}
+
+//-----------------------------------------------------------------------------
+int testRegionPoint(qtTest& testObject, const vgGeocodedPoly& region,
+                    size_t index, double radius)
+{
+  static const vgGeocodedCoordinate center = utmCoord();
+
+  vgGeocodedCoordinate c(region.Coordinate[index], region.GCS);
+  c = vgGeodesy::convertGcs(c, TestUtmZoneGcs);
+
+  const double dN = qAbs(c.Northing - center.Northing);
+  const double dE = qAbs(c.Easting - center.Easting);
+  const double epsilon = 0.01 * radius;
+
+  int failed = 0;
+  failed |= TEST(qAbs(dN - radius) < epsilon);
+  failed |= TEST(qAbs(dE - radius) < epsilon);
+
+  if (failed)
+    {
+    qDebug() << "validation of region point" << c << "at index" << index
+             << "failed";
+    qDebug() << "  expected distance from center:" << radius;
+    qDebug() << "  actual distances:" << dN << 'N' << dE << 'E';
+    }
+
+  return failed;
+}
+
+//-----------------------------------------------------------------------------
+int testNoopConversion(qtTest& testObject)
+{
+  const vgGeocodedCoordinate c1 = llCoord();
+  TEST_EQUAL(vgGeodesy::convertGcs(c1, vgGeodesy::LatLon_Wgs84), c1);
+
+  const vgGeocodedCoordinate c2 = utmCoord();
+  TEST_EQUAL(vgGeodesy::convertGcs(c2, TestUtmZoneGcs), c2);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testLatLonToUtmConversion(qtTest& testObject)
+{
+  const vgGeocodedCoordinate cLL = llCoord();
+  TEST_EQUAL(vgGeodesy::convertGcs(cLL, TestUtmZoneGcs), utmCoord());
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testUtmToLatLonConversion(qtTest& testObject)
+{
+  const vgGeocodedCoordinate cUTM = utmCoord();
+  TEST_EQUAL(vgGeodesy::convertGcs(cUTM, vgGeodesy::LatLon_Wgs84), llCoord());
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testRoundTripConversion(qtTest& testObject)
+{
+  const vgGeocodedCoordinate c1 =
+    vgGeodesy::convertGcs(llCoord(), TestUtmZoneGcs);
+  TEST_EQUAL(vgGeodesy::convertGcs(c1, vgGeodesy::LatLon_Wgs84), llCoord());
+
+  const vgGeocodedCoordinate c2 =
+    vgGeodesy::convertGcs(utmCoord(), vgGeodesy::LatLon_Wgs84);
+  TEST_EQUAL(vgGeodesy::convertGcs(c2, TestUtmZoneGcs), utmCoord());
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testCreateRegion(qtTest& testObject)
+{
+  static const double radius = 100.0;
+  const vgGeocodedPoly region =
+    vgGeodesy::generateRegion(llCoord(), 2.0 * radius);
+
+  if (TEST_EQUAL(region.Coordinate.size(), static_cast<size_t>(4)))
+    return 1;
+
+  TEST_CALL(testRegionPoint, region, 0, radius);
+  TEST_CALL(testRegionPoint, region, 1, radius);
+  TEST_CALL(testRegionPoint, region, 2, radius);
+  TEST_CALL(testRegionPoint, region, 3, radius);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  Q_UNUSED(argc);
+  Q_UNUSED(argv);
+
+  qtTest testObject;
+
+  testObject.runSuite("No-op Conversion Test", testNoopConversion);
+  testObject.runSuite("LL -> UTM Conversion Test", testLatLonToUtmConversion);
+  testObject.runSuite("UTM -> LL Conversion Test", testUtmToLatLonConversion);
+  testObject.runSuite("Round Trip Conversion Test", testRoundTripConversion);
+  testObject.runSuite("Generate Region Test", testCreateRegion);
+//   testObject.runSuite("Region Center Test", testRegionCenter);
+  return testObject.result();
+}
diff --git a/Libraries/VgCommon/Testing/TestPointerInt.cxx b/Libraries/VgCommon/Testing/TestPointerInt.cxx
new file mode 100644
index 00000000..07c17d36
--- /dev/null
+++ b/Libraries/VgCommon/Testing/TestPointerInt.cxx
@@ -0,0 +1,215 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtTest.h>
+
+#include "../vgPointerInt.h"
+
+class A
+{
+  int n;
+
+public:
+  A() {}
+};
+
+A* a1;
+A* a2;
+
+enum
+{
+  BitOne   = 1 << 0,
+  BitTwo   = 1 << 1,
+  BitThree = 1 << 2,
+  BitOneAndThree = BitOne | BitThree
+};
+
+typedef vgPointerInt<A*> AP;
+
+//-----------------------------------------------------------------------------
+int testCtors(qtTest& testObject)
+{
+  {
+  AP v;
+  TEST(v.GetPointer() == 0);
+  TEST(v.GetInt() == 0);
+  }
+
+  {
+  AP v(a1);
+  TEST(v.GetPointer() == a1);
+  TEST(v.GetInt() == 0);
+  }
+
+  {
+  AP v(a1, BitOneAndThree);
+  TEST(v.GetPointer() == a1);
+  TEST(v.GetInt() == BitOneAndThree);
+  }
+
+  {
+  AP v(0, BitTwo);
+  TEST(v.GetPointer() == 0);
+  TEST(v.GetInt() == BitTwo);
+  }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testInteger(qtTest& testObject)
+{
+  {
+  AP v;
+  v.SetInt(BitOneAndThree);
+  TEST(v.GetInt() == BitOneAndThree);
+  TEST(v.GetPointer() == 0);
+  }
+
+  {
+  AP v;
+  v.SetPointer(a1);
+  TEST(v.GetPointer() == a1);
+  TEST(v.GetInt() == 0);
+  }
+
+  {
+  AP v;
+  v.SetPointer(a1);
+  v.SetPointer(0);
+  TEST(v.GetPointer() == 0);
+  TEST(v.GetInt() == 0);
+  }
+
+  {
+  AP v;
+  v.SetPointer(a1);
+  v.SetInt(BitOneAndThree);
+  TEST(v.GetPointer() == a1);
+  TEST(v.GetInt() == BitOneAndThree);
+  }
+
+  {
+  AP v;
+  v.SetInt(BitOneAndThree);
+  v.SetPointer(a1);
+  TEST(v.GetInt() == BitOneAndThree);
+  TEST(v.GetPointer() == a1);
+  }
+
+  {
+  AP v;
+  v.SetPointer(a1);
+  v.SetPointer(a2);
+  TEST(v.GetPointer() == a2);
+  }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testBitwise(qtTest& testObject)
+{
+  {
+  AP v;
+  v.SetBits(BitOneAndThree);
+  TEST(v.GetBitsAreSet(BitOneAndThree));
+  TEST(v.GetBitsAreSet(BitOne));
+  TEST(v.GetBitsAreSet(BitThree));
+  TEST(!v.GetBitsAreSet(BitTwo));
+  TEST(!v.GetBitsAreSet(BitOne | BitTwo | BitThree));
+  }
+
+  {
+  AP v;
+  v.SetBits(BitOne);
+  v.SetBits(BitTwo);
+  v.SetBits(BitThree);
+  TEST(v.GetBitsAreSet(BitOne));
+  TEST(v.GetBitsAreSet(BitTwo));
+  TEST(v.GetBitsAreSet(BitThree));
+  TEST(v.GetBitsAreSet(BitOne | BitTwo | BitThree));
+  TEST(v.GetInt() == (BitOne | BitTwo | BitThree));
+  }
+
+  {
+  AP v;
+  v.SetPointer(a1);
+  v.SetBits(BitOneAndThree);
+  TEST(v.GetBitsAreSet(BitOneAndThree));
+  TEST(v.GetPointer() == a1);
+  }
+
+  {
+  AP v;
+  v.SetBits(BitOneAndThree);
+  v.SetPointer(a1);
+  TEST(v.GetPointer() == a1);
+  TEST(v.GetBitsAreSet(BitOneAndThree));
+  }
+
+  {
+  AP v;
+  v.SetBits(BitOneAndThree);
+  v.SetPointer(a1);
+  v.ClearBits(BitTwo);
+  TEST(v.GetBitsAreSet(BitOneAndThree));
+  TEST(v.GetPointer() == a1);
+  v.ClearBits(BitOne);
+  TEST(!v.GetBitsAreSet(BitOne));
+  TEST(v.GetBitsAreSet(BitThree));
+  v.ClearBits(BitThree);
+  TEST(!v.GetBitsAreSet(BitThree));
+  TEST(v.GetInt() == 0);
+  TEST(v.GetPointer() == a1);
+  }
+
+  {
+  AP v;
+  v.SetBits(BitOneAndThree);
+  v.SetPointer(a1);
+  TEST(v.GetBitsAreSet(BitOne));
+  TEST(!v.GetBitsAreSet(BitTwo));
+  v.ClearBits(BitThree);
+  TEST(!v.GetBitsAreSet(BitThree));
+  TEST(v.GetPointer() == a1);
+  }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+A* makeTestPointer()
+{
+  // Make sure the upper words of a 64-bit pointer have something in them.
+  // Otherwise we may miss some errors that only occur with pointers above
+  // the 4 GB boundary.
+  A* a = new A;
+  if (sizeof(a) == 8 && uintptr(a) < (1ULL << 32))
+    {
+    a = (A*)(uintptr(a) | (uintptr(a) << 32));
+    }
+  return a;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  Q_UNUSED(argc);
+  Q_UNUSED(argv);
+
+  // Some memory will leak here, but we don't really care.
+  a1 = makeTestPointer();
+  a2 = makeTestPointer();
+
+  qtTest testObject;
+
+  testObject.runSuite("Constructor Tests", testCtors);
+  testObject.runSuite("Integer Operation Tests", testInteger);
+  testObject.runSuite("Bitwise Operation Tests", testBitwise);
+
+  return testObject.result();
+}
diff --git a/Libraries/VgCommon/Testing/TestTimestamp.cxx b/Libraries/VgCommon/Testing/TestTimestamp.cxx
new file mode 100644
index 00000000..53c01c60
--- /dev/null
+++ b/Libraries/VgCommon/Testing/TestTimestamp.cxx
@@ -0,0 +1,175 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtTest.h>
+
+#include "../vgTimeStamp.h"
+
+static const double TestTimeValue = 1302025968.521;
+static const unsigned int TestFrameNumber = 3571;
+
+//-----------------------------------------------------------------------------
+void testTimestamp(qtTest& testObject, const vgTimeStamp& ts,
+                   bool xht, bool xhf)
+{
+  TEST_EQUAL(ts.IsValid(), xht || xhf);
+  TEST_EQUAL(ts.HasTime(), xht);
+  TEST_EQUAL(ts.HasFrameNumber(), xhf);
+  if (xht)
+    TEST_EQUAL(ts.Time, TestTimeValue);
+  else
+    TEST_EQUAL(ts.Time, vgTimeStamp::InvalidTime());
+  if (xhf)
+    TEST_EQUAL(ts.FrameNumber, TestFrameNumber);
+  else
+    TEST_EQUAL(ts.FrameNumber, vgTimeStamp::InvalidFrameNumber());
+}
+
+//-----------------------------------------------------------------------------
+int testCtor(qtTest& testObject)
+{
+  vgTimeStamp ts1(TestTimeValue);
+  TEST_CALL(testTimestamp, ts1, true, false);
+
+  vgTimeStamp ts2(TestFrameNumber);
+  TEST_CALL(testTimestamp, ts2, false, true);
+
+  vgTimeStamp ts3(TestTimeValue, TestFrameNumber);
+  TEST_CALL(testTimestamp, ts3, true, true);
+
+  vgTimeStamp ts4;
+  TEST_CALL(testTimestamp, ts4, false, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testModification(qtTest& testObject)
+{
+  vgTimeStamp ts;
+
+  ts.Time = TestTimeValue;
+  TEST_CALL(testTimestamp, ts, true, false);
+
+  ts.FrameNumber = TestFrameNumber;
+  TEST_CALL(testTimestamp, ts, true, true);
+
+  ts.Time = vgTimeStamp::InvalidTime();
+  TEST_CALL(testTimestamp, ts, false, true);
+
+  ts.FrameNumber = vgTimeStamp::InvalidFrameNumber();
+  TEST_CALL(testTimestamp, ts, false, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testComparison(qtTest& testObject)
+{
+  // Comparing time only
+  vgTimeStamp ts1(TestTimeValue), ts2(TestTimeValue + 15.0);
+  TEST_EQUAL(ts1 < ts2, true);
+  TEST_EQUAL(ts1 < ts1, false);
+  TEST_EQUAL(ts2 < ts1, false);
+
+  // Comparing frame number only
+  vgTimeStamp ts3(TestFrameNumber), ts4(TestFrameNumber + 4U);
+  TEST_EQUAL(ts3 < ts4, true);
+  TEST_EQUAL(ts3 < ts3, false);
+  TEST_EQUAL(ts4 < ts3, false);
+
+  // Comparing with both
+  vgTimeStamp ts5(TestTimeValue, TestFrameNumber);
+  vgTimeStamp ts6(TestTimeValue + 15.0, TestFrameNumber + 4U);
+  TEST_EQUAL(ts5 < ts6, true);
+  TEST_EQUAL(ts5 < ts5, false);
+  TEST_EQUAL(ts6 < ts5, false);
+
+  // Comparing complete with partial
+  TEST_EQUAL(ts5 < ts2, true);
+  TEST_EQUAL(ts5 < ts4, true);
+  TEST_EQUAL(ts5 < ts1, false);
+  TEST_EQUAL(ts5 < ts3, false);
+  TEST_EQUAL(ts6 < ts2, false);
+  TEST_EQUAL(ts6 < ts4, false);
+  TEST_EQUAL(ts6 < ts1, false);
+  TEST_EQUAL(ts6 < ts3, false);
+
+  // Unsupported comparisons
+  TEST_EQUAL(ts1 < ts3, false);
+  TEST_EQUAL(ts1 < ts4, false);
+  TEST_EQUAL(ts2 < ts3, false);
+  TEST_EQUAL(ts2 < ts4, false);
+  TEST_EQUAL(ts3 < ts1, false);
+  TEST_EQUAL(ts3 < ts2, false);
+  TEST_EQUAL(ts4 < ts1, false);
+  TEST_EQUAL(ts4 < ts2, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testEquality(qtTest& testObject)
+{
+  // Test inequality due to valid/invalid member mismatch
+  vgTimeStamp ts0;
+  vgTimeStamp ts1(TestTimeValue);
+  vgTimeStamp ts2(TestFrameNumber);
+  vgTimeStamp ts3(TestTimeValue, TestFrameNumber);
+  TEST(ts1 != ts0);
+  TEST(ts2 != ts0);
+  TEST(ts3 != ts0);
+  TEST(ts1 != ts2);
+  TEST(ts1 != ts3);
+  TEST(ts2 != ts3);
+
+  // Test equality
+  vgTimeStamp ts4(TestTimeValue);
+  vgTimeStamp ts5(TestFrameNumber);
+  vgTimeStamp ts6(TestTimeValue, TestFrameNumber);
+  TEST(ts1 == ts4);
+  TEST(ts2 == ts5);
+  TEST(ts3 == ts6);
+
+  // Test inequality due to value differences
+  vgTimeStamp ts7(TestTimeValue + 15.0);
+  vgTimeStamp ts8(TestFrameNumber + 4U);
+  vgTimeStamp ts9(TestTimeValue + 15.0, TestFrameNumber + 4U);
+  vgTimeStamp ts10(TestTimeValue + 15.0, TestFrameNumber);
+  vgTimeStamp ts11(TestTimeValue, TestFrameNumber + 4U);
+  TEST(ts7 != ts1);
+  TEST(ts7 != ts2);
+  TEST(ts7 != ts3);
+  TEST(ts8 != ts1);
+  TEST(ts8 != ts2);
+  TEST(ts8 != ts3);
+  TEST(ts9 != ts1);
+  TEST(ts9 != ts2);
+  TEST(ts9 != ts3);
+  TEST(ts10 != ts1);
+  TEST(ts10 != ts2);
+  TEST(ts10 != ts3);
+  TEST(ts11 != ts1);
+  TEST(ts11 != ts2);
+  TEST(ts11 != ts3);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  Q_UNUSED(argc);
+  Q_UNUSED(argv);
+
+  qtTest testObject;
+
+  testObject.runSuite("Constructor Tests", testCtor);
+  testObject.runSuite("Modification Tests", testModification);
+  testObject.runSuite("Comparison Tests", testComparison);
+  testObject.runSuite("Equality Tests", testEquality);
+  return testObject.result();
+}
diff --git a/Libraries/VgCommon/typesystem.xml b/Libraries/VgCommon/typesystem.xml
new file mode 100644
index 00000000..b34630aa
--- /dev/null
+++ b/Libraries/VgCommon/typesystem.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0"?>
+<typesystem package="@TYPESYSTEM_NAME@">
+
+  @EXTRA_TYPESYSTEMS@
+
+  <primitive-type name="bool"/>
+  <primitive-type name="double"/>
+  <primitive-type name="float"/>
+  <primitive-type name="unsigned long long"/>
+  <primitive-type name="long long"/>
+  <primitive-type name="short"/>
+  <primitive-type name="signed short"/>
+  <primitive-type name="signed short int"/>
+  <primitive-type name="unsigned short int"/>
+  <primitive-type name="unsigned short"/>
+  <primitive-type name="char"/>
+  <primitive-type name="signed char"/>
+  <primitive-type name="unsigned char"/>
+  <primitive-type name="int"/>
+  <primitive-type name="signed int"/>
+  <primitive-type name="unsigned int"/>
+  <primitive-type name="signed long"/>
+  <primitive-type name="signed long int"/>
+  <primitive-type name="long"/>
+  <primitive-type name="unsigned long int"/>
+  <primitive-type name="unsigned long"/>
+
+  <primitive-type name="std::string"/>
+
+  <container-type name="std::vector" type="vector">
+    <include file-name="vector" location="global"/>
+
+    <conversion-rule>
+
+      <native-to-target>
+      %INTYPE::size_type vectorSize = %in.size();
+      PyObject* %out = PyList_New((int) vectorSize);
+      for (%INTYPE::size_type idx = 0; idx &lt; vectorSize; ++idx) {
+        %INTYPE_0 cppItem(%in[idx]);
+        PyList_SET_ITEM(%out, idx, %CONVERTTOPYTHON[%INTYPE_0](cppItem));
+      }
+      return %out;
+      </native-to-target>
+
+      <target-to-native>
+
+        <add-conversion type="PySequence">
+        Shiboken::AutoDecRef seq(PySequence_Fast(%in, 0));
+        Py_ssize_t vectorSize = PySequence_Fast_GET_SIZE(seq.object());
+        %out.reserve(vectorSize);
+        for (Py_ssize_t idx = 0; idx &lt; vectorSize; ++idx ) {
+          PyObject* pyItem = PySequence_Fast_GET_ITEM(seq.object(), idx);
+          %OUTTYPE_0 cppItem = %CONVERTTOCPP[%OUTTYPE_0](pyItem);
+          %out.push_back(cppItem);
+        }
+        </add-conversion>
+
+      </target-to-native>
+
+    </conversion-rule>
+  </container-type>
+
+  <container-type name="std::map" type="map">
+    <include file-name="map" location="global"/>
+
+    <conversion-rule>
+
+      <native-to-target>
+      PyObject* %out = PyDict_New();
+      %INTYPE::const_iterator it;
+      for (it = %in.begin(); it != %in.end(); ++it) {
+        %INTYPE_0 key = it->first;
+        %INTYPE_1 value = it->second;
+        PyDict_SetItem(%out,
+                       %CONVERTTOPYTHON[%INTYPE_0](key),
+                       %CONVERTTOPYTHON[%INTYPE_1](value));
+      }
+      return %out;
+      </native-to-target>
+
+      <target-to-native>
+
+        <add-conversion type="PyDict">
+        PyObject* key;
+        PyObject* value;
+        Py_ssize_t pos = 0;
+        while (PyDict_Next(%in, &amp;pos, &amp;key, &amp;value)) {
+          %OUTTYPE_0 cppKey = %CONVERTTOCPP[%OUTTYPE_0](key);
+          %OUTTYPE_1 cppValue = %CONVERTTOCPP[%OUTTYPE_1](value);
+          %out.insert(%OUTTYPE::value_type(cppKey, cppValue));
+        }
+        </add-conversion>
+
+      </target-to-native>
+
+    </conversion-rule>
+  </container-type>
+
+  <container-type name="std::set" type="set">
+    <include file-name="set" location="global"/>
+
+    <conversion-rule>
+
+      <native-to-target>
+      PyObject* %out = PySet_New(0);
+      %INTYPE::const_iterator it;
+      for (it = %in.begin(); it != %in.end(); ++it) {
+        %INTYPE_0 value = *it;
+        PyObject* pyValue = %CONVERTTOPYTHON[%INTYPE_0](value);
+        PySet_Add(%out, pyValue);
+      }
+      return %out;
+      </native-to-target>
+
+      <target-to-native>
+
+        <add-conversion type="PySet">
+        Shiboken::AutoDecRef iter(PyObject_GetIter(%in));
+        if (iter.object()) {
+          PyObject* item;
+          while ((item = PyIter_Next(iter))) {
+            %OUTTYPE_0 cppItem = %CONVERTTOCPP[%OUTTYPE_0](item);
+            %out.insert(cppItem);
+            Py_DECREF(item);
+          }
+        }
+        </add-conversion>
+
+        <add-conversion type="PySequence">
+        Shiboken::AutoDecRef seq(PySequence_Fast(%in, 0));
+        Py_ssize_t vectorSize = PySequence_Fast_GET_SIZE(seq.object());
+        for (Py_ssize_t idx = 0; idx &lt; vectorSize; ++idx) {
+          PyObject* pyItem = PySequence_Fast_GET_ITEM(seq.object(), idx);
+          %OUTTYPE_0 cppItem = %CONVERTTOCPP[%OUTTYPE_0](pyItem);
+          %out.insert(cppItem);
+        }
+        </add-conversion>
+
+      </target-to-native>
+
+    </conversion-rule>
+  </container-type>
+
+  <template name="hash_vgTimeStamp">
+  inline static long vgPyHash(double value)
+  {
+    char* p = reinterpret_cast&lt;char*&gt;(&amp;value);
+    long* l = reinterpret_cast&lt;long*&gt;(p + sizeof(double) - sizeof(long));
+    return *l;
+  }
+  inline static long vgPyHash(const vgTimeStamp&amp; ts)
+  {
+    return ts.FrameNumber ^ vgPyHash(ts.Time);
+  }
+  </template>
+
+  <value-type name="vgTimeStamp" hash-function="vgPyHash">
+    <inject-code class="native" position="beginning">
+      <insert-template name="hash_vgTimeStamp"/>
+    </inject-code>
+  </value-type>
+
+  <namespace-type name="vg">
+    <enum-type name="SeekMode"/>
+  </namespace-type>
+
+  <namespace-type name="vgGeodesy">
+    <enum-type name="GCS"/>
+  </namespace-type>
+
+  @EXTRA_OBJECTS@
+
+</typesystem>
diff --git a/Libraries/VgCommon/vgAbstractFactory.h b/Libraries/VgCommon/vgAbstractFactory.h
new file mode 100644
index 00000000..abe44a9d
--- /dev/null
+++ b/Libraries/VgCommon/vgAbstractFactory.h
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgAbstractFactory_h
+#define __vgAbstractFactory_h
+
+#include <vector>
+
+//-----------------------------------------------------------------------------
+template <typename Type, typename Key>
+class vgAbstractFactory
+{
+public:
+
+  typedef Type(*Creator)();
+
+  virtual Type Create(Key key) = 0;
+  virtual bool Register(Creator function)
+    {
+    if (function)
+      {
+      this->Creators.push_back(function);
+      return true;
+      }
+    else
+      {
+      return false;
+      }
+    }
+
+  virtual ~vgAbstractFactory()
+    {
+    }
+
+
+protected:
+
+  std::vector<Creator> Creators;
+};
+
+#endif // __vgAbstractFactory_h
diff --git a/Libraries/VgCommon/vgActivityType.cxx b/Libraries/VgCommon/vgActivityType.cxx
new file mode 100644
index 00000000..b8d40cdb
--- /dev/null
+++ b/Libraries/VgCommon/vgActivityType.cxx
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgActivityType.h"
+
+#include <assert.h>
+#include <string.h>
+
+//-----------------------------------------------------------------------------
+static const char* DisplayModeStrings[vgActivityType::NumDisplayModes] =
+{
+  "Events",
+  "Bounds",
+};
+
+//-----------------------------------------------------------------------------
+vgActivityType::vgActivityType()
+{
+  this->UseRandomColors = true;
+
+  this->Id[0] = '\0';
+  this->DisplayMode = DM_Events;
+}
+
+#ifdef _WIN32
+#pragma warning(disable:4996) // 'strncpy' unsafe
+#endif
+
+//-----------------------------------------------------------------------------
+void vgActivityType::SetId(const char* id)
+{
+  strncpy(this->Id, id, sizeof(this->Id) - 1);
+  this->Id[sizeof(this->Id) - 1] = '\0';
+}
+
+//-----------------------------------------------------------------------------
+const char* vgActivityType::GetDisplayModeString(int mode)
+{
+  assert(mode >= 0 && mode < NumDisplayModes);
+  return DisplayModeStrings[mode];
+}
diff --git a/Libraries/VgCommon/vgActivityType.h b/Libraries/VgCommon/vgActivityType.h
new file mode 100644
index 00000000..f7583033
--- /dev/null
+++ b/Libraries/VgCommon/vgActivityType.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgActivityType_h
+#define __vgActivityType_h
+
+#include "vgEntityType.h"
+
+class VG_COMMON_EXPORT vgActivityType : public vgEntityType
+{
+public:
+  enum DisplayMode
+    {
+    DM_Events,
+    DM_Bounds,
+    NumDisplayModes
+    };
+
+  vgActivityType();
+
+  void SetId(const char* id);
+  const char* GetId() const { return this->Id; }
+
+  void SetDisplayMode(int mode) { this->DisplayMode = mode; }
+  int  GetDisplayMode() const   { return this->DisplayMode; }
+
+  static const char* GetDisplayModeString(int mode);
+
+private:
+  char Id[256];
+
+  int DisplayMode;
+};
+
+#endif // __vgActivityType_h
diff --git a/Libraries/VgCommon/vgAttributeSet.cxx b/Libraries/VgCommon/vgAttributeSet.cxx
new file mode 100644
index 00000000..4302f67d
--- /dev/null
+++ b/Libraries/VgCommon/vgAttributeSet.cxx
@@ -0,0 +1,134 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgAttributeSet.h"
+
+//-----------------------------------------------------------------------------
+void vgAttributeSet::SetMask(const std::string& group,
+                             const std::string& name,
+                             unsigned int mask)
+{
+  std::vector<vgAttribute>& attrs = this->AttributeGroups[group].Attributes;
+  for (size_t i = 0, size = attrs.size(); i < size; ++i)
+    {
+    if (attrs[i].Name == name)
+      {
+      attrs[i].Mask = mask;
+      return;
+      }
+    }
+
+  // attribute doesn't exist yet, so push it into the group
+  vgAttribute attr;
+  attr.Name = name;
+  attr.Mask = mask;
+  attrs.push_back(attr);
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vgAttributeSet::GetMask(const std::string& group,
+                                     const std::string& name) const
+{
+  AttributeGroupMap::const_iterator iter = this->AttributeGroups.find(group);
+  if (iter == this->AttributeGroups.end())
+    {
+    return 0;
+    }
+
+  for (size_t i = 0, size = iter->second.Attributes.size(); i < size; ++i)
+    {
+    if (iter->second.Attributes[i].Name == name)
+      {
+      return iter->second.Attributes[i].Mask;
+      }
+    }
+
+  // not found
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vgAttributeSet::GetGroupMask(const std::string& group) const
+{
+  AttributeGroupMap::const_iterator iter = this->AttributeGroups.find(group);
+  if (iter == this->AttributeGroups.end())
+    {
+    return 0;
+    }
+
+  unsigned int groupMask = 0;
+  for (size_t i = 0, size = iter->second.Attributes.size(); i < size; ++i)
+    {
+    groupMask |= iter->second.Attributes[i].Mask;
+    }
+
+  return groupMask;
+}
+
+//-----------------------------------------------------------------------------
+void vgAttributeSet::SetGroupEnabled(const std::string& group, bool enabled)
+{
+  this->AttributeGroups[group].Enabled = enabled;
+}
+
+//-----------------------------------------------------------------------------
+bool vgAttributeSet::IsGroupEnabled(const std::string& group) const
+{
+  AttributeGroupMap::const_iterator iter = this->AttributeGroups.find(group);
+  if (iter == this->AttributeGroups.end())
+    {
+    return false;
+    }
+
+  return iter->second.Enabled;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<std::string> vgAttributeSet::GetGroups() const
+{
+  std::vector<std::string> groups;
+  for (AttributeGroupMap::const_iterator iter = this->AttributeGroups.begin(),
+       end = this->AttributeGroups.end(); iter != end; ++iter)
+    {
+    groups.push_back(iter->first);
+    }
+
+  return groups;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<std::string> vgAttributeSet::GetEnabledGroups() const
+{
+  std::vector<std::string> groups;
+  for (AttributeGroupMap::const_iterator iter = this->AttributeGroups.begin(),
+       end = this->AttributeGroups.end(); iter != end; ++iter)
+    {
+    if (iter->second.Enabled)
+      {
+      groups.push_back(iter->first);
+      }
+    }
+
+  return groups;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vgAttribute> vgAttributeSet::GetAttributes(const std::string& group) const
+{
+  AttributeGroupMap::const_iterator iter = this->AttributeGroups.find(group);
+  if (iter == this->AttributeGroups.end())
+    {
+    return std::vector<vgAttribute>();
+    }
+
+  return iter->second.Attributes;
+}
+
+//-----------------------------------------------------------------------------
+void vgAttributeSet::Clear()
+{
+  this->AttributeGroups.clear();
+}
diff --git a/Libraries/VgCommon/vgAttributeSet.h b/Libraries/VgCommon/vgAttributeSet.h
new file mode 100644
index 00000000..bd97805e
--- /dev/null
+++ b/Libraries/VgCommon/vgAttributeSet.h
@@ -0,0 +1,92 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// Manages a set of grouped attributes (i.e. named bitmasks)
+
+#ifndef __vgAttributeSet_h
+#define __vgAttributeSet_h
+
+#include <vgExport.h>
+
+#include <map>
+#include <string>
+#include <vector>
+
+struct vgAttribute
+{
+  vgAttribute() : Mask(0) {}
+
+  std::string Name;
+  unsigned int Mask;
+};
+
+// Disable warning about the STL member of vgAttributeGroup not being exported.
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4251)
+#endif
+
+struct VG_COMMON_EXPORT vgAttributeGroup
+{
+  vgAttributeGroup() : Enabled(true) {}
+
+  std::vector<vgAttribute> Attributes;
+  bool Enabled;
+};
+
+class VG_COMMON_EXPORT vgAttributeSet
+{
+public:
+  // Description:
+  // Define or update an attribute mask
+  void SetMask(const std::string& group, const std::string& name,
+               unsigned int mask);
+
+  // Description:
+  // Get the mask for a defined attribute
+  unsigned int GetMask(const std::string& group,
+                       const std::string& name) const;
+
+  // Description:
+  // Get the OR'ed mask of all attributes currently defined for a group
+  unsigned int GetGroupMask(const std::string& group) const;
+
+  // Description:
+  // Set the enabled flag for a group. The group will be added if it didn't
+  // already exist. Groups are enabled by default.
+  void SetGroupEnabled(const std::string& group, bool enabled);
+
+  // Description:
+  // Get the enabled flag for a group
+  bool IsGroupEnabled(const std::string& group) const;
+
+  // Description:
+  // Get all the defined groups. Expensive.
+  std::vector<std::string> GetGroups() const;
+
+  // Description:
+  // Get all enabled groups. Expensive.
+  std::vector<std::string> GetEnabledGroups() const;
+
+  // Description:
+  // Get all the attributes in a particular group
+  std::vector<vgAttribute> GetAttributes(const std::string& group) const;
+
+  // Description:
+  // Reset to a clean state
+  void Clear();
+
+private:
+  typedef std::map<std::string, vgAttributeGroup> AttributeGroupMap;
+
+  AttributeGroupMap AttributeGroups;
+};
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif // __vgAttributeSet_h
diff --git a/Libraries/VgCommon/vgCheckArg.h b/Libraries/VgCommon/vgCheckArg.h
new file mode 100644
index 00000000..7a653909
--- /dev/null
+++ b/Libraries/VgCommon/vgCheckArg.h
@@ -0,0 +1,13 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgCheckArg_h
+#define __vgCheckArg_h
+
+#define CHECK_ARG(_expr, ...) \
+  if (!(_expr)) return __VA_ARGS__
+
+#endif
diff --git a/Libraries/VgCommon/vgEntityType.cxx b/Libraries/VgCommon/vgEntityType.cxx
new file mode 100644
index 00000000..a7139be8
--- /dev/null
+++ b/Libraries/VgCommon/vgEntityType.cxx
@@ -0,0 +1,92 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgEntityType.h"
+
+#include <string.h>
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+inline void SetColorInternal(double (&arr)[3], double r, double g, double b)
+{
+  arr[0] = r;
+  arr[1] = g;
+  arr[2] = b;
+}
+
+//-----------------------------------------------------------------------------
+inline void GetColorInternal(const double (&arr)[3],
+                             double& r, double& g, double& b)
+{
+  r = arr[0];
+  g = arr[1];
+  b = arr[2];
+}
+
+} // end anonymous namespace
+
+//-----------------------------------------------------------------------------
+vgEntityType::vgEntityType() :
+  HasSecondaryColor(false), UseRandomColors(false), IconIndex(-1),
+  IsUsed(false)
+{
+  Name[0] = '\0';
+  this->Color[0] = this->Color[1] = this->Color[2] = 1.0;
+  this->SecondaryColor[0] = 1.0;
+  this->SecondaryColor[1] = 1.0;
+  this->SecondaryColor[2] = 1.0;
+  this->LabelForegroundColor[0] = 0.0;
+  this->LabelForegroundColor[1] = 0.0;
+  this->LabelForegroundColor[2] = 0.0;
+  this->LabelBackgroundColor[0] = 1.0;
+  this->LabelBackgroundColor[1] = 1.0;
+  this->LabelBackgroundColor[2] = 1.0;
+}
+
+#ifdef _WIN32
+#pragma warning(disable:4996) // 'strncpy' unsafe
+#endif
+
+//-----------------------------------------------------------------------------
+void vgEntityType::SetName(const char* name)
+{
+  strncpy(this->Name, name, sizeof(this->Name) - 1);
+  this->Name[sizeof(this->Name) - 1] = '\0';
+}
+
+//-----------------------------------------------------------------------------
+void vgEntityType::SetColor(double r, double g, double b)
+{ SetColorInternal(this->Color, r, g, b); }
+
+//-----------------------------------------------------------------------------
+void vgEntityType::GetColor(double& r, double& g, double& b) const
+{ GetColorInternal(this->Color, r, g, b); }
+
+//-----------------------------------------------------------------------------
+void vgEntityType::SetSecondaryColor(double r, double g, double b)
+{ SetColorInternal(this->SecondaryColor, r, g, b); }
+
+//-----------------------------------------------------------------------------
+void vgEntityType::GetSecondaryColor(double& r, double& g, double& b) const
+{ GetColorInternal(this->SecondaryColor, r, g, b); }
+
+//-----------------------------------------------------------------------------
+void vgEntityType::SetLabelForegroundColor(double r, double g, double b)
+{ SetColorInternal(this->LabelForegroundColor, r, g, b); }
+
+//-----------------------------------------------------------------------------
+void vgEntityType::GetLabelForegroundColor(double& r, double& g, double& b) const
+{ GetColorInternal(this->LabelForegroundColor, r, g, b); }
+
+//-----------------------------------------------------------------------------
+void vgEntityType::SetLabelBackgroundColor(double r, double g, double b)
+{ SetColorInternal(this->LabelBackgroundColor, r, g, b); }
+
+//-----------------------------------------------------------------------------
+void vgEntityType::GetLabelBackgroundColor(double& r, double& g, double& b) const
+{ GetColorInternal(this->LabelBackgroundColor, r, g, b); }
diff --git a/Libraries/VgCommon/vgEntityType.h b/Libraries/VgCommon/vgEntityType.h
new file mode 100644
index 00000000..bc5c672b
--- /dev/null
+++ b/Libraries/VgCommon/vgEntityType.h
@@ -0,0 +1,65 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgEntityType_h
+#define __vgEntityType_h
+
+#include <vgExport.h>
+
+class VG_COMMON_EXPORT vgEntityType
+{
+public:
+  vgEntityType();
+
+  void SetName(const char* name);
+  const char* GetName() const { return this->Name; }
+
+  void SetColor(double r, double g, double b);
+  void GetColor(double& r, double& g, double& b) const;
+
+  void SetHasSecondaryColor(bool enable) { this->HasSecondaryColor = enable; }
+  bool GetHasSecondaryColor() const      { return this->HasSecondaryColor; }
+
+  void SetSecondaryColor(double r, double g, double b);
+  void GetSecondaryColor(double& r, double& g, double& b) const;
+
+  void SetLabelForegroundColor(double r, double g, double b);
+  void GetLabelForegroundColor(double& r, double& g, double& b) const;
+
+  void SetLabelBackgroundColor(double r, double g, double b);
+  void GetLabelBackgroundColor(double& r, double& g, double& b) const;
+
+  void SetUseRandomColors(bool enable) { this->UseRandomColors = enable; }
+  bool GetUseRandomColors() const      { return this->UseRandomColors; }
+
+  void SetIconIndex(int index) { this->IconIndex = index; }
+  int  GetIconIndex() const    { return this->IconIndex; }
+
+  void SetEntityTypeInfo(const vgEntityType& et)
+    {
+    *this = et;
+    }
+
+  void SetIsUsed(bool used) { this->IsUsed = used; }
+  bool GetIsUsed() const    { return this->IsUsed; }
+
+protected:
+  char Name[256];
+
+  double Color[3];
+  double SecondaryColor[3];
+  double LabelForegroundColor[3];
+  double LabelBackgroundColor[3];
+
+  bool HasSecondaryColor;
+  bool UseRandomColors;
+
+  int IconIndex;
+
+  bool IsUsed;
+};
+
+#endif // __vgEntityType_h
diff --git a/Libraries/VgCommon/vgEventType.cxx b/Libraries/VgCommon/vgEventType.cxx
new file mode 100644
index 00000000..db91373a
--- /dev/null
+++ b/Libraries/VgCommon/vgEventType.cxx
@@ -0,0 +1,66 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgEventType.h"
+
+#include <assert.h>
+#include <string.h>
+
+//-----------------------------------------------------------------------------
+static const char* DisplayModeStrings[vgEventType::NumDisplayModes] =
+{
+  "Tracks",
+  "Regions",
+  "TracksAndRegions"
+};
+
+//-----------------------------------------------------------------------------
+vgEventType::vgEventType() :
+  Id(-1), MinTracks(-1), MaxTracks(-1), SecondaryIconIndex(-1),
+  DisplayMode(DM_Tracks)
+{
+}
+
+#ifdef _WIN32
+#pragma warning(disable:4996) // 'strncpy' unsafe
+#endif
+
+//-----------------------------------------------------------------------------
+void vgEventType::GetTrackColor(int trackIndex,
+                                double& r, double& g, double& b) const
+{
+  assert(trackIndex >= 0);
+
+  const double* color = this->Color;;
+  if (trackIndex > 0 && this->HasSecondaryColor)
+    {
+    color = this->SecondaryColor;
+    }
+
+  r = color[0];
+  g = color[1];
+  b = color[2];
+}
+
+//-----------------------------------------------------------------------------
+int vgEventType::GetTrackIconIndex(int trackIndex) const
+{
+  assert(trackIndex >= 0);
+
+  int iconIndex = this->IconIndex;
+  if (trackIndex > 0 && this->SecondaryIconIndex >= 0)
+    {
+    iconIndex = this->SecondaryIconIndex;
+    }
+  return iconIndex;
+}
+
+//-----------------------------------------------------------------------------
+const char* vgEventType::GetDisplayModeString(int mode)
+{
+  assert(mode >= 0 && mode < NumDisplayModes);
+  return DisplayModeStrings[mode];
+}
diff --git a/Libraries/VgCommon/vgEventType.h b/Libraries/VgCommon/vgEventType.h
new file mode 100644
index 00000000..13c0308e
--- /dev/null
+++ b/Libraries/VgCommon/vgEventType.h
@@ -0,0 +1,58 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgEventType_h
+#define __vgEventType_h
+
+#include "vgEntityType.h"
+
+class VG_COMMON_EXPORT vgEventType : public vgEntityType
+{
+public:
+  enum DisplayMode
+    {
+    DM_Tracks,
+    DM_Regions,
+    DM_TracksAndRegions,
+    NumDisplayModes
+    };
+
+public:
+  vgEventType();
+
+  void SetId(int id) { this->Id = id; }
+  int  GetId() const { return this->Id; }
+
+  void SetMinTracks(int mt) { this->MinTracks = mt; }
+  int  GetMinTracks() const { return this->MinTracks; }
+
+  void SetMaxTracks(int mt) { this->MaxTracks = mt; }
+  int  GetMaxTracks() const { return this->MaxTracks; }
+
+  void SetSecondaryIconIndex(int index) { this->SecondaryIconIndex = index; }
+  int  GetSecondaryIconIndex() const    { return this->SecondaryIconIndex; }
+
+  void GetTrackColor(int trackIndex, double& r, double& g, double& b) const;
+
+  int  GetTrackIconIndex(int trackIndex) const;
+
+  void SetDisplayMode(int mode) { this->DisplayMode = mode; }
+  int  GetDisplayMode() const   { return this->DisplayMode; }
+
+  static const char* GetDisplayModeString(int mode);
+
+private:
+  int Id;
+
+  int MinTracks;
+  int MaxTracks;
+
+  int SecondaryIconIndex;
+
+  int DisplayMode;
+};
+
+#endif // __vgEventType_h
diff --git a/Libraries/VgCommon/vgFingerprint.cxx.in b/Libraries/VgCommon/vgFingerprint.cxx.in
new file mode 100644
index 00000000..7aca4bb4
--- /dev/null
+++ b/Libraries/VgCommon/vgFingerprint.cxx.in
@@ -0,0 +1,21 @@
+#include "vgFingerprint.h"
+
+#define GIT_STATUS "@GIT_STATUS@"
+#define GIT_SHA1 "@GIT_SHA1@"
+
+namespace {
+
+const char *VgGitHash   = GIT_SHA1;
+const char *VgGitStatus = GIT_STATUS;
+
+}
+
+const char* GetVisguiSha1()
+{
+  return VgGitHash;
+}
+
+const char* GetVisguiStatus()
+{
+  return VgGitStatus;
+}
diff --git a/Libraries/VgCommon/vgFingerprint.h b/Libraries/VgCommon/vgFingerprint.h
new file mode 100644
index 00000000..3adbbeb6
--- /dev/null
+++ b/Libraries/VgCommon/vgFingerprint.h
@@ -0,0 +1,15 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgFingerprint_h
+#define __vgFingerprint_h
+
+#include <vgExport.h>
+
+VG_COMMON_EXPORT const char* GetVisguiSha1();
+VG_COMMON_EXPORT const char* GetVisguiStatus();
+
+#endif
diff --git a/Libraries/VgCommon/vgFlags.h b/Libraries/VgCommon/vgFlags.h
new file mode 100644
index 00000000..28b63594
--- /dev/null
+++ b/Libraries/VgCommon/vgFlags.h
@@ -0,0 +1,98 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgFlags_h
+#define __vgFlags_h
+
+#define VG_DECLARE_FLAGS(_flags, _enum) typedef vgFlags<_enum> _flags;
+
+#define VG_DECLARE_OPERATORS_FOR_FLAGS(_flags) \
+  inline _flags operator|(_flags::EnumType f1, _flags::EnumType f2) \
+    { return _flags(f1) | f2; } \
+  inline _flags operator|(_flags::EnumType f1, _flags f2) \
+    { return f2 | f1; } \
+  inline vgIncompatibleFlag operator|(_flags::EnumType f1, int f2) \
+    { return vgIncompatibleFlag(static_cast<int>(f1) | f2); }
+
+//-----------------------------------------------------------------------------
+class vgIncompatibleFlag
+{
+public:
+  inline explicit vgIncompatibleFlag(int i) : i(i) {}
+  inline operator int() const { return i; }
+protected:
+  int i;
+};
+
+//-----------------------------------------------------------------------------
+template <typename Enum> class vgFlags
+{
+public:
+  typedef Enum EnumType;
+
+  inline vgFlags() : i(0) {}
+  inline vgFlags(Enum flag) : i(flag) {}
+  inline vgFlags(const vgFlags& other) : i(other.i) {}
+
+#ifdef SHIBOKEN
+  inline vgFlags(int value) : i(value) {}
+
+  inline vgFlags& operator=(const QFlags<Enum>& other)
+    { this->i = other; return *this; }
+
+  inline operator QFlags<Enum>() const { return QFlag(this->i); }
+#endif
+
+  inline vgFlags& operator=(const vgFlags& other)
+    { this->i = other.i; return *this; }
+
+  inline vgFlags& operator&=(int mask)
+    { this->i &= mask; return *this; }
+  inline vgFlags& operator&=(unsigned int mask)
+    { this->i &= mask; return *this; }
+
+  inline vgFlags& operator|=(vgFlags f)
+    { this->i |= f.i; return *this; }
+  inline vgFlags& operator|=(Enum f)
+    { this->i |= f; return *this; }
+
+  inline vgFlags& operator^=(vgFlags f)
+    { this->i ^= f.i; return *this; }
+  inline vgFlags& operator^=(Enum f)
+    { this->i ^= f; return *this; }
+
+  inline operator int() const { return this->i; }
+
+  inline vgFlags operator&(Enum f) const
+    { vgFlags g; g.i = this->i & f; return g; }
+  inline vgFlags operator&(int mask) const
+    { vgFlags g; g.i = this->i & mask; return g; }
+  inline vgFlags operator&(unsigned int mask) const
+    { vgFlags g; g.i = this->i & mask; return g; }
+
+  inline vgFlags operator|(vgFlags f) const
+    { vgFlags g; g.i = this->i | f.i; return g; }
+  inline vgFlags operator|(Enum f) const
+    { vgFlags g; g.i = this->i | f; return g; }
+
+  inline vgFlags operator^(vgFlags f) const
+    { vgFlags g; g.i = this->i ^ f.i; return g; }
+  inline vgFlags operator^(Enum f) const
+    { vgFlags g; g.i = this->i ^ f; return g; }
+
+  inline int operator~() const
+    { return ~this->i; }
+
+  inline bool operator!() const { return !i; }
+
+  inline bool testFlag(Enum f) const
+    { return (i & f) == f && (f != 0 || i == 0); }
+
+protected:
+  int i;
+};
+
+#endif
diff --git a/Libraries/VgCommon/vgGeoTypes.h b/Libraries/VgCommon/vgGeoTypes.h
new file mode 100644
index 00000000..b5ad1996
--- /dev/null
+++ b/Libraries/VgCommon/vgGeoTypes.h
@@ -0,0 +1,62 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgGeoTypes_h
+#define __vgGeoTypes_h
+
+#include <vector>
+
+//-----------------------------------------------------------------------------
+struct vgGeoSystem
+{
+  /*implicit*/ vgGeoSystem(int gcs = -1) : GCS(gcs) {}
+  int GCS; // EPSG CRS (coordinate reference system) code
+};
+
+//-----------------------------------------------------------------------------
+struct vgGeoRawCoordinate
+{
+  vgGeoRawCoordinate() : Northing(0), Easting(0) {}
+  vgGeoRawCoordinate(double northing, double easting)
+    : Northing(northing), Easting(easting) {}
+  union
+    {
+    double Northing;
+    double Latitude;
+    };
+  union
+    {
+    double Easting;
+    double Longitude;
+    };
+};
+
+//-----------------------------------------------------------------------------
+struct vgGeocodedCoordinate : vgGeoSystem, vgGeoRawCoordinate
+{
+  vgGeocodedCoordinate() : vgGeoSystem(), vgGeoRawCoordinate() {}
+  vgGeocodedCoordinate(vgGeoRawCoordinate coord, vgGeoSystem gcs)
+    : vgGeoSystem(gcs), vgGeoRawCoordinate(coord) {}
+  vgGeocodedCoordinate(double northing, double easting, vgGeoSystem gcs)
+    : vgGeoSystem(gcs), vgGeoRawCoordinate(northing, easting) {}
+};
+
+//-----------------------------------------------------------------------------
+template <int K>
+struct vgGeocodedFixedPoly : vgGeoSystem
+{
+  vgGeoRawCoordinate Coordinate[K];
+};
+
+typedef vgGeocodedFixedPoly<4> vgGeocodedTile;
+
+//-----------------------------------------------------------------------------
+struct vgGeocodedPoly : vgGeoSystem
+{
+  std::vector<vgGeoRawCoordinate> Coordinate;
+};
+
+#endif
diff --git a/Libraries/VgCommon/vgGeodesy.cxx b/Libraries/VgCommon/vgGeodesy.cxx
new file mode 100644
index 00000000..33ca6022
--- /dev/null
+++ b/Libraries/VgCommon/vgGeodesy.cxx
@@ -0,0 +1,330 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgGeodesy.h"
+
+#include <cmath>
+#include <iostream>
+#include <sstream>
+#include <string>
+
+#include <proj_api.h>
+
+#include <GeographicLib/GeoCoords.hpp>
+#include <GeographicLib/MGRS.hpp>
+#include <GeographicLib/UTMUPS.hpp>
+
+#include "vgGeoTypes.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+projPJ adaptEPSG(int gcs)
+{
+  std::stringstream proj4Arg;
+  proj4Arg << "+init=epsg:" << gcs;
+  return pj_init_plus(proj4Arg.str().c_str());
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedCoordinate transformCoordinate(
+  const vgGeocodedCoordinate& inCoord,
+  const projPJ& fromProj, const projPJ& toProj, int toGcs)
+{
+  vgGeocodedCoordinate out;
+
+  double x = inCoord.Easting;
+  double y = inCoord.Northing;
+  double z = 0.0;
+
+  if (pj_is_latlong(fromProj))
+    {
+    x *= DEG_TO_RAD;
+    y *= DEG_TO_RAD;
+    }
+
+  int err = pj_transform(fromProj, toProj, 1, 1, &x, &y, &z);
+
+  if (err == 0)
+    {
+    out.GCS = toGcs;
+    if (pj_is_latlong(toProj))
+      {
+      out.Longitude = x * RAD_TO_DEG;
+      out.Latitude = y * RAD_TO_DEG;
+      }
+    else
+      {
+      out.Easting = x;
+      out.Northing = y;
+      }
+    }
+  else
+    {
+    std::cerr << "Coordinate transformation failed: error " << err << '\n';
+    }
+
+  return out;
+}
+
+//-----------------------------------------------------------------------------
+projPJ createUTMProj(const vgGeocodedCoordinate& inCoord, int& outGcs)
+{
+  projPJ inProj = adaptEPSG(inCoord.GCS);
+
+  static const char* baseInit = "+proj=utm +ellps=WGS84 +datum=WGS84 +units=m";
+  if (inCoord.GCS < 0)
+    {
+    // Default
+    return pj_init_plus(baseInit);
+    }
+  else if (inProj && pj_is_latlong(inProj))
+    {
+    int zone;
+    bool northp;
+    double x, y;
+
+    try
+      {
+      GeographicLib::UTMUPS::Forward(inCoord.Latitude, inCoord.Longitude,
+                                     zone, northp, x, y);
+      }
+    catch (std::exception& e)
+      {
+      std::cerr << "Caught exception: " << e.what() << '\n';
+      return 0;
+      }
+
+    std::stringstream proj4Arg;
+    proj4Arg << baseInit << " +zone=" << zone;
+
+    // This is a must as it adds a false northing of 10,000,000m
+    if (!northp)
+      {
+      proj4Arg << " +south";
+      outGcs = vgGeodesy::UTM_Wgs84South + zone;
+      }
+    else
+      {
+      outGcs = vgGeodesy::UTM_Wgs84North + zone;
+      }
+
+    return pj_init_plus(proj4Arg.str().c_str());
+    }
+  else
+    {
+    projPJ outProj = adaptEPSG(vgGeodesy::LatLon_Wgs84);
+
+    if (!inProj || !outProj)
+      {
+      return 0;
+      }
+
+    const vgGeocodedCoordinate coord =
+      transformCoordinate(inCoord, inProj, outProj, vgGeodesy::LatLon_Wgs84);
+
+    return createUTMProj(coord, outGcs);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void createRegion(vgGeocodedPoly& poly, vgGeocodedCoordinate centerInUTM,
+                  double diameter)
+{
+  double radius = diameter * 0.5;
+
+  vgGeoRawCoordinate tl, tr, br, bl;
+
+  tl.Easting  = centerInUTM.Easting - radius;
+  tl.Northing = centerInUTM.Northing + radius;
+
+  tr.Easting  = centerInUTM.Easting + radius;
+  tr.Northing = centerInUTM.Northing + radius;
+
+  br.Easting  = centerInUTM.Easting + radius;
+  br.Northing = centerInUTM.Northing - radius;
+
+  bl.Easting  = centerInUTM.Easting - radius;
+  bl.Northing = centerInUTM.Northing - radius;
+
+  poly.Coordinate.push_back(tl);
+  poly.Coordinate.push_back(tr);
+  poly.Coordinate.push_back(br);
+  poly.Coordinate.push_back(bl);
+
+  poly.GCS = centerInUTM.GCS;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vgGeocodedCoordinate vgGeodesy::regionCenter(const vgGeocodedPoly& region)
+{
+  vgGeocodedCoordinate center;
+  center.Latitude = center.Longitude = 0.0;
+  center.GCS = region.GCS;
+
+  const double f = 1.0 / static_cast<double>(region.Coordinate.size());
+  size_t n = region.Coordinate.size();
+  while (n--)
+    {
+    center.Latitude += f * region.Coordinate[n].Latitude;
+    center.Longitude += f * region.Coordinate[n].Longitude;
+    }
+
+  return center;
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedPoly vgGeodesy::generateRegion(
+  const vgGeocodedCoordinate& center, double diameter)
+{
+  vgGeocodedPoly out;
+  int outGcs;
+
+  projPJ fromProj = adaptEPSG(center.GCS);
+  projPJ toProj = createUTMProj(center, outGcs);
+
+  if (!fromProj || !toProj)
+    {
+    return out;
+    }
+
+  const vgGeocodedCoordinate utmCoord =
+    transformCoordinate(center, fromProj, toProj, outGcs);
+
+  createRegion(out, utmCoord, diameter);
+
+  // Release resources
+  pj_free(fromProj);
+  pj_free(toProj);
+
+  return out;
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedPoly vgGeodesy::regionFromMgrs(const char* mgrs)
+{
+  // First convert MGRS to UTM
+  int zone, prec;
+  bool northp;
+  double x, y;
+
+  try
+    {
+    GeographicLib::MGRS::Reverse(mgrs, zone, northp, x, y, prec);
+
+    // Then UTM to lat lon
+    vgGeocodedCoordinate coord;
+    double lat, lon;
+    GeographicLib::UTMUPS::Reverse(zone, northp, x, y, lat, lon);
+
+    coord.Latitude = lat;
+    coord.Longitude = lon;
+
+    // UTMUPS returns lat lon using WGS84 ellps and datum
+    coord.GCS = vgGeodesy::LatLon_Wgs84;
+
+    // (100m * 1km) / 1e<prec> == 1e5 * 1e<-prec> = 1e(5 - prec)
+    double diameter = std::pow(10.0, 5 - prec);
+
+    return generateRegion(coord, diameter);
+    }
+  catch (const std::exception& e)
+    {
+    std::cerr << "Caught exception: " << e.what() << '\n';
+
+    return vgGeocodedPoly();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedCoordinate vgGeodesy::convertGcs(
+  const vgGeocodedCoordinate& in, int desiredGcs)
+{
+  // Validate input
+  if (in.GCS < 0)
+    return vgGeocodedCoordinate();
+
+  // Check for no-op
+  if (in.GCS == desiredGcs)
+    return in;
+
+  projPJ fromProj = adaptEPSG(in.GCS);
+  projPJ toProj = adaptEPSG(desiredGcs);
+
+  if (!fromProj || !toProj)
+    {
+    return vgGeocodedCoordinate();
+    }
+
+  const vgGeocodedCoordinate out =
+    transformCoordinate(in, fromProj, toProj, desiredGcs);
+
+  // Release resources
+  pj_free(fromProj);
+  pj_free(toProj);
+
+  return out;
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedPoly vgGeodesy::convertGcs(const vgGeocodedPoly& in, int desiredGcs)
+{
+  // Validate input
+  if (in.GCS < 0)
+    return vgGeocodedPoly();
+
+  // Check for no-op
+  if (in.GCS == desiredGcs)
+    return in;
+
+  // Prepare for conversion
+  vgGeocodedCoordinate temp;
+  vgGeoRawCoordinate& raw = temp;
+  temp.GCS = in.GCS;
+  vgGeocodedPoly out;
+
+  // Convert points
+  for (size_t n = 0, k = in.Coordinate.size(); n < k; ++n)
+    {
+    raw = in.Coordinate[n];
+    out.Coordinate.push_back(convertGcs(temp, desiredGcs));
+    }
+
+  out.GCS = desiredGcs;
+
+  // Return converted result
+  return out;
+}
+
+//-----------------------------------------------------------------------------
+std::string vgGeodesy::mgrs(const vgGeocodedCoordinate& in, int precision)
+{
+  // Convert to WGS84
+  // TODO optimize for input already in UTM
+  const vgGeocodedCoordinate cc = convertGcs(in, LatLon_Wgs84);
+
+  // Test if input is valid (do after conversion so we only need to test once
+  // to handle also failed conversion; conversion will have failed quickly if
+  // the original input was invalid)
+  if (cc.GCS < 0)
+    {
+    return "(invalid)";
+    }
+
+  // Convert to UTM
+  int zone;
+  bool northp;
+  double x, y;
+  GeographicLib::UTMUPS::Forward(cc.Latitude, cc.Longitude, zone, northp, x, y);
+
+  // Convert to MGRS
+  std::string mgrs;
+  GeographicLib::MGRS::Forward(zone, northp, x, y, precision, mgrs);
+  return mgrs;
+}
diff --git a/Libraries/VgCommon/vgGeodesy.h b/Libraries/VgCommon/vgGeodesy.h
new file mode 100644
index 00000000..30d4bd08
--- /dev/null
+++ b/Libraries/VgCommon/vgGeodesy.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgGeodesy_h
+#define __vgGeodesy_h
+
+#include <vgExport.h>
+
+#include <string>
+
+struct vgGeocodedCoordinate;
+struct vgGeocodedPoly;
+
+namespace vgGeodesy
+{
+  enum GCS
+    {
+    LatLon_Wgs84 = 4326,
+    LatLon_Nad83 = 4269,
+    UTM_Wgs84North = 32600, // Add zone number to get zoned GCS
+    UTM_Wgs84South = 32700, // Add zone number to get zoned GCS
+    UTM_Nad83NorthEast = 3313, // Add zone number to get zoned GCS (59N - 60N)
+    UTM_Nad83NorthWest = 26900, // Add zone number to get zoned GCS (1N - 23N)
+    };
+
+  VG_COMMON_EXPORT vgGeocodedCoordinate regionCenter(const vgGeocodedPoly&);
+
+  VG_COMMON_EXPORT vgGeocodedPoly generateRegion(
+    const vgGeocodedCoordinate& center, double diameter);
+
+  VG_COMMON_EXPORT vgGeocodedPoly regionFromMgrs(const char*);
+
+  VG_COMMON_EXPORT vgGeocodedCoordinate convertGcs(
+    const vgGeocodedCoordinate&, int desiredGcs);
+
+  VG_COMMON_EXPORT vgGeocodedPoly convertGcs(
+    const vgGeocodedPoly&, int desiredGcs);
+
+  VG_COMMON_EXPORT std::string mgrs(
+    const vgGeocodedCoordinate&, int precision = 5);
+}
+
+#endif
diff --git a/Libraries/VgCommon/vgNamespace.h b/Libraries/VgCommon/vgNamespace.h
new file mode 100644
index 00000000..fc5eb820
--- /dev/null
+++ b/Libraries/VgCommon/vgNamespace.h
@@ -0,0 +1,56 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgNamespace_h
+#define __vgNamespace_h
+
+namespace vg
+{
+  /// Requested seek mode.
+  ///
+  /// The value relates to the caller's expected result based on the input. The
+  /// meaning of lower/upper bound is similar to, but not exactly the same as,
+  /// the like-named Qt/STL container search methods.
+  enum SeekMode
+    {
+    /// Direction is not specified; the result is implementation defined.
+    ///
+    /// Most implementations will interpret this as "choose a sensible default"
+    /// (most often ::SeekNearest).
+    SeekUnspecified = -1,
+    /// Request the closest possible value to the input.
+    SeekNearest = 0,
+    /// Request nearest value that is greater than or equal to the request.
+    ///
+    /// The request is treated as a lower bound for permissible result values.
+    /// The result value will be the same as ::SeekExact, if such a value
+    /// exists. Otherwise, the result will be the same as ::SeekNext.
+    SeekLowerBound,
+    /// Request nearest value that is less than or equal to the request.
+    ///
+    /// The request is treated as an upper bound for permissible result values.
+    /// The result value will be the same as ::SeekExact, if such a value
+    /// exists. Otherwise, the result will be the same as ::SeekPrevious.
+    SeekUpperBound,
+    /// Request an exact match only.
+    ///
+    /// The result value will be "exactly" equal to the request. If no such
+    /// value exists, no value will be returned. An implementation is permitted
+    /// to interpret "exact" as "within a reasonable amount of fuzz to
+    /// accommodate for floating point rounding error".
+    SeekExact,
+    /// Request nearest value that is strictly greater than the request.
+    ///
+    /// \sa ::SeekLowerBound
+    SeekNext,
+    /// Request nearest value that is strictly less than the request.
+    ///
+    /// \sa ::SeekUpperBound
+    SeekPrevious
+    };
+} // namespace vg
+
+#endif
diff --git a/Libraries/VgCommon/vgPointerInt.h b/Libraries/VgCommon/vgPointerInt.h
new file mode 100644
index 00000000..2a1a7ada
--- /dev/null
+++ b/Libraries/VgCommon/vgPointerInt.h
@@ -0,0 +1,81 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// Implements a "merged" pointer / integer pair, where the integer's bits
+// are merged into the low bits of the pointer. Since malloc'd pointers are
+// typically at least 8-byte aligned, this allows us to store a pointer plus
+// a few bits of user data in the same amount of space as a single pointer.
+
+#ifndef __vgPointerInt_h
+#define __vgPointerInt_h
+
+#include "vgTypes.h"
+
+#include <assert.h>
+
+template <typename PointerType>
+class vgPointerInt
+{
+  uintptr Data;
+
+  enum { UsedBits = 0x7 };
+
+public:
+  vgPointerInt() : Data(0)
+    {}
+
+  explicit vgPointerInt(PointerType ptr, unsigned integer = 0) : Data(0)
+    {
+    this->SetPointer(ptr);
+    this->SetInt(integer);
+    }
+
+  void SetPointer(PointerType ptr)
+    {
+    uintptr data = reinterpret_cast<uintptr>(ptr);
+    assert((data & UsedBits) == 0 && "pointer not sufficiently aligned");
+    this->Data &= UsedBits;
+    this->Data |= data;
+    }
+
+  PointerType GetPointer() const
+    {
+    return reinterpret_cast<PointerType>(this->Data & ~UsedBits);
+    }
+
+  void SetInt(unsigned integer)
+    {
+    assert((integer & ~UsedBits) == 0 && "data exceeds available space");
+    this->Data &= ~UsedBits;
+    this->Data |= integer;
+    }
+
+  unsigned GetInt() const
+    {
+    return static_cast<unsigned>(this->Data & UsedBits);
+    }
+
+  void SetBits(unsigned bits)
+    {
+    assert((bits & ~UsedBits) == 0 && "data exceeds available space");
+    uintptr b = bits;
+    this->Data |= b;
+    }
+
+  void ClearBits(unsigned bits)
+    {
+    assert((bits & ~UsedBits) == 0 && "data exceeds available space");
+    uintptr b = bits;
+    this->Data &= ~b;
+    }
+
+  bool GetBitsAreSet(unsigned bits) const
+    {
+    return (this->Data & bits) == bits;
+    }
+};
+
+#endif // __vgPointerInt_h
diff --git a/Libraries/VgCommon/vgRange.h b/Libraries/VgCommon/vgRange.h
new file mode 100644
index 00000000..773b4eb4
--- /dev/null
+++ b/Libraries/VgCommon/vgRange.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgRange_h
+#define __vgRange_h
+
+template <typename T>
+class vgRange
+{
+public:
+  vgRange() {}
+  vgRange(T l, T u) : lower(l), upper(u) {}
+  vgRange(const vgRange<T>& other) : lower(other.lower), upper(other.upper) {}
+  vgRange& operator=(const vgRange<T>& other)
+    { this->lower = other.lower; this->upper = other.upper; return *this; }
+
+  bool operator==(const vgRange<T>& other) const
+    { return this->lower == other.lower && this->upper == other.upper; }
+  bool operator!=(const vgRange<T>& other) const
+    { return this->lower != other.lower || this->upper != other.upper; }
+
+  bool operator<(const vgRange<T>& other) const
+    {
+    return (this->lower < other.lower) ||
+           ((this->lower == other.lower) && (this->upper < other.upper));
+    }
+
+  T lower;
+  T upper;
+};
+
+#endif
diff --git a/Libraries/VgCommon/vgStringUtils.h b/Libraries/VgCommon/vgStringUtils.h
new file mode 100644
index 00000000..df8b6186
--- /dev/null
+++ b/Libraries/VgCommon/vgStringUtils.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgStringUtils_h
+#define __vgStringUtils_h
+
+#include <sstream>
+#include <string>
+#include <vector>
+
+class vgStringUtils
+{
+public:
+  static std::vector<std::string> &Split(
+    const std::string &s, char delim, std::vector<std::string> &elems)
+    {
+      std::stringstream ss(s);
+      std::string item;
+      while(std::getline(ss, item, delim)) {
+          elems.push_back(item);
+      }
+    return elems;
+    }
+
+
+  static std::vector<std::string> Split(const std::string &s, char delim)
+    {
+    std::vector<std::string> elems;
+    return vgStringUtils::Split(s, delim, elems);
+    }
+};
+
+#endif // __vgStringUtils_h
diff --git a/Libraries/VgCommon/vgTimeStamp.h b/Libraries/VgCommon/vgTimeStamp.h
new file mode 100644
index 00000000..2da45f2a
--- /dev/null
+++ b/Libraries/VgCommon/vgTimeStamp.h
@@ -0,0 +1,158 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgTimeStamp_h
+#define __vgTimeStamp_h
+
+//-----------------------------------------------------------------------------
+struct vgTimeStamp
+{
+  static double InvalidTime()
+    { return -1e300; }
+  static unsigned int InvalidFrameNumber()
+    { return static_cast<unsigned int>(-1); }
+
+  inline vgTimeStamp();
+  inline explicit vgTimeStamp(double time);
+  inline explicit vgTimeStamp(unsigned int frame_number);
+  inline explicit vgTimeStamp(double time, unsigned int frame_number);
+
+  inline bool IsValid() const;
+  inline bool HasTime() const;
+  inline bool HasFrameNumber() const;
+
+  inline bool operator==(const vgTimeStamp&) const;
+  inline bool operator!=(const vgTimeStamp&) const;
+
+  inline bool operator<(const vgTimeStamp&) const;
+  inline bool operator>(const vgTimeStamp&) const;
+  inline bool operator<=(const vgTimeStamp&) const;
+  inline bool operator>=(const vgTimeStamp&) const;
+
+  inline vgTimeStamp operator-(const vgTimeStamp&) const;
+
+  inline static vgTimeStamp fromTime(double time);
+  inline static vgTimeStamp fromFrameNumber(unsigned int frame_number);
+
+  double Time;
+  unsigned int FrameNumber;
+};
+
+//-----------------------------------------------------------------------------
+vgTimeStamp::vgTimeStamp()
+  : Time(InvalidTime()), FrameNumber(InvalidFrameNumber())
+{
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp::vgTimeStamp(double time)
+  : Time(time), FrameNumber(InvalidFrameNumber())
+{
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp::vgTimeStamp(unsigned int frame_number)
+  : Time(InvalidTime()), FrameNumber(frame_number)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp::vgTimeStamp(double time, unsigned int frame_number)
+  : Time(time), FrameNumber(frame_number)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::IsValid() const
+{
+  return this->HasTime() || this->HasFrameNumber();
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::HasTime() const
+{
+  return this->Time != InvalidTime();
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::HasFrameNumber() const
+{
+  return this->FrameNumber != InvalidFrameNumber();
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::operator==(const vgTimeStamp& other) const
+{
+  return (this->Time == other.Time) &&
+         (this->FrameNumber == other.FrameNumber);
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::operator!=(const vgTimeStamp& other) const
+{
+  return !(*this == other);
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::operator<(const vgTimeStamp& other) const
+{
+  if (this->HasTime() && other.HasTime())
+    return this->Time < other.Time;
+
+  if (this->HasFrameNumber() && other.HasFrameNumber())
+    return this->FrameNumber < other.FrameNumber;
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::operator>(const vgTimeStamp& other) const
+{
+  return other < *this;
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::operator<=(const vgTimeStamp& other) const
+{
+  if (this->HasTime() && other.HasTime())
+    return this->Time <= other.Time;
+
+  if (this->HasFrameNumber() && other.HasFrameNumber())
+    return this->FrameNumber <= other.FrameNumber;
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vgTimeStamp::operator>=(const vgTimeStamp& other) const
+{
+  return other <= *this;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgTimeStamp::operator-(const vgTimeStamp& other) const
+{
+  vgTimeStamp result;
+  if (this->HasTime() && other.HasTime())
+    result.Time = this->Time - other.Time;
+  if (this->HasFrameNumber() && this->FrameNumber > other.FrameNumber)
+    result.FrameNumber = this->FrameNumber - other.FrameNumber;
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgTimeStamp::fromTime(double time)
+{
+  return vgTimeStamp(time);
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgTimeStamp::fromFrameNumber(unsigned int frame_number)
+{
+  return vgTimeStamp(frame_number);
+}
+
+#endif
diff --git a/Libraries/VgCommon/vgTrackType.h b/Libraries/VgCommon/vgTrackType.h
new file mode 100644
index 00000000..e077bd75
--- /dev/null
+++ b/Libraries/VgCommon/vgTrackType.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgTrackType_h
+#define __vgTrackType_h
+
+#include "vgEntityType.h"
+
+class vgTrackType : public vgEntityType
+{
+public:
+  // For track types, the id is the just the label string
+  void SetId(const char* id) { this->SetName(id); }
+  const char* GetId() const  { return this->GetName(); }
+};
+
+#endif // __vgTrackType_h
diff --git a/Libraries/VgCommon/vgTypes.h b/Libraries/VgCommon/vgTypes.h
new file mode 100644
index 00000000..801de617
--- /dev/null
+++ b/Libraries/VgCommon/vgTypes.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgTypes_h
+#define __vgTypes_h
+
+#ifdef _WIN32
+#ifdef _WIN64
+typedef unsigned __int64 uintptr;
+#else
+typedef unsigned int uintptr;
+#endif
+#else
+typedef unsigned long uintptr;
+#endif
+
+#endif // __vgTypes_h
diff --git a/Libraries/VgCommon/vgUtil.h b/Libraries/VgCommon/vgUtil.h
new file mode 100644
index 00000000..edd77ac3
--- /dev/null
+++ b/Libraries/VgCommon/vgUtil.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgUtil_h
+#define __vgUtil_h
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline void vgExpandLowerBoundary(T& lowerBound, const T& value)
+{ if (value < lowerBound) lowerBound = value; }
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline void vgExpandUpperBoundary(T& upperBound, const T& value)
+{ if (upperBound < value) upperBound = value; }
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline void vgExpandBoundaries(T& lowerBound, T& upperBound, const T& value)
+{
+  vgExpandLowerBoundary(lowerBound, value);
+  vgExpandUpperBoundary(upperBound, value);
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline void vgTruncateLowerBoundary(T& lowerBound, const T& value)
+{ vgExpandUpperBoundary(lowerBound, value); }
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline void vgTruncateUpperBoundary(T& upperBound, const T& value)
+{ vgExpandLowerBoundary(upperBound, value); }
+
+//-----------------------------------------------------------------------------
+template <typename T>
+inline void vgBound(T& value, const T& lowerBound, const T& upperBound)
+{
+  vgTruncateLowerBoundary(value, lowerBound);
+  vgTruncateUpperBoundary(value, upperBound);
+}
+
+#endif
diff --git a/Libraries/VgDataFramework/CMakeLists.txt b/Libraries/VgDataFramework/CMakeLists.txt
new file mode 100644
index 00000000..40f33098
--- /dev/null
+++ b/Libraries/VgDataFramework/CMakeLists.txt
@@ -0,0 +1,75 @@
+project(vgDataFramework)
+
+set(vgDataFrameworkSources
+  vdfNodeBase.cxx
+  vdfNodeProxy.cxx
+  vdfQuerySessionNode.cxx
+  vdfSelector.cxx
+  vdfSelectorSet.cxx
+  vdfTemporalSelector.cxx
+)
+
+set(vgDataFrameworkMocHeaders
+  vdfAbstractQuerySessionNode.h
+  vdfNodeBase.h
+  vdfNodeProxy.h
+  vdfQuerySessionNode.h
+  vdfSelector.h
+  vdfTemporalSelector.h
+)
+
+set(vgDataFrameworkInstallHeaders
+  vdfAbstractEventNode.h
+  vdfAbstractQueryResultSetNode.h
+  vdfAbstractQuerySessionNode.h
+  vdfAbstractTrackNode.h
+  vdfNamespace.h
+  vdfNodeBase.h
+  vdfNodeProxy.h
+  vdfQuerySessionNode.h
+  vdfSelector.h
+  vdfSelectorSet.h
+  vdfTemporalSelector.h
+)
+
+set(vgDataFrameworkWrapObjects
+  vdfNodeBase
+  vdfQuerySessionNode
+  vdfSelector
+  vdfTemporalSelector
+  BY_VALUE
+  vdfSelectorType
+  INTERFACES
+  #vdfAbstractEventNode CANNOT WRAP, depends on vtkVgModelView
+  #vdfAbstractTrackNode CANNOT WRAP, depends on vtkVgModelView
+)
+
+qt4_wrap_cpp(vgDataFrameworkMocSources ${vgDataFrameworkMocHeaders})
+
+vg_include_library_sdk_directories(qtExtensions vgCommon)
+
+add_library(${PROJECT_NAME}
+  ${vgDataFrameworkSources}
+  ${vgDataFrameworkMocSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PRIVATE_INTERFACE_TARGETS
+  vvIO
+  LINK_LIBRARIES
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vgDataFrameworkInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VgDataFramework)
+
+vg_wrap_library(${PROJECT_NAME}
+  TYPESYSTEM typesystem.xml
+  OBJECTS ${vgDataFrameworkWrapObjects}
+  HEADERS ${vgDataFrameworkInstallHeaders}
+  DEPENDS PySide:Core qtExtensions vgCommon vvIO
+)
+
+vg_add_documentation(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR} Qt)
diff --git a/Libraries/VgDataFramework/Testing/execute_query.py b/Libraries/VgDataFramework/Testing/execute_query.py
new file mode 100755
index 00000000..3e029488
--- /dev/null
+++ b/Libraries/VgDataFramework/Testing/execute_query.py
@@ -0,0 +1,89 @@
+#!/bin/env python
+
+#ckwg +5
+# Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+# KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+# Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+#
+
+import json
+import os
+import sys
+
+from PySide.QtCore import *
+from PySide.QtGui import *
+
+from vgDataFrameworkPython import *
+from vvIOPython import *
+
+#==============================================================================
+def usage(exit_code=0):
+  pname = os.path.basename(__file__)
+  sys.stderr.write("Usage: %s <query service> <query plan>\n" % pname)
+  sys.exit(exit_code)
+
+#==============================================================================
+def die_bad_query_plan(path):
+    sys.stderr.write("Failed to load query plan from '%s'\n" % path)
+    sys.exit(2)
+
+#==============================================================================
+def read_query_plan(path):
+  reader = vvReader()
+  reader.open(path) or die_bad_query_plan(path)
+
+  head = vvHeader()
+  reader.readHeader(head) or die_bad_query_plan(path)
+  if not head.type == vvHeader.QueryPlan:
+    sys.stderr.write("'%s' does not contain a query plan\n" % path)
+    sys.exit(2)
+
+  plan = vvQueryInstance()
+  reader.readQueryPlan(plan) or die_bad_query_plan(path)
+
+  return plan
+
+#==============================================================================
+class Application(QCoreApplication):
+  #----------------------------------------------------------------------------
+  def __init__(self, args):
+    QCoreApplication.__init__(self, args)
+    self.m_node = None
+
+  #----------------------------------------------------------------------------
+  def createSessionNode(self, service):
+    self.m_node = vdfQuerySessionNode(service)
+
+    self.m_node.resultSetComplete.connect(self.printResults)
+
+    return self.m_node
+
+  #----------------------------------------------------------------------------
+  def printResults(self):
+    print self.m_node.resultCount()
+    results = self.m_node.results(vdfAbstractQueryResultSetNode.SortByRelevancy)
+    for r in results:
+      print json.dumps(vvJson.serialize(self.m_node.result(r)), indent=2)
+    self.exit()
+
+#==============================================================================
+def main(args):
+
+  if len(args) < 3:
+    usage(exit_code=1)
+
+  app = Application(args)
+
+  plan = read_query_plan(args[2])
+
+  node = app.createSessionNode(QUrl(args[1]))
+  if not node.canExecute():
+    sys.stderr.write("Node cannot execute query\n")
+    sys.exit(2)
+
+  node.execute(plan, 3000)
+  app.exec_()
+
+#==============================================================================
+if __name__ == '__main__':
+  main(sys.argv)
diff --git a/Libraries/VgDataFramework/index.dox b/Libraries/VgDataFramework/index.dox
new file mode 100644
index 00000000..32065428
--- /dev/null
+++ b/Libraries/VgDataFramework/index.dox
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+/**
+\mainpage VisGUI Data Framework Documentation
+
+The VisGUI Data Framework (VDF) provides a framework for managing large and
+heterogeneous data sets in a hierarchical manner.
+
+Global data sets may consist of several logical data groupings (e.g. videos
+with associated tracks and events) as well as additional loosely-related data
+(e.g. cartographic imagery providers). Using a tree to represent related data
+is convenient and sensible. Using a generic base node class, along with a root
+node, allows users to maintain a single structure containing all of the above
+mentioned data elements.
+
+VDF uses QObject as an ancestor class for nodes. This provides a number of conveniences, such as the ability for nodes to respond to events, notification
+of node destruction via the QObject::destroyed() signal, automatic reaping of
+child nodes on destruction of the parent, and tracking of node relationships
+using QObject's parenting.
+
+The base node class, vdfNodeBase, also provides some common functionality, such
+as the ability for the user to supply a meaningful name to a node, and to
+globally toggle visibility of associated data in all active views. Additional
+functionality not visible to end users includes reference counting of views
+that are using a node, allowing derived node classes to create and destroy
+resources on demand in order to conserve resources, and improved notification
+of child creation.
+
+\par Further Reading
+\li \ref vdfUpdates
+\li \ref vdfNodeTypes
+
+*/
+// kate: hl c++
diff --git a/Libraries/VgDataFramework/node_types.dox b/Libraries/VgDataFramework/node_types.dox
new file mode 100644
index 00000000..0646afb0
--- /dev/null
+++ b/Libraries/VgDataFramework/node_types.dox
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+/**
+\page vdfNodeTypes Types of Data Nodes
+
+\brief Overview of data node classifications.
+
+Data nodes may be broadly categorized by their selectivity and functionality,
+both of which relate to the usage and variability of the data that a node
+provides. selectivity
+
+The selectivity of a node defines the nature of filtering that may be applied
+when accessing a node's data, and may be queried directly via
+vdfNodeBase::supportedSelectors and vdfNodeBase::isSelectorSupported. Selective
+data nodes are capable of delivering a subset of all available data, influenced
+by parameters such as time or location. Consumers use a \em connection, in the
+form of a vdfNodeProxy instance, to interact with nodes and select the data
+they wish to use, and to receive notification when their data is ready.
+
+Node functionality is somewhat more ephemeral, and is generally defined in
+terms of the specific interfaces that the node implements:
+
+\li An interactive data node allows the user to interact with it in some
+    fashion beyond the basic visibility flag shared by all nodes. This might be
+    simple, such as a track data node that allows the user to apply track
+    filters based on track classification (or even to simply hide individual
+    tracks), or very complicated, such as a node that provides an interactive
+    query interface to a database.
+
+\li Dynamic data nodes work in combination with data sources to manage data
+    from streaming input sources. The dynamic data node provides aggregated
+    data for presentation to the user, which is received from data source
+    nodes. This allows the user to toggle visibility for e.g. all track data,
+    all data from a particular data source (which may include several types of
+    data), or a specific type of data from a specific data source. Dynamic data
+    nodes are often created as hidden nodes, and remain hidden until a relevant
+    data source is added to their neighborhood.
+
+*/
+// kate: hl c++
diff --git a/Libraries/VgDataFramework/selectors.dox b/Libraries/VgDataFramework/selectors.dox
new file mode 100644
index 00000000..d48f27cd
--- /dev/null
+++ b/Libraries/VgDataFramework/selectors.dox
@@ -0,0 +1,28 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+/**
+\page vdfSelectors Data Selectors
+
+\brief Use of selectors to control what data is made available to consumers.
+
+The VisGUI data framework uses \em selectors to request data from data nodes.
+In the absence of selectors, a data node will provide all possible data to a
+consumer, or in some cases, no data at all. As this is usually not desired,
+selectors are used to choose the most appropriate data, and to limit data
+according to user preferences or for performance reasons.
+
+Selectors are implemented via the abstract object class vdfSelector, and use
+meta-casting and the vdfSelectorType static meta-object identifier to determine
+their function. This allows the set of possible selectors to be variable, such
+that libraries may define new selectors that are not known to the core library.
+
+The function of selectors is described by their respective class documentation.
+See vdfSelector's subclasses for a list of selectors defined in the core
+library.
+
+*/
+// kate: hl c++
diff --git a/Libraries/VgDataFramework/typesystem.xml b/Libraries/VgDataFramework/typesystem.xml
new file mode 100644
index 00000000..c77b93d2
--- /dev/null
+++ b/Libraries/VgDataFramework/typesystem.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<typesystem package="@TYPESYSTEM_NAME@">
+
+  @EXTRA_TYPESYSTEMS@
+
+  <namespace-type name="vdf">
+    <enum-type name="UpdateFlag" flags="UpdateFlags"/>
+  </namespace-type>
+
+  <interface-type name="vdfAbstractQueryResultSetNode">
+    <enum-type name="SortOrder"/>
+  </interface-type>
+
+  <object-type name="vdfAbstractQuerySessionNode">
+    <primitive-type name="ResultId"/>
+  </object-type>
+
+  <object-type name="vdfNodeProxy">
+    <enum-type name="ProgressType"/>
+  </object-type>
+
+  @EXTRA_OBJECTS@
+
+</typesystem>
diff --git a/Libraries/VgDataFramework/updates.dox b/Libraries/VgDataFramework/updates.dox
new file mode 100644
index 00000000..a76c45dd
--- /dev/null
+++ b/Libraries/VgDataFramework/updates.dox
@@ -0,0 +1,84 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+/**
+\page vdfUpdates Data Node Update Mechanism
+
+\brief Explanation of data node update options, responses, and signal
+       flow/timing.
+
+\section vdfUpdatesOverview Overview
+
+The VisGUI data framework defines a means for data providers to service
+multiple consumers, using an asynchronous model for maximum responsiveness.
+
+Providing data to multiple consumers requires that updates and available data
+be managed on a per-consumer basis. This is facilitated by the use of a node
+proxy object, vdfNodeProxy, through which all update requests are processed,
+and which is used to select the active data set of a node.
+
+\subsection vdfUpdateTiming Update Timing
+
+Although some data nodes may support synchronous updates, updating of data
+nodes is defined as an asynchronous process. Consumers (typically scene nodes)
+issues requests to obtain data for a specified time stamp and wait for a
+response. In order to improve performance, data nodes may discard outstanding
+requests on the receipt of a new request, such that only the most recent
+request is actually processed.
+
+Data nodes which can update synchronously will simply emit a response to an
+update request immediately, without unwinding the call stack.
+
+\section vdfUpdateRequestIds Request Identifiers
+
+An optional request identifier may be associated with any request. The use of
+a request identifier ensures that a reply will be issued for any outstanding
+requests so that the user knows when the request has been satisfied (either
+directly, or by completion of a later request which superseded the identified
+request). This can be useful when some action, such as updating an interface
+indicator, should be taken when the request has been satisfied.
+
+\section vdfUpdateModesAndResponses Modes and Responses
+
+In addition to \ref vdfSelectors, node update requests may specify additional
+options controlling the manner in which the update will take place:
+
+\li vdf::UpdateIncremental \n
+    Inform the node that we will accept multiple updates as data becomes
+    available. If this flag is not set, the node will not report progress on
+    the update until the update is complete.
+\li vdf::UpdateFastest \n
+    Requests that the node make \em some data available as quickly as possible,
+    even if it is not the best data. Usually this is used in combination with
+    vdf::UpdateIncremental, in which case the node will continue to make better
+    data available until the best data is available.
+
+Once an update request is made, the node has several options for responding.
+Most importantly, it is not guaranteed that the node will respond at all (for
+example, if the update requires sensing a network request for which no response
+is ever received). This is doubly true for requests without a valid identifier,
+which may be silently discarded.
+
+The node may also signal vdfNodeProxy::UpdateDiscarded if it decides that
+nothing needs to be done for a request (typically, if the same request is made
+more than once, or if the request otherwise would not change the available
+data).
+
+Requests that change the available data will signal either
+vdfNodeProxy::UpdateDataAvailable or vdfNodeProxy::UpdateCompleted when new
+data is available and ready for use. Incremental updates may be for lower
+quality data (e.g. imagery sources providing lower resolution than requested or
+image tiles only partially covering a requested area, or video sources
+providing a key frame which is near a requested time when a better match will
+be made available later). Once vdfNodeProxy::UpdateCompleted is signaled, the
+request is complete, and no additional data pertaining to the request will be
+made available.
+
+If something goes wrong during an update, the node may indicate this by
+signaling vdfNodeProxy::UpdateFailed.
+
+*/
+// kate: hl c++
diff --git a/Libraries/VgDataFramework/vdfAbstractEventNode.h b/Libraries/VgDataFramework/vdfAbstractEventNode.h
new file mode 100644
index 00000000..522c7b88
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfAbstractEventNode.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfAbstractEventNode_h
+#define __vdfAbstractEventNode_h
+
+#include <QObject>
+
+class vtkVgEventModel;
+
+/// Interface for a data node providing an event model.
+class vdfAbstractEventNode
+{
+public:
+  virtual ~vdfAbstractEventNode() {}
+
+  /// Get event model.
+  ///
+  /// \return Pointer to the node's provided event model.
+  ///
+  /// The returned pointer shall remain valid as long as the node is in use,
+  /// but may become invalid once the node becomes unused.
+  virtual vtkVgEventModel* eventModel() const = 0;
+
+protected:
+  vdfAbstractEventNode() {}
+};
+
+Q_DECLARE_INTERFACE(vdfAbstractEventNode,
+                    "org.visgui.framework.data.eventNode")
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfAbstractQueryResultSetNode.h b/Libraries/VgDataFramework/vdfAbstractQueryResultSetNode.h
new file mode 100644
index 00000000..ff238ab8
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfAbstractQueryResultSetNode.h
@@ -0,0 +1,106 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfAbstractQueryResultSetNode_h
+#define __vdfAbstractQueryResultSetNode_h
+
+#include <vvIqr.h>
+
+#include <QObject>
+
+class QAbstractItemModel;
+
+class vdfNodeBase;
+
+struct vvQueryResult;
+
+/// Interface for a data node providing a collection of query results.
+///
+/// This interface manages access to a collection of query results. It provides
+/// users with a way to look up specific results or their associated data nodes
+/// by ID, and to retrieve the ID's of result subsets. It also provides a Qt
+/// item data model that may be used to represent results in a Qt item view.
+class vdfAbstractQueryResultSetNode
+{
+public:
+  /// Enumeration of sort orders for result subset retrieval.
+  enum SortOrder
+    {
+    /// The results are sorted by ID.
+    SortById,
+    /// The results are sorted by relevancy score, then by rank, and lastly by
+    /// ID.
+    SortByRelevancy,
+    /// The results are sorted by preference score, then by rank, and lastly by
+    /// ID.
+    SortByFeedbackPreference,
+    /// The results are sorted by rank, then by relevancy score, and lastly by
+    /// ID.
+    SortByRank
+    };
+
+  typedef long long ResultId;
+
+  virtual ~vdfAbstractQueryResultSetNode() {}
+
+  /// Look up result by ID.
+  ///
+  /// \return Pointer to the requested result, or \c nullptr if no such result
+  ///         exists.
+  virtual const vvQueryResult* result(ResultId iid) const = 0;
+
+  /// Get the total number of results available.
+  virtual int resultCount() const = 0;
+
+  /// Get ID's of a subset of the result set.
+  ///
+  /// This method allows users to request a list of result ID's of either the
+  /// entire set, or a subset.
+  ///
+  /// \param sortOrder Order in which the results will be sorted.
+  /// \param start First index of the sorted set to be included in the subset.
+  /// \param maxCount Maximum number of results to return. If negative, no
+  ///                 limit is imposed.
+  ///
+  /// \note Sorting is done prior to extracting the result subset, and so
+  ///       influences which results are returned by specifying a \p start
+  ///       and/or \p maxCount.
+  virtual QList<ResultId> results(SortOrder sortOrder, int start = 0,
+                                  int maxCount = -1) = 0;
+
+  /// Look up result data node by ID.
+  ///
+  /// \return Pointer to the requested result node, or \c nullptr if no such
+  ///         result exists.
+  virtual vdfNodeBase* resultNode(ResultId) const = 0;
+
+  /// Return an item model for this result set.
+  ///
+  /// This returns a Qt item model for the result set which is suitable for
+  /// displaying the results in a Qt item view (e.g. QTreeView). Most users
+  /// will want to use this model indirectly via a sort/filter proxy in order
+  /// to allow the user to sort the displayed results.
+  virtual QAbstractItemModel* resultItemModel() const = 0;
+
+  /// Set result feedback (user score).
+  ///
+  /// This changes the feedback on the result set by setting the user score on
+  /// the specified result. The corresponding result node is also updated.
+  ///
+  /// \return \c true if the operation was accepted (whether or not the node's
+  ///         user score actually changes), otherwise \c false (e.g. if the
+  ///         operation is not permitted, or if the requested result was not
+  ///         found).
+  virtual bool setResultFeedback(ResultId, vvIqr::Classification) = 0;
+
+protected:
+  vdfAbstractQueryResultSetNode() {}
+};
+
+Q_DECLARE_INTERFACE(vdfAbstractQueryResultSetNode,
+                    "org.visgui.framework.data.queryResultSet")
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfAbstractQuerySessionNode.h b/Libraries/VgDataFramework/vdfAbstractQuerySessionNode.h
new file mode 100644
index 00000000..f185e9bb
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfAbstractQuerySessionNode.h
@@ -0,0 +1,227 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfAbstractQuerySessionNode_h
+#define __vdfAbstractQuerySessionNode_h
+
+#include "vdfAbstractQueryResultSetNode.h"
+#include "vdfNodeBase.h"
+
+#include <qtStatusSource.h>
+
+template <typename T> class QSet;
+
+class qtStatusNotifier;
+
+class vvQueryInstance;
+struct vvQueryResult;
+
+/// Interface for a data node providing interactive access to a query session.
+class VG_DATA_FRAMEWORK_EXPORT vdfAbstractQuerySessionNode :
+  public vdfNodeBase,
+  virtual public vdfAbstractQueryResultSetNode
+{
+  Q_OBJECT
+  Q_INTERFACES(vdfAbstractQueryResultSetNode)
+
+  /// Flag indicating if the query session is busy.
+  ///
+  /// Users should not be allowed to interact with a busy query session.
+  ///
+  /// \sa busyChanged()
+  Q_PROPERTY(bool busy READ isBusy NOTIFY busyChanged)
+
+  /// Flag indicating if execution of a query is possible.
+  ///
+  /// Normally it is only possible to execute a query immediately after
+  /// creating a node (i.e. before a query has been executed). However, if
+  /// there is a problem with the node, it may never be possible to execute a
+  /// query.
+  Q_PROPERTY(bool canExecute READ canExecute)
+
+  /// Flag indicating if feedback requests may be retrieved.
+  ///
+  /// A query session can normally only ask for feedback requests just after
+  /// the 'normal' result set has been received. If this is done implicitly
+  /// (see feedbackImplicit), this is likely to never be \c true. If managing
+  /// feedback requests manually, this flag indicates when the node may be
+  /// asked to get feedback requests.
+  Q_PROPERTY(bool canGetFeedbackRequests READ canGetFeedbackRequests)
+
+  /// Flag indicating if refinement of the query is possible.
+  ///
+  /// Refinement may not be possible for some query sessions, or until the user
+  /// provides feedback. The application should disable refinement controls
+  /// when refinement is not possible.
+  Q_PROPERTY(bool canRefine READ canRefine NOTIFY canRefineChanged)
+
+  /// Flag indicating if the node should automatically get feedback requests.
+  ///
+  /// Executing a query returns a 'normal' result set. In order to improve
+  /// <abbr title="Iterative Query Refinement">IQR</abbr>, the query service
+  /// may be asked to provide a set of feedback requests. This flag controls
+  /// whether this request is made implicitly once the 'normal' results are
+  /// available. When \c true, getFeedbackRequests() is called automatically
+  /// at the appropriate time.
+  ///
+  /// By default, feedbackImplicit is \c true.
+  Q_PROPERTY(bool feedbackImplicit READ isFeedbackImplicit
+                                   WRITE setFeedbackImplicit)
+
+  /// Desired number of results on which to request feedback.
+  Q_PROPERTY(int desiredFeedbackCount READ desiredFeedbackCount
+                                      WRITE setDesiredFeedbackCount)
+
+public:
+  virtual ~vdfAbstractQuerySessionNode() {}
+
+  /// Execute query plan.
+  ///
+  /// This executes the specified query plan and sets the working set size. The
+  /// working set is the pool of results that will be used for query
+  /// refinement; depending on the implementation of the refinement engine,
+  /// results after refinement may or may not be limited to the initial working
+  /// set. Similarly, the size is a suggestion which is passed to the back end,
+  /// which the back end may choose to ignore.
+  ///
+  /// As vdfAbstractQuerySessionNode is not intended for managing multiple
+  /// queries per instance, most implementations will only allow one query to
+  /// be executed per instance. Providing this operation separate from
+  /// construction is intended mainly to give the application the opportunity
+  /// to connect to the status notifier before any status changes occur.
+  ///
+  /// \return \c true if the query was successfully dispatched, otherwise
+  ///         \c false.
+  ///
+  /// Users should check canExecute before calling this method.
+  ///
+  /// \note Because the query may (and probably will) execute asynchronously,
+  ///       the return value ("dispatched" versus "executed") will generally
+  ///       only catch errors that happen in the early, synchronous stages of
+  ///       query execution (e.g. if canExecute() is \c false).
+  virtual bool execute(const vvQueryInstance& queryPlan,
+                       int workingSetSize) = 0;
+
+  /// Get the query plan used to initiate this query.
+  ///
+  /// The query plan is empty until a query is executed.
+  virtual vvQueryInstance initialQueryPlan() const = 0;
+
+  /// Get the query plan associated with this query session.
+  ///
+  /// This returns the query plan associated with this query. Initially this is
+  /// the query plan used to initiate the query, but the query plan may be
+  /// updated as the query is refined.
+  ///
+  /// \sa initialQueryPlan()
+  virtual vvQueryInstance queryPlan() const = 0;
+
+  /// Get the status notifier associated with this query session.
+  ///
+  /// This returns the qtStatusNotifier associated with this query session. The
+  /// status notifier provides notification of query progress and status that
+  /// the application may wish to present to the user, by connecting to the
+  /// status notifier's signals.
+  virtual const qtStatusNotifier* statusNotifier() const = 0;
+
+  /// Get query session 'busy' state.
+  /// \sa busy
+  virtual bool isBusy() const = 0;
+
+  /// Get query session 'canExecute' state.
+  /// \sa canExecute
+  virtual bool canExecute() const = 0;
+
+  /// Get query session 'canGetFeedbackRequests' state.
+  /// \sa canGetFeedbackRequests
+  virtual bool canGetFeedbackRequests() const = 0;
+
+  /// Get query session 'canRefine' state.
+  /// \sa canRefine
+  virtual bool canRefine() const = 0;
+
+  /// Get if asking for feedback requests is implicit.
+  /// \sa feedbackImplicit
+  virtual bool isFeedbackImplicit() const = 0;
+
+  /// Set if asking for feedback requests is implicit.
+  /// \sa feedbackImplicit
+  virtual void setFeedbackImplicit(bool) = 0;
+
+  /// Get desired number of results on which to request feedback.
+  /// \sa desiredFeedbackCount
+  virtual int desiredFeedbackCount() const = 0;
+
+  /// Set desired number of results on which to request feedback.
+  /// \sa desiredFeedbackCount
+  virtual void setDesiredFeedbackCount(int) = 0;
+
+  /// Get results for which feedback is requested.
+  ///
+  /// This returns a list of result ID's for which feedback has been requested
+  /// by the query engine being used for this session.
+  virtual QSet<ResultId> feedbackRequests() const = 0;
+
+  /// Get if feedback has been requested for specific result.
+  ///
+  /// \return \c true if feedback is requested for the specified result,
+  ///         otherwise \c false.
+  virtual bool isFeedbackRequested(ResultId) const = 0;
+
+signals:
+  /// Notification when the query session's 'busy' state changes.
+  /// \param newValue New value of the state.
+  /// \sa busy
+  void busyChanged(bool newValue);
+
+  /// Notification when the query session's 'canRefine' state changes.
+  /// \param newValue New value of the state.
+  /// \sa canRefine
+  void canRefineChanged(bool newValue);
+
+  /// Notification when all results have been received.
+  ///
+  /// This signal is emitted when we have received all results for a query
+  /// iteration of the type designated by \p scoringRequests. Note that this is
+  /// usually emitted twice per query iteration; once when all 'regular'
+  /// results are ready (with \p scoringRequests = \c false), and once when all
+  /// results for which IQR has requested feedback have been received (with
+  /// \p scoringRequests = \c true).
+  void resultSetComplete(bool scoringRequests);
+
+  /// Notification when an error occurs while processing a query action.
+  void error(qtStatusSource, QString) const;
+
+public slots:
+  /// Ask session for feedback requests
+  ///
+  /// This method requests that the session to provide a set of results on
+  /// which it would like feedback in order to optimally perform refinement.
+  /// (If feedbackImplicit is \c true, this is done automatically.)
+  ///
+  /// \return \c true if refinement is proceeding, \c false if refinement is
+  ///         not possible at this time.
+  ///
+  /// Users should check canGetFeedbackRequests before calling this method.
+  virtual bool getFeedbackRequests() = 0;
+
+  /// Request refinement of the query.
+  ///
+  /// This method requests that the session refine the query, using whatever
+  /// refinement data has been provided. Refinement is typically done
+  /// asynchronously.
+  ///
+  /// \return \c true if refinement is proceeding, \c false if refinement is
+  ///         not possible at this time.
+  ///
+  /// Users should check canRefine before calling this method.
+  virtual bool refine() = 0;
+
+protected:
+  vdfAbstractQuerySessionNode(QObject* parent = 0) : vdfNodeBase(parent) {}
+};
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfAbstractTrackNode.h b/Libraries/VgDataFramework/vdfAbstractTrackNode.h
new file mode 100644
index 00000000..7cd63465
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfAbstractTrackNode.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfAbstractTrackNode_h
+#define __vdfAbstractTrackNode_h
+
+#include <QObject>
+
+class vtkVgTrackModel;
+
+/// Interface for a data node providing an track model.
+class vdfAbstractTrackNode
+{
+public:
+  virtual ~vdfAbstractTrackNode() {}
+
+  /// Get track model.
+  ///
+  /// \return Pointer to the node's provided track model.
+  ///
+  /// The returned pointer shall remain valid as long as the node is in use,
+  /// but may become invalid once the node becomes unused.
+  virtual vtkVgTrackModel* trackModel() const = 0;
+
+protected:
+  vdfAbstractTrackNode() {}
+};
+
+Q_DECLARE_INTERFACE(vdfAbstractTrackNode,
+                    "org.visgui.framework.data.trackNode")
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfNamespace.h b/Libraries/VgDataFramework/vdfNamespace.h
new file mode 100644
index 00000000..688f35e1
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfNamespace.h
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfNamespace_h
+#define __vdfNamespace_h
+
+#include <QtGlobal>
+
+#include <vgExport.h>
+
+struct QMetaObject;
+
+/// \namespace vdf Global definitions for the VisGUI Data Framework
+namespace vdf
+{
+  /// Option flags controlling how node updates are performed.
+  /// \sa \ref vdfUpdateModesAndResponses
+  enum UpdateFlag
+    {
+    /// Allow multiple updates per request
+    UpdateIncremental = 0x1,
+    /// Obtain data as fast as possible at possible cost of quality
+    UpdateFastest = 0x2,
+    };
+  Q_DECLARE_FLAGS(UpdateFlags, UpdateFlag)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vdf::UpdateFlags)
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfNodeBase.cxx b/Libraries/VgDataFramework/vdfNodeBase.cxx
new file mode 100644
index 00000000..336f53e2
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfNodeBase.cxx
@@ -0,0 +1,279 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vdfNodeBase.h"
+
+#include "vdfNodeProxy.h"
+#include "vdfSelector.h"
+#include "vdfSelectorSet.h"
+
+#include <QChildEvent>
+#include <QSet>
+#include <QWeakPointer>
+
+namespace // anonymous
+{
+  typedef QWeakPointer<QObject> ObjectWeakPointer;
+}
+
+//-----------------------------------------------------------------------------
+class vdfNodeBasePrivate
+{
+public:
+  vdfNodeBasePrivate() :
+    DisplayName("Unnamed Node"),
+    Visibility(true),
+    ReferenceCount(0)
+    {}
+
+  QString DisplayName;
+  bool Visibility;
+  int ReferenceCount;
+
+  QSet<vdfNodeProxy*> Connections;
+
+  QList<ObjectWeakPointer> NewChildren;
+};
+
+QTE_IMPLEMENT_D_FUNC(vdfNodeBase)
+
+//-----------------------------------------------------------------------------
+vdfNodeBase::vdfNodeBase(QObject* parent) :
+  QObject(parent), d_ptr(new vdfNodeBasePrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfNodeBase::~vdfNodeBase()
+{
+}
+
+//-----------------------------------------------------------------------------
+const QString vdfNodeBase::displayName() const
+{
+  QTE_D_CONST(vdfNodeBase);
+  return d->DisplayName;
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::setDisplayName(const QString& value)
+{
+  QTE_D(vdfNodeBase);
+  if (d->DisplayName != value)
+    {
+    d->DisplayName = value;
+    emit this->displayNameChanged(value);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vdfNodeBase::type() const
+{
+  QTE_THREADSAFE_STATIC_CONST(QString) myType("Collection");
+  return myType;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfNodeBase::isHidden() const
+{
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfNodeBase::isVisible() const
+{
+  QTE_D_CONST(vdfNodeBase);
+  return d->Visibility;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfNodeBase::setVisible(bool visibility)
+{
+  if (!this->canChangeVisibility())
+    {
+    // Changing node visibility not allowed; do nothing and return failure
+    return false;
+    }
+
+  QTE_D(vdfNodeBase);
+  if (d->Visibility != visibility)
+    {
+    d->Visibility = visibility;
+    emit this->visibilityChanged(visibility);
+    }
+
+  // Visibility state is now as requested; return success (even if the state
+  // didn't actually change, the operation was still allowed)
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfNodeBase::canChangeVisibility() const
+{
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfNodeBase::canDelete() const
+{
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+QSet<vdfSelectorType> vdfNodeBase::supportedSelectors() const
+{
+  return QSet<vdfSelectorType>();
+}
+
+//-----------------------------------------------------------------------------
+bool vdfNodeBase::isSelectorSupported(const vdfSelectorType& st) const
+{
+  return this->supportedSelectors().contains(st);
+}
+
+//-----------------------------------------------------------------------------
+bool vdfNodeBase::isSelectorSupported(const vdfSelector* selector) const
+{
+  return this->isSelectorSupported(selector->type());
+}
+
+//-----------------------------------------------------------------------------
+vdfNodeProxy* vdfNodeBase::connect(QObject* consumer)
+{
+  QTE_D(vdfNodeBase);
+
+  vdfNodeProxy* const connection = new vdfNodeProxy(this);
+  connect(consumer, SIGNAL(destroyed()), connection, SLOT(deleteLater()));
+  this->enter();
+
+  d->Connections.insert(connection);
+  return connection;
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::disconnect(vdfNodeProxy* connection)
+{
+  QTE_D(vdfNodeBase);
+  if (d->Connections.contains(connection))
+    {
+    // Because the connection calls this method when it is being destroyed, we
+    // cannot just delete the connection, but we still want to ensure that it
+    // goes away...
+    connection->deleteLater();
+    d->Connections.remove(connection);
+    this->leave();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::enter()
+{
+  QTE_D(vdfNodeBase);
+
+  Q_ASSERT(d->ReferenceCount >= 0);
+
+  if (d->ReferenceCount <= 0)
+    {
+    // Acquire node when first user enters
+    this->acquire();
+    }
+
+  // Increment reference count
+  ++d->ReferenceCount;
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::leave()
+{
+  QTE_D(vdfNodeBase);
+
+  // Decrement reference count
+  --d->ReferenceCount;
+
+  if (d->ReferenceCount <= 0)
+    {
+    // Release node after last user leaves
+    this->release();
+    }
+
+  Q_ASSERT(d->ReferenceCount >= 0);
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::acquire()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::release()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::select(const vdfNodeProxy* connection)
+{
+  Q_UNUSED(connection)
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::update(
+  const vdfNodeProxy* connection, qint64 requestId,
+  const vdfSelectorSet& selectors, vdf::UpdateFlags mode)
+{
+  Q_UNUSED(selectors)
+  Q_UNUSED(mode)
+
+  // Base class has no data, so cannot update
+  emit connection->progress(vdfNodeProxy::UpdateDiscarded, requestId);
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::addChild(vdfNodeBase* child)
+{
+  Q_UNUSED(child)
+}
+
+//-----------------------------------------------------------------------------
+/// \cond internal
+void vdfNodeBase::childEvent(QChildEvent* e)
+{
+  if (e->added())
+    {
+    QTE_D(vdfNodeBase);
+
+    if (d->NewChildren.isEmpty())
+      {
+      // For the first new child we see in a given iteration of the event loop,
+      // schedule a call to process new children
+      QMetaObject::invokeMethod(this, "updateChildren", Qt::QueuedConnection);
+      }
+
+    // Add new child to new children list so we can process it later, once it
+    // is fully constructed
+    d->NewChildren.append(e->child());
+    }
+
+  QObject::childEvent(e);
+}
+
+
+//-----------------------------------------------------------------------------
+void vdfNodeBase::updateChildren()
+{
+  QTE_D(vdfNodeBase);
+  foreach (const ObjectWeakPointer child, d->NewChildren)
+    {
+    vdfNodeBase* const childNode = qobject_cast<vdfNodeBase*>(child.data());
+    if (childNode)
+      {
+      // If the cast succeeded (which it will only for actual nodes that have
+      // not been deleted by the time we come back around the event loop),
+      // process the new child
+      this->addChild(childNode);
+      }
+    }
+}
+/// \endcond
diff --git a/Libraries/VgDataFramework/vdfNodeBase.h b/Libraries/VgDataFramework/vdfNodeBase.h
new file mode 100644
index 00000000..b7700330
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfNodeBase.h
@@ -0,0 +1,353 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfNodeBase_h
+#define __vdfNodeBase_h
+
+#include "vdfNamespace.h"
+
+#include <vgNamespace.h>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <QObject>
+
+template <typename T> class QSet;
+
+struct vgTimeStamp;
+
+class vdfNodeProxy;
+class vdfSelector;
+class vdfSelectorSet;
+class vdfSelectorType;
+
+class vdfNodeBasePrivate;
+
+/// Base class for data tree nodes.
+///
+/// This class defines the minimum interface implemented by a node in a VisGUI
+/// data tree. Concrete data nodes implement interfaces to provide data for
+/// visualization, or to enable interaction with the node. Typically, a scene
+/// tree is constructed by walking a data tree, querying each node for
+/// supported interfaces, and building representations based on what interfaces
+/// each node implements.
+///
+/// Not every node will implement usable interfaces. The root node in
+/// particular is often actually a vdfNodeBase (i.e. not a subclass thereof).
+///
+/// Management of the node tree is handled by QObject. Consumers should be
+/// careful to allow for their associated data nodes to be destroyed at any
+/// time.
+class VG_DATA_FRAMEWORK_EXPORT vdfNodeBase : public QObject
+{
+  Q_OBJECT
+
+  /// Node display name.
+  ///
+  /// This gives a descriptive name of this specific data node, which can
+  /// normally be changed by the user. The name describes the content of the
+  /// data node, and may for example refer to a specific data set. As suggested
+  /// by the name, this property is most typically used when presenting the
+  /// node to the user, e.g. when showing information about the node, or a tree
+  /// view of data nodes.
+  ///
+  /// \sa setName()
+  Q_PROPERTY(QString displayName READ displayName WRITE setDisplayName
+                                 NOTIFY displayNameChanged)
+
+  /// Node type.
+  ///
+  /// This gives a description of the type of data node, which cannot be
+  /// changed. It is intended for use in a user interface.
+  Q_PROPERTY(QString type READ type CONSTANT)
+
+  /// Node user visibility state.
+  ///
+  /// The user visibility state provides a mechanism for the user to hide a
+  /// set of data from all views. Representations of a node should be visible
+  /// iff the representation's user visibility state is \c true, the data
+  /// node's user visibility state is \c true, and the data node is not hidden.
+  ///
+  /// \sa isVisible(), setVisible()
+  Q_PROPERTY(bool visible READ isVisible WRITE setVisible
+                          NOTIFY visibilityChanged)
+
+  /// Node 'hidden' state.
+  ///
+  /// Node hiding is used to avoid presenting the user with unnecessary
+  /// information, and may be done for a variety of reasons. A hidden node
+  /// should not be shown to the user, even to make it visible or change its
+  /// display name.
+  ///
+  /// One reason to hide nodes is used by dynamic data nodes which must be
+  /// created to handle types of data which may be received by sources,
+  /// allowing them to 'lurk' until and unless such a source is actually
+  /// created.
+  ///
+  /// Another reason is to hide internal child nodes, especially the individual
+  /// source types of source nodes, for which only the primary source node
+  /// should be visible to the user.
+  ///
+  /// \sa isHidden()
+  Q_PROPERTY(bool hidden READ isHidden)
+
+public:
+  vdfNodeBase(QObject* parent = 0);
+  virtual ~vdfNodeBase();
+
+  /// Get parent data node.
+  ///
+  /// \return Pointer to the parent vdfNodeBase, or \c nullptr if the data node
+  ///         has no parent.
+  ///
+  /// As the parent data node is by definition also the parent QObject, this
+  /// method is shorthand for qobject_cast&lt;vdfNodeBase*&gt;(parent()).
+  inline vdfNodeBase* parentNode() const
+    { return qobject_cast<vdfNodeBase*>(this->parent()); }
+
+  /// Get node display name.
+  /// \sa displayName
+  QString const displayName() const;
+
+  /// Get node type.
+  /// \sa type
+  virtual QString type() const;
+
+  /// Get user visibility state.
+  /// \sa visible, setVisible()
+  virtual bool isVisible() const;
+
+  /// Get if node is hidden.
+  ///
+  /// \return \c true if node is hidden, otherwise \c false.
+  ///
+  /// The default implementation returns \c false. Usually only dynamic nodes
+  /// will need to override this.
+  ///
+  /// \sa hidden
+  virtual bool isHidden() const;
+
+  /// Get if the user can change the node's visibility.
+  ///
+  /// The default implementation returns \c true. Usually only data source
+  /// nodes that feed aggregator nodes and do not directly provide data for
+  /// visualization should return \c false.
+  virtual bool canChangeVisibility() const;
+
+  /// Get if the user can delete the node.
+  ///
+  /// \return \c true if the user should be allowed to request deletion of the
+  ///         node, otherwise \c false.
+  ///
+  /// The default implementation returns \c true. Note that the node must still
+  /// support being deleted due to its parent being deleted.
+  virtual bool canDelete() const;
+
+  /// Get node's supported selectors.
+  ///
+  /// This gives a collection of pointers to the meta-objects of all selector
+  /// types which are supported by this data node.
+  ///
+  /// \sa \ref vdfNodeTypes
+  virtual QSet<vdfSelectorType> supportedSelectors() const;
+
+  /// Query if a node supports a particular selector type.
+  ///
+  /// \return \c true if the node supports selectors of the specified type,
+  ///         otherwise \c false.
+  ///
+  /// \sa supportedSelectors()
+  bool isSelectorSupported(const vdfSelectorType&) const;
+
+  /// Query if a node supports a particular selector type.
+  ///
+  /// \return \c true if the node supports selectors of the same type as
+  ///         \p selector, otherwise \c false.
+  ///
+  /// \sa supportedSelectors()
+  bool isSelectorSupported(const vdfSelector* selector) const;
+
+  /// Establish a connection to this data node.
+  ///
+  /// This creates a connection from an arbitrary \p consumer to the data node,
+  /// in the form of a vdfNodeProxy, which can be used to request data from the
+  /// node. The connection is automatically destroyed, along with any
+  /// associated per-consumer data, when either this data node or the specified
+  /// \p consumer is destroyed.
+  ///
+  /// The \p consumer must not be null. If a valid \p consumer is not
+  /// specified, the connection attempt will fail and return \c nullptr.
+  ///
+  /// Establishing a connection also calls enter().
+  virtual vdfNodeProxy* connect(QObject* consumer);
+
+  // Don't hide Qt signal/slot methods
+  using QObject::connect;
+  using QObject::disconnect;
+
+signals:
+  /// Notification when the node's display name changes.
+  /// \sa displayName
+  void displayNameChanged(const QString&);
+
+  /// Notification when the node's user visibility state changes.
+  /// \sa visible
+  void visibilityChanged(bool);
+
+  /// Notification when a child node is added.
+  ///
+  /// This signal is emitted when a data node is newly added as a child to this
+  /// data node. The signal parameter is a pointer to the new node.
+  ///
+  /// \note Internally, new children are collected and - if they have not been
+  ///       deleted in the mean time - processed at the next iteration of the
+  ///       application event loop. This ensures that the new node is fully
+  ///       constructed when this signal is emitted, although it is possible
+  ///       for a child to be added and immediately destroyed without
+  ///       triggering this notification.
+  void childAdded(vdfNodeBase*);
+
+  /// Notification when a node's data has changed.
+  ///
+  /// This signal is emitted whenever a data node's data has changed. This
+  /// could be a change to the underlying raw data, or to the presented data
+  /// due to a change in a data filter. Such changes generally recommend that
+  /// associated scene nodes should be updated.
+  ///
+  /// \note Emission of this signal does not mean that the new data is ready
+  ///       for immediate consumption. Consumers should request that the node
+  ///       update for their current time stamp in order to obtain the updated
+  ///       data. (The node may still discard such a request if the new data
+  ///       that caused this signal to be emitted is not relevant to that
+  ///       consumer.)
+  void modified();
+
+public slots:
+  /// Destroy connection to this data node.
+  ///
+  /// This removes the specified connection to this data node, along with any
+  /// per-connection data belonging to the data node. Once called, the
+  /// specified connection is invalid and must not be used.
+  ///
+  /// Releasing a connection also calls leave().
+  virtual void disconnect(vdfNodeProxy*);
+
+  /// Begin using this node for a new consumer.
+  ///
+  /// This slot increments a data node's count of consumers that are using the
+  /// node. This may cause the node to construct additional structures (e.g.
+  /// data models) that may be required to visualize the node.
+  ///
+  /// Normally, this is called when a consumer connects to the node using
+  /// connect(). Consumers that use the node without a connection \b must call
+  /// this slot before attaching any representations to the node.
+  void enter();
+
+  /// Release this node from a consumer.
+  ///
+  /// This slot decrements a data node's count of consumers that are using the
+  /// node. When this count reaches zero, the node may choose to release
+  /// resources that are not needed when the node is not being visualized in
+  /// order to conserve memory or otherwise reduce load on the system.
+  ///
+  /// This is also called when a connection is removed from the node. Consumers
+  /// should only need to call this directly if calling enter() directly.
+  void leave();
+
+  /// Set the display name of this data node.
+  /// \sa name
+  void setDisplayName(const QString&);
+
+  /// Set the user visibility state of this data node.
+  ///
+  /// The user visibility state provides a mechanism for the user to hide a
+  /// data tree in all views.
+  ///
+  /// \return \c true if the request to change state was accepted (whether or
+  ///         not the visibility state actually changed), otherwise \c false.
+  ///
+  /// Normally, this method will return \c false iff canChangeVisibility()
+  /// would return \c false. Note that the default implementation enforces
+  /// this, so that nodes that do not permit changing their visibility do not
+  /// normally need to override this method to prevent visibility changes.
+  virtual bool setVisible(bool);
+
+protected:
+  /// Begin using this node for visualization.
+  ///
+  /// This method is called when a consumer requests use of a node that is not
+  /// currently being used by any consumers. The default implementation does
+  /// nothing. Nodes that lazy-construct models or other resources needed to
+  /// visualize the node should construct and/or initialize such resources in
+  /// this method.
+  ///
+  /// \sa enter()
+  virtual void acquire();
+
+  /// End use of this node for visualization.
+  ///
+  /// This method is called when the last consumer detaches from a node. The
+  /// default implementation does nothing. Nodes that release visualization
+  /// resources when they are unneeded may do so in this method.
+  ///
+  /// \sa leave()
+  virtual void release();
+
+  /// Handle addition of a new child node.
+  ///
+  /// This method is called after a new child node is added to this data node,
+  /// to allow the parent node to perform any necessary special action in
+  /// reaction to the addition. The default implementation is responsible for
+  /// emitting the childAdded() signal, so classes that reimplement this must
+  /// be careful to call the base implementation.
+  ///
+  /// Processing of new children is deferred until the next iteration of the
+  /// event loop, so that they are fully constructed when this method is
+  /// called. Children that are deleted before this will not be processed.
+  ///
+  /// \sa childAdded()
+  virtual void addChild(vdfNodeBase*);
+
+  /// Request that the data node update to the specified time stamp.
+  ///
+  /// This dispatches an update request for the specified consumer (as
+  /// identified by its connection proxy).
+  ///
+  /// \sa vdfNodeProxy::update()
+  virtual void update(const vdfNodeProxy*, qint64 requestId,
+                      const vdfSelectorSet&, vdf::UpdateFlags);
+
+  /// Select active data set.
+  ///
+  /// This selects the active data set for this node to be the data set
+  /// for the specified consumer (as identified by its connection proxy).
+  ///
+  /// \sa vdfNodeProxy::select()
+  virtual void select(const vdfNodeProxy*);
+
+  ////-------------------------------------------------------------------------
+  /// \cond internal
+
+protected slots:
+  void updateChildren();
+
+protected:
+  friend class vdfNodeProxy;
+
+  virtual void childEvent(QChildEvent*) QTE_OVERRIDE;
+
+  QTE_DECLARE_PRIVATE_RPTR(vdfNodeBase)
+
+private:
+  QTE_DECLARE_PRIVATE(vdfNodeBase)
+  QTE_DISABLE_COPY(vdfNodeBase)
+
+  /// \endcond
+};
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfNodeProxy.cxx b/Libraries/VgDataFramework/vdfNodeProxy.cxx
new file mode 100644
index 00000000..de3bd8d0
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfNodeProxy.cxx
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vdfNodeProxy.h"
+
+#include "vdfNodeBase.h"
+
+//-----------------------------------------------------------------------------
+class vdfNodeProxyPrivate
+{
+public:
+  vdfNodeProxyPrivate(vdfNodeBase* node) : Node(node) {}
+
+  vdf::UpdateFlags UpdateMode;
+  vdfNodeBase* const Node;
+};
+
+QTE_IMPLEMENT_D_FUNC(vdfNodeProxy)
+
+//-----------------------------------------------------------------------------
+/// \cond internal
+vdfNodeProxy::vdfNodeProxy(vdfNodeBase* node) :
+  QObject(node), d_ptr(new vdfNodeProxyPrivate(node))
+{
+}
+/// \endcond
+
+//-----------------------------------------------------------------------------
+vdfNodeProxy::~vdfNodeProxy()
+{
+  QTE_D(vdfNodeProxy);
+  d->Node->disconnect(this);
+}
+
+//-----------------------------------------------------------------------------
+vdfNodeBase* vdfNodeProxy::node() const
+{
+  QTE_D_CONST(vdfNodeProxy);
+  return d->Node;
+}
+
+//-----------------------------------------------------------------------------
+vdf::UpdateFlags vdfNodeProxy::updateMode() const
+{
+  QTE_D_CONST(vdfNodeProxy);
+  return d->UpdateMode;
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeProxy::setUpdateMode(vdf::UpdateFlags mode)
+{
+  QTE_D(vdfNodeProxy);
+  d->UpdateMode = mode;
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeProxy::makeCurrent() const
+{
+  QTE_D_CONST(vdfNodeProxy);
+  d->Node->select(this);
+}
+
+//-----------------------------------------------------------------------------
+void vdfNodeProxy::update(const vdfSelectorSet& selectors,
+                          qint64 requestId) const
+{
+  QTE_D_CONST(vdfNodeProxy);
+  d->Node->update(this, requestId, selectors, d->UpdateMode);
+}
diff --git a/Libraries/VgDataFramework/vdfNodeProxy.h b/Libraries/VgDataFramework/vdfNodeProxy.h
new file mode 100644
index 00000000..64faa036
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfNodeProxy.h
@@ -0,0 +1,123 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfNodeProxy_h
+#define __vdfNodeProxy_h
+
+#include "vdfNamespace.h"
+
+#include <vgNamespace.h>
+#include <vgTimeStamp.h>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <QObject>
+
+class vdfNodeBase;
+class vdfSelectorSet;
+
+class vdfNodeProxyPrivate;
+
+/// Interface proxy for data nodes.
+///
+/// This class provides a targeted interface for users of a data node. The
+/// purpose of this interface is to marshal per-user requests on the data node,
+/// without requiring users to worry about filtering replies by the intended
+/// recipient.
+///
+/// The node proxy itself is generally immutable and stateless, operating on
+/// the (mutable) associated data node.
+///
+/// \sa \ref vdfUpdates
+class VG_DATA_FRAMEWORK_EXPORT vdfNodeProxy : public QObject
+{
+  Q_OBJECT
+
+public:
+  /// Status of update request.
+  ///
+  /// This enumeration describes the current status of
+  enum ProgressType
+    {
+    /// The update() is not yet complete, but new data is available
+    UpdateDataAvailable,
+    /// The update() is complete, and the requested data is available
+    UpdateCompleted,
+    /// The update() was discarded
+    UpdateDiscarded,
+    /// The update() failed for some other reason
+    UpdateFailed
+    };
+
+  virtual ~vdfNodeProxy();
+
+  /// Return the data node associated with this proxy.
+  vdfNodeBase* node() const;
+
+  /// Get current update option flags.
+  vdf::UpdateFlags updateMode() const;
+
+  /// Set update option flags.
+  void setUpdateMode(vdf::UpdateFlags);
+
+signals:
+  /// Notification when the status of a update() request changes.
+  ///
+  /// \param id Identifier of the most recent request that is satisfied by this
+  ///           ready update.
+  ///
+  /// \note The response identifier corresponds to most recent satisfied
+  ///       request which had a valid (non-negative) identifier associated with
+  ///       it, and \em not necessarily the most recent request actually
+  ///       satisfied. The update may satisfy a later request that did not
+  ///       provide a valid identifier.
+  void progress(ProgressType, qint64 id) const;
+
+public slots:
+  /// Select active data set of associated data node.
+  ///
+  /// This makes this proxy the active (current) consumer of the data node,
+  /// such that the data provided by the node corresponds to the most recent
+  /// data retrieved for this consumer. Consumers should always call this
+  /// method before attempting to access the data of the associated data node.
+  void makeCurrent() const;
+
+  /// Request data from the associated data node.
+  ///
+  /// This makes a request to the data node using the provided selectors.
+  ///
+  /// \param selectors Set of selectors controlling what data will be
+  ///                  requested.
+  /// \param requestId Identifier for the seek request.
+  ///
+  /// Negative request identifiers are considered 'invalid'; these are still
+  /// allowed requests, but the reply will not identify what request was
+  /// satisfied. It is an error which shall result in undefined behavior to
+  /// issue a request with a valid identifier less than that of another
+  /// outstanding request against the same proxy. (Identifiers of requests made
+  /// against different proxies have no relation to each other.)
+  void update(const vdfSelectorSet& selectors, qint64 requestId = -1) const;
+
+  ////-------------------------------------------------------------------------
+  /// \cond internal
+
+protected:
+  friend class vdfNodeBase;
+
+  vdfNodeProxy(vdfNodeBase*);
+
+  QTE_DECLARE_PRIVATE_RPTR(vdfNodeProxy)
+
+private:
+  QTE_DECLARE_PRIVATE(vdfNodeProxy)
+  QTE_DISABLE_COPY(vdfNodeProxy)
+
+  /// \endcond
+};
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfQuerySessionNode.cxx b/Libraries/VgDataFramework/vdfQuerySessionNode.cxx
new file mode 100644
index 00000000..84070554
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfQuerySessionNode.cxx
@@ -0,0 +1,656 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vdfQuerySessionNode.h"
+
+#include <vvQueryService.h>
+#include <vvQuerySession.h>
+
+#include <qtMap.h>
+#include <qtStatusForwarder.h>
+
+#include <QSet>
+
+namespace // anonymous
+{
+
+// Alias types so we can use it unqualified
+typedef vdfAbstractQueryResultSetNode::ResultId ResultId;
+typedef vdfAbstractQuerySessionNode::SortOrder SortOrder;
+
+// Convenience types
+typedef QList<ResultId> ResultIdList;
+typedef QPair<vvIqr::Classification, vvIqr::Classification> FeedbackChange;
+typedef QHash<ResultId, vvQueryResult>::const_iterator ResultIterator;
+
+typedef bool (*CompareResults)(const vvQueryResult*, const vvQueryResult*);
+
+//-----------------------------------------------------------------------------
+bool CompareResultsById(const vvQueryResult* a, const vvQueryResult* b)
+{
+  return a->InstanceId < b->InstanceId;
+}
+
+//-----------------------------------------------------------------------------
+bool CompareResultsByRank(const vvQueryResult* a, const vvQueryResult* b)
+{
+  if (a->Rank == b->Rank)
+    {
+    const double ra = a->RelevancyScore;
+    const double rb = b->RelevancyScore;
+
+    return (!qFuzzyCompare(ra, rb) ? ra < rb : a->InstanceId < b->InstanceId);
+    }
+
+  return a->Rank < b->Rank;
+}
+
+//-----------------------------------------------------------------------------
+bool CompareResultsByRelevancy(const vvQueryResult* a, const vvQueryResult* b)
+{
+  const double ra = a->RelevancyScore;
+  const double rb = b->RelevancyScore;
+
+  return (!qFuzzyCompare(ra, rb) ? ra < rb :
+          a->Rank != b->Rank ? a->Rank < b->Rank :
+          a->InstanceId < b->InstanceId);
+}
+
+//-----------------------------------------------------------------------------
+bool CompareResultsByPreference(const vvQueryResult* a, const vvQueryResult* b)
+{
+  const double pa = a->PreferenceScore;
+  const double pb = b->PreferenceScore;
+
+  return (!qFuzzyCompare(pa, pb) ? pa < pb :
+          a->Rank != b->Rank ? a->Rank < b->Rank :
+          a->InstanceId < b->InstanceId);
+}
+
+} // namespace <anonymous>
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vdfQuerySessionNodePrivate
+
+//-----------------------------------------------------------------------------
+class vdfQuerySessionNodePrivate : public qtStatusForwarder
+{
+public:
+  vdfQuerySessionNodePrivate(vdfQuerySessionNode* q) : q_ptr(q) {}
+
+  void setBusy(bool);
+  void setCanRefine(bool);
+
+  bool getFeedbackRequests();
+
+  void addResult(ResultId iid, const vvQueryResult& result);
+  void removeResult(ResultId iid);
+
+  void sortResults(SortOrder sortOrder, ResultIdList& out);
+
+  bool Busy;
+  bool CanExecute;
+  bool CanGetFeedbackRequests;
+  bool CanRefine;
+
+  bool FeedbackImplicit;
+  int DesiredFeedbackCount;
+
+  QScopedPointer<vvQuerySession> Session;
+
+  vvQueryInstance QueryPlan;
+  vvQueryInstance InitialQueryPlan;
+
+  QHash<ResultId, vvQueryResult> Results;
+  QSet<ResultId> FeedbackRequests;
+  QSet<ResultId> RemovedResults;
+
+  QHash<ResultId, FeedbackChange> FeedbackChanges;
+
+  QHash<SortOrder, ResultIdList> SortedResults;
+
+private:
+  QTE_DECLARE_PUBLIC_PTR(vdfQuerySessionNode)
+  QTE_DECLARE_PUBLIC(vdfQuerySessionNode)
+};
+
+QTE_IMPLEMENT_D_FUNC(vdfQuerySessionNode)
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNodePrivate::setBusy(bool state)
+{
+  if (this->Busy != state)
+    {
+    QTE_Q(vdfQuerySessionNode);
+    this->Busy = state;
+    emit q->busyChanged(state);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNodePrivate::setCanRefine(bool state)
+{
+  if (this->CanRefine != state)
+    {
+    QTE_Q(vdfQuerySessionNode);
+    this->CanRefine = state;
+    emit q->canRefineChanged(state);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNodePrivate::getFeedbackRequests()
+{
+  this->setBusy(true);
+  return this->Session->requestRefinement(this->DesiredFeedbackCount);
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNodePrivate::addResult(
+  ResultId iid, const vvQueryResult& result)
+{
+  // TODO create or update result node
+  this->Results.insert(iid, result);
+  this->SortedResults.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNodePrivate::removeResult(ResultId iid)
+{
+  // TODO remove result node
+  this->Results.remove(iid);
+  this->SortedResults.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNodePrivate::sortResults(
+  SortOrder sortOrder, ResultIdList& out)
+{
+  // Get compare function
+  CompareResults compare;
+  switch (sortOrder)
+    {
+    case vdfAbstractQueryResultSetNode::SortByRank:
+      compare = &CompareResultsByRank;
+      break;
+    case vdfAbstractQueryResultSetNode::SortByRelevancy:
+      compare = &CompareResultsByRelevancy;
+      break;
+    case vdfAbstractQueryResultSetNode::SortByFeedbackPreference:
+      compare = &CompareResultsByPreference;
+      break;
+    default:
+      compare = &CompareResultsById;
+      break;
+    }
+
+  // Get list of results (as pointers, to avoid copying)
+  QList<const vvQueryResult*> sortedResults;
+  sortedResults.reserve(this->Results.count());
+
+  const ResultIterator end = this->Results.constEnd();
+  for (ResultIterator iter = this->Results.constBegin(); iter != end; ++iter)
+    {
+    sortedResults.append(&iter.value());
+    }
+
+  // Sort results
+  qSort(sortedResults.begin(), sortedResults.end(), compare);
+
+  // Convert list of result pointers to list of result ID's
+  out.clear();
+  out.reserve(sortedResults.count());
+  foreach (const vvQueryResult* r, sortedResults)
+    {
+    out.append(r->InstanceId);
+    }
+}
+
+//END vdfQuerySessionNodePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vdfQuerySessionNode ctor/dtor and state-query methods
+
+//-----------------------------------------------------------------------------
+vdfQuerySessionNode::vdfQuerySessionNode(
+  const QUrl& service, QObject* parent) :
+  vdfAbstractQuerySessionNode(parent),
+  d_ptr(new vdfQuerySessionNodePrivate(this))
+{
+  QTE_D(vdfQuerySessionNode);
+
+  d->Busy = false;
+  d->CanRefine = false;
+  d->CanGetFeedbackRequests = false;
+  d->CanExecute = false;
+
+  d->FeedbackImplicit = true;
+  d->DesiredFeedbackCount = 10;
+
+  vvQuerySession* const session = vvQueryService::createSession(service);
+  if (session)
+    {
+    d->Session.reset(session);
+    d->CanExecute = true;
+
+    // Connect to query session
+    connect(session, SIGNAL(resultAvailable(vvQueryResult, bool)),
+            this, SLOT(addResult(vvQueryResult, bool)));
+    connect(session, SIGNAL(resultSetComplete(bool)),
+            this, SLOT(prepareResults(bool)));
+    connect(session, SIGNAL(error(qtStatusSource, QString)),
+            this, SLOT(fail(qtStatusSource, QString)));
+
+    // Forward status notifications
+    d->connect(d->Session.data());
+    }
+}
+
+//-----------------------------------------------------------------------------
+vdfQuerySessionNode::~vdfQuerySessionNode()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::isBusy() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->Busy;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::canExecute() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->CanExecute && !d->Busy;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::canGetFeedbackRequests() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->CanGetFeedbackRequests && !d->Busy;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::canRefine() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->CanRefine && !d->Busy;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::isFeedbackImplicit() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->FeedbackImplicit;
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNode::setFeedbackImplicit(bool state)
+{
+  QTE_D(vdfQuerySessionNode);
+  d->DesiredFeedbackCount = state;
+}
+
+//-----------------------------------------------------------------------------
+int vdfQuerySessionNode::desiredFeedbackCount() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->DesiredFeedbackCount;
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNode::setDesiredFeedbackCount(int value)
+{
+  QTE_D(vdfQuerySessionNode);
+  d->DesiredFeedbackCount = value;
+}
+
+//-----------------------------------------------------------------------------
+const qtStatusNotifier* vdfQuerySessionNode::statusNotifier() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d;
+}
+
+//END vdfQuerySessionNode ctor/dtor and state-query methods
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vdfQuerySessionNode data access
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNode::release()
+{
+  QTE_D(vdfQuerySessionNode);
+  // TODO release Qt item model
+  d->SortedResults.clear();
+
+  vdfNodeBase::release();
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance vdfQuerySessionNode::initialQueryPlan() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->InitialQueryPlan;
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance vdfQuerySessionNode::queryPlan() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->QueryPlan;
+}
+
+//-----------------------------------------------------------------------------
+int vdfQuerySessionNode::resultCount() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->Results.count();
+}
+
+//-----------------------------------------------------------------------------
+QList<ResultId> vdfQuerySessionNode::results(
+  SortOrder sortOrder, int start, int maxCount)
+{
+  QTE_D(vdfQuerySessionNode);
+
+  if (start < 0 || start > d->Results.count())
+    {
+    // Return empty in case of range errors
+    return ResultIdList();
+    }
+
+  ResultIdList& fullList = d->SortedResults[sortOrder];
+  if (fullList.isEmpty() && !d->Results.isEmpty())
+    {
+    // Full list was implicitly created by QHash::operator[], which means we
+    // need to create the actual sorted list now and store it back into the
+    // sorting cache
+    d->sortResults(sortOrder, fullList);
+    }
+
+  // Return requested slice of the full sorted list
+  return fullList.mid(start, maxCount);
+}
+
+//-----------------------------------------------------------------------------
+const vvQueryResult* vdfQuerySessionNode::result(ResultId iid) const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  QHash<ResultId, vvQueryResult>::const_iterator iter = d->Results.find(iid);
+  return (iter != d->Results.constEnd() ? &iter.value() : 0);
+}
+
+//-----------------------------------------------------------------------------
+vdfNodeBase* vdfQuerySessionNode::resultNode(ResultId iid) const
+{
+  // TODO
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+QAbstractItemModel* vdfQuerySessionNode::resultItemModel() const
+{
+  // TODO
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+QSet<ResultId> vdfQuerySessionNode::feedbackRequests() const
+{
+  QTE_D_CONST(vdfQuerySessionNode);
+  return d->FeedbackRequests;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::isFeedbackRequested(ResultId iid) const
+{
+  return this->feedbackRequests().contains(iid);
+}
+
+//END vdfQuerySessionNode data access
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vdfQuerySessionNode data manipulation
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::setResultFeedback(
+  ResultId iid, vvIqr::Classification score)
+{
+  QTE_D(vdfQuerySessionNode);
+
+  // Does the requested result exist?
+  if (d->Results.contains(iid))
+    {
+    // Get the result and check if we need to do anything
+    vvQueryResult& r = d->Results[iid];
+    if (r.UserScore != score)
+      {
+      // Was feedback for this result already changed?
+      if (d->FeedbackChanges.contains(iid))
+        {
+        FeedbackChange& c = d->FeedbackChanges[iid];
+        if (c.first == score)
+          {
+          // Undoing previous change; result feedback is no longer changed
+          d->FeedbackChanges.remove(iid);
+          }
+        else
+          {
+          // Feedback is still changed, but new score is different from
+          // previous change
+          c.second = score;
+          }
+        }
+      else
+        {
+        // Result feedback not changed since last IQR round; create new change
+        d->FeedbackChanges.insert(iid, FeedbackChange(r.UserScore, score));
+        }
+
+      // Update the result...
+      r.UserScore = score;
+      // TODO update result node also
+      if (d->InitialQueryPlan.isSimilarityQuery())
+        {
+        // ...and whether or not refinement is now possible (which it only is
+        // for similarity queries)...
+        d->setCanRefine(!d->FeedbackChanges.empty());
+        }
+
+      // ...and signal that we are modified
+      emit this->modified();
+      }
+
+    return true;
+    }
+
+  return false;
+}
+
+//END vdfQuerySessionNode data manipulation
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vdfQuerySessionNode query execution and response handling
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::execute(
+  const vvQueryInstance& queryPlan, int workingSetSize)
+{
+  if (queryPlan.isValid() && this->canExecute())
+    {
+    QTE_D(vdfQuerySessionNode);
+    d->CanExecute = false;
+    d->setBusy(true);
+    d->QueryPlan = d->InitialQueryPlan = queryPlan;
+    return d->Session->processQuery(queryPlan, workingSetSize);
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::getFeedbackRequests()
+{
+  if (this->canGetFeedbackRequests())
+    {
+    QTE_D(vdfQuerySessionNode);
+    return d->getFeedbackRequests();
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vdfQuerySessionNode::refine()
+{
+  if (this->canRefine())
+    {
+    QTE_D(vdfQuerySessionNode);
+
+    vvIqr::ScoringClassifiers feedback;
+    int feedbackCount = 0;
+
+    // Include scores for all feedback requests, regardless of score...
+    foreach (ResultId iid, d->FeedbackRequests)
+      {
+      vvIqr::Classification score = d->Results[iid].UserScore;
+      feedback.insert(iid, score);
+      if (score != vvIqr::UnclassifiedExample)
+        {
+        // ...but only count as usable feedback if it isn't Unclassified
+        ++feedbackCount;
+        }
+      }
+
+    // Include positive/negative scores for all nodes
+    const ResultIterator end = d->Results.constEnd();
+    for (ResultIterator iter = d->Results.constBegin(); iter != end; ++iter)
+      {
+      vvIqr::Classification score = iter->UserScore;
+      if (score != vvIqr::UnclassifiedExample)
+        {
+        feedback.insert(iter.key(), score);
+        ++feedbackCount;
+        }
+      }
+
+    // Check that there is usable feedback to provide
+    if (!feedbackCount)
+      {
+      emit this->error(d->statusSource(),
+                       "Unable to refine query: no feedback provided");
+      return false;
+      }
+
+    // In case we don't get back all the old results, mark all of the current
+    // results as removed by the refinement round; we'll remove them again from
+    // the set as they arrive in the new set
+    d->RemovedResults = d->Results.keys().toSet();
+
+    // Initiate refinement
+    d->setCanRefine(false);
+    d->FeedbackRequests.clear();
+    d->FeedbackChanges.clear();
+    return d->Session->refineQuery(feedback);
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNode::addResult(vvQueryResult r, bool isFeedbackRequest)
+{
+  QTE_D(vdfQuerySessionNode);
+
+  const ResultId iid = r.InstanceId;
+
+  if (isFeedbackRequest)
+    {
+    d->FeedbackRequests.insert(iid);
+    if (!d->Results.contains(iid))
+      {
+      // Only add result if we don't already have it
+      d->addResult(iid, r);
+      }
+    else
+      {
+      // Otherwise, update the preference score
+      d->Results[iid].PreferenceScore = r.PreferenceScore;
+      d->SortedResults.remove(SortByFeedbackPreference);
+      }
+    }
+  else
+    {
+    // If not a feedback request, always replace the result (e.g. updating
+    // results after an IQR round)...
+    const ResultIterator iter = d->Results.constFind(iid);
+    if (iter != d->Results.constEnd())
+      {
+      // ...but first copy user mutable information that may not be preserved
+      // by (or even ever known to) the query back-end
+      const vvQueryResult& o = iter.value();
+      r.UserData = o.UserData;
+      r.UserScore = o.UserScore;
+      }
+    d->addResult(iid, r);
+    }
+
+  // Result was returned again; remove from set of results that weren't
+  d->RemovedResults.remove(iid);
+
+  emit this->modified();
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNode::prepareResults(bool feedbackRequests)
+{
+  QTE_D(vdfQuerySessionNode);
+
+  d->CanGetFeedbackRequests = !feedbackRequests;
+
+  if (!feedbackRequests && d->FeedbackImplicit)
+    {
+    // If we implicitly want to ask for feedback requests, do so now...
+    d->getFeedbackRequests();
+    }
+  else
+    {
+    // ...otherwise clean up removed results, and then we are no longer busy
+    if (!d->RemovedResults.isEmpty())
+      {
+      qtUtil::mapBound(d->RemovedResults, d,
+                       &vdfQuerySessionNodePrivate::removeResult);
+      emit this->modified();
+      }
+    d->setBusy(false);
+    }
+
+  // Re-emit signal; done here rather than forwarding to ensure we have cleaned
+  // up any results removed by refinement before consumers are alerted that the
+  // new set is ready
+  emit this->resultSetComplete(feedbackRequests);
+}
+
+//-----------------------------------------------------------------------------
+void vdfQuerySessionNode::fail(qtStatusSource ss, QString errorMessage)
+{
+  QTE_D(vdfQuerySessionNode);
+
+  Q_UNUSED(ss)
+
+  d->setBusy(false);
+  emit this->error(d->statusSource(), errorMessage);
+}
+
+//END vdfQuerySessionNode query execution and response handling
diff --git a/Libraries/VgDataFramework/vdfQuerySessionNode.h b/Libraries/VgDataFramework/vdfQuerySessionNode.h
new file mode 100644
index 00000000..71c32b4f
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfQuerySessionNode.h
@@ -0,0 +1,131 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfQuerySessionNode_h
+#define __vdfQuerySessionNode_h
+
+#include "vdfAbstractQuerySessionNode.h"
+
+#include <vvQueryResult.h>
+
+class QUrl;
+
+class vvQuerySession;
+
+class vdfQuerySessionNodePrivate;
+
+/// Concrete vvIO-based query instance node.
+///
+/// This class implements an interactive query session node
+/// (vdfAbstractQuerySessionNode) using vvQuerySession as a back-end.
+class VG_DATA_FRAMEWORK_EXPORT vdfQuerySessionNode :
+  public vdfAbstractQuerySessionNode
+{
+  Q_OBJECT
+
+public:
+  /// Create query session node.
+  ///
+  /// This constructs a query session node using the specified query service.
+  /// A vvQuerySession will be automatically created using vvQueryService.
+  vdfQuerySessionNode(const QUrl& service, QObject* parent = 0);
+  virtual ~vdfQuerySessionNode();
+
+  // vdfNodeBase interface
+
+  /// \copybrief vdfNodeBase::release
+  virtual void release() QTE_OVERRIDE;
+
+  // vdfAbstractQueryResultSetNode interface
+
+  /// \copydoc vdfAbstractQueryResultSetNode::result
+  virtual const vvQueryResult* result(ResultId iid) const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQueryResultSetNode::resultCount
+  virtual int resultCount() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQueryResultSetNode::results
+  virtual QList<ResultId> results(SortOrder sortOrder, int start = 0,
+                                  int maxCount = -1) QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQueryResultSetNode::resultNode
+  virtual vdfNodeBase* resultNode(ResultId) const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQueryResultSetNode::setResultFeedback
+  virtual bool setResultFeedback(ResultId, vvIqr::Classification) QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQueryResultSetNode::resultItemModel
+  ///
+  /// vdfQuerySessionNode constructs the model on demand.
+  virtual QAbstractItemModel* resultItemModel() const QTE_OVERRIDE;
+
+  // vdfAbstractQuerySessionNode interface
+
+  /// \copydoc vdfAbstractQuerySessionNode::execute
+  virtual bool execute(const vvQueryInstance& queryPlan,
+                       int workingSetSize) QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::initialQueryPlan
+  virtual vvQueryInstance initialQueryPlan() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::queryPlan
+  virtual vvQueryInstance queryPlan() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::statusNotifier
+  virtual const qtStatusNotifier* statusNotifier() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::isBusy
+  virtual bool isBusy() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::canExecute
+  virtual bool canExecute() const QTE_OVERRIDE;
+
+  /// \copydoc canGetFeedbackRequests::canExecute
+  virtual bool canGetFeedbackRequests() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::canRefine
+  virtual bool canRefine() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::isFeedbackImplicit
+  virtual bool isFeedbackImplicit() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::setFeedbackImplicit
+  virtual void setFeedbackImplicit(bool) QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::desiredFeedbackCount
+  virtual int desiredFeedbackCount() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::setDesiredFeedbackCount
+  virtual void setDesiredFeedbackCount(int) QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::feedbackRequests
+  virtual QSet<ResultId> feedbackRequests() const QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::isFeedbackRequested
+  virtual bool isFeedbackRequested(ResultId) const QTE_OVERRIDE;
+
+public slots:
+  /// \copydoc vdfAbstractQuerySessionNode::getFeedbackRequests
+  virtual bool getFeedbackRequests() QTE_OVERRIDE;
+
+  /// \copydoc vdfAbstractQuerySessionNode::refine
+  virtual bool refine() QTE_OVERRIDE;
+
+protected slots:
+  void addResult(vvQueryResult, bool isFeedbackRequest);
+  void prepareResults(bool feedbackRequests);
+
+  void fail(qtStatusSource, QString);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vdfQuerySessionNode)
+
+private:
+  QTE_DECLARE_PRIVATE(vdfQuerySessionNode)
+  QTE_DISABLE_COPY(vdfQuerySessionNode)
+};
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfSelector.cxx b/Libraries/VgDataFramework/vdfSelector.cxx
new file mode 100644
index 00000000..2b366b6a
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfSelector.cxx
@@ -0,0 +1,77 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vdfSelector.h"
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vdfSelectorType
+
+//-----------------------------------------------------------------------------
+vdfSelectorType::vdfSelectorType(const QMetaObject* d) : d_ptr(d)
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfSelectorType::~vdfSelectorType()
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfSelectorType& vdfSelectorType::operator=(const QMetaObject* d)
+{
+  this->d_ptr = d;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vdfSelectorType::operator const QMetaObject*() const
+{
+  return this->d_ptr;
+}
+
+//-----------------------------------------------------------------------------
+const QMetaObject& vdfSelectorType::operator*() const
+{
+  return *this->d_ptr;
+}
+
+//-----------------------------------------------------------------------------
+const QMetaObject& vdfSelectorType::operator->() const
+{
+  return *this->d_ptr;
+}
+
+//-----------------------------------------------------------------------------
+uint qHash(const vdfSelectorType& st)
+{
+  const QMetaObject* mo = st;
+  return qHash(mo);
+}
+
+//END vdfSelectorType
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vdfSelector
+
+//-----------------------------------------------------------------------------
+vdfSelector::vdfSelector(): QObject()
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfSelector::~vdfSelector()
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfSelectorType vdfSelector::type() const
+{
+  return this->metaObject();
+}
+
+//END vdfSelector
diff --git a/Libraries/VgDataFramework/vdfSelector.h b/Libraries/VgDataFramework/vdfSelector.h
new file mode 100644
index 00000000..d48b6f7e
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfSelector.h
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfSelector_h
+#define __vdfSelector_h
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <QObject>
+
+class vdfSelectorType;
+
+/// Selector type handle.
+///
+/// This class is a wrapper over a pointer to a \c const QMetaObject. Besides
+/// providing a convenient and informative type name, it is required for
+/// correct generation of the Shiboken Python bindings, as the container
+/// wrapping otherwise cannot wrap a container which contains \c const
+/// pointers.
+class VG_DATA_FRAMEWORK_EXPORT vdfSelectorType
+{
+public:
+  /*implicit*/ vdfSelectorType(const QMetaObject* = 0);
+  ~vdfSelectorType();
+
+  vdfSelectorType& operator=(const QMetaObject*);
+
+  operator const QMetaObject*() const;
+
+  const QMetaObject& operator*() const;
+  const QMetaObject& operator->() const;
+
+protected:
+  const QMetaObject* d_ptr;
+};
+
+/// Abstract base class for selectors.
+///
+/// This class defines a basic interface for selectors. Since most of the
+/// meaningful interface for a selector is dependent on specific data types on
+/// which the selector operates, the main purpose of this interface is to
+/// ensure a mechanism for copying selectors.
+///
+/// \sa \ref vdfSelectors
+class VG_DATA_FRAMEWORK_EXPORT vdfSelector : protected QObject
+{
+  Q_OBJECT
+
+public:
+  vdfSelector();
+  ~vdfSelector();
+
+  /// Create a functionally equivalent copy of this selector.
+  ///
+  /// This method shall return a new vdfSelector having the same derived class
+  /// as this instance, and the same internal data, such that the new selector
+  /// will perform the same selection as the existing instance.
+  ///
+  /// This is used to implement copy-on-write semantics for vdfSelectorSet,
+  /// e.g. when a consumer wishes to change a selector that is shared with a
+  /// pending asynchronous update request.
+  virtual vdfSelector* clone() const = 0;
+
+  /// Get the type of this selector.
+  vdfSelectorType type() const;
+
+private:
+  QTE_DISABLE_COPY(vdfSelector)
+};
+
+extern VG_DATA_FRAMEWORK_EXPORT uint qHash(const vdfSelectorType&);
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfSelectorSet.cxx b/Libraries/VgDataFramework/vdfSelectorSet.cxx
new file mode 100644
index 00000000..738a836f
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfSelectorSet.cxx
@@ -0,0 +1,87 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vdfSelectorSet.h"
+
+#include "vdfSelector.h"
+
+#include <QHash>
+
+QTE_IMPLEMENT_D_FUNC_SHARED(vdfSelectorSet)
+
+namespace // anonymous
+{
+  typedef QHash<vdfSelectorType, const vdfSelector*> SelectorCollection;
+}
+
+//-----------------------------------------------------------------------------
+class vdfSelectorSetData : public QSharedData
+{
+public:
+  vdfSelectorSetData() {}
+  vdfSelectorSetData(const vdfSelectorSetData&);
+  ~vdfSelectorSetData() { qDeleteAll(this->Selectors); }
+
+  SelectorCollection Selectors;
+};
+
+//-----------------------------------------------------------------------------
+vdfSelectorSetData::vdfSelectorSetData(const vdfSelectorSetData& other) :
+  QSharedData()
+{
+  foreach (const vdfSelector* s, other.Selectors)
+    {
+    const vdfSelector* const sc = s->clone();
+    this->Selectors.insert(sc->type(), sc);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vdfSelectorSet::vdfSelectorSet() : d_ptr(new vdfSelectorSetData)
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfSelectorSet::vdfSelectorSet(const vdfSelectorSet& other) :
+  d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfSelectorSet::~vdfSelectorSet()
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfSelectorSet& vdfSelectorSet::operator=(const vdfSelectorSet& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+void vdfSelectorSet::insert(const vdfSelector* selector)
+{
+  QTE_D_MUTABLE(vdfSelectorSet);
+
+  const vdfSelectorType type = selector->type();
+  delete d->Selectors.take(type);
+  d->Selectors.insert(type, selector);
+}
+
+//-----------------------------------------------------------------------------
+void vdfSelectorSet::remove(const vdfSelectorType& type)
+{
+  QTE_D_MUTABLE(vdfSelectorSet);
+  delete d->Selectors.take(type);
+}
+
+//-----------------------------------------------------------------------------
+QList<const vdfSelector*> vdfSelectorSet::selectors() const
+{
+  QTE_D_SHARED(vdfSelectorSet);
+  return d->Selectors.values();
+}
diff --git a/Libraries/VgDataFramework/vdfSelectorSet.h b/Libraries/VgDataFramework/vdfSelectorSet.h
new file mode 100644
index 00000000..db6c7bc7
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfSelectorSet.h
@@ -0,0 +1,61 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfSelectorSet_h
+#define __vdfSelectorSet_h
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <QSharedDataPointer>
+
+template <typename T> class QList;
+
+class vdfSelector;
+class vdfSelectorType;
+
+class vdfSelectorSetData;
+
+/// Collection of selectors
+///
+/// This class provides a container for passing and managing selectors, which
+/// are used to request data from nodes.
+///
+/// \sa \ref vdfSelectors
+class VG_DATA_FRAMEWORK_EXPORT vdfSelectorSet
+{
+public:
+  vdfSelectorSet();
+  ~vdfSelectorSet();
+
+  vdfSelectorSet(const vdfSelectorSet&);
+  vdfSelectorSet& operator=(const vdfSelectorSet&);
+
+  /// Add a selector to this set.
+  ///
+  /// This method adds the specified selector to the selector set. If the set
+  /// already contains a selector of the same type, it is replaced.
+  ///
+  /// The set takes ownership of the selector. The caller should consider the
+  /// selector to be invalid after it is inserted and should not attempt to
+  /// use it again.
+  void insert(const vdfSelector* selector);
+
+  /// Remove any selector of the specified type.
+  void remove(const vdfSelectorType&);
+
+  /// Get selectors in this set.
+  QList<const vdfSelector*> selectors() const;
+
+protected:
+  QTE_DECLARE_SHARED_PTR(vdfSelectorSet)
+
+private:
+  QTE_DECLARE_SHARED(vdfSelectorSet)
+};
+
+#endif
diff --git a/Libraries/VgDataFramework/vdfTemporalSelector.cxx b/Libraries/VgDataFramework/vdfTemporalSelector.cxx
new file mode 100644
index 00000000..67c6280c
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfTemporalSelector.cxx
@@ -0,0 +1,77 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vdfTemporalSelector.h"
+
+#include <vgTimeStamp.h>
+
+//-----------------------------------------------------------------------------
+class vdfTemporalSelectorPrivate
+{
+public:
+  vdfTemporalSelectorPrivate(const vgTimeStamp& ts, vg::SeekMode sm,
+                             vdfTemporalSelector::TemporalSelectionFlags sf);
+  vgTimeStamp TimeStamp;
+  vg::SeekMode SeekMode;
+  vdfTemporalSelector::TemporalSelectionFlags Options;
+};
+
+QTE_IMPLEMENT_D_FUNC(vdfTemporalSelector)
+
+//-----------------------------------------------------------------------------
+vdfTemporalSelectorPrivate::vdfTemporalSelectorPrivate(
+  const vgTimeStamp& ts, vg::SeekMode sm,
+  vdfTemporalSelector::TemporalSelectionFlags sf) :
+  TimeStamp(ts), SeekMode(sm), Options(sf)
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfTemporalSelector::vdfTemporalSelector(
+  const vgTimeStamp& ts, vg::SeekMode sm, TemporalSelectionFlags sf) :
+  d_ptr(new vdfTemporalSelectorPrivate(ts, sm, sf))
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfTemporalSelector::vdfTemporalSelector(
+  const vgTimeStamp& ts, TemporalSelectionFlags sf) :
+  d_ptr(new vdfTemporalSelectorPrivate(ts, vg::SeekNearest, sf))
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfTemporalSelector::~vdfTemporalSelector()
+{
+}
+
+//-----------------------------------------------------------------------------
+vdfSelector* vdfTemporalSelector::clone() const
+{
+  return new vdfTemporalSelector(this->timeStamp(), this->seekMode(),
+                                 this->options());
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vdfTemporalSelector::timeStamp() const
+{
+  QTE_D_CONST(vdfTemporalSelector);
+  return d->TimeStamp;
+}
+
+//-----------------------------------------------------------------------------
+vg::SeekMode vdfTemporalSelector::seekMode() const
+{
+  QTE_D_CONST(vdfTemporalSelector);
+  return d->SeekMode;
+}
+
+//-----------------------------------------------------------------------------
+vdfTemporalSelector::TemporalSelectionFlags vdfTemporalSelector::options() const
+{
+  QTE_D_CONST(vdfTemporalSelector);
+  return d->Options;
+}
diff --git a/Libraries/VgDataFramework/vdfTemporalSelector.h b/Libraries/VgDataFramework/vdfTemporalSelector.h
new file mode 100644
index 00000000..0ad3f55d
--- /dev/null
+++ b/Libraries/VgDataFramework/vdfTemporalSelector.h
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vdfTemporalSelector_h
+#define __vdfTemporalSelector_h
+
+#include "vdfSelector.h"
+
+#include <vgNamespace.h>
+
+class vgTimeStamp;
+
+class vdfTemporalSelectorPrivate;
+
+/// Selector which filters based on time.
+///
+/// This selector requests the data which most closely matches a specific time,
+/// according to the seek direction. Depending on the type of data, this may
+/// match a single element (e.g. video data), or many elements (e.g. in a
+/// collection of track data, the best track state match for each track).
+class VG_DATA_FRAMEWORK_EXPORT vdfTemporalSelector : public vdfSelector
+{
+  Q_OBJECT
+
+public:
+  /// Additional options to control data selection.
+  enum TemporalSelectionFlag
+    {
+    /// Request data node to provide interpolated data where possible in order
+    /// to achieve a better match.
+    TS_Interpolate = 0x1
+    };
+  Q_DECLARE_FLAGS(TemporalSelectionFlags, TemporalSelectionFlag)
+
+  /// Create selector.
+  ///
+  /// This creates a selector with the specified time stamp, seek mode, and
+  /// selection flags.
+  vdfTemporalSelector(const vgTimeStamp&, vg::SeekMode = vg::SeekNearest,
+                      TemporalSelectionFlags = 0);
+  /// Create selector.
+  /// \overload
+  vdfTemporalSelector(const vgTimeStamp&, TemporalSelectionFlags);
+
+  virtual ~vdfTemporalSelector();
+
+  /// \copybrief vdfSelector::clone
+  virtual vdfSelector* clone() const;
+
+  /// Get time stamp to use for selecting data.
+  vgTimeStamp timeStamp() const;
+
+  /// Get seek mode to use when selecting data.
+  vg::SeekMode seekMode() const;
+
+  /// Get selection option flag.
+  TemporalSelectionFlags options() const;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vdfTemporalSelector)
+
+private:
+  QTE_DECLARE_PRIVATE(vdfTemporalSelector)
+  QTE_DISABLE_COPY(vdfTemporalSelector)
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vdfTemporalSelector::TemporalSelectionFlags)
+
+#endif
diff --git a/Libraries/VgVideo/CMakeLists.txt b/Libraries/VgVideo/CMakeLists.txt
new file mode 100644
index 00000000..5b9c0b7f
--- /dev/null
+++ b/Libraries/VgVideo/CMakeLists.txt
@@ -0,0 +1,68 @@
+project(vgVideo)
+
+vg_include_library_sdk_directories(
+  TARGET ${PROJECT_NAME} INTERFACE
+  qtExtensions
+  vgCommon
+  qtVgCommon
+)
+
+set(vgVideoSources
+    vgImage.cxx
+    vgIStream.cxx
+    vgKwaArchive.cxx
+    vgKwaFrameMetadata.cxx
+    vgKwaUtil.cxx
+    vgKwaVideoClip.cxx
+    vgVideo.cxx
+    vgVideoBuffer.cxx
+    vgVideoFramePtr.cxx
+    vslInstantiations.cxx
+)
+
+set(vgVideoInstallHeaders
+  vgImage.h
+  vgKwaArchive.h
+  vgKwaFrameMetadata.h
+  vgKwaVideoClip.h
+  vgVideoBuffer.h
+  vgVideoFramePtr.h
+  vgVideo.h
+)
+
+set(vgVideoWrapObjects
+  vgImage
+  vgKwaArchive
+  vgKwaArchiveRequest
+  vgKwaFrameMetadata
+  vgKwaVideoClip
+  vgVideo
+  vgVideoBuffer
+  BY_VALUE
+  vgKwaWorldBox
+  vgVideoFramePtr
+)
+
+add_library(${PROJECT_NAME} ${vgVideoSources})
+
+target_link_libraries(${PROJECT_NAME}
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+  LINK_PRIVATE
+  qtExtensions
+  vnl_io
+  vil_io
+  vsl
+)
+
+vg_add_test_subdirectory()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vgVideoInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VgVideo)
+
+vg_wrap_library(${PROJECT_NAME}
+  OBJECTS ${vgVideoWrapObjects}
+  HEADERS ${vgVideoInstallHeaders}
+  DEPENDS PySide:Core vgCommon
+)
diff --git a/Libraries/VgVideo/Testing/CMakeLists.txt b/Libraries/VgVideo/Testing/CMakeLists.txt
new file mode 100644
index 00000000..e56f939e
--- /dev/null
+++ b/Libraries/VgVideo/Testing/CMakeLists.txt
@@ -0,0 +1,5 @@
+set(VGTEST_LINK_LIBRARIES vgVideo qtExtensions ${QT_LIBRARIES})
+vg_add_test(vgVideo-BufferRaw testVideoBuffer SOURCES TestVideoBuffer.cxx)
+vg_add_test(vgVideo-BufferPng testVideoBuffer ARGS "PNG")
+
+vg_add_test(testKwaVideoClip INTERACTIVE SOURCES TestKwaVideoClip.cxx)
diff --git a/Libraries/VgVideo/Testing/TestKwaVideoClip.cxx b/Libraries/VgVideo/Testing/TestKwaVideoClip.cxx
new file mode 100644
index 00000000..31236237
--- /dev/null
+++ b/Libraries/VgVideo/Testing/TestKwaVideoClip.cxx
@@ -0,0 +1,271 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "../vgKwaFrameMetadata.h"
+#include "../vgKwaVideoClip.h"
+#include "../vgVideoBuffer.h"
+
+#include <QApplication>
+#include <QDateTime>
+#include <QFileInfo>
+#include <QLabel>
+#include <QUrl>
+
+#include <vgDebug.h>
+
+//-----------------------------------------------------------------------------
+QDebug& operator<<(QDebug& dbg, vgGeoRawCoordinate coord)
+{
+  dbg.nospace()
+    << "(Northing " << coord.Northing
+    << ", Easting " << coord.Easting
+    << ')';
+  return dbg.space();
+}
+
+//-----------------------------------------------------------------------------
+class Argument
+{
+public:
+  Argument(const QString& arg);
+
+  QString name() const { return this->Name; }
+  QString value() const { return this->Value; }
+
+  bool operator==(const QString& otherName) const
+    {
+    return this->name() == otherName;
+    }
+
+protected:
+  QString Name;
+  QString Value;
+};
+
+//-----------------------------------------------------------------------------
+Argument::Argument(const QString& arg)
+{
+  const int n = arg.indexOf('=');
+  this->Name = arg.left(n);
+  this->Value = (n > 0 ? arg.mid(n + 1) : QString());
+}
+
+//-----------------------------------------------------------------------------
+class PerformanceTimer
+{
+public:
+  PerformanceTimer(const QString& msg, int frameCount);
+  ~PerformanceTimer();
+
+protected:
+  const QString Message;
+  const int FrameCount;
+  const QDateTime StartTime;
+};
+
+//-----------------------------------------------------------------------------
+PerformanceTimer::PerformanceTimer(const QString& msg, int frameCount) :
+  Message(msg),
+  FrameCount(frameCount),
+  StartTime(QDateTime::currentDateTimeUtc())
+{
+}
+
+//-----------------------------------------------------------------------------
+PerformanceTimer::~PerformanceTimer()
+{
+  const QDateTime endTime = QDateTime::currentDateTimeUtc();
+  double delta = 1e-3 * this->StartTime.msecsTo(endTime);
+  double rate = this->FrameCount / delta;
+  qWarning().nospace()
+    << qPrintable(this->Message) << ": "
+    << qPrintable(QString::number(delta, 'f', 3)) << " seconds ("
+    << qPrintable(QString::number(rate, 'f', 2)) << " frames/second)";
+}
+
+//-----------------------------------------------------------------------------
+void usage(const QString& argv0)
+{
+  QFileInfo fi(argv0);
+  qWarning() << "Usage:" << qPrintable(fi.fileName())
+             << "[ <options> ] <video file>";
+  qWarning() << "  Available options:";
+  qWarning() << "    --count        Report the number of frames in the video";
+  qWarning() << "    --dump-gsd     Print the GSD of each frame";
+  qWarning() << "    --dump-corners Print the corner points of each frame";
+  qWarning() << "    --dump-homographies";
+  qWarning() << "                   Print the homography matrix and reference";
+  qWarning() << "                   frame of each frame";
+  qWarning() << "    --dump-image-format";
+  qWarning() << "                   Print the size and strides of each frame";
+  qWarning() << "    --show-frames  Display the frame image data in a window";
+  qWarning() << "    --test-performance[=<compression format>]";
+  qWarning() << "                   Run some performance tests";
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+  QStringList args = app.arguments();
+
+  // Get the video file name
+  QString fileName;
+  for (int n = 1; n < args.count(); ++n)
+    {
+    if (!args[n].startsWith("--"))
+      {
+      fileName = args[n];
+      break;
+      }
+    }
+  if (fileName.isEmpty())
+    {
+    qWarning() << "Error: No video file given";
+    usage(args[0]);
+    return 1;
+    }
+
+  // Load the video file
+  vgKwaVideoClip clip(QUrl::fromUserInput(fileName));
+  vgKwaVideoClip::MetadataMap md = clip.metadata();
+
+  // Consider options
+  for (int n = 1; n < args.count(); ++n)
+    {
+    const Argument arg(args[n]);
+    if (arg == "--count")
+      {
+      qDebug() << md.count();
+      }
+    else if (arg == "--dump-gsd")
+      {
+      foreach_iter (vgKwaVideoClip::MetadataMap::const_iterator, iter, md)
+        qDebug() << "at" << iter.key() << "gsd" << iter.value().gsd();
+      }
+    else if (arg == "--dump-corners")
+      {
+      foreach_iter (vgKwaVideoClip::MetadataMap::const_iterator, iter, md)
+        {
+        qDebug() << "at" << iter.key();
+        qDebug() << "  GCS         :" << iter.value().worldCornerPoints().GCS;
+        qDebug() << "  upper left  :"
+                 << iter.value().worldCornerPoints().UpperLeft;
+        qDebug() << "  upper right :"
+                 << iter.value().worldCornerPoints().UpperRight;
+        qDebug() << "  lower left  :"
+                 << iter.value().worldCornerPoints().LowerLeft;
+        qDebug() << "  lower right :"
+                 << iter.value().worldCornerPoints().LowerRight;
+        }
+      }
+    else if (arg == "--dump-homographies")
+      {
+      foreach_iter (vgKwaVideoClip::MetadataMap::const_iterator, iter, md)
+        {
+        qDebug() << "at" << iter.key();
+        if (iter.value().homographyReferenceFrameNumber() >= 0)
+          {
+          qDebug() << "  matrix          :" << iter.value().homography();
+          qDebug() << "  reference frame :"
+                   << iter.value().homographyReferenceFrameNumber();
+          }
+        else
+          {
+          qDebug() << "  no homography is available for this frame";
+          }
+        }
+      }
+    else if (arg == "--dump-image-format")
+      {
+      clip.rewind();
+      while (clip.currentTimeStamp().IsValid())
+        {
+        vgImage frame = clip.currentImage();
+        qDebug() << "at" << clip.currentTimeStamp()
+                 << frame.iCount() << frame.jCount() << frame.planeCount()
+                 << frame.iStep() << frame.jStep() << frame.planeStep();
+        clip.advance();
+        }
+      }
+    else if (arg == "--show-frames")
+      {
+      QLabel label;
+
+      label.show();
+      clip.rewind();
+      while (clip.currentTimeStamp().IsValid())
+        {
+        const QImage image = clip.currentImage().toQImage();
+        label.setPixmap(QPixmap::fromImage(image));
+        label.setFixedSize(image.size());
+        label.update();
+        app.processEvents();
+        clip.advance();
+        }
+      }
+    else if (arg == "--test-performance")
+      {
+      const int count = clip.frameCount();
+      for (int n = 0; n < 2; ++n)
+        {
+        PerformanceTimer timer(QString("Raw read (iteration %1)").arg(n + 1),
+                               count);
+        clip.rewind();
+        while (clip.currentTimeStamp().IsValid())
+          {
+          // Force read of pixel data
+          clip.currentImage().constData();
+          clip.advance();
+          }
+        }
+
+      if (arg.value() == "recode")
+        {
+        PerformanceTimer timer("Recode", count);
+
+        clip.rewind();
+        while (clip.currentTimeStamp().IsValid())
+          {
+          clip.currentImage().toQImage();
+          clip.advance();
+          }
+        }
+      else if (!arg.value().isEmpty())
+        {
+        const QString format = arg.value();
+        vgVideoBuffer buffer(format == "RAW" ? 0 : qPrintable(format));
+
+        if (1) // Scope for PerformanceTimer
+          {
+          PerformanceTimer timer(QString("Compress (%1)").arg(format), count);
+
+          clip.rewind();
+          while (clip.currentTimeStamp().IsValid())
+            {
+            buffer.insert(clip.currentTimeStamp(), clip.currentImage());
+            clip.advance();
+            }
+          }
+
+        if (1) // Scope for PerformanceTimer
+          {
+          PerformanceTimer timer(QString("Decompress (%1)").arg(format), count);
+
+          buffer.rewind();
+          while (buffer.currentTimeStamp().IsValid())
+            {
+            // Force read of pixel data
+            buffer.currentImage().constData();
+            buffer.advance();
+            }
+          }
+        }
+      }
+    }
+
+  return 0;
+}
diff --git a/Libraries/VgVideo/Testing/TestVideoBuffer.cxx b/Libraries/VgVideo/Testing/TestVideoBuffer.cxx
new file mode 100644
index 00000000..8b62a35b
--- /dev/null
+++ b/Libraries/VgVideo/Testing/TestVideoBuffer.cxx
@@ -0,0 +1,355 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "../vgVideoBuffer.h"
+
+#include <qtStringStream.h>
+#include <qtTest.h>
+
+#include <vgDebug.h>
+
+QList<vgImage> images;
+const int COUNT = 5, LAST = COUNT - 1;
+const double FIRST_TIME = 1302909449.0;
+const int IMAGE_BYTES = 720 * 468 * 3;
+
+const char* compressionFormat;
+
+//-----------------------------------------------------------------------------
+vgVideoBuffer* buffer()
+{
+  static vgVideoBuffer* theBuffer = 0;
+  if (!theBuffer)
+    {
+    theBuffer = new vgVideoBuffer(compressionFormat);
+    }
+  return theBuffer;
+}
+
+//-----------------------------------------------------------------------------
+vgImage randomImage()
+{
+  QScopedArrayPointer<unsigned char> data(new unsigned char[IMAGE_BYTES]);
+  for (int i = 0; i < IMAGE_BYTES; ++i)
+    {
+    data[i] = qrand() & 0xFF;
+    }
+  return vgImage(data.data(), 720, 468, 3, 3, 3 * 720, 1);
+}
+
+//-----------------------------------------------------------------------------
+unsigned char subpixel(vgImage const& image, int i, int j, int plane)
+{
+  const unsigned char* const data = image.constData();
+  const ptrdiff_t offset =
+    (i * image.iStep()) + (j * image.jStep()) + (plane * image.planeStep());
+  return *(data + offset);
+}
+
+//-----------------------------------------------------------------------------
+void compareImages(qtTest& testObject, vgImage a, vgImage b)
+{
+  TEST_EQUAL(a.iCount(), b.iCount());
+  TEST_EQUAL(a.jCount(), b.jCount());
+  TEST_EQUAL(a.planeCount(), b.planeCount());
+  if (!compressionFormat)
+    {
+    TEST_EQUAL(a.iStep(), b.iStep());
+    TEST_EQUAL(a.jStep(), b.jStep());
+    TEST_EQUAL(a.planeStep(), b.planeStep());
+    }
+  const unsigned char* ad, *bd;
+  TEST((ad = a.constData()) != 0);
+  TEST((bd = b.constData()) != 0);
+  if (ad && bd)
+    {
+    if (compressionFormat)
+      {
+      // Must compare individual sub-pixels one at a time, as packing order may
+      // have changed
+      int p = a.planeCount();
+      while (p--)
+        {
+        int i = a.iCount();
+        while (i--)
+          {
+          int j = a.jCount();
+          while (j--)
+            {
+            const int asp = subpixel(a, i, j, p);
+            const int bsp = subpixel(b, i, j, p);
+            if (TEST_EQUAL(asp - bsp, 0))
+              {
+              testObject.out() << "at " << i << ',' << j << ',' << p << '\n';
+              return;
+              }
+            }
+          }
+        }
+      }
+    else
+      {
+      TEST_EQUAL(memcmp(a.constData(), b.constData(), IMAGE_BYTES), 0);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testSeek(qtTest& testObject, double time, vg::SeekMode direction,
+              vgTimeStamp expectedTime)
+{
+  TEST_EQUAL(buffer()->frameAt(vgTimeStamp(time), direction).time(),
+             expectedTime);
+}
+
+//-----------------------------------------------------------------------------
+void testIter(qtTest& testObject, int pos)
+{
+  vgVideoBuffer& b = *buffer();
+
+  if (pos >= 0)
+    {
+    vgTimeStamp t(FIRST_TIME + double(pos), pos);
+    TEST_EQUAL(b.currentTimeStamp(), t);
+    vgVideoFramePtr fp = b.currentFrame();
+    TEST_EQUAL(fp.time(), t);
+    TEST_CALL(compareImages, fp.image(), images[pos]);
+    TEST_CALL(compareImages, b.currentImage(), images[pos]);
+    }
+  else
+    {
+    vgTimeStamp t;
+    TEST_EQUAL(b.currentTimeStamp(), t);
+    vgVideoFramePtr fp = b.currentFrame();
+    TEST_EQUAL(fp.time(), t);
+    TEST_EQUAL(b.currentImage().isValid(), false);
+    TEST_EQUAL(fp.image().isValid(), false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testSeek(qtTest& testObject, double time, vg::SeekMode direction,
+              int expectedFrameNumber)
+{
+  vgVideoBuffer& b = *buffer();
+
+  vgTimeStamp expectedTimeStamp = (expectedFrameNumber >= 0 ?
+     vgTimeStamp(FIRST_TIME + double(expectedFrameNumber),
+                 expectedFrameNumber) :
+     vgTimeStamp());
+
+  TEST_EQUAL(b.seek(vgTimeStamp(time), direction), expectedTimeStamp);
+  TEST_CALL(testIter, expectedFrameNumber);
+}
+
+//-----------------------------------------------------------------------------
+int testInsertion(qtTest& testObject)
+{
+  vgVideoBuffer& b = *buffer();
+
+  int i;
+
+  // Create some images for testing
+  for (i = 0; i < COUNT; ++i)
+    {
+    images.append(randomImage());
+    }
+
+  // Test basic insertion
+  for (i = 0; i < COUNT; ++i)
+    {
+    vgTimeStamp t(FIRST_TIME + double(i), i);
+    TEST(b.insert(t, images[i]));
+    }
+
+  // Test that multiple insertion fails
+  TEST_QUIET_XFAIL(b.insert(vgTimeStamp(FIRST_TIME), images[0]));
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testMetadata(qtTest& testObject)
+{
+  vgVideoBuffer& b = *buffer();
+
+  vgTimeStamp first(FIRST_TIME, 0);
+  vgTimeStamp last(FIRST_TIME + double(LAST), LAST);
+
+  TEST_EQUAL(b.frameCount(), COUNT);
+  TEST_EQUAL(b.timeRange(), vgRange<vgTimeStamp>(first, last));
+  TEST_EQUAL(b.firstTime(), first);
+  TEST_EQUAL(b.lastTime(), last);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testMapAccess(qtTest& testObject)
+{
+  vgVideoBuffer::FrameMap map = buffer()->frames();
+
+  TEST_EQUAL(map.count(), COUNT);
+  int i = 0;
+  vgVideoBuffer::FrameMap::const_iterator iter = map.begin();
+  while (iter != map.end())
+    {
+    TEST_EQUAL(iter.key(), vgTimeStamp(FIRST_TIME + double(i), i));
+    TEST_EQUAL(iter.key(), iter.value().time());
+    TEST_CALL(compareImages, iter.value().image(), images[i]);
+    ++iter;
+    ++i;
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testRandomAccess(qtTest& testObject)
+{
+  vgVideoBuffer& b = *buffer();
+  vgVideoFramePtr fp;
+
+  for (int i = 0; i < COUNT; ++i)
+    {
+    vgTimeStamp ts(FIRST_TIME + double(i), i);
+
+    // Access by time
+    vgTimeStamp byTime = vgTimeStamp::fromTime(FIRST_TIME + double(i));
+    fp = b.frameAt(byTime);
+    TEST_EQUAL(fp.time(), ts);
+    TEST_CALL(compareImages, fp.image(), images[i]);
+    TEST_CALL(compareImages, b.imageAt(byTime), images[i]);
+
+    // Access by frame number
+    vgTimeStamp byFrameNumber = vgTimeStamp::fromFrameNumber(i);
+    fp = b.frameAt(byFrameNumber);
+    TEST_EQUAL(fp.time(), ts);
+    TEST_CALL(compareImages, fp.image(), images[i]);
+    TEST_CALL(compareImages, b.imageAt(byFrameNumber), images[i]);
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testSeekDirect(qtTest& testObject)
+{
+  vgTimeStamp ta(FIRST_TIME, 0);
+  vgTimeStamp tb(FIRST_TIME + 1.0, 1);
+  vgTimeStamp tc(FIRST_TIME + double(LAST), LAST);
+  vgTimeStamp ti;
+
+  TEST_CALL(testSeek, FIRST_TIME + 0.4, vg::SeekNearest, ta);
+  TEST_CALL(testSeek, FIRST_TIME + 0.6, vg::SeekNearest, tb);
+  TEST_CALL(testSeek, FIRST_TIME + 0.6, vg::SeekNearest, tb);
+  TEST_CALL(testSeek, FIRST_TIME + 0.4, vg::SeekExact, ti);
+
+  TEST_CALL(testSeek, FIRST_TIME + 1.0, vg::SeekLowerBound, tb);
+  TEST_CALL(testSeek, FIRST_TIME + 1.0, vg::SeekUpperBound, tb);
+
+  TEST_CALL(testSeek, FIRST_TIME + 0.4, vg::SeekLowerBound, tb);
+  TEST_CALL(testSeek, FIRST_TIME + 0.6, vg::SeekUpperBound, ta);
+
+  TEST_CALL(testSeek, FIRST_TIME - 1.0, vg::SeekNearest, ta);
+  TEST_CALL(testSeek, FIRST_TIME - 1.0, vg::SeekLowerBound, ta);
+  TEST_CALL(testSeek, FIRST_TIME - 1.0, vg::SeekUpperBound, ti);
+
+  TEST_CALL(testSeek, FIRST_TIME * 99.0, vg::SeekNearest, tc);
+  TEST_CALL(testSeek, FIRST_TIME * 99.0, vg::SeekLowerBound, ti);
+  TEST_CALL(testSeek, FIRST_TIME * 99.0, vg::SeekUpperBound, tc);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testSequentialAccess(qtTest& testObject)
+{
+  vgVideoBuffer& b = *buffer();
+  int i;
+
+  // Test forward access (and advance past end)
+  b.rewind();
+  for (i = 0; i < COUNT; ++i)
+    {
+    TEST_CALL(testIter, i);
+    TEST_EQUAL(b.advance().IsValid(), (i + 1) != COUNT);
+    }
+  TEST_CALL(testIter, -1);
+
+  // Test reverse access
+  while (--i)
+    {
+    TEST_EQUAL(b.recede().IsValid(), true);
+    TEST_CALL(testIter, i);
+    }
+
+  // Test rewind
+  while (b.advance().IsValid())
+    {
+    // Empty loop; just calling advance() until at end of clip
+    }
+  b.rewind();
+  TEST_CALL(testIter, 0);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testSeekIter(qtTest& testObject)
+{
+  TEST_CALL(testSeek, FIRST_TIME + 0.4, vg::SeekNearest, 0);
+  TEST_CALL(testSeek, FIRST_TIME + 0.6, vg::SeekNearest, 1);
+  TEST_CALL(testSeek, FIRST_TIME + 0.6, vg::SeekNearest, 1);
+  TEST_CALL(testSeek, FIRST_TIME + 0.4, vg::SeekExact, -1);
+
+  TEST_CALL(testSeek, FIRST_TIME + 1.0, vg::SeekLowerBound, 1);
+  TEST_CALL(testSeek, FIRST_TIME + 1.0, vg::SeekUpperBound, 1);
+
+  TEST_CALL(testSeek, FIRST_TIME + 0.4, vg::SeekLowerBound, 1);
+  TEST_CALL(testSeek, FIRST_TIME + 0.6, vg::SeekUpperBound, 0);
+
+  TEST_CALL(testSeek, FIRST_TIME - 1.0, vg::SeekNearest, 0);
+  TEST_CALL(testSeek, FIRST_TIME - 1.0, vg::SeekLowerBound, 0);
+  TEST_CALL(testSeek, FIRST_TIME - 1.0, vg::SeekUpperBound, -1);
+
+  TEST_CALL(testSeek, FIRST_TIME * 99.0, vg::SeekNearest, LAST);
+  TEST_CALL(testSeek, FIRST_TIME * 99.0, vg::SeekLowerBound, -1);
+  TEST_CALL(testSeek, FIRST_TIME * 99.0, vg::SeekUpperBound, LAST);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char** argv)
+{
+  qtTest testObject;
+
+  compressionFormat = (argc > 1 ? argv[1] : 0);
+
+  // Create the buffer instance and stuff it in a scoped pointer so it will
+  // be automatically cleaned up... a bit of a hack, but works
+  QScopedPointer<vgVideoBuffer> theBuffer(buffer());
+
+  // Run insertion tests; if this fails, give up, as the remaining tests will
+  // all go quite badly...
+  if (testObject.runSuite("Insertion Tests", testInsertion))
+    {
+    return testObject.result();
+    }
+
+  // Insertion worked and we (theoretically) have a good buffer, so now we can
+  // run the remaining tests
+  testObject.runSuite("Metadata Tests", testMetadata);
+  testObject.runSuite("Map Access Tests", testMapAccess);
+  testObject.runSuite("Random Access Tests", testRandomAccess);
+  testObject.runSuite("Direct Seek Tests", testSeekDirect);
+  testObject.runSuite("Sequential Access Tests", testSequentialAccess);
+  testObject.runSuite("Iterator Seek Tests", testSeekIter);
+
+  // Done
+  return testObject.result();
+}
diff --git a/Libraries/VgVideo/vgIStream.cxx b/Libraries/VgVideo/vgIStream.cxx
new file mode 100644
index 00000000..71a49727
--- /dev/null
+++ b/Libraries/VgVideo/vgIStream.cxx
@@ -0,0 +1,120 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgIStream.h"
+
+#ifdef Q_OS_WIN
+  #include <cstdio>
+  #include <iostream>
+#endif
+#include <fstream>
+
+// This class exists to wrap a std::istream such that files larger than 2 GiB
+// can be read. The trouble is on Windows, where std::streampos is a 32-bit
+// integer (even on 64-bit Windows), which means we cannot directly seek to a
+// position beyond 2 GiB using std::ifstream. The workaround, implemented by
+// this class, is to create a std::istream using a std::filebuf wrapped around
+// a FILE*, and use the C API that supports large files to seek the FILE*.
+
+QTE_IMPLEMENT_D_FUNC(vgIStream)
+
+//-----------------------------------------------------------------------------
+class vgIStreamPrivate
+{
+public:
+#ifdef Q_OS_WIN
+  FILE* file;
+  std::filebuf* buffer;
+  std::istream* stream;
+#else
+  QScopedPointer<std::ifstream> stream;
+#endif
+};
+
+//-----------------------------------------------------------------------------
+vgIStream::vgIStream() : d_ptr(new vgIStreamPrivate)
+{
+#ifdef Q_OS_WIN
+  QTE_D(vgIStream);
+
+  d->file = 0;
+  d->buffer = 0;
+  d->stream = 0;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+vgIStream::~vgIStream()
+{
+#ifdef Q_OS_WIN
+  QTE_D(vgIStream);
+
+  delete d->stream;
+  delete d->buffer;
+  fclose(d->file);
+#endif
+}
+
+//-----------------------------------------------------------------------------
+bool vgIStream::open(const QString& fileName)
+{
+  QTE_D(vgIStream);
+
+#ifdef Q_OS_WIN
+  if (fopen_s(&d->file, qPrintable(fileName), "rb"))
+    {
+    return false;
+    }
+  d->buffer = new std::filebuf(d->file);
+  d->stream = new std::istream(d->buffer);
+  return true;
+#else
+  d->stream.reset(new std::ifstream(qPrintable(fileName)));
+  return d->stream->good();
+#endif
+}
+
+//-----------------------------------------------------------------------------
+bool vgIStream::seek(qint64 position)
+{
+  QTE_D(vgIStream);
+
+#ifdef Q_OS_WIN
+
+  // Don't seek if not necessary, to avoid flushing data that has already been
+  // read into the buffer
+  if (_ftelli64(d->file) == position)
+    {
+    return true;
+    }
+
+  if (_fseeki64(d->file, position, SEEK_SET) == 0)
+    {
+    d->buffer->pubsync();
+    return true;
+    }
+
+  d->stream->setstate(std::ios::failbit);
+  return false;
+
+#else
+
+  d->stream->seekg(position);
+  return d->stream->good();
+
+#endif
+}
+
+//-----------------------------------------------------------------------------
+vgIStream::operator std::istream*()
+{
+  QTE_D(vgIStream);
+#ifdef Q_OS_WIN
+  return d->stream;
+#else
+  return d->stream.data();
+#endif
+}
diff --git a/Libraries/VgVideo/vgIStream.h b/Libraries/VgVideo/vgIStream.h
new file mode 100644
index 00000000..fe2c99fb
--- /dev/null
+++ b/Libraries/VgVideo/vgIStream.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgIStream_h
+#define __vgIStream_h
+
+#include <QScopedPointer>
+#include <QString>
+
+#include <qtGlobal.h>
+
+#include <iosfwd>
+
+#include <vgExport.h>
+
+class vgIStreamPrivate;
+
+class VG_VIDEO_EXPORT vgIStream
+{
+public:
+  vgIStream();
+  ~vgIStream();
+
+  bool open(const QString& fileName);
+  bool seek(qint64 position);
+
+  operator std::istream*();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgIStream)
+
+private:
+  QTE_DECLARE_PRIVATE(vgIStream)
+  Q_DISABLE_COPY(vgIStream)
+};
+
+#endif
diff --git a/Libraries/VgVideo/vgImage.cxx b/Libraries/VgVideo/vgImage.cxx
new file mode 100644
index 00000000..c37521e8
--- /dev/null
+++ b/Libraries/VgVideo/vgImage.cxx
@@ -0,0 +1,400 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgImage.h"
+
+#include <QImage>
+
+#include <limits>
+
+QTE_IMPLEMENT_D_FUNC_SHARED(vgImage)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+size_t readData(unsigned char* dest, QDataStream& stream, size_t len)
+{
+  const int chunk = std::numeric_limits<int>::max();
+  size_t read = 0;
+  while (len > 0)
+    {
+    size_t request = qMin(static_cast<size_t>(chunk), len);
+    int n = stream.readRawData(reinterpret_cast<char*>(dest),
+                               static_cast<int>(request));
+    if (n <= 0)
+      {
+      return read + n;
+      }
+    read += n;
+    dest += n;
+    len -= n;
+    }
+  return read;
+}
+
+//-----------------------------------------------------------------------------
+size_t writeData(const unsigned char* data, QDataStream& stream, size_t len)
+{
+  const int chunk = std::numeric_limits<int>::max();
+  size_t written = 0;
+  while (len > 0)
+    {
+    size_t request = qMin(static_cast<size_t>(chunk), len);
+    int n = stream.writeRawData(reinterpret_cast<const char*>(data),
+                                static_cast<int>(request));
+    if (n <= 0)
+      {
+      return written + n;
+      }
+    written += n;
+    data += n;
+    len -= n;
+    }
+  return written;
+}
+
+//-----------------------------------------------------------------------------
+void arrayDeleter(void* ucharData)
+{
+  unsigned char* const data = reinterpret_cast<unsigned char*>(ucharData);
+  delete[] data;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vgImageData : public QSharedData
+{
+public:
+  vgImageData();
+  ~vgImageData();
+
+  vgImageData(const vgImageData&);
+  vgImageData(const unsigned char* d,
+              int ni, int nj, int np,
+              int si, int sj, int sp,
+              const vgImage::Closure&);
+
+  int iCount, jCount, pCount;
+  int iStep, jStep, pStep;
+  unsigned char* data;
+  vgImage::Closure cleanup;
+
+  static size_t calculateDataSize(int ni, int nj, int np,
+                                  int si, int sj, int sp);
+
+protected:
+  void setData(const unsigned char* d,
+               int ni, int nj, int np,
+               int si, int sj, int sp,
+               const vgImage::Closure&);
+};
+
+//-----------------------------------------------------------------------------
+vgImageData::vgImageData() :
+  QSharedData(),
+  iCount(0), jCount(0), pCount(0),
+  iStep(0), jStep(0), pStep(0),
+  data(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgImageData::vgImageData(const vgImageData& other) : QSharedData(other)
+{
+  this->setData(other.data, other.iCount, other.jCount, other.pCount,
+                other.iStep, other.jStep, other.pStep, vgImage::Closure());
+}
+
+//-----------------------------------------------------------------------------
+vgImageData::vgImageData(
+  const unsigned char* d, int ni, int nj, int np, int si, int sj, int sp,
+  const vgImage::Closure& c)
+{
+  this->setData(d, ni, nj, np, si, sj, sp, c);
+}
+
+//-----------------------------------------------------------------------------
+vgImageData::~vgImageData()
+{
+  this->cleanup();
+}
+
+//-----------------------------------------------------------------------------
+size_t vgImageData::calculateDataSize(int ni, int nj, int np,
+                                      int si, int sj, int sp)
+{
+  if (ni < 0 || nj < 0 || np < 0)
+    {
+    return 0;
+    }
+
+  size_t n = 0;
+  n = qMax(n, static_cast<size_t>(ni) * static_cast<size_t>(si));
+  n = qMax(n, static_cast<size_t>(nj) * static_cast<size_t>(sj));
+  n = qMax(n, static_cast<size_t>(np) * static_cast<size_t>(sp));
+  return n;
+}
+
+//-----------------------------------------------------------------------------
+void vgImageData::setData(
+  const unsigned char* d, int ni, int nj, int np, int si, int sj, int sp,
+  const vgImage::Closure& c)
+{
+  this->iCount = ni;
+  this->jCount = nj;
+  this->pCount = np;
+  this->iStep = si;
+  this->jStep = sj;
+  this->pStep = sp;
+
+  size_t n = calculateDataSize(ni, nj, np, si, sj, sp);
+
+  this->cleanup();
+  if (n > 0)
+    {
+    if (!c)
+      {
+      this->data = new unsigned char[n];
+      qMemCopy(this->data, d, n);
+      this->cleanup = vgImage::Closure(arrayDeleter, this->data);
+      }
+    else
+      {
+      this->data = const_cast<unsigned char*>(d);
+      this->cleanup = c;
+      }
+    }
+  else
+    {
+    this->data = 0;
+    this->cleanup = vgImage::Closure();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vgImage::vgImage() : d_ptr(new vgImageData)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgImage::vgImage(const unsigned char* data, int ni, int nj, int np,
+                 int si, int sj, int sp) :
+  d_ptr(new vgImageData(data, ni, nj, np, si, sj, sp, Closure()))
+{
+}
+
+//-----------------------------------------------------------------------------
+vgImage::vgImage(unsigned char* data, int ni, int nj, int np,
+                 int si, int sj, int sp, const Closure& cleanup) :
+  d_ptr(new vgImageData(data, ni, nj, np, si, sj, sp, cleanup))
+{
+}
+
+//-----------------------------------------------------------------------------
+vgImage::~vgImage()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgImage::vgImage(const vgImage& other) : d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgImage& vgImage::operator=(const vgImage& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+bool vgImage::isValid() const
+{
+  QTE_D_SHARED(vgImage);
+  return d->data;
+}
+
+//-----------------------------------------------------------------------------
+vgImage::operator bool() const
+{
+  return this->isValid();
+}
+
+//-----------------------------------------------------------------------------
+bool vgImage::operator!() const
+{
+  return !this->isValid();
+}
+
+//-----------------------------------------------------------------------------
+void vgImage::clear()
+{
+  if (this->isValid())
+    {
+    this->d_ptr = new vgImageData;
+    }
+  else
+    {
+    this->d_ptr.detach();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const unsigned char* vgImage::constData() const
+{
+  QTE_D_SHARED(vgImage);
+  return d->data;
+}
+
+//-----------------------------------------------------------------------------
+int vgImage::iCount() const
+{
+  QTE_D_SHARED(vgImage);
+  return d->iCount;
+}
+
+//-----------------------------------------------------------------------------
+int vgImage::iStep() const
+{
+  QTE_D_SHARED(vgImage);
+  return d->iStep;
+}
+
+//-----------------------------------------------------------------------------
+int vgImage::jCount() const
+{
+  QTE_D_SHARED(vgImage);
+  return d->jCount;
+}
+
+//-----------------------------------------------------------------------------
+int vgImage::jStep() const
+{
+  QTE_D_SHARED(vgImage);
+  return d->jStep;
+}
+
+//-----------------------------------------------------------------------------
+int vgImage::planeCount() const
+{
+  QTE_D_SHARED(vgImage);
+  return d->pCount;
+}
+
+//-----------------------------------------------------------------------------
+int vgImage::planeStep() const
+{
+  QTE_D_SHARED(vgImage);
+  return d->pStep;
+}
+
+//-----------------------------------------------------------------------------
+QImage vgImage::toQImage() const
+{
+  QTE_D_SHARED(vgImage);
+
+  if (d->pCount != 3)
+    {
+    // TODO handle other than 3-plane images?
+    return QImage();
+    }
+
+  const unsigned char* const rawPixels = d->data;
+  QSize const size(d->iCount, d->jCount);
+
+  if (d->pStep == 1 && d->iStep == 3)
+    {
+    // Trivial case; data is packed RGBRGB...RGB
+    return QImage(rawPixels, size.width(), size.height(),
+                  d->jStep, QImage::Format_RGB888);
+    }
+
+  if (d->pStep == -1 && d->iStep == 4)
+    {
+    // Trivial case; data is packed BGRxBGRx...BGRx with padding byte 'x'
+    return QImage(rawPixels - 2, size.width(), size.height(),
+                  d->jStep, QImage::Format_RGB32);
+    }
+
+  QImage qi(size, QImage::Format_RGB32);
+  const int iStep = d->iStep;
+  const int jStep = d->jStep;
+  const int planeStep = d->pStep;
+  const int width = size.width();
+  QRgb* const newPixels = reinterpret_cast<QRgb*>(qi.bits());
+
+  int y = d->jCount;
+  while (y--)
+    {
+    const unsigned char* const rawScanLine = rawPixels + (y * jStep);
+    QRgb* const newScanLine = newPixels + (y * width);
+
+    int x = d->iCount;
+    while (x--)
+      {
+      const unsigned char* const pixoff = rawScanLine + (x * iStep);
+      const unsigned char r = *(pixoff + (0 * planeStep));
+      const unsigned char g = *(pixoff + (1 * planeStep));
+      const unsigned char b = *(pixoff + (2 * planeStep));
+      newScanLine[x] = qRgb(r, g, b);
+      }
+    }
+  return qi;
+}
+
+//-----------------------------------------------------------------------------
+QDataStream& operator>>(QDataStream& stream, vgImage& image)
+{
+  // Clear image; this will detach so we can use the mutable d-ptr later
+  image.clear();
+  vgImageData* const d = image.d_func(false);
+
+  // Get image dimensions and pixel strides
+  qint32 ni, nj, np, si, sj, sp;
+  stream >> ni >> nj >> np >> si >> sj >> sp;
+
+  // Read pixel data
+  size_t n = vgImageData::calculateDataSize(ni, nj, np, si, sj, sp);
+  if (n > 0)
+    {
+    QScopedArrayPointer<unsigned char> data(new unsigned char[n]);
+    if (readData(data.data(), stream, n) < n)
+      {
+      return stream;
+      }
+
+    // Assign read data to image
+    d->data = data.take();
+    d->cleanup = vgImage::Closure(arrayDeleter, d->data);
+    }
+
+  d->iCount = ni;
+  d->jCount = nj;
+  d->pCount = np;
+  d->iStep = si;
+  d->jStep = sj;
+  d->pStep = sp;
+
+  return stream;
+}
+
+//-----------------------------------------------------------------------------
+QDataStream& operator<<(QDataStream& stream, const vgImage& image)
+{
+  qint32 ni = image.iCount(), nj = image.jCount(), np = image.planeCount();
+  qint32 si = image.iStep(), sj = image.jStep(), sp = image.planeStep();
+
+  // Write image dimensions and pixel strides
+  stream << ni << nj << np << si << sj << sp;
+
+  // Write pixel data
+  size_t n = vgImageData::calculateDataSize(ni, nj, np, si, sj, sp);
+  writeData(image.constData(), stream, n);
+
+  return stream;
+}
diff --git a/Libraries/VgVideo/vgImage.h b/Libraries/VgVideo/vgImage.h
new file mode 100644
index 00000000..2702e457
--- /dev/null
+++ b/Libraries/VgVideo/vgImage.h
@@ -0,0 +1,94 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgImage_h
+#define __vgImage_h
+
+#include <QDataStream>
+#include <QExplicitlySharedDataPointer>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class QImage;
+
+class vgImageData;
+
+class VG_VIDEO_EXPORT vgImage
+{
+public:
+  typedef void (*Deleter)(void*);
+
+  struct Closure
+    {
+      inline Closure(Deleter function = 0, void* data = 0) :
+        CleanupFunction(function), CleanupData(data)
+        {}
+
+      inline operator bool() const { return this->CleanupFunction; }
+      inline bool operator!() const { return !this->CleanupFunction; }
+
+      inline void operator()() const
+        {
+        if (this->CleanupFunction)
+          {
+          (*this->CleanupFunction)(this->CleanupData);
+          }
+        }
+
+    protected:
+      friend class vgImageData;
+
+      Deleter CleanupFunction;
+      void* CleanupData;
+    };
+
+  vgImage();
+  vgImage(const unsigned char* data,
+          int ni, int nj, int np,
+          int si, int sj, int sp);
+  vgImage(unsigned char* data,
+          int ni, int nj, int np,
+          int si, int sj, int sp,
+          const Closure& cleanup = Closure());
+  ~vgImage();
+
+  vgImage(const vgImage&);
+  vgImage& operator=(const vgImage&);
+
+  bool isValid() const;
+  operator bool() const;
+  bool operator!() const;
+
+  void clear();
+
+  const unsigned char* constData() const;
+
+  int iCount() const;
+  int iStep() const;
+
+  int jCount() const;
+  int jStep() const;
+
+  int planeCount() const;
+  int planeStep() const;
+
+  QImage toQImage() const;
+
+protected:
+  QTE_DECLARE_SHARED_EPTR(vgImage)
+
+  friend QDataStream& operator>>(QDataStream&, vgImage&);
+
+private:
+  QTE_DECLARE_SHARED(vgImage)
+};
+
+extern VG_VIDEO_EXPORT QDataStream& operator>>(QDataStream&, vgImage&);
+extern VG_VIDEO_EXPORT QDataStream& operator<<(QDataStream&, const vgImage&);
+
+#endif
diff --git a/Libraries/VgVideo/vgKwaArchive.cxx b/Libraries/VgVideo/vgKwaArchive.cxx
new file mode 100644
index 00000000..4fa1e815
--- /dev/null
+++ b/Libraries/VgVideo/vgKwaArchive.cxx
@@ -0,0 +1,300 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgKwaArchive.h"
+
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QHash>
+#include <QMap>
+#include <QRegExp>
+#include <QSet>
+#include <QUrl>
+
+#include <vgCheckArg.h>
+
+#include "vgKwaVideoClip.h"
+#include "vgKwaUtil.h"
+
+static const char* RE_LooksLikeUri = "^[a-zA-Z0-9]{2,}:";
+
+static const char* ERROR_PREFIX = "vgKwaArchive:";
+
+QTE_IMPLEMENT_D_FUNC(vgKwaArchive)
+
+//BEGIN vgKwaArchivePrivate
+
+//-----------------------------------------------------------------------------
+class vgKwaArchivePrivate
+{
+public:
+  void addSource(const QUrl& uri, const QString& referencePath);
+  void addArchive(QFile& file, const QString& versionString,
+                  const QString& path);
+  void addClip(const QUrl& uri);
+
+  vgKwaVideoClip* findClip(const vgKwaArchive::Request& request) const;
+
+  QUrl generateUri(vgKwaVideoClip* clip,
+                   double resolvedStartTime,
+                   double resolvedEndTime) const;
+
+  QDebug debug() const { return qDebug().nospace() << ERROR_PREFIX; }
+
+  QSet<vgKwaVideoClip*> clips;
+  QHash<vgKwaVideoClip*, QUrl> clipUris;
+  QHash<QString, QList<vgKwaVideoClip*> > clipsByMissionId;
+};
+
+//-----------------------------------------------------------------------------
+void vgKwaArchivePrivate::addSource(
+  const QUrl& uri, const QString& referencePath)
+{
+  // Only local files supported for now
+  if (uri.scheme() != "file")
+    {
+    this->debug() << " unable to open requested source " << uri
+                  << ": the scheme is not supported";
+    }
+
+  // Resolve path, if given a reference path
+  QString path = uri.toLocalFile();
+  if (!referencePath.isEmpty())
+    {
+    if (!vgKwaUtil::resolvePath(path, referencePath, "source"))
+      {
+      // resolvePath() will have displayed a suitable error
+      return;
+      }
+    }
+
+  // Open the source file
+  QFile file(path);
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    this->debug() << " unable to open requested source " << uri
+                  << ": " << qPrintable(file.errorString());
+    return;
+    }
+
+  // Read the header and parse the file
+  const QString header = QString::fromLocal8Bit(file.readLine()).trimmed();
+  if (header.toLower().startsWith("archive"))
+    {
+    this->addArchive(file, header.mid(7), path);
+    }
+  else
+    {
+    QFileInfo fi(path);
+    this->addClip(QUrl::fromLocalFile(fi.canonicalFilePath()));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgKwaArchivePrivate::addArchive(
+  QFile& file, const QString& versionString, const QString& path)
+{
+  // Get version number
+  bool okay;
+  int version = (versionString + '0').toInt(&okay) / 10;
+  if (!okay)
+    {
+    this->debug() << " error loading source archive " << path
+                  << ": could not parse archive version number "
+                  << versionString;
+    return;
+    }
+
+  if (version < 0 || version > 1)
+    {
+    this->debug() << " error loading source archive " << path
+                  << ": version " << versionString << " is not supported";
+    return;
+    }
+
+  // Load referenced sources
+  while (!file.atEnd())
+    {
+    // Read line and remove trailing newline
+    QString source = QString::fromLocal8Bit(file.readLine());
+    if (source.endsWith('\n'))
+      {
+      source = source.left(source.length() - 1);
+      }
+
+    // Convert to URI
+    const bool looksLikeUri = QRegExp(RE_LooksLikeUri).exactMatch(source);
+    const QUrl uri = (looksLikeUri ? QUrl::fromUserInput(source) :
+                                     QUrl::fromLocalFile(source));
+
+    // Hand back to addSource (recursive archives okay!)
+    this->addSource(uri, path);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgKwaArchivePrivate::addClip(const QUrl& uri)
+{
+  // Attempt to load clip
+  QScopedPointer<vgKwaVideoClip> clip(new vgKwaVideoClip(uri));
+  if (!clip->firstTime().IsValid() || !clip->lastTime().IsValid())
+    {
+    // Something went wrong; clip should have displayed a suitable error
+    return;
+    }
+
+  // Add clip to clip list and maps
+  this->clipsByMissionId[clip->missionId()].append(clip.data());
+  this->clipUris.insert(clip.data(), uri);
+  this->clips.insert(clip.take());
+}
+
+//-----------------------------------------------------------------------------
+vgKwaVideoClip* vgKwaArchivePrivate::findClip(
+  const vgKwaArchive::Request& request) const
+{
+  CHECK_ARG(request.EndTime >= request.StartTime, 0);
+  CHECK_ARG(this->clipsByMissionId.contains(request.MissionId), 0);
+
+  const double requestStart = request.StartTime;
+  const double requestEnd = request.EndTime;
+
+  vgKwaVideoClip* result = 0;
+  double bestMatch = 0.0;
+  const QList<vgKwaVideoClip*>& candidates =
+    this->clipsByMissionId[request.MissionId];
+
+  // Search for "best" match, defined as the match that will give us the longest
+  // actual clip (in case the temporal limits do not fit entirely within any
+  // single clip, but partly overlap more than one), not counting padding
+  foreach (vgKwaVideoClip* clip, candidates)
+    {
+    // Check for stream ID match
+    if (!(request.StreamId.isEmpty() || clip->streamId().isEmpty()))
+      {
+      if (request.StreamId != clip->streamId())
+        {
+        // Skip clip if stream ID was requested and does not match clip
+        continue;
+        }
+      }
+
+    const double clipStart = clip->firstTime().Time;
+    const double clipEnd = clip->lastTime().Time;
+
+    // Check for overlap
+    if (clipStart <= requestEnd || clipEnd >= requestStart)
+      {
+      if (clipStart <= requestStart && clipEnd >= requestEnd)
+        {
+        // Clip wholly contains the request; looks like a winner
+        return clip;
+        }
+      const double matchLength =
+        qMin(clipEnd, requestEnd) - qMax(clipStart, requestStart);
+      if (matchLength > bestMatch)
+        {
+        // Better match than we've found so far...
+        result = clip;
+        bestMatch = matchLength;
+        }
+      }
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+QUrl vgKwaArchivePrivate::generateUri(
+  vgKwaVideoClip* clip, double resolvedStartTime, double resolvedEndTime) const
+{
+  // Generate URI for the request
+  QUrl result = this->clipUris.value(clip);
+  const qint64 uriStartTime = qRound64(resolvedStartTime);
+  const qint64 uriEndTime = qRound64(resolvedEndTime);
+  result.addQueryItem("StartTime", QString::number(uriStartTime));
+  result.addQueryItem("EndTime", QString::number(uriEndTime));
+  return result;
+}
+
+//END vgKwaArchivePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgKwaArchive
+
+//-----------------------------------------------------------------------------
+vgKwaArchive::vgKwaArchive() : d_ptr(new vgKwaArchivePrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgKwaArchive::~vgKwaArchive()
+{
+  QTE_D(vgKwaArchive);
+  qDeleteAll(d->clips);
+}
+
+//-----------------------------------------------------------------------------
+void vgKwaArchive::addSource(const QUrl& uri)
+{
+  QTE_D(vgKwaArchive);
+  d->addSource(uri, QString());
+}
+
+//-----------------------------------------------------------------------------
+QUrl vgKwaArchive::getUri(const Request& request) const
+{
+  QTE_D_CONST(vgKwaArchive);
+  vgKwaVideoClip* clip = d->findClip(request);
+
+  if (clip)
+    {
+    // Resolve padding
+    double resolvedStartTime = request.StartTime;
+    double resolvedEndTime = request.EndTime;
+    if (clip->resolvePadding(resolvedStartTime, resolvedEndTime,
+                             request.Padding))
+      {
+      return d->generateUri(clip, resolvedStartTime, resolvedEndTime);
+      }
+    }
+
+  return QUrl();
+}
+
+//-----------------------------------------------------------------------------
+vgKwaVideoClip* vgKwaArchive::getClip(const Request& request, QUrl* uri) const
+{
+  QTE_D_CONST(vgKwaArchive);
+  vgKwaVideoClip* clip = d->findClip(request);
+
+  if (clip)
+    {
+    if (uri)
+      {
+      // Resolve padding
+      double resolvedStartTime = request.StartTime;
+      double resolvedEndTime = request.EndTime;
+      if (clip->resolvePadding(resolvedStartTime, resolvedEndTime,
+                               request.Padding))
+        {
+        *uri = d->generateUri(clip, resolvedStartTime, resolvedEndTime);
+        return new vgKwaVideoClip(*clip, resolvedStartTime, resolvedEndTime);
+        }
+      }
+    else
+      {
+      return clip->subClip(request.StartTime, request.EndTime,
+                           request.Padding);
+      }
+    }
+
+  return 0;
+}
+
+//END vgKwaArchive
diff --git a/Libraries/VgVideo/vgKwaArchive.h b/Libraries/VgVideo/vgKwaArchive.h
new file mode 100644
index 00000000..ffa2a710
--- /dev/null
+++ b/Libraries/VgVideo/vgKwaArchive.h
@@ -0,0 +1,83 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgKwaArchive_h
+#define __vgKwaArchive_h
+
+#include <QScopedPointer>
+#include <QString>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class QUrl;
+
+class vgKwaVideoClip;
+
+class vgKwaArchivePrivate;
+
+struct vgKwaArchiveRequest
+{
+  vgKwaArchiveRequest() : StartTime(-1), EndTime(-1), Padding(0) {}
+
+  QString MissionId;
+  QString StreamId;
+  double StartTime;
+  double EndTime;
+  double Padding;
+};
+
+class VG_VIDEO_EXPORT vgKwaArchive
+{
+public:
+  typedef vgKwaArchiveRequest Request;
+
+  vgKwaArchive();
+  virtual ~vgKwaArchive();
+
+  /// Add source to archive.
+  ///
+  /// Add an additional video source to this archive. A source is usually a
+  /// clip, or a file containing a list of clips. Once a source is added, it
+  /// can be used to resolve ::findUri and ::findClip requests.
+  void addSource(const QUrl& uri);
+
+  /// Retrieve (create) URI of single clip from the archive.
+  ///
+  /// Attempt to determine the URI of a clip from the archive, based on the
+  /// given request. On success, the resulting URI can be used to construct
+  /// a new clip, or passed to another user. Note that clips constructed from
+  /// a URI are <i>not</i> shared with the archive; they will use additional
+  /// resources, but can also be safely owned and accessed by other threads.
+  QUrl getUri(const Request&) const;
+
+  /// Retrieve (create) a single clip from the archive.
+  ///
+  /// Attempt to create a clip from the archive, based on the given request. On
+  /// success, the new clip will have a duration that is a subset of (or equal
+  /// to) the duration specified in the request. The caller is responsible for
+  /// deleting the returned clip. If \p uri is specified, the URI of the clip
+  /// will be placed in \p uri.
+  ///
+  /// \par Note:
+  /// To reduce resource allocation, the returned clip's data is <i>shared</i>
+  /// with this archive instance. If you need to use the clip in a different
+  /// thread, you must take any precautions required by the clip to ensure safe
+  /// usage in a multi-threaded environment.
+  ///
+  /// \sa vgKwaVideoClip::subClip
+  vgKwaVideoClip* getClip(const Request&, QUrl* uri = 0) const;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgKwaArchive)
+
+private:
+  QTE_DECLARE_PRIVATE(vgKwaArchive)
+  Q_DISABLE_COPY(vgKwaArchive)
+};
+
+#endif
diff --git a/Libraries/VgVideo/vgKwaFrameMetadata.cxx b/Libraries/VgVideo/vgKwaFrameMetadata.cxx
new file mode 100644
index 00000000..50639b44
--- /dev/null
+++ b/Libraries/VgVideo/vgKwaFrameMetadata.cxx
@@ -0,0 +1,190 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgKwaFrameMetadata.h"
+
+#include <vcl_vector.h>
+#include <vil/io/vil_io_image_view.h>
+#include <vnl/io/vnl_io_matrix_fixed.h>
+#include <vnl/io/vnl_io_vector_fixed.h>
+#include <vnl/vnl_matrix_fixed.h>
+#include <vsl/vsl_binary_io.h>
+#include <vsl/vsl_vector_io.h>
+
+const int vgKwaFrameMetadata::SupportedDataVersion = 3;
+
+//-----------------------------------------------------------------------------
+class vgKwaFrameMetadataData : public QSharedData
+{
+public:
+  vgTimeStamp timestamp;
+  QMatrix3x3 homography;
+  uint homographyReferenceFrameNumber;
+
+  vgKwaWorldBox worldCornerPoints;
+
+  double gsd;
+  QSize imageSize;
+};
+
+QTE_IMPLEMENT_D_FUNC_SHARED(vgKwaFrameMetadata)
+
+//-----------------------------------------------------------------------------
+vgKwaFrameMetadata::vgKwaFrameMetadata() : d_ptr(new vgKwaFrameMetadataData)
+{
+  QTE_D_MUTABLE(vgKwaFrameMetadata);
+  d->homographyReferenceFrameNumber = -1;
+  d->gsd = -1.0;
+}
+
+//-----------------------------------------------------------------------------
+vgKwaFrameMetadata::vgKwaFrameMetadata(
+  vsl_b_istream& stream, int version, bool isMeta) :
+  d_ptr(new vgKwaFrameMetadataData)
+{
+  Q_ASSERT(version > 0 && version <= vgKwaFrameMetadata::SupportedDataVersion);
+
+  QTE_D_MUTABLE(vgKwaFrameMetadata);
+
+  stream.clear_serialisation_records();
+
+  vxl_int_64 time;
+  vnl_matrix_fixed<double, 3, 3> homography;
+  vcl_vector<vnl_vector_fixed<double, 2> > corners;
+
+  vsl_b_read(stream, time);
+  if (!isMeta)
+    {
+    if (version < 3)
+      {
+      vil_image_view<vxl_byte> image;
+      vsl_b_read(stream, image);
+      }
+    else
+      {
+      char imageFormat;
+      vcl_vector<char> imageData;
+      vsl_b_read(stream, imageFormat);
+      vsl_b_read(stream, imageData);
+      }
+    }
+  vsl_b_read(stream, homography);
+  vsl_b_read(stream, corners);
+
+  d->timestamp.Time = time;
+
+  d->homography(0, 0) = homography.get(0, 0);
+  d->homography(0, 1) = homography.get(0, 1);
+  d->homography(0, 2) = homography.get(0, 2);
+  d->homography(1, 0) = homography.get(1, 0);
+  d->homography(1, 1) = homography.get(1, 1);
+  d->homography(1, 2) = homography.get(1, 2);
+  d->homography(2, 0) = homography.get(2, 0);
+  d->homography(2, 1) = homography.get(2, 1);
+  d->homography(2, 2) = homography.get(2, 2);
+
+  double max = qMax(qMax(qMax(corners[0][0], corners[0][1]),
+                         qMax(corners[1][0], corners[1][1])),
+                    qMax(qMax(corners[2][0], corners[2][1]),
+                         qMax(corners[3][0], corners[3][1])));
+
+  if (max < 400)
+    {
+    d->worldCornerPoints.GCS = 4326;
+    d->worldCornerPoints.UpperLeft.Latitude   = corners[0][0];
+    d->worldCornerPoints.UpperLeft.Longitude  = corners[0][1];
+    d->worldCornerPoints.UpperRight.Latitude  = corners[1][0];
+    d->worldCornerPoints.UpperRight.Longitude = corners[1][1];
+    d->worldCornerPoints.LowerLeft.Latitude   = corners[2][0];
+    d->worldCornerPoints.LowerLeft.Longitude  = corners[2][1];
+    d->worldCornerPoints.LowerRight.Latitude  = corners[3][0];
+    d->worldCornerPoints.LowerRight.Longitude = corners[3][1];
+    }
+  else
+    {
+    d->worldCornerPoints.GCS = -1;
+    }
+
+  if (version > 1)
+    {
+    vxl_int_64 frameNumber;
+    vxl_int_64 homographyReferenceFrameNumber;
+    vxl_int_64 imageWidth;
+    vxl_int_64 imageHeight;
+
+    vsl_b_read(stream, d->gsd);
+    vsl_b_read(stream, frameNumber);
+    vsl_b_read(stream, homographyReferenceFrameNumber);
+    vsl_b_read(stream, imageWidth);
+    vsl_b_read(stream, imageHeight);
+
+    d->timestamp.FrameNumber = static_cast<unsigned int>(frameNumber);
+    d->homographyReferenceFrameNumber = homographyReferenceFrameNumber;
+    d->imageSize.setWidth(static_cast<int>(imageWidth));
+    d->imageSize.setHeight(static_cast<int>(imageHeight));
+    }
+}
+
+//-----------------------------------------------------------------------------
+vgKwaFrameMetadata::~vgKwaFrameMetadata()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgKwaFrameMetadata::vgKwaFrameMetadata(const vgKwaFrameMetadata& other) :
+  d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgKwaFrameMetadata& vgKwaFrameMetadata::operator=(
+  const vgKwaFrameMetadata& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgKwaFrameMetadata::timestamp() const
+{
+  QTE_D_SHARED(vgKwaFrameMetadata);
+  return d->timestamp;
+}
+
+//-----------------------------------------------------------------------------
+QMatrix3x3 vgKwaFrameMetadata::homography() const
+{
+  QTE_D_SHARED(vgKwaFrameMetadata);
+  return d->homography;
+}
+
+//-----------------------------------------------------------------------------
+uint vgKwaFrameMetadata::homographyReferenceFrameNumber() const
+{
+  QTE_D_SHARED(vgKwaFrameMetadata);
+  return d->homographyReferenceFrameNumber;
+}
+
+//-----------------------------------------------------------------------------
+vgKwaWorldBox vgKwaFrameMetadata::worldCornerPoints() const
+{
+  QTE_D_SHARED(vgKwaFrameMetadata);
+  return d->worldCornerPoints;
+}
+
+//-----------------------------------------------------------------------------
+double vgKwaFrameMetadata::gsd() const
+{
+  QTE_D_SHARED(vgKwaFrameMetadata);
+  return d->gsd;
+}
+
+//-----------------------------------------------------------------------------
+QSize vgKwaFrameMetadata::imageSize() const
+{
+  QTE_D_SHARED(vgKwaFrameMetadata);
+  return d->imageSize;
+}
diff --git a/Libraries/VgVideo/vgKwaFrameMetadata.h b/Libraries/VgVideo/vgKwaFrameMetadata.h
new file mode 100644
index 00000000..9e74230d
--- /dev/null
+++ b/Libraries/VgVideo/vgKwaFrameMetadata.h
@@ -0,0 +1,67 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgKwaFrameMetadata_h
+#define __vgKwaFrameMetadata_h
+
+#include <QMatrix3x3>
+#include <QSharedDataPointer>
+#include <QSize>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vgGeoTypes.h>
+#include <vgTimeStamp.h>
+
+class vsl_b_istream;
+
+class vgKwaFrameMetadataData;
+
+//-----------------------------------------------------------------------------
+struct vgKwaWorldBox : vgGeoSystem
+{
+  vgGeoRawCoordinate UpperLeft;
+  vgGeoRawCoordinate UpperRight;
+  vgGeoRawCoordinate LowerLeft;
+  vgGeoRawCoordinate LowerRight;
+};
+
+//-----------------------------------------------------------------------------
+class VG_VIDEO_EXPORT vgKwaFrameMetadata
+{
+public:
+  vgKwaFrameMetadata();
+  virtual ~vgKwaFrameMetadata();
+
+  vgKwaFrameMetadata(const vgKwaFrameMetadata&);
+  vgKwaFrameMetadata& operator=(const vgKwaFrameMetadata&);
+
+  vgTimeStamp timestamp() const;
+  QMatrix3x3 homography() const;
+  uint homographyReferenceFrameNumber() const;
+
+  vgKwaWorldBox worldCornerPoints() const;
+
+  double gsd() const;
+  QSize imageSize() const;
+
+  static const int SupportedDataVersion;
+
+protected:
+  QTE_DECLARE_SHARED_PTR(vgKwaFrameMetadata)
+
+  friend class vgKwaVideoClip;
+  friend class vgKwaVideoClipPrivate;
+
+  vgKwaFrameMetadata(vsl_b_istream& stream, int version, bool isMeta);
+
+private:
+  QTE_DECLARE_SHARED(vgKwaFrameMetadata)
+};
+
+#endif
diff --git a/Libraries/VgVideo/vgKwaUtil.cxx b/Libraries/VgVideo/vgKwaUtil.cxx
new file mode 100644
index 00000000..4baec7b8
--- /dev/null
+++ b/Libraries/VgVideo/vgKwaUtil.cxx
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgKwaUtil.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+
+#define die(...) do { \
+  qDebug() << "vgKwaUtil:" << __VA_ARGS__; \
+  return false; \
+  } while (0)
+
+//-----------------------------------------------------------------------------
+bool vgKwaUtil::resolvePath(
+  QString& name, const QString& relativeTo, const char* what)
+{
+  // Look for the file in four places:
+  // 0. absolute path (if <name> is absolute)
+  // 1. relative to the current working directory
+  // 2. relative to <relativeTo>
+  // 3. relative to the canonical location of <relativeTo>
+  //
+  // Most likely, <name> is given as a path relative to the canonical location
+  // of <relativeTo>. Since the path we received may be a symlink, we should
+  // try (3) as well as (2).
+  QFileInfo fi(name);
+  if (fi.isAbsolute())
+    {
+    if (fi.exists())
+      {
+      return true;
+      }
+    die("Unable to find" << what << "file" << name);
+    }
+
+  fi = QFileInfo(QDir(), name);
+  QString try1 = fi.absoluteFilePath();
+  if (fi.exists())
+    {
+    name = try1;
+    return true;
+    }
+
+  QFileInfo rfi(relativeTo);
+  fi = QFileInfo(rfi.path(), name);
+  QString try2 = fi.absoluteFilePath();
+  if (fi.exists())
+    {
+    name = try2;
+    return true;
+    }
+
+  fi = QFileInfo(rfi.canonicalPath(), name);
+  QString try3 = fi.absoluteFilePath();
+  if (fi.exists())
+    {
+    name = try3;
+    return true;
+    }
+
+  die("Unable to find" << what << "file" << name
+      << "\n  Tried:" << try1
+      << "\n        " << try2
+      << "\n        " << try3);
+}
diff --git a/Libraries/VgVideo/vgKwaUtil.h b/Libraries/VgVideo/vgKwaUtil.h
new file mode 100644
index 00000000..ef3eb416
--- /dev/null
+++ b/Libraries/VgVideo/vgKwaUtil.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgKwaUtil_h
+#define __vgKwaUtil_h
+
+#include <vgExport.h>
+
+class QString;
+
+namespace vgKwaUtil
+{
+  VG_VIDEO_EXPORT bool resolvePath(QString& name, const QString& relativeTo,
+                                   const char* what);
+}
+
+#endif
diff --git a/Libraries/VgVideo/vgKwaVideoClip.cxx b/Libraries/VgVideo/vgKwaVideoClip.cxx
new file mode 100644
index 00000000..28b7af47
--- /dev/null
+++ b/Libraries/VgVideo/vgKwaVideoClip.cxx
@@ -0,0 +1,620 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgKwaVideoClip.h"
+
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QUrl>
+
+#include <vgCheckArg.h>
+
+#include <vgDebug.h>
+
+#include <vcl_vector.h>
+#include <vil/file_formats/vil_jpeg.h>
+#include <vil/vil_stream_core.h>
+
+#include <vil/io/vil_io_image_view.h>
+#include <vsl/vsl_binary_io.h>
+#include <vsl/vsl_stream.h>
+#include <vsl/vsl_vector_io.h>
+#include <vsl/vsl_vector_io.txx>
+
+#include <limits>
+
+#include "vgIStream.h"
+#include "vgKwaFrameMetadata.h"
+#include "vgKwaUtil.h"
+#include "vgVideoFramePtrPrivate.h"
+#include "vgVideoPrivate.h"
+
+VSL_VECTOR_IO_INSTANTIATE(char);
+
+#define die(...) do { \
+  qDebug() << "vgKwaVideoClip:" << __VA_ARGS__; \
+  return; \
+  } while (0)
+
+//-----------------------------------------------------------------------------
+uint qHash(const vgTimeStamp& ts)
+{
+  return qHash(qRound64(ts.Time));
+}
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void vilCleanup(void* data)
+{
+  // Destroy our memory chunk pointer, which will cleanly release our reference
+  // to the memory chunk
+  vil_memory_chunk_sptr* chunk =
+    reinterpret_cast<vil_memory_chunk_sptr*>(data);
+  delete chunk;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vgKwaVideoClipPrivate : public vgVideoPrivate
+{
+public:
+  QString missionId;
+  QString streamId;
+  QSharedPointer<vgIStream> store;
+  QSharedPointer<vsl_b_istream> stream;
+  QHash<vgTimeStamp, quint64> dataOffsets;
+  vgKwaVideoClip::MetadataMap metadata;
+
+  vgKwaFrameMetadata metadataAt(const vgTimeStamp& ts) const;
+  double applyPadding(double time, double padding, int direction) const;
+};
+
+//-----------------------------------------------------------------------------
+vgKwaFrameMetadata vgKwaVideoClipPrivate::metadataAt(
+  const vgTimeStamp& ts) const
+{
+  // Use loaded metadata from .meta, if present
+  if (this->metadata.contains(ts))
+    {
+    return this->metadata[ts];
+    }
+
+  // Try to read from .data
+  if (this->dataOffsets.contains(ts))
+    {
+    CHECK_ARG(this->store->seek(0), vgKwaFrameMetadata());
+
+    vsl_b_istream stream(*this->store);
+
+    int dataVersion;
+    vsl_b_read(stream, dataVersion);
+
+    const int maxVersion = vgKwaFrameMetadata::SupportedDataVersion;
+    if (dataVersion < 1 || dataVersion > maxVersion ||
+        !this->store->seek(this->dataOffsets[ts]))
+      {
+      // Not working out...
+      return vgKwaFrameMetadata();
+      }
+
+    return vgKwaFrameMetadata(stream, dataVersion, false);
+    }
+
+  // No luck
+  return vgKwaFrameMetadata();
+}
+
+//-----------------------------------------------------------------------------
+double vgKwaVideoClipPrivate::applyPadding(
+  double time, double padding, int direction) const
+{
+  // Get initial position
+  const vg::SeekMode seekDirection =
+    (direction > 0 ? vg::SeekUpperBound : vg::SeekLowerBound);
+  vgKwaVideoClip::MetadataMap::const_iterator iter =
+    this->metadata.find(vgTimeStamp::fromTime(time), seekDirection);
+
+  // If reference time isn't an exact match to a frame, add the difference to
+  // the padding value and reset the reference time
+  if (time != iter.key().Time)
+    {
+    padding += fabs(iter.key().Time - time);
+    time = iter.key().Time;
+    }
+
+  // Get reference frame and boundary position
+  uint hrf = iter->homographyReferenceFrameNumber();
+  const vgKwaVideoClip::MetadataMap::const_iterator boundary =
+    (direction > 0 ? this->metadata.constEnd() - 1 :
+                     this->metadata.constBegin());
+
+  // Start applying padding
+  while (iter != boundary)
+    {
+    // Check next frame
+    iter += direction;
+
+    // If frame lies in another shot, we are done
+    if (iter->homographyReferenceFrameNumber() != hrf)
+      {
+      break;
+      }
+
+    // Reduce padding; if we run out, we are done
+    padding -= fabs(time - iter.key().Time);
+    if (padding < 0.0)
+      {
+      break;
+      }
+
+    // Otherwise, accept up to current position
+    time = iter.key().Time;
+    }
+
+  return time;
+}
+
+QTE_IMPLEMENT_D_FUNC(vgKwaVideoClip)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgKwaVideoFramePtr
+
+//-----------------------------------------------------------------------------
+class vgKwaVideoFramePtr : public vgVideoFramePtrPrivate
+{
+public:
+  explicit vgKwaVideoFramePtr(
+    vgTimeStamp ts, const QSharedPointer<vsl_b_istream>& stream,
+    const QSharedPointer<vgIStream>& store, quint64 offset, int version);
+
+  vgImage data() const;
+
+protected:
+  QSharedPointer<vsl_b_istream> dataStream;
+  QSharedPointer<vgIStream> dataStore;
+  quint64 dataOffset;
+  int dataVersion;
+};
+
+//-----------------------------------------------------------------------------
+vgKwaVideoFramePtr::vgKwaVideoFramePtr(
+  vgTimeStamp ts, const QSharedPointer<vsl_b_istream>& stream,
+  const QSharedPointer<vgIStream>& store, quint64 offset, int version) :
+  dataStream(stream),
+  dataStore(store),
+  dataOffset(offset),
+  dataVersion(version)
+{
+  this->time = ts;
+}
+
+//-----------------------------------------------------------------------------
+vgImage vgKwaVideoFramePtr::data() const
+{
+  // Seek stream to appropriate location
+  if (!this->dataStore->seek(this->dataOffset))
+    {
+    qDebug() << "vgKwaVideoFramePtr: failed to seek to position"
+             << this->dataOffset << "for timestamp" << this->time;
+    return vgImage();
+    }
+
+  vxl_int_64 ts;
+  vil_image_view<vxl_byte> vilImage;
+
+  // Read timestamp and image from data stream
+  this->dataStream->clear_serialisation_records();
+  vsl_b_read(*this->dataStream, ts);
+  if (this->dataVersion < 3)
+    {
+    vsl_b_read(*this->dataStream, vilImage);
+    }
+  else
+    {
+    QScopedPointer<vil_file_format> format;
+    char formatMarker;
+    vsl_b_read(*this->dataStream, formatMarker);
+    switch (formatMarker)
+      {
+      case 'j':
+      case 'J':
+        format.reset(new vil_jpeg_file_format);
+        break;
+      default:
+        qDebug() << "vgKwaVideoFramePtr: unknown compression format"
+                 << formatMarker;
+        return vgImage();
+      }
+    vil_stream* memoryStream = new vil_stream_core();
+    memoryStream->ref();
+    vcl_vector<char> bytes;
+    vsl_b_read(*this->dataStream, bytes);
+    memoryStream->write(&bytes[0], bytes.size());
+    vil_image_resource_sptr imageResource =
+      format->make_input_image(memoryStream);
+    if (!imageResource)
+      {
+      qDebug() << "vgKwaVideoFramePtr: failed to read frame image at"
+               << this->dataOffset;
+      memoryStream->unref();
+      return vgImage();
+      }
+    vilImage = imageResource->get_view();
+    memoryStream->unref();
+    }
+
+  // Sanity check timestamp
+  vgTimeStamp dataTime, indexTime = this->time;
+  indexTime.FrameNumber = vgTimeStamp::InvalidFrameNumber();
+  dataTime.Time = ts;
+  if (dataTime != indexTime)
+    {
+    qDebug() << "vgKwaVideoFramePtr: warning: time" << dataTime
+             << "in data does not match time" << this->time << "from index";
+    }
+
+  if (!vilImage.is_contiguous())
+    {
+    qDebug() << "vgKwaVideoFramePtr: cannot convert non-contiguous image";
+    return vgImage();
+    }
+
+  // Convert to vgImage
+  vil_memory_chunk_sptr* chunk =
+    new vil_memory_chunk_sptr(vilImage.memory_chunk());
+  vgImage::Closure cleanup(&vilCleanup, chunk);
+  return vgImage(vilImage.top_left_ptr(),
+                 vilImage.ni(), vilImage.nj(), vilImage.nplanes(),
+                 vilImage.istep(), vilImage.jstep(), vilImage.planestep(),
+                 cleanup);
+}
+
+//END vgKwaVideoFramePtr
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgKwaVideoClip
+
+//-----------------------------------------------------------------------------
+vgKwaVideoClip::vgKwaVideoClip(const QUrl& uri) :
+  vgVideo(new vgKwaVideoClipPrivate)
+{
+  QTE_D(vgKwaVideoClip);
+
+  QUrl indexUri = uri;
+  bool okay;
+
+  // Get temporal limits (if any) from URI
+  qint64 startTime = std::numeric_limits<qint64>::min();
+  qint64 endTime = std::numeric_limits<qint64>::max();
+  if (indexUri.hasQueryItem("StartTime"))
+    {
+    startTime = indexUri.queryItemValue("StartTime").toLongLong(&okay);
+    if (!okay)
+      {
+      qWarning() << "vgKwaVideoClip: Ignoring invalid start time"
+                 << indexUri.queryItemValue("StartTime");
+      startTime = std::numeric_limits<qint64>::min();
+      }
+    indexUri.removeAllQueryItems("StartTime");
+    }
+  if (indexUri.hasQueryItem("EndTime"))
+    {
+    endTime = indexUri.queryItemValue("EndTime").toLongLong(&okay);
+    if (!okay)
+      {
+      qWarning() << "vgKwaVideoClip: Ignoring invalid end time"
+                 << indexUri.queryItemValue("EndTime");
+      startTime = std::numeric_limits<qint64>::min();
+      }
+    indexUri.removeAllQueryItems("EndTime");
+    }
+
+  // Open index file
+  QString indexName = indexUri.toLocalFile();
+  QFile indexFile(indexName);
+  if (!indexFile.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    die("Unable to open index" << indexUri.toString());
+    }
+
+  // Initialize index stream
+  QTextStream indexStream(&indexFile);
+  QString line = indexStream.readLine();
+  long lineNumber = 1;
+
+  // Read index version
+  int indexVersion = line.toInt(&okay);
+  if (!okay)
+    {
+    die("Bad index version" << line);
+    }
+  if (indexVersion < 1 || indexVersion > 4)
+    {
+    die("Don't know how to parse index version" << indexVersion);
+    }
+
+  // Read header
+  QString dataName = indexStream.readLine();
+  QString metaName;
+  if (!vgKwaUtil::resolvePath(dataName, indexName, "data"))
+    {
+    return;
+    }
+  if (indexVersion > 1)
+    {
+    if (indexVersion > 2)
+      {
+      metaName = indexStream.readLine();
+      if (!vgKwaUtil::resolvePath(metaName, indexName, "meta"))
+        {
+        return;
+        }
+      ++lineNumber;
+      }
+
+    // Read mission ID
+    d->missionId = indexStream.readLine();
+    ++lineNumber;
+
+    if (indexVersion > 3)
+      {
+      // Read stream ID
+      d->streamId = indexStream.readLine();
+      ++lineNumber;
+      }
+    }
+  ++lineNumber;
+
+  // Open meta stream, if we have one
+  QScopedPointer<vsl_b_istream> metaVblStream;
+  vgIStream metaStream;
+  int metaVersion = 0;
+  if (!metaName.isEmpty())
+    {
+    if (!metaStream.open(metaName))
+      {
+      die("Unable to open metadata file" << metaName);
+      }
+    metaVblStream.reset(new vsl_b_istream(metaStream));
+
+    // Read metadata version
+    vsl_b_read(*metaVblStream, metaVersion);
+    if (metaVersion < 1 || metaVersion > 2)
+      {
+      die("Don't know how to parse metadata version" << metaVersion);
+      }
+    }
+
+  // Open the data file
+  d->store = QSharedPointer<vgIStream>(new vgIStream);
+  if (!d->store->open(dataName))
+    {
+    die("Unable to open data file" << metaName);
+    }
+  d->stream = QSharedPointer<vsl_b_istream>(new vsl_b_istream(*d->store));
+  int dataVersion;
+  vsl_b_read(*d->stream, dataVersion);
+
+  // Process the index
+  while (!indexStream.atEnd())
+    {
+    line = indexStream.readLine();
+    ++lineNumber;
+
+    // Read index line
+    qint64 time;
+    quint64 offset;
+
+    QTextStream lineStream(&line);
+    lineStream >> time >> offset;
+
+    if (lineStream.status() != QTextStream::Ok)
+      {
+      die("Error parsing index file" << indexUri.toString()
+          << "at line" << lineNumber);
+      }
+
+    // Create timestamp
+    vgTimeStamp ts;
+    ts.Time = time;
+
+    // Read metadata for frame
+    if (metaVersion > 0)
+      {
+      vgKwaFrameMetadata fmd(*metaVblStream, metaVersion, true);
+      ts.FrameNumber = fmd.timestamp().FrameNumber;
+      if (time >= startTime && time <= endTime)
+        {
+        // Only insert metadata if between start and end times
+        d->metadata.insert(ts, fmd);
+        }
+
+      // Verify information from metadata matches index
+      if (ts != fmd.timestamp())
+        {
+        die("Processing error: timestamp" << fmd.timestamp()
+            << "in medata file" << metaName
+            << "does not match timestamp" << ts
+            << "in index file" << indexUri.toString()
+            << "at line" << lineNumber);
+        }
+      }
+
+    // Add offset to map...
+    if (time >= startTime && time <= endTime)
+      {
+      // ...but only if between start and end times
+      d->dataOffsets.insert(ts, offset);
+      }
+    }
+
+  // Generate frame pointers
+  typedef QHash<vgTimeStamp, quint64>::const_iterator Iterator;
+  foreach_iter (Iterator, iter, d->dataOffsets)
+    {
+    vgKwaVideoFramePtr* frame =
+      new vgKwaVideoFramePtr(iter.key(), d->stream, d->store, iter.value(),
+                             dataVersion);
+    d->frames.insert(iter.key(), vgVideoFramePtr(frame));
+    }
+}
+
+//-----------------------------------------------------------------------------
+vgKwaVideoClip::vgKwaVideoClip(const vgKwaVideoClip& other,
+                               double startTime,
+                               double endTime) :
+  vgVideo(new vgKwaVideoClipPrivate)
+{
+  QTE_D(vgKwaVideoClip);
+  const vgKwaVideoClipPrivate* od = other.d_func();
+
+  d->missionId = od->missionId;
+  d->streamId = od->streamId;
+  d->stream = od->stream;
+  d->store = od->store;
+
+  // Copy metadata
+  typedef vgKwaVideoClip::MetadataMap::const_iterator MetadataIterator;
+  foreach_iter (MetadataIterator, mdIter, od->metadata)
+    {
+    // Get raw time
+    const double time = mdIter.key().Time;
+    if (time >= startTime && time <= endTime)
+      {
+      // Copy metadata, if in range
+      d->metadata.insert(mdIter.key(), mdIter.value());
+      }
+    }
+
+  // Copy frame pointers
+  typedef vgVideo::FrameMap::const_iterator FrameIterator;
+  foreach_iter (FrameIterator, fIter, od->frames)
+    {
+    // Get raw time
+    const double time = fIter.key().Time;
+    if (time >= startTime && time <= endTime)
+      {
+      // Copy frame, if in range
+      d->frames.insert(fIter.key(), fIter.value());
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vgKwaVideoClip::~vgKwaVideoClip()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vgKwaVideoClip::missionId() const
+{
+  QTE_D_CONST(vgKwaVideoClip);
+  return d->missionId;
+}
+
+//-----------------------------------------------------------------------------
+QString vgKwaVideoClip::streamId() const
+{
+  QTE_D_CONST(vgKwaVideoClip);
+  return d->streamId;
+}
+
+//-----------------------------------------------------------------------------
+vgKwaFrameMetadata vgKwaVideoClip::currentMetadata() const
+{
+  QTE_D_CONST(vgKwaVideoClip);
+  if (d->pos == d->frames.end())
+    {
+    return vgKwaFrameMetadata();
+    }
+  return d->metadataAt(d->pos.key());
+}
+
+//-----------------------------------------------------------------------------
+vgKwaVideoClip::MetadataMap vgKwaVideoClip::metadata() const
+{
+  QTE_D_CONST(vgKwaVideoClip);
+  return d->metadata;
+}
+
+//-----------------------------------------------------------------------------
+vgKwaFrameMetadata vgKwaVideoClip::metadataAt(
+  vgTimeStamp pos, vg::SeekMode direction) const
+{
+  QTE_D_CONST(vgKwaVideoClip);
+  FrameMap::const_iterator iter = this->iterAt(pos, direction);
+  return d->metadataAt(iter.key());
+}
+
+//-----------------------------------------------------------------------------
+vgKwaVideoClip* vgKwaVideoClip::subClip(
+  double startTime, double endTime, double padding) const
+{
+  // Resolve padding request; this will also normalize the start and end time,
+  // even if padding == 0
+  if (!this->resolvePadding(startTime, endTime, padding))
+    {
+    // Padding resolution failed... this might happen if the requested limits
+    // are bad (e.g. start > end), or don't overlap us at all
+    return 0;
+    }
+
+  // Seems like we have something to do; return new clip constructed from us,
+  // with the requested temporal limits
+  return new vgKwaVideoClip(*this, startTime, endTime);
+}
+
+//-----------------------------------------------------------------------------
+bool vgKwaVideoClip::resolvePadding(
+  double& startTime, double& endTime, double padding) const
+{
+  QTE_D_CONST(vgKwaVideoClip);
+
+  if (d->frames.isEmpty())
+    {
+    // If our frame range is empty, this is a futile exercise...
+    return false;
+    }
+
+  CHECK_ARG(startTime <= endTime, false);
+
+  // Fix up arguments
+  if (startTime == -1 && endTime == -1)
+    {
+    startTime = std::numeric_limits<qint64>::min();
+    endTime = std::numeric_limits<qint64>::max();
+    }
+  padding = qMax(padding, 0.0);
+
+  // Check for some overlap
+  const double myStartTime = d->frames.begin().key().Time;
+  const double myEndTime = (d->frames.end() - 1).key().Time;
+  CHECK_ARG(myStartTime < endTime && myEndTime > startTime, false);
+
+  if (d->metadata.isEmpty() || padding == 0.0)
+    {
+    // If we have no metadata, or no padding was requested, just limit the
+    // bounds to our actual time range
+    startTime = qMax(startTime, myStartTime);
+    endTime   = qMin(endTime,   myEndTime);
+    }
+  else
+    {
+    startTime = d->applyPadding(qMax(startTime, myStartTime), padding, -1);
+    endTime   = d->applyPadding(qMin(endTime,   myEndTime),   padding, +1);
+    }
+
+  return true;
+}
+
+//END vgKwaVideoClip
diff --git a/Libraries/VgVideo/vgKwaVideoClip.h b/Libraries/VgVideo/vgKwaVideoClip.h
new file mode 100644
index 00000000..8cd79000
--- /dev/null
+++ b/Libraries/VgVideo/vgKwaVideoClip.h
@@ -0,0 +1,84 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgKwaVideoClip_h
+#define __vgKwaVideoClip_h
+
+#include <vgExport.h>
+
+#include "vgVideo.h"
+
+class QUrl;
+
+class vgKwaFrameMetadata;
+
+class vgKwaVideoClipPrivate;
+
+class VG_VIDEO_EXPORT vgKwaVideoClip : public vgVideo
+{
+public:
+  typedef vgTimeMap<vgKwaFrameMetadata> MetadataMap;
+
+  explicit vgKwaVideoClip(const QUrl& indexUri);
+  virtual ~vgKwaVideoClip();
+
+  QString missionId() const;
+  QString streamId() const;
+
+  // Metadata accessors
+  vgKwaFrameMetadata currentMetadata() const;
+  vgKwaFrameMetadata metadataAt(
+    vgTimeStamp pos, vg::SeekMode direction = vg::SeekNearest) const;
+
+  MetadataMap metadata() const;
+
+  /// Extract a sub-clip from this clip.
+  ///
+  /// Create a new clip that is a subset of this clip. The returned clip will
+  /// contain no frames before \p startTime or after \p endTime. If \p startTime
+  /// and \p endTime are both \c -1, the returned clip will be a clone of this
+  /// clip. The caller is responsible for deleting the returned clip.
+  ///
+  /// \par Note:
+  /// The new clip shares internal resources with this clip. To prevent errors,
+  /// users must ensure that all attempts to access image data from either clip
+  /// are serialized.
+  vgKwaVideoClip* subClip(double startTime, double endTime,
+                          double padding) const;
+
+  /// Resolve times with padding applied.
+  ///
+  /// Calculate actual start and end times from base times plus padding. After
+  /// resolution, the start and end times will lie within the times actually
+  /// contained in the clip, and the limits (if within the clip) will be grown
+  /// by either \p padding, or until the edge of a "shot", whichever is smaller.
+  /// (A "shot" is defined as the contiguous region between homography breaks.)
+  ///
+  /// Negative padding will be treated as zero. If the input range is invalid
+  /// (both limits equal to \c -1), the limits will be set to the complete
+  /// extent of the clip.
+  ///
+  /// \return \c true if resolution succeeds, \c false otherwise (e.g. if the
+  /// input range does not overlap the clip's actual range).
+  ///
+  /// \par Note:
+  /// For performance reasons, if this clip does not have external metadata,
+  /// no padding will be applied.
+  bool resolvePadding(double& startTime, double& endTime,
+                      double padding) const;
+
+protected:
+  friend class vgKwaArchive;
+
+  explicit vgKwaVideoClip(const vgKwaVideoClip& other,
+                          double startTime, double endTime);
+
+private:
+  QTE_DECLARE_PRIVATE(vgKwaVideoClip)
+  Q_DISABLE_COPY(vgKwaVideoClip)
+};
+
+#endif
diff --git a/Libraries/VgVideo/vgVideo.cxx b/Libraries/VgVideo/vgVideo.cxx
new file mode 100644
index 00000000..54557b99
--- /dev/null
+++ b/Libraries/VgVideo/vgVideo.cxx
@@ -0,0 +1,192 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideo.h"
+#include "vgVideoPrivate.h"
+
+QTE_IMPLEMENT_D_FUNC(vgVideo)
+
+//-----------------------------------------------------------------------------
+vgVideoPrivate::vgVideoPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPrivate::~vgVideoPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideo::vgVideo(vgVideoPrivate* d) : d_ptr(d)
+{
+  // Reset iterator
+  this->rewind();
+}
+
+//-----------------------------------------------------------------------------
+vgVideo::~vgVideo()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoFramePtr vgVideo::currentFrame() const
+{
+  QTE_D_CONST(vgVideo);
+  if (d->pos == d->frames.end())
+    {
+    return vgVideoFramePtr();
+    }
+  return d->pos.value();
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideo::currentTimeStamp() const
+{
+  QTE_D_CONST(vgVideo);
+  if (d->pos == d->frames.end())
+    {
+    return vgTimeStamp();
+    }
+  return d->pos.key();
+}
+
+//-----------------------------------------------------------------------------
+vgImage vgVideo::currentImage() const
+{
+  QTE_D_CONST(vgVideo);
+  if (d->pos == d->frames.end())
+    {
+    return vgImage();
+    }
+  return *d->pos.value();
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideo::advance()
+{
+  QTE_D(vgVideo);
+  if (d->pos == d->frames.end())
+    {
+    return vgTimeStamp();
+    }
+
+  ++d->pos;
+  if (d->pos == d->frames.end())
+    {
+    return vgTimeStamp();
+    }
+
+  return d->pos.key();
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideo::recede()
+{
+  QTE_D(vgVideo);
+  if (d->pos == d->frames.begin())
+    {
+    return vgTimeStamp();
+    }
+
+  --d->pos;
+  return d->pos.key();
+}
+
+//-----------------------------------------------------------------------------
+void vgVideo::rewind()
+{
+  QTE_D(vgVideo);
+  d->pos = d->frames.begin();
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideo::seek(vgTimeStamp pos, vg::SeekMode direction)
+{
+  QTE_D(vgVideo);
+  d->pos = this->iterAt(pos, direction);
+  return this->currentTimeStamp();
+}
+
+//-----------------------------------------------------------------------------
+vgVideoFramePtr vgVideo::frameAt(
+  vgTimeStamp pos, vg::SeekMode direction) const
+{
+  QTE_D_CONST(vgVideo);
+  FrameMap::const_iterator iter = this->iterAt(pos, direction);
+  if (iter == d->frames.end())
+    {
+    return vgVideoFramePtr();
+    }
+  return iter.value();
+}
+
+//-----------------------------------------------------------------------------
+vgImage vgVideo::imageAt(vgTimeStamp pos, vg::SeekMode direction) const
+{
+  QTE_D_CONST(vgVideo);
+  FrameMap::const_iterator iter = this->iterAt(pos, direction);
+  if (iter == d->frames.end())
+    {
+    return vgImage();
+    }
+  return *iter.value();
+}
+
+//-----------------------------------------------------------------------------
+vgVideo::FrameMap vgVideo::frames() const
+{
+  QTE_D_CONST(vgVideo);
+  return d->frames;
+}
+
+//-----------------------------------------------------------------------------
+vgRange<vgTimeStamp> vgVideo::timeRange() const
+{
+  QTE_D_CONST(vgVideo);
+  if (d->frames.count() < 1)
+    {
+    return vgRange<vgTimeStamp>();
+    }
+  return vgRange<vgTimeStamp>(d->frames.begin().key(),
+                              (--d->frames.end()).key());
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideo::firstTime() const
+{
+  QTE_D_CONST(vgVideo);
+  if (d->frames.count() < 1)
+    {
+    return vgTimeStamp();
+    }
+  return d->frames.begin().key();
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideo::lastTime() const
+{
+  QTE_D_CONST(vgVideo);
+  if (d->frames.count() < 1)
+    {
+    return vgTimeStamp();
+    }
+  return (--d->frames.end()).key();
+}
+
+//-----------------------------------------------------------------------------
+int vgVideo::frameCount() const
+{
+  QTE_D_CONST(vgVideo);
+  return d->frames.count();
+}
+
+//-----------------------------------------------------------------------------
+vgVideo::FrameMap::const_iterator vgVideo::iterAt(
+  vgTimeStamp pos, vg::SeekMode direction) const
+{
+  QTE_D_CONST(vgVideo);
+  return d->frames.find(pos, direction);
+}
diff --git a/Libraries/VgVideo/vgVideo.h b/Libraries/VgVideo/vgVideo.h
new file mode 100644
index 00000000..0bc490a7
--- /dev/null
+++ b/Libraries/VgVideo/vgVideo.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideo_h
+#define __vgVideo_h
+
+#include <QMap>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+#include <vgNamespace.h>
+#include <vgRange.h>
+#include <vgTimeStamp.h>
+
+#include <vgTimeMap.h>
+
+#include "vgVideoFramePtr.h"
+
+class vgVideoPrivate;
+
+class VG_VIDEO_EXPORT vgVideo
+{
+public:
+  typedef vgTimeMap<vgVideoFramePtr> FrameMap;
+
+  virtual ~vgVideo();
+
+  // Stream accessors
+  vgVideoFramePtr currentFrame() const;
+  vgTimeStamp currentTimeStamp() const;
+  vgImage currentImage() const;
+
+  // Seek operators
+  vgTimeStamp advance();
+  vgTimeStamp recede();
+
+  void rewind();
+  vgTimeStamp seek(vgTimeStamp pos,
+                   vg::SeekMode direction = vg::SeekNearest);
+
+  // Random accessors
+  vgVideoFramePtr frameAt(vgTimeStamp pos,
+                          vg::SeekMode direction = vg::SeekNearest) const;
+  vgImage imageAt(vgTimeStamp pos,
+                  vg::SeekMode direction = vg::SeekNearest) const;
+
+  FrameMap frames() const;
+  vgRange<vgTimeStamp> timeRange() const;
+  vgTimeStamp firstTime() const;
+  vgTimeStamp lastTime() const;
+
+  int frameCount() const;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgVideo)
+
+  explicit vgVideo(vgVideoPrivate*);
+
+  FrameMap::const_iterator iterAt(vgTimeStamp pos,
+                                  vg::SeekMode direction) const;
+
+private:
+  QTE_DECLARE_PRIVATE(vgVideo)
+  Q_DISABLE_COPY(vgVideo)
+};
+
+#endif
diff --git a/Libraries/VgVideo/vgVideoBuffer.cxx b/Libraries/VgVideo/vgVideoBuffer.cxx
new file mode 100644
index 00000000..001f3705
--- /dev/null
+++ b/Libraries/VgVideo/vgVideoBuffer.cxx
@@ -0,0 +1,214 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideoBuffer.h"
+
+#include <QDir>
+#include <QImage>
+
+#include <qtTemporaryFile.h>
+#include <qtUtil.h>
+
+#include <vgDebug.h>
+
+#include "vgVideoFramePtrPrivate.h"
+#include "vgVideoPrivate.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void qiCleanup(void* data)
+{
+  QImage* qi = reinterpret_cast<QImage*>(data);
+  delete qi;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vgVideoBufferPrivate : public vgVideoPrivate
+{
+public:
+  vgVideoBufferPrivate(const char* cf) : CompressionFormat(cf) {}
+
+  QSharedPointer<QFile> Store;
+  QString CompressionFormat;
+};
+
+QTE_IMPLEMENT_D_FUNC(vgVideoBuffer)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgVideoDataStreamFramePtr
+
+//-----------------------------------------------------------------------------
+class vgVideoDataStreamFramePtr : public vgVideoFramePtrPrivate
+{
+public:
+  explicit vgVideoDataStreamFramePtr(
+    vgTimeStamp ts, QSharedPointer<QIODevice> store,
+    quint64 offset, const QString& compressionFormat);
+
+  vgImage data() const;
+
+protected:
+  const QSharedPointer<QIODevice> DataStore;
+  const quint64 DataOffset;
+  const QString CompressionFormat;
+};
+
+//-----------------------------------------------------------------------------
+vgVideoDataStreamFramePtr::vgVideoDataStreamFramePtr(
+  vgTimeStamp ts, QSharedPointer<QIODevice> store,
+  quint64 offset, const QString& compressionFormat) :
+  DataStore(store),
+  DataOffset(offset),
+  CompressionFormat(compressionFormat)
+{
+  this->time = ts;
+}
+
+//-----------------------------------------------------------------------------
+vgImage vgVideoDataStreamFramePtr::data() const
+{
+  if (this->DataStore->seek(this->DataOffset))
+    {
+    if (this->CompressionFormat.isEmpty())
+      {
+      vgImage image;
+      QDataStream stream(this->DataStore.data());
+      stream >> image;
+      return image;
+      }
+    else
+      {
+      const char* const cf = qPrintable(this->CompressionFormat);
+      QScopedPointer<QImage> qi(new QImage);
+      if (qi->load(this->DataStore.data(), cf))
+        {
+        int planes = 0;
+        int iStep = 0;
+        int planeStep = 0;
+        ptrdiff_t offset = 0;
+        switch (qi->format())
+          {
+          case QImage::Format_RGB888:
+            planes = 3;
+            iStep = 3;
+            planeStep = 1;
+            offset = 0;
+            break;
+          case QImage::Format_RGB32:
+            planes = 3;
+            iStep = 4;
+            planeStep = -1;
+            offset = 2;
+            break;
+          default:
+            qDebug() << "vgVideoDataStreamFramePtr(" << this << ')'
+                     << "failed to read compressed image:"
+                     << "unsupported QImage format" << qi->format();
+            return vgImage();
+          }
+
+        QImage* qip = qi.take();
+        unsigned char* topLeft = qip->bits() + offset;
+        vgImage::Closure cleanup(&qiCleanup, qip);
+        return vgImage(topLeft, qip->width(), qip->height(), planes,
+                       iStep, qip->bytesPerLine(), planeStep, cleanup);
+        }
+      }
+    }
+
+  return vgImage();
+}
+
+//END vgVideoDataStreamFramePtr
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgVideoBuffer
+
+//-----------------------------------------------------------------------------
+vgVideoBuffer::vgVideoBuffer(const char* compressionFormat) :
+  vgVideo(new vgVideoBufferPrivate(compressionFormat))
+{
+  QTE_D(vgVideoBuffer);
+
+  // Generate path for temporary file for backing store
+  QString ft = ".vg_video_buffer_XXXXXX";
+  const QByteArray tdv = qgetenv("VG_VIDEO_TMPDIR");
+  if (!tdv.isEmpty())
+    {
+    const QDir td(QString::fromLocal8Bit(tdv));
+    const QString ctd = (td.exists() ? td.canonicalPath() : td.absolutePath());
+    ft = QString("%2/%1").arg(ft).arg(ctd);
+    }
+
+  // Create temporary file for backing store
+  QSharedPointer<qtTemporaryFile> f(new qtTemporaryFile(ft));
+
+  // Open file
+  if (!f->open())
+    {
+    qDebug() << "vgVideoBuffer(" << this << ')'
+             << "failed to open backing store:"
+             << qPrintable(f->errorString());
+    return;
+    }
+
+  // Assign file handle to ourselves
+  d->Store = f;
+}
+
+//-----------------------------------------------------------------------------
+vgVideoBuffer::~vgVideoBuffer()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vgVideoBuffer::insert(vgTimeStamp pos, vgImage image)
+{
+  QTE_D(vgVideoBuffer);
+
+  // Disallow duplicates
+  if (d->frames.contains(pos))
+    {
+    qDebug() << "vgVideoBuffer(" << this << ')'
+             << "tried to insert frame at timestamp" << pos
+             << "which already exists";
+    return false;
+    }
+
+  // Fail if backing store does not exist
+  if (!d->Store)
+    {
+    return false;
+    }
+
+  // Write image to backing store
+  qint64 offset = d->Store->size();
+  d->Store->seek(offset);
+  if (d->CompressionFormat.isEmpty())
+    {
+    QDataStream stream(d->Store.data());
+    stream << image;
+    }
+  else
+    {
+    image.toQImage().save(d->Store.data(), qPrintable(d->CompressionFormat));
+    }
+
+  // Create frame pointer and insert into map
+  vgVideoFramePtrPrivate* p =
+    new vgVideoDataStreamFramePtr(pos, d->Store, offset, d->CompressionFormat);
+  vgVideoFramePtr frame(p);
+  d->pos = d->frames.insert(pos, frame);
+  return true;
+}
+
+//END vgVideoBuffer
diff --git a/Libraries/VgVideo/vgVideoBuffer.h b/Libraries/VgVideo/vgVideoBuffer.h
new file mode 100644
index 00000000..fe4c8ccb
--- /dev/null
+++ b/Libraries/VgVideo/vgVideoBuffer.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoBuffer_h
+#define __vgVideoBuffer_h
+
+#include <vgExport.h>
+
+#include "vgVideo.h"
+
+class vgVideoBufferPrivate;
+
+class VG_VIDEO_EXPORT vgVideoBuffer : public vgVideo
+{
+public:
+  explicit vgVideoBuffer(const char* compressionFormat = 0);
+  virtual ~vgVideoBuffer();
+
+  bool insert(vgTimeStamp pos, vgImage image);
+
+private:
+  QTE_DECLARE_PRIVATE(vgVideoBuffer)
+  Q_DISABLE_COPY(vgVideoBuffer)
+};
+
+#endif
diff --git a/Libraries/VgVideo/vgVideoFramePtr.cxx b/Libraries/VgVideo/vgVideoFramePtr.cxx
new file mode 100644
index 00000000..b0f824e0
--- /dev/null
+++ b/Libraries/VgVideo/vgVideoFramePtr.cxx
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideoFramePtrPrivate.h"
+
+QTE_IMPLEMENT_D_FUNC_CONST(vgVideoFramePtr)
+
+//-----------------------------------------------------------------------------
+vgVideoFramePtr::vgVideoFramePtr()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoFramePtr::vgVideoFramePtr(const vgVideoFramePtr& other) :
+  d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoFramePtr::vgVideoFramePtr(vgVideoFramePtrPrivate* d) : d_ptr(d)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoFramePtr::~vgVideoFramePtr()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoFramePtr& vgVideoFramePtr::operator=(const vgVideoFramePtr& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+bool vgVideoFramePtr::isValid() const
+{
+  QTE_D_CONST(vgVideoFramePtr);
+  return d;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vgVideoFramePtr::time() const
+{
+  QTE_D_CONST(vgVideoFramePtr);
+  return (d ? d->time : vgTimeStamp());
+}
+
+//-----------------------------------------------------------------------------
+vgImage vgVideoFramePtr::image() const
+{
+  QTE_D_CONST(vgVideoFramePtr);
+  return (d ? d->data() : vgImage());
+}
+
+//-----------------------------------------------------------------------------
+vgImage vgVideoFramePtr::operator*() const
+{
+  return this->image();
+}
diff --git a/Libraries/VgVideo/vgVideoFramePtr.h b/Libraries/VgVideo/vgVideoFramePtr.h
new file mode 100644
index 00000000..048d8930
--- /dev/null
+++ b/Libraries/VgVideo/vgVideoFramePtr.h
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoFramePtr_h
+#define __vgVideoFramePtr_h
+
+#include <QSharedPointer>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vgTimeStamp.h>
+
+#include "vgImage.h"
+
+class vgVideoFramePtrPrivate;
+
+class VG_VIDEO_EXPORT vgVideoFramePtr
+{
+public:
+  vgVideoFramePtr();
+  vgVideoFramePtr(const vgVideoFramePtr&);
+  ~vgVideoFramePtr();
+
+  vgVideoFramePtr& operator=(const vgVideoFramePtr&);
+
+  bool isValid() const;
+
+  vgTimeStamp time() const;
+  vgImage image() const;
+
+  vgImage operator*() const;
+
+protected:
+  QTE_DECLARE_PRIVATE_SPTR(const vgVideoFramePtr)
+
+  friend class vgKwaVideoClip;
+  friend class vgVideoBuffer;
+
+  vgVideoFramePtr(vgVideoFramePtrPrivate*);
+
+private:
+  QTE_DECLARE_PRIVATE_CONST(vgVideoFramePtr)
+};
+
+#endif
diff --git a/Libraries/VgVideo/vgVideoFramePtrPrivate.h b/Libraries/VgVideo/vgVideoFramePtrPrivate.h
new file mode 100644
index 00000000..4a151e5f
--- /dev/null
+++ b/Libraries/VgVideo/vgVideoFramePtrPrivate.h
@@ -0,0 +1,27 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoFramePtrPrivate_h
+#define __vgVideoFramePtrPrivate_h
+
+#include "vgImage.h"
+#include "vgVideoFramePtr.h"
+
+class vgVideoFramePtrPrivate
+{
+public:
+  vgVideoFramePtrPrivate() {}
+  virtual ~vgVideoFramePtrPrivate() {}
+
+  virtual vgImage data() const = 0;
+
+  vgTimeStamp time;
+
+private:
+  Q_DISABLE_COPY(vgVideoFramePtrPrivate)
+};
+
+#endif
diff --git a/Libraries/VgVideo/vgVideoPrivate.h b/Libraries/VgVideo/vgVideoPrivate.h
new file mode 100644
index 00000000..bc81ce83
--- /dev/null
+++ b/Libraries/VgVideo/vgVideoPrivate.h
@@ -0,0 +1,22 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoPrivate_h
+#define __vgVideoPrivate_h
+
+#include "vgVideo.h"
+
+class vgVideoPrivate
+{
+public:
+  vgVideoPrivate();
+  virtual ~vgVideoPrivate();
+
+  vgVideo::FrameMap frames;
+  vgVideo::FrameMap::const_iterator pos;
+};
+
+#endif
diff --git a/Libraries/VgVideo/vslInstantiations.cxx b/Libraries/VgVideo/vslInstantiations.cxx
new file mode 100644
index 00000000..9a8e1d07
--- /dev/null
+++ b/Libraries/VgVideo/vslInstantiations.cxx
@@ -0,0 +1,11 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <vnl/io/vnl_io_vector_fixed.txx>
+#include <vsl/vsl_vector_io.txx>
+
+VNL_IO_VECTOR_FIXED_INSTANTIATE(double, 2);
+VSL_VECTOR_IO_INSTANTIATE(vnl_vector_fixed<double VCL_COMMA 2>);
diff --git a/Libraries/VgVtkVideo/CMakeLists.txt b/Libraries/VgVtkVideo/CMakeLists.txt
new file mode 100644
index 00000000..8cf51052
--- /dev/null
+++ b/Libraries/VgVtkVideo/CMakeLists.txt
@@ -0,0 +1,56 @@
+project(vgVtkVideo)
+
+set(vvvSources
+  vgVideoAnimation.cxx
+  vgVideoSeekRequest.cxx
+  vgVideoPlayer.cxx
+  vgVideoPlayerBufferedRequestor.cxx
+  vgVideoPlayerRequestor.cxx
+)
+
+set(vvvMocHeaders
+  vgVideoAnimation.h
+  vgVideoPlayer.h
+  vgVideoPlayerBufferedRequestor.h
+  vgVideoPlayerPrivate.h
+  vgVideoPlayerRequestor.h
+  vgVideoSourceRequestor.h
+)
+
+set(vgVtkVideoInstallHeaders
+  vgVideoAnimation.h
+  vgVideoPlayer.h
+  vgVideoSource.h
+  vgVideoSourceRequestor.h
+  vgVtkVideoFrame.h
+)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+qt4_wrap_cpp(mocSources ${vvvMocHeaders})
+
+source_group("Generated" FILES ${mocSources})
+
+add_library(${PROJECT_NAME} ${vvvSources} ${mocSources})
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  qtExtensions
+  vgVideo
+  vtkVgCore
+  vtkVgVideo
+  LINK_LIBRARIES
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+  vtkRenderingCore
+  ${VTK_JPEG_LIBRARIES}
+  LINK_PRIVATE
+  vgl
+  vgl_algo
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vgVtkVideoInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VgVtkVideo)
diff --git a/Libraries/VgVtkVideo/vgVideoAnimation.cxx b/Libraries/VgVtkVideo/vgVideoAnimation.cxx
new file mode 100644
index 00000000..8843d3de
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoAnimation.cxx
@@ -0,0 +1,197 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideoAnimation.h"
+
+#include <qtScopedValueChange.h>
+
+#include <vgCheckArg.h>
+
+#include "vgVideoPlayerPrivate.h"
+
+//-----------------------------------------------------------------------------
+vgVideoAnimation::vgVideoAnimation(vgVideoPlayerPrivate* q) :
+  qtAbstractAnimation(q),
+  q_ptr(q),
+  TimeDuration(0.0),
+  TimeOffset(0.0),
+  BlockUpdates(false)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoAnimation::~vgVideoAnimation()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoAnimation::updateTimeRange(double start, double end)
+{
+  // Adjust current time for new start time, if it has changed
+  if (start != this->TimeOffset)
+    {
+    double newTime = this->currentTime() + this->TimeOffset - start;
+    this->setCurrentTime(qMax(0.0, newTime));
+    this->TimeOffset = start;
+    }
+
+  this->TimeDuration = end - start;
+}
+
+//-----------------------------------------------------------------------------
+double vgVideoAnimation::duration() const
+{
+  return this->TimeDuration;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoAnimation::seek(vgVideoSeekRequest request)
+{
+  // Fix up request direction (use Exact if not specified)
+  if (request.Direction < 0)
+    {
+    request.Direction = vg::SeekExact;
+    }
+
+  // Find time for frame, if not provided
+  if (!request.TimeStamp.HasTime() && request.TimeStamp.HasFrameNumber())
+    {
+    QTE_Q(vgVideoPlayerPrivate);
+    request.TimeStamp =
+      q->findTime(request.TimeStamp.GetFrameNumber(), request.Direction);
+    }
+
+  if (!request.TimeStamp.IsValid())
+    {
+    // If we don't have a valid time stamp, we cannot do anything with this
+    // request...
+    return;
+    }
+
+  if (this->state() == QAbstractAnimation::Stopped && this->duration() > 0.0)
+    {
+    this->start();
+    this->pause();
+    }
+
+  // Bound request time to within the animation's range
+  const double time = request.TimeStamp.GetTime();
+  const double maxTime = (this->TimeDuration + this->TimeOffset) * 1e6;
+  request.TimeStamp.SetTime(qBound(this->TimeOffset * 1e6, time, maxTime));
+  this->postUpdate(request);
+
+  qtScopedValueChange<bool> bu(this->BlockUpdates, true);
+  this->setCurrentTime((time * 1e-6) - this->TimeOffset);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoAnimation::seek(const vtkVgTimeStamp& ts, vg::SeekMode direction)
+{
+  vgVideoSeekRequest request;
+  request.TimeStamp = ts;
+  request.Direction = direction;
+  this->seek(request);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoAnimation::setFrameRange(
+  const vtkVgTimeStamp& first, const vtkVgTimeStamp& last)
+{
+  this->updateTimeRange(first.GetTime() * 1e-6, last.GetTime() * 1e-6);
+}
+
+//-----------------------------------------------------------------------------
+bool vgVideoAnimation::setState(QAbstractAnimation::State newState)
+{
+  if (this->state() != newState)
+    {
+    if (newState != QAbstractAnimation::Stopped && this->duration() <= 0.0)
+      {
+      // We cannot play or pause an animation with no duration...
+      return false;
+      }
+    switch (newState)
+      {
+      case QAbstractAnimation::Running:
+        if (this->state() == QAbstractAnimation::Paused)
+          {
+          this->resume();
+          }
+        else
+          {
+          this->start();
+          }
+        break;
+      case QAbstractAnimation::Paused:
+        if (this->state() == QAbstractAnimation::Stopped)
+          {
+          // Must start animation before it can be paused...
+          this->start();
+          }
+        this->pause();
+        break;
+      default:
+        this->stop();
+        break;
+      }
+
+    // Check if we succeeded
+    return this->state() == newState;
+    }
+
+  // No change was needed
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoAnimation::updateCurrentTime(double time)
+{
+  vgVideoSeekRequest request;
+
+  request.TimeStamp = vgTimeStamp::fromTime((time + this->TimeOffset) * 1e6);
+  request.Direction = vg::SeekNearest;
+
+  this->postUpdate(request);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoAnimation::postUpdate(vgVideoSeekRequest request)
+{
+  CHECK_ARG(!this->BlockUpdates);
+
+  // Post update
+  if (!this->NextRequest.TimeStamp.IsValid())
+    {
+    QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
+    }
+
+  if (request.RequestId < 0)
+    {
+    // If the request does not have a valid ID, copy the one from the previous
+    // request, which will either also be invalid (if we had no pending
+    // requests with an ID), or else will the ID of the most recent request
+    // that DID have an ID... this way, when we reply, we will still indicate
+    // the most recent ID'd request that has been satisfied (which would
+    // otherwise get lost if we didn't do this!)
+    request.RequestId = this->NextRequest.RequestId;
+    }
+
+  // Set next seek
+  this->NextRequest = request;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoAnimation::update()
+{
+  CHECK_ARG(this->NextRequest.TimeStamp.IsValid());
+
+  // Pass off to implementation handler
+  QTE_Q(vgVideoPlayerPrivate);
+  q->requestFrame(this->NextRequest);
+
+  // Reset the pending update
+  this->NextRequest = vgVideoSeekRequest();
+}
diff --git a/Libraries/VgVtkVideo/vgVideoAnimation.h b/Libraries/VgVtkVideo/vgVideoAnimation.h
new file mode 100644
index 00000000..24f97d2d
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoAnimation.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoAnimation_h
+#define __vgVideoAnimation_h
+
+#include <qtAbstractAnimation.h>
+
+#include <vgExport.h>
+
+#include "vgVideoSourceRequestor.h"
+
+class vgVideoPlayerPrivate;
+
+class VG_VTKVIDEO_EXPORT vgVideoAnimation : public qtAbstractAnimation
+{
+  Q_OBJECT
+
+public:
+  explicit vgVideoAnimation(vgVideoPlayerPrivate* q);
+  virtual ~vgVideoAnimation();
+
+  void setFrameRange(const vtkVgTimeStamp& first, const vtkVgTimeStamp& last);
+  void seek(const vtkVgTimeStamp&, vg::SeekMode = vg::SeekNearest);
+  void seek(vgVideoSeekRequest);
+
+  bool setState(QAbstractAnimation::State);
+
+protected slots:
+  void update();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vgVideoPlayerPrivate)
+
+private:
+  QTE_DECLARE_PUBLIC(vgVideoPlayerPrivate)
+  Q_DISABLE_COPY(vgVideoAnimation)
+
+  virtual double duration() const;
+  virtual void updateCurrentTime(double time);
+
+  void updateTimeRange(double start, double end);
+  void postUpdate(vgVideoSeekRequest);
+
+  double TimeDuration, TimeOffset;
+  vgVideoSeekRequest NextRequest;
+  bool BlockUpdates;
+};
+
+#endif
diff --git a/Libraries/VgVtkVideo/vgVideoPlayer.cxx b/Libraries/VgVtkVideo/vgVideoPlayer.cxx
new file mode 100644
index 00000000..5ed0def7
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoPlayer.cxx
@@ -0,0 +1,751 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideoPlayerPrivate.h"
+
+#include <QtCore>
+
+#include <qtDebug.h>
+#include <qtDebugHelper.h>
+#include <qtOnce.h>
+
+#include <vgCheckArg.h>
+
+#include "vgVideoAnimation.h"
+#include "vgVideoPlayerRequestor.h"
+#include "vgVideoSource.h"
+#include "vgVideoPlayerBufferedRequestor.h"
+
+QTE_IMPLEMENT_D_FUNC(vgVideoPlayer)
+
+//BEGIN QDebug helpers
+
+//-----------------------------------------------------------------------------
+QDEBUG_ENUM_HANDLER_BEGIN(vgVideoPlayer::PlaybackMode)
+QDEBUG_HANDLE_ENUM(vgVideoPlayer::Stopped)
+QDEBUG_HANDLE_ENUM(vgVideoPlayer::Paused)
+QDEBUG_HANDLE_ENUM(vgVideoPlayer::Playing)
+QDEBUG_HANDLE_ENUM(vgVideoPlayer::Buffering)
+QDEBUG_HANDLE_ENUM(vgVideoPlayer::Live)
+QDEBUG_ENUM_HANDLER_END(vgVideoPlayer)
+
+//-----------------------------------------------------------------------------
+QDEBUG_ENUM_HANDLER_BEGIN(QAbstractAnimation::State)
+QDEBUG_HANDLE_ENUM(QAbstractAnimation::Stopped)
+QDEBUG_HANDLE_ENUM(QAbstractAnimation::Paused)
+QDEBUG_HANDLE_ENUM(QAbstractAnimation::Running)
+QDEBUG_ENUM_HANDLER_END(QAbstractAnimation)
+
+//-----------------------------------------------------------------------------
+QDEBUG_ENUM_HANDLER_BEGIN(vg::SeekMode)
+QDEBUG_HANDLE_ENUM(vg::SeekExact)
+QDEBUG_HANDLE_ENUM(vg::SeekNearest)
+QDEBUG_HANDLE_ENUM(vg::SeekLowerBound)
+QDEBUG_HANDLE_ENUM(vg::SeekUpperBound)
+QDEBUG_HANDLE_ENUM(vg::SeekUnspecified)
+QDEBUG_ENUM_HANDLER_END(vg::SeekMode)
+
+//-----------------------------------------------------------------------------
+QDebug& operator<<(QDebug& dbg, const vgVideoSeekRequest& r)
+{
+  dbg.nospace()
+    << "(time = "
+    << (r.TimeStamp.HasTime()
+        ? qPrintable(QString::number(r.TimeStamp.GetTime(), 'f', 2))
+        : "<invalid>")
+    << ", frame number = "
+    << (r.TimeStamp.HasFrameNumber()
+        ? qPrintable(QString::number(r.TimeStamp.GetFrameNumber()))
+        : "<invalid>")
+    << ", direction = " << r.Direction
+    << ", requestor = " << r.Requestor
+    << ", request id = " << r.RequestId
+    << ')';
+  return dbg.space();
+}
+
+//END QDebug helpers
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgVideoPlayerStatic
+
+namespace vgVideoPlayerStatic
+{
+
+QTE_ONCE(once);
+
+//-----------------------------------------------------------------------------
+void registerMetaTypes()
+{
+  QTE_REGISTER_METATYPE(vgVideoSource*);
+  QTE_REGISTER_METATYPE(vgVideoPlayer::PlaybackMode);
+  QTE_REGISTER_METATYPE(vgVtkVideoFramePtr);
+  QTE_REGISTER_METATYPE(vtkVgTimeStamp);
+  QTE_REGISTER_METATYPE(vg::SeekMode);
+  QTE_REGISTER_METATYPE(qtDebugAreaAccessor);
+}
+
+} // namespace vgVideoPlayerStatic
+
+//END vgVideoPlayerStatic
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgVideoPlayerPrivate::SuppressStateUpdates
+
+//-----------------------------------------------------------------------------
+class vgVideoPlayerPrivate::SuppressStateUpdates
+{
+public:
+  SuppressStateUpdates(vgVideoPlayerPrivate* q);
+
+  ~SuppressStateUpdates();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vgVideoPlayerPrivate)
+
+  bool UpdateSuppressed;
+
+private:
+  QTE_DECLARE_PUBLIC(vgVideoPlayerPrivate)
+};
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerPrivate::SuppressStateUpdates::SuppressStateUpdates(
+  vgVideoPlayerPrivate* q) :
+  q_ptr(q),
+  UpdateSuppressed(false)
+{
+  q->StateUpdateSuppressor = this;
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerPrivate::SuppressStateUpdates::~SuppressStateUpdates()
+{
+  QTE_Q(vgVideoPlayerPrivate);
+
+  if (this->UpdateSuppressed)
+    {
+    // If an update was suppressed, push it to the public vgVideoPlayer now
+    q->updatePublicPlaybackMode();
+    }
+
+  q->StateUpdateSuppressor = 0;
+}
+
+//END vgVideoPlayerPrivate::SuppressStateUpdates
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgVideoPlayerPrivate
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerPrivate::vgVideoPlayerPrivate(vgVideoPlayer* q) :
+  q_ptr(q),
+  Animation(0),
+  StateUpdateSuppressor(0),
+  DebugArea(qtDebug::InvalidArea),
+  AutoPlay(true),
+  AutoPause(false),
+  Streaming(false),
+  LivePlaybackOffset(0.0)
+{
+  this->setSource(0);
+
+  this->PlaybackMode = vgVideoPlayer::Stopped;
+  this->PlaybackRate = 1.0;
+  this->debugPlayback("set initial mode");
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerPrivate::~vgVideoPlayerPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::debugPlayback(const char* message)
+{
+  qtDebug(this->DebugArea)
+    << message << this->PlaybackMode << this->PlaybackRate;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::setDebugArea(qtDebugAreaAccessor area)
+{
+  this->DebugArea = area;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::run()
+{
+  qtDebug(this->DebugArea) << "playback thread executing";
+
+  // Start up the animation framework
+  this->Animation = new vgVideoAnimation(this);
+  connect(this->Animation, SIGNAL(stateChanged(QAbstractAnimation::State,
+                                               QAbstractAnimation::State)),
+          this, SLOT(updateAnimationStatus(QAbstractAnimation::State)));
+  qtThread::run();
+
+  qtDebug(this->DebugArea) << "playback thread halting";
+
+  // Make sure animation is stopped (or Qt is unhappy when it is destroyed)
+  this->Animation->setState(QAbstractAnimation::Stopped);
+
+  // Detach and release our requestor
+  this->Requestor->release();
+
+  // Done
+  qtDebug(this->DebugArea) << "playback thread done";
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vgVideoPlayerPrivate::findTime(
+  unsigned int frameNumber, vg::SeekMode direction)
+{
+  CHECK_ARG(this->VideoSource, vtkVgTimeStamp());
+  return this->VideoSource->findTime(frameNumber, direction);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::requestFrame(vgVideoSeekRequest request)
+{
+  this->Requestor->requestFrame(this->VideoSource, request);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::setSource(vgVideoSource* source)
+{
+  // Reset the source and available frame range
+  this->VideoSource = source;
+  this->FirstFrameTimestamp.Reset();
+  this->LastFrameTimestamp.Reset();
+
+  // Reset the animation (but test existence; it won't exist yet when we are
+  // called during construction)
+  if (this->Animation)
+    {
+    this->Animation->setState(QAbstractAnimation::Stopped);
+    this->Animation->setFrameRange(vtkVgTimeStamp(), vtkVgTimeStamp());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::setStreaming(bool streaming)
+{
+  this->Streaming = streaming;
+
+  if (!streaming)
+    {
+    if (this->PlaybackMode == vgVideoPlayer::Buffering)
+      {
+      // If we were waiting on more data, there won't be any; change to stopped
+      this->setPlaybackSpeed(vgVideoPlayer::Stopped, this->PlaybackRate);
+      }
+    else if (this->PlaybackMode == vgVideoPlayer::Live)
+      {
+      // If we were in live playback mode, switch to regular playback (which
+      // may switch immediately to stopped if we have no more video)
+      this->setPlaybackSpeed(vgVideoPlayer::Playing, this->PlaybackRate);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::setFrameRange(
+  vtkVgTimeStamp first, vtkVgTimeStamp last)
+{
+  vtkVgTimeStamp oldBufferEnd = this->LastFrameTimestamp;
+
+  // Update internal state
+  this->FirstFrameTimestamp = first;
+  this->LastFrameTimestamp = last;
+
+  // Update animation
+  this->Animation->setFrameRange(first, last);
+
+  if (this->PlaybackMode == vgVideoPlayer::Live)
+    {
+    const double t = last.GetTime() - this->LivePlaybackOffset;
+    this->Animation->seek(vgTimeStamp::fromTime(t), vg::SeekUpperBound);
+    }
+  // Else if we were waiting on more data, resume playback
+  else if (this->AutoPlay && (!oldBufferEnd.IsValid() || oldBufferEnd < last) &&
+           this->PlaybackMode == vgVideoPlayer::Buffering)
+    {
+    // Temporarily suppress playback status updates until we have resolved our
+    // final resulting state
+    SuppressStateUpdates su(this);
+
+    this->Animation->seek(oldBufferEnd);
+    this->setPlaybackSpeed(vgVideoPlayer::Playing, this->PlaybackRate);
+    }
+  // If we are paused at the previous end of the video, the actual animation
+  // state is stopped, so we need to transition back to 'actual' paused
+  else if (this->AutoPause && this->PlaybackMode == vgVideoPlayer::Paused)
+    {
+    // Temporarily suppress playback status updates until we have resolved our
+    // final resulting state
+    SuppressStateUpdates su(this);
+
+    this->setPlaybackSpeed(vgVideoPlayer::Paused, this->PlaybackRate);
+    this->Animation->seek(oldBufferEnd);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::setPlaybackSpeed(
+  vgVideoPlayer::PlaybackMode mode, qreal rate)
+{
+  qtDebug(this->DebugArea) << "requesting mode" << mode << rate;
+
+  switch (mode)
+    {
+    case vgVideoPlayer::Playing:
+      this->AutoPlay = true;
+      this->Animation->setRate(rate);
+      this->Requestor->setPlaybackRate(rate);
+      if (this->PlaybackMode == vgVideoPlayer::Paused)
+        {
+        if (this->AutoPause)
+          {
+          // If the current state is reported as Paused, and auto-pause is set,
+          // then the animation is actually stopped; we don't need to make any
+          // request of the animation, but need to transition our internal
+          // state to Buffering and set auto-play
+          this->AutoPlay = true;
+          this->AutoPause = false;
+          mode = vgVideoPlayer::Buffering;
+          }
+        else
+          {
+          this->Animation->setState(QAbstractAnimation::Running);
+          }
+        }
+      else if (this->PlaybackMode == vgVideoPlayer::Live)
+        {
+        // If we're in Live, things get a little interesting; if we're at the
+        // head (animation state == Stopped) and we're asked to play forward,
+        // we need to switch immediately to Buffering to prevent the animation
+        // from resetting to the beginning, otherwise we can start the
+        // animation running normally
+        if (rate > 0.0 && this->Animation->state() == QAbstractAnimation::Stopped)
+          {
+          this->AutoPlay = true;
+          this->AutoPause = false;
+          mode = vgVideoPlayer::Buffering;
+          }
+        else
+          {
+          this->Animation->setState(QAbstractAnimation::Running);
+          }
+        }
+      else if (this->PlaybackMode != vgVideoPlayer::Buffering)
+        {
+        this->Animation->setState(QAbstractAnimation::Running);
+        }
+      else
+        {
+        // If we were previously in Buffering, we need to stay in Buffering,
+        // because we aren't really playing just because the speed changed
+        // (note that a transition out of Buffering goes through Paused due to
+        // the animation seek, so we can know that that isn't happening here)
+        mode = vgVideoPlayer::Buffering;
+        }
+      this->updatePlaybackMode(mode, rate);
+      break;
+    case vgVideoPlayer::Live:
+      this->AutoPause = false;
+      this->updatePlaybackMode(mode, rate);
+      this->Animation->setState(QAbstractAnimation::Paused);
+      // Set offset to itself as a mechanism for seeking the playback position
+      // to the right initial spot for live playback
+      this->setLivePlaybackOffset(this->LivePlaybackOffset);
+    case vgVideoPlayer::Paused:
+      this->AutoPause = false;
+      this->Requestor->setPlaybackRate(0.0);
+      if (this->PlaybackMode == vgVideoPlayer::Playing)
+        {
+        this->Animation->setState(QAbstractAnimation::Paused);
+        }
+      else if (this->PlaybackMode == vgVideoPlayer::Buffering)
+        {
+        this->AutoPlay = false;
+        this->AutoPause = true;
+        this->PlaybackMode = mode;
+        this->updatePublicPlaybackMode();
+        }
+      else if (this->PlaybackMode == vgVideoPlayer::Live)
+        {
+        this->AutoPause =
+          (this->Animation->state() == QAbstractAnimation::Stopped);
+        this->updatePlaybackMode(mode, rate);
+        }
+      break;
+    case vgVideoPlayer::Stopped:
+      this->AutoPause = false;
+      this->Requestor->setPlaybackRate(0.0);
+      if (this->PlaybackMode != vgVideoPlayer::Stopped)
+        {
+        // Stop playing, reset to the beginning, and transition the animation
+        // to stopped
+        this->AutoPlay = false;
+        this->Animation->setState(QAbstractAnimation::Paused);
+        this->Animation->seek(vgTimeStamp::fromTime(-qInf()));
+        this->Animation->setState(QAbstractAnimation::Stopped);
+        if (this->PlaybackMode == vgVideoPlayer::Live)
+          {
+          // In live playback mode, the animation may already be stopped, and
+          // so we won't get our mode transition that way, so instead force it
+          // here and now (and not via updatePlaybackMode, which tries to guess
+          // if we want to switch to Buffering, which we don't because we were
+          // told to be Stopped)
+          this->PlaybackMode = vgVideoPlayer::Stopped;
+          this->updatePublicPlaybackMode();
+          }
+
+        // Clear auto-pause (again), as it will have been affected by our
+        // changes to the animation's time and playback state
+        this->AutoPause = false;
+        }
+      break;
+    default:
+      // May not set playback speed to Buffering
+      qDebug() << "warning: setting playback mode to" << mode
+               << "is not permitted";
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::updatePlaybackMode(
+  vgVideoPlayer::PlaybackMode mode, qreal rate)
+{
+  if (this->Streaming)
+    {
+    if (mode == vgVideoPlayer::Stopped)
+      {
+      qtDebug(this->DebugArea)
+        << "requested" << mode << "but may adjust due to streaming"
+        << "( auto-play" << this->AutoPlay
+        << "/ auto-pause" << this->AutoPause << ')';
+
+      if (this->AutoPlay && (this->Animation->currentTime() > 1e-4))
+        {
+        // If we are playing, and the animation stops (because it is at the
+        // end), switch to Buffering mode
+        mode = vgVideoPlayer::Buffering;
+        }
+      else if (this->AutoPause)
+        {
+        // If we are paused, and the animation stops (because a seek caused us
+        // to be at the end), switch to Paused mode
+        mode = vgVideoPlayer::Paused;
+        }
+      }
+    else if (mode == vgVideoPlayer::Playing)
+      {
+      if (this->Animation->duration() < 1e-4)
+        {
+        qtDebug(this->DebugArea)
+          << "request" << mode << "being adjusted due to tiny duration";
+        mode = vgVideoPlayer::Buffering;
+        }
+      }
+    }
+
+  // Update internal mode
+  this->PlaybackMode = mode;
+  this->PlaybackRate = rate;
+  this->debugPlayback("update mode");
+
+  if (this->StateUpdateSuppressor)
+    {
+    // If updates are being blocked, update our internal state (necessary for
+    // transition from Buffering to Playing to work correctly), but hold off
+    // updating public class (which will also suppress emission of the state
+    // changed signal)
+    this->StateUpdateSuppressor->UpdateSuppressed = true;
+    }
+  else
+    {
+    // Update public class (so its getters have the current values)
+    this->updatePublicPlaybackMode();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::updatePublicPlaybackMode()
+{
+  QTE_Q(vgVideoPlayer);
+  QMetaObject::invokeMethod(
+    q, "updatePlaybackMode",
+    Q_ARG(vgVideoPlayer::PlaybackMode, this->PlaybackMode),
+    Q_ARG(qreal, this->PlaybackRate));
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::seekToTimestamp(
+  qint64 requestId, vtkVgTimeStamp ts, vg::SeekMode direction)
+{
+  // Temporarily suppress playback status updates until we have resolved our
+  // final resulting state
+  SuppressStateUpdates su(this);
+
+  // Before we do anything, check if we are Buffering; if so, we want to be
+  // Playing after the seek, but the animation is actually stopped (and so the
+  // seek is going to leave us in Paused)
+  bool autoPlay =
+    this->PlaybackMode == vgVideoPlayer::Buffering && this->AutoPlay;
+
+  vgVideoSeekRequest request;
+  request.RequestId = requestId;
+  request.TimeStamp = ts;
+  request.Direction = direction;
+
+  qtDebug(this->DebugArea) << "requesting seek" << request;
+
+  this->Animation->seek(request);
+
+  if (autoPlay)
+    {
+    // Start playing the animation, if we determined that we need to do so
+    // (see above comment)
+    this->Animation->setState(QAbstractAnimation::Running);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::setLivePlaybackOffset(double offset)
+{
+  this->LivePlaybackOffset = offset;
+
+  if (this->PlaybackMode == vgVideoPlayer::Live)
+    {
+    const double t = this->LastFrameTimestamp.GetTime() - offset;
+    this->Animation->seek(vgTimeStamp::fromTime(t), vg::SeekUpperBound);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerPrivate::updateAnimationStatus(QAbstractAnimation::State s)
+{
+  qtDebug(this->DebugArea) << "animation status changed to" << s;
+
+  switch (s)
+    {
+    case QAbstractAnimation::Running:
+      if (this->PlaybackMode != vgVideoPlayer::Live)
+        {
+        this->updatePlaybackMode(vgVideoPlayer::Playing, this->PlaybackRate);
+        }
+      break;
+    case QAbstractAnimation::Paused:
+      if (this->PlaybackMode != vgVideoPlayer::Live)
+        {
+        // When transitioning to Paused, clear auto-pause, or else we can get
+        // wrongly stuck in Buffering when the user asks to play (even on
+        // non-streaming video!)
+        this->AutoPause = false;
+        this->updatePlaybackMode(vgVideoPlayer::Paused, this->PlaybackRate);
+        }
+      break;
+    default:
+      if (this->PlaybackMode == vgVideoPlayer::Paused)
+        {
+        // If the animation transitions to Stopped when our previous state was
+        // Paused, it is because a: we were asked to stop, or b: a seek moved
+        // us to the end of the animation; set auto-play/auto-pause accordingly
+        // so we don't think we are in Buffering mode and start playing the
+        // animation again when new video arrives (in case (a), we will clear
+        // auto-pause after vgVideoAnimation::setState returns)
+        this->AutoPlay = false;
+        this->AutoPause = true;
+        }
+      else if (this->PlaybackMode != vgVideoPlayer::Live)
+        {
+        this->updatePlaybackMode(vgVideoPlayer::Stopped, this->PlaybackRate);
+        }
+      break;
+    }
+}
+
+//END vgVideoPlayerPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vgVideoPlayer
+
+//-----------------------------------------------------------------------------
+vgVideoPlayer::vgVideoPlayer(QObject* parent) :
+  QObject(parent),
+  d_ptr(new vgVideoPlayerPrivate(this))
+{
+  QTE_D(vgVideoPlayer);
+
+  // Register our metatypes
+  using namespace vgVideoPlayerStatic;
+  qtOnce(once, &registerMetaTypes);
+
+  d->ParentDebugArea = qtDebug::InvalidArea;
+  d->ParentPlaybackMode = vgVideoPlayer::Stopped;
+  d->ParentPlaybackRate = 1.0;
+  d->ParentLivePlaybackOffset = 0.0;
+
+  // Get video buffering settings
+  QSettings settings;
+  settings.beginGroup("VideoPlayback");
+  const double bufferTime = settings.value("BufferTime", 5.0).toDouble();
+  const double bufferFrames = settings.value("BufferFrames", 50).toInt();
+  const qreal bufferRateCap = settings.value("BufferRateLimit", 2.2).toReal();
+
+  // If buffering is enabled (both size limits > 0)...
+  if (bufferFrames > 0 && bufferTime > 0)
+    {
+    // ...then create a buffered requestor...
+    vgVideoPlayerBufferedRequestor* requestor =
+      vgVideoPlayerBufferedRequestor::create();
+    requestor->setBufferLimit(bufferTime, bufferFrames, bufferRateCap);
+    d->Requestor = requestor;
+    }
+  else
+    {
+    // ...otherwise create a plain requestor
+    d->Requestor = vgVideoPlayerRequestor::create();
+    }
+
+  connect(d->Requestor, SIGNAL(frameAvailable(vgVtkVideoFramePtr, qint64)),
+          this, SLOT(emitFrameAvailable(vgVtkVideoFramePtr, qint64)));
+  connect(d->Requestor, SIGNAL(seekRequestDiscarded(qint64, vtkVgTimeStamp)),
+          this, SIGNAL(seekRequestDiscarded(qint64, vtkVgTimeStamp)));
+  d->Requestor->moveToThread(d->thread());
+
+  d->start();
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayer::~vgVideoPlayer()
+{
+  QTE_D(vgVideoPlayer);
+  qtDebug(d->ParentDebugArea) << "stopping playback thread";
+  d->quit();
+  d->wait();
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::setDebugArea(qtDebugAreaAccessor area)
+{
+  QTE_D(vgVideoPlayer);
+  d->ParentDebugArea = area;
+  QMetaObject::invokeMethod(d, "setDebugArea",
+                            Q_ARG(qtDebugAreaAccessor, area));
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::setVideoSource(vgVideoSource* source)
+{
+  QTE_D(vgVideoPlayer);
+  QMetaObject::invokeMethod(d, "setSource", Qt::BlockingQueuedConnection,
+                            Q_ARG(vgVideoSource*, source));
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayer::PlaybackMode vgVideoPlayer::playbackMode() const
+{
+  QTE_D_CONST(vgVideoPlayer);
+  return d->ParentPlaybackMode;
+}
+
+//-----------------------------------------------------------------------------
+qreal vgVideoPlayer::playbackSpeed() const
+{
+  QTE_D_CONST(vgVideoPlayer);
+  return d->ParentPlaybackRate;
+}
+
+//-----------------------------------------------------------------------------
+double vgVideoPlayer::livePlaybackOffset() const
+{
+  QTE_D_CONST(vgVideoPlayer);
+  return d->ParentLivePlaybackOffset;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::updatePlaybackMode(
+  vgVideoPlayer::PlaybackMode mode, qreal rate)
+{
+  QTE_D(vgVideoPlayer);
+
+  d->ParentPlaybackMode = mode;
+  d->ParentPlaybackRate = rate;
+
+  emit this->playbackSpeedChanged(mode, rate);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::setSourceStreaming(bool streaming)
+{
+  QTE_D(vgVideoPlayer);
+  QMetaObject::invokeMethod(d, "setStreaming", Q_ARG(bool, streaming));
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::setSourceFrameRange(
+  vtkVgTimeStamp first, vtkVgTimeStamp last)
+{
+  QTE_D(vgVideoPlayer);
+  QMetaObject::invokeMethod(d, "setFrameRange",
+                            Q_ARG(vtkVgTimeStamp, first),
+                            Q_ARG(vtkVgTimeStamp, last));
+}
+
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::setPlaybackSpeed(
+  vgVideoPlayer::PlaybackMode mode, qreal rate)
+{
+  QTE_D(vgVideoPlayer);
+  QMetaObject::invokeMethod(d, "setPlaybackSpeed",
+                            Qt::BlockingQueuedConnection,
+                            Q_ARG(vgVideoPlayer::PlaybackMode, mode),
+                            Q_ARG(qreal, rate));
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::seekToTimestamp(
+  qint64 requestId, vtkVgTimeStamp ts, vg::SeekMode direction)
+{
+  CHECK_ARG(ts.IsValid());
+
+  QTE_D(vgVideoPlayer);
+  QMetaObject::invokeMethod(d, "seekToTimestamp", Qt::BlockingQueuedConnection,
+                            Q_ARG(qint64, requestId),
+                            Q_ARG(vtkVgTimeStamp, ts),
+                            Q_ARG(vg::SeekMode, direction));
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::setLivePlaybackOffset(double offset)
+{
+  // Figure out effective offset, adjusting for bad input and converting from
+  // a possibly negative 'additive offset' to a magnitude, which is how we want
+  // to use it internally
+  offset = (qIsFinite(offset) ? qAbs(offset) : 0.0);
+
+  QTE_D(vgVideoPlayer);
+  QMetaObject::invokeMethod(d, "setLivePlaybackOffset", Q_ARG(double, offset));
+  d->ParentLivePlaybackOffset = offset;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayer::emitFrameAvailable(
+  vgVtkVideoFramePtr frame, qint64 seekRequestId)
+{
+  emit this->frameAvailable(*frame, seekRequestId);
+}
+
+//END vgVideoPlayer
diff --git a/Libraries/VgVtkVideo/vgVideoPlayer.h b/Libraries/VgVtkVideo/vgVideoPlayer.h
new file mode 100644
index 00000000..1a786a6f
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoPlayer.h
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoPlayer_h
+#define __vgVideoPlayer_h
+
+#include <QObject>
+
+#include <qtDebugArea.h>
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+
+#include "vgVtkVideoFrame.h"
+
+class vgVideoSource;
+
+class vgVideoPlayerPrivate;
+
+class VG_VTKVIDEO_EXPORT vgVideoPlayer : public QObject
+{
+  Q_OBJECT
+
+public:
+  enum PlaybackMode
+    {
+    Stopped,
+    Paused,
+    Playing,
+    Buffering,
+    Live
+    };
+
+  vgVideoPlayer(QObject* parent = 0);
+  virtual ~vgVideoPlayer();
+
+  void setDebugArea(qtDebugAreaAccessor);
+  void setVideoSource(vgVideoSource*);
+
+  vgVideoPlayer::PlaybackMode playbackMode() const;
+  qreal playbackSpeed() const;
+
+  double livePlaybackOffset() const;
+
+signals:
+  void frameAvailable(vtkVgVideoFrame frame, qint64 seekRequestId);
+  void seekRequestDiscarded(qint64 id, vtkVgTimeStamp lastFrameAvailable);
+
+  void playbackSpeedChanged(vgVideoPlayer::PlaybackMode, qreal rate);
+
+public slots:
+  void setSourceStreaming(bool);
+  void setSourceFrameRange(vtkVgTimeStamp first, vtkVgTimeStamp last);
+
+  void setPlaybackSpeed(vgVideoPlayer::PlaybackMode, qreal rate = 1.0);
+  void seekToTimestamp(qint64 requestId, vtkVgTimeStamp,
+                       vg::SeekMode = vg::SeekNearest);
+  void setLivePlaybackOffset(double);
+
+protected slots:
+  void updatePlaybackMode(vgVideoPlayer::PlaybackMode, qreal rate);
+  void emitFrameAvailable(vgVtkVideoFramePtr frame, qint64 seekRequestId);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vgVideoPlayer)
+  friend class vgVideoPlayerRequestor;
+
+private:
+  QTE_DECLARE_PRIVATE(vgVideoPlayer)
+  Q_DISABLE_COPY(vgVideoPlayer)
+};
+
+#endif
diff --git a/Libraries/VgVtkVideo/vgVideoPlayerBufferedRequestor.cxx b/Libraries/VgVtkVideo/vgVideoPlayerBufferedRequestor.cxx
new file mode 100644
index 00000000..fa4f5408
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoPlayerBufferedRequestor.cxx
@@ -0,0 +1,457 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideoPlayerBufferedRequestor.h"
+
+#include <qtGlobal.h>
+#include <qtMath.h>
+
+#include <vgCheckArg.h>
+
+#include "vgVideoSource.h"
+
+//-----------------------------------------------------------------------------
+class vgVideoPlayerBufferRequestor : public vgVideoPlayerRequestor
+{
+public:
+  static vgVideoPlayerBufferRequestor*
+  create(vgVideoPlayerBufferedRequestor* q)
+    { return new vgVideoPlayerBufferRequestor(q); }
+
+  virtual void update(vgVideoSeekRequest request, vgVtkVideoFramePtr frame)
+    {
+    CHECK_ARG(frame);
+    QTE_Q(vgVideoPlayerBufferedRequestor);
+    q->addFrameToBuffer(request, frame);
+    }
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vgVideoPlayerBufferedRequestor);
+
+  vgVideoPlayerBufferRequestor(vgVideoPlayerBufferedRequestor* q) :
+    q_ptr(q)
+    {}
+
+private:
+  QTE_DECLARE_PUBLIC(vgVideoPlayerBufferedRequestor);
+};
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerBufferedRequestor* vgVideoPlayerBufferedRequestor::create()
+{
+  return new vgVideoPlayerBufferedRequestor;
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerBufferedRequestor::vgVideoPlayerBufferedRequestor() :
+  VideoSource(0),
+  SourceLastFlushed(true),
+  BufferRequestor(0),
+  BufferingEnabled(false),
+  BufferFillDirection(vg::SeekExact)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerBufferedRequestor::~vgVideoPlayerBufferedRequestor()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::release()
+{
+  this->VideoSource = 0;
+  this->clearBuffer();
+
+  this->releaseBufferRequestor();
+  vgVideoPlayerRequestor::release();
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::releaseBufferRequestor()
+{
+  if (this->BufferRequestor)
+    {
+    this->BufferRequestor->release();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::setBufferLimit(
+  double maxTime, int maxFrames, qreal maxRate)
+{
+  this->BufferFrameLimit = maxFrames;
+  this->BufferTimeLimit = maxTime * 1e6;
+  this->BufferRateLimit = maxRate;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::setVideoSource(vgVideoSource* source)
+{
+  // Throw out any buffer from the previous source (if any)
+  this->clearBuffer();
+  this->VideoSource = source;
+  this->SourceLastFlushed = true,
+
+  // If we have a requestor for the old source, release it so we won't get
+  // any more frames from it
+  this->releaseBufferRequestor();
+
+  // Create a new requestor for the new source
+  this->BufferRequestor = vgVideoPlayerBufferRequestor::create(this);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::requestFrame(
+  vgVideoSource* source, vgVideoSeekRequest& request)
+{
+  Q_ASSERT(request.TimeStamp.IsValid());
+
+  const vgTimeStamp ts = request.TimeStamp.GetRawTimeStamp();
+
+  // Check if our source has changed
+  if (source != this->VideoSource)
+    {
+    // If so, reset to use the new source
+    this->setVideoSource(source);
+    }
+
+  // Does the request lie within the range we have buffered?
+  while (this->isRequestWithinBuffer(ts, request.Direction))
+    {
+    // Use buffer to satisfy request
+    FrameBufferIterator iter = this->Buffer.find(ts, request.Direction);
+    if (iter != this->Buffer.end())
+      {
+      // Did we fill the request?
+      if (iter.value())
+        {
+        // Yes; remove the frame from the buffer...
+        vgVtkVideoFramePtr frame(*iter);
+        *iter = 0;
+
+        // ...purge earlier entries from the buffer...
+        this->pruneBuffer(iter, ts);
+
+        // ...notify source to discard its notion of the last frame we saw...
+        if (!this->SourceLastFlushed)
+          {
+          source->clearLastRequest(this);
+          this->SourceLastFlushed = true;
+          }
+
+        // ...and hand the frame off to the caller (will also start or resume
+        // filling the buffer, if not full)
+        this->update(request, frame);
+        }
+      else
+        {
+        // No... did we give back the same frame as before?
+        if (vtkVgTimeStamp(iter.key()) == this->LastFrameTime)
+          {
+          // Yes; does caller care?
+          if (request.RequestId >= 0)
+            {
+            // Yes; notify caller of discarded request
+            emit this->seekRequestDiscarded(request.RequestId,
+                                            this->LastFrameTime);
+            }
+          }
+        else
+          {
+          // No; this can happen if we were between frames leaning toward
+          // a frame 'later' in the buffer, and a seek (while playing) makes
+          // a request that resolves to the 'earlier' frame... in this case,
+          // since the frames are non-persistent (i.e. we no longer have the
+          // earlier frame to give back), punt on using the buffer
+          break;
+          }
+        }
+      }
+    // The find() should only fail if the seek mode was Exact, and we have no
+    // match... if so, do we need to notify the caller?
+    else if (request.RequestId >= 0)
+      {
+      // Yes; notify caller of discarded request
+      emit this->seekRequestDiscarded(request.RequestId, this->LastFrameTime);
+      }
+
+    // Use of buffer was successful
+    return;
+    }
+
+  // Check for seek requests 'before' the buffer head
+  if (!this->Buffer.isEmpty() && this->isTimeStampBeforeBufferHead(ts))
+    {
+    // Any such request means we must throw out the buffer, because the reply
+    // we get will otherwise violate its continuity property
+    this->clearBuffer();
+    }
+
+  // Hand off to source to satisfy request
+  vgVideoPlayerRequestor::requestFrame(source, request);
+  this->SourceLastFlushed = false;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::setPlaybackRate(qreal rate)
+{
+  if (!qFuzzyIsNull(rate))
+    {
+    const vg::SeekMode newDirection =
+      (rate > 0.0 ? vg::SeekNext : vg::SeekPrevious);
+    if (this->BufferFillDirection != newDirection)
+      {
+      this->BufferFillDirection = newDirection;
+      this->clearBuffer(true);
+      }
+    }
+
+  // Disable buffering if playing back "significantly" faster than real time
+  // (with somewhat arbitrary definition of "significantly")... don't bother to
+  // clear the buffer, as we might as well use anything we have until we run
+  // out and it is flushed naturally
+  this->BufferingEnabled = (fabs(rate) < this->BufferRateLimit);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::update(
+  vgVideoSeekRequest seekRequest, vgVtkVideoFramePtr frame)
+{
+  if (frame)
+    {
+    const vgTimeStamp ts = frame->MetaData.Time.GetRawTimeStamp();
+
+    if (this->isTimeStampBeforeBufferHead(ts))
+      {
+      this->clearBuffer();
+      this->Buffer.insert(ts, 0);
+      this->BufferHead = this->BufferTail = ts;
+      }
+    else
+      {
+      FrameBufferIterator iter = this->Buffer.find(ts);
+
+      if (iter == this->Buffer.end())
+        {
+        // Add placeholder to buffer if not found...
+        iter = this->Buffer.insert(ts, 0);
+        }
+      else
+        {
+        // ...otherwise replace old frame with placeholder
+        delete *iter;
+        *iter = 0;
+        }
+
+      // Purge earlier entries from the buffer
+      this->pruneBuffer(iter, seekRequest.TimeStamp.GetRawTimeStamp());
+      if (this->Buffer.count() < 2)
+        {
+        // If our new entry is the only one left, it must now be the tail
+        this->BufferTail = ts;
+        }
+      }
+    }
+
+  // Pass frame along to caller
+  vgVideoPlayerRequestor::update(seekRequest, frame);
+
+  // Start filling buffer
+  this->fillBuffer();
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::addFrameToBuffer(
+  const vgVideoSeekRequest& request, vgVtkVideoFramePtr frame)
+{
+  // Don't add frame it it would violate continuity property
+  CHECK_ARG(request.TimeStamp == this->BufferTail);
+  CHECK_ARG(request.Direction == this->BufferFillDirection);
+
+  // Add frame to buffer
+  const vgTimeStamp ts = frame->MetaData.Time.GetRawTimeStamp();
+  this->Buffer.insert(ts, frame.take());
+  this->BufferTail = ts;
+
+  // Continue filling buffer until full
+  this->fillBuffer();
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::fillBuffer()
+{
+  // Don't fill if buffering is disabled
+  CHECK_ARG(this->BufferingEnabled);
+  CHECK_ARG(this->BufferFillDirection != vg::SeekExact);
+
+  // Don't fill if full based on frame count
+  CHECK_ARG(this->Buffer.count() < this->BufferFrameLimit);
+
+  if (this->BufferHead.HasTime() && this->BufferTail.HasTime())
+    {
+    const double bufferTimeSize =
+      fabs(this->BufferHead.Time - this->BufferTail.Time);
+    // Don't fill if full based on time range
+    CHECK_ARG(bufferTimeSize < this->BufferTimeLimit);
+    }
+
+  // Request next (in playback direction) frame for buffer
+  this->PendingBufferRequest = this->BufferTail;
+  this->issueBufferRequest();
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::issueBufferRequest()
+{
+  vgVideoSeekRequest request;
+  request.TimeStamp = this->PendingBufferRequest;
+  request.Direction = this->BufferFillDirection;
+  this->BufferRequestor->requestFrame(this->VideoSource, request);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::pruneBuffer(
+  FrameBufferIterator iter, const vgTimeStamp& ref)
+{
+  if (this->BufferFillDirection == vg::SeekNext)
+    {
+    if (iter != this->Buffer.begin())
+      {
+      // If buffer seek landed us on the later of the first two entries...
+      if (ref < iter.key())
+        {
+        // ...then go back one, so that if we seek again between entries we can
+        // still use the buffer
+        --iter;
+        }
+
+      // Update head
+      this->BufferHead = iter.key();
+
+      // Remove all entries before updated iterator
+      const vgTimeStamp keep = iter.key();
+      iter = this->Buffer.begin();
+      while (iter != this->Buffer.end() && iter.key() != keep)
+        {
+        // Erase entry
+        delete *iter;
+        iter = this->Buffer.erase(iter);
+        }
+      }
+    }
+  else if (this->BufferFillDirection == vg::SeekPrevious)
+    {
+    if ((iter + 1) != this->Buffer.end())
+      {
+      // If buffer seek landed us on the later of the first two entries...
+      if (ref > iter.key())
+        {
+        // ...then go forward one, so that if we seek again between entries we
+        // can still use the buffer
+        ++iter;
+        }
+
+      // Update head
+      this->BufferHead = iter.key();
+
+      // Remove all entries after updated iterator
+      ++iter;
+      while (iter != this->Buffer.end())
+        {
+        // Erase entry
+        delete *iter;
+        iter = this->Buffer.erase(iter);
+        }
+      }
+    }
+  else
+    {
+    // Remove everything but specified entry
+    const vgTimeStamp keep = iter.key();
+    iter = this->Buffer.begin();
+    while (iter != this->Buffer.end())
+      {
+      if (iter.key() == keep)
+        {
+        // Skip specified entry
+        ++iter;
+        }
+      else
+        {
+        // Erase other entries
+        delete *iter;
+        iter = this->Buffer.erase(iter);
+        }
+      }
+    // Update head
+    this->BufferHead = keep;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerBufferedRequestor::clearBuffer(bool keepLast)
+{
+  // Clear the buffer
+  qDeleteAll(this->Buffer);
+  this->Buffer.clear();
+
+  if (keepLast && this->LastFrameTime.IsValid())
+    {
+    // Add placeholder for the last frame seen
+    const vgTimeStamp ts = this->LastFrameTime.GetRawTimeStamp();
+    this->Buffer.insert(ts, 0);
+    this->BufferHead = this->BufferTail = ts;
+    }
+
+  // If we have outstanding buffer requests...
+  if (this->VideoSource && this->PendingBufferRequest.IsValid())
+    {
+    // ...clear our pending request and make an invalid request (which will
+    // either be a no-op, or will purge any outstanding buffer requests,
+    // depending on the source's processing order)
+    this->PendingBufferRequest.Reset();
+    this->issueBufferRequest();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vgVideoPlayerBufferedRequestor::isRequestWithinBuffer(
+  const vgTimeStamp& ts, vg::SeekMode direction)
+{
+  if (!this->Buffer.isEmpty())
+    {
+    const vgTimeStamp lower = this->Buffer.begin().key();
+    const vgTimeStamp upper = (this->Buffer.end() - 1).key();
+    if (ts == lower)
+      {
+      // If ts == lower, the request is within the buffer unless the seek
+      // direction == SeekPrevious
+      return direction != vg::SeekPrevious;
+      }
+    else if (ts == upper)
+      {
+      // Similar for upper
+      return direction != vg::SeekNext;
+      }
+    else
+      {
+      // For all other modes, lower <= ts <= upper will suffice
+      return lower <= ts && ts <= upper;
+      }
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vgVideoPlayerBufferedRequestor::isTimeStampBeforeBufferHead(
+  const vgTimeStamp& ts)
+{
+  return
+    (this->BufferFillDirection == vg::SeekNext ? ts < this->BufferHead :
+     this->BufferFillDirection == vg::SeekPrevious ? ts > this->BufferHead :
+     true);
+}
diff --git a/Libraries/VgVtkVideo/vgVideoPlayerBufferedRequestor.h b/Libraries/VgVtkVideo/vgVideoPlayerBufferedRequestor.h
new file mode 100644
index 00000000..ac4840d1
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoPlayerBufferedRequestor.h
@@ -0,0 +1,76 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoPlayerBufferedRequestor_h
+#define __vgVideoPlayerBufferedRequestor_h
+
+#include <vgTimeMap.h>
+
+#include "vgVideoPlayerRequestor.h"
+
+// CAUTION: This class is private to vgVideoPlayer; do not use it outside of
+//          the vgVtkVideo library
+
+class vgVideoPlayerBufferRequestor;
+
+class vgVideoPlayerBufferedRequestor : public vgVideoPlayerRequestor
+{
+  Q_OBJECT
+
+public:
+  static vgVideoPlayerBufferedRequestor* create();
+  virtual ~vgVideoPlayerBufferedRequestor();
+
+  void setBufferLimit(double maxTime, int maxFrames, qreal maxRate);
+
+  virtual void requestFrame(vgVideoSource*, vgVideoSeekRequest&);
+  virtual void setPlaybackRate(qreal);
+
+  virtual void update(vgVideoSeekRequest, vgVtkVideoFramePtr);
+
+  virtual void release();
+
+protected:
+  friend class vgVideoPlayerBufferRequestor;
+
+  typedef vtkVgVideoFrame* FramePointer;
+  typedef vgTimeMap<FramePointer> FrameBuffer;
+  typedef FrameBuffer::iterator FrameBufferIterator;
+
+  vgVideoPlayerBufferedRequestor();
+
+  void setVideoSource(vgVideoSource* source);
+  void releaseBufferRequestor();
+
+  void addFrameToBuffer(const vgVideoSeekRequest&, vgVtkVideoFramePtr frame);
+
+  void issueBufferRequest();
+  void fillBuffer();
+  void pruneBuffer(FrameBufferIterator iter, const vgTimeStamp& ref);
+  void clearBuffer(bool keepLast = false);
+
+  bool isRequestWithinBuffer(const vgTimeStamp&, vg::SeekMode);
+  bool isTimeStampBeforeBufferHead(const vgTimeStamp&);
+
+  vgVideoSource* VideoSource;
+
+  bool SourceLastFlushed;
+
+  FrameBuffer Buffer;
+  vgVideoPlayerBufferRequestor* BufferRequestor;
+  vtkVgTimeStamp PendingBufferRequest;
+  bool BufferingEnabled;
+
+  vg::SeekMode BufferFillDirection;
+  vgTimeStamp BufferHead;
+  vgTimeStamp BufferTail;
+
+  qreal BufferRateLimit;
+  double BufferTimeLimit;
+  int BufferFrameLimit;
+};
+
+#endif
diff --git a/Libraries/VgVtkVideo/vgVideoPlayerPrivate.h b/Libraries/VgVtkVideo/vgVideoPlayerPrivate.h
new file mode 100644
index 00000000..ffb5b2ec
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoPlayerPrivate.h
@@ -0,0 +1,93 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoPlayerPrivate_h
+#define __vgVideoPlayerPrivate_h
+
+#include <qtThread.h>
+
+#include <vgNamespace.h>
+
+#include "vgVideoAnimation.h"
+#include "vgVideoPlayer.h"
+#include "vgVideoSourceRequestor.h"
+
+class vgVideoPlayerRequestor;
+
+class vgVideoPlayerPrivate : public qtThread
+{
+  Q_OBJECT
+
+public:
+  virtual ~vgVideoPlayerPrivate();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vgVideoPlayer)
+
+  vgVideoPlayerPrivate(vgVideoPlayer* q);
+
+  virtual void run();
+
+  void debugPlayback(const char* msg);
+
+  vtkVgTimeStamp findTime(unsigned int frameNumber, vg::SeekMode);
+  void requestFrame(vgVideoSeekRequest);
+
+  void updatePlaybackMode(vgVideoPlayer::PlaybackMode, qreal rate);
+  void updatePublicPlaybackMode();
+
+protected slots:
+  void setDebugArea(qtDebugAreaAccessor);
+
+  void setSource(vgVideoSource*);
+  void setStreaming(bool);
+  void setFrameRange(vtkVgTimeStamp first, vtkVgTimeStamp last);
+
+  void setPlaybackSpeed(vgVideoPlayer::PlaybackMode, qreal rate);
+  void seekToTimestamp(qint64 requestId, vtkVgTimeStamp, vg::SeekMode);
+
+  void setLivePlaybackOffset(double);
+
+  void updateAnimationStatus(QAbstractAnimation::State);
+
+private:
+  Q_DISABLE_COPY(vgVideoPlayerPrivate)
+
+  class SuppressStateUpdates;
+
+  QTE_DECLARE_PUBLIC(vgVideoPlayer)
+  friend class vgVideoAnimation;
+  friend class SuppressStateUpdates;
+
+  // This set of variables are for use in the parent's thread ONLY
+  qtDebugAreaAccessor ParentDebugArea;
+  vgVideoPlayer::PlaybackMode ParentPlaybackMode;
+  qreal ParentPlaybackRate;
+  double ParentLivePlaybackOffset;
+
+  // Request callback object can be accessed from either thread
+  vgVideoPlayerRequestor* Requestor;
+  volatile bool RequestorFlag;
+
+  vgVideoSource* VideoSource;
+  vgVideoAnimation* Animation;
+  SuppressStateUpdates* StateUpdateSuppressor;
+  qtDebugAreaAccessor DebugArea;
+
+  vgVideoPlayer::PlaybackMode PlaybackMode;
+  qreal PlaybackRate;
+
+  bool AutoPlay;
+  bool AutoPause;
+  bool Streaming;
+
+  double LivePlaybackOffset;
+
+  vtkVgTimeStamp FirstFrameTimestamp;
+  vtkVgTimeStamp LastFrameTimestamp;
+};
+
+#endif
diff --git a/Libraries/VgVtkVideo/vgVideoPlayerRequestor.cxx b/Libraries/VgVtkVideo/vgVideoPlayerRequestor.cxx
new file mode 100644
index 00000000..ec199fd6
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoPlayerRequestor.cxx
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideoPlayerRequestor.h"
+
+#include <vgCheckArg.h>
+
+#include "vgVideoSource.h"
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerRequestor* vgVideoPlayerRequestor::create()
+{
+  return new vgVideoPlayerRequestor;
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerRequestor::vgVideoPlayerRequestor()
+{
+  this->Self = vgVideoSourceRequestorPtr(this);
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayerRequestor::~vgVideoPlayerRequestor()
+{
+  Q_ASSERT(this->Self.isNull()); // Must be released!
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerRequestor::release()
+{
+  this->disconnect();
+
+  // Remove ourselves from all event loops... this allows us (specifically, our
+  // base QObject) to be deleted from any thread, in case there are requests
+  // still hanging on to pointers to us
+  this->moveToThread(0);
+
+  // Release our internal pointer reference... this may cause our destructor to
+  // run immediately; if not, remaining references will be held by requestors
+  // and can be released asynchronously
+  // CAUTION: we may be deleted when this returns!
+  this->Self.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerRequestor::requestFrame(
+  vgVideoSource* source, vgVideoSeekRequest& request)
+{
+  CHECK_ARG(source);
+
+  request.Requestor = this->Self;
+  source->requestFrame(request);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerRequestor::setPlaybackRate(qreal)
+{
+  // Not implemented in base class
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoPlayerRequestor::update(
+  vgVideoSeekRequest seekRequest, vgVtkVideoFramePtr frame)
+{
+  if (frame)
+    {
+    this->LastFrameTime = frame->MetaData.Time;
+    emit this->frameAvailable(frame, seekRequest.RequestId);
+    }
+  else
+    {
+    emit this->seekRequestDiscarded(seekRequest.RequestId,
+                                    this->LastFrameTime);
+    }
+}
diff --git a/Libraries/VgVtkVideo/vgVideoPlayerRequestor.h b/Libraries/VgVtkVideo/vgVideoPlayerRequestor.h
new file mode 100644
index 00000000..14b966c5
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoPlayerRequestor.h
@@ -0,0 +1,43 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoPlayerRequestor_h
+#define __vgVideoPlayerRequestor_h
+
+#include "vgVideoSourceRequestor.h"
+
+class vgVideoSource;
+
+// CAUTION: This class is private to vgVideoPlayer; do not use it outside of
+//          the vgVtkVideo library
+
+class vgVideoPlayerRequestor : public vgVideoSourceRequestor
+{
+  Q_OBJECT
+
+public:
+  static vgVideoPlayerRequestor* create();
+  virtual ~vgVideoPlayerRequestor();
+
+  virtual void requestFrame(vgVideoSource*, vgVideoSeekRequest&);
+  virtual void setPlaybackRate(qreal);
+
+  virtual void update(vgVideoSeekRequest, vgVtkVideoFramePtr);
+
+  virtual void release();
+
+signals:
+  void frameAvailable(vgVtkVideoFramePtr frame, qint64 seekRequestId);
+  void seekRequestDiscarded(qint64 id, vtkVgTimeStamp lastFrameAvailable);
+
+protected:
+  vgVideoPlayerRequestor();
+
+  vgVideoSourceRequestorPtr Self;
+  vtkVgTimeStamp LastFrameTime;
+};
+
+#endif
diff --git a/Libraries/VgVtkVideo/vgVideoSeekRequest.cxx b/Libraries/VgVtkVideo/vgVideoSeekRequest.cxx
new file mode 100644
index 00000000..4c055887
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoSeekRequest.cxx
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vgVideoSourceRequestor.h"
+
+//-----------------------------------------------------------------------------
+vgVideoSeekRequest::vgVideoSeekRequest() :
+  RequestId(-1),
+  Direction(vg::SeekUnspecified)
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoSeekRequest::~vgVideoSeekRequest()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoSeekRequest::copyWithoutRequestor(const vgVideoSeekRequest& other)
+{
+  this->RequestId = other.RequestId;
+  this->TimeStamp = other.TimeStamp;
+  this->Direction = other.Direction;
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoSeekRequest::destructiveCopy(vgVideoSeekRequest& other)
+{
+  this->copyWithoutRequestor(other);
+  this->Requestor.swap(other.Requestor);
+}
+
+//-----------------------------------------------------------------------------
+void vgVideoSeekRequest::sendReply(vgVtkVideoFramePtr frame) const
+{
+  vgVideoSeekRequest strippedRequest;
+  strippedRequest.copyWithoutRequestor(*this);
+  QMetaObject::invokeMethod(this->Requestor.data(), "update",
+                            Q_ARG(vgVideoSeekRequest, strippedRequest),
+                            Q_ARG(vgVtkVideoFramePtr, frame));
+}
diff --git a/Libraries/VgVtkVideo/vgVideoSource.h b/Libraries/VgVtkVideo/vgVideoSource.h
new file mode 100644
index 00000000..8a0f1e9a
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoSource.h
@@ -0,0 +1,56 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoSource_h
+#define __vgVideoSource_h
+
+#include "vgVideoSourceRequestor.h"
+
+class vgVideoSource
+{
+public:
+  virtual ~vgVideoSource() {}
+
+  /// Find the time stamp for a given frame number.
+  ///
+  /// This method attempts to find time stamp that best matches a particular
+  /// frame number, using the requested search mode.
+  ///
+  /// \return The time stamp that best meets the request, or an invalid time
+  ///         stamp if there is no suitable match.
+  ///
+  /// \note This call is synchronous, but as there is no guarantee that the
+  ///       source lives in the thread as potential users, this method may
+  ///       block while the request is handled by another thread.
+  virtual vtkVgTimeStamp findTime(unsigned int frameNumber, vg::SeekMode) = 0;
+
+  /// Request a video frame.
+  ///
+  /// This method issues a request for a video frame, which may execute
+  /// asynchronously. The source will answer the request by invoking a well
+  /// known method on the requestor object, passing along the request ID given
+  /// in the original request. If the request cannot be satisfied, the callback
+  /// method will be invoked with a null pointer for the frame data.
+  ///
+  /// \note The source may also choose to ignore requests if the result of the
+  ///       request would be the same as the most recently answered request, or
+  ///       if additional requests have been received before the source is able
+  ///       to respond to earlier requests.
+  ///
+  /// \sa clearLastRequest
+  virtual void requestFrame(vgVideoSeekRequest) = 0;
+
+  /// Discard notion of last request answered.
+  ///
+  /// This method instructs a source to discard its notion of the last frame
+  /// that it provided to the specified requestor. This is useful if the last
+  /// received frame becomes unavailable (e.g. when using a secondary requestor
+  /// to fill a look-ahead buffer), to allow the requestor to re-request the
+  /// same frame.
+  virtual void clearLastRequest(vgVideoSourceRequestor*) = 0;
+};
+
+#endif
diff --git a/Libraries/VgVtkVideo/vgVideoSourceRequestor.h b/Libraries/VgVtkVideo/vgVideoSourceRequestor.h
new file mode 100644
index 00000000..09c47b23
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVideoSourceRequestor.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVideoSourceRequestor_h
+#define __vgVideoSourceRequestor_h
+
+#include <QObject>
+#include <QSharedPointer>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+
+#include <vtkVgTimeStamp.h>
+
+#include "vgVtkVideoFrame.h"
+
+class vgVideoSourceRequestor;
+
+//-----------------------------------------------------------------------------
+typedef QSharedPointer<vgVideoSourceRequestor> vgVideoSourceRequestorPtr;
+
+struct VG_VTKVIDEO_EXPORT vgVideoSeekRequest
+{
+  vgVideoSeekRequest();
+  ~vgVideoSeekRequest();
+
+  /// Copy another request, except for the requestor.
+  ///
+  /// This method is more efficient than a normal copy when the requestor is
+  /// not needed in the new request (e.g. when issuing the reply), since it
+  /// avoids the overhead of atomic reference counting operations.
+  void copyWithoutRequestor(const vgVideoSeekRequest& other);
+
+  /// Copy another request, destructively.
+  ///
+  /// This method copies another request in a manner that is less expensive
+  /// than a normal copy, but causes the other request to become invalid. This
+  /// should be used when the other request can or will be discarded after the
+  /// copy is made.
+  ///
+  /// This method works by calling ::copyWithoutRequestor, then swapping the
+  /// requestor pointer with \p other, thereby reducing the number of atomic
+  /// reference counting operations that must be performed.
+  void destructiveCopy(vgVideoSeekRequest& other);
+
+  /// Send reply to the request.
+  ///
+  /// This method invokes vgVideoSourceRequestor::update on the requestor,
+  /// giving back the \p frame and a copy of this request. If the requestor's
+  /// event loop is running in a thread other than the current thread, the
+  /// update will be delivered asynchronously.
+  void sendReply(vgVtkVideoFramePtr frame) const;
+
+  vgVideoSourceRequestorPtr Requestor;
+  qint64 RequestId;
+  vtkVgTimeStamp TimeStamp;
+  vg::SeekMode Direction;
+};
+
+//-----------------------------------------------------------------------------
+class VG_VTKVIDEO_EXPORT vgVideoSourceRequestor : public QObject
+{
+  Q_OBJECT
+
+public:
+  virtual ~vgVideoSourceRequestor() {}
+
+protected slots:
+  virtual void update(vgVideoSeekRequest, vgVtkVideoFramePtr) = 0;
+
+protected:
+  vgVideoSourceRequestor() {}
+
+private:
+  Q_DISABLE_COPY(vgVideoSourceRequestor)
+};
+
+#endif
diff --git a/Libraries/VgVtkVideo/vgVtkVideoFrame.h b/Libraries/VgVtkVideo/vgVtkVideoFrame.h
new file mode 100644
index 00000000..f7fe1809
--- /dev/null
+++ b/Libraries/VgVtkVideo/vgVtkVideoFrame.h
@@ -0,0 +1,16 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vgVtkVideoFrame_h
+#define __vgVtkVideoFrame_h
+
+#include <qtTransferablePointer.h>
+
+#include <vtkVgVideoFrame.h>
+
+typedef qtTransferablePointer<vtkVgVideoFrame> vgVtkVideoFramePtr;
+
+#endif
diff --git a/Libraries/VspData/CMakeLists.txt b/Libraries/VspData/CMakeLists.txt
new file mode 100644
index 00000000..501276dd
--- /dev/null
+++ b/Libraries/VspData/CMakeLists.txt
@@ -0,0 +1,92 @@
+project(vspData)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(vspData_Sources
+    # Service core
+    vsSourceFactoryInterface.cxx
+    vsSourceService.cxx
+    # Data sources
+    vsDataSource.cxx
+    vsVideoSource.cxx
+    vsSimpleSourceFactory.cxx
+    vsSourceFactory.cxx
+    vsStaticSourceFactory.cxx
+    # Live descriptors
+    vsLiveDescriptor.cxx
+    # Supporting code
+    vsContour.cxx
+    vsDescriptorInput.cxx
+    vsEventInfo.cxx
+    vsLibDebug.cxx
+    vsTrackInfo.cxx
+    vtkVsTrackInfo.cxx
+)
+
+set(vspData_MocHeaders
+    # Live descriptors
+    vsLiveDescriptor.h
+    vsLiveDescriptorPrivate.h
+    # Data sources
+    vsDataSource.h
+    vsVideoSource.h
+    vsVideoSourcePrivate.h
+    vsTrackSource.h
+    vsDescriptorSource.h
+)
+
+set(vspDataInstallHeaders
+  vsArchiveSourceInfo.h
+  vsArchiveSourceInterface.h
+  vsContour.h
+  vsDataSource.h
+  vsDescriptor.h
+  vsDescriptorInput.h
+  vsDescriptorSource.h
+  vsEvent.h
+  vsEventInfo.h
+  vsFactoryAction.h
+  vsLiveDescriptor.h
+  vsLiveDescriptorPrivate.h
+  vsSimpleSourceFactory.h
+  vsSourceFactory.h
+  vsSourceFactoryInterface.h
+  vsSourceService.h
+  vsStaticSourceFactory.h
+  vsTrackClassifier.h
+  vsTrackData.h
+  vsTrackInfo.h
+  vsTrackSource.h
+  vsTrackState.h
+  vsVideoSource.h
+  vsVideoSourcePrivate.h
+  vtkVsTrackInfo.h
+)
+
+qt4_wrap_cpp(vspData_MocSources ${vspData_MocHeaders})
+
+add_library(${PROJECT_NAME}
+  ${vspData_Sources}
+  ${vspData_MocSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  qtExtensions
+  qtVgCommon
+  vgVideo
+  vtkVgCore
+  vvIO
+  vgVtkVideo
+  vvVtkWidgets
+  LINK_LIBRARIES
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vspDataInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VspData)
diff --git a/Libraries/VspData/vsArchiveSourceInfo.h b/Libraries/VspData/vsArchiveSourceInfo.h
new file mode 100644
index 00000000..0aaf9d58
--- /dev/null
+++ b/Libraries/VspData/vsArchiveSourceInfo.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsArchiveSourceInfo_h
+#define __vsArchiveSourceInfo_h
+
+#include <QStringList>
+
+//-----------------------------------------------------------------------------
+struct vsArchiveFileType
+{
+  QString Description;
+  QStringList Patterns;
+};
+
+//-----------------------------------------------------------------------------
+struct vsArchivePluginInfo
+{
+  QList<vsArchiveFileType> SupportedFileTypes;
+};
+
+//-----------------------------------------------------------------------------
+namespace vs
+{
+  enum ArchiveSourceType
+    {
+    ArchiveVideoSource      = 0x1,
+    ArchiveTrackSource      = 0x2,
+    ArchiveDescriptorSource = 0x4
+    };
+  Q_DECLARE_FLAGS(ArchiveSourceTypes, ArchiveSourceType)
+}
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vs::ArchiveSourceTypes)
+
+typedef vs::ArchiveSourceType vsArchiveSourceType;
+typedef vs::ArchiveSourceTypes vsArchiveSourceTypes;
+
+#endif
diff --git a/Libraries/VspData/vsArchiveSourceInterface.cxx b/Libraries/VspData/vsArchiveSourceInterface.cxx
new file mode 100644
index 00000000..0fd85406
--- /dev/null
+++ b/Libraries/VspData/vsArchiveSourceInterface.cxx
@@ -0,0 +1,77 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsSourceFactoryInterface.h"
+
+#include <QApplication>
+#include <QVariant>
+
+#include "vsFactoryAction.h"
+
+namespace { const char* keyActionDisplayGroup = "vsData_ActionDisplayGroup"; }
+
+//-----------------------------------------------------------------------------
+vsSourceFactoryInterface::~vsSourceFactoryInterface()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsSourceFactoryInterface::settingsKey() const
+{
+  return QString("SourceFactory/Create%1").arg(this->identifier());
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryInterface::registerFactoryCliOptions(qtCliOptions& options)
+{
+  Q_UNUSED(options);
+}
+
+//-----------------------------------------------------------------------------
+QList<vsPendingFactoryAction> vsSourceFactoryInterface::parseFactoryArguments(
+  const qtCliArgs& args)
+{
+  Q_UNUSED(args);
+  return QList<vsPendingFactoryAction>();
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryInterface::registerActions()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryInterface::createActions(
+  QObject* parent, QSignalMapper* signalMapper,
+  qtPrioritizedMenuProxy& videoMenu,
+  qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  Q_UNUSED(parent);
+  Q_UNUSED(signalMapper);
+  Q_UNUSED(videoMenu);
+  Q_UNUSED(trackMenu);
+  Q_UNUSED(descriptorMenu);
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactory* vsSourceFactoryInterface::createFactory()
+{
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+QString vsSourceFactoryInterface::actionDisplayGroup()
+{
+  QVariant value = qApp->property(keyActionDisplayGroup);
+  return (value.isNull() ? QString("Sources") : value.toString());
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryInterface::setActionDisplayGroup(const QString& value)
+{
+  qApp->setProperty(keyActionDisplayGroup, value);
+}
diff --git a/Libraries/VspData/vsArchiveSourceInterface.h b/Libraries/VspData/vsArchiveSourceInterface.h
new file mode 100644
index 00000000..2b763c87
--- /dev/null
+++ b/Libraries/VspData/vsArchiveSourceInterface.h
@@ -0,0 +1,84 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsArchiveSourceInterface_h
+#define __vsArchiveSourceInterface_h
+
+#include <QtPlugin>
+
+#include "vsArchiveSourceInfo.h"
+
+class QUrl;
+
+class vsSimpleSourceFactory;
+
+//-----------------------------------------------------------------------------
+/// Interface for an archive source plugin.
+///
+/// This class defines the public interface for an archive source plugin.
+class vsArchiveSourceInterface
+{
+public:
+  /// Mode in which source creation should operate.
+  enum SourceCreateMode
+    {
+    /// Quick archive validation.
+    ///
+    /// This mode specifies that the plugin should make a quick, educated guess
+    /// if it supports the specified archive, and fail otherwise. Usually this
+    /// means simply checking if the archive is a file name matching a well
+    /// known pattern supported by the plugin. This is meant to prevent a
+    /// plugin from trying overly hard to process an archive it does not
+    /// support in order to allow other plugins a chance to accept the archive.
+    /// A quick attempt should be followed by a thorough attempt before the
+    /// archive is accepted.
+    ///
+    /// This mode is used first by ::vsSourceService::createArchiveSource.
+    QuickTest,
+    /// Thorough archive validation.
+    ///
+    /// This mode specifies that the plugin should make a thorough attempt to
+    /// process the archive, rather than relying on quick checks. This is meant
+    /// to overcome problems such as an incorrectly formatted file name.
+    ///
+    /// This mode is used by ::vsSourceService::createArchiveSource after all
+    /// plugins have been asked to process the archive in ::QuickTest mode, but
+    /// none accepted the archive.
+    ThoroughTest
+    };
+
+  virtual ~vsArchiveSourceInterface() {}
+
+  /// Get set of archive types supported by plugin.
+  ///
+  /// This method returns the set of archive types that the plugin services.
+  virtual vsArchiveSourceTypes archiveTypes() const = 0;
+
+  /// Get plugin information.
+  ///
+  /// This method returns a ::vsArchivePluginInfo structure describing the
+  /// plugin (in particular, what file formats the plugin supports). The
+  /// \p type of source is provided as a hint to allow plugins supporting more
+  /// than one source type to return information specific to the \p type being
+  /// queried.
+  virtual vsArchivePluginInfo archivePluginInfo(
+    vsArchiveSourceType type) const = 0;
+
+  /// Create data sources, if the archive is supported.
+  ///
+  /// This method requests that the plugin create sources for the specified
+  /// \p archive. The plugin should test if the \p archive is of a type that it
+  /// supports, and if not, return null. The assumed \p type of archive is
+  /// provided as a hint in case the plugin supports multiple source types and
+  /// needs to know what type the user asked to open for proper behavior.
+  virtual vsSimpleSourceFactory* createArchiveSource(
+    vsArchiveSourceType type, const QUrl& archive, SourceCreateMode) = 0;
+};
+
+Q_DECLARE_INTERFACE(vsArchiveSourceInterface,
+                    "org.visgui.vsArchiveSourceInterface")
+
+#endif
diff --git a/Libraries/VspData/vsContour.cxx b/Libraries/VspData/vsContour.cxx
new file mode 100644
index 00000000..58638584
--- /dev/null
+++ b/Libraries/VspData/vsContour.cxx
@@ -0,0 +1,134 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsContour.h"
+
+#include <QComboBox>
+
+QTE_IMPLEMENT_D_FUNC_SHARED(vsContour)
+
+//-----------------------------------------------------------------------------
+class vsContourData : public QSharedData
+{
+public:
+  int Id;
+  vsContour::Type Type;
+  QString Name;
+  QPolygonF Points;
+};
+
+//-----------------------------------------------------------------------------
+bool vsContour::isLoopType(vsContour::Type t)
+{
+  return (t == vsContour::Filter || t == vsContour::Selector);
+}
+
+//-----------------------------------------------------------------------------
+vsContour::vsContour(int id, Type type, QPolygonF points, QString name)
+  : d_ptr(new vsContourData)
+{
+  QTE_D_MUTABLE(vsContour);
+  d->Id = id;
+  d->Type = type;
+  d->Name = name;
+  d->Points = points;
+}
+
+//-----------------------------------------------------------------------------
+vsContour::vsContour(const vsContour& other)
+  : d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsContour& vsContour::operator=(const vsContour& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vsContour::~vsContour()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsContour::populateTypeWidget(QComboBox* box)
+{
+  for (int i = vsContour::Annotation; i < vsContour::NoType; ++i)
+    {
+    vsContour::Type t = static_cast<vsContour::Type>(i);
+    box->addItem(vsContour::typeString(t),
+                 QVariant::fromValue<vsContour::Type>(t));
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vsContour::typeString(vsContour::Type type)
+{
+  switch (type)
+    {
+    case vsContour::Annotation:
+      return "Annotation";
+    case vsContour::Tripwire:
+      return "Tripwire";
+    case vsContour::Filter:
+      return "Filter";
+    case vsContour::Selector:
+      return "Selector";
+    default:
+      return "(unknown)";
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vsContour::id() const
+{
+  QTE_D_SHARED(vsContour);
+  return d->Id;
+}
+
+//-----------------------------------------------------------------------------
+vsContour::Type vsContour::type() const
+{
+  QTE_D_SHARED(vsContour);
+  return d->Type;
+}
+
+//-----------------------------------------------------------------------------
+QString vsContour::name() const
+{
+  QTE_D_SHARED(vsContour);
+  return d->Name;
+}
+
+//-----------------------------------------------------------------------------
+QPolygonF vsContour::points() const
+{
+  QTE_D_SHARED(vsContour);
+  return d->Points;
+}
+
+//-----------------------------------------------------------------------------
+void vsContour::setType(vsContour::Type type)
+{
+  QTE_D_MUTABLE(vsContour);
+  d->Type = type;
+}
+
+//-----------------------------------------------------------------------------
+void vsContour::setName(const QString& name)
+{
+  QTE_D_MUTABLE(vsContour);
+  d->Name = name;
+}
+
+//-----------------------------------------------------------------------------
+void vsContour::setPoints(const QPolygonF& points)
+{
+  QTE_D_MUTABLE(vsContour);
+  d->Points = points;
+}
diff --git a/Libraries/VspData/vsContour.h b/Libraries/VspData/vsContour.h
new file mode 100644
index 00000000..91f58fc6
--- /dev/null
+++ b/Libraries/VspData/vsContour.h
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsContour_h
+#define __vsContour_h
+
+#include <QPolygonF>
+#include <QSharedDataPointer>
+#include <QVariant>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class QComboBox;
+
+class vsContourData;
+
+class VSP_DATA_EXPORT vsContour
+{
+public:
+  enum Type
+    {
+    Annotation,
+    Tripwire,
+    Filter,
+    Selector,
+    NoType // keep last
+    };
+
+  static bool isLoopType(Type);
+
+  vsContour(int id = -1, Type type = NoType, QPolygonF points = QPolygonF(),
+            QString name = QString());
+  vsContour(const vsContour&);
+  ~vsContour();
+
+  vsContour& operator=(const vsContour&);
+
+  static void populateTypeWidget(QComboBox*);
+  static QString typeString(Type);
+
+  int id() const;
+  Type type() const;
+  QString name() const;
+  QPolygonF points() const;
+
+  void setType(Type);
+  void setName(const QString&);
+  void setPoints(const QPolygonF&);
+
+protected:
+  QTE_DECLARE_SHARED_PTR(vsContour)
+
+private:
+  QTE_DECLARE_SHARED(vsContour)
+};
+
+Q_DECLARE_METATYPE(vsContour::Type)
+
+#endif
diff --git a/Libraries/VspData/vsDataSource.cxx b/Libraries/VspData/vsDataSource.cxx
new file mode 100644
index 00000000..6e556c82
--- /dev/null
+++ b/Libraries/VspData/vsDataSource.cxx
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsDataSource.h"
+
+//-----------------------------------------------------------------------------
+vsDataSource::vsDataSource()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::~vsDataSource()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsDataSource::start()
+{
+  // NOTE: The implementation should accept ::start() being called more than
+  //       once!
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsDataSource::status() const
+{
+  return NoSource;
+}
+
+//-----------------------------------------------------------------------------
+QString vsDataSource::text() const
+{
+  return QString();
+}
+
+//-----------------------------------------------------------------------------
+QString vsDataSource::toolTip() const
+{
+  return QString();
+}
diff --git a/Libraries/VspData/vsDataSource.h b/Libraries/VspData/vsDataSource.h
new file mode 100644
index 00000000..43102e7c
--- /dev/null
+++ b/Libraries/VspData/vsDataSource.h
@@ -0,0 +1,63 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsDataSource_h
+#define __vsDataSource_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class VSP_DATA_EXPORT vsDataSource : public QObject
+{
+  Q_OBJECT
+
+public:
+  enum Status
+    {
+    NoSource                            = 0x000,
+    StreamingPending                    = 0x101,
+    StreamingIdle                       = 0x102,
+    StreamingActive                     = 0x103,
+    StreamingStopped                    = 0x100,
+    InProcessIdle                       = 0x200,
+    InProcessActive                     = 0x203,
+    ArchivedIdle                        = 0x400,
+    ArchivedActive                      = 0x403,
+    ArchivedSuspended                   = 0x402,
+    MultipleSources                     = 0x800,
+    MultipleSourcesStreaming            = 0x900,
+    MultipleSourcesInProcess            = 0xA00,
+    MultipleSourcesStreamingInProcess   = 0xB00,
+    MultipleSourcesArchived             = 0xC00,
+    MultipleSourcesStreamingArchived    = 0xD00,
+    MultipleSourcesInProcessArchived    = 0xE00,
+    MultipleSourcesAll                  = 0xF00
+    };
+
+  static const int SourceTypeMask       = 0x700;
+
+  virtual ~vsDataSource();
+
+  virtual void start();
+
+  virtual Status status() const;
+  virtual QString text() const;
+  virtual QString toolTip() const;
+
+signals:
+  void statusChanged(vsDataSource::Status);
+
+protected:
+  vsDataSource();
+
+private:
+  QTE_DISABLE_COPY(vsDataSource)
+};
+
+#endif
diff --git a/Libraries/VspData/vsDescriptor.h b/Libraries/VspData/vsDescriptor.h
new file mode 100644
index 00000000..31f0d120
--- /dev/null
+++ b/Libraries/VspData/vsDescriptor.h
@@ -0,0 +1,18 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsDescriptor_h
+#define __vsDescriptor_h
+
+#include <qtTransferablePointer.h>
+#include <qtTransferablePointerArray.h>
+
+struct vvDescriptor;
+
+typedef qtTransferablePointer<vvDescriptor> vsDescriptor;
+typedef qtTransferablePointerArray<vvDescriptor> vsDescriptorList;
+
+#endif
diff --git a/Libraries/VspData/vsDescriptorInput.cxx b/Libraries/VspData/vsDescriptorInput.cxx
new file mode 100644
index 00000000..4469cde5
--- /dev/null
+++ b/Libraries/VspData/vsDescriptorInput.cxx
@@ -0,0 +1,252 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsDescriptorInput.h"
+
+#include <QPolygonF>
+#include <QScopedPointer>
+
+#include <vvQuery.h>
+#include <vvTrack.h>
+
+#include <vtkImageData.h>
+
+#include <vgTimeStamp.h>
+
+#include <vtkVgVideoFrameMetaData.h>
+
+#include "vsContour.h"
+#include "vsEvent.h"
+#include "vsTrackClassifier.h"
+#include "vsTrackState.h"
+
+QTE_IMPLEMENT_D_FUNC(vsDescriptorInput)
+
+//-----------------------------------------------------------------------------
+class vsDescriptorInputPrivate
+{
+public:
+  vsDescriptorInput::Type Type;
+
+  QScopedPointer<const vtkVgVideoFrameMetaData> FrameMetaData;
+
+  QScopedPointer<const vvTrackId> TrackId;
+  QScopedPointer<const vsTrackState> TrackState;
+  QScopedPointer<const vsTrackObjectClassifier> TrackClassifier;
+
+  QScopedPointer<const vsEvent> Event;
+  QScopedPointer<const vsEventId> EventId;
+
+  QScopedPointer<const vvIqr::Classification> Rating;
+  QScopedPointer<const QString> Note;
+  QScopedPointer<const vgTimeStamp> NoteStartTime;
+  QScopedPointer<const vgTimeStamp> NoteEndTime;
+
+  QScopedPointer<const vsContour> Contour;
+
+  QScopedPointer<vvSimilarityQuery> Query;
+  QScopedPointer<const int> QueryId;
+};
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::~vsDescriptorInput()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::Type vsDescriptorInput::type() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->Type;
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vtkVgVideoFrameMetaData& metaData) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::FrameMetaData;
+  d->FrameMetaData.reset(new vtkVgVideoFrameMetaData(metaData));
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vvTrackId& closedTrack) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::TrackClosure;
+  d->TrackId.reset(new vvTrackId(closedTrack));
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vvTrackId& id,
+                                     const vsTrackState& data) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::TrackUpdate;
+  d->TrackId.reset(new vvTrackId(id));
+  d->TrackState.reset(new vsTrackState(data));
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vvTrackId& id,
+                                     const vsTrackObjectClassifier& data) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::TrackObjectClassifier;
+  d->TrackId.reset(new vvTrackId(id));
+  d->TrackClassifier.reset(new vsTrackObjectClassifier(data));
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vsEvent& data, const vsEventId& id) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::Event;
+  d->Event.reset(new vsEvent(data));
+  d->EventId.reset(new vsEventId(id));
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vsEventId& id,
+                                     const vvIqr::Classification& data) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::EventRating;
+  d->EventId.reset(new vsEventId(id));
+  d->Rating.reset(new vvIqr::Classification(data));
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vsEventId& id,
+                                     const QString& note,
+                                     const vgTimeStamp& startTime,
+                                     const vgTimeStamp& endTime) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::EventNote;
+  d->EventId.reset(new vsEventId(id));
+  d->Note.reset(new QString(note));
+  d->NoteStartTime.reset(
+    new vgTimeStamp(startTime.Time, startTime.FrameNumber));
+  d->NoteEndTime.reset(
+    new vgTimeStamp(endTime.Time, endTime.FrameNumber));
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vsContour& contour) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::Contour;
+  d->Contour.reset(new vsContour(contour));
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::vsDescriptorInput(const vvSimilarityQuery& data, int id) :
+  d_ptr(new vsDescriptorInputPrivate)
+{
+  QTE_D(vsDescriptorInput);
+  d->Type = vsDescriptorInput::Query;
+  d->Query.reset(new vvSimilarityQuery(data));
+  d->QueryId.reset(new int(id));
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgVideoFrameMetaData* vsDescriptorInput::frameMetaData() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->FrameMetaData.data();
+}
+
+//-----------------------------------------------------------------------------
+const vvTrackId* vsDescriptorInput::trackId() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->TrackId.data();
+}
+
+//-----------------------------------------------------------------------------
+const vsTrackState* vsDescriptorInput::trackState() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->TrackState.data();
+}
+
+//-----------------------------------------------------------------------------
+const vsTrackObjectClassifier* vsDescriptorInput::trackClassifier() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->TrackClassifier.data();
+}
+
+//-----------------------------------------------------------------------------
+const vsContour* vsDescriptorInput::contour() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->Contour.data();
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgEventBase* vsDescriptorInput::event() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return (d->Event ? d->Event.data()->GetVolatileConstPointer() : 0);
+}
+
+//-----------------------------------------------------------------------------
+const vsEventId* vsDescriptorInput::eventId() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->EventId.data();
+}
+
+//-----------------------------------------------------------------------------
+const vvIqr::Classification* vsDescriptorInput::rating() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->Rating.data();
+}
+
+//-----------------------------------------------------------------------------
+const QString* vsDescriptorInput::note() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->Note.data();
+}
+
+//-----------------------------------------------------------------------------
+const vgTimeStamp* vsDescriptorInput::noteStartTime() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->NoteStartTime.data();
+}
+
+//-----------------------------------------------------------------------------
+const vgTimeStamp* vsDescriptorInput::noteEndTime() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->NoteEndTime.data();
+}
+
+//-----------------------------------------------------------------------------
+const vvSimilarityQuery* vsDescriptorInput::query() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->Query.data();
+}
+
+//-----------------------------------------------------------------------------
+const int* vsDescriptorInput::queryId() const
+{
+  QTE_D_CONST(vsDescriptorInput);
+  return d->QueryId.data();
+}
diff --git a/Libraries/VspData/vsDescriptorInput.h b/Libraries/VspData/vsDescriptorInput.h
new file mode 100644
index 00000000..4f4cdbef
--- /dev/null
+++ b/Libraries/VspData/vsDescriptorInput.h
@@ -0,0 +1,109 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsDescriptorInput_h
+#define __vsDescriptorInput_h
+
+#include <QScopedPointer>
+#include <QSharedPointer>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvIqr.h>
+
+class QPolygonF;
+
+struct vvSimilarityQuery;
+struct vvTrackId;
+
+class vtkImageData;
+
+struct vgTimeStamp;
+
+class vtkVgEventBase;
+struct vtkVgVideoFrameMetaData;
+
+class vsContour;
+class vsEvent;
+struct vsEventId;
+struct vsTrackObjectClassifier;
+struct vsTrackState;
+
+class vsDescriptorInputPrivate;
+
+class VSP_DATA_EXPORT vsDescriptorInput
+{
+public:
+  enum Type
+    {
+    NoType = 0,
+    TrackUpdate = 0x1,
+    TrackClosure = 0x2,
+    TrackObjectClassifier = 0x8,
+    Event = 0x10,
+    FrameMetaData = 0x40,
+    EventRating = 0x100,
+    EventNote = 0x200,
+    Contour = 0x1000,
+    Query = 0x2000
+    };
+  Q_DECLARE_FLAGS(Types, Type)
+
+  ~vsDescriptorInput();
+
+  Type type() const;
+
+  // constructors
+  explicit vsDescriptorInput(const vtkVgVideoFrameMetaData& metaData);
+  explicit vsDescriptorInput(const vvTrackId& closedTrack);
+  explicit vsDescriptorInput(const vvTrackId&,
+                             const vsTrackState&);
+  explicit vsDescriptorInput(const vvTrackId&,
+                             const vsTrackObjectClassifier&);
+
+  explicit vsDescriptorInput(const vsEvent&, const vsEventId&);
+
+  explicit vsDescriptorInput(const vsEventId&, const vvIqr::Classification&);
+  explicit vsDescriptorInput(const vsEventId&, const QString&,
+                             const vgTimeStamp&, const vgTimeStamp&);
+
+  explicit vsDescriptorInput(const vsContour&);
+  explicit vsDescriptorInput(const vvSimilarityQuery&, int id);
+
+  // accessors
+  const vtkVgVideoFrameMetaData*    frameMetaData() const;
+  const vvTrackId*                  trackId() const;
+  const vsTrackState*               trackState() const;
+  const vsTrackObjectClassifier*    trackClassifier() const;
+
+  const vsContour*                  contour() const;
+
+  const vtkVgEventBase*             event() const;
+  const vsEventId*                  eventId() const;
+
+  const vvIqr::Classification*      rating() const;
+  const QString*                    note() const;
+  const vgTimeStamp*                noteStartTime() const;
+  const vgTimeStamp*                noteEndTime() const;
+
+  const vvSimilarityQuery*          query() const;
+  const int*                        queryId() const;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsDescriptorInput)
+
+private:
+  QTE_DECLARE_PRIVATE(vsDescriptorInput)
+  QTE_DISABLE_COPY(vsDescriptorInput)
+};
+
+typedef QSharedPointer<const vsDescriptorInput> vsDescriptorInputPtr;
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vsDescriptorInput::Types)
+
+#endif
diff --git a/Libraries/VspData/vsDescriptorSource.h b/Libraries/VspData/vsDescriptorSource.h
new file mode 100644
index 00000000..75062c48
--- /dev/null
+++ b/Libraries/VspData/vsDescriptorSource.h
@@ -0,0 +1,80 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsDescriptorSource_h
+#define __vsDescriptorSource_h
+
+#include <vgExport.h>
+
+#include <vvDescriptor.h>
+#include <vvTrack.h>
+
+#include "vsDataSource.h"
+#include "vsDescriptor.h"
+#include "vsEvent.h"
+#include "vsEventInfo.h"
+#include "vsTrackClassifier.h"
+
+#include "vsDescriptorInput.h"
+
+class VSP_DATA_EXPORT vsDescriptorSource : public vsDataSource
+{
+  Q_OBJECT
+
+public:
+  virtual ~vsDescriptorSource() {}
+
+  virtual vsDescriptorInput::Types inputAccepted() const
+    { return vsDescriptorInput::NoType; }
+
+signals:
+  void readyForInput(vsDescriptorSource* source);
+
+  void eventTypeAvailable(vsDescriptorSource* source, vsEventInfo info,
+                          double initialFilterThreshold);
+  void eventGroupExpected(vsEventInfo::Group);
+
+  void descriptorAvailable(vsDescriptorSource* source, vsDescriptor ds);
+  void descriptorsAvailable(vsDescriptorSource* source, vsDescriptorList dl);
+  void eventAvailable(vsDescriptorSource* source, vsEvent event);
+  void eventRevoked(vsDescriptorSource* source, vtkIdType eventId);
+
+  void tocAvailable(vvTrackId trackId, vsTrackObjectClassifier toc);
+
+  void destroyed(vsDescriptorSource*);
+
+public slots:
+  virtual void injectInput(qint64 id, vsDescriptorInputPtr input)
+    { Q_UNUSED(id); Q_UNUSED(input); }
+
+  virtual void revokeInput(qint64 id, bool revokeEvents)
+    { Q_UNUSED(id); Q_UNUSED(revokeEvents); }
+
+  virtual void revokeAllInput(bool revokeEvents)
+    { Q_UNUSED(revokeEvents); }
+
+protected slots:
+  void emitEventType(vsEventInfo info, double initialFilterThreshold)
+    { emit this->eventTypeAvailable(this, info, initialFilterThreshold); }
+  void emitDescriptor(vsDescriptor ds)
+    { emit this->descriptorAvailable(this, ds); }
+  void emitDescriptors(vsDescriptorList dl)
+    { emit this->descriptorsAvailable(this, dl); }
+  void emitEvent(vsEvent event)
+    { emit this->eventAvailable(this, event); }
+  void revokeEvent(vtkIdType id)
+    { emit this->eventRevoked(this, id); }
+
+protected:
+  vsDescriptorSource() {}
+
+  void suicide() { emit this->destroyed(this); }
+
+private:
+  QTE_DISABLE_COPY(vsDescriptorSource)
+};
+
+#endif
diff --git a/Libraries/VspData/vsEvent.h b/Libraries/VspData/vsEvent.h
new file mode 100644
index 00000000..445be6a7
--- /dev/null
+++ b/Libraries/VspData/vsEvent.h
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEvent_h
+#define __vsEvent_h
+
+#include <QUuid>
+
+#include <vtkVgEventBase.h>
+#include <vtkVgSharedInstance.h>
+
+class vsDescriptorSource;
+
+class vsEvent : public vtkVgSharedInstance<vtkVgEventBase>
+{
+public:
+  vsEvent(const QUuid& u) : UniqueId(u) {}
+
+  QUuid GetUniqueId() const { return this->UniqueId; }
+  void SetUniqueId(const QUuid& u) { this->UniqueId = u; }
+
+protected:
+  // Default construction allowed only through Qt's meta-type system, to allow
+  // use as QVariant; direct users must specify a UUID
+  template <typename T> friend void *qMetaTypeConstructHelper(const T *t);
+
+  vsEvent() {}
+
+  QUuid UniqueId;
+};
+
+struct vsEventId
+{
+  vsEventId()
+    : GlobalId(-1), SourceId(-1), Source(0) {}
+  vsEventId(const QUuid& uid, vtkIdType gid,
+            vtkIdType sid, const vsDescriptorSource* s)
+    : UniqueId(uid), GlobalId(gid), SourceId(sid), Source(s) {}
+
+  QUuid UniqueId;
+  vtkIdType GlobalId;
+  vtkIdType SourceId;
+  const vsDescriptorSource* Source;
+};
+
+#endif
diff --git a/Libraries/VspData/vsEventInfo.cxx b/Libraries/VspData/vsEventInfo.cxx
new file mode 100644
index 00000000..d40056df
--- /dev/null
+++ b/Libraries/VspData/vsEventInfo.cxx
@@ -0,0 +1,230 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventInfo.h"
+
+#include <QColor>
+#include <QSettings>
+
+#include <qtScopedSettingGroup.h>
+
+#include <vgEventType.h>
+
+#include <vvEventSetInfo.h>
+
+#include <vvEventInfo.h>
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+struct EventInfoTemplate
+{
+  int type;
+  const char* name;
+  unsigned char color[6];
+};
+
+//-----------------------------------------------------------------------------
+static const EventInfoTemplate emptyEventTemplate =
+{
+  0, 0, { 240, 240, 240, 112, 112, 112 }
+};
+
+static const EventInfoTemplate eventsGeneral[] =
+{
+  { vsEventInfo::Tripwire,        "Tripwire",
+    { 240, 240, 240, 112, 112, 112 } },
+  { vsEventInfo::EnteringRegion,  "Entering Region",
+    { 240, 240, 240, 112, 112, 112 } },
+  { vsEventInfo::ExitingRegion,   "Exiting Region",
+    { 240, 240, 240, 112, 112, 112 } },
+  emptyEventTemplate
+};
+
+static const EventInfoTemplate eventsUser[] =
+{
+  emptyEventTemplate
+};
+
+//-----------------------------------------------------------------------------
+void loadColor(QSettings& settings, double (&color)[3], QString key,
+               const QColor& defaultColor)
+{
+  vgColor::read(settings, key, defaultColor).fillArray(color);
+}
+
+//-----------------------------------------------------------------------------
+void loadColor(QSettings& settings, double (&color)[3], QString key,
+               unsigned char defaultColor[])
+{
+  QColor q(defaultColor[0], defaultColor[1], defaultColor[2]);
+  loadColor(settings, color, key, q);
+}
+
+//-----------------------------------------------------------------------------
+vsEventInfo eventFromSettings(QSettings& settings, int type,
+                              EventInfoTemplate tpl)
+{
+  qtScopedSettingGroup sg(settings, QString::number(type));
+
+  vsEventInfo ei;
+
+  ei.type = type;
+  const QString defaultName =
+    (tpl.name ? tpl.name : QString("Unknown type %1").arg(type));
+  ei.name = settings.value("Name", defaultName).toString();
+
+  loadColor(settings, ei.pcolor, "PenColor", tpl.color + 0);
+  loadColor(settings, ei.bcolor, "BackgroundColor", tpl.color + 3);
+  loadColor(settings, ei.fcolor, "ForegroundColor", Qt::white);
+
+  return ei;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsEventInfo> eventsFromGroup(QSettings& settings,
+                                   const QString& settingsGroup,
+                                   const EventInfoTemplate* ta)
+{
+  // Convert bare templates to something we can reference by type
+  int i;
+  QHash<int, EventInfoTemplate> builtinTypes;
+  for (i = 0; ta[i].type; ++i)
+    builtinTypes.insert(ta[i].type, ta[i]);
+
+  // Get list of user defined event types
+  QList<int> types;
+  settings.beginGroup(settingsGroup);
+  const QVariant typesData = settings.value("Types");
+  if (typesData.canConvert(QVariant::Int))
+    {
+    types.append(typesData.toInt());
+    }
+  else
+    {
+    foreach (QVariant v, typesData.toList())
+      types.append(v.toInt());
+    }
+
+  // Add built-in types
+  foreach (i, builtinTypes.keys())
+    {
+    if (!types.contains(i))
+      types.prepend(i);
+    }
+
+  // Load each event type
+  QList<vsEventInfo> events;
+  foreach (i, types)
+    {
+    EventInfoTemplate t =
+      (builtinTypes.contains(i) ? builtinTypes.value(i) : emptyEventTemplate);
+    events.append(eventFromSettings(settings, i, t));
+    }
+
+  settings.endGroup();
+
+  return events;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vgEventType vsEventInfo::toVgEventType() const
+{
+  vgEventType vget;
+  vget.SetId(this->type);
+  vget.SetName(qPrintable(this->name));
+  vget.SetColor(this->pcolor[0], this->pcolor[1], this->pcolor[2]);
+  vget.SetLabelForegroundColor(this->fcolor[0], this->fcolor[1],
+                               this->fcolor[2]);
+  vget.SetLabelBackgroundColor(this->bcolor[0], this->bcolor[1],
+                               this->bcolor[2]);
+  return vget;
+}
+
+//-----------------------------------------------------------------------------
+vsEventInfo vsEventInfo::fromEventSetInfo(
+  const vvEventSetInfo& vvInfo, int type)
+{
+  vsEventInfo vsInfo;
+
+  vsInfo.type = type;
+  vsInfo.name = vvInfo.Name;
+  vgColor::fillArray(vvInfo.PenColor, vsInfo.pcolor);
+  vgColor::fillArray(vvInfo.BackgroundColor, vsInfo.bcolor);
+  vgColor::fillArray(vvInfo.ForegroundColor, vsInfo.fcolor);
+
+  return vsInfo;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsEventInfo> vsEventInfo::events(vsEventInfo::Groups groups)
+{
+  vvEventInfo::Groups vvGroups = 0;
+  if (groups.testFlag(vsEventInfo::Person))
+    vvGroups |= vvEventInfo::Person;
+  if (groups.testFlag(vsEventInfo::Vehicle))
+    vvGroups |= vvEventInfo::Vehicle;
+
+  QList<vsEventInfo> vsEvents;
+
+  foreach (vvEventInfo vvEvent, vvEventInfo::eventTypes(vvGroups))
+    {
+    vsEventInfo vsEvent;
+    vsEvent.type = vvEvent.Type;
+    vsEvent.name = vvEvent.Name;
+    vvEvent.PenColor.fillArray(vsEvent.pcolor);
+    vvEvent.BackgroundColor.fillArray(vsEvent.bcolor);
+    vvEvent.ForegroundColor.fillArray(vsEvent.fcolor);
+    vsEvents.append(vsEvent);
+    }
+
+  // Add vsPlay event types
+  if (groups.testFlag(vsEventInfo::General))
+    {
+    QSettings settings;
+    settings.beginGroup("EventTypes");
+    vsEvents += eventsFromGroup(settings, "General", eventsGeneral);
+    }
+  if (groups.testFlag(vsEventInfo::User))
+    {
+    QSettings settings;
+    settings.beginGroup("EventTypes");
+    vsEvents += eventsFromGroup(settings, "User", eventsUser);
+    }
+
+  return vsEvents;
+}
+
+//-----------------------------------------------------------------------------
+vsEventInfo::Groups vsEventInfo::eventGroups(int eventType)
+{
+  if (eventType > 0)
+    {
+    // Anything positive is considered a classifier (but we don't try to
+    // determine a specific group)
+    return Classifier;
+    }
+  else if (eventType <= UserType)
+    {
+    return User;
+    }
+  else if (eventType <= QueryAlert)
+    {
+    return Alert;
+    }
+  else if (eventType <= Tripwire)
+    {
+    // Anything starting with the built-in types (-3000) but before QueryAlert
+    // is considered General... which includes the vsTrackInfo types, but we
+    // don't have a Group for that, so too bad...
+    return General;
+    }
+
+  return Unknown;
+}
diff --git a/Libraries/VspData/vsEventInfo.h b/Libraries/VspData/vsEventInfo.h
new file mode 100644
index 00000000..d5351116
--- /dev/null
+++ b/Libraries/VspData/vsEventInfo.h
@@ -0,0 +1,62 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventInfo_h
+#define __vsEventInfo_h
+
+#include <QString>
+#include <QList>
+
+#include <vgExport.h>
+
+class vgEventType;
+
+struct vvEventSetInfo;
+
+struct VSP_DATA_EXPORT vsEventInfo
+{
+  int type;
+  QString name;
+  double pcolor[3];
+  double bcolor[3];
+  double fcolor[3];
+
+  enum Group
+    {
+    Unknown     = 0x0,
+    Person      = 0x1,
+    Vehicle     = 0x2,
+    Classifier  = 0xf,
+    Alert       = 0x10,
+    General     = 0x20,
+    User        = 0x80,
+    NonUser     = 0x7f,
+    All         = 0xff
+    };
+  Q_DECLARE_FLAGS(Groups, Group)
+
+  enum Type
+    {
+    Tripwire        = -3000,
+    EnteringRegion  = -3001,
+    ExitingRegion   = -3002,
+    // NOTE: -5000 - -5??? reserved by vsTrackInfo
+    QueryAlert      = -10000,
+    UserType        = -20000
+    };
+
+public:
+  vgEventType toVgEventType() const;
+
+  static vsEventInfo fromEventSetInfo(const vvEventSetInfo&, int type = -1);
+
+  static QList<vsEventInfo> events(Groups = All);
+  static Groups eventGroups(int eventType);
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vsEventInfo::Groups)
+
+#endif
diff --git a/Libraries/VspData/vsFactoryAction.h b/Libraries/VspData/vsFactoryAction.h
new file mode 100644
index 00000000..6bf9c039
--- /dev/null
+++ b/Libraries/VspData/vsFactoryAction.h
@@ -0,0 +1,19 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsFactoryAction_h
+#define __vsFactoryAction_h
+
+#include <QString>
+#include <QUrl>
+
+struct vsPendingFactoryAction
+{
+  QString FactoryIdentifier;
+  QUrl SourceUri;
+};
+
+#endif
diff --git a/Libraries/VspData/vsLibDebug.cxx b/Libraries/VspData/vsLibDebug.cxx
new file mode 100644
index 00000000..b1450025
--- /dev/null
+++ b/Libraries/VspData/vsLibDebug.cxx
@@ -0,0 +1,9 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtDebugImpl.h>
+
+#include "vsLibDebug.h"
diff --git a/Libraries/VspData/vsLibDebug.h b/Libraries/VspData/vsLibDebug.h
new file mode 100644
index 00000000..61f1ae43
--- /dev/null
+++ b/Libraries/VspData/vsLibDebug.h
@@ -0,0 +1,14 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsLibDebug_h
+#define __vsLibDebug_h
+
+#include <qtDebug.h>
+
+QTE_DEBUG_AREA(vsd, VideoSource, true);
+
+#endif
diff --git a/Libraries/VspData/vsLiveDescriptor.cxx b/Libraries/VspData/vsLiveDescriptor.cxx
new file mode 100644
index 00000000..0a3c3b2a
--- /dev/null
+++ b/Libraries/VspData/vsLiveDescriptor.cxx
@@ -0,0 +1,166 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsLiveDescriptor.h"
+#include "vsLiveDescriptorPrivate.h"
+
+#include <QTimer>
+
+QTE_IMPLEMENT_D_FUNC(vsLiveDescriptor)
+
+//-----------------------------------------------------------------------------
+vsLiveDescriptorPrivate::vsLiveDescriptorPrivate(vsLiveDescriptor* q) :
+  q_ptr(q)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsLiveDescriptorPrivate::~vsLiveDescriptorPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptorPrivate::run()
+{
+  QTE_Q(vsLiveDescriptor);
+
+  q->updateStatus(vsDataSource::InProcessActive);
+  qtThread::run();
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptorPrivate::setSuicideTimer(int timeout, bool changeStatus)
+{
+  if (changeStatus)
+    {
+    QTE_Q(vsLiveDescriptor);
+    q->updateStatus(vsDataSource::InProcessIdle);
+    }
+
+  this->suicideTimer.reset(new QTimer);
+  this->suicideTimer->setInterval(timeout);
+  this->suicideTimer->setSingleShot(true);
+  this->suicideTimer->start();
+  connect(this->suicideTimer.data(), SIGNAL(timeout()),
+          this, SLOT(suicide()));
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptorPrivate::cancelSuicideTimer(bool changeStatus)
+{
+  if (this->suicideTimer)
+    {
+    if (changeStatus)
+      {
+      QTE_Q(vsLiveDescriptor);
+      q->updateStatus(vsDataSource::InProcessActive);
+      }
+    this->suicideTimer.reset();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptorPrivate::suicide()
+{
+  QTE_Q(vsLiveDescriptor);
+  q->suicide();
+}
+
+//-----------------------------------------------------------------------------
+vsLiveDescriptor::vsLiveDescriptor(vsLiveDescriptorPrivate* d) : d_ptr(d)
+{
+  connect(d, SIGNAL(eventAvailable(vsEvent)),
+          this, SLOT(emitEvent(vsEvent)));
+  connect(d, SIGNAL(eventRevoked(vtkIdType)),
+          this, SLOT(revokeEvent(vtkIdType)));
+  d->status = vsDataSource::InProcessIdle;
+}
+
+//-----------------------------------------------------------------------------
+vsLiveDescriptor::~vsLiveDescriptor()
+{
+  QTE_D(vsLiveDescriptor);
+  d->quit();
+  d->wait();
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptor::start()
+{
+  QTE_D(vsLiveDescriptor);
+  vsDataSource::start();
+  d->start();
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptor::updateStatus(vsDataSource::Status status)
+{
+  if (QThread::currentThread() != this->thread())
+    {
+    QMetaObject::invokeMethod(this, "updateStatus",
+                              Q_ARG(vsDataSource::Status, status));
+    return;
+    }
+
+  QTE_D(vsLiveDescriptor);
+  d->status = status;
+  emit this->statusChanged(status);
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsLiveDescriptor::status() const
+{
+  QTE_D_CONST(vsLiveDescriptor);
+  return d->status;
+}
+
+//-----------------------------------------------------------------------------
+QString vsLiveDescriptor::text() const
+{
+  return "In-Process";
+}
+
+//-----------------------------------------------------------------------------
+QString vsLiveDescriptor::toolTip() const
+{
+  QTE_D_CONST(vsLiveDescriptor);
+
+  QString format("Live in-process %1 descriptor");
+  if (d->status == vsDataSource::InProcessIdle)
+    format += " (idle)";
+
+  return format.arg(this->name());
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptor::injectInput(qint64 id, vsDescriptorInputPtr input)
+{
+  QTE_D(vsLiveDescriptor);
+  QMetaObject::invokeMethod(d, "injectInput", Qt::QueuedConnection,
+                            Q_ARG(qint64, id),
+                            Q_ARG(vsDescriptorInputPtr, input));
+  vsDescriptorSource::injectInput(id, input);
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptor::revokeInput(qint64 id, bool revokeEvents)
+{
+  QTE_D(vsLiveDescriptor);
+  QMetaObject::invokeMethod(d, "revokeInput", Qt::QueuedConnection,
+                            Q_ARG(qint64, id),
+                            Q_ARG(bool, revokeEvents));
+  vsDescriptorSource::revokeInput(id, revokeEvents);
+}
+
+//-----------------------------------------------------------------------------
+void vsLiveDescriptor::revokeAllInput(bool revokeEvents)
+{
+  QTE_D(vsLiveDescriptor);
+  QMetaObject::invokeMethod(d, "revokeAllInput", Qt::QueuedConnection,
+                            Q_ARG(bool, revokeEvents));
+  vsDescriptorSource::revokeAllInput(revokeEvents);
+}
diff --git a/Libraries/VspData/vsLiveDescriptor.h b/Libraries/VspData/vsLiveDescriptor.h
new file mode 100644
index 00000000..7dde56b2
--- /dev/null
+++ b/Libraries/VspData/vsLiveDescriptor.h
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsLiveDescriptor_h
+#define __vsLiveDescriptor_h
+
+#include <qtThread.h>
+
+#include <vgExport.h>
+
+#include "vsDescriptorSource.h"
+
+class vsLiveDescriptorPrivate;
+
+class VSP_DATA_EXPORT vsLiveDescriptor : public vsDescriptorSource
+{
+  Q_OBJECT
+
+public:
+  virtual ~vsLiveDescriptor();
+
+  virtual void start();
+
+  virtual Status status() const QTE_OVERRIDE;
+  virtual QString text() const QTE_OVERRIDE;
+  virtual QString toolTip() const QTE_OVERRIDE;
+
+protected slots:
+  void updateStatus(vsDataSource::Status);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(vsLiveDescriptor)
+
+  vsLiveDescriptor(vsLiveDescriptorPrivate*);
+
+  virtual QString name() const = 0;
+
+  virtual void injectInput(qint64 id, vsDescriptorInputPtr input) QTE_OVERRIDE;
+  virtual void revokeInput(qint64 id, bool revokeEvents) QTE_OVERRIDE;
+  virtual void revokeAllInput(bool revokeEvents) QTE_OVERRIDE;
+
+private:
+  QTE_DECLARE_PRIVATE(vsLiveDescriptor)
+  QTE_DISABLE_COPY(vsLiveDescriptor)
+};
+
+#endif
diff --git a/Libraries/VspData/vsLiveDescriptorPrivate.h b/Libraries/VspData/vsLiveDescriptorPrivate.h
new file mode 100644
index 00000000..2f8cc3e7
--- /dev/null
+++ b/Libraries/VspData/vsLiveDescriptorPrivate.h
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsLiveDescriptorPrivate_h
+#define __vsLiveDescriptorPrivate_h
+
+#include <qtThread.h>
+
+#include <vgExport.h>
+
+#include "vsLiveDescriptor.h"
+
+class QTimer;
+
+class VSP_DATA_EXPORT vsLiveDescriptorPrivate : public qtThread
+{
+  Q_OBJECT
+
+public:
+  vsLiveDescriptorPrivate(vsLiveDescriptor*);
+  virtual ~vsLiveDescriptorPrivate();
+
+signals:
+  void eventAvailable(vsEvent event);
+  void eventRevoked(vtkIdType eventId);
+
+protected slots:
+  virtual void injectInput(qint64 id, vsDescriptorInputPtr input)
+    { Q_UNUSED(id); Q_UNUSED(input); }
+
+  virtual void revokeInput(qint64 id, bool revokeEvents)
+    { Q_UNUSED(id); Q_UNUSED(revokeEvents); }
+
+  virtual void revokeAllInput(bool revokeEvents)
+    { Q_UNUSED(revokeEvents); }
+
+  virtual void suicide();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsLiveDescriptor)
+
+  virtual void run() QTE_OVERRIDE;
+  void setSuicideTimer(int timeoutMilliseconds = 30000,
+                       bool setInactiveStatus = true);
+  void cancelSuicideTimer(bool setActiveStatus = true);
+
+  vsDataSource::Status status;
+
+private:
+  QTE_DECLARE_PUBLIC(vsLiveDescriptor)
+  QTE_DISABLE_COPY(vsLiveDescriptorPrivate)
+
+  QScopedPointer<QTimer> suicideTimer;
+};
+
+#endif
diff --git a/Libraries/VspData/vsSimpleSourceFactory.cxx b/Libraries/VspData/vsSimpleSourceFactory.cxx
new file mode 100644
index 00000000..2ad3bf56
--- /dev/null
+++ b/Libraries/VspData/vsSimpleSourceFactory.cxx
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsSimpleSourceFactory.h"
+
+// Need these so that QSharedPointer can find their dtors
+#include "vsVideoSource.h"
+#include "vsTrackSource.h"
+#include "vsDescriptorSource.h"
+
+//-----------------------------------------------------------------------------
+vsSimpleSourceFactory::vsSimpleSourceFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsSimpleSourceFactory::~vsSimpleSourceFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVideoSourcePtr vsSimpleSourceFactory::videoSource() const
+{
+  return vsVideoSourcePtr();
+}
+
+//-----------------------------------------------------------------------------
+QList<vsTrackSourcePtr> vsSimpleSourceFactory::trackSources() const
+{
+  return QList<vsTrackSourcePtr>();
+}
+
+//-----------------------------------------------------------------------------
+QList<vsDescriptorSourcePtr> vsSimpleSourceFactory::descriptorSources() const
+{
+  return QList<vsDescriptorSourcePtr>();
+}
diff --git a/Libraries/VspData/vsSimpleSourceFactory.h b/Libraries/VspData/vsSimpleSourceFactory.h
new file mode 100644
index 00000000..634748dd
--- /dev/null
+++ b/Libraries/VspData/vsSimpleSourceFactory.h
@@ -0,0 +1,69 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsSimpleSourceFactory_h
+#define __vsSimpleSourceFactory_h
+
+#include <QSharedPointer>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+template <typename T> class QList;
+
+class vsVideoSource;
+class vsTrackSource;
+class vsDescriptorSource;
+
+typedef QSharedPointer<vsVideoSource> vsVideoSourcePtr;
+typedef QSharedPointer<vsTrackSource> vsTrackSourcePtr;
+typedef QSharedPointer<vsDescriptorSource> vsDescriptorSourcePtr;
+
+/// Simple source factory.
+///
+/// This class implements a simple source factory that does not support
+/// initialization. Source factory plugins must use ::vsSourceFactory, which
+/// does support initialization. Archive source plugins may wish to use
+/// ::vsStaticSourceFactory, which serves as a data source container which
+/// can be given sources at creation, prior to being returned from
+/// ::vsArchiveSourceInterface::createArchiveSource.
+class VSP_DATA_EXPORT vsSimpleSourceFactory
+{
+public:
+  virtual ~vsSimpleSourceFactory();
+
+  /// Return the video source associated with this factory.
+  ///
+  /// This method returns a shared pointer to the video source provided by this
+  /// factory. The pointer will be null if the factory does not provide a video
+  /// source.
+  virtual vsVideoSourcePtr videoSource() const;
+
+  /// Return the track sources associated with this factory.
+  ///
+  /// This method returns a list of shared pointers to the track source(s)
+  /// provided by this factory. The list will be empty if the factory does not
+  /// provide track sources.
+  virtual QList<vsTrackSourcePtr> trackSources() const;
+
+  /// Return the descriptor sources associated with this factory.
+  ///
+  /// This method returns a list of shared pointers to the descriptor source(s)
+  /// provided by this factory. The list will be empty if the factory does not
+  /// provide descriptor sources.
+  virtual QList<vsDescriptorSourcePtr> descriptorSources() const;
+
+protected:
+  vsSimpleSourceFactory();
+
+private:
+  QTE_DISABLE_COPY(vsSimpleSourceFactory)
+};
+
+typedef QSharedPointer<vsSimpleSourceFactory> vsSimpleSourceFactoryPtr;
+
+#endif
diff --git a/Libraries/VspData/vsSourceFactory.cxx b/Libraries/VspData/vsSourceFactory.cxx
new file mode 100644
index 00000000..2278222c
--- /dev/null
+++ b/Libraries/VspData/vsSourceFactory.cxx
@@ -0,0 +1,34 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsSourceFactory.h"
+
+#include <QDebug>
+#include <QMessageBox>
+
+//-----------------------------------------------------------------------------
+vsSourceFactory::vsSourceFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactory::~vsSourceFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactory::warn(
+  QWidget* dialogParent, const QString& dialogTitle, const QString& message)
+{
+  if (dialogParent)
+    {
+    QMessageBox::warning(dialogParent, dialogTitle, message);
+    }
+  else
+    {
+    qWarning() << "vsArchiveSourceFactory:" << message;
+    }
+}
diff --git a/Libraries/VspData/vsSourceFactory.h b/Libraries/VspData/vsSourceFactory.h
new file mode 100644
index 00000000..6a39cdf7
--- /dev/null
+++ b/Libraries/VspData/vsSourceFactory.h
@@ -0,0 +1,66 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsSourceFactory_h
+#define __vsSourceFactory_h
+
+#include <vgExport.h>
+
+#include "vsSimpleSourceFactory.h"
+
+class QUrl;
+class QWidget;
+
+/// Standard source factory.
+///
+/// This class implements a full source factory, with support for
+/// initialization. These are closer to "true" factories, in that they require
+/// no additional information to create, and can be initialized later to set up
+/// the actual sources.
+class VSP_DATA_EXPORT vsSourceFactory : public vsSimpleSourceFactory
+{
+public:
+  virtual ~vsSourceFactory();
+
+  /// Request interactive factory initialization.
+  ///
+  /// This method attempts to interactively initialize the source factory,
+  /// usually by prompting the user to select a source (e.g. a file or URI).
+  /// The factory should use \p dialogParent as the window parent for any
+  /// dialogs it creates.
+  ///
+  /// \return \c true if the factory was initialized, \c false otherwise.
+  virtual bool initialize(QWidget* dialogParent) = 0;
+
+  /// Request factory initialization from URI.
+  ///
+  /// This method attempts to initialize the source factory from the specified
+  /// URI in a non-interactive manner. This is typically used to initialize a
+  /// factory from a source specified via the command line.
+  ///
+  /// \return \c true if the factory was initialized, \c false otherwise.
+  virtual bool initialize(const QUrl& uri) = 0;
+
+protected:
+  vsSourceFactory();
+
+  /// Display a warning.
+  ///
+  /// This method displays a warning, using a dialog box in interactive mode
+  /// (if \p dialogParent is non-null), and ::qWarning otherwise.
+  ///
+  /// \param dialogTitle Title to give the dialog box, if a dialog box is used.
+  /// \param message Warning message to display.
+  void warn(QWidget* dialogParent, const QString& dialogTitle,
+            const QString& message);
+
+private:
+  QTE_DISABLE_COPY(vsSourceFactory)
+};
+
+typedef QSharedPointer<vsSourceFactory> vsSourceFactoryPtr;
+
+#endif
diff --git a/Libraries/VspData/vsSourceFactoryInterface.cxx b/Libraries/VspData/vsSourceFactoryInterface.cxx
new file mode 100644
index 00000000..faac8ca2
--- /dev/null
+++ b/Libraries/VspData/vsSourceFactoryInterface.cxx
@@ -0,0 +1,75 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsSourceFactoryInterface.h"
+
+#include <QApplication>
+#include <QVariant>
+
+#include "vsFactoryAction.h"
+
+namespace { const char* keyActionDisplayGroup = "vsData_ActionDisplayGroup"; }
+
+//-----------------------------------------------------------------------------
+vsSourceFactoryInterface::~vsSourceFactoryInterface()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsSourceFactoryInterface::settingsKey() const
+{
+  return QString("SourceFactory/Create%1").arg(this->identifier());
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryInterface::registerFactoryCliOptions(qtCliOptions&)
+{
+}
+
+//-----------------------------------------------------------------------------
+QList<vsPendingFactoryAction> vsSourceFactoryInterface::parseFactoryArguments(
+  const qtCliArgs&)
+{
+  return QList<vsPendingFactoryAction>();
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryInterface::registerActions()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryInterface::createActions(
+  QObject* parent, QSignalMapper* signalMapper,
+  qtPrioritizedMenuProxy& videoMenu,
+  qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  Q_UNUSED(parent);
+  Q_UNUSED(signalMapper);
+  Q_UNUSED(videoMenu);
+  Q_UNUSED(trackMenu);
+  Q_UNUSED(descriptorMenu);
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactory* vsSourceFactoryInterface::createFactory()
+{
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+QString vsSourceFactoryInterface::actionDisplayGroup()
+{
+  QVariant value = qApp->property(keyActionDisplayGroup);
+  return (value.isNull() ? QString("Sources") : value.toString());
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryInterface::setActionDisplayGroup(const QString& value)
+{
+  qApp->setProperty(keyActionDisplayGroup, value);
+}
diff --git a/Libraries/VspData/vsSourceFactoryInterface.h b/Libraries/VspData/vsSourceFactoryInterface.h
new file mode 100644
index 00000000..74a3fb3d
--- /dev/null
+++ b/Libraries/VspData/vsSourceFactoryInterface.h
@@ -0,0 +1,134 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsSourceFactoryInterface_h
+#define __vsSourceFactoryInterface_h
+
+#include <QtPlugin>
+
+#include <vgExport.h>
+
+#include <qtPrioritizedMenuProxy.h>
+
+class QSignalMapper;
+class QString;
+
+template <typename T> class QList;
+
+class qtCliArgs;
+class qtCliOptions;
+
+struct vsPendingFactoryAction;
+class vsSourceFactory;
+
+//-----------------------------------------------------------------------------
+/// Interface for a source factory plugin.
+///
+/// This class defines the public interface for a source factory plugin.
+class VSP_DATA_EXPORT vsSourceFactoryInterface
+{
+public:
+  virtual ~vsSourceFactoryInterface();
+
+  /// Return the identifier of this source factory.
+  ///
+  /// This method returns an identifier for the source factory. The source
+  /// service uses this identifier to choose the appropriate plugin when asked
+  /// to create a factory. As such, implementations should take care to ensure
+  /// that the identifier is unique.
+  virtual QString identifier() const = 0;
+
+  /// Return key for creating actions.
+  ///
+  /// This method returns a QSettings key suitable for uniquely identifying a
+  /// single action associated with the plugin.
+  virtual QString settingsKey() const;
+
+  /// Register CLI options for factory plugin.
+  ///
+  /// This method is called to allow the source factory plugin to add any
+  /// additional command line options it wishes to be available to the user.
+  /// The most common example would be an option to connect to a source
+  /// specified via the command line.
+  ///
+  /// The default implementation does nothing.
+  virtual void registerFactoryCliOptions(qtCliOptions&);
+
+  /// Parse CLI arguments for factory plugin.
+  ///
+  /// This method is called to allow the source factory plugin to process the
+  /// command line arguments and take any necessary actions based on the same.
+  ///
+  /// The return value is a list of source connections that should be created
+  /// based on the command line arguments, which may be empty.
+  ///
+  /// The default implementation does nothing and returns an empty list.
+  virtual QList<vsPendingFactoryAction> parseFactoryArguments(const qtCliArgs&);
+
+  /// Register actions.
+  ///
+  /// This method is called to register actions that will be used by the
+  /// plugin. Implementations should create action factories for any actions
+  /// they wish to define when this method is called.
+  ///
+  /// The default implementation does nothing.
+  virtual void registerActions();
+
+  /// Create actions.
+  ///
+  /// This method is called to request that the plugin create menu actions that
+  /// the user can use to create an instance of the source. Implementations
+  /// should create their action(s) and add them to the appropriate menu(s)
+  /// when this method is called. The action's ::QAction::triggered signal
+  /// should be connected to the \p signalMapper, using the plugin's
+  /// ::identifier as the mapping key.
+  ///
+  /// The default implementation does nothing.
+  ///
+  /// \param parent A ::QObject suitable for use as the parent object of any
+  ///               actions created.
+  /// \param signalMapper ::QSignalMapper that should be triggered when the
+  ///                     action is triggered.
+  /// \param videoMenu Insertion placeholder for the application's 'Video'
+  ///                  menu.
+  /// \param trackMenu Insertion placeholder for the application's 'Tracks'
+  ///                  menu.
+  /// \param descriptorMenu Insertion placeholder for the application's
+  ///                       'Descriptors' menu.
+  virtual void createActions(
+    QObject* parent, QSignalMapper* signalMapper,
+    qtPrioritizedMenuProxy& videoMenu,
+    qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu);
+
+  /// Create a new factory instance.
+  ///
+  /// This method creates a new instance of the source factory plugin's factory
+  /// object.
+  ///
+  /// The default implementation returns a null pointer.
+  virtual vsSourceFactory* createFactory();
+
+  /// Return name of display group for source factory actions.
+  ///
+  /// This method returns the name of the display group under which source
+  /// factory plugins should register their actions with ::qtActionManager.
+  static QString actionDisplayGroup();
+
+  /// Set name of display group for source factory actions.
+  ///
+  /// This method sets the name that will be returned by ::actionGroup. The
+  /// name is stored as a property on the ::QCoreApplication instance.
+  /// Applications should call this method prior to calling
+  /// ::vsSourceService::registerActions if they wish to change the default
+  /// name for the action display group.
+  static void setActionDisplayGroup(const QString&);
+};
+
+Q_DECLARE_INTERFACE(vsSourceFactoryInterface,
+                    "org.visgui.vsSourceFactoryInterface")
+
+#endif
diff --git a/Libraries/VspData/vsSourceService.cxx b/Libraries/VspData/vsSourceService.cxx
new file mode 100644
index 00000000..2c2dcd23
--- /dev/null
+++ b/Libraries/VspData/vsSourceService.cxx
@@ -0,0 +1,176 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsSourceService.h"
+
+#include <QHash>
+
+#include <qtGlobal.h>
+
+#include <vgPluginLoader.h>
+
+#include "vsArchiveSourceInterface.h"
+#include "vsFactoryAction.h"
+#include "vsSourceFactoryInterface.h"
+
+//-----------------------------------------------------------------------------
+class vsSourceServiceInstance : public QObject
+{
+public:
+  vsSourceServiceInstance();
+
+  QHash<QString, vsSourceFactoryInterface*> Factories;
+  QHash<vsArchiveSourceType, QList<vsArchiveSourceInterface*> > ArchiveSources;
+};
+
+QTE_PRIVATE_SINGLETON(vsSourceServiceInstance, ssInstance)
+
+//-----------------------------------------------------------------------------
+vsSourceServiceInstance::vsSourceServiceInstance()
+{
+  // Load plugins
+  foreach (QObject* object, vgPluginLoader::plugins())
+    {
+    // Check if plugin provides a source factory
+    vsSourceFactoryInterface* factoryInterface =
+      qobject_cast<vsSourceFactoryInterface*>(object);
+    if (factoryInterface)
+      {
+      // Add to registered factories
+      this->Factories.insert(factoryInterface->identifier(), factoryInterface);
+      }
+
+    // Check if plugin provides (an) archive source(s)
+    vsArchiveSourceInterface* archiveInterface =
+      qobject_cast<vsArchiveSourceInterface*>(object);
+    if (archiveInterface)
+      {
+      vsArchiveSourceTypes supportedTypes = archiveInterface->archiveTypes();
+      int bit = 1;
+      // Iterate over possible source types
+      while (supportedTypes)
+        {
+        vsArchiveSourceType type = static_cast<vsArchiveSourceType>(bit);
+        if (supportedTypes.testFlag(type))
+          {
+          this->ArchiveSources[type].append(archiveInterface);
+          supportedTypes ^= type;
+          }
+        bit <<= 1;
+        }
+      }
+
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceService::registerCliOptions(qtCliOptions& options)
+{
+  foreach (vsSourceFactoryInterface* factoryInterface, ssInstance()->Factories)
+    {
+    factoryInterface->registerFactoryCliOptions(options);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QList<vsPendingFactoryAction> vsSourceService::parseArguments(
+  const qtCliArgs& args)
+{
+  QList<vsPendingFactoryAction> actions;
+  foreach (vsSourceFactoryInterface* factoryInterface, ssInstance()->Factories)
+    {
+    actions += factoryInterface->parseFactoryArguments(args);
+    }
+  return actions;
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceService::registerActions()
+{
+  foreach (vsSourceFactoryInterface* factoryInterface, ssInstance()->Factories)
+    {
+    factoryInterface->registerActions();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceService::createActions(
+  QObject* parent, QSignalMapper* signalMapper,
+  qtPrioritizedMenuProxy& videoMenu,
+  qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  foreach (vsSourceFactoryInterface* factoryInterface, ssInstance()->Factories)
+    {
+    factoryInterface->createActions(parent, signalMapper,
+                                    videoMenu, trackMenu, descriptorMenu);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactoryPtr vsSourceService::createFactory(
+  const QString& identifier)
+{
+  vsSourceFactoryInterface* factoryInterface =
+    ssInstance()->Factories.value(identifier, 0);
+  if (factoryInterface)
+    {
+    vsSourceFactory* factory = factoryInterface->createFactory();
+    return vsSourceFactoryPtr(factory);
+    }
+
+  return vsSourceFactoryPtr();
+}
+
+//-----------------------------------------------------------------------------
+QList<vsArchivePluginInfo> vsSourceService::archivePluginInfo(
+  vsArchiveSourceType type)
+{
+  QList<vsArchivePluginInfo> result;
+  const QList<vsArchiveSourceInterface*>& sources =
+    ssInstance()->ArchiveSources[type];
+  foreach (vsArchiveSourceInterface* archiveSource, sources)
+    {
+    result.append(archiveSource->archivePluginInfo(type));
+    }
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+vsSimpleSourceFactoryPtr vsSourceService::createArchiveSource(
+  vsArchiveSourceType type, const QUrl& archive)
+{
+  vsArchiveSourceInterface::SourceCreateMode mode =
+    vsArchiveSourceInterface::QuickTest;
+
+  forever
+    {
+    // Run through available plugins, first in QuickTest mode, then if that
+    // fails, in ThoroughTest mode
+    const QList<vsArchiveSourceInterface*>& sources =
+      ssInstance()->ArchiveSources[type];
+    foreach (vsArchiveSourceInterface* archiveSource, sources)
+      {
+      vsSimpleSourceFactory* source =
+        archiveSource->createArchiveSource(type, archive, mode);
+      if (source)
+        {
+        return vsSimpleSourceFactoryPtr(source);
+        }
+      }
+
+    if (mode != vsArchiveSourceInterface::ThoroughTest)
+      {
+      // Try again in ThoroughTest mode
+      mode = vsArchiveSourceInterface::ThoroughTest;
+      continue;
+      }
+
+    // If we failed to create a source in ThoroughTest mode, give up
+    break;
+    }
+  return vsSimpleSourceFactoryPtr();
+}
diff --git a/Libraries/VspData/vsSourceService.h b/Libraries/VspData/vsSourceService.h
new file mode 100644
index 00000000..2c11cd53
--- /dev/null
+++ b/Libraries/VspData/vsSourceService.h
@@ -0,0 +1,91 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsSourceService_h
+#define __vsSourceService_h
+
+#include <vgExport.h>
+
+#include <qtPrioritizedMenuProxy.h>
+
+#include "vsArchiveSourceInfo.h"
+#include "vsSourceFactory.h"
+
+class QSignalMapper;
+
+class qtCliArgs;
+class qtCliOptions;
+
+struct vsPendingFactoryAction;
+
+//-----------------------------------------------------------------------------
+/// Methods for interfacing with the data sources plugin framework.
+///
+/// This namespace provides methods to query and interact with data source
+/// plugins. Plugin loading is done on first use (that is, the first time any
+/// function in the namespace is called).
+namespace vsSourceService
+{
+  /// Register CLI options for plugins.
+  ///
+  /// This method registers command line options for all loaded data source
+  /// plugins. This allows plugins to define command line options for their
+  /// use, most often to allow source factory plugins to create options for
+  /// connecting sources on start-up via the command line.
+  VSP_DATA_EXPORT void registerCliOptions(qtCliOptions&);
+
+  /// Parse CLI arguments for plugins.
+  ///
+  /// This method sends the parsed command line arguments to all loaded plugins
+  /// for processing. It is up to specific plugins what, if anything, they need
+  /// to do with the arguments.
+  ///
+  /// The return value is a list of source connections that were requested by
+  /// source factory plugins based on the command line arguments, which may be
+  /// empty.
+  VSP_DATA_EXPORT QList<vsPendingFactoryAction> parseArguments(
+    const qtCliArgs&);
+
+  /// Register actions for source factory plugins.
+  ///
+  /// This method registers actions for all loaded source factory plugins.
+  /// This should be done as part of the application's start-up, but must not
+  /// be done until \em after the QCoreApplication object has been created.
+  VSP_DATA_EXPORT void registerActions();
+
+  /// Create actions for source factory plugins.
+  ///
+  /// This method creates actions for all loaded source factory plugins.
+  VSP_DATA_EXPORT void createActions(
+    QObject* parent, QSignalMapper* signalMapper,
+    qtPrioritizedMenuProxy& videoMenu,
+    qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu);
+
+  /// Create source factory.
+  ///
+  /// This method creates a source factory of the specified \p kind.
+  VSP_DATA_EXPORT vsSourceFactoryPtr createFactory(const QString& kind);
+
+  /// Get information on archive plugins.
+  ///
+  /// This method returns a ::vsArchivePluginInfo structure for all loaded
+  /// archive plugins servicing the specified \p type.
+  VSP_DATA_EXPORT QList<vsArchivePluginInfo> archivePluginInfo(
+    vsArchiveSourceType type);
+
+  /// Create archive source factory.
+  ///
+  /// This method attempts to create an archive source factory of the specified
+  /// \p type from the specified \p archive. This is done by asking all loaded
+  /// archive source plugins to create a static source factory from the
+  /// specified \p archive. If no plugin is able to process the \p archive,
+  /// a null pointer is returned.
+  VSP_DATA_EXPORT vsSimpleSourceFactoryPtr createArchiveSource(
+    vsArchiveSourceType type, const QUrl& archive);
+}
+
+#endif
diff --git a/Libraries/VspData/vsStaticSourceFactory.cxx b/Libraries/VspData/vsStaticSourceFactory.cxx
new file mode 100644
index 00000000..94638712
--- /dev/null
+++ b/Libraries/VspData/vsStaticSourceFactory.cxx
@@ -0,0 +1,97 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsStaticSourceFactory.h"
+
+#include <QList>
+
+// Need these so that QSharedPointer can find their dtors
+#include "vsVideoSource.h"
+#include "vsTrackSource.h"
+#include "vsDescriptorSource.h"
+
+//-----------------------------------------------------------------------------
+class vsStaticSourceFactoryPrivate
+{
+public:
+  vsVideoSourcePtr VideoSource;
+  QList<vsTrackSourcePtr> TrackSources;
+  QList<vsDescriptorSourcePtr> DescriptorSources;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsStaticSourceFactory)
+
+//-----------------------------------------------------------------------------
+vsStaticSourceFactory::vsStaticSourceFactory() :
+  d_ptr(new vsStaticSourceFactoryPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsStaticSourceFactory::~vsStaticSourceFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVideoSourcePtr vsStaticSourceFactory::videoSource() const
+{
+  QTE_D_CONST(vsStaticSourceFactory);
+  return d->VideoSource;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsTrackSourcePtr> vsStaticSourceFactory::trackSources() const
+{
+  QTE_D_CONST(vsStaticSourceFactory);
+  return d->TrackSources;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsDescriptorSourcePtr> vsStaticSourceFactory::descriptorSources() const
+{
+  QTE_D_CONST(vsStaticSourceFactory);
+  return d->DescriptorSources;
+}
+
+//-----------------------------------------------------------------------------
+void vsStaticSourceFactory::setVideoSource(const vsVideoSourcePtr& sourcePtr)
+{
+  QTE_D(vsStaticSourceFactory);
+  d->VideoSource = sourcePtr;
+}
+
+//-----------------------------------------------------------------------------
+void vsStaticSourceFactory::setVideoSource(vsVideoSource* source)
+{
+  this->setVideoSource(vsVideoSourcePtr(source));
+}
+
+//-----------------------------------------------------------------------------
+void vsStaticSourceFactory::addTrackSource(const vsTrackSourcePtr& sourcePtr)
+{
+  QTE_D(vsStaticSourceFactory);
+  d->TrackSources.append(sourcePtr);
+}
+
+//-----------------------------------------------------------------------------
+void vsStaticSourceFactory::addTrackSource(vsTrackSource* source)
+{
+  this->addTrackSource(vsTrackSourcePtr(source));
+}
+
+//-----------------------------------------------------------------------------
+void vsStaticSourceFactory::addDescriptorSource(
+  const vsDescriptorSourcePtr& sourcePtr)
+{
+  QTE_D(vsStaticSourceFactory);
+  d->DescriptorSources.append(sourcePtr);
+}
+
+//-----------------------------------------------------------------------------
+void vsStaticSourceFactory::addDescriptorSource(vsDescriptorSource* source)
+{
+  this->addDescriptorSource(vsDescriptorSourcePtr(source));
+}
diff --git a/Libraries/VspData/vsStaticSourceFactory.h b/Libraries/VspData/vsStaticSourceFactory.h
new file mode 100644
index 00000000..81f241ea
--- /dev/null
+++ b/Libraries/VspData/vsStaticSourceFactory.h
@@ -0,0 +1,80 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsStaticSourceFactory_h
+#define __vsStaticSourceFactory_h
+
+#include <vgExport.h>
+
+#include "vsSimpleSourceFactory.h"
+
+class vsStaticSourceFactoryPrivate;
+
+/// Static source factory.
+///
+/// This class implements a static source factory, which is a sort of "fake"
+/// factory that must be pre-initialized with its sources. This is intended to
+/// be used as a "source container" convenience class for archive source
+/// plugins, such that their implementations of
+/// ::vsArchiveSourceInterface::createArchiveSource can create raw sources
+/// without a factory, stuff them into an instance of this class, and use said
+/// instance as their return object.
+class VSP_DATA_EXPORT vsStaticSourceFactory : public vsSimpleSourceFactory
+{
+public:
+  vsStaticSourceFactory();
+  virtual ~vsStaticSourceFactory();
+
+  virtual vsVideoSourcePtr videoSource() const QTE_OVERRIDE;
+  virtual QList<vsTrackSourcePtr> trackSources() const QTE_OVERRIDE;
+  virtual QList<vsDescriptorSourcePtr> descriptorSources() const QTE_OVERRIDE;
+
+  /// Set video source.
+  ///
+  /// This method sets the static factory's video source to the specified
+  /// source. Only one video source is supported; if a video source was already
+  /// set, it is replaces with the new source.
+  void setVideoSource(const vsVideoSourcePtr&);
+
+  /// \copydoc setVideoSource(vsVideoSourcePtr)
+  ///
+  /// This convenience overload creates a new ::QSharedPointer from a bare
+  /// pointer. The object must not already be wrapped in a pointer class.
+  void setVideoSource(vsVideoSource*);
+
+  /// Add track source.
+  ///
+  /// This method adds a track source to the static factory. Multiple sources
+  /// may be added.
+  void addTrackSource(const vsTrackSourcePtr&);
+
+  /// \copydoc addTrackSource(vsTrackSourcePtr)
+  ///
+  /// This convenience overload creates a new ::QSharedPointer from a bare
+  /// pointer. The object must not already be wrapped in a pointer class.
+  void addTrackSource(vsTrackSource*);
+
+  /// Add descriptor source.
+  ///
+  /// This method adds a descriptor source to the static factory. Multiple
+  /// sources may be added.
+  void addDescriptorSource(const vsDescriptorSourcePtr&);
+
+  /// \copydoc addDescriptorSource(vsDescriptorSourcePtr)
+  ///
+  /// This convenience overload creates a new ::QSharedPointer from a bare
+  /// pointer. The object must not already be wrapped in a pointer class.
+  void addDescriptorSource(vsDescriptorSource*);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsStaticSourceFactory)
+
+private:
+  QTE_DECLARE_PRIVATE(vsStaticSourceFactory)
+  QTE_DISABLE_COPY(vsStaticSourceFactory)
+};
+
+#endif
diff --git a/Libraries/VspData/vsTrackClassifier.h b/Libraries/VspData/vsTrackClassifier.h
new file mode 100644
index 00000000..6018b6a2
--- /dev/null
+++ b/Libraries/VspData/vsTrackClassifier.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackClassifier_h
+#define __vsTrackClassifier_h
+
+struct vsTrackObjectClassifier
+{
+  vsTrackObjectClassifier()
+    : probabilityPerson(0.0), probabilityVehicle(0.0), probabilityOther(0.0) {}
+
+  double probabilityPerson;
+  double probabilityVehicle;
+  double probabilityOther;
+};
+
+#endif
diff --git a/Libraries/VspData/vsTrackData.h b/Libraries/VspData/vsTrackData.h
new file mode 100644
index 00000000..c0e00580
--- /dev/null
+++ b/Libraries/VspData/vsTrackData.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackData_h
+#define __vsTrackData_h
+
+#include <vtkVgTimeStamp.h>
+
+#include <QString>
+#include <QHash>
+
+#include <map>
+
+typedef std::map<vtkVgTimeStamp, double> vsTrackDataItem;
+typedef QHash<QString, vsTrackDataItem> vsTrackData;
+
+#endif
diff --git a/Libraries/VspData/vsTrackInfo.cxx b/Libraries/VspData/vsTrackInfo.cxx
new file mode 100644
index 00000000..fa0f5d8d
--- /dev/null
+++ b/Libraries/VspData/vsTrackInfo.cxx
@@ -0,0 +1,83 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackInfo.h"
+
+#include <QHash>
+
+#include <vgColor.h>
+
+#include <vtkVgTrack.h>
+
+#include <vvTrackInfo.h>
+
+const int vsTrackInfo::GroundTruthSource = 1000;
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+vsTrackInfo adapt(const vvTrackInfo& in)
+{
+  vsTrackInfo out;
+
+  out.name = in.Name;
+  out.type = in.Type;
+  out.source = in.Source;
+  in.PenColor.fillArray(out.pcolor);
+  in.ForegroundColor.fillArray(out.fcolor);
+  in.BackgroundColor.fillArray(out.bcolor);
+
+  return out;
+}
+
+//-----------------------------------------------------------------------------
+void adapt(
+  QList<vsTrackInfo>& out,
+  QHash<vtkVgTrack::enumTrackPVOType, vvTrackInfo> const& src,
+  vtkVgTrack::enumTrackPVOType vtkType,
+  vsTrackInfo::Type vsType)
+{
+  if (!src.contains(vtkType))
+    return;
+
+  vsTrackInfo ati = adapt(src[vtkType]);
+  ati.id = vsType;
+
+  out.append(ati);
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+QList<vsTrackInfo> vsTrackInfo::trackTypes()
+{
+  QHash<vtkVgTrack::enumTrackPVOType, vvTrackInfo> types;
+  foreach (vvTrackInfo ti, vvTrackInfo::trackTypes())
+    types.insert(ti.Type, ti);
+
+  QList<vsTrackInfo> result;
+  adapt(result, types, vtkVgTrack::Person,       vsTrackInfo::Person);
+  adapt(result, types, vtkVgTrack::Vehicle,      vsTrackInfo::Vehicle);
+  adapt(result, types, vtkVgTrack::Other,        vsTrackInfo::Other);
+  adapt(result, types, vtkVgTrack::Unclassified, vsTrackInfo::Unclassified);
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsTrackInfo> vsTrackInfo::trackSources()
+{
+  QList<vsTrackInfo> result;
+  foreach (vvTrackInfo ti, vvTrackInfo::trackSources())
+    {
+    vsTrackInfo ati = adapt(ti);
+    ati.id = ti.Source;
+    result.append(ati);
+    }
+
+  return result;
+}
diff --git a/Libraries/VspData/vsTrackInfo.h b/Libraries/VspData/vsTrackInfo.h
new file mode 100644
index 00000000..03611cd8
--- /dev/null
+++ b/Libraries/VspData/vsTrackInfo.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackInfo_h
+#define __vsTrackInfo_h
+
+#include <QString>
+#include <QList>
+
+#include <vgExport.h>
+
+struct VSP_DATA_EXPORT vsTrackInfo
+{
+  int id;
+  int source;
+  int type;
+  QString name;
+  double pcolor[3];
+  double bcolor[3];
+  double fcolor[3];
+
+  enum Type
+    {
+    Person       = -5001,
+    Vehicle      = -5002,
+    Other        = -5003,
+    Unclassified = -5000
+    };
+
+public:
+  static const int GroundTruthSource;
+
+  static QList<vsTrackInfo> trackTypes();
+  static QList<vsTrackInfo> trackSources();
+};
+
+#endif
diff --git a/Libraries/VspData/vsTrackSource.h b/Libraries/VspData/vsTrackSource.h
new file mode 100644
index 00000000..2b449076
--- /dev/null
+++ b/Libraries/VspData/vsTrackSource.h
@@ -0,0 +1,41 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackSource_h
+#define __vsTrackSource_h
+
+#include <vgExport.h>
+
+#include <vvTrack.h>
+
+#include "vsDataSource.h"
+#include "vsTrackData.h"
+
+class VSP_DATA_EXPORT vsTrackSource : public vsDataSource
+{
+  Q_OBJECT
+
+public:
+  virtual ~vsTrackSource() {}
+
+signals:
+  void trackUpdated(vvTrackId trackId, vvTrackState state);
+  void trackUpdated(vvTrackId trackId, QList<vvTrackState> states);
+  void trackDataUpdated(vvTrackId trackId, vsTrackData data);
+  void trackClosed(vvTrackId trackId);
+
+  void destroyed(vsTrackSource*);
+
+protected:
+  vsTrackSource() {}
+
+  void suicide() { emit this->destroyed(this); }
+
+private:
+  QTE_DISABLE_COPY(vsTrackSource)
+};
+
+#endif
diff --git a/Libraries/VspData/vsTrackState.h b/Libraries/VspData/vsTrackState.h
new file mode 100644
index 00000000..78386601
--- /dev/null
+++ b/Libraries/VspData/vsTrackState.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackState_h
+#define __vsTrackState_h
+
+#include <QPointF>
+#include <QPolygon>
+#include <QPolygonF>
+
+#include <vvTrack.h>
+
+#include <vtkVgTimeStamp.h>
+
+struct vsTrackState
+{
+  vtkVgTimeStamp time;
+  QPointF point;
+  QPolygonF object;
+
+  bool operator<(const vvTrackState& other) const
+    { return this->time < vtkVgTimeStamp(other.TimeStamp); }
+  bool operator<(const vtkVgTimeStamp& timestamp) const
+    { return this->time < timestamp; }
+  bool operator>(const vtkVgTimeStamp& timestamp) const
+    { return timestamp < this->time; }
+};
+
+#endif
diff --git a/Libraries/VspData/vsVideoSource.cxx b/Libraries/VspData/vsVideoSource.cxx
new file mode 100644
index 00000000..5c3eccfc
--- /dev/null
+++ b/Libraries/VspData/vsVideoSource.cxx
@@ -0,0 +1,207 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVideoSourcePrivate.h"
+
+#include <qtMap.h>
+
+#include "vsLibDebug.h"
+
+QTE_IMPLEMENT_D_FUNC(vsVideoSource)
+
+//BEGIN vsVideoSourcePrivate
+
+//-----------------------------------------------------------------------------
+vsVideoSourcePrivate::vsVideoSourcePrivate(vsVideoSource* q)
+  : q_ptr(q), Status(vsDataSource::NoSource), Streaming(false)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVideoSourcePrivate::~vsVideoSourcePrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSourcePrivate::run()
+{
+  qtDebug(vsdVideoSource) << "video source thread executing";
+  qtThread::run();
+  qtDebug(vsdVideoSource) << "video source thread halting";
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSourcePrivate::emitMetadata(
+  QList<vtkVgVideoFrameMetaData> metadata)
+{
+  QTE_Q(vsVideoSource);
+  emit q->metadataAvailable(metadata);
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSourcePrivate::updateFrameRange(
+  vtkVgTimeStamp first, vtkVgTimeStamp last)
+{
+  QTE_Q(vsVideoSource);
+  QMetaObject::invokeMethod(q, "setFrameRange",
+                            Q_ARG(vtkVgTimeStamp, first),
+                            Q_ARG(vtkVgTimeStamp, last));
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSourcePrivate::queueFrameRequest(vgVideoSeekRequest request)
+{
+  // Set up handler
+  if (this->CurrentRequests.isEmpty())
+    {
+    QMetaObject::invokeMethod(this, "flushFrameRequests",
+                              Qt::QueuedConnection);
+    }
+
+  vgVideoSeekRequest& currentRequest =
+    this->CurrentRequests[request.Requestor.data()];
+  if (request.RequestId < 0)
+    {
+    // If the request does not have a valid ID, copy the one from the previous
+    // request, which will either also be invalid (if we had no pending
+    // requests with an ID), or else will the ID of the most recent request
+    // that DID have an ID... this way, when we reply, we will still indicate
+    // the most recent ID'd request that has been satisfied (which would
+    // otherwise get lost if we didn't do this!)
+    request.RequestId = currentRequest.RequestId;
+    }
+
+  // Set next request
+  currentRequest.destructiveCopy(request);
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSourcePrivate::flushFrameRequests()
+{
+  // Dispatch queued requests for all requestors...
+  qtUtil::mapBound(this->CurrentRequests, this,
+                   &vsVideoSourcePrivate::requestFrame);
+  // ...then clear the pending requests
+  this->CurrentRequests.clear();
+}
+
+//END vsVideoSourcePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsVideoSource
+
+//-----------------------------------------------------------------------------
+vsVideoSource::vsVideoSource(vsVideoSourcePrivate* d) : d_ptr(d)
+{
+  if (d->Status != vsDataSource::NoSource)
+    this->updateStatus(d->Status);
+}
+
+//-----------------------------------------------------------------------------
+vsVideoSource::~vsVideoSource()
+{
+  QTE_D(vsVideoSource);
+  qtDebug(vsdVideoSource) << "stopping video source thread";
+  d->quit();
+  d->wait();
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsVideoSource::status() const
+{
+  QTE_D_CONST(vsVideoSource);
+  return d->Status;
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSource::start()
+{
+  QTE_D(vsVideoSource);
+
+  if (d->Status == vsDataSource::NoSource)
+    return;
+
+  vsDataSource::start();
+  d->start();
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSource::updateStatus(vsDataSource::Status status)
+{
+  QTE_D(vsVideoSource);
+  d->Status = status;
+  emit this->statusChanged(status);
+}
+
+//-----------------------------------------------------------------------------
+vgRange<vtkVgTimeStamp> vsVideoSource::frameRange() const
+{
+  QTE_D_CONST(vsVideoSource);
+  return vgRange<vtkVgTimeStamp>(d->FirstAvailableFrame,
+                                 d->LastAvailableFrame);
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSource::setFrameRange(
+  vtkVgTimeStamp first, vtkVgTimeStamp last)
+{
+  QTE_D(vsVideoSource);
+  d->FirstAvailableFrame = first;
+  d->LastAvailableFrame = last;
+  emit this->frameRangeAvailable(first, last);
+}
+
+//-----------------------------------------------------------------------------
+bool vsVideoSource::isStreaming() const
+{
+  QTE_D_CONST(vsVideoSource);
+  return d->Streaming;
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSource::setStreaming(bool streaming)
+{
+  QTE_D(vsVideoSource);
+  if (d->Streaming != streaming)
+    {
+    d->Streaming = streaming;
+    emit this->streamingChanged(streaming);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vsVideoSource::findTime(
+  unsigned int frameNumber, vg::SeekMode direction)
+{
+  QTE_D(vsVideoSource);
+
+  vtkVgTimeStamp result;
+  QMetaObject::invokeMethod(d, "findTime", Qt::BlockingQueuedConnection,
+                            Q_ARG(vtkVgTimeStamp*, &result),
+                            Q_ARG(unsigned int, frameNumber),
+                            Q_ARG(vg::SeekMode, direction));
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSource::requestFrame(vgVideoSeekRequest request)
+{
+  QTE_D(vsVideoSource);
+  QMetaObject::invokeMethod(d, "queueFrameRequest",
+                            Q_ARG(vgVideoSeekRequest, request));
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoSource::clearLastRequest(vgVideoSourceRequestor* requestor)
+{
+  QTE_D(vsVideoSource);
+  QMetaObject::invokeMethod(d, "clearLastRequest",
+                            Q_ARG(vgVideoSourceRequestor*, requestor));
+}
+
+//END vsVideoSource
diff --git a/Libraries/VspData/vsVideoSource.h b/Libraries/VspData/vsVideoSource.h
new file mode 100644
index 00000000..772bdb92
--- /dev/null
+++ b/Libraries/VspData/vsVideoSource.h
@@ -0,0 +1,65 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVideoSource_h
+#define __vsVideoSource_h
+
+#include <QAbstractAnimation>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+#include <vgRange.h>
+
+#include <vgVideoSource.h>
+
+#include <vtkVgTimeStamp.h>
+
+#include <vtkVgVideoFrameMetaData.h>
+
+#include "vsDataSource.h"
+
+class vsVideoSourcePrivate;
+
+class VSP_DATA_EXPORT vsVideoSource : public vsDataSource, public vgVideoSource
+{
+  Q_OBJECT
+
+public:
+  virtual ~vsVideoSource();
+
+  virtual void start() QTE_OVERRIDE;
+
+  vsDataSource::Status status() const QTE_OVERRIDE;
+
+  virtual bool isStreaming() const;
+  vgRange<vtkVgTimeStamp> frameRange() const;
+
+  virtual vtkVgTimeStamp findTime(unsigned int frameNumber, vg::SeekMode);
+  virtual void requestFrame(vgVideoSeekRequest);
+  virtual void clearLastRequest(vgVideoSourceRequestor*);
+
+signals:
+  void frameRangeAvailable(vtkVgTimeStamp first, vtkVgTimeStamp last);
+  void metadataAvailable(QList<vtkVgVideoFrameMetaData> metadata);
+  void streamingChanged(bool);
+
+protected slots:
+  virtual void setStreaming(bool);
+  virtual void setFrameRange(vtkVgTimeStamp first, vtkVgTimeStamp last);
+  virtual void updateStatus(vsDataSource::Status);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(vsVideoSource)
+
+  vsVideoSource(vsVideoSourcePrivate*);
+
+private:
+  QTE_DECLARE_PRIVATE(vsVideoSource)
+  QTE_DISABLE_COPY(vsVideoSource)
+};
+
+#endif
diff --git a/Libraries/VspData/vsVideoSourcePrivate.h b/Libraries/VspData/vsVideoSourcePrivate.h
new file mode 100644
index 00000000..6ecea1a1
--- /dev/null
+++ b/Libraries/VspData/vsVideoSourcePrivate.h
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVideoSourcePrivate_h
+#define __vsVideoSourcePrivate_h
+
+#include <QHash>
+
+#include <qtThread.h>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+
+#include "vsVideoSource.h"
+
+class vsVideoAnimation;
+
+class VSP_DATA_EXPORT vsVideoSourcePrivate : public qtThread
+{
+  Q_OBJECT
+
+public:
+  virtual ~vsVideoSourcePrivate();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsVideoSource)
+
+  vsVideoSourcePrivate(vsVideoSource* q);
+
+  virtual void run() QTE_OVERRIDE;
+
+  virtual void requestFrame(const vgVideoSeekRequest&) = 0;
+
+  vsDataSource::Status Status;
+  bool Streaming;
+  vtkVgTimeStamp FirstAvailableFrame;
+  vtkVgTimeStamp LastAvailableFrame;
+  QHash<QObject*, vgVideoSeekRequest> CurrentRequests;
+
+protected slots:
+  virtual void findTime(vtkVgTimeStamp* result, unsigned int frameNumber,
+                        vg::SeekMode) = 0;
+  virtual void queueFrameRequest(vgVideoSeekRequest);
+  virtual void flushFrameRequests();
+  virtual void clearLastRequest(vgVideoSourceRequestor*) = 0;
+
+  void updateFrameRange(vtkVgTimeStamp first, vtkVgTimeStamp last);
+  void emitMetadata(QList<vtkVgVideoFrameMetaData> metadata);
+
+private:
+  QTE_DECLARE_PUBLIC(vsVideoSource)
+  QTE_DISABLE_COPY(vsVideoSourcePrivate)
+};
+
+#endif
diff --git a/Libraries/VspData/vtkVsTrackInfo.cxx b/Libraries/VspData/vtkVsTrackInfo.cxx
new file mode 100644
index 00000000..d6e041db
--- /dev/null
+++ b/Libraries/VspData/vtkVsTrackInfo.cxx
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVsTrackInfo.h"
+
+vtkImplementMetaObject(vtkVsTrackInfo, vtkVgEventTrackInfoBase);
+
+//-----------------------------------------------------------------------------
+vtkVsTrackInfo::vtkVsTrackInfo(
+  vvTrackId tid, const vtkVgTimeStamp& start, const vtkVgTimeStamp& end)
+  : vtkVgEventTrackInfoBase(-1, start, end), VvTrackId(tid)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVsTrackInfo::vtkVsTrackInfo(const vtkVsTrackInfo& other)
+  : vtkVgEventTrackInfoBase(other), VvTrackId(other.VvTrackId)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVsTrackInfo::~vtkVsTrackInfo()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfoBase* vtkVsTrackInfo::Clone() const
+{
+  return new vtkVsTrackInfo(*this);
+}
+
+//-----------------------------------------------------------------------------
+const char* vtkVsTrackInfo::CheckValid() const
+{
+  if (this->VvTrackId.Source < 0)
+    {
+    return "Only non-negative track sources are allowed.\n";
+    }
+
+  if (this->VvTrackId.SerialNumber < 0)
+    {
+    return "Only non-negative track serial numbers are allowed.\n";
+    }
+
+  return vtkVgEventTrackInfoBase::CheckBaseValid();
+}
diff --git a/Libraries/VspData/vtkVsTrackInfo.h b/Libraries/VspData/vtkVsTrackInfo.h
new file mode 100644
index 00000000..f7d166d3
--- /dev/null
+++ b/Libraries/VspData/vtkVsTrackInfo.h
@@ -0,0 +1,34 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVsTrackInfo_h
+#define __vtkVsTrackInfo_h
+
+#include <vgExport.h>
+
+#include <vtkVgEventBase.h>
+
+#include <vvTrack.h>
+
+class VSP_DATA_EXPORT vtkVsTrackInfo : public vtkVgEventTrackInfoBase
+{
+  vtkDeclareMetaObject(vtkVsTrackInfo);
+
+public:
+  vtkVsTrackInfo(vvTrackId tid,
+                 const vtkVgTimeStamp& start,
+                 const vtkVgTimeStamp& end);
+  vtkVsTrackInfo(const vtkVsTrackInfo&);
+  virtual ~vtkVsTrackInfo();
+
+  virtual vtkVgEventTrackInfoBase* Clone() const;
+
+  virtual const char* CheckValid() const;
+
+  vvTrackId VvTrackId;
+};
+
+#endif
diff --git a/Libraries/VspSourceUtil/CMakeLists.txt b/Libraries/VspSourceUtil/CMakeLists.txt
new file mode 100644
index 00000000..0c111a9a
--- /dev/null
+++ b/Libraries/VspSourceUtil/CMakeLists.txt
@@ -0,0 +1,53 @@
+project(vspSourceUtil)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+set(vspSourceUtil_Sources
+    vsAdapt.cxx
+    vsArchiveSource.cxx
+    vsSourceFactoryPlugin.cxx
+    vsStreamFactory.cxx
+    vsStreamSource.cxx
+    vsUtilDebug.cxx
+    vsVideoArchive.cxx
+    vsVideoHelper.cxx
+)
+
+set(vspSourceUtil_MocHeaders
+    vsStreamSource.h
+    vsStreamSourcePrivate.h
+    vsVideoArchive.h
+    vsVideoHelper.h
+)
+
+set(vspSourceUtilInstallHeaders
+  vsAdapt.h
+  vsAdaptTracks.h
+  vsArchiveSource.h
+  vsArchiveSourcePrivate.h
+  vsSourceFactoryPlugin.h
+  vsStreamFactory.h
+  vsStreamSource.h
+  vsStreamSourcePrivate.h
+  vsVideoArchive.h
+  vsVideoHelper.h
+)
+
+qt4_wrap_cpp(vspSourceUtil_MocSources ${vspSourceUtil_MocHeaders})
+
+add_library(${PROJECT_NAME}
+  ${vspSourceUtil_Sources}
+  ${vspSourceUtil_MocSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vspData
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vspSourceUtilInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VspSourceUtil)
diff --git a/Libraries/VspSourceUtil/vsAdapt.cxx b/Libraries/VspSourceUtil/vsAdapt.cxx
new file mode 100644
index 00000000..d57b97a4
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsAdapt.cxx
@@ -0,0 +1,228 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsAdapt.h"
+#include "vsAdaptTracks.h"
+
+#include <QMap>
+
+#include <vgImage.h>
+
+#include <vvQueryResult.h>
+
+#include <vvUtil.h>
+
+#include <vtkVgAdapt.h>
+
+#include <vsEvent.h>
+#include <vsTrackInfo.h>
+#include <vtkVsTrackInfo.h>
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void addTracks(vsEventTrackInfo& eti, const vvDescriptor& d)
+{
+  if (!d.Region.empty())
+    {
+    const vsTimeInterval tti(d.Region.begin()->TimeStamp,
+                             d.Region.rbegin()->TimeStamp);
+    for (size_t n = 0, k = d.TrackIds.size(); n < k; ++n)
+      {
+      eti[d.TrackIds[n]].insert(tti, 0);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void addRegions(
+  const vvDescriptor& d, QMap<vtkVgTimeStamp, vvImageBoundingBox>& regions)
+{
+  foreach_iter (vvDescriptorRegionMap::const_iterator, iter, d.Region)
+    {
+    if (regions.contains(iter->TimeStamp))
+      {
+      vvImageBoundingBox& dst = regions[iter->TimeStamp];
+      const vvImageBoundingBox& src = iter->ImageRegion;
+
+      // Calculate union of existing box with current iterator box
+      dst.TopLeft.X = qMin(dst.TopLeft.X, src.TopLeft.X);
+      dst.TopLeft.Y = qMin(dst.TopLeft.Y, src.TopLeft.Y);
+      dst.BottomRight.X = qMin(dst.BottomRight.X, src.BottomRight.X);
+      dst.BottomRight.Y = qMin(dst.BottomRight.Y, src.BottomRight.Y);
+      }
+    else
+      {
+      // No box exists yet at this time, so just add the one on the iterator
+      regions.insert(iter->TimeStamp, iter->ImageRegion);
+      }
+    }
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vsEvent vsAdapt(const vvQueryResult& result)
+{
+  vsEvent eventBase = vsEvent(QUuid() /* FIXME? */);
+
+  // Add descriptor track intervals
+  vsEventTrackInfo eti;
+  for (size_t n = 0, k = result.Descriptors.size(); n < k; ++n)
+    {
+    addTracks(eti, result.Descriptors[n]);
+    }
+  vsAddTracks(eventBase, eti);
+
+  if (!result.Descriptors.empty())
+    {
+    // Generate merged regions, using metadata descriptor if present
+    QMap<vtkVgTimeStamp, vvImageBoundingBox> mergedRegions;
+    const size_t k = result.Descriptors.size();
+    const size_t mdi = vvUtil::findMergedRegions(result.Descriptors);
+    if (mdi < k)
+      {
+      addRegions(result.Descriptors[mdi], mergedRegions);
+      }
+    else
+      {
+      for (size_t n = 0; n < k; ++n)
+        {
+        addRegions(result.Descriptors[n], mergedRegions);
+        }
+      }
+
+    // Set start and end times
+    if (!mergedRegions.isEmpty())
+      {
+      eventBase->SetStartFrame(mergedRegions.begin().key());
+      eventBase->SetEndFrame((mergedRegions.end() - 1).key());
+      }
+
+    // Add merged regions
+    typedef QMap<vtkVgTimeStamp, vvImageBoundingBox>::const_iterator Iterator;
+    foreach_iter (Iterator, iter, mergedRegions)
+      {
+      const vvImageBoundingBox& box = iter.value();
+
+      double points[8];
+      points[0] = box.TopLeft.X;     points[1] = box.TopLeft.Y;
+      points[2] = box.BottomRight.X; points[3] = box.TopLeft.Y;
+      points[4] = box.BottomRight.X; points[5] = box.BottomRight.Y;
+      points[6] = box.TopLeft.X;     points[7] = box.BottomRight.Y;
+      eventBase->AddRegion(iter.key(), 4, points);
+      }
+    }
+
+  if (result.UserData.Flags.testFlag(vvUserData::Starred))
+    {
+    eventBase->SetFlags(vtkVgEventBase::EF_Starred);
+    }
+
+  eventBase->SetName(qPrintable(QString::number(result.InstanceId)));
+
+  if (!result.UserData.Notes.empty())
+    {
+    eventBase->SetNote(result.UserData.Notes.c_str());
+    }
+
+  return eventBase;
+}
+
+//-----------------------------------------------------------------------------
+vvTrackId vsAdaptTrackId(unsigned int vidtkId)
+{
+  vvTrackId vvId(0, vidtkId);
+  if (vvId.SerialNumber >= 1000000)
+    {
+    vvId.Source = vsTrackInfo::GroundTruthSource;
+    vvId.SerialNumber -= 1000000;
+    }
+  return vvId;
+}
+
+//-----------------------------------------------------------------------------
+bool vsExtractClassifier(const vvDescriptor& sd, QList<vsEvent>& eventList)
+{
+  // Check if this descriptor is a classifier
+  // \TODO should be using descriptor_oracle (if available) for this check
+  if (sd.DescriptorName != "classifier")
+    return false;
+
+  vsEvent event = vsEvent(QUuid() /* FIXME? */);
+
+  // Check format of classifier vector
+  if (sd.Values.size() == 1)
+    {
+    // Convert flat map
+    for (size_t i = 0; i < sd.Values[0].size(); ++i)
+      {
+      double p = sd.Values[0][i];
+      if (p > 0.0)
+        event->AddClassifier(static_cast<int>(i), p, 0.0);
+      }
+    }
+
+  // Add regions from descriptor
+  foreach_iter (vvDescriptorRegionMap::const_iterator, rIter, sd.Region)
+    {
+    const vvImageBoundingBox r = rIter->ImageRegion;
+    double points[8];
+    points[0] = r.TopLeft.X;     points[1] = r.TopLeft.Y;
+    points[2] = r.BottomRight.X; points[3] = r.TopLeft.Y;
+    points[4] = r.BottomRight.X; points[5] = r.BottomRight.Y;
+    points[6] = r.TopLeft.X;     points[7] = r.BottomRight.Y;
+    event->AddRegion(rIter->TimeStamp, 4, points);
+    }
+
+  // Get start and end frame
+  vsEventTrackInfo eti;
+  if (sd.Region.size())
+    {
+    vsTimeInterval tti(sd.Region.begin()->TimeStamp,
+                       sd.Region.rbegin()->TimeStamp);
+
+    // Add track(s)
+    for (size_t n = 0, k = sd.TrackIds.size(); n < k; ++n)
+      eti[sd.TrackIds[n]].insert(tti, 0);
+    }
+
+  // Add track interval(s) from descriptor to event
+  vsAddTracks(event, eti);
+
+  // Done
+  eventList.append(event);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vsAddTracks(vsEvent& event, const vsEventTrackInfo& eti)
+{
+  foreach_iter (vsEventTrackInfo::const_iterator, iter, eti)
+    {
+    QMap<vsTimeInterval, void*> tti = iter.value();
+    while (tti.count())
+      {
+      // Take first interval
+      vsTimeInterval i = tti.begin().key();
+      tti.erase(tti.begin());
+
+      // Test for overlapping intervals and grow interval accordingly
+      while (tti.count())
+        {
+        if (i.upper < tti.begin().key().lower)
+          break;
+        i.upper = tti.begin().key().upper;
+        tti.erase(tti.begin());
+        }
+
+      // When no more overlapping intervals, add interval to event
+      vtkVsTrackInfo* ti = new vtkVsTrackInfo(iter.key(), i.lower, i.upper);
+      event->AddTrack(ti);
+      }
+    }
+}
diff --git a/Libraries/VspSourceUtil/vsAdapt.h b/Libraries/VspSourceUtil/vsAdapt.h
new file mode 100644
index 00000000..8cf03466
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsAdapt.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsAdapt_h
+#define __vsAdapt_h
+
+#include <QList>
+
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+class vtkImageData;
+
+class vgImage;
+
+struct vvDescriptor;
+struct vvQueryResult;
+struct vvTrackId;
+
+class vsEvent;
+
+extern VSP_SOURCEUTIL_EXPORT vsEvent
+vsAdapt(const vvQueryResult&);
+
+extern VSP_SOURCEUTIL_EXPORT vvTrackId
+vsAdaptTrackId(unsigned int);
+
+extern VSP_SOURCEUTIL_EXPORT bool
+vsExtractClassifier(const vvDescriptor&, QList<vsEvent>&);
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsAdaptTracks.h b/Libraries/VspSourceUtil/vsAdaptTracks.h
new file mode 100644
index 00000000..b68c7b04
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsAdaptTracks.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsAdaptTracks_h
+#define __vsAdaptTracks_h
+
+#include <QHash>
+
+#include <vgExport.h>
+
+#include <vgRange.h>
+
+class vtkVgTimeStamp;
+
+struct vvDescriptor;
+struct vvTrackId;
+
+class vsEvent;
+
+typedef vgRange<vtkVgTimeStamp> vsTimeInterval;
+typedef QHash<vvTrackId, QMap<vsTimeInterval, void*> > vsEventTrackInfo;
+
+extern VSP_SOURCEUTIL_EXPORT void
+vsAddTracks(vsEvent&, const vsEventTrackInfo&);
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsArchiveSource.cxx b/Libraries/VspSourceUtil/vsArchiveSource.cxx
new file mode 100644
index 00000000..087ff03e
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsArchiveSource.cxx
@@ -0,0 +1,97 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsArchiveSourcePrivate.h"
+
+QTE_IMPLEMENT_ALIASED_D_FUNC(vsArchiveSourceHelper, vsArchiveSourcePrivate)
+
+//-----------------------------------------------------------------------------
+vsArchiveSourcePrivate::~vsArchiveSourcePrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsArchiveSourcePrivate::run()
+{
+  QTE_Q(vsArchiveSourceHelper);
+
+  q->emitStatusChanged(vsDataSource::ArchivedActive);
+
+  if (!this->processArchive(this->ArchiveUri))
+    {
+    // If the read failed, commit suicide (the core will clean us up)
+    q->suicide();
+    return;
+    }
+
+  // Done
+  this->Active = false;
+  q->emitStatusChanged(vsDataSource::ArchivedIdle);
+}
+
+//-----------------------------------------------------------------------------
+bool vsArchiveSourcePrivate::isRunning() const
+{
+  return this->Active && qtThread::isRunning();
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceHelper::vsArchiveSourceHelper(vsArchiveSourcePrivate* d) :
+  d_ptr(d)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceHelper::~vsArchiveSourceHelper()
+{
+  QTE_D(vsArchiveSource);
+  delete d;
+}
+
+//-----------------------------------------------------------------------------
+void vsArchiveSourceHelper::finishConstruction()
+{
+  this->emitStatusChanged(vsDataSource::ArchivedIdle);
+}
+
+//-----------------------------------------------------------------------------
+void vsArchiveSourceHelper::wait()
+{
+  QTE_D(vsArchiveSource);
+  d->wait();
+}
+
+//-----------------------------------------------------------------------------
+void vsArchiveSourceHelper::start()
+{
+  QTE_D(vsArchiveSource);
+  d->start();
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsArchiveSourceHelper::status() const
+{
+  QTE_D_CONST(vsArchiveSource);
+  return (d->isRunning() ? vsDataSource::ArchivedActive
+                         : vsDataSource::ArchivedIdle);
+}
+
+//-----------------------------------------------------------------------------
+QString vsArchiveSourceHelper::text() const
+{
+  QTE_D_CONST(vsArchiveSource);
+  return (d->isRunning() ? "Loading" : "Archived");
+}
+
+//-----------------------------------------------------------------------------
+QString vsArchiveSourceHelper::toolTip() const
+{
+  QTE_D_CONST(vsArchiveSource);
+
+  const QString ttFormat = (d->isRunning() ? "Reading archived %1 from %2"
+                                           : "Using archived %1 from %2");
+  return ttFormat.arg(d->Type, d->ArchiveUri.toString());
+}
diff --git a/Libraries/VspSourceUtil/vsArchiveSource.h b/Libraries/VspSourceUtil/vsArchiveSource.h
new file mode 100644
index 00000000..ecd3d70a
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsArchiveSource.h
@@ -0,0 +1,113 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsArchiveSource_h
+#define __vsArchiveSource_h
+
+#include <QUrl>
+
+#include <vgExport.h>
+
+#include <vsDataSource.h>
+
+class vsArchiveSourcePrivate;
+
+//-----------------------------------------------------------------------------
+class VSP_SOURCEUTIL_EXPORT vsArchiveSourceHelper
+{
+public:
+  virtual ~vsArchiveSourceHelper();
+
+  void start();
+
+  vsDataSource::Status status() const;
+  QString text() const;
+  QString toolTip() const;
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(vsArchiveSource)
+
+  void finishConstruction();
+  void wait();
+
+  virtual void emitStatusChanged(vsDataSource::Status) = 0;
+  virtual void suicide() = 0;
+
+private:
+  QTE_DECLARE_PRIVATE(vsArchiveSource)
+  QTE_DISABLE_COPY(vsArchiveSourceHelper)
+
+  template <typename T> friend class vsArchiveSource;
+  vsArchiveSourceHelper(vsArchiveSourcePrivate*);
+};
+
+//-----------------------------------------------------------------------------
+template <typename T>
+class vsArchiveSource : public T, protected vsArchiveSourceHelper
+{
+public:
+  ~vsArchiveSource() { this->wait(); }
+
+  virtual void start() QTE_OVERRIDE;
+
+  virtual vsDataSource::Status status() const QTE_OVERRIDE
+    { return vsArchiveSourceHelper::status(); }
+
+  virtual QString text() const QTE_OVERRIDE
+    { return vsArchiveSourceHelper::text(); }
+
+  virtual QString toolTip() const QTE_OVERRIDE
+    { return vsArchiveSourceHelper::toolTip(); }
+
+protected:
+#if defined(__GNUC__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 7)
+  // Work around bug in g++ 4.x < 4.7 where 'using <base>::d_ptr' appears to do
+  // nothing
+  vsArchiveSourcePrivate* const& d_ptr;
+
+  vsArchiveSource(vsArchiveSourcePrivate* q) :
+    vsArchiveSourceHelper(q), d_ptr(vsArchiveSourceHelper::d_ptr)
+    { this->finishConstruction(); }
+#else
+  using vsArchiveSourceHelper::d_ptr;
+
+  vsArchiveSource(vsArchiveSourcePrivate* q) : vsArchiveSourceHelper(q)
+    { this->finishConstruction(); }
+#endif
+
+  virtual void emitStatusChanged(vsDataSource::Status status) QTE_OVERRIDE
+    { emit this->statusChanged(status); }
+
+  virtual void suicide() QTE_OVERRIDE { T::suicide(); }
+
+private:
+  QTE_DECLARE_PRIVATE(vsArchiveSource)
+  QTE_DISABLE_COPY(vsArchiveSource)
+};
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vsArchiveSource<T>::start()
+{
+  T::start();
+  vsArchiveSourceHelper::start();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vsArchiveSourcePrivate* vsArchiveSource<T>::d_func()
+{
+  return vsArchiveSourceHelper::d_func();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+const vsArchiveSourcePrivate* vsArchiveSource<T>::d_func() const
+{
+  return vsArchiveSourceHelper::d_func();
+}
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsArchiveSourcePrivate.h b/Libraries/VspSourceUtil/vsArchiveSourcePrivate.h
new file mode 100644
index 00000000..195b3ddb
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsArchiveSourcePrivate.h
@@ -0,0 +1,43 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsArchiveSourcePrivate_h
+#define __vsArchiveSourcePrivate_h
+
+#include <qtThread.h>
+
+#include <vgExport.h>
+
+#include "vsArchiveSource.h"
+
+//-----------------------------------------------------------------------------
+class VSP_SOURCEUTIL_EXPORT vsArchiveSourcePrivate : public qtThread
+{
+public:
+  vsArchiveSourcePrivate(
+    vsArchiveSourceHelper* q, const QString& type, const QUrl& uri) :
+    q_ptr(q), Active(true), Type(type), ArchiveUri(uri) {}
+
+  virtual ~vsArchiveSourcePrivate();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsArchiveSourceHelper)
+
+  virtual void run() QTE_OVERRIDE;
+  virtual bool isRunning() const QTE_OVERRIDE;
+
+  virtual bool processArchive(const QUrl& uri) = 0;
+
+private:
+  QTE_DECLARE_PUBLIC(vsArchiveSourceHelper)
+  QTE_DISABLE_COPY(vsArchiveSourcePrivate)
+
+  volatile bool Active;
+  QString Type;
+  QUrl ArchiveUri;
+};
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsSourceFactoryPlugin.cxx b/Libraries/VspSourceUtil/vsSourceFactoryPlugin.cxx
new file mode 100644
index 00000000..2ea38895
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsSourceFactoryPlugin.cxx
@@ -0,0 +1,120 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsSourceFactoryPlugin.h"
+
+#include <QDebug>
+#include <QHash>
+#include <QSignalMapper>
+
+#include <qtActionFactory.h>
+#include <qtActionManager.h>
+
+//-----------------------------------------------------------------------------
+class vsSourceFactoryPluginPrivate
+{
+public:
+  vsSourceFactoryPluginPrivate() : ActionParent(0), SignalMapper(0) {}
+
+  QHash<int, QAction*> Actions;
+  QHash<int, qtActionFactory*> ActionFactories;
+
+  QObject* ActionParent;
+  QSignalMapper* SignalMapper;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsSourceFactoryPlugin)
+
+//-----------------------------------------------------------------------------
+vsSourceFactoryPlugin::vsSourceFactoryPlugin() :
+  d_ptr(new vsSourceFactoryPluginPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactoryPlugin::~vsSourceFactoryPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtActionFactory* vsSourceFactoryPlugin::registerAction(
+  int key, const QString& displayText, const QString& iconName,
+  const QString& shortcutPortableString, const QString& toolTipText)
+{
+  QTE_D(vsSourceFactoryPlugin);
+
+  // Check that we haven't already registered an action with this key
+  if (d->ActionFactories.contains(key))
+    {
+    qWarning() << "vsSourceFactoryPlugin::registerAction:"
+                  " ignoring request to register action"
+                  " with already registered key" << key;
+    return 0;
+    }
+
+  const QString& displayGroup = vsSourceFactoryInterface::actionDisplayGroup();
+  const QKeySequence shortcut(shortcutPortableString,
+                              QKeySequence::PortableText);
+
+  // Create the action factory
+  qtActionFactory* actionFactory =
+    qtAm->registerAction(this->settingsKey(), displayText, displayGroup,
+                         iconName, shortcut);
+  actionFactory->setToolTip(toolTipText);
+
+  // Insert into private map and return the new factory
+  d->ActionFactories.insert(key, actionFactory);
+  return actionFactory;
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryPlugin::createActions(
+  QObject* parent, QSignalMapper* signalMapper,
+  qtPrioritizedMenuProxy& videoMenu,
+  qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  QTE_D(vsSourceFactoryPlugin);
+
+  d->ActionParent = parent;
+  d->SignalMapper = signalMapper;
+
+  this->insertActions(videoMenu, trackMenu, descriptorMenu);
+}
+
+//-----------------------------------------------------------------------------
+QAction* vsSourceFactoryPlugin::action(int key)
+{
+  QTE_D(vsSourceFactoryPlugin);
+
+  // Has the action been created yet?
+  if (!d->Actions.contains(key))
+    {
+    if (!d->ActionFactories.contains(key))
+      {
+      // Oops; looks like this action was not registered
+      return 0;
+      }
+
+    // Create action, and connect to signal mapper
+    QAction* action = d->ActionFactories[key]->createAction(d->ActionParent);
+    d->SignalMapper->setMapping(action, this->identifier());
+    d->SignalMapper->connect(action, SIGNAL(triggered()), SLOT(map()));
+    d->Actions.insert(key, action);
+
+    // Return new action (saves an extra has look-up)
+    return action;
+    }
+
+  // Return existing action
+  return d->Actions[key];
+}
+
+//-----------------------------------------------------------------------------
+void vsSourceFactoryPlugin::insertActions(
+  qtPrioritizedMenuProxy&, qtPrioritizedMenuProxy&, qtPrioritizedMenuProxy&)
+{
+}
diff --git a/Libraries/VspSourceUtil/vsSourceFactoryPlugin.h b/Libraries/VspSourceUtil/vsSourceFactoryPlugin.h
new file mode 100644
index 00000000..365e48bd
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsSourceFactoryPlugin.h
@@ -0,0 +1,92 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsSourceFactoryPlugin_h
+#define __vsSourceFactoryPlugin_h
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vsSourceFactoryInterface.h>
+
+class qtActionFactory;
+
+class vsSourceFactoryPluginPrivate;
+
+//-----------------------------------------------------------------------------
+/// An abstract source factory plugin that supports actions.
+///
+/// This class provides an abstract base class for a source factory plugin
+/// that registers and creates actions. Source factory plugins can derive from
+/// this class to take advantage of its action management functions to simplify
+/// creation and registration of UI actions.
+class VSP_SOURCEUTIL_EXPORT vsSourceFactoryPlugin
+  : public vsSourceFactoryInterface
+{
+public:
+  virtual ~vsSourceFactoryPlugin();
+
+  /// Create actions.
+  ///
+  /// This method prepares the instance to create registered actions, and calls
+  /// ::insertActions to allow subclasses to insert actions into the
+  /// appropriate menus. Subclasses overriding this method must call this base
+  /// class implementation before calling ::action.
+  virtual void createActions(
+    QObject* parent, QSignalMapper* signalMapper,
+    qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu) QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsSourceFactoryPlugin)
+
+  vsSourceFactoryPlugin();
+
+  /// Register an action.
+  ///
+  /// This method registers an action with the specified \p key, and returns
+  /// the resulting action factory. The action uses the standard settings key
+  /// and display group.
+  qtActionFactory* registerAction(
+    int key, const QString& displayText, const QString& iconName,
+    const QString& shortcutPortableString, const QString& toolTipText);
+
+  /// Retrieve an action.
+  ///
+  /// This method retrieves a ::QAction instance of a previously registered
+  /// action, creating a new instance if necessary. The action is already
+  /// parented, and already connected to the signal mapper passed to
+  /// ::createActions.
+  ///
+  /// \par Caution:
+  /// This method should not be called outside of ::insertActions.
+  QAction* action(int key);
+
+  /// Insert actions into menus.
+  ///
+  /// This method is called to request that the plugin insert menu actions that
+  /// the user can use to create an instance of the source. Registered actions
+  /// should be retrieved via ::action.
+  ///
+  /// The default implementation does nothing.
+  ///
+  /// \param videoMenu Insertion placeholder for the application's 'Video'
+  ///                  menu.
+  /// \param trackMenu Insertion placeholder for the application's 'Tracks'
+  ///                  menu.
+  /// \param descriptorMenu Insertion placeholder for the application's
+  ///                       'Descriptors' menu.
+  virtual void insertActions(
+    qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu);
+
+private:
+  QTE_DECLARE_PRIVATE(vsSourceFactoryPlugin)
+  QTE_DISABLE_COPY(vsSourceFactoryPlugin)
+};
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsStreamFactory.cxx b/Libraries/VspSourceUtil/vsStreamFactory.cxx
new file mode 100644
index 00000000..7378eb65
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsStreamFactory.cxx
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsStreamFactory.h"
+
+#include "vsStreamSource.h"
+
+// Need these so that QSharedPointer can find their dtors
+#include <vsDescriptorSource.h>
+#include <vsTrackSource.h>
+
+QTE_IMPLEMENT_D_FUNC(vsStreamFactory)
+
+//-----------------------------------------------------------------------------
+class vsStreamFactoryPrivate
+{
+public:
+  QSharedPointer<vsStreamSource> source;
+};
+
+//-----------------------------------------------------------------------------
+vsStreamFactory::vsStreamFactory() : d_ptr(new vsStreamFactoryPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsStreamFactory::~vsStreamFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamFactory::setSource(vsStreamSource* s)
+{
+  QTE_D(vsStreamFactory);
+  d->source = QSharedPointer<vsStreamSource>(s);
+}
+
+//-----------------------------------------------------------------------------
+vsVideoSourcePtr vsStreamFactory::videoSource() const
+{
+  QTE_D_CONST(vsStreamFactory);
+  return d->source;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsTrackSourcePtr> vsStreamFactory::trackSources() const
+{
+  QTE_D_CONST(vsStreamFactory);
+
+  vsTrackSourcePtr s;
+  if (!d->source || !(s = d->source->trackSource()))
+    {
+    return vsSourceFactory::trackSources();
+    }
+
+  QList<vsTrackSourcePtr> list;
+  list.append(s);
+  return list;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsDescriptorSourcePtr> vsStreamFactory::descriptorSources() const
+{
+  QTE_D_CONST(vsStreamFactory);
+
+  vsDescriptorSourcePtr s;
+  if (!d->source || !(s = d->source->descriptorSource()))
+    {
+    return vsSourceFactory::descriptorSources();
+    }
+
+  QList<vsDescriptorSourcePtr> list;
+  list.append(s);
+  return list;
+}
diff --git a/Libraries/VspSourceUtil/vsStreamFactory.h b/Libraries/VspSourceUtil/vsStreamFactory.h
new file mode 100644
index 00000000..1d0c8194
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsStreamFactory.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsStreamFactory_h
+#define __vsStreamFactory_h
+
+#include <vgExport.h>
+
+#include <vsSourceFactory.h>
+
+class vsStreamFactoryPrivate;
+class vsStreamSource;
+
+class VSP_SOURCEUTIL_EXPORT vsStreamFactory : public vsSourceFactory
+{
+public:
+  vsStreamFactory();
+  virtual ~vsStreamFactory();
+
+  virtual vsVideoSourcePtr videoSource() const QTE_OVERRIDE;
+  virtual QList<vsTrackSourcePtr> trackSources() const QTE_OVERRIDE;
+  virtual QList<vsDescriptorSourcePtr> descriptorSources() const QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsStreamFactory)
+
+  void setSource(vsStreamSource*);
+
+private:
+  QTE_DECLARE_PRIVATE(vsStreamFactory)
+  QTE_DISABLE_COPY(vsStreamFactory)
+};
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsStreamSource.cxx b/Libraries/VspSourceUtil/vsStreamSource.cxx
new file mode 100644
index 00000000..ea068ee5
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsStreamSource.cxx
@@ -0,0 +1,348 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsStreamSourcePrivate.h"
+
+#include <vgCheckArg.h>
+
+#include <vsTrackSource.h>
+#include <vsDescriptorSource.h>
+#include <vtkVsTrackInfo.h>
+
+QTE_IMPLEMENT_D_FUNC(vsStreamSource)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsStreamTrackSource
+
+//-----------------------------------------------------------------------------
+class vsStreamTrackSource : public vsTrackSource
+{
+public:
+  virtual ~vsStreamTrackSource() {}
+
+  virtual Status status() const;
+  virtual QString text() const;
+  virtual QString toolTip() const;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsStreamSourcePrivate)
+
+  vsStreamTrackSource(vsStreamSourcePrivate* q) : q_ptr(q) {}
+
+private:
+  QTE_DECLARE_PUBLIC(vsStreamSourcePrivate)
+};
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsStreamTrackSource::status() const
+{
+  QTE_Q_CONST(vsStreamSourcePrivate);
+  return q->Status;
+}
+
+//-----------------------------------------------------------------------------
+QString vsStreamTrackSource::text() const
+{
+  QTE_Q_CONST(vsStreamSourcePrivate);
+  return q->text();
+}
+
+//-----------------------------------------------------------------------------
+QString vsStreamTrackSource::toolTip() const
+{
+  QTE_Q_CONST(vsStreamSourcePrivate);
+  return q->toolTip("track", "tracks");
+}
+
+//END vsStreamTrackSource
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsStreamDescriptorSource
+
+//-----------------------------------------------------------------------------
+class vsStreamDescriptorSource : public vsDescriptorSource
+{
+public:
+  virtual ~vsStreamDescriptorSource() {}
+
+  virtual Status status() const;
+  virtual QString text() const;
+  virtual QString toolTip() const;
+
+  virtual vsDescriptorInput::Types inputAccepted() const;
+
+  virtual void injectInput(qint64 id, vsDescriptorInputPtr input);
+  virtual void revokeInput(qint64 id, bool revokeEvents);
+  virtual void revokeAllInput(bool revokeEvents);
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsStreamSourcePrivate)
+
+  vsStreamDescriptorSource(vsStreamSourcePrivate* q) : q_ptr(q) {}
+
+private:
+  QTE_DECLARE_PUBLIC(vsStreamSourcePrivate)
+};
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsStreamDescriptorSource::status() const
+{
+  QTE_Q_CONST(vsStreamSourcePrivate);
+  return q->Status;
+}
+
+//-----------------------------------------------------------------------------
+QString vsStreamDescriptorSource::text() const
+{
+  QTE_Q_CONST(vsStreamSourcePrivate);
+  return q->text();
+}
+
+//-----------------------------------------------------------------------------
+QString vsStreamDescriptorSource::toolTip() const
+{
+  QTE_Q_CONST(vsStreamSourcePrivate);
+  return q->toolTip("descriptor", "descriptors");
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::Types vsStreamDescriptorSource::inputAccepted() const
+{
+  QTE_Q_CONST(vsStreamSourcePrivate);
+  return q->inputAccepted() | vsDescriptorSource::inputAccepted();
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamDescriptorSource::injectInput(
+  qint64 id, vsDescriptorInputPtr input)
+{
+  QTE_Q(vsStreamSourcePrivate);
+  q->injectInput(id, input);
+  vsDescriptorSource::injectInput(id, input);
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamDescriptorSource::revokeInput(qint64 id, bool revokeEvents)
+{
+  QTE_Q(vsStreamSourcePrivate);
+  q->revokeInput(id, revokeEvents);
+  vsDescriptorSource::revokeInput(id, revokeEvents);
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamDescriptorSource::revokeAllInput(bool revokeEvents)
+{
+  QTE_Q(vsStreamSourcePrivate);
+  q->revokeAllInput(revokeEvents);
+  vsDescriptorSource::revokeAllInput(revokeEvents);
+}
+
+//END vsStreamDescriptorSource
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsStreamSourcePrivate
+
+//-----------------------------------------------------------------------------
+vsStreamSourcePrivate::vsStreamSourcePrivate(
+  vsStreamSource* q, QUrl streamUri) :
+  vsVideoSourcePrivate(q), StreamUri(streamUri),
+  TrackSource(new vsStreamTrackSource(this)),
+  DescriptorSource(new vsStreamDescriptorSource(this))
+{
+  this->TrackSource->moveToThread(this->thread());
+  this->DescriptorSource->moveToThread(this->thread());
+}
+
+//-----------------------------------------------------------------------------
+vsStreamSourcePrivate::~vsStreamSourcePrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamSourcePrivate::beginAcceptingInput()
+{
+  emit this->DescriptorSource->readyForInput(this->DescriptorSource.data());
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamSourcePrivate::updateStatus(vsDataSource::Status newStatus)
+{
+  // This method is meant to be called from our thread to post an update to the
+  // GUI thread, so we use invokeMethod to pass the call across
+  QTE_Q(vsStreamSource);
+  QMetaObject::invokeMethod(q, "updateStatus", Qt::QueuedConnection,
+                            Q_ARG(vsDataSource::Status, newStatus));
+  bool streaming =
+    (newStatus == vsDataSource::StreamingActive ||
+     newStatus == vsDataSource::StreamingPending);
+  QMetaObject::invokeMethod(q, "setStreaming", Qt::QueuedConnection,
+                            Q_ARG(bool, streaming));
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamSourcePrivate::suicide()
+{
+  this->DescriptorSource->suicide();
+  this->TrackSource->suicide();
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamSourcePrivate::notifyClassifiersAvailable(bool available)
+{
+  CHECK_ARG(available);
+  this->notifyEventGroupExpected(vsEventInfo::Classifier);
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamSourcePrivate::notifyEventGroupExpected(vsEventInfo::Group group)
+{
+  emit this->DescriptorSource->eventGroupExpected(group);
+}
+
+//-----------------------------------------------------------------------------
+QString vsStreamSourcePrivate::text() const
+{
+  // Get appropriate format
+  QString format;
+  switch (this->Status)
+    {
+    case vsDataSource::StreamingPending:
+      format = "(P %1)";
+      break;
+    case vsDataSource::StreamingActive:
+      format = "A %1";
+      break;
+    case vsDataSource::StreamingIdle:
+      format = "(I %1)";
+      break;
+    case vsDataSource::StreamingStopped:
+      format = "(C %1)";
+      break;
+    default:
+      return "(none)";
+    }
+
+  // Format text
+  return this->text(format);
+}
+
+//-----------------------------------------------------------------------------
+QString vsStreamSourcePrivate::toolTip(
+  const QString& sourceTypeSingular, const QString& sourceTypePlural) const
+{
+  // Get appropriate format
+  QString format;
+  const QString* sourceType;
+  switch (this->Status)
+    {
+    case vsDataSource::StreamingPending:
+      format = "Waiting for %1 stream from %2";
+      sourceType = &sourceTypeSingular;
+      break;
+    case vsDataSource::StreamingActive:
+      format = "Streaming %1 from %2";
+      sourceType = &sourceTypePlural;
+      break;
+    case vsDataSource::StreamingIdle:
+      format = "Idle %1 stream (from %2)";
+      sourceType = &sourceTypeSingular;
+      break;
+    case vsDataSource::StreamingStopped:
+      format = "Closed %1 stream (from %2)";
+      sourceType = &sourceTypeSingular;
+      break;
+    default:
+      return QString("(no %1 source)").arg(sourceTypeSingular);
+    }
+
+  // Return formatted text
+  return format.arg(*sourceType).arg(this->StreamUri.toString());
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::Types vsStreamSourcePrivate::inputAccepted() const
+{
+  return vsDescriptorInput::NoType;
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamSourcePrivate::injectInput(
+  qint64 id, vsDescriptorInputPtr input)
+{
+  Q_UNUSED(id);
+  Q_UNUSED(input);
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamSourcePrivate::revokeInput(qint64 id, bool revokeEvents)
+{
+  Q_UNUSED(id);
+  Q_UNUSED(revokeEvents);
+}
+
+//-----------------------------------------------------------------------------
+void vsStreamSourcePrivate::revokeAllInput(bool revokeEvents)
+{
+  Q_UNUSED(revokeEvents);
+}
+
+//END vsStreamSourcePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsStreamSource
+
+//-----------------------------------------------------------------------------
+vsStreamSource::vsStreamSource(vsStreamSourcePrivate* d) : vsVideoSource(d)
+{
+  connect(this, SIGNAL(statusChanged(vsDataSource::Status)),
+          d->TrackSource.data(),
+          SIGNAL(statusChanged(vsDataSource::Status)));
+  connect(this, SIGNAL(statusChanged(vsDataSource::Status)),
+          d->DescriptorSource.data(),
+          SIGNAL(statusChanged(vsDataSource::Status)));
+  this->updateStatus(vsDataSource::StreamingPending);
+}
+
+//-----------------------------------------------------------------------------
+vsStreamSource::~vsStreamSource()
+{
+  QTE_D(vsStreamSource);
+  d->suicide();
+}
+
+//-----------------------------------------------------------------------------
+QString vsStreamSource::text() const
+{
+  QTE_D_CONST(vsStreamSource);
+  return d->text();
+}
+
+//-----------------------------------------------------------------------------
+QString vsStreamSource::toolTip() const
+{
+  QTE_D_CONST(vsStreamSource);
+  return d->toolTip("video", "video");
+}
+
+//-----------------------------------------------------------------------------
+vsTrackSourcePtr vsStreamSource::trackSource()
+{
+  QTE_D(vsStreamSource);
+  return d->TrackSource;
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorSourcePtr vsStreamSource::descriptorSource()
+{
+  QTE_D_CONST(vsStreamSource);
+  return d->DescriptorSource;
+}
+
+//END vsStreamSource
diff --git a/Libraries/VspSourceUtil/vsStreamSource.h b/Libraries/VspSourceUtil/vsStreamSource.h
new file mode 100644
index 00000000..818bc01e
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsStreamSource.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsStreamSource_h
+#define __vsStreamSource_h
+
+#include <vgExport.h>
+
+#include <vsSimpleSourceFactory.h>
+#include <vsVideoSource.h>
+
+class vsStreamSourcePrivate;
+
+class VSP_SOURCEUTIL_EXPORT vsStreamSource : public vsVideoSource
+{
+  Q_OBJECT
+
+public:
+  virtual ~vsStreamSource();
+
+  virtual QString text() const QTE_OVERRIDE;
+  virtual QString toolTip() const QTE_OVERRIDE;
+
+protected:
+  friend class vsStreamFactory;
+
+  vsStreamSource(vsStreamSourcePrivate*);
+
+  virtual vsTrackSourcePtr trackSource();
+  virtual vsDescriptorSourcePtr descriptorSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsStreamSource)
+  QTE_DISABLE_COPY(vsStreamSource)
+};
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsStreamSourcePrivate.h b/Libraries/VspSourceUtil/vsStreamSourcePrivate.h
new file mode 100644
index 00000000..2c0d3cce
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsStreamSourcePrivate.h
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsStreamSourcePrivate_h
+#define __vsStreamSourcePrivate_h
+
+#include <QUrl>
+
+#include <vgExport.h>
+
+#include <vvDescriptor.h>
+
+#include <vsDescriptor.h>
+#include <vsDescriptorInput.h>
+#include <vsEvent.h>
+#include <vsEventInfo.h>
+#include <vsVideoSourcePrivate.h>
+
+#include "vsStreamSource.h"
+
+class vsStreamTrackSource;
+class vsStreamDescriptorSource;
+
+class VSP_SOURCEUTIL_EXPORT vsStreamSourcePrivate : public vsVideoSourcePrivate
+{
+  Q_OBJECT
+
+protected:
+  QTE_DECLARE_PUBLIC(vsStreamSource)
+  friend class vsStreamTrackSource;
+  friend class vsStreamDescriptorSource;
+
+  vsStreamSourcePrivate(vsStreamSource* q, QUrl streamUri);
+  virtual ~vsStreamSourcePrivate();
+
+  virtual QString text() const;
+  virtual QString text(QString format) const = 0;
+  virtual QString toolTip(const QString& sourceTypeSingular,
+                          const QString& sourceTypePlural) const;
+
+  void beginAcceptingInput();
+  void updateStatus(vsDataSource::Status newStatus);
+  void suicide();
+
+  void notifyEventGroupExpected(vsEventInfo::Group group);
+  void notifyClassifiersAvailable(bool);
+
+  virtual vsDescriptorInput::Types inputAccepted() const;
+
+  virtual void injectInput(qint64 id, vsDescriptorInputPtr input);
+  virtual void revokeInput(qint64 id, bool revokeEvents);
+  virtual void revokeAllInput(bool revokeEvents);
+
+  const QUrl StreamUri;
+
+signals:
+  void descriptorAvailable(vsDescriptor);
+  void descriptorsAvailable(vsDescriptorList);
+  void eventAvailable(vsEvent);
+  void eventRevoked(vtkIdType);
+
+private:
+  QTE_DISABLE_COPY(vsStreamSourcePrivate)
+
+  QSharedPointer<vsStreamTrackSource> TrackSource;
+  QSharedPointer<vsStreamDescriptorSource> DescriptorSource;
+};
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsUtilDebug.cxx b/Libraries/VspSourceUtil/vsUtilDebug.cxx
new file mode 100644
index 00000000..dd451906
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsUtilDebug.cxx
@@ -0,0 +1,9 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtDebugImpl.h>
+
+#include "vsUtilDebug.h"
diff --git a/Libraries/VspSourceUtil/vsUtilDebug.h b/Libraries/VspSourceUtil/vsUtilDebug.h
new file mode 100644
index 00000000..25f03ef9
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsUtilDebug.h
@@ -0,0 +1,14 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsUtilDebug_h
+#define __vsUtilDebug_h
+
+#include <qtDebug.h>
+
+QTE_DEBUG_AREA(vsd, VideoArchive, false);
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsVideoArchive.cxx b/Libraries/VspSourceUtil/vsVideoArchive.cxx
new file mode 100644
index 00000000..44f70140
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsVideoArchive.cxx
@@ -0,0 +1,184 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVideoArchive.h"
+
+#include <QUrl>
+
+#include <qtUtil.h>
+
+#include <vgKwaFrameMetadata.h>
+#include <vgKwaVideoClip.h>
+
+#include <vtkVgAdapt.h>
+#include <vgVtkVideoFrame.h>
+
+#include <vtkVgAdaptImage.h>
+
+#include "vsAdapt.h"
+#include "vsUtilDebug.h"
+#include "vsVideoHelper.h"
+
+QTE_IMPLEMENT_D_FUNC(vsVideoArchive)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrameMetaData adaptMetadata(const vgKwaFrameMetadata& vgvMetadata)
+{
+  vtkVgVideoFrameMetaData vvvMetadata;
+
+  vvvMetadata.Time = vgvMetadata.timestamp();
+  vvvMetadata.Gsd = vgvMetadata.gsd();
+
+  vvvMetadata.HomographyReferenceFrame =
+    vgvMetadata.homographyReferenceFrameNumber();
+
+  const QMatrix3x3 hm = vgvMetadata.homography();
+  vvvMetadata.Homography->Identity();
+  vvvMetadata.Homography->SetElement(0, 0, hm(0, 0));
+  vvvMetadata.Homography->SetElement(0, 1, hm(0, 1));
+  vvvMetadata.Homography->SetElement(0, 3, hm(0, 2));
+  vvvMetadata.Homography->SetElement(1, 0, hm(1, 0));
+  vvvMetadata.Homography->SetElement(1, 1, hm(1, 1));
+  vvvMetadata.Homography->SetElement(1, 3, hm(1, 2));
+  vvvMetadata.Homography->SetElement(3, 0, hm(2, 0));
+  vvvMetadata.Homography->SetElement(3, 1, hm(2, 1));
+  vvvMetadata.Homography->SetElement(3, 3, hm(2, 2));
+
+  const vgKwaWorldBox corners = vgvMetadata.worldCornerPoints();
+  vvvMetadata.WorldLocation.GCS = corners.GCS;
+  vvvMetadata.WorldLocation.UpperLeft.Latitude   = corners.UpperLeft.Latitude;
+  vvvMetadata.WorldLocation.UpperLeft.Longitude  = corners.UpperLeft.Longitude;
+  vvvMetadata.WorldLocation.UpperRight.Latitude  = corners.UpperRight.Latitude;
+  vvvMetadata.WorldLocation.UpperRight.Longitude = corners.UpperRight.Longitude;
+  vvvMetadata.WorldLocation.LowerRight.Latitude  = corners.LowerRight.Latitude;
+  vvvMetadata.WorldLocation.LowerRight.Longitude = corners.LowerRight.Longitude;
+  vvvMetadata.WorldLocation.LowerLeft.Latitude   = corners.LowerLeft.Latitude;
+  vvvMetadata.WorldLocation.LowerLeft.Longitude  = corners.LowerLeft.Longitude;
+
+  vvvMetadata.SetWidthAndHeight(vgvMetadata.imageSize().width(),
+                                vgvMetadata.imageSize().height());
+  return vvvMetadata;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vsVideoArchivePrivate
+{
+public:
+  vsVideoArchivePrivate(const QUrl& clipUri);
+
+  vtkVgTimeStamp timestamp(vxl_int_64 time);
+
+  bool Okay;
+  QUrl ClipUri;
+  vgKwaVideoClip Clip;
+  vsVideoHelper Helper;
+};
+
+//-----------------------------------------------------------------------------
+vsVideoArchivePrivate::vsVideoArchivePrivate(const QUrl& clipUri) :
+  Okay(false), ClipUri(clipUri), Clip(clipUri)
+{
+  if (this->Clip.frameCount())
+    {
+    this->Okay = true;
+    qtDebug(vsdVideoArchive) << "loaded clip from" << this->ClipUri;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsVideoArchive::vsVideoArchive(const QUrl& archiveUri) :
+  d_ptr(new vsVideoArchivePrivate(archiveUri))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVideoArchive::~vsVideoArchive()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsVideoArchive::okay() const
+{
+  QTE_D_CONST(vsVideoArchive);
+  return d->Okay;
+}
+
+//-----------------------------------------------------------------------------
+QUrl vsVideoArchive::uri() const
+{
+  QTE_D_CONST(vsVideoArchive);
+  return d->ClipUri;
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoArchive::initialize()
+{
+  QTE_D(vsVideoArchive);
+
+  // Get homographies for the whole clip
+  vgKwaVideoClip::MetadataMap md = d->Clip.metadata();
+  if (md.count())
+    {
+    QList<vtkVgVideoFrameMetaData> metadata;
+    foreach (const vgKwaFrameMetadata& mdi, md)
+      {
+      metadata.append(adaptMetadata(mdi));
+      }
+
+    // Notify user of available time range and metadata
+    emit this->frameRangeAvailable(metadata.first().Time,
+                                   metadata.last().Time);
+    emit this->metadataAvailable(metadata);
+    }
+  else
+    {
+    // Notify user of available time range
+    emit this->frameRangeAvailable(d->Clip.firstTime(), d->Clip.lastTime());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoArchive::requestFrame(vgVideoSeekRequest request)
+{
+  QTE_D(vsVideoArchive);
+
+  // Seek to the appropriate frame
+  vgVideoFramePtr frame =
+    d->Helper.updateFrame(d->Clip, request);
+
+  if (frame.isValid())
+    {
+    // Get metadata
+    const vgKwaFrameMetadata metadata = d->Clip.metadataAt(frame.time());
+
+    // Extract the pixels in VTK-usable format
+    vgVtkVideoFramePtr rframe(new vtkVgVideoFrame(vtkVgAdapt(*frame)));
+
+    // Build the metadata and hand the frame to the caller
+    rframe->MetaData = adaptMetadata(metadata);
+    request.sendReply(rframe);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoArchive::clearLastRequest(vgVideoSourceRequestor* requestor)
+{
+  QTE_D(vsVideoArchive);
+  d->Helper.clearLastRequest(requestor);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vsVideoArchive::findTime(
+  unsigned int frameNumber, vg::SeekMode roundMode)
+{
+  QTE_D(vsVideoArchive);
+  return vsVideoHelper::findTime(d->Clip, frameNumber, roundMode);
+}
diff --git a/Libraries/VspSourceUtil/vsVideoArchive.h b/Libraries/VspSourceUtil/vsVideoArchive.h
new file mode 100644
index 00000000..05acf157
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsVideoArchive.h
@@ -0,0 +1,58 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVideoArchive_h
+#define __vsVideoArchive_h
+
+#include <QList>
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+
+#include <vtkVgTimeStamp.h>
+
+#include <vtkVgVideoFrameMetaData.h>
+
+#include <vgVideoSourceRequestor.h>
+
+class QUrl;
+
+class vsVideoArchivePrivate;
+
+class VSP_SOURCEUTIL_EXPORT vsVideoArchive : public QObject
+{
+  Q_OBJECT
+
+public:
+  vsVideoArchive(const QUrl& archiveUri);
+  virtual ~vsVideoArchive();
+
+  virtual bool okay() const;
+  virtual QUrl uri() const;
+
+  virtual void initialize();
+  virtual void requestFrame(vgVideoSeekRequest);
+  virtual void clearLastRequest(vgVideoSourceRequestor*);
+  virtual vtkVgTimeStamp findTime(unsigned int frameNumber,
+                                  vg::SeekMode roundMode);
+
+signals:
+  void frameRangeAvailable(vtkVgTimeStamp first, vtkVgTimeStamp last);
+  void metadataAvailable(QList<vtkVgVideoFrameMetaData> metadata);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsVideoArchive)
+
+private:
+  QTE_DECLARE_PRIVATE(vsVideoArchive)
+  QTE_DISABLE_COPY(vsVideoArchive)
+};
+
+#endif
diff --git a/Libraries/VspSourceUtil/vsVideoHelper.cxx b/Libraries/VspSourceUtil/vsVideoHelper.cxx
new file mode 100644
index 00000000..1b4bd131
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsVideoHelper.cxx
@@ -0,0 +1,108 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVideoHelper.h"
+
+#include <QHash>
+
+#include <vgVideo.h>
+
+#include <vgVideoSourceRequestor.h>
+
+QTE_IMPLEMENT_D_FUNC(vsVideoHelper)
+
+//-----------------------------------------------------------------------------
+class vsVideoHelperPrivate
+{
+public:
+  QHash<QObject*, vtkVgTimeStamp> LastRequest;
+};
+
+//-----------------------------------------------------------------------------
+vsVideoHelper::vsVideoHelper(QObject* parent)
+  : QObject(parent), d_ptr(new vsVideoHelperPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVideoHelper::~vsVideoHelper()
+{
+}
+
+//-----------------------------------------------------------------------------
+vgVideoFramePtr vsVideoHelper::updateFrame(
+  const vgVideo& video, const vgVideoSeekRequest& request)
+{
+  QTE_D(vsVideoHelper);
+
+  QObject* requestor = request.Requestor.data();
+  if (!d->LastRequest.contains(requestor))
+    {
+    d->LastRequest.insert(requestor, vtkVgTimeStamp());
+    connect(requestor, SIGNAL(destroyed(QObject*)),
+            this, SLOT(cleanupRequestor(QObject*)));
+    }
+
+  // Seek to the appropriate frame
+  const vgTimeStamp now = request.TimeStamp.GetRawTimeStamp();
+  const vgTimeStamp lastTime = d->LastRequest[requestor].GetRawTimeStamp();
+  vgVideoFramePtr frame = video.frameAt(now, request.Direction);
+
+  // Check if the frame is valid and has advanced
+  if (!frame.isValid() || frame.time() == lastTime || !frame.image().isValid())
+    {
+    // Nope; return an invalid frame to indicate failure / nothing to do...
+    if (request.RequestId >= 0)
+      {
+      // ...and if the requestor is expecting a reply, notify them that the
+      // request was discarded
+      vgVtkVideoFramePtr noFrame;
+      request.sendReply(noFrame);
+      }
+    return vgVideoFramePtr();
+    }
+
+  // Update last-time and return the new frame
+  d->LastRequest.insert(requestor, frame.time());
+  return frame;
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoHelper::clearLastRequest(vgVideoSourceRequestor* requestor)
+{
+  QTE_D(vsVideoHelper);
+  d->LastRequest.remove(requestor);
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vsVideoHelper::findTime(
+  const vgVideo& video, unsigned int frameNumber, vg::SeekMode roundMode)
+{
+  vgTimeStamp ts(frameNumber);
+
+  // vgVideo would be perfectly within its rights to not find a matching frame
+  // to our time-less time stamp, even if a frame with that frame number
+  // exists; so, handle Exact by finding the nearest frame, and accepting it if
+  // it has the correct frame number
+  if (roundMode == vg::SeekExact)
+    {
+    vgVideoFramePtr frame = video.frameAt(ts);
+    ts = frame.time();
+    if (ts.HasFrameNumber() && ts.FrameNumber == frameNumber)
+      return ts;
+    return vgTimeStamp();
+    }
+
+  // Everything else (fuzzy modes) should just work correctly
+  return video.frameAt(ts, roundMode).time();
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoHelper::cleanupRequestor(QObject* requestor)
+{
+  QTE_D(vsVideoHelper);
+  d->LastRequest.remove(requestor);
+}
diff --git a/Libraries/VspSourceUtil/vsVideoHelper.h b/Libraries/VspSourceUtil/vsVideoHelper.h
new file mode 100644
index 00000000..b7656b5b
--- /dev/null
+++ b/Libraries/VspSourceUtil/vsVideoHelper.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVideoHelper_h
+#define __vsVideoHelper_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+
+struct vgTimeStamp;
+class  vgVideo;
+class  vgVideoFramePtr;
+struct vgVideoSeekRequest;
+class  vgVideoSourceRequestor;
+
+class vsVideoHelperPrivate;
+
+class VSP_SOURCEUTIL_EXPORT vsVideoHelper : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit vsVideoHelper(QObject* parent = 0);
+  virtual ~vsVideoHelper();
+
+  vgVideoFramePtr updateFrame(const vgVideo& video,
+                              const vgVideoSeekRequest& request);
+  void clearLastRequest(vgVideoSourceRequestor*);
+
+  static vgTimeStamp findTime(const vgVideo& video, unsigned int frameNumber,
+                              vg::SeekMode roundMode);
+
+protected slots:
+  void cleanupRequestor(QObject*);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsVideoHelper)
+
+private:
+  QTE_DECLARE_PRIVATE(vsVideoHelper)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/CMakeLists.txt b/Libraries/VspUserInterface/CMakeLists.txt
new file mode 100644
index 00000000..d1438c2e
--- /dev/null
+++ b/Libraries/VspUserInterface/CMakeLists.txt
@@ -0,0 +1,186 @@
+project(vspUserInterface)
+
+include(${qtExtensions_SOURCE_DIR}/CMake/Modules/UseQtExtensions.cmake)
+
+# Use the include path and library for Qt that is used by VTK
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+if (QtTesting_FOUND)
+  add_definitions(-DENABLE_QTTESTING)
+  include_directories(SYSTEM ${QtTesting_INCLUDE_DIRS})
+  set(TESTING_INTERFACES qtTestingSupport)
+endif()
+
+###############################################################################
+
+# BEGIN source file lists
+
+set(vspUserInterface_Sources
+    # Core code
+    vsApplication.cxx
+    vsCore.cxx
+    vsCorePrivate.cxx
+    vsMainWindow.cxx
+    vsMainWindowPrivate.cxx
+    vsScene.cxx
+    vsScenePrivate.cxx
+    # Supporting code
+    vsAlertEditor.cxx
+    vsAlertList.cxx
+    vsContourWidget.cxx
+    vsDebug.cxx
+    vsEventInfoWidget.cxx
+    vsEventRatingMenu.cxx
+    vsEventTreeModel.cxx
+    vsEventTreeSelectionModel.cxx
+    vsEventTreeView.cxx
+    vsEventTreeWidget.cxx
+    vsRegionList.cxx
+    vsRegionTypeDelegate.cxx
+    vsSettings.cxx
+    vsTrackColorDialog.cxx
+    vsTrackTreeModel.cxx
+    vsTrackTreeView.cxx
+    vsTrackTreeWidget.cxx
+    vsUiExtensionInterface.cxx
+# TODO: Everything below should be moved to either plugins or the application
+    # Query formulation (viqui integration)
+    vsQfDialog.cxx
+    vsQfVideoPlayer.cxx
+    vsQfVideoSource.cxx
+    vsVideoPlayerModel.cxx
+    # Built-in live descriptors - TODO: move to application?
+    vsTripwireDescriptor.cxx
+)
+
+set(vspUserInterface_AMUI
+    eventTree.ui
+    trackTree.ui
+    vsp.ui
+)
+
+set(vspUserInterface_UI
+    alertEditor.ui
+    eventInfo.ui
+    trackColor.ui
+    ${vspUserInterface_AMUI}
+)
+
+set(vspUserInterface_MocHeaders
+    # Core code
+    vsApplication.h
+    vsCore.h
+    vsMainWindow.h
+    vsMainWindowPrivate.h
+    vsScene.h
+    # Supporting code
+    vsAlertEditor.h
+    vsAlertList.h
+    vsContourWidget.h
+    vsEventInfoWidget.h
+    vsEventTreeModel.h
+    vsEventTreeSelectionModel.h
+    vsEventTreeView.h
+    vsEventTreeWidget.h
+    vsRegionList.h
+    vsTrackColorDialog.h
+    vsTrackTreeModel.h
+    vsTrackTreeView.h
+    vsTrackTreeWidget.h
+# TODO: Everything below should be moved to either plugins or the application
+    # Query formulation (viqui integration)
+    vsQfDialog.h
+    vsQfVideoPlayer.h
+    vsQfVideoSource.h
+    # Built-in live descriptors - TODO: move to application?
+    vsTripwireDescriptor.h
+)
+
+set(vspUserInterface_SdkHeaders
+    # Core code
+    vsApplication.h
+    vsCore.h
+    vsMainWindow.h
+    vsScene.h
+    # Supporting code
+    vsEventUserInfo.h
+    vsUiExtensionInterface.h
+)
+
+# END source file lists
+
+###############################################################################
+
+# BEGIN build rules
+
+qt4_wrap_ui(vspUserInterface_UiSources ${vspUserInterface_UI})
+qte_amc_wrap_ui(vspUserInterface_AmSources ActionManagerDialog
+  ${vspUserInterface_AMUI}
+)
+qt4_wrap_cpp(vspUserInterface_MocSources ${vspUserInterface_MocHeaders})
+
+source_group("User Interface" FILES
+  ${vspUserInterface_UI}
+)
+
+source_group("Generated" FILES
+  ${vspUserInterface_UiSources}
+  ${vspUserInterface_AmSources}
+  ${vspUserInterface_MocSources}
+)
+
+set_source_files_properties(${vspUserInterface_Sources}
+  PROPERTIES OBJECT_DEPENDS
+  "${vspUserInterface_UiSources};${vspUserInterface_AmSources}"
+)
+
+add_library(${PROJECT_NAME}
+  ${vspUserInterface_Sources}
+  ${vspUserInterface_UiSources}
+  ${vspUserInterface_AmSources}
+  ${vspUserInterface_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  LINK_PUBLIC
+  ${QT_QTMAIN_LIBRARY}
+  ${QT_LIBRARIES}
+  LINK_PRIVATE
+  vtkImagingStencil
+  vtkRenderingOpenGL
+  vtkRenderingFreeTypeOpenGL
+  vtkRenderingVolumeOpenGL
+  vtkGUISupportQt
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  qtExtensions
+  vtkVgCore
+  vtkVgModelView
+  vgVtkVideo
+  vspData
+  PRIVATE_INTERFACE_TARGETS
+  vgCommon
+  qtVgCommon
+  qtVgWidgets
+  vvIO
+  vvWidgets
+  vtkVgQtUtil
+  ${TESTING_INTERFACES}
+# TODO: Only needed for code that should be moved out
+  vtkVgSceneGraph
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vspUserInterface_SdkHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VspUserInterface)
+
+# END build rules
diff --git a/Libraries/VspUserInterface/alertEditor.ui b/Libraries/VspUserInterface/alertEditor.ui
new file mode 100644
index 00000000..bf44147d
--- /dev/null
+++ b/Libraries/VspUserInterface/alertEditor.ui
@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vsAlertEditor</class>
+ <widget class="QDialog" name="vsAlertEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>441</width>
+    <height>216</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Editing Alert...</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="nameLabel">
+       <property name="toolTip">
+        <string>This name will be used in the UI when referring to the event type.</string>
+       </property>
+       <property name="text">
+        <string>Name:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="name">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="queryLabel">
+       <property name="text">
+        <string>Query:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="queryLayout">
+       <property name="spacing">
+        <number>2</number>
+       </property>
+       <item>
+        <widget class="QLineEdit" name="queryFile"/>
+       </item>
+       <item>
+        <widget class="QToolButton" name="queryBrowse">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset resource="../../Icons/vsp.qrc">
+           <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="2" column="1">
+      <widget class="vvQueryInfoLabel" name="queryInfo">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>(no query provided)</string>
+       </property>
+       <property name="errorText" stdset="0">
+        <string>(no query provided)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="penColorLabel">
+       <property name="toolTip">
+        <string>This color will be used to draw thinner lines and shapes related to the event (e.g. paths, head outlines).</string>
+       </property>
+       <property name="text">
+        <string>Pen:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <layout class="QGridLayout" name="gridLayout">
+       <property name="horizontalSpacing">
+        <number>16</number>
+       </property>
+       <item row="0" column="0">
+        <widget class="qtColorButton" name="penColor">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="0" column="1" rowspan="2">
+        <layout class="QFormLayout" name="formLayout_2">
+         <item row="0" column="0">
+          <widget class="QLabel" name="backgroundColorLabel">
+           <property name="toolTip">
+            <string>This color will be used to draw filled shapes related to the event (e.g. labels).</string>
+           </property>
+           <property name="text">
+            <string>Background:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="qtColorButton" name="backgroundColor">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="foregroundColorLabel">
+           <property name="toolTip">
+            <string>This color will be used to draw shapes related to the event against the background color (e.g. label text).</string>
+           </property>
+           <property name="text">
+            <string>Foreground:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="qtColorButton" name="foregroundColor">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="displayThresholdLabel">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;Alerts with a probability less than this value will be hidden.&lt;/p&gt;
+&lt;p&gt;The filter threshold may also be adjusted in the Filters dock.&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>Filter:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QDoubleSpinBox" name="displayThreshold">
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+       <property name="maximum">
+        <double>1.000000000000000</double>
+       </property>
+       <property name="singleStep">
+        <double>0.010000000000000</double>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="buttonLayout">
+     <item>
+      <widget class="QPushButton" name="saveButton">
+       <property name="text">
+        <string>Save</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../Icons/vsp.qrc">
+         <normaloff>:/icons/16x16/save</normaloff>:/icons/16x16/save</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vvQueryInfoLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">vvQueryInfoLabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>qtColorButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">qtColorButton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vsp.qrc"/>
+  <include location="../../Icons/viqui.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vsAlertEditor</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>263</x>
+     <y>155</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>220</x>
+     <y>87</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vsAlertEditor</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>263</x>
+     <y>155</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>220</x>
+     <y>87</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Libraries/VspUserInterface/eventInfo.ui b/Libraries/VspUserInterface/eventInfo.ui
new file mode 100644
index 00000000..09b64de2
--- /dev/null
+++ b/Libraries/VspUserInterface/eventInfo.ui
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vsEventInfoWidget</class>
+ <widget class="QWidget" name="vsEventInfoWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>260</width>
+    <height>301</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QScrollArea" name="scrollArea">
+      <property name="frameShape">
+       <enum>QFrame::NoFrame</enum>
+      </property>
+      <property name="widgetResizable">
+       <bool>true</bool>
+      </property>
+      <widget class="QWidget" name="scrollAreaWidgetContents">
+       <property name="geometry">
+        <rect>
+         <x>0</x>
+         <y>0</y>
+         <width>260</width>
+         <height>301</height>
+        </rect>
+       </property>
+       <layout class="QFormLayout" name="formLayout">
+        <property name="fieldGrowthPolicy">
+         <enum>QFormLayout::ExpandingFieldsGrow</enum>
+        </property>
+        <property name="verticalSpacing">
+         <number>2</number>
+        </property>
+        <item row="0" column="0">
+         <widget class="QLabel" name="idLabel">
+          <property name="text">
+           <string>Id:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="1">
+         <widget class="QLineEdit" name="id">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="startTimeLabel">
+          <property name="text">
+           <string>Start:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="startTime">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="endTimelabel">
+          <property name="text">
+           <string>End:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="endTime">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <widget class="QLabel" name="durationLabel">
+          <property name="text">
+           <string>Duration:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLineEdit" name="duration">
+          <property name="frame">
+           <bool>false</bool>
+          </property>
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="0">
+         <widget class="QLabel" name="noteLabel">
+          <property name="text">
+           <string>Note:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="4" column="1">
+         <widget class="qtSqueezedLabel" name="note">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="textFormat">
+           <enum>Qt::PlainText</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="5" column="0">
+         <widget class="qtExpander" name="showDetails">
+          <property name="text">
+           <string>Details</string>
+          </property>
+          <property name="checkable">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="0" colspan="2">
+         <widget class="QTreeWidget" name="classifiers">
+          <property name="rootIsDecorated">
+           <bool>false</bool>
+          </property>
+          <property name="itemsExpandable">
+           <bool>false</bool>
+          </property>
+          <property name="sortingEnabled">
+           <bool>true</bool>
+          </property>
+          <property name="allColumnsShowFocus">
+           <bool>true</bool>
+          </property>
+          <column>
+           <property name="text">
+            <string>Classifier</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Probability</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </widget>
+     <widget class="QWidget" name="helpWidget">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="notice">
+         <property name="text">
+          <string>Notice</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="helpLabel">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="text">
+          <string>Select a single event to view detailed information.</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtExpander</class>
+   <extends>QToolButton</extends>
+   <header location="global">qtExpander.h</header>
+  </customwidget>
+  <customwidget>
+   <class>qtSqueezedLabel</class>
+   <extends>QLabel</extends>
+   <header location="global">qtSqueezedLabel.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Libraries/VspUserInterface/eventTree.ui b/Libraries/VspUserInterface/eventTree.ui
new file mode 100644
index 00000000..28b068be
--- /dev/null
+++ b/Libraries/VspUserInterface/eventTree.ui
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vsEventTreeWidget</class>
+ <widget class="QWidget" name="vsEventTreeWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>416</width>
+    <height>325</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="vsEventTreeView" name="tree">
+     <property name="acceptDrops">
+      <bool>true</bool>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::DragDrop</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QToolBar" name="toolBar">
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonFollowStyle</enum>
+     </property>
+     <addaction name="actionHideAll"/>
+     <addaction name="actionShowAll"/>
+     <addaction name="actionShowHiddenItems"/>
+    </widget>
+   </item>
+  </layout>
+  <action name="actionHideAll">
+   <property name="text">
+    <string>Hide All</string>
+   </property>
+   <property name="toolTip">
+    <string>Set visibility state of all events to hidden</string>
+   </property>
+   <property name="shortcut">
+    <string>H, A</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionShowAll">
+   <property name="text">
+    <string>Show All</string>
+   </property>
+   <property name="toolTip">
+    <string>Set visibility state of all events to shown</string>
+   </property>
+   <property name="shortcut">
+    <string>S, A</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionShowHiddenItems">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Show Hidden</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle visibility of hidden events</string>
+   </property>
+   <property name="shortcut">
+    <string>S, H</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionShowSelected">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Show</string>
+   </property>
+   <property name="toolTip">
+    <string>Show selected event(s)</string>
+   </property>
+   <property name="shortcut">
+    <string>S, S</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionHideSelected">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Hide</string>
+   </property>
+   <property name="toolTip">
+    <string>Hide selected event(s)</string>
+   </property>
+   <property name="shortcut">
+    <string>H, S</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionJumpToStart">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-skip-backward</normaloff>:/icons/16x16/playback-skip-backward</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Jump to Start</string>
+   </property>
+   <property name="toolTip">
+    <string>Seek to the temporal and spatial start of the selected event</string>
+   </property>
+   <property name="shortcut">
+    <string>J</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionJumpToEnd">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-skip-forward</normaloff>:/icons/16x16/playback-skip-forward</iconset>
+   </property>
+   <property name="text">
+    <string>Jump to &amp;End</string>
+   </property>
+   <property name="toolTip">
+    <string>Seek to the temporal and spatial end of the selected event</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+J</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionAddStar">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Add Star</string>
+   </property>
+   <property name="toolTip">
+    <string>Mark selected event(s) as starred</string>
+   </property>
+  </action>
+  <action name="actionRemoveStar">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Remove Star</string>
+   </property>
+   <property name="toolTip">
+    <string>Mark selected event(s) as not starred</string>
+   </property>
+  </action>
+  <action name="actionEditNote">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/edit</normaloff>:/icons/16x16/edit</iconset>
+   </property>
+   <property name="text">
+    <string>Edit &amp;Note...</string>
+   </property>
+   <property name="toolTip">
+    <string>Edit event note</string>
+   </property>
+  </action>
+  <action name="actionSetEventStart">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Set Event Start</string>
+   </property>
+   <property name="toolTip">
+    <string>Set the start time of the selected event(s) to the time of the current video frame</string>
+   </property>
+  </action>
+  <action name="actionSetEventEnd">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Set Event End</string>
+   </property>
+   <property name="toolTip">
+    <string>Set the end time of the selected event(s) to the time of the current video frame</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vsEventTreeView</class>
+   <extends>QTreeView</extends>
+   <header>vsEventTreeView.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vsp.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>vsEventTreeWidget</sender>
+   <signal>selectionStatusChanged(bool)</signal>
+   <receiver>actionShowSelected</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>207</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>vsEventTreeWidget</sender>
+   <signal>selectionStatusChanged(bool)</signal>
+   <receiver>actionHideSelected</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>207</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>vsEventTreeWidget</sender>
+   <signal>selectionStatusChanged(bool)</signal>
+   <receiver>actionAddStar</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>207</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>vsEventTreeWidget</sender>
+   <signal>selectionStatusChanged(bool)</signal>
+   <receiver>actionRemoveStar</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>207</x>
+     <y>162</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+ <slots>
+  <signal>selectionStatusChanged(bool)</signal>
+ </slots>
+</ui>
diff --git a/Libraries/VspUserInterface/trackColor.ui b/Libraries/VspUserInterface/trackColor.ui
new file mode 100644
index 00000000..1fb10bae
--- /dev/null
+++ b/Libraries/VspUserInterface/trackColor.ui
@@ -0,0 +1,867 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vsTrackColorDialog</class>
+ <widget class="QDialog" name="vsTrackColorDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>288</width>
+    <height>482</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Track Color</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="defaultLabel">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;The default color is used if Single Color mode is selected, or mode-based coloring fails (e.g. a track has no object classification or dynamic data).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>Default Color:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="qtColorButton" name="defaultColor">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Default track pen color. This color will be used to draw thinner lines and shapes related to the track (e.g. paths, head outlines).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="qtColorButton" name="defaultColorFore">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Default track label text color.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="qtColorButton" name="defaultColorBack">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Default track label background color.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="1" column="0" colspan="2">
+      <widget class="QRadioButton" name="singleColor">
+       <property name="toolTip">
+        <string>Use the same color for all tracks.</string>
+       </property>
+       <property name="text">
+        <string>&amp;Single Color</string>
+       </property>
+       <property name="checked">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0" colspan="2">
+      <widget class="QRadioButton" name="colorByToc">
+       <property name="toolTip">
+        <string>Color tracks by their object classification, if available.</string>
+       </property>
+       <property name="text">
+        <string>Color by Object &amp;Classification</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="personLabel">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Person:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="qtColorButton" name="personColor">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Track pen color for tracks classified as Person. This color will be used to draw thinner lines and shapes related to the track (e.g. paths, head outlines).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="qtColorButton" name="personColorFore">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Track label text color for tracks classified as Person.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="qtColorButton" name="personColorBack">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Track label background color for tracks classified as Person.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="vehicleLabel">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Vehicle:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
+       <item>
+        <widget class="qtColorButton" name="vehicleColor">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Track pen color for tracks classified as Vehicle. This color will be used to draw thinner lines and shapes related to the track (e.g. paths, head outlines).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="qtColorButton" name="vehicleColorFore">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Track label text color for tracks classified as Vehicle.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="qtColorButton" name="vehicleColorBack">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Track label background color for tracks classified as Vehicle.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="5" column="0">
+      <widget class="QLabel" name="otherLabel">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Other:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
+       <item>
+        <widget class="qtColorButton" name="otherColor">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Track pen color for tracks classified as Other. This color will be used to draw thinner lines and shapes related to the track (e.g. paths, head outlines).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="qtColorButton" name="otherColorFore">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Track label text color for tracks classified as Other.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="qtColorButton" name="otherColorBack">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="toolTip">
+          <string>Track label background color for tracks classified as Other.</string>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="6" column="0" colspan="2">
+      <widget class="QRadioButton" name="colorByData">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Color tracks by their dynamic data, if available. The color used will vary between the minimum and maximum colors depending on the data for a given track segment.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>Color by Dynamic &amp;Data</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="dataSetLabel">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Data Set:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QComboBox" name="dataSet">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Data set to use for dynamic coloring.</string>
+       </property>
+       <property name="insertPolicy">
+        <enum>QComboBox::InsertAlphabetically</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="0">
+      <widget class="QLabel" name="minimumLabel">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Minimum:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="qtColorButton" name="minimumColor">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Track geomoetry color to represent the minimum value in the data value range.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="0">
+      <widget class="QLabel" name="maximumLabel">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="text">
+        <string>Maximum:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="9" column="1">
+      <widget class="qtColorButton" name="maximumColor">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Track geomoetry color to represent the maximum value in the data value range.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="0" colspan="2">
+      <widget class="QGroupBox" name="colorBySource">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>160</height>
+        </size>
+       </property>
+       <property name="title">
+        <string>&amp;Override Color by Track Source</string>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+       <property name="checked">
+        <bool>false</bool>
+       </property>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0" colspan="2">
+         <widget class="QTreeWidget" name="sourceColors">
+          <property name="alternatingRowColors">
+           <bool>true</bool>
+          </property>
+          <property name="selectionMode">
+           <enum>QAbstractItemView::ExtendedSelection</enum>
+          </property>
+          <property name="rootIsDecorated">
+           <bool>false</bool>
+          </property>
+          <property name="uniformRowHeights">
+           <bool>true</bool>
+          </property>
+          <property name="sortingEnabled">
+           <bool>true</bool>
+          </property>
+          <property name="allColumnsShowFocus">
+           <bool>true</bool>
+          </property>
+          <attribute name="headerDefaultSectionSize">
+           <number>50</number>
+          </attribute>
+          <column>
+           <property name="text">
+            <string>Source</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Pen</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Fore</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Back</string>
+           </property>
+          </column>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QPushButton" name="addSource">
+          <property name="text">
+           <string>&amp;Add</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../Icons/vsp.qrc">
+            <normaloff>:/icons/16x16/add</normaloff>:/icons/16x16/add</iconset>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QPushButton" name="removeSource">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>&amp;Remove</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../Icons/vsp.qrc">
+            <normaloff>:/icons/16x16/delete</normaloff>:/icons/16x16/delete</iconset>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>18</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtColorButton</class>
+   <extends>QPushButton</extends>
+   <header location="global">qtColorButton.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vsp.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vsTrackColorDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>214</x>
+     <y>361</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vsTrackColorDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>214</x>
+     <y>361</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>218</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>personLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>65</x>
+     <y>65</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>66</x>
+     <y>89</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>personColor</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>121</x>
+     <y>73</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>122</x>
+     <y>93</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>personColorFore</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>121</x>
+     <y>73</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>122</x>
+     <y>93</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>personColorBack</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>121</x>
+     <y>73</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>122</x>
+     <y>93</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>vehicleLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>82</x>
+     <y>72</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>82</x>
+     <y>118</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>otherLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>36</x>
+     <y>65</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>54</x>
+     <y>148</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>vehicleColor</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>171</x>
+     <y>74</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>148</x>
+     <y>122</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>vehicleColorFore</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>171</x>
+     <y>74</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>148</x>
+     <y>122</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>vehicleColorBack</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>171</x>
+     <y>74</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>148</x>
+     <y>122</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>otherColor</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>194</x>
+     <y>67</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>150</x>
+     <y>149</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>otherColorFore</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>194</x>
+     <y>67</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>150</x>
+     <y>149</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByToc</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>otherColorBack</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>194</x>
+     <y>67</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>150</x>
+     <y>149</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByData</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>minimumLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>47</x>
+     <y>184</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>91</x>
+     <y>243</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByData</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>maximumLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>31</x>
+     <y>178</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>66</x>
+     <y>271</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByData</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>minimumColor</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>141</x>
+     <y>179</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>154</x>
+     <y>243</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByData</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>maximumColor</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>187</x>
+     <y>177</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>154</x>
+     <y>271</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByData</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>dataSetLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>47</x>
+     <y>182</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>47</x>
+     <y>201</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>colorByData</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>dataSet</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>203</x>
+     <y>179</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>173</x>
+     <y>203</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Libraries/VspUserInterface/trackTree.ui b/Libraries/VspUserInterface/trackTree.ui
new file mode 100644
index 00000000..0c1d37ba
--- /dev/null
+++ b/Libraries/VspUserInterface/trackTree.ui
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vsTrackTreeWidget</class>
+ <widget class="QWidget" name="vsTrackTreeWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>416</width>
+    <height>325</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="vsTrackTreeView" name="tree">
+     <property name="acceptDrops">
+      <bool>true</bool>
+     </property>
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
+     <property name="dragEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::DragDrop</enum>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QToolBar" name="toolBar">
+     <property name="toolButtonStyle">
+      <enum>Qt::ToolButtonFollowStyle</enum>
+     </property>
+     <addaction name="actionHideAll"/>
+     <addaction name="actionShowAll"/>
+     <addaction name="actionShowHiddenItems"/>
+    </widget>
+   </item>
+  </layout>
+  <action name="actionHideAll">
+   <property name="text">
+    <string>Hide All</string>
+   </property>
+   <property name="toolTip">
+    <string>Set visibility state of all tracks to hidden</string>
+   </property>
+   <property name="shortcut">
+    <string>H, A</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionShowAll">
+   <property name="text">
+    <string>Show All</string>
+   </property>
+   <property name="toolTip">
+    <string>Set visibility state of all tracks to shown</string>
+   </property>
+   <property name="shortcut">
+    <string>S, A</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionShowHiddenItems">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Show Hidden</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle visibility of hidden tracks</string>
+   </property>
+   <property name="shortcut">
+    <string>S, H</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionShowSelected">
+   <property name="text">
+    <string>&amp;Show</string>
+   </property>
+   <property name="toolTip">
+    <string>Show selected tracks</string>
+   </property>
+   <property name="shortcut">
+    <string>S, S</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionHideSelected">
+   <property name="text">
+    <string>&amp;Hide</string>
+   </property>
+   <property name="toolTip">
+    <string>Hide selected tracks</string>
+   </property>
+   <property name="shortcut">
+    <string>H, S</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionJumpToStart">
+   <property name="text">
+    <string>&amp;Jump to Start</string>
+   </property>
+   <property name="toolTip">
+    <string>Seek to the temporal and spatial start of the selected track</string>
+   </property>
+   <property name="shortcut">
+    <string>J</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionJumpToEnd">
+   <property name="text">
+    <string>Jump to &amp;End</string>
+   </property>
+   <property name="toolTip">
+    <string>Seek to the temporal and spatial end of the selected track</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+J</string>
+   </property>
+   <property name="shortcutContext">
+    <enum>Qt::WidgetWithChildrenShortcut</enum>
+   </property>
+  </action>
+  <action name="actionFollowTrack">
+   <property name="text">
+    <string>Follow Track</string>
+   </property>
+   <property name="toolTip">
+    <string>Emit geolocation for sensor tracking of object</string>
+   </property>
+  </action>
+  <action name="actionStopFollowingTrack">
+   <property name="text">
+    <string>Stop Following Track</string>
+   </property>
+   <property name="toolTip">
+    <string>Stop following any track</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vsTrackTreeView</class>
+   <extends>QTreeView</extends>
+   <header>vsTrackTreeView.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Libraries/VspUserInterface/vsAlert.h b/Libraries/VspUserInterface/vsAlert.h
new file mode 100644
index 00000000..527c0fbf
--- /dev/null
+++ b/Libraries/VspUserInterface/vsAlert.h
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsAlert_h
+#define __vsAlert_h
+
+#include <vvQuery.h>
+
+#include <vsEventInfo.h>
+
+struct vsAlert
+{
+  vsEventInfo eventInfo;
+  vvSimilarityQuery query;
+  double displayThreshold;
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsAlertEditor.cxx b/Libraries/VspUserInterface/vsAlertEditor.cxx
new file mode 100644
index 00000000..cb801a2f
--- /dev/null
+++ b/Libraries/VspUserInterface/vsAlertEditor.cxx
@@ -0,0 +1,424 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsAlertEditor.h"
+
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QTextStream>
+#include <QUrl>
+
+#include <qtScopedValueChange.h>
+#include <qtUtil.h>
+
+#include <vvQuery.h>
+#include <vvReader.h>
+#include <vvWriter.h>
+
+#include <vgColor.h>
+#include <vgFileDialog.h>
+
+#include "vsAlert.h"
+
+#include "ui_alertEditor.h"
+
+#define die(_msg) return this->abort(fileName, _msg);
+#define test_or_die(_cond, _msg) if (!(_cond)) die(_msg)
+
+QTE_IMPLEMENT_D_FUNC(vsAlertEditor)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+QColor qColor(const double dc[3])
+{
+  return vgColor(dc[0], dc[1], dc[2]).toQColor();
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vsAlertEditorPrivate
+{
+public:
+  Ui::vsAlertEditor UI;
+  bool uiInEditMode;
+
+  vsEventInfo originalEventInfo;
+  double originalDisplayThreshold;
+  vvSimilarityQuery query;
+
+  bool changed;
+};
+
+//-----------------------------------------------------------------------------
+vsAlertEditor::vsAlertEditor(QWidget* parent)
+  : QDialog(parent), d_ptr(new vsAlertEditorPrivate)
+{
+  QTE_D(vsAlertEditor);
+  d->UI.setupUi(this);
+  d->uiInEditMode = false;
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  connect(d->UI.name, SIGNAL(textChanged(QString)),
+          this, SLOT(nameChanged()));
+  connect(d->UI.queryFile, SIGNAL(textChanged(QString)),
+          this, SLOT(queryFileChanged(QString)));
+  connect(d->UI.penColor, SIGNAL(colorChanged(QColor)),
+          this, SLOT(setModified()));
+  connect(d->UI.foregroundColor, SIGNAL(colorChanged(QColor)),
+          this, SLOT(setModified()));
+  connect(d->UI.backgroundColor, SIGNAL(colorChanged(QColor)),
+          this, SLOT(setModified()));
+  connect(d->UI.displayThreshold, SIGNAL(valueChanged(double)),
+          this, SLOT(setModified()));
+
+  connect(d->UI.queryBrowse, SIGNAL(clicked()),
+          this, SLOT(browseForQuery()));
+  connect(d->UI.saveButton, SIGNAL(clicked()),
+          this, SLOT(saveAlert()));
+
+  d->UI.penColor->setColor(Qt::red);
+  d->UI.foregroundColor->setColor(Qt::white);
+  d->UI.backgroundColor->setColor(Qt::darkRed);
+  this->apply();
+
+  d->changed = false;
+  this->validate();
+}
+
+//-----------------------------------------------------------------------------
+vsAlertEditor::~vsAlertEditor()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::setAlert(const vsAlert& alert)
+{
+  QTE_D(vsAlertEditor);
+  d->originalEventInfo = alert.eventInfo;
+  d->originalDisplayThreshold = alert.displayThreshold;
+  d->query = alert.query;
+
+  // Modify UI for editing (as opposed to creating) an alert, if we have not
+  // already done so
+  if (!d->uiInEditMode)
+    {
+    d->uiInEditMode = true;
+
+    // Add 'apply', 'reset' buttons
+    connect(d->UI.buttonBox->addButton(QDialogButtonBox::Apply),
+            SIGNAL(clicked()), this, SLOT(apply()));
+    connect(d->UI.buttonBox->addButton(QDialogButtonBox::Reset),
+            SIGNAL(clicked()), this, SLOT(reset()));
+    qtUtil::setStandardIcons(d->UI.buttonBox);
+
+    // Hide query file controls
+    d->UI.queryLabel->setVisible(false);
+    d->UI.queryFile->setVisible(false);
+    d->UI.queryBrowse->setVisible(false);
+    }
+
+  // Fill UI fields and set button states
+  d->UI.displayThreshold->setValue(alert.displayThreshold);
+  this->setQueryInfo();
+  this->reset();
+  this->validate();
+  d->changed = false;
+}
+
+//-----------------------------------------------------------------------------
+vsAlert vsAlertEditor::alert() const
+{
+  QTE_D_CONST(vsAlertEditor);
+  vsAlert alert;
+  alert.eventInfo = d->originalEventInfo;
+  alert.query = d->query;
+  alert.displayThreshold = d->originalDisplayThreshold;
+  return alert;
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::selectName()
+{
+  QTE_D(vsAlertEditor);
+  d->UI.name->setFocus();
+  d->UI.name->selectAll();
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::accept()
+{
+  this->apply();
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::reject()
+{
+  QTE_D_CONST(vsAlertEditor);
+  if (d->changed)
+    QDialog::accept();
+  else
+    QDialog::reject();
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::apply()
+{
+  QTE_D(vsAlertEditor);
+  d->originalEventInfo.name = d->UI.name->text();
+  vgColor::fillArray(d->UI.penColor->color(),
+                     d->originalEventInfo.pcolor);
+  vgColor::fillArray(d->UI.foregroundColor->color(),
+                     d->originalEventInfo.fcolor);
+  vgColor::fillArray(d->UI.backgroundColor->color(),
+                     d->originalEventInfo.bcolor);
+  d->originalDisplayThreshold = d->UI.displayThreshold->value();
+
+  d->changed = true;
+  this->setModified();
+  emit this->changesApplied();
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::reset()
+{
+  QTE_D(vsAlertEditor);
+
+  qtScopedBlockSignals bsN(d->UI.name);
+  qtScopedBlockSignals bsPC(d->UI.penColor);
+  qtScopedBlockSignals bsFC(d->UI.foregroundColor);
+  qtScopedBlockSignals bsBC(d->UI.backgroundColor);
+  qtScopedBlockSignals bsDT(d->UI.displayThreshold);
+
+  d->UI.penColor->setColor(qColor(d->originalEventInfo.pcolor));
+  d->UI.foregroundColor->setColor(qColor(d->originalEventInfo.fcolor));
+  d->UI.backgroundColor->setColor(qColor(d->originalEventInfo.bcolor));
+  d->UI.name->setText(d->originalEventInfo.name);
+  d->UI.displayThreshold->setValue(d->originalDisplayThreshold);
+
+  this->setModified();
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::setModified()
+{
+  QTE_D(vsAlertEditor);
+  if (!(d->UI.buttonBox->button(QDialogButtonBox::Apply) &&
+        d->UI.buttonBox->button(QDialogButtonBox::Reset)))
+    return;
+
+  bool modified = d->originalEventInfo.name != d->UI.name->text();
+  modified |= (qColor(d->originalEventInfo.pcolor)
+               != d->UI.penColor->color());
+  modified |= (qColor(d->originalEventInfo.fcolor)
+               != d->UI.foregroundColor->color());
+  modified |= (qColor(d->originalEventInfo.bcolor)
+               != d->UI.backgroundColor->color());
+  modified |= (!qFuzzyCompare(d->originalDisplayThreshold,
+                              d->UI.displayThreshold->value()));
+
+  d->UI.buttonBox->button(QDialogButtonBox::Apply)->setEnabled(modified);
+  d->UI.buttonBox->button(QDialogButtonBox::Reset)->setEnabled(modified);
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::validate()
+{
+  QTE_D(vsAlertEditor);
+
+  bool valid = !d->UI.name->text().isEmpty();
+  valid = valid && (!d->UI.queryFile->isVisible()
+                    || d->query.Descriptors.size());
+
+  d->UI.saveButton->setEnabled(valid);
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::setQueryInfo(QString error)
+{
+  QTE_D(vsAlertEditor);
+
+  if (error.isEmpty())
+    {
+    d->UI.queryInfo->setErrorText("(no descriptors)");
+    d->UI.queryInfo->setQuery(d->query);
+    }
+  else
+    {
+    d->UI.queryInfo->setErrorText(error);
+    d->UI.queryInfo->clearData();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vsAlertEditor::loadAlert(const QString& fileName)
+{
+  if (!fileName.isEmpty() && QFileInfo(fileName).exists())
+    {
+    vvReader reader;
+    test_or_die(reader.open(QUrl::fromLocalFile(fileName)),
+                reader.error());
+
+    vvHeader header;
+    test_or_die(reader.readHeader(header), reader.error());
+
+    test_or_die(header.type == vvHeader::EventSetInfo,
+                "The file does not appear to be a saved alert");
+
+    vvEventSetInfo info;
+    test_or_die(reader.readEventSetInfo(info), reader.error());
+
+    if (this->readQuery(reader, fileName))
+      {
+      QTE_D(vsAlertEditor);
+
+      d->UI.name->setText(info.Name);
+      d->UI.penColor->setColor(info.PenColor);
+      d->UI.foregroundColor->setColor(info.ForegroundColor);
+      d->UI.backgroundColor->setColor(info.BackgroundColor);
+      d->UI.displayThreshold->setValue(info.DisplayThreshold);
+      this->apply();
+      return true;
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::saveAlert()
+{
+  QString path = vgFileDialog::getSaveFileName(
+                   this, "Save alert...", QString(),
+                   "VisGUI Saved Alert (*.vsa *.vsax);;"
+                   "VisGUI Saved Alert - KST (*.vsa);;"
+                   "VisGUI Saved Alert - XML (*.vsax *.xml);;"
+                   "All files (*)");
+
+  if (!path.isEmpty())
+    {
+    QTE_D(vsAlertEditor);
+
+    QFile file(path);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Truncate))
+      {
+      qDebug() << "Error opening file" << path << "for writing:"
+               << qPrintable(file.errorString());
+      return;
+      }
+
+    vvEventSetInfo info;
+    info.Name = d->UI.name->text();
+    info.PenColor = d->UI.penColor->color();
+    info.ForegroundColor = d->UI.foregroundColor->color();
+    info.BackgroundColor = d->UI.backgroundColor->color();
+    info.DisplayThreshold = d->UI.displayThreshold->value();
+
+    const vvWriter::Format format =
+      QFileInfo(path).suffix().contains('x') ? vvWriter::Xml : vvWriter::Kst;
+    QTextStream stream(&file);
+    vvWriter writer(stream, format);
+    writer << vvHeader::EventSetInfo << info
+           << vvHeader::QueryPlan << vvQueryInstance(d->query);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vsAlertEditor::readQuery(vvReader& reader, const QString& fileName)
+{
+  QTE_D(vsAlertEditor);
+
+  vvHeader header;
+
+  test_or_die(reader.readHeader(header), reader.error());
+
+  test_or_die(header.type == vvHeader::QueryPlan,
+              "The file does not contain a query plan");
+
+  vvQueryInstance query;
+  test_or_die(reader.readQueryPlan(query), reader.error());
+  test_or_die(query.isSimilarityQuery(),
+              "Non-similarity queries cannot be used");
+
+  d->query = *query.similarityQuery();
+  this->setQueryInfo();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vsAlertEditor::abort(const QString& fileName, const QString& message)
+{
+  return this->abort(fileName, qPrintable(message));
+}
+
+//-----------------------------------------------------------------------------
+bool vsAlertEditor::abort(const QString& fileName, const char* message)
+{
+  const QString errorPrefix("Error reading file \"%1\":");
+  qDebug() << qPrintable(errorPrefix.arg(fileName)) << message;
+  this->setQueryInfo("(query file is not valid)");
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::browseForQuery()
+{
+  QString path = vgFileDialog::getOpenFileName(
+                   this, "Browse for query...", QString(),
+                   "VisGUI Query Plans (*.vqp);;"
+                   "All files (*)");
+
+  if (!path.isEmpty())
+    {
+    QTE_D(vsAlertEditor);
+    d->UI.queryFile->setText(path);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::nameChanged()
+{
+  this->setModified();
+  this->validate();
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertEditor::queryFileChanged(QString fileName)
+{
+  QTE_D(vsAlertEditor);
+  d->query.Descriptors.clear();
+
+  QFileInfo fi(fileName);
+  if (fi.exists())
+    {
+    vvReader reader;
+    if (!reader.open(QUrl::fromLocalFile(fileName)))
+      {
+      this->abort(fileName, reader.error());
+      return;
+      }
+
+    if (!this->readQuery(reader, fileName))
+      {
+      return;
+      }
+    }
+  else if (fileName.isEmpty())
+    {
+    this->setQueryInfo("(no query provided)");
+    }
+  else
+    {
+    this->setQueryInfo("(query file does not exist)");
+    }
+
+  this->validate();
+}
diff --git a/Libraries/VspUserInterface/vsAlertEditor.h b/Libraries/VspUserInterface/vsAlertEditor.h
new file mode 100644
index 00000000..ff213dde
--- /dev/null
+++ b/Libraries/VspUserInterface/vsAlertEditor.h
@@ -0,0 +1,70 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsAlertEditor_h
+#define __vsAlertEditor_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class vvReader;
+
+struct vsAlert;
+
+class vsAlertEditorPrivate;
+
+class vsAlertEditor : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vsAlertEditor(QWidget* parent = 0);
+  ~vsAlertEditor();
+
+  bool loadAlert(const QString& fileName);
+  void setAlert(const vsAlert&);
+
+  vsAlert alert() const;
+
+  void selectName();
+
+signals:
+  void changesApplied();
+
+public slots:
+  virtual void accept();
+  virtual void reject();
+
+  void apply();
+  void reset();
+
+  void saveAlert();
+
+protected slots:
+  void browseForQuery();
+
+  void nameChanged();
+  void queryFileChanged(QString);
+
+  void setModified();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsAlertEditor)
+
+  bool readQuery(vvReader& reader, const QString& fileName);
+  bool abort(const QString& fileName, const QString& message);
+  bool abort(const QString& fileName, const char* message);
+
+  void validate();
+  void setQueryInfo(QString error = QString());
+
+private:
+  QTE_DECLARE_PRIVATE(vsAlertEditor)
+  Q_DISABLE_COPY(vsAlertEditor)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsAlertList.cxx b/Libraries/VspUserInterface/vsAlertList.cxx
new file mode 100644
index 00000000..99334e6d
--- /dev/null
+++ b/Libraries/VspUserInterface/vsAlertList.cxx
@@ -0,0 +1,379 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsAlertList.h"
+
+#include <qtConfirmationDialog.h>
+
+#include <vgSwatchCache.h>
+
+#include "vsAlertEditor.h"
+
+Q_DECLARE_METATYPE(vsAlert)
+
+QTE_IMPLEMENT_D_FUNC(vsAlertList)
+
+//BEGIN item data helpers
+
+namespace // anonymous
+{
+
+enum DataRole
+{
+  IdRole = Qt::UserRole,
+  ActivationStateRole,
+  AlertRole,
+  MatchesRole
+};
+
+//-----------------------------------------------------------------------------
+int itemId(QTreeWidgetItem* item)
+{
+  return item->data(0, IdRole).toInt();
+}
+
+//-----------------------------------------------------------------------------
+void setItemId(QTreeWidgetItem* item, int newId)
+{
+  item->setData(0, IdRole, QVariant(newId));
+}
+
+//-----------------------------------------------------------------------------
+bool itemActivationState(QTreeWidgetItem* item)
+{
+  return item->data(0, ActivationStateRole).toBool();
+}
+
+//-----------------------------------------------------------------------------
+void setItemActivationState(QTreeWidgetItem* item, bool newState)
+{
+  item->setData(0, ActivationStateRole, QVariant(newState));
+  item->setText(1, newState ? "Active" : "Inactive");
+}
+
+//-----------------------------------------------------------------------------
+vsAlert itemAlert(QTreeWidgetItem* item)
+{
+  return item->data(0, AlertRole).value<vsAlert>();
+}
+
+//-----------------------------------------------------------------------------
+void setItemAlert(QTreeWidgetItem* item, vsAlert newAlert,
+                  const vgSwatchCache* swatchCache)
+{
+  item->setData(0, AlertRole, QVariant::fromValue(newAlert));
+  item->setText(0, newAlert.eventInfo.name);
+
+  if (swatchCache)
+    {
+    const double* dc = newAlert.eventInfo.pcolor;
+    const QColor color = QColor::fromRgbF(dc[0], dc[1], dc[2]);
+    item->setIcon(0, swatchCache->swatch(color));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void setItemAlertData(QTreeWidgetItem* item, vsAlert newAlert)
+{
+  item->setData(0, AlertRole, QVariant::fromValue(newAlert));
+}
+
+//-----------------------------------------------------------------------------
+void setItemMatches(QTreeWidgetItem* item, int newMatches)
+{
+  item->setData(0, MatchesRole, QVariant(newMatches));
+  item->setText(2, QString::number(newMatches));
+}
+
+} // namespace <anonymous>
+
+//END item data helpers
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsAlertListPrivate
+
+//-----------------------------------------------------------------------------
+class vsAlertListPrivate
+{
+public:
+  vsAlertListPrivate(vsAlertList* q);
+
+  void removeAlerts(const QList<QTreeWidgetItem*>&);
+
+  bool ShowInactive;
+
+  vsAlertEditor* ActiveEditor;
+  QTreeWidgetItem* EditItem;
+
+  const vgSwatchCache* SwatchCache;
+
+  static const char* const ConfirmMessage;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsAlertList)
+
+private:
+  QTE_DECLARE_PUBLIC(vsAlertList)
+};
+
+
+const char* const vsAlertListPrivate::ConfirmMessage =
+  "Removing alerts will remove all associated events. Once an alert is"
+  " removed, it must be reloaded or recreated before it can be used again."
+  " (To stop the system processing an alert without removing the alert;"
+  " deactivate the alert instead.)\n\nProceed with removal of %1 %2?";
+
+//-----------------------------------------------------------------------------
+vsAlertListPrivate::vsAlertListPrivate(vsAlertList* q)
+  : ShowInactive(true), ActiveEditor(0), EditItem(0), SwatchCache(0), q_ptr(q)
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertListPrivate::removeAlerts(const QList<QTreeWidgetItem*>& items)
+{
+  if (items.isEmpty())
+    return;
+
+  QTE_Q(vsAlertList);
+
+  const char* noun = (items.count() > 1 ? "alerts" : "alert");
+  const QString prompt = QString(vsAlertListPrivate::ConfirmMessage);
+  bool sure = qtConfirmationDialog::getConfirmation(
+                q->window(), "RemoveAllAlerts",
+                prompt.arg(items.count()).arg(noun),
+                QString("Remove %1").arg(noun),
+                qtConfirmationDialog::RememberSession, "Are you sure?");
+  if (sure)
+    {
+    foreach (QTreeWidgetItem* item, items)
+      emit q->alertRemoved(itemId(item));
+    }
+  // Item(s) will be removed on signal from vsCore
+}
+
+//END vsAlertListPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsAlertList
+
+//-----------------------------------------------------------------------------
+vsAlertList::vsAlertList(QWidget* parent)
+  : QTreeWidget(parent), d_ptr(new vsAlertListPrivate(this))
+{
+  this->sortItems(0, Qt::AscendingOrder);
+}
+
+//-----------------------------------------------------------------------------
+vsAlertList::~vsAlertList()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::setSwatchCache(const vgSwatchCache& sc)
+{
+  QTE_D(vsAlertList);
+  d->SwatchCache = &sc;
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::addAlert(int id, vsAlert alert)
+{
+  QTE_D(vsAlertList);
+
+  QTreeWidgetItem* item = new QTreeWidgetItem;
+  setItemId(item, id);
+  setItemAlert(item, alert, d->SwatchCache);
+  setItemActivationState(item, true);
+  item->setText(2, QString::number(0));
+  this->addTopLevelItem(item);
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::updateAlert(int id, vsAlert alert)
+{
+  QTE_D(vsAlertList);
+
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    {
+    if (itemId(item) == id)
+      {
+      setItemAlert(item, alert, d->SwatchCache);
+      if (item == d->EditItem && d->ActiveEditor)
+        {
+        d->ActiveEditor->setAlert(alert);
+        }
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::updateAlertThreshold(int id, double threshold)
+{
+  QTE_D(vsAlertList);
+
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    {
+    if (itemId(item) == id)
+      {
+      vsAlert alert = itemAlert(item);
+      alert.displayThreshold = threshold;
+      setItemAlertData(item, alert);
+      if (item == d->EditItem && d->ActiveEditor)
+        {
+        d->ActiveEditor->setAlert(alert);
+        }
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::setAlertMatches(int id, int matches)
+{
+  for (int i = 0, count = this->topLevelItemCount(); i < count; ++i)
+    {
+    QTreeWidgetItem* item = this->topLevelItem(i);
+    itemId(item) == id && (setItemMatches(item, matches), false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::setAlertEnabled(int id, bool enabled)
+{
+  QTE_D(vsAlertList);
+
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    {
+    if (itemId(item) == id)
+      {
+      setItemActivationState(item, enabled);
+      item->setHidden(!(enabled || d->ShowInactive));
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::removeAlert(int id)
+{
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    {
+    if (itemId(item) == id)
+      {
+      delete item;
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::removeSelected()
+{
+  QTE_D(vsAlertList);
+  d->removeAlerts(this->selectedItems());
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::removeAll()
+{
+  QTE_D(vsAlertList);
+
+  QList<QTreeWidgetItem*> items;
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    items.append(item);
+
+  d->removeAlerts(items);
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::activateSelected()
+{
+  this->setSelectedActivation(true);
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::deactivateSelected()
+{
+  this->setSelectedActivation(false);
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::setSelectedActivation(bool newState)
+{
+  foreach (QTreeWidgetItem* item, this->selectedItems())
+    {
+    if (itemActivationState(item) != newState)
+      emit this->alertActivationChanged(itemId(item), newState);
+    }
+  // Item activation state(s) will be updated on signal from vsCore
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::setShowInactive(bool newFlag)
+{
+  QTE_D(vsAlertList);
+
+  if (newFlag != d->ShowInactive)
+    {
+    d->ShowInactive = newFlag;
+    for (int i = 0, count = this->topLevelItemCount(); i < count; ++i)
+      {
+      QTreeWidgetItem* item = this->topLevelItem(i);
+      bool show = itemActivationState(item) || d->ShowInactive;
+      item->setHidden(!show);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vsAlertList::edit(
+  const QModelIndex& index, QAbstractItemView::EditTrigger trigger, QEvent* e)
+{
+  if (this->editTriggers().testFlag(trigger))
+    {
+    QTreeWidgetItem* item = this->itemFromIndex(index);
+    if (item)
+      {
+      QTE_D(vsAlertList);
+
+      vsAlertEditor editor;
+      d->ActiveEditor = &editor;
+      d->EditItem = item;
+
+      connect(&editor, SIGNAL(changesApplied()),
+              this, SLOT(editAlertChanged()));
+
+      editor.setAlert(itemAlert(item));
+      editor.selectName();
+      editor.exec();
+
+      d->ActiveEditor = 0;
+      d->EditItem = 0;
+      return false;
+      }
+    }
+
+  return QTreeWidget::edit(index, trigger, e);
+}
+
+//-----------------------------------------------------------------------------
+void vsAlertList::editAlertChanged()
+{
+  QTE_D(vsAlertList);
+
+  if (d->ActiveEditor && d->EditItem)
+    {
+    vsAlert updatedAlert = d->ActiveEditor->alert();
+    emit this->alertChanged(itemId(d->EditItem), updatedAlert);
+    }
+  // Item alert will be updated on signal from vsCore
+}
+
+//END vsAlertList
diff --git a/Libraries/VspUserInterface/vsAlertList.h b/Libraries/VspUserInterface/vsAlertList.h
new file mode 100644
index 00000000..ce233a38
--- /dev/null
+++ b/Libraries/VspUserInterface/vsAlertList.h
@@ -0,0 +1,67 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsAlertList_h
+#define __vsAlertList_h
+
+#include <QTreeWidget>
+
+#include <qtGlobal.h>
+
+#include "vsAlert.h"
+
+class vgSwatchCache;
+
+class vsAlertEditor;
+
+class vsAlertListPrivate;
+
+class vsAlertList : public QTreeWidget
+{
+  Q_OBJECT
+
+public:
+  vsAlertList(QWidget* parent);
+  ~vsAlertList();
+
+  void setSwatchCache(const vgSwatchCache&);
+
+signals:
+  void alertChanged(int id, vsAlert);
+  void alertActivationChanged(int id, bool active);
+  void alertRemoved(int id);
+
+public slots:
+  void addAlert(int id, vsAlert);
+  void updateAlert(int id, vsAlert);
+  void updateAlertThreshold(int id, double);
+  void setAlertMatches(int id, int matches);
+  void setAlertEnabled(int id, bool enabled);
+  void removeAlert(int id);
+
+  void removeSelected();
+  void removeAll();
+
+  void activateSelected();
+  void deactivateSelected();
+  void setSelectedActivation(bool state);
+  void setShowInactive(bool);
+
+protected slots:
+  void editAlertChanged();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsAlertList)
+
+  virtual bool edit(const QModelIndex& index, QAbstractItemView::EditTrigger,
+                    QEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(vsAlertList)
+  Q_DISABLE_COPY(vsAlertList)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsApplication.cxx b/Libraries/VspUserInterface/vsApplication.cxx
new file mode 100644
index 00000000..22be59d8
--- /dev/null
+++ b/Libraries/VspUserInterface/vsApplication.cxx
@@ -0,0 +1,131 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsApplication.h"
+
+#include <vgPluginLoader.h>
+
+#include <vsSourceService.h>
+
+#include "vsCore.h"
+#include "vsMainWindow.h"
+#include "vsUiExtensionInterface.h"
+
+QTE_IMPLEMENT_D_FUNC(vsApplication)
+
+//-----------------------------------------------------------------------------
+class vsApplicationPrivate
+{
+public:
+  vsCore* Core;
+  QList<vsUiExtensionInterface*> UiExtensions;
+  QWeakPointer<vsMainWindow> FirstView;
+  bool FirstViewAssigned;
+};
+
+//-----------------------------------------------------------------------------
+vsApplication::vsApplication(int& argc, char** argv)
+  : QApplication(argc, argv), d_ptr(new vsApplicationPrivate)
+{
+  QTE_D(vsApplication);
+
+  d->FirstViewAssigned = false;
+}
+
+//-----------------------------------------------------------------------------
+vsApplication::~vsApplication()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsApplication* vsApplication::instance()
+{
+  return qobject_cast<vsApplication*>(QCoreApplication::instance());
+}
+
+//-----------------------------------------------------------------------------
+QList<vsUiExtensionInterface*> vsApplication::uiExtensions()
+{
+  return vsApplication::instance()->d_func()->UiExtensions;
+}
+
+//-----------------------------------------------------------------------------
+vsMainWindow* vsApplication::firstView() const
+{
+  QTE_D_CONST(vsApplication);
+  return d->FirstView.data();
+}
+
+//-----------------------------------------------------------------------------
+vsMainWindow* vsApplication::newView(vsMainWindow* invokingView)
+{
+  QTE_D(vsApplication);
+
+  // Create new view
+  vsMainWindow* view = new vsMainWindow(d->Core, invokingView);
+  view->show();
+
+  // Mark window for clean-up on close
+  view->setAttribute(Qt::WA_DeleteOnClose, true);
+
+  // Ensure view is closed when we shut down (won't happen if we are shut down
+  // via QCoreApplication::exit!)
+  connect(this, SIGNAL(aboutToQuit()), view, SLOT(close()));
+
+  // Assign as the first view, if not assigned
+  if (!d->FirstViewAssigned)
+    {
+    d->FirstView = view;
+    d->FirstViewAssigned = true;
+    }
+
+  return view;
+}
+
+//-----------------------------------------------------------------------------
+void vsApplication::connectSource(const QString& identifier, const QUrl& uri)
+{
+  QTE_D(vsApplication);
+
+  vsSourceFactoryPtr factory = vsSourceService::createFactory(identifier);
+  if (factory && factory->initialize(uri))
+    d->Core->addSources(factory);
+}
+
+//-----------------------------------------------------------------------------
+void vsApplication::initialize()
+{
+  QTE_D(vsApplication);
+  d->Core = new vsCore(this);
+
+  // Load plugins
+  foreach (QObject* plugin, vgPluginLoader::plugins())
+    {
+    // Check if plugin provides a UI extension
+    vsUiExtensionInterface* extension =
+      qobject_cast<vsUiExtensionInterface*>(plugin);
+    if (extension)
+      {
+      // Register and initialize extension
+      d->UiExtensions.append(extension);
+      extension->initialize(d->Core);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsApplication::viewCloseEvent(vsMainWindow*, QCloseEvent*)
+{
+  int viewCount = 0;
+  foreach (QWidget* tlw, qApp->topLevelWidgets())
+    {
+    if (qobject_cast<vsMainWindow*>(tlw))
+      ++viewCount;
+    }
+
+  if (viewCount == 1)
+    emit this->lastViewClosed();
+}
diff --git a/Libraries/VspUserInterface/vsApplication.h b/Libraries/VspUserInterface/vsApplication.h
new file mode 100644
index 00000000..75a05fbd
--- /dev/null
+++ b/Libraries/VspUserInterface/vsApplication.h
@@ -0,0 +1,56 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsApplication_h
+#define __vsApplication_h
+
+#include <QApplication>
+#include <QUrl>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class QCloseEvent;
+
+class vsCore;
+class vsMainWindow;
+class vsUiExtensionInterface;
+
+class vsApplicationPrivate;
+
+class VSP_USERINTERFACE_EXPORT vsApplication : public QApplication
+{
+  Q_OBJECT
+
+public:
+  vsApplication(int& argc, char** argv);
+  virtual ~vsApplication();
+
+  static vsApplication* instance();
+  static QList<vsUiExtensionInterface*> uiExtensions();
+
+  vsMainWindow* firstView() const;
+  vsMainWindow* newView(vsMainWindow* invokingView = 0);
+  virtual void connectSource(const QString& identifier, const QUrl& uri);
+
+  void initialize();
+
+signals:
+  void lastViewClosed();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsApplication)
+  friend class vsMainWindow;
+
+  void viewCloseEvent(vsMainWindow*, QCloseEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(vsApplication)
+  Q_DISABLE_COPY(vsApplication)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsContourWidget.cxx b/Libraries/VspUserInterface/vsContourWidget.cxx
new file mode 100644
index 00000000..2547c698
--- /dev/null
+++ b/Libraries/VspUserInterface/vsContourWidget.cxx
@@ -0,0 +1,342 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsContourWidget.h"
+
+#include <vtkCellArray.h>
+#include <vtkCommand.h>
+#include <vtkContourWidget.h>
+#include <vtkIdList.h>
+#include <vtkLinearContourLineInterpolator.h>
+#include <vtkMatrix4x4.h>
+#include <vtkPoints.h>
+#include <vtkPolyData.h>
+#include <vtkRenderWindowInteractor.h>
+
+#include <vtkVgContourRepresentation.h>
+#include <vtkVgInstance.h>
+
+#include <vtkVgQtUtil.h>
+
+QTE_IMPLEMENT_D_FUNC(vsContourWidget)
+
+//-----------------------------------------------------------------------------
+class vsContourWidgetPrivate
+{
+public:
+  vsContourWidgetPrivate(int id) : Id(id) {}
+
+  void init(vtkRenderWindowInteractor* rwi);
+
+  int State;
+
+  const int Id;
+  QString Name;
+  vsContour::Type Type;
+
+  vtkVgInstance<vtkContourWidget> Widget;
+  vtkVgInstance<vtkVgContourRepresentation> Representation;
+};
+
+//-----------------------------------------------------------------------------
+void vsContourWidgetPrivate::init(vtkRenderWindowInteractor* rwi)
+{
+  this->Type = vsContour::NoType;
+
+  this->Widget->SetRepresentation(this->Representation);
+  this->Widget->SetInteractor(rwi);
+  this->Widget->SetContinuousDraw(true);
+
+  vtkLinearContourLineInterpolator* interpolator =
+    vtkLinearContourLineInterpolator::New();
+
+  this->Representation->SetLineInterpolator(interpolator);
+  interpolator->FastDelete();
+
+  this->Representation->AlwaysOnTopOn();
+  this->Representation->SetLineColor(1.0, 0.0, 0.0);
+}
+
+//-----------------------------------------------------------------------------
+vsContourWidget::vsContourWidget(int id, vtkRenderWindowInteractor* rwi)
+  : d_ptr(new vsContourWidgetPrivate(id))
+{
+  QTE_D(vsContourWidget);
+  d->init(rwi);
+
+  d->Name = "Unnamed Region " + QString::number(id);
+  d->State = vsContourWidget::Begin;
+}
+
+//-----------------------------------------------------------------------------
+vsContourWidget::vsContourWidget(const vsContour& contour,
+                                 vtkRenderWindowInteractor* rwi)
+  : d_ptr(new vsContourWidgetPrivate(contour.id()))
+{
+  QTE_D(vsContourWidget);
+  d->init(rwi);
+
+  d->Name = contour.name();
+  d->State = vsContourWidget::Complete;
+
+  d->Widget->On();
+  d->Widget->ProcessEventsOff();
+
+  this->setType(contour.type());
+  this->setPoints(contour.points());
+
+  d->Representation->Finalize();
+}
+
+//-----------------------------------------------------------------------------
+vsContourWidget::~vsContourWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vsContourWidget::state() const
+{
+  QTE_D_CONST(vsContourWidget);
+  return d->State;
+}
+
+//-----------------------------------------------------------------------------
+bool vsContourWidget::isClosed()
+{
+  QTE_D(vsContourWidget);
+  return !!d->Representation->GetClosedLoop();
+}
+
+//-----------------------------------------------------------------------------
+int vsContourWidget::id() const
+{
+  QTE_D_CONST(vsContourWidget);
+  return d->Id;
+}
+
+//-----------------------------------------------------------------------------
+QString vsContourWidget::name() const
+{
+  QTE_D_CONST(vsContourWidget);
+  return d->Name;
+}
+
+//-----------------------------------------------------------------------------
+vsContour::Type vsContourWidget::type() const
+{
+  QTE_D_CONST(vsContourWidget);
+  return d->Type;
+}
+
+//-----------------------------------------------------------------------------
+vtkContourWidget* vsContourWidget::widget()
+{
+  QTE_D(vsContourWidget);
+  return d->Widget;
+}
+
+//-----------------------------------------------------------------------------
+vtkPoints* vsContourWidget::points()
+{
+  QTE_D(vsContourWidget);
+  return d->Representation->GetPoints();
+}
+
+//-----------------------------------------------------------------------------
+vsContour vsContourWidget::toContour()
+{
+  QTE_D_CONST(vsContourWidget);
+
+  // Convert points to QPolygonF
+  QPolygonF polygon;
+  vtkPoints* vp = this->points();
+  for (vtkIdType n = 0; n < vp->GetNumberOfPoints(); ++n)
+    {
+    double p[3];
+    vp->GetPoint(n, p);
+    polygon.append(QPointF(p[0], p[1]));
+    }
+
+  // QPolygonF is closed if first point == last point; vsContour does not
+  // duplicate to indicate closure, so need to repeat the first point
+  if (this->isClosed())
+    {
+    polygon.append(polygon.front());
+    }
+
+  // Create vsContour
+  return vsContour(d->Id, d->Type, polygon, d->Name);
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::setMatrix(vtkMatrix4x4* matrix)
+{
+  QTE_D(vsContourWidget);
+  d->Representation->SetTransformMatrix(matrix);
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::setPoints(const QPolygonF& points)
+{
+  QTE_D(vsContourWidget);
+
+  vtkIdList* ids = vtkIdList::New();
+  vtkPoints* pts = vtkPoints::New();
+  vtkPolyData* pd = vtkPolyData::New();
+  vtkCellArray* ca = vtkCellArray::New();
+
+  int numIds = points.count();
+  int numPoints = points.isClosed() ? numIds - 1 : numIds;
+
+  ids->SetNumberOfIds(numIds);
+  pts->SetNumberOfPoints(numPoints);
+
+  for (int i = 0; i < numPoints; ++i)
+    {
+    const QPointF& point = points[i];
+    pts->SetPoint(i, point.x(), point.y(), 0.0);
+    ids->SetId(i, i);
+    }
+
+  if (points.isClosed())
+    {
+    ids->SetId(numIds - 1, 0);
+    }
+
+  ca->InsertNextCell(ids);
+  pd->SetPoints(pts);
+  pd->SetLines(ca);
+
+  d->Widget->Initialize(pd);
+
+  ids->FastDelete();
+  pts->FastDelete();
+  pd->FastDelete();
+  ca->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::setName(QString name)
+{
+  QTE_D(vsContourWidget);
+  d->Name = name;
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::setType(vsContour::Type type)
+{
+  QTE_D(vsContourWidget);
+
+  d->Type = type;
+  switch (type)
+    {
+    case vsContour::Annotation:
+      d->Representation->SetLineColor(1.0, 0.0, 0.0);
+      break;
+    case vsContour::Tripwire:
+      d->Representation->SetLineColor(1.0, 1.0, 0.0);
+      break;
+    case vsContour::Selector:
+      d->Representation->SetLineColor(1.0, 1.0, 1.0);
+      break;
+    case vsContour::Filter:
+      d->Representation->SetLineColor(1.0, 0.0, 1.0);
+      break;
+    default:
+      d->Representation->SetLineColor(0.0, 0.0, 0.0);
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::setVisible(bool visible)
+{
+  QTE_D(vsContourWidget);
+  d->Representation->SetVisibility(visible);
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::begin()
+{
+  QTE_D(vsContourWidget);
+
+  d->Widget->On();
+  d->Widget->Initialize();
+  d->Widget->FollowCursorOn();
+  d->Widget->Render();
+
+  // widget fires an EndInteraction event when it changes to manipulate mode
+  // (by closing the loop or the user right clicking)
+  vtkConnect(d->Widget, vtkCommand::EndInteractionEvent,
+             this, SLOT(onInteractionComplete()));
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::close()
+{
+  QTE_D(vsContourWidget);
+
+  // don't automatically add the node following the mouse
+  if (!d->Representation->GetClosedLoop() &&
+      d->State == vsContourWidget::Begin)
+    {
+    d->Representation->DeleteLastNode();
+    }
+  d->Widget->CloseLoop();
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::finalize()
+{
+  QTE_D(vsContourWidget);
+
+  d->Widget->ProcessEventsOff();
+  d->Representation->Finalize();
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::onRightClick()
+{
+  QTE_D(vsContourWidget);
+
+  if (d->State == vsContourWidget::Manipulate)
+    {
+    d->State = vsContourWidget::Complete;
+    vtkDisconnect(d->Widget->GetInteractor()->GetInteractorStyle(),
+                  vtkCommand::RightButtonPressEvent);
+    emit this->manipulationComplete();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsContourWidget::onInteractionComplete()
+{
+  QTE_D(vsContourWidget);
+
+  if (d->State == vsContourWidget::Begin)
+    {
+    d->State = vsContourWidget::Manipulate;
+
+    // don't automatically add the node following the mouse
+    if (!d->Representation->GetClosedLoop())
+      {
+      d->Representation->DeleteLastNode();
+      }
+
+    // close loop if required by type
+    if (vsContour::isLoopType(d->Type))
+      {
+      this->close();
+      }
+
+    // listen for the final right click to indicate completion
+    vtkConnect(d->Widget->GetInteractor()->GetInteractorStyle(),
+               vtkCommand::RightButtonPressEvent,
+               this, SLOT(onRightClick()));
+
+    emit this->interactionComplete();
+    }
+}
diff --git a/Libraries/VspUserInterface/vsContourWidget.h b/Libraries/VspUserInterface/vsContourWidget.h
new file mode 100644
index 00000000..25343c6b
--- /dev/null
+++ b/Libraries/VspUserInterface/vsContourWidget.h
@@ -0,0 +1,81 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsContourWidget_h
+#define __vsContourWidget_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsContour.h>
+
+class vtkContourWidget;
+class vtkMatrix4x4;
+class vtkPoints;
+class vtkRenderWindowInteractor;
+
+class vsContourWidgetPrivate;
+
+class vsContourWidget : public QObject
+{
+  Q_OBJECT
+
+public:
+  enum State
+    {
+    Begin,
+    Manipulate,
+    Complete
+    };
+
+  vsContourWidget(int id, vtkRenderWindowInteractor*);
+  vsContourWidget(const vsContour&, vtkRenderWindowInteractor*);
+  ~vsContourWidget();
+
+  void setMatrix(vtkMatrix4x4* matrix);
+  void setPoints(const QPolygonF&);
+
+  int state() const;
+
+  bool isClosed();
+
+  int id() const;
+  QString name() const;
+  vsContour::Type type() const;
+
+  vtkContourWidget* widget();
+  vtkPoints* points();
+
+  vsContour toContour();
+
+signals:
+  void interactionComplete();
+  void manipulationComplete();
+
+public slots:
+  void begin();
+  void close();
+  void finalize();
+
+  void setName(QString);
+  void setType(vsContour::Type);
+
+  void setVisible(bool);
+
+protected slots:
+  void onRightClick();
+  void onInteractionComplete();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsContourWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(vsContourWidget)
+  Q_DISABLE_COPY(vsContourWidget)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsCore.cxx b/Libraries/VspUserInterface/vsCore.cxx
new file mode 100644
index 00000000..bfceae4e
--- /dev/null
+++ b/Libraries/VspUserInterface/vsCore.cxx
@@ -0,0 +1,1006 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsCore.h"
+#include "vsCorePrivate.h"
+
+#include <QProgressDialog>
+
+#include <vgCheckArg.h>
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventModelCollection.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackModelCollection.h>
+#include <vtkVgTypeDefs.h>
+
+#include <qtStlUtil.h>
+
+#include <vsDescriptorSource.h>
+#include <vsTrackSource.h>
+#include <vsVideoSource.h>
+
+QTE_IMPLEMENT_D_FUNC(vsCore)
+
+//-----------------------------------------------------------------------------
+vsCore::vsCore(QObject* parent)
+  : QObject(parent), d_ptr(new vsCorePrivate(this))
+{
+  QTE_D(vsCore);
+
+  // Register types for loaded and system-created events
+  foreach (const vsEventInfo& ei, vsEventInfo::events(vsEventInfo::NonUser))
+    {
+    d->registerEventType(ei, false);
+    }
+
+  // Register types for user-created ('manual') events
+  foreach (vsEventInfo ei, vsEventInfo::events(vsEventInfo::User))
+    {
+    ei.type = d->NextUserType--; // Type from settings is not used
+    d->registerEventType(ei, true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsCore::~vsCore()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::registerEventType(const vsEventInfo& ei, bool isManualType)
+{
+  QTE_D(vsCore);
+
+  d->registerEventType(ei, isManualType);
+
+  // Emit updated signal, as events may have changed
+  emit this->updated();
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::unregisterEventType(int type)
+{
+  QTE_D(vsCore);
+
+  // Look up the event type
+  int index = d->EventTypeRegistry->GetTypeIndex(type);
+  if (index >= 0)
+    {
+    // Remove the type from the registry
+    d->EventTypeRegistry->RemoveType(index);
+
+    // Emit updated signal, as events may have changed
+    emit this->updated();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsVideoSource* vsCore::videoSource() const
+{
+  QTE_D_CONST(vsCore);
+  return d->VideoSource.data();
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsCore::videoSourceStatus() const
+{
+  QTE_D_CONST(vsCore);
+  return (d->VideoSource ? d->VideoSource->status() : vsDataSource::NoSource);
+}
+
+//-----------------------------------------------------------------------------
+QString vsCore::videoSourceText() const
+{
+  QTE_D_CONST(vsCore);
+  return (d->VideoSource ? d->VideoSource->text() : QString("(none)"));
+}
+
+//-----------------------------------------------------------------------------
+QString vsCore::videoSourceToolTip() const
+{
+  QTE_D_CONST(vsCore);
+  return (d->VideoSource ? d->VideoSource->toolTip()
+                         : QString("(no video source)"));
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsCore::trackSourceStatus(int sourceIndex) const
+{
+  QTE_D_CONST(vsCore);
+  if (sourceIndex < 0 || sourceIndex + 1 > d->TrackSources.count())
+    return vsDataSource::NoSource;
+  return d->TrackSources[sourceIndex]->status();
+}
+
+//-----------------------------------------------------------------------------
+QString vsCore::trackSourceText(int sourceIndex) const
+{
+  QTE_D_CONST(vsCore);
+  if (sourceIndex < 0 || sourceIndex + 1 > d->TrackSources.count())
+    return "(none)";
+  return d->TrackSources[sourceIndex]->text();
+}
+
+//-----------------------------------------------------------------------------
+QString vsCore::trackSourceToolTip(int sourceIndex) const
+{
+  QTE_D_CONST(vsCore);
+  if (sourceIndex < 0 || sourceIndex + 1 > d->TrackSources.count())
+    return "(no track source)";
+  return d->TrackSources[sourceIndex]->toolTip();
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsCore::descriptorSourceStatus(int sourceIndex) const
+{
+  QTE_D_CONST(vsCore);
+  if (sourceIndex < 0 || sourceIndex + 1 > d->DescriptorSources.count())
+    return vsDataSource::NoSource;
+  return d->DescriptorSources[sourceIndex]->status();
+}
+
+//-----------------------------------------------------------------------------
+QString vsCore::descriptorSourceText(int sourceIndex) const
+{
+  QTE_D_CONST(vsCore);
+  if (sourceIndex < 0 || sourceIndex + 1 > d->DescriptorSources.count())
+    return "(none)";
+  return d->DescriptorSources[sourceIndex]->text();
+}
+
+//-----------------------------------------------------------------------------
+QString vsCore::descriptorSourceToolTip(int sourceIndex) const
+{
+  QTE_D_CONST(vsCore);
+  if (sourceIndex < 0 || sourceIndex + 1 > d->DescriptorSources.count())
+    return "(no descriptor source)";
+  return d->DescriptorSources[sourceIndex]->toolTip();
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addSources(vsSourceFactoryPtr factory)
+{
+  QTE_D(vsCore);
+
+  vsVideoSourcePtr vs = factory->videoSource();
+  if (vs)
+    d->setVideoSource(vs);
+  foreach (vsTrackSourcePtr ts, factory->trackSources())
+    d->addTrackSource(ts);
+  foreach (vsDescriptorSourcePtr ds, factory->descriptorSources())
+    d->addDescriptorSource(ds);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::connectDescriptorInputs(vsDescriptorSource* source)
+{
+  QTE_D(vsCore);
+  d->connectDescriptorInputs(source);
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::Types vsCore::acceptedInputs() const
+{
+  QTE_D_CONST(vsCore);
+  return d->CollectedDescriptorInputs;
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addModel(vtkVgTrackModel* model, ModelType type)
+{
+  QTE_D(vsCore);
+  vtkVgTrackModelCollection* collection =
+    (type == vsCore::NormalModel ? d->TrackModel : d->GroundTruthTrackModel);
+  model->SetPoints(collection->GetInternalTrackModel()->GetPoints());
+  collection->AddTrackModel(model);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addModel(vtkVgEventModel* model, ModelType type)
+{
+  QTE_D(vsCore);
+  vtkVgEventModelCollection* collection =
+    (type == vsCore::NormalModel ? d->EventModel : d->GroundTruthEventModel);
+  collection->AddEventModel(model);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTypeRegistry* vsCore::eventTypeRegistry()
+{
+  QTE_D(vsCore);
+  return d->EventTypeRegistry;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsEventInfo> vsCore::manualEventTypes() const
+{
+  QTE_D_CONST(vsCore);
+  return d->ManualEventTypes;
+}
+
+//-----------------------------------------------------------------------------
+const vgSwatchCache& vsCore::swatchCache() const
+{
+  QTE_D_CONST(vsCore);
+  return d->SwatchCache;
+}
+
+//-----------------------------------------------------------------------------
+bool vsCore::isGroundTruthDataPresent() const
+{
+  QTE_D_CONST(vsCore);
+  return d->GroundTruthDataPresent;
+}
+
+//-----------------------------------------------------------------------------
+bool vsCore::isEventGroupExpected(vsEventInfo::Group group) const
+{
+  QTE_D_CONST(vsCore);
+  return d->ExpectedEventGroups.contains(group);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::expectEventGroup(vsEventInfo::Group group)
+{
+  QTE_D(vsCore);
+  d->expectEventGroup(group);
+}
+
+//-----------------------------------------------------------------------------
+QStringList vsCore::dynamicDataSets()
+{
+  QTE_D(vsCore);
+  QStringList sets;
+
+  vtkVgTrackModel::SmartPtr trackModel =
+    d->TrackModel->GetInternalTrackModel();
+  std::vector<std::string> scalarsName = trackModel->GetAllScalarsName();
+  for (size_t i = 0; i < scalarsName.size(); ++i)
+    {
+    sets.append(qtString(scalarsName[i]));
+    }
+  return sets;
+}
+
+//-----------------------------------------------------------------------------
+int vsCore::createContourId()
+{
+  QTE_D(vsCore);
+  return d->NextContourId++;
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addContour(vsContour contour)
+{
+  QTE_D(vsCore);
+
+  // Emit to descriptors
+  vsCorePrivate::ContourInfo info(contour);
+  info.inputId = d->emitInput(info.contour);
+
+  // Add to internal map and notify interested observers
+  d->Contours.insert(info.contour.id(), info);
+  emit this->contourAdded(info.contour);
+}
+
+//-----------------------------------------------------------------------------
+bool vsCore::setContourName(int id, QString name)
+{
+  QTE_D(vsCore);
+
+  if (!d->Contours.contains(id))
+    return false;
+
+  vsCorePrivate::ContourInfo& info = d->Contours[id];
+  if (info.contour.name() != name)
+    {
+    info.contour.setName(name);
+    emit this->contourNameChanged(id, name);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vsCore::setContourType(int id, vsContour::Type newType)
+{
+  QTE_D(vsCore);
+
+  if (!d->Contours.contains(id))
+    return false;
+
+  vsCorePrivate::ContourInfo& info = d->Contours[id];
+  if (!d->setContourType(info, newType))
+    {
+    // If we can't set the type, emit that the type was changed... this is a
+    // somewhat crude way to notify the region list to cancel an edit, but the
+    // only way that works if the region list is going to notify us of a change
+    // by emitting a signal, rather than something much more tightly coupled
+    emit this->contourTypeChanged(id, info.contour.type());
+    return false;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vsCore::removeContour(int id, bool removeEvents)
+{
+  QTE_D(vsCore);
+
+  if (d->Contours.contains(id))
+    {
+    // Remove contour from internal map
+    vsCorePrivate::ContourInfo info = d->Contours.take(id);
+
+    // Signal removal to descriptors
+    d->revokeInput(&vsCore::contourRevoked, info.inputId, removeEvents);
+
+    // Done
+    emit this->contourRemoved(id);
+    emit this->updated();
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vsCore::convertContourToEvent(int id, int eventType, vtkVgTimeStamp ts)
+{
+  QTE_D(vsCore);
+
+  if (d->Contours.contains(id))
+    {
+    // Get contour and points
+    vsCorePrivate::ContourInfo info = d->Contours[id];
+    QPolygonF points = info.contour.points();
+
+    // Create and add event
+    this->createManualEvent(eventType, points, ts);
+
+    // Remove contour
+    this->removeContour(id);
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::createManualEvent(
+  int eventType, QPolygonF region, vtkVgTimeStamp ts)
+{
+  QTE_D(vsCore);
+
+  // Convert points to raw double array
+  const int k = region.isClosed() ? region.count() - 1 : region.count();
+  QScopedArrayPointer<double> points(new double[2 * k]);
+  for (int i = 0; i < k; ++i)
+    {
+    points[(2 * i) + 0] = region[i].x();
+    points[(2 * i) + 1] = region[i].y();
+    }
+
+  // Create event from region
+  vsEvent event(QUuid::createUuid());
+  event->SetId(d->NextRawEventId++);
+  event->AddClassifier(eventType, 1.0);
+  event->AddRegion(ts, k, points.data());
+  event->SetStartFrame(ts);
+  event->SetEndFrame(ts);
+  event->SetFlags(vtkVgEventBase::EF_UserCreated |
+                  vtkVgEventBase::EF_Modifiable);
+
+  // Notify views to show filter
+  d->expectEventGroup(vsEventInfo::User);
+
+  emit this->manualEventCreated(event->GetId());
+
+  // Add event
+  d->addReadyEvent(0, event);
+}
+
+//-----------------------------------------------------------------------------
+bool vsCore::addAlert(vsAlert alert)
+{
+  QTE_D(vsCore);
+
+  // Generate new ID
+  int alertId = d->NextAlertType--;
+  vsCorePrivate::AlertInfo info(alert);
+
+  // Register alert with event type registry
+  info.alert.eventInfo.type = alertId;
+  this->registerEventType(info.alert.eventInfo);
+  d->expectEventGroup(vsEventInfo::Alert);
+
+  // Emit alert to interested observers
+  emit this->alertAdded(alertId, info.alert);
+  qint64 inputId =
+    d->emitInput(&vsCore::queryAvailable,
+                 new vsDescriptorInput(info.alert.query, alertId));
+  info.inputIdList.append(inputId);
+
+  // Done
+  d->Alerts.insert(alertId, info);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::updateAlert(int id, vsAlert updatedAlert)
+{
+  QTE_D(vsCore);
+
+  if (!d->Alerts.contains(id))
+    return;
+
+  // Update internal map with the new event info
+  vsCorePrivate::AlertInfo& info = d->Alerts[id];
+  vsEventInfo& ei = info.alert.eventInfo = updatedAlert.eventInfo;
+
+  // Re-register the event type
+  this->registerEventType(ei);
+
+  // Notify interested observers of the change
+  emit this->alertChanged(id, updatedAlert);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::setAlertEnabled(int id, bool enabled)
+{
+  QTE_D(vsCore);
+
+  if (!d->Alerts.contains(id))
+    return;
+
+  vsCorePrivate::AlertInfo& info = d->Alerts[id];
+  if (info.enabled != enabled)
+    {
+    info.enabled = enabled;
+    if (enabled)
+      {
+      qint64 inputId =
+        d->emitInput(&vsCore::queryAvailable,
+                     new vsDescriptorInput(info.alert.query, id));
+      info.inputIdList.append(inputId);
+      }
+    else
+      {
+      qint64 inputId = info.inputIdList.last();
+      d->revokeInput(&vsCore::queryRevoked, inputId, false);
+      }
+    emit this->alertEnabledChanged(id, enabled);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::removeAlert(int id, bool removeEvents)
+{
+  QTE_D(vsCore);
+
+  if (!d->Alerts.contains(id))
+    return;
+
+  // Remove from internal map
+  vsCorePrivate::AlertInfo info = d->Alerts.take(id);
+
+  // Revoke alert from descriptors
+  foreach (qint64 inputId, info.inputIdList)
+    d->revokeInput(&vsCore::queryRevoked, inputId, removeEvents);
+
+  // If removing events, unregister the event type
+  if (removeEvents)
+    {
+    int type = info.alert.eventInfo.type;
+    this->unregisterEventType(type);
+    }
+
+  // Done
+  emit this->alertRemoved(id, removeEvents);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::updateTrackSourceStatus(vsDataSource::Status status)
+{
+  QTE_D(vsCore);
+
+  if (!d->TrackSources.size())
+    status = vsDataSource::NoSource;
+
+  emit this->trackSourceStatusChanged(status);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::unregisterTrackSource(vsTrackSource* source)
+{
+  QTE_D(vsCore);
+
+  vsCorePrivate::vsTrackSourceIterator iter = d->TrackSources.begin();
+  while (iter != d->TrackSources.end())
+    {
+    if (*iter == source)
+      {
+      iter = d->TrackSources.erase(iter);
+      emit this->trackSourceStatusChanged(vsDataSource::NoSource);
+      }
+    else
+      {
+      ++iter;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::updateDescriptorSourceStatus(vsDataSource::Status status)
+{
+  QTE_D(vsCore);
+
+  if (!d->DescriptorSources.size())
+    status = vsDataSource::NoSource;
+
+  emit this->descriptorSourceStatusChanged(status);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::unregisterDescriptorSource(vsDescriptorSource* source)
+{
+  QTE_D(vsCore);
+  d->removeDescriptorSource(source);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addMetadata(QList<vtkVgVideoFrameMetaData> metadata)
+{
+  QTE_D(vsCore);
+
+  foreach (const vtkVgVideoFrameMetaData& fmd, metadata)
+    {
+    vgTimeStamp ts = fmd.Time.GetRawTimeStamp();
+    if (!d->HomographyMap.contains(ts))
+      {
+      // We haven't seen this metadata before; first, add the homography to our
+      // internal map...
+      d->HomographyMap.insert(fmd.Time.GetRawTimeStamp(), fmd.Homography);
+
+      // ...then to the map that QF uses...
+      const vtkVgVideoMetadata vmd(fmd.Time, fmd.Gsd, fmd.Homography,
+                                   fmd.HomographyReferenceFrame);
+      d->VideoMetadata.insert(std::make_pair(fmd.Time, vmd));
+
+      // ...and lastly, emit to any interested descriptors
+      d->emitInput(&vsCore::metaDataAvailable,
+                   new vsDescriptorInput(fmd));
+      }
+
+    // Update the homography reference frame time map
+    unsigned int hrf = fmd.HomographyReferenceFrame;
+    vtkVgTimeStamp& hrfTime = d->HomographyReferenceTimeMap[hrf];
+    if (hrfTime.IsValid())
+      {
+      // If the time existed already, check if we have received an earlier
+      // frame with the same reference; if so, we should update the time with
+      // the current earlier time
+      hrfTime = qMin(hrfTime, fmd.Time);
+      }
+    else
+      {
+      // Didn't exist; set it to time of current meta data
+      hrfTime = fmd.Time;
+      }
+
+    // Also save the full metadata in a map
+    d->VideoFrameMetadata.insert(fmd.Time.GetRawTimeStamp(), fmd);
+    }
+
+  // Flush any deferred updates that can now be satisfied
+  d->flushDeferredTrackUpdates(metadata.last().Time);
+  d->flushDeferredEventRegions(metadata.last().Time);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vsCore::homographyReferenceTime(
+  unsigned int frameNumber, vtkVgTimeStamp bestGuess) const
+{
+  QTE_D_CONST(vsCore);
+  return d->HomographyReferenceTimeMap.value(frameNumber, bestGuess);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::flushUpdateSignals()
+{
+  QTE_D(vsCore);
+
+  typedef vsCorePrivate::TrackUpdateSignalMap::const_iterator TrackIterator;
+  foreach_iter (TrackIterator, tIter, d->PendingTrackUpdateSignals)
+    {
+    emit (this->*tIter.value())(tIter.key());
+    }
+  d->PendingTrackUpdateSignals.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::updateTrack(vvTrackId trackId, vvTrackState state)
+{
+  QTE_D(vsCore);
+
+  QList<vvTrackState> states;
+  states.append(state);
+
+  d->updateTrack(trackId, states);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::updateTrack(vvTrackId trackId, QList<vvTrackState> states)
+{
+  QTE_D(vsCore);
+  d->updateTrack(trackId, states);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::updateTrackData(vvTrackId trackId, vsTrackData data)
+{
+  QTE_D(vsCore);
+  d->updateTrackData(trackId, data);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::closeTrack(vvTrackId trackId)
+{
+  QTE_D(vsCore);
+
+  if (d->DeferredTrackUpdates.contains(trackId))
+    d->DeferredTrackUpdates[trackId].closed = true;
+  else
+    d->closeTrack(trackId);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::setTrackClassification(
+  vvTrackId trackId, vsTrackObjectClassifier toc)
+{
+  QTE_D(vsCore);
+
+  // Set PVO on vvTrack
+  vvTrack& theVvTrack = d->getVvTrack(trackId);
+  theVvTrack.Classification["Person"] = toc.probabilityPerson;
+  theVvTrack.Classification["Vehicle"] = toc.probabilityVehicle;
+  theVvTrack.Classification["Other"] = toc.probabilityOther;
+
+  // Set PVO on vtkVgTrack
+  d->track(trackId)->SetPVO(toc.probabilityPerson,
+                            toc.probabilityVehicle,
+                            toc.probabilityOther);
+
+  d->emitInput(&vsCore::tocAvailable,
+               new vsDescriptorInput(trackId, toc));
+
+  // d->trackLabelRepresentation_->Modified(); \FIXME must communicate this
+
+  emit this->updated();
+}
+
+//-----------------------------------------------------------------------------
+vvTrackId vsCore::logicalTrackId(vtkIdType modelTrackId) const
+{
+  QTE_D_CONST(vsCore);
+  return d->TrackLogicalIdMap.value(modelTrackId);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vsCore::modelEventId(vsDescriptorSource* source,
+                               vtkIdType sourceId) const
+{
+  QTE_D_CONST(vsCore);
+
+  if (!d->EventMap.contains(source))
+    {
+    // No such source
+    return -1;
+    }
+
+  const QHash<vtkIdType, vsCorePrivate::EventReference>& map =
+    d->EventMap[source];
+
+  if (!map.contains(sourceId))
+    {
+    // Not found
+    return -1;
+    }
+
+  return map[sourceId].modelId;
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addEventType(
+  vsDescriptorSource* source, vsEventInfo info, double initialThreshold)
+{
+  QTE_D(vsCore);
+
+  // Check for existing type
+  QHash<int, int>& typeMap = d->UserEventTypeMap[source];
+  if (!typeMap.contains(info.type))
+    {
+    // Generate new type
+    typeMap.insert(info.type, d->NextUserType--);
+    }
+  info.type = typeMap[info.type];
+
+  // Register user type with event type registry
+  this->registerEventType(info);
+  d->expectEventGroup(vsEventInfo::User);
+
+  // Emit user event type to interested observers
+  emit this->userEventTypeAdded(info.type, info, initialThreshold);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addDescriptor(vsDescriptorSource* source, vsDescriptor ds)
+{
+  QTE_D(vsCore);
+  d->addDescriptor(source, ds.take());
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addDescriptors(vsDescriptorSource* source, vsDescriptorList dl)
+{
+  QTE_D(vsCore);
+  d->addDescriptors(source, dl.take());
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::addEvent(vsDescriptorSource* source, vsEvent eventBase)
+{
+  QTE_D(vsCore);
+  d->addEvent(source, eventBase);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::removeEvent(vsDescriptorSource* source, vtkIdType eventId)
+{
+  QTE_D(vsCore);
+  d->removeEvent(source, eventId);
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::setEventRating(vtkIdType eventId, int rating)
+{
+  QTE_D(vsCore);
+
+  if (vtkVgEvent* e = d->EventModel->GetEvent(eventId))
+    {
+    // CAUTION: If rating changes to carry information besides IQR score, this
+    //          code should be modified to check for a change in IQR score
+    //          before unilaterally emitting descriptor input
+    vvIqr::Classification classification;
+    switch (rating)
+      {
+      case vgObjectStatus::Adjudicated:
+        {
+        classification = vvIqr::PositiveExample;
+        break;
+        }
+      case vgObjectStatus::Excluded:
+        {
+        classification = vvIqr::NegativeExample;
+        break;
+        }
+      case vgObjectStatus::None:
+        {
+        classification = vvIqr::UnclassifiedExample;
+        break;
+        }
+      }
+    vsEventId eid = d->Events.value(eventId);
+    d->emitInput(&vsCore::eventRatingAvailable,
+                 new vsDescriptorInput(eid, classification));
+
+    e->SetStatus(rating);
+    emit this->eventRatingChanged(e, rating);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::setEventStatus(vtkIdType eventId, int status)
+{
+  QTE_D(vsCore);
+
+  if (vtkVgEvent* e = d->EventModel->GetEvent(eventId))
+    {
+    emit this->eventStatusChanged(e, status);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::setEventNote(vtkIdType eventId, QString note)
+{
+  QTE_D(vsCore);
+
+  if (vtkVgEvent* e = d->EventModel->GetEvent(eventId))
+    {
+    e->SetNote(note.isEmpty() ? 0 : qPrintable(note));
+    emit this->eventNoteChanged(e, note);
+    vsEventId eid = d->Events.value(eventId);
+    d->emitInput(&vsCore::eventNoteAvailable,
+                 new vsDescriptorInput(eid, note,
+                                       e->GetStartFrame().GetRawTimeStamp(),
+                                       e->GetEndFrame().GetRawTimeStamp()));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::setEventStart(vtkIdType eventId, vtkVgTimeStamp ts)
+{
+  QTE_D(vsCore);
+
+  vtkVgEventModelCollection* model;
+  vtkVgEvent* event = d->event(eventId, &model);
+  if (!(event && event->IsModifiable()))
+    {
+    // Punt if event not found, or does not have the modifiable flag set
+    return;
+    }
+
+  // Don't allow start to be set after the first region in the event. Rather
+  // than adding a specific interface for this purpose, use the current
+  // interface and the assumption that start frame is never going to be after
+  // the first region.
+  vtkIdType npts, *pts;
+  vtkVgTimeStamp timeStamp = event->GetStartFrame();
+  event->GetRegionAtOrAfter(timeStamp, npts, pts);
+  if (npts == 0)
+    {
+    // Event has no region; don't allow setting of start time
+    return;
+    }
+  if (ts > timeStamp)
+    {
+    // Clamp requested start time to no later than first region
+    ts = timeStamp;
+    }
+
+  if (event->GetStartFrame() != ts)
+    {
+    model->Modified();
+    event->SetStartFrame(ts);
+    d->notifyEventModified(event);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::setEventEnd(vtkIdType eventId, vtkVgTimeStamp ts)
+{
+  QTE_D(vsCore);
+
+  vtkVgEventModelCollection* model;
+  vtkVgEvent* event = d->event(eventId, &model);
+  if (!(event && event->IsModifiable()))
+    {
+    // Punt if event not found, or does not have the modifiable flag set
+    return;
+    }
+
+  // Don't allow end to be set before the last region in the event.
+  // GetClosestDisplayRegion() returns closest less than or equal, or first if
+  // none are earlier, thus specifying last time as the search criteria to be
+  // before the last region.
+  vtkIdType npts, *pts;
+  vtkVgTimeStamp timeStamp(true);
+  event->GetClosestDisplayRegion(timeStamp, npts, pts);
+  if (npts == 0)
+    {
+    // If no region, don't allow setting of start time
+    return;
+    }
+  if (ts < timeStamp)
+    {
+    // Clamp requested end time to no earlier than last region
+    ts = timeStamp;
+    }
+
+  if (event->GetEndFrame() != ts)
+    {
+    model->Modified();
+    event->SetEndFrame(ts);
+    d->notifyEventModified(event);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::startFollowingTrack(vtkIdType trackId)
+{
+  QTE_D(vsCore);
+  d->FollowedTrackId = trackId;
+  d->FollowedTrackTimeStamp.Time = vgTimeStamp::InvalidTime();
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::stopFollowingTrack()
+{
+  QTE_D(vsCore);
+  d->FollowedTrackId = -1;
+}
+
+//-----------------------------------------------------------------------------
+static inline bool updateGetQfDataProgress(
+  QProgressDialog& dialog, int& itemsProcessed, bool* canceled)
+{
+  if ((++itemsProcessed % 50) == 0)
+    {
+    dialog.setValue(itemsProcessed);
+    if (dialog.wasCanceled())
+      {
+      canceled && (*canceled = true);
+      return false;
+      }
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vsCore::getQueryFormulationData(
+  vtkVgTimeStamp start, vtkVgTimeStamp end, QList<vvTrack>& tracks,
+  QList<vvDescriptor>& descriptors, bool* canceled)
+{
+  QTE_D(vsCore);
+
+  const int totalItems = d->Tracks.count() + d->Descriptors.count();
+  int itemsProcessed = 0;
+  QProgressDialog progressDlg;
+  progressDlg.setLabelText("Preparing data for query formulation...");
+  progressDlg.setRange(0, totalItems);
+  progressDlg.show();
+  if (!canceled)
+    {
+    // If caller is not paying attention to cancellation, do not allow user to
+    // cancel the operation
+    progressDlg.setCancelButton(0);
+    }
+
+  // Find tracks (at least partly) within the time span
+  foreach (const vvTrack& track, d->Tracks)
+    {
+    if (!track.Trajectory.empty() &&
+        track.Trajectory.begin()->TimeStamp < end &&
+        start < track.Trajectory.rbegin()->TimeStamp)
+      {
+      // We have a winner
+      tracks.append(track);
+      }
+
+    // Update progress
+    CHECK_ARG(
+      updateGetQfDataProgress(progressDlg, itemsProcessed, canceled));
+    }
+
+  // Find descriptors (at least partly) within the time span
+  foreach (const vvDescriptor* descriptor, d->Descriptors)
+    {
+    if (!descriptor->Region.empty() &&
+        descriptor->Region.begin()->TimeStamp < end &&
+        start < descriptor->Region.rbegin()->TimeStamp)
+      {
+      // We have a winner
+      descriptors.append(*descriptor);
+      }
+
+    // Update progress
+    CHECK_ARG(
+      updateGetQfDataProgress(progressDlg, itemsProcessed, canceled));
+    }
+}
+
+//-----------------------------------------------------------------------------
+std::map<vtkVgTimeStamp, vtkVgVideoMetadata> vsCore::allMetadata()
+{
+  QTE_D(vsCore);
+
+  return d->VideoMetadata;
+}
diff --git a/Libraries/VspUserInterface/vsCore.h b/Libraries/VspUserInterface/vsCore.h
new file mode 100644
index 00000000..48f3363f
--- /dev/null
+++ b/Libraries/VspUserInterface/vsCore.h
@@ -0,0 +1,236 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsCore_h
+#define __vsCore_h
+
+#include <QObject>
+#include <QList>
+#include <QHash>
+#include <QMap>
+#include <QSet>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vtkVgTimeStamp.h>
+
+#include <vtkVgVideoFrameMetaData.h>
+
+#include <vsDataSource.h>
+#include <vsDescriptor.h>
+#include <vsDescriptorInput.h>
+#include <vsEvent.h>
+#include <vsEventInfo.h>
+#include <vsSourceFactory.h>
+#include <vsTrackClassifier.h>
+#include <vsTrackData.h>
+
+#include "vsAlert.h"
+#include "vsContourWidget.h"
+
+class QStringList;
+
+class vgSwatchCache;
+
+class vtkVgEvent;
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+class vtkVgTrack;
+class vtkVgTrackModel;
+struct vtkVgVideoMetadata;
+
+
+class vsDescriptorSource;
+class vsTrackSource;
+class vsVideoSource;
+
+class vsCorePrivate;
+
+class VSP_USERINTERFACE_EXPORT vsCore : public QObject
+{
+  Q_OBJECT
+
+public:
+  enum FilterIds
+    {
+    GroundTruth = -10000
+    };
+
+  enum ModelType
+    {
+    NormalModel,
+    GroundTruthModel
+    };
+
+  vsCore(QObject* parent = 0);
+  ~vsCore();
+
+  vsVideoSource* videoSource() const;
+  vsDataSource::Status videoSourceStatus() const;
+  QString videoSourceText() const;
+  QString videoSourceToolTip() const;
+
+  vsDataSource::Status trackSourceStatus(int sourceIndex) const;
+  QString trackSourceText(int sourceIndex) const;
+  QString trackSourceToolTip(int sourceIndex) const;
+
+  vsDataSource::Status descriptorSourceStatus(int sourceIndex) const;
+  QString descriptorSourceText(int sourceIndex) const;
+  QString descriptorSourceToolTip(int sourceIndex) const;
+
+  vsDescriptorInput::Types acceptedInputs() const;
+
+  void addModel(vtkVgTrackModel*, ModelType type = NormalModel);
+  void addModel(vtkVgEventModel*, ModelType type = NormalModel);
+
+  vtkVgEventTypeRegistry* eventTypeRegistry();
+  QList<vsEventInfo> manualEventTypes() const;
+  const vgSwatchCache& swatchCache() const;
+
+  bool isGroundTruthDataPresent() const;
+  bool isEventGroupExpected(vsEventInfo::Group group) const;
+
+  QStringList dynamicDataSets();
+
+  int createContourId();
+
+  vtkVgTimeStamp homographyReferenceTime(unsigned int frameNumber,
+                                         vtkVgTimeStamp bestGuess) const;
+
+  vvTrackId logicalTrackId(vtkIdType modelTrackId) const;
+
+  vtkIdType modelEventId(vsDescriptorSource* source, vtkIdType sourceId) const;
+
+  void getQueryFormulationData(vtkVgTimeStamp start, vtkVgTimeStamp end,
+                               QList<vvTrack>& tracks,
+                               QList<vvDescriptor>& descriptors,
+                               bool* canceled);
+  std::map<vtkVgTimeStamp, vtkVgVideoMetadata> allMetadata();
+
+signals:
+  void updated();
+  void statusMessageAvailable(QString message);
+
+  void videoSourceStatusChanged(vsDataSource::Status);
+  void trackSourceStatusChanged(vsDataSource::Status);
+  void descriptorSourceStatusChanged(vsDataSource::Status);
+
+  void videoSourceChanged(vsVideoSource*);
+  void videoTimeRangeAvailableUpdated(vtkVgTimeStamp first,
+                                      vtkVgTimeStamp last);
+
+  void eventGroupExpected(vsEventInfo::Group);
+
+  void eventAdded(vtkVgEvent*);
+  void eventChanged(vtkVgEvent*);
+  void eventRatingChanged(vtkVgEvent*, int newRating);
+  void eventStatusChanged(vtkVgEvent*, int newStatus);
+  void eventNoteChanged(vtkVgEvent*, QString newNote);
+  void eventRemoved(vtkIdType);
+
+  void trackAdded(vtkVgTrack*);
+  void trackChanged(vtkVgTrack*);
+
+  void contourAdded(vsContour);
+  void contourTypeChanged(int id, vsContour::Type);
+  void contourNameChanged(int id, QString);
+  void contourPointsChanged(int id, QPolygonF);
+  void contourRemoved(int id);
+
+  void userEventTypeAdded(int id, vsEventInfo, double initialThreshold);
+  void manualEventTypesUpdated(QList<vsEventInfo>);
+  void manualEventCreated(vtkIdType);
+
+  void alertAdded(int id, vsAlert);
+  void alertChanged(int id, vsAlert);
+  void alertMatchesChanged(int id, int matches);
+  void alertEnabledChanged(int id, bool enabled);
+  void alertRemoved(int id, bool unregister);
+
+  void acceptedInputsChanged(vsDescriptorInput::Types);
+
+  void    metaDataAvailable(qint64 id, vsDescriptorInputPtr input);
+  void         trackUpdated(qint64 id, vsDescriptorInputPtr input);
+  void          trackClosed(qint64 id, vsDescriptorInputPtr input);
+  void         tocAvailable(qint64 id, vsDescriptorInputPtr input);
+  void       eventAvailable(qint64 id, vsDescriptorInputPtr input);
+  void eventRatingAvailable(qint64 id, vsDescriptorInputPtr input);
+  void   eventNoteAvailable(qint64 id, vsDescriptorInputPtr input);
+  void     contourAvailable(qint64 id, vsDescriptorInputPtr input);
+  void       queryAvailable(qint64 id, vsDescriptorInputPtr input);
+
+  void   eventRevoked(qint64 id, bool removeEvents);
+  void contourRevoked(qint64 id, bool removeEvents);
+  void   queryRevoked(qint64 id, bool removeEvents);
+
+  void followedTrackStateAvailable(vgTimeStamp, vgGeocodedCoordinate);
+
+public slots:
+  void addContour(vsContour);
+  bool setContourName(int, QString);
+  bool setContourType(int, vsContour::Type);
+  bool removeContour(int, bool removeEvents = true);
+  bool convertContourToEvent(int, int eventType, vtkVgTimeStamp);
+
+  void createManualEvent(int eventType, QPolygonF region, vtkVgTimeStamp);
+
+  void setEventRating(vtkIdType, int rating);
+  void setEventStatus(vtkIdType, int status);
+  void setEventNote(vtkIdType, QString note);
+
+  void setEventStart(vtkIdType, vtkVgTimeStamp);
+  void setEventEnd(vtkIdType, vtkVgTimeStamp);
+
+  bool addAlert(vsAlert);
+  void updateAlert(int id, vsAlert);
+  void setAlertEnabled(int id, bool enabled);
+  void removeAlert(int id, bool removeEvents = true);
+
+  void addSources(vsSourceFactoryPtr);
+
+  void startFollowingTrack(vtkIdType trackId);
+  void stopFollowingTrack();
+
+protected slots:
+  void addMetadata(QList<vtkVgVideoFrameMetaData> metadata);
+
+  void updateTrackSourceStatus(vsDataSource::Status);
+  void unregisterTrackSource(vsTrackSource*);
+  void updateTrack(vvTrackId trackId, vvTrackState state);
+  void updateTrack(vvTrackId trackId, QList<vvTrackState> state);
+  void updateTrackData(vvTrackId trackId, vsTrackData data);
+  void closeTrack(vvTrackId trackId);
+
+  void updateDescriptorSourceStatus(vsDataSource::Status);
+  void unregisterDescriptorSource(vsDescriptorSource*);
+  void connectDescriptorInputs(vsDescriptorSource*);
+
+  void expectEventGroup(vsEventInfo::Group group);
+  void addEventType(vsDescriptorSource*, vsEventInfo,
+                    double initialThreshold);
+
+  void addDescriptor(vsDescriptorSource*, vsDescriptor);
+  void addDescriptors(vsDescriptorSource*, vsDescriptorList);
+  void addEvent(vsDescriptorSource*, vsEvent);
+  void removeEvent(vsDescriptorSource*, vtkIdType);
+  void setTrackClassification(vvTrackId trackId, vsTrackObjectClassifier toc);
+
+  void flushUpdateSignals();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsCore)
+
+  void registerEventType(const vsEventInfo&, bool isManualType = false);
+  void unregisterEventType(int);
+
+private:
+  QTE_DECLARE_PRIVATE(vsCore)
+  Q_DISABLE_COPY(vsCore)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsCorePrivate.cxx b/Libraries/VspUserInterface/vsCorePrivate.cxx
new file mode 100644
index 00000000..650a8877
--- /dev/null
+++ b/Libraries/VspUserInterface/vsCorePrivate.cxx
@@ -0,0 +1,1244 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsCorePrivate.h"
+
+#include <QDir>
+#include <QFileInfo>
+#include <QSettings>
+
+#include <qtMap.h>
+#include <qtStlUtil.h>
+
+#include <vtkPoints.h>
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgScalars.h>
+#include <vtkVgTrack.h>
+#include <vtkVgUtil.h>
+
+#include <vtkVgEventModel.h>
+#include <vtkVgEventModelCollection.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackModelCollection.h>
+
+#include <vgDebug.h>
+
+#include <vsDescriptorSource.h>
+#include <vsTrackSource.h>
+#include <vsTrackState.h>
+#include <vsVideoSource.h>
+#include <vtkVsTrackInfo.h>
+
+#include "vsAlertEditor.h"
+#include "vsTrackInfo.h"
+#include "vsTripwireDescriptor.h"
+
+//-----------------------------------------------------------------------------
+vsCorePrivate::vsCorePrivate(vsCore* q)
+  : CollectedDescriptorInputs(vsDescriptorInput::NoType),
+    NextInputId(0),
+    NextTrackId(0),
+    NextEventId(0),
+    NextRawEventId(0),
+    NextContourId(1),
+    NextAlertType(vsEventInfo::QueryAlert),
+    NextUserType(vsEventInfo::UserType),
+    GroundTruthDataPresent(false),
+    PersistentAlertsLoaded(false),
+    FollowedTrackId(-1),
+    q_ptr(q)
+{
+  this->EventModel->GetInternalEventModel()->SetTrackModel(
+    this->TrackModel->GetInternalTrackModel());
+  this->GroundTruthEventModel->GetInternalEventModel()->SetTrackModel(
+    this->GroundTruthTrackModel->GetInternalTrackModel());
+}
+
+//-----------------------------------------------------------------------------
+vsCorePrivate::~vsCorePrivate()
+{
+  QTE_Q(vsCore);
+
+  qDeleteAll(this->Descriptors);
+
+  // Explicitly release all sources... this prevents us from processing their
+  // destroyed() events after we have been deleted
+  if (this->VideoSource)
+    {
+    q->disconnect(this->VideoSource.data());
+    this->VideoSource.clear();
+    }
+  foreach (vsTrackSourcePtr ts, this->TrackSources)
+    {
+    q->disconnect(ts.data());
+    }
+  this->TrackSources.clear();
+  foreach (vsDescriptorSourcePtr ds, this->DescriptorSources)
+    {
+    q->disconnect(ds.data());
+    }
+  this->DescriptorSources.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::registerEventType(const vsEventInfo& ei, bool isManualType)
+{
+  QTE_Q(vsCore);
+
+  // Check if type is already registered
+  int index = this->EventTypeRegistry->GetTypeIndex(ei.type);
+  if (index >= 0)
+    {
+    // If so, updating the type information
+    this->EventTypeRegistry->SetType(index, ei.toVgEventType());
+    if (isManualType)
+      {
+      const int index = this->ManualEventTypesMap[ei.type];
+      this->ManualEventTypes[index] = ei;
+      emit q->manualEventTypesUpdated(this->ManualEventTypes);
+      }
+    }
+  else
+    {
+    // Otherwise, add it
+    this->EventTypeRegistry->AddType(ei.toVgEventType());
+    if (isManualType)
+      {
+      this->ManualEventTypesMap.insert(ei.type, this->ManualEventTypes.count());
+      this->ManualEventTypes.append(ei);
+      emit q->manualEventTypesUpdated(this->ManualEventTypes);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::loadPersistentAlerts()
+{
+  QTE_Q(vsCore);
+
+  QSettings settings;
+  QStringList filePaths;
+  QStringList paths = settings.value("PersistentAlerts").toStringList();
+
+  vsAlertEditor editor;
+
+  foreach (QString path, paths)
+    {
+    this->findAndStorePossibleAlerts(path, filePaths);
+    }
+
+  foreach (QString filePath, filePaths)
+    {
+    if (editor.loadAlert(filePath))
+      {
+      q->addAlert(editor.alert());
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::findAndStorePossibleAlerts(
+  QString path, QStringList& filePaths)
+{
+  QFileInfo info(path);
+  if (info.isDir())
+    {
+    QDir dir(path);
+    dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks
+                  | QDir::NoDot | QDir::NoDotDot);
+    QFileInfoList list = dir.entryInfoList();
+    for (int i = 0; i < list.size(); ++i)
+      {
+      QFileInfo fileInfo = list.at(i);
+      if (fileInfo.isDir())
+        {
+        findAndStorePossibleAlerts(fileInfo.canonicalFilePath(), filePaths);
+        }
+      else
+        {
+        filePaths.push_back(fileInfo.canonicalFilePath());
+        }
+      }
+    }
+  else
+    {
+    filePaths.push_back(path);
+    }
+}
+
+//-----------------------------------------------------------------------------
+#define CONNECT_SOURCE(_signal, _otype, _oname, _params) \
+  q->connect(sourcePtr, SIGNAL(_signal _params), q, _otype(_oname _params))
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::setVideoSource(vsVideoSourcePtr source)
+{
+  QTE_Q(vsCore);
+
+  // Swap our internal source reference with the new source, so that the old
+  // source (which may be held as a bare pointer by anyone listening to
+  // vsCore::videoSourceChanged) is not destroyed until said listeners have a
+  // chance to switch over to the new source
+  this->VideoSource.swap(source);
+  vsVideoSource* sourcePtr = this->VideoSource.data();
+
+  // Clear all existing tracks, events, contours, etc.
+  // \TODO
+  this->NextTrackId = 0;
+  this->NextEventId = 0;
+  this->NextRawEventId = 0;
+  this->LastHomographyTimestamp.Reset();
+
+  CONNECT_SOURCE(statusChanged, SIGNAL, videoSourceStatusChanged,
+                 (vsDataSource::Status));
+  CONNECT_SOURCE(frameRangeAvailable, SIGNAL, videoTimeRangeAvailableUpdated,
+                 (vtkVgTimeStamp, vtkVgTimeStamp));
+  CONNECT_SOURCE(metadataAvailable, SLOT, addMetadata,
+                 (QList<vtkVgVideoFrameMetaData>));
+
+  emit q->videoSourceChanged(sourcePtr);
+
+  sourcePtr->start();
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::addTrackSource(vsTrackSourcePtr source)
+{
+  QTE_Q(vsCore);
+
+  this->TrackSources.append(source);
+
+  vsTrackSource* sourcePtr = source.data();
+  CONNECT_SOURCE(trackUpdated, SLOT, updateTrack,
+                 (vvTrackId, vvTrackState));
+  CONNECT_SOURCE(trackUpdated, SLOT, updateTrack,
+                 (vvTrackId, QList<vvTrackState>));
+  CONNECT_SOURCE(trackDataUpdated, SLOT, updateTrackData,
+                 (vvTrackId, vsTrackData));
+  CONNECT_SOURCE(trackClosed, SLOT, closeTrack,
+                 (vvTrackId));
+  CONNECT_SOURCE(statusChanged, SLOT, updateTrackSourceStatus,
+                 (vsDataSource::Status));
+  CONNECT_SOURCE(destroyed, SLOT, unregisterTrackSource,
+                 (vsTrackSource*));
+
+  source->start();
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::addDescriptorSource(vsDescriptorSourcePtr source)
+{
+  QTE_Q(vsCore);
+
+  this->DescriptorSources.append(source);
+
+  vsDescriptorSource* sourcePtr = source.data();
+  CONNECT_SOURCE(readyForInput, SLOT, connectDescriptorInputs,
+                 (vsDescriptorSource*));
+  CONNECT_SOURCE(eventGroupExpected, SLOT, expectEventGroup,
+                 (vsEventInfo::Group));
+  CONNECT_SOURCE(eventTypeAvailable, SLOT, addEventType,
+                 (vsDescriptorSource*, vsEventInfo, double));
+  CONNECT_SOURCE(descriptorAvailable, SLOT, addDescriptor,
+                 (vsDescriptorSource*, vsDescriptor));
+  CONNECT_SOURCE(descriptorsAvailable, SLOT, addDescriptors,
+                 (vsDescriptorSource*, vsDescriptorList));
+  CONNECT_SOURCE(eventAvailable, SLOT, addEvent,
+                 (vsDescriptorSource*, vsEvent));
+  CONNECT_SOURCE(eventRevoked, SLOT, removeEvent,
+                 (vsDescriptorSource*, vtkIdType));
+  CONNECT_SOURCE(tocAvailable, SLOT, setTrackClassification,
+                 (vvTrackId, vsTrackObjectClassifier));
+  CONNECT_SOURCE(statusChanged, SLOT, updateDescriptorSourceStatus,
+                 (vsDataSource::Status));
+  CONNECT_SOURCE(destroyed, SLOT, unregisterDescriptorSource,
+                 (vsDescriptorSource*));
+
+  source->start();
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::connectDescriptorInputs(vsDescriptorSource* source)
+{
+  // Connect descriptor inputs to core descriptor-input outputs
+  vsDescriptorInput::Types inputs = source->inputAccepted();
+  this->connectInput(
+    source, inputs, vsDescriptorInput::FrameMetaData,
+    SIGNAL(metaDataAvailable(qint64, vsDescriptorInputPtr)));
+  this->connectInput(
+    source, inputs, vsDescriptorInput::TrackUpdate,
+    SIGNAL(trackUpdated(qint64, vsDescriptorInputPtr)));
+  this->connectInput(
+    source, inputs, vsDescriptorInput::TrackClosure,
+    SIGNAL(trackClosed(qint64, vsDescriptorInputPtr)));
+  this->connectInput(
+    source, inputs, vsDescriptorInput::TrackObjectClassifier,
+    SIGNAL(tocAvailable(qint64, vsDescriptorInputPtr)));
+  this->connectInput(
+    source, inputs, vsDescriptorInput::Event,
+    SIGNAL(eventAvailable(qint64, vsDescriptorInputPtr)),
+    SIGNAL(eventRevoked(qint64, bool)));
+  this->connectInput(
+    source, inputs, vsDescriptorInput::EventRating,
+    SIGNAL(eventRatingAvailable(qint64, vsDescriptorInputPtr)));
+  this->connectInput(
+    source, inputs, vsDescriptorInput::EventNote,
+    SIGNAL(eventNoteAvailable(qint64, vsDescriptorInputPtr)));
+  this->connectInput(
+    source, inputs, vsDescriptorInput::Contour,
+    SIGNAL(contourAvailable(qint64, vsDescriptorInputPtr)),
+    SIGNAL(contourRevoked(qint64, bool)));
+  this->connectInput(
+    source, inputs, vsDescriptorInput::Query,
+    SIGNAL(queryAvailable(qint64, vsDescriptorInputPtr)),
+    SIGNAL(queryRevoked(qint64, bool)));
+
+  // Update merged accepted descriptor inputs
+  this->DescriptorInputs[source] = inputs;
+  this->updateDescriptorInputs();
+
+  // Re-emit historic inputs
+  foreach_iter (InputMap::const_iterator, iter, this->InputHistory)
+    {
+    if (inputs.testFlag(iter.value()->type()))
+      {
+      QMetaObject::invokeMethod(source, "injectInput",
+                                Q_ARG(qint64, iter.key()),
+                                Q_ARG(vsDescriptorInputPtr, iter.value()));
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::connectInput(
+  vsDescriptorSource* source,
+  vsDescriptorInput::Types mask,
+  vsDescriptorInput::Type type,
+  const char* injectSignal,
+  const char* revokeSignal)
+{
+  if (mask.testFlag(type))
+    {
+    QTE_Q(vsCore);
+
+    q->connect(q, injectSignal, source,
+               SLOT(injectInput(qint64, vsDescriptorInputPtr)));
+    if (revokeSignal)
+      {
+      q->connect(q, revokeSignal, source,
+                 SLOT(revokeInput(qint64, bool)));
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+qint64 vsCorePrivate::emitInput(InputSignal signal, vsDescriptorInput* input)
+{
+  QTE_Q(vsCore);
+
+  // Create input
+  qint64 inputId = this->NextInputId++;
+  vsDescriptorInputPtr inputPtr(input);
+
+  // Add to input history
+  this->InputHistory.insert(inputId, inputPtr);
+
+  // Emit input
+  emit (q->*signal)(inputId, inputPtr);
+
+  // Return ID of input
+  return inputId;
+}
+
+//-----------------------------------------------------------------------------
+qint64 vsCorePrivate::emitInput(const vsContour& contour)
+{
+  // If we are going to be creating a tripwire, make sure the descriptor exists
+  if (contour.type() == vsContour::Tripwire)
+    this->createTripwireDescriptor();
+
+  // Emit input
+  return this->emitInput(&vsCore::contourAvailable,
+                         new vsDescriptorInput(contour));
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::revokeInput(
+  RevokeInputSignal signal, qint64 inputId, bool revokeEvents)
+{
+  QTE_Q(vsCore);
+
+  // Emit input revocation and remove from input history
+  emit (q->*signal)(inputId, revokeEvents);
+  this->InputHistory.remove(inputId);
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::mappedRevokeInput(
+  qint64 inputId, RevokeInputSignal signal, bool revokeEvents)
+{
+  this->revokeInput(signal, inputId, revokeEvents);
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::updateDescriptorInputs()
+{
+  vsDescriptorInput::Types collectedInputs = vsDescriptorInput::NoType;
+  foreach (vsDescriptorInput::Types input, this->DescriptorInputs.values())
+    collectedInputs |= input;
+
+  if (collectedInputs != this->CollectedDescriptorInputs)
+    {
+    QTE_Q(vsCore);
+
+    this->CollectedDescriptorInputs = collectedInputs;
+    emit q->acceptedInputsChanged(collectedInputs);
+
+    if (!this->PersistentAlertsLoaded
+        && collectedInputs.testFlag(vsDescriptorInput::Query))
+      {
+      this->loadPersistentAlerts();
+      this->PersistentAlertsLoaded = true;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::expectEventGroup(vsEventInfo::Group group)
+{
+  QTE_Q(vsCore);
+  this->ExpectedEventGroups.insert(group);
+  emit q->eventGroupExpected(group);
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::createTripwireDescriptor()
+{
+  if (!this->TripwireDescriptor)
+    {
+    this->TripwireDescriptor =
+      vsDescriptorSourcePtr(new vsTripwireDescriptor);
+    this->addDescriptorSource(this->TripwireDescriptor);
+    }
+  this->expectEventGroup(vsEventInfo::General);
+}
+
+//-----------------------------------------------------------------------------
+bool vsCorePrivate::setContourType(ContourInfo& info, vsContour::Type newType)
+{
+  vsContour::Type currentType = info.contour.type();
+
+  // Anything to do?
+  if (currentType != newType)
+    {
+    QTE_Q(vsCore);
+
+    // Force contour closed, if required by new type
+    QPolygonF points = info.contour.points();
+    if (!points.isClosed() && vsContour::isLoopType(newType))
+      {
+      if (points.count() < 3)
+        {
+        // Not enough points to change type
+        emit q->statusMessageAvailable("Not enough points in region");
+        return false;
+        }
+
+      // Update points
+      points.append(points.front());
+      info.contour.setPoints(points);
+
+      // Notify scenes of changes
+      emit q->contourPointsChanged(info.contour.id(), points);
+      }
+
+    // Update the type
+    info.contour.setType(newType);
+
+    // Reissue to descriptors
+    this->revokeInput(&vsCore::contourRevoked, info.inputId, true);
+    info.inputId = this->emitInput(info.contour);
+
+    // Notify scenes of changes
+    emit q->contourTypeChanged(info.contour.id(), newType);
+    emit q->updated();
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vvTrack& vsCorePrivate::getVvTrack(const vvTrackId& trackId)
+{
+  if (!this->Tracks.contains(trackId))
+    {
+    vvTrack newTrack;
+    newTrack.Id = trackId;
+    this->Tracks.insert(trackId, newTrack);
+    }
+
+  return this->Tracks[trackId];
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack* vsCorePrivate::track(const vvTrackId& trackId)
+{
+  // Select appropriate model
+  vtkVgTrackModelCollection* trackModel = this->TrackModel;
+  if (trackId.Source == vsTrackInfo::GroundTruthSource)
+    {
+    this->GroundTruthDataPresent = true;
+    trackModel = this->GroundTruthTrackModel;
+    }
+
+  // Return track, if it has been created already
+  if (this->TrackModelIdMap.contains(trackId))
+    return trackModel->GetTrack(this->TrackModelIdMap.value(trackId));
+
+  // Track does not exist; assign a new model ID...
+  vtkIdType trackModelId = this->NextTrackId++;
+  this->TrackModelIdMap.insert(trackId, trackModelId);
+  this->TrackLogicalIdMap.insert(trackModelId, trackId);
+
+  // ...and create a new track
+  vtkVgTrack* track = vtkVgTrack::New();
+  track->SetId(trackModelId);
+  QString name =
+    QString("T %1:%2").arg(trackId.Source).arg(trackId.SerialNumber);
+  track->SetName(qPrintable(name));
+  trackModel->AddTrack(track);
+  track->SetPoints(trackModel->GetInternalTrackModel()->GetPoints());
+  track->FastDelete();
+  this->flushDeferredEvents();
+
+  // Return newly created track
+  return track;
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::deferTrackUpdate(
+  const vvTrackId& trackId, const vvTrackState& state)
+{
+  if (!this->DeferredTrackUpdates.contains(trackId))
+    this->DeferredTrackUpdates.insert(trackId, DeferredTrackUpdate());
+
+  DeferredTrackUpdate& tu = this->DeferredTrackUpdates[trackId];
+  if (tu.updates.isEmpty() || tu.updates.last() < state)
+    {
+    tu.updates.append(state);
+    }
+  else
+    {
+    tu.updates.insert(
+      qLowerBound(tu.updates.begin(), tu.updates.end(), state), state);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::flushDeferredTrackUpdates(const vtkVgTimeStamp& ts)
+{
+  if (!this->LastHomographyTimestamp.IsValid()
+      || this->LastHomographyTimestamp < ts)
+    {
+    this->LastHomographyTimestamp = ts;
+    }
+
+  // Flush any deferred updates that are older than the latest homography we
+  // have received
+  foreach (vvTrackId tid, this->DeferredTrackUpdates.keys())
+    {
+    QList<vvTrackState> states;
+    DeferredTrackUpdate& tu = this->DeferredTrackUpdates[tid];
+    while (!tu.updates.isEmpty()
+           && tu.updates.first().TimeStamp < this->LastHomographyTimestamp)
+      {
+      states.append(tu.updates.takeFirst());
+      }
+    this->updateTrack(tid, states);
+    if (tu.updates.isEmpty())
+      {
+      bool closed = tu.closed;
+      this->DeferredTrackUpdates.remove(tid);
+      if (closed)
+        this->closeTrack(tid);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::updateTrack(
+  const vvTrackId& trackId, const QList<vvTrackState>& states)
+{
+  QTE_Q(vsCore);
+
+  vtkVgTrack* track = 0;
+  vvTrack& vvTrack = this->getVvTrack(trackId);
+  bool stateAccepted = false;
+  bool isFirstPoint = false;
+  foreach (const vvTrackState& state, states)
+    {
+    // Always accept the state for our internal vvTrack (used for QF), as we
+    // don't need to do anything to the state for those
+    vvTrack.Trajectory.insert(state);
+
+    // Try to find a homography for this track state
+    HomographyMapIterator iter =
+      this->HomographyMap.constFind(state.TimeStamp, vg::SeekNearest);
+    HomographyMapIterator notFound = this->HomographyMap.constEnd();
+
+    // If no match was found...
+    if (iter == notFound || iter.key() != state.TimeStamp)
+      {
+      // ...and we have not yet seen homographies later than this state, defer
+      // the update in the hope that we will receive the needed homography at a
+      // later time
+      if (!this->LastHomographyTimestamp.IsValid()
+          || this->LastHomographyTimestamp < state.TimeStamp)
+        {
+        // Defer the update
+        this->deferTrackUpdate(trackId, state);
+        continue;
+        }
+
+      // Otherwise, check if our 'nearest' match is good enough... we'll accept
+      // a homography for a time that is off by less than expected gap between
+      // frames, e.g. to compensate for rounding errors
+      double delta = 1e100;
+      if (iter != notFound && iter.key().HasTime()
+          && state.TimeStamp.HasTime())
+        {
+        delta = fabs(iter.key().Time - state.TimeStamp.Time);
+        }
+      if (delta > 1e3) // 10 ms
+        {
+        // We've already seen later homographies, and don't have a "close
+        // enough" match... nothing more we can do...
+        // TODO: Given we can get things from streaming sources out of order,
+        //       we really should also force some sort of time-based delay
+        //       before giving up
+        qWarning() << "warning: no homography available for time"
+                   << state.TimeStamp << "- track state has been discarded";
+        continue;
+        }
+      }
+
+    stateAccepted = true;
+    vsTrackState wstate;
+    wstate.time = state.TimeStamp;
+
+    // Use homography to get stabilized coordinates from image coordinates
+    const vtkMatrix4x4& homography = iter.value();
+    QVector<float> object;
+    double wp[2];
+    for (size_t n = 0; n < state.ImageObject.size(); ++n)
+      {
+      const vvImagePointF& ip = state.ImageObject[n];
+      vtkVgApplyHomography(ip.X, ip.Y, homography, wp);
+      object.append(wp[0]); object.append(wp[1]); object.append(0.0f);
+      wstate.object.append(QPointF(wp[0], wp[1]));
+      }
+    vtkVgApplyHomography(state.ImagePoint.X, state.ImagePoint.Y,
+                         homography, wp);
+    wstate.point = QPointF(wp[0], wp[1]);
+
+    // Accept the update
+    track || (track = this->track(trackId));
+    isFirstPoint = isFirstPoint || !track->GetStartFrame().IsValid();
+    track->SetPoint(state.TimeStamp, wp, vtkVgGeoCoord(), object.count() / 3,
+                    object.data());
+    this->emitInput(&vsCore::trackUpdated,
+                    new vsDescriptorInput(trackId, wstate));
+
+    // If we're "following" a track and the id of this track matches the
+    // "followed track", emit updated coordinates
+    if (track->GetId() == this->FollowedTrackId)
+      {
+      if (!this->FollowedTrackTimeStamp.IsValid() ||
+           state.TimeStamp > this->FollowedTrackTimeStamp)
+        {
+        this->FollowedTrackTimeStamp = state.TimeStamp;
+
+        QMap<vgTimeStamp, vtkVgVideoFrameMetaData>::const_iterator iter =
+          this->VideoFrameMetadata.find(this->FollowedTrackTimeStamp);
+        if (iter != this->VideoFrameMetadata.end() && // How could it == end?
+            iter.value().AreCornerPointsValid())
+          {
+          vtkSmartPointer<vtkMatrix4x4> imageToLatLonMatrix =
+            iter.value().MakeImageToLatLonMatrix();
+          if (imageToLatLonMatrix)
+            {
+            vgGeocodedCoordinate geoCoord;
+            geoCoord.GCS = iter.value().WorldLocation.GCS;
+            vtkVgApplyHomography(state.ImagePoint.X,
+                                 iter.value().Height - state.ImagePoint.Y,
+                                 imageToLatLonMatrix,
+                                 geoCoord.Longitude, geoCoord.Latitude);
+            emit q->followedTrackStateAvailable(state.TimeStamp, geoCoord);
+            }
+          }
+        }
+      }
+    }
+
+  if (stateAccepted)
+    {
+    QTE_Q(vsCore);
+
+    // Notify observers that a track has been created or updated
+    this->postTrackUpdateSignal(
+      track, isFirstPoint ? &vsCore::trackAdded : &vsCore::trackChanged);
+    emit q->updated();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::updateTrackData(const vvTrackId &trackId,
+                                    const vsTrackData& data)
+{
+  QTE_Q(vsCore);
+
+  vtkVgTrack* track = this->track(trackId);
+
+  // Loop over data sets
+  foreach_iter(vsTrackData::const_iterator, dataItem, data)
+    {
+    // Check if scalars already exists
+    vtkSmartPointer<vtkVgScalars> scalars =
+      track->GetScalars(stdString(dataItem.key()));
+    if(!scalars)
+      {
+      // No; create new one
+      scalars = vtkSmartPointer<vtkVgScalars>::New();
+      track->SetScalars(stdString(dataItem.key()), scalars);
+      }
+    // Add data
+    scalars->InsertValues(dataItem.value());
+    }
+
+  emit q->updated();
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::closeTrack(const vvTrackId& trackId)
+{
+  QTE_Q(vsCore);
+
+  this->track(trackId)->Close();
+  this->emitInput(&vsCore::trackClosed,
+                  new vsDescriptorInput(trackId));
+
+  emit q->updated();
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::postTrackUpdateSignal(
+  vtkVgTrack* track, vsCorePrivate::TrackUpdateSignal signal)
+{
+  // If we haven't already, queue an event to flush pending signals
+  if (this->PendingTrackUpdateSignals.isEmpty())
+    {
+    QTE_Q(vsCore);
+    QMetaObject::invokeMethod(q, "flushUpdateSignals", Qt::QueuedConnection);
+    }
+
+  if (!this->PendingTrackUpdateSignals.contains(track))
+    {
+    // Only insert signal if one doesn't already exist... this will both merge
+    // updates, and (because we don't check what signal, and will always see
+    // 'added' first) will collapse 'added' and 'changed' into just 'added'
+    this->PendingTrackUpdateSignals.insert(track, signal);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::removeDescriptorSource(vsDescriptorSource* source)
+{
+  QTE_Q(vsCore);
+
+  vsDescriptorSourceIterator iter = this->DescriptorSources.begin();
+  while (iter != this->DescriptorSources.end())
+    {
+    if (*iter == source)
+      {
+      iter = this->DescriptorSources.erase(iter);
+      emit q->descriptorSourceStatusChanged(vsDataSource::NoSource);
+      }
+    else
+      {
+      ++iter;
+      }
+    }
+
+  if (source == this->TripwireDescriptor)
+    this->TripwireDescriptor.clear();
+
+  this->DescriptorInputs.remove(source);
+  this->updateDescriptorInputs();
+}
+
+//-----------------------------------------------------------------------------
+bool vsCorePrivate::areEventTracksPresent(const vsEvent& event)
+{
+  int n = event->GetNumberOfTracks();
+  while (n--)
+    {
+    vtkVsTrackInfo* ti = vtkVsTrackInfo::SafeDownCast(event->GetTrackInfo(n));
+    if (!ti || !this->TrackModelIdMap.contains(ti->VvTrackId))
+      return false;
+    }
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::deferEventRegion(
+  vtkVgEvent* event, const vtkVgTimeStamp& ts, const QPolygonF& region)
+{
+  // Find the model to which the event belongs
+  vtkIdType eventId = event->GetId();
+  vtkVgEventModelCollection* model = this->EventModel;
+  if (event != model->GetEvent(eventId))
+    {
+    model = this->GroundTruthEventModel;
+    if (event != model->GetEvent(eventId))
+      {
+      qWarning() << "warning: in vsCorePrivate::deferEventRegion:"
+                    "unable to determine model for event" << eventId
+                 << "- event region has been discarded";
+      return;
+      }
+    }
+
+  DeferredEventRegion er(model, eventId);
+  er.time = ts;
+  er.region = region;
+  this->DeferredEventRegions.insert(ts, er);
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::flushDeferredEventRegions(const vtkVgTimeStamp& ts)
+{
+  if (!this->LastHomographyTimestamp.IsValid()
+      || this->LastHomographyTimestamp < ts)
+    {
+    this->LastHomographyTimestamp = ts;
+    }
+
+  // Flush any deferred regions that are older than the latest homography we
+  // have received
+  bool updateNeeded = false;
+  QMultiMap<vtkVgTimeStamp, DeferredEventRegion>::iterator iter =
+    this->DeferredEventRegions.begin();
+  while (iter != this->DeferredEventRegions.end() && iter.key() <= ts)
+    {
+    DeferredEventRegion e = iter.value();
+    iter = this->DeferredEventRegions.erase(iter);
+    vtkVgEvent* event = e.model->GetEvent(e.modelId);
+    if (event)
+      {
+      const bool updated = this->addEventRegion(event, e.time, e.region);
+      updateNeeded = updateNeeded || updated;
+      }
+    }
+
+  // Issue an update if any regions were added
+  if (updateNeeded)
+    {
+    QTE_Q(vsCore);
+    emit q->updated();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vsCorePrivate::addEventRegion(
+  vtkVgEvent* event, const vtkVgTimeStamp& ts, const QPolygonF& region)
+{
+  HomographyMapIterator notFound = this->HomographyMap.constEnd();
+
+  HomographyMapIterator iter =
+    this->HomographyMap.constFind(ts.GetRawTimeStamp(), vg::SeekNearest);
+
+  // If no match was found...
+  if (iter == notFound || iter.key() != ts.GetRawTimeStamp())
+    {
+    // ...and we have not yet seen homographies later than this state, defer
+    // the region in the hope that we will receive the needed homography at a
+    // later time
+    if (!this->LastHomographyTimestamp.IsValid()
+        || this->LastHomographyTimestamp < ts)
+      {
+      // Defer the region
+      this->deferEventRegion(event, ts, region);
+      return false;
+      }
+
+    // Otherwise, check if our 'nearest' match is good enough... we'll accept
+    // a homography for a time that is off by less than expected gap between
+    // frames, e.g. to compensate for rounding errors
+    double delta = 1e100;
+    if (iter != notFound && iter.key().HasTime() && ts.HasTime())
+      {
+      delta = fabs(iter.key().Time - ts.GetTime());
+      }
+    if (delta > 1e3) // 10 ms
+      {
+      // We've already seen later homographies, and don't have a "close enough"
+      // match... nothing more we can do...
+      // TODO: Given we can get things from streaming sources out of order, we
+      //       really should also force some sort of time-based delay before
+      //       giving up
+      qWarning() << "warning: no homography available for time"
+                 << ts.GetRawTimeStamp() << "- event region has been discarded";
+      return false;
+      }
+    }
+
+  // Use the homography to convert the region from image coordinates to
+  // stabilized coordinates
+  int pointCount = region.count();
+  QScopedArrayPointer<double> rawPoints(new double[2 * pointCount]);
+  for (int i = 0; i < pointCount; ++i)
+    {
+    vtkVgApplyHomography(region[i].x(), region[i].y(), iter.value(),
+                         &(rawPoints.data()[2 * i]));
+    }
+  event->SetRegion(ts, pointCount, rawPoints.data());
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::setEventRegions(vtkVgEvent* dst, vtkVgEventBase* src)
+{
+  // Convert event regions from image coordinates to stabilized coordinates
+  QList<QPair<vtkVgTimeStamp, QPolygonF> > regions;
+  if (src->GetNumberOfRegions())
+    {
+    vtkVgTimeStamp ts;
+    vtkIdType pointCount, *points;
+    vtkPoints* eventPoints = src->GetRegionPoints();
+
+    src->InitRegionTraversal();
+    while (src->GetNextRegion(ts, pointCount, points))
+      {
+      // Get region points
+      QPolygonF region;
+      for (int i = 0; i < pointCount; ++i)
+        {
+        double pt[3];
+        eventPoints->GetPoint(points[i], pt);
+        region.append(QPointF(pt[0], pt[1]));
+        }
+
+      // Add source region to destination event
+      this->addEventRegion(dst, ts, region);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::flushDeferredEvents()
+{
+  int i = 0;
+  while (i < this->DeferredEvents.count())
+    {
+    if (this->areEventTracksPresent(this->DeferredEvents[i].event))
+      {
+      DeferredEvent e = this->DeferredEvents.takeAt(i);
+      this->addReadyEvent(e.source, e.event);
+      }
+    else
+      {
+      ++i;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::addDescriptor(
+  vsDescriptorSource* source, vvDescriptor* descriptor)
+{
+  Q_UNUSED(source);
+  this->Descriptors.append(descriptor);
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::addDescriptors(
+  vsDescriptorSource* source, const QList<vvDescriptor*>& descriptors)
+{
+  Q_UNUSED(source);
+  this->Descriptors.append(descriptors);
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::addEvent(vsDescriptorSource* source, vsEvent eventBase)
+{
+  QHash<int, int>& typeMap = this->UserEventTypeMap[source];
+  bool haveClassifiers =
+    this->ExpectedEventGroups.contains(vsEventInfo::Classifier);
+
+  const std::vector<int> classifiers = eventBase->GetClassifierTypes();
+
+  // Remap user event types and check for classifier types
+  for (size_t n = 0, k = classifiers.size(); n < k; ++n)
+    {
+    int classifier = classifiers[n];
+
+    // Check if this is a user-defined event type
+    if (typeMap.contains(classifier))
+      {
+      const int mappedType = typeMap[classifier];
+      if (mappedType != classifier)
+        {
+        // Get classifier values and replace user type with mapped type
+        const double probability = eventBase->GetProbability(classifier);
+        const double normalcy = eventBase->GetNormalcy(classifier);
+        eventBase->RemoveClassifier(classifier);
+        eventBase->AddClassifier(mappedType, probability, normalcy);
+        classifier = mappedType;
+        }
+      }
+
+    // If we haven't already seen a classifier event, check if this is one
+    if (!haveClassifiers && classifier > 0)
+      {
+      // The event has a classifier; show the filters
+      this->expectEventGroup(vsEventInfo::Classifier);
+      haveClassifiers = true;
+      }
+    }
+
+  // Check if supporting tracks exist
+  if (!this->areEventTracksPresent(eventBase))
+    {
+    this->DeferredEvents.append(DeferredEvent(source, eventBase));
+    return;
+    }
+
+  // Everything is in place to add the event
+  this->addReadyEvent(source, eventBase);
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::addReadyEvent(
+  vsDescriptorSource* source, vsEvent eventBase)
+{
+  QTE_Q(vsCore);
+
+  vtkVgEventModelCollection* eventModel = this->EventModel;
+  vtkVgEventBase* eventPtr = eventBase.GetVolatilePointer();
+
+  // Add model ID's to associated tracks
+  int n = eventPtr->GetNumberOfTracks();
+  while (n--)
+    {
+    vtkVsTrackInfo* ti =
+      vtkVsTrackInfo::SafeDownCast(eventPtr->GetTrackInfo(n));
+    // Cast must succeed or areEventTracksPresent would have returned false
+    if (ti->VvTrackId.Source == vsTrackInfo::GroundTruthSource)
+      eventModel = this->GroundTruthEventModel;
+    ti->TrackId = this->TrackModelIdMap.value(ti->VvTrackId);
+    }
+
+  // Check if this is an update to a previously seen event
+  vtkIdType descriptorEventId = eventPtr->GetId();
+  QHash<vtkIdType, EventReference>& eventMap = this->EventMap[source];
+  if (eventMap.contains(descriptorEventId))
+    {
+    // Yes; find and update the existing event
+    EventReference& ref = eventMap[descriptorEventId];
+    eventPtr->SetId(ref.modelId);
+
+    vtkVgEvent* theEvent = ref.model->GetEvent(ref.modelId);
+    theEvent->UpdateEvent(eventPtr);
+    if (source) // If not a raw event...
+      {
+      // ...copy updated event regions, converting from image coordinates to
+      // stabilized coordinates (raw event regions are already in stabilized
+      // coordinates)
+      this->setEventRegions(theEvent, eventPtr);
+      }
+
+    emit q->eventChanged(theEvent);
+    emit q->updated();
+
+    // Remove old instances of the event to reduce memory usage
+    qtUtil::mapBound(ref.inputIds, this->InputHistory, &InputMap::remove);
+
+    // Reemit the event to interested descriptors
+    const vsEventId eid(eventBase.GetUniqueId(), ref.modelId,
+                        descriptorEventId, source);
+    vsDescriptorInput* const input = new vsDescriptorInput(eventBase, eid);
+    ref.inputIds.append(this->emitInput(&vsCore::eventAvailable, input));
+
+    // That's it for updated events
+    return;
+    }
+
+  // Generate new global ID from source ID
+  EventReference ref(eventModel, this->NextEventId++);
+  eventPtr->SetId(ref.modelId);
+
+  // Update alert matches, if this is an alert event
+  if (source && eventPtr->GetNumberOfClassifiers() == 1)
+    {
+    eventPtr->InitClassifierTraversal();
+    int classifier = eventPtr->GetClassifierType();
+    if (this->Alerts.contains(classifier))
+      {
+      AlertInfo& ai = this->Alerts[classifier];
+      ai.matchingEvents.insert(ref.modelId);
+      emit q->alertMatchesChanged(classifier, ai.matchingEvents.count());
+      }
+    }
+
+  // Generate new event
+  vtkVgEvent* theEvent = eventModel->AddEvent(eventPtr);
+  if (theEvent)
+    {
+    if (source) // If not a raw event...
+      {
+      // ...copy event regions, converting from image coordinates to stabilized
+      // coordinates (raw event regions are already in stabilized coordinates)
+      this->setEventRegions(theEvent, eventPtr);
+      }
+
+    // Emit notification that the event was added
+    emit q->eventAdded(theEvent);
+    emit q->updated();
+
+    // Emit the event to interested descriptors and add to the map
+    vsEventId eid(eventBase.GetUniqueId(), ref.modelId,
+                  descriptorEventId, source);
+    qint64 inputId = this->emitInput(&vsCore::eventAvailable,
+                                     new vsDescriptorInput(eventBase, eid));
+    ref.inputIds.append(inputId);
+    eventMap.insert(descriptorEventId, ref);
+    this->Events.insert(ref.modelId, eid);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::removeEvent(
+  vsDescriptorSource* source, vtkIdType eventId)
+{
+  // Check if the event has been added already
+  QHash<vtkIdType, EventReference>* eventMap;
+  if (this->EventMap.contains(source)
+      && (eventMap = &(this->EventMap[source]))->contains(eventId))
+    {
+    QTE_Q(vsCore);
+
+    // The event was added; remove it from the appropriate model
+    const EventReference& ref = (*eventMap)[eventId];
+    ref.model->RemoveEvent(ref.modelId);
+    qtUtil::mapBound(ref.inputIds, this, &vsCorePrivate::mappedRevokeInput,
+                     &vsCore::eventRevoked, false);
+    eventMap->remove(eventId);
+
+    // The event may have deferred regions; if so, find them and yank them from
+    // the queue
+    QMultiMap<vtkVgTimeStamp, DeferredEventRegion>::iterator iter =
+      this->DeferredEventRegions.begin();
+    while (iter != this->DeferredEventRegions.end())
+      {
+      (iter->model == ref.model && iter->modelId == ref.modelId)
+        ? iter = this->DeferredEventRegions.erase(iter)
+        : ++iter;
+      }
+
+    // Remove from alert matches, if present
+    foreach_iter (AlertMap::iterator, iter, this->Alerts)
+      {
+      QSet<vtkIdType>& me = iter->matchingEvents;
+      if (me.contains(ref.modelId))
+        {
+        me.remove(ref.modelId);
+        emit q->alertMatchesChanged(iter.key(), me.count());
+        }
+      }
+
+    emit q->eventRemoved(ref.modelId);
+    }
+  else
+    {
+    // The event may be deferred; if so, find it and yank it from the queue
+    QList<DeferredEvent>::iterator iter = this->DeferredEvents.begin();
+    while (iter != this->DeferredEvents.end())
+      {
+      if (iter->source == source && iter->event->GetId() == eventId)
+        {
+        this->DeferredEvents.erase(iter);
+        break;
+        }
+      ++iter;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vsCorePrivate::event(
+  vtkIdType id, vtkVgEventModelCollection** model)
+{
+  if (vtkVgEvent* event = this->EventModel->GetEvent(id))
+    {
+    if (model)
+      {
+      *model = this->EventModel;
+      }
+    return event;
+    }
+
+  if (vtkVgEvent* event = this->GroundTruthEventModel->GetEvent(id))
+    {
+    if (model)
+      {
+      *model = this->GroundTruthEventModel;
+      }
+    return event;
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vsCorePrivate::notifyEventModified(vtkVgEvent* event)
+{
+  if (!event)
+    {
+    // Shouldn't happen, but don't crash if event is bogus
+    return;
+    }
+
+  QTE_Q(vsCore);
+
+  emit q->eventChanged(event);
+  emit q->updated();
+
+  // Reemit the event to interested descriptors
+  const vtkIdType eventId = event->GetId();
+  if (this->Events.contains(eventId))
+    {
+    // Get event source and reference
+    const vsEventId eid = this->Events.value(eventId);
+    EventReference& ref = this->EventMap[eid.Source][eid.SourceId];
+
+    // Remove old instances of the event to reduce memory usage
+    qtUtil::mapBound(ref.inputIds, this->InputHistory, &InputMap::remove);
+
+    // Create a copy of the event for descriptors (we can't give them our
+    // internal one because it might change, and we don't already have a
+    // vsEvent because we are modifying the internal event directly, not
+    // through a vsEvent)
+    vsEvent eventCopy(eid.UniqueId);
+    eventCopy->DeepCopy(event);
+
+    // Emit the new input and add to the reference descriptor inputs list
+    vsDescriptorInput* const input = new vsDescriptorInput(eventCopy, eid);
+    ref.inputIds.append(this->emitInput(&vsCore::eventAvailable, input));
+    }
+}
diff --git a/Libraries/VspUserInterface/vsCorePrivate.h b/Libraries/VspUserInterface/vsCorePrivate.h
new file mode 100644
index 00000000..31dfc43d
--- /dev/null
+++ b/Libraries/VspUserInterface/vsCorePrivate.h
@@ -0,0 +1,238 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsCorePrivate_h
+#define __vsCorePrivate_h
+
+#include <vgSwatchCache.h>
+#include <vgTimeMap.h>
+
+#include <vtkVgInstance.h>
+#include <vtkVgVideoMetadata.h>
+
+#include <vsContour.h>
+#include <vsDescriptorInput.h>
+#include <vsEvent.h>
+
+#include "vsCore.h"
+
+class vtkMatrix4x4;
+
+class vtkVgEvent;
+class vtkVgEventModelCollection;
+class vtkVgEventTypeRegistry;
+class vtkVgTrack;
+class vtkVgTrackModelCollection;
+
+struct vsEventInfo;
+struct vvTrack;
+
+class vsCorePrivate
+{
+public:
+  vsCorePrivate(vsCore*);
+  ~vsCorePrivate();
+
+  struct DeferredTrackUpdate
+    {
+    QList<vvTrackState> updates;
+    bool closed;
+    DeferredTrackUpdate() : closed(false) {}
+    };
+
+  struct DeferredEvent
+    {
+    DeferredEvent() : source(0), event(QUuid()) {}
+    DeferredEvent(vsDescriptorSource* s, const vsEvent& e)
+      : source(s), event(e) {}
+
+    vsDescriptorSource* source;
+    vsEvent event;
+    };
+
+  struct DeferredEventRegion
+    {
+    DeferredEventRegion(vtkVgEventModelCollection* m = 0, vtkIdType i = 0)
+      : model(m), modelId(i) {}
+    vtkVgEventModelCollection* model;
+    vtkIdType modelId;
+    vtkVgTimeStamp time;
+    QPolygonF region;
+    };
+
+  struct EventReference
+    {
+    EventReference() : model(0), modelId(-1) {}
+    EventReference(vtkVgEventModelCollection* m, vtkIdType i)
+      : model(m), modelId(i) {}
+
+    vtkVgEventModelCollection* model;
+    vtkIdType modelId;
+    QList<qint64> inputIds;
+    };
+
+  struct ContourInfo
+    {
+    ContourInfo() : inputId(-1) {}
+    ContourInfo(const vsContour& c, qint64 iid = -1)
+      : contour(c), inputId(iid) {}
+
+    vsContour contour;
+    qint64 inputId;
+    };
+
+  struct AlertInfo
+    {
+    AlertInfo() : enabled(true) {}
+    AlertInfo(const vsAlert& a) : alert(a), enabled(true) {}
+
+    vsAlert alert;
+    QList<qint64> inputIdList;
+    bool enabled;
+    QSet<vtkIdType> matchingEvents;
+    };
+
+  typedef QList<vsTrackSourcePtr>::iterator vsTrackSourceIterator;
+  typedef QList<vsDescriptorSourcePtr>::iterator vsDescriptorSourceIterator;
+
+  typedef void (vsCore::*InputSignal)(qint64, vsDescriptorInputPtr);
+  typedef void (vsCore::*RevokeInputSignal)(qint64, bool);
+  typedef QMap<qint64, vsDescriptorInputPtr> InputMap;
+  typedef QHash<int, AlertInfo> AlertMap;
+
+  typedef vtkVgInstance<vtkMatrix4x4> HomographyMatrix;
+  typedef vgTimeMap<HomographyMatrix>::const_iterator HomographyMapIterator;
+
+  typedef void (vsCore::*TrackUpdateSignal)(vtkVgTrack*);
+
+  void setVideoSource(vsVideoSourcePtr);
+  void addTrackSource(vsTrackSourcePtr);
+  void addDescriptorSource(vsDescriptorSourcePtr);
+  void removeDescriptorSource(vsDescriptorSource*);
+
+  void connectDescriptorInputs(vsDescriptorSource*);
+  void connectInput(vsDescriptorSource* source,
+                    vsDescriptorInput::Types mask,
+                    vsDescriptorInput::Type type,
+                    const char* injectSignal,
+                    const char* revokeSignal = 0);
+  qint64 emitInput(InputSignal signal, vsDescriptorInput* input);
+  qint64 emitInput(const vsContour& contour);
+  void revokeInput(RevokeInputSignal, qint64 id, bool revokeEvents);
+  void mappedRevokeInput(qint64 id, RevokeInputSignal, bool revokeEvents);
+
+  void updateDescriptorInputs();
+  void expectEventGroup(vsEventInfo::Group);
+
+  void createTripwireDescriptor();
+
+  bool setContourType(ContourInfo&, vsContour::Type);
+
+  vvTrack& getVvTrack(const vvTrackId&);
+  vtkVgTrack* track(const vvTrackId&);
+  void deferTrackUpdate(const vvTrackId&, const vvTrackState&);
+  void flushDeferredTrackUpdates(const vtkVgTimeStamp&);
+  void flushDeferredEvents();
+  void deferEventRegion(vtkVgEvent*, const vtkVgTimeStamp&, const QPolygonF&);
+  void flushDeferredEventRegions(const vtkVgTimeStamp&);
+
+  void updateTrack(const vvTrackId&, const QList<vvTrackState>&);
+  void updateTrackData(const vvTrackId& trackId, const vsTrackData& data);
+  void closeTrack(const vvTrackId&);
+  void postTrackUpdateSignal(vtkVgTrack*, TrackUpdateSignal);
+
+  bool areEventTracksPresent(const vsEvent&);
+
+  void addDescriptor(vsDescriptorSource*, vvDescriptor*);
+  void addDescriptors(vsDescriptorSource*, const QList<vvDescriptor*>&);
+  void addEvent(vsDescriptorSource*, vsEvent);
+  void addReadyEvent(vsDescriptorSource*, vsEvent);
+  void removeEvent(vsDescriptorSource*, vtkIdType);
+
+  vtkVgEvent* event(vtkIdType, vtkVgEventModelCollection** = 0);
+  void notifyEventModified(vtkVgEvent*);
+
+  bool addEventRegion(vtkVgEvent*, const vtkVgTimeStamp&, const QPolygonF&);
+  void setEventRegions(vtkVgEvent* dst, vtkVgEventBase* src);
+
+  void registerEventType(const vsEventInfo&, bool isManualType);
+
+  void loadPersistentAlerts();
+  void findAndStorePossibleAlerts(QString path, QStringList& filePaths);
+
+  vsVideoSourcePtr VideoSource;
+  QList<vsTrackSourcePtr> TrackSources;
+  QList<vsDescriptorSourcePtr> DescriptorSources;
+  vsDescriptorSourcePtr TripwireDescriptor;
+
+  QSet<vsEventInfo::Group> ExpectedEventGroups;
+
+  QHash<const vsDescriptorSource*, vsDescriptorInput::Types> DescriptorInputs;
+  vsDescriptorInput::Types CollectedDescriptorInputs;
+
+  qint64 NextInputId;
+  InputMap InputHistory;
+
+  vtkIdType NextTrackId;
+  vtkIdType NextEventId;
+  vtkIdType NextRawEventId;
+  vtkVgInstance<vtkVgTrackModelCollection> TrackModel;
+  vtkVgInstance<vtkVgEventModelCollection> EventModel;
+  QHash<vvTrackId, vtkIdType> TrackModelIdMap;
+  QHash<vtkIdType, vvTrackId> TrackLogicalIdMap;
+
+  vtkVgInstance<vtkVgEventTypeRegistry> EventTypeRegistry;
+  vgSwatchCache SwatchCache;
+
+  QHash<int, ContourInfo> Contours;
+  int NextContourId;
+
+  AlertMap Alerts;
+  int NextAlertType;
+
+  QHash<const vsDescriptorSource*, QHash<int, int> > UserEventTypeMap;
+  QList<vsEventInfo> ManualEventTypes;
+  QHash<int, int> ManualEventTypesMap;
+  int NextUserType;
+
+  bool GroundTruthDataPresent;
+  vtkVgInstance<vtkVgTrackModelCollection> GroundTruthTrackModel;
+  vtkVgInstance<vtkVgEventModelCollection> GroundTruthEventModel;
+
+  std::map<vtkVgTimeStamp, vtkVgVideoMetadata> VideoMetadata;
+
+  QMap<vgTimeStamp, vtkVgVideoFrameMetaData> VideoFrameMetadata;
+
+  vgTimeMap<HomographyMatrix> HomographyMap;
+  QHash<long long, vtkVgTimeStamp> HomographyReferenceTimeMap;
+  vtkVgTimeStamp LastHomographyTimestamp;
+
+  QList<vvDescriptor*> Descriptors;
+  QHash<vvTrackId, vvTrack> Tracks;
+  QHash<vtkIdType, vsEventId> Events;
+  QHash<const vsDescriptorSource*, QHash<vtkIdType, EventReference> > EventMap;
+
+  QHash<vvTrackId, DeferredTrackUpdate> DeferredTrackUpdates;
+  QList<DeferredEvent> DeferredEvents;
+  QMultiMap<vtkVgTimeStamp, DeferredEventRegion> DeferredEventRegions;
+
+  typedef QHash<vtkVgTrack*, TrackUpdateSignal> TrackUpdateSignalMap;
+  TrackUpdateSignalMap PendingTrackUpdateSignals;
+
+  bool PersistentAlertsLoaded;
+
+  vtkIdType FollowedTrackId;
+  vgTimeStamp FollowedTrackTimeStamp;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsCore)
+
+private:
+  QTE_DECLARE_PUBLIC(vsCore)
+  Q_DISABLE_COPY(vsCorePrivate)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsDebug.cxx b/Libraries/VspUserInterface/vsDebug.cxx
new file mode 100644
index 00000000..6073a660
--- /dev/null
+++ b/Libraries/VspUserInterface/vsDebug.cxx
@@ -0,0 +1,9 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtDebugImpl.h>
+
+#include "vsDebug.h"
diff --git a/Libraries/VspUserInterface/vsDebug.h b/Libraries/VspUserInterface/vsDebug.h
new file mode 100644
index 00000000..4a8628f7
--- /dev/null
+++ b/Libraries/VspUserInterface/vsDebug.h
@@ -0,0 +1,14 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsDebug_h
+#define __vsDebug_h
+
+#include <qtDebug.h>
+
+QTE_DEBUG_AREA(vsd, VideoPlayback, false);
+
+#endif
diff --git a/Libraries/VspUserInterface/vsEventInfoWidget.cxx b/Libraries/VspUserInterface/vsEventInfoWidget.cxx
new file mode 100644
index 00000000..1432212a
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventInfoWidget.cxx
@@ -0,0 +1,186 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventInfoWidget.h"
+#include "ui_eventInfo.h"
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventTypeRegistry.h>
+
+#include <vgUnixTime.h>
+
+#include <qtMath.h>
+#include <qtUtil.h>
+
+QTE_IMPLEMENT_D_FUNC(vsEventInfoWidget)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void setDateTime(QLineEdit* widget, long long ts)
+{
+  QString format("%1T%2Z"); // ISO 8601
+  vgUnixTime t(ts);
+  widget->setText(format.arg(t.dateString()) .arg(t.timeString()));
+}
+
+//-----------------------------------------------------------------------------
+void makeTransparent(QLineEdit* widget)
+{
+  widget->setForegroundRole(QPalette::WindowText);
+  qtUtil::makeTransparent(widget);
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vsEventInfoWidgetPrivate
+{
+public:
+  vsEventInfoWidgetPrivate() : EventTypeRegistry(0), Event(0) {}
+
+  void updateEventInfo(vtkVgEvent*);
+
+  Ui::vsEventInfoWidget UI;
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+
+  vtkVgEvent* Event;
+};
+
+//-----------------------------------------------------------------------------
+void vsEventInfoWidgetPrivate::updateEventInfo(vtkVgEvent* e)
+{
+  this->UI.stackedWidget->setCurrentWidget(this->UI.scrollArea);
+
+  this->UI.id->setText(QString::number(e->GetId()));
+
+  double startTime = e->GetStartFrame().GetTime();
+  double endTime = e->GetEndFrame().GetTime();
+  setDateTime(this->UI.startTime, startTime);
+  setDateTime(this->UI.endTime, endTime);
+  vgUnixTime duration(endTime - startTime);
+  this->UI.duration->setText(duration.timeString());
+
+  const char* noteData = e->GetNote();
+  const QString note =
+    (noteData && *noteData ? QString::fromLocal8Bit(noteData)
+                           : "(no note set)");
+  this->UI.note->setText(note, qtSqueezedLabel::SetFullText |
+                               qtSqueezedLabel::SimplifyText);
+  this->UI.note->setToolTip(note, qtSqueezedLabel::PlainText |
+                                  qtSqueezedLabel::AutoWrap);
+
+  this->UI.classifiers->clear();
+
+  if (!this->EventTypeRegistry)
+    {
+    qDebug() << "Event type registry not set";
+    return;
+    }
+
+  for (bool valid = e->InitClassifierTraversal(); valid;
+       valid = e->NextClassifier())
+    {
+    int type = e->GetClassifierType();
+    double prob = e->GetClassifierProbability();
+    QStringList sl;
+    sl << this->EventTypeRegistry->GetTypeById(type).GetName()
+       << QString::number(prob, 'f', 4);
+    QTreeWidgetItem* item = new QTreeWidgetItem(sl);
+    this->UI.classifiers->addTopLevelItem(item);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsEventInfoWidget::vsEventInfoWidget(QWidget* parent)
+  : QWidget(parent), d_ptr(new vsEventInfoWidgetPrivate)
+{
+  QTE_D(vsEventInfoWidget);
+
+  d->UI.setupUi(this);
+
+  connect(d->UI.showDetails, SIGNAL(toggled(bool)),
+          this, SLOT(setDetailsVisible(bool)));
+  this->setDetailsVisible(d->UI.showDetails->isChecked());
+
+  makeTransparent(d->UI.id);
+
+  makeTransparent(d->UI.startTime);
+  makeTransparent(d->UI.endTime);
+  makeTransparent(d->UI.duration);
+
+  d->UI.classifiers->sortByColumn(1);
+
+  this->clear();
+}
+
+//-----------------------------------------------------------------------------
+vsEventInfoWidget::~vsEventInfoWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsEventInfoWidget::setEventTypeRegistry(vtkVgEventTypeRegistry* registry)
+{
+  QTE_D(vsEventInfoWidget);
+  d->EventTypeRegistry = registry;
+}
+
+//-----------------------------------------------------------------------------
+void vsEventInfoWidget::clear()
+{
+  QTE_D(vsEventInfoWidget);
+
+  d->Event = 0;
+
+  d->UI.notice->setText("No event selected");
+  d->UI.stackedWidget->setCurrentWidget(d->UI.helpWidget);
+
+  d->UI.id->clear();
+
+  d->UI.startTime->clear();
+  d->UI.endTime->clear();
+  d->UI.duration->clear();
+
+  d->UI.classifiers->clear();
+}
+
+//-----------------------------------------------------------------------------
+void vsEventInfoWidget::setDetailsVisible(bool visible)
+{
+  QTE_D(vsEventInfoWidget);
+  d->UI.classifiers->setVisible(visible);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventInfoWidget::setEvents(QList<vtkVgEvent*> events)
+{
+  QTE_D(vsEventInfoWidget);
+
+  if (events.count() == 1)
+    {
+    d->Event = events.first();
+    d->updateEventInfo(d->Event);
+    return;
+    }
+
+  this->clear();
+  if (events.count())
+    {
+    d->UI.notice->setText("Multiple events selected");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventInfoWidget::updateEvent(vtkVgEvent* e)
+{
+  QTE_D(vsEventInfoWidget);
+  if (d->Event == e)
+    {
+    d->updateEventInfo(e);
+    }
+}
diff --git a/Libraries/VspUserInterface/vsEventInfoWidget.h b/Libraries/VspUserInterface/vsEventInfoWidget.h
new file mode 100644
index 00000000..c43cdf9f
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventInfoWidget.h
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventInfoWidget_h
+#define __vsEventInfoWidget_h
+
+#include <QWidget>
+
+#include <qtGlobal.h>
+
+class vtkVgEvent;
+class vtkVgEventTypeRegistry;
+
+class vsEventInfoWidgetPrivate;
+
+class vsEventInfoWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vsEventInfoWidget(QWidget* parent = 0);
+  ~vsEventInfoWidget();
+
+  void setEventTypeRegistry(vtkVgEventTypeRegistry* registry);
+
+public slots:
+  void clear();
+  void setEvents(QList<vtkVgEvent*> events);
+  void updateEvent(vtkVgEvent*);
+
+protected slots:
+  void setDetailsVisible(bool);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsEventInfoWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(vsEventInfoWidget)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsEventRatingMenu.cxx b/Libraries/VspUserInterface/vsEventRatingMenu.cxx
new file mode 100644
index 00000000..876e5520
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventRatingMenu.cxx
@@ -0,0 +1,65 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventRatingMenu.h"
+
+#include <QMenu>
+
+#include <qtUtil.h>
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+const char* getObjectName(vsEventRatingMenu::RatingMenuItem item)
+{
+  switch (item)
+    {
+    case vsEventRatingMenu::Unrated:  return "unrated";
+    case vsEventRatingMenu::Relevant: return "relevant";
+    case vsEventRatingMenu::Excluded: return "excluded";
+    case vsEventRatingMenu::Rejected: return "rejected";
+    }
+  return 0;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+void vsEventRatingMenu::buildMenu(QMenu* menu)
+{
+  QAction* unrated = menu->addAction("Unrated / Verified");
+  unrated->setObjectName(getObjectName(Unrated));
+  unrated->setIcon(qtUtil::standardActionIcon("apply"));
+
+  QAction* relevant = menu->addAction("Relevant / Verified");
+  relevant->setObjectName(getObjectName(Relevant));
+  relevant->setIcon(qtUtil::standardActionIcon("okay"));
+
+  QAction* excluded = menu->addAction("Not Relevant / Verified");
+  excluded->setObjectName(getObjectName(Excluded));
+  excluded->setIcon(qtUtil::standardActionIcon("cancel"));
+
+  menu->addSeparator();
+
+  QAction* rejected = menu->addAction("Not Relevant / Rejected");
+  rejected->setObjectName(getObjectName(Rejected));
+  rejected->setIcon(qtUtil::standardActionIcon("delete"));
+}
+
+//-----------------------------------------------------------------------------
+QAction* vsEventRatingMenu::getAction(QMenu* menu, RatingMenuItem item)
+{
+  QString name(getObjectName(item));
+  foreach (QAction* action, menu->actions())
+    {
+    if (action->objectName() == name)
+      {
+      return action;
+      }
+    }
+  return 0;
+}
diff --git a/Libraries/VspUserInterface/vsEventRatingMenu.h b/Libraries/VspUserInterface/vsEventRatingMenu.h
new file mode 100644
index 00000000..fbf79b1a
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventRatingMenu.h
@@ -0,0 +1,23 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+class QAction;
+class QMenu;
+
+namespace vsEventRatingMenu
+{
+  enum RatingMenuItem
+    {
+    Unrated,
+    Relevant,
+    Excluded,
+    Rejected
+    };
+
+  void buildMenu(QMenu* menu);
+
+  QAction* getAction(QMenu* menu, RatingMenuItem item);
+}
diff --git a/Libraries/VspUserInterface/vsEventStatus.h b/Libraries/VspUserInterface/vsEventStatus.h
new file mode 100644
index 00000000..6f77d968
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventStatus.h
@@ -0,0 +1,22 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventStatus_h
+#define __vsEventStatus_h
+
+namespace vs
+{
+  enum EventStatus
+    {
+    UnverifiedEvent,
+    VerifiedEvent,
+    RejectedEvent
+    };
+}
+
+typedef enum vs::EventStatus vsEventStatus;
+
+#endif
diff --git a/Libraries/VspUserInterface/vsEventTreeModel.cxx b/Libraries/VspUserInterface/vsEventTreeModel.cxx
new file mode 100644
index 00000000..9971d2e4
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventTreeModel.cxx
@@ -0,0 +1,614 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventTreeModel.h"
+
+#include <QDebug>
+#include <QMimeData>
+#include <QPalette>
+
+#include <qtUtil.h>
+
+#include <vgEventType.h>
+#include <vgSwatchCache.h>
+#include <vgUnixTime.h>
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventFilter.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgTypeDefs.h>
+
+#include <algorithm>
+#include <vector>
+
+#include "vsEventStatus.h"
+#include "vsScene.h"
+
+namespace // anonymous
+{
+
+bool CompareClassifiers(const vtkVgEventFilter::ScoredClassifier& a,
+                        const vtkVgEventFilter::ScoredClassifier& b)
+{
+  return a.second > b.second;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vsEventTreeModel::vsEventTreeModel(
+  vsScene* scene, vtkVgEventFilter* eventFilter,
+  vtkVgEventTypeRegistry* eventTypeRegistry, const vgSwatchCache& swatchCache,
+  QObject* parent)
+  : QAbstractItemModel(parent), Scene(scene), eventFilter(eventFilter),
+    eventTypeRegistry(eventTypeRegistry), swatchCache(swatchCache),
+    isSorted(true)
+{
+  this->yesIcon = qtUtil::standardIcon("okay", 16);
+  this->noIcon = qtUtil::standardIcon("cancel", 16);
+
+  connect(scene, SIGNAL(eventSceneUpdated()), this, SLOT(update()));
+}
+
+//-----------------------------------------------------------------------------
+vsEventTreeModel::~vsEventTreeModel()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vsEventTreeModel::columnCount(const QModelIndex& /*parent*/) const
+{
+  return NumColumns;
+}
+
+//-----------------------------------------------------------------------------
+Qt::ItemFlags vsEventTreeModel::flags(const QModelIndex& index) const
+{
+  if (!index.isValid())
+    return Qt::ItemIsDropEnabled;
+
+  return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled |
+         Qt::ItemIsDropEnabled;
+}
+
+//-----------------------------------------------------------------------------
+QVariant vsEventTreeModel::data(const QModelIndex& index, int role) const
+{
+  if (!index.isValid())
+    return QVariant();
+
+  vsEventUserInfo vsEventUserInfo = this->events[index.row()];
+  vtkVgEvent* event = vsEventUserInfo.Event;
+  switch (role)
+    {
+    case Qt::DisplayRole:
+      switch (index.column())
+        {
+        case IdColumn:
+          return event->GetId();
+
+        case NameColumn:
+          // If event has a name...
+          if (event->GetName())
+            {
+            // ...then use that
+            return QString::fromLocal8Bit(event->GetName());
+            }
+          else
+            {
+            // ...else show the ID in parentheses (temporary?)
+            return QString("(%1)").arg(event->GetId());
+            }
+
+        case EventTypeColumn:
+          {
+          int type = this->eventFilter->GetBestClassifier(event);
+          if (type == -1)
+            {
+            return QString("(none)");
+            }
+          return this->eventTypeRegistry->GetTypeById(type).GetName();
+          }
+
+        case ProbabilityColumn:
+          {
+          int type = this->eventFilter->GetBestClassifier(event);
+          double probability =
+            (type == -1 ? 0.0 : event->GetProbability(type));
+          return QString::number(probability, 'f', 4);
+          }
+
+        case StartTimeColumn:
+          return vgUnixTime(event->GetStartFrame().GetTime()).timeString();
+
+        case EndTimeColumn:
+          return vgUnixTime(event->GetEndFrame().GetTime()).timeString();
+
+        case NoteColumn:
+          return QString::fromLocal8Bit(event->GetNote());
+        }
+      break;
+
+    case Qt::DecorationRole:
+      if (index.column() == RatingColumn)
+        {
+        switch (event->GetStatus())
+          {
+          case vgObjectStatus::Adjudicated: return this->yesIcon;
+          case vgObjectStatus::Excluded:    return this->noIcon;
+          }
+        }
+      else if (index.column() == StarColumn)
+        {
+        const QString name = (event->IsStarred() ? "star" : "star-off");
+        return qtUtil::standardIcon(name, 16);
+        }
+      else if (index.column() == EventTypeColumn)
+        {
+        double dc[3];
+        if (event->GetUseCustomColor())
+          {
+          event->GetCustomColor(dc);
+          }
+        else
+          {
+          int type = this->eventFilter->GetBestClassifier(event);
+          if (type == -1)
+            {
+            // If the event is filtered out, don't show a color swatch
+            return QVariant();
+            }
+          const vgEventType& et = this->eventTypeRegistry->GetTypeById(type);
+          et.GetColor(dc[0], dc[1], dc[2]);
+          }
+        const qreal a = (this->isIndexHidden(index) ? 0.5 : 1.0);
+        const QColor color = QColor::fromRgbF(dc[0], dc[1], dc[2], a);
+        return this->swatchCache.swatch(color);
+        }
+      break;
+
+    case Qt::ForegroundRole:
+      // Gray out filtered and hidden events
+      if (this->isIndexHidden(index))
+        return QPalette().brush(QPalette::Disabled, QPalette::WindowText);
+      break;
+
+    case Qt::TextAlignmentRole:
+      switch (index.column())
+        {
+        case StarColumn:
+          return Qt::AlignCenter;
+        case ProbabilityColumn:
+        case NameColumn: // temporary?
+          return QVariant(Qt::AlignRight | Qt::AlignVCenter);
+        }
+      break;
+
+    case Qt::ToolTipRole:
+      switch (index.column())
+        {
+        case RatingColumn:
+          switch (event->GetStatus())
+            {
+            case vgObjectStatus::None:        return "Unrated";
+            case vgObjectStatus::Adjudicated: return "Relevant";
+            case vgObjectStatus::Excluded:    return "Not Relevant";
+            }
+          break;
+
+        case EventTypeColumn:
+        case ProbabilityColumn:
+          {
+          std::vector<vtkVgEventFilter::ScoredClassifier> classifiers =
+            this->eventFilter->GetActiveClassifiers(event);
+
+          if (classifiers.size() == 0)
+            return QString("(none)");
+
+          // sort by probability
+          std::sort(classifiers.begin(), classifiers.end(),
+                    CompareClassifiers);
+
+          // build the tool tip string with more likely classifiers near the top
+          QString tooltip = "<html><table>";
+          for (size_t i = 0, end = classifiers.size(); i < end; ++i)
+            {
+            if (i != 0)
+              tooltip.append('\n');
+
+            const int type = classifiers[i].first;
+            const double p = event->GetProbability(type);
+
+            const QString str("<tr><td>%1</td><td align=\"right\">(%2)</td>");
+            const char* name =
+              this->eventTypeRegistry->GetTypeById(type).GetName();
+            tooltip += str.arg(name).arg(p, 0, 'f', 4);
+            }
+          return tooltip + "</table></html>";
+          }
+
+        case NoteColumn:
+          {
+          const char* note = event->GetNote();
+          if (note)
+            {
+            return QString::fromLocal8Bit(note);
+            }
+          break;
+          }
+        default:
+          break;
+        }
+      break;
+
+    case DisplayStateRole:
+      return this->Scene->eventDisplayState(event->GetId());
+
+    case RatingRole:
+      return event->GetStatus();
+
+    case StatusRole:
+      return vsEventUserInfo.Status;
+
+    case StarRole:
+      return event->IsStarred();
+
+    case NameSortRole:
+      if (event->GetName())
+        {
+        return QString::fromLocal8Bit(event->GetName()).toInt();
+        }
+      return event->GetId();
+
+    case ModifiableRole:
+      return event->IsModifiable();
+    }
+
+  return QVariant();
+}
+
+//-----------------------------------------------------------------------------
+QVariant vsEventTreeModel::headerData(
+  int section, Qt::Orientation orientation, int role) const
+{
+  if (orientation == Qt::Horizontal)
+    {
+    if (role == Qt::DisplayRole)
+      {
+      switch (section)
+        {
+        case RatingColumn:      return "";
+        case NameColumn:        return "Id";
+        case EventTypeColumn:   return "Event Type";
+        case ProbabilityColumn: return "Probability";
+        case StartTimeColumn:   return "Start Time";
+        case EndTimeColumn:     return "End Time";
+        case NoteColumn:        return "Note";
+        default: break;
+        }
+      }
+    else if (role == Qt::DecorationRole && section == StarColumn)
+      {
+      if (section == StarColumn)
+        {
+        return qtUtil::standardIcon("star", 16);
+        }
+      }
+    else if (role == Qt::ToolTipRole)
+      {
+      if (section == StarColumn)
+        {
+        return "Starred";
+        }
+      }
+    }
+
+  return QVariant();
+}
+
+//-----------------------------------------------------------------------------
+bool vsEventTreeModel::setData(
+  const QModelIndex& index, const QVariant& value, int role)
+{
+  if (!index.isValid())
+    return false;
+
+  switch (role)
+    {
+    case Qt::DisplayRole:
+      if (index.column() == NoteColumn)
+        {
+        vtkVgEvent* event = this->events[index.row()].Event;
+        emit this->eventNoteChanged(event->GetId(), value.toString());
+        break;
+        }
+
+    default:
+      return false;
+
+    case DisplayStateRole:
+      this->setEventDisplayState(index, value.toBool());
+      break;
+
+    case RatingRole:
+      {
+      vtkVgEvent* event = this->events[index.row()].Event;
+      emit this->eventRatingChanged(event->GetId(), value.toInt());
+      break;
+      }
+
+    case StatusRole:
+      {
+      vsEventUserInfo& eventInfo = this->events[index.row()];
+
+      const int oldStatus = eventInfo.Status;
+      const int newStatus = value.toInt();
+
+      if (newStatus != oldStatus)
+        {
+        if (newStatus == vs::RejectedEvent &&
+            oldStatus != vs::RejectedEvent)
+          {
+          // Auto-hide rejected events
+          this->setData(index, false, DisplayStateRole);
+          }
+        else if (oldStatus == vs::RejectedEvent &&
+                 newStatus != vs::RejectedEvent)
+          {
+          // Likewise re-show if moving out of rejected list
+          this->setData(index, true, DisplayStateRole);
+          }
+
+        eventInfo.Status = newStatus;
+        emit this->eventStatusChanged(eventInfo.Event->GetId(), newStatus);
+        }
+      break;
+      }
+
+    case StarRole:
+      {
+      vtkVgEvent* event = this->events[index.row()].Event;
+      value.toBool() ? event->SetFlags(vtkVgEventBase::EF_Starred)
+                     : event->ClearFlags(vtkVgEventBase::EF_Starred);
+      break;
+      }
+    }
+
+  emit this->dataChanged(index, index);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+QModelIndex vsEventTreeModel::index(
+  int row, int column, const QModelIndex& parent) const
+{
+  if (!this->hasIndex(row, column, parent))
+    return QModelIndex();
+
+  return this->createIndex(row, column);
+}
+
+//-----------------------------------------------------------------------------
+QModelIndex vsEventTreeModel::parent(const QModelIndex& /*index*/) const
+{
+  return QModelIndex();
+}
+
+//-----------------------------------------------------------------------------
+int vsEventTreeModel::rowCount(const QModelIndex& parent) const
+{
+  if (parent.column() > 0)
+    return 0;
+
+  if (!parent.isValid())
+    return this->events.size();
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeModel::addEvent(vtkVgEvent* event)
+{
+  if (this->addedEvents.isEmpty())
+    {
+    QMetaObject::invokeMethod(this, "deferredAddEvents",
+                              Qt::QueuedConnection);
+    }
+  this->addedEvents.insert(event->GetId(), event);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeModel::deferredAddEvents()
+{
+  if (this->addedEvents.isEmpty())
+    {
+    return;
+    }
+
+  int count = this->addedEvents.count();
+  int row = this->rowCount();
+  this->beginInsertRows(QModelIndex(), row, row + count - 1);
+
+  typedef QMap<vtkIdType, vtkVgEvent*>::const_iterator Iterator;
+  foreach_iter (Iterator, iter, this->addedEvents)
+    {
+    vsEventUserInfo ei;
+    ei.Event = iter.value();
+    ei.Status = vgObjectStatus::None;
+
+    vtkVgEvent* prev = this->events.isEmpty() ? 0 : this->events.back().Event;
+    this->events.append(ei);
+
+    // Check if ordering has been violated. We assume the id of an event will
+    // not change once it has been added, so this check should be sufficient.
+    if (prev && this->isSorted && iter.key() < prev->GetId())
+      {
+      this->isSorted = false;
+      qWarning() << "Event tree ids are not in sorted order, "
+                    "falling back to linear search";
+      }
+    }
+
+  this->addedEvents.clear();
+  this->endInsertRows();
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeModel::updateEvent(vtkVgEvent* event)
+{
+  if (this->updatedEvents.isEmpty())
+    {
+    QMetaObject::invokeMethod(this, "deferredUpdateEvents",
+                              Qt::QueuedConnection);
+    }
+
+  this->updatedEvents.append(event);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeModel::deferredUpdateEvents()
+{
+  bool changed = false;
+  int minRow = this->rowCount() - 1;
+  int maxRow = 0;
+
+  // Update event pointers and compute the model rows covered by the events
+  foreach (vtkVgEvent* event, this->updatedEvents)
+    {
+    QModelIndex index = this->indexOfEvent(event->GetId());
+    if (!index.isValid())
+      {
+      continue;
+      }
+
+    changed = true;
+    const int row = index.row();
+    this->events[row].Event = event;
+
+    minRow = qMin(row, minRow);
+    maxRow = qMax(row, maxRow);
+    }
+
+  this->updatedEvents.clear();
+
+  if (changed)
+    {
+    emit this->dataChanged(this->index(minRow, 0),
+                           this->index(maxRow, NumColumns - 1));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeModel::removeEvent(vtkIdType eventId)
+{
+  // Check if the event is still waiting to be added
+  if (this->addedEvents.remove(eventId))
+    {
+    // Yes; nothing to do besides removing it from pending additions
+    return;
+    }
+
+  QModelIndex index = this->indexOfEvent(eventId);
+  if (index.isValid())
+    {
+    int row = index.row();
+    this->beginRemoveRows(QModelIndex(), row, row);
+    this->events.removeAt(row);
+    this->endRemoveRows();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeModel::update()
+{
+  // If the event model has been updated, conservatively assume that every
+  // event has been modified
+  emit this->dataChanged(this->index(0, 0),
+                         this->index(this->rowCount() - 1, NumColumns - 1));
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeModel::setEventDisplayState(
+  const QModelIndex& index, bool show)
+{
+  if (index.column() != 0)
+    return;
+
+  const vtkIdType eventId = this->events[index.row()].Event->GetId();
+  this->Scene->setEventDisplayState(eventId, show);
+}
+
+//-----------------------------------------------------------------------------
+bool vsEventTreeModel::isIndexHidden(const QModelIndex& index) const
+{
+  vtkVgEvent* event = this->events[index.row()].Event;
+  return !this->Scene->eventVisibility(event->GetId());
+}
+
+//-----------------------------------------------------------------------------
+QMimeData* vsEventTreeModel::mimeData(const QModelIndexList& indexes) const
+{
+  QMimeData* mimeData = new QMimeData();
+  QByteArray encodedData;
+
+  QDataStream stream(&encodedData, QIODevice::WriteOnly);
+
+  // Put the event id in the mime encoding since the event may not be in
+  // the same row when it is dropped.
+  foreach (QModelIndex index, indexes)
+    {
+    if (index.isValid() && index.column() == 0)
+      stream << this->events[index.row()].Event->GetId();
+    }
+
+  mimeData->setData("application/vnd.kitware.event", encodedData);
+  return mimeData;
+}
+
+//-----------------------------------------------------------------------------
+QStringList vsEventTreeModel::mimeTypes() const
+{
+  QStringList types;
+  types << "application/vnd.kitware.event";
+  return types;
+}
+
+//-----------------------------------------------------------------------------
+struct compareEventIds
+{
+  bool operator()(const vsEventUserInfo& a, vtkIdType b)
+    { return a.Event->GetId() < b; }
+  bool operator()(vtkIdType a, const vsEventUserInfo& b)
+    { return a < b.Event->GetId(); }
+};
+
+//-----------------------------------------------------------------------------
+QModelIndex vsEventTreeModel::indexOfEvent(vtkIdType eventId) const
+{
+  if (this->isSorted)
+    {
+    // We can do binary search
+    const QList<vsEventUserInfo>::const_iterator iter =
+      qBinaryFind(this->events.constBegin(), this->events.constEnd(),
+                  eventId, compareEventIds());
+    if (iter != this->events.constEnd())
+      {
+      return this->index(iter - this->events.constBegin(), 0);
+      }
+    }
+  else
+    {
+    // Not sorted by id, fall back to linear search
+    for (int i = 0, k = this->events.count(); i < k; ++i)
+      {
+      if (this->events[i].Event->GetId() == eventId)
+        return this->index(i, 0);
+      }
+    }
+
+  qDebug() << "Event" << eventId << "not found in tree";
+  return QModelIndex();
+}
diff --git a/Libraries/VspUserInterface/vsEventTreeModel.h b/Libraries/VspUserInterface/vsEventTreeModel.h
new file mode 100644
index 00000000..02f6d6e4
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventTreeModel.h
@@ -0,0 +1,133 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventTreeModel_h
+#define __vsEventTreeModel_h
+
+#include <QAbstractItemModel>
+#include <QIcon>
+
+#include <vtkSmartPointer.h>
+
+#include "vsEventUserInfo.h"
+
+class QPixmap;
+
+class vgSwatchCache;
+
+class vtkVgEvent;
+class vtkVgEventFilter;
+class vtkVgEventTypeRegistry;
+
+class vsScene;
+
+class vsEventTreeModel : public QAbstractItemModel
+{
+  Q_OBJECT
+
+public:
+  enum ModelColumn
+    {
+    RatingColumn,
+    IdColumn, // not displayed
+    NameColumn,
+    StarColumn,
+    EventTypeColumn,
+    ProbabilityColumn,
+    StartTimeColumn,
+    EndTimeColumn,
+    NoteColumn
+    };
+
+  enum { NumColumns = NoteColumn + 1 };
+
+  enum DataRole
+    {
+    DisplayStateRole = Qt::UserRole + 1,
+    RatingRole,
+    StatusRole,
+    StarRole,
+    NameSortRole,
+    ModifiableRole
+    };
+
+public:
+  vsEventTreeModel(vsScene* scene, vtkVgEventFilter* eventFilter,
+                   vtkVgEventTypeRegistry* eventTypeRegistry,
+                   const vgSwatchCache& swatchCache, QObject* parent = 0);
+  virtual ~vsEventTreeModel();
+
+  // Reimplemented from QAbstractItemModel
+  virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+
+  virtual QVariant data(const QModelIndex& index, int role) const;
+
+  virtual QVariant headerData(int section, Qt::Orientation orientation,
+                              int role = Qt::DisplayRole) const;
+
+  virtual bool setData(const QModelIndex& index, const QVariant& value,
+                       int role);
+
+  virtual QModelIndex index(int row, int column,
+                            const QModelIndex& parent = QModelIndex()) const;
+
+  virtual QModelIndex parent(const QModelIndex& index) const;
+
+  virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
+  virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
+
+  virtual QStringList mimeTypes() const;
+  virtual QMimeData* mimeData(const QModelIndexList& indexes) const;
+
+  bool isIndexHidden(const QModelIndex& index) const;
+
+  QModelIndex indexOfEvent(vtkIdType eventId) const;
+
+  QList<vsEventUserInfo> eventList() const
+    {
+    return events;
+    }
+
+signals:
+  void eventRatingChanged(vtkIdType eventId, int rating);
+  void eventStatusChanged(vtkIdType eventId, int status);
+  void eventNoteChanged(vtkIdType eventId, QString note);
+
+public slots:
+  void addEvent(vtkVgEvent* event);
+  void updateEvent(vtkVgEvent* event);
+  void removeEvent(vtkIdType eventId);
+  void update();
+
+protected:
+  void setEventDisplayState(const QModelIndex& index, bool show);
+
+  QPixmap colorSwatch(const QColor&) const;
+
+protected slots:
+  void deferredAddEvents();
+  void deferredUpdateEvents();
+
+private:
+  Q_DISABLE_COPY(vsEventTreeModel)
+
+  vsScene* Scene;
+
+  vtkSmartPointer<vtkVgEventFilter> eventFilter;
+  vtkSmartPointer<vtkVgEventTypeRegistry> eventTypeRegistry;
+
+  const vgSwatchCache& swatchCache;
+
+  QList<vsEventUserInfo> events;
+  QMap<vtkIdType, vtkVgEvent*> addedEvents;
+  QList<vtkVgEvent*> updatedEvents;
+  QIcon yesIcon;
+  QIcon noIcon;
+
+  bool isSorted;
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsEventTreeSelectionModel.cxx b/Libraries/VspUserInterface/vsEventTreeSelectionModel.cxx
new file mode 100644
index 00000000..321ba929
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventTreeSelectionModel.cxx
@@ -0,0 +1,120 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventTreeSelectionModel.h"
+
+#include "vsEventTreeModel.h"
+#include "vsEventTreeView.h"
+
+//-----------------------------------------------------------------------------
+vsEventTreeSelectionModel::vsEventTreeSelectionModel(
+  vsEventTreeModel* model, QObject* parent) :
+  QItemSelectionModel(model, parent),
+  EventTreeModel(model)
+{
+  connect(this, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+          this, SLOT(updateSelection()));
+}
+
+//-----------------------------------------------------------------------------
+vsEventTreeSelectionModel::~vsEventTreeSelectionModel()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vsEventTreeSelectionModel::eventIdFromIndex(
+  const QModelIndex& index) const
+{
+  const QModelIndex ii =
+    this->EventTreeModel->index(index.row(), vsEventTreeModel::IdColumn);
+  return this->model()->data(ii).value<vtkIdType>();
+}
+
+//-----------------------------------------------------------------------------
+QSet<vtkIdType> vsEventTreeSelectionModel::selectedEvents() const
+{
+  QSet<vtkIdType> selectedIds;
+  foreach (QModelIndex i, this->selectedRows())
+    {
+    selectedIds.insert(this->eventIdFromIndex(i));
+    }
+  return selectedIds;
+}
+
+//-----------------------------------------------------------------------------
+int vsEventTreeSelectionModel::selectedEventCount() const
+{
+  return this->selectedRows().count();
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeSelectionModel::updateSelection()
+{
+  emit this->selectionChanged(this->selectedEvents());
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeSelectionModel::selectEvent(
+  vtkIdType eventId, SelectionFlags mode)
+{
+  QModelIndex index = this->EventTreeModel->indexOfEvent(eventId);
+
+  if (mode & Current)
+    {
+    // Just having the 'current' flag does not seem sufficient to actually set
+    // the current index... so call setCurrentIndex directly
+    this->setCurrentIndex(index, mode | Rows);
+    }
+  else
+    {
+    this->select(index, mode | Rows);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeSelectionModel::setSelectedEvents(QSet<vtkIdType> selectedIds)
+{
+  QItemSelection selection;
+  foreach (vtkIdType id, selectedIds)
+    {
+    QModelIndex index = this->EventTreeModel->indexOfEvent(id);
+    if (index.isValid())
+      {
+      selection.select(index, index);
+      }
+    }
+  this->select(selection, ClearAndSelect | Rows);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeSelectionModel::setCurrentEvent(vtkIdType currentId)
+{
+  if (currentId != -1)
+    {
+    QModelIndex index = this->EventTreeModel->indexOfEvent(currentId);
+    if (index.isValid())
+      {
+      this->setCurrentIndex(index, Current | Rows);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+QModelIndexList vsEventTreeSelectionModel::selectedRows(
+  QTreeView* view, int column) const
+{
+  QModelIndexList globalSelection = this->selectedRows(column);
+  QModelIndexList viewSelection;
+  foreach(const QModelIndex& i, globalSelection)
+    {
+    if (!view->isRowHidden(i.row(), i.parent()))
+      {
+      viewSelection.append(i);
+      }
+    }
+
+  return viewSelection;
+}
diff --git a/Libraries/VspUserInterface/vsEventTreeSelectionModel.h b/Libraries/VspUserInterface/vsEventTreeSelectionModel.h
new file mode 100644
index 00000000..ea557767
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventTreeSelectionModel.h
@@ -0,0 +1,60 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventTreeSelectionModel_h
+#define __vsEventTreeSelectionModel_h
+
+#include <QItemSelectionModel>
+
+#include <vtkType.h>
+
+class QTreeView;
+
+class vsEventTreeModel;
+
+class vsEventTreeSelectionModel : public QItemSelectionModel
+{
+  Q_OBJECT
+
+public:
+  vsEventTreeSelectionModel(vsEventTreeModel* model, QObject* parent = 0);
+  virtual ~vsEventTreeSelectionModel();
+
+  QSet<vtkIdType> selectedEvents() const;
+  int selectedEventCount() const;
+
+  // Reimplemented from QItemSelectionModel
+  using QItemSelectionModel::selectedRows;
+  QModelIndexList selectedRows(QTreeView* view, int column = 0) const;
+
+  const vsEventTreeModel* eventTreeModel() const
+    {
+    return this->EventTreeModel;
+    }
+
+signals:
+  void selectionChanged(QSet<vtkIdType> selectedEventIds);
+
+public slots:
+  void selectEvent(vtkIdType eventId,
+                   SelectionFlags mode = ClearAndSelect | Current);
+
+  void setSelectedEvents(QSet<vtkIdType> selectedIds);
+  void setCurrentEvent(vtkIdType currentId);
+
+protected slots:
+  void updateSelection();
+
+protected:
+  vtkIdType eventIdFromIndex(const QModelIndex& index) const;
+
+private:
+  Q_DISABLE_COPY(vsEventTreeSelectionModel)
+
+  vsEventTreeModel* const EventTreeModel;
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsEventTreeView.cxx b/Libraries/VspUserInterface/vsEventTreeView.cxx
new file mode 100644
index 00000000..12d16865
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventTreeView.cxx
@@ -0,0 +1,480 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventTreeView.h"
+
+#include <QDropEvent>
+#include <QHeaderView>
+#include <QSortFilterProxyModel>
+
+#include <qtGlobal.h>
+
+#include "vsEventTreeModel.h"
+#include "vsEventTreeSelectionModel.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+class vsSortFilterProxyModel : public QSortFilterProxyModel
+{
+protected:
+  virtual bool lessThan(const QModelIndex& left, const QModelIndex& right) const
+    {
+    switch (left.column())
+      {
+      case vsEventTreeModel::RatingColumn:
+        {
+        QVariant l = left.model()->data(left, vsEventTreeModel::RatingRole);
+        QVariant r = right.model()->data(right, vsEventTreeModel::RatingRole);
+        return l.toInt() < r.toInt();
+        }
+      case vsEventTreeModel::NameColumn:
+        {
+        QVariant l = left.model()->data(left, vsEventTreeModel::NameSortRole);
+        QVariant r = right.model()->data(right, vsEventTreeModel::NameSortRole);
+        return l.toInt() < r.toInt();
+        }
+      case vsEventTreeModel::StarColumn:
+        {
+        QVariant l = left.model()->data(left, vsEventTreeModel::StarRole);
+        QVariant r = right.model()->data(right, vsEventTreeModel::StarRole);
+        return l.toBool() < r.toBool();
+        }
+      }
+
+    return QSortFilterProxyModel::lessThan(left, right);
+    }
+};
+
+//-----------------------------------------------------------------------------
+class vsProxySelectionModel : public QItemSelectionModel
+{
+public:
+  vsProxySelectionModel(QAbstractProxyModel* proxy,
+                        QItemSelectionModel* model) :
+    QItemSelectionModel(proxy),
+    proxyItemModel(proxy),
+    underlyingSelectionModel(model)
+    {}
+
+  void select(const QItemSelection& selection)
+    {
+    const QItemSelection mappedSelection =
+      this->proxyItemModel->mapSelectionFromSource(selection);
+    this->QItemSelectionModel::select(mappedSelection, Select);
+    }
+
+  void deselect(const QItemSelection& selection)
+    {
+    const QItemSelection mappedSelection =
+      this->proxyItemModel->mapSelectionFromSource(selection);
+    this->QItemSelectionModel::select(mappedSelection, Deselect);
+    }
+
+protected:
+  virtual void select(
+    const QModelIndex& index, SelectionFlags command) QTE_OVERRIDE
+    {
+    const QModelIndex mappedIndex = this->proxyItemModel->mapToSource(index);
+    this->underlyingSelectionModel->select(mappedIndex, command);
+    }
+
+  virtual void select(
+    const QItemSelection& selection, SelectionFlags command) QTE_OVERRIDE
+    {
+    const QItemSelection mappedSelection =
+      this->proxyItemModel->mapSelectionToSource(selection);
+    this->underlyingSelectionModel->select(mappedSelection, command);
+    }
+
+  QAbstractProxyModel* const proxyItemModel;
+  QItemSelectionModel* const underlyingSelectionModel;
+};
+
+//-----------------------------------------------------------------------------
+class DisableSort
+{
+  QSortFilterProxyModel* Model;
+
+public:
+  DisableSort(QSortFilterProxyModel* model) : Model(model)
+    {
+    this->Model->setDynamicSortFilter(false);
+    }
+
+  ~DisableSort()
+    {
+    this->Model->setDynamicSortFilter(false);
+    }
+};
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vsEventTreeView::vsEventTreeView(QWidget* p) :
+  QTreeView(p),
+  eventTreeModel(0),
+  eventTreeSelectionModel(0),
+  showHiddenItems(true),
+  viewMode(vs::UnverifiedEvent)
+{
+  connect(this, SIGNAL(activated(const QModelIndex&)),
+          this, SLOT(itemActivated(const QModelIndex&)));
+}
+
+//-----------------------------------------------------------------------------
+vsEventTreeView::~vsEventTreeView()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::setModel(QAbstractItemModel* m)
+{
+  vsEventTreeModel* em = qobject_cast<vsEventTreeModel*>(m);
+  if (!em)
+    return;
+
+  // NOTE: Caller is responsible for deleting any prior model
+  this->eventTreeModel = em;
+
+  this->proxyModel.reset(new vsSortFilterProxyModel);
+  this->proxyModel->setSourceModel(this->eventTreeModel);
+  this->proxyModel->setDynamicSortFilter(false);
+
+  QAbstractItemModel* old = this->model();
+  this->QTreeView::setModel(this->proxyModel.data());
+  delete old;
+
+  this->setColumnHidden(vsEventTreeModel::IdColumn, true);
+  this->setColumnWidth(vsEventTreeModel::RatingColumn, 20);
+  this->setColumnWidth(vsEventTreeModel::StarColumn,
+                       this->header()->sectionSizeHint(
+                         vsEventTreeModel::StarColumn));
+  this->setColumnWidth(vsEventTreeModel::NameColumn, 50);
+  this->setColumnWidth(vsEventTreeModel::StartTimeColumn, 80);
+  this->setColumnWidth(vsEventTreeModel::EndTimeColumn, 80);
+  this->sortByColumn(vsEventTreeModel::NameColumn, Qt::AscendingOrder);
+  this->setSortingEnabled(true);
+
+  connect(this->proxyModel.data(),
+          SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+          this,
+          SLOT(updateRows(const QModelIndex&, int, int)));
+
+  connect(this->proxyModel.data(),
+          SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)),
+          this,
+          SLOT(updateRows(const QModelIndex&, const QModelIndex&)));
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::setSelectionModel(QItemSelectionModel* m)
+{
+  vsEventTreeSelectionModel* const esm =
+    qobject_cast<vsEventTreeSelectionModel*>(m);
+
+  if (!esm)
+    {
+    return;
+    }
+
+  this->eventTreeSelectionModel = esm;
+
+  vsProxySelectionModel* const psm =
+    new vsProxySelectionModel(this->proxyModel.data(), esm);
+  this->proxySelectionModel.reset(psm);
+  this->QTreeView::setSelectionModel(psm);
+
+  connect(esm, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
+          this, SLOT(updateSelection(QItemSelection, QItemSelection)));
+  connect(esm, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
+          this, SLOT(setCurrentIndex(QModelIndex)));
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::itemActivated(const QModelIndex& index)
+{
+  bool toEnd = (index.column() == vsEventTreeModel::EndTimeColumn);
+  emit this->jumpToEvent(this->eventIdFromIndex(index), toEnd);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::hideSelectedItems()
+{
+  DisableSort ds(this->proxyModel.data());
+
+  QModelIndexList selected = this->eventTreeSelectionModel->selectedRows(this);
+  foreach (QModelIndex i, selected)
+    {
+    this->eventTreeModel->setData(
+      i, false, vsEventTreeModel::DisplayStateRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::showSelectedItems()
+{
+  DisableSort ds(this->proxyModel.data());
+
+  QModelIndexList selected = this->eventTreeSelectionModel->selectedRows(this);
+  foreach (QModelIndex i, selected)
+    {
+    this->eventTreeModel->setData(
+      i, true, vsEventTreeModel::DisplayStateRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::jumpToSelectedStart()
+{
+  QModelIndex index = this->eventTreeSelectionModel->selectedRows(this).front();
+  emit this->jumpToEvent(this->eventIdFromIndex(index), false);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::jumpToSelectedEnd()
+{
+  QModelIndex index = this->eventTreeSelectionModel->selectedRows(this).front();
+  emit this->jumpToEvent(this->eventIdFromIndex(index), true);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::setSelectedItemsRating(
+  vgObjectStatus::enumObjectStatus rating)
+{
+  DisableSort ds(this->proxyModel.data());
+
+  const QModelIndexList selected =
+    this->eventTreeSelectionModel->selectedRows(
+      this, vsEventTreeModel::RatingColumn);
+
+  foreach (QModelIndex i, selected)
+    {
+    this->eventTreeModel->setData(
+      i, static_cast<int>(rating), vsEventTreeModel::RatingRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::setSelectedItemsStatus(vsEventStatus status)
+{
+  DisableSort ds(this->proxyModel.data());
+
+  const QModelIndexList selected =
+    this->eventTreeSelectionModel->selectedRows(
+      this, vsEventTreeModel::RatingColumn);
+
+  foreach (QModelIndex i, selected)
+    {
+    this->eventTreeModel->setData(
+      i, static_cast<int>(status), vsEventTreeModel::StatusRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::setSelectedItemsStarred(bool starred)
+{
+  DisableSort ds(this->proxyModel.data());
+
+  const QModelIndexList selected =
+    this->eventTreeSelectionModel->selectedRows(
+      this, vsEventTreeModel::StarColumn);
+
+  foreach (QModelIndex i, selected)
+    {
+    this->model()->setData(i, starred, vsEventTreeModel::StarRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::hideAllItems()
+{
+  DisableSort ds(this->proxyModel.data());
+
+  for (int i = 0, end = this->proxyModel->rowCount(); i < end; ++i)
+    {
+    QModelIndex idx =
+      this->proxyModel->mapToSource(this->proxyModel->index(i, 0));
+    int itemStatus =
+      this->eventTreeModel->data(idx, vsEventTreeModel::StatusRole).toInt();
+
+    if (itemStatus == this->viewMode)
+      {
+      this->eventTreeModel->setData(idx, false,
+                                    vsEventTreeModel::DisplayStateRole);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::showAllItems()
+{
+  DisableSort ds(this->proxyModel.data());
+
+  for (int i = 0, end = this->proxyModel->rowCount(); i < end; ++i)
+    {
+    QModelIndex idx =
+      this->proxyModel->mapToSource(this->proxyModel->index(i, 0));
+    int itemStatus =
+      this->eventTreeModel->data(idx, vsEventTreeModel::StatusRole).toInt();
+
+    if (itemStatus == this->viewMode)
+      {
+      this->eventTreeModel->setData(idx, true,
+                                    vsEventTreeModel::DisplayStateRole);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::setHiddenItemsShown(bool enable)
+{
+  if (enable == this->showHiddenItems)
+    return;
+
+  this->showHiddenItems = enable;
+
+  if (!this->proxyModel)
+    {
+    return;
+    }
+
+  for (int i = 0, end = this->proxyModel->rowCount(); i < end; ++i)
+    {
+    QModelIndex idx =
+      this->proxyModel->mapToSource(this->proxyModel->index(i, 0));
+    int itemStatus =
+      this->eventTreeModel->data(idx, vsEventTreeModel::StatusRole).toInt();
+
+    if (itemStatus != this->viewMode)
+      continue;
+
+    if (this->eventTreeModel->isIndexHidden(idx))
+      this->setRowHidden(i, QModelIndex(), !enable);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::updateRows(const QModelIndex& start,
+                                 const QModelIndex& end)
+{
+  this->updateRows(QModelIndex(), start.row(), end.row());
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::updateRows(
+  const QModelIndex& parent, int start, int end)
+{
+  for (int i = start; i <= end; ++i)
+    {
+    QModelIndex pidx = this->proxyModel->index(i, 0, parent);
+    QModelIndex idx = this->proxyModel->mapToSource(pidx);
+
+    int itemStatus =
+      this->eventTreeModel->data(idx, vsEventTreeModel::StatusRole).toInt();
+
+    bool hide;
+    if (itemStatus != this->viewMode)
+      {
+      hide = true;
+      }
+    else if (this->eventTreeModel->isIndexHidden(idx))
+      {
+      hide = !this->showHiddenItems ;
+      }
+    else
+      {
+      hide = false;
+      }
+
+    if (this->isRowHidden(i, parent) != hide)
+      {
+      this->setRowHidden(i, parent, hide);
+
+      // Unselect hidden rows
+      if (hide)
+        {
+        this->selectionModel()->select(pidx, QItemSelectionModel::Rows |
+                                             QItemSelectionModel::Deselect);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::updateSelection(
+  const QItemSelection& selected, const QItemSelection& deselected)
+{
+  vsProxySelectionModel* const psm =
+    static_cast<vsProxySelectionModel*>(this->proxySelectionModel.data());
+  psm->select(selected);
+  psm->deselect(deselected);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::setCurrentIndex(const QModelIndex& current)
+{
+  const QModelIndex mappedCurrent = this->proxyModel->mapFromSource(current);
+  this->proxySelectionModel->setCurrentIndex(
+    mappedCurrent, QItemSelectionModel::Current);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::dropEvent(QDropEvent* event)
+{
+  DisableSort ds(this->proxyModel.data());
+
+  const QMimeData* data = event->mimeData();
+  QByteArray encodedData = data->data("application/vnd.kitware.event");
+  QDataStream stream(&encodedData, QIODevice::ReadOnly);
+
+  while (!stream.atEnd())
+    {
+    vtkIdType id;
+    stream >> id;
+
+    QModelIndex idx = this->eventTreeModel->indexOfEvent(id);
+
+    // Give the dropped row this view's status to 'move' it to our view.
+    this->eventTreeModel->setData(idx,
+                                  this->viewMode,
+                                  vsEventTreeModel::StatusRole);
+
+    // Automatically give events a negative rating if they were dropped in the
+    // Rejected list.
+    if (this->viewMode == vs::RejectedEvent)
+      {
+      this->eventTreeModel->setData(
+        idx, vgObjectStatus::Excluded, vsEventTreeModel::RatingRole);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeView::mousePressEvent(QMouseEvent* event)
+{
+  if (event->button() == Qt::LeftButton)
+    {
+    QModelIndex i = indexAt(event->pos());
+    if (i.isValid() && i.column() == vsEventTreeModel::StarColumn)
+      {
+      const bool starred =
+        this->model()->data(i, vsEventTreeModel::StarRole).toBool();
+      this->model()->setData(i, !starred, vsEventTreeModel::StarRole);
+      return;
+      }
+    }
+  QTreeView::mousePressEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vsEventTreeView::eventIdFromIndex(const QModelIndex& index) const
+{
+  return this->model()->data(
+           this->model()->index(
+             index.row(), vsEventTreeModel::IdColumn)).value<vtkIdType>();
+}
diff --git a/Libraries/VspUserInterface/vsEventTreeView.h b/Libraries/VspUserInterface/vsEventTreeView.h
new file mode 100644
index 00000000..b3092290
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventTreeView.h
@@ -0,0 +1,87 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventTreeView_h
+#define __vsEventTreeView_h
+
+#include <QTreeView>
+
+#include <vtkType.h>
+
+#include <vtkVgTypeDefs.h>
+
+#include "vsEventStatus.h"
+
+class vsEventTreeModel;
+class vsEventTreeSelectionModel;
+
+class QSortFilterProxyModel;
+
+class vsEventTreeView : public QTreeView
+{
+  Q_OBJECT
+
+public:
+  vsEventTreeView(QWidget* parent = 0);
+  virtual ~vsEventTreeView();
+
+  void setStatusFilter(vsEventStatus s) { this->viewMode = s; }
+
+  // Reimplemented from QWidget
+  virtual void setModel(QAbstractItemModel* m);
+  virtual void setSelectionModel(QItemSelectionModel* selectionModel);
+  virtual void dropEvent(QDropEvent* event);
+  virtual void mousePressEvent(QMouseEvent* event);
+
+  const vsEventTreeSelectionModel* underlyingSelectionModel()
+    {
+    return this->eventTreeSelectionModel;
+    }
+
+signals:
+  void jumpToEvent(vtkIdType eventId, bool jumpToEnd);
+
+public slots:
+  void hideAllItems();
+  void showAllItems();
+  void setHiddenItemsShown(bool enable);
+
+  void hideSelectedItems();
+  void showSelectedItems();
+
+  void setSelectedItemsRating(vgObjectStatus::enumObjectStatus rating);
+  void setSelectedItemsStatus(vsEventStatus status);
+  void setSelectedItemsStarred(bool starred);
+
+  void jumpToSelectedStart();
+  void jumpToSelectedEnd();
+
+protected slots:
+  void itemActivated(const QModelIndex& index);
+
+  void updateRows(const QModelIndex& parent, int start, int end);
+  void updateRows(const QModelIndex& start, const QModelIndex& end);
+
+  void updateSelection(const QItemSelection& selected,
+                       const QItemSelection& deselected);
+  void setCurrentIndex(const QModelIndex& current);
+
+protected:
+  vtkIdType eventIdFromIndex(const QModelIndex& index) const;
+
+private:
+  Q_DISABLE_COPY(vsEventTreeView)
+
+  vsEventTreeModel* eventTreeModel;
+  vsEventTreeSelectionModel* eventTreeSelectionModel;
+  QScopedPointer<QSortFilterProxyModel> proxyModel;
+  QScopedPointer<QItemSelectionModel> proxySelectionModel;
+
+  bool showHiddenItems;
+  vsEventStatus viewMode;
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsEventTreeWidget.cxx b/Libraries/VspUserInterface/vsEventTreeWidget.cxx
new file mode 100644
index 00000000..7e7604fe
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventTreeWidget.cxx
@@ -0,0 +1,337 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventTreeWidget.h"
+#include "ui_eventTree.h"
+#include "am_eventTree.h"
+
+#include <QContextMenuEvent>
+#include <QMenu>
+
+#include <qtMap.h>
+#include <qtScopedValueChange.h>
+
+#include <vgTextEditDialog.h>
+
+#include "vsEventRatingMenu.h"
+#include "vsEventTreeModel.h"
+#include "vsEventTreeSelectionModel.h"
+
+#define connectEventTreeButtonToggled(_a_, _s_) do { \
+  connect(_a_, SIGNAL(toggled(bool)), tree, SLOT(_s_(bool))); \
+  tree->_s_(_a_->isChecked()); \
+  } while (0)
+
+//-----------------------------------------------------------------------------
+class vsEventTreeWidgetPrivate
+{
+public:
+  Ui::vsEventTreeWidget UI;
+  Am::vsEventTreeWidget AM;
+
+  QMenu* contextMenu;
+  QMenu* ratingMenu;
+
+  vsEventTreeSelectionModel* selectionModel;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsEventTreeWidget)
+
+//-----------------------------------------------------------------------------
+vsEventTreeWidget::vsEventTreeWidget(QWidget* parent) :
+  QWidget(parent), d_ptr(new vsEventTreeWidgetPrivate)
+{
+  QTE_D(vsEventTreeWidget);
+
+  d->UI.setupUi(this);
+  d->AM.setupActions(d->UI, this);
+
+  vsEventTreeView* const tree = d->UI.tree;
+  d->selectionModel = 0;
+
+  // Add all actions as actions of this widget, so shortcuts will work
+  foreach (QObject* object, this->children())
+    {
+    QAction* action = qobject_cast<QAction*>(object);
+    if (action)
+      this->addAction(action);
+    }
+
+  connect(d->UI.actionHideAll, SIGNAL(triggered()),
+          tree, SLOT(hideAllItems()));
+  connect(d->UI.actionShowAll, SIGNAL(triggered()),
+          tree, SLOT(showAllItems()));
+  connect(d->UI.actionHideSelected, SIGNAL(triggered()),
+          tree, SLOT(hideSelectedItems()));
+  connect(d->UI.actionShowSelected, SIGNAL(triggered()),
+          tree, SLOT(showSelectedItems()));
+  connect(d->UI.actionSetEventStart, SIGNAL(triggered(bool)),
+          this, SLOT(setSelectedEventsStart()));
+  connect(d->UI.actionSetEventEnd, SIGNAL(triggered(bool)),
+          this, SLOT(setSelectedEventsEnd()));
+  connect(d->UI.actionAddStar, SIGNAL(triggered()),
+          this, SLOT(addStar()));
+  connect(d->UI.actionRemoveStar, SIGNAL(triggered()),
+          this, SLOT(removeStar()));
+  connect(d->UI.actionEditNote, SIGNAL(triggered()),
+          this, SLOT(editNote()));
+
+  // Connect signal and slot and sync GUI state with underlying model state
+  connectEventTreeButtonToggled(d->UI.actionShowHiddenItems,
+                                setHiddenItemsShown);
+
+  connect(d->UI.actionJumpToStart, SIGNAL(triggered()),
+          tree, SLOT(jumpToSelectedStart()));
+  connect(d->UI.actionJumpToEnd, SIGNAL(triggered()),
+          tree, SLOT(jumpToSelectedEnd()));
+
+  connect(tree, SIGNAL(jumpToEvent(vtkIdType, bool)),
+          this, SIGNAL(jumpToEvent(vtkIdType, bool)));
+
+  d->contextMenu = new QMenu(this);
+  d->contextMenu->addAction(d->UI.actionShowSelected);
+  d->contextMenu->addAction(d->UI.actionHideSelected);
+  d->contextMenu->addAction(d->UI.actionJumpToStart);
+  d->contextMenu->addAction(d->UI.actionJumpToEnd);
+  d->contextMenu->addSeparator();
+  d->contextMenu->addAction(d->UI.actionSetEventStart);
+  d->contextMenu->addAction(d->UI.actionSetEventEnd);
+  d->contextMenu->addSeparator();
+  d->ratingMenu = d->contextMenu->addMenu("&Rate As");
+
+  vsEventRatingMenu::buildMenu(d->ratingMenu);
+
+  QAction* unrated =
+    vsEventRatingMenu::getAction(d->ratingMenu, vsEventRatingMenu::Unrated);
+  QAction* relevant =
+    vsEventRatingMenu::getAction(d->ratingMenu, vsEventRatingMenu::Relevant);
+  QAction* excluded =
+    vsEventRatingMenu::getAction(d->ratingMenu, vsEventRatingMenu::Excluded);
+  QAction* rejected =
+    vsEventRatingMenu::getAction(d->ratingMenu, vsEventRatingMenu::Rejected);
+
+  unrated->setShortcut(Qt::Key_Slash);
+  relevant->setShortcut(Qt::Key_Plus);
+  excluded->setShortcut(Qt::Key_Minus);
+  rejected->setShortcut(Qt::Key_Delete);
+
+  unrated->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+  relevant->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+  excluded->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+  rejected->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+
+  this->addActions(d->ratingMenu->actions());
+
+  connect(unrated, SIGNAL(triggered()),
+          this, SLOT(setSelectedEventsToUnratedVerified()));
+
+  connect(relevant, SIGNAL(triggered()),
+          this, SLOT(setSelectedEventsToRelevantVerified()));
+
+  connect(excluded, SIGNAL(triggered()),
+          this, SLOT(setSelectedEventsToNotRelevantVerified()));
+
+  connect(rejected, SIGNAL(triggered()),
+          this, SLOT(setSelectedEventsToNotRelevantRejected()));
+
+  connect(this, SIGNAL(selectionStatusChanged(bool)),
+          unrated, SLOT(setEnabled(bool)));
+  connect(this, SIGNAL(selectionStatusChanged(bool)),
+          relevant, SLOT(setEnabled(bool)));
+  connect(this, SIGNAL(selectionStatusChanged(bool)),
+          excluded, SLOT(setEnabled(bool)));
+  connect(this, SIGNAL(selectionStatusChanged(bool)),
+          rejected, SLOT(setEnabled(bool)));
+  connect(this, SIGNAL(selectionStatusChanged(bool)),
+          d->ratingMenu, SLOT(setEnabled(bool)));
+  unrated->setEnabled(false);
+  relevant->setEnabled(false);
+  excluded->setEnabled(false);
+  rejected->setEnabled(false);
+  d->ratingMenu->setEnabled(false);
+
+  d->contextMenu->addSeparator();
+  d->contextMenu->addAction(d->UI.actionAddStar);
+  d->contextMenu->addAction(d->UI.actionRemoveStar);
+  d->contextMenu->addSeparator();
+  d->contextMenu->addAction(d->UI.actionEditNote);
+
+  qtScopedBlockSignals bs(this);
+  this->updateSelectionStatus(QSet<vtkIdType>());
+}
+
+//-----------------------------------------------------------------------------
+vsEventTreeWidget::~vsEventTreeWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::contextMenuEvent(QContextMenuEvent* event)
+{
+  QTE_D(vsEventTreeWidget);
+
+  if (d->UI.tree->isAncestorOf(this->childAt(event->pos())))
+    {
+    d->contextMenu->exec(event->globalPos());
+    return;
+    }
+
+  QWidget::contextMenuEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setStatusFilter(vsEventStatus s)
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.tree->setStatusFilter(s);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setModel(vsEventTreeModel* model)
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.tree->setModel(model);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setSelectionModel(vsEventTreeSelectionModel* model)
+{
+  QTE_D(vsEventTreeWidget);
+  d->selectionModel = model;
+  d->UI.tree->setSelectionModel(model);
+
+  connect(model, SIGNAL(selectionChanged(QSet<vtkIdType>)),
+          this, SLOT(updateSelectionStatus(QSet<vtkIdType>)));
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::selectEvent(vtkIdType eventId)
+{
+  QTE_D(vsEventTreeWidget);
+  d->selectionModel->selectEvent(eventId);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::updateSelectionStatus(QSet<vtkIdType> selection)
+{
+  QTE_D(vsEventTreeWidget);
+
+  const int count = selection.count();
+  d->UI.actionJumpToStart->setEnabled(count == 1);
+  d->UI.actionJumpToEnd->setEnabled(count == 1);
+  d->UI.actionEditNote->setEnabled(count == 1);
+
+  // Get count of modifiable events
+  int modifiableCount = 0;
+
+  const vsEventTreeSelectionModel* esm =
+    d->UI.tree->underlyingSelectionModel();
+  if (esm && esm->eventTreeModel())
+    {
+    const vsEventTreeModel* model = esm->eventTreeModel();
+    foreach (const QModelIndex& i, esm->selectedRows())
+      {
+      const bool modifiable =
+        model->data(i, vsEventTreeModel::ModifiableRole).toBool();
+      modifiableCount += (modifiable ? 1 : 0);
+      }
+    }
+
+  d->UI.actionSetEventStart->setEnabled(modifiableCount > 0 &&
+                                        modifiableCount == count);
+  d->UI.actionSetEventEnd->setEnabled(modifiableCount > 0 &&
+                                      modifiableCount == count);
+
+  emit this->selectionChanged(selection);
+  emit this->selectionStatusChanged(count > 0);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setSelectedEventsToUnratedVerified()
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.tree->setSelectedItemsRating(vgObjectStatus::None);
+  d->UI.tree->setSelectedItemsStatus(vs::VerifiedEvent);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setSelectedEventsToRelevantVerified()
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.tree->setSelectedItemsRating(vgObjectStatus::Adjudicated);
+  d->UI.tree->setSelectedItemsStatus(vs::VerifiedEvent);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setSelectedEventsToNotRelevantVerified()
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.tree->setSelectedItemsRating(vgObjectStatus::Excluded);
+  d->UI.tree->setSelectedItemsStatus(vs::VerifiedEvent);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setSelectedEventsToNotRelevantRejected()
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.tree->setSelectedItemsRating(vgObjectStatus::Excluded);
+  d->UI.tree->setSelectedItemsStatus(vs::RejectedEvent);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setHiddenItemsShown(bool enable)
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.actionShowHiddenItems->setChecked(enable);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::addStar()
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.tree->setSelectedItemsStarred(true);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::removeStar()
+{
+  QTE_D(vsEventTreeWidget);
+  d->UI.tree->setSelectedItemsStarred(false);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::editNote()
+{
+  QTE_D(vsEventTreeWidget);
+
+  const QModelIndex i = d->UI.tree->selectionModel()->selectedRows().first();
+  const QModelIndex n =
+    d->UI.tree->model()->index(i.row(), vsEventTreeModel::NoteColumn);
+  QString note = d->UI.tree->model()->data(n).toString();
+
+  bool ok = false;
+  note = vgTextEditDialog::getText(this, "Edit Event Note", note, &ok);
+  if (ok)
+    {
+    d->UI.tree->model()->setData(n, note, Qt::DisplayRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setSelectedEventsStart()
+{
+  QTE_D(vsEventTreeWidget);
+  qtUtil::mapBound(d->selectionModel->selectedEvents(), this,
+                   &vsEventTreeWidget::setEventStartRequested);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventTreeWidget::setSelectedEventsEnd()
+{
+  QTE_D(vsEventTreeWidget);
+  qtUtil::mapBound(d->selectionModel->selectedEvents(), this,
+                   &vsEventTreeWidget::setEventEndRequested);
+}
diff --git a/Libraries/VspUserInterface/vsEventTreeWidget.h b/Libraries/VspUserInterface/vsEventTreeWidget.h
new file mode 100644
index 00000000..ff8fa88e
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventTreeWidget.h
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventTreeWidget_h
+#define __vsEventTreeWidget_h
+
+#include <QSet>
+#include <QWidget>
+
+#include <qtGlobal.h>
+
+#include <vtkType.h>
+
+#include "vsEventStatus.h"
+
+class QAction;
+class QMenu;
+
+class vsEventTreeModel;
+class vsEventTreeSelectionModel;
+
+class vsEventTreeWidgetPrivate;
+
+class vsEventTreeWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vsEventTreeWidget(QWidget* parent);
+  ~vsEventTreeWidget();
+
+  void setStatusFilter(vsEventStatus s);
+  void setModel(vsEventTreeModel*);
+  void setSelectionModel(vsEventTreeSelectionModel*);
+  void setHiddenItemsShown(bool enable);
+
+  virtual void contextMenuEvent(QContextMenuEvent* event);
+
+signals:
+  void selectionChanged(QSet<vtkIdType> selectedEventIds);
+  void selectionStatusChanged(bool selectionIsNonEmpty);
+
+  void jumpToEvent(vtkIdType eventId, bool jumpToEnd);
+
+  void setEventStartRequested(vtkIdType);
+  void setEventEndRequested(vtkIdType);
+
+public slots:
+  void selectEvent(vtkIdType eventId);
+
+protected slots:
+  void updateSelectionStatus(QSet<vtkIdType> selection);
+
+  void setSelectedEventsToUnratedVerified();
+  void setSelectedEventsToRelevantVerified();
+  void setSelectedEventsToNotRelevantVerified();
+  void setSelectedEventsToNotRelevantRejected();
+
+  void addStar();
+  void removeStar();
+
+  void editNote();
+
+  void setSelectedEventsStart();
+  void setSelectedEventsEnd();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsEventTreeWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(vsEventTreeWidget)
+  Q_DISABLE_COPY(vsEventTreeWidget)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsEventUserInfo.h b/Libraries/VspUserInterface/vsEventUserInfo.h
new file mode 100644
index 00000000..e4d18762
--- /dev/null
+++ b/Libraries/VspUserInterface/vsEventUserInfo.h
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventUserInfo_h
+#define __vsEventUserInfo_h
+
+#include <QString>
+
+class vtkVgEvent;
+
+class vsEventUserInfo
+{
+public:
+  vtkVgEvent* Event;
+  int Status;
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsMainWindow.cxx b/Libraries/VspUserInterface/vsMainWindow.cxx
new file mode 100644
index 00000000..9d2618bf
--- /dev/null
+++ b/Libraries/VspUserInterface/vsMainWindow.cxx
@@ -0,0 +1,1699 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsMainWindow.h"
+#include "vsMainWindowPrivate.h"
+
+#include <QComboBox>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QSignalMapper>
+#include <QTextStream>
+#include <QTimer>
+
+#ifdef ENABLE_QTTESTING
+#include <pqCoreTestUtility.h>
+#endif
+
+#include <qtDockController.h>
+#include <qtDoubleInputDialog.h>
+#include <qtKstReader.h>
+#include <qtPrioritizedToolBarProxy.h>
+#include <qtScopedValueChange.h>
+#include <qtUtil.h>
+
+#include <vgCheckArg.h>
+
+#include <vgFileDialog.h>
+#include <vgUnixTime.h>
+
+#include <vgAboutAction.h>
+
+#include <vtkVgVideoMetadata.h>
+
+#include <vvMakeId.h>
+#include <vvWriter.h>
+
+#include <vsSourceFactory.h>
+#include <vsSourceService.h>
+
+#include "vsAlertEditor.h"
+#include "vsApplication.h"
+#include "vsCore.h"
+#include "vsQfDialog.h"
+#include "vsQfVideoSource.h"
+#include "vsScene.h"
+#include "vsSettings.h"
+#include "vsTrackColorDialog.h"
+#include "vsTrackInfo.h"
+#include "vsUiExtensionInterface.h"
+
+QTE_IMPLEMENT_D_FUNC(vsMainWindow)
+
+//BEGIN miscellaneous helper functions
+
+namespace // anonymous
+{
+
+#define connectSceneDisplayToggle(_a_, _s_) do { \
+  connect(_a_, SIGNAL(toggled(bool)), scene, SLOT(_s_(bool))); \
+  scene->_s_(_a_->isChecked()); \
+  } while (0)
+
+//-----------------------------------------------------------------------------
+void mapIntAction(QSignalMapper* mapper, QAction* action, int id)
+{
+  mapper->setMapping(action, id);
+  action->connect(action, SIGNAL(toggled(bool)), mapper, SLOT(map()));
+}
+
+//-----------------------------------------------------------------------------
+void copyBoolOption(QAction* from, QAction* to)
+{
+  to->setChecked(from->isChecked());
+}
+
+//-----------------------------------------------------------------------------
+void copyBoolOption(QCheckBox* from, QCheckBox* to)
+{
+  to->setChecked(from->isChecked());
+}
+
+} // namespace <anonymous>
+
+//END miscellaneous helper functions
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsMainWindow
+
+//-----------------------------------------------------------------------------
+vsMainWindow::vsMainWindow(vsCore* core, vsMainWindow* invokingView)
+  : d_ptr(new vsMainWindowPrivate(this))
+{
+  QTE_D(vsMainWindow);
+
+  d->Core = core;
+  vsScene* scene = d->Scene = new vsScene(core, this);
+
+  // Set up UI
+  d->UI.setupUi(this);
+  d->AM.setupActions(d->UI, this);
+  connect(d->UI.actionQuit, SIGNAL(triggered()), qApp, SLOT(quit()));
+
+  this->pushViewCursor(d->UI.renderFrame->cursor(), 0);
+
+  scene->setupUi(d->UI.renderFrame);
+  scene->setupFilterWidget(d->UI.filter);
+  scene->setupRegionList(d->UI.regionTree);
+  scene->setupAlertList(d->UI.alertTree);
+  scene->setupEventTree(d->UI.eventTree,
+                        d->UI.verifiedEventTree,
+                        d->UI.rejectedEventTree);
+  scene->setupTrackTree(d->UI.trackTree);
+
+  d->UI.regionTree->addContextMenuAction(d->UI.actionRegionRemoveSelected);
+  d->UI.regionTree->setEventTypes(d->Core->manualEventTypes());
+  connect(d->UI.regionTree, SIGNAL(selectionStatusChanged(bool)),
+          d->UI.actionRegionRemoveSelected, SLOT(setEnabled(bool)));
+
+  d->UI.eventInfo->setEventTypeRegistry(core->eventTypeRegistry());
+  connect(scene, SIGNAL(selectedEventsChanged(QList<vtkVgEvent*>)),
+          d->UI.eventInfo, SLOT(setEvents(QList<vtkVgEvent*>)));
+  connect(core, SIGNAL(eventChanged(vtkVgEvent*)),
+          d->UI.eventInfo, SLOT(updateEvent(vtkVgEvent*)));
+  connect(core, SIGNAL(eventRatingChanged(vtkVgEvent*, int)),
+          d->UI.eventInfo, SLOT(updateEvent(vtkVgEvent*)));
+  connect(core, SIGNAL(eventNoteChanged(vtkVgEvent*, QString)),
+          d->UI.eventInfo, SLOT(updateEvent(vtkVgEvent*)));
+
+  // Create placeholders for tools menu and tool bar, and add built-in tools
+  d->ToolsMenu.reset(new qtPrioritizedMenuProxy(d->UI.menuTools));
+  d->ToolsToolBar.reset(new qtPrioritizedToolBarProxy(d->UI.toolsToolBar));
+  d->ToolsMenu->insertAction(d->UI.actionFormulateQuery, 400);
+  d->ToolsToolBar->insertAction(d->UI.actionFormulateQuery, 400);
+
+  // Set window title (i.e. add version number) and icon
+  QString title("%1 %3");
+  const QString version = QApplication::applicationVersion();
+  title = title.arg(this->windowTitle()).arg(version);
+  this->setWindowTitle(title);
+  qtUtil::setApplicationIcon("vsPlay", this);
+
+  // Set up About dialog
+  d->UI.menuHelp->addAction(new vgAboutAction(this));
+
+  // Set up docks
+  d->UI.filterDock->hide();
+  d->UI.regionDock->hide();
+  d->UI.eventsDock->hide();
+  d->UI.verifiedEventsDock->hide();
+  d->UI.rejectedEventsDock->hide();
+  d->UI.eventInfoDock->hide();
+  d->DockController = new qtDockController(this);
+
+  d->DockController->addToggleAction(
+    d->UI.actionWindowFilterShow,
+    d->UI.filterDock);
+  d->DockController->addToggleAction(
+    d->UI.actionWindowRegionShow,
+    d->UI.regionDock);
+  d->DockController->addToggleAction(
+    d->UI.actionWindowAlertShow,
+    d->UI.alertDock);
+  d->DockController->addToggleAction(
+    d->UI.actionWindowEventsShow,
+    d->UI.eventsDock);
+  d->DockController->addToggleAction(
+    d->UI.actionWindowVerifiedEventsShow,
+    d->UI.verifiedEventsDock);
+  d->DockController->addToggleAction(
+    d->UI.actionWindowRejectedEventsShow,
+    d->UI.rejectedEventsDock);
+  d->DockController->addToggleAction(
+    d->UI.actionWindowEventInfoShow,
+    d->UI.eventInfoDock);
+  d->DockController->addToggleAction(
+    d->UI.actionWindowTracksShow,
+    d->UI.tracksDock);
+
+  // Set up status bar
+  d->setupStatusBar();
+
+  this->setVideoSourceStatus(vsDataSource::NoSource);
+  this->setTrackSourceStatus(vsDataSource::NoSource);
+  this->setDescriptorSourceStatus(vsDataSource::NoSource);
+
+  // Set up video scrubber
+  d->UI.scrubber->setRange(vgTimeStamp::fromTime(-1.0),
+                           vgTimeStamp::fromTime(-1.0));
+  d->UI.scrubber->setSingleStep(vgTimeStamp(1e4, 1u));
+  d->UI.scrubber->setWheelStep(vgTimeStamp(0.0875e6, 1u));
+  d->UI.scrubber->setPageStep(vgTimeStamp(1e6 /* 1 second */, 10u));
+
+  // Set up region related UI
+  d->RegionType = new QComboBox(d->UI.drawingToolBar);
+  d->RegionType->setObjectName("regionType");
+  vsContour::populateTypeWidget(d->RegionType);
+  d->UI.drawingToolBar->insertWidget(d->UI.actionRegionClose, d->RegionType);
+  connect(d->RegionType, SIGNAL(currentIndexChanged(int)),
+          d, SLOT(updateDrawingType()));
+  d->updateDrawingType();
+
+  d->UI.regionTree->sortItems(0, Qt::AscendingOrder);
+
+  // Set up source factory actions
+  d->SourceMapper = new QSignalMapper(this);
+  qtPrioritizedMenuProxy videoMenu(d->UI.menuVideo, d->UI.actionQuit,
+                                   qtUtil::AddSeparatorAfter);
+  qtPrioritizedMenuProxy trackMenu(d->UI.menuTracks);
+  qtPrioritizedMenuProxy descriptorMenu(d->UI.menuDescriptors);
+  vsSourceService::createActions(this, d->SourceMapper,
+                                 videoMenu, trackMenu, descriptorMenu);
+  connect(d->SourceMapper, SIGNAL(mapped(QString)),
+          this, SLOT(createSource(QString)));
+
+  // Connect to scene inputs
+  connect(d->UI.scrubber, SIGNAL(valueChanged(vgTimeStamp, vg::SeekMode)),
+          this, SLOT(seekVideo(vgTimeStamp, vg::SeekMode)));
+  connect(d->UI.actionViewReset, SIGNAL(triggered()),
+          scene, SLOT(resetView()));
+
+  d->VideoSamplingMapper = new QSignalMapper(this);
+  connect(d->VideoSamplingMapper, SIGNAL(mapped(int)),
+          d->Scene, SLOT(setVideoSamplingMode(int)));
+  mapIntAction(d->VideoSamplingMapper, d->UI.actionVideoSampleNearest, 0);
+  mapIntAction(d->VideoSamplingMapper, d->UI.actionVideoSampleLinear, 1);
+  mapIntAction(d->VideoSamplingMapper, d->UI.actionVideoSampleBicubic, 2);
+
+  d->Scene->setVideoSamplingMode(
+    d->resampleMode(d->AM.videoSampling->checkedAction()));
+
+  connectSceneDisplayToggle(d->UI.actionTracksShow,
+                            setTracksVisible);
+  connectSceneDisplayToggle(d->UI.actionTracksShowBoxes,
+                            setTrackBoxesVisible);
+  connectSceneDisplayToggle(d->UI.actionTracksShowId,
+                            setTrackIdsVisible);
+  connectSceneDisplayToggle(d->UI.actionTracksShowPvo,
+                            setTrackPvoScoresVisible);
+  connectSceneDisplayToggle(d->UI.actionEventsTracksShow,
+                            setEventTracksVisible);
+  connectSceneDisplayToggle(d->UI.actionEventsBoxesShow,
+                            setEventBoxesVisible);
+  connectSceneDisplayToggle(d->UI.actionEventsLabelsShow,
+                            setEventLabelsVisible);
+  connectSceneDisplayToggle(d->UI.actionEventsProbabilityShow,
+                            setEventProbabilityVisible);
+  connectSceneDisplayToggle(d->UI.groundTruthVisible,
+                            setGroundTruthVisible);
+  connectSceneDisplayToggle(d->UI.actionVideoMaskShowTracking,
+                            setTrackingMaskVisible);
+  connectSceneDisplayToggle(d->UI.actionVideoMaskShowFiltering,
+                            setFilteringMaskVisible);
+  connectSceneDisplayToggle(d->UI.actionFollowEvent,
+                            setFollowEvent);
+
+  connect(d->UI.actionRegionClose, SIGNAL(triggered()),
+          scene, SLOT(closeContour()));
+
+  // Connect correlated display toggles
+  connect(d->UI.actionTracksShow, SIGNAL(toggled(bool)),
+          this, SLOT(updateTrackLabelActionsEnabled()));
+  connect(d->UI.actionTracksShowBoxes, SIGNAL(toggled(bool)),
+          this, SLOT(updateTrackLabelActionsEnabled()));
+
+  // Connect to scene outputs
+  connect(scene, SIGNAL(updated()), d->UI.renderFrame, SLOT(update()));
+  connect(scene, SIGNAL(videoSeekRequestDiscarded(qint64, vtkVgTimeStamp)),
+          this, SLOT(updateVideoPosition(qint64, vtkVgTimeStamp)));
+  connect(scene, SIGNAL(videoMetadataUpdated(vtkVgVideoFrameMetaData, qint64)),
+          this, SLOT(updateVideoMetadata(vtkVgVideoFrameMetaData, qint64)));
+  connect(scene, SIGNAL(playbackStatusChanged(vgVideoPlayer::PlaybackMode, qreal)),
+          this, SLOT(setPlaybackStatus(vgVideoPlayer::PlaybackMode, qreal)));
+  connect(scene, SIGNAL(locationTextUpdated(QString)),
+          this, SLOT(setCursorLocationText(QString)));
+  connect(scene, SIGNAL(statusMessageAvailable(QString)),
+          this, SLOT(setStatusText(QString)));
+  connect(scene, SIGNAL(contourStarted()), d, SLOT(enableRegionClose()));
+  connect(scene, SIGNAL(contourClosed()), d, SLOT(disableRegionClose()));
+  connect(scene, SIGNAL(drawingEnded()), d, SLOT(completeDrawing()));
+  connect(scene, SIGNAL(interactionCanceled()), d, SLOT(cancelDrawing()));
+
+  // Connect to core outputs
+  connect(core, SIGNAL(statusMessageAvailable(QString)),
+          this, SLOT(setStatusText(QString)));
+  connect(core, SIGNAL(videoSourceChanged(vsVideoSource*)),
+          this, SLOT(changeVideoSource(vsVideoSource*)));
+  connect(core, SIGNAL(videoSourceChanged(vsVideoSource*)),
+          this, SLOT(resetVideo()));
+  connect(core, SIGNAL(videoTimeRangeAvailableUpdated(vtkVgTimeStamp,
+                                                      vtkVgTimeStamp)),
+          this, SLOT(updateVideoAvailableTimeRange(vtkVgTimeStamp,
+                                                   vtkVgTimeStamp)));
+  connect(core, SIGNAL(videoSourceStatusChanged(vsDataSource::Status)),
+          this, SLOT(setVideoSourceStatus(vsDataSource::Status)));
+  connect(core, SIGNAL(trackSourceStatusChanged(vsDataSource::Status)),
+          this, SLOT(setTrackSourceStatus(vsDataSource::Status)));
+  connect(core, SIGNAL(descriptorSourceStatusChanged(vsDataSource::Status)),
+          this, SLOT(setDescriptorSourceStatus(vsDataSource::Status)));
+  connect(core, SIGNAL(acceptedInputsChanged(vsDescriptorInput::Types)),
+          d, SLOT(enableInputs(vsDescriptorInput::Types)));
+  d->enableInputs(core->acceptedInputs());
+
+  // Connect playback actions
+  connect(d->UI.actionVideoPlayLive, SIGNAL(triggered()),
+          this, SLOT(setVideoPlaybackLive()));
+  connect(d->UI.actionVideoPlay, SIGNAL(triggered()),
+          this, SLOT(setVideoPlaybackNormal()));
+  connect(d->UI.actionVideoPause, SIGNAL(triggered()),
+          this, SLOT(setVideoPlaybackPaused()));
+  connect(d->UI.actionVideoResume, SIGNAL(triggered()),
+          this, SLOT(setVideoPlaybackResumed()));
+  connect(d->UI.actionVideoStop, SIGNAL(triggered()),
+          this, SLOT(setVideoPlaybackStopped()));
+  connect(d->UI.actionVideoPlayReversed, SIGNAL(triggered()),
+          this, SLOT(setVideoPlaybackReversed()));
+  connect(d->UI.actionVideoFastForward, SIGNAL(triggered()),
+          this, SLOT(setVideoPlaybackFastForward()));
+  connect(d->UI.actionVideoFastBackward, SIGNAL(triggered()),
+          this, SLOT(setVideoPlaybackFastBackward()));
+  connect(d->UI.actionVideoSpeedDecrease, SIGNAL(triggered()),
+          this, SLOT(decreaseVideoPlaybackSpeed()));
+  connect(d->UI.actionVideoSpeedIncrease, SIGNAL(triggered()),
+          this, SLOT(increaseVideoPlaybackSpeed()));
+  connect(d->UI.actionVideoFrameBackward, SIGNAL(triggered()),
+          this, SLOT(stepVideoBackward()));
+  connect(d->UI.actionVideoFrameForward, SIGNAL(triggered()),
+          this, SLOT(stepVideoForward()));
+  connect(d->UI.actionVideoSkipBackward, SIGNAL(triggered()),
+          this, SLOT(skipVideoBackward()));
+  connect(d->UI.actionVideoSkipForward, SIGNAL(triggered()),
+          this, SLOT(skipVideoForward()));
+  d->VideoPlaybackMode = vgVideoPlayer::Stopped;
+  d->VideoPlaybackRate = 0.0;
+  this->setPlaybackStatus(vgVideoPlayer::Stopped, 0.0);
+
+  connect(d->UI.frame, SIGNAL(valueChanged(int, vg::SeekMode)),
+          this, SLOT(seekVideoFrame(int, vg::SeekMode)));
+  connect(d->UI.frame, SIGNAL(editingFinished()),
+          d, SLOT(updateFrameSpinBox()));
+
+  // Connect other internal actions
+  connect(d->UI.actionVideoLiveOffsetSet, SIGNAL(triggered()),
+          this, SLOT(setVideoLiveOffset()));
+  connect(d->UI.actionTracksColor, SIGNAL(triggered()),
+          this, SLOT(setTrackColoring()));
+  connect(d->UI.actionTracksTrailLengthSet, SIGNAL(triggered()),
+          this, SLOT(setTrackTrailLength()));
+  connect(d->UI.actionEventFiltersLoad, SIGNAL(triggered()),
+          this, SLOT(loadFilterSettings()));
+  connect(d->UI.actionEventFiltersSave, SIGNAL(triggered()),
+          this, SLOT(saveFilterSettings()));
+  connect(d->UI.actionEventProbabilityThresholdSet, SIGNAL(triggered()),
+          this, SLOT(setEventDisplayThreshold()));
+  connect(d->UI.actionEventsPersonEnableAll, SIGNAL(triggered()),
+          this, SLOT(showEventsAllPerson()));
+  connect(d->UI.actionEventsVehicleEnableAll, SIGNAL(triggered()),
+          this, SLOT(showEventsAllVehicle()));
+  connect(d->UI.actionEventsPersonDisableAll, SIGNAL(triggered()),
+          this, SLOT(hideEventsAllPerson()));
+  connect(d->UI.actionEventsVehicleDisableAll, SIGNAL(triggered()),
+          this, SLOT(hideEventsAllVehicle()));
+  connect(d->UI.actionRegionDraw, SIGNAL(toggled(bool)),
+          this, SLOT(toggleDrawing(bool)));
+  connect(d->UI.actionAlertCreate, SIGNAL(triggered()),
+          this, SLOT(createAlert()));
+  connect(d->UI.actionAlertLoad, SIGNAL(triggered()),
+          this, SLOT(loadAlert()));
+  connect(d->UI.actionFormulateQuery, SIGNAL(triggered()),
+          this, SLOT(formulateQuery()));
+
+  connect(d->UI.actionWriteRenderedImages, SIGNAL(triggered(bool)),
+          this, SLOT(writeRenderedImages(bool)));
+  connect(d->UI.actionSaveScreenshot, SIGNAL(triggered()),
+          this, SLOT(saveScreenShot()));
+
+  // Set up UI extensions
+  foreach (vsUiExtensionInterface* extension, vsApplication::uiExtensions())
+    {
+    // Register this window with the extension
+    extension->createInterface(this, d->Scene);
+    }
+
+  // Set up UI state persistence (after UI extensions, so they can leverage
+  // geometry persistence, if applicable)
+  d->UiState.mapState("Window/state", this);
+  d->UiState.mapGeometry("Window/geometry", this);
+
+  d->UiState.mapChecked("TracksVisible",
+                        d->UI.actionTracksShow);
+  d->UiState.mapChecked("TrackBoxesVisible",
+                        d->UI.actionTracksShowBoxes);
+  d->UiState.mapChecked("TrackIdsVisible",
+                        d->UI.actionTracksShowId);
+  d->UiState.mapChecked("TrackPvoVisible",
+                        d->UI.actionTracksShowPvo);
+  d->UiState.mapChecked("EventTracksVisible",
+                        d->UI.actionEventsTracksShow);
+  d->UiState.mapChecked("EventBoxesVisible",
+                        d->UI.actionEventsBoxesShow);
+  d->UiState.mapChecked("EventLabelsVisible",
+                        d->UI.actionEventsLabelsShow);
+  d->UiState.mapChecked("EventProbabilityVisible",
+                        d->UI.actionEventsProbabilityShow);
+  d->UiState.mapChecked("GroundTruthVisible",
+                        d->UI.groundTruthVisible);
+
+  if (invokingView)
+    {
+    // Copy window state (except position)
+    this->restoreState(invokingView->saveState());
+    this->restoreGeometry(invokingView->saveGeometry());
+    this->move(0, 0);
+
+    // Copy other settings
+    // \TODO probably should tell other window to save its state, and then
+    //       use our regular state restore code, rather than this separate code
+    //       to copy everything
+    vsMainWindowPrivate* id = invokingView->d_func();
+    Ui::MainWindow& myUi = d->UI;
+    Ui::MainWindow& ivUi = id->UI;
+
+    int resampleMode = id->resampleMode(id->AM.videoSampling->checkedAction());
+    d->resampleAction(resampleMode)->setChecked(true);
+
+    copyBoolOption(myUi.actionTracksShow,
+                   ivUi.actionTracksShow);
+    copyBoolOption(myUi.actionTracksShowBoxes,
+                   ivUi.actionTracksShowBoxes);
+    copyBoolOption(myUi.actionTracksShowId,
+                   ivUi.actionTracksShowId);
+    copyBoolOption(myUi.actionTracksShowPvo,
+                   ivUi.actionTracksShowPvo);
+
+    // \TODO copy trail length
+
+    copyBoolOption(myUi.actionEventsTracksShow,
+                   ivUi.actionEventsTracksShow);
+    copyBoolOption(myUi.actionEventsBoxesShow,
+                   ivUi.actionEventsBoxesShow);
+    copyBoolOption(myUi.actionEventsLabelsShow,
+                   ivUi.actionEventsLabelsShow);
+    copyBoolOption(myUi.actionEventsProbabilityShow,
+                   ivUi.actionEventsProbabilityShow);
+
+    copyBoolOption(myUi.groundTruthVisible,
+                   ivUi.groundTruthVisible);
+    }
+  else
+    {
+    // Restore previous window state and managed settings
+    d->UiState.restore();
+
+    // Restore other settings
+    QSettings settings;
+    int resampleMode = d->resampleMode(d->AM.videoSampling->checkedAction());
+    resampleMode = settings.value("VideoResampling", resampleMode).toInt();
+    d->resampleAction(resampleMode)->setChecked(true);
+
+    scene->setVideoLiveOffset(
+      settings.value("VideoLiveOffset",
+                     scene->videoLiveOffset()).toDouble());
+
+    scene->setTrackTrailLength(
+      settings.value("TrackTrailLength",
+                     scene->trackTrailLength()).toDouble());
+
+    scene->setEventSelectedColor(vsSettings().eventSelectedColor());
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsMainWindow::~vsMainWindow()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::closeEvent(QCloseEvent* e)
+{
+  QTE_D(vsMainWindow);
+
+  vsApplication::instance()->viewCloseEvent(this, e);
+
+  // Save window settings and managed UI state
+  d->UiState.save();
+
+  // Save other settings
+  QSettings settings;
+  settings.setValue("VideoResampling",
+                    d->resampleMode(d->AM.videoSampling->checkedAction()));
+
+  settings.setValue("TrackTrailLength",
+                    d->Scene->trackTrailLength());
+
+  settings.setValue("VideoLiveOffset",
+                    d->Scene->videoLiveOffset());
+
+  // Hand off to default handler to accept the event and close the window
+  QWidget::closeEvent(e);
+}
+
+//-----------------------------------------------------------------------------
+qtPrioritizedMenuProxy* vsMainWindow::toolsMenu()
+{
+  QTE_D(vsMainWindow);
+  return d->ToolsMenu.data();
+}
+
+//-----------------------------------------------------------------------------
+qtPrioritizedToolBarProxy* vsMainWindow::toolsToolBar()
+{
+  QTE_D(vsMainWindow);
+  return d->ToolsToolBar.data();
+}
+
+//-----------------------------------------------------------------------------
+QVTKWidget* vsMainWindow::view()
+{
+  QTE_D(vsMainWindow);
+  return d->UI.renderFrame;
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::pushViewCursor(const QCursor& c, QObject* owner)
+{
+  QTE_D(vsMainWindow);
+
+  d->ViewCursorOwners.removeAll(owner);
+  d->ViewCursorOwners.append(owner);
+  d->ViewCursorStacks[owner].push(c);
+
+  d->UI.renderFrame->setCursor(c);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::popViewCursor(QObject* owner)
+{
+  QTE_D(vsMainWindow);
+
+  QStack<QCursor>* stack = &d->ViewCursorStacks[owner];
+  if (stack->isEmpty())
+    {
+    d->ViewCursorStacks.remove(owner);
+    return;
+    }
+
+  stack->pop();
+  if (stack->isEmpty())
+    {
+    d->ViewCursorOwners.removeAll(owner);
+    d->ViewCursorStacks.remove(owner);
+    }
+
+  stack = &d->ViewCursorStacks[d->ViewCursorOwners.last()];
+  d->UI.renderFrame->setCursor(stack->top());
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::addDockWidget(QDockWidget* dock, Qt::DockWidgetArea area,
+                                 QAction* toggleDockAction)
+{
+  QTE_D(vsMainWindow);
+
+  this->addDockWidget(area, dock);
+  d->DockController->addToggleAction(toggleDockAction, dock);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoPlaybackLive()
+{
+  QTE_D(vsMainWindow);
+  d->Scene->setVideoPlaybackSpeed(vgVideoPlayer::Live, d->VideoPlaybackRate);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoPlaybackNormal()
+{
+  QTE_D(vsMainWindow);
+  d->OldVideoPlaybackLive = false;
+  d->setVideoPlaybackSlow(1.0);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoPlaybackReversed()
+{
+  QTE_D(vsMainWindow);
+  d->OldVideoPlaybackLive = false;
+  d->setVideoPlaybackSlow(-1.0);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoPlaybackPaused()
+{
+  QTE_D(vsMainWindow);
+
+  if (!qFuzzyIsNull(d->VideoPlaybackRate))
+    d->OldVideoPlaybackRate = d->VideoPlaybackRate;
+  d->VideoPlaybackRate = 0.0;
+
+  if (d->VideoPlaybackMode != vgVideoPlayer::Playing &&
+      d->VideoPlaybackMode != vgVideoPlayer::Buffering &&
+      d->VideoPlaybackMode != vgVideoPlayer::Live)
+    {
+    if (d->OldVideoPlaybackLive)
+      {
+      d->UI.actionVideoPlayLive->setChecked(true);
+      this->setVideoPlaybackLive();
+      }
+    else
+      {
+      d->UI.actionVideoPlay->setChecked(true);
+      this->setVideoPlaybackNormal();
+      }
+
+    return;
+    }
+
+  d->OldVideoPlaybackLive = (d->VideoPlaybackMode == vgVideoPlayer::Live);
+  d->Scene->setVideoPlaybackSpeed(vgVideoPlayer::Paused);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoPlaybackResumed()
+{
+  QTE_D(vsMainWindow);
+
+  if (d->VideoPlaybackMode != vgVideoPlayer::Playing &&
+      d->VideoPlaybackMode != vgVideoPlayer::Buffering &&
+      d->VideoPlaybackMode != vgVideoPlayer::Live)
+    {
+    d->VideoPlaybackRate = d->OldVideoPlaybackRate;
+    if (d->OldVideoPlaybackLive)
+      {
+      d->UI.actionVideoPlayLive->setChecked(true);
+      this->setVideoPlaybackLive();
+      }
+    else
+      {
+      d->UI.actionVideoPlay->setChecked(true);
+      d->Scene->setVideoPlaybackSpeed(vgVideoPlayer::Playing,
+                                      d->VideoPlaybackRate);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoPlaybackStopped()
+{
+  QTE_D(vsMainWindow);
+  d->OldVideoPlaybackRate = 1.0;
+  d->OldVideoPlaybackLive = false;
+  d->VideoPlaybackRate = 0.0;
+  d->Scene->setVideoPlaybackSpeed(vgVideoPlayer::Stopped);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoPlaybackFastBackward()
+{
+  QTE_D(vsMainWindow);
+  d->OldVideoPlaybackLive = false;
+  d->setVideoPlaybackFast(-1.0);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoPlaybackFastForward()
+{
+  QTE_D(vsMainWindow);
+  d->OldVideoPlaybackLive = false;
+  d->setVideoPlaybackFast(1.0);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::decreaseVideoPlaybackSpeed()
+{
+  QTE_D(vsMainWindow);
+  d->OldVideoPlaybackLive = false;
+  d->setVideoPlaybackSpeed(d->VideoPlaybackRate * 0.5);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::increaseVideoPlaybackSpeed()
+{
+  QTE_D(vsMainWindow);
+  d->OldVideoPlaybackLive = false;
+  d->setVideoPlaybackSpeed(d->VideoPlaybackRate * 2.0);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::stepVideo(int stepBy)
+{
+  QTE_D(vsMainWindow);
+
+  const unsigned int frame
+    = static_cast<unsigned int>(d->UI.frame->value());
+  const bool haveFrameNumbers = (frame != vgTimeStamp::InvalidFrameNumber());
+
+  vgTimeStamp ts;
+  vg::SeekMode direction;
+
+  if (abs(stepBy) > 1)
+    {
+    ts = (haveFrameNumbers
+          ? vgTimeStamp::fromFrameNumber(frame + stepBy)
+          : vgTimeStamp::fromTime(d->UI.scrubber->value().Time + stepBy));
+    direction = (stepBy > 0 ? vg::SeekLowerBound : vg::SeekUpperBound);
+    }
+  else
+    {
+    ts = d->UI.scrubber->value();
+    direction = (stepBy > 0 ? vg::SeekNext : vg::SeekPrevious);
+    }
+
+  d->OldVideoPlaybackLive = false;
+  d->Scene->seekVideo(ts, direction, ++d->NextSeekRequestId);
+
+  // Update our reference control to show the change, and also tag it against
+  // the request so our reference doesn't get changed by a stale response
+  if (haveFrameNumbers)
+    {
+    qtScopedBlockSignals bs(d->UI.frame);
+    d->UI.frame->setValue(ts.FrameNumber);
+    d->LastSpinBoxSeek = d->NextSeekRequestId;
+    }
+  else
+    {
+    qtScopedBlockSignals bs(d->UI.scrubber);
+    d->UI.scrubber->setValue(ts);
+    d->LastScrubberSeek = d->NextSeekRequestId;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::stepVideoBackward()
+{
+  this->stepVideo(-1);
+}
+//-----------------------------------------------------------------------------
+void vsMainWindow::stepVideoForward()
+{
+  this->stepVideo(+1);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::skipVideo(double skipBy)
+{
+  QTE_D(vsMainWindow);
+
+  vgTimeStamp ts =
+    vgTimeStamp::fromTime(d->UI.scrubber->value().Time + skipBy);
+  vg::SeekMode direction =
+    (skipBy > 0.0 ? vg::SeekLowerBound : vg::SeekUpperBound);
+
+  d->OldVideoPlaybackLive = false;
+  d->Scene->seekVideo(ts, direction, ++d->NextSeekRequestId);
+
+  // Update our reference control to show the change, and also tag it against
+  // the request so our reference doesn't get changed by a stale response
+  qtScopedBlockSignals bs(d->UI.scrubber);
+  d->UI.scrubber->setValue(ts);
+  d->LastScrubberSeek = d->NextSeekRequestId;
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::skipVideoBackward()
+{
+  QSettings settings;
+  const double skip = settings.value("VideoSkipAmount", 10.0).toDouble();
+  this->skipVideo(-1e6 * skip);
+}
+//-----------------------------------------------------------------------------
+void vsMainWindow::skipVideoForward()
+{
+  QSettings settings;
+  const double skip = settings.value("VideoSkipAmount", 10.0).toDouble();
+  this->skipVideo(+1e6 * skip);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::seekVideoFrame(int frame, vg::SeekMode direction)
+{
+  QTE_D(vsMainWindow);
+
+  if (direction == vg::SeekNearest)
+    {
+    // Don't change text while user is typing, even if frame is not valid
+    d->BlockFrameUpdates = true;
+    }
+
+  d->Scene->seekVideo(vgTimeStamp::fromFrameNumber(frame),
+                      vg::SeekLowerBound, ++d->NextSeekRequestId);
+  d->LastSpinBoxSeek = d->NextSeekRequestId;
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::seekVideo(vgTimeStamp ts, vg::SeekMode direction)
+{
+  QTE_D(vsMainWindow);
+
+  d->Scene->seekVideo(ts, direction, ++d->NextSeekRequestId);
+  d->LastScrubberSeek = d->NextSeekRequestId;
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setPendingSeek(const vtkVgTimeStamp& request)
+{
+  QTE_D(vsMainWindow);
+  d->PendingSeek = request;
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setPlaybackStatus(
+  vgVideoPlayer::PlaybackMode mode, qreal rate)
+{
+  QTE_D(vsMainWindow);
+
+  QString s;
+  QToolBar* vtb = d->UI.videoToolBar;
+
+  switch (mode)
+    {
+    case vgVideoPlayer::Playing:
+    case vgVideoPlayer::Buffering:
+    case vgVideoPlayer::Live:
+      d->VideoPlaybackRate = rate;
+
+      if (vtb->actions().contains(d->UI.actionVideoSkipBackward))
+        {
+        qtScopedBlockUpdates bu(vtb);
+        vtb->insertAction(d->UI.actionVideoSkipBackward,
+                          d->UI.actionVideoFastBackward);
+        vtb->insertAction(d->UI.actionVideoSkipForward,
+                          d->UI.actionVideoFastForward);
+        vtb->insertAction(d->UI.actionVideoFrameBackward,
+                          d->UI.actionVideoSpeedDecrease);
+        vtb->insertAction(d->UI.actionVideoFrameForward,
+                          d->UI.actionVideoSpeedIncrease);
+        vtb->removeAction(d->UI.actionVideoSkipBackward);
+        vtb->removeAction(d->UI.actionVideoSkipForward);
+        vtb->removeAction(d->UI.actionVideoFrameBackward);
+        vtb->removeAction(d->UI.actionVideoFrameForward);
+        }
+
+      if (mode == vgVideoPlayer::Live)
+        {
+        d->UI.actionVideoPlayLive->setChecked(true);
+        }
+      else if (rate > 1.1)
+        {
+        d->UI.actionVideoFastForward->setChecked(true);
+        }
+      else if (rate < -1.1)
+        {
+        d->UI.actionVideoFastBackward->setChecked(true);
+        }
+      else if (rate < 0.0)
+        {
+        d->UI.actionVideoPlayReversed->setChecked(true);
+        }
+      else
+        {
+        d->UI.actionVideoPlay->setChecked(true);
+        }
+
+      if (mode == vgVideoPlayer::Live)
+        {
+        if (!qFuzzyIsNull(d->Scene->videoLiveOffset()))
+          {
+          s = QString("<b>LIVE</b> (-%1)").arg(d->Scene->videoLiveOffset());
+          }
+        else
+          {
+          s = "<b>LIVE</b>";
+          }
+        }
+      else if (!qFuzzyIsNull(rate) && fabs(rate) < 0.9)
+        {
+        const int frac = qRound(1.0 / fabs(rate));
+        const char* sc = (rate < 0.0 ? "-" : "");
+        s = QString("%1<sup>1</sup>/<sub>%2</sub>x").arg(sc).arg(frac);
+        }
+      else
+        {
+        s = QString("%1x").arg(qRound(rate));
+        }
+
+      if (mode == vgVideoPlayer::Buffering)
+        s = '(' + s + ')';
+
+      break;
+    default:
+      d->VideoPlaybackRate = 0.0;
+
+      if (vtb->actions().contains(d->UI.actionVideoFastBackward))
+        {
+        qtScopedBlockUpdates bu(vtb);
+        vtb->insertAction(d->UI.actionVideoFastBackward,
+                          d->UI.actionVideoSkipBackward);
+        vtb->insertAction(d->UI.actionVideoFastForward,
+                          d->UI.actionVideoSkipForward);
+        vtb->insertAction(d->UI.actionVideoSpeedDecrease,
+                          d->UI.actionVideoFrameBackward);
+        vtb->insertAction(d->UI.actionVideoSpeedIncrease,
+                          d->UI.actionVideoFrameForward);
+        vtb->removeAction(d->UI.actionVideoFastBackward);
+        vtb->removeAction(d->UI.actionVideoFastForward);
+        vtb->removeAction(d->UI.actionVideoSpeedDecrease);
+        vtb->removeAction(d->UI.actionVideoSpeedIncrease);
+        }
+
+      if (mode == vgVideoPlayer::Paused)
+        {
+        d->UI.actionVideoPause->setChecked(true);
+        s = "<i>P</i>";
+        }
+      else
+        {
+        d->UI.actionVideoStop->setChecked(true);
+        s = "<b>S</b>";
+        }
+      break;
+    }
+
+  if (d->VideoPlaybackMode != mode)
+    {
+    d->OldVideoPlaybackLive = (d->VideoPlaybackMode == vgVideoPlayer::Live);
+    d->VideoPlaybackMode = mode;
+    }
+  d->UI.playbackMode->setText(s);
+  d->updatePlaybackControlsState(d->UI.scrubber->value());
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoSourceStatus(vsDataSource::Status status)
+{
+  QTE_D(vsMainWindow);
+
+  QStringList textList, toolTipList;
+  QList<vsDataSource::Status> statusList;
+
+  statusList.append(status);
+  if (status == vsDataSource::NoSource)
+    {
+    d->VideoPlaybackMode = vgVideoPlayer::Stopped;
+    d->UI.playbackMode->hide();
+    d->setStatusVisible(vsMainWindowPrivate::StatusFrameGsd, false);
+    d->setStatusVisible(vsMainWindowPrivate::StatusFrameTimestamp, false);
+    d->setStatusVisible(vsMainWindowPrivate::StatusCursorLocation, false);
+    d->AM.playbackActions->setEnabled(false);
+    foreach (QAction* a, d->AM.playbackActions->actions())
+      a->setChecked(false);
+    d->UI.actionRegionDraw->setEnabled(false);
+    d->UI.actionRegionDraw->setChecked(false);
+    d->UI.actionRegionClose->setEnabled(false);
+    textList.append("(none)");
+    toolTipList.append("(no video source)");
+    }
+  else
+    {
+    d->UI.playbackMode->show();
+    bool liveEnabled = false;
+    switch (status)
+      {
+      case vsDataSource::StreamingActive:
+      case vsDataSource::StreamingIdle:
+        liveEnabled = true;
+      case vsDataSource::StreamingStopped:
+      case vsDataSource::ArchivedActive:
+      case vsDataSource::ArchivedSuspended:
+      case vsDataSource::ArchivedIdle:
+        d->AM.playbackActions->setEnabled(true);
+        d->UI.actionRegionDraw->setEnabled(true);
+        d->UI.actionFormulateQuery->setEnabled(true);
+        d->UI.actionVideoPlayLive->setEnabled(liveEnabled);
+        d->UI.actionVideoLiveOffsetSet->setEnabled(liveEnabled);
+        break;
+      default:
+        d->AM.playbackActions->setEnabled(false);
+        foreach (QAction* a, d->AM.playbackActions->actions())
+          a->setChecked(false);
+        d->UI.actionRegionDraw->setEnabled(false);
+        d->UI.actionRegionDraw->setChecked(false);
+        d->UI.actionRegionClose->setEnabled(false);
+        break;
+      }
+    textList.append(d->Core->videoSourceText());
+    toolTipList.append(d->Core->videoSourceToolTip());
+    }
+
+  d->setSourceStatus(vsMainWindowPrivate::StatusVideoIcon,
+                     vsMainWindowPrivate::StatusVideoText,
+                     "video", statusList, textList, toolTipList);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setTrackSourceStatus(vsDataSource::Status status)
+{
+  QTE_D(vsMainWindow);
+
+  QStringList textList, toolTipList;
+  QList<vsDataSource::Status> statusList;
+
+  for (int i = 0; ; ++i)
+    {
+    status = d->Core->trackSourceStatus(i);
+    if (status == vsDataSource::NoSource)
+      break;
+
+    statusList.append(status);
+    textList.append(d->Core->trackSourceText(i));
+    toolTipList.append(d->Core->trackSourceToolTip(i));
+    }
+  if (!statusList.size())
+    {
+    statusList.append(vsDataSource::NoSource);
+    textList.append("(none)");
+    toolTipList.append("(no track source)");
+    }
+
+  d->setSourceStatus(vsMainWindowPrivate::StatusTrackIcon,
+                     vsMainWindowPrivate::StatusTrackText,
+                     "track", statusList, textList, toolTipList);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setDescriptorSourceStatus(vsDataSource::Status status)
+{
+  QTE_D(vsMainWindow);
+
+  QStringList textList, toolTipList;
+  QList<vsDataSource::Status> statusList;
+
+  for (int i = 0; ; ++i)
+    {
+    status = d->Core->descriptorSourceStatus(i);
+    if (status == vsDataSource::NoSource)
+      break;
+
+    statusList.append(status);
+    textList.append(d->Core->descriptorSourceText(i));
+    toolTipList.append(d->Core->descriptorSourceToolTip(i));
+    }
+  if (!statusList.size())
+    {
+    statusList.append(vsDataSource::NoSource);
+    textList.append("(none)");
+    toolTipList.append("(no descriptor source)");
+    }
+
+  d->setSourceStatus(vsMainWindowPrivate::StatusDescriptorIcon,
+                     vsMainWindowPrivate::StatusDescriptorText,
+                     "event", statusList, textList, toolTipList);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::resetVideo()
+{
+  QTE_D(vsMainWindow);
+
+  // Clear any old video range, so that a: the controls do not reflect the
+  // state of a previous video while we wait on the new video's range to
+  // update, and b: we will correctly detect the new range to start automatic
+  // playback
+  qtScopedBlockSignals bsf(d->UI.frame), bss(d->UI.scrubber);
+  d->UI.frame->setRange(-1, -1);
+  d->UI.scrubber->setRange(vgTimeStamp(), vgTimeStamp());
+  d->AvailableVideoRange = vgRange<vgTimeStamp>();
+
+  d->updatePlaybackControlsState(d->UI.scrubber->value());
+
+  // \TODO disable playback controls?
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::updateVideoAvailableTimeRange(
+  vtkVgTimeStamp first, vtkVgTimeStamp last)
+{
+  QTE_D(vsMainWindow);
+
+  const bool valid = !d->UI.scrubber->isRangeEmpty();
+
+  qtScopedBlockSignals bsf(d->UI.frame), bss(d->UI.scrubber);
+  d->UI.frame->setRange(first.GetFrameNumber(), last.GetFrameNumber());
+  d->UI.scrubber->setRange(first.GetRawTimeStamp(), last.GetRawTimeStamp());
+  d->AvailableVideoRange.lower = first.GetRawTimeStamp();
+  d->AvailableVideoRange.upper = last.GetRawTimeStamp();
+
+  d->updatePlaybackControlsState(d->UI.scrubber->value());
+
+  // If we had no video before, but do now...
+  if (!valid && !d->UI.scrubber->isRangeEmpty())
+    {
+    // ..and have a pending seek request...
+    if (d->PendingSeek.IsValid())
+      {
+      // ...then try to fulfill the request (and clear it)...
+      if (first <= d->PendingSeek && d->PendingSeek <= last)
+        {
+        // Issue the pending seek (which will pause automatically), queued,
+        // as the animation may not have updated yet
+        QMetaObject::invokeMethod(
+          this, "seekVideo", Qt::QueuedConnection,
+          Q_ARG(vgTimeStamp, d->PendingSeek.GetRawTimeStamp()),
+          Q_ARG(vg::SeekMode, vg::SeekNearest));
+        }
+      d->PendingSeek.Reset();
+      }
+    else
+      {
+      // ...otherwise start playing automatically, from beginning
+      this->seekVideo(first.GetRawTimeStamp(), vg::SeekNearest);
+      QMetaObject::invokeMethod(d->UI.actionVideoPlay, "trigger",
+                                Qt::QueuedConnection);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::updateVideoMetadata(
+  vtkVgVideoFrameMetaData metaData, qint64 seekRequestId)
+{
+  QTE_D(vsMainWindow);
+
+  // If we have video, show the pane for cursor location (which isn't updated
+  // from this slot)
+  d->setStatusVisible(vsMainWindowPrivate::StatusCursorLocation, true);
+
+  // Set GSD
+  const double threshold =
+    QSettings().value("GsdMetersThreshold", 0.5).toDouble();
+  const QString text =
+    (metaData.Gsd > threshold
+     ? QString().sprintf("%.3f m/px", metaData.Gsd)
+     : QString().sprintf("%.1f cm/px", metaData.Gsd * 100.0));
+  d->setStatusVisible(vsMainWindowPrivate::StatusFrameGsd, true);
+  d->setStatusText(vsMainWindowPrivate::StatusFrameGsd, text);
+
+  // Set time stamp
+  vgUnixTime unixTime(metaData.Time.GetTime());
+  d->setStatusVisible(vsMainWindowPrivate::StatusFrameTimestamp, true);
+  d->setStatusText(vsMainWindowPrivate::StatusFrameTimestamp,
+                   unixTime.timeString());
+
+  // Update video seek controls
+  this->updateVideoPosition(seekRequestId, metaData.Time);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::updateVideoPosition(
+  qint64 seekRequestId, vtkVgTimeStamp vtkTimeStamp)
+{
+  QTE_D(vsMainWindow);
+
+  vgTimeStamp ts = vtkTimeStamp.GetRawTimeStamp();
+
+  // Check if there are pending seek requests
+  bool mayUpdateScrubber = true;
+  bool mayUpdateSpinBox = true;
+  if (d->NextSeekRequestId > 0)
+    {
+    if (seekRequestId >= d->NextSeekRequestId)
+      {
+      // The last pending seek request has been fulfilled; we can update the
+      // video position controls, and also since there are no outstanding
+      // requests, we can reset the request counter (so, less likely that it
+      // will wrap)
+      d->NextSeekRequestId = 0;
+      d->LastScrubberSeek = -1;
+      d->LastSpinBoxSeek = -1;
+      d->SeekFlushLoop.quit();
+      }
+    else
+      {
+      // There are outstanding seek requests... don't update the video position
+      // controls responsible for outstanding seek requests; since they have
+      // been moved by the user since we sent the request whose response we are
+      // processing, doing so could cause visual "jerking" or - in the case of
+      // the frame spin box - could cause new changes to be calculated relative
+      // to the wrong frame
+      mayUpdateScrubber = (seekRequestId >= d->LastScrubberSeek);
+      mayUpdateSpinBox = (seekRequestId >= d->LastSpinBoxSeek);
+      }
+    }
+
+  if (mayUpdateSpinBox)
+    {
+    // Set frame number (unless user is currently typing one)
+    if (!d->BlockFrameUpdates)
+      {
+      qtScopedBlockSignals bs(d->UI.frame);
+      d->UI.frame->setValue(ts.FrameNumber);
+      }
+    }
+
+  if (mayUpdateScrubber)
+    {
+    // Set scrubber position
+    qtScopedBlockSignals bs(d->UI.scrubber);
+    d->UI.scrubber->setValue(ts);
+    }
+
+  // Enable/disable frame step controls
+  d->updatePlaybackControlsState(ts);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::flushPendingSeeks(int timeout)
+{
+  QTE_D(vsMainWindow);
+
+  if (d->LastScrubberSeek >= 0 || d->LastSpinBoxSeek >= 0)
+    {
+    // Set a single shot timer to cancel the internal event loop when the
+    // timeout expires; we don't use QTimer::singleShot because we need the
+    // timer and associated connection to go away if we finish before the time
+    // out expires
+    QTimer timer;
+    timer.setInterval(timeout);
+    connect(&timer, SIGNAL(timeout()), &d->SeekFlushLoop, SLOT(quit()));
+
+    // Run internal event loop until all pending seeks flush, or we time out
+    d->SeekFlushLoop.exec();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setCursorLocationText(QString text)
+{
+  QTE_D(vsMainWindow);
+  d->setStatusText(vsMainWindowPrivate::StatusCursorLocation, text);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::createSource(QString identifier)
+{
+  QTE_D(vsMainWindow);
+
+  vsSourceFactoryPtr factory = vsSourceService::createFactory(identifier);
+  if (!factory)
+    return;
+
+  if (factory->initialize(this))
+    d->Core->addSources(factory);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::loadFilterSettings(QString fileName)
+{
+  QTE_D(vsMainWindow);
+
+  if (fileName.isEmpty())
+    {
+    fileName = vgFileDialog::getOpenFileName(
+                 this, "Load filter settings...", QString(),
+                 "Filter Settings (*.vpefs);;"
+                 "All files (*)");
+    if (fileName.isEmpty())
+      return;
+    }
+  else
+    {
+    QFileInfo fi(fileName);
+    if (!fi.exists())
+      return;
+    fileName = fi.canonicalFilePath();
+    }
+
+  qtKstReader reader(QUrl::fromLocalFile(fileName));
+  if (!reader.isValid())
+    {
+    d->UI.statusbar->showMessage("Unable to load filter settings file");
+    return;
+    }
+
+  // Check header
+  QString header;
+  if (!reader.readString(header)
+      || header != "FILTERS"
+      || !reader.nextRecord())
+    {
+    d->UI.statusbar->showMessage("Unable to load filter settings file");
+    return;
+    }
+
+  // Read filter settings
+  while (!reader.isEndOfFile())
+    {
+    int type;
+    int visibility;
+    double threshold;
+    if (reader.readInt(type, 0) && reader.readInt(visibility, 1))
+      {
+      if (type == vsCore::GroundTruth)
+        {
+        d->UI.groundTruthVisible->setChecked(!!visibility);
+        }
+      else if (reader.readReal(threshold, 2))
+        {
+        d->UI.filter->setState(type, !!visibility);
+        d->UI.filter->setValue(type, threshold);
+        }
+      }
+    reader.nextRecord();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::saveFilterSettings(QString fileName)
+{
+  QTE_D(vsMainWindow);
+
+  if (fileName.isEmpty())
+    {
+    fileName = vgFileDialog::getSaveFileName(
+                 this, "Save filter settings...", QString(),
+                 "Filter Settings (*.vpefs);;"
+                 "All files (*)");
+    if (fileName.isEmpty())
+      return;
+    }
+  else
+    {
+    QFileInfo fi(fileName);
+    if (!fi.dir().exists())
+      return;
+    fileName = fi.canonicalFilePath();
+    }
+
+  QFile file(fileName);
+  if (!file.open(QIODevice::WriteOnly))
+    {
+    d->UI.statusbar->showMessage("Error writing file");
+    return;
+    }
+
+  QTextStream out(&file);
+  out << "FILTERS;\n# Type, Visibility, Threshold\n";
+  out << vsCore::GroundTruth
+      << (d->UI.groundTruthVisible->isChecked() ? 1 : 0);
+  foreach (int type, d->UI.filter->keys())
+    {
+    out << type << ", "
+        << (d->UI.filter->state(type) ? 1 : 0) << ", "
+        << d->UI.filter->value(type) << ";\n";
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::loadMaskImage(QString fileName)
+{
+  QTE_D(vsMainWindow);
+
+  QFileInfo fi(fileName);
+  if (!fi.exists())
+    {
+    return;
+    }
+
+  if (d->Scene->setMaskImage(fi.canonicalFilePath()))
+    {
+    d->UI.actionVideoMaskShowTracking->setEnabled(true);
+    d->UI.actionVideoMaskShowTracking->setChecked(true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setTrackColoring()
+{
+  QTE_D(vsMainWindow);
+
+  vsTrackColorDialog dlg;
+  dlg.setDynamicDataSets(d->Core->dynamicDataSets());
+  switch (d->Scene->trackColorMode())
+    {
+    case vtkVgTrackRepresentationBase::TCM_Scalars:
+      dlg.setMode(vsTrackColorDialog::ColorByDynamicData);
+      dlg.setDynamicDataSet(d->Scene->trackColorDataId());
+      break;
+    case vtkVgTrackRepresentationBase::TCM_PVO:
+      dlg.setMode(vsTrackColorDialog::ColorByClassification);
+      break;
+    default:
+      dlg.setMode(vsTrackColorDialog::SingleColor);
+      break;
+    }
+
+  if (dlg.exec() == QDialog::Accepted)
+    {
+    vtkVgTrackRepresentationBase::TrackColorMode mode;
+    switch(dlg.mode())
+      {
+      case vsTrackColorDialog::ColorByClassification:
+        mode = vtkVgTrackRepresentationBase::TCM_PVO;
+        break;
+      case vsTrackColorDialog::ColorByDynamicData:
+        mode = vtkVgTrackRepresentationBase::TCM_Scalars;
+        break;
+      case vsTrackColorDialog::SingleColor:
+      default:
+        mode = vtkVgTrackRepresentationBase::TCM_Default;
+        break;
+      }
+
+    d->Scene->updateTrackColors(mode);
+    d->Scene->setTrackColorMode(mode, dlg.dynamicDataSet());
+    // TODO update tree
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setTrackTrailLength()
+{
+  QTE_D(vsMainWindow);
+
+  double currentLength = d->Scene->trackTrailLength();
+
+  bool okay = false;
+  double newLength = qtDoubleInputDialog::getDouble(
+                       this, "Set Track Trail Length", "Trail Length (seconds)",
+                       currentLength, 0.0, 1e6, "Unlimited", 1, 0.1, &okay);
+
+  if (okay)
+    {
+    d->Scene->setTrackTrailLength(newLength);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setVideoLiveOffset()
+{
+  QTE_D(vsMainWindow);
+
+  const double currentOffset = d->Scene->videoLiveOffset();
+
+  bool okay = false;
+  double newOffset = qtDoubleInputDialog::getDouble(
+                       this, "Set Live Offset", "Live Offset (seconds)",
+                       currentOffset, 0.0, 1e6, 1, 0.1, &okay);
+
+  if (okay)
+    {
+    d->Scene->setVideoLiveOffset(newOffset);
+    this->setPlaybackStatus(d->VideoPlaybackMode, d->VideoPlaybackRate);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setEventDisplayThreshold()
+{
+  bool okay = false;
+  double t = qtDoubleInputDialog::getDouble(
+               this, "Set Event Threshold", "Threshold",
+               0.0, 0.0, 1.0, 2, 0.01, &okay);
+
+  if (okay)
+    {
+    QTE_D(vsMainWindow);
+    d->Scene->setEventGroupThreshold(vsEventInfo::All, t);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::showEventsAllPerson()
+{
+  QTE_D(vsMainWindow);
+  d->Scene->setEventGroupVisibility(vsEventInfo::Person, true);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::showEventsAllVehicle()
+{
+  QTE_D(vsMainWindow);
+  d->Scene->setEventGroupVisibility(vsEventInfo::Vehicle, true);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::hideEventsAllPerson()
+{
+  QTE_D(vsMainWindow);
+  d->Scene->setEventGroupVisibility(vsEventInfo::Person, false);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::hideEventsAllVehicle()
+{
+  QTE_D(vsMainWindow);
+  d->Scene->setEventGroupVisibility(vsEventInfo::Vehicle, false);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::setStatusText(QString text)
+{
+  QTE_D(vsMainWindow);
+  d->setStatusText(vsMainWindowPrivate::StatusText, text);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::toggleDrawing(bool state)
+{
+  QTE_D(vsMainWindow);
+  if (state)
+    {
+    this->pushViewCursor(Qt::CrossCursor, this);
+    qtScopedValueChange<bool> ic(d->IgnoreCancelDrawing, true);
+    d->Scene->beginDrawing(d->currentDrawingType());
+    }
+  else
+    {
+    d->Scene->interruptDrawing();
+    this->popViewCursor(this);
+    d->UI.actionRegionClose->setEnabled(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::updateTrackLabelActionsEnabled()
+{
+  QTE_D(vsMainWindow);
+
+  bool enabled = d->UI.actionTracksShow->isChecked() ||
+                 d->UI.actionTracksShowBoxes->isChecked();
+  d->UI.actionTracksShowId->setEnabled(enabled);
+  d->UI.actionTracksShowPvo->setEnabled(enabled);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::createAlert()
+{
+  vsAlertEditor editor;
+  if (editor.exec() == QDialog::Accepted)
+    {
+    QTE_D(vsMainWindow);
+    d->Core->addAlert(editor.alert());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::loadAlert()
+{
+  QTE_D(vsMainWindow);
+
+  QStringList paths = vgFileDialog::getOpenFileNames(
+                        this, "Load alert(s)...", QString(),
+                        "VisGUI Saved Alert (*.vsa *.vsax);;"
+                        "All files (*)");
+
+  vsAlertEditor editor;
+  foreach (QString path, paths)
+    {
+    if (editor.loadAlert(path))
+      {
+      d->Core->addAlert(editor.alert());
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::formulateQuery()
+{
+  QTE_D(vsMainWindow);
+
+  // Get padding for QF
+  QSettings settings;
+  settings.beginGroup("QueryFormulation");
+  const double padBefore = settings.value("PaddingBefore", 10.0).toDouble();
+  const double padAfter = settings.value("PaddingAfter", 10.0).toDouble();
+  const double currentTime = d->UI.scrubber->value().Time;
+
+  const vgTimeStamp start =
+    vgTimeStamp::fromTime(currentTime - (padBefore * 1e6));
+  const vgTimeStamp end =
+    vgTimeStamp::fromTime(currentTime + (padAfter * 1e6));
+
+  // Create video source for QF
+  // \TODO: Use vgVideoSource directly
+  vsQfVideoSource* vs = vsQfVideoSource::New();
+  vs->SetSource(d->VideoSource);
+  vs->SetMetadata(d->Core->allMetadata());
+  vs->SetTimeRange(start.Time, end.Time);
+
+  // Get relevant tracks and descriptors
+  QList<vvTrack> tracks;
+  QList<vvDescriptor> descriptors;
+  bool canceled;
+  d->Core->getQueryFormulationData(start, end, tracks, descriptors,
+                                   &canceled);
+
+  // Check for canceled, or no descriptors found
+  CHECK_ARG(!canceled);
+  if (descriptors.isEmpty())
+    {
+    QMessageBox::information(
+      this, "Query Formulation",
+      "No descriptors are available at this temporal location");
+    return;
+    }
+
+  // Prepare and show formulation dialog
+  vsQfDialog qf(vs);
+  qf.initialize(vgTimeStamp::fromTime(currentTime));
+  qf.setQueryTracksAndDescriptors(descriptors, tracks);
+  qf.exec();
+
+  vs->Delete();
+
+  CHECK_ARG(!qf.selectedDescriptors().empty());
+
+  // Create query plan
+  vvQueryInstance qi(vvDatabaseQuery::Similarity);
+  vvSimilarityQuery* query = qi.similarityQuery();
+
+  query->QueryId = vvMakeId("VSPLAY");
+  query->Descriptors = qf.selectedDescriptors();
+  query->SimilarityThreshold = 0.0;
+
+  QString fileName = vgFileDialog::getSaveFileName(
+                       this, "Saved query...", QString(),
+                       "VisGUI Query Plans (*.vqp);;"
+                       "All files (*)");
+  CHECK_ARG(!fileName.isEmpty());
+
+  QFile file(fileName);
+  if (file.open(QIODevice::WriteOnly))
+    {
+    // Write out the query plan
+    vvWriter writer(file);
+    writer << vvHeader::QueryPlan << qi;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::initializeTesting(const qtCliArgs* args)
+{
+#ifdef ENABLE_QTTESTING
+  QTE_D(vsMainWindow);
+  d->TestUtility = new pqCoreTestUtility(this, d->UI.renderFrame, this);
+  d->TestUtility->SetDataRootEnvironment("VISGUI_DATA_ROOT");
+  d->TestUtility->AddTestingMenu(this->menuBar(), "s", d->UI.menuHelp);
+
+  d->TestUtility->ParseCommandLine(*args);
+  d->TestUtility->ProcessCommandLine();
+#endif
+
+  Q_UNUSED(args);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::changeVideoSource(vsVideoSource* vs)
+{
+  QTE_D(vsMainWindow);
+  d->VideoSource = vs;
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::writeRenderedImages(bool state)
+{
+  QTE_D(vsMainWindow);
+
+  // if turning "on", ask for an output directory (required)
+  if (state == true)
+    {
+    QFileDialog fileDialog(0, tr("Image Output Directory"));
+    fileDialog.setObjectName("WriteRenderedImagesDialog");
+    fileDialog.setFileMode(QFileDialog::Directory);
+    fileDialog.setOption(QFileDialog::ShowDirsOnly);
+    if (fileDialog.exec() == QDialog::Accepted)
+      {
+      d->Scene->setWriteRenderedImages(
+        state, &fileDialog.selectedFiles().front());
+      }
+    else
+      {
+      d->UI.actionWriteRenderedImages->setChecked(false);
+      }
+    }
+  else
+    {
+    d->Scene->setWriteRenderedImages(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindow::saveScreenShot()
+{
+  QTE_D(vsMainWindow);
+
+  QString filePath = vgFileDialog::getSaveFileName(
+                       this, "Save screenshot...",
+                       QString(), "PNG File (*.png);;");
+
+  if (!filePath.isEmpty())
+    {
+    d->Scene->saveScreenShot(&filePath);
+    }
+}
+
+//END vsMainWindow
diff --git a/Libraries/VspUserInterface/vsMainWindow.h b/Libraries/VspUserInterface/vsMainWindow.h
new file mode 100644
index 00000000..18f388c9
--- /dev/null
+++ b/Libraries/VspUserInterface/vsMainWindow.h
@@ -0,0 +1,136 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsMainWindow_h
+#define __vsMainWindow_h
+
+#include <QMainWindow>
+
+#include <vgExport.h>
+
+#include <vtkVgVideoFrameMetaData.h>
+
+#include <vgVideoPlayer.h>
+
+#include <vsDataSource.h>
+#include <vsDescriptorInput.h>
+
+class QVTKWidget;
+
+class qtCliArgs;
+class qtPrioritizedMenuProxy;
+class qtPrioritizedToolBarProxy;
+
+class vsCore;
+class vsVideoSource;
+
+class vsMainWindowPrivate;
+
+class VSP_USERINTERFACE_EXPORT vsMainWindow : public QMainWindow
+{
+  Q_OBJECT
+
+public:
+  explicit vsMainWindow(vsCore* core, vsMainWindow* invokingView = 0);
+  virtual ~vsMainWindow();
+
+  void setPendingSeek(const vtkVgTimeStamp&);
+
+  qtPrioritizedMenuProxy* toolsMenu();
+  qtPrioritizedToolBarProxy* toolsToolBar();
+
+  QVTKWidget* view();
+
+  void pushViewCursor(const QCursor&, QObject* owner);
+  void popViewCursor(QObject* owner);
+
+  using QMainWindow::addDockWidget;
+  void addDockWidget(QDockWidget* dock, Qt::DockWidgetArea area,
+                     QAction* toggleDockAction);
+
+public slots:
+  void createSource(QString identifier);
+
+  void loadFilterSettings(QString fileName = QString());
+  void saveFilterSettings(QString fileName = QString());
+
+  void loadMaskImage(QString fileName);
+
+  void setStatusText(QString);
+
+  void setVideoPlaybackLive();
+  void setVideoPlaybackNormal();
+  void setVideoPlaybackPaused();
+  void setVideoPlaybackResumed();
+  void setVideoPlaybackStopped();
+  void setVideoPlaybackReversed();
+  void setVideoPlaybackFastForward();
+  void setVideoPlaybackFastBackward();
+  void stepVideoForward();
+  void stepVideoBackward();
+  void skipVideoForward();
+  void skipVideoBackward();
+
+  void decreaseVideoPlaybackSpeed();
+  void increaseVideoPlaybackSpeed();
+
+  void writeRenderedImages(bool);
+  void saveScreenShot();
+
+  void initializeTesting(const qtCliArgs*);
+
+protected slots:
+  void toggleDrawing(bool);
+
+  void setCursorLocationText(QString);
+
+  void updateTrackLabelActionsEnabled();
+
+  void seekVideoFrame(int, vg::SeekMode);
+  void seekVideo(vgTimeStamp, vg::SeekMode);
+
+  void stepVideo(int stepBy);
+  void skipVideo(double skipBy);
+
+  void flushPendingSeeks(int timeoutMilliseconds);
+
+  void setPlaybackStatus(vgVideoPlayer::PlaybackMode, qreal);
+  void setVideoSourceStatus(vsDataSource::Status);
+  void setTrackSourceStatus(vsDataSource::Status);
+  void setDescriptorSourceStatus(vsDataSource::Status);
+
+  void updateVideoMetadata(vtkVgVideoFrameMetaData, qint64 seekRequestId);
+  void updateVideoPosition(qint64 seekRequestId, vtkVgTimeStamp position);
+
+  void changeVideoSource(vsVideoSource*);
+  void resetVideo();
+  void updateVideoAvailableTimeRange(vtkVgTimeStamp first, vtkVgTimeStamp last);
+
+  void setVideoLiveOffset();
+  void setTrackColoring();
+  void setTrackTrailLength();
+  void setEventDisplayThreshold();
+  void showEventsAllPerson();
+  void showEventsAllVehicle();
+  void hideEventsAllPerson();
+  void hideEventsAllVehicle();
+
+  void createAlert();
+  void loadAlert();
+
+  void formulateQuery();
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(vsMainWindow)
+
+  virtual void closeEvent(QCloseEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(vsMainWindow)
+  Q_DISABLE_COPY(vsMainWindow)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsMainWindowPrivate.cxx b/Libraries/VspUserInterface/vsMainWindowPrivate.cxx
new file mode 100644
index 00000000..bc607e60
--- /dev/null
+++ b/Libraries/VspUserInterface/vsMainWindowPrivate.cxx
@@ -0,0 +1,432 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsMainWindowPrivate.h"
+
+#include <QComboBox>
+#include <QLabel>
+#include <QToolTip>
+
+#include <qtMath.h>
+#include <qtPrioritizedMenuProxy.h>
+#include <qtPrioritizedToolBarProxy.h>
+#include <qtScopedValueChange.h>
+
+#include "vsContourWidget.h"
+#include "vsScene.h"
+
+//-----------------------------------------------------------------------------
+vsMainWindowPrivate::vsMainWindowPrivate(vsMainWindow* q)
+  : QObject(q), q_ptr(q),
+    Scene(0),
+    TestUtility(0),
+    IgnoreCancelDrawing(false),
+    OldVideoPlaybackRate(1.0),
+    OldVideoPlaybackLive(false),
+    BlockFrameUpdates(false),
+    NextSeekRequestId(0),
+    LastScrubberSeek(-1),
+    LastSpinBoxSeek(-1)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsMainWindowPrivate::~vsMainWindowPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::createStatusLabel(
+  StatusSlot slot, Qt::Alignment alignment, bool permanent, int stretch)
+{
+  QLabel* label = new QLabel(this->UI.statusbar);
+  label->setAlignment(alignment);
+
+  (permanent
+   ? this->UI.statusbar->addPermanentWidget(label, stretch)
+   : this->UI.statusbar->addWidget(label, stretch));
+
+  this->StatusLabels.insert(slot, label);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::createSourceStatusLabels(
+  StatusSlot iconSlot, StatusSlot textSlot)
+{
+  this->createStatusLabel(iconSlot, Qt::AlignCenter, true, 0);
+  this->createStatusLabel(textSlot, Qt::AlignCenter, true, 1);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::setupStatusBar()
+{
+  this->createSourceStatusLabels(vsMainWindowPrivate::StatusVideoIcon,
+                                 vsMainWindowPrivate::StatusVideoText);
+  this->createSourceStatusLabels(vsMainWindowPrivate::StatusTrackIcon,
+                                 vsMainWindowPrivate::StatusTrackText);
+  this->createSourceStatusLabels(vsMainWindowPrivate::StatusDescriptorIcon,
+                                 vsMainWindowPrivate::StatusDescriptorText);
+
+  this->createStatusLabel(vsMainWindowPrivate::StatusText,
+                          Qt::AlignCenter, false, 4);
+  this->createStatusLabel(vsMainWindowPrivate::StatusCursorLocation,
+                          Qt::AlignCenter, false, 1);
+  this->createStatusLabel(vsMainWindowPrivate::StatusFrameGsd,
+                          Qt::AlignCenter, false, 1);
+  this->createStatusLabel(vsMainWindowPrivate::StatusFrameTimestamp,
+                          Qt::AlignLeft, false, 1);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::setStatusVisible(StatusSlot slot, bool visible)
+{
+  if (this->StatusLabels.contains(slot))
+    this->StatusLabels[slot]->setVisible(visible);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::setStatusText(StatusSlot slot, const QString& text)
+{
+  if (this->StatusLabels.contains(slot))
+    this->StatusLabels[slot]->setText(text);
+}
+
+//-----------------------------------------------------------------------------
+QString vsMainWindowPrivate::iconFromStatus(
+  const QString& baseIcon, vsDataSource::Status status)
+{
+  switch (status)
+    {
+    case vsDataSource::StreamingPending:
+      return baseIcon + "-stream-pending";
+    case vsDataSource::StreamingActive:
+      return baseIcon + "-stream-active";
+    case vsDataSource::StreamingIdle:
+      return baseIcon + "-stream-idle";
+    case vsDataSource::StreamingStopped:
+      return baseIcon + "-stream-stopped";
+    case vsDataSource::InProcessIdle:
+      return baseIcon + "-live-idle";
+    case vsDataSource::InProcessActive:
+      return baseIcon + "-live-active";
+    case vsDataSource::ArchivedActive:
+      return baseIcon + "-archived-active";
+    case vsDataSource::ArchivedSuspended:
+      return baseIcon + "-archived-suspended";
+    case vsDataSource::ArchivedIdle:
+      return baseIcon + "-archived";
+    case vsDataSource::MultipleSourcesStreaming:
+      return baseIcon + "-multiple-sources-stream";
+    case vsDataSource::MultipleSourcesInProcess:
+      return baseIcon + "-multiple-sources-live";
+    case vsDataSource::MultipleSourcesStreamingInProcess:
+      return baseIcon + "-multiple-sources-stream-live";
+    case vsDataSource::MultipleSourcesArchived:
+      return baseIcon + "-multiple-sources-archived";
+    case vsDataSource::MultipleSourcesStreamingArchived:
+      return baseIcon + "-multiple-sources-stream-archived";
+    case vsDataSource::MultipleSourcesInProcessArchived:
+      return baseIcon + "-multiple-sources-live-archived";
+    case vsDataSource::MultipleSourcesAll:
+      return baseIcon + "-multiple-sources";
+    default:
+      break;
+    }
+  return baseIcon;
+}
+
+//-----------------------------------------------------------------------------
+QString vsMainWindowPrivate::iconHtmlFromStatus(
+  const QString& baseIcon, vsDataSource::Status status)
+{
+  if (status == vsDataSource::NoSource)
+    return "&nbsp;";
+  const QString icon = vsMainWindowPrivate::iconFromStatus(baseIcon, status);
+  return QString("<img src='%1'/>").arg(icon);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::setSourceStatus(
+  StatusSlot iconSlot, StatusSlot textSlot,
+  const QString& icon, QList<vsDataSource::Status> status,
+  const QStringList& text, const QStringList& toolTip)
+{
+  QString baseIcon = ":/icons/source/16x16/" + icon;
+  QString mergedToolTip;
+  QString mergedText;
+  vsDataSource::Status mergedStatus = vsDataSource::NoSource;
+
+  QFontMetrics fm(QToolTip::font());
+  int width = 32;
+
+  // Generate merged status and tool tip
+  for (int i = 0; i < status.size(); ++i)
+    {
+    if (mergedStatus == vsDataSource::NoSource)
+      {
+      mergedText = text[i];
+      mergedStatus = status[i];
+      }
+    else
+      {
+      int si = ((static_cast<int>(mergedStatus) | static_cast<int>(status[i]))
+                & vsDataSource::SourceTypeMask)
+               | static_cast<int>(vsDataSource::MultipleSources);
+      mergedText = "(multiple sources)";
+      mergedStatus = static_cast<vsDataSource::Status>(si);
+      }
+    const QString iconHtml =
+      vsMainWindowPrivate::iconHtmlFromStatus(baseIcon, status[i]);
+    mergedToolTip +=
+      "<tr><td>" + iconHtml + "</td><td>" + toolTip[i] + "</td></tr>";
+    int tw = fm.width(toolTip[i]);
+    width = qMax(width, qMin(400, tw + 32));
+    }
+  mergedToolTip =
+    QString("<table width=%1>").arg(width) + mergedToolTip + "</table>";
+
+  // Set status icon, text, and tool tips
+  QLabel* iconLabel = this->StatusLabels.value(iconSlot, 0);
+  QLabel* textLabel = this->StatusLabels.value(textSlot, 0);
+  if (iconLabel)
+    {
+    if (mergedStatus == vsDataSource::NoSource)
+      {
+      QPixmap icon = QIcon(baseIcon).pixmap(16, 16, QIcon::Disabled);
+      iconLabel->setPixmap(icon);
+      }
+    else
+      {
+      const QString icon =
+        vsMainWindowPrivate::iconFromStatus(baseIcon, mergedStatus);
+      iconLabel->setPixmap(QPixmap(icon));
+      }
+    iconLabel->setToolTip(mergedToolTip);
+    }
+  if (textLabel)
+    {
+    textLabel->setText(mergedText);
+    textLabel->setToolTip(mergedToolTip);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::updateFrameSpinBox()
+{
+  this->BlockFrameUpdates = false;
+  vgTimeStamp ts = this->UI.scrubber->value();
+  if (ts.HasFrameNumber())
+    {
+    qtScopedBlockSignals bs(this->UI.frame);
+    this->UI.frame->setValue(static_cast<int>(ts.FrameNumber));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::enableInputs(
+  vsDescriptorInput::Types acceptedInputs)
+{
+  bool enableAlerts = acceptedInputs.testFlag(vsDescriptorInput::Query);
+
+  this->UI.actionAlertCreate->setEnabled(enableAlerts);
+  this->UI.actionAlertLoad->setEnabled(enableAlerts);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::enableRegionClose()
+{
+  this->UI.actionRegionClose->setEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::disableRegionClose()
+{
+  this->UI.actionRegionClose->setEnabled(false);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::completeDrawing()
+{
+  if (QSettings().value("PersistentDrawing", false).toBool())
+    {
+    // Keep drawing until told to stop
+    this->Scene->beginDrawing(this->currentDrawingType());
+    }
+  else
+    {
+    // End drawing mode
+    this->UI.actionRegionDraw->setChecked(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::cancelDrawing()
+{
+  if (!this->IgnoreCancelDrawing)
+    {
+    this->UI.actionRegionDraw->setChecked(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::updateDrawingType()
+{
+  this->Scene->setDrawingType(this->currentDrawingType());
+  this->UI.actionRegionClose->setEnabled(
+    this->Scene->contourState() == vsContourWidget::Begin);
+}
+
+//-----------------------------------------------------------------------------
+vsContour::Type vsMainWindowPrivate::currentDrawingType() const
+{
+  const QVariant typeData =
+    this->RegionType->itemData(this->RegionType->currentIndex());
+  return typeData.value<vsContour::Type>();
+}
+
+//-----------------------------------------------------------------------------
+int vsMainWindowPrivate::resampleMode(QAction* activeMode) const
+{
+  if (activeMode == this->UI.actionVideoSampleBicubic)
+    {
+    return 2;
+    }
+  else if (activeMode == this->UI.actionVideoSampleLinear)
+    {
+    return 1;
+    }
+  else
+    {
+    return 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+QAction* vsMainWindowPrivate::resampleAction(int resampleMode)
+{
+  switch (resampleMode)
+    {
+    default:
+    case 0:
+      return this->UI.actionVideoSampleNearest;
+    case 1:
+      return this->UI.actionVideoSampleLinear;
+    case 2:
+      return this->UI.actionVideoSampleBicubic;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::setVideoPlaybackSlow(qreal direction)
+{
+  const qreal rate = fabs(this->VideoPlaybackRate);
+  const bool sameDirection = (qtSign(this->VideoPlaybackRate) == direction);
+
+  QSettings settings;
+  if (sameDirection && this->VideoPlaybackMode != vgVideoPlayer::Live &&
+      settings.value("PlaybackPlaySlows", false).toBool())
+    {
+    const qreal min = settings.value("PlaybackMinSpeed", 8).toReal();
+    (rate > (1.0 / (min - 0.5)) && rate < 1.1
+     ? this->VideoPlaybackRate *= 0.5
+     : this->VideoPlaybackRate = direction);
+    }
+  else
+    {
+    this->VideoPlaybackRate = direction;
+    }
+
+  this->Scene->setVideoPlaybackSpeed(vgVideoPlayer::Playing,
+                                     this->VideoPlaybackRate);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::setVideoPlaybackFast(qreal direction)
+{
+  const qreal rate = fabs(this->VideoPlaybackRate);
+  const bool sameDirection = (qtSign(this->VideoPlaybackRate) == direction);
+
+  QSettings settings;
+  if (rate > 1.1 && sameDirection)
+    {
+    const qreal max = settings.value("PlaybackMaxSpeed", 32).toReal();
+    (rate > 1.1 && rate < (max - 0.5)
+     ? this->VideoPlaybackRate *= 2.0
+     : this->VideoPlaybackRate = direction * 2.0);
+    }
+  else
+    {
+    this->VideoPlaybackRate =
+      direction * settings.value("PlaybackInitialFastSpeed", 2).toReal();
+    }
+
+  this->UI.actionVideoPlay->setChecked(true);
+  this->Scene->setVideoPlaybackSpeed(vgVideoPlayer::Playing,
+                                     this->VideoPlaybackRate);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::setVideoPlaybackSpeed(qreal rate)
+{
+  if (this->VideoPlaybackMode != vgVideoPlayer::Playing &&
+      this->VideoPlaybackMode != vgVideoPlayer::Buffering)
+    {
+    return;
+    }
+
+  QSettings settings;
+  const qreal min = settings.value("PlaybackMinSpeed", 8).toReal();
+  const qreal max = settings.value("PlaybackMaxSpeed", 32).toReal();
+  const qreal direction = qtSign(rate);
+
+  this->VideoPlaybackRate = direction * qBound(1.0 / min, fabs(rate), max);
+
+  this->UI.actionVideoPlay->setChecked(true);
+  this->Scene->setVideoPlaybackSpeed(vgVideoPlayer::Playing,
+                                     this->VideoPlaybackRate);
+}
+
+//-----------------------------------------------------------------------------
+void vsMainWindowPrivate::updatePlaybackControlsState(
+  vgTimeStamp currentVideoTime)
+{
+  vgVideoPlayer::PlaybackMode mode = this->VideoPlaybackMode;
+  bool playing =
+    (mode == vgVideoPlayer::Playing ||
+     mode == vgVideoPlayer::Buffering ||
+     mode == vgVideoPlayer::Live);
+  bool paused = (mode == vgVideoPlayer::Paused);
+
+  bool enableForward = (currentVideoTime < this->AvailableVideoRange.upper);
+  bool enableBackward = (currentVideoTime > this->AvailableVideoRange.lower);
+
+  this->UI.actionVideoFrameForward->setEnabled(!playing && enableForward);
+  this->UI.actionVideoFrameBackward->setEnabled(!playing && enableBackward);
+  this->UI.actionVideoSkipForward->setEnabled(!playing && enableForward);
+  this->UI.actionVideoSkipBackward->setEnabled(!playing && enableBackward);
+
+  this->UI.actionVideoFastBackward->setEnabled(playing);
+  this->UI.actionVideoFastForward->setEnabled(playing);
+  this->UI.actionVideoResume->setEnabled(paused);
+
+  if (playing && mode != vgVideoPlayer::Live)
+    {
+    QSettings settings;
+    const qreal min = settings.value("PlaybackMinSpeed", 8).toReal();
+    const qreal max = settings.value("PlaybackMaxSpeed", 32).toReal();
+    const qreal rate = fabs(this->VideoPlaybackRate);
+    this->UI.actionVideoSpeedDecrease->setEnabled(
+      rate > (1.0 / (min - 0.5)));
+    this->UI.actionVideoSpeedIncrease->setEnabled(
+      rate < (max - 0.5));
+    }
+  else
+    {
+    this->UI.actionVideoSpeedDecrease->setEnabled(false);
+    this->UI.actionVideoSpeedIncrease->setEnabled(false);
+    }
+
+}
diff --git a/Libraries/VspUserInterface/vsMainWindowPrivate.h b/Libraries/VspUserInterface/vsMainWindowPrivate.h
new file mode 100644
index 00000000..b8959df5
--- /dev/null
+++ b/Libraries/VspUserInterface/vsMainWindowPrivate.h
@@ -0,0 +1,149 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsMainWindowPrivate_h
+#define __vsMainWindowPrivate_h
+
+#include <QHash>
+#include <QStack>
+
+#include <qtUiState.h>
+
+#include <vgRange.h>
+
+#include <vsContour.h>
+#include <vsDescriptorInput.h>
+
+#include "vsMainWindow.h"
+
+#include "ui_vsp.h"
+#include "am_vsp.h"
+
+class QComboBox;
+class QLabel;
+class QSignalMapper;
+
+class qtDockController;
+
+class pqCoreTestUtility;
+
+class vsScene;
+
+class vsMainWindow;
+
+class vsMainWindowPrivate : public QObject
+{
+  Q_OBJECT
+
+public:
+  enum StatusSlot
+    {
+    StatusFrameGsd,
+    StatusFrameTimestamp,
+    StatusCursorLocation,
+    StatusVideoIcon,
+    StatusVideoText,
+    StatusTrackIcon,
+    StatusTrackText,
+    StatusDescriptorIcon,
+    StatusDescriptorText,
+    StatusText
+    };
+
+  explicit vsMainWindowPrivate(vsMainWindow* q);
+  virtual ~vsMainWindowPrivate();
+
+  void setupStatusBar();
+  void setStatusVisible(StatusSlot slot, bool visible);
+  void setStatusText(StatusSlot slot, const QString& text);
+
+  vsContour::Type currentDrawingType() const;
+  int resampleMode(QAction* activeMode) const;
+  QAction* resampleAction(int resampleMode);
+
+  Ui::MainWindow UI;
+  Am::MainWindow AM;
+
+public slots:
+  void enableInputs(vsDescriptorInput::Types);
+
+  void enableRegionClose();
+  void disableRegionClose();
+  void completeDrawing();
+  void cancelDrawing();
+  void updateDrawingType();
+
+  void updateFrameSpinBox();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsMainWindow)
+
+  void createStatusLabel(StatusSlot slot, Qt::Alignment alignment,
+                         bool permanent = false, int stretch = 0);
+  void createSourceStatusLabels(StatusSlot iconSlot, StatusSlot textSlot);
+
+  void setSourceStatus(
+    StatusSlot iconSlot, StatusSlot textSlot,
+    const QString& icon, QList<vsDataSource::Status> status,
+    const QStringList& text, const QStringList& toolTip);
+
+  void setVideoPlaybackSlow(qreal direction);
+  void setVideoPlaybackFast(qreal direction);
+  void setVideoPlaybackSpeed(qreal rate);
+
+  void updatePlaybackControlsState(vgTimeStamp currentVideoTime);
+
+  static QString iconFromStatus(const QString& baseIcon,
+                                vsDataSource::Status status);
+  static QString iconHtmlFromStatus(const QString& baseIcon,
+                                    vsDataSource::Status status);
+
+  typedef QStack<QCursor> CursorStack;
+
+  qtUiState UiState;
+
+  vsCore* Core;
+  vsScene* Scene;
+  vsVideoSource* VideoSource;
+  QSignalMapper* VideoSamplingMapper;
+  QSignalMapper* SourceMapper;
+  pqCoreTestUtility* TestUtility;
+
+  QHash<StatusSlot, QLabel*> StatusLabels;
+  QComboBox* RegionType;
+  qtDockController* DockController;
+
+  QScopedPointer<qtPrioritizedMenuProxy> ToolsMenu;
+  QScopedPointer<qtPrioritizedToolBarProxy> ToolsToolBar;
+
+  QList<QObject*> ViewCursorOwners;
+  QMap<QObject*, CursorStack> ViewCursorStacks;
+
+  bool IgnoreCancelDrawing;
+
+  vgVideoPlayer::PlaybackMode VideoPlaybackMode;
+  qreal VideoPlaybackRate;
+  qreal OldVideoPlaybackRate;
+
+  bool OldVideoPlaybackLive;
+
+  vtkVgTimeStamp PendingSeek;
+
+  vgRange<vgTimeStamp> AvailableVideoRange;
+
+  bool BlockFrameUpdates;
+  long long NextSeekRequestId;
+  long long LastScrubberSeek;
+  long long LastSpinBoxSeek;
+
+  QEventLoop SeekFlushLoop;
+
+private:
+  QTE_DECLARE_PUBLIC(vsMainWindow)
+  Q_DISABLE_COPY(vsMainWindowPrivate)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsQfDialog.cxx b/Libraries/VspUserInterface/vsQfDialog.cxx
new file mode 100644
index 00000000..21199114
--- /dev/null
+++ b/Libraries/VspUserInterface/vsQfDialog.cxx
@@ -0,0 +1,122 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsQfDialog.h"
+
+#include <vvVideoQueryDialogPrivate.h>
+
+#include <vvDescriptor.h>
+
+#include "vsQfVideoPlayer.h"
+#include "vsQfVideoSource.h"
+
+//-----------------------------------------------------------------------------
+class vsQfDialogPrivate : public vvVideoQueryDialogPrivate
+{
+public:
+  // \note: This code could be moved somewhere else
+  enum DescriptorsFilterMode
+    {
+    Closed = 0
+    };
+
+  vsQfDialogPrivate(vvVideoQueryDialog* q, vsQfVideoSource* source) :
+    vvVideoQueryDialogPrivate(q, new vsQfVideoPlayer(source)) {}
+
+  QList<vvDescriptor> filterDescriptors(
+    vsQfVideoSource* source, QList<vvDescriptor> descriptors,
+    DescriptorsFilterMode mode = Closed)
+    {
+    if (!source)
+      {
+      return descriptors;
+      }
+
+    QList<vvDescriptor> filteredDescriptors;
+
+    double timeRange[2];
+    source->GetTimeRange(timeRange);
+
+    foreach (vvDescriptor descriptor, descriptors)
+      {
+      vgTimeStamp startTime = descriptor.Region.begin()->TimeStamp;
+      vgTimeStamp endTime = descriptor.Region.rbegin()->TimeStamp;
+
+      switch (mode)
+        {
+        case Closed:
+          if ((startTime.Time >= timeRange[0])
+              && (endTime.Time <= timeRange[1]))
+            {
+            filteredDescriptors.append(descriptor);
+            }
+          continue;
+        default:
+          filteredDescriptors.append(descriptor);
+          break;
+        }
+      }
+
+    return filteredDescriptors;
+    }
+};
+
+QTE_IMPLEMENT_D_FUNC(vsQfDialog)
+
+//-----------------------------------------------------------------------------
+vsQfDialog::vsQfDialog(vsQfVideoSource* source,
+                       QWidget* parent, Qt::WindowFlags flags)
+  : vvVideoQueryDialog(new vsQfDialogPrivate(this, source),
+                       true, parent, flags)
+{
+  QTE_D(vsQfDialog);
+
+  d->UI.chooseVideo->setEnabled(false);
+  d->UI.reprocessVideo->setEnabled(false);
+  d->UI.videoLocation->setEnabled(false);
+}
+
+//-----------------------------------------------------------------------------
+vsQfDialog::~vsQfDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vsQfDialog::exec()
+{
+  // TODO: Load video
+
+  return vvVideoQueryDialog::exec();
+}
+
+//-----------------------------------------------------------------------------
+void vsQfDialog::setQueryTracksAndDescriptors(
+  QList<vvDescriptor> descriptors, QList<vvTrack> tracks)
+{
+  QTE_D(vsQfDialog);
+
+  vsQfVideoPlayer* qfVideoPlayer =
+    qobject_cast<vsQfVideoPlayer*>(d->Player);
+  vsQfVideoSource* source = 0;
+  if (qfVideoPlayer)
+    {
+    source = qfVideoPlayer->source();
+    }
+
+  if (source)
+    {
+    descriptors = d->filterDescriptors(source, descriptors);
+    }
+  vvVideoQueryDialog::setQueryTracksAndDescriptors(descriptors, tracks);
+}
+
+//-----------------------------------------------------------------------------
+void vsQfDialog::clearQueryDescriptors()
+{
+  // TODO
+
+  vvVideoQueryDialog::clearQueryDescriptors();
+}
diff --git a/Libraries/VspUserInterface/vsQfDialog.h b/Libraries/VspUserInterface/vsQfDialog.h
new file mode 100644
index 00000000..434edced
--- /dev/null
+++ b/Libraries/VspUserInterface/vsQfDialog.h
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsQfDialog_h
+#define __vsQfDialog_h
+
+#include <qtGlobal.h>
+
+#include <vvDescriptor.h>
+#include <vvQueryFormulation.h>
+
+#include <vvVideoQueryDialog.h>
+
+class vsQfVideoSource;
+
+class vsQfDialogPrivate;
+
+struct vtkVgVideoMetadata;
+
+class vsQfDialog : public vvVideoQueryDialog
+{
+  Q_OBJECT
+
+public:
+  vsQfDialog(vsQfVideoSource* source,
+             QWidget* parent = 0, Qt::WindowFlags flags = 0);
+  ~vsQfDialog();
+
+public slots:
+  virtual int exec();
+
+public slots:
+  virtual void setQueryTracksAndDescriptors(
+    QList<vvDescriptor> descriptors, QList<vvTrack> tracks);
+  virtual void clearQueryDescriptors();
+
+private:
+  QTE_DECLARE_PRIVATE(vsQfDialog)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsQfVideoPlayer.cxx b/Libraries/VspUserInterface/vsQfVideoPlayer.cxx
new file mode 100644
index 00000000..ca6c5c5c
--- /dev/null
+++ b/Libraries/VspUserInterface/vsQfVideoPlayer.cxx
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsQfVideoPlayer.h"
+
+#include <vvQueryVideoPlayerPrivate.h>
+
+#include "vsVideoPlayerModel.h"
+
+// TODO: Why does this include need to come last on MSVC?
+#include "vsQfVideoSource.h"
+
+//-----------------------------------------------------------------------------
+vsQfVideoPlayer::vsQfVideoPlayer(vsQfVideoSource* source, QWidget* parent)
+  : vvQueryVideoPlayer(parent), Source(source)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsQfVideoPlayer::~vsQfVideoPlayer()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoPlayer::buildVideoModel()
+{
+  vsVideoPlayerModel* model = vsVideoPlayerModel::New();
+
+  model->SetVideoSource(this->Source);
+  model->SetUseInternalTimeStamp(1);
+  model->SetSharingSource(1);
+  model->SetLooping(1);
+  model->SetId(0);
+
+  this->Internal->VideoModel = model;
+  model->Delete();
+
+  connect(this->Source,
+          SIGNAL(frameAvailable()),
+          model,
+          SLOT(OnFrameAvailable()));
+
+  connect(model,
+          SIGNAL(FrameAvailable()),
+          this,
+          SLOT(onFrameAvailable()));
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoPlayer::videoHeight()
+{
+  // TODO
+  return 480;
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoPlayer::reset()
+{
+  // TODO
+  vvQueryVideoPlayer::reset();
+}
diff --git a/Libraries/VspUserInterface/vsQfVideoPlayer.h b/Libraries/VspUserInterface/vsQfVideoPlayer.h
new file mode 100644
index 00000000..98cbca2e
--- /dev/null
+++ b/Libraries/VspUserInterface/vsQfVideoPlayer.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsQfVideoPlayer_h
+#define __vsQfVideoPlayer_h
+
+#include <QUrl>
+
+#include <vvQueryVideoPlayer.h>
+
+class vsQfVideoSource;
+
+struct vtkVgVideoMetadata;
+
+class vsQfVideoPlayer : public vvQueryVideoPlayer
+{
+  Q_OBJECT
+
+public:
+  vsQfVideoPlayer(vsQfVideoSource* source, QWidget* parent = 0);
+  ~vsQfVideoPlayer();
+
+  virtual int videoHeight();
+
+  vsQfVideoSource* source() { return this->Source; }
+
+public slots:
+  virtual void reset();
+
+protected:
+  virtual void buildVideoModel();
+
+private:
+  vsQfVideoSource* Source;
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsQfVideoSource.cxx b/Libraries/VspUserInterface/vsQfVideoSource.cxx
new file mode 100644
index 00000000..b00c031b
--- /dev/null
+++ b/Libraries/VspUserInterface/vsQfVideoSource.cxx
@@ -0,0 +1,232 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsQfVideoSource.h"
+
+#include <vtkVgAdapt.h>
+#include <vtkVgVideoFrameData.h>
+#include <vtkVgVideoMetadata.h>
+
+#include <vtkObjectFactory.h>
+#include <vtkMatrix4x4.h>
+
+#include <vgVideoPlayer.h>
+#include <vgVideoSource.h>
+
+vtkStandardNewMacro(vsQfVideoSource);
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::updateVideoFrame(
+  vtkVgVideoFrame frame, qint64 seekRequestId)
+{
+  Q_UNUSED(seekRequestId);
+
+  this->CurrentVideoFrameData->TimeStamp = frame.MetaData.Time;
+  this->CurrentVideoFrameData->VideoImage = frame.Image.GetPointer();
+  this->CurrentVideoMetadata->Gsd = frame.MetaData.Gsd;
+  this->CurrentVideoMetadata->Time = frame.MetaData.Time;
+  this->CurrentVideoMetadata->Homography = frame.MetaData.Homography;
+  this->CurrentVideoMetadata->HomographyReferenceFrame =
+    frame.MetaData.HomographyReferenceFrame;
+
+  emit this->frameAvailable();
+}
+
+//-----------------------------------------------------------------------------
+vsQfVideoSource::vsQfVideoSource()
+  : vtkVgVideoProviderBase(), Player(new vgVideoPlayer)
+{
+  this->RequestId = 0;
+
+  this->CurrentVideoFrameData = new vtkVgVideoFrameData();
+  this->CurrentVideoMetadata = new vtkVgVideoMetadata();
+
+  connect(this->Player.data(),
+          SIGNAL(frameAvailable(vtkVgVideoFrame, qint64)),
+          SLOT(updateVideoFrame(vtkVgVideoFrame, qint64)));
+
+  // Is this a valid assumption?
+  this->SetTimeInterval(1.0);
+}
+
+//-----------------------------------------------------------------------------
+vsQfVideoSource::~vsQfVideoSource()
+{
+  delete this->CurrentVideoFrameData;
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::SetTimeRange(double a, double b)
+{
+  this->Superclass::SetTimeRange(a, b);
+  this->UpdatePlayerFrameRange();
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::SetTimeRange(double range[2])
+{
+  this->Superclass::SetTimeRange(range);
+  this->UpdatePlayerFrameRange();
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::UpdatePlayerFrameRange()
+{
+  this->Player->setSourceFrameRange(
+    vtkVgTimeStamp(this->TimeRange[0]),
+    vtkVgTimeStamp(this->TimeRange[1]));
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::SetSource(vgVideoSource* source)
+{
+  this->Player->setVideoSource(source);
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::Play()
+{
+  this->Player->setPlaybackSpeed(vgVideoPlayer::Playing);
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::Pause()
+{
+  this->Player->setPlaybackSpeed(vgVideoPlayer::Paused);
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::Stop()
+{
+  this->Player->setPlaybackSpeed(vgVideoPlayer::Stopped);
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::GetFrame(
+  vtkVgVideoFrameData* vtkNotUsed(frameData), double time)
+{
+  this->Player->seekToTimestamp(this->RequestId++, vtkVgTimeStamp(time));
+
+  // indicate asynchronous
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::GetFrame(
+  vtkVgVideoFrameData* vtkNotUsed(frameData), int vtkNotUsed(frameNumber))
+{
+  // \TODO: Need to implement this.
+  return VTK_ERROR;
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::GetNextFrame(vtkVgVideoFrameData* vtkNotUsed(frameData))
+{
+  double time = this->CurrentVideoFrameData->TimeStamp.GetTime() + 1.0e4;
+  this->Player->seekToTimestamp(this->RequestId++, vtkVgTimeStamp(time),
+                                vg::SeekLowerBound);
+
+  // indicate asynchronous
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::GetCurrentFrame(vtkVgVideoFrameData* frameData)
+{
+  frameData->TimeStamp = this->CurrentVideoFrameData->TimeStamp;
+  frameData->VideoImage->ShallowCopy(this->CurrentVideoFrameData->VideoImage);
+  frameData->VideoMatrix = this->CurrentVideoFrameData->VideoMatrix;
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::GetPreviousFrame(
+  vtkVgVideoFrameData* vtkNotUsed(frameData))
+{
+  double time = this->CurrentVideoFrameData->TimeStamp.GetTime() - 1.0e4;
+  this->Player->seekToTimestamp(this->RequestId++, vtkVgTimeStamp(time),
+                                vg::SeekUpperBound);
+
+  // indicate asynchronous
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::GetNumberOfFrames()
+{
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::GetCurrentMetadata(vtkVgVideoMetadata* metadata)
+{
+  *metadata = *this->CurrentVideoMetadata;
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::SetMetadata(
+  const std::map<vtkVgTimeStamp, vtkVgVideoMetadata>& allMetadata)
+{
+  this->AllMetadata = allMetadata;
+}
+
+//-----------------------------------------------------------------------------
+std::map<vtkVgTimeStamp, vtkVgVideoMetadata> vsQfVideoSource::GetMetadata()
+{
+  return this->AllMetadata;
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::GetVideoHeight()
+{
+  // TODO
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::Update()
+{
+  if (!this->CurrentVideoFrameData->TimeStamp.IsValid())
+    {
+    // Get first frame
+    this->Player->seekToTimestamp(this->RequestId++,
+                                  vtkVgTimeStamp(this->TimeRange[0]));
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vsQfVideoSource::Reset()
+{
+  *this->CurrentVideoFrameData = vtkVgVideoFrameData();
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::ShallowCopy(vtkVgDataSourceBase& other)
+{
+  this->Superclass::ShallowCopy(other);
+
+  vsQfVideoSource* otherDerived = vsQfVideoSource::SafeDownCast(&other);
+
+  if (otherDerived)
+    {
+    // TODO
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsQfVideoSource::DeepCopy(vtkVgDataSourceBase& other)
+{
+  this->Superclass::DeepCopy(other);
+
+  vsQfVideoSource* otherDerived = vsQfVideoSource::SafeDownCast(&other);
+
+  if (otherDerived)
+    {
+    // TODO
+    }
+}
diff --git a/Libraries/VspUserInterface/vsQfVideoSource.h b/Libraries/VspUserInterface/vsQfVideoSource.h
new file mode 100644
index 00000000..8f57a6ef
--- /dev/null
+++ b/Libraries/VspUserInterface/vsQfVideoSource.h
@@ -0,0 +1,96 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsQfVideoSource_h
+#define __vsQfVideoSource_h
+
+#include <QObject>
+
+#include <vtkVgMacros.h>
+#include <vtkVgVideoProviderBase.h>
+
+#include <vtkVgVideoFrame.h>
+
+class vgVideoPlayer;
+class vgVideoSource;
+
+class vsQfVideoSource : public QObject, public vtkVgVideoProviderBase
+{
+  Q_OBJECT
+
+public:
+  vtkVgClassMacro(vsQfVideoSource);
+
+  vtkTypeMacro(vsQfVideoSource, vtkVgVideoProviderBase);
+
+  static vsQfVideoSource* New();
+
+  void SetSource(vgVideoSource*);
+
+  void Play();
+  void Pause();
+  void Stop();
+
+  virtual void SetTimeRange(double, double);
+  virtual void SetTimeRange(double[2]);
+
+  virtual int GetFrame(vtkVgVideoFrameData* frameData, double time);
+  virtual int GetFrame(vtkVgVideoFrameData* frameData, int frameNumber);
+
+  virtual int GetNextFrame(vtkVgVideoFrameData* frameData);
+  virtual int GetCurrentFrame(vtkVgVideoFrameData* frameData);
+  virtual int GetPreviousFrame(vtkVgVideoFrameData* frameData);
+
+  virtual int GetNumberOfFrames();
+
+  void SetMetadata(
+    const std::map<vtkVgTimeStamp, vtkVgVideoMetadata>& allMetadata);
+
+  virtual std::map<vtkVgTimeStamp, vtkVgVideoMetadata> GetMetadata();
+
+  virtual int GetCurrentMetadata(vtkVgVideoMetadata* metadata);
+
+  virtual int GetVideoHeight();
+
+  virtual void Update();
+
+  virtual int Reset();
+
+  virtual bool Advance() { return false; }
+  virtual bool Recede() { return false; }
+  virtual bool SeekNearestEarlier(double) { return false; }
+
+  virtual void ShallowCopy(vtkVgDataSourceBase& other);
+  virtual void DeepCopy(vtkVgDataSourceBase& other);
+
+signals:
+  void frameAvailable();
+
+protected slots:
+  void updateVideoFrame(vtkVgVideoFrame, qint64 seekRequestId);
+
+protected:
+  vsQfVideoSource();
+  virtual ~vsQfVideoSource();
+
+  void UpdatePlayerFrameRange();
+
+  vtkVgVideoFrameData* CurrentVideoFrameData;
+  vtkVgVideoMetadata* CurrentVideoMetadata;
+
+  std::map<vtkVgTimeStamp, vtkVgVideoMetadata> AllMetadata;
+
+  vtkVgVideoFrame* Frame;
+  QScopedPointer<vgVideoPlayer> Player;
+
+  qint64 RequestId;
+
+private:
+  vsQfVideoSource(const vsQfVideoSource&); // Not implemented.
+  void operator=(const vsQfVideoSource&); // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsRegionList.cxx b/Libraries/VspUserInterface/vsRegionList.cxx
new file mode 100644
index 00000000..8c91fbf6
--- /dev/null
+++ b/Libraries/VspUserInterface/vsRegionList.cxx
@@ -0,0 +1,324 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsRegionList.h"
+
+#include <QContextMenuEvent>
+#include <QMenu>
+#include <QSignalMapper>
+
+#include "vsRegionTypeDelegate.h"
+
+namespace // anonymous
+{
+
+enum DataRole
+{
+  IdRole = Qt::UserRole,
+  NameRole,
+  VisibilityRole
+};
+
+//-----------------------------------------------------------------------------
+int itemId(QTreeWidgetItem* item)
+{
+  return item->data(0, IdRole).toInt();
+}
+
+//-----------------------------------------------------------------------------
+void setItemId(QTreeWidgetItem* item, int newId)
+{
+  item->setData(0, IdRole, QVariant(newId));
+}
+
+//-----------------------------------------------------------------------------
+QString itemName(QTreeWidgetItem* item)
+{
+  return item->data(0, NameRole).toString();
+}
+
+//-----------------------------------------------------------------------------
+void setItemName(QTreeWidgetItem* item, const QString& newName)
+{
+  item->setData(0, NameRole, QVariant(newName));
+  item->setText(0, newName);
+}
+
+//-----------------------------------------------------------------------------
+bool itemVisibility(QTreeWidgetItem* item)
+{
+  return item->data(0, VisibilityRole).toBool();
+}
+
+//-----------------------------------------------------------------------------
+void setItemVisibility(QTreeWidgetItem* item, bool newVisibility)
+{
+  item->setData(0, VisibilityRole, QVariant(newVisibility));
+  item->setCheckState(0, newVisibility ? Qt::Checked : Qt::Unchecked);
+}
+
+//-----------------------------------------------------------------------------
+vsContour::Type itemType(QTreeWidgetItem* item)
+{
+  return item->data(1, Qt::UserRole).value<vsContour::Type>();
+}
+
+//-----------------------------------------------------------------------------
+void setItemType(QTreeWidgetItem* item, vsContour::Type newType)
+{
+  QVariant typeData = QVariant::fromValue<vsContour::Type>(newType);
+  item->setData(1, Qt::UserRole, typeData);
+  item->setText(1, vsContour::typeString(newType));
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vsRegionListPrivate
+{
+public:
+  vsRegionListPrivate() : ConvertEventMenu(0), ShowHidden(true) {}
+
+  QMenu* ContextMenu;
+  QMenu* ConvertEventMenu;
+  QSignalMapper* ConvertEventMapper;
+
+  bool ShowHidden;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsRegionList)
+
+//-----------------------------------------------------------------------------
+vsRegionList::vsRegionList(QWidget* parent)
+  : QTreeWidget(parent), d_ptr(new vsRegionListPrivate)
+{
+  QTE_D(vsRegionList);
+
+  vsRegionTypeDelegate* delegate = new vsRegionTypeDelegate(this);
+  this->setItemDelegateForColumn(1, delegate);
+
+  connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(updateRegionFromItem(QTreeWidgetItem*, int)));
+  connect(this, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateSelectionStatus()));
+
+  d->ContextMenu = new QMenu(this);
+  d->ConvertEventMapper = new QSignalMapper(this);
+  connect(d->ConvertEventMapper, SIGNAL(mapped(int)),
+          this, SLOT(convertSelectedToEvents(int)));
+}
+
+//-----------------------------------------------------------------------------
+vsRegionList::~vsRegionList()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::addRegion(vsContour contour)
+{
+  const int id = contour.id();
+
+  QTreeWidgetItem* item = new QTreeWidgetItem;
+  setItemId(item, id);
+  setItemName(item, contour.name());
+  setItemType(item, contour.type());
+  setItemVisibility(item, true);
+  item->setFlags(item->flags() | Qt::ItemIsEditable | Qt::ItemIsUserCheckable);
+  this->addTopLevelItem(item);
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::setRegionName(int id, QString newName)
+{
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    {
+    if (itemId(item) == id)
+      {
+      setItemName(item, newName);
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::setRegionType(int id, vsContour::Type newType)
+{
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    {
+    if (itemId(item) == id)
+      {
+      setItemType(item, newType);
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::removeRegion(int id)
+{
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    {
+    if (itemId(item) == id)
+      {
+      delete item;
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::removeSelected()
+{
+  int k = 0;
+  foreach (QTreeWidgetItem* item, this->selectedItems())
+    {
+    emit this->regionRemoved(itemId(item));
+    ++k;
+    }
+  this->emitRemovalStatus(k);
+  // Item(s) will be removed on signal from vsCore
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::removeAll()
+{
+  int k = 0;
+  foreach (QTreeWidgetItem* item, this->invisibleRootItem()->takeChildren())
+    {
+    emit this->regionRemoved(itemId(item));
+    ++k;
+    }
+  this->emitRemovalStatus(k);
+  // Item(s) will be removed on signal from vsCore
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::emitRemovalStatus(int numRemoved)
+{
+  return; // \TODO
+
+  QString message;
+  if (numRemoved)
+    {
+    const char* n = (numRemoved > 1 ? "regions" : "region");
+    message = QString("Removed %2 %1").arg(n).arg(numRemoved);
+    }
+  else
+    {
+    message = "No regions were removed";
+    }
+  // \TODO emit status message
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::setShowHidden(bool newFlag)
+{
+  QTE_D(vsRegionList);
+
+  if (newFlag != d->ShowHidden)
+    {
+    d->ShowHidden = newFlag;
+    for (int i = 0, count = this->topLevelItemCount(); i < count; ++i)
+      {
+      QTreeWidgetItem* item = this->topLevelItem(i);
+      bool show = itemVisibility(item) || d->ShowHidden;
+      item->setHidden(!show);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::updateRegionFromItem(QTreeWidgetItem* item, int column)
+{
+  QTE_D(vsRegionList);
+
+  const int id = itemId(item);
+
+  switch (column)
+    {
+    case 0:
+      {
+      QString newName = item->text(0);
+      bool newVisibility = (item->checkState(0) == Qt::Checked);
+
+      // Check if visibility changed
+      if (newVisibility != itemVisibility(item))
+        {
+        setItemVisibility(item, newVisibility);
+        item->setHidden(!(newVisibility || d->ShowHidden));
+        emit this->regionVisibilityChanged(id, newVisibility);
+        }
+
+      // Check if name changed
+      if (newName != itemName(item))
+        emit this->regionNameChanged(id, newName);
+      } break;
+
+    case 1:
+      emit this->regionTypeChanged(id, itemType(item));
+      break;
+
+    default:
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::updateSelectionStatus()
+{
+  emit this->selectionStatusChanged(!this->selectedItems().isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::addContextMenuAction(QAction* action)
+{
+  QTE_D(vsRegionList);
+  d->ContextMenu->addAction(action);
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::contextMenuEvent(QContextMenuEvent* event)
+{
+  if (!this->selectedItems().isEmpty())
+    {
+    QTE_D(vsRegionList);
+    d->ContextMenu->exec(event->globalPos());
+    return;
+    }
+
+  QWidget::contextMenuEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::setEventTypes(QList<vsEventInfo> types)
+{
+  QTE_D(vsRegionList);
+
+  if (!d->ConvertEventMenu)
+    {
+    d->ConvertEventMenu = new QMenu("Convert to &Event", this);
+    d->ContextMenu->addMenu(d->ConvertEventMenu);
+    }
+
+  qDeleteAll(d->ConvertEventMenu->actions());
+  foreach (const vsEventInfo& ei, types)
+    {
+    QAction* action =
+      d->ConvertEventMenu->addAction(ei.name,
+                                     d->ConvertEventMapper, SLOT(map()));
+    d->ConvertEventMapper->setMapping(action, ei.type);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRegionList::convertSelectedToEvents(int type)
+{
+  foreach (QTreeWidgetItem* item, this->selectedItems())
+    {
+    // Actual conversion done by vsCore
+    emit this->regionConvertedToEvent(itemId(item), type);
+    }
+}
diff --git a/Libraries/VspUserInterface/vsRegionList.h b/Libraries/VspUserInterface/vsRegionList.h
new file mode 100644
index 00000000..80074b89
--- /dev/null
+++ b/Libraries/VspUserInterface/vsRegionList.h
@@ -0,0 +1,67 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsRegionList_h
+#define __vsRegionList_h
+
+#include <QTreeWidget>
+
+#include <vsContour.h>
+#include <vsEventInfo.h>
+
+class vsRegionListPrivate;
+
+class vsRegionList : public QTreeWidget
+{
+  Q_OBJECT
+
+public:
+  vsRegionList(QWidget* parent);
+  ~vsRegionList();
+
+  void addContextMenuAction(QAction*);
+
+signals:
+  void regionNameChanged(int id, QString newName);
+  void regionTypeChanged(int id, vsContour::Type newType);
+  void regionVisibilityChanged(int id, bool visible);
+  void regionRemoved(int id);
+  void regionConvertedToEvent(int id, int eventType);
+
+  void selectionStatusChanged(bool selectionIsNonEmpty);
+
+public slots:
+  void addRegion(vsContour);
+  void setRegionName(int id, QString);
+  void setRegionType(int id, vsContour::Type);
+  void removeRegion(int id);
+
+  void removeSelected();
+  void removeAll();
+
+  void setShowHidden(bool);
+
+  void setEventTypes(QList<vsEventInfo>);
+
+  void convertSelectedToEvents(int type);
+
+protected slots:
+  void updateRegionFromItem(QTreeWidgetItem* item, int column);
+  void updateSelectionStatus();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsRegionList)
+
+  virtual void contextMenuEvent(QContextMenuEvent*) QTE_OVERRIDE;
+
+  void emitRemovalStatus(int numRemoved);
+
+private:
+  QTE_DECLARE_PRIVATE(vsRegionList)
+  Q_DISABLE_COPY(vsRegionList)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsRegionTypeDelegate.cxx b/Libraries/VspUserInterface/vsRegionTypeDelegate.cxx
new file mode 100644
index 00000000..3cda374d
--- /dev/null
+++ b/Libraries/VspUserInterface/vsRegionTypeDelegate.cxx
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsRegionTypeDelegate.h"
+
+#include <QComboBox>
+
+#include <vsContour.h>
+
+//-----------------------------------------------------------------------------
+vsRegionTypeDelegate::vsRegionTypeDelegate(QObject* parent)
+  : qtComboBoxDelegate(parent)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsRegionTypeDelegate::~vsRegionTypeDelegate()
+{
+}
+
+//-----------------------------------------------------------------------------
+QWidget* vsRegionTypeDelegate::createListEditor(QWidget* parent) const
+{
+  QWidget* widget = qtComboBoxDelegate::createListEditor(parent);
+  vsContour::populateTypeWidget(qobject_cast<QComboBox*>(widget));
+  return widget;
+}
+
+//-----------------------------------------------------------------------------
+bool vsRegionTypeDelegate::compareData(
+  const QVariant& a, const QVariant& b) const
+{
+  if (a.canConvert<vsContour::Type>() && b.canConvert<vsContour::Type>())
+    return a.value<vsContour::Type>() == b.value<vsContour::Type>();
+  return qtComboBoxDelegate::compareData(a, b);
+}
diff --git a/Libraries/VspUserInterface/vsRegionTypeDelegate.h b/Libraries/VspUserInterface/vsRegionTypeDelegate.h
new file mode 100644
index 00000000..ee7e3f54
--- /dev/null
+++ b/Libraries/VspUserInterface/vsRegionTypeDelegate.h
@@ -0,0 +1,28 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsRegionTypeDelegate_h
+#define __vsRegionTypeDelegate_h
+
+#include <qtComboBoxDelegate.h>
+
+class vsRegionTypeDelegate : public qtComboBoxDelegate
+{
+public:
+  vsRegionTypeDelegate(QObject* parent = 0);
+  virtual ~vsRegionTypeDelegate();
+
+protected:
+  virtual QWidget* createListEditor(QWidget* parent) const;
+
+protected:
+  virtual bool compareData(const QVariant&, const QVariant&) const;
+
+private:
+  Q_DISABLE_COPY(vsRegionTypeDelegate)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsScene.cxx b/Libraries/VspUserInterface/vsScene.cxx
new file mode 100644
index 00000000..d3bc2713
--- /dev/null
+++ b/Libraries/VspUserInterface/vsScene.cxx
@@ -0,0 +1,2166 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsScene.h"
+#include "vsScenePrivate.h"
+
+#include <QApplication>
+#include <QClipboard>
+#include <QMenu>
+
+#include <qtGradient.h>
+#include <qtStlUtil.h>
+
+#include <vtkAssembly.h>
+#include <vtkCamera.h>
+#include <vtkImageActor.h>
+#include <vtkImageProperty.h>
+#include <vtkLookupTable.h>
+#include <vtkPoints.h>
+#include <vtkProp3DCollection.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderer.h>
+#include <vtkPNGReader.h>
+#include <vtkPNGWriter.h>
+#include <vtkTimerLog.h>
+#include <vtkWindowToImageFilter.h>
+#include <QVTKWidget.h>
+
+#include <vtkVgContourOperatorManager.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventFilter.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgInteractorStyleRubberBand2D.h>
+#include <vtkVgSpaceConversion.h>
+#include <vtkVgTrack.h>
+#include <vtkVgUtil.h>
+
+#include <vtkVgEventLabelRepresentation.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgEventRepresentation.h>
+#include <vtkVgTrackFilter.h>
+#include <vtkVgTrackHeadRepresentation.h>
+#include <vtkVgTrackLabelRepresentation.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+
+#include <vgCheckArg.h>
+#include <vgRange.h>
+
+#include <vtkVgQtAdapt.h>
+#include <vtkVgQtUtil.h>
+
+#include <vgMixerWidget.h>
+#include <vgTextEditDialog.h>
+
+#include "vsAlertList.h"
+#include "vsContourWidget.h"
+#include "vsCore.h"
+#include "vsDebug.h"
+#include "vsEventRatingMenu.h"
+#include "vsEventTreeModel.h"
+#include "vsEventTreeSelectionModel.h"
+#include "vsEventTreeView.h"
+#include "vsEventTreeWidget.h"
+#include "vsRegionList.h"
+#include "vsSettings.h"
+#include "vsTrackInfo.h"
+#include "vsTrackTreeModel.h"
+#include "vsTrackTreeWidget.h"
+
+QTE_IMPLEMENT_D_FUNC(vsScene)
+
+#define FORWARD_SIGNAL(_so, _sn, _dn, _p) \
+  connect(_so, SIGNAL(_sn _p), this, SIGNAL(_dn _p))
+
+//-----------------------------------------------------------------------------
+vsScene::vsScene(vsCore* core, QObject* parent)
+  : QObject(parent), d_ptr(new vsScenePrivate(this, core))
+{
+  QTE_D(vsScene);
+
+  // Initialize the homography reference frame to MinTime to handle case of KWA
+  // older than v3 for which we don't have reference frame info, and thus want
+  // to ignore the reference frame (which setting to MinTime will do)
+  d->CurrentHomographyReferenceTime.SetToMinTime();
+
+  // Connect our outputs to core inputs
+  connect(this, SIGNAL(contourCompleted(vsContour)),
+          core, SLOT(addContour(vsContour)));
+
+  // Connect to core outputs
+  connect(core, SIGNAL(updated()), this, SLOT(postUpdate()));
+
+  connect(core, SIGNAL(videoSourceChanged(vsVideoSource*)),
+          this, SLOT(resetVideo(vsVideoSource*)));
+
+  connect(core, SIGNAL(contourAdded(vsContour)),
+          this, SLOT(addContour(vsContour)));
+  connect(core, SIGNAL(contourTypeChanged(int, vsContour::Type)),
+          this, SLOT(setContourType(int, vsContour::Type)));
+  connect(core, SIGNAL(contourPointsChanged(int, QPolygonF)),
+          this, SLOT(setContourPoints(int, QPolygonF)));
+  connect(core, SIGNAL(contourRemoved(int)),
+          this, SLOT(removeContour(int)));
+
+  connect(core, SIGNAL(userEventTypeAdded(int, vsEventInfo, double)),
+          this, SLOT(addUserEventType(int, vsEventInfo, double)));
+
+  connect(core, SIGNAL(alertAdded(int, vsAlert)),
+          this, SLOT(addAlert(int, vsAlert)));
+  connect(core, SIGNAL(alertChanged(int, vsAlert)),
+          this, SLOT(updateAlert(int, vsAlert)));
+
+  connect(core, SIGNAL(manualEventCreated(vtkIdType)),
+          this, SLOT(startQuickNoteTimer(vtkIdType)));
+
+  // Connect video player
+  connect(&d->VideoPlayer, SIGNAL(frameAvailable(vtkVgVideoFrame, qint64)),
+          this, SLOT(updateVideoFrame(vtkVgVideoFrame, qint64)));
+  FORWARD_SIGNAL(&d->VideoPlayer, playbackSpeedChanged, playbackStatusChanged,
+                 (vgVideoPlayer::PlaybackMode, qreal));
+  FORWARD_SIGNAL(&d->VideoPlayer, seekRequestDiscarded,
+                 videoSeekRequestDiscarded, (qint64, vtkVgTimeStamp));
+  d->VideoPlayer.setDebugArea(vsdVideoPlayback);
+
+  // Set default track trail length (will trigger an update)
+  this->setTrackTrailLength(4.0);
+
+  d->TimerLog = vtkSmartPointer<vtkTimerLog>::New();
+  d->LastManualEventCreated = -1;
+}
+
+//-----------------------------------------------------------------------------
+vsScene::~vsScene()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setupUi(QVTKWidget* renderWidget)
+{
+  QTE_D(vsScene);
+
+  d->RenderWidget = renderWidget;
+
+  // Everything in the scene should fall between z = (-1.0, 1.0). Exploit this
+  // to improve our depth buffer resolution.
+  d->Renderer->GetActiveCamera()->ParallelProjectionOn();
+  d->Renderer->GetActiveCamera()->SetClippingRange(1.0, 3.0);
+  d->Renderer->GetActiveCamera()->SetPosition(0.0, 0.0, 2.0);
+
+  // Set up render pipeline
+  d->Renderer->SetBackground(0, 0, 0);
+  d->RenderWindow->AddRenderer(d->Renderer);
+  renderWidget->SetRenderWindow(d->RenderWindow);
+
+  // Don't allow camera rotation since it confuses contour drawing
+  vtkVgInteractorStyleRubberBand2D* style =
+    vtkVgInteractorStyleRubberBand2D::New();
+  style->SetRenderer(d->Renderer);
+  renderWidget->GetInteractor()->SetInteractorStyle(style);
+  style->FastDelete();
+
+  // Listen for 'pick' events, and connect context menu and position display
+  vtkConnect(style, vtkVgInteractorStyleRubberBand2D::LeftClickEvent,
+             this, SLOT(onLeftClick()));
+  vtkConnect(style, vtkVgInteractorStyleRubberBand2D::RightClickEvent,
+             this, SLOT(onRightClick()));
+  vtkConnect(renderWidget->GetInteractor(), vtkCommand::MouseMoveEvent,
+             this, SLOT(vtkSceneMouseMoveEvent()));
+  vtkConnect(renderWidget->GetInteractor(), vtkCommand::LeaveEvent,
+             this, SLOT(vtkSceneLeaveEvent()));
+
+  // Set up video display (must feed a dummy initial frame)
+  d->ImageActor->SetInputData(vsScenePrivate::createDummyImage());
+  d->Renderer->AddViewProp(d->ImageActor);
+  d->ImageActor->SetPosition(0.0, 0.0, -0.2);
+
+  // Set up track and event display
+  d->setupRepresentations(d->NormalGraph);
+  d->setupRepresentations(d->GroundTruthGraph, 1.5f);
+
+  // Add to renderer; tracks go *after* events so that translucent events will
+  // mask underlying tracks...
+  d->Renderer->AddViewProp(d->EventPropsBegin);
+  d->Renderer->AddViewProp(d->TrackPropsBegin);
+
+  // Add mask props (in order of rendering)
+  //
+  // NOTE: To avoid rendering artifacts, newer filter masks are positioned
+  // further from the camera than older ones, and selector masks must be closer
+  // to the camera than the mask quad; depth testing will be enabled for
+  // this geometry even though masks may be translucent
+  d->Renderer->AddViewProp(d->FilterMaskProps);
+  d->Renderer->AddViewProp(d->SelectorMaskProps);
+  d->Renderer->AddViewProp(d->SelectorMaskQuad);
+  d->Renderer->AddViewProp(d->TrackingMask);
+  d->SelectorMaskQuad->SetPosition(0.0, 0.0, -0.15);
+
+  // setup outputing images from render window
+  d->WindowToImageFilter = vtkSmartPointer<vtkWindowToImageFilter>::New();
+  d->WindowToImageFilter->SetInput(d->RenderWindow);
+  d->PngWriter = vtkSmartPointer<vtkPNGWriter>::New();
+  d->PngWriter->SetInputConnection(d->WindowToImageFilter->GetOutputPort());
+
+  vtkConnect(d->RenderWindow, vtkCommand::RenderEvent,
+             this, SLOT(writeRenderedImages()));
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setupFilterWidget(vgMixerWidget* filterWidget)
+{
+  QTE_D(vsScene);
+
+  d->FilterWidget = filterWidget;
+
+  // Connect signals/slots first so changes to defaults are seen
+  connect(filterWidget, SIGNAL(stateChanged(int, bool)),
+          this, SLOT(setEventVisibility(int, bool)));
+  connect(filterWidget, SIGNAL(valueChanged(int, double)),
+          this, SLOT(setEventThreshold(int, double)));
+
+  // Set up object type filters
+  int groupId = filterWidget->addGroup("Object Type");
+  filterWidget->setExpanded(groupId);
+  foreach (vsTrackInfo ti, vsTrackInfo::trackTypes())
+    {
+    if (ti.id != vsTrackInfo::Unclassified)
+      filterWidget->addItem(ti.id, ti.name, groupId);
+    }
+
+  // Set up groups for event type filters
+  d->createFilterEventGroup("Event Type", vsEventInfo::All, true);
+  d->createFilterEventGroup("Classifier", vsEventInfo::Classifier);
+  d->createFilterEventGroup("User Defined", vsEventInfo::User);
+  d->createFilterEventGroup("Alert", vsEventInfo::Alert);
+  d->createFilterEventGroup("General", vsEventInfo::General);
+  d->createFilterEventGroup("Person", vsEventInfo::Person,
+                            vsEventInfo::Classifier);
+  d->createFilterEventGroup("Vehicle", vsEventInfo::Vehicle,
+                            vsEventInfo::Classifier);
+
+  // Set up (built-in) event type filters
+  d->setupFilterEventGroup(vsEventInfo::Person);
+  d->setupFilterEventGroup(vsEventInfo::Vehicle);
+  d->setupFilterEventGroup(vsEventInfo::General, true);
+  d->setupFilterEventGroup(d->Core->manualEventTypes(),
+                           vsEventInfo::User, true);
+
+  // Show filters when needed
+  d->setFilterEventGroupVisibility(vsEventInfo::Classifier);
+  d->setFilterEventGroupVisibility(vsEventInfo::User);
+  d->setFilterEventGroupVisibility(vsEventInfo::Alert);
+  d->setFilterEventGroupVisibility(vsEventInfo::General);
+
+  connect(d->Core, SIGNAL(eventGroupExpected(vsEventInfo::Group)),
+          this, SLOT(showEventGroupFilter(vsEventInfo::Group)));
+  connect(d->Core, SIGNAL(alertRemoved(int, bool)),
+          this, SLOT(removeAlert(int, bool)));
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setupRegionList(vsRegionList* list)
+{
+  QTE_D(vsScene);
+
+  vsCore* core = d->Core; // just so connections look neater
+
+  connect(core, SIGNAL(contourAdded(vsContour)),
+          list, SLOT(addRegion(vsContour)));
+  connect(core, SIGNAL(contourNameChanged(int, QString)),
+          list, SLOT(setRegionName(int, QString)));
+  connect(core, SIGNAL(contourTypeChanged(int, vsContour::Type)),
+          list, SLOT(setRegionType(int, vsContour::Type)));
+  connect(core, SIGNAL(contourRemoved(int)),
+          list, SLOT(removeRegion(int)));
+
+  connect(list, SIGNAL(regionNameChanged(int, QString)),
+          core, SLOT(setContourName(int, QString)));
+  connect(list, SIGNAL(regionTypeChanged(int, vsContour::Type)),
+          core, SLOT(setContourType(int, vsContour::Type)));
+  connect(list, SIGNAL(regionVisibilityChanged(int, bool)),
+          this, SLOT(setContourEnabled(int, bool)));
+  connect(list, SIGNAL(regionRemoved(int)),
+          core, SLOT(removeContour(int)));
+
+  connect(core, SIGNAL(manualEventTypesUpdated(QList<vsEventInfo>)),
+          list, SLOT(setEventTypes(QList<vsEventInfo>)));
+  connect(list, SIGNAL(regionConvertedToEvent(int, int)),
+          this, SLOT(convertContourToEvent(int, int)));
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setupAlertList(vsAlertList* list)
+{
+  QTE_D(vsScene);
+
+  vsCore* core = d->Core; // just so connections look neater
+
+  list->setSwatchCache(core->swatchCache());
+
+  connect(core, SIGNAL(alertAdded(int, vsAlert)),
+          list, SLOT(addAlert(int, vsAlert)));
+  connect(core, SIGNAL(alertChanged(int, vsAlert)),
+          list, SLOT(updateAlert(int, vsAlert)));
+  connect(core, SIGNAL(alertMatchesChanged(int, int)),
+          list, SLOT(setAlertMatches(int, int)));
+  connect(core, SIGNAL(alertEnabledChanged(int, bool)),
+          list, SLOT(setAlertEnabled(int, bool)));
+  connect(core, SIGNAL(alertRemoved(int, bool)),
+          list, SLOT(removeAlert(int)));
+
+  connect(list, SIGNAL(alertChanged(int, vsAlert)),
+          core, SLOT(updateAlert(int, vsAlert)));
+  connect(list, SIGNAL(alertActivationChanged(int, bool)),
+          core, SLOT(setAlertEnabled(int, bool)));
+  connect(list, SIGNAL(alertRemoved(int)),
+          core, SLOT(removeAlert(int)));
+
+  connect(this, SIGNAL(alertThresholdChanged(int, double)),
+          list, SLOT(updateAlertThreshold(int, double)));
+  connect(list, SIGNAL(alertChanged(int, vsAlert)),
+          this, SLOT(updateAlertThreshold(int, vsAlert)));
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setupEventTree(
+  vsEventTreeWidget* eventTree,
+  vsEventTreeWidget* verifiedTree,
+  vsEventTreeWidget* rejectedTree)
+{
+  QTE_D(vsScene);
+
+  d->EventTreeModel =
+    new vsEventTreeModel(this, d->EventFilter, d->Core->eventTypeRegistry(),
+                         d->Core->swatchCache(), this);
+  d->EventTreeSelectionModel =
+    new vsEventTreeSelectionModel(d->EventTreeModel, this);
+
+  connect(d->EventTreeModel, SIGNAL(eventRatingChanged(vtkIdType, int)),
+          d->Core, SLOT(setEventRating(vtkIdType, int)));
+  connect(d->EventTreeModel, SIGNAL(eventStatusChanged(vtkIdType, int)),
+          d->Core, SLOT(setEventStatus(vtkIdType, int)));
+  connect(d->EventTreeModel, SIGNAL(eventNoteChanged(vtkIdType, QString)),
+          d->Core, SLOT(setEventNote(vtkIdType, QString)));
+  connect(d->Core, SIGNAL(eventAdded(vtkVgEvent*)),
+          d->EventTreeModel, SLOT(addEvent(vtkVgEvent*)));
+  connect(d->Core, SIGNAL(eventChanged(vtkVgEvent*)),
+          d->EventTreeModel, SLOT(updateEvent(vtkVgEvent*)));
+  connect(d->Core, SIGNAL(eventRemoved(vtkIdType)),
+          d->EventTreeModel, SLOT(removeEvent(vtkIdType)));
+  connect(d->Core, SIGNAL(eventStatusChanged(vtkVgEvent*, int)),
+          this, SLOT(setEventStatus(vtkVgEvent*, int)));
+  connect(d->Core, SIGNAL(eventRatingChanged(vtkVgEvent*, int)),
+          d->EventTreeModel, SLOT(updateEvent(vtkVgEvent*)));
+
+  connect(d->EventTreeSelectionModel, SIGNAL(selectionChanged(QSet<vtkIdType>)),
+          this, SLOT(updateEventSelection(QSet<vtkIdType>)));
+
+  rejectedTree->setHiddenItemsShown(true);
+
+  this->setupEventTree(eventTree, vs::UnverifiedEvent);
+  this->setupEventTree(verifiedTree, vs::VerifiedEvent);
+  this->setupEventTree(rejectedTree, vs::RejectedEvent);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setupEventTree(vsEventTreeWidget* tree, int type)
+{
+  QTE_D(vsScene);
+
+  tree->setStatusFilter(static_cast<vsEventStatus>(type));
+  tree->setModel(d->EventTreeModel);
+  tree->setSelectionModel(d->EventTreeSelectionModel);
+
+  connect(tree, SIGNAL(jumpToEvent(vtkIdType, bool)),
+          this, SLOT(jumpToEvent(vtkIdType, bool)));
+
+  connect(tree, SIGNAL(setEventStartRequested(vtkIdType)),
+          this, SLOT(setEventStart(vtkIdType)));
+  connect(tree, SIGNAL(setEventEndRequested(vtkIdType)),
+          this, SLOT(setEventEnd(vtkIdType)));
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setupTrackTree(vsTrackTreeWidget* tree)
+{
+  QTE_D(vsScene);
+
+  d->TrackTreeModel =
+    new vsTrackTreeModel(d->Core, this, d->TrackFilter, this);
+
+  d->updateTrackTreeColors();
+
+  connect(d->Core, SIGNAL(trackAdded(vtkVgTrack*)),
+          d->TrackTreeModel, SLOT(addTrack(vtkVgTrack*)));
+  connect(d->Core, SIGNAL(trackChanged(vtkVgTrack*)),
+          d->TrackTreeModel, SLOT(updateTrack(vtkVgTrack*)));
+  connect(tree, SIGNAL(jumpToTrack(vtkIdType, bool)),
+          this, SLOT(jumpToTrack(vtkIdType, bool)));
+  connect(this, SIGNAL(pickedTrack(vtkIdType)),
+          tree, SLOT(selectTrack(vtkIdType)));
+  connect(tree, SIGNAL(trackFollowingRequested(vtkIdType)),
+          d->Core, SLOT(startFollowingTrack(vtkIdType)));
+  connect(tree, SIGNAL(trackFollowingCanceled()),
+          d->Core, SLOT(stopFollowingTrack()));
+
+  tree->setModel(d->TrackTreeModel);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::showEventGroupFilter(vsEventInfo::Group group)
+{
+  this->setEventGroupFilterVisible(group, true);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::hideEventGroupFilter(vsEventInfo::Group group)
+{
+  this->setEventGroupFilterVisible(group, false);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventGroupFilterVisible(
+  vsEventInfo::Group group, bool visibility)
+{
+  QTE_D(vsScene);
+  CHECK_ARG(d->FilterGroup.contains(group));
+  d->FilterWidget->setGroupVisible(d->FilterGroup[group], visibility);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventGroupVisibility(
+  vsEventInfo::Group group, bool visibility)
+{
+  QTE_D(vsScene);
+  CHECK_ARG(d->FilterGroup.contains(group));
+  d->FilterWidget->setGroupState(d->FilterGroup[group], visibility);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventGroupThreshold(
+  vsEventInfo::Group group, double threshold)
+{
+  QTE_D(vsScene);
+  CHECK_ARG(d->FilterGroup.contains(group));
+  d->FilterWidget->setGroupValue(d->FilterGroup[group], threshold);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setGroundTruthVisible(bool visibility)
+{
+  QTE_D(vsScene);
+
+  d->GroundTruthEnabled = visibility;
+  if (!d->GroundTruthEnabled)
+    {
+    d->GroundTruthGraph.TrackRepresentation->SetVisible(false);
+    d->GroundTruthGraph.TrackHeadRepresentation->SetVisible(false);
+    d->GroundTruthGraph.TrackLabelRepresentation->SetVisible(false);
+    d->GroundTruthGraph.EventRepresentation->SetVisible(false);
+    d->GroundTruthGraph.EventHeadRepresentation->SetVisible(false);
+    d->GroundTruthGraph.EventLabelRepresentation->SetVisible(false);
+    }
+  else
+    {
+    d->GroundTruthGraph.TrackRepresentation->SetVisible(
+      d->NormalGraph.TrackRepresentation->GetVisible());
+    d->GroundTruthGraph.TrackHeadRepresentation->SetVisible(
+      d->NormalGraph.TrackHeadRepresentation->GetVisible());
+    d->GroundTruthGraph.TrackLabelRepresentation->SetVisible(
+      d->NormalGraph.TrackLabelRepresentation->GetVisible());
+    d->GroundTruthGraph.EventRepresentation->SetVisible(
+      d->NormalGraph.EventRepresentation->GetVisible());
+    d->GroundTruthGraph.EventHeadRepresentation->SetVisible(
+      d->NormalGraph.EventHeadRepresentation->GetVisible());
+    d->GroundTruthGraph.EventLabelRepresentation->SetVisible(
+      d->NormalGraph.EventLabelRepresentation->GetVisible());
+    }
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventVisibility(int type, bool visibility)
+{
+  QTE_D(vsScene);
+
+  switch (type)
+    {
+    case vsTrackInfo::Person:
+      d->TrackFilter->SetShowType(vtkVgTrack::Person, visibility);
+      break;
+    case vsTrackInfo::Vehicle:
+      d->TrackFilter->SetShowType(vtkVgTrack::Vehicle, visibility);
+      break;
+    case vsTrackInfo::Other:
+      d->TrackFilter->SetShowType(vtkVgTrack::Other, visibility);
+      break;
+    default:
+      d->EventFilter->SetShowType(type, visibility);
+      break;
+    }
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventThreshold(int type, double threshold)
+{
+  QTE_D(vsScene);
+
+  switch (type)
+    {
+    case vsTrackInfo::Person:
+      d->TrackFilter->SetMinProbability(vtkVgTrack::Person, threshold);
+      break;
+    case vsTrackInfo::Vehicle:
+      d->TrackFilter->SetMinProbability(vtkVgTrack::Vehicle, threshold);
+      break;
+    case vsTrackInfo::Other:
+      d->TrackFilter->SetMinProbability(vtkVgTrack::Other, threshold);
+      break;
+    default:
+      d->EventFilter->SetMinProbability(type, threshold);
+      break;
+    }
+
+  if (vsEventInfo::eventGroups(type).testFlag(vsEventInfo::Alert))
+    {
+    // When an alert's threshold changes, notify the alert list so that the
+    // editor will have the current threshold
+    emit this->alertThresholdChanged(type, threshold);
+    }
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::resetView()
+{
+  QTE_D(vsScene);
+
+  double bounds[6];
+  d->ImageActor->GetBounds(bounds);
+  double w = bounds[1] - bounds[0], h = bounds[3] - bounds[2], a = w / h;
+  double* ra = d->Renderer->GetAspect();
+  double s = 0.5 * h; // fit height
+  if (a > ra[0])
+    s *= a / ra[0]; // fit width
+  d->Renderer->ResetCamera(bounds);
+  d->Renderer->GetActiveCamera()->SetParallelScale(s);
+
+  // We don't need to update the scene, but we DO need to repaint, so we emit
+  // our updated signal, but don't bother with all of update/postUpdate
+  emit this->updated();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::panTo(double x, double y)
+{
+  QTE_D(vsScene);
+
+  vtkCamera* camera = d->Renderer->GetActiveCamera();
+
+  double lastFocalPt[3], lastPos[3];
+  camera->GetFocalPoint(lastFocalPt);
+  camera->GetPosition(lastPos);
+
+  camera->SetFocalPoint(x, y, lastFocalPt[2]);
+  camera->SetPosition(x, y, lastPos[2]);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::jumpToTrack(vtkVgTrack* track)
+{
+  CHECK_ARG(track);
+
+  QTE_D(vsScene);
+
+  // Get the point ID at the track current head
+  vtkIdType pointId = track->GetClosestFramePtId(d->CurrentFrameTime);
+  CHECK_ARG(pointId != -1);
+
+  // Get point's stabilized coordinates and convert to image coordinates
+  double point[3];
+  track->GetPoints()->GetPoint(pointId, point);
+  vtkVgApplyHomography(point, d->CurrentTransformVtk, point);
+
+  // Pan the camera to track head as of the current frame
+  this->panTo(point[0], point[1]);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::jumpToEvent()
+{
+  QTE_D(vsScene);
+
+  CHECK_ARG(d->FollowEventEnabled);
+
+  vtkVgEvent* event = d->findEvent(d->PendingJumpEventId);
+  d->PendingJumpEventId = -1;
+
+  // Make sure that event hasn't gone missing...
+  CHECK_ARG(event);
+
+  if (event->GetNumberOfTracks())
+    {
+    this->jumpToTrack(event->GetTrack(0));
+    }
+  else
+    {
+    // \TODO handle track-less events
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::jumpToEvent(vtkIdType eventId, bool jumpToEnd)
+{
+  QTE_D(vsScene);
+
+  vtkVgEvent* event = d->findEvent(eventId);
+  CHECK_ARG(event);
+  emit this->jumpToItem();
+
+  vtkVgTimeStamp time =
+    jumpToEnd ? event->GetEndFrame() : event->GetStartFrame();
+  vg::SeekMode direction =
+    jumpToEnd ? vg::SeekUpperBound : vg::SeekLowerBound;
+
+  // Allow the video frame homography to update before centering the camera
+  d->PendingJumpEventId = eventId;
+
+  this->seekVideo(time, direction, -1);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::jumpToTrack()
+{
+  QTE_D(vsScene);
+
+  CHECK_ARG(d->FollowEventEnabled);
+
+  this->jumpToTrack(d->findTrack(d->PendingJumpTrackId));
+  d->PendingJumpTrackId = -1;
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::jumpToTrack(vtkIdType trackId, bool jumpToEnd)
+{
+  QTE_D(vsScene);
+
+  vtkVgTrack* track = d->findTrack(trackId);
+  CHECK_ARG(track);
+  emit this->jumpToItem();
+
+  vtkVgTimeStamp time =
+    jumpToEnd ? track->GetEndFrame() : track->GetStartFrame();
+  vg::SeekMode direction =
+    jumpToEnd ? vg::SeekUpperBound : vg::SeekLowerBound;
+
+  // Allow the video frame homography to update before centering the camera
+  d->PendingJumpTrackId = trackId;
+
+  this->seekVideo(time, direction, -1);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventSelection(
+  QSet<vtkIdType> selectedIds, vtkIdType currentId)
+{
+  QTE_D(vsScene);
+  d->EventTreeSelectionModel->setSelectedEvents(selectedIds);
+  d->EventTreeSelectionModel->setCurrentEvent(currentId);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::updateEventSelection(QSet<vtkIdType> selectedIds)
+{
+  QTE_D(vsScene);
+
+  QSet<vtkVgEvent*> selectedEvents;
+  vtkVgEvent* event = 0;
+  bool modified = false;
+
+  // Build new set of selected events
+  foreach (vtkIdType id, selectedIds)
+    {
+    if ((event = d->findEvent(id)))
+      {
+      selectedEvents.insert(event);
+      }
+    }
+
+  // Turn off selected color of events that are no longer selected
+  foreach (event, d->SelectedEvents)
+    {
+    if (!selectedEvents.contains(event))
+      {
+      event->UseCustomColorOff();
+      modified = true;
+      }
+    }
+
+  // Turn on selected color for newly selected events
+  foreach (event, selectedEvents)
+    {
+    if (!d->SelectedEvents.contains(event))
+      {
+      event->SetCustomColor(d->EventSelectedColor.constData().array);
+      event->UseCustomColorOn();
+      modified = true;
+      }
+    }
+
+  if (modified)
+    {
+    d->SelectedEvents = selectedEvents;
+
+    d->NormalGraph.EventModel->Modified();
+    d->GroundTruthGraph.EventModel->Modified();
+    this->postUpdate();
+
+    emit this->selectedEventsChanged(selectedIds);
+    emit this->selectedEventsChanged(selectedEvents.toList());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventStart(vtkIdType id)
+{
+  QTE_D(vsScene);
+  if (d->CurrentFrameTime.IsValid())
+    {
+    d->Core->setEventStart(id, d->CurrentFrameTime);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventEnd(vtkIdType id)
+{
+  QTE_D(vsScene);
+  if (d->CurrentFrameTime.IsValid())
+    {
+    d->Core->setEventEnd(id, d->CurrentFrameTime);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::cancelInteraction()
+{
+  this->interruptDrawing();
+  emit this->interactionCanceled();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::beginDrawing(vsContour::Type type)
+{
+  QTE_D(vsScene);
+
+  // End any other interaction that may currently be active
+  this->cancelInteraction();
+
+  emit this->contourStarted();
+  emit this->statusMessageAvailable("Drawing contour;"
+                                    " right click to enter adjustment mode");
+
+  d->EditContour.reset(
+    new vsContourWidget(d->Core->createContourId(),
+                        d->RenderWindow->GetInteractor()));
+  d->EditContour->setType(type);
+  d->EditContour->setMatrix(d->CurrentTransformVtk);
+  d->EditContour->begin();
+
+  connect(d->EditContour.data(), SIGNAL(interactionComplete()),
+          this, SLOT(beginContourManipulation()));
+  connect(d->EditContour.data(), SIGNAL(manipulationComplete()),
+          this, SLOT(finalizeContour()));
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::interruptDrawing()
+{
+  QTE_D(vsScene);
+
+  if (!d->EditContour)
+    return;
+
+  switch (d->EditContour->state())
+    {
+    case vsContourWidget::Begin:
+      // If the contour is still in initial drawing state, just delete it
+      d->EditContour.reset();
+      emit this->drawingCanceled();
+      break;
+
+    case vsContourWidget::Manipulate:
+      // If the contour has been drawn but not finalized, do so
+      this->finalizeContour();
+      break;
+    }
+
+  d->RenderWindow->Render();
+  emit this->statusMessageAvailable("");
+}
+
+//-----------------------------------------------------------------------------
+int vsScene::contourState() const
+{
+  QTE_D_CONST(vsScene);
+  return (d->EditContour ? d->EditContour->state() : -1);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setDrawingType(vsContour::Type newType)
+{
+  QTE_D(vsScene);
+
+  if (d->EditContour && d->EditContour->type() != newType)
+    {
+    if (d->EditContour->state() == vsContourWidget::Manipulate)
+      {
+      if (!d->EditContour->isClosed() && vsContour::isLoopType(newType))
+        {
+        d->EditContour->close();
+        }
+      }
+
+    d->EditContour->setType(newType);
+    d->RenderWindow->Render();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::closeContour()
+{
+  QTE_D(vsScene);
+
+  if (!d->EditContour)
+    return;
+
+  // Get number of points we have, and number needed (don't count point under
+  // mouse cursor that has not been "committed", as it will be removed)
+  vtkIdType numPoints = d->EditContour->points()->GetNumberOfPoints();
+  vtkIdType neededPoints =
+    (d->EditContour->state() == vsContourWidget::Begin ? 4 : 3);
+
+  // Check that we have enough points to close the region
+  if (numPoints >= neededPoints)
+    {
+    d->EditContour->close();
+    emit this->contourClosed();
+
+    // Finalize the contour
+    this->finalizeContour();
+    }
+  else
+    {
+    emit this->statusMessageAvailable("Not enough points in region");
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::beginContourManipulation()
+{
+  QTE_D(vsScene);
+  if (d->EditContour->isClosed())
+    emit this->contourClosed();
+  emit this->statusMessageAvailable("Editing contour; right click when done");
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::finalizeContour()
+{
+  QTE_D(vsScene);
+
+  // Finalize contour
+  if (d->EditContour)
+    {
+    vtkIdType numPoints =
+      d->EditContour->points()->GetNumberOfPoints();
+
+    vsContour::Type currentType = d->EditContour->type();
+    bool loopRequired = vsContour::isLoopType(currentType);
+
+    if (numPoints < 2 || (numPoints < 3 && loopRequired))
+      {
+      emit this->statusMessageAvailable("Not enough points in region");
+      d->EditContour.reset();
+      }
+    else
+      {
+      // Close contour if needed
+      if (!d->EditContour->isClosed() && loopRequired)
+        d->EditContour->close();
+
+      // Finalize contour
+      d->EditContour->setMatrix(d->CurrentTransformVtk);
+      d->EditContour->finalize();
+
+      // Emit completed contour and destroy widget
+      emit this->contourCompleted(d->EditContour.data()->toContour());
+      d->EditContour.reset();
+      }
+
+    this->postUpdate();
+    emit this->drawingEnded();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::addContour(vsContour contour)
+{
+  QTE_D(vsScene);
+
+  Q_ASSERT(!d->Contours.contains(contour.id()));
+
+  vtkRenderWindowInteractor* rwi = d->RenderWindow->GetInteractor();
+  vsScenePrivate::ContourInfo info(new vsContourWidget(contour, rwi));
+  info.widget->setMatrix(d->CurrentTransformVtk);
+  d->addFilterContour(info);
+  d->Contours.insert(contour.id(), info);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setContourType(int id, vsContour::Type newType)
+{
+  QTE_D(vsScene);
+
+  if (!d->Contours.contains(id))
+    return;
+
+  vsScenePrivate::ContourInfo& info = d->Contours[id];
+  vsContour::Type currentType = info.widget->type();
+
+  // Anything to do?
+  if (currentType != newType)
+    {
+    // Remove filters/selectors from VTK model/view
+    d->removeFilterContour(info);
+
+    // Update the type
+    info.widget->setType(newType);
+
+    // Create new masks if necessary
+    d->addFilterContour(info);
+
+    // Done
+    this->postUpdate();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setContourPoints(int id, QPolygonF points)
+{
+  QTE_D(vsScene);
+
+  if (!d->Contours.contains(id))
+    return;
+
+  vsScenePrivate::ContourInfo& info = d->Contours[id];
+  info.widget->setPoints(points);
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+bool vsScene::setContourEnabled(int id, bool enabled)
+{
+  QTE_D(vsScene);
+
+  if (!d->Contours.contains(id))
+    return false;
+
+  vsScenePrivate::ContourInfo& info = d->Contours[id];
+
+  // Anything to do?
+  if (info.enabled != enabled)
+    {
+    vsContour::Type type = info.widget->type();
+    if (type == vsContour::Tripwire)
+      {
+      // \TODO need some way to apply filtering to associated events
+      }
+    else if (type == vsContour::Selector || type == vsContour::Filter)
+      {
+      info.maskActor->SetVisibility(enabled);
+
+      if (type == vsContour::Selector)
+        {
+        if (enabled)
+          {
+          d->SelectorMaskQuad->SetVisibility(true);
+          }
+        else
+          {
+          // If all selectors have been disabled, make sure the image overlay
+          // mask is hidden
+          vtkProp3DCollection* props = d->SelectorMaskProps->GetParts();
+          props->InitTraversal();
+          int numVisible = 0;
+          while (vtkProp* prop = props->GetNextProp())
+            prop->GetVisibility() && ++numVisible;
+          d->SelectorMaskQuad->SetVisibility(numVisible > 0);
+          }
+        }
+
+      d->ContourOperatorManager->SetContourEnabled(
+        info.widget->points(), enabled);
+      }
+
+    // Change visibility and update
+    info.enabled = enabled;
+    info.widget->setVisible(enabled);
+    this->postUpdate();
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::removeContour(int id)
+{
+  QTE_D(vsScene);
+
+  if (!d->Contours.contains(id))
+    return;
+
+  // Remove contour from internal map
+  vsScenePrivate::ContourInfo info = d->Contours.take(id);
+
+  // Remove filters/selectors from VTK model/view
+  d->removeFilterContour(info);
+
+  // Done
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+bool vsScene::convertContourToEvent(int id, int eventType)
+{
+  QTE_D(vsScene);
+
+  if (!d->CurrentFrameTime.IsValid())
+    {
+    // Can't convert with no valid time
+    // TODO: show warning to user?
+    return false;
+    }
+
+  return d->Core->convertContourToEvent(id, eventType, d->CurrentFrameTime);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::addUserEventType(
+  int id, vsEventInfo info, double initialThreshold)
+{
+  Q_UNUSED(id);
+  QTE_D(vsScene);
+  d->addFilter(info, vsEventInfo::User, true, initialThreshold);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::addAlert(int id, vsAlert alert)
+{
+  Q_UNUSED(id);
+  QTE_D(vsScene);
+  d->addFilter(alert.eventInfo, vsEventInfo::Alert,
+               true, alert.displayThreshold);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::updateAlert(int id, vsAlert alert)
+{
+  Q_UNUSED(id);
+  QTE_D(vsScene);
+  d->FilterWidget->setText(alert.eventInfo.type, alert.eventInfo.name);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::updateAlertThreshold(int id, vsAlert alert)
+{
+  Q_UNUSED(id);
+  QTE_D(vsScene);
+  d->FilterWidget->setValue(alert.eventInfo.type, alert.displayThreshold);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::removeAlert(int id, bool unregister)
+{
+  if (unregister)
+    {
+    QTE_D(vsScene);
+    d->FilterWidget->removeItem(id);
+    // \TODO should remove from d->EventFilter also?
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::startQuickNoteTimer(vtkIdType eventId)
+{
+  QTE_D(vsScene);
+
+  d->LastManualEventCreated = eventId;
+  d->TimerLog->StartTimer();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::postUpdate()
+{
+  QTE_D(vsScene);
+  d->PendingUpdates.append(vsScenePrivate::Update());
+  QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::postUpdate(vtkVgTimeStamp ts)
+{
+  QTE_D(vsScene);
+  d->PendingUpdates.append(vsScenePrivate::Update(ts));
+  QMetaObject::invokeMethod(this, "update", Qt::QueuedConnection);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::update()
+{
+  QTE_D(vsScene);
+
+  // Punt if there are no outstanding updates
+  if (!d->PendingUpdates.count())
+    return;
+
+  // Process pending updates, updating the current video time to the most
+  // recent video update
+  foreach (const vsScenePrivate::Update& u, d->PendingUpdates)
+    {
+    if (u.videoUpdated)
+      d->CurrentFrameTime = u.time;
+    }
+  d->PendingUpdates.clear();
+
+  // Update actors and redraw
+  if (d->CurrentFrameTime.IsValid())
+    {
+    // Normal events and tracks
+    bool forceUpdate = d->Core->eventTypeRegistry()->GetMTime() >
+                       d->NormalGraph.EventRepresentation->GetUpdateTime();
+    d->updateModels(d->NormalGraph, forceUpdate);
+
+    // Ground-truth versions
+    if (d->Core->isGroundTruthDataPresent())
+      d->updateModels(d->GroundTruthGraph);
+    }
+
+  if (d->PendingJumpEventId != -1)
+    this->jumpToEvent();
+
+  if (d->PendingJumpTrackId != -1)
+    this->jumpToTrack();
+
+  emit this->updated();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setVideoSamplingMode(int mode)
+{
+  QTE_D(vsScene);
+
+  switch (mode)
+    {
+    default:
+    case 0:
+      d->ImageActor->GetProperty()->SetInterpolationTypeToNearest();
+      break;
+    case 1:
+      d->ImageActor->GetProperty()->SetInterpolationTypeToLinear();
+      break;
+    case 2:
+      d->ImageActor->GetProperty()->SetInterpolationTypeToCubic();
+      break;
+    }
+
+  d->ImageActor->Update();
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setTracksVisible(bool visibility)
+{
+  QTE_D(vsScene);
+
+  const bool flag = !visibility;
+  d->NormalGraph.TrackRepresentation->SetOnlyDisplayForcedTracks(flag);
+  d->GroundTruthGraph.TrackRepresentation->SetOnlyDisplayForcedTracks(flag);
+
+  // If tracks not shown, and event tracks not shown, hide track representation
+  // entirely
+  const bool repVisibility =
+    visibility || d->NormalGraph.EventRepresentation->GetVisible();
+  d->NormalGraph.TrackRepresentation->SetVisible(repVisibility);
+  d->GroundTruthGraph.TrackRepresentation->SetVisible(
+    d->GroundTruthEnabled && repVisibility);
+
+  // Determine label visibility
+  visibility |= !!d->NormalGraph.TrackHeadRepresentation->GetVisible();
+  visibility &= d->NormalGraph.TrackLabelRepresentation->GetShowName() ||
+                d->NormalGraph.TrackLabelRepresentation->GetShowProbability();
+  d->NormalGraph.TrackLabelRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.TrackLabelRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setTrackBoxesVisible(bool visibility)
+{
+  QTE_D(vsScene);
+
+  d->NormalGraph.TrackHeadRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.TrackHeadRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+
+  // Determine label visibility
+  visibility |=
+    !d->NormalGraph.TrackRepresentation->GetOnlyDisplayForcedTracks();
+  visibility &= d->NormalGraph.TrackLabelRepresentation->GetShowName() ||
+                d->NormalGraph.TrackLabelRepresentation->GetShowProbability();
+  d->NormalGraph.TrackLabelRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.TrackLabelRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setTrackIdsVisible(bool visibility)
+{
+  QTE_D(vsScene);
+
+  d->NormalGraph.TrackLabelRepresentation->SetShowName(visibility);
+  d->GroundTruthGraph.TrackLabelRepresentation->SetShowName(visibility);
+
+  visibility |= d->NormalGraph.TrackLabelRepresentation->GetShowProbability();
+  visibility &=
+    !d->NormalGraph.TrackRepresentation->GetOnlyDisplayForcedTracks() ||
+    d->NormalGraph.TrackHeadRepresentation->GetVisible();
+  d->NormalGraph.TrackLabelRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.TrackLabelRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setTrackPvoScoresVisible(bool visibility)
+{
+  QTE_D(vsScene);
+
+  d->NormalGraph.TrackLabelRepresentation->SetShowProbability(visibility);
+  d->GroundTruthGraph.TrackLabelRepresentation->SetShowProbability(visibility);
+
+  visibility |= d->NormalGraph.TrackLabelRepresentation->GetShowName();
+  visibility &=
+    !d->NormalGraph.TrackRepresentation->GetOnlyDisplayForcedTracks() ||
+    d->NormalGraph.TrackHeadRepresentation->GetVisible();
+  d->NormalGraph.TrackLabelRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.TrackLabelRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setVideoLiveOffset(double offset)
+{
+  QTE_D(vsScene);
+
+  d->VideoPlayer.setLivePlaybackOffset(offset > 0.0 ? offset * 1e6 : 0.0);
+}
+
+//-----------------------------------------------------------------------------
+double vsScene::videoLiveOffset() const
+{
+  QTE_D_CONST(vsScene);
+
+  return d->VideoPlayer.livePlaybackOffset() * 1e-6;
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setTrackTrailLength(double length)
+{
+  QTE_D(vsScene);
+
+  vtkVgTimeStamp& ttl = d->TrackTrailLength;
+  (length > 0.0
+   ? ttl.SetTime(length * 1e6)
+   : ttl.SetToMaxTime());
+
+  // Update existing tracks
+  d->NormalGraph.TrackModel->SetMaximumDisplayDuration(ttl);
+  d->GroundTruthGraph.TrackModel->SetMaximumDisplayDuration(ttl);
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+double vsScene::trackTrailLength() const
+{
+  QTE_D_CONST(vsScene);
+
+  if (d->TrackTrailLength.IsMaxTime())
+    return 0.0;
+  return d->TrackTrailLength.GetTime() * 1e-6;
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventSelectedColor(QColor color)
+{
+  QTE_D(vsScene);
+  d->EventSelectedColor = color;
+  // \TODO update event colors
+}
+
+//-----------------------------------------------------------------------------
+QColor vsScene::eventSelectedColor() const
+{
+  QTE_D_CONST(vsScene);
+  return d->EventSelectedColor.toQColor();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setFilteringMaskVisible(bool visibility)
+{
+  QTE_D(vsScene);
+  d->FilterMaskProps->SetVisibility(visibility);
+  d->SelectorMaskProps->SetVisibility(visibility);
+  d->SelectorMaskQuad->SetVisibility(visibility);
+  emit this->updated();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setTrackingMaskVisible(bool visibility)
+{
+  QTE_D(vsScene);
+  d->TrackingMask->SetVisibility(visibility);
+  emit this->updated();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventTracksVisible(bool visibility)
+{
+  QTE_D(vsScene);
+
+  d->NormalGraph.EventRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.EventRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+  if (!visibility)
+    {
+    d->NormalGraph.TrackRepresentation->ClearForceShownTracks();
+    d->GroundTruthGraph.TrackRepresentation->ClearForceShownTracks();
+    }
+
+  // If event tracks not shown, and tracks not shown, hide track representation
+  // entirely
+  visibility |=
+    !d->NormalGraph.TrackRepresentation->GetOnlyDisplayForcedTracks();
+  d->NormalGraph.TrackRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.TrackRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventBoxesVisible(bool visibility)
+{
+  QTE_D(vsScene);
+
+  d->NormalGraph.EventHeadRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.EventHeadRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+
+  vtkVgEventLabelRepresentation::enumLocationSourceMode lsm =
+    (visibility ? vtkVgEventLabelRepresentation::LSM_RegionThenTrack
+                : vtkVgEventLabelRepresentation::LSM_Track);
+  d->NormalGraph.EventLabelRepresentation->SetLocationSourceMode(lsm);
+  d->GroundTruthGraph.EventLabelRepresentation->SetLocationSourceMode(lsm);
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventLabelsVisible(bool visibility)
+{
+  QTE_D(vsScene);
+  d->NormalGraph.EventLabelRepresentation->SetVisible(visibility);
+  d->GroundTruthGraph.EventLabelRepresentation->SetVisible(
+    d->GroundTruthEnabled && visibility);
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventProbabilityVisible(bool visibility)
+{
+  QTE_D(vsScene);
+  d->NormalGraph.EventLabelRepresentation->SetShowProbability(visibility);
+  d->GroundTruthGraph.EventLabelRepresentation->SetShowProbability(
+    visibility);
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+QPointF vsScene::viewToFrame(const QPointF& in)
+{
+  QTE_D(vsScene);
+
+  double pt[3] = { in.x(), d->RenderWidget->height() - in.y(), 0.0 };
+  vtkVgSpaceConversion::DisplayToWorldNormalized(d->Renderer, pt, pt);
+
+  double frameBounds[6];
+  d->ImageActor->GetBounds(frameBounds);
+  const double h = frameBounds[3] - frameBounds[2];
+
+  return QPointF(pt[0], h - pt[1]);
+}
+
+//-----------------------------------------------------------------------------
+vgGeocodedCoordinate vsScene::viewToLatLon(const QPointF& in)
+{
+  QTE_D(vsScene);
+
+  vtkSmartPointer<vtkMatrix4x4> imageToLatLonMatrix =
+    d->CurrentFrameMetaData.MakeImageToLatLonMatrix();
+
+  vgGeocodedCoordinate geoCoord;
+  if (imageToLatLonMatrix)
+    {
+    const double h = d->RenderWidget->height();
+    double point[3] = { in.x(), h - in.y(), 0.0 };
+    vtkVgSpaceConversion::DisplayToWorldNormalized(d->Renderer, point, point);
+    vtkVgApplyHomography(point, imageToLatLonMatrix,
+                         geoCoord.Easting, geoCoord.Northing);
+    geoCoord.GCS = d->CurrentFrameMetaData.WorldLocation.GCS;
+    }
+  return geoCoord;
+}
+
+//-----------------------------------------------------------------------------
+QMatrix4x4 vsScene::currentTransform() const
+{
+  QTE_D_CONST(vsScene);
+  return d->CurrentTransformQt;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgVideoFrameMetaData& vsScene::currentFrameMetaData() const
+{
+  QTE_D_CONST(vsScene);
+  return d->CurrentFrameMetaData;
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderer* vsScene::renderer()
+{
+  QTE_D(vsScene);
+  return d->Renderer;
+}
+
+//-----------------------------------------------------------------------------
+vgVideoPlayer::PlaybackMode vsScene::videoPlaybackStatus() const
+{
+  QTE_D_CONST(vsScene);
+  return d->VideoPlayer.playbackMode();
+}
+
+//-----------------------------------------------------------------------------
+qreal vsScene::videoPlaybackSpeed() const
+{
+  QTE_D_CONST(vsScene);
+  return d->VideoPlayer.playbackSpeed();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setVideoPlaybackSpeed(
+  vgVideoPlayer::PlaybackMode mode, qreal rate)
+{
+  QTE_D(vsScene);
+  d->VideoPlayer.setPlaybackSpeed(mode, rate);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vsScene::currentVideoTime() const
+{
+  QTE_D_CONST(vsScene);
+  return d->CurrentFrameTime;
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::seekVideo(
+  vtkVgTimeStamp ts, vg::SeekMode direction, qint64 requestId)
+{
+  QTE_D(vsScene);
+  if (d->VideoPlayer.playbackMode() == vgVideoPlayer::Live)
+    {
+    // Seek in live playback mode causes playback to pause
+    d->VideoPlayer.setPlaybackSpeed(vgVideoPlayer::Paused, 1.0);
+    }
+  d->VideoPlayer.seekToTimestamp(requestId, ts, direction);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::resetVideo()
+{
+  QTE_D(vsScene);
+  d->VideoPlayer.setVideoSource(d->VideoSource = 0);
+
+  // \TODO clear video
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::resetVideo(vsVideoSource* source)
+{
+  QTE_D(vsScene);
+  this->postUpdate(vtkVgTimeStamp());
+  d->NeedViewReset = true;
+  d->SourceIsStreaming = false;
+
+  // \TODO clear video
+
+  d->VideoPlayer.setPlaybackSpeed(vgVideoPlayer::Stopped, 0.0);
+  d->VideoPlayer.setVideoSource(d->VideoSource = source);
+
+  if (source)
+    {
+    this->setSourceStreaming(source->isStreaming());
+
+    connect(source, SIGNAL(streamingChanged(bool)),
+            this, SLOT(setSourceStreaming(bool)));
+    connect(source, SIGNAL(frameRangeAvailable(vtkVgTimeStamp, vtkVgTimeStamp)),
+            this, SLOT(setSourceFrameRange(vtkVgTimeStamp, vtkVgTimeStamp)));
+
+    connect(source, SIGNAL(destroyed(QObject*)),
+            this, SLOT(removeVideoSource(QObject*)));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setSourceStreaming(bool isStreaming)
+{
+  QTE_D(vsScene);
+
+  if (d->SourceIsStreaming && !isStreaming)
+    {
+    const vgRange<vtkVgTimeStamp> range = d->VideoSource->frameRange();
+    d->VideoPlayer.setSourceFrameRange(range.lower, range.upper);
+    }
+
+  d->SourceIsStreaming = isStreaming;
+  d->VideoPlayer.setSourceStreaming(isStreaming);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setSourceFrameRange(vtkVgTimeStamp first, vtkVgTimeStamp last)
+{
+  QTE_D(vsScene);
+
+  // If we are streaming, adjust frame range reported to video player by stream
+  // delay, if set
+  if (d->SourceIsStreaming && d->StreamDelay.IsValid())
+    {
+    last.ShiftBackward(d->StreamDelay);
+    last = qMax(first, last);
+    }
+
+  d->VideoPlayer.setSourceFrameRange(first, last);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::removeVideoSource(QObject* source)
+{
+  QTE_D(vsScene);
+  QObject* currentSource = d->VideoSource;
+  if (source == currentSource)
+    {
+    // If the source that just went away is the current source, clear the
+    // source and reset the video... this check is needed as the old source may
+    // not be destroyed before we have switched to a new source, in which case
+    // resetting would break the new source
+    this->resetVideo();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::updateVideoFrame(vtkVgVideoFrame frame, qint64 requestId)
+{
+  QTE_D(vsScene);
+
+  // Update video frame
+  d->ImageActor->SetInputData(frame.Image.GetPointer());
+
+  // Recenter image on first frame
+  if (d->NeedViewReset)
+    {
+    this->resetView();
+    d->NeedViewReset = false;
+    }
+
+  // Update homography reference time
+  const vtkVgVideoFrameMetaData& metadata = frame.MetaData;
+  if (metadata.HomographyReferenceFrame < 0)
+    {
+    // Initializes to 0 (MinTime), so if we get here and NOT 0, that means we
+    // must have valid reference frame data. Thus, since we got a -1, this
+    // frame must be "garbage", which amounts to a reference reset (one is
+    // about to happen); we don't want to display ANY tracks / events on this
+    // frame (which setting to MaxTime will accomplish).
+    if (d->CurrentHomographyReferenceTime.GetTime() != 0)
+      d->CurrentHomographyReferenceTime.SetToMaxTime();
+    }
+  else
+    {
+    d->CurrentHomographyReferenceTime =
+      d->Core->homographyReferenceTime(metadata.HomographyReferenceFrame,
+                                       metadata.Time);
+    }
+  d->CurrentFrameMetaData = metadata;
+
+  // Update track/event display for current frame
+  this->postUpdate(metadata.Time);
+
+  // Generate the transform matrix
+  QMatrix4x4 hi, fy;
+  double ib[6];
+  d->ImageActor->GetBounds(ib);
+  hi = qtAdapt(metadata.Homography).inverted();
+  fy(1, 1) = -1.0;
+  fy(1, 3) = ib[3] - ib[2];
+  d->CurrentTransformQt = fy * hi;
+
+  if (d->CurrentTransformQt(3, 3) < 0)
+    {
+    // If the 3,3 component is negative, we're like to run into an OpenGL issue
+    // where points are not rendered when the homogeneous coordinate after
+    // transformation is < 0.  This is a temporary fix.
+    d->CurrentTransformQt *= -1.0;
+    }
+
+  // Copy Qt matrix to VTK matrix
+  vtkVgInstance<vtkMatrix4x4> xf;
+  qtAdapt(d->CurrentTransformQt, xf);
+
+  d->CurrentTransformVtk->DeepCopy(xf);
+
+  // Update representation transform matrices
+  vsScenePrivate::setRepresentationTransforms(d->NormalGraph, xf);
+  vsScenePrivate::setRepresentationTransforms(d->GroundTruthGraph, xf);
+  d->FilterMaskProps->SetUserMatrix(xf);
+  d->SelectorMaskProps->SetUserMatrix(xf);
+  d->updateContourMaskPositions();
+
+  // Update contour transform matrices
+  if (d->EditContour)
+    d->EditContour->setMatrix(xf);
+  foreach (const vsScenePrivate::ContourInfo& info, d->Contours)
+    info.widget->setMatrix(xf);
+
+  d->Renderer->ResetCameraClippingRange();
+
+  // Update location
+  const int x = d->LastCursorPosition.x(), y = d->LastCursorPosition.y();
+  emit this->locationTextUpdated(d->buildLocationTextFromDisplay(x, y));
+
+  // Pass along metadata
+  emit this->transformChanged(d->CurrentTransformQt);
+  emit this->videoMetadataUpdated(metadata, requestId);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::onLeftClick()
+{
+  QTE_D(vsScene);
+
+  vtkRenderWindowInteractor* interactor = d->RenderWindow->GetInteractor();
+
+  int x, y;
+  interactor->GetEventPosition(x, y);
+
+  // Pick against normal events
+  vtkIdType eventId = this->tryPick(d->NormalGraph.EventLabelRepresentation,
+                                    d->NormalGraph.EventHeadRepresentation,
+                                    d->NormalGraph.EventRepresentation, x, y);
+  if (eventId != -1)
+    {
+    // Ctrl-Click to give positive feedback
+    if (interactor->GetControlKey())
+      {
+      d->Core->setEventRating(eventId, vgObjectStatus::Adjudicated);
+      QModelIndex idx = d->EventTreeModel->indexOfEvent(eventId);
+      d->EventTreeModel->setData(
+        idx, vs::VerifiedEvent, vsEventTreeModel::StatusRole);
+      }
+
+    // \TODO handle ctrl to multi-select?
+    d->EventTreeSelectionModel->selectEvent(eventId);
+    emit this->pickedEvent(eventId);
+    return;
+    }
+
+  // Pick against GT events
+  eventId = this->tryPick(d->GroundTruthGraph.EventLabelRepresentation,
+                          d->GroundTruthGraph.EventHeadRepresentation,
+                          d->GroundTruthGraph.EventRepresentation, x, y);
+  if (eventId != -1)
+    {
+    // \TODO handle ctrl to multi-select?
+    d->EventTreeSelectionModel->selectEvent(eventId);
+    emit this->pickedEvent(eventId);
+    return;
+    }
+
+  // Pick against tracks
+  vtkIdType trackId = this->tryPick(d->NormalGraph.TrackLabelRepresentation,
+                                    d->NormalGraph.TrackHeadRepresentation,
+                                    d->NormalGraph.TrackRepresentation, x, y);
+  if (trackId != -1)
+    {
+    emit this->pickedTrack(trackId);
+    return;
+    }
+
+  // Pick against GT tracks
+  trackId = this->tryPick(d->GroundTruthGraph.TrackLabelRepresentation,
+                          d->GroundTruthGraph.TrackHeadRepresentation,
+                          d->GroundTruthGraph.TrackRepresentation, x, y);
+  if (trackId != -1)
+    {
+    emit this->pickedTrack(trackId);
+    return;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::onRightClick()
+{
+  QTE_D(vsScene);
+
+  if (d->LastManualEventCreated != -1)
+    {
+    // Note: this doesn't actually "stop" the timer, but instead sets the
+    // EndTime for use with GetElapsedTime; StartTime is unchanged and thus
+    // another call to StopTimer will get cumulative ElapsedTime.
+    d->TimerLog->StopTimer();
+    if (d->MaxTimeForQuickNote > d->TimerLog->GetElapsedTime())
+      {
+      bool ok = false;
+      QString note;
+      note = vgTextEditDialog::getText(0, "Add Event Note", note, &ok);
+      if (ok)
+        {
+        d->Core->setEventNote(d->LastManualEventCreated, note);
+        d->EventTreeModel->update();
+        // Assumption with quick note is that no note exists; thus reset
+        // the event id so we can't edit this note again.
+        d->LastManualEventCreated = -1;
+        }
+      return;
+      }
+    }
+  vtkRenderWindowInteractor* interactor = d->RenderWindow->GetInteractor();
+
+  int x, y;
+  interactor->GetEventPosition(x, y);
+  vtkIdType eventId = this->tryPick(d->NormalGraph.EventLabelRepresentation,
+                                    d->NormalGraph.EventHeadRepresentation,
+                                    d->NormalGraph.EventRepresentation, x, y);
+
+  // Ctrl-RMB to give negative feedback and reject the event
+  if (interactor->GetControlKey())
+    {
+    if (eventId != -1)
+      {
+      d->Core->setEventRating(eventId, vgObjectStatus::Excluded);
+      QModelIndex idx = d->EventTreeModel->indexOfEvent(eventId);
+      d->EventTreeModel->setData(
+        idx, vs::RejectedEvent, vsEventTreeModel::StatusRole);
+      }
+    return;
+    }
+
+  // Get widget mouse position (adjusted for zero-based value)
+  QPoint widgetPos(x, d->RenderWindow->GetInteractor()->GetSize()[1] - y - 1);
+
+  // Prepare context menu
+  QMenu menu(d->RenderWidget);
+  QAction* choice = 0;
+
+  QAction* copyLocation = 0;
+  if (d->CurrentFrameTime.IsValid())
+    {
+    copyLocation = menu.addAction("&Copy Location");
+    menu.addSeparator();
+    }
+
+  // Handle context menu for events
+  if (eventId != -1)
+    {
+    vsEventRatingMenu::buildMenu(&menu);
+
+    QAction* unrated =
+      vsEventRatingMenu::getAction(&menu, vsEventRatingMenu::Unrated);
+    QAction* relevant =
+      vsEventRatingMenu::getAction(&menu, vsEventRatingMenu::Relevant);
+    QAction* excluded =
+      vsEventRatingMenu::getAction(&menu, vsEventRatingMenu::Excluded);
+    QAction* rejected =
+      vsEventRatingMenu::getAction(&menu, vsEventRatingMenu::Rejected);
+
+    // Show the menu
+    choice = menu.exec(d->RenderWidget->mapToGlobal(widgetPos));
+    if (!choice)
+      {
+      // Menu was dismissed; return without doing anything
+      return;
+      }
+
+    int rating =
+      (choice == unrated  ? vgObjectStatus::None :
+       choice == relevant ? vgObjectStatus::Adjudicated :
+       choice == excluded ||
+       choice == rejected ? vgObjectStatus::Excluded :
+                            -1);
+
+    int status =
+      (choice == rejected ? vs::RejectedEvent : vs::VerifiedEvent);
+
+    // If an event-related action was picked, handle it now and return;
+    // otherwise fall through to general action handling below
+    if (rating != -1)
+      {
+      d->Core->setEventRating(eventId, rating);
+
+      // Update the status
+      QModelIndex idx = d->EventTreeModel->indexOfEvent(eventId);
+      d->EventTreeModel->setData(idx, status, vsEventTreeModel::StatusRole);
+      return;
+      }
+    }
+  else if (!menu.actions().isEmpty())
+    {
+    choice = menu.exec(d->RenderWidget->mapToGlobal(widgetPos));
+    }
+
+  // Handle general actions
+  if (choice == copyLocation)
+    {
+    // Generate location text and copy to clipboard
+    qApp->clipboard()->setText(d->buildLocationTextFromDisplay(x, y));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::vtkSceneMouseMoveEvent()
+{
+  QTE_D(vsScene);
+
+  // Always get cursor position, so that we show location when we start getting
+  // video (if mouse is over the view)
+  int x, y;
+  d->RenderWidget->GetInteractor()->GetEventPosition(x, y);
+  d->LastCursorPosition = QPoint(x, y);
+
+  if (d->CurrentFrameTime.IsValid())
+    {
+    // Only emit location text if we have video
+    emit this->locationTextUpdated(d->buildLocationTextFromDisplay(x, y));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::vtkSceneLeaveEvent()
+{
+  QTE_D(vsScene);
+  d->LastCursorPosition = QPoint(-1, -1);
+  emit this->locationTextUpdated(QString());
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vsScene::tryPick(vtkVgRepresentationBase& labelRep,
+                           vtkVgRepresentationBase& headRep,
+                           vtkVgRepresentationBase& lineRep, int x, int y)
+{
+  QTE_D(vsScene);
+
+  // Pick against labels
+  vtkIdType pickType;
+  vtkIdType pickedId = labelRep.Pick(x, y, d->Renderer, pickType);
+  if (pickedId != -1)
+    {
+    return pickedId;
+    }
+
+  // Pick against head/region
+  pickedId = headRep.Pick(x, y, d->Renderer, pickType);
+  if (pickedId != -1)
+    {
+    return pickedId;
+    }
+
+  // Pick against lines
+  return lineRep.Pick(x, y, d->Renderer, pickType);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventStatus(vtkVgEvent* event, int newStatus)
+{
+  QTE_D(vsScene);
+
+  QModelIndex idx = d->EventTreeModel->indexOfEvent(event->GetId());
+  d->EventTreeModel->setData(idx, newStatus, vsEventTreeModel::StatusRole);
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setFollowEvent(bool state)
+{
+  QTE_D(vsScene);
+
+  d->FollowEventEnabled = state;
+}
+
+//-----------------------------------------------------------------------------
+bool vsScene::trackDisplayState(vtkIdType trackId)
+{
+  QTE_D(vsScene);
+
+  vtkVgTrackInfo trackInfo = d->trackInfo(trackId);
+  return (!!trackInfo.GetTrack() && trackInfo.GetDisplayTrack());
+}
+
+//-----------------------------------------------------------------------------
+bool vsScene::trackVisibility(vtkIdType trackId)
+{
+  QTE_D(vsScene);
+
+  vtkVgTrackInfo trackInfo = d->trackInfo(trackId);
+  if (trackInfo.GetTrack())
+    {
+    vtkVgTrack* const track = trackInfo.GetTrack();
+    const int bestClassifier = d->TrackFilter->GetBestClassifier(track);
+    return trackInfo.GetDisplayTrack() && (bestClassifier != -1);
+    }
+  return false; // Track not found
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setTrackDisplayState(vtkIdType trackId, bool state)
+{
+  QTE_D(vsScene);
+
+  d->NormalGraph.TrackModel->SetTrackDisplayState(trackId, state);
+  d->GroundTruthGraph.TrackModel->SetTrackDisplayState(trackId, state);
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+bool vsScene::eventDisplayState(vtkIdType eventId)
+{
+  QTE_D(vsScene);
+
+  vtkVgEventInfo eventInfo = d->eventInfo(eventId);
+  return (!!eventInfo.GetEvent() && eventInfo.GetDisplayEvent());
+}
+
+//-----------------------------------------------------------------------------
+bool vsScene::eventVisibility(vtkIdType eventId)
+{
+  QTE_D(vsScene);
+
+  vtkVgEventInfo eventInfo = d->eventInfo(eventId);
+  if (eventInfo.GetEvent())
+    {
+    vtkVgEvent* const event = eventInfo.GetEvent();
+    const int bestClassifier = d->EventFilter->GetBestClassifier(event);
+    return eventInfo.GetDisplayEvent() && (bestClassifier != -1);
+    }
+  return false; // Event not found
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setEventDisplayState(vtkIdType eventId, bool state)
+{
+  QTE_D(vsScene);
+
+  d->NormalGraph.EventModel->SetEventDisplayState(eventId, state);
+  d->GroundTruthGraph.EventModel->SetEventDisplayState(eventId, state);
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackRepresentationBase::TrackColorMode vsScene::trackColorMode()
+{
+  QTE_D(vsScene);
+  return d->NormalGraph.TrackRepresentation->GetColorMode();
+}
+
+//-----------------------------------------------------------------------------
+QString vsScene::trackColorDataId()
+{
+  QTE_D(vsScene);
+  return qtString(d->NormalGraph.TrackModel->GetActiveScalars());
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setTrackColorMode(
+  vtkVgTrackRepresentationBase::TrackColorMode mode, const QString& dataId)
+{
+  QTE_D(vsScene);
+
+  if (mode == vtkVgTrackRepresentationBase::TCM_Scalars)
+    {
+    if (dataId.isEmpty())
+      {
+      qWarning() << "Track coloring mode TCM_Scalars requested, but dataId"
+                    " is empty; this won't work... ignoring the request";
+      return;
+      }
+
+    vtkSmartPointer<vtkLookupTable> lookupTable =
+      d->NormalGraph.TrackRepresentation->GetLookupTable();
+
+    if (!lookupTable)
+      {
+      this->updateTrackColors(mode);
+      vtkSmartPointer<vtkLookupTable> lookupTable =
+        d->NormalGraph.TrackRepresentation->GetLookupTable();
+      }
+
+    vtkVgTrackModel::ScalarsRange range =
+      d->NormalGraph.TrackModel->GetScalarsRange(stdString(dataId));
+    lookupTable->SetRange(range.lower, range.upper);
+
+    d->NormalGraph.TrackModel->SetActiveScalars(stdString(dataId));
+    }
+
+  d->NormalGraph.TrackRepresentation->SetColorMode(mode);
+  d->NormalGraph.TrackHeadRepresentation->SetColorMode(mode);
+
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::updateTrackColors(
+  vtkVgTrackRepresentationBase::TrackColorMode mode)
+{
+  QTE_D(vsScene);
+
+  if (mode == vtkVgTrackRepresentationBase::TCM_Scalars)
+    {
+    vtkSmartPointer<vtkLookupTable> lookupTable =
+      d->NormalGraph.TrackRepresentation->GetLookupTable();
+
+    // Create LUT if it doesn't exist yet
+    if (!lookupTable)
+      {
+      static const int numberOfColors = 256; // Hard coded for now
+      lookupTable = vtkSmartPointer<vtkLookupTable>::New();
+      lookupTable->SetNumberOfTableValues(numberOfColors);
+
+      d->NormalGraph.TrackRepresentation->SetLookupTable(lookupTable);
+      d->NormalGraph.TrackHeadRepresentation->SetLookupTable(lookupTable);
+      }
+
+    // Get color gradient
+    qtGradient gradient;
+    vsSettings settings;
+    gradient.insertStop(0.0, settings.dataMaxColor());
+    gradient.insertStop(1.0, settings.dataMinColor());
+
+    // Fill LUT
+    static const int numberOfColors =
+      static_cast<int>(lookupTable->GetNumberOfTableValues());
+    QList<QColor> colors = gradient.render(numberOfColors);
+    for (int i = 0; i < numberOfColors; ++i)
+      {
+      vgColor color(colors[i]);
+      lookupTable->SetTableValue(i, color.data().array);
+      }
+    }
+
+  d->updateTrackClassifierColors();
+  d->updateTrackSourceColors();
+  d->updateTrackTreeColors();
+  this->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+QList<vsEventUserInfo> vsScene::eventList() const
+{
+  QTE_D_CONST(vsScene);
+  return d->EventTreeModel->eventList();
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::writeRenderedImages()
+{
+  QTE_D(vsScene);
+
+  if (d->WriteRenderedImages)
+    {
+    d->WindowToImageFilter->Modified();
+    QChar zero('0');
+    const QString outputFileName =
+      d->ImageOutputDirectory +
+      QString("/vsPlayImage%1.png").arg(d->ImageCounter++, 6, 10, zero);
+    d->PngWriter->SetFileName(outputFileName.toAscii());
+    d->PngWriter->Write();
+    }
+  if (d->SaveScreenShot)
+    {
+    d->SaveScreenShot = false; // this is one shot
+    d->WindowToImageFilter->Modified();
+    d->PngWriter->SetFileName(d->ScreenShotFileName.toAscii());
+    d->PngWriter->Write();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::setWriteRenderedImages(bool state, QString* outputDir/*=0*/)
+{
+  QTE_D(vsScene);
+
+  d->WriteRenderedImages = state;
+  if (outputDir)
+    {
+    d->ImageOutputDirectory = *outputDir;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScene::saveScreenShot(QString* filePath)
+{
+  QTE_D(vsScene);
+
+  d->ScreenShotFileName = *filePath;
+  d->SaveScreenShot = true;
+
+  // cause render
+  d->RenderWindow->Render();
+}
+
+//-----------------------------------------------------------------------------
+bool vsScene::setMaskImage(const QString& fileName)
+{
+  QTE_D(vsScene);
+
+  vtkVgInstance<vtkPNGReader> reader;
+  if (!reader->CanReadFile(qPrintable(fileName)))
+    {
+    return false;
+    }
+
+  reader->SetFileName(qPrintable(fileName));
+  reader->Update();
+  d->TrackingMask->SetInputData(reader->GetOutput());
+  return true;
+}
diff --git a/Libraries/VspUserInterface/vsScene.h b/Libraries/VspUserInterface/vsScene.h
new file mode 100644
index 00000000..d8ca3cae
--- /dev/null
+++ b/Libraries/VspUserInterface/vsScene.h
@@ -0,0 +1,261 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsScene_h
+#define __vsScene_h
+
+#include <QColor>
+#include <QMatrix4x4>
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vgVideoPlayer.h>
+#include <vgVtkVideoFrame.h>
+
+#include <vtkVgTrackRepresentationBase.h>
+
+#include <vsContour.h>
+#include <vsEventInfo.h>
+#include <vsVideoSource.h>
+
+#include "vsAlert.h"
+
+class vgMixerWidget;
+
+class vsAlertList;
+class vsCore;
+class vsEventTreeWidget;
+class vsEventUserInfo;
+class vsRegionList;
+class vsTrackTreeWidget;
+
+class vsScenePrivate;
+
+class QVTKWidget;
+
+class vtkVgEvent;
+class vtkVgTrack;
+
+class VSP_USERINTERFACE_EXPORT vsScene : public QObject
+{
+  Q_OBJECT
+
+public:
+  vsScene(vsCore*, QObject* parent = 0);
+  virtual ~vsScene();
+
+  virtual void setupUi(QVTKWidget*);
+  virtual void setupFilterWidget(vgMixerWidget*);
+  virtual void setupRegionList(vsRegionList*);
+  virtual void setupAlertList(vsAlertList*);
+  virtual void setupEventTree(
+    vsEventTreeWidget* eventTree,
+    vsEventTreeWidget* verifiedTree,
+    vsEventTreeWidget* rejectedTree);
+  virtual void setupTrackTree(vsTrackTreeWidget* tree);
+
+  int contourState() const;
+
+  double videoLiveOffset() const;
+  double trackTrailLength() const;
+
+  QColor eventSelectedColor() const;
+
+  // TODO move below to UI plugin
+  void setWriteRenderedImages(bool state, QString* outputDir = 0);
+  void saveScreenShot(QString* filePath);
+
+  bool setMaskImage(const QString& fileName);
+
+  bool trackDisplayState(vtkIdType trackId);
+  bool eventDisplayState(vtkIdType eventId);
+
+  bool trackVisibility(vtkIdType trackId);
+  bool eventVisibility(vtkIdType eventId);
+
+  vtkVgTrackRepresentationBase::TrackColorMode trackColorMode();
+  QString trackColorDataId();
+
+  QList<vsEventUserInfo> eventList() const;
+
+  qreal videoPlaybackSpeed() const;
+  vgVideoPlayer::PlaybackMode videoPlaybackStatus() const;
+  vtkVgTimeStamp currentVideoTime() const;
+
+  QPointF viewToFrame(const QPointF&);
+  vgGeocodedCoordinate viewToLatLon(const QPointF& in);
+
+  QMatrix4x4 currentTransform() const;
+
+  const vtkVgVideoFrameMetaData& currentFrameMetaData() const;
+
+  vtkRenderer* renderer();
+
+signals:
+  void updated();
+  void playbackStatusChanged(vgVideoPlayer::PlaybackMode, qreal rate);
+  void videoMetadataUpdated(vtkVgVideoFrameMetaData, qint64 seekRequestId);
+  void videoSeekRequestDiscarded(qint64 id,
+                                 vtkVgTimeStamp lastFrameAvailable);
+
+  void transformChanged(const QMatrix4x4& newTransform);
+
+  void locationTextUpdated(QString location);
+
+  void statusMessageAvailable(QString message);
+
+  void interactionCanceled();
+
+  void contourStarted();
+  void contourClosed();
+  void contourCompleted(vsContour);
+
+  void drawingCanceled();
+  void drawingEnded();
+
+  void pickedEvent(vtkIdType);
+  void pickedTrack(vtkIdType);
+
+  void jumpToItem();
+
+  void selectedEventsChanged(QSet<vtkIdType> selectedEventIds);
+  void selectedEventsChanged(QList<vtkVgEvent*> selectedEvents);
+
+  void trackSceneUpdated();
+  void eventSceneUpdated();
+
+  void alertThresholdChanged(int id, double);
+
+public slots:
+  void postUpdate();
+
+  void resetView();
+  void panTo(double x, double y);
+
+  void jumpToEvent(vtkIdType eventId, bool jumpToEnd = false);
+  void jumpToTrack(vtkIdType trackId, bool jumpToEnd = false);
+
+  void setEventSelection(QSet<vtkIdType> eventIds, vtkIdType currentId = -1);
+
+  void cancelInteraction();
+
+  void beginDrawing(vsContour::Type type);
+  void interruptDrawing();
+  void setDrawingType(vsContour::Type);
+  void closeContour();
+  void beginContourManipulation();
+  void finalizeContour();
+
+  bool setContourEnabled(int, bool);
+  bool convertContourToEvent(int, int eventType);
+
+  void setEventStart(vtkIdType);
+  void setEventEnd(vtkIdType);
+
+  void setVideoPlaybackSpeed(vgVideoPlayer::PlaybackMode, qreal rate = 1.0);
+  void seekVideo(vtkVgTimeStamp, vg::SeekMode, qint64);
+
+  void setVideoLiveOffset(double);
+  void setVideoSamplingMode(int mode);
+
+  void setTracksVisible(bool);
+  void setTrackBoxesVisible(bool);
+  void setTrackIdsVisible(bool);
+  void setTrackPvoScoresVisible(bool);
+  void setTrackTrailLength(double);
+
+  void setEventTracksVisible(bool);
+  void setEventBoxesVisible(bool);
+  void setEventLabelsVisible(bool);
+  void setEventProbabilityVisible(bool);
+
+  void showEventGroupFilter(vsEventInfo::Group);
+  void hideEventGroupFilter(vsEventInfo::Group);
+  void setEventGroupFilterVisible(vsEventInfo::Group, bool);
+
+  void setEventGroupVisibility(vsEventInfo::Group, bool);
+  void setEventGroupThreshold(vsEventInfo::Group, double);
+
+  void setEventSelectedColor(QColor c);
+
+  void setGroundTruthVisible(bool);
+
+  void setFilteringMaskVisible(bool);
+  void setTrackingMaskVisible(bool);
+
+  void setEventStatus(vtkVgEvent*, int);
+
+  void setFollowEvent(bool);
+
+  void setTrackDisplayState(vtkIdType trackId, bool state);
+  void setEventDisplayState(vtkIdType eventId, bool state);
+
+  void setTrackColorMode(vtkVgTrackRepresentationBase::TrackColorMode,
+                         const QString& dataId = QString());
+
+  void updateTrackColors(vtkVgTrackRepresentationBase::TrackColorMode);
+
+protected slots:
+  void update();
+
+  void resetVideo();
+  void resetVideo(vsVideoSource*);
+  void updateVideoFrame(vtkVgVideoFrame, qint64 seekRequestId);
+  void removeVideoSource(QObject*);
+
+  void setSourceStreaming(bool);
+  void setSourceFrameRange(vtkVgTimeStamp, vtkVgTimeStamp);
+
+  void setEventVisibility(int, bool);
+  void setEventThreshold(int, double);
+
+  void updateEventSelection(QSet<vtkIdType> eventIds);
+
+  void onLeftClick();
+  void onRightClick();
+  void vtkSceneMouseMoveEvent();
+  void vtkSceneLeaveEvent();
+
+  void addContour(vsContour);
+  void setContourType(int id, vsContour::Type);
+  void setContourPoints(int id, QPolygonF);
+  void removeContour(int id);
+
+  void addUserEventType(int id, vsEventInfo, double initialThreshold);
+
+  void addAlert(int id, vsAlert);
+  void updateAlert(int id, vsAlert);
+  void updateAlertThreshold(int id, vsAlert);
+  void removeAlert(int id, bool unregister);
+
+  void startQuickNoteTimer(vtkIdType eventId);
+
+  void writeRenderedImages();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsScene)
+
+  void postUpdate(vtkVgTimeStamp);
+
+  void setupEventTree(vsEventTreeWidget* tree, int type);
+
+  void jumpToEvent();
+  void jumpToTrack();
+  void jumpToTrack(vtkVgTrack*);
+
+  vtkIdType tryPick(vtkVgRepresentationBase& labelRep,
+                    vtkVgRepresentationBase& headRep,
+                    vtkVgRepresentationBase& lineRep, int x, int y);
+
+private:
+  QTE_DECLARE_PRIVATE(vsScene)
+  Q_DISABLE_COPY(vsScene)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsScenePrivate.cxx b/Libraries/VspUserInterface/vsScenePrivate.cxx
new file mode 100644
index 00000000..6bf592b0
--- /dev/null
+++ b/Libraries/VspUserInterface/vsScenePrivate.cxx
@@ -0,0 +1,945 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsScenePrivate.h"
+
+#include <QSettings>
+
+#include <vtkAssembly.h>
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkImageActor.h>
+#include <vtkImageProperty.h>
+#include <vtkImageStencil.h>
+#include <vtkImplicitSelectionLoop.h>
+#include <vtkImplicitFunctionToImageStencil.h>
+#include <vtkLookupTable.h>
+#include <vtkMath.h>
+#include <vtkPoints.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProp3DCollection.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderer.h>
+
+#include <vtkVgContourOperatorManager.h>
+#include <vtkVgEventFilter.h>
+#include <vtkVgEventLabelRepresentation.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgEventRepresentation.h>
+#include <vtkVgSpaceConversion.h>
+#include <vtkVgTrackFilter.h>
+#include <vtkVgTrackHeadRepresentation.h>
+#include <vtkVgTrackLabelRepresentation.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+#include <vtkVgUtil.h>
+
+#include <vgGeoUtil.h>
+
+#include <vgMixerWidget.h>
+
+#include "vsContourWidget.h"
+#include "vsCore.h"
+#include "vsEventTreeModel.h"
+#include "vsScene.h"
+#include "vsSettings.h"
+#include "vsTrackInfo.h"
+#include "vsTrackTreeModel.h"
+
+//BEGIN vsSceneTrackColorHelper
+
+//-----------------------------------------------------------------------------
+class vsSceneTrackColorHelper : public vsTrackTreeColorHelper,
+                                public vtkVgTrackColorHelper,
+                                public vtkVgTrackLabelColorHelper
+{
+public:
+  vsSceneTrackColorHelper(vsCore* core) : Core(core) {}
+  virtual ~vsSceneTrackColorHelper() {}
+
+  // vsTrackTreeColorHelper interface
+  virtual QColor color(vtkVgTrack* track) QTE_OVERRIDE;
+
+  // vtkVgTrackColorHelper interface
+  virtual const double* GetTrackColor(
+    vtkVgTrackInfo track, double scalar) QTE_OVERRIDE;
+
+  // vtkVgTrackLabelColorHelper interface
+  virtual const double* GetTrackLabelBackgroundColor(
+    vtkVgTrack* track) QTE_OVERRIDE;
+  virtual const double* GetTrackLabelForegroundColor(
+    vtkVgTrack* track) QTE_OVERRIDE;
+
+  // Public members
+  QHash<int, vsTrackInfo> SourceColors;
+
+protected:
+  const vsTrackInfo* infoForTrack(vtkVgTrack* track) const;
+
+  vsCore* const Core;
+};
+
+//-----------------------------------------------------------------------------
+QColor vsSceneTrackColorHelper::color(vtkVgTrack* track)
+{
+  const vsTrackInfo* const ti = this->infoForTrack(track);
+  if (ti)
+    {
+    return QColor::fromRgbF(ti->pcolor[0], ti->pcolor[1], ti->pcolor[2]);
+    }
+  return QColor();
+}
+
+//-----------------------------------------------------------------------------
+const double* vsSceneTrackColorHelper::GetTrackColor(
+  vtkVgTrackInfo track, double scalar)
+{
+  Q_UNUSED(scalar)
+  const vsTrackInfo* const ti = this->infoForTrack(track.GetTrack());
+  return (ti ? ti->pcolor : 0);
+}
+
+//-----------------------------------------------------------------------------
+const double* vsSceneTrackColorHelper::GetTrackLabelBackgroundColor(
+  vtkVgTrack* track)
+{
+  const vsTrackInfo* const ti = this->infoForTrack(track);
+  return (ti ? ti->bcolor : 0);
+}
+
+//-----------------------------------------------------------------------------
+const double* vsSceneTrackColorHelper::GetTrackLabelForegroundColor(
+  vtkVgTrack* track)
+{
+  const vsTrackInfo* const ti = this->infoForTrack(track);
+  return (ti ? ti->fcolor : 0);
+}
+
+//-----------------------------------------------------------------------------
+const vsTrackInfo* vsSceneTrackColorHelper::infoForTrack(
+  vtkVgTrack* track) const
+{
+  const vvTrackId tid = this->Core->logicalTrackId(track->GetId());
+
+  const QHash<int, vsTrackInfo>::const_iterator iter =
+    this->SourceColors.find(tid.Source);
+  return (iter == this->SourceColors.constEnd() ? 0 : &iter.value());
+}
+
+//END vsSceneTrackColorHelper
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN static helper methods
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+double blend(double t, double a, double b)
+{
+  return ((1.0 - t) * a) + (t * b);
+}
+
+//-----------------------------------------------------------------------------
+double blend2d(double u, double v, double tl, double tr, double bl, double br)
+{
+  const double l = blend(v, tl, bl), r = blend(v, tr, br);
+  return blend(u, l, r);
+}
+
+//-----------------------------------------------------------------------------
+void setTrackTypeColors(vsScenePrivate::Graph& graph, vsTrackInfo ti)
+{
+  vtkVgTrack::enumTrackPVOType type =
+    static_cast<vtkVgTrack::enumTrackPVOType>(ti.type);
+  graph.TrackRepresentation->SetColor(type, ti.pcolor);
+  graph.TrackHeadRepresentation->SetColor(type, ti.pcolor);
+  graph.TrackLabelRepresentation->SetTrackTypeColors(
+    type, ti.bcolor, ti.fcolor);
+}
+
+//-----------------------------------------------------------------------------
+void setDefaultColors(vsScenePrivate::Graph& graph, double (&color)[3])
+{
+  graph.TrackRepresentation->SetDefaultColor(color);
+  graph.TrackHeadRepresentation->SetDefaultColor(color);
+}
+
+//-----------------------------------------------------------------------------
+void setHelperForGraph(vsScenePrivate::Graph& graph,
+                       vsSceneTrackColorHelper* helper)
+{
+  graph.TrackRepresentation->SetColorHelper(helper);
+  graph.TrackHeadRepresentation->SetColorHelper(helper);
+  graph.TrackLabelRepresentation->SetLabelColorHelper(helper);
+  graph.TrackRepresentation->Modified();
+  graph.TrackHeadRepresentation->Modified();
+  graph.TrackLabelRepresentation->Modified();
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vsSceneTrackColorHelper* updateTrackColorHelper(
+  vsSceneTrackColorHelper* helper)
+{
+  if (!vsSettings().colorTracksBySource())
+    {
+    // If per-source coloring is disabled, we don't really need to do anything,
+    // and we return the helper that should be used (i.e. 'none' in this case)
+    return 0;
+    }
+
+  // Otherwise, ensure that the helper's collection of source colors is up to
+  // date...
+  helper->SourceColors.clear();
+  foreach (const vsTrackInfo& ti, vsTrackInfo::trackSources())
+    {
+    helper->SourceColors.insert(ti.source, ti);
+    }
+
+  // ...and return the helper
+  return helper;
+}
+
+//END static helper methods
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsScenePrivate
+
+//-----------------------------------------------------------------------------
+vsScenePrivate::vsScenePrivate(vsScene* q, vsCore* core)
+  : q_ptr(q), Core(core), VideoSource(0),
+    TrackColorHelper(new vsSceneTrackColorHelper(core)),
+    EventSelectedColor(vsSettings().eventSelectedColor()),
+    FilteringMaskColor(vsSettings().filteringMaskColor()),
+    GroundTruthEnabled(true), RenderWidget(0), FilterWidget(0),
+    EventTreeModel(0), TrackTreeModel(0), NeedViewReset(true),
+    PendingJumpEventId(-1), PendingJumpTrackId(-1),
+    WriteRenderedImages(false), ImageCounter(1), SaveScreenShot(false)
+{
+  // Initialize models
+  this->initializeGraph(this->NormalGraph);
+  this->initializeGraph(this->GroundTruthGraph, "GT-");
+
+  core->addModel(this->NormalGraph.TrackModel);
+  core->addModel(this->NormalGraph.EventModel);
+  core->addModel(this->GroundTruthGraph.TrackModel, vsCore::GroundTruthModel);
+  core->addModel(this->GroundTruthGraph.EventModel, vsCore::GroundTruthModel);
+
+  // Initialize filters
+  this->TrackFilter->SetShowType(vtkVgTrack::Person, true);
+  this->TrackFilter->SetMinProbability(vtkVgTrack::Person, 0.0);
+  this->TrackFilter->SetMaxProbability(vtkVgTrack::Person, 1.0);
+  this->TrackFilter->SetShowType(vtkVgTrack::Vehicle, true);
+  this->TrackFilter->SetMinProbability(vtkVgTrack::Vehicle, 0.0);
+  this->TrackFilter->SetMaxProbability(vtkVgTrack::Vehicle, 1.0);
+  this->TrackFilter->SetShowType(vtkVgTrack::Other, true);
+  this->TrackFilter->SetMinProbability(vtkVgTrack::Other, 0.0);
+  this->TrackFilter->SetMaxProbability(vtkVgTrack::Other, 1.0);
+
+  // Set up track labels and coloring
+  this->updateTrackClassifierColors();
+  this->updateTrackSourceColors();
+
+  this->TrackingMask->GetProperty()->SetOpacity(
+    this->FilteringMaskColor.constData().color.alpha);
+  this->TrackingMask->SetInterpolate(0);
+
+  QSettings settings;
+  this->MaxTimeForQuickNote =
+    settings.value("MaxQuickNoteTime", 1.0).toDouble();
+}
+
+//-----------------------------------------------------------------------------
+vsScenePrivate::~vsScenePrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::createFilterEventGroup(
+  const QString& name, vsEventInfo::Group group,
+  vsEventInfo::Group parent, bool expanded)
+{
+  bool checkable = (group != vsEventInfo::All);
+  int parentId = this->FilterGroup.value(parent, 0);
+  int groupId = this->FilterWidget->addGroup(name, checkable, parentId);
+  this->FilterGroup.insert(group, groupId);
+  this->FilterWidget->setExpanded(groupId, expanded);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::createFilterEventGroup(
+  const QString& name, vsEventInfo::Group group, bool expanded)
+{
+  this->createFilterEventGroup(name, group, vsEventInfo::All, expanded);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::setupFilterEventGroup(
+  vsEventInfo::Group group, bool visibility, double threshold)
+{
+  const QList<vsEventInfo> eventTypes = vsEventInfo::events(group);
+  this->setupFilterEventGroup(eventTypes, group, visibility, threshold);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::setupFilterEventGroup(
+  const QList<vsEventInfo>& eventTypes, vsEventInfo::Group group,
+  bool visibility, double threshold)
+{
+  int groupId = this->FilterGroup.value(group, 0);
+
+  foreach (const vsEventInfo& ei, eventTypes)
+    this->FilterWidget->addItem(ei.type, ei.name, groupId);
+  this->FilterWidget->setGroupState(groupId, visibility);
+  this->FilterWidget->setGroupValue(groupId, threshold);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::setFilterEventGroupVisibility(vsEventInfo::Group group)
+{
+  int groupId = this->FilterGroup.value(group, 0);
+  bool filterVisibility = this->Core->isEventGroupExpected(group);
+  this->FilterWidget->setGroupVisible(groupId, filterVisibility);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::addFilter(const vsEventInfo& ei, vsEventInfo::Group group,
+                               bool visibility, double threshold)
+{
+  int groupId = this->FilterGroup.value(group, 0);
+  this->FilterWidget->addItem(ei.type, ei.name, groupId);
+  this->FilterWidget->setState(ei.type, visibility);
+  this->FilterWidget->setValue(ei.type, threshold);
+  this->EventFilter->SetShowType(ei.type, visibility);
+  this->EventFilter->SetMinProbability(ei.type, threshold);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::createMaskActor(
+  ContourInfo& info, const vgColor& fcolor, const vgColor& bcolor)
+{
+  vtkImplicitSelectionLoop* loop =
+    this->ContourOperatorManager->GetContourLoop(info.widget->points());
+  vtkPoints* points = loop->GetLoop();
+
+  double bounds[6];
+  points->GetBounds(bounds);
+  vtkSmartPointer<vtkImageData> input =
+    vsScenePrivate::createFilterMaskImage(bounds);
+
+  vtkImplicitFunctionToImageStencil* loopToStencil =
+    vtkImplicitFunctionToImageStencil::New();
+
+  loopToStencil->SetInput(loop);
+  loopToStencil->SetOutputOrigin(input->GetOrigin());
+  // set output extents
+  int ib[4] =
+    {
+    vtkMath::Floor(bounds[0]), vtkMath::Ceil(bounds[1]),
+    vtkMath::Floor(bounds[2]), vtkMath::Ceil(bounds[3])
+    };
+  int dim[3] = { ib[1] - ib[0], ib[3] - ib[2], 1 };
+  loopToStencil->SetOutputWholeExtent(
+    0, dim[0]-1, 0, dim[1]-1, 0, dim[2]-1);
+  loopToStencil->Update();
+
+  vtkImageStencil* stencil = vtkImageStencil::New();
+  stencil->SetStencilData(loopToStencil->GetOutput());
+  stencil->SetInputData(input);
+  stencil->SetBackgroundValue(1.0);
+  stencil->Update();
+
+  info.maskActor = vtkSmartPointer<vtkImageActor>::New();
+  info.maskActor->SetInputData(stencil->GetOutput());
+
+  vtkLookupTable* lut = vtkLookupTable::New();
+  lut->SetNumberOfTableValues(2);
+  lut->SetTableValue(0, fcolor.value().array); // foreground
+  lut->SetTableValue(1, bcolor.value().array); // background
+  lut->SetTableRange(0.0, 1.0);
+  lut->SetRampToLinear();
+  info.maskActor->GetProperty()->SetLookupTable(lut);
+  info.maskActor->GetProperty()->UseLookupTableScalarRangeOn();
+
+  info.maskActor->SetInterpolate(0);
+  info.maskActor->Update();
+
+  loopToStencil->FastDelete();
+  stencil->FastDelete();
+  lut->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::createFilterMask(ContourInfo& info)
+{
+  this->createMaskActor(info, this->FilteringMaskColor, vgColor());
+  this->FilterMaskProps->AddPart(info.maskActor);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::removeFilterMask(ContourInfo& info)
+{
+  this->FilterMaskProps->RemovePart(info.maskActor);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::createSelectorMask(ContourInfo& info)
+{
+  // Create a gray quad to cover the whole image; individual selectors will
+  // mask out their respective parts of this with the help of stencil testing
+  if (!this->SelectorMaskQuad->GetMapper())
+    {
+    vtkPoints* points = vtkPoints::New();
+    vtkPolyData* pd = vtkPolyData::New();
+    vtkCellArray* ca = vtkCellArray::New();
+    vtkPolyDataMapper* pdm = vtkPolyDataMapper::New();
+    vtkUnsignedCharArray* uca = vtkUnsignedCharArray::New();
+
+    points->SetNumberOfPoints(4);
+
+    double bounds[6];
+    this->ImageActor->GetBounds(bounds);
+
+    points->SetPoint(0, bounds[0], bounds[2], 0.0);
+    points->SetPoint(1, bounds[1], bounds[2], 0.0);
+    points->SetPoint(2, bounds[1], bounds[3], 0.0);
+    points->SetPoint(3, bounds[0], bounds[3], 0.0);
+
+    vtkIdType ids[] = { 0, 1, 2, 3 };
+    ca->InsertNextCell(4, ids);
+
+    uca->SetNumberOfComponents(4);
+    uca->SetName("Colors");
+
+    unsigned char color[4];
+    this->FilteringMaskColor.fillArray(color);
+    uca->InsertNextTupleValue(color);
+
+    pd->GetCellData()->SetScalars(uca);
+    pd->SetPoints(points);
+    pd->SetPolys(ca);
+    pdm->SetInputData(pd);
+
+    this->SelectorMaskQuad->SetMapper(pdm);
+
+    points->FastDelete();
+    pd->FastDelete();
+    ca->FastDelete();
+    pdm->FastDelete();
+    uca->FastDelete();
+    }
+
+  // Foreground color must have non-zero alpha to prevent GL from throwing out
+  // the geometry during alpha test.
+  vgColor foreground(0.0, 0.0, 0.0, 0.01);
+
+  this->createMaskActor(info, foreground, vgColor());
+  this->SelectorMaskProps->AddPart(info.maskActor);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::removeSelectorMask(ContourInfo& info)
+{
+  this->SelectorMaskProps->RemovePart(info.maskActor);
+
+  if (this->SelectorMaskProps->GetParts()->GetNumberOfItems() == 0)
+    this->SelectorMaskQuad->SetMapper(0);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::setAssemblyZRange(vtkAssembly* a, double z1, double z2)
+{
+  vtkProp3DCollection* props = a->GetParts();
+  int numProps = props->GetNumberOfItems();
+
+  double range = z2 - z1;
+
+  int i = 0;
+  props->InitTraversal();
+  while (vtkProp3D* p = props->GetNextProp3D())
+    {
+    double z = range * (++i / static_cast<double>((numProps + 1)));
+    p->SetPosition(0.0, 0.0, z1 + z);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::updateContourMaskPositions()
+{
+  // Contour masks should fall in the z interval (-0.1, 0.0), between the
+  // video image and the first track or event representation. If contours are
+  // not positioned lower than tracks (or events), those tracks will be wrongly
+  // occluded, since they render later in the pipeline. For correct rendering,
+  // we must also ensure that later-rendered masks have a greater depth value
+  // than earlier-rendered ones (of the same type). This prevents z-fighting
+  // and prevents blending of the mask color when two mask regions overlap.
+  double z = -0.1;
+  double w = this->CurrentTransformVtk->Element[3][3];
+  double zscale = this->CurrentTransformVtk->Element[2][2];
+  if (zscale != 0.0)
+    {
+    w /= zscale;
+    }
+  z *= w;
+  this->setAssemblyZRange(this->FilterMaskProps, 0.0, z);
+  this->setAssemblyZRange(this->SelectorMaskProps, 0.0, z);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::addFilterContour(ContourInfo& info)
+{
+  vsContour::Type type = info.widget->type();
+  vsContourWidget* contourWidget = info.widget.data();
+  if (type == vsContour::Filter)
+    {
+    this->ContourOperatorManager->AddFilter(contourWidget->points());
+    this->createFilterMask(info);
+    }
+  else if (type == vsContour::Selector)
+    {
+    this->ContourOperatorManager->AddSelector(contourWidget->points());
+    this->createSelectorMask(info);
+    }
+  this->updateContourMaskPositions();
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::removeFilterContour(ContourInfo& info)
+{
+  vsContour::Type type = info.widget->type();
+  vsContourWidget* contourWidget = info.widget.data();
+  if (type == vsContour::Filter)
+    {
+    this->removeFilterMask(info);
+    this->ContourOperatorManager->RemoveFilter(contourWidget->points());
+    }
+  else if (type == vsContour::Selector)
+    {
+    this->removeSelectorMask(info);
+    this->ContourOperatorManager->RemoveSelector(contourWidget->points());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::initializeGraph(Graph& graph, const char* labelPrefix)
+{
+  vtkVgEventTypeRegistry* eventTypeRegistry = this->Core->eventTypeRegistry();
+
+  // Track model
+  graph.TrackModel->Initialize();
+  graph.TrackModel->SetDisplayAllTracks(true);
+  graph.TrackModel->SetContourOperatorManager(this->ContourOperatorManager);
+
+  // Track representations
+  graph.TrackRepresentation->UseAutoUpdateOff();
+  graph.TrackRepresentation->SetTrackModel(graph.TrackModel);
+  graph.TrackRepresentation->SetColorModeToPVO();
+  graph.TrackRepresentation->SetTrackFilter(this->TrackFilter);
+  graph.TrackRepresentation->SetContourOperatorManager(
+    this->ContourOperatorManager);
+
+  graph.TrackHeadRepresentation->SetTrackModel(graph.TrackModel);
+  graph.TrackHeadRepresentation->SetColorModeToPVO();
+  graph.TrackHeadRepresentation->SetTrackFilter(this->TrackFilter);
+  graph.TrackHeadRepresentation->SetContourOperatorManager(
+    this->ContourOperatorManager);
+
+  graph.TrackLabelRepresentation->UseAutoUpdateOff();
+  graph.TrackLabelRepresentation->SetTrackModel(graph.TrackModel);
+  graph.TrackLabelRepresentation->SetTrackFilter(this->TrackFilter);
+  if (labelPrefix)
+    graph.TrackLabelRepresentation->SetLabelPrefix(labelPrefix);
+
+  // Event model
+  graph.EventModel->SetTrackModel(graph.TrackModel);
+  graph.EventModel->SetContourOperatorManager(
+    this->ContourOperatorManager);
+
+  vtkVgTimeStamp offset;
+  offset.SetFrameNumber(30); // 3 seconds at 10 fps
+  offset.SetTime(3e6); // 3 seconds
+  graph.EventModel->SetEventExpirationOffset(offset);
+
+  // This we do nothing for events whose tracks are used once per trackInfo,
+  // which should be true of everything but alerts.  For alerts, this will
+  // merge the (possibly) multiple track infos (that use the same track) so
+  // that it acts (looks) like single track info.
+  graph.EventModel->UseTrackGroupsOn();
+
+  // Event representations
+  graph.EventRepresentation->Initialize();
+  graph.EventRepresentation->UseAutoUpdateOff();
+  graph.EventRepresentation->SetEventModel(graph.EventModel);
+  graph.EventRepresentation->SetEventFilter(this->EventFilter);
+  graph.EventRepresentation->SetEventTypeRegistry(eventTypeRegistry);
+
+  graph.EventHeadRepresentation->UseAutoUpdateOff();
+  graph.EventHeadRepresentation->SetEventModel(graph.EventModel);
+  graph.EventHeadRepresentation->SetEventFilter(this->EventFilter);
+  graph.EventHeadRepresentation->SetEventTypeRegistry(eventTypeRegistry);
+
+  graph.EventLabelRepresentation->UseAutoUpdateOff();
+  graph.EventLabelRepresentation->SetEventModel(graph.EventModel);
+  graph.EventLabelRepresentation->SetEventFilter(this->EventFilter);
+  graph.EventLabelRepresentation->SetEventTypeRegistry(eventTypeRegistry);
+  if (labelPrefix)
+    graph.EventLabelRepresentation->SetLabelPrefix(labelPrefix);
+  graph.EventLabelRepresentation->SetShowId(false);
+  graph.EventLabelRepresentation->SetShowClassifiers(4);
+
+  // Show supporting tracks for events
+  graph.EventRepresentation->SetTrackRepresentation(
+    graph.TrackRepresentation);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::setupRepresentations(Graph& graph, float widthScale)
+{
+  graph.EventRepresentation->SetZOffset(0.1);
+  graph.EventRepresentation->SetLineWidth(4.0f * widthScale);
+  graph.EventHeadRepresentation->SetLineWidth(1.0f * widthScale);
+
+  graph.TrackRepresentation->SetActiveTrackLineWidth(1.7f * widthScale);
+  graph.TrackRepresentation->SetExpiringTrackLineWidth(1.7f * widthScale);
+  graph.TrackHeadRepresentation->SetLineWidth(1.0f * widthScale);
+}
+
+//-----------------------------------------------------------------------------
+bool vsScenePrivate::updateModels(Graph& graph, bool forceUpdate)
+{
+  // Events
+  QList<vtkVgRepresentationBase*> eventReps;
+  QList<vtkProp*> insertEventPropsAfter;
+  eventReps << graph.EventRepresentation
+            << graph.EventHeadRepresentation
+            << graph.EventLabelRepresentation;
+  insertEventPropsAfter << this->EventPropsBegin << this->EventPropsBegin << 0;
+
+  // Only notify that the event scene has changed in case of a change to the
+  // type registry, event filter, or the event model (not counting normal
+  // updates)
+  const bool notifyEventSceneUpdated =
+    forceUpdate ||
+    this->EventFilter->GetMTime() >  graph.EventRepresentationsUpdateTime ||
+    graph.EventModel->GetMTime() > graph.EventModel->GetUpdateTime();
+
+  bool updated =
+    this->updateModels(graph.EventModel, this->EventFilter,
+                       eventReps, insertEventPropsAfter,
+                       graph.EventRepresentationsUpdateTime, forceUpdate);
+  if (notifyEventSceneUpdated)
+    {
+    QTE_Q(vsScene);
+    emit q->eventSceneUpdated();
+    }
+
+  // Tracks
+  QList<vtkVgRepresentationBase*> trackReps;
+  QList<vtkProp*> insertTrackPropsAfter;
+  trackReps << graph.TrackRepresentation
+            << graph.TrackHeadRepresentation
+            << graph.TrackLabelRepresentation;
+  insertTrackPropsAfter << this->TrackPropsBegin << this->TrackPropsBegin << 0;
+
+  // The state of the event representation can affect track display
+  forceUpdate = graph.EventRepresentation->GetUpdateTime() >
+                graph.TrackRepresentation->GetUpdateTime();
+
+  // Only notify that the track scene has changed in case of a change to the
+  // track filter or the model (not counting normal updates)
+  const bool notifyTrackSceneUpdated =
+    this->TrackFilter->GetMTime() > graph.TrackRepresentationsUpdateTime ||
+    graph.TrackModel->GetMTime() > graph.TrackModel->GetUpdateTime();
+
+  updated =
+    this->updateModels(graph.TrackModel, this->TrackFilter,
+                       trackReps, insertTrackPropsAfter,
+                       graph.TrackRepresentationsUpdateTime,
+                       updated || forceUpdate) || updated;
+  if (notifyTrackSceneUpdated)
+    {
+    QTE_Q(vsScene);
+    emit q->trackSceneUpdated();
+    }
+
+  return updated;
+}
+
+//-----------------------------------------------------------------------------
+bool vsScenePrivate::updateModels(
+  vtkVgModelBase* model, vtkObject* filter,
+  QList<vtkVgRepresentationBase*> modelReps, QList<vtkProp*> insertAfter,
+  vtkTimeStamp& repsUpdateTime, bool forceUpdate)
+{
+  // Record the old model update time and update the model
+  unsigned long preUpdateModelTime = model->GetUpdateTime();
+  model->Update(this->CurrentFrameTime,
+                &this->CurrentHomographyReferenceTime);
+
+  // If either the model or filter have changed since the last update, then
+  // we must perform a full update of all representations.
+  if (!forceUpdate)
+    {
+    forceUpdate =
+      (preUpdateModelTime < model->GetUpdateTime() ||
+       filter->GetMTime() > repsUpdateTime);
+    }
+
+  Q_ASSERT(modelReps.size() == insertAfter.size());
+
+  // See if the model rep Modified and UpdateTime warrant updating the rep
+  for (int i = 0, end = modelReps.count(); i < end; ++i)
+    {
+    vtkVgRepresentationBase* modelRep = modelReps[i];
+    if (!modelRep->GetVisible())
+      continue;
+
+    if (forceUpdate ||
+        modelRep->GetMTime() > modelRep->GetUpdateTime() ||
+        modelRep->GetUpdateTime() < model->GetUpdateTime() ||
+        modelRep->GetUpdateTime() < model->GetUpdateDataRequestTime())
+      {
+      modelRep->Update();
+
+      // Add new props
+      vtkPropCollection* props;
+      props = modelRep->GetNewRenderObjects();
+      props->InitTraversal();
+      while (vtkProp* prop = props->GetNextProp())
+        {
+        if (vtkProp* ia = insertAfter[i])
+          {
+          // Insert prop "by hand" if render order is important. This is
+          // a linear operation, but it shouldn't happen that often.
+          vtkPropCollection* rendProps = this->Renderer->GetViewProps();
+          int insertAt = rendProps->IsItemPresent(ia);
+          Q_ASSERT_X(insertAt, __FUNCTION__, "failed assert insertAt != 0;"
+                     " placeholder prop not added to renderer");
+          rendProps->InsertItem(insertAt - 1, prop);
+          prop->AddConsumer(this->Renderer);
+          }
+        else
+          {
+          // No placeholder, just append
+          this->Renderer->AddViewProp(prop);
+          }
+        }
+
+      // Remove expired props
+      props = modelRep->GetExpiredRenderObjects();
+      props->InitTraversal();
+      while (vtkProp* prop = props->GetNextProp())
+        this->Renderer->RemoveViewProp(prop);
+
+      modelRep->ResetTemporaryRenderObjects();
+      }
+    }
+
+  // Bump the update time and return true if the model was updated, filters
+  // changed, or something else occurred that was important enough force a
+  // "full update". This is a signal to the caller that other dependent
+  // representations will need updating (e.g. the event tree).
+  if (forceUpdate)
+    {
+    repsUpdateTime.Modified();
+    return true;
+    }
+
+  // This was an incremental update (e.g. labels only). Further updates of
+  // dependent representations should not be necessary.
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::updateTrackClassifierColors()
+{
+  foreach (vsTrackInfo ti, vsTrackInfo::trackTypes())
+    {
+    setTrackTypeColors(this->NormalGraph, ti);
+    setTrackTypeColors(this->GroundTruthGraph, ti);
+
+    // TCM_Default doesn't use unclassified color, but that's what we want...
+    if (ti.type == vtkVgTrack::Unclassified)
+      {
+      setDefaultColors(this->NormalGraph, ti.pcolor);
+      setDefaultColors(this->GroundTruthGraph, ti.pcolor);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::updateTrackSourceColors()
+{
+  vsSceneTrackColorHelper* const helper =
+    updateTrackColorHelper(this->TrackColorHelper.data());
+  setHelperForGraph(this->NormalGraph, helper);
+  setHelperForGraph(this->GroundTruthGraph, helper);
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::updateTrackTreeColors()
+{
+  foreach (const vsTrackInfo& ti, vsTrackInfo::trackTypes())
+    {
+    const QColor color =
+      QColor::fromRgbF(ti.pcolor[0], ti.pcolor[1], ti.pcolor[2]);
+    this->TrackTreeModel->setColor(ti.type, color);
+    }
+
+  this->TrackTreeModel->setColorHelper(
+    updateTrackColorHelper(this->TrackColorHelper.data()));
+
+  this->TrackTreeModel->update();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackInfo vsScenePrivate::trackInfo(vtkIdType trackId)
+{
+  vtkVgTrackInfo info = this->NormalGraph.TrackModel->GetTrackInfo(trackId);
+  if (!info.GetTrack())
+    {
+    info = this->GroundTruthGraph.TrackModel->GetTrackInfo(trackId);
+    }
+  return info;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventInfo vsScenePrivate::eventInfo(vtkIdType eventId)
+{
+  vtkVgEventInfo info = this->NormalGraph.EventModel->GetEventInfo(eventId);
+  if (!info.GetEvent())
+    {
+    info = this->GroundTruthGraph.EventModel->GetEventInfo(eventId);
+    }
+  return info;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack* vsScenePrivate::findTrack(vtkIdType trackId)
+{
+  return this->trackInfo(trackId).GetTrack();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vsScenePrivate::findEvent(vtkIdType eventId)
+{
+  return this->eventInfo(eventId).GetEvent();
+}
+
+//-----------------------------------------------------------------------------
+QString vsScenePrivate::buildLocationTextFromDisplay(int x, int y)
+{
+  if (x < 0 || y < 0)
+    {
+    // If location is invalid, return empty string
+    return QString();
+    }
+  else if (this->CurrentFrameMetaData.WorldLocation.GCS != -1)
+    {
+    // Get point in image coordinates
+    double pos[3] = { static_cast<double>(x), static_cast<double>(y), 0.0 };
+    vtkVgSpaceConversion::DisplayToWorldNormalized(this->Renderer, pos, pos);
+
+    double latitude, longitude;
+    vtkSmartPointer<vtkMatrix4x4> imageToLatLonMatrix =
+      this->CurrentFrameMetaData.MakeImageToLatLonMatrix();
+    if (imageToLatLonMatrix)
+      {
+      vtkVgApplyHomography(pos, imageToLatLonMatrix, longitude, latitude);
+      }
+    else
+      {
+      // Normalize and y-flip the image coordinates
+      pos[0] /= (this->ImageActor->GetMaxXBound() + 1);
+      pos[1] = 1.0 - (pos[1] / (this->ImageActor->GetMaxYBound() + 1));
+
+      vtkVgVideoFrameCorners& corners =
+        this->CurrentFrameMetaData.WorldLocation;
+      // Get lat/lon
+      latitude =
+        blend2d(pos[0], pos[1],
+                corners.UpperLeft.Latitude, corners.UpperRight.Latitude,
+                corners.LowerLeft.Latitude, corners.LowerRight.Latitude);
+      longitude =
+        blend2d(pos[0], pos[1],
+                corners.UpperLeft.Longitude, corners.UpperRight.Longitude,
+                corners.LowerLeft.Longitude, corners.LowerRight.Longitude);
+      }
+
+    // Make sure lat-lon is at least in valid range
+    latitude = qBound(-90.0, latitude, 90.0);
+    longitude = qBound(-180.0, longitude, 180.0);
+
+    // Set clipboard text
+    return vgGeodesy::coordString(latitude, longitude);
+    }
+  return "(invalid)";
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkImageData> vsScenePrivate::createDummyImage()
+{
+  // Create a blank image when we don't have a real input
+  vtkSmartPointer<vtkImageData> dummy =
+    vtkSmartPointer<vtkImageData>::New();
+  dummy->SetExtent(0, 9, 0, 9, 0, 0);
+  dummy->AllocateScalars(VTK_UNSIGNED_CHAR, 1);
+  for (int i = 0; i < 10; ++i)
+    {
+    for (int j = 0; j < 10; ++j)
+      {
+      dummy->SetScalarComponentFromDouble(i, j, 0, 0, 0);
+      }
+    }
+
+  return dummy;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkImageData> vsScenePrivate::createFilterMaskImage(
+  const double (&bounds)[6])
+{
+  int ib[4] =
+    {
+    vtkMath::Floor(bounds[0]), vtkMath::Ceil(bounds[1]),
+    vtkMath::Floor(bounds[2]), vtkMath::Ceil(bounds[3])
+    };
+
+  int dim[3] = { ib[1] - ib[0], ib[3] - ib[2], 1 };
+
+  vtkSmartPointer<vtkImageData> data =
+    vtkSmartPointer<vtkImageData>::New();
+  data->SetExtent(0, dim[0]-1, 0, dim[1]-1, 0, dim[2]-1);
+  data->SetOrigin(ib[0], ib[2], 0);
+  data->AllocateScalars(VTK_FLOAT, 1);
+
+  // Initialize to 0.0f (CAUTION: relies on 0.0f being binary 0)
+  size_t k = dim[0] * dim[1] * dim[2];
+  memset(data->GetScalarPointer(), 0, k * sizeof(float));
+
+  return data;
+}
+
+//-----------------------------------------------------------------------------
+void vsScenePrivate::setRepresentationTransforms(
+  Graph& graph, vtkMatrix4x4* xf)
+{
+  graph.TrackRepresentation->SetRepresentationMatrix(xf);
+  graph.TrackHeadRepresentation->SetRepresentationMatrix(xf);
+  graph.TrackLabelRepresentation->SetRepresentationMatrix(xf);
+
+  graph.EventRepresentation->SetRepresentationMatrix(xf);
+  graph.EventHeadRepresentation->SetRepresentationMatrix(xf);
+  graph.EventLabelRepresentation->SetRepresentationMatrix(xf);
+}
+
+//END vsScenePrivate
diff --git a/Libraries/VspUserInterface/vsScenePrivate.h b/Libraries/VspUserInterface/vsScenePrivate.h
new file mode 100644
index 00000000..b78ce307
--- /dev/null
+++ b/Libraries/VspUserInterface/vsScenePrivate.h
@@ -0,0 +1,265 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsScenePrivate_h
+#define __vsScenePrivate_h
+
+#include <QHash>
+#include <QMatrix4x4>
+#include <QPoint>
+#include <QSet>
+#include <QSharedPointer>
+
+#include <vgColor.h>
+
+#include <vtkSmartPointer.h>
+#include <vtkTimeStamp.h>
+
+#include <vtkVgInstance.h>
+#include <vtkVgTimeStamp.h>
+
+#include <vgVideoPlayer.h>
+
+#include <vsEventInfo.h>
+
+class QVTKWidget;
+class vtkActor;
+class vtkAssembly;
+class vtkImageActor;
+class vtkImageData;
+class vtkMatrix4x4;
+class vtkObject;
+class vtkPNGWriter;
+class vtkProp;
+class vtkRenderer;
+class vtkRenderWindow;
+class vtkTimerLog;
+class vtkWindowToImageFilter;
+
+class vtkVgEvent;
+class vtkVgEventInfo;
+class vtkVgModelBase;
+class vtkVgContourOperatorManager;
+class vtkVgRepresentationBase;
+class vtkVgTrack;
+class vtkVgTrackInfo;
+class vtkVgTrackFilter;
+class vtkVgTrackModel;
+class vtkVgTrackRepresentation;
+class vtkVgTrackHeadRepresentation;
+class vtkVgTrackLabelRepresentation;
+class vtkVgEventModel;
+class vtkVgEventFilter;
+class vtkVgEventRepresentation;
+class vtkVgEventLabelRepresentation;
+class vtkVgEventRegionRepresentation;
+
+class vgColor;
+
+class vgMixerWidget;
+
+class vsAlertList;
+class vsCore;
+class vsContourWidget;
+class vsEventTreeModel;
+class vsEventTreeSelectionModel;
+class vsEventTreeWidget;
+class vsRegionList;
+class vsScene;
+class vsSceneTrackColorHelper;
+class vsTrackTreeModel;
+class vsVideoSource;
+
+class vsScenePrivate
+{
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsScene)
+
+public:
+  struct Update
+    {
+    Update() : videoUpdated(false) {}
+    Update(vtkVgTimeStamp vts) : time(vts), videoUpdated(true) {}
+
+    vtkVgTimeStamp time;
+    bool videoUpdated;
+    };
+
+  struct Graph
+    {
+    vtkVgInstance<vtkVgTrackModel> TrackModel;
+    vtkVgInstance<vtkVgTrackRepresentation> TrackRepresentation;
+    vtkVgInstance<vtkVgTrackHeadRepresentation> TrackHeadRepresentation;
+    vtkVgInstance<vtkVgTrackLabelRepresentation> TrackLabelRepresentation;
+
+    vtkVgInstance<vtkVgEventModel> EventModel;
+    vtkVgInstance<vtkVgEventRepresentation> EventRepresentation;
+    vtkVgInstance<vtkVgEventRegionRepresentation> EventHeadRepresentation;
+    vtkVgInstance<vtkVgEventLabelRepresentation> EventLabelRepresentation;
+
+    vtkTimeStamp TrackRepresentationsUpdateTime;
+    vtkTimeStamp EventRepresentationsUpdateTime;
+    };
+
+  struct ContourInfo
+    {
+    ContourInfo(vsContourWidget* w = 0) : widget(w), enabled(true) {}
+
+    QSharedPointer<vsContourWidget> widget;
+    vtkSmartPointer<vtkImageActor> maskActor;
+    bool enabled;
+    };
+
+  vsScenePrivate(vsScene* q, vsCore* core);
+  ~vsScenePrivate();
+
+  void createFilterEventGroup(const QString& name,
+                              vsEventInfo::Group group,
+                              vsEventInfo::Group parent = vsEventInfo::All,
+                              bool expanded = false);
+  void createFilterEventGroup(const QString& name,
+                              vsEventInfo::Group group,
+                              bool expanded);
+  void setupFilterEventGroup(vsEventInfo::Group group,
+                             bool visibility = false,
+                             double threshold = 0.1);
+  void setupFilterEventGroup(const QList<vsEventInfo>& eventTypes,
+                             vsEventInfo::Group group,
+                             bool visibility = false,
+                             double threshold = 0.1);
+  void setFilterEventGroupVisibility(vsEventInfo::Group group);
+  void addFilter(const vsEventInfo& info, vsEventInfo::Group group,
+                 bool visibility = true, double threshold = 0.0);
+
+  void createMaskActor(ContourInfo& info,
+                       const vgColor& fcolor, const vgColor& bcolor);
+
+  void createFilterMask(ContourInfo& info);
+  void removeFilterMask(ContourInfo& info);
+
+  void createSelectorMask(ContourInfo& info);
+  void removeSelectorMask(ContourInfo& info);
+
+  void setAssemblyZRange(vtkAssembly* a, double z1, double z2);
+  void updateContourMaskPositions();
+
+  void addFilterContour(ContourInfo& info);
+  void removeFilterContour(ContourInfo& info);
+
+  void initializeGraph(Graph&, const char* labelPrefix = 0);
+
+  void setupRepresentations(Graph& graph, float widthScale = 1.0);
+
+  bool updateModels(Graph& graph, bool forceUpdate = false);
+  bool updateModels(vtkVgModelBase* model, vtkObject* filter,
+                    QList<vtkVgRepresentationBase*> modelReps,
+                    QList<vtkProp*> insertAfter,
+                    vtkTimeStamp& repsUpdateTime,
+                    bool forceUpdate = false);
+
+  void updateTrackClassifierColors();
+  void updateTrackSourceColors();
+  void updateTrackTreeColors();
+
+  vtkVgTrackInfo trackInfo(vtkIdType trackId);
+  vtkVgEventInfo eventInfo(vtkIdType eventId);
+
+  vtkVgTrack* findTrack(vtkIdType trackId);
+  vtkVgEvent* findEvent(vtkIdType eventId);
+
+  QString buildLocationTextFromDisplay(int x, int y);
+
+  static vtkSmartPointer<vtkImageData> createDummyImage();
+  static vtkSmartPointer<vtkImageData> createFilterMaskImage(
+    const double (&bounds)[6]);
+
+  static void setRepresentationTransforms(Graph&, vtkMatrix4x4*);
+
+  vsCore* const Core;
+
+  vtkVgInstance<vtkRenderWindow> RenderWindow;
+  vtkVgInstance<vtkRenderer> Renderer;
+  vtkVgInstance<vtkImageActor> ImageActor;
+
+  vgVideoPlayer VideoPlayer;
+  vsVideoSource* VideoSource;
+  bool SourceIsStreaming;
+
+  vtkVgTimeStamp StreamDelay;
+
+  vtkVgTimeStamp TrackTrailLength;
+
+  QScopedPointer<vsSceneTrackColorHelper> TrackColorHelper;
+
+  vgColor EventSelectedColor;
+  QSet<vtkVgEvent*> SelectedEvents;
+
+  vgColor FilteringMaskColor;
+  vtkVgInstance<vtkAssembly> FilterMaskProps;
+  vtkVgInstance<vtkAssembly> SelectorMaskProps;
+
+  vtkVgInstance<vtkActor> SelectorMaskQuad;
+  vtkVgInstance<vtkActor> EventPropsBegin;
+  vtkVgInstance<vtkActor> TrackPropsBegin;
+
+  vtkVgInstance<vtkImageActor> TrackingMask;
+
+  vtkVgInstance<vtkVgContourOperatorManager> ContourOperatorManager;
+
+  vtkVgInstance<vtkVgTrackFilter> TrackFilter;
+  vtkVgInstance<vtkVgEventFilter> EventFilter;
+
+  Graph NormalGraph;
+  Graph GroundTruthGraph;
+  bool GroundTruthEnabled;
+
+  QScopedPointer<vsContourWidget> EditContour;
+  QHash<int, ContourInfo> Contours;
+  QHash<int, vsEventInfo> Alerts;
+
+  QVTKWidget* RenderWidget;
+
+  vgMixerWidget* FilterWidget;
+  QHash<vsEventInfo::Group, int> FilterGroup;
+
+  vsEventTreeModel* EventTreeModel;
+  vsTrackTreeModel* TrackTreeModel;
+
+  vsEventTreeSelectionModel* EventTreeSelectionModel;
+
+  bool NeedViewReset;
+  QList<Update> PendingUpdates;
+  vtkVgTimeStamp CurrentFrameTime;
+  vtkVgTimeStamp CurrentHomographyReferenceTime;
+  QMatrix4x4 CurrentTransformQt;
+  vtkVgInstance<vtkMatrix4x4> CurrentTransformVtk;
+  vtkVgVideoFrameMetaData CurrentFrameMetaData;
+
+  QPoint LastCursorPosition;
+
+  vtkIdType PendingJumpEventId;
+  vtkIdType PendingJumpTrackId;
+
+  bool FollowEventEnabled;
+
+  vtkSmartPointer<vtkWindowToImageFilter> WindowToImageFilter;
+  vtkSmartPointer<vtkPNGWriter> PngWriter;
+  bool WriteRenderedImages;
+  QString ImageOutputDirectory;
+  vtkIdType ImageCounter;
+  QString ScreenShotFileName;
+  bool SaveScreenShot;
+
+  double MaxTimeForQuickNote;
+  vtkIdType LastManualEventCreated;
+  vtkSmartPointer<vtkTimerLog> TimerLog;
+
+private:
+  QTE_DECLARE_PUBLIC(vsScene)
+  Q_DISABLE_COPY(vsScenePrivate)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsSettings.cxx b/Libraries/VspUserInterface/vsSettings.cxx
new file mode 100644
index 00000000..717ed01d
--- /dev/null
+++ b/Libraries/VspUserInterface/vsSettings.cxx
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsSettings.h"
+
+#define QTSETTINGS_SUBCLASS_NAME vsSettings
+#include <qtSettingsImpl.h>
+
+static const char* const keyColorTracksBySource    = "ColorTracksBySource";
+static const char* const keyEventSelectedColor     = "EventSelectedColor";
+static const char* const keyFilteringMaskColor     = "FilteringMaskColor";
+static const char* const keyDataMinColor           = "DataMinColor";
+static const char* const keyDataMaxColor           = "DataMaxColor";
+
+//-----------------------------------------------------------------------------
+vsSettings::vsSettings()
+{
+  this->declareSetting(keyColorTracksBySource, QVariant(false));
+  this->declareSetting(keyEventSelectedColor, QColor(255, 20, 144));
+  this->declareSetting(keyFilteringMaskColor, QColor(0, 0, 0, 96));
+  this->declareSetting(keyDataMinColor, Qt::red);
+  this->declareSetting(keyDataMaxColor, Qt::cyan);
+}
+
+//-----------------------------------------------------------------------------
+qtSettings_implement(colorTracksBySource, ColorTracksBySource, bool)
+qtSettings_implement(eventSelectedColor, EventSelectedColor, QColor)
+qtSettings_implement(filteringMaskColor, FilteringMaskColor, QColor)
+qtSettings_implement(dataMinColor, DataMinColor, QColor)
+qtSettings_implement(dataMaxColor, DataMaxColor, QColor)
diff --git a/Libraries/VspUserInterface/vsSettings.h b/Libraries/VspUserInterface/vsSettings.h
new file mode 100644
index 00000000..ab5ac480
--- /dev/null
+++ b/Libraries/VspUserInterface/vsSettings.h
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsSettings_h
+#define __vsSettings_h
+
+#include <QColor>
+
+#include <qtSettings.h>
+
+class vsSettings : public qtSettings
+{
+public:
+  vsSettings();
+
+  qtSettings_declare(bool, colorTracksBySource, setColorTracksBySource);
+  qtSettings_declare(QColor, eventSelectedColor, setEventSelectedColor);
+  qtSettings_declare(QColor, filteringMaskColor, setFilteringMaskColor);
+  qtSettings_declare(QColor, dataMinColor, setDataMinColor);
+  qtSettings_declare(QColor, dataMaxColor, setDataMaxColor);
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsTrackColorDialog.cxx b/Libraries/VspUserInterface/vsTrackColorDialog.cxx
new file mode 100644
index 00000000..f0fca74c
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTrackColorDialog.cxx
@@ -0,0 +1,285 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackColorDialog.h"
+#include "ui_trackColor.h"
+
+#include <limits>
+
+#include <qtUtil.h>
+#include <qtMap.h>
+
+#include <qtColorButtonItemWidget.h>
+#include <qtSpinBoxDelegate.h>
+
+#include <vtkVgTrack.h>
+#include <vvTrackInfo.h>
+
+#include "vsSettings.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void setColorFromTocType(
+  qtColorButton* penButton, qtColorButton* fgButton, qtColorButton* bgButton,
+  QLabel* label, vtkVgTrack::enumTrackPVOType type)
+{
+  vvTrackInfo ti(type);
+  penButton->setColor(ti.PenColor.toQColor());
+  fgButton->setColor(ti.ForegroundColor.toQColor());
+  bgButton->setColor(ti.BackgroundColor.toQColor());
+  if (label)
+    {
+    label->setText(ti.Name + ':');
+    }
+}
+
+//-----------------------------------------------------------------------------
+void saveTocTypeColor(
+  vtkVgTrack::enumTrackPVOType type, const QColor& penColor,
+  const QColor& foreColor, const QColor& backColor)
+{
+  vvTrackInfo ti(type);
+  ti.PenColor = penColor;
+  ti.ForegroundColor = foreColor;
+  ti.BackgroundColor = backColor;
+  ti.write();
+}
+
+} // namespace <anonymous>
+
+QTE_IMPLEMENT_D_FUNC(vsTrackColorDialog)
+
+//-----------------------------------------------------------------------------
+class vsTrackColorDialogPrivate
+{
+public:
+  Ui::vsTrackColorDialog UI;
+
+  void addTrackSource(QTreeWidgetItem* item);
+};
+
+//-----------------------------------------------------------------------------
+void vsTrackColorDialogPrivate::addTrackSource(QTreeWidgetItem* item)
+{
+  // Set common item attributes
+  item->setFlags(item->flags() | Qt::ItemIsEditable);
+  item->setTextAlignment(0, Qt::AlignRight | Qt::AlignVCenter);
+
+  // Add item to tree and create item widgets for colors (which will parent
+  // and assign themselves automatically)
+  this->UI.sourceColors->addTopLevelItem(item);
+  new qtColorButtonItemWidget(item, 1);
+  new qtColorButtonItemWidget(item, 2);
+  new qtColorButtonItemWidget(item, 3);
+}
+
+//-----------------------------------------------------------------------------
+vsTrackColorDialog::vsTrackColorDialog(QWidget* parent)
+  : QDialog(parent), d_ptr(new vsTrackColorDialogPrivate)
+{
+  QTE_D(vsTrackColorDialog);
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  // Get TOC colors
+#define SET_COLOR_FROM_TOC_TYPE(button, label, type) \
+  setColorFromTocType(button, button##Fore, button##Back, label, type)
+
+  SET_COLOR_FROM_TOC_TYPE(d->UI.defaultColor, 0, vtkVgTrack::Unclassified);
+  SET_COLOR_FROM_TOC_TYPE(d->UI.personColor,
+                          d->UI.personLabel, vtkVgTrack::Person);
+  SET_COLOR_FROM_TOC_TYPE(d->UI.vehicleColor,
+                          d->UI.vehicleLabel, vtkVgTrack::Vehicle);
+  SET_COLOR_FROM_TOC_TYPE(d->UI.otherColor,
+                          d->UI.otherLabel, vtkVgTrack::Other);
+
+  vsSettings settings;
+  d->UI.minimumColor->setColor(settings.dataMinColor());
+  d->UI.maximumColor->setColor(settings.dataMaxColor());
+
+  d->UI.colorBySource->setChecked(settings.colorTracksBySource());
+
+  // Get per-source colors
+  QList<vvTrackInfo> sourceInfo = vvTrackInfo::trackSources();
+  foreach (const vvTrackInfo& ti, sourceInfo)
+    {
+    QTreeWidgetItem* item = new QTreeWidgetItem;
+    item->setData(0, Qt::EditRole, ti.Source);
+    item->setData(1, Qt::EditRole, ti.PenColor.toQColor());
+    item->setData(2, Qt::EditRole, ti.ForegroundColor.toQColor());
+    item->setData(3, Qt::EditRole, ti.BackgroundColor.toQColor());
+
+    d->addTrackSource(item);
+    }
+
+  qtSpinBoxDelegate* const delegate = new qtSpinBoxDelegate(d->UI.sourceColors);
+  delegate->setRange(0, std::numeric_limits<int>::max());
+  delegate->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+  d->UI.sourceColors->setItemDelegateForColumn(0, delegate);
+
+  qtUtil::resizeColumnsToContents(d->UI.sourceColors);
+
+  connect(d->UI.addSource, SIGNAL(clicked()), this, SLOT(addSource()));
+  connect(d->UI.removeSource, SIGNAL(clicked()), this, SLOT(removeSources()));
+  connect(d->UI.sourceColors, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateSourceButtonsState()));
+}
+
+//-----------------------------------------------------------------------------
+vsTrackColorDialog::~vsTrackColorDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsTrackColorDialog::ColoringMode vsTrackColorDialog::mode() const
+{
+  QTE_D_CONST(vsTrackColorDialog);
+  return (d->UI.colorByToc->isChecked()   ? ColorByClassification :
+          d->UI.colorByData->isChecked()  ? ColorByDynamicData    :
+                                            SingleColor);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackColorDialog::setMode(vsTrackColorDialog::ColoringMode mode)
+{
+  QTE_D(vsTrackColorDialog);
+
+  switch (mode)
+    {
+    case ColorByClassification:
+      d->UI.colorByToc->setChecked(true);
+      break;
+    case ColorByDynamicData:
+      d->UI.colorByData->setChecked(true);
+      break;
+    case SingleColor:
+    default:
+      d->UI.singleColor->setChecked(true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vsTrackColorDialog::dynamicDataSet()
+{
+  QTE_D_CONST(vsTrackColorDialog);
+  return (d->UI.colorByData->isChecked()
+          ? d->UI.dataSet->currentText() : QString());
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackColorDialog::setDynamicDataSet(const QString& set)
+{
+  QTE_D(vsTrackColorDialog);
+  d->UI.dataSet->setCurrentIndex(d->UI.dataSet->findText(set));
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackColorDialog::setDynamicDataSets(const QStringList& sets)
+{
+  QTE_D(vsTrackColorDialog);
+
+  d->UI.dataSet->clear();
+
+  if (sets.isEmpty())
+    {
+    d->UI.colorByData->setEnabled(false);
+    }
+  else
+    {
+    d->UI.dataSet->insertItems(0, sets);
+    d->UI.colorByData->setEnabled(true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackColorDialog::accept()
+{
+  QTE_D(vsTrackColorDialog);
+
+  vsSettings settings;
+
+#define SAVE_TOC_TYPE_COLOR(type, button) \
+  saveTocTypeColor(type, button->color(), \
+                   button##Fore->color(), button##Back->color())
+
+  SAVE_TOC_TYPE_COLOR(vtkVgTrack::Unclassified, d->UI.defaultColor);
+
+  if (d->UI.colorByToc->isChecked())
+    {
+    SAVE_TOC_TYPE_COLOR(vtkVgTrack::Person,  d->UI.personColor);
+    SAVE_TOC_TYPE_COLOR(vtkVgTrack::Vehicle, d->UI.vehicleColor);
+    SAVE_TOC_TYPE_COLOR(vtkVgTrack::Other,   d->UI.otherColor);
+    }
+  else if (d->UI.colorByData->isChecked())
+    {
+    settings.setDataMinColor(d->UI.minimumColor->color());
+    settings.setDataMaxColor(d->UI.maximumColor->color());
+    }
+
+  settings.setColorTracksBySource(d->UI.colorBySource->isChecked());
+  if (d->UI.colorBySource->isChecked())
+    {
+    // Get collection of sources that were previously saved
+    QSet<int> removedSources;
+    foreach (const vvTrackInfo& ti, vvTrackInfo::trackSources())
+      {
+      removedSources.insert(ti.Source);
+      }
+
+    // Write new sources
+    foreach_child (QTreeWidgetItem* const item,
+                   d->UI.sourceColors->invisibleRootItem())
+      {
+      vvTrackInfo ti;
+      ti.Source = item->data(0, Qt::EditRole).toInt();
+      ti.PenColor = item->data(1, Qt::EditRole).value<QColor>();
+      ti.ForegroundColor = item->data(2, Qt::EditRole).value<QColor>();
+      ti.BackgroundColor = item->data(3, Qt::EditRole).value<QColor>();
+      ti.write();
+      removedSources.remove(ti.Source);
+      }
+
+    // Remove configuration for any sources that the user deleted
+    qtUtil::map(removedSources, &vvTrackInfo::eraseTrackSource);
+    }
+
+  settings.commit();
+
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackColorDialog::addSource()
+{
+  QTE_D(vsTrackColorDialog);
+
+  QTreeWidgetItem* item = new QTreeWidgetItem;
+  item->setData(0, Qt::EditRole, 1);
+  item->setData(1, Qt::EditRole, d->UI.defaultColor->color());
+  item->setData(2, Qt::EditRole, d->UI.defaultColorFore->color());
+  item->setData(3, Qt::EditRole, d->UI.defaultColorBack->color());
+
+  d->addTrackSource(item);
+  qtUtil::resizeColumnsToContents(d->UI.sourceColors);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackColorDialog::removeSources()
+{
+  QTE_D(vsTrackColorDialog);
+  qDeleteAll(d->UI.sourceColors->selectedItems());
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackColorDialog::updateSourceButtonsState()
+{
+  QTE_D(vsTrackColorDialog);
+
+  const bool canRemove = d->UI.sourceColors->selectedItems().count();
+  d->UI.removeSource->setEnabled(canRemove);
+}
diff --git a/Libraries/VspUserInterface/vsTrackColorDialog.h b/Libraries/VspUserInterface/vsTrackColorDialog.h
new file mode 100644
index 00000000..a389e67c
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTrackColorDialog.h
@@ -0,0 +1,54 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackColorDialog_h
+#define __vsTrackColorDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class vsTrackColorDialogPrivate;
+
+class vsTrackColorDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  enum ColoringMode
+    {
+    SingleColor,
+    ColorByClassification,
+    ColorByDynamicData
+    };
+
+  vsTrackColorDialog(QWidget* parent = 0);
+  ~vsTrackColorDialog();
+
+  ColoringMode mode() const;
+  void setMode(ColoringMode);
+
+  QString dynamicDataSet();
+  void setDynamicDataSet(const QString&);
+  void setDynamicDataSets(const QStringList&);
+
+public slots:
+  virtual void accept();
+
+  void addSource();
+  void removeSources();
+
+  void updateSourceButtonsState();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsTrackColorDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vsTrackColorDialog)
+  Q_DISABLE_COPY(vsTrackColorDialog)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsTrackTreeModel.cxx b/Libraries/VspUserInterface/vsTrackTreeModel.cxx
new file mode 100644
index 00000000..9980c25b
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTrackTreeModel.cxx
@@ -0,0 +1,423 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackTreeModel.h"
+
+#include <QDebug>
+#include <QPalette>
+
+#include <vgSwatchCache.h>
+#include <vgUnixTime.h>
+
+#include <vtkVgTrack.h>
+#include <vtkVgTrackFilter.h>
+#include <vtkVgTypeDefs.h>
+
+#include <algorithm>
+#include <vector>
+
+#include "vsCore.h"
+#include "vsScene.h"
+
+//-----------------------------------------------------------------------------
+vsTrackTreeModel::vsTrackTreeModel(
+  vsCore* core, vsScene* scene, vtkVgTrackFilter* trackFilter,
+  QObject* parent)
+  : QAbstractItemModel(parent), Core(core), Scene(scene),
+    trackFilter(trackFilter), swatchCache(core->swatchCache()),
+    isSorted(true)
+{
+  connect(scene, SIGNAL(trackSceneUpdated()), this, SLOT(update()));
+}
+
+//-----------------------------------------------------------------------------
+vsTrackTreeModel::~vsTrackTreeModel()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vsTrackTreeModel::columnCount(const QModelIndex& /*parent*/) const
+{
+  return NumColumns;
+}
+
+//-----------------------------------------------------------------------------
+Qt::ItemFlags vsTrackTreeModel::flags(const QModelIndex& index) const
+{
+  if (!index.isValid())
+    return 0;
+
+  return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+}
+
+//-----------------------------------------------------------------------------
+QVariant vsTrackTreeModel::data(const QModelIndex& index, int role) const
+{
+  if (!index.isValid())
+    return QVariant();
+
+  vtkVgTrack* track = this->tracks[index.row()];
+  switch (role)
+    {
+    case Qt::DisplayRole:
+      switch (index.column())
+        {
+        case IdColumn:
+          return track->GetId();
+
+        case NameColumn:
+          return track->GetName();
+
+        case TrackTypeColumn:
+          {
+          int type = this->trackFilter->GetBestClassifier(track);
+          switch (type)
+            {
+            case vtkVgTrack::Person:       return "Person";
+            case vtkVgTrack::Vehicle:      return "Vehicle";
+            case vtkVgTrack::Other:        return "Other";
+            case vtkVgTrack::Unclassified: return "Unclassified";
+            }
+          return "(none)";
+          }
+
+        case ProbabilityColumn:
+          {
+          int type = this->trackFilter->GetBestClassifier(track);
+
+          double probability;
+          if (type == -1 || type == vtkVgTrack::Unclassified)
+            {
+            probability = 0.0;
+            }
+          else
+            {
+            probability = track->GetPVO()[type];
+            }
+
+          return QString::number(probability, 'f', 4);
+          }
+
+        case StartTimeColumn:
+          return vgUnixTime(track->GetStartFrame().GetTime()).timeString();
+
+        case EndTimeColumn:
+          return vgUnixTime(track->GetEndFrame().GetTime()).timeString();
+        }
+      break;
+
+    case Qt::DecorationRole:
+      if (index.column() == TrackTypeColumn)
+        {
+        int type = this->trackFilter->GetBestClassifier(track);
+        if (type == -1)
+          {
+          // If the track is filtered out, don't show a color swatch
+          return QVariant();
+          }
+        QColor color;
+        if (this->colorHelper)
+          {
+          color = this->colorHelper->color(track);
+          }
+        if (!color.isValid())
+          {
+          color = this->colors[type];
+          }
+        color.setAlphaF(this->isIndexHidden(index) ? 0.5 : 1.0);
+        return this->swatchCache.swatch(color);
+        }
+      break;
+
+    case Qt::ForegroundRole:
+      // Gray out filtered and hidden tracks
+      if (this->isIndexHidden(index))
+        return QPalette().brush(QPalette::Disabled, QPalette::WindowText);
+      break;
+
+    case Qt::TextAlignmentRole:
+      if (index.column() == ProbabilityColumn)
+        return QVariant(Qt::AlignRight | Qt::AlignVCenter);
+      break;
+
+    case Qt::ToolTipRole:
+      if (index.column() == TrackTypeColumn ||
+          index.column() == ProbabilityColumn)
+        {
+        double PVO[3];
+        track->GetPVO(PVO);
+
+        QString tooltip = "P:%1, V:%2, O:%3";
+
+        return tooltip.arg(PVO[0], 0, 'f', 2)
+                      .arg(PVO[1], 0, 'f', 2)
+                      .arg(PVO[2], 0, 'f', 2);
+        }
+      break;
+
+    case LogicalIdRole:
+      return QVariant::fromValue(
+               this->Core->logicalTrackId(track->GetId()));
+
+    case DisplayStateRole:
+      return this->Scene->trackDisplayState(track->GetId());
+    }
+
+  return QVariant();
+}
+
+//-----------------------------------------------------------------------------
+QVariant vsTrackTreeModel::headerData(
+  int section, Qt::Orientation orientation, int role) const
+{
+  if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+    {
+    switch (static_cast<ModelColumn>(section))
+      {
+      case NameColumn:        return "Id";
+      case TrackTypeColumn:   return "Track Type";
+      case ProbabilityColumn: return "Probability";
+      case StartTimeColumn:   return "Start Time";
+      case EndTimeColumn:     return "End Time";
+      default: break;
+      }
+    }
+
+  return QVariant();
+}
+
+//-----------------------------------------------------------------------------
+bool vsTrackTreeModel::setData(
+  const QModelIndex& index, const QVariant& value, int role)
+{
+  if (!index.isValid())
+    return false;
+
+  switch (role)
+    {
+    default:
+      return false;
+
+    case DisplayStateRole:
+      this->setTrackDisplayState(index, value.toBool());
+      break;
+    }
+
+  emit this->dataChanged(index, index);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+QModelIndex vsTrackTreeModel::index(
+  int row, int column, const QModelIndex& parent) const
+{
+  if (!this->hasIndex(row, column, parent))
+    return QModelIndex();
+
+  return this->createIndex(row, column);
+}
+
+//-----------------------------------------------------------------------------
+QModelIndex vsTrackTreeModel::parent(const QModelIndex& /*index*/) const
+{
+  return QModelIndex();
+}
+
+//-----------------------------------------------------------------------------
+int vsTrackTreeModel::rowCount(const QModelIndex& parent) const
+{
+  if (parent.column() > 0)
+    return 0;
+
+  if (!parent.isValid())
+    return this->tracks.size();
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::addTrack(vtkVgTrack* track)
+{
+  if (this->addedTracks.isEmpty())
+    {
+    QMetaObject::invokeMethod(this, "deferredAddTracks",
+                              Qt::QueuedConnection);
+    }
+  this->addedTracks.insert(track->GetId(), track);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::deferredAddTracks()
+{
+  if (this->addedTracks.isEmpty())
+    {
+    return;
+    }
+
+  int count = this->addedTracks.count();
+  int row = this->rowCount();
+  this->beginInsertRows(QModelIndex(), row, row + count - 1);
+
+  typedef QMap<vtkIdType, vtkVgTrack*>::const_iterator Iterator;
+  foreach_iter (Iterator, iter, this->addedTracks)
+    {
+    vtkVgTrack* prev = this->tracks.isEmpty() ? 0 : this->tracks.back();
+    this->tracks.append(iter.value());
+
+    // Check if ordering has been violated. We assume the id of a track will
+    // not change once it has been added, so this check should be sufficient.
+    if (prev && this->isSorted && iter.key() < prev->GetId())
+      {
+      this->isSorted = false;
+      qWarning() << "Track tree ids are not in sorted order, "
+                    "falling back to linear search";
+      }
+    }
+
+  this->addedTracks.clear();
+  this->endInsertRows();
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::updateTrack(vtkVgTrack* track)
+{
+  if (this->updatedTracks.isEmpty())
+    {
+    QMetaObject::invokeMethod(this, "deferredUpdateTracks",
+                              Qt::QueuedConnection);
+    }
+
+  this->updatedTracks.append(track);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::deferredUpdateTracks()
+{
+  bool changed = false;
+  int minRow = this->rowCount() - 1;
+  int maxRow = 0;
+
+  // Update track pointers and compute the model rows covered by the tracks
+  foreach (vtkVgTrack* track, this->updatedTracks)
+    {
+    QModelIndex index = this->indexOfTrack(track->GetId());
+    if (!index.isValid())
+      {
+      continue;
+      }
+
+    changed = true;
+    const int row = index.row();
+    this->tracks[row] = track;
+
+    minRow = qMin(row, minRow);
+    maxRow = qMax(row, maxRow);
+    }
+
+  this->updatedTracks.clear();
+
+  if (changed)
+    {
+    emit this->dataChanged(this->index(minRow, 0),
+                           this->index(maxRow, NumColumns - 1));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::removeTrack(vtkIdType trackId)
+{
+  // Check if the track is still waiting to be added
+  if (this->addedTracks.remove(trackId))
+    {
+    // Yes; nothing to do besides removing it from pending additions
+    return;
+    }
+
+  QModelIndex index = this->indexOfTrack(trackId);
+  if (index.isValid())
+    {
+    int row = index.row();
+    this->beginRemoveRows(QModelIndex(), row, row);
+    this->tracks.removeAt(row);
+    this->endRemoveRows();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::update()
+{
+  // If the track model has been updated, conservatively assume that every
+  // track has been modified
+  emit this->dataChanged(this->index(0, 0),
+                         this->index(this->rowCount() - 1, NumColumns - 1));
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::setTrackDisplayState(
+  const QModelIndex& index, bool show)
+{
+  if (index.column() != 0)
+    return;
+
+  const vtkIdType trackId = this->tracks[index.row()]->GetId();
+  this->Scene->setTrackDisplayState(trackId, show);
+}
+
+//-----------------------------------------------------------------------------
+bool vsTrackTreeModel::isIndexHidden(const QModelIndex& index) const
+{
+  vtkVgTrack* track = this->tracks[index.row()];
+  return !this->Scene->trackVisibility(track->GetId());
+}
+
+//-----------------------------------------------------------------------------
+struct compareTrackIds
+{
+  bool operator()(vtkVgTrack* a, vtkIdType b)
+    { return a->GetId() < b; }
+  bool operator()(vtkIdType a, vtkVgTrack* b)
+    { return a < b->GetId(); }
+};
+
+//-----------------------------------------------------------------------------
+QModelIndex vsTrackTreeModel::indexOfTrack(vtkIdType trackId) const
+{
+  if (this->isSorted)
+    {
+    // We can do binary search
+    const QList<vtkVgTrack*>::const_iterator iter =
+      qBinaryFind(this->tracks.constBegin(), this->tracks.constEnd(),
+                  trackId, compareTrackIds());
+    if (iter != this->tracks.constEnd())
+      {
+      return this->index(iter - this->tracks.constBegin(), 0);
+      }
+    }
+  else
+    {
+    // Not sorted by id, fall back to linear search
+    for (int i = 0, k = this->tracks.count(); i < k; ++i)
+      {
+      if (this->tracks[i]->GetId() == trackId)
+        return this->index(i, 0);
+      }
+    }
+
+  qDebug() << "Track" << trackId << "not found in tree";
+  return QModelIndex();
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::setColor(int type, const QColor& color)
+{
+  this->colors[type] = color;
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeModel::setColorHelper(vsTrackTreeColorHelper* helper)
+{
+  this->colorHelper = helper;
+}
diff --git a/Libraries/VspUserInterface/vsTrackTreeModel.h b/Libraries/VspUserInterface/vsTrackTreeModel.h
new file mode 100644
index 00000000..430640bd
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTrackTreeModel.h
@@ -0,0 +1,124 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackTreeModel_h
+#define __vsTrackTreeModel_h
+
+#include <QAbstractItemModel>
+
+#include <vtkSmartPointer.h>
+
+#include <vvTrack.h>
+
+class QColor;
+class QPixmap;
+
+class vgSwatchCache;
+
+class vtkVgTrack;
+class vtkVgTrackFilter;
+
+class vsCore;
+class vsScene;
+
+class vsTrackTreeColorHelper
+{
+public:
+  virtual ~vsTrackTreeColorHelper() {}
+  virtual QColor color(vtkVgTrack*) = 0;
+};
+
+class vsTrackTreeModel : public QAbstractItemModel
+{
+  Q_OBJECT
+
+public:
+  enum ModelColumn
+    {
+    NameColumn,
+    TrackTypeColumn,
+    ProbabilityColumn,
+    StartTimeColumn,
+    EndTimeColumn,
+    IdColumn // not displayed
+    };
+
+  enum { NumColumns = IdColumn + 1 };
+
+  enum DataRole
+    {
+    LogicalIdRole = Qt::UserRole + 1,
+    DisplayStateRole
+    };
+
+public:
+  vsTrackTreeModel(vsCore* core, vsScene* scene, vtkVgTrackFilter* trackFilter,
+                   QObject* parent = 0);
+  virtual ~vsTrackTreeModel();
+
+  // Reimplemented from QAbstractItemModel
+  virtual Qt::ItemFlags flags(const QModelIndex& index) const;
+
+  virtual QVariant data(const QModelIndex& index, int role) const;
+
+  virtual QVariant headerData(int section, Qt::Orientation orientation,
+                              int role = Qt::DisplayRole) const;
+
+  virtual bool setData(const QModelIndex& index, const QVariant& value,
+                       int role);
+
+  virtual QModelIndex index(int row, int column,
+                            const QModelIndex& parent = QModelIndex()) const;
+
+  virtual QModelIndex parent(const QModelIndex& index) const;
+
+  virtual int rowCount(const QModelIndex& parent = QModelIndex()) const;
+  virtual int columnCount(const QModelIndex& parent = QModelIndex()) const;
+
+  bool isIndexHidden(const QModelIndex& index) const;
+
+  QModelIndex indexOfTrack(vtkIdType trackId) const;
+
+  void setColor(int type, const QColor& color);
+  void setColorHelper(vsTrackTreeColorHelper*);
+
+public slots:
+  void addTrack(vtkVgTrack* track);
+  void updateTrack(vtkVgTrack* track);
+  void removeTrack(vtkIdType trackId);
+  void update();
+
+protected:
+  void setTrackDisplayState(const QModelIndex& index, bool show);
+
+  QPixmap colorSwatch(const QColor&) const;
+
+protected slots:
+  void deferredAddTracks();
+  void deferredUpdateTracks();
+
+private:
+  Q_DISABLE_COPY(vsTrackTreeModel)
+
+  vsCore* Core;
+  vsScene* Scene;
+  vtkSmartPointer<vtkVgTrackFilter> trackFilter;
+
+  const vgSwatchCache& swatchCache;
+
+  vsTrackTreeColorHelper* colorHelper;
+
+  QList<vtkVgTrack*> tracks;
+  QMap<vtkIdType, vtkVgTrack*> addedTracks;
+  QList<vtkVgTrack*> updatedTracks;
+  QMap<int, QColor> colors;
+
+  bool isSorted;
+};
+
+Q_DECLARE_METATYPE(vvTrackId)
+
+#endif
diff --git a/Libraries/VspUserInterface/vsTrackTreeView.cxx b/Libraries/VspUserInterface/vsTrackTreeView.cxx
new file mode 100644
index 00000000..41b2d7a6
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTrackTreeView.cxx
@@ -0,0 +1,298 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackTreeView.h"
+
+#include <QSortFilterProxyModel>
+
+#include "vsTrackTreeModel.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+class vsSortFilterProxyModel : public QSortFilterProxyModel
+{
+protected:
+  virtual bool lessThan(const QModelIndex& left, const QModelIndex& right) const
+    {
+    if (left.column() == vsTrackTreeModel::NameColumn &&
+        right.column() == vsTrackTreeModel::NameColumn)
+      {
+      const QVariant ad =
+        left.model()->data(left, vsTrackTreeModel::LogicalIdRole);
+      const QVariant bd =
+        right.model()->data(right, vsTrackTreeModel::LogicalIdRole);
+      const vvTrackId a = ad.value<vvTrackId>();
+      const vvTrackId b = bd.value<vvTrackId>();
+      return (a.Source == b.Source ? a.SerialNumber < b.SerialNumber
+                                   : a.Source < b.Source);
+      }
+
+    return QSortFilterProxyModel::lessThan(left, right);
+    }
+};
+
+//-----------------------------------------------------------------------------
+class DisableSort
+{
+  QSortFilterProxyModel* Model;
+
+public:
+  DisableSort(QSortFilterProxyModel* model) : Model(model)
+    {
+    this->Model->setDynamicSortFilter(false);
+    }
+
+  ~DisableSort()
+    {
+    this->Model->setDynamicSortFilter(false);
+    }
+};
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vsTrackTreeView::vsTrackTreeView(QWidget* p)
+  : QTreeView(p), showHiddenItems(true)
+{
+  connect(this, SIGNAL(activated(const QModelIndex&)),
+          this, SLOT(itemActivated(const QModelIndex&)));
+}
+
+//-----------------------------------------------------------------------------
+vsTrackTreeView::~vsTrackTreeView()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::setModel(QAbstractItemModel* m)
+{
+  vsTrackTreeModel* tm = qobject_cast<vsTrackTreeModel*>(m);
+  if (!tm)
+    return;
+
+  // NOTE: Caller is responsible for deleting any prior model
+  this->trackTreeModel = tm;
+
+  this->proxyModel.reset(new vsSortFilterProxyModel);
+  this->proxyModel->setSourceModel(this->trackTreeModel);
+  this->proxyModel->setDynamicSortFilter(false);
+
+  QAbstractItemModel* old = this->model();
+  this->QTreeView::setModel(this->proxyModel.data());
+  delete old;
+
+  this->setColumnHidden(vsTrackTreeModel::IdColumn, true);
+  this->setColumnWidth(vsTrackTreeModel::NameColumn, 50);
+  this->setColumnWidth(vsTrackTreeModel::StartTimeColumn, 80);
+  this->setColumnWidth(vsTrackTreeModel::EndTimeColumn, 80);
+  this->sortByColumn(vsTrackTreeModel::NameColumn, Qt::AscendingOrder);
+  this->setSortingEnabled(true);
+
+  connect(this->proxyModel.data(),
+          SIGNAL(rowsInserted(const QModelIndex&, int, int)),
+          this,
+          SLOT(updateRows(const QModelIndex&, int, int)));
+
+  connect(this->proxyModel.data(),
+          SIGNAL(dataChanged(const QModelIndex&, const QModelIndex&)),
+          this,
+          SLOT(updateRows(const QModelIndex&, const QModelIndex&)));
+}
+
+//-----------------------------------------------------------------------------
+int vsTrackTreeView::selectedTrackCount()
+{
+  if (this->selectionModel())
+    return this->selectionModel()->selectedRows().count();
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::selectionChanged(const QItemSelection& selected,
+                                       const QItemSelection& deselected)
+{
+  QList<vtkIdType> selectedIds;
+  foreach (QModelIndex i, this->selectionModel()->selectedRows())
+    {
+    selectedIds << this->trackIdFromIndex(i);
+    }
+
+  emit this->selectionChanged(selectedIds);
+  QTreeView::selectionChanged(selected, deselected);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::itemActivated(const QModelIndex& index)
+{
+  bool toEnd = (index.column() == vsTrackTreeModel::EndTimeColumn);
+  emit this->jumpToTrack(this->trackIdFromIndex(index), toEnd);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::hideSelectedItems()
+{
+  DisableSort ds(this->proxyModel.data());
+
+  QModelIndexList selected = this->selectionModel()->selectedRows();
+  foreach (QModelIndex i, selected)
+    {
+    this->trackTreeModel->setData(
+      this->proxyModel->mapToSource(i), false,
+      vsTrackTreeModel::DisplayStateRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::showSelectedItems()
+{
+  DisableSort ds(this->proxyModel.data());
+
+  QModelIndexList selected = this->selectionModel()->selectedRows();
+  foreach (QModelIndex i, selected)
+    {
+    this->trackTreeModel->setData(
+      this->proxyModel->mapToSource(i), true,
+      vsTrackTreeModel::DisplayStateRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::jumpToSelectedStart()
+{
+  QModelIndex index = this->selectionModel()->selectedRows().front();
+  emit this->jumpToTrack(trackIdFromIndex(index), false);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::jumpToSelectedEnd()
+{
+  QModelIndex index = this->selectionModel()->selectedRows().front();
+  emit this->jumpToTrack(trackIdFromIndex(index), true);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::followSelectedTrack()
+{
+  QModelIndex index = this->selectionModel()->selectedRows().front();
+  emit this->trackFollowingRequested(trackIdFromIndex(index));
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::hideAllItems()
+{
+  DisableSort ds(this->proxyModel.data());
+
+  for (int i = 0, end = this->proxyModel->rowCount(); i < end; ++i)
+    {
+    QModelIndex idx =
+      this->proxyModel->mapToSource(this->proxyModel->index(i, 0));
+
+    this->trackTreeModel->setData(idx, false,
+                                  vsTrackTreeModel::DisplayStateRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::showAllItems()
+{
+  DisableSort ds(this->proxyModel.data());
+
+  for (int i = 0, end = this->proxyModel->rowCount(); i < end; ++i)
+    {
+    QModelIndex idx =
+      this->proxyModel->mapToSource(this->proxyModel->index(i, 0));
+
+    this->trackTreeModel->setData(idx, true,
+                                  vsTrackTreeModel::DisplayStateRole);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::setHiddenItemsShown(bool enable)
+{
+  if (enable == this->showHiddenItems)
+    return;
+
+  this->showHiddenItems = enable;
+
+  if (!this->proxyModel)
+    {
+    return;
+    }
+
+  for (int i = 0, end = this->proxyModel->rowCount(); i < end; ++i)
+    {
+    QModelIndex idx =
+      this->proxyModel->mapToSource(this->proxyModel->index(i, 0));
+
+    if (this->trackTreeModel->isIndexHidden(idx))
+      this->setRowHidden(i, QModelIndex(), !enable);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::updateRows(const QModelIndex& start,
+                                 const QModelIndex& end)
+{
+  this->updateRows(QModelIndex(), start.row(), end.row());
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::updateRows(
+  const QModelIndex& parent, int start, int end)
+{
+  for (int i = start; i <= end; ++i)
+    {
+    QModelIndex pidx = this->proxyModel->index(i, 0, parent);
+    QModelIndex idx = this->proxyModel->mapToSource(pidx);
+
+    bool hide;
+    if (this->trackTreeModel->isIndexHidden(idx))
+      {
+      hide = !this->showHiddenItems ;
+      }
+    else
+      {
+      hide = false;
+      }
+
+    if (this->isRowHidden(i, parent) != hide)
+      {
+      this->setRowHidden(i, parent, hide);
+
+      // Unselect hidden rows
+      if (hide)
+        {
+        this->selectionModel()->select(pidx, QItemSelectionModel::Rows |
+                                             QItemSelectionModel::Deselect);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeView::selectTrack(vtkIdType trackId)
+{
+  QModelIndex index = this->trackTreeModel->indexOfTrack(trackId);
+  index = this->proxyModel->mapFromSource(index);
+
+  if (!index.isValid() || this->isRowHidden(index.row(), QModelIndex()))
+    return;
+
+  this->selectionModel()->setCurrentIndex(index,
+                                          QItemSelectionModel::ClearAndSelect |
+                                          QItemSelectionModel::Rows);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vsTrackTreeView::trackIdFromIndex(const QModelIndex& index)
+{
+  return this->model()->data(
+           this->model()->index(
+             index.row(), vsTrackTreeModel::IdColumn)).value<vtkIdType>();
+}
diff --git a/Libraries/VspUserInterface/vsTrackTreeView.h b/Libraries/VspUserInterface/vsTrackTreeView.h
new file mode 100644
index 00000000..bc019315
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTrackTreeView.h
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackTreeView_h
+#define __vsTrackTreeView_h
+
+#include <QTreeView>
+
+#include <vtkType.h>
+
+#include <vtkVgTypeDefs.h>
+
+class vsTrackTreeModel;
+
+class QSortFilterProxyModel;
+
+class vsTrackTreeView : public QTreeView
+{
+  Q_OBJECT
+
+public:
+  vsTrackTreeView(QWidget* parent = 0);
+  virtual ~vsTrackTreeView();
+
+  int selectedTrackCount();
+
+  // Reimplemented from QWidget
+  virtual void setModel(QAbstractItemModel* m);
+
+signals:
+  void jumpToTrack(vtkIdType trackId, bool jumpToEnd);
+  void selectionChanged(QList<vtkIdType> selectedEventIds);
+  void trackFollowingRequested(vtkIdType trackId);
+
+public slots:
+  void hideAllItems();
+  void showAllItems();
+  void setHiddenItemsShown(bool enable);
+
+  void hideSelectedItems();
+  void showSelectedItems();
+
+  void selectTrack(vtkIdType trackId);
+
+  void jumpToSelectedStart();
+  void jumpToSelectedEnd();
+  void followSelectedTrack();
+
+protected slots:
+  void itemActivated(const QModelIndex& index);
+
+  void updateRows(const QModelIndex& parent, int start, int end);
+  void updateRows(const QModelIndex& start, const QModelIndex& end);
+
+protected:
+  virtual void selectionChanged(const QItemSelection&, const QItemSelection&);
+
+  vtkIdType trackIdFromIndex(const QModelIndex& index);
+
+private:
+  Q_DISABLE_COPY(vsTrackTreeView)
+
+  vsTrackTreeModel* trackTreeModel;
+  QScopedPointer<QSortFilterProxyModel> proxyModel;
+
+  bool showHiddenItems;
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsTrackTreeWidget.cxx b/Libraries/VspUserInterface/vsTrackTreeWidget.cxx
new file mode 100644
index 00000000..dfe8226f
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTrackTreeWidget.cxx
@@ -0,0 +1,122 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackTreeWidget.h"
+
+#include <QContextMenuEvent>
+#include <QMenu>
+
+#include "vsTrackTreeModel.h"
+
+//-----------------------------------------------------------------------------
+vsTrackTreeWidget::vsTrackTreeWidget(QWidget* parent) : QWidget(parent)
+{
+  this->UI.setupUi(this);
+  this->AM.setupActions(this->UI, this);
+
+  // Add all actions as actions of this widget, so shortcuts will work
+  foreach (QObject* object, this->children())
+    {
+    QAction* action = qobject_cast<QAction*>(object);
+    if (action)
+      this->addAction(action);
+    }
+
+  connect(this->UI.actionHideAll, SIGNAL(triggered()),
+          this->UI.tree, SLOT(hideAllItems()));
+  connect(this->UI.actionShowAll, SIGNAL(triggered()),
+          this->UI.tree, SLOT(showAllItems()));
+  connect(this->UI.actionHideSelected, SIGNAL(triggered()),
+          this->UI.tree, SLOT(hideSelectedItems()));
+  connect(this->UI.actionShowSelected, SIGNAL(triggered()),
+          this->UI.tree, SLOT(showSelectedItems()));
+
+  // Connect signal and slot and sync GUI state with underlying model state
+  connect(this->UI.actionShowHiddenItems, SIGNAL(toggled(bool)),
+          this->UI.tree, SLOT(setHiddenItemsShown(bool)));
+
+  this->UI.tree->setHiddenItemsShown(
+    this->UI.actionShowHiddenItems->isChecked());
+
+  connect(this->UI.actionJumpToStart, SIGNAL(triggered()),
+          this->UI.tree, SLOT(jumpToSelectedStart()));
+  connect(this->UI.actionJumpToEnd, SIGNAL(triggered()),
+          this->UI.tree, SLOT(jumpToSelectedEnd()));
+  connect(this->UI.actionFollowTrack, SIGNAL(triggered()),
+          this->UI.tree, SLOT(followSelectedTrack()));
+
+  connect(this->UI.tree, SIGNAL(selectionChanged(QList<vtkIdType>)),
+          this, SLOT(setActionsEnabled()));
+
+  connect(this->UI.tree, SIGNAL(selectionChanged(QList<vtkIdType>)),
+          this, SIGNAL(selectionChanged(QList<vtkIdType>)));
+
+  connect(this->UI.tree, SIGNAL(jumpToTrack(vtkIdType, bool)),
+          this, SIGNAL(jumpToTrack(vtkIdType, bool)));
+
+  connect(this->UI.tree, SIGNAL(trackFollowingRequested(vtkIdType)),
+          this, SIGNAL(trackFollowingRequested(vtkIdType)));
+
+  connect(this->UI.actionStopFollowingTrack, SIGNAL(triggered()),
+          this, SIGNAL(trackFollowingCanceled()));
+
+  this->contextMenu = new QMenu(this);
+  this->contextMenu->addAction(this->UI.actionShowSelected);
+  this->contextMenu->addAction(this->UI.actionHideSelected);
+  this->contextMenu->addAction(this->UI.actionJumpToStart);
+  this->contextMenu->addAction(this->UI.actionJumpToEnd);
+  this->contextMenu->addAction(this->UI.actionFollowTrack);
+  this->contextMenu->addAction(this->UI.actionStopFollowingTrack);
+
+  this->setActionsEnabled();
+}
+
+//-----------------------------------------------------------------------------
+vsTrackTreeWidget::~vsTrackTreeWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeWidget::contextMenuEvent(QContextMenuEvent* event)
+{
+  if (this->UI.tree->isAncestorOf(this->childAt(event->pos())))
+    {
+    this->contextMenu->exec(event->globalPos());
+    return;
+    }
+
+  QWidget::contextMenuEvent(event);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeWidget::setModel(vsTrackTreeModel* model)
+{
+  this->UI.tree->setModel(model);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeWidget::selectTrack(vtkIdType trackId)
+{
+  this->UI.tree->selectTrack(trackId);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeWidget::setActionsEnabled()
+{
+  int count = this->UI.tree->selectedTrackCount();
+  this->UI.actionHideSelected->setEnabled(count > 0);
+  this->UI.actionShowSelected->setEnabled(count > 0);
+  this->UI.actionJumpToStart->setEnabled(count == 1);
+  this->UI.actionJumpToEnd->setEnabled(count == 1);
+  this->UI.actionFollowTrack->setEnabled(count == 1);
+  this->UI.actionStopFollowingTrack->setEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vsTrackTreeWidget::setHiddenItemsShown(bool enable)
+{
+  this->UI.actionShowHiddenItems->setChecked(enable);
+}
diff --git a/Libraries/VspUserInterface/vsTrackTreeWidget.h b/Libraries/VspUserInterface/vsTrackTreeWidget.h
new file mode 100644
index 00000000..694c2153
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTrackTreeWidget.h
@@ -0,0 +1,52 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackTreeWidget_h
+#define __vsTrackTreeWidget_h
+
+#include <QWidget>
+
+#include "ui_trackTree.h"
+#include "am_trackTree.h"
+
+class QMenu;
+
+class vsTrackTreeWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vsTrackTreeWidget(QWidget* parent);
+  ~vsTrackTreeWidget();
+
+  void setModel(vsTrackTreeModel*);
+  void setHiddenItemsShown(bool enable);
+
+  virtual void contextMenuEvent(QContextMenuEvent* event);
+
+signals:
+  void jumpToTrack(vtkIdType trackId, bool jumpToEnd);
+  void selectionChanged(QList<vtkIdType> selectedTrackIds);
+  void trackFollowingRequested(vtkIdType trackId);
+  void trackFollowingCanceled();
+
+public slots:
+  void selectTrack(vtkIdType trackId);
+
+protected slots:
+  void setActionsEnabled();
+
+protected:
+  Ui::vsTrackTreeWidget UI;
+  Am::vsTrackTreeWidget AM;
+
+  QMenu* contextMenu;
+
+private:
+  Q_DISABLE_COPY(vsTrackTreeWidget)
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsTripwireDescriptor.cxx b/Libraries/VspUserInterface/vsTripwireDescriptor.cxx
new file mode 100644
index 00000000..d37896ed
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTripwireDescriptor.cxx
@@ -0,0 +1,355 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTripwireDescriptor.h"
+
+#include <vtkPoints.h>
+
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTripWireManager.h>
+
+#include <vsContour.h>
+#include <vsEventInfo.h>
+#include <vsTrackState.h>
+#include <vtkVsTrackInfo.h>
+
+#include <vsLiveDescriptorPrivate.h>
+
+//BEGIN vsTripwireDescriptorPrivate
+
+//-----------------------------------------------------------------------------
+class vsTripwireDescriptorPrivate : public vsLiveDescriptorPrivate
+{
+public:
+  vsTripwireDescriptorPrivate(vsTripwireDescriptor*);
+  virtual ~vsTripwireDescriptorPrivate();
+
+protected:
+  virtual void run();
+
+  virtual void injectInput(qint64 id, vsDescriptorInputPtr input);
+  virtual void revokeInput(qint64 id, bool revokeEvents);
+  virtual void revokeAllInput(bool revokeEvents);
+
+  void addContour(qint64 id, const QPolygonF& points);
+  void updateTrack(const vvTrackId* id, const vsTrackState* state);
+  void processIntersections(
+    std::vector<vtkVgTripWireManager::IntersectionInfo>& intersections,
+    vtkVgTrack* track, const vvTrackId* id);
+  void emitEvent(
+    const vvTrackId& id, const vtkVgTimeStamp& startTime,
+    const vtkVgTimeStamp& endTime, double (&tripLocation)[3],
+    const vtkVgTimeStamp& tripTime, int classifierType);
+
+  vtkIdType NextTrackId;
+  vtkIdType NextEventId;
+  vtkVgTripWireManager* TripWireManager;
+  QHash<vvTrackId, vtkIdType> TrackModelIdMap;
+
+private:
+  QTE_DECLARE_PUBLIC(vsTripwireDescriptor)
+};
+
+//-----------------------------------------------------------------------------
+vsTripwireDescriptorPrivate::vsTripwireDescriptorPrivate(
+  vsTripwireDescriptor* q) :
+  vsLiveDescriptorPrivate(q), NextTrackId(0), NextEventId(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsTripwireDescriptorPrivate::~vsTripwireDescriptorPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsTripwireDescriptorPrivate::run()
+{
+  QTE_Q(vsTripwireDescriptor);
+
+  // Initialization
+  this->TripWireManager = vtkVgTripWireManager::New();
+  vtkVgTrackModel* trackModel = vtkVgTrackModel::New();
+  this->TripWireManager->SetTrackModel(trackModel);
+  trackModel->FastDelete();
+  this->TripWireManager->SetTripWireId(vsEventInfo::Tripwire);
+  this->TripWireManager->SetEnteringRegionId(vsEventInfo::EnteringRegion);
+  this->TripWireManager->SetExitingRegionId(vsEventInfo::ExitingRegion);
+
+  emit q->readyForInput(q);
+  vsLiveDescriptorPrivate::run();
+
+  // Cleanup
+  this->TripWireManager->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vsTripwireDescriptorPrivate::injectInput(
+  qint64 id, vsDescriptorInputPtr input)
+{
+  if (input->type() == vsDescriptorInput::TrackUpdate)
+    {
+    this->updateTrack(input->trackId(), input->trackState());
+    }
+  else
+    {
+    const vsContour* contour = input->contour();
+    if (contour && (contour->type() == vsContour::Tripwire))
+      {
+      this->addContour(id, contour->points());
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTripwireDescriptorPrivate::revokeInput(qint64 id, bool revokeEvents)
+{
+  vtkIdType vtkId = static_cast<vtkIdType>(id);
+  if (this->TripWireManager->IsTripWire(vtkId))
+    {
+    if (revokeEvents)
+      {
+      // \TODO revoke events associated with the specified contour
+      }
+
+    this->TripWireManager->RemoveTripWire(vtkId);
+    if (!this->TripWireManager->GetNumberOfTripWires())
+      this->setSuicideTimer(30000);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTripwireDescriptorPrivate::revokeAllInput(bool revokeEvents)
+{
+  if (revokeEvents)
+    {
+    // \TODO revoke all events
+    }
+  this->TripWireManager->RemoveAllTripWires();
+  this->setSuicideTimer(30000);
+}
+
+//-----------------------------------------------------------------------------
+void vsTripwireDescriptorPrivate::addContour(qint64 id, const QPolygonF& r)
+{
+  this->cancelSuicideTimer();
+  vtkIdType vtkId = static_cast<vtkIdType>(id);
+
+  // Convert (back) from QPolygonF... maybe not the most efficient way, but
+  // for thread safety, the vsDescriptorInput *must* have its own copy of the
+  // points
+  const bool closedLoop = r.isClosed();
+  vtkPoints* loopPts = vtkPoints::New();
+  loopPts->SetNumberOfPoints(r.count() - (closedLoop ? 1 : 0));
+  vtkIdType ptIndex = 0;
+  foreach (const QPointF& point, r)
+    {
+    loopPts->SetPoint(ptIndex++, point.x(), point.y(), 0.0);
+    if (ptIndex == loopPts->GetNumberOfPoints())
+      {
+      // If a closed loop, we don't want to add last point; we already handled
+      // setting number of points correctly, so stop if we've added last
+      // desired point
+      break;
+      }
+    }
+
+  // Add contour to the TripWireManager
+  vtkIdType tripWireId =
+    this->TripWireManager->AddTripWire(loopPts, closedLoop, vtkId);
+  loopPts->Delete();
+
+  // Process all known track information against the new region
+  std::vector<vtkVgTripWireManager::IntersectionInfo> intersections;
+  this->TripWireManager->CheckTripWire(tripWireId, intersections);
+  this->processIntersections(intersections, 0, 0);
+}
+
+//-----------------------------------------------------------------------------
+void vsTripwireDescriptorPrivate::updateTrack(
+  const vvTrackId* id, const vsTrackState* state)
+{
+  if (id && state)
+    {
+    // Get the relevant track (or start a new one)
+    vtkVgTrack* track;
+    vtkVgTrackModel* trackModel = this->TripWireManager->GetTrackModel();
+    if (this->TrackModelIdMap.contains(*id))
+      {
+      track = trackModel->GetTrack(this->TrackModelIdMap.value(*id));
+      }
+    else
+      {
+      // Track does not exist; assign a new model ID...
+      vtkIdType trackModelId = this->NextTrackId++;
+      this->TrackModelIdMap.insert(*id, trackModelId);
+
+      // Create a new track
+      track = vtkVgTrack::New();
+      track->SetId(trackModelId);
+      track->SetPoints(trackModel->GetPoints());
+      trackModel->AddTrack(track);
+      track->FastDelete();
+      }
+
+    // Add the new point to the track
+    double pt[3] = { state->point.x(), state->point.y(), 0.0 };
+    track->SetPoint(state->time, pt, vtkVgGeoCoord());
+
+    // Get previous point and use with current to check for a trip event
+    double previousPt[3];
+    vtkVgTimeStamp previousTimeStamp;
+    if (!track->GetPriorFramePt(state->time, previousPt, previousTimeStamp))
+      {
+      // No previous point; just return for now
+      // \TODO This doesn't handle out-of-order updates properly; should also
+      //       check against point after
+      return;
+      }
+
+    previousPt[2] = 0;
+    std::vector<vtkVgTripWireManager::IntersectionInfo> intersections;
+    this->TripWireManager->CheckTrackSegment(
+      previousPt, pt, previousTimeStamp, state->time, intersections);
+    this->processIntersections(intersections, track, id);
+
+    // \NOTE For performance, it would be best to calculate a bounding
+    //       box for the track segment, and compare that to the bounding box
+    //       (precomputed!) of each known region before progressing to a full
+    //       intersection test.
+    // \NOTE DO NOT assume that states will arrive in order; this should be
+    //       true at the moment, but is expected to change in the future. This
+    //       does mean that the arrival of a new segment could mean than an
+    //       event that was emitted previously should be revoked :-(. Possibly
+    //       this should be left as a FIXME in the initial implementation.
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTripwireDescriptorPrivate::processIntersections(
+  std::vector<vtkVgTripWireManager::IntersectionInfo>& intersections,
+  vtkVgTrack* track, const vvTrackId* id)
+{
+  if (!intersections.size())
+    {
+    return;
+    }
+
+  // Give event 3 second duration (frames assumes 30 fps)
+  vtkVgTimeStamp preTripDuration(3e6, 90);
+
+  vvTrackId tempId;
+  if (id)
+    {
+    tempId = *id;
+    }
+
+  // Process (emit events) any intersections
+  typedef std::vector<vtkVgTripWireManager::IntersectionInfo>::const_iterator
+    IntersectionIter;
+  foreach_iter (IntersectionIter, intersectionIter, intersections)
+    {
+    if (!id)
+      {
+      // If vvTrackId wasn't passed in, then need to set/get tempId and track
+      vtkIdType modelId = intersectionIter->TrackId;
+      tempId = this->TrackModelIdMap.key(modelId);
+      track = this->TripWireManager->GetTrackModel()->GetTrack(modelId);
+      }
+
+    // Right now, computing start time for the event regardless of whether
+    // entering/exiting or open trip wire
+    vtkVgTimeStamp startTime = intersectionIter->PostFrame;
+
+    // For now, preTripDuration measured from the point that caused the
+    // crossing, NOT where the intersection occurred (which we should maybe do
+    // at some point)
+    startTime.ShiftBackward(preTripDuration);
+    if (intersectionIter->PreFrame < startTime)
+      {
+      // If previous track point is more than preTripDuration "old", use it for
+      // the start
+      startTime = intersectionIter->PreFrame;
+      }
+    else if (startTime < track->GetStartFrame())
+      {
+      // If preTripDuration puts us before start of track, use start of
+      // track as start
+      startTime = track->GetStartFrame();
+      }
+
+    double tripLocation[3] = { intersectionIter->IntersectionPt[0],
+                               intersectionIter->IntersectionPt[1], 0.0 };
+
+    // If ClassifierType == -1, the segment that created the intersection has
+    // end points either both inside or both outside the trip wire, and thus we
+    // should create events for both
+    if (intersectionIter->ClassifierType == -1)
+      {
+      this->emitEvent(tempId, startTime, intersectionIter->PostFrame,
+                      tripLocation, intersectionIter->IntersectionTime,
+                      vsEventInfo::EnteringRegion);
+      this->emitEvent(tempId, startTime, intersectionIter->PostFrame,
+                      tripLocation, intersectionIter->IntersectionTime,
+                      vsEventInfo::ExitingRegion);
+      }
+    else
+      {
+      this->emitEvent(tempId, startTime, intersectionIter->PostFrame,
+                      tripLocation, intersectionIter->IntersectionTime,
+                      intersectionIter->ClassifierType);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsTripwireDescriptorPrivate::emitEvent(
+  const vvTrackId& trackId, const vtkVgTimeStamp& startTime,
+  const vtkVgTimeStamp& endTime, double (&tripLocation)[3],
+  const vtkVgTimeStamp& tripTime, int classifierType)
+{
+  vsEvent eventBase(QUuid::createUuid());
+  eventBase->SetId(this->NextEventId++);
+  eventBase->AddClassifier(classifierType, 1.0, 0.0);
+  vtkVsTrackInfo* ti = new vtkVsTrackInfo(trackId, startTime, endTime);
+  eventBase->AddTrack(ti);
+  eventBase->SetTripEventInfo(tripLocation, tripTime);
+  emit this->eventAvailable(eventBase);
+}
+
+
+//END vsTripwireDescriptorPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsTripwireDescriptor
+
+//-----------------------------------------------------------------------------
+vsTripwireDescriptor::vsTripwireDescriptor()
+  : vsLiveDescriptor(new vsTripwireDescriptorPrivate(this))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsTripwireDescriptor::~vsTripwireDescriptor()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsTripwireDescriptor::name() const
+{
+  return "tripwire";
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::Types vsTripwireDescriptor::inputAccepted() const
+{
+  return (vsDescriptorInput::TrackUpdate | vsDescriptorInput::Contour |
+          vsDescriptorSource::inputAccepted());
+}
+
+//END vsTripwireDescriptor
diff --git a/Libraries/VspUserInterface/vsTripwireDescriptor.h b/Libraries/VspUserInterface/vsTripwireDescriptor.h
new file mode 100644
index 00000000..20c0ba96
--- /dev/null
+++ b/Libraries/VspUserInterface/vsTripwireDescriptor.h
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTripwireDescriptor_h
+#define __vsTripwireDescriptor_h
+
+#include <vsLiveDescriptor.h>
+
+class vsTripwireDescriptorPrivate;
+
+class vsTripwireDescriptor : public vsLiveDescriptor
+{
+  Q_OBJECT
+
+public:
+  vsTripwireDescriptor();
+  virtual ~vsTripwireDescriptor();
+
+  virtual vsDescriptorInput::Types inputAccepted() const QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE(vsTripwireDescriptor)
+
+  virtual QString name() const;
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsUiExtensionInterface.cxx b/Libraries/VspUserInterface/vsUiExtensionInterface.cxx
new file mode 100644
index 00000000..98639909
--- /dev/null
+++ b/Libraries/VspUserInterface/vsUiExtensionInterface.cxx
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsUiExtensionInterface.h"
+
+QTE_IMPLEMENT_D_FUNC(vsUiExtensionInterface)
+
+//-----------------------------------------------------------------------------
+class vsUiExtensionInterfacePrivate
+{
+public:
+  vsCore* Core;
+};
+
+//-----------------------------------------------------------------------------
+vsUiExtensionInterface::vsUiExtensionInterface() :
+  d_ptr(new vsUiExtensionInterfacePrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsUiExtensionInterface::~vsUiExtensionInterface()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsUiExtensionInterface::initialize(vsCore* core)
+{
+  QTE_D(vsUiExtensionInterface);
+  d->Core = core;
+}
+
+//-----------------------------------------------------------------------------
+vsCore* vsUiExtensionInterface::core() const
+{
+  QTE_D_CONST(vsUiExtensionInterface);
+  return d->Core;
+}
+
+//-----------------------------------------------------------------------------
+void vsUiExtensionInterface::createInterface(
+  vsMainWindow* window, vsScene* scene)
+{
+  Q_UNUSED(window);
+  Q_UNUSED(scene);
+}
diff --git a/Libraries/VspUserInterface/vsUiExtensionInterface.h b/Libraries/VspUserInterface/vsUiExtensionInterface.h
new file mode 100644
index 00000000..71b6e76d
--- /dev/null
+++ b/Libraries/VspUserInterface/vsUiExtensionInterface.h
@@ -0,0 +1,74 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsUiExtensionInterface_h
+#define __vsUiExtensionInterface_h
+
+#include <QtPlugin>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class vsCore;
+class vsScene;
+class vsMainWindow;
+class vsMenuPlaceholder;
+class vsToolBarPlaceholder;
+
+class vsUiExtensionInterfacePrivate;
+
+//-----------------------------------------------------------------------------
+class VSP_USERINTERFACE_EXPORT vsUiExtensionInterface
+{
+public:
+  virtual ~vsUiExtensionInterface();
+
+  /// Initialize the extension.
+  ///
+  /// This method is used to perform any initialization of the plugin that
+  /// cannot be performed in the constructor (e.g. because it needs the vsCore
+  /// instance or otherwise depends on the application being already fully
+  /// initialized).
+  ///
+  /// \param core Pointer to the application vsCore instance.
+  ///
+  /// The default implementation merely stores the pointer to the vsCore
+  /// instance; it should be called by subclasses that wish to use core().
+  virtual void initialize(vsCore* core);
+
+  /// Create user interface for new main window.
+  ///
+  /// This method is called to request that the plugin create its user
+  /// interface elements for a new main window. Implementations should create
+  /// their menu actions, tool bar actions/widgets, dock windows, etc. and add
+  /// them to the main user interface.
+  ///
+  /// \param window New window object to which the extension interface should
+  ///               be added.
+  /// \param scene Scene associated with the window.
+  ///
+  /// The default implementation does nothing.
+  virtual void createInterface(vsMainWindow* window, vsScene* scene);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsUiExtensionInterface)
+
+  vsUiExtensionInterface();
+
+  /// Return pointer to the application vsCore instance, as passed to
+  /// initialize().
+  vsCore* core() const;
+
+private:
+  QTE_DECLARE_PRIVATE(vsUiExtensionInterface)
+  QTE_DISABLE_COPY(vsUiExtensionInterface)
+};
+
+Q_DECLARE_INTERFACE(vsUiExtensionInterface,
+                    "org.visgui.vsUiExtensionInterface")
+
+#endif
diff --git a/Libraries/VspUserInterface/vsVideoPlayerModel.cxx b/Libraries/VspUserInterface/vsVideoPlayerModel.cxx
new file mode 100644
index 00000000..4c9dd60b
--- /dev/null
+++ b/Libraries/VspUserInterface/vsVideoPlayerModel.cxx
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVideoPlayerModel.h"
+
+#include <vtkObjectFactory.h>
+
+#include "vsQfVideoSource.h"
+
+vtkStandardNewMacro(vsVideoPlayerModel);
+
+//-----------------------------------------------------------------------------
+vsVideoPlayerModel::vsVideoPlayerModel() : vvVideoPlayerModel()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVideoPlayerModel::~vsVideoPlayerModel()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vsVideoPlayerModel::Play()
+{
+  this->Superclass::Play();
+
+  vsQfVideoSource* src = vsQfVideoSource::SafeDownCast(this->GetVideoSource());
+  if (src)
+    {
+    src->Play();
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vsVideoPlayerModel::Pause()
+{
+  this->Superclass::Pause();
+
+  vsQfVideoSource* src = vsQfVideoSource::SafeDownCast(this->GetVideoSource());
+  if (src)
+    {
+    src->Pause();
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vsVideoPlayerModel::Stop()
+{
+  this->Superclass::Stop();
+
+  vsQfVideoSource* src = vsQfVideoSource::SafeDownCast(this->GetVideoSource());
+  if (src)
+    {
+    src->Stop();
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+void vsVideoPlayerModel::PrintSelf(ostream& vtkNotUsed(os),
+                                   vtkIndent vtkNotUsed(indent))
+{
+  // \TODO: Implement this.
+}
diff --git a/Libraries/VspUserInterface/vsVideoPlayerModel.h b/Libraries/VspUserInterface/vsVideoPlayerModel.h
new file mode 100644
index 00000000..4256c495
--- /dev/null
+++ b/Libraries/VspUserInterface/vsVideoPlayerModel.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVideoPlayerModel_h
+#define __vsVideoPlayerModel_h
+
+// VG includes.
+#include <vvVideoPlayerModel.h>
+
+class vsVideoPlayerModel : public vvVideoPlayerModel
+{
+  vtkVgClassMacro(vsVideoPlayerModel);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vsVideoPlayerModel, vvVideoPlayerModel);
+
+  static vsVideoPlayerModel* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Overridden functions.
+  virtual int Play();
+
+  virtual int Pause();
+
+  virtual int Stop();
+
+protected:
+  vsVideoPlayerModel();
+  virtual ~vsVideoPlayerModel();
+
+private:
+  vsVideoPlayerModel(const vsVideoPlayerModel&);
+  void operator=(const vsVideoPlayerModel&);
+};
+
+#endif
diff --git a/Libraries/VspUserInterface/vsp.ui b/Libraries/VspUserInterface/vsp.ui
new file mode 100644
index 00000000..17cf3ff4
--- /dev/null
+++ b/Libraries/VspUserInterface/vsp.ui
@@ -0,0 +1,1942 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1069</width>
+    <height>608</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Video Stream Player</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../../Icons/vsp.qrc">
+    <normaloff>:/icons/16x16/vsPlay</normaloff>:/icons/16x16/vsPlay</iconset>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <item row="0" column="0" colspan="4">
+     <widget class="QVTKWidget" name="renderFrame" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="0">
+     <widget class="QLabel" name="playbackMode">
+      <property name="minimumSize">
+       <size>
+        <width>32</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="text">
+       <string/>
+      </property>
+      <property name="textFormat">
+       <enum>Qt::RichText</enum>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="1">
+     <widget class="vgVideoScrubber" name="scrubber" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="2">
+     <widget class="QLabel" name="label">
+      <property name="text">
+       <string>Frame</string>
+      </property>
+     </widget>
+    </item>
+    <item row="1" column="3">
+     <widget class="vgFrameSpinBox" name="frame">
+      <property name="frame">
+       <bool>true</bool>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+      </property>
+      <property name="maximum">
+       <number>0</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menubar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>1069</width>
+     <height>26</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="menuVideo">
+    <property name="title">
+     <string>&amp;Video</string>
+    </property>
+    <widget class="QMenu" name="menuVideoResampling">
+     <property name="title">
+      <string>R&amp;esampling Mode</string>
+     </property>
+     <addaction name="actionVideoSampleNearest"/>
+     <addaction name="actionVideoSampleLinear"/>
+     <addaction name="actionVideoSampleBicubic"/>
+    </widget>
+    <addaction name="actionVideoPlay"/>
+    <addaction name="actionVideoPause"/>
+    <addaction name="actionVideoPlayReversed"/>
+    <addaction name="actionVideoFastBackward"/>
+    <addaction name="actionVideoFastForward"/>
+    <addaction name="separator"/>
+    <addaction name="actionVideoStop"/>
+    <addaction name="actionVideoResume"/>
+    <addaction name="actionVideoSpeedDecrease"/>
+    <addaction name="actionVideoSpeedIncrease"/>
+    <addaction name="actionVideoFrameBackward"/>
+    <addaction name="actionVideoFrameForward"/>
+    <addaction name="actionVideoSkipBackward"/>
+    <addaction name="actionVideoSkipForward"/>
+    <addaction name="actionVideoPlayLive"/>
+    <addaction name="separator"/>
+    <addaction name="actionViewReset"/>
+    <addaction name="separator"/>
+    <addaction name="actionVideoLiveOffsetSet"/>
+    <addaction name="menuVideoResampling"/>
+    <addaction name="actionVideoMaskShowTracking"/>
+    <addaction name="actionVideoMaskSetColorTracking"/>
+    <addaction name="separator"/>
+    <addaction name="actionWriteRenderedImages"/>
+    <addaction name="actionSaveScreenshot"/>
+    <addaction name="separator"/>
+    <addaction name="actionQuit"/>
+   </widget>
+   <widget class="QMenu" name="menuTracks">
+    <property name="title">
+     <string>&amp;Tracks</string>
+    </property>
+    <addaction name="actionTracksShow"/>
+    <addaction name="actionTracksShowBoxes"/>
+    <addaction name="actionTracksShowId"/>
+    <addaction name="actionTracksShowPvo"/>
+    <addaction name="actionTracksColor"/>
+    <addaction name="actionTracksTrailLengthSet"/>
+    <addaction name="separator"/>
+    <addaction name="actionWindowTracksShow"/>
+    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="menuDescriptors">
+    <property name="title">
+     <string>&amp;Descriptors</string>
+    </property>
+    <widget class="QMenu" name="menuAlerts">
+     <property name="title">
+      <string>Alerts</string>
+     </property>
+     <addaction name="actionAlertCreate"/>
+     <addaction name="actionAlertLoad"/>
+     <addaction name="separator"/>
+     <addaction name="actionAlertActivateSelected"/>
+     <addaction name="actionAlertDeactivateSelected"/>
+     <addaction name="separator"/>
+     <addaction name="actionAlertRemoveSelected"/>
+     <addaction name="actionAlertRemoveAll"/>
+     <addaction name="separator"/>
+     <addaction name="actionWindowAlertShow"/>
+    </widget>
+    <addaction name="menuAlerts"/>
+    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="menuEvents">
+    <property name="title">
+     <string>&amp;Events</string>
+    </property>
+    <addaction name="actionEventsPersonEnableAll"/>
+    <addaction name="actionEventsPersonDisableAll"/>
+    <addaction name="separator"/>
+    <addaction name="actionEventsVehicleEnableAll"/>
+    <addaction name="actionEventsVehicleDisableAll"/>
+    <addaction name="separator"/>
+    <addaction name="actionEventFiltersLoad"/>
+    <addaction name="actionEventFiltersSave"/>
+    <addaction name="actionEventProbabilityThresholdSet"/>
+    <addaction name="separator"/>
+    <addaction name="actionWindowFilterShow"/>
+    <addaction name="actionEventsTracksShow"/>
+    <addaction name="actionEventsBoxesShow"/>
+    <addaction name="actionEventsLabelsShow"/>
+    <addaction name="actionEventsProbabilityShow"/>
+    <addaction name="separator"/>
+    <addaction name="actionWindowEventsShow"/>
+    <addaction name="actionWindowVerifiedEventsShow"/>
+    <addaction name="actionWindowRejectedEventsShow"/>
+    <addaction name="actionWindowEventInfoShow"/>
+   </widget>
+   <widget class="QMenu" name="menuDraw">
+    <property name="title">
+     <string>&amp;Regions</string>
+    </property>
+    <addaction name="actionRegionDraw"/>
+    <addaction name="actionRegionClose"/>
+    <addaction name="actionRegionRemoveSelected"/>
+    <addaction name="actionRegionRemoveAll"/>
+    <addaction name="separator"/>
+    <addaction name="actionVideoMaskShowFiltering"/>
+    <addaction name="actionVideoMaskSetColorFiltering"/>
+    <addaction name="separator"/>
+    <addaction name="actionWindowRegionShow"/>
+   </widget>
+   <widget class="QMenu" name="menuHelp">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+   </widget>
+   <widget class="QMenu" name="menuTools">
+    <property name="title">
+     <string>T&amp;ools</string>
+    </property>
+   </widget>
+   <addaction name="menuVideo"/>
+   <addaction name="menuTracks"/>
+   <addaction name="menuEvents"/>
+   <addaction name="menuDescriptors"/>
+   <addaction name="menuDraw"/>
+   <addaction name="menuTools"/>
+   <addaction name="menuHelp"/>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="videoToolBar">
+   <property name="windowTitle">
+    <string>Video</string>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonIconOnly</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionVideoFastBackward"/>
+   <addaction name="actionVideoPlayReversed"/>
+   <addaction name="actionVideoPause"/>
+   <addaction name="actionVideoPlay"/>
+   <addaction name="actionVideoFastForward"/>
+   <addaction name="separator"/>
+   <addaction name="actionVideoStop"/>
+   <addaction name="actionVideoSpeedDecrease"/>
+   <addaction name="actionVideoSpeedIncrease"/>
+   <addaction name="actionVideoPlayLive"/>
+   <addaction name="separator"/>
+   <addaction name="actionViewReset"/>
+   <addaction name="actionFollowEvent"/>
+  </widget>
+  <widget class="QToolBar" name="visualizationToolBar">
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="windowTitle">
+    <string>Visualization</string>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonIconOnly</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="actionTracksShow"/>
+   <addaction name="actionTracksShowBoxes"/>
+   <addaction name="actionTracksShowId"/>
+   <addaction name="actionTracksShowPvo"/>
+   <addaction name="separator"/>
+   <addaction name="actionEventsTracksShow"/>
+   <addaction name="actionEventsBoxesShow"/>
+   <addaction name="actionEventsLabelsShow"/>
+   <addaction name="actionEventsProbabilityShow"/>
+   <addaction name="separator"/>
+   <addaction name="actionVideoMaskShowTracking"/>
+   <addaction name="actionVideoMaskShowFiltering"/>
+  </widget>
+  <widget class="QDockWidget" name="filterDock">
+   <property name="minimumSize">
+    <size>
+     <width>250</width>
+     <height>151</height>
+    </size>
+   </property>
+   <property name="windowTitle">
+    <string>Filters</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="filterDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="QScrollArea" name="filterDockScrollArea">
+       <property name="frameShape">
+        <enum>QFrame::NoFrame</enum>
+       </property>
+       <property name="widgetResizable">
+        <bool>true</bool>
+       </property>
+       <widget class="QWidget" name="filterDockScrollAreaContents">
+        <property name="geometry">
+         <rect>
+          <x>0</x>
+          <y>0</y>
+          <width>342</width>
+          <height>85</height>
+         </rect>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_3">
+         <property name="spacing">
+          <number>0</number>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QCheckBox" name="groundTruthVisible">
+           <property name="text">
+            <string>Ground Truth</string>
+           </property>
+           <property name="checked">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="vgMixerWidget" name="filter" native="true"/>
+         </item>
+         <item>
+          <spacer name="filterDockSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>62</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolBar" name="filterToolBar">
+       <property name="windowTitle">
+        <string>Filter Tool Bar</string>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonFollowStyle</enum>
+       </property>
+       <addaction name="actionEventFiltersLoad"/>
+       <addaction name="actionEventFiltersSave"/>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QToolBar" name="drawingToolBar">
+   <property name="windowTitle">
+    <string>Drawing</string>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonFollowStyle</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="separator"/>
+   <addaction name="actionRegionDraw"/>
+   <addaction name="actionRegionClose"/>
+   <addaction name="actionRegionRemoveAll"/>
+  </widget>
+  <widget class="QDockWidget" name="regionDock">
+   <property name="windowTitle">
+    <string>Regions</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="regionDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vsRegionList" name="regionTree">
+       <property name="editTriggers">
+        <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked</set>
+       </property>
+       <property name="alternatingRowColors">
+        <bool>true</bool>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="uniformRowHeights">
+        <bool>true</bool>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+       <property name="allColumnsShowFocus">
+        <bool>true</bool>
+       </property>
+       <column>
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Type</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolBar" name="regionToolBar">
+       <property name="windowTitle">
+        <string>Region Tool Bar</string>
+       </property>
+       <addaction name="actionRegionRemoveSelected"/>
+       <addaction name="actionRegionRemoveAll"/>
+       <addaction name="separator"/>
+       <addaction name="actionRegionShowHidden"/>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="eventsDock">
+   <property name="minimumSize">
+    <size>
+     <width>150</width>
+     <height>80</height>
+    </size>
+   </property>
+   <property name="windowTitle">
+    <string>Events</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="eventDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_4">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vsEventTreeWidget" name="eventTree" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="verifiedEventsDock">
+   <property name="minimumSize">
+    <size>
+     <width>150</width>
+     <height>80</height>
+    </size>
+   </property>
+   <property name="windowTitle">
+    <string>Verified Events</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="verifiedDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_5">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vsEventTreeWidget" name="verifiedEventTree" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="rejectedEventsDock">
+   <property name="minimumSize">
+    <size>
+     <width>150</width>
+     <height>80</height>
+    </size>
+   </property>
+   <property name="windowTitle">
+    <string>Rejected Events</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="rejectedDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_6">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vsEventTreeWidget" name="rejectedEventTree" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="alertDock">
+   <property name="windowTitle">
+    <string>Alerts</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>2</number>
+   </attribute>
+   <widget class="QWidget" name="alertDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_7">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vsAlertList" name="alertTree">
+       <property name="alternatingRowColors">
+        <bool>true</bool>
+       </property>
+       <property name="selectionMode">
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="uniformRowHeights">
+        <bool>true</bool>
+       </property>
+       <property name="sortingEnabled">
+        <bool>true</bool>
+       </property>
+       <property name="allColumnsShowFocus">
+        <bool>true</bool>
+       </property>
+       <column>
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Status</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Matches</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolBar" name="alertToolBar">
+       <property name="windowTitle">
+        <string>Region Tool Bar</string>
+       </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonIconOnly</enum>
+       </property>
+       <addaction name="actionAlertCreate"/>
+       <addaction name="actionAlertLoad"/>
+       <addaction name="separator"/>
+       <addaction name="actionAlertActivateSelected"/>
+       <addaction name="actionAlertDeactivateSelected"/>
+       <addaction name="separator"/>
+       <addaction name="actionAlertRemoveSelected"/>
+       <addaction name="actionAlertRemoveAll"/>
+       <addaction name="separator"/>
+       <addaction name="actionAlertShowInactive"/>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="eventInfoDock">
+   <property name="windowTitle">
+    <string>Event Info</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="eventInfoDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_8">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vsEventInfoWidget" name="eventInfo" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QDockWidget" name="tracksDock">
+   <property name="windowTitle">
+    <string>Tracks</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>1</number>
+   </attribute>
+   <widget class="QWidget" name="trackDockContents">
+    <layout class="QVBoxLayout" name="verticalLayout_9">
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="vsTrackTreeWidget" name="trackTree" native="true"/>
+     </item>
+    </layout>
+   </widget>
+  </widget>
+  <widget class="QToolBar" name="toolsToolBar">
+   <property name="windowTitle">
+    <string>Tools</string>
+   </property>
+   <property name="toolButtonStyle">
+    <enum>Qt::ToolButtonFollowStyle</enum>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <action name="actionVideoPause">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-pause</normaloff>:/icons/16x16/playback-pause</iconset>
+   </property>
+   <property name="text">
+    <string>Pa&amp;use</string>
+   </property>
+   <property name="toolTip">
+    <string>Pause video playback</string>
+   </property>
+   <property name="shortcut">
+    <string>Space</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionQuit">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/quit</normaloff>:/icons/16x16/quit</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Quit</string>
+   </property>
+   <property name="toolTip">
+    <string>Exit the application</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+  </action>
+  <action name="actionViewReset">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/view-reset</normaloff>:/icons/16x16/view-reset</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Reset View</string>
+   </property>
+   <property name="toolTip">
+    <string>Reset the view to the full video image</string>
+   </property>
+   <property name="shortcut">
+    <string>R</string>
+   </property>
+  </action>
+  <action name="actionTracksShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/track-show</normaloff>:/icons/16x16/track-show</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Show Tracks</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of tracks</string>
+   </property>
+   <property name="shortcut">
+    <string>T</string>
+   </property>
+  </action>
+  <action name="actionTracksShowBoxes">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/track-show-boxes</normaloff>:/icons/16x16/track-show-boxes</iconset>
+   </property>
+   <property name="text">
+    <string>Show Entity &amp;Boxes</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of entity bounding boxes</string>
+   </property>
+   <property name="shortcut">
+    <string>B</string>
+   </property>
+  </action>
+  <action name="actionWindowFilterShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/filter-show</normaloff>:/icons/16x16/filter-show</iconset>
+   </property>
+   <property name="text">
+    <string>Show &amp;Filter Window</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the event filter window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, F</string>
+   </property>
+  </action>
+  <action name="actionEventsPersonEnableAll">
+   <property name="text">
+    <string>Show All Person Events</string>
+   </property>
+   <property name="toolTip">
+    <string>Enable display of all person events</string>
+   </property>
+   <property name="shortcut">
+    <string>S, P</string>
+   </property>
+  </action>
+  <action name="actionEventsVehicleEnableAll">
+   <property name="text">
+    <string>Show All Vehicle Events</string>
+   </property>
+   <property name="toolTip">
+    <string>Enable display of all vehicle events</string>
+   </property>
+   <property name="shortcut">
+    <string>S, V</string>
+   </property>
+  </action>
+  <action name="actionEventsPersonDisableAll">
+   <property name="text">
+    <string>Hide All Person Events</string>
+   </property>
+   <property name="toolTip">
+    <string>Disable display of all person events</string>
+   </property>
+   <property name="shortcut">
+    <string>H, P</string>
+   </property>
+  </action>
+  <action name="actionEventsVehicleDisableAll">
+   <property name="text">
+    <string>Hide All Vehicle Events</string>
+   </property>
+   <property name="toolTip">
+    <string>Disable display of all vehicle events</string>
+   </property>
+   <property name="shortcut">
+    <string>H, V</string>
+   </property>
+  </action>
+  <action name="actionEventProbabilityThresholdSet">
+   <property name="text">
+    <string>Set &amp;Threshold...</string>
+   </property>
+   <property name="toolTip">
+    <string>Set the probability threshold for filtering events</string>
+   </property>
+   <property name="shortcut">
+    <string>O</string>
+   </property>
+  </action>
+  <action name="actionEventsLabelsShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/event-show-label</normaloff>:/icons/16x16/event-show-label</iconset>
+   </property>
+   <property name="text">
+    <string>Show &amp;Labels</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of event labels</string>
+   </property>
+   <property name="shortcut">
+    <string>L</string>
+   </property>
+  </action>
+  <action name="actionRegionDraw">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/path-draw</normaloff>:/icons/16x16/path-draw</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Draw</string>
+   </property>
+   <property name="toolTip">
+    <string>Draw regions of interest using lines and polylines</string>
+   </property>
+   <property name="shortcut">
+    <string>D</string>
+   </property>
+  </action>
+  <action name="actionRegionRemoveAll">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/path-clear-all</normaloff>:/icons/16x16/path-clear-all</iconset>
+   </property>
+   <property name="text">
+    <string>Clear &amp;All</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove all user regions of interest</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+E</string>
+   </property>
+  </action>
+  <action name="actionRegionRemoveSelected">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/path-clear</normaloff>:/icons/16x16/path-clear</iconset>
+   </property>
+   <property name="text">
+    <string>Clear &amp;Selected</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove selected user regions of interest</string>
+   </property>
+  </action>
+  <action name="actionRegionClose">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/path-close</normaloff>:/icons/16x16/path-close</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Close Path</string>
+   </property>
+   <property name="toolTip">
+    <string>Close the region of interest path being drawn</string>
+   </property>
+   <property name="shortcut">
+    <string>C</string>
+   </property>
+  </action>
+  <action name="actionWindowRegionShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/path-list</normaloff>:/icons/16x16/path-list</iconset>
+   </property>
+   <property name="text">
+    <string>Show Region &amp;List</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the region list window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, R</string>
+   </property>
+  </action>
+  <action name="actionEventsProbabilityShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/event-show-probability</normaloff>:/icons/16x16/event-show-probability</iconset>
+   </property>
+   <property name="text">
+    <string>Show &amp;Probability</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of event probability scores</string>
+   </property>
+   <property name="shortcut">
+    <string>P</string>
+   </property>
+  </action>
+  <action name="actionEventFiltersLoad">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/load</normaloff>:/icons/16x16/load</iconset>
+   </property>
+   <property name="text">
+    <string>L&amp;oad Filter Settings...</string>
+   </property>
+   <property name="iconText">
+    <string>Load</string>
+   </property>
+   <property name="toolTip">
+    <string>Load event filter settings from a file</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O, F</string>
+   </property>
+  </action>
+  <action name="actionEventFiltersSave">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/save</normaloff>:/icons/16x16/save</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Save Filter Settings...</string>
+   </property>
+   <property name="iconText">
+    <string>Save</string>
+   </property>
+   <property name="toolTip">
+    <string>Save event filter settings to a file</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S, F</string>
+   </property>
+  </action>
+  <action name="actionTracksShowId">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/track-show-id</normaloff>:/icons/16x16/track-show-id</iconset>
+   </property>
+   <property name="text">
+    <string>Show &amp;ID's</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of track ID's</string>
+   </property>
+  </action>
+  <action name="actionTracksShowPvo">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/track-show-pvo</normaloff>:/icons/16x16/track-show-pvo</iconset>
+   </property>
+   <property name="text">
+    <string>Show &amp;PVO's</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of track P/V/O scores</string>
+   </property>
+  </action>
+  <action name="actionTracksTrailLengthSet">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Set &amp;Trail Length...</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+T</string>
+   </property>
+  </action>
+  <action name="actionVideoFastBackward">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-fast-backward</normaloff>:/icons/16x16/playback-fast-backward</iconset>
+   </property>
+   <property name="text">
+    <string>Fast &amp;Backward</string>
+   </property>
+   <property name="toolTip">
+    <string>Play video backwards at an accelerated rate</string>
+   </property>
+   <property name="shortcut">
+    <string>&lt;</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoPlay">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-play</normaloff>:/icons/16x16/playback-play</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Play</string>
+   </property>
+   <property name="toolTip">
+    <string>Play video at normal speed</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoFastForward">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-fast-forward</normaloff>:/icons/16x16/playback-fast-forward</iconset>
+   </property>
+   <property name="text">
+    <string>Fast &amp;Forward</string>
+   </property>
+   <property name="toolTip">
+    <string>Play video forwards at an accelerated rate</string>
+   </property>
+   <property name="shortcut">
+    <string>&gt;</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoFrameBackward">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-frame-backward</normaloff>:/icons/16x16/playback-frame-backward</iconset>
+   </property>
+   <property name="text">
+    <string>Frame &amp;Backward</string>
+   </property>
+   <property name="toolTip">
+    <string>Step video one frame backward</string>
+   </property>
+   <property name="shortcut">
+    <string>[</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoFrameForward">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-frame-forward</normaloff>:/icons/16x16/playback-frame-forward</iconset>
+   </property>
+   <property name="text">
+    <string>Frame &amp;Forward</string>
+   </property>
+   <property name="toolTip">
+    <string>Step video one frame forward</string>
+   </property>
+   <property name="shortcut">
+    <string>]</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoStop">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-stop</normaloff>:/icons/16x16/playback-stop</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Stop</string>
+   </property>
+   <property name="toolTip">
+    <string>Stop video playback and reset to beginning</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionWindowEventsShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show &amp;Event List</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the event list window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, E</string>
+   </property>
+  </action>
+  <action name="actionWindowVerifiedEventsShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show &amp;Verified Event List</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the verified event list window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, V</string>
+   </property>
+  </action>
+  <action name="actionWindowRejectedEventsShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show &amp;Rejected Event List</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the rejected event list window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, J</string>
+   </property>
+  </action>
+  <action name="actionAlertCreate">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/new-alert</normaloff>:/icons/16x16/new-alert</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Create Alert</string>
+   </property>
+   <property name="toolTip">
+    <string>Create a new Alert</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+A</string>
+   </property>
+  </action>
+  <action name="actionAlertLoad">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/load-alert</normaloff>:/icons/16x16/load-alert</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Load Alert</string>
+   </property>
+   <property name="toolTip">
+    <string>Load a saved alert</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O, A</string>
+   </property>
+  </action>
+  <action name="actionAlertRemoveSelected">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/alert-clear</normaloff>:/icons/16x16/alert-clear</iconset>
+   </property>
+   <property name="text">
+    <string>Clear &amp;Selected</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove selected alerts, including corresponding events</string>
+   </property>
+  </action>
+  <action name="actionAlertRemoveAll">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/alert-clear-all</normaloff>:/icons/16x16/alert-clear-all</iconset>
+   </property>
+   <property name="text">
+    <string>Cl&amp;ear All</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove all alerts and alert events</string>
+   </property>
+  </action>
+  <action name="actionAlertActivateSelected">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/alert-activate</normaloff>:/icons/16x16/alert-activate</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Activate Selected</string>
+   </property>
+   <property name="toolTip">
+    <string>Activate selected alerts</string>
+   </property>
+  </action>
+  <action name="actionAlertDeactivateSelected">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/alert-deactivate</normaloff>:/icons/16x16/alert-deactivate</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Deactivate Selected</string>
+   </property>
+   <property name="toolTip">
+    <string>Deactivate selected alerts</string>
+   </property>
+  </action>
+  <action name="actionAlertShowInactive">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Show Inactive</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of inactive alerts in the alert list</string>
+   </property>
+  </action>
+  <action name="actionWindowAlertShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/alert-list</normaloff>:/icons/16x16/alert-list</iconset>
+   </property>
+   <property name="text">
+    <string>Show Alert Lis&amp;t</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the alert list window</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, A</string>
+   </property>
+  </action>
+  <action name="actionVideoMaskShowFiltering">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/mask-show-filtering</normaloff>:/icons/16x16/mask-show-filtering</iconset>
+   </property>
+   <property name="text">
+    <string>Show Filter &amp;Mask </string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the filter-region mask</string>
+   </property>
+  </action>
+  <action name="actionVideoMaskSetColorTracking">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/mask-color</normaloff>:/icons/16x16/mask-color</iconset>
+   </property>
+   <property name="text">
+    <string>Change Mask &amp;Color...</string>
+   </property>
+   <property name="toolTip">
+    <string>Change the color used to visualize the tracking mask</string>
+   </property>
+  </action>
+  <action name="actionVideoMaskShowTracking">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/mask-show-tracking</normaloff>:/icons/16x16/mask-show-tracking</iconset>
+   </property>
+   <property name="text">
+    <string>Show Tracking &amp;Mask</string>
+   </property>
+   <property name="toolTip">
+    <string>Show or hide the tracking mask</string>
+   </property>
+  </action>
+  <action name="actionVideoMaskSetColorFiltering">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/mask-color</normaloff>:/icons/16x16/mask-color</iconset>
+   </property>
+   <property name="text">
+    <string>Change Mask &amp;Color...</string>
+   </property>
+   <property name="toolTip">
+    <string>Change the color used to visualize the filtering mask</string>
+   </property>
+  </action>
+  <action name="actionRegionShowHidden">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Show Hidden</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of hidden regions in the region list</string>
+   </property>
+  </action>
+  <action name="actionWriteRenderedImages">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Write Rendered Images</string>
+   </property>
+   <property name="toolTip">
+    <string>Write an image to specified directory each time the view updates</string>
+   </property>
+  </action>
+  <action name="actionWindowEventInfoShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Show Event &amp;Info</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, I</string>
+   </property>
+  </action>
+  <action name="actionVideoSampleNearest">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Nearest</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>videoSampling</string>
+   </property>
+  </action>
+  <action name="actionVideoSampleLinear">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Linear</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>videoSampling</string>
+   </property>
+  </action>
+  <action name="actionVideoSampleBicubic">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>&amp;Bicubic</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>videoSampling</string>
+   </property>
+  </action>
+  <action name="actionEventsBoxesShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/event-show-boxes</normaloff>:/icons/16x16/event-show-boxes</iconset>
+   </property>
+   <property name="text">
+    <string>Show Event &amp;Boxes</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of event computation boxes</string>
+   </property>
+  </action>
+  <action name="actionFormulateQuery">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/22x22/new-query</normaloff>:/icons/22x22/new-query</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Formulate Query</string>
+   </property>
+   <property name="toolTip">
+    <string>Formulate a query using current data sources</string>
+   </property>
+  </action>
+  <action name="actionFollowEvent">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset>
+     <normaloff>:/icons/22x22/view-track</normaloff>:/icons/22x22/view-track</iconset>
+   </property>
+   <property name="text">
+    <string>actionFollowEvent</string>
+   </property>
+   <property name="toolTip">
+    <string>Allow the camera to follow  ( pan ) an event</string>
+   </property>
+  </action>
+  <action name="actionSaveScreenshot">
+   <property name="text">
+    <string>Save Screenshot</string>
+   </property>
+   <property name="toolTip">
+    <string>Save a screenshot of the current view</string>
+   </property>
+  </action>
+  <action name="actionVideoPlayReversed">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-play-reverse</normaloff>:/icons/16x16/playback-play-reverse</iconset>
+   </property>
+   <property name="text">
+    <string>Play Re&amp;versed</string>
+   </property>
+   <property name="toolTip">
+    <string>Play video backwards at normal speed</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoResume">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Res&amp;ume</string>
+   </property>
+   <property name="toolTip">
+    <string>Resume playback at the previous rate and direction</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+Space</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoSpeedIncrease">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-speed-increase</normaloff>:/icons/16x16/playback-speed-increase</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Increase Speed</string>
+   </property>
+   <property name="toolTip">
+    <string>Increase playback speed</string>
+   </property>
+   <property name="shortcut">
+    <string>]</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoSpeedDecrease">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-speed-decrease</normaloff>:/icons/16x16/playback-speed-decrease</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Decrease Speed</string>
+   </property>
+   <property name="toolTip">
+    <string>Decrease playback speed</string>
+   </property>
+   <property name="shortcut">
+    <string>[</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoSkipForward">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-skip-forward</normaloff>:/icons/16x16/playback-skip-forward</iconset>
+   </property>
+   <property name="text">
+    <string>Skip F&amp;orward</string>
+   </property>
+   <property name="toolTip">
+    <string>Skip the video forward a few seconds</string>
+   </property>
+   <property name="shortcut">
+    <string>&gt;</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoSkipBackward">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-skip-backward</normaloff>:/icons/16x16/playback-skip-backward</iconset>
+   </property>
+   <property name="text">
+    <string>Skip B&amp;ackward</string>
+   </property>
+   <property name="toolTip">
+    <string>Skip the video backward a few seconds</string>
+   </property>
+   <property name="shortcut">
+    <string>&lt;</string>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionWindowTracksShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/track-list</normaloff>:/icons/16x16/track-list</iconset>
+   </property>
+   <property name="text">
+    <string>Show Track &amp;List</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D, T</string>
+   </property>
+  </action>
+  <action name="actionEventsTracksShow">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/event-show-tracks</normaloff>:/icons/16x16/event-show-tracks</iconset>
+   </property>
+   <property name="text">
+    <string>Show Event Tr&amp;acks</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle display of event track segments</string>
+   </property>
+  </action>
+  <action name="actionTracksColor">
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/track-color</normaloff>:/icons/16x16/track-color</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Change Color(s)...</string>
+   </property>
+   <property name="toolTip">
+    <string>Set track coloring options</string>
+   </property>
+  </action>
+  <action name="actionVideoPlayLive">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vsp.qrc">
+     <normaloff>:/icons/16x16/playback-play-live</normaloff>:/icons/16x16/playback-play-live</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Live</string>
+   </property>
+   <property name="toolTip">
+    <string>Play video at head of stream</string>
+   </property>
+   <property name="font">
+    <font>
+     <pointsize>8</pointsize>
+     <weight>50</weight>
+     <italic>false</italic>
+     <bold>false</bold>
+    </font>
+   </property>
+   <property name="priority">
+    <enum>QAction::NormalPriority</enum>
+   </property>
+   <property name="actionGroup" stdset="0">
+    <string>playbackActions</string>
+   </property>
+   <property name="displayGroup" stdset="0">
+    <string>Video Playback</string>
+   </property>
+  </action>
+  <action name="actionVideoLiveOffsetSet">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>Set Live Offset...</string>
+   </property>
+   <property name="toolTip">
+    <string>Set Offset from Live for &quot;Live&quot; mode</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QVTKWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vgMixerWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">vgMixerWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vgFrameSpinBox</class>
+   <extends>QSpinBox</extends>
+   <header location="global">vgFrameSpinBox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>vsEventTreeWidget</class>
+   <extends>QWidget</extends>
+   <header>vsEventTreeWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vsAlertList</class>
+   <extends>QTreeWidget</extends>
+   <header>vsAlertList.h</header>
+   <slots>
+    <slot>removeSelected()</slot>
+    <slot>removeAll()</slot>
+    <slot>activateSelected()</slot>
+    <slot>deactivateSelected()</slot>
+    <slot>setShowInactive(bool)</slot>
+   </slots>
+  </customwidget>
+  <customwidget>
+   <class>vsRegionList</class>
+   <extends>QTreeWidget</extends>
+   <header>vsRegionList.h</header>
+   <slots>
+    <slot>removeSelected()</slot>
+    <slot>removeAll()</slot>
+    <slot>setShowHidden(bool)</slot>
+   </slots>
+  </customwidget>
+  <customwidget>
+   <class>vgVideoScrubber</class>
+   <extends>QWidget</extends>
+   <header location="global">vgVideoScrubber.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vsEventInfoWidget</class>
+   <extends>QWidget</extends>
+   <header>vsEventInfoWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vsTrackTreeWidget</class>
+   <extends>QWidget</extends>
+   <header>vsTrackTreeWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vsp.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>actionEventsLabelsShow</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>actionEventsProbabilityShow</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionTracksShow</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>actionTracksTrailLengthSet</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionAlertActivateSelected</sender>
+   <signal>triggered()</signal>
+   <receiver>alertTree</receiver>
+   <slot>activateSelected()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>732</x>
+     <y>487</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionAlertDeactivateSelected</sender>
+   <signal>triggered()</signal>
+   <receiver>alertTree</receiver>
+   <slot>deactivateSelected()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>732</x>
+     <y>487</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionAlertRemoveSelected</sender>
+   <signal>triggered()</signal>
+   <receiver>alertTree</receiver>
+   <slot>removeSelected()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>732</x>
+     <y>487</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionAlertRemoveAll</sender>
+   <signal>triggered()</signal>
+   <receiver>alertTree</receiver>
+   <slot>removeAll()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>732</x>
+     <y>487</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionAlertShowInactive</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>alertTree</receiver>
+   <slot>setShowInactive(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>732</x>
+     <y>487</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionRegionRemoveSelected</sender>
+   <signal>triggered()</signal>
+   <receiver>regionTree</receiver>
+   <slot>removeSelected()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>730</x>
+     <y>297</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionRegionRemoveAll</sender>
+   <signal>triggered()</signal>
+   <receiver>regionTree</receiver>
+   <slot>removeAll()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>730</x>
+     <y>297</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionRegionShowHidden</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>regionTree</receiver>
+   <slot>setShowHidden(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>730</x>
+     <y>297</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Libraries/VtkVgCore/CMakeLists.txt b/Libraries/VtkVgCore/CMakeLists.txt
new file mode 100644
index 00000000..79fd11d8
--- /dev/null
+++ b/Libraries/VtkVgCore/CMakeLists.txt
@@ -0,0 +1,233 @@
+project(vtkVgCore)
+
+if(NOT VTK_USE_SYSTEM_JPEG)
+  add_definitions(-DVTK_JPEG_INCLUDE_JERROR)
+endif(NOT VTK_USE_SYSTEM_JPEG)
+
+# Requires VTK and VXL (using VIL of VXL).
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+  ${VXL_JPEG_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS}
+)
+
+# Source files.
+set(vtkVgCoreSrcs
+  jmem_src.c
+  vtkVg2DGraphMapper.cxx
+  vtkVgActivity.cxx
+  vtkVgActivityTypeRegistry.cxx
+  vtkVgAdapt.cxx
+  vtkVgAnnotationActor.cxx
+  vtkVgAppendImageData.cxx
+  vtkVgApplySelectedColor.cxx
+  vtkVgArcParallelEdgeStrategy.cxx
+  vtkVgAssignCoordinates.cxx
+  vtkVgAssignCoordinatesLayoutStrategy.cxx
+  vtkVgAtomic.cxx
+  vtkVgBaseImageSource.cxx
+  vtkVgBorderRepresentation.cxx
+  vtkVgCellPicker.cxx
+  vtkVgChartTimeline.cxx
+  vtkVgClipPolyData.cxx
+  vtkVgColorUtil.cxx
+  vtkVgContourOperatorManager.cxx
+  vtkVgContourRepresentation.cxx
+  vtkVgContourWidget.cxx
+  vtkVgCoordinateTransformUtil.cxx
+  vtkVgEvent.cxx
+  vtkVgEventBase.cxx
+  vtkVgEventTypeRegistry.cxx
+  vtkVgGeoCoord.cxx
+  vtkVgGraphMapper.cxx
+  vtkVgHull2D.cxx
+  vtkVgIcon.cxx
+  vtkVgIconManager.cxx
+  vtkVgImageIcon.cxx
+  vtkVgImageSource.cxx
+  vtkVgInteractorStyleRubberBand2D.cxx
+  vtkVgJPEGReader.cxx
+  vtkVgJPEGMemoryReader.cxx
+  vtkVgLabeledRegion.cxx
+  vtkVgLineRepresentation.cxx
+  vtkVgMetaObject.cxx
+  vtkVgMultiResJpgImageReader2.cxx
+  vtkVgMultiResJpgImageWriter2.cxx
+  vtkVgPNGReader.cxx
+  vtkVgPlotTimeline.cxx
+  vtkVgQuad.cxx
+  vtkVgRendererUtils.cxx
+  vtkVgScalars.cxx
+  vtkVgSelectionListRepresentation.cxx
+  vtkVgSelectionRepresentation.cxx
+  vtkVgSelectionWidget.cxx
+  vtkVgSpaceConversion.cxx
+  vtkVgTemporalFilters.cxx
+  vtkVgTimeStamp.cxx
+  vtkVgTrack.cxx
+  vtkVgTrackTypeRegistry.cxx
+  vtkVgTriangulateConcavePolysFilter.cxx
+  vtkVgUtil.cxx
+  vtkVgVideoFrame.cxx
+  vtkVgVideoFrameCorner.cxx
+  vtkVgVideoFrameCorners.cxx
+  vtkVgVideoFrameMetaData.cxx
+  vtkVgVideoSelectionSource.cxx
+  vtkVgVideoSourceBase.cxx
+)
+
+set(vtkVgCoreInstallHeaders
+  jmem_src.h
+  vtkVg2DGraphMapper.h
+  vtkVgActivity.h
+  vtkVgActivityTypeRegistry.h
+  vtkVgAdapt.h
+  vtkVgAnnotationActor.h
+  vtkVgAppendImageData.h
+  vtkVgApplySelectedColor.h
+  vtkVgArcParallelEdgeStrategy.h
+  vtkVgAssignCoordinates.h
+  vtkVgAssignCoordinatesLayoutStrategy.h
+  vtkVgAtomic.h
+  vtkVgBaseImageSource.h
+  vtkVgBorderRepresentation.h
+  vtkVgCellPicker.h
+  vtkVgChartTimeline.h
+  vtkVgClipPolyData.h
+  vtkVgColorUtil.h
+  vtkVgContourOperatorManager.h
+  vtkVgContourRepresentation.h
+  vtkVgContourWidget.h
+  vtkVgCoordinateTransformUtil.h
+  vtkVgEventBase.h
+  vtkVgEvent.h
+  vtkVgEventRenderSetup.h
+  vtkVgEventTypeRegistry.h
+  vtkVgGeoCoord.h
+  vtkVgGraphMapper.h
+  vtkVgHull2D.h
+  vtkVgIcon.h
+  vtkVgIconManager.h
+  vtkVgImageIcon.h
+  vtkVgImageSource.h
+  vtkVgInstance.h
+  vtkVgInteractorStyleRubberBand2D.h
+  vtkVgJPEGReader.h
+  vtkVgJPEGMemoryReader.h
+  vtkVgLabeledRegion.h
+  vtkVgLineRepresentation.h
+  vtkVgMacros.h
+  vtkVgMetaObject.h
+  vtkVgMultiResJpgImageReader2.h
+  vtkVgMultiResJpgImageWriter2.h
+  vtkVgPlotTimeline.h
+  vtkVgPNGReader.h
+  vtkVgPythonUtil.h
+  vtkVgQuad.h
+  vtkVgRendererUtils.h
+  vtkVgScalars.h
+  vtkVgSelectionListRepresentation.h
+  vtkVgSelectionRepresentation.h
+  vtkVgSelectionWidget.h
+  vtkVgSetGet.h
+  vtkVgSharedInstance.h
+  vtkVgSpaceConversion.h
+  vtkVgTemporalFilters.h
+  vtkVgTimeStamp.h
+  vtkVgTrack.h
+  vtkVgTrackTypeRegistry.h
+  vtkVgTriangulateConcavePolysFilter.h
+  vtkVgTypeDefs.h
+  vtkVgTypeRegistryBase.h
+  vtkVgTypeRegistry.h
+  vtkVgUtil.h
+  vtkVgVideoCache.h
+  vtkVgVideoFrame.h
+  vtkVgVideoFrameCorner.h
+  vtkVgVideoFrameCorners.h
+  vtkVgVideoFrameMetaData.h
+  vtkVgVideoSelectionSource.h
+  vtkVgVideoSourceBase.h
+)
+
+if(CMAKE_COMPILER_IS_GNUCXX)
+  # VTK proper has a better check, but for our purposes this will suffice
+  set_source_files_properties(vtkVgAtomic.cxx PROPERTIES
+                              COMPILE_DEFINITIONS VTK_HAVE_SYNC_BUILTINS)
+endif()
+
+set_source_files_properties(
+  vtkVgBaseImageSource
+  PROPERTIES ABSTRACT TRUE
+)
+
+set_source_files_properties(
+  vtkVgActivity
+  vtkVgActivityTypeRegistry
+  vtkVgAdapt
+  vtkVgAtomic
+  vtkVgColorUtil
+  vtkVgCoordinateTransformUtil
+  vtkVgEvent
+  vtkVgEventBase
+  vtkVgEventTypeRegistry
+  vtkVgMetaObject
+  vtkVgQuad
+  vtkVgRendererUtils
+  vtkVgTrackTypeRegistry
+  PROPERTIES WRAP_EXCLUDE TRUE
+)
+
+set_source_files_properties(
+  vtkVgGeoCoord
+  vtkVgRendererUtils
+  vtkVgTimeStamp
+  vtkVgVideoFrame
+  vtkVgVideoFrameCorner
+  vtkVgVideoFrameCorners
+  vtkVgVideoFrameMetaData
+  PROPERTIES WRAP_SPECIAL TRUE
+)
+
+vg_vtk_module(${PROJECT_NAME}
+  DEPENDS
+  vtkChartsCore
+  vtkInteractionStyle
+  vtkInfovisLayout
+  vtkIOCore
+  vtkRenderingFreeTypeOpenGL
+  vtkRenderingLabel
+  vtkRenderingOpenGL
+  vtkRenderingVolumeOpenGL
+  vtkViewsCore
+  vtksys
+)
+
+# Build and link library.
+vtk_module_library(${PROJECT_NAME} ${vtkVgCoreSrcs})
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vgCommon
+  LINK_LIBRARIES
+  LINK_PUBLIC
+  vtkInteractionStyle
+  vtkRenderingFreeTypeOpenGL
+  vtkRenderingVolumeOpenGL
+  LINK_PRIVATE
+  vgl
+  vgl_algo
+  vnl
+  vpl
+  vil
+  ${VTK_JPEG_LIBRARIES}
+  ${Boost_LIBRARIES}
+)
+
+vg_add_test_subdirectory()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vtkVgCoreInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VtkVgCore)
+
+vg_wrap_vtk_library(${PROJECT_NAME})
diff --git a/Libraries/VtkVgCore/Testing/CMakeLists.txt b/Libraries/VtkVgCore/Testing/CMakeLists.txt
new file mode 100644
index 00000000..1c97afbf
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/CMakeLists.txt
@@ -0,0 +1,2 @@
+add_subdirectory(Cxx)
+add_subdirectory(Python)
diff --git a/Libraries/VtkVgCore/Testing/Cxx/CMakeLists.txt b/Libraries/VtkVgCore/Testing/Cxx/CMakeLists.txt
new file mode 100644
index 00000000..9bee5868
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/Cxx/CMakeLists.txt
@@ -0,0 +1,17 @@
+vg_include_library_sdk_directories(qtExtensions)
+
+set(VGTEST_LINK_LIBRARIES qtExtensions ${QT_LIBRARIES})
+
+include_directories(${vtkVgCore_SOURCE_DIR})
+
+vg_add_test(vtkVgCore-Instance testVtkVgInstance
+            SOURCES TestInstance.cxx LINK_LIBRARIES vtkVgCore
+)
+vg_add_test(vtkVgCore-SharedInstance testVtkVgSharedInstance
+            SOURCES TestSharedInstance.cxx
+            LINK_LIBRARIES vtkVgCore
+)
+vg_add_test(vtkVgCore-ReadMrj testVtkVgReadMrj
+            SOURCES TestReadMrj.cxx
+            LINK_LIBRARIES vtkVgCore vtkTestingRendering
+)
diff --git a/Libraries/VtkVgCore/Testing/Cxx/TestInstance.cxx b/Libraries/VtkVgCore/Testing/Cxx/TestInstance.cxx
new file mode 100644
index 00000000..9cc97906
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/Cxx/TestInstance.cxx
@@ -0,0 +1,242 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtTest.h>
+
+#include "vtkVgInstance.h"
+
+#include "TestObject.h"
+
+typedef vtkVgInstance<TestObject> Instance;
+
+//-----------------------------------------------------------------------------
+int testDefaultCtor(qtTest& testObject)
+{
+  bool flag = false;
+    {
+    // Test construction
+    Instance i;
+    TEST_EQUAL(i->GetData(), 0);
+
+    // Test basic access
+    i->SetFlag(&flag);
+    TEST_EQUAL(flag, true);
+
+    i->SetData(5);
+    TEST_EQUAL(i->GetData(), 5);
+    }
+
+  // Verify object was destroyed
+  TEST_EQUAL(flag, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testCopyCtor(qtTest& testObject)
+{
+  bool flag1, flag2;
+    {
+    Instance i1;
+    TestObject* p1 = i1;
+    i1->SetFlag(&flag1);
+
+    // Set some data on first instance
+    i1->SetData(4);
+    TEST_EQUAL(i1->GetData(), 4);
+
+      {
+      // Test construction
+      Instance i2(i1);
+      TestObject* p2 = i2;
+      i2->SetFlag(&flag2);
+
+      // Verify copy
+      TEST(p2 != p1);
+      TEST(p2 != i1);
+      TEST_EQUAL(i2->GetData(), 4);
+      }
+    }
+
+  // Verify objects were destroyed
+  TEST_EQUAL(flag1, false);
+  TEST_EQUAL(flag2, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testAssignment(qtTest& testObject)
+{
+  bool flag1, flag2;
+    {
+    Instance i1;
+    TestObject* p1 = i1;
+    i1->SetFlag(&flag1);
+    TEST_EQUAL(i1->GetData(), 0);
+
+      {
+      // Test construction
+      Instance i2;
+      TestObject* p2 = i2;
+      i2->SetFlag(&flag2);
+
+      // Set some data on second instance
+      i2->SetData(3);
+      TEST_EQUAL(i2->GetData(), 3);
+
+      // Copy instance to first instance
+      i1 = i2;
+      TEST_EQUAL(i1->GetData(), 3);
+
+      // Set some different data on second instance
+      i2->SetData(7);
+      TEST_EQUAL(i2->GetData(), 7);
+
+      // Copy pointer to first instance
+      i1 = p2;
+      TEST_EQUAL(i1->GetData(), 7);
+      }
+
+    // Verify object was destroyed
+    TEST_EQUAL(flag2, false);
+
+    // Verify that assignment did not change the underlying object
+    TestObject* p = i1;
+    TEST_EQUAL(p, p1);
+    TEST_EQUAL(flag1, true);
+    TEST_EQUAL(i1->GetData(), 7);
+    }
+
+  // Verify object was destroyed
+  TEST_EQUAL(flag1, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testPtrCtor1(qtTest& testObject)
+{
+  bool flag;
+  TestObject* p = TestObject::New();
+  p->SetFlag(&flag);
+
+  // Set some data on the object
+  p->SetData(9);
+  TEST_EQUAL(p->GetData(), 9);
+
+    {
+    // Test construction
+    Instance i(p, Instance::TakeReference);
+
+    // Verify construction
+    TestObject* pi = i;
+    TEST_EQUAL(pi, p);
+    TEST_EQUAL(i->GetData(), 9);
+    }
+
+  // Verify object was NOT destroyed
+  TEST_EQUAL(flag, true);
+  TEST_EQUAL(p->GetData(), 9);
+
+    {
+    // Test construction (take 2)
+    Instance i(p, Instance::TakeReference);
+
+    // Verify construction (take 2)
+    TestObject* pi = i;
+    TEST_EQUAL(pi, p);
+    TEST_EQUAL(i->GetData(), 9);
+
+    // Verify object still valid after releasing original reference
+    p->Delete();
+    TEST_EQUAL(flag, true);
+    TEST_EQUAL(p->GetData(), 9);
+    }
+
+  // Verify object is destroyed
+  TEST_EQUAL(flag, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testPtrCtor2(qtTest& testObject)
+{
+  bool flag;
+  TestObject* p = TestObject::New();
+  p->SetFlag(&flag);
+
+  // Set some data on the object
+  p->SetData(6);
+  TEST_EQUAL(p->GetData(), 6);
+
+    {
+    // Test construction
+    Instance i(p, Instance::TakeOwnership);
+
+    // Verify construction
+    TestObject* pi = i;
+    TEST_EQUAL(pi, p);
+    TEST_EQUAL(i->GetData(), 6);
+    }
+
+  // Verify object was destroyed
+  TEST_EQUAL(flag, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testPtrCtor3(qtTest& testObject)
+{
+  bool flag1, flag2;
+  TestObject* p1 = TestObject::New();
+  p1->SetFlag(&flag1);
+
+  // Set some data on first object
+  p1->SetData(2);
+  TEST_EQUAL(p1->GetData(), 2);
+
+    {
+    // Test construction
+    Instance i2(p1, Instance::CopyByAssignment);
+    TestObject* p2 = i2;
+    i2->SetFlag(&flag2);
+
+    // Verify copy
+    TEST(p2 != p1);
+    TEST_EQUAL(i2->GetData(), 2);
+
+    // Verify instance valid after first object deleted
+    p1->Delete();
+    TEST_EQUAL(flag1, false);
+    TEST_EQUAL(flag2, true);
+    TEST_EQUAL(i2->GetData(), 2);
+    }
+
+  // Verify object was destroyed
+  TEST_EQUAL(flag2, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  Q_UNUSED(argc);
+  Q_UNUSED(argv);
+
+  qtTest testObject;
+
+  testObject.runSuite("Default Constructor",               testDefaultCtor);
+  testObject.runSuite("Copy Constructor",                  testCopyCtor);
+  testObject.runSuite("Assignment Operator",               testAssignment);
+  testObject.runSuite("Take-Reference Constructor",        testPtrCtor1);
+  testObject.runSuite("Take-Ownership Constructor",        testPtrCtor2);
+  testObject.runSuite("Copy-by-Assignment Constructor",    testPtrCtor3);
+  return testObject.result();
+}
diff --git a/Libraries/VtkVgCore/Testing/Cxx/TestObject.h b/Libraries/VtkVgCore/Testing/Cxx/TestObject.h
new file mode 100644
index 00000000..5386d361
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/Cxx/TestObject.h
@@ -0,0 +1,56 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __TestObject_h
+#define __TestObject_h
+
+#include <vtkObject.h>
+
+class TestObject : public vtkObject
+{
+public:
+  static TestObject* New() { return new TestObject; }
+  vtkTypeMacro(TestObject, vtkObject);
+
+  int GetData() const { return this->Data; }
+  void SetData(int n) { this->Data = n; }
+
+  static void SetCounter(int* c) { TestObject::Counter = c; }
+  void SetFlag(bool* f) { this->Flag = f; f && (*f = true); }
+
+  void DeepCopy(TestObject* src) { this->Data = src->Data; }
+
+protected:
+  TestObject() : Data(0), Flag(0)
+    {
+    this->Counter && ++(*this->Counter);
+    }
+
+  virtual ~TestObject()
+    {
+    this->Counter && --(*this->Counter);
+    this->Flag && (*this->Flag = false);
+    }
+
+  int Data;
+  bool* Flag;
+  static int* Counter;
+};
+
+int* TestObject::Counter = 0;
+
+class TestCounter
+{
+public:
+  TestCounter() : Value(0) { TestObject::SetCounter(&this->Value); }
+  ~TestCounter() { TestObject::SetCounter(0); }
+  int GetValue() const { return this->Value; }
+
+protected:
+  int Value;
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/Testing/Cxx/TestReadMrj.cxx b/Libraries/VtkVgCore/Testing/Cxx/TestReadMrj.cxx
new file mode 100644
index 00000000..6e5af6b9
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/Cxx/TestReadMrj.cxx
@@ -0,0 +1,54 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgMultiResJpgImageReader2.h"
+
+#include <vtkImageActor.h>
+#include <vtkNew.h>
+#include <vtkRegressionTestImage.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkTesting.h>
+
+int main(int argc, char** argv)
+{
+  if (argc < 2)
+    {
+    std::cerr << "Requires second argument for data source" << std::endl;
+    return 1;
+    }
+
+  vtkNew<vtkVgMultiResJpgImageReader2> mrjReader;
+  mrjReader->SetFileName(argv[1]);
+  mrjReader->SetLevel(5);
+  mrjReader->Update();
+
+  vtkNew<vtkImageActor> imageActor;
+  imageActor->SetInputData(mrjReader->GetOutput());
+
+  vtkNew<vtkRenderer> ren;
+  ren->AddActor(imageActor.GetPointer());
+
+  vtkNew<vtkRenderWindow> renWin;
+  renWin->AddRenderer(ren.GetPointer());
+
+  vtkNew<vtkRenderWindowInteractor> viewer;
+  viewer->SetRenderWindow(renWin.GetPointer());
+
+  renWin->Render();
+
+  int retVal = vtkRegressionTestImageThreshold(renWin.GetPointer(), 25);
+  if (retVal == vtkRegressionTester::DO_INTERACTOR)
+    {
+    viewer->Start();
+    retVal = vtkRegressionTester::PASSED;
+    }
+
+  return (!retVal);
+
+  return 0;
+}
diff --git a/Libraries/VtkVgCore/Testing/Cxx/TestSharedInstance.cxx b/Libraries/VtkVgCore/Testing/Cxx/TestSharedInstance.cxx
new file mode 100644
index 00000000..3d7f731c
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/Cxx/TestSharedInstance.cxx
@@ -0,0 +1,234 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtTest.h>
+
+#include "vtkVgSharedInstance.h"
+
+#include "TestObject.h"
+
+typedef vtkVgSharedInstance<TestObject> Instance;
+
+//-----------------------------------------------------------------------------
+int testDefaultCtor(qtTest& testObject)
+{
+  bool flag = false;
+    {
+    // Test construction
+    Instance i;
+    TEST_EQUAL(i->GetData(), 0);
+
+    // Test basic access
+    i->SetFlag(&flag);
+    TEST_EQUAL(flag, true);
+
+    i->SetData(5);
+    TEST_EQUAL(i->GetData(), 5);
+    }
+
+  // Verify object was destroyed
+  TEST_EQUAL(flag, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testAssignmentCtor(qtTest& testObject)
+{
+  bool flag;
+  TestObject* p = TestObject::New();
+  p->SetFlag(&flag);
+
+  // Set some data on the object
+  p->SetData(3);
+  TEST_EQUAL(p->GetData(), 3);
+
+    {
+    // Test construction
+    Instance i(p);
+    TEST_EQUAL(i.GetVolatilePointer(), p);
+    TEST_EQUAL(i->GetData(), 3);
+    }
+
+  // Verify object was destroyed
+  TEST_EQUAL(flag, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testSharing(qtTest& testObject)
+{
+  TestCounter counter;
+
+  Instance i1, i2;
+  TEST_EQUAL(counter.GetValue(), 2);   // i1, i2
+  TEST(i1.GetVolatileConstPointer() != i2.GetVolatileConstPointer());
+  i1->SetData(1);
+  i2->SetData(2);
+
+  // Test copy is shared
+  Instance i3(i1);
+  const Instance& ci3 = i3;
+  TEST_EQUAL(counter.GetValue(), 2);   // i1 == i3, i2
+  TEST(&i3 == &ci3);
+  TEST_EQUAL(ci3.GetVolatileConstPointer(), i1.GetVolatileConstPointer());
+  TEST_EQUAL(ci3->GetData(), 1);
+  TEST_EQUAL(i3.GetVolatileConstPointer(), i1.GetVolatileConstPointer());
+
+  // Test assignment is shared
+  Instance i4;
+  const Instance& ci4 = i4;
+  TEST_EQUAL(counter.GetValue(), 3);   // i1 == i3, i2, i4
+  i4 = i2;
+  TEST_EQUAL(counter.GetValue(), 2);   // i1 == i3, i2 == i4
+  TEST(&i4 == &ci4);
+  TEST_EQUAL(ci4.GetVolatileConstPointer(), i2.GetVolatileConstPointer());
+  TEST_EQUAL(ci4->GetData(), 2);
+  TEST_EQUAL(i4.GetVolatileConstPointer(), i2.GetVolatileConstPointer());
+
+  // Test detach on write
+  const TestObject* p = i1.GetVolatileConstPointer();
+  Instance i5(i1);
+  TEST_EQUAL(counter.GetValue(), 2);   // i1 == i3 == i5, i2 == i4
+  TEST_EQUAL(i5.GetVolatileConstPointer(), p);
+  i5->SetData(5);
+  TEST_EQUAL(counter.GetValue(), 3);   // i1 == i3, i2 == i4, i5
+  TEST_EQUAL(i1.GetVolatileConstPointer(), p);
+  TEST_EQUAL(i3.GetVolatileConstPointer(), p);
+  TEST(i5.GetVolatileConstPointer() != p);
+  TEST_EQUAL(ci3->GetData(), 1);
+  TEST_EQUAL(i5->GetData(), 5);
+
+  // Test detach on non-const pointer access
+  // NOTE: This also verifies that the underlying object pointer is indeed
+  //       volatile
+  TEST_EQUAL(i1.GetVolatileConstPointer(), p);
+  TEST(i1.GetVolatilePointer() != p);
+  TEST_EQUAL(counter.GetValue(), 4);   // i1, i2 == i4, i3, i5
+  TEST(i1.GetVolatileConstPointer() != p);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testReset(qtTest& testObject)
+{
+  TestCounter counter;
+  bool flag;
+
+  // Create an object
+  TestObject* p = TestObject::New();
+  p->SetFlag(&flag);
+  TEST_EQUAL(counter.GetValue(), 1);
+
+  // Set some data on the object
+  p->SetData(8);
+  TEST_EQUAL(p->GetData(), 8);
+
+    {
+    // Create an instance
+    Instance i;
+    TEST_EQUAL(counter.GetValue(), 2);
+
+    // Assign the first object to the instance
+    i.Reset(p);
+    TEST_EQUAL(counter.GetValue(), 1);
+    TEST_EQUAL(i->GetData(), 8);
+    TEST_EQUAL(i.GetVolatilePointer(), p);
+    }
+
+  // Verify the object was destroyed
+  TEST_EQUAL(counter.GetValue(), 0);
+  TEST_EQUAL(flag, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testAssumeOwnership(qtTest& testObject)
+{
+  bool flag;
+  TestObject* p = TestObject::New();
+  const TestObject* cp = p;
+  p->SetFlag(&flag);
+  Instance i1(p);
+
+  // Set some data on the object
+  i1->SetData(7);
+  TEST_EQUAL(i1->GetData(), 7);
+  TEST_EQUAL(i1.GetVolatilePointer(), p);
+
+    {
+    // Create a second instance sharing the first
+    Instance i2(i1);
+    TEST_EQUAL(i2.GetVolatileConstPointer(), cp);
+
+    // Modify the first instance so that it detaches
+    i1->SetData(11);
+    TEST(i1.GetVolatilePointer() != p);
+    }
+
+  // Verify the original object was destroyed
+  TEST_EQUAL(flag, false);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testPoison(qtTest& testObject)
+{
+  TestCounter counter;
+
+  // Create first instance
+  Instance i1;
+  i1->SetData(6);
+  TEST_EQUAL(counter.GetValue(), 1);
+  TEST_EQUAL(i1->GetData(), 6);
+
+  // Poison first instance
+  const TestObject* p1 = i1.GetPointer();
+
+  // Create second instance as a copy of the first
+  const Instance i2(i1);
+  TEST_EQUAL(i2->GetData(), 6);
+
+  // Verify that second instance is a deep copy...
+  TEST_EQUAL(counter.GetValue(), 2);
+  TEST(i2.GetVolatileConstPointer() != p1);
+
+  // ...and first instance did not change
+  const TestObject* p = i1.GetPointer();
+  TEST_EQUAL(p, p1);
+
+  // Release non-volatile pointer to first instance
+  i1.ReleasePointer();
+
+  // Verify that copies now are shared
+  const Instance i3(i1);
+  TEST_EQUAL(counter.GetValue(), 2);
+  TEST_EQUAL(i3.GetVolatileConstPointer(), p1);
+  TEST_EQUAL(i3->GetData(), 6);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  Q_UNUSED(argc);
+  Q_UNUSED(argv);
+
+  qtTest testObject;
+
+  testObject.runSuite("Default Constructor",           testDefaultCtor);
+  testObject.runSuite("Assignment Constructor",        testAssignmentCtor);
+  testObject.runSuite("Sharing",                       testSharing);
+  testObject.runSuite("Reset Method",                  testReset);
+  testObject.runSuite("Assumption of Ownership",       testAssumeOwnership);
+  testObject.runSuite("Poisoning",                     testPoison);
+  return testObject.result();
+}
diff --git a/Libraries/VtkVgCore/Testing/Python/CMakeLists.txt b/Libraries/VtkVgCore/Testing/Python/CMakeLists.txt
new file mode 100644
index 00000000..9e4c92dd
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/Python/CMakeLists.txt
@@ -0,0 +1,15 @@
+set(TESTS_WITHOUT_BASELINES
+  TimeStamp
+)
+
+set(TESTS_WITH_BASELINES
+  MrjImageReader
+)
+
+foreach(test ${TESTS_WITHOUT_BASELINES})
+  vg_add_vtk_python_test(vtkVgCore ${test})
+endforeach()
+
+foreach(test ${TESTS_WITH_BASELINES})
+  vg_add_vtk_python_test(vtkVgCore ${test} WITH_BASELINE)
+endforeach()
diff --git a/Libraries/VtkVgCore/Testing/Python/TestMrjImageReader.py b/Libraries/VtkVgCore/Testing/Python/TestMrjImageReader.py
new file mode 100644
index 00000000..3855953f
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/Python/TestMrjImageReader.py
@@ -0,0 +1,23 @@
+from vtkRenderingCorePython import *
+import vtkRenderingOpenGLPython
+
+import vtkVgCorePython
+from visgui.testing import VtkTest
+
+class TestMrjImageReader(VtkTest):
+  def testRead(self):
+    mrjReader = vtkVgCorePython.vtkVgMultiResJpgImageReader2()
+    mrjReader.SetFileName(self.getDataPath('$VISGUI_DATA_ROOT/sample.mrj'))
+    mrjReader.SetLevel(5)
+    mrjReader.Update()
+
+    imageActor = vtkImageActor()
+    imageActor.SetInputData(mrjReader.GetOutput())
+
+    context = self.createRenderContext()
+    context.renderer.AddActor(imageActor)
+
+    self.compareToBaseline(context)
+
+if __name__ == "__main__":
+    VtkTest.main()
diff --git a/Libraries/VtkVgCore/Testing/Python/TestTimeStamp.py b/Libraries/VtkVgCore/Testing/Python/TestTimeStamp.py
new file mode 100644
index 00000000..1fd52677
--- /dev/null
+++ b/Libraries/VtkVgCore/Testing/Python/TestTimeStamp.py
@@ -0,0 +1,67 @@
+import unittest
+
+from vtkVgCorePython import vtkVgTimeStamp
+
+class TestTimeStamp(unittest.TestCase):
+  def testConstruction(self):
+    # Constructing with time only
+    t1 = vtkVgTimeStamp(123456.0)
+    self.assertTrue(t1.IsValid())
+    self.assertTrue(t1.HasTime())
+    self.assertFalse(t1.HasFrameNumber())
+    self.assertEqual(t1.GetTime(), 123456.0)
+    # Constructing with time and frame number
+    t2 = vtkVgTimeStamp(123456.0, 42)
+    self.assertTrue(t2.IsValid())
+    self.assertTrue(t2.HasTime())
+    self.assertTrue(t2.HasFrameNumber())
+    self.assertEqual(t2.GetTime(), 123456.0)
+    self.assertEqual(t2.GetFrameNumber(), 42)
+    # Constructing minimum time
+    tmin = vtkVgTimeStamp(False)
+    tmax = vtkVgTimeStamp(True)
+    self.assertTrue(tmin.IsMinTime())
+    self.assertTrue(tmax.IsMaxTime())
+
+  def testTime(self):
+    t = vtkVgTimeStamp()
+    # Test initial state
+    self.assertFalse(t.IsValid())
+    self.assertFalse(t.HasTime())
+    # Test setting and getting time
+    t.SetTime(123456.0)
+    self.assertTrue(t.IsValid())
+    self.assertTrue(t.HasTime())
+    self.assertEqual(t.GetTime(), 123456.0)
+
+  def testFrameNumber(self):
+    t = vtkVgTimeStamp()
+    # Test initial state
+    self.assertFalse(t.IsValid())
+    self.assertFalse(t.HasFrameNumber())
+    # Test setting and getting frame number
+    t.SetFrameNumber(42)
+    self.assertTrue(t.IsValid())
+    self.assertTrue(t.HasFrameNumber())
+    self.assertEqual(t.GetFrameNumber(), 42)
+
+  def testMinMax(self):
+    t = vtkVgTimeStamp()
+    self.assertFalse(t.IsValid())
+    t.SetToMinTime()
+    self.assertTrue(t.IsMinTime())
+    t.SetToMaxTime()
+    self.assertTrue(t.IsMaxTime())
+
+  def testReset(self):
+    t = vtkVgTimeStamp(0.0, 0);
+    self.assertTrue(t.IsValid())
+    self.assertTrue(t.HasTime())
+    self.assertTrue(t.HasFrameNumber())
+    t.Reset()
+    self.assertFalse(t.IsValid())
+    self.assertFalse(t.HasTime())
+    self.assertFalse(t.HasFrameNumber())
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/Libraries/VtkVgCore/jmem_src.c b/Libraries/VtkVgCore/jmem_src.c
new file mode 100644
index 00000000..2eaf7adc
--- /dev/null
+++ b/Libraries/VtkVgCore/jmem_src.c
@@ -0,0 +1,223 @@
+/* jmem_src.c: memory source manager for JFIF library
+**
+** There is a companion data module called mem_dest.[ch], which should be
+** read for an explanation of the implementation details of this module.
+**
+** (Based on jdatasrc.c)
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "jmem_src.h"
+
+/*
+** init_source:  Initialize memory source object
+** Called by jpeg_read_header before any data is actually read.
+**
+** cinfo: (in/out) pointer to JPEG decompression object
+*/
+
+METHODDEF(void)
+init_source (j_decompress_ptr cinfo)
+{
+  mem_src_ptr src = (mem_src_ptr) cinfo->src;
+
+  /* Initialize public members */
+
+  /* See the notes in mem_dest.c for init_destination */
+
+  /* next_input_byte is set to point to the beginning of the source
+  ** image buffer
+  */
+  src->pub.next_input_byte = src->buffer;
+
+  /* bytes_in_buffer is set to the maximum size of the input buffer.
+  ** It is assumed that even if the JPEG compressed image data is smaller
+  ** than buffer_size, the JFIF library will see the EOI tag and stop
+  ** decomression before reaching the end of the buffer.
+  */
+  src->pub.bytes_in_buffer = src->buffer_size;
+}
+
+
+
+
+/*
+ * Fill the input buffer --- called whenever buffer is emptied.
+ *
+ * In typical applications, this should read fresh data into the buffer
+ * (ignoring the current state of next_input_byte & bytes_in_buffer),
+ * reset the pointer & count to the start of the buffer, and return TRUE
+ * indicating that the buffer has been reloaded.  It is not necessary to
+ * fill the buffer entirely, only to obtain at least one more byte.
+ *
+ * There is no such thing as an EOF return.  If the end of the file has been
+ * reached, the routine has a choice of ERREXIT() or inserting fake data into
+ * the buffer.  In most cases, generating a warning message and inserting a
+ * fake EOI marker is the best course of action --- this will allow the
+ * decompressor to output however much of the image is there.  However,
+ * the resulting error message is misleading if the real problem is an empty
+ * input file, so we handle that case specially.
+ *
+ * In applications that need to be able to suspend compression due to input
+ * not being available yet, a FALSE return indicates that no more data can be
+ * obtained right now, but more may be forthcoming later.  In this situation,
+ * the decompressor will return to its caller (with an indication of the
+ * number of scanlines it has read, if any).  The application should resume
+ * decompression after it has loaded more data into the input buffer.  Note
+ * that there are substantial restrictions on the use of suspension --- see
+ * the documentation.
+ *
+ * When suspending, the decompressor will back up to a convenient restart point
+ * (typically the start of the current MCU). next_input_byte & bytes_in_buffer
+ * indicate where the restart point will be if the current call returns FALSE.
+ * Data beyond this point must be rescanned after resumption, so move it to
+ * the front of the buffer rather than discarding it.
+ */
+
+/* fill_input_buffer should never be called for memory source.  Entire
+** compressed image should be in buffer at the time of decompression.
+**
+** Just in case something happened to the data on the way into the
+** buffer, fill_input_buffer will fake a EOI.
+*/
+METHODDEF(boolean)
+fill_input_buffer (j_decompress_ptr cinfo)
+{
+  mem_src_ptr src = (mem_src_ptr) cinfo->src;
+
+  fprintf(stderr, "jmem_src: fill_input_buffer: should not be called.\n");
+
+  /* Print a warning message */
+  WARNMS(cinfo, JWRN_JPEG_EOF);
+
+  /* Insert a fake EOI marker */
+  src->buffer[0] = (JOCTET) 0xFF;
+  src->buffer[1] = (JOCTET) JPEG_EOI;
+  src->pub.bytes_in_buffer = 2;
+  src->pub.next_input_byte = src->buffer;
+
+  return TRUE;
+}
+
+
+
+
+/*
+ * Skip data --- used to skip over a potentially large amount of
+ * uninteresting data (such as an APPn marker).
+ *
+ * Writers of suspendable-input applications must note that skip_input_data
+ * is not granted the right to give a suspension return.  If the skip extends
+ * beyond the data currently in the buffer, the buffer can be marked empty so
+ * that the next read will cause a fill_input_buffer call that can suspend.
+ * Arranging for additional bytes to be discarded before reloading the input
+ * buffer is the application writer's problem.
+ */
+
+METHODDEF(void)
+skip_input_data (j_decompress_ptr cinfo, long num_bytes)
+{
+  mem_src_ptr src = (mem_src_ptr) cinfo->src;
+
+  fprintf(stderr, "jmem_src: skip_input_data: %li\n", num_bytes);
+
+  while (num_bytes > (long) src->pub.bytes_in_buffer) {
+    /* This should never happen.  Entire image should be in buffer. */
+    num_bytes -= (long) src->pub.bytes_in_buffer;
+    (void) fill_input_buffer(cinfo);
+
+    /* note we assume that fill_input_buffer will never return FALSE,
+     * so suspension need not be handled.
+     */
+  }
+  src->pub.next_input_byte += (size_t) num_bytes;
+  src->pub.bytes_in_buffer -= (size_t) num_bytes;
+}
+
+
+
+
+/*
+ * An additional method that can be provided by data source modules is the
+ * resync_to_restart method for error recovery in the presence of RST markers.
+ * For the moment, this source module just uses the default resync method
+ * provided by the JPEG library.  That method assumes that no backtracking
+ * is possible.
+ */
+
+
+
+
+/*
+ * Terminate source --- called by jpeg_finish_decompress
+ * after all data has been read.  Often a no-op.
+ *
+ * NB: *not* called by jpeg_abort or jpeg_destroy; surrounding
+ * application must deal with any cleanup that should happen even
+ * for error exit.
+ */
+
+METHODDEF(void)
+term_source (j_decompress_ptr cinfo)
+{
+  /* no work necessary here */
+}
+
+
+
+
+/* jpeg_memory_src: Prepare for input from memory.
+**
+** The user is responsible for having already allocated the image
+** buffer, filling it before calling this decompression module, and will
+** be responsible for freeing that buffer when it is no longer being
+** used.
+**
+** cinfo: (in/out) pointer to decompression object
+** jfif_buffer: (in) decompression image buffer
+** buf_size: (in) maximum size of the jfif_buffer, in bytes.
+**
+** Note that buf_size is the MAXIMUM size of the buffer, not the size of
+** the image.  This is so the same jfif_buffer can be re-filled with a new
+** JPEG compressed image, and the same mem_source object can be re-used
+** to decompress multiple objects.  However, read the comments below
+** concerning the caveat about re-use.
+**
+*/
+
+GLOBAL(void)
+jpeg_memory_src (j_decompress_ptr cinfo, const unsigned char *jfif_buffer,
+                 int buf_size)
+{
+  mem_src_ptr src;
+
+  /* The source object is made permanent so that a series
+   * of JPEG images can be read from the same jfif_buffer by calling
+   * jpeg_memory_src only before the first one.  (If we discarded the
+   * buffer at the end of one image, we'd likely lose the start of
+   * the next one.)
+   *
+   * This makes it unsafe to use this manager and a different source
+   * manager serially with the same JPEG object.  Caveat programmer.
+   */
+  if (cinfo->src == NULL) {     /* first time for this JPEG object? */
+    cinfo->src = (struct jpeg_source_mgr *)
+      (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
+                                  ((size_t) sizeof(mem_source_mgr)));
+  }
+
+  src = (mem_src_ptr) cinfo->src;  /* for casting */
+
+  /* Initialize method pointers */
+  src->pub.init_source = init_source;
+  src->pub.fill_input_buffer = fill_input_buffer;
+  src->pub.skip_input_data = skip_input_data;
+  src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+  src->pub.term_source = term_source;
+
+  /* Initialize private members */
+  src->buffer = (JOCTET*)jfif_buffer;
+  src->buffer_size = buf_size;
+}
diff --git a/Libraries/VtkVgCore/jmem_src.h b/Libraries/VtkVgCore/jmem_src.h
new file mode 100644
index 00000000..276a4f36
--- /dev/null
+++ b/Libraries/VtkVgCore/jmem_src.h
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+/* jmem_src.h: memory source manager for JFIF library
+*/
+
+#include <vtk_jpeg.h>
+
+typedef struct {
+  struct jpeg_source_mgr pub;   /* public fields */
+
+  JOCTET * buffer;              /* image buffer */
+  unsigned int buffer_size;     /* image buffer size */
+} mem_source_mgr;
+
+
+typedef mem_source_mgr * mem_src_ptr;
+
+
+extern GLOBAL(void)
+jpeg_memory_src (j_decompress_ptr cinfo, const unsigned char *jfif_buffer,
+                 int buf_size);
diff --git a/Libraries/VtkVgCore/vtkVg2DGraphMapper.cxx b/Libraries/VtkVgCore/vtkVg2DGraphMapper.cxx
new file mode 100644
index 00000000..691f0815
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVg2DGraphMapper.cxx
@@ -0,0 +1,1000 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// VisGUI includes
+#include "vtkVg2DGraphMapper.h"
+#include "vtkVgApplySelectedColor.h"
+#include "vtkVgArcParallelEdgeStrategy.h"
+#include "vtkVgAssignCoordinatesLayoutStrategy.h"
+
+// VTK includes
+#include <vtkActor.h>
+#include <vtkActor2D.h>
+#include <vtkCamera.h>
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkDirectedGraph.h>
+#include <vtkDistanceToCamera.h>
+#include <vtkEdgeLayout.h>
+#include <vtkExecutive.h>
+#include <vtkFollower.h>
+#include <vtkGarbageCollector.h>
+#include <vtkGlyph3DMapper.h>
+#include <vtkGlyphSource2D.h>
+#include <vtkGraphLayout.h>
+#include <vtkGraphToPolyData.h>
+#include <vtkIconGlyphFilter.h>
+#include <vtkImageData.h>
+#include <vtkInformation.h>
+#include <vtkLabelPlacementMapper.h>
+#include <vtkLookupTableWithEnabling.h>
+#include <vtkMapArrayValues.h>
+#include <vtkMath.h>
+#include <vtkObjectFactory.h>
+#include <vtkPassThroughEdgeStrategy.h>
+#include <vtkPNGReader.h>
+#include <vtkPlaneSource.h>
+#include <vtkPointData.h>
+#include <vtkPointSetToLabelHierarchy.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkPolyDataMapper2D.h>
+#include <vtkProperty.h>
+#include <vtkProperty2D.h>
+#include <vtkRenderer.h>
+#include <vtkTextProperty.h>
+#include <vtkTexture.h>
+#include <vtkTexturedActor2D.h>
+#include <vtkTransformCoordinateSystems.h>
+#include <vtkUndirectedGraph.h>
+#include <vtkVertexGlyphFilter.h>
+#include <vtkViewTheme.h>
+
+vtkStandardNewMacro(vtkVg2DGraphMapper);
+
+#define VTK_CREATE(type,name) \
+  vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
+
+//----------------------------------------------------------------------------
+vtkVg2DGraphMapper::vtkVg2DGraphMapper()
+{
+  this->VertexPointSize = 400.0;
+  this->EdgeLineWidth = 1.0;
+
+  this->GraphToPoly = vtkSmartPointer<vtkGraphToPolyData>::New();
+  this->GraphToPoly->EdgeGlyphOutputOn();
+  this->GraphToPoly->SetEdgeGlyphPosition(0.8);
+
+  this->VertexGlyph  = vtkSmartPointer<vtkVertexGlyphFilter>::New();
+  this->IconTypeToIndex = vtkSmartPointer<vtkMapArrayValues>::New();
+  this->IconGlyph = vtkSmartPointer<vtkIconGlyphFilter>::New();
+  this->IconTransform = vtkSmartPointer<vtkTransformCoordinateSystems>::New();
+  this->EdgeMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
+
+  this->DistanceToCamera  = vtkSmartPointer<vtkDistanceToCamera>::New();
+  this->DistanceToCamera->SetScreenSize(this->VertexPointSize);
+  this->DistanceToCamera->SetInputConnection(this->VertexGlyph->GetOutputPort());
+
+  this->DistanceToCamera2  = vtkSmartPointer<vtkDistanceToCamera>::New();
+  this->DistanceToCamera2->SetScreenSize(26.0);
+  this->DistanceToCamera2->SetInputConnection(this->GraphToPoly->GetOutputPort(1));
+
+  this->EdgeGlyphSource = vtkSmartPointer<vtkGlyphSource2D>::New();
+  this->EdgeGlyphSource->SetGlyphTypeToEdgeArrow();
+  this->EdgeGlyphSource->SetScale(1);
+  this->EdgeGlyphSource->Update();
+
+  this->EdgeGlyph = vtkSmartPointer<vtkGlyph3D>::New();
+  this->EdgeGlyph->SetInputConnection(0, this->DistanceToCamera2->GetOutputPort());
+  this->EdgeGlyph->SetInputConnection(1, this->EdgeGlyphSource->GetOutputPort());
+  this->EdgeGlyph->SetScaleModeToScaleByScalar();
+  this->EdgeGlyph->SetInputArrayToProcess(0, 0, 0,
+    vtkDataObject::FIELD_ASSOCIATION_POINTS, "DistanceToCamera");
+
+  this->VertexMapper = vtkSmartPointer<vtkGlyph3DMapper>::New();
+  this->VertexMapper->SetInputConnection(this->DistanceToCamera->GetOutputPort());
+  this->VertexMapper->SetScaleArray("DistanceToCamera");
+
+  this->IconMapper = vtkSmartPointer<vtkPolyDataMapper2D>::New();
+  this->EdgeActor = vtkSmartPointer<vtkActor>::New();
+  this->VertexActor = vtkSmartPointer<vtkActor>::New();
+  this->IconActor = vtkSmartPointer<vtkTexturedActor2D>::New();
+  this->LabelMapper = vtkSmartPointer<vtkLabelPlacementMapper>::New();
+  this->LabelActor = vtkSmartPointer<vtkActor2D>::New();
+  this->PointsToLabels = vtkSmartPointer<vtkPointSetToLabelHierarchy>::New();
+
+  this->EdgeGlyphMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
+  this->EdgeGlyphMapper->SetInputConnection(this->EdgeGlyph->GetOutputPort());
+  this->EdgeGlyphMapper->SetScalarVisibility(0);
+  this->EdgeGlyphActor = vtkSmartPointer<vtkActor>::New();
+  this->EdgeGlyphActor->SetMapper(this->EdgeGlyphMapper);
+  this->EdgeGlyphActor->GetProperty()->SetColor(0.0, 0.0, 0.0);
+
+  this->ApplyColors = vtkSmartPointer<vtkVgApplySelectedColor>::New();
+
+  this->GraphLayout = vtkSmartPointer<vtkGraphLayout>::New();
+  this->GraphLayoutStrategy =
+    vtkSmartPointer<vtkVgAssignCoordinatesLayoutStrategy>::New();
+
+  this->GraphLayout->SetLayoutStrategy(this->GraphLayoutStrategy);
+
+  this->EdgeLayout = vtkSmartPointer<vtkEdgeLayout>::New();
+  this->PassThroughEdgeStrategy =
+    vtkSmartPointer<vtkPassThroughEdgeStrategy>::New();
+  this->ArcParallelEdgeStrategy =
+    vtkSmartPointer<vtkVgArcParallelEdgeStrategy>::New();
+
+  this->ArcParallelEdgeStrategy->SetMinLoopHeight(0.05);
+  this->ArcParallelEdgeStrategy->SetMaxLoopHeight(0.15);
+  this->ArcParallelEdgeStrategy->SetNumberOfSubdivisions(20);
+  this->EdgeLayout->SetLayoutStrategy(this->PassThroughEdgeStrategy);
+  this->EdgeLayout->SetInputConnection(this->GraphLayout->GetOutputPort());
+
+  this->VertexLookupTable = vtkLookupTableWithEnabling::New();
+  this->EdgeLookupTable = vtkLookupTableWithEnabling::New();
+  this->VertexPositionArrayNameInternal = 0;
+  this->VertexColorArrayNameInternal = 0;
+  this->VertexSelectionArrayNameInternal = 0;
+  this->EdgeColorArrayNameInternal = 0;
+  this->EdgeSelectionArrayNameInternal = 0;
+  this->EnabledEdgesArrayName = 0;
+  this->EnabledVerticesArrayName = 0;
+
+  this->VertexMapper->SetScalarModeToUsePointFieldData();
+  this->VertexMapper->SelectColorArray("vtkVgApplySelectedColor color");
+  this->VertexMapper->SetLookupTable(this->VertexLookupTable);
+  this->VertexMapper->SetScalarVisibility(true);
+  this->VertexMapper->ImmediateModeRenderingOff();
+  this->VertexActor->PickableOn();
+  this->EdgeMapper->SetScalarModeToUseCellFieldData();
+  this->EdgeMapper->SelectColorArray("vtkVgApplySelectedColor color");
+  this->EdgeMapper->SetLookupTable(this->EdgeLookupTable);
+  this->EdgeMapper->SetScalarVisibility(true);
+  this->EdgeMapper->ImmediateModeRenderingOff();
+  this->EdgeActor->SetPosition(0, 0, -0.003);
+  this->EdgeActor->GetProperty()->SetLineWidth(this->GetEdgeLineWidth());
+  this->EdgeActor->GetProperty()->SetOpacity(0.9);
+
+  this->ApplyColors->SetDefaultCellColor(0.5, 0.5, 0.5);
+  this->ApplyColors->SetInputConnection(this->EdgeLayout->GetOutputPort());
+
+  this->IconTransform->SetInputCoordinateSystemToWorld();
+  this->IconTransform->SetOutputCoordinateSystemToDisplay();
+  this->IconTransform->SetInputConnection(this->VertexGlyph->GetOutputPort());
+
+  this->IconTypeToIndex->SetInputConnection(this->IconTransform->GetOutputPort());
+  this->IconTypeToIndex->SetFieldType(vtkMapArrayValues::POINT_DATA);
+  this->IconTypeToIndex->SetOutputArrayType(VTK_INT);
+  this->IconTypeToIndex->SetPassArray(0);
+  this->IconTypeToIndex->SetFillValue(-1);
+
+  this->IconGlyph->SetInputConnection(this->IconTypeToIndex->GetOutputPort());
+  this->IconGlyph->SetUseIconSize(true);
+  this->IconMapper->SetInputConnection(this->IconGlyph->GetOutputPort());
+  this->IconMapper->ScalarVisibilityOff();
+
+  this->IconActor->SetMapper(this->IconMapper);
+  this->IconArrayNameInternal = 0;
+
+  this->VertexActor->SetMapper(this->VertexMapper);
+  this->EdgeMapper->SetInputConnection(this->GraphToPoly->GetOutputPort());
+  this->EdgeActor->SetMapper(this->EdgeMapper);
+
+  this->PointsToLabels->SetInputConnection(this->GraphToPoly->GetOutputPort());
+  this->PointsToLabels->GetTextProperty()->SetJustificationToCentered();
+  this->PointsToLabels->GetTextProperty()->SetVerticalJustificationToCentered();
+  this->PointsToLabels->GetTextProperty()->SetBold(1);
+  this->PointsToLabels->GetTextProperty()->SetFontFamilyToTimes();
+  this->PointsToLabels->GetTextProperty()->SetColor(0.0, 0.0, 0.0);
+
+  // HACK: Setting the maximum depth to a large value helps minimize the strange
+  // behavior where labels spiral outwards when two or more points are
+  // coincident and there is a non-coincident point nearby. This is because the
+  // "spiral offset" is divided by the max depth in
+  // vtkLabelHierarchy::ComputeHierarchy().
+  this->PointsToLabels->SetMaximumDepth(999999);
+
+  this->LabelMapper->SetInputConnection(this->PointsToLabels->GetOutputPort());
+  this->LabelActor->SetMapper(this->LabelMapper);
+
+  // Set default parameters
+  this->SetVertexColorArrayName("VertexDegree");
+  this->SetVertexSelectionArrayName("Selected");
+  this->SetColorVertices(false);
+  this->SetEdgeColorArrayName("weight");
+  this->SetEdgeSelectionArrayName("Selected");
+  this->SetColorEdges(false);
+  this->SetEnabledEdgesArrayName("weight");
+  this->SetEnabledVerticesArrayName("VertexDegree");
+  this->EnableEdgesByArray = 0;
+  this->EnableVerticesByArray = 0;
+  this->IconVisibilityOff();
+  this->LabelVisibilityOff();
+}
+
+//----------------------------------------------------------------------------
+vtkVg2DGraphMapper::~vtkVg2DGraphMapper()
+{
+  // Delete internally created objects.
+  // Note: All of the smartpointer objects
+  //       will be deleted for us
+  this->SetVertexPositionArrayNameInternal(0);
+  this->SetVertexColorArrayNameInternal(0);
+  this->SetVertexSelectionArrayNameInternal(0);
+  this->SetEdgeColorArrayNameInternal(0);
+  this->SetEdgeSelectionArrayNameInternal(0);
+  this->SetEnabledEdgesArrayName(0);
+  this->SetEnabledVerticesArrayName(0);
+  this->SetIconArrayNameInternal(0);
+  this->VertexLookupTable->Delete();
+  this->VertexLookupTable = 0;
+  this->EdgeLookupTable->Delete();
+  this->EdgeLookupTable = 0;
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetUseEdgeLayout(bool enabled)
+{
+  if (enabled)
+    {
+    this->EdgeLayout->SetLayoutStrategy(this->ArcParallelEdgeStrategy);
+    }
+  else
+    {
+    this->EdgeLayout->SetLayoutStrategy(this->PassThroughEdgeStrategy);
+    }
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetIconArrayName(const char* name)
+{
+  this->SetIconArrayNameInternal(name);
+  this->IconGlyph->SetInputArrayToProcess(0, 0, 0,
+                                          vtkDataObject::FIELD_ASSOCIATION_POINTS, name);
+  this->IconTypeToIndex->SetInputArrayName(name);
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVg2DGraphMapper::GetIconArrayName()
+{
+  return this->GetIconArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+// Helper method
+vtkPolyData* vtkVg2DGraphMapper::CreateCircle(bool vtkNotUsed(filled))
+{
+  int circleRes = 16;
+  vtkIdType ptIds[17];
+  double x[3], theta;
+
+  // Allocate storage
+  vtkPolyData* poly = vtkPolyData::New();
+  VTK_CREATE(vtkPoints, pts);
+  VTK_CREATE(vtkCellArray, circle);
+
+  // generate points around the circle
+  x[2] = 0.0;
+  theta = 2.0 * vtkMath::Pi() / circleRes;
+  for (int i = 0; i < circleRes; i++)
+    {
+    x[0] = 0.5 * cos(i * theta);
+    x[1] = 0.5 * sin(i * theta);
+    ptIds[i] = pts->InsertNextPoint(x);
+    }
+  circle->InsertNextCell(circleRes, ptIds);
+
+  poly->SetPoints(pts);
+  poly->SetPolys(circle);
+  return poly;
+}
+
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetVertexColorArrayName(const char* name)
+{
+  this->SetVertexColorArrayNameInternal(name);
+  this->ApplyColors->SetInputArrayToProcess(1, 0, 0,
+    vtkDataObject::FIELD_ASSOCIATION_VERTICES, name);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVg2DGraphMapper::GetVertexColorArrayName()
+{
+  return this->GetVertexColorArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetVertexPositionArrayName(const char* name)
+{
+  this->SetVertexPositionArrayNameInternal(name);
+  this->GraphLayoutStrategy->SetXYZCoordArrayName(name);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVg2DGraphMapper::GetVertexPositionArrayName()
+{
+  return this->GetVertexPositionArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetVertexSelectionArrayName(const char* name)
+{
+  this->SetVertexSelectionArrayNameInternal(name);
+  this->ApplyColors->SetInputArrayToProcess(0, 0, 0,
+    vtkDataObject::FIELD_ASSOCIATION_VERTICES, name);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVg2DGraphMapper::GetVertexSelectionArrayName()
+{
+  return this->GetVertexSelectionArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetLabelArrayName(const char* name)
+{
+  this->PointsToLabels->SetLabelArrayName(name);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVg2DGraphMapper::GetLabelArrayName()
+{
+  return this->PointsToLabels->GetLabelArrayName();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetUseVertexSelection(bool enable)
+{
+  this->ApplyColors->SetUsePointSelection(enable);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetUseVertexSelection()
+{
+  return this->ApplyColors->GetUsePointSelection();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetColorVertices(bool vis)
+{
+  this->ApplyColors->SetUsePointScalars(vis);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetColorVertices()
+{
+  return this->ApplyColors->GetUsePointScalars();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetIconVisibility(bool vis)
+{
+  this->IconActor->SetVisibility(vis);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetIconVisibility()
+{
+  return this->IconActor->GetVisibility() != 0;
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetLabelVisibility(bool vis)
+{
+  this->LabelActor->SetVisibility(vis);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetLabelVisibility()
+{
+  return this->LabelActor->GetVisibility() != 0;
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetLabelColor(double color[3])
+{
+  this->PointsToLabels->GetTextProperty()->SetColor(color);
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetEdgeGlyphVisibility(bool vis)
+{
+  this->EdgeGlyphActor->SetVisibility(vis);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetEdgeGlyphVisibility()
+{
+  return this->EdgeGlyphActor->GetVisibility() != 0;
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetEdgeGlyphColor(double color[3])
+{
+  this->EdgeGlyphActor->GetProperty()->SetColor(color);
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetEdgeColorArrayName(const char* name)
+{
+  this->SetEdgeColorArrayNameInternal(name);
+  this->ApplyColors->SetInputArrayToProcess(3, 0, 0,
+    vtkDataObject::FIELD_ASSOCIATION_EDGES, name);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVg2DGraphMapper::GetEdgeColorArrayName()
+{
+  return this->GetEdgeColorArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetEdgeSelectionArrayName(const char* name)
+{
+  this->SetEdgeSelectionArrayNameInternal(name);
+  this->ApplyColors->SetInputArrayToProcess(2, 0, 0,
+    vtkDataObject::FIELD_ASSOCIATION_EDGES, name);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVg2DGraphMapper::GetEdgeSelectionArrayName()
+{
+  return this->GetEdgeSelectionArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetUseEdgeSelection(bool enable)
+{
+  this->ApplyColors->SetUseCellSelection(enable);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetUseEdgeSelection()
+{
+  return this->ApplyColors->GetUseCellSelection();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetColorEdges(bool vis)
+{
+  this->ApplyColors->SetUseCellScalars(vis);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetColorEdges()
+{
+  return this->ApplyColors->GetUseCellScalars();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetVertexPointSize(double size)
+{
+  this->VertexPointSize = size;
+
+  this->DistanceToCamera->SetScreenSize(size);
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetEdgeLineWidth(float width)
+{
+  this->EdgeLineWidth = width;
+  this->EdgeActor->GetProperty()->SetLineWidth(this->GetEdgeLineWidth());
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::AddIconType(char* type, int index)
+{
+  this->IconTypeToIndex->AddToMap(type, index);
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::ClearIconTypes()
+{
+  this->IconTypeToIndex->ClearMap();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetVertexVisibility(bool vis)
+{
+  this->VertexActor->SetVisibility(vis);
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetVertexVisibility()
+{
+  return this->VertexActor->GetVisibility() ? true : false;
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetEdgeVisibility(bool vis)
+{
+  this->EdgeActor->SetVisibility(vis);
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVg2DGraphMapper::GetEdgeVisibility()
+{
+  return this->EdgeActor->GetVisibility() ? true : false;
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetIconSize(int* size)
+{
+  this->IconGlyph->SetIconSize(size);
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetIconAlignment(int alignment)
+{
+  this->IconGlyph->SetGravity(alignment);
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+int* vtkVg2DGraphMapper::GetIconSize()
+{
+  return this->IconGlyph->GetIconSize();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetIconTexture(vtkTexture* texture)
+{
+  this->IconActor->SetTexture(texture);
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+vtkTexture* vtkVg2DGraphMapper::GetIconTexture()
+{
+  return this->IconActor->GetTexture();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetInputData(vtkGraph* input)
+{
+  if (input)
+    {
+    this->SetInputDataInternal(0, input);
+    }
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+vtkGraph* vtkVg2DGraphMapper::GetInput()
+{
+  vtkGraph* inputGraph =
+    vtkGraph::SafeDownCast(this->Superclass::GetInputAsDataSet());
+  return inputGraph;
+}
+
+// ---------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetVertexGeometry(vtkPolyData* geometry)
+{
+  this->VertexGeometry = geometry;
+
+  this->VertexMapper->SetSourceData(this->VertexGeometry);
+
+  this->Modified();
+}
+
+// ---------------------------------------------------------------------------
+vtkPolyData* vtkVg2DGraphMapper::GetVertexGeometry()
+{
+  return this->VertexGeometry;
+}
+
+// ---------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetVertexOpacity(double value)
+{
+  this->VertexActor->GetProperty()->SetOpacity(value);
+}
+
+// ---------------------------------------------------------------------------
+void vtkVg2DGraphMapper::SetEdgeOpacity(double value)
+{
+  this->EdgeActor->GetProperty()->SetOpacity(value);
+}
+
+// ---------------------------------------------------------------------------
+vtkGlyphSource2D* vtkVg2DGraphMapper::GetEdgeGlyphSource()
+{
+  return this->EdgeGlyphSource;
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::ReleaseGraphicsResources(vtkWindow* renWin)
+{
+  if (this->EdgeMapper)
+    {
+    this->EdgeMapper->ReleaseGraphicsResources(renWin);
+    }
+  if (this->VertexMapper)
+    {
+    this->VertexMapper->ReleaseGraphicsResources(renWin);
+    }
+  if (this->IconMapper)
+    {
+    this->IconMapper->ReleaseGraphicsResources(renWin);
+    }
+}
+
+//----------------------------------------------------------------------------
+// Receives from Actor -> maps data to primitives
+//
+void vtkVg2DGraphMapper::Render(vtkRenderer* ren, vtkActor* vtkNotUsed(act))
+{
+  this->DistanceToCamera->SetRenderer(ren);
+  this->DistanceToCamera2->SetRenderer(ren);
+
+  // make sure that we've been properly initialized
+  if (!this->GetExecutive()->GetInputData(0, 0))
+    {
+    vtkErrorMacro(<< "No input!\n");
+    return;
+    }
+
+  // Update the pipeline up until the graph to poly data
+  vtkGraph* input = vtkGraph::SafeDownCast(this->GetExecutive()->GetInputData(0, 0));
+  if (!input)
+    {
+    vtkErrorMacro(<< "Input is not a graph!\n");
+    return;
+    }
+  vtkGraph* graph = 0;
+  if (vtkDirectedGraph::SafeDownCast(input))
+    {
+    graph = vtkDirectedGraph::New();
+    }
+  else
+    {
+    graph = vtkUndirectedGraph::New();
+    }
+  graph->ShallowCopy(input);
+
+  this->GraphLayout->SetInputData(graph);
+  this->GraphToPoly->SetInputConnection(this->ApplyColors->GetOutputPort());
+  this->VertexGlyph->SetInputConnection(this->ApplyColors->GetOutputPort());
+  graph->Delete();
+  this->GraphToPoly->Update();
+  this->DistanceToCamera->Update();
+  this->DistanceToCamera2->Update();
+  vtkPolyData* edgePd = this->GraphToPoly->GetOutput();
+  vtkPolyData* vertPd = this->VertexGlyph->GetOutput();
+
+  // Try to find the range the user-specified color array.
+  // If we cannot find that array, use the scalar range.
+  double range[2];
+  vtkDataArray* arr = 0;
+  if (this->GetColorEdges())
+    {
+    if (this->GetEdgeColorArrayName())
+      {
+      arr = edgePd->GetCellData()->GetArray(this->GetEdgeColorArrayName());
+      }
+    if (!arr)
+      {
+      arr = edgePd->GetCellData()->GetScalars();
+      }
+    if (arr)
+      {
+      arr->GetRange(range);
+      this->EdgeMapper->SetScalarRange(range[0], range[1]);
+      }
+    }
+
+  arr = 0;
+  if (this->EnableEdgesByArray && this->EnabledEdgesArrayName)
+    {
+    vtkLookupTableWithEnabling::SafeDownCast(this->EdgeLookupTable)->SetEnabledArray(
+      edgePd->GetCellData()->GetArray(this->GetEnabledEdgesArrayName()));
+    }
+  else
+    {
+    vtkLookupTableWithEnabling::SafeDownCast(this->EdgeLookupTable)->SetEnabledArray(0);
+    }
+
+  // Do the same thing for the vertex array.
+  arr = 0;
+  if (this->GetColorVertices())
+    {
+    if (this->GetVertexColorArrayName())
+      {
+      arr = vertPd->GetPointData()->GetArray(this->GetVertexColorArrayName());
+      }
+    if (!arr)
+      {
+      arr = vertPd->GetPointData()->GetScalars();
+      }
+    if (arr)
+      {
+      arr->GetRange(range);
+      this->VertexMapper->SetScalarRange(range[0], range[1]);
+      }
+    }
+
+  arr = 0;
+  if (this->EnableVerticesByArray && this->EnabledVerticesArrayName)
+    {
+    vtkLookupTableWithEnabling::SafeDownCast(this->VertexLookupTable)->SetEnabledArray(
+      vertPd->GetPointData()->GetArray(this->GetEnabledVerticesArrayName()));
+    }
+  else
+    {
+    vtkLookupTableWithEnabling::SafeDownCast(this->VertexLookupTable)->SetEnabledArray(0);
+    }
+
+  if (this->IconActor->GetTexture() &&
+      this->IconActor->GetTexture()->GetInput() &&
+      this->IconActor->GetVisibility())
+    {
+    this->IconTransform->SetViewport(ren);
+    this->IconActor->GetTexture()->MapColorScalarsThroughLookupTableOff();
+    this->IconActor->GetTexture()->Update();
+    int* dim = this->IconActor->GetTexture()->GetInput()->GetDimensions();
+    this->IconGlyph->SetIconSheetSize(dim);
+    // Override the array for vtkIconGlyphFilter to process if we have
+    // a map of icon types.
+    if (this->IconTypeToIndex->GetMapSize())
+      {
+      this->IconGlyph->SetInputArrayToProcess(0, 0, 0,
+        vtkDataObject::FIELD_ASSOCIATION_POINTS,
+        this->IconTypeToIndex->GetOutputArrayName());
+      }
+    }
+  if (this->EdgeActor->GetVisibility())
+    {
+    this->EdgeActor->RenderOpaqueGeometry(ren);
+    }
+  if (this->VertexActor->GetVisibility())
+    {
+    this->VertexActor->RenderOpaqueGeometry(ren);
+    }
+  if (this->IconActor->GetVisibility())
+    {
+    this->IconActor->RenderOpaqueGeometry(ren);
+    }
+  if (this->LabelActor->GetVisibility())
+    {
+    this->LabelActor->RenderOpaqueGeometry(ren);
+    }
+  if (this->EdgeGlyphActor->GetVisibility())
+    {
+    this->EdgeGlyphActor->RenderOpaqueGeometry(ren);
+    }
+
+  if (this->EdgeActor->GetVisibility())
+    {
+    this->EdgeActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+  if (this->VertexActor->GetVisibility())
+    {
+    this->VertexActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+  if (this->IconActor->GetVisibility())
+    {
+    this->IconActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+  if (this->LabelActor->GetVisibility())
+    {
+    this->LabelActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+  if (this->EdgeGlyphActor->GetVisibility())
+    {
+    this->EdgeGlyphActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+
+  if (this->IconActor->GetVisibility())
+    {
+    this->IconActor->RenderOverlay(ren);
+    }
+  if (this->LabelActor->GetVisibility())
+    {
+    this->LabelActor->RenderOverlay(ren);
+    }
+
+  this->TimeToDraw = this->EdgeMapper->GetTimeToDraw() +
+                     this->VertexMapper->GetTimeToDraw() +
+                     this->IconMapper->GetTimeToDraw();
+}
+
+void vtkVg2DGraphMapper::ApplyViewTheme(vtkViewTheme* theme)
+{
+  this->VertexActor->GetProperty()->SetColor(theme->GetPointColor());
+  this->VertexActor->GetProperty()->SetOpacity(theme->GetPointOpacity());
+  this->SetVertexPointSize(theme->GetPointSize());
+  this->VertexLookupTable->SetHueRange(theme->GetPointHueRange());
+  this->VertexLookupTable->SetSaturationRange(theme->GetPointSaturationRange());
+  this->VertexLookupTable->SetValueRange(theme->GetPointValueRange());
+  this->VertexLookupTable->SetAlphaRange(theme->GetPointAlphaRange());
+  this->VertexLookupTable->Build();
+
+  this->EdgeActor->GetProperty()->SetColor(theme->GetCellColor());
+  this->EdgeActor->GetProperty()->SetOpacity(theme->GetCellOpacity());
+  this->SetEdgeLineWidth(theme->GetLineWidth());
+  this->EdgeLookupTable->SetHueRange(theme->GetCellHueRange());
+  this->EdgeLookupTable->SetSaturationRange(theme->GetCellSaturationRange());
+  this->EdgeLookupTable->SetValueRange(theme->GetCellValueRange());
+  this->EdgeLookupTable->SetAlphaRange(theme->GetCellAlphaRange());
+  this->EdgeLookupTable->Build();
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  if (this->EdgeMapper)
+    {
+    os << indent << "EdgeMapper: (" << this->EdgeMapper << ")\n";
+    }
+  else
+    {
+    os << indent << "EdgeMapper: (none)\n";
+    }
+  if (this->VertexMapper)
+    {
+    os << indent << "VertexMapper: (" << this->VertexMapper << ")\n";
+    }
+  else
+    {
+    os << indent << "VertexMapper: (none)\n";
+    }
+  if (this->EdgeActor)
+    {
+    os << indent << "EdgeActor: (" << this->EdgeActor << ")\n";
+    }
+  else
+    {
+    os << indent << "EdgeActor: (none)\n";
+    }
+  if (this->VertexActor)
+    {
+    os << indent << "VertexActor: (" << this->VertexActor << ")\n";
+    }
+  else
+    {
+    os << indent << "VertexActor: (none)\n";
+    }
+
+  if (this->GraphToPoly)
+    {
+    os << indent << "GraphToPoly: (" << this->GraphToPoly << ")\n";
+    }
+  else
+    {
+    os << indent << "GraphToPoly: (none)\n";
+    }
+
+  if (this->VertexLookupTable)
+    {
+    os << indent << "VertexLookupTable: (" << this->VertexLookupTable << ")\n";
+    }
+  else
+    {
+    os << indent << "VertexLookupTable: (none)\n";
+    }
+
+  if (this->EdgeLookupTable)
+    {
+    os << indent << "EdgeLookupTable: (" << this->EdgeLookupTable << ")\n";
+    }
+  else
+    {
+    os << indent << "EdgeLookupTable: (none)\n";
+    }
+
+  os << indent << "VertexPointSize: " << this->VertexPointSize << endl;
+  os << indent << "EdgeLineWidth: " << this->EdgeLineWidth << endl;
+  os << indent << "EnableEdgesByArray: " << this->EnableEdgesByArray << endl;
+  os << indent << "EnableVerticesByArray: " << this->EnableVerticesByArray << endl;
+  os << indent << "EnabledEdgesArrayName: "
+     << (this->EnabledEdgesArrayName ? "" : "(null)") << endl;
+  os << indent << "EnabledVerticesArrayName: "
+     << (this->EnabledVerticesArrayName ? "" : "(null)") << endl;
+
+}
+
+//----------------------------------------------------------------------------
+unsigned long vtkVg2DGraphMapper::GetMTime()
+{
+  unsigned long mTime = this->vtkMapper::GetMTime();
+  unsigned long time;
+
+  if (this->LookupTable != NULL)
+    {
+    time = this->LookupTable->GetMTime();
+    mTime = (time > mTime ? time : mTime);
+    }
+
+  return mTime;
+}
+
+//----------------------------------------------------------------------------
+int vtkVg2DGraphMapper::FillInputPortInformation(
+  int vtkNotUsed(port), vtkInformation* info)
+{
+  info->Set(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkGraph");
+  return 1;
+}
+
+//----------------------------------------------------------------------------
+double* vtkVg2DGraphMapper::GetBounds()
+{
+  vtkGraph* graph = vtkGraph::SafeDownCast(this->GetExecutive()->GetInputData(0, 0));
+  if (!graph)
+    {
+    vtkMath::UninitializeBounds(this->Bounds);
+    return this->Bounds;
+    }
+  if (!this->Static)
+    {
+    this->Update();
+    graph = vtkGraph::SafeDownCast(this->GetExecutive()->GetInputData(0, 0));
+    }
+  if (!graph)
+    {
+    vtkMath::UninitializeBounds(this->Bounds);
+    return this->Bounds;
+    }
+
+  if (this->VertexGlyph->GetInput())
+    {
+    this->VertexMapper->GetBounds(this->Bounds);
+    }
+  else
+    {
+    // If there is no input yet to vertex glyph, then it means no render has
+    // happened yet, and therefore we don't have good bounds info. However,
+    // we may never get rendered at all if we're culled due to returning bad
+    // bounds! Work around this chicken-and-egg problem by returning null
+    // bounds, ensuring that the initial render will always occur.
+    return 0;
+    //graph->GetBounds(this->Bounds);
+    }
+
+  return this->Bounds;
+}
+
+//----------------------------------------------------------------------------
+void vtkVg2DGraphMapper::ReportReferences(vtkGarbageCollector* collector)
+{
+  this->Superclass::ReportReferences(collector);
+  // These filters share our input and are therefore involved in a
+  // reference loop.
+  //vtkGarbageCollectorReport(collector, this->GraphToPoly,
+  //                          "GraphToPoly");
+}
diff --git a/Libraries/VtkVgCore/vtkVg2DGraphMapper.h b/Libraries/VtkVgCore/vtkVg2DGraphMapper.h
new file mode 100644
index 00000000..6830ff80
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVg2DGraphMapper.h
@@ -0,0 +1,355 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVg2DGraphMapper_h
+#define __vtkVg2DGraphMapper_h
+
+#include "vtkSmartPointer.h"    // Required for smart pointer internal ivars.
+
+#include <vgExport.h>
+
+// VTK includes
+#include <vtkMapper.h>
+#include <vtkPolyData.h>
+
+class vtkActor2D;
+class vtkVgArcParallelEdgeStrategy;
+class vtkCamera;
+class vtkCellCenters;
+class vtkDistanceToCamera;
+class vtkEdgeLayout;
+class vtkFollower;
+class vtkGlyphSource2D;
+class vtkGlyph3D;
+class vtkGlyph3DMapper;
+class vtkGraph;
+class vtkGraphLayout;
+class vtkGraphToPolyData;
+class vtkIconGlyphFilter;
+class vtkLabelPlacementMapper;
+class vtkLookupTable;
+class vtkMapArrayValues;
+class vtkPassThroughEdgeStrategy;
+class vtkPointSetToLabelHierarchy;
+class vtkPointSource;
+class vtkPolyData;
+class vtkPolyDataMapper;
+class vtkPolyDataMapper2D;
+class vtkTexture;
+class vtkTexturedActor2D;
+class vtkTransformCoordinateSystems;
+class vtkVertexGlyphFilter;
+class vtkViewTheme;
+
+class vtkVgApplySelectedColor;
+class vtkVgAssignCoordinatesLayoutStrategy;
+
+// C++ includes.
+#include <map>
+
+class VTKVG_CORE_EXPORT vtkVg2DGraphMapper : public vtkMapper
+{
+public:
+  static vtkVg2DGraphMapper* New();
+  vtkTypeMacro(vtkVg2DGraphMapper, vtkMapper);
+  void PrintSelf(ostream& os, vtkIndent indent);
+  void Render(vtkRenderer* ren, vtkActor* act);
+
+  // Description:
+  // The array to use for positioning vertices.
+  void SetVertexPositionArrayName(const char* name);
+  const char* GetVertexPositionArrayName();
+
+  // Description:
+  // The array to use for coloring vertices.  Default is "color".
+  void SetVertexColorArrayName(const char* name);
+  const char* GetVertexColorArrayName();
+
+  void SetVertexSelectionArrayName(const char* name);
+  const char* GetVertexSelectionArrayName();
+
+  // Description:
+  // The array to use for labeling vertices.
+  void SetLabelArrayName(const char* name);
+  const char* GetLabelArrayName();
+
+  // Description:
+  // Whether to use vertex selection array.  Default is off.
+  void SetUseVertexSelection(bool enable);
+  bool GetUseVertexSelection();
+
+  // Description:
+  // Whether to color vertices.  Default is off.
+  void SetColorVertices(bool vis);
+  bool GetColorVertices();
+
+  // Description:
+  // Whether to show vertices or not.  Default is on.
+  void SetVertexVisibility(bool vis);
+  bool GetVertexVisibility();
+  vtkBooleanMacro(VertexVisibility, bool);
+
+  // Description:
+  // Whether to show edges or not.  Default is on.
+  void SetEdgeVisibility(bool vis);
+  bool GetEdgeVisibility();
+  vtkBooleanMacro(EdgeVisibility, bool);
+
+  // Description:
+  // The array to use for coloring edges.  Default is "color".
+  void SetEdgeColorArrayName(const char* name);
+  const char* GetEdgeColorArrayName();
+
+  void SetEdgeSelectionArrayName(const char* name);
+  const char* GetEdgeSelectionArrayName();
+
+  // Description:
+  // Whether to use edge selection array.  Default is off.
+  void SetUseEdgeSelection(bool enable);
+  bool GetUseEdgeSelection();
+
+  // Description:
+  // Whether to color edges.  Default is off.
+  void SetColorEdges(bool vis);
+  bool GetColorEdges();
+
+  // Description:
+  // The array to use for coloring edges.  Default is "color".
+  vtkSetStringMacro(EnabledEdgesArrayName);
+  vtkGetStringMacro(EnabledEdgesArrayName);
+
+  // Description:
+  // Whether to enable/disable edges using array values.  Default is off.
+  vtkSetMacro(EnableEdgesByArray, int);
+  vtkGetMacro(EnableEdgesByArray, int);
+  vtkBooleanMacro(EnableEdgesByArray, int);
+
+  // Description:
+  // The array to use for coloring edges.  Default is "color".
+  vtkSetStringMacro(EnabledVerticesArrayName);
+  vtkGetStringMacro(EnabledVerticesArrayName);
+
+  // Description:
+  // Whether to enable/disable vertices using array values.  Default is off.
+  vtkSetMacro(EnableVerticesByArray, int);
+  vtkGetMacro(EnableVerticesByArray, int);
+  vtkBooleanMacro(EnableVerticesByArray, int);
+
+  // Description:
+  // Whether to layout edges or just pass through
+  void SetUseEdgeLayout(bool enable);
+
+  // Description:
+  // The array to use for assigning icons.
+  void SetIconArrayName(const char* name);
+  const char* GetIconArrayName();
+
+  // Description:
+  // Associate the icon at index "index" in the vtkTexture to all vertices
+  // containing "type" as a value in the vertex attribute array specified by
+  // IconArrayName.
+  void AddIconType(char* type, int index);
+
+  // Description:
+  // Clear all icon mappings.
+  void ClearIconTypes();
+
+  // Description:
+  // Specify the Width and Height, in pixels, of an icon in the icon sheet.
+  void SetIconSize(int* size);
+  int* GetIconSize();
+
+  // Description:
+  // Specify where the icons should be placed in relation to the vertex.
+  // See vtkIconGlyphFilter.h for possible values.
+  void SetIconAlignment(int alignment);
+
+  // Description:
+  // The texture containing the icon sheet.
+  vtkTexture* GetIconTexture();
+  void SetIconTexture(vtkTexture* texture);
+
+  // Description:
+  // Whether to show icons.  Default is off.
+  void SetIconVisibility(bool vis);
+  bool GetIconVisibility();
+  vtkBooleanMacro(IconVisibility, bool);
+
+  // Description:
+  // Whether to show labels.  Default is off.
+  void SetLabelVisibility(bool vis);
+  bool GetLabelVisibility();
+  vtkBooleanMacro(LabelVisibility, bool);
+
+  void SetLabelColor(double color[3]);
+
+  // Description:
+  // Whether to edge glyphs.  Default is on.
+  void SetEdgeGlyphVisibility(bool vis);
+  bool GetEdgeGlyphVisibility();
+  vtkBooleanMacro(EdgeGlyphVisibility, bool);
+
+  void SetEdgeGlyphColor(double *color);
+
+  // Description:
+  // Get/Set the vertex point size
+  vtkGetMacro(VertexPointSize, double);
+  void SetVertexPointSize(double size);
+
+  // Description:
+  // Get/Set the edge line width
+  vtkGetMacro(EdgeLineWidth, double);
+  void SetEdgeLineWidth(float width);
+
+  // Description:
+  // Apply the theme to this view.
+  virtual void ApplyViewTheme(vtkViewTheme* theme);
+
+  // Description:
+  // Release any graphics resources that are being consumed by this mapper.
+  // The parameter window could be used to determine which graphic
+  // resources to release.
+  void ReleaseGraphicsResources(vtkWindow*);
+
+  // Description:
+  // Get the mtime also considering the lookup table.
+  unsigned long GetMTime();
+
+  // Description:
+  // Set the Input of this mapper.
+  void SetInputData(vtkGraph* input);
+  vtkGraph* GetInput();
+
+  // Description:
+  // Return bounding box (array of six doubles) of data expressed as
+  // (xmin,xmax, ymin,ymax, zmin,zmax).
+  virtual double* GetBounds();
+  virtual void GetBounds(double* bounds)
+    { Superclass::GetBounds(bounds); }
+
+  // Description:
+  // Access to the lookup tables used by the vertex and edge mappers.
+  vtkGetObjectMacro(EdgeLookupTable, vtkLookupTable);
+  vtkGetObjectMacro(VertexLookupTable, vtkLookupTable);
+
+  // Description:
+  // Set/Get polydata used for representing vertex.
+  void SetVertexGeometry(vtkPolyData* geometry);
+  vtkPolyData* GetVertexGeometry();
+
+  // Description:
+  // Set vertex opacity.
+  void SetVertexOpacity(double value);
+
+  // Description:
+  // Set edge opacity.
+  void SetEdgeOpacity(double value);
+
+  // Description:
+  // Return edge glyph source
+  vtkGlyphSource2D* GetEdgeGlyphSource();
+
+protected:
+  vtkVg2DGraphMapper();
+  ~vtkVg2DGraphMapper();
+
+  virtual bool GetSupportsSelection()
+    { return true; }
+
+  // Description:
+  // Used to store the vertex and edge color array names
+  vtkGetStringMacro(VertexPositionArrayNameInternal);
+  vtkSetStringMacro(VertexPositionArrayNameInternal);
+
+  vtkGetStringMacro(VertexColorArrayNameInternal);
+  vtkSetStringMacro(VertexColorArrayNameInternal);
+  vtkGetStringMacro(EdgeColorArrayNameInternal);
+  vtkSetStringMacro(EdgeColorArrayNameInternal);
+
+  vtkGetStringMacro(VertexSelectionArrayNameInternal);
+  vtkSetStringMacro(VertexSelectionArrayNameInternal);
+  vtkGetStringMacro(EdgeSelectionArrayNameInternal);
+  vtkSetStringMacro(EdgeSelectionArrayNameInternal);
+
+  char* VertexPositionArrayNameInternal;
+  char* VertexColorArrayNameInternal;
+  char* VertexSelectionArrayNameInternal;
+
+  char* EdgeColorArrayNameInternal;
+  char* EdgeSelectionArrayNameInternal;
+
+  char* EnabledEdgesArrayName;
+  char* EnabledVerticesArrayName;
+  int EnableEdgesByArray;
+  int EnableVerticesByArray;
+
+  vtkGetStringMacro(IconArrayNameInternal);
+  vtkSetStringMacro(IconArrayNameInternal);
+  char* IconArrayNameInternal;
+
+  //BTX
+  vtkSmartPointer<vtkDistanceToCamera>           DistanceToCamera;
+  vtkSmartPointer<vtkDistanceToCamera>           DistanceToCamera2;
+  vtkSmartPointer<vtkGlyphSource2D>              EdgeGlyphSource;
+  vtkSmartPointer<vtkGlyph3D>                    EdgeGlyph;
+  vtkSmartPointer<vtkGraphToPolyData>            GraphToPoly;
+  vtkSmartPointer<vtkVertexGlyphFilter>          VertexGlyph;
+  vtkSmartPointer<vtkIconGlyphFilter>            IconGlyph;
+  vtkSmartPointer<vtkMapArrayValues>             IconTypeToIndex;
+  vtkSmartPointer<vtkTransformCoordinateSystems> IconTransform;
+  vtkSmartPointer<vtkPointSetToLabelHierarchy>   PointsToLabels;
+
+  vtkSmartPointer<vtkGraphLayout>                GraphLayout;
+  vtkSmartPointer<vtkVgAssignCoordinatesLayoutStrategy>
+    GraphLayoutStrategy;
+
+  vtkSmartPointer<vtkEdgeLayout>                 EdgeLayout;
+  vtkSmartPointer<vtkPassThroughEdgeStrategy>
+  PassThroughEdgeStrategy;
+  vtkSmartPointer<vtkVgArcParallelEdgeStrategy>
+  ArcParallelEdgeStrategy;
+
+  vtkSmartPointer<vtkPolyDataMapper>    EdgeMapper;
+  vtkSmartPointer<vtkGlyph3DMapper>     VertexMapper;
+  vtkSmartPointer<vtkPolyDataMapper2D>  IconMapper;
+  vtkSmartPointer<vtkLabelPlacementMapper> LabelMapper;
+  vtkSmartPointer<vtkPolyDataMapper> EdgeGlyphMapper;
+
+  vtkSmartPointer<vtkActor>             EdgeActor;
+  vtkSmartPointer<vtkActor>             VertexActor;
+  vtkSmartPointer<vtkActor>             OutlineActor;
+  vtkSmartPointer<vtkTexturedActor2D>   IconActor;
+  vtkSmartPointer<vtkActor2D>           LabelActor;
+  vtkSmartPointer<vtkActor> EdgeGlyphActor;
+
+  vtkSmartPointer<vtkVgApplySelectedColor> ApplyColors;
+
+  vtkSmartPointer<vtkPolyData> VertexGeometry;
+  //ETX
+
+  // Color maps
+  vtkLookupTable* EdgeLookupTable;
+  vtkLookupTable* VertexLookupTable;
+
+  virtual void ReportReferences(vtkGarbageCollector*);
+
+  // see algorithm for more info
+  virtual int FillInputPortInformation(int port, vtkInformation* info);
+
+private:
+  vtkVg2DGraphMapper(const vtkVg2DGraphMapper&);  // Not implemented.
+  void operator=(const vtkVg2DGraphMapper&);  // Not implemented.
+
+  // Helper function
+  vtkPolyData* CreateCircle(bool filled);
+
+  double VertexPointSize;
+  double EdgeLineWidth;
+  bool ScaledGlyphs;
+  char* ScalingArrayName;
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgActivity.cxx b/Libraries/VtkVgCore/vtkVgActivity.cxx
new file mode 100644
index 00000000..08f3bca6
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgActivity.cxx
@@ -0,0 +1,669 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgActivity.h"
+
+// VTK includes.
+#include <vtkAppendPolyData.h>
+#include <vtkBitArray.h>
+#include <vtkBoundingBox.h>
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkCleanPolyData.h>
+#include <vtkExtractVOI.h>
+#include <vtkIdList.h>
+#include <vtkIdListCollection.h>
+#include <vtkImageData.h>
+#include <vtkImplicitModeller.h>
+#include <vtkMarchingSquares.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkStripper.h>
+#include <vtkTextProperty.h>
+
+#include "vtkVgHull2D.h"
+#include "vtkVgLabeledRegion.h"
+#include "vtkVgTriangulateConcavePolysFilter.h"
+#include "vtkVgEvent.h"
+#include "vtkVgIconManager.h"
+
+#include <assert.h>
+
+vtkStandardNewMacro(vtkVgActivity);
+
+vtkCxxSetObjectMacro(vtkVgActivity, IconManager, vtkVgIconManager);
+
+//-----------------------------------------------------------------------------
+class vtkVgActivity::vtkInternal
+{
+public:
+  std::vector<vtkVgEvent*> Events;
+  vtkBoundingBox BoundingBox;
+  vtkPolyData* RenderPolyData;
+
+  vtkSmartPointer<vtkRenderer> Renderer;
+
+  vtkInternal()
+    {
+    this->RenderPolyData = 0;
+    }
+
+  ~vtkInternal()
+    {
+    if (this->RenderPolyData)
+      {
+      this->RenderPolyData->Delete();
+      }
+    }
+};
+
+//-----------------------------------------------------------------------------
+vtkVgActivity::vtkVgActivity()
+{
+  this->Name            =  0;
+  this->Type            = -1;
+  this->Id              = -1;
+  this->IconIndex       = -1;
+  this->Status = vgObjectStatus::None;
+  this->Saliency = -1.0;
+  this->Probability = -1.0;
+
+  this->Actor = 0;
+  this->IconManager = 0;
+  this->ActivityFrameExtents[0].SetToMaxTime();
+  this->ActivityFrameExtents[1].SetToMinTime();
+
+  // initalize SpatialBounds to invalid bounds
+  this->SpatialBounds[0] = this->SpatialBounds[2] = 1;
+  this->SpatialBounds[1] = this->SpatialBounds[3] = -1;
+
+  this->BoundsMode = false;
+
+  this->Internal = new vtkInternal;
+
+  this->Color[0] = this->Color[1] = this->Color[2] = 1.0;
+
+  this->SecondaryColor[0] = this->SecondaryColor[1]
+                            = this->SecondaryColor[2] = 0.0;
+
+  this->MultiColorEnabled = false;
+  this->ShowAlways = false;
+
+  this->ExpirationOffset.SetTime(0);
+  this->ExpirationOffset.SetFrameNumber(0);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgActivity::~vtkVgActivity()
+{
+  if (this->Actor)
+    {
+    this->GetRenderer()->RemoveViewProp(this->Actor);
+    this->Actor->Delete();
+    }
+  if (this->IconManager)
+    {
+    this->IconManager->Delete();
+    }
+
+  delete[] this->Name;
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::SetRenderer(vtkRenderer* ren)
+{
+  this->Internal->Renderer = ren;
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderer* vtkVgActivity::GetRenderer()
+{
+  return this->Internal->Renderer;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::SetOverlayOpacity(double opacity)
+{
+  this->OverlayOpacity = opacity;
+
+  if (this->Actor)
+    {
+    this->Actor->GetFrameProperty()->SetOpacity(opacity);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::SetVisibility(bool visible)
+{
+  if (this->Actor)
+    {
+    this->Actor->SetVisibility(visible);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgActivity::SetCurrentDisplayFrame(const vtkVgTimeStamp& timeStamp)
+{
+  this->CurrentDisplayFrame = timeStamp;
+
+  vtkVgTimeStamp endFrame = this->ActivityFrameExtents[1];
+  endFrame.ShiftForward(this->ExpirationOffset);
+
+  if (!this->ShowAlways &&
+      (this->ActivityFrameExtents[0] > this->CurrentDisplayFrame ||
+       endFrame < this->CurrentDisplayFrame))
+    {
+    if (this->Actor)
+      {
+      this->GetRenderer()->RemoveViewProp(this->Actor);
+      this->Actor->Delete();
+      this->Actor = NULL;
+      }
+    return false;
+    }
+
+  if (!this->Actor)
+    {
+    if (!this->Internal->RenderPolyData)
+      {
+      this->PrepareRepresentation();
+      }
+
+    this->Actor = vtkVgLabeledRegion::New();
+
+    this->Actor->SetFramePolyData(this->Internal->RenderPolyData);
+    this->Actor->SetImageSize(32, 32);
+    this->Actor->SetNormalizedLabelPosition(0.5, 0.5);
+    this->Actor->GetFrameProperty()->SetOpacity(this->OverlayOpacity);
+    this->Actor->GetFrameProperty()->SetLineWidth(3);
+    this->Actor->GetFrameProperty()->SetColor(this->Color);
+    this->Actor->GetTextProperty()->SetColor(1.0, 1.0, 1.0);
+
+    // @TODO: Adding an actor to the renderer here is a quick hack
+    //        to get things working - revisit this.
+    this->GetRenderer()->AddViewProp(this->Actor);
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::PrepareRepresentation()
+{
+  if (!this->Internal->RenderPolyData)
+    {
+    this->Internal->RenderPolyData = vtkPolyData::New();
+    }
+
+  if (this->BoundsMode)
+    {
+    // do nothing if SpatialBounds aren't valid
+    if (this->SpatialBounds[1] < this->SpatialBounds[0] ||
+        this->SpatialBounds[3] < this->SpatialBounds[2])
+      {
+      return;
+      }
+
+    // points
+    vtkPoints* points = vtkPoints::New();
+    this->Internal->RenderPolyData->SetPoints(points);
+    points->FastDelete();
+    points->SetNumberOfPoints(4);
+    points->SetPoint(0, this->SpatialBounds[0], this->SpatialBounds[2], 0.0);
+    points->SetPoint(1, this->SpatialBounds[1], this->SpatialBounds[2], 0.0);
+    points->SetPoint(2, this->SpatialBounds[1], this->SpatialBounds[3], 0.0);
+    points->SetPoint(3, this->SpatialBounds[0], this->SpatialBounds[3], 0.0);
+
+    // and then the poly
+    vtkCellArray* polys = vtkCellArray::New();
+    this->Internal->RenderPolyData->SetPolys(polys);
+    polys->FastDelete();
+    polys->Allocate(5);
+    polys->InsertNextCell(4);
+    polys->InsertCellPoint(0);
+    polys->InsertCellPoint(1);
+    polys->InsertCellPoint(2);
+    polys->InsertCellPoint(3);
+
+    // now add the required color info; ugly for now (rather not duplicate code
+    // from below)
+    vtkUnsignedCharArray* uca = vtkUnsignedCharArray::New();
+    uca->SetNumberOfComponents(3);
+    uca->SetName("Activity Color");
+
+    vtkBitArray* ba = vtkBitArray::New();
+    ba->SetName("Use Secondary Color");
+
+    this->Internal->RenderPolyData->GetCellData()->SetScalars(uca);
+    this->Internal->RenderPolyData->GetCellData()->SetPedigreeIds(ba);
+    uca->FastDelete();
+    ba->FastDelete();
+
+    uca->InsertNextTuple3(this->Color[0] * 255,
+                          this->Color[1] * 255,
+                          this->Color[2] * 255);
+    ba->InsertNextValue(0);
+    return;
+    }
+
+  // else
+  vtkPolyData* pd[] = { vtkPolyData::New(), vtkPolyData::New() };
+
+  // When using multi-colored activities, it is necessary to build the polydata
+  // in two phases - first for the primary event, then for all other events.
+  // Since vtkImplicitModeller does not preserve scalar data, there is no other
+  // way to assign different colors to different events within the activity.
+  for (int phase = 0; phase < 2; ++phase)
+    {
+    // add verts to supprt single pt events
+    vtkCellArray* verts = vtkCellArray::New();
+    pd[phase]->SetVerts(verts);
+    verts->FastDelete();
+
+    vtkCellArray* lines = vtkCellArray::New();
+    pd[phase]->SetLines(lines);
+    lines->FastDelete();
+
+    std::vector<vtkVgEvent*>::const_iterator eventIter;
+    for (eventIter = this->Internal->Events.begin();
+         eventIter != this->Internal->Events.end(); eventIter++)
+      {
+      if (eventIter == this->Internal->Events.begin())
+        {
+        pd[phase]->SetPoints((*eventIter)->GetPoints());
+
+        // skip first event if we're building data for secondary events
+        if (phase == 1)
+          {
+          continue;
+          }
+        }
+
+      vtkIdListCollection* idCollection =
+        (*eventIter)->GetFullEventIdCollection();
+      for (vtkIdType i = 0; i < idCollection->GetNumberOfItems(); i++)
+        {
+        if (idCollection->GetItem(i)->GetNumberOfIds() == 1)
+          {
+          verts->InsertNextCell(idCollection->GetItem(i));
+          }
+        else
+          {
+          lines->InsertNextCell(idCollection->GetItem(i));
+          }
+        }
+
+      // only build data for primary event in phase 0
+      if (phase == 0)
+        {
+        break;
+        }
+      }
+
+    pd[phase]->Modified();
+    }
+
+  // need to clean these calculations some, but will do for now
+  double maxDistance = 20.0;
+  vtkBoundingBox bb;
+  for (int i = 0; i < 2; ++i)
+    {
+    bb.AddBounds(pd[i]->GetBounds());
+    }
+  double bounds[6];
+  bb.GetBounds(bounds);
+  // make sure min/max bounds are not equal, as calulcations break down ankd
+  // error generated by the implicit modeller if they are
+  if (bounds[0] == bounds[1])
+    {
+    bounds[0] -= 0.5;
+    bounds[1] += 0.5;
+    }
+  if (bounds[2] == bounds[3])
+    {
+    bounds[2] -= 0.5;
+    bounds[3] += 0.5;
+    }
+  double modelBounds[6] =
+    {
+    bounds[0], bounds[1], bounds[2], bounds[3],
+    bounds[4] - maxDistance * 2.0,
+    bounds[5] + maxDistance * 2.0
+    };
+
+  int sampleDimensions[3] = { 0, 0, 3 };
+  double maxSpacing = 0;
+  for (int i = 0; i < 2; i++)
+    {
+    sampleDimensions[i] =
+      2 * ceil((bounds[i * 2 + 1] - bounds[i * 2]) / maxDistance);
+    if (sampleDimensions[i] < 3)
+      {
+      sampleDimensions[i] = 3;
+      }
+
+    // to make sure we "represent" the max distance at the extents, extend
+    // bounds and add samples
+    double sampleSpacing = (bounds[i * 2 + 1] - bounds[i * 2]) /
+                           (sampleDimensions[i] - 1);
+    if (sampleSpacing > maxSpacing)
+      {
+      maxSpacing = sampleSpacing;
+      }
+    modelBounds[i * 2] -= sampleSpacing * 2;
+    modelBounds[i * 2 + 1] += sampleSpacing * 2;
+    sampleDimensions[i] += 4 * 2;
+    }
+
+  vtkAppendPolyData* append = vtkAppendPolyData::New();
+
+  for (int phase = 0; phase < 2; ++phase)
+    {
+    // compute a distance map of the component events
+    vtkImplicitModeller* implicitModeller = vtkImplicitModeller::New();
+    implicitModeller->SetInputData(pd[phase]);
+    implicitModeller->SetSampleDimensions(sampleDimensions);
+    implicitModeller->SetMaximumDistance(maxDistance * 1.05);
+    implicitModeller->SetModelBounds(modelBounds);
+    implicitModeller->SetOutputScalarTypeToFloat();
+    implicitModeller->SetProcessModeToPerCell();
+    implicitModeller->CappingOn();
+    implicitModeller->SetCapValue(maxDistance + maxSpacing);
+    implicitModeller->Update();
+
+    pd[phase]->FastDelete();
+
+    // extract our z-slice of interest (the middle one); implicit modeller requires
+    // a volume, which is why we didn't make z sample dimension 1.  We made it 3 so
+    // that the middle slice would be exactly what we want.
+    vtkExtractVOI* extractSlice = vtkExtractVOI::New();
+    extractSlice->SetInputConnection(implicitModeller->GetOutputPort());
+    extractSlice->SetVOI(0, sampleDimensions[0] - 1, 0, sampleDimensions[1] - 1, 1, 1);
+    implicitModeller->FastDelete();
+
+    // finally, contour
+    vtkMarchingSquares* contour = vtkMarchingSquares::New();
+    contour->SetInputConnection(extractSlice->GetOutputPort());
+    extractSlice->FastDelete();
+    contour->SetValue(0, maxDistance);
+
+    // largest allowed value by the stripper, but shouldn't be a problem
+    vtkStripper* stripper = vtkStripper::New();
+    stripper->SetMaximumLength(100000);
+    stripper->SetInputConnection(contour->GetOutputPort());
+    contour->FastDelete();
+
+    stripper->Update();
+    vtkPolyData* pd = stripper->GetOutput();
+
+    vtkUnsignedCharArray* uca = vtkUnsignedCharArray::New();
+    uca->SetNumberOfComponents(3);
+    uca->SetName("Activity Color");
+
+    vtkBitArray* ba = vtkBitArray::New();
+    ba->SetName("Use Secondary Color");
+
+    pd->GetCellData()->SetScalars(uca);
+    pd->GetCellData()->SetPedigreeIds(ba);
+    uca->FastDelete();
+    ba->FastDelete();
+
+    bool useSecondaryColor = this->GetMultiColorEnabled();
+
+    // add scalar data for colors
+    for (vtkIdType i = 0; i < pd->GetNumberOfCells(); ++i)
+      {
+      unsigned char color[3];
+      if (useSecondaryColor && phase > 0)
+        {
+        color[0] = this->SecondaryColor[0] * 255;
+        color[1] = this->SecondaryColor[1] * 255;
+        color[2] = this->SecondaryColor[2] * 255;
+        }
+      else
+        {
+        color[0] = this->Color[0] * 255;
+        color[1] = this->Color[1] * 255;
+        color[2] = this->Color[2] * 255;
+        }
+      uca->InsertNextTupleValue(color);
+      ba->InsertNextValue(phase > 0);
+      }
+
+    append->AddInputConnection(stripper->GetOutputPort());
+    stripper->FastDelete();
+    }
+
+  append->Update();
+  vtkPolyData* appended = append->GetOutput();
+
+  vtkPolyData* polygons = vtkPolyData::New();
+  polygons->SetPoints(appended->GetPoints());
+
+  vtkCellArray* polys = vtkCellArray::New();
+  polygons->SetPolys(polys);
+  polys->FastDelete();
+
+  // should be sufficient as long as points aren't reused (and we don't expect
+  // them to be reused)
+  polys->Allocate(appended->GetNumberOfPoints() + appended->GetNumberOfLines());
+
+  vtkCellArray* lines = appended->GetLines();
+  lines->InitTraversal();
+  vtkIdType npts, *pts;
+  while (lines->GetNextCell(npts, pts))
+    {
+    // make sure it is closed
+    if (pts[0] != pts[npts - 1])
+      {
+      continue;
+      }
+    polys->InsertNextCell(npts - 1, pts);
+    }
+
+  // copy color info
+  polygons->GetCellData()->SetScalars(appended->GetCellData()->GetScalars());
+  polygons->GetCellData()->SetPedigreeIds(appended->GetCellData()->GetPedigreeIds());
+
+  append->Delete();
+
+  vtkVgTriangulateConcavePolysFilter* concavePolys =
+    vtkVgTriangulateConcavePolysFilter::New();
+  concavePolys->SetInputData(polygons);
+  polygons->FastDelete();
+  concavePolys->Update();
+
+  this->Internal->RenderPolyData->DeepCopy(concavePolys->GetOutput());
+  concavePolys->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::AddEvent(vtkVgEvent* theEvent)
+{
+  if (!theEvent)
+    {
+    vtkErrorMacro("Invalid event.\n");
+    return;
+    }
+
+  this->Internal->Events.push_back(theEvent);
+
+  if (theEvent->GetStartFrame() < this->ActivityFrameExtents[0])
+    {
+    this->ActivityFrameExtents[0] = theEvent->GetStartFrame();
+    }
+  if (this->ActivityFrameExtents[1] < theEvent->GetEndFrame())
+    {
+    this->ActivityFrameExtents[1] = theEvent->GetEndFrame();
+    }
+
+  double bounds[6] = {0, 0, 0, 0, 0, 0};
+  theEvent->GetFullBounds(bounds);
+  this->Internal->BoundingBox.AddBounds(bounds);
+  this->Internal->BoundingBox.GetBounds(bounds);
+
+  // rebuild the representation
+  if (this->Actor)
+    {
+    this->PrepareRepresentation();
+    }
+  else if (this->Internal->RenderPolyData)
+    {
+    this->Internal->RenderPolyData->Delete();
+    this->Internal->RenderPolyData = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::RemoveEvent(unsigned int index)
+{
+  this->Internal->Events.erase(this->Internal->Events.begin() + index);
+  this->UpdateFrameExtentsAndBounds();
+
+  // rebuild the representation
+  if (this->Actor)
+    {
+    this->PrepareRepresentation();
+    }
+  else if (this->Internal->RenderPolyData)
+    {
+    this->Internal->RenderPolyData->Delete();
+    this->Internal->RenderPolyData = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vtkVgActivity::GetNumberOfEvents()
+{
+  return static_cast<unsigned int>(this->Internal->Events.size());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::UpdateFrameExtentsAndBounds()
+{
+  if (this->GetNumberOfEvents() == 0)
+    {
+    return;
+    }
+
+  vtkVgEvent* event0 = this->Internal->Events[0];
+
+  vtkVgTimeStamp minStartFrame = event0->GetStartFrame();
+  vtkVgTimeStamp maxEndFrame = event0->GetEndFrame();
+
+  double bounds[6] = { 0.0 };
+  event0->GetFullBounds(bounds);
+
+  this->Internal->BoundingBox.Reset();
+  this->Internal->BoundingBox.AddBounds(bounds);
+
+  for (unsigned int i = 1, end = this->GetNumberOfEvents(); i < end; ++i)
+    {
+    vtkVgEvent* theEvent = this->Internal->Events[i];
+    minStartFrame = std::min(minStartFrame, theEvent->GetStartFrame());
+    maxEndFrame = std::max(maxEndFrame, theEvent->GetEndFrame());
+    theEvent->GetFullBounds(bounds);
+    this->Internal->BoundingBox.AddBounds(bounds);
+    }
+
+  this->ActivityFrameExtents[0] = minStartFrame;
+  this->ActivityFrameExtents[1] = maxEndFrame;
+
+  this->Internal->BoundingBox.GetBounds(bounds);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vtkVgActivity::GetEvent(unsigned int index)
+{
+  if (index >= this->Internal->Events.size())
+    {
+    vtkErrorMacro("Index out of range.\n");
+    return 0;
+    }
+
+  return this->Internal->Events[index];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::SetShowLabel(bool enable)
+{
+  if (!this->Actor)
+    {
+    return;
+    }
+
+  if (enable)
+    {
+    if (this->IconManager->GetIconSheetFileName())
+      {
+      this->Actor->SetImage(this->IconManager->GetIconImage(this->IconIndex));
+      }
+    this->Actor->SetText(this->Name);
+    }
+  else
+    {
+    this->Actor->SetImage(0);
+    this->Actor->SetText(0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::ApplyColors()
+{
+  if (!this->Internal->RenderPolyData)
+    {
+    return;
+    }
+
+  vtkBitArray* ba =
+    vtkBitArray::SafeDownCast(
+      this->Internal->RenderPolyData->GetCellData()->GetPedigreeIds());
+
+  vtkUnsignedCharArray* uca =
+    vtkUnsignedCharArray::SafeDownCast(
+      this->Internal->RenderPolyData->GetCellData()->GetScalars());
+
+  assert(ba->GetNumberOfTuples() == uca->GetNumberOfTuples());
+  bool useSecondary = this->GetMultiColorEnabled();
+
+  // Update the color scalars in the render polydata.
+  for (vtkIdType i = 0, end = ba->GetNumberOfTuples(); i < end; ++i)
+    {
+    unsigned char color[3];
+    if (useSecondary && ba->GetValue(i))
+      {
+      color[0] = this->SecondaryColor[0] * 255;
+      color[1] = this->SecondaryColor[1] * 255;
+      color[2] = this->SecondaryColor[2] * 255;
+      }
+    else
+      {
+      color[0] = this->Color[0] * 255;
+      color[1] = this->Color[1] * 255;
+      color[2] = this->Color[2] * 255;
+      }
+    uca->SetTupleValue(i, color);
+    }
+
+  this->Internal->RenderPolyData->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivity::SetExpirationOffset(const vtkVgTimeStamp& timeStamp)
+{
+  this->ExpirationOffset = timeStamp;
+  this->Modified();
+}
diff --git a/Libraries/VtkVgCore/vtkVgActivity.h b/Libraries/VtkVgCore/vtkVgActivity.h
new file mode 100644
index 00000000..8efd9f10
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgActivity.h
@@ -0,0 +1,204 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgActivity_h
+#define __vtkVgActivity_h
+
+#include "vtkObject.h"
+
+#include "vtkVgTimeStamp.h"
+
+#include <vgExport.h>
+
+class vtkIdList;
+class vtkPoints;
+class vtkVgEvent;
+class vtkVgIconManager;
+class vtkRenderer;
+class vtkVgLabeledRegion;
+
+class VTKVG_CORE_EXPORT vtkVgActivity : public vtkObject
+{
+public:
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVgActivity* New();
+  vtkTypeMacro(vtkVgActivity, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  vtkSetMacro(Type, int);
+  vtkGetMacro(Type, int);
+
+  vtkSetMacro(Id, int);
+  vtkGetMacro(Id, int);
+
+  vtkSetMacro(IconIndex, int);
+  vtkGetMacro(IconIndex, int);
+
+  vtkGetObjectMacro(ActivityDisplayIds, vtkIdList);
+
+  vtkGetObjectMacro(Actor, vtkVgLabeledRegion);
+
+  vtkSetStringMacro(Name);
+  vtkGetStringMacro(Name);
+
+  void SetVisibility(bool visible);
+
+  // Description:
+  // Update activity to indicated frame. Returns true if a new actor was added.
+  bool SetCurrentDisplayFrame(const vtkVgTimeStamp& timeStamp);
+  vtkVgTimeStamp GetCurrentDisplayFrame()
+    {
+    return this->CurrentDisplayFrame;
+    }
+
+  // Description:
+  // Specify renderer viewport that the highlight actor will render into.
+  void SetRenderer(vtkRenderer* ren);
+  vtkRenderer* GetRenderer();
+
+  // Description:
+  // Specify an icon manager to coordinate with.
+  void SetIconManager(vtkVgIconManager* iconManager);
+  vtkGetObjectMacro(IconManager, vtkVgIconManager);
+
+  void SetOverlayOpacity(double opacity);
+
+  // Description:
+  // Add a new event into the list of events related with the activity.
+  void AddEvent(vtkVgEvent* theEvent);
+
+  // Description:
+  // Remove an event from the activity.
+  void RemoveEvent(unsigned int index);
+
+  unsigned int GetNumberOfEvents();
+
+  // Description:
+  // After adding all events or changing the representation type, this function
+  // does the heavy lifting of preparing the activity for display
+  void PrepareRepresentation();
+
+  // Description:
+  // Given a valid index, fill in track and its related parameters.
+  // \TODO: This interface might change in the future.
+  vtkVgEvent* GetEvent(unsigned int index);
+
+  // Description:
+  // Get start and end frame for the activity
+  void GetActivityFrameExtents(vtkVgTimeStamp& startFrame,
+                               vtkVgTimeStamp& endFrame)
+    {
+    startFrame = this->ActivityFrameExtents[0];
+    endFrame = this->ActivityFrameExtents[1];
+    }
+
+  // Description:
+  // Set/Get the color to use for rendering non-icon part of activity
+  vtkSetVector3Macro(Color, double);
+  vtkGetVector3Macro(Color, double);
+
+  // Description:
+  // Set/Get the bounds of the activity (to be used for "Box" display)
+  // (xmin, xmax, ymin, ymax)
+  vtkSetVector4Macro(SpatialBounds, double);
+  vtkGetVector4Macro(SpatialBounds, double);
+
+  // Description:
+  // Set/Get whether to use "Bounds" mode for diaplying the activity.
+  // For BoundsMode, we just show a "box" based on the SpatialBounds.
+  vtkBooleanMacro(BoundsMode, bool);
+  vtkSetMacro(BoundsMode, bool);
+  vtkGetMacro(BoundsMode, bool);
+
+  // Description:
+  // Set/Get the color to use for rendering non-icon part of activity
+  vtkSetVector3Macro(SecondaryColor, double);
+  vtkGetVector3Macro(SecondaryColor, double);
+
+  vtkSetMacro(MultiColorEnabled, bool);
+  vtkGetMacro(MultiColorEnabled, bool);
+
+  // Description:
+  // Update activity actor with most recent color settings
+  void ApplyColors();
+
+  // Description:
+  // Set/Get the status of the activity (adjudicated, excluded, or otherwise)
+  vtkSetMacro(Status, int);
+  vtkGetMacro(Status, int);
+
+  // Description:
+  // Set/Get the saliency of the activity.
+  vtkSetMacro(Saliency, double);
+  vtkGetMacro(Saliency, double);
+
+  // Description:
+  // Set/Get the probability of the activity.
+  vtkSetMacro(Probability, double);
+  vtkGetMacro(Probability, double);
+
+  // Description:
+  // Show the icon and text description of this activity.
+  void SetShowLabel(bool enable);
+
+  // Description:
+  // Always display the activity, regardless of current frame.
+  vtkSetMacro(ShowAlways, bool);
+  vtkGetMacro(ShowAlways, bool);
+
+  void SetExpirationOffset(const vtkVgTimeStamp& timeStamp);
+  vtkVgTimeStamp GetExpirationOffset()
+    {
+    return this->ExpirationOffset;
+    }
+
+private:
+  vtkVgActivity(const vtkVgActivity&); // Not implemented.
+  void operator=(const vtkVgActivity&);  // Not implemented.
+
+  // Description:
+  // Constructor / Destructor.
+  vtkVgActivity();
+  ~vtkVgActivity();
+
+  void UpdateFrameExtentsAndBounds();
+
+  char* Name;
+
+  int Type;
+  int Id;
+  int Status;
+  int IconIndex;
+
+  double Saliency;
+  double Probability;
+
+  vtkVgTimeStamp ActivityFrameExtents[2];
+  double SpatialBounds[4];
+
+  vtkIdList* ActivityDisplayIds;
+  vtkVgTimeStamp CurrentDisplayFrame;
+  vtkVgTimeStamp ExpirationOffset;
+
+  vtkVgLabeledRegion* Actor;
+  vtkVgIconManager* IconManager;
+
+  double OverlayOpacity;
+
+  double Color[3];
+  double SecondaryColor[3];
+
+  bool MultiColorEnabled;
+  bool ShowAlways;
+  bool BoundsMode;
+
+  class vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgActivity_h
diff --git a/Libraries/VtkVgCore/vtkVgActivityTypeRegistry.cxx b/Libraries/VtkVgCore/vtkVgActivityTypeRegistry.cxx
new file mode 100644
index 00000000..c5ed2fde
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgActivityTypeRegistry.cxx
@@ -0,0 +1,13 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgActivityTypeRegistry.h"
+
+#include <vtkObjectFactory.h>
+
+template class vtkVgTypeRegistry<vgActivityType>;
+
+vtkStandardNewMacro(vtkVgActivityTypeRegistry);
diff --git a/Libraries/VtkVgCore/vtkVgActivityTypeRegistry.h b/Libraries/VtkVgCore/vtkVgActivityTypeRegistry.h
new file mode 100644
index 00000000..27a0a43b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgActivityTypeRegistry.h
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgActivityTypeRegistry_h
+#define __vtkVgActivityTypeRegistry_h
+
+#include "vtkVgTypeRegistry.h"
+
+#include <vgExport.h>
+#include <vgActivityType.h>
+
+class VTKVG_CORE_EXPORT vtkVgActivityTypeRegistry
+  : public vtkVgTypeRegistry<vgActivityType>
+{
+  typedef vtkVgTypeRegistry<vgActivityType> BaseClassType;
+public:
+  static vtkVgActivityTypeRegistry* New();
+
+  vtkTypeMacro(vtkVgActivityTypeRegistry, BaseClassType);
+};
+
+#endif // __vtkVgActivityTypeRegistry_h
diff --git a/Libraries/VtkVgCore/vtkVgAdapt.cxx b/Libraries/VtkVgCore/vtkVgAdapt.cxx
new file mode 100644
index 00000000..105db43a
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAdapt.cxx
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgAdapt.h"
+
+//-----------------------------------------------------------------------------
+void vtkVgAdapt(const vnl_matrix_fixed<double, 3, 3>& in, vtkMatrix4x4* out)
+{
+  double k = (in[2][2] < 0.0 ? -1.0 : 1.0);
+
+  out->Identity();
+
+  (*out)[0][0] = in[0][0] * k;
+  (*out)[0][1] = in[0][1] * k;
+  (*out)[0][3] = in[0][2] * k;
+
+  (*out)[1][0] = in[1][0] * k;
+  (*out)[1][1] = in[1][1] * k;
+  (*out)[1][3] = in[1][2] * k;
+
+  (*out)[3][0] = in[2][0] * k;
+  (*out)[3][1] = in[2][1] * k;
+  (*out)[3][3] = in[2][2] * k;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkMatrix4x4>
+vtkVgAdapt(const vnl_matrix_fixed<double, 3, 3>& vnlMatrix)
+{
+  vtkSmartPointer<vtkMatrix4x4> vtkMatrix =
+    vtkSmartPointer<vtkMatrix4x4>::New();
+
+  vtkVgAdapt(vnlMatrix, vtkMatrix);
+
+  return vtkMatrix;
+}
diff --git a/Libraries/VtkVgCore/vtkVgAdapt.h b/Libraries/VtkVgCore/vtkVgAdapt.h
new file mode 100644
index 00000000..1761e90c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAdapt.h
@@ -0,0 +1,23 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgAdapt_h
+#define __vtkVgAdapt_h
+
+#include <vtkSmartPointer.h>
+#include <vtkMatrix4x4.h>
+
+#include <vnl/vnl_matrix_fixed.h>
+
+#include <vgExport.h>
+
+extern VTKVG_CORE_EXPORT void
+vtkVgAdapt(const vnl_matrix_fixed<double, 3, 3>& in, vtkMatrix4x4* out);
+
+extern VTKVG_CORE_EXPORT vtkSmartPointer<vtkMatrix4x4>
+vtkVgAdapt(const vnl_matrix_fixed<double, 3, 3>&);
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgAnnotationActor.cxx b/Libraries/VtkVgCore/vtkVgAnnotationActor.cxx
new file mode 100644
index 00000000..77ca84cb
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAnnotationActor.cxx
@@ -0,0 +1,447 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgAnnotationActor.h"
+
+#include <vtkActor2D.h>
+#include <vtkCellArray.h>
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper2D.h>
+#include <vtkPropCollection.h>
+#include <vtkProperty2D.h>
+#include <vtkTextMapper.h>
+#include <vtkTextProperty.h>
+#include <vtkViewport.h>
+
+#define MaxArrowLength     75.0   // pixels
+#define MaxArrowLengthDist 500.0  // pixels
+
+vtkStandardNewMacro(vtkVgAnnotationActor);
+
+//----------------------------------------------------------------------
+vtkVgAnnotationActor::vtkVgAnnotationActor()
+  : Text(0), ClampToViewport(true), ClampedToBorder(false)
+{
+  this->Offset[0] = this->Offset[1] = 0;
+
+  this->AutoCenterX = this->AutoCenterY = false;
+
+  this->TextMapper = vtkTextMapper::New();
+  this->TextActor = vtkActor2D::New();
+  this->TextActor->SetMapper(this->TextMapper);
+
+  vtkTextProperty* property = this->TextMapper->GetTextProperty();
+  property->SetVerticalJustificationToTop();
+  property->SetJustificationToCentered();
+  property->SetFontSize(14);
+
+  // contruct the frame
+  this->FramePoints = vtkPoints::New();
+  vtkPolyData* polydata = vtkPolyData::New();
+  vtkCellArray* polys = vtkCellArray::New();
+
+  this->FramePoints->SetNumberOfPoints(8);
+
+  // central quad
+    {
+    vtkIdType ids[] = { 0, 1, 2, 3 };
+    polys->InsertNextCell(4, ids);
+    }
+
+  // direction arrow triangles
+    {
+    vtkIdType left[]   = { 0, 3, 4 };
+    vtkIdType bottom[] = { 1, 0, 5 };
+    vtkIdType right[]  = { 2, 1, 6 };
+    vtkIdType top[]    = { 3, 2, 7 };
+
+    polys->InsertNextCell(3, left);
+    polys->InsertNextCell(3, bottom);
+    polys->InsertNextCell(3, right);
+    polys->InsertNextCell(3, top);
+    }
+
+  polydata->SetPoints(this->FramePoints);
+  polydata->SetPolys(polys);
+  polys->FastDelete();
+
+  vtkPolyDataMapper2D* mapper = vtkPolyDataMapper2D::New();
+  mapper->SetInputData(polydata);
+  polydata->FastDelete();
+
+  this->FrameActor = vtkActor2D::New();
+  this->FrameActor->SetMapper(mapper);
+  this->FrameActor->GetProperty()->SetColor(0.0, 0.4, 0.0);
+  this->FrameActor->GetProperty()->SetOpacity(0.7);
+  mapper->FastDelete();
+
+  // default positioning is relative to world, not display
+  this->FrameActor->GetPositionCoordinate()->SetCoordinateSystemToWorld();
+
+  // need a reference coordinate for text to allow display position offset
+  // while maintaining a world anchor point
+  vtkCoordinate* coord = vtkCoordinate::New();
+  coord->SetCoordinateSystemToWorld();
+  this->TextActor->GetPositionCoordinate()->SetReferenceCoordinate(coord);
+  coord->FastDelete();
+}
+
+//----------------------------------------------------------------------
+vtkVgAnnotationActor::~vtkVgAnnotationActor()
+{
+  delete [] Text;
+
+  this->TextActor->Delete();
+  this->TextMapper->Delete();
+  this->FrameActor->Delete();
+  this->FramePoints->Delete();
+}
+
+//-----------------------------------------------------------------------------
+vtkTextProperty* vtkVgAnnotationActor::GetTextProperty()
+{
+  return this->TextMapper->GetTextProperty();
+}
+
+//-----------------------------------------------------------------------------
+vtkProperty2D* vtkVgAnnotationActor::GetFrameProperty()
+{
+  return this->FrameActor->GetProperty();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgAnnotationActor::GetTransformedPosition(double pos[3])
+{
+  vtkMatrix4x4* mat = this->GetMatrix();
+
+  double w = mat->Element[3][3];
+  pos[0] = mat->Element[0][3] / w;
+  pos[1] = mat->Element[1][3] / w;
+  pos[2] = mat->Element[2][3] / w;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgAnnotationActor::Update(vtkViewport* v)
+{
+  this->TextMapper->SetInput(this->Text);
+
+  int textSize[2];
+  this->TextMapper->GetSize(v, textSize);
+
+  int padding[] = { 4, 4, 1, 4 }; // left, right, bottom, top
+
+  // size the frame in display coordinates relative to the text
+  if (this->AutoCenterX)
+    {
+    // position the center of the frame over the anchor position
+    this->Left = -(textSize[0] / 2) - padding[0];
+    this->Right = (textSize[0] / 2) + padding[1];
+    }
+  else
+    {
+    // position the left corner of the frame at the anchor position
+    this->Left = 0;
+    this->Right = textSize[0] + padding[0] + padding[1];
+    }
+
+  if (this->AutoCenterY)
+    {
+    // position the center of the frame over the anchor position
+    this->Top = (textSize[1] / 2) + padding[3];
+    this->Bottom = -(textSize[1] / 2) - padding[2];
+    }
+  else
+    {
+    // position the top of the frame at the anchor position
+    this->Top = 0;
+    this->Bottom = -textSize[1] - (padding[2] + padding[3]);
+    }
+
+  // add offset
+  this->Left += this->Offset[0];
+  this->Right += this->Offset[0];
+  this->Bottom += this->Offset[1];
+  this->Top += this->Offset[1];
+
+  this->FramePoints->SetPoint(0, this->Left, this->Bottom, 0.0);
+  this->FramePoints->SetPoint(1, this->Right, this->Bottom, 0.0);
+  this->FramePoints->SetPoint(2, this->Right, this->Top, 0.0);
+  this->FramePoints->SetPoint(3, this->Left, this->Top, 0.0);
+
+  // hide the direction triangles by making them degenerate
+  this->FramePoints->SetPoint(4, this->FramePoints->GetPoint(0));
+  this->FramePoints->SetPoint(5, this->FramePoints->GetPoint(1));
+  this->FramePoints->SetPoint(6, this->FramePoints->GetPoint(2));
+  this->FramePoints->SetPoint(7, this->FramePoints->GetPoint(3));
+
+  // draw 'pointer' to anchor position when not in clamp mode
+  if (!this->ClampToViewport)
+    {
+    double anchor[] = { 0.0, 0.0, 0.0 };
+
+    if (this->Left < 0 && this->Right > 0)
+      {
+      // anchor between the left and right edges of the frame
+      if (this->Bottom < 0 && this->Top > 0)
+        {
+        // anchor is between top and bottom edges
+        }
+      else if (this->Top < 0)
+        {
+        // anchor is above top edge
+        this->FramePoints->SetPoint(7, anchor);
+        }
+      else if (this->Bottom > 0)
+        {
+        // anchor is below bottom edge
+        this->FramePoints->SetPoint(5, anchor);
+        }
+      }
+    else if (this->Left > 0)
+      {
+      // anchor is to the left of the frame
+      if (this->Bottom < 0 && this->Top > 0)
+        {
+        // anchor is between top and bottom edges
+        this->FramePoints->SetPoint(4, anchor);
+        }
+      else if (this->Top < 0)
+        {
+        // anchor is above top edge
+        this->FramePoints->SetPoint(3, anchor);
+        }
+      else if (this->Bottom > 0)
+        {
+        // anchor is below bottom edge
+        this->FramePoints->SetPoint(0, anchor);
+        }
+      }
+    else if (this->Right < 0)
+      {
+      // anchor is to the right of the frame
+      if (this->Bottom < 0 && this->Top > 0)
+        {
+        // anchor is between top and bottom edges
+        this->FramePoints->SetPoint(6, anchor);
+        }
+      else if (this->Top < 0)
+        {
+        // anchor is above top edge
+        this->FramePoints->SetPoint(2, anchor);
+        }
+      else if (this->Bottom > 0)
+        {
+        // anchor is below bottom edge
+        this->FramePoints->SetPoint(1, anchor);
+        }
+      }
+    }
+
+  vtkCoordinate* textCoord = this->TextActor->GetPositionCoordinate();
+
+  // set world position of frame and text
+  double position[3];
+  this->GetTransformedPosition(position);
+  this->FrameActor->SetPosition(position);
+  textCoord->GetReferenceCoordinate()->SetValue(position);
+
+  // add text offset
+  textCoord->SetValue(0.5 * (this->Left + this->Right), this->Top - padding[3]);
+
+  this->UpdateTime.Modified();
+}
+
+//----------------------------------------------------------------------
+void vtkVgAnnotationActor::ReleaseGraphicsResources(vtkWindow* w)
+{
+  this->Superclass::ReleaseGraphicsResources(w);
+  this->TextActor->ReleaseGraphicsResources(w);
+  this->FrameActor->ReleaseGraphicsResources(w);
+}
+
+//----------------------------------------------------------------------
+int vtkVgAnnotationActor::RenderOverlay(vtkViewport* v)
+{
+  if (!this->Text)
+    {
+    return 0;
+    }
+
+  int count = 0;
+  count += this->FrameActor->RenderOverlay(v);
+  count += this->TextActor->RenderOverlay(v);
+  return count;
+}
+
+//----------------------------------------------------------------------
+inline int vtkVgAnnotationActor::CalcArrowLength(int dist)
+{
+  const double limits[] = { 0.0, MaxArrowLengthDist };
+  return MaxArrowLength * pow(vtkMath::ClampAndNormalizeValue(dist, limits), 0.75);
+}
+
+//----------------------------------------------------------------------
+int vtkVgAnnotationActor::RenderOpaqueGeometry(vtkViewport* v)
+{
+  if (!this->Text)
+    {
+    return 0;
+    }
+
+  // update if text or position has changed
+  if (this->GetMTime() > this->UpdateTime)
+    {
+    this->Update(v);
+    }
+
+  // if we're not in clamp mode, no further magic is required.
+  if (!this->ClampToViewport)
+    {
+    int count = 0;
+    count += this->FrameActor->RenderOpaqueGeometry(v);
+    count += this->TextActor->RenderOpaqueGeometry(v);
+    return count;
+    }
+
+  double position[3];
+  this->GetTransformedPosition(position);
+  v->SetWorldPoint(position);
+  v->WorldToDisplay();
+  double pos[] =
+    {
+    floor(v->GetDisplayPoint()[0]),
+    floor(v->GetDisplayPoint()[1])
+    };
+
+  int* viewport = v->GetSize();
+
+  int xmin = pos[0] + this->Left;
+  int xmax = pos[0] + this->Right;
+  int ymin = pos[1] + this->Bottom;
+  int ymax = pos[1] + this->Top;
+
+  int xmid = (this->Left + this->Right) / 2;
+  int ymid = (this->Bottom + this->Top) / 2;
+
+  double xOffset = 0;
+  double yOffset = 0;
+
+  // update the points for the left and right arrows
+  if (xmin < 0)
+    {
+    xOffset = this->CalcArrowLength(-xmin);
+    this->FramePoints->SetPoint(4, this->Left - xOffset, ymid, 0.0);
+    }
+  else if (xmax > viewport[0])
+    {
+    xOffset = -this->CalcArrowLength(xmax - viewport[0]);
+    this->FramePoints->SetPoint(6, this->Right - xOffset, ymid, 0.0);
+    }
+  else if (this->ClampedToBorder)
+    {
+    // the x-extents of the frame are within the viewport - hide the arrows
+    this->FramePoints->SetPoint(4, this->FramePoints->GetPoint(0));
+    this->FramePoints->SetPoint(6, this->FramePoints->GetPoint(2));
+    }
+
+  // update the points for the top and bottom arrows
+  if (ymin < 0)
+    {
+    yOffset = this->CalcArrowLength(-ymin);
+    this->FramePoints->SetPoint(5, xmid, this->Bottom - yOffset, 0.0);
+    }
+  else if (ymax > viewport[1])
+    {
+    yOffset = -this->CalcArrowLength(ymax - viewport[1]);
+    this->FramePoints->SetPoint(7, xmid, this->Top - yOffset, 0.0);
+    }
+  else if (this->ClampedToBorder)
+    {
+    // the y-extents of the frame are within the viewport - hide the arrows
+    this->FramePoints->SetPoint(5, this->FramePoints->GetPoint(1));
+    this->FramePoints->SetPoint(7, this->FramePoints->GetPoint(3));
+    }
+
+  vtkCoordinate* textCoord = this->TextActor->GetPositionCoordinate();
+
+  // see if we need to clamp to the edge of the viewport
+  if (xmin < 0 || xmax > viewport[0] || ymin < 0 || ymax > viewport[1])
+    {
+    // clamp to offset position
+    double newPos[] = { pos[0], pos[1] };
+    double xRange[] = { -this->Left + xOffset, viewport[0] - this->Right + xOffset };
+    double yRange[] = { -this->Bottom + yOffset, viewport[1] - this->Top + yOffset };
+    vtkMath::ClampValue(&newPos[0], xRange);
+    vtkMath::ClampValue(&newPos[1], yRange);
+
+    // use display-relative positioning while clamped
+    if (!this->ClampedToBorder)
+      {
+      this->FrameActor->GetPositionCoordinate()->SetCoordinateSystemToDisplay();
+      textCoord->GetReferenceCoordinate()->SetCoordinateSystemToDisplay();
+      }
+
+    this->FrameActor->SetPosition(newPos);
+    textCoord->GetReferenceCoordinate()->SetValue(newPos[0], newPos[1]);
+    this->ClampedToBorder = true;
+    }
+  else if (this->ClampedToBorder)
+    {
+    // the frame is now within the viewport again, so go back to using world coords
+    this->FrameActor->GetPositionCoordinate()->SetCoordinateSystemToWorld();
+    this->FrameActor->SetPosition(this->GetPosition());
+    textCoord->GetReferenceCoordinate()->SetCoordinateSystemToWorld();
+    textCoord->GetReferenceCoordinate()->SetValue(this->GetPosition());
+    this->ClampedToBorder = false;
+    }
+
+  int count = 0;
+  count += this->FrameActor->RenderOpaqueGeometry(v);
+  count += this->TextActor->RenderOpaqueGeometry(v);
+  return count;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgAnnotationActor::HasTranslucentPolygonalGeometry()
+{
+  if (!this->Text)
+    {
+    return 0;
+    }
+
+  int count = 0;
+  count += this->FrameActor->HasTranslucentPolygonalGeometry();
+  count += this->TextActor->HasTranslucentPolygonalGeometry();
+  return count;
+}
+
+//----------------------------------------------------------------------
+void vtkVgAnnotationActor::GetActors2D(vtkPropCollection* pc)
+{
+  pc->AddItem(this->FrameActor);
+  pc->AddItem(this->TextActor);
+}
+
+//----------------------------------------------------------------------
+void vtkVgAnnotationActor::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Annotation Text: ";
+
+  if (this->Text)
+    {
+    os << this->Text << '\n';
+    }
+  else
+    {
+    os << "(none)\n";
+    }
+}
diff --git a/Libraries/VtkVgCore/vtkVgAnnotationActor.h b/Libraries/VtkVgCore/vtkVgAnnotationActor.h
new file mode 100644
index 00000000..83b897f7
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAnnotationActor.h
@@ -0,0 +1,127 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgAnnotationActor - a composite 2D actor for displaying simple text annotations
+
+#ifndef __vtkVgAnnotationActor_h
+#define __vtkVgAnnotationActor_h
+
+#include "vtkActor.h"
+
+#include <vgExport.h>
+
+class vtkActor2D;
+class vtkPoints;
+class vtkProperty2D;
+class vtkTextActor;
+class vtkTextMapper;
+class vtkTextProperty;
+
+class VTKVG_CORE_EXPORT vtkVgAnnotationActor : public vtkActor
+{
+public:
+  vtkTypeMacro(vtkVgAnnotationActor, vtkActor);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Instantiate the class.
+  static vtkVgAnnotationActor* New();
+
+  // Description:
+  // Specify/retrieve the text to display in the annotation.
+  vtkGetStringMacro(Text);
+  vtkSetStringMacro(Text);
+
+  // Description:
+  // Set/get the text property
+  vtkTextProperty* GetTextProperty();
+
+  // Description:
+  // Set/get the frame property
+  vtkProperty2D*   GetFrameProperty();
+
+  // Description:
+  // Access to the component actors
+  vtkActor2D* GetFrameActor() { return this->FrameActor; }
+  vtkActor2D* GetTextActor() { return this->TextActor; }
+
+  // Description:
+  // Clamp annotation to edges of viewport?
+  vtkSetMacro(ClampToViewport, bool);
+  vtkGetMacro(ClampToViewport, bool);
+  vtkBooleanMacro(ClampToViewport, bool);
+
+  // Description:
+  // Specify the display offset of the annotation.
+  vtkSetVector2Macro(Offset, int);
+  vtkGetVector2Macro(Offset, int);
+
+  // Description:
+  // Automatically set the x offset so that the text will be centered on the
+  // anchor point.
+  vtkSetMacro(AutoCenterX, bool);
+  vtkGetMacro(AutoCenterX, bool);
+  vtkBooleanMacro(AutoCenterX, bool);
+
+  // Description:
+  // Automatically set the y offset so that the text will be centered on the
+  // anchor point.
+  vtkSetMacro(AutoCenterY, bool);
+  vtkGetMacro(AutoCenterY, bool);
+  vtkBooleanMacro(AutoCenterY, bool);
+
+  // Description:
+  // Methods required by vtkProp superclass.
+  virtual void ReleaseGraphicsResources(vtkWindow* w);
+
+  virtual int RenderOpaqueGeometry(vtkViewport* viewport);
+  virtual int RenderTranslucentPolygonalGeometry(vtkViewport*) {return 0;};
+  virtual int RenderOverlay(vtkViewport* viewport);
+  virtual int HasTranslucentPolygonalGeometry();
+
+  virtual void GetActors2D(vtkPropCollection* pc);
+
+  // Returning a null bounds prevents the renderer from culling this actor
+  virtual double* GetBounds() { return 0; }
+
+protected:
+  vtkVgAnnotationActor();
+  ~vtkVgAnnotationActor();
+
+  // Gets the final transformed world position of the actor.
+  void GetTransformedPosition(double pos[3]);
+
+  char* Text;
+
+  int Offset[2];
+
+  bool AutoCenterX;
+  bool AutoCenterY;
+
+  vtkTextMapper*   TextMapper;
+  vtkActor2D*      TextActor;
+
+  vtkPoints*       FramePoints;
+  vtkActor2D*      FrameActor;
+
+  vtkTimeStamp    UpdateTime;
+
+  bool ClampToViewport;
+  bool ClampedToBorder;
+
+  // bounds of frame in pixels relative to the actor
+  int Left, Right;
+  int Bottom, Top;
+
+private:
+  vtkVgAnnotationActor(const vtkVgAnnotationActor&);  //Not implemented
+  void operator=(const vtkVgAnnotationActor&);      //Not implemented
+
+  void Update(vtkViewport* v);
+  inline int CalcArrowLength(int dist);
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgAppendImageData.cxx b/Libraries/VtkVgCore/vtkVgAppendImageData.cxx
new file mode 100644
index 00000000..7e29eb5f
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAppendImageData.cxx
@@ -0,0 +1,563 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// VTKExtensions include.
+#include "vtkVgAppendImageData.h"
+#include "vtkVgImageSource.h"
+#include "vtkVgMultiResJpgImageReader2.h"
+
+//
+#include <vtkConditionVariable.h>
+#include <vtkImageData.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
+#include <vtkMultiThreader.h>
+#include <vtkObjectFactory.h>
+#include <vtkMutexLock.h>
+#include <vtkPNGReader.h>
+#include <vtkPointData.h>
+#include <vtkSmartPointer.h>
+#include <vtkStreamingDemandDrivenPipeline.h>
+
+
+#include <vtksys/SystemTools.hxx>
+
+// STL includes.
+#include <string>
+#include <sstream>
+
+vtkStandardNewMacro(vtkVgAppendImageData);
+
+// Thread stuff.
+//-----------------------------------------------------------------------------
+VTK_THREAD_RETURN_TYPE vtkAppendImageDataThreadStart(void* arg)
+{
+  vtkVgAppendImageData* self;
+  self = static_cast<vtkVgAppendImageData*>
+         (static_cast<vtkMultiThreader::ThreadInfo*>(arg)->UserData);
+  self->Start();
+  return VTK_THREAD_RETURN_VALUE;
+}
+
+// This class hides the implementation details.
+//-----------------------------------------------------------------------------
+class vtkAppendImageDataInternal
+{
+public:
+  vtkAppendImageDataInternal(vtkVgAppendImageData* aidPtr);
+  ~vtkAppendImageDataInternal();
+
+  vtkSmartPointer<vtkImageData> ImageVolume;
+  vtkVgAppendImageData*           Interface;
+};
+
+//-----------------------------------------------------------------------------
+vtkAppendImageDataInternal::vtkAppendImageDataInternal(
+  vtkVgAppendImageData* aidPtr) :
+  Interface(aidPtr)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkAppendImageDataInternal::~vtkAppendImageDataInternal()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgAppendImageData::vtkVgAppendImageData() :
+  vtkImageAlgorithm()
+{
+  this->StopThread          = false;
+  this->UseOutputResolution = false;
+
+  this->SetBaseFileName(0);
+  this->SetBaseFileNamePrefix(0);
+  this->SetBaseFileNameNum(0);
+
+  this->NoOfFiles       = -1;
+  this->BaseNum         = -1;
+  this->WorkerThreadId  = -1;
+  this->StateArray      =  0;
+
+  for (int i = 0; i < 4; ++i)
+    {
+    ReadExtents[i]      = -1;
+    }
+
+  OutputResolution[0] = -1;
+  OutputResolution[1] = -1;
+
+  this->Threader = vtkMultiThreader::New();
+  this->Threader->SetNumberOfThreads(1);
+
+  this->ProcessingLock = vtkMutexLock::New();
+
+  this->ConditionLock = vtkMutexLock::New();
+  this->Condition     = vtkConditionVariable::New();
+
+  this->Lock          = vtkMutexLock::New();
+
+  this->Implementation = new vtkAppendImageDataInternal(this);
+
+  this->SetNumberOfInputPorts(0);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgAppendImageData::~vtkVgAppendImageData()
+{
+  std::cout << "~vtkVgAppendImageData" << std::endl;
+
+  this->SetBaseFileName(0);
+  this->SetBaseFileNamePrefix(0);
+  this->SetBaseFileNameNum(0);
+
+  this->VGImageReader->Delete();
+
+  this->Threader->Delete();
+  this->ProcessingLock->Delete();
+  this->ConditionLock->Delete();
+  this->Condition->Delete();
+
+  this->Lock->Delete();
+
+  delete this->Implementation;
+}
+
+//-----------------------------------------------------------------------------
+//vtkImageData* vtkVgAppendImageData::GetData()
+//{
+//  return this->Implementation->ImageVolume;
+//}
+
+//-----------------------------------------------------------------------------
+void vtkVgAppendImageData::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "StopThread: " << this->StopThread << std::endl;
+  os << indent << "BaseFileName: " << (this->BaseFileName != NULL
+    ? this->BaseFileName : "NULL") << std::endl;
+  os << indent << "BaseFileNamePrefix: " << (this->BaseFileNamePrefix != NULL
+    ? this->BaseFileName : "NULL") << std::endl;
+  os << indent << "BaseFileNameNum: " << (this->BaseFileNameNum != NULL
+    ? this->BaseFileName : "NULL") << std::endl;
+  os << indent << "NoOfFiles: " << NoOfFiles << std::endl;
+  os << indent << "BaseNum: " << BaseNum << std::endl;
+  os << indent << "WorkerThreadId: " << WorkerThreadId << std::endl;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgAppendImageData::GetOutputResolution(int &w, int &h) const
+{
+  w = this->OutputResolution[0];
+  h = this->OutputResolution[1];
+  return;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgAppendImageData::SetOutputResolution(int w, int h)
+{
+  if (w < 0)
+    {
+    // Error.
+    return;
+    }
+
+  if (h < 0)
+    {
+    // Error.
+    return;
+    }
+
+  this->OutputResolution[0] = w;
+  this->OutputResolution[1] = h;
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgAppendImageData::UpdateStateInfo(int* stArr)
+{
+  if (!stArr)
+    {
+    std::cerr << "Incoming array is NULL or Invalid." << std::endl;
+    return;
+    }
+
+  this->ProcessingLock->Lock();
+
+  for (int i = 0; i < this->NoOfFiles; ++i)
+    {
+    stArr[i] = StateArray[i];
+    }
+
+  this->ProcessingLock->Unlock();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgAppendImageData::RequestInformation(
+  vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** vtkNotUsed(inputVector),
+  vtkInformationVector* outputVector)
+{
+  // Making sure to initialize VGImageReader.
+  this->Init();
+
+  // Get the info object.
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  int dataExtent[6] = { -1, -1, -1, -1, -1, -1};
+  double spacing[3] = {1, 1, 1};
+  double origin[3] = {0, 0, 0};
+
+  if (this->GetUseOutputResolution())
+    {
+    dataExtent[0] = 0;
+    dataExtent[1] = this->OutputResolution[0] - 1;
+    dataExtent[2] = 0;
+    dataExtent[3] = this->OutputResolution[1] - 1;
+    dataExtent[4] = 0;
+    dataExtent[5] = this->NoOfFiles - 1;
+    }
+  else
+    {
+    // Assuming that read extens are not bigger than the actual dimensions of
+    // the image.
+    // @TODO: Fix this assumption later.
+    //
+    bool getFullExtents(false);
+    for (int i = 0; i < 4; ++i)
+      {
+      if (this->ReadExtents[i] == -1)
+        {
+        getFullExtents = true;
+        break;
+        }
+      }
+
+    if (getFullExtents)
+      {
+      vtkImageData* image = this->VGImageReader->GetOutput();
+      if (image)
+        {
+        int extents[6];
+        image->GetExtent(extents);
+        this->SetReadExtents(extents[0], extents[1],
+                             extents[2], extents[3]);
+        }
+      }
+
+    origin[0] = this->ReadExtents[0];
+    origin[1] = this->ReadExtents[1];
+    dataExtent[0] = 0;
+    dataExtent[1] = this->ReadExtents[2] - this->ReadExtents[0] - 1;
+    dataExtent[2] = 0;
+    dataExtent[3] = this->ReadExtents[3] - this->ReadExtents[1] - 1;
+    dataExtent[4] = 0;
+    dataExtent[5] = this->NoOfFiles - 1;
+    }
+
+  outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),
+               dataExtent, 6);
+  outInfo->Set(vtkDataObject::SPACING(), spacing, 3);
+  outInfo->Set(vtkDataObject::ORIGIN(),  origin,  3);
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgAppendImageData::RequestData(vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** vtkNotUsed(inputVector),
+  vtkInformationVector* outputVector)
+{
+  // First stop the last thread running.
+  // @NOTE: May be I need to forcefully kill the thread here.
+  this->Stop();
+  this->Finish();
+
+  // Pipeline stuff.
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information.\n");
+    return 1;
+    }
+
+  vtkDataObject* outDataObj = outInfo->Get(vtkDataObject::DATA_OBJECT());
+  if (!outDataObj)
+    {
+    vtkErrorMacro("Invalid output data object.\n");
+    return 1;
+    }
+
+  vtkImageData* outImageData = vtkImageData::SafeDownCast(outDataObj);
+  if (!outImageData)
+    {
+    vtkErrorMacro("Invalid output image data.\n")
+    return 1;
+    }
+
+  // First extract the required ivars.
+  this->ComputerInternalFileName();
+
+  // Initialize the state array with false (0) value.
+  this->ProcessingLock->Lock();
+  this->StateArray = new int[this->NoOfFiles];
+  for (int i = 0; i < this->NoOfFiles; ++i)
+    {
+    this->StateArray[i] = 0;
+    }
+  this->ProcessingLock->Unlock();
+
+  this->Implementation->ImageVolume = vtkSmartPointer<vtkImageData>::New();
+
+  // Read the very first file for the meta data.
+  //@NOTE: This has been moved to Init() which will be called during RequestInformation.
+  vtkSmartPointer<vtkImageData> tempImageData(vtkSmartPointer<vtkImageData>::New());
+//  this->VGImageReader->SetFileName(this->BaseFileName);
+//  this->VGImageReader->SetUseOutputResolution(this->UseOutputResolution);
+//  this->VGImageReader->SetReadExtents(this->ReadExtents);
+//  this->VGImageReader->SetOutputResolution(this->OutputResolution[0],
+//                                           this->OutputResolution[1]);
+//  this->VGImageReader->Update();
+
+  tempImageData->ShallowCopy(this->VGImageReader->GetOutput());
+
+  int dims[] = {0, 0};
+  if (tempImageData)
+    {
+    tempImageData->GetDimensions(dims);
+    }
+  else
+    {
+    std::cout << "Failed to read the image. " << std::endl;
+    return 1;
+    }
+
+  // @TODO Fix this
+  int wext[6] = {0, dims[0] - 1,
+                 0, dims[1] - 1,
+                 0, this->NoOfFiles - 1};
+  outInfo->Set(
+    vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), wext, 6);
+
+  // @NOTE: Do we need to set the same origin as the original data.
+//  this->Implementation->ImageVolume->SetScalarType(tempImageData->GetScalarType());
+//  this->Implementation->ImageVolume->SetNumberOfScalarComponents(
+//    tempImageData->GetNumberOfScalarComponents());
+//  this->Implementation->ImageVolume->SetOrigin(tempImageData->GetOrigin());
+//  this->Implementation->ImageVolume->SetSpacing(tempImageData->GetSpacing());
+//  this->Implementation->ImageVolume->AllocateScalars();
+
+  // Here we are spawing a new thread.
+//  this->WorkerThreadId =
+//    this->Threader->SpawnThread(vtkAppendImageDataThreadStart, this);
+
+//  outImageData->ShallowCopy(this->Implementation->ImageVolume);
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgAppendImageData::Start()
+{
+  int currIndex = this->BaseNum;
+
+  int lenBaseStr = static_cast<int>(strlen(this->BaseFileNameNum));
+
+  // Loop.
+  while (currIndex < (this->BaseNum + this->NoOfFiles))
+    {
+    this->Lock->Lock();
+    if (this->StopThread)
+      {
+      this->Condition->Broadcast();
+      this->Lock->Unlock();
+      return;
+      }
+    this->Lock->Unlock();
+
+    int sliceNo = currIndex - this->BaseNum;
+
+    // If already done reading skip.
+    if (StateArray[sliceNo])
+      {
+      continue;
+      }
+
+    std::ostringstream oss;
+    oss << currIndex;
+
+    std::string indexStr = oss.str();
+    int lenIndexStr = static_cast<int>(indexStr.length());
+
+    for (int i = 0; i < (lenBaseStr - lenIndexStr); ++i)
+      {
+      indexStr = std::string("0" + indexStr);
+      }
+
+    // Get the complete path of the next file in line.
+    std::string nextInputFileName = std::string(this->BaseFileNamePrefix
+      + indexStr
+      + vtksys::SystemTools::GetFilenameExtension(this->BaseFileName));
+
+    std::cout << "Processing file " << nextInputFileName << std::endl;
+
+    this->VGImageReader->SetFileName(nextInputFileName.c_str());
+    this->VGImageReader->SetUseOutputResolution(this->UseOutputResolution);
+    this->VGImageReader->SetReadExtents(this->ReadExtents);
+    this->VGImageReader->SetOutputResolution(this->OutputResolution[0],
+                                             this->OutputResolution[1]);
+    this->VGImageReader->Update();
+    vtkImageData* outImgData = this->VGImageReader->GetOutput();
+
+    // Find the address.
+    int dims[3];
+    int dataSize = this->Implementation->ImageVolume->GetScalarSize();
+    this->Implementation->ImageVolume->GetDimensions(dims);
+    size_t copySize = dims[0] * dims[1] * dataSize *
+                      outImgData->GetNumberOfScalarComponents();
+
+    memcpy(this->Implementation->ImageVolume->GetScalarPointer(0, 0, sliceNo),
+           outImgData->GetScalarPointer(),
+           copySize);
+
+    this->ProcessingLock->Lock();
+    this->StateArray[sliceNo] = 1;
+    this->ProcessingLock->Unlock();
+
+    ++currIndex;
+    }
+
+  this->Condition->Broadcast();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgAppendImageData::Stop()
+{
+  // Terminate the thread now.
+  if (this->WorkerThreadId != -1
+    && this->Threader->IsThreadActive(this->WorkerThreadId))
+    {
+    this->Lock->Lock();
+    this->StopThread = true;
+    this->Lock->Unlock();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgAppendImageData::Finish()
+{
+  if (this->WorkerThreadId != -1
+    && this->Threader->IsThreadActive(this->WorkerThreadId))
+    {
+    // Make sure that you wait for the thread to finish.
+    this->ConditionLock->Lock();
+    this->Condition->Wait(this->ConditionLock);
+    this->ConditionLock->Unlock();
+
+    this->Threader->TerminateThread(this->WorkerThreadId);
+    }
+
+  if (this->Threader->IsThreadActive(this->WorkerThreadId))
+    {
+    return false;
+    }
+  else
+    {
+    return true;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgAppendImageData::Kill()
+{
+  // Kill the thread forecefully.
+  if (this->WorkerThreadId != -1
+    && this->Threader->IsThreadActive(this->WorkerThreadId))
+    {
+    this->Threader->TerminateThread(this->WorkerThreadId);
+    }
+
+  if (this->Threader->IsThreadActive(this->WorkerThreadId))
+    {
+    return false;
+    }
+  else
+    {
+    return true;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgAppendImageData::ComputerInternalFileName()
+{
+  std::string fileName(this->BaseFileName);
+
+//  std::cout << "fileName " << fileName << std::endl;
+
+  size_t posUS;
+  size_t posDot;
+
+  posUS = fileName.find_last_of("_");
+
+  if (posUS == std::string::npos)
+    {
+    // Throw an error.
+    return;
+    }
+
+//  std::cout << "posUS" << posUS << std::endl;
+
+  posDot = fileName.find_last_of(".");
+  if (posDot == std::string::npos)
+    {
+    // Throw an error.
+    return;
+    }
+
+//  std::cout << "posDot" << posDot << std::endl;
+
+  std::string prefix = fileName.substr(0, posUS + 1);
+  this->SetBaseFileNamePrefix(prefix.c_str());
+//  std::cout << "BaseFileNamePrefix: " << this->BaseFileNamePrefix << std::endl;
+
+  std::string numStr = fileName.substr(posUS + 1, posDot - (posUS + 1));
+//  std::cout << "numStr is: " << numStr << std::endl;
+
+  std::istringstream iss;
+  iss.str(numStr);
+  iss >> this->BaseNum;
+
+//  std::cout << "Check: this->BaseNum " << this->BaseNum << std::endl;
+
+  this->SetBaseFileNameNum(numStr.c_str());
+}
+
+
+void vtkVgAppendImageData::Init()
+{
+  std::string ext
+    = vtksys::SystemTools::GetFilenameExtension(this->BaseFileName);
+  if (ext.compare(".mrj"))
+    {
+    this->VGImageReader = vtkVgMultiResJpgImageReader2::New();
+    }
+  else if (ext.compare(".jp2"))
+    {
+    this->VGImageReader = vtkVgImageSource::New();
+    }
+  else
+    {
+    }
+
+  this->VGImageReader->SetFileName(this->BaseFileName);
+  this->VGImageReader->SetUseOutputResolution(this->UseOutputResolution);
+  this->VGImageReader->SetReadExtents(this->ReadExtents);
+  this->VGImageReader->SetOutputResolution(this->OutputResolution[0],
+                                           this->OutputResolution[1]);
+  this->VGImageReader->Update();
+}
diff --git a/Libraries/VtkVgCore/vtkVgAppendImageData.h b/Libraries/VtkVgCore/vtkVgAppendImageData.h
new file mode 100644
index 00000000..0b10850e
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAppendImageData.h
@@ -0,0 +1,139 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgAppendImageData_h
+#define __vtkVgAppendImageData_h
+
+#include "vtkImageAlgorithm.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkAppendImageDataInternal;
+class vtkImageReader2;
+class vtkVgBaseImageSource;
+class vtkMutexLock;
+class vtkMultiThreader;
+class vtkConditionVariable;
+
+class VTKVG_CORE_EXPORT vtkVgAppendImageData : public vtkImageAlgorithm
+{
+public:
+  static vtkVgAppendImageData* New();
+  vtkTypeMacro(vtkVgAppendImageData, vtkImageAlgorithm);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Get/Set the first file name in the list of filenames.
+  // This should include the path as well for ex. on Unix
+  // systems it would be /home/...../test_00001.jp2. Naming
+  // convention is important here as anything after last '_'
+  // will be considered as the index.
+  vtkGetStringMacro(BaseFileName);
+  vtkSetStringMacro(BaseFileName);
+
+  // Get/Set the number of files to be read including the
+  // \c BaseFileName.
+  vtkGetMacro(NoOfFiles, int);
+  vtkSetMacro(NoOfFiles, int);
+
+  // Get/Set the flag to use requested resolution. If set to false
+  // image won't be sampled.
+  vtkGetMacro(UseOutputResolution, bool);
+  vtkSetMacro(UseOutputResolution, bool);
+  vtkBooleanMacro(UseOutputResolution, bool);
+
+  // Get/Set requested resolution. If \c UseOutputResolution
+  // set to true and given these values the image will sampled
+  // accordingly. For example if the reader reads the entire image
+  // of 1k X 1k size and user has set w, h = 500 then image will
+  // be downsampled.
+  void GetOutputResolution(int& w, int& h) const;
+  void SetOutputResolution(int w, int h);
+
+  // Get/Set the extents of the data to be read. Currently there is
+  // no check if this extent is bigger than the whole extent of the
+  // data.
+  vtkSetVector4Macro(ReadExtents, int);
+  vtkGetVector4Macro(ReadExtents, int);
+
+  // Use this function to query what slices has been read. Passed
+  // array should have enough memory to held \c NoOfFiles flags.
+  void UpdateStateInfo(int* stArr);
+
+  // Thread related functions.
+  void        Start();
+  void        Stop();
+  bool        Finish();
+  bool        Kill();
+
+  // This is not required as of now.
+//  vtkImageData*        GetData();
+
+protected:
+
+  vtkVgAppendImageData();
+  virtual ~vtkVgAppendImageData();
+
+  virtual int RequestInformation(vtkInformation* request,
+                                 vtkInformationVector** inputVector,
+                                 vtkInformationVector* outputVector);
+
+  virtual int RequestData(vtkInformation* request,
+                          vtkInformationVector** inputVector,
+                          vtkInformationVector* outputVector);
+
+
+  // Useful functions.
+  void        ComputerInternalFileName();
+
+  // This function is needed to that we can query some meta data.
+  void        Init();
+
+  vtkSetStringMacro(BaseFileNamePrefix);
+  vtkSetStringMacro(BaseFileNameNum);
+
+// Data:
+protected:
+
+  bool  StopThread;
+  bool  UseOutputResolution;
+
+  char* BaseFileName;
+  char* BaseFileNamePrefix;
+  char* BaseFileNameNum;
+
+  int   NoOfFiles;
+  int   BaseNum;
+  int   WorkerThreadId;
+  int*  StateArray;
+
+  int   OutputResolution[2];
+  int   ReadExtents[4];
+
+  vtkVgBaseImageSource* VGImageReader;
+
+  vtkMultiThreader* Threader;
+
+  // Lock used for read / write StateArray.
+  vtkMutexLock*     ProcessingLock;
+
+  // Lock and condition used for making sure
+  // application wait for the thread to finish
+  // unless application calls \c Stop().
+  vtkMutexLock*         ConditionLock;
+  vtkConditionVariable* Condition;
+
+  // Lock used for read / write StopThread.
+  vtkMutexLock*         Lock;
+
+  vtkAppendImageDataInternal* Implementation;
+
+private:
+  vtkVgAppendImageData(const vtkVgAppendImageData&);  // Not implemented.
+  void operator=(const vtkVgAppendImageData&);      // Not implemented.
+};
+
+#endif // __vtkVgAppendImageData_h
diff --git a/Libraries/VtkVgCore/vtkVgApplySelectedColor.cxx b/Libraries/VtkVgCore/vtkVgApplySelectedColor.cxx
new file mode 100644
index 00000000..e68120a9
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgApplySelectedColor.cxx
@@ -0,0 +1,301 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgApplySelectedColor.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+/*-------------------------------------------------------------------------
+  Copyright 2008 Sandia Corporation.
+  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+  the U.S. Government retains certain rights in this software.
+-------------------------------------------------------------------------*/
+#include "vtkVgApplySelectedColor.h"
+
+#include "vtkCellData.h"
+#include "vtkGraph.h"
+#include "vtkIdTypeArray.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkObjectFactory.h"
+#include "vtkPointData.h"
+#include "vtkDataSet.h"
+#include "vtkSmartPointer.h"
+#include "vtkTable.h"
+#include "vtkUnsignedCharArray.h"
+
+vtkStandardNewMacro(vtkVgApplySelectedColor);
+
+//----------------------------------------------------------------------------
+vtkVgApplySelectedColor::vtkVgApplySelectedColor()
+{
+  this->DefaultPointColor[0] = 0.0;
+  this->DefaultPointColor[1] = 0.0;
+  this->DefaultPointColor[2] = 0.0;
+  this->DefaultPointOpacity = 1.0;
+  this->DefaultCellColor[0] = 0.0;
+  this->DefaultCellColor[1] = 0.0;
+  this->DefaultCellColor[2] = 0.0;
+  this->DefaultCellOpacity = 1.0;
+  this->SelectedPointColor[0] = 1.0;
+  this->SelectedPointColor[1] = 0.0;
+  this->SelectedPointColor[2] = 1.0;
+  this->SelectedPointOpacity = 1.0;
+  this->SelectedCellColor[0] = 1.0;
+  this->SelectedCellColor[1] = 0.0;
+  this->SelectedCellColor[2] = 1.0;
+  this->SelectedCellOpacity = 1.0;
+  this->SetNumberOfInputPorts(1);
+
+  this->SetInputArrayToProcess(0, 0, 0,
+                               vtkDataObject::FIELD_ASSOCIATION_VERTICES,
+                               vtkDataSetAttributes::SCALARS);
+  this->SetInputArrayToProcess(1, 0, 0,
+                               vtkDataObject::FIELD_ASSOCIATION_VERTICES,
+                               vtkDataSetAttributes::SCALARS);
+  this->SetInputArrayToProcess(2, 0, 0,
+                               vtkDataObject::FIELD_ASSOCIATION_EDGES,
+                               vtkDataSetAttributes::SCALARS);
+  this->SetInputArrayToProcess(3, 0, 0,
+                               vtkDataObject::FIELD_ASSOCIATION_EDGES,
+                               vtkDataSetAttributes::SCALARS);
+
+  this->PointColorOutputArrayName = 0;
+  this->CellColorOutputArrayName = 0;
+  this->SetPointColorOutputArrayName("vtkVgApplySelectedColor color");
+  this->SetCellColorOutputArrayName("vtkVgApplySelectedColor color");
+
+  this->UsePointScalars = false;
+  this->UsePointSelection = false;
+  this->UseCellScalars = false;
+  this->UseCellSelection = false;
+}
+
+//----------------------------------------------------------------------------
+vtkVgApplySelectedColor::~vtkVgApplySelectedColor()
+{
+  this->SetPointColorOutputArrayName(0);
+  this->SetCellColorOutputArrayName(0);
+}
+
+//----------------------------------------------------------------------------
+int vtkVgApplySelectedColor::FillInputPortInformation(int port, vtkInformation* info)
+{
+  if (port == 0)
+    {
+    info->Remove(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE());
+    info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkDataSet");
+    info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkGraph");
+    info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkTable");
+    }
+  return 1;
+}
+
+//----------------------------------------------------------------------------
+int vtkVgApplySelectedColor::RequestData(
+  vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** inputVector,
+  vtkInformationVector* outputVector)
+{
+  // get the info objects
+  vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  if (!this->PointColorOutputArrayName || !this->CellColorOutputArrayName)
+    {
+    vtkErrorMacro("Point and cell array names must be valid");
+    return 0;
+    }
+
+  // get the input and output
+  vtkDataObject* input = inInfo->Get(vtkDataObject::DATA_OBJECT());
+  vtkDataObject* output = outInfo->Get(vtkDataObject::DATA_OBJECT());
+
+  output->ShallowCopy(input);
+
+  vtkGraph* graph = vtkGraph::SafeDownCast(output);
+  vtkDataSet* dataSet = vtkDataSet::SafeDownCast(output);
+  vtkTable* table = vtkTable::SafeDownCast(output);
+
+  // initialize color arrays
+  vtkSmartPointer<vtkUnsignedCharArray> colorArr1 =
+    vtkSmartPointer<vtkUnsignedCharArray>::New();
+
+  colorArr1->SetName(this->PointColorOutputArrayName);
+  colorArr1->SetNumberOfComponents(4);
+
+  if (graph)
+    {
+    colorArr1->SetNumberOfTuples(graph->GetNumberOfVertices());
+    graph->GetVertexData()->AddArray(colorArr1);
+    }
+  else if (dataSet)
+    {
+    colorArr1->SetNumberOfTuples(dataSet->GetNumberOfPoints());
+    dataSet->GetPointData()->AddArray(colorArr1);
+    }
+  else
+    {
+    colorArr1->SetNumberOfTuples(table->GetNumberOfRows());
+    table->AddColumn(colorArr1);
+    }
+
+  vtkSmartPointer<vtkUnsignedCharArray> colorArr2 =
+    vtkSmartPointer<vtkUnsignedCharArray>::New();
+
+  colorArr2->SetName(this->CellColorOutputArrayName);
+  colorArr2->SetNumberOfComponents(4);
+
+  if (graph)
+    {
+    colorArr2->SetNumberOfTuples(graph->GetNumberOfEdges());
+    graph->GetEdgeData()->AddArray(colorArr2);
+    }
+  else if (dataSet)
+    {
+    colorArr2->SetNumberOfTuples(dataSet->GetNumberOfCells());
+    dataSet->GetCellData()->AddArray(colorArr2);
+    }
+
+  unsigned char pointColor[4];
+  pointColor[0] = static_cast<unsigned char>(255 * this->DefaultPointColor[0]);
+  pointColor[1] = static_cast<unsigned char>(255 * this->DefaultPointColor[1]);
+  pointColor[2] = static_cast<unsigned char>(255 * this->DefaultPointColor[2]);
+  pointColor[3] = static_cast<unsigned char>(255 * this->DefaultPointOpacity);
+
+  unsigned char sPointColor[4];
+  sPointColor[0] = static_cast<unsigned char>(255 * this->SelectedPointColor[0]);
+  sPointColor[1] = static_cast<unsigned char>(255 * this->SelectedPointColor[1]);
+  sPointColor[2] = static_cast<unsigned char>(255 * this->SelectedPointColor[2]);
+  sPointColor[3] = static_cast<unsigned char>(255 * this->SelectedPointOpacity);
+
+  vtkAbstractArray* selected
+    = this->UsePointSelection ?
+      this->GetInputAbstractArrayToProcess(0, inputVector) : 0;
+
+  if (selected &&
+      selected->GetNumberOfTuples() != colorArr1->GetNumberOfTuples())
+    {
+    vtkErrorMacro("Selection array size doesn't match input size");
+    return 0;
+    }
+
+  vtkUnsignedCharArray* inputColors
+    = this->UsePointScalars ?
+      vtkUnsignedCharArray::SafeDownCast(
+        this->GetInputAbstractArrayToProcess(1, inputVector)) : 0;
+
+  if (inputColors &&
+      inputColors->GetNumberOfTuples() != colorArr1->GetNumberOfTuples())
+    {
+    vtkErrorMacro("Input color array size doesn't match input size");
+    return 0;
+    }
+
+  this->ProcessColorArray(selected, inputColors, colorArr1,
+                          sPointColor, pointColor);
+
+  unsigned char cellColor[4];
+  cellColor[0] = static_cast<unsigned char>(255 * this->DefaultCellColor[0]);
+  cellColor[1] = static_cast<unsigned char>(255 * this->DefaultCellColor[1]);
+  cellColor[2] = static_cast<unsigned char>(255 * this->DefaultCellColor[2]);
+  cellColor[3] = static_cast<unsigned char>(255 * this->DefaultCellOpacity);
+
+  unsigned char sCellColor[4];
+  sCellColor[0] = static_cast<unsigned char>(255 * this->SelectedCellColor[0]);
+  sCellColor[1] = static_cast<unsigned char>(255 * this->SelectedCellColor[1]);
+  sCellColor[2] = static_cast<unsigned char>(255 * this->SelectedCellColor[2]);
+  sCellColor[3] = static_cast<unsigned char>(255 * this->SelectedCellOpacity);
+
+  selected = this->UseCellSelection ?
+             this->GetInputAbstractArrayToProcess(2, inputVector) : 0;
+
+  if (selected &&
+      selected->GetNumberOfTuples() != colorArr2->GetNumberOfTuples())
+    {
+    vtkErrorMacro("Selection array size doesn't match input size");
+    return 0;
+    }
+
+  inputColors = this->UseCellScalars ?
+                vtkUnsignedCharArray::SafeDownCast(
+                  this->GetInputAbstractArrayToProcess(3, inputVector)) : 0;
+
+  if (inputColors &&
+      inputColors->GetNumberOfTuples() != colorArr2->GetNumberOfTuples())
+    {
+    vtkErrorMacro("Input color array size doesn't match input size");
+    return 0;
+    }
+
+  this->ProcessColorArray(selected, inputColors, colorArr2,
+                          sCellColor, cellColor);
+
+  return 1;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgApplySelectedColor::ProcessColorArray(
+  vtkAbstractArray* selectedArr,
+  vtkUnsignedCharArray* inputColorArr,
+  vtkUnsignedCharArray* outputColorArr,
+  unsigned char selectedColor[4],
+  unsigned char defaultColor[4])
+{
+  for (vtkIdType i = 0; i < outputColorArr->GetNumberOfTuples(); ++i)
+    {
+    if (selectedArr && selectedArr->GetVariantValue(i).ToInt() != 0)
+      {
+      outputColorArr->SetTupleValue(i, selectedColor);
+      continue;
+      }
+
+    if (inputColorArr)
+      {
+      unsigned char color[4] = { 0, 0, 0, 255 };
+      inputColorArr->GetTupleValue(i, color);
+      outputColorArr->SetTupleValue(i, color);
+      }
+    else
+      {
+      outputColorArr->SetTupleValue(i, defaultColor);
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
+void vtkVgApplySelectedColor::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+  os << indent << "DefaultPointColor: "
+     << this->DefaultPointColor[0] << ","
+     << this->DefaultPointColor[1] << ","
+     << this->DefaultPointColor[2] << endl;
+  os << indent << "DefaultPointOpacity: " << this->DefaultPointOpacity << endl;
+  os << indent << "DefaultCellColor: "
+     << this->DefaultCellColor[0] << ","
+     << this->DefaultCellColor[1] << ","
+     << this->DefaultCellColor[2] << endl;
+  os << indent << "DefaultCellOpacity: " << this->DefaultCellOpacity << endl;
+  os << indent << "SelectedPointColor: "
+     << this->SelectedPointColor[0] << ","
+     << this->SelectedPointColor[1] << ","
+     << this->SelectedPointColor[2] << endl;
+  os << indent << "SelectedPointOpacity: " << this->SelectedPointOpacity << endl;
+  os << indent << "SelectedCellColor: "
+     << this->SelectedCellColor[0] << ","
+     << this->SelectedCellColor[1] << ","
+     << this->SelectedCellColor[2] << endl;
+  os << indent << "SelectedCellOpacity: " << this->SelectedCellOpacity << endl;
+  os << indent << "PointColorOutputArrayName: "
+     << (this->PointColorOutputArrayName ? this->PointColorOutputArrayName : "(none)") << endl;
+  os << indent << "CellColorOutputArrayName: "
+     << (this->CellColorOutputArrayName ? this->CellColorOutputArrayName : "(none)") << endl;
+}
diff --git a/Libraries/VtkVgCore/vtkVgApplySelectedColor.h b/Libraries/VtkVgCore/vtkVgApplySelectedColor.h
new file mode 100644
index 00000000..59bc9dee
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgApplySelectedColor.h
@@ -0,0 +1,211 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgApplySelectedColor.h
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+/*-------------------------------------------------------------------------
+  Copyright 2008 Sandia Corporation.
+  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+  the U.S. Government retains certain rights in this software.
+-------------------------------------------------------------------------*/
+// .NAME vtkVgApplySelectedColor - apply colors to a data set.
+//
+// .SECTION Description
+// vtkVgApplySelectedColor performs a coloring of the dataset using default colors,
+// lookup tables, annotations, and/or a selection. The output is a
+// four-component vtkUnsignedCharArray containing RGBA tuples for each
+// element in the dataset. The first input is the dataset to be colored, which
+// may be a vtkTable, vtkGraph subclass, or vtkDataSet subclass. The API
+// of this algorithm refers to "points" and "cells". For vtkGraph, the
+// "points" refer to the graph vertices and "cells" refer to graph edges.
+// For vtkTable, "points" refer to table rows. For vtkDataSet subclasses, the
+// meaning is obvious.
+//
+// The algorithm takes four input arrays, specified with
+// SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, name) // boolean array with selected = true
+// SetInputArrayToProcess(1, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, name) // color scalars (optional)
+// and
+// SetInputArrayToProcess(2, 0, 0, vtkDataObject::FIELD_ASSOCIATION_CELLS, name). // boolean array with selected = true
+// SetInputArrayToProcess(3, 0, 0, vtkDataObject::FIELD_ASSOCIATION_CELLS, name). // color scalars (optional)
+// These set the point and cell data arrays to use to color the data with
+// according to the 'selected' bit in array 0 and 2. For vtkGraph,
+// vtkTable inputs, you would use FIELD_ASSOCIATION_VERTICES,
+// FIELD_ASSOCIATION_EDGES, or FIELD_ASSOCIATION_ROWS as appropriate.
+//
+// To use the color array generated here, you should do the following:
+//
+//  mapper->SetScalarModeToUseCellFieldData();
+//  mapper->SelectColorArray("vtkVgApplySelectedColor color");
+//  mapper->SetScalarVisibility(true);
+//
+// Colors are assigned with the following priorities:
+// <ol>
+// <li> If an item is part of the selection, it is colored with that color.
+// <li> Otherwise, if the item is part of an annotation, it is colored
+//      with the color of the final (top) annotation in the set of layers.
+// <li> Otherwise, if the lookup table is used, it is colored using the
+//      lookup table color for the data value of the element.
+// <li> Otherwise it will be colored with the default color.
+// </ol>
+//
+// Note: The opacity of an unselected item is defined by the multiplication
+// of default opacity, lookup table opacity, and annotation opacity, where
+// opacity is taken as a number from 0 to 1. So items will never be more opaque
+// than any of these three opacities. Selected items are always given the
+// selection opacity directly.
+
+#ifndef __vtkVgApplySelectedColor_h
+#define __vtkVgApplySelectedColor_h
+
+#include "vtkPassInputTypeAlgorithm.h"
+
+#include <vgExport.h>
+
+class vtkScalarsToColors;
+class vtkUnsignedCharArray;
+
+class VTKVG_CORE_EXPORT vtkVgApplySelectedColor
+  : public vtkPassInputTypeAlgorithm
+{
+public:
+  static vtkVgApplySelectedColor* New();
+  vtkTypeMacro(vtkVgApplySelectedColor, vtkPassInputTypeAlgorithm);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // The default point color for all unannotated, unselected elements
+  // of the data. This is used if UsePointLookupTable is off.
+  vtkSetVector3Macro(DefaultPointColor, double);
+  vtkGetVector3Macro(DefaultPointColor, double);
+
+  // Description:
+  // The default point opacity for all unannotated, unselected elements
+  // of the data. This is used if UsePointLookupTable is off.
+  vtkSetMacro(DefaultPointOpacity, double);
+  vtkGetMacro(DefaultPointOpacity, double);
+
+  // Description:
+  // The point color for all selected elements of the data.
+  // This is used if the selection input is available.
+  vtkSetVector3Macro(SelectedPointColor, double);
+  vtkGetVector3Macro(SelectedPointColor, double);
+
+  // Description:
+  // The point opacity for all selected elements of the data.
+  // This is used if the selection input is available.
+  vtkSetMacro(SelectedPointOpacity, double);
+  vtkGetMacro(SelectedPointOpacity, double);
+
+  // Description:
+  // The output array name for the point color RGBA array.
+  // Default is "vtkVgApplySelectedColor color".
+  vtkSetStringMacro(PointColorOutputArrayName);
+  vtkGetStringMacro(PointColorOutputArrayName);
+
+  // Description:
+  // The default cell color for all unannotated, unselected elements
+  // of the data. This is used if UseCellLookupTable is off.
+  vtkSetVector3Macro(DefaultCellColor, double);
+  vtkGetVector3Macro(DefaultCellColor, double);
+
+  // Description:
+  // The default cell opacity for all unannotated, unselected elements
+  // of the data. This is used if UseCellLookupTable is off.
+  vtkSetMacro(DefaultCellOpacity, double);
+  vtkGetMacro(DefaultCellOpacity, double);
+
+  // Description:
+  // The cell color for all selected elements of the data.
+  // This is used if the selection input is available.
+  vtkSetVector3Macro(SelectedCellColor, double);
+  vtkGetVector3Macro(SelectedCellColor, double);
+
+  // Description:
+  // The cell opacity for all selected elements of the data.
+  // This is used if the selection input is available.
+  vtkSetMacro(SelectedCellOpacity, double);
+  vtkGetMacro(SelectedCellOpacity, double);
+
+  // Description:
+  // The output array name for the cell color RGBA array.
+  // Default is "vtkVgApplySelectedColor color".
+  vtkSetStringMacro(CellColorOutputArrayName);
+  vtkGetStringMacro(CellColorOutputArrayName);
+
+  // Description:
+  // If on, uses the input scalar array to set the colors of unannotated,
+  // unselected elements of the data.
+  vtkSetMacro(UsePointScalars, bool);
+  vtkGetMacro(UsePointScalars, bool);
+  vtkBooleanMacro(UsePointScalars, bool);
+
+  // Description:
+  // If on, uses the input scalar array to set the colors of unannotated,
+  // unselected elements of the data.
+  vtkSetMacro(UseCellScalars, bool);
+  vtkGetMacro(UseCellScalars, bool);
+  vtkBooleanMacro(UseCellScalars, bool);
+
+  // Description:
+  // If on, uses the point selection array to determine selection of points
+  vtkSetMacro(UsePointSelection, bool);
+  vtkGetMacro(UsePointSelection, bool);
+  vtkBooleanMacro(UsePointSelection, bool);
+
+  // Description:
+  // If on, uses the cell selection array to determine selection of cells
+  vtkSetMacro(UseCellSelection, bool);
+  vtkGetMacro(UseCellSelection, bool);
+  vtkBooleanMacro(UseCellSelection, bool);
+
+protected:
+  vtkVgApplySelectedColor();
+  ~vtkVgApplySelectedColor();
+
+  // Description:
+  // Convert the vtkGraph into vtkPolyData.
+  int RequestData(
+    vtkInformation*, vtkInformationVector**, vtkInformationVector*);
+
+  // Description:
+  // Set the input type of the algorithm to vtkGraph.
+  int FillInputPortInformation(int port, vtkInformation* info);
+
+  void ProcessColorArray(
+    vtkAbstractArray* selectedArr,
+    vtkUnsignedCharArray* inputColorArr,
+    vtkUnsignedCharArray* outputColorArr,
+    unsigned char selectedColor[4],
+    unsigned char defaultColor[4]);
+
+  double DefaultPointColor[3];
+  double DefaultPointOpacity;
+  double DefaultCellColor[3];
+  double DefaultCellOpacity;
+  double SelectedPointColor[3];
+  double SelectedPointOpacity;
+  double SelectedCellColor[3];
+  double SelectedCellOpacity;
+  char* PointColorOutputArrayName;
+  char* CellColorOutputArrayName;
+
+  bool UsePointScalars;
+  bool UsePointSelection;
+  bool UseCellScalars;
+  bool UseCellSelection;
+
+private:
+  vtkVgApplySelectedColor(const vtkVgApplySelectedColor&);  // Not implemented.
+  void operator=(const vtkVgApplySelectedColor&);  // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgArcParallelEdgeStrategy.cxx b/Libraries/VtkVgCore/vtkVgArcParallelEdgeStrategy.cxx
new file mode 100644
index 00000000..58ecffe0
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgArcParallelEdgeStrategy.cxx
@@ -0,0 +1,267 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgArcParallelEdgeStrategy.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+/*----------------------------------------------------------------------------
+ Copyright (c) Sandia Corporation
+ See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details.
+----------------------------------------------------------------------------*/
+#include "vtkVgArcParallelEdgeStrategy.h"
+
+#include "vtkCellArray.h"
+#include "vtkCommand.h"
+#include "vtkDirectedGraph.h"
+#include "vtkEdgeListIterator.h"
+#include "vtkGraph.h"
+#include "vtkMath.h"
+#include "vtkObjectFactory.h"
+#include "vtkPoints.h"
+#include "vtkSmartPointer.h"
+
+#include <vtksys/stl/utility>
+#include <vtksys/stl/vector>
+#include <vtksys/stl/map>
+
+vtkStandardNewMacro(vtkVgArcParallelEdgeStrategy);
+
+vtkVgArcParallelEdgeStrategy::vtkVgArcParallelEdgeStrategy()
+{
+  this->NumberOfSubdivisions = 10;
+  this->MinLoopHeight = 0.1;
+  this->MaxLoopHeight = 1.0;
+}
+
+vtkVgArcParallelEdgeStrategy::~vtkVgArcParallelEdgeStrategy()
+{
+}
+
+void vtkVgArcParallelEdgeStrategy::Layout()
+{
+  bool directed = vtkDirectedGraph::SafeDownCast(this->Graph) != 0;
+  vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkIdType>, int> edgeCount;
+  vtksys_stl::map<vtksys_stl::pair<vtkIdType, vtkIdType>, int> edgeNumber;
+  vtksys_stl::vector<vtkEdgeType> edgeVector(this->Graph->GetNumberOfEdges());
+  vtkSmartPointer<vtkEdgeListIterator> it =
+    vtkSmartPointer<vtkEdgeListIterator>::New();
+  this->Graph->GetEdges(it);
+  while (it->HasNext())
+    {
+    vtkEdgeType e = it->Next();
+    vtkIdType src, tgt;
+    if (directed || e.Source < e.Target)
+      {
+      src = e.Source;
+      tgt = e.Target;
+      }
+    else
+      {
+      src = e.Target;
+      tgt = e.Source;
+      }
+    edgeCount[vtksys_stl::pair<vtkIdType, vtkIdType>(src, tgt)]++;
+    edgeVector[e.Id] = e;
+
+    // Compute edge length
+    double sourcePt[3];
+    double targetPt[3];
+    this->Graph->GetPoint(e.Source, sourcePt);
+    this->Graph->GetPoint(e.Target, targetPt);
+    }
+  vtkIdType numEdges = this->Graph->GetNumberOfEdges();
+  double* pts = new double[this->NumberOfSubdivisions * 3];
+  for (vtkIdType eid = 0; eid < numEdges; ++eid)
+    {
+    vtkEdgeType e = edgeVector[eid];
+    vtkIdType src, tgt;
+    if (directed || e.Source < e.Target)
+      {
+      src = e.Source;
+      tgt = e.Target;
+      }
+    else
+      {
+      src = e.Target;
+      tgt = e.Source;
+      }
+    // Lookup the total number of edges with this source
+    // and target, as well as how many times this pair
+    // has been found so far.
+    vtksys_stl::pair<vtkIdType, vtkIdType> p(src, tgt);
+    edgeNumber[p]++;
+    int cur = edgeNumber[p];
+    int total = edgeCount[p];
+    vtksys_stl::pair<vtkIdType, vtkIdType> revP(tgt, src);
+    int revTotal = edgeCount[revP];
+
+    double sourcePt[3];
+    double targetPt[3];
+    this->Graph->GetPoint(e.Source, sourcePt);
+    this->Graph->GetPoint(e.Target, targetPt);
+
+    // If only one edge between source and target,
+    // just draw a straight line.
+    if (total + revTotal == 1)
+      {
+      double pt[6];
+      pt[0] = sourcePt[0];
+      pt[1] = sourcePt[1];
+      pt[2] = sourcePt[2];
+      pt[3] = targetPt[0];
+      pt[4] = targetPt[1];
+      pt[5] = targetPt[2];
+      this->Graph->SetEdgePoints(e.Id, 2, pt);
+      continue;
+      }
+
+    // Find vector from source to target
+    double delta[3];
+    for (int c = 0; c < 3; ++c)
+      {
+      delta[c] = targetPt[c] - sourcePt[c];
+      }
+    double dist = vtkMath::Norm(delta);
+
+    // If the distance is zero, draw a loop.
+    if (dist == 0)
+      {
+      double radius = this->MinLoopHeight +
+                      (this->MaxLoopHeight - this->MinLoopHeight) * cur / total;
+      double u[3] = {1.0, 0.0, 0.0};
+      double v[3] = {0.0, 1.0, 0.0};
+      double center[3] = {sourcePt[0] - radius, sourcePt[1], sourcePt[2]};
+      // Use the general equation for a circle in three dimensions
+      // to draw a loop.
+      for (int s = 0; s < this->NumberOfSubdivisions; ++s)
+        {
+        double angle = 2.0 * vtkMath::Pi()
+                       * s / (this->NumberOfSubdivisions - 1);
+        for (int c = 0; c < 3; ++c)
+          {
+          pts[3 * s + c] = center[c]
+                           + radius * cos(angle) * u[c]
+                           + radius / 2.0 * sin(angle) * v[c];
+          }
+        }
+      this->Graph->SetEdgePoints(e.Id, this->NumberOfSubdivisions, pts);
+      continue;
+      }
+
+    // Find vector perpendicular to delta
+    // and (0,0,1).
+    double z[3] = {0.0, 0.0, 1.0};
+    double w[3];
+    vtkMath::Cross(delta, z, w);
+    vtkMath::Normalize(w);
+
+    // Really bad ascii art:
+    //    ___-------___
+    //   /      |height\ <-- the drawn arc
+    // src----dist-----tgt
+    //   \      |      /
+    //    \     |offset
+    //     \    |    /
+    //    u \   |   / x
+    //       \  |  /
+    //        \ | /
+    //         \|/
+    //        center
+    // The center of the circle used to draw the arc is a
+    // point along the vector w a certain distance (offset)
+    // from the midpoint of sourcePt and targetPt.
+    // The offset is computed to give a certain arc height
+    // based on cur and total.
+    double maxHeight = dist / 8.0;
+    double height;
+    int sign = 1;
+    if (directed)
+      {
+      // Directed edges will go on one side or the other
+      // automatically based on the order of source and target.
+      height = (static_cast<double>(cur) / total) * maxHeight;
+      }
+    else
+      {
+      // For undirected edges, place every other edge on one
+      // side or the other.
+      height = (static_cast<double>((cur + 1) / 2) / (total / 2)) * maxHeight;
+      if (cur % 2)
+        {
+        sign = -1;
+        }
+      }
+    // This formula computes offset given dist and height.
+    // You can pull out your trig formulas and verify it :)
+    double offset = (dist * dist / 4.0 - height * height) / (2.0 * height);
+    double center[3];
+    for (int c = 0; c < 3; ++c)
+      {
+      center[c] = (targetPt[c] + sourcePt[c]) / 2.0 + sign * offset * w[c];
+      }
+
+    // The vectors u and x are unit vectors pointing from the
+    // center of the circle to the two endpoints of the arc,
+    // sourcePt and targetPt, respectively.
+    double u[3], x[3];
+    for (int c = 0; c < 3; ++c)
+      {
+      u[c] = sourcePt[c] - center[c];
+      x[c] = targetPt[c] - center[c];
+      }
+    double radius = vtkMath::Norm(u);
+    vtkMath::Normalize(u);
+    vtkMath::Normalize(x);
+
+    // Find the angle that the arc spans.
+    double theta = acos(vtkMath::Dot(u, x));
+
+    // We need two perpendicular vectors on the plane of the circle
+    // in order to draw the circle.  First we calculate n, a vector
+    // normal to the circle, by crossing u and w.  Next, we cross
+    // n and u in order to get a vector v in the plane of the circle
+    // that is perpendicular to u.
+    double n[3];
+    vtkMath::Cross(u, w, n);
+    vtkMath::Normalize(n);
+    double v[3];
+    vtkMath::Cross(n, u, v);
+    vtkMath::Normalize(v);
+
+    // Use the general equation for a circle in three dimensions
+    // to draw an arc from the last point to the current point.
+    for (int s = 0; s < this->NumberOfSubdivisions; ++s)
+      {
+      double angle = -sign * s * theta / (this->NumberOfSubdivisions - 1.0);
+      for (int c = 0; c < 3; ++c)
+        {
+        pts[3 * s + c] = center[c]
+                         + radius * cos(angle) * u[c]
+                         + radius * sin(angle) * v[c];
+        }
+      }
+    this->Graph->SetEdgePoints(e.Id, this->NumberOfSubdivisions, pts);
+    if (eid % 1000 == 0)
+      {
+      double progress = eid / static_cast<double>(numEdges);
+      this->InvokeEvent(vtkCommand::ProgressEvent, static_cast<void*>(&progress));
+      }
+    }
+  double progress = 1.0;
+  this->InvokeEvent(vtkCommand::ProgressEvent, static_cast<void*>(&progress));
+  delete [] pts;
+}
+
+void vtkVgArcParallelEdgeStrategy::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+  os << indent << "NumberOfSubdivisions: " << this->NumberOfSubdivisions << endl;
+}
diff --git a/Libraries/VtkVgCore/vtkVgArcParallelEdgeStrategy.h b/Libraries/VtkVgCore/vtkVgArcParallelEdgeStrategy.h
new file mode 100644
index 00000000..4b983eff
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgArcParallelEdgeStrategy.h
@@ -0,0 +1,76 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgArcParallelEdgeStrategy.h
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+/*----------------------------------------------------------------------------
+ Copyright (c) Sandia Corporation
+ See Copyright.txt or http://www.paraview.org/HTML/Copyright.html for details.
+----------------------------------------------------------------------------*/
+// .NAME vtkVgArcParallelEdgeStrategy - routes parallel edges as arcs
+//
+// .SECTION Description
+// Parallel edges are drawn as arcs, and self-loops are drawn as ovals.
+// When only one edge connects two vertices it is drawn as a straight line.
+
+#ifndef __vtkVgArcParallelEdgeStrategy_h
+#define __vtkVgArcParallelEdgeStrategy_h
+
+#include "vtkEdgeLayoutStrategy.h"
+
+#include <vgExport.h>
+
+class vtkGraph;
+
+class VTKVG_CORE_EXPORT vtkVgArcParallelEdgeStrategy
+  : public vtkEdgeLayoutStrategy
+{
+public:
+  static vtkVgArcParallelEdgeStrategy* New();
+  vtkTypeMacro(vtkVgArcParallelEdgeStrategy, vtkEdgeLayoutStrategy);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // This is the layout method where the graph that was
+  // set in SetGraph() is laid out.
+  virtual void Layout();
+
+  // Description:
+  // Get/Set the number of subdivisions on each edge.
+  vtkGetMacro(NumberOfSubdivisions, int);
+  vtkSetMacro(NumberOfSubdivisions, int);
+
+  // Description:
+  // Get/Set the height of self-loops.
+  vtkGetMacro(MinLoopHeight, double);
+  vtkSetMacro(MinLoopHeight, double);
+
+  // Description:
+  // Get/Set the height of self-loops.
+  vtkGetMacro(MaxLoopHeight, double);
+  vtkSetMacro(MaxLoopHeight, double);
+
+protected:
+  vtkVgArcParallelEdgeStrategy();
+  ~vtkVgArcParallelEdgeStrategy();
+
+  int NumberOfSubdivisions;
+
+  double MinLoopHeight;
+  double MaxLoopHeight;
+
+private:
+  vtkVgArcParallelEdgeStrategy(const vtkVgArcParallelEdgeStrategy&);  // Not implemented.
+  void operator=(const vtkVgArcParallelEdgeStrategy&);  // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgAssignCoordinates.cxx b/Libraries/VtkVgCore/vtkVgAssignCoordinates.cxx
new file mode 100644
index 00000000..88fd7bb2
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAssignCoordinates.cxx
@@ -0,0 +1,148 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgAssignCoordinates.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+#include "vtkVgAssignCoordinates.h"
+
+#include "vtkGraph.h"
+#include "vtkIdTypeArray.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkMath.h"
+#include "vtkObjectFactory.h"
+#include "vtkPointData.h"
+#include "vtkPointSet.h"
+#include "vtkPoints.h"
+
+vtkStandardNewMacro(vtkVgAssignCoordinates);
+
+vtkVgAssignCoordinates::vtkVgAssignCoordinates()
+{
+  this->XYZCoordArrayName = 0;
+
+  this->Jitter = false;
+}
+
+vtkVgAssignCoordinates::~vtkVgAssignCoordinates()
+{
+  if(this->XYZCoordArrayName!=0)
+    {
+    delete[] this->XYZCoordArrayName;
+    }
+}
+
+int vtkVgAssignCoordinates::RequestData(vtkInformation *vtkNotUsed(request),
+                            vtkInformationVector **inputVector,
+                            vtkInformationVector *outputVector)
+{
+
+  // get the info objects
+  vtkInformation *inInfo = inputVector[0]->GetInformationObject(0);
+  vtkInformation *outInfo = outputVector->GetInformationObject(0);
+
+  // get the input and output
+  vtkDataObject *input = inInfo->Get(vtkDataObject::DATA_OBJECT());
+  vtkDataObject *output = outInfo->Get(vtkDataObject::DATA_OBJECT());
+
+  // Do a shallow copy of the input to the output
+  output->ShallowCopy(input);
+
+  // Create new points on the output
+  vtkDataSetAttributes *data = 0;
+  vtkPoints* pts = vtkPoints::New();
+  if (vtkPointSet::SafeDownCast(input))
+    {
+    vtkPointSet *psInput = vtkPointSet::SafeDownCast(input);
+    vtkPointSet *psOutput = vtkPointSet::SafeDownCast(output);
+    pts->DeepCopy(psInput->GetPoints());
+    psOutput->SetPoints(pts);
+    pts->Delete();
+    data = psOutput->GetPointData();
+    }
+  else if (vtkGraph::SafeDownCast(input))
+    {
+    vtkGraph *graphInput = vtkGraph::SafeDownCast(input);
+    vtkGraph *graphOutput = vtkGraph::SafeDownCast(output);
+    pts->DeepCopy(graphInput->GetPoints());
+    graphOutput->SetPoints(pts);
+    pts->Delete();
+    data = graphOutput->GetVertexData();
+    }
+  else
+    {
+    vtkErrorMacro(<<"Input must be graph or point set.");
+    return 0;
+    }
+
+  // I need at least one coordinate array
+  if (!this->XYZCoordArrayName || strlen(XYZCoordArrayName) == 0)
+    {
+    return 0;
+    }
+
+  // Okay now check for coordinate arrays
+  vtkDataArray* XYZArray = data->GetArray(this->XYZCoordArrayName);
+
+  // Does the array exist at all?
+  if (XYZArray == NULL)
+    {
+    vtkErrorMacro("Could not find array named " << this->XYZCoordArrayName);
+    return 0;
+    }
+
+  // Generate the points
+  int numPts = pts->GetNumberOfPoints();
+  for (int i = 0; i < numPts; i++)
+    {
+    double rx,ry;
+    if (Jitter)
+      {
+      rx = vtkMath::Random()-.5;
+      ry = vtkMath::Random()-.5;
+      rx *= 1e-4;
+      ry *= 1e-4;
+      }
+    else
+      {
+      rx = ry = 0;
+      }
+
+    double* tuple = XYZArray->GetTuple3(i);
+    double point[3] = { tuple[0], tuple[1], tuple[2] };
+    point[0] += rx;
+    point[1] += ry;
+    pts->SetPoint(i, point);
+    }
+
+  return 1;
+}
+
+int vtkVgAssignCoordinates::FillInputPortInformation(int vtkNotUsed(port), vtkInformation* info)
+{
+  // This algorithm may accept a vtkPointSet or vtkGraph.
+  info->Remove(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE());
+  info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkPointSet");
+  info->Append(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkGraph");
+  return 1;
+}
+
+void vtkVgAssignCoordinates::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os,indent);
+
+  os << indent << "XYZCoordArrayName: "
+     << (this->XYZCoordArrayName ? this->XYZCoordArrayName : "(none)") << endl;
+
+  os << indent << "Jitter: "
+     << (this->Jitter ? "True" : "False") << endl;
+}
diff --git a/Libraries/VtkVgCore/vtkVgAssignCoordinates.h b/Libraries/VtkVgCore/vtkVgAssignCoordinates.h
new file mode 100644
index 00000000..c64e9ddd
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAssignCoordinates.h
@@ -0,0 +1,63 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgAssignCoordinates.h
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+// .NAME vtkVgAssignCoordinates - Given two(or three) arrays take the values
+// in those arrays and simply assign them to the coordinates of the vertices.
+//
+// .SECTION Description
+// Given two(or three) arrays take the values in those arrays and simply assign
+// them to the coordinates of the vertices. Yes you could do this with the array
+// calculator, but your mom wears army boots so we're not going to.
+
+#ifndef __vtkVgAssignCoordinates_h
+#define __vtkVgAssignCoordinates_h
+
+#include "vtkPassInputTypeAlgorithm.h"
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgAssignCoordinates : public vtkPassInputTypeAlgorithm
+{
+public:
+  static vtkVgAssignCoordinates *New();
+
+  vtkTypeMacro(vtkVgAssignCoordinates, vtkPassInputTypeAlgorithm);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set the xyz coordinate array name.
+  vtkSetStringMacro(XYZCoordArrayName);
+  vtkGetStringMacro(XYZCoordArrayName);
+
+  // Description:
+  // Set if you want a random jitter
+  vtkSetMacro(Jitter,bool);
+
+protected:
+  vtkVgAssignCoordinates();
+  ~vtkVgAssignCoordinates();
+
+  int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
+  int FillInputPortInformation(int port, vtkInformation* info);
+
+private:
+
+  char* XYZCoordArrayName;
+  bool Jitter;
+
+  vtkVgAssignCoordinates(const vtkVgAssignCoordinates&);  // Not implemented.
+  void operator=(const vtkVgAssignCoordinates&);  // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgAssignCoordinatesLayoutStrategy.cxx b/Libraries/VtkVgCore/vtkVgAssignCoordinatesLayoutStrategy.cxx
new file mode 100644
index 00000000..374db29c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAssignCoordinatesLayoutStrategy.cxx
@@ -0,0 +1,67 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgAssignCoordinatesLayoutStrategy.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+
+#include "vtkVgAssignCoordinatesLayoutStrategy.h"
+
+#include "vtkVgAssignCoordinates.h"
+#include "vtkCellArray.h"
+#include "vtkCellData.h"
+#include "vtkDataArray.h"
+#include "vtkFloatArray.h"
+#include "vtkMath.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkObjectFactory.h"
+#include "vtkPointData.h"
+#include "vtkPoints.h"
+#include "vtkTree.h"
+
+vtkStandardNewMacro(vtkVgAssignCoordinatesLayoutStrategy);
+
+vtkVgAssignCoordinatesLayoutStrategy::vtkVgAssignCoordinatesLayoutStrategy()
+{
+  this->AssignCoordinates = vtkSmartPointer<vtkVgAssignCoordinates>::New();
+}
+
+vtkVgAssignCoordinatesLayoutStrategy::~vtkVgAssignCoordinatesLayoutStrategy()
+{
+}
+
+void vtkVgAssignCoordinatesLayoutStrategy::SetXYZCoordArrayName(const char* name)
+{
+  this->AssignCoordinates->SetXYZCoordArrayName(name);
+}
+
+const char* vtkVgAssignCoordinatesLayoutStrategy::GetXYZCoordArrayName()
+{
+  return this->AssignCoordinates->GetXYZCoordArrayName();
+}
+
+void vtkVgAssignCoordinatesLayoutStrategy::Layout()
+{
+  this->AssignCoordinates->SetInputData(this->Graph);
+  this->AssignCoordinates->Update();
+  this->Graph->ShallowCopy(this->AssignCoordinates->GetOutput());
+}
+
+void vtkVgAssignCoordinatesLayoutStrategy::SetJitter(bool enable)
+{
+  this->AssignCoordinates->SetJitter(enable);
+}
+
+void vtkVgAssignCoordinatesLayoutStrategy::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os,indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgAssignCoordinatesLayoutStrategy.h b/Libraries/VtkVgCore/vtkVgAssignCoordinatesLayoutStrategy.h
new file mode 100644
index 00000000..6cb795e4
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAssignCoordinatesLayoutStrategy.h
@@ -0,0 +1,61 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgAssignCoordinatesLayoutStrategy.h
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+// .NAME vtkVgAssignCoordinatesLayoutStrategy - uses array values to set vertex locations
+//
+// .SECTION Description
+// Uses vtkAssignCoordinates to use values from arrays as the x, y, and z coordinates.
+
+#ifndef __vtkVgAssignCoordinatesLayoutStrategy_h
+#define __vtkVgAssignCoordinatesLayoutStrategy_h
+
+#include "vtkGraphLayoutStrategy.h"
+#include "vtkSmartPointer.h" // For SP ivars
+
+#include <vgExport.h>
+
+class vtkVgAssignCoordinates;
+
+class VTKVG_CORE_EXPORT vtkVgAssignCoordinatesLayoutStrategy : public vtkGraphLayoutStrategy
+{
+public:
+  static vtkVgAssignCoordinatesLayoutStrategy *New();
+  vtkTypeMacro(vtkVgAssignCoordinatesLayoutStrategy, vtkGraphLayoutStrategy);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // The array to use for the xyz coordinate values.
+  virtual void SetXYZCoordArrayName(const char* name);
+  virtual const char* GetXYZCoordArrayName();
+
+  // Description:
+  // Perform the random layout.
+  void Layout();
+
+  void SetJitter(bool enable);
+
+protected:
+  vtkVgAssignCoordinatesLayoutStrategy();
+  ~vtkVgAssignCoordinatesLayoutStrategy();
+
+  //BTX
+  vtkSmartPointer<vtkVgAssignCoordinates> AssignCoordinates;
+  //ETX
+
+private:
+  vtkVgAssignCoordinatesLayoutStrategy(const vtkVgAssignCoordinatesLayoutStrategy&);  // Not implemented.
+  void operator=(const vtkVgAssignCoordinatesLayoutStrategy&);  // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgAtomic.cxx b/Libraries/VtkVgCore/vtkVgAtomic.cxx
new file mode 100644
index 00000000..b556d4d1
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAtomic.cxx
@@ -0,0 +1,162 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgAtomic.h"
+
+// Windows
+#if defined(WIN32) || defined(_WIN32)
+  #include <vtkWindows.h>
+  #define VTK_HAVE_PURE_ATOMICS
+
+  #if defined(_WIN64)
+    #define _atomicAdd(_v, _a) (InterlockedExchangeAdd64(_v, _a) + _a)
+    #define _atomicIncr InterlockedIncrement64
+    #define _atomicDecr InterlockedDecrement64
+  #else
+    #define _atomicAdd(_v, _a) (InterlockedExchangeAdd(_v, _a) + _a)
+    #define _atomicIncr InterlockedIncrement
+    #define _atomicDecr InterlockedDecrement
+  #endif
+
+// OS/X
+#elif defined(__APPLE__) && defined(__MACH__)
+  #include <libkern/OSAtomic.h>
+  #define VTK_HAVE_PURE_ATOMICS
+
+  #if __LP64__
+    #define _atomicAdd(_v, _a) OSAtomicAdd64(_a, _v)
+    #define _atomicIncr OSAtomicIncrement64
+    #define _atomicDecr OSAtomicDecrement64
+  #else
+    #define _atomicAdd(_v, _a) OSAtomicAdd32(_a, _v)
+    #define _atomicIncr OSAtomicIncrement32
+    #define _atomicDecr OSAtomicDecrement32
+  #endif
+
+// gcc
+#elif defined(VTK_HAVE_SYNC_BUILTINS)
+  #define VTK_HAVE_PURE_ATOMICS
+
+  #define _atomicAdd __sync_add_and_fetch
+  #define _atomicIncr(_v) __sync_add_and_fetch(_v, 1)
+  #define _atomicDecr(_v) __sync_add_and_fetch(_v, -1)
+#endif
+
+// Everyone else
+#if defined(VTK_HAVE_PURE_ATOMICS)
+  #define THIS_ARGS &this->Value
+#else
+
+  #include <vtkCriticalSection.h>
+  class vtkVgSignedAtomic::Internal : public vtkSimpleCriticalSection {};
+
+  #define THIS_ARGS &this->Value, this->Internal
+
+  namespace // <anonymous>
+    {
+
+    typedef vtkVgSignedAtomic::PodType satom_t;
+    typedef volatile satom_t* satom_p;
+
+    class Lock
+      {
+      public:
+        Lock(vtkSimpleCriticalSection* mutex) : Mutex(mutex)
+          { this->Mutex->Lock(); }
+        ~Lock() { this->Mutex->Unlock(); }
+      private:
+        vtkSimpleCriticalSection* Mutex;
+      };
+
+    satom_t _atomicAdd(satom_p v, vtkSimpleCriticalSection* m, satom_t n)
+      {
+      Lock l(m);
+      return (*v) += n;
+      }
+
+    satom_t _atomicIncr(satom_p v, vtkSimpleCriticalSection* m)
+      {
+      Lock l(m);
+      return ++(*v);
+      }
+
+    satom_t _atomicDecr(satom_p v, vtkSimpleCriticalSection* m)
+      {
+      Lock l(m);
+      return --(*v);
+      }
+
+    } // end anonymous namespace
+
+#endif
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::vtkVgSignedAtomic(vtkVgSignedAtomic::PodType initialValue)
+  : Value(initialValue)
+#if !defined(VTK_HAVE_PURE_ATOMICS)
+  , Internal(new class Internal)
+#endif
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::~vtkVgSignedAtomic()
+{
+#if !defined(VTK_HAVE_PURE_ATOMICS)
+  delete this->Internal;
+#endif
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::PodType vtkVgSignedAtomic::GetValue() const
+{
+  return this->Value;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::PodType vtkVgSignedAtomic::operator=(
+  vtkVgSignedAtomic::PodType newValue)
+{
+  return this->Value = newValue;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::PodType vtkVgSignedAtomic::operator+=(
+  vtkVgSignedAtomic::PodType addend)
+{
+  return _atomicAdd(THIS_ARGS, addend);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::PodType vtkVgSignedAtomic::operator-=(
+  vtkVgSignedAtomic::PodType subtrahend)
+{
+  return *this += (-subtrahend);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::PodType vtkVgSignedAtomic::operator++()
+{
+  return _atomicIncr(THIS_ARGS);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::PodType vtkVgSignedAtomic::operator--()
+{
+  return _atomicDecr(THIS_ARGS);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::PodType vtkVgSignedAtomic::operator++(int)
+{
+  return _atomicIncr(THIS_ARGS) - 1;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSignedAtomic::PodType vtkVgSignedAtomic::operator--(int)
+{
+  return _atomicDecr(THIS_ARGS) + 1;
+}
diff --git a/Libraries/VtkVgCore/vtkVgAtomic.h b/Libraries/VtkVgCore/vtkVgAtomic.h
new file mode 100644
index 00000000..853c65ae
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgAtomic.h
@@ -0,0 +1,107 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgAtomic_h
+#define __vtkVgAtomic_h
+
+#include <vgExport.h>
+
+#if defined(WIN32) || defined(_WIN32)
+  #include <vtkWindows.h>
+#endif
+
+#if defined(__APPLE__) && defined(__MACH__)
+  #include <sys/types.h>
+#endif
+
+// Description:
+// This class provides a thread safe integer that may be accessed and modified
+// in an atomic manner. The integer is signed, and is the same size as a
+// pointer.
+class VTKVG_CORE_EXPORT vtkVgSignedAtomic
+{
+public:
+
+  // Description:
+  // The POD data type this class wraps. This will vary by platform and pointer
+  // size.
+#if defined(WIN32) || defined(_WIN32)
+  #if defined(_WIN64)
+  typedef LONGLONG PodType;
+  #else
+  typedef LONG PodType;
+  #endif
+#elif defined(__APPLE__) && defined(__MACH__)
+  #if __LP64__
+  typedef int64_t PodType;
+  #else
+  typedef int32_t PodType;
+  #endif
+#else
+  typedef long PodType;
+#endif
+
+  // Description:
+  // Default constructor. Accepts an optional initial value (default == 0).
+  vtkVgSignedAtomic(PodType initialValue = 0);
+
+  // Description:
+  // Destructor.
+  ~vtkVgSignedAtomic();
+
+  // Description:
+  // Get the value of the atomic.
+  PodType GetValue() const;
+
+  PodType operator=(PodType newValue);
+  PodType operator+=(PodType addend);
+  PodType operator-=(PodType subtrahend);
+  PodType operator++();
+  PodType operator--();
+  PodType operator++(int);
+  PodType operator--(int);
+
+private:
+  volatile PodType Value;
+
+  class Internal;
+  Internal* Internal;
+};
+
+//-----------------------------------------------------------------------------
+#define vtkVgAtomic_ImplementPodOperator(_op) \
+  inline vtkVgSignedAtomic::PodType \
+  operator _op(const vtkVgSignedAtomic& a, vtkVgSignedAtomic::PodType p) \
+    { return a.GetValue() _op p; } \
+  inline vtkVgSignedAtomic::PodType \
+  operator _op(vtkVgSignedAtomic::PodType p, const vtkVgSignedAtomic& a) \
+    { return p _op a.GetValue(); }
+
+#define vtkVgAtomic_ImplementBoolOperator(_op) \
+  inline bool \
+  operator _op(const vtkVgSignedAtomic& a, vtkVgSignedAtomic::PodType p) \
+    { return a.GetValue() _op p; } \
+  inline bool \
+  operator _op(vtkVgSignedAtomic::PodType p, const vtkVgSignedAtomic& a) \
+    { return p _op a.GetValue(); }
+
+//-----------------------------------------------------------------------------
+vtkVgAtomic_ImplementPodOperator(+)
+vtkVgAtomic_ImplementPodOperator(-)
+vtkVgAtomic_ImplementPodOperator(*)
+vtkVgAtomic_ImplementPodOperator(/)
+vtkVgAtomic_ImplementPodOperator(%)
+
+vtkVgAtomic_ImplementBoolOperator(==)
+vtkVgAtomic_ImplementBoolOperator(!=)
+vtkVgAtomic_ImplementBoolOperator(<)
+vtkVgAtomic_ImplementBoolOperator(>)
+
+//-----------------------------------------------------------------------------
+#undef vtkVgAtomic_ImplementPodOperator
+#undef vtkVgAtomic_ImplementBoolOperator
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgBaseImageSource.cxx b/Libraries/VtkVgCore/vtkVgBaseImageSource.cxx
new file mode 100644
index 00000000..587dd296
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgBaseImageSource.cxx
@@ -0,0 +1,99 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgBaseImageSource.h"
+
+#include <vtkMatrix4x4.h>
+
+//-----------------------------------------------------------------------------
+vtkVgBaseImageSource::vtkVgBaseImageSource() : vtkImageAlgorithm(),
+  UseOutputResolution(false),
+  Level(0),
+  Scale(1.0),
+  FileName(0)
+{
+  this->OutputResolution[0] = this->OutputResolution[1] = -1;
+
+  for (int i = 0; i < 4; ++i) {this->ReadExtents[i] = -1;}
+  for (int i = 0; i < 3; ++i) {this->Origin[i] = 0; this->Spacing[i] = 1;}
+
+  this->ImageTimeStamp.Reset();
+
+  this->SetNumberOfInputPorts(0);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgBaseImageSource::~vtkVgBaseImageSource()
+{
+  if (this->FileName)
+    {
+    this->SetFileName(0);
+    }
+}
+
+//----------------------------------------------------------------------------
+void vtkVgBaseImageSource::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//----------------------------------------------------------------------------
+void vtkVgBaseImageSource::GetOutputResolution(int& w, int& h) const
+{
+  w = this->OutputResolution[0];
+  h = this->OutputResolution[1];
+}
+
+//----------------------------------------------------------------------------
+int vtkVgBaseImageSource::SetOutputResolution(int w, int h)
+{
+  if (w < 0)
+    {
+    // Error.
+    return VTK_ERROR;
+    }
+
+  if (h < 0)
+    {
+    // Error.
+    return VTK_ERROR;
+    }
+
+  this->OutputResolution[0] = w;
+  this->OutputResolution[1] = h;
+
+  this->Modified();
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgBaseImageSource::GetNumberOfLevels() const
+{
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkMatrix4x4> vtkVgBaseImageSource::GetImageToWorldMatrix()
+{
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgBaseImageSource::RequestInformation(vtkInformation* request,
+                                             vtkInformationVector** inputVector,
+                                             vtkInformationVector* outputVector)
+{
+  return this->Superclass::RequestInformation(request, inputVector, outputVector);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgBaseImageSource::RequestData(vtkInformation* request,
+                                      vtkInformationVector** inputVector,
+                                      vtkInformationVector* outputVector)
+{
+  return this->Superclass::RequestData(request, inputVector, outputVector);
+}
diff --git a/Libraries/VtkVgCore/vtkVgBaseImageSource.h b/Libraries/VtkVgCore/vtkVgBaseImageSource.h
new file mode 100644
index 00000000..544fc576
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgBaseImageSource.h
@@ -0,0 +1,171 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgBaseImageSource_h
+#define __vtkVgBaseImageSource_h
+
+#include "vtkVgTimeStamp.h"
+
+// VTK includes
+#include <vtkImageAlgorithm.h>
+#include <vtkSmartPointer.h>
+
+// Forward declarations
+class vtkMatrix4x4;
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgBaseImageSource : public vtkImageAlgorithm
+{
+public:
+  // Description:
+  // Check type.
+  vtkTypeMacro(vtkVgBaseImageSource, vtkImageAlgorithm);
+
+  // Description:
+  // Print values of the member variables.
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Set the flag to true to allow the use of
+  // output resolution in \c SetOutputResolution
+  // and vice versa.
+  vtkSetMacro(UseOutputResolution, bool);
+  vtkGetMacro(UseOutputResolution, bool);
+  vtkBooleanMacro(UseOutputResolution, bool);
+
+  // Description:
+  // Request a particular resolution. This is useful
+  // if the actual image is much bigger than the
+  // dimension of the display viewport or window.
+  void GetOutputResolution(int& w, int& h) const;
+  int  SetOutputResolution(int w, int h);
+
+  // Description:
+  // The extent of pixels to read.
+  vtkSetVector4Macro(ReadExtents, int);
+  vtkGetVector4Macro(ReadExtents, int);
+
+  // Description:
+  // If the image has multiple level of details
+  // and if the reader supports it set the level of
+  // detail to one particular leve.
+  // @NOTE: A lower number means higher resolution.
+  vtkGetMacro(Level, int);
+  vtkSetMacro(Level, int);
+
+  // Description:
+  // Given the ratio of width of the camera viewport
+  // to window viewport calculate and use the
+  // correct level of detail.
+  vtkGetMacro(Scale, double);
+  vtkSetMacro(Scale, double);
+
+  // Description:
+  // Set the file to read. Required full path to the
+  // file.
+  vtkGetStringMacro(FileName);
+  vtkSetStringMacro(FileName);
+
+  // Description:
+  // Set the origin that will be set in the pipeline.
+  vtkSetVector3Macro(Origin, double);
+  vtkGetVector3Macro(Origin, double);
+
+  // Description:
+  // Set the spacing that will be set in the pipeline.
+  vtkSetVector3Macro(Spacing, double);
+  vtkGetVector3Macro(Spacing, double);
+
+  // Description:
+  // Return the dimensions of the image data.
+  virtual void GetDimensions(int dim[2]) = 0;
+
+  // Description:
+  // Get the dimensions of the entire image and return true if
+  // supported by the reader).
+  virtual bool GetRasterDimensions(int vtkNotUsed(dim)[2])
+    {
+    return false;
+    }
+
+  // Description:
+  // Return the number of level of details exists
+  // or supported by this reader.
+  virtual int GetNumberOfLevels() const;
+
+  // Description:
+  // Get image timestamp
+  virtual vtkVgTimeStamp GetImageTimeStamp()
+    {
+    return this->ImageTimeStamp;
+    }
+
+  // Description:
+  // Check if a given source (file, extension) can be read by
+  // this source.
+  virtual bool CanRead(const std::string& source) = 0;
+
+  // Description:
+  // Return a short description of the source (for display purposes).
+  virtual std::string GetShortDescription() = 0;
+
+  // Description:
+  // Return a long description of the source.
+  virtual std::string GetLongDescription() = 0;
+
+  // Description:
+  // FIXME
+  virtual vtkSmartPointer<vtkMatrix4x4> GetImageToWorldMatrix();
+
+  // Description:
+  // FIXME
+  virtual const double* GetGeoCornerPoints()
+    {
+    return 0;
+    }
+
+protected:
+
+  vtkVgBaseImageSource();
+  virtual ~vtkVgBaseImageSource();
+
+// Description:
+// Derived classes need to implement this function.
+  virtual int RequestInformation(vtkInformation* request,
+                                 vtkInformationVector** inputVector,
+                                 vtkInformationVector* outputVector);
+
+// Description:
+// Derived classes need to implement this function.
+  virtual int RequestData(vtkInformation* request,
+                          vtkInformationVector** inputVector,
+                          vtkInformationVector* outputVector);
+
+private:
+
+  vtkVgBaseImageSource(const vtkVgBaseImageSource&);  // Not implemented.
+  void operator=(const vtkVgBaseImageSource&);        // Not implemented.
+
+
+// Data members.
+protected:
+
+  bool    UseOutputResolution;
+  int     OutputResolution[2];
+  int     ReadExtents[4];
+
+  int     Level;
+  double  Scale;
+
+  double  Origin[3];
+  double  Spacing[3];
+
+  char*   FileName;
+
+  vtkVgTimeStamp ImageTimeStamp;
+};
+
+#endif // __vtkVgBaseImageSource_h
diff --git a/Libraries/VtkVgCore/vtkVgBorderRepresentation.cxx b/Libraries/VtkVgCore/vtkVgBorderRepresentation.cxx
new file mode 100644
index 00000000..3e194e5b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgBorderRepresentation.cxx
@@ -0,0 +1,260 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgBorderRepresentation.h"
+
+#include "vtkActor2D.h"
+#include "vtkMath.h"
+#include "vtkObjectFactory.h"
+#include "vtkPoints.h"
+#include "vtkPolyData.h"
+#include "vtkPolyDataMapper2D.h"
+#include "vtkRenderer.h"
+#include "vtkTransform.h"
+#include "vtkTransformPolyDataFilter.h"
+#include "vtkWindow.h"
+
+vtkStandardNewMacro(vtkVgBorderRepresentation);
+
+//------------------------------------------------------------------------
+vtkVgBorderRepresentation::vtkVgBorderRepresentation()
+{
+  this->PositionCoordinate->SetCoordinateSystemToWorld();
+  this->Position2Coordinate->SetCoordinateSystemToWorld();
+  this->Position2Coordinate->SetReferenceCoordinate(0);
+
+  // using our own transform
+  vtkCoordinate* xform = vtkCoordinate::New();
+  xform->SetCoordinateSystemToWorld();
+  this->BWMapper->SetTransformCoordinate(xform);
+  this->BWMapper->SetInputData(this->BWPolyData);
+  this->BWTransformFilter->SetInputData(0);
+  xform->FastDelete();
+}
+
+//------------------------------------------------------------------------
+vtkVgBorderRepresentation::~vtkVgBorderRepresentation()
+{
+}
+
+//-------------------------------------------------------------------------
+void vtkVgBorderRepresentation::StartWidgetInteraction(double eventPos[2])
+{
+  // Convert from normalized viewport coords to world.
+  double x = eventPos[0];
+  double y = eventPos[1];
+  double z = 0.0;
+  this->Renderer->NormalizedViewportToView(x, y, z);
+  this->Renderer->SetViewPoint(x, y, z);
+  this->Renderer->ViewToWorld();
+
+  double* wp = this->Renderer->GetWorldPoint();
+  this->StartEventPosition[0] = vtkMath::Round(wp[0]);
+  this->StartEventPosition[1] = vtkMath::Round(wp[1]);
+}
+
+//-------------------------------------------------------------------------
+// Note: Most of this is copied wholesale from vtkBorderRepresentation.
+//-------------------------------------------------------------------------
+void vtkVgBorderRepresentation::WidgetInteraction(double eventPos[2])
+{
+  double XF = eventPos[0];
+  double YF = eventPos[1];
+
+  // convert to world coordinates
+  this->Renderer->SetDisplayPoint(XF, YF, 0.0);
+  this->Renderer->DisplayToWorld();
+  XF = vtkMath::Round(this->Renderer->GetWorldPoint()[0]);
+  YF = vtkMath::Round(this->Renderer->GetWorldPoint()[1]);
+
+  // there are four parameters that can be adjusted
+  double* fpos1 = this->PositionCoordinate->GetValue();
+  double* fpos2 = this->Position2Coordinate->GetValue();
+  double par1[2];
+  double par2[2];
+  par1[0] = fpos1[0];
+  par1[1] = fpos1[1];
+  par2[0] = fpos2[0];
+  par2[1] = fpos2[1];
+
+  double delX = XF - this->StartEventPosition[0];
+  double delY = YF - this->StartEventPosition[1];
+  double delX2 = 0.0, delY2 = 0.0;
+
+  // Based on the state, adjust the representation. Note that we force a
+  // uniform scaling of the widget when tugging on the corner points (and
+  // when proportional resize is on). This is done by finding the maximum
+  // movement in the x-y directions and using this to scale the widget.
+  if (this->ProportionalResize && !this->Moving)
+    {
+    double sx = (fpos2[0] - fpos1[0]) / (fpos2[1] - fpos1[1]);
+    double sy = (fpos2[1] - fpos1[1]) / (fpos2[0] - fpos1[0]);
+    if (fabs(delX) > fabs(delY))
+      {
+      delY = sy * delX;
+      delX2 = delX;
+      delY2 = -delY;
+      }
+    else
+      {
+      delX = sx * delY;
+      delY2 = delY;
+      delX2 = -delX;
+      }
+    }
+  else
+    {
+    delX2 = delX;
+    delY2 = delY;
+    }
+
+  // The previous "if" statement has taken care of the proportional resize
+  // for the most part. However, tugging on edges has special behavior, which
+  // is to scale the box about its center.
+  switch (this->InteractionState)
+    {
+    case vtkBorderRepresentation::AdjustingP0:
+      par1[0] = par1[0] + delX;
+      par1[1] = par1[1] + delY;
+      break;
+    case vtkBorderRepresentation::AdjustingP1:
+      par2[0] = par2[0] + delX2;
+      par1[1] = par1[1] + delY2;
+      break;
+    case vtkBorderRepresentation::AdjustingP2:
+      par2[0] = par2[0] + delX;
+      par2[1] = par2[1] + delY;
+      break;
+    case vtkBorderRepresentation::AdjustingP3:
+      par1[0] = par1[0] + delX2;
+      par2[1] = par2[1] + delY2;
+      break;
+    case vtkBorderRepresentation::AdjustingE0:
+      par1[1] = par1[1] + delY;
+      if (this->ProportionalResize)
+        {
+        par2[1] = par2[1] - delY;
+        par1[0] = par1[0] + delX;
+        par2[0] = par2[0] - delX;
+        }
+      break;
+    case vtkBorderRepresentation::AdjustingE1:
+      par2[0] = par2[0] + delX;
+      if (this->ProportionalResize)
+        {
+        par1[0] = par1[0] - delX;
+        par1[1] = par1[1] - delY;
+        par2[1] = par2[1] + delY;
+        }
+      break;
+    case vtkBorderRepresentation::AdjustingE2:
+      par2[1] = par2[1] + delY;
+      if (this->ProportionalResize)
+        {
+        par1[1] = par1[1] - delY;
+        par1[0] = par1[0] - delX;
+        par2[0] = par2[0] + delX;
+        }
+      break;
+    case vtkBorderRepresentation::AdjustingE3:
+      par1[0] = par1[0] + delX;
+      if (this->ProportionalResize)
+        {
+        par2[0] = par2[0] - delX;
+        par1[1] = par1[1] + delY;
+        par2[1] = par2[1] - delY;
+        }
+      break;
+    case vtkBorderRepresentation::Inside:
+      if (this->Moving)
+        {
+        par1[0] = par1[0] + delX;
+        par1[1] = par1[1] + delY;
+        par2[0] = par2[0] + delX;
+        par2[1] = par2[1] + delY;
+        }
+      break;
+    }
+
+  // Modify the representation
+  if (par2[0] > par1[0] && par2[1] > par1[1])
+    {
+    this->SetCoordValue(par1, this->PositionCoordinate);
+    this->SetCoordValue(par2, this->Position2Coordinate);
+    this->StartEventPosition[0] = XF;
+    this->StartEventPosition[1] = YF;
+    }
+
+  this->Modified();
+  this->BuildRepresentation();
+}
+
+//-------------------------------------------------------------------------
+void vtkVgBorderRepresentation::BuildRepresentation()
+{
+  if (this->GetMTime() > this->BuildTime ||
+      (this->Renderer && this->Renderer->GetVTKWindow() &&
+       this->Renderer->GetVTKWindow()->GetMTime() > this->BuildTime))
+    {
+    // Set things up
+    double* pos1 = this->PositionCoordinate->GetComputedValue(this->Renderer);
+    double* pos2 = this->Position2Coordinate->GetComputedValue(this->Renderer);
+
+    this->BWPoints->SetPoint(0, pos1[0], pos1[1], 0.0);
+    this->BWPoints->SetPoint(1, pos2[0], pos1[1], 0.0);
+    this->BWPoints->SetPoint(2, pos2[0], pos2[1], 0.0);
+    this->BWPoints->SetPoint(3, pos1[0], pos2[1], 0.0);
+
+    this->BWPolyData->Modified();
+    this->BuildTime.Modified();
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgBorderRepresentation::SetDisplayPoint1(int p1[2])
+{
+  this->SetDisplayPoint(p1, this->Point1);
+  this->SetCoordValue(this->Point1, this->PositionCoordinate);
+  this->Modified();
+}
+
+//-------------------------------------------------------------------------
+void vtkVgBorderRepresentation::SetDisplayPoint2(int p2[2])
+{
+  this->SetDisplayPoint(p2, this->Point2);
+
+  // The coordinates need to be "normalized" so that position 2 is always above
+  // and to the right of position 1. vtkBorderWidget relies on this.
+  double p1coord[3] = { this->Point1[0], this->Point1[1] };
+  double p2coord[3] = { this->Point2[0], this->Point2[1] };
+  if (p2coord[0] < p1coord[0])
+    {
+    std::swap(p2coord[0], p1coord[0]);
+    }
+  if (p2coord[1] < p1coord[1])
+    {
+    std::swap(p2coord[1], p1coord[1]);
+    }
+  this->SetCoordValue(p1coord, this->PositionCoordinate);
+  this->SetCoordValue(p2coord, this->Position2Coordinate);
+  this->Modified();
+}
+
+//-------------------------------------------------------------------------
+void vtkVgBorderRepresentation::SetDisplayPoint(int p[2], double world[2])
+{
+  this->Renderer->SetDisplayPoint(p[0], p[1], 0.0);
+  this->Renderer->DisplayToWorld();
+  world[0] = this->Renderer->GetWorldPoint()[0];
+  world[1] = this->Renderer->GetWorldPoint()[1];
+}
+
+//-------------------------------------------------------------------------
+void vtkVgBorderRepresentation::SetCoordValue(double p[2], vtkCoordinate* coord)
+{
+  // snap to integral world (image) coordinates
+  coord->SetValue(vtkMath::Round(p[0]), vtkMath::Round(p[1]), 0.0);
+}
diff --git a/Libraries/VtkVgCore/vtkVgBorderRepresentation.h b/Libraries/VtkVgCore/vtkVgBorderRepresentation.h
new file mode 100644
index 00000000..b818c45e
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgBorderRepresentation.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// Allows a border widget to use world coordinates rather than the default
+// normalized viewport coords.
+
+#ifndef __vtkVgBorderRepresentation_h
+#define __vtkVgBorderRepresentation_h
+
+#include "vtkBorderRepresentation.h"
+
+#include <vgExport.h>
+
+class vtkCoordinate;
+
+class VTKVG_CORE_EXPORT vtkVgBorderRepresentation
+  : public vtkBorderRepresentation
+{
+public:
+  static vtkVgBorderRepresentation* New();
+
+  vtkTypeMacro(vtkVgBorderRepresentation, vtkBorderRepresentation);
+
+  virtual void BuildRepresentation();
+  virtual void StartWidgetInteraction(double eventPos[2]);
+  virtual void WidgetInteraction(double eventPos[2]);
+
+  // Set the corners of the rectangle in display coordinates
+  void SetDisplayPoint1(int p1[2]);
+  void SetDisplayPoint2(int p2[2]);
+
+protected:
+  vtkVgBorderRepresentation();
+  ~vtkVgBorderRepresentation();
+
+  void SetDisplayPoint(int p[2], double world[2]);
+  void SetCoordValue(double p[2], vtkCoordinate* coord);
+
+  double Point1[2];
+  double Point2[2];
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgCellPicker.cxx b/Libraries/VtkVgCore/vtkVgCellPicker.cxx
new file mode 100644
index 00000000..069b7b11
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgCellPicker.cxx
@@ -0,0 +1,686 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgCellPicker.h"
+
+// VTK includes.
+#include <vtkAbstractCellLocator.h>
+#include <vtkAbstractMapper3D.h>
+#include <vtkAbstractVolumeMapper.h>
+#include <vtkAssemblyPath.h>
+#include <vtkBox.h>
+#include <vtkCamera.h>
+#include <vtkCommand.h>
+#include <vtkDataArray.h>
+#include <vtkDataSet.h>
+#include <vtkDoubleArray.h>
+#include <vtkGenericCell.h>
+#include <vtkIdList.h>
+#include <vtkImageData.h>
+#include <vtkImageMapper3D.h>
+#include <vtkImageSlice.h>
+#include <vtkLODProp3D.h>
+#include <vtkMapper.h>
+#include <vtkMath.h>
+#include <vtkObjectFactory.h>
+#include <vtkPerspectiveTransform.h>
+#include <vtkPoints.h>
+#include <vtkPolygon.h>
+#include <vtkProp3DCollection.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkTransform.h>
+#include <vtkTexture.h>
+
+vtkStandardNewMacro(vtkVgCellPicker);
+
+
+//-----------------------------------------------------------------------------
+vtkVgCellPicker::vtkVgCellPicker() : vtkCellPicker()
+{
+  // For polydata picking
+  this->Cell = vtkGenericCell::New();
+  this->PointIds = vtkIdList::New();
+
+  this->PerspectiveTransform = vtkSmartPointer<vtkPerspectiveTransform>::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgCellPicker::~vtkVgCellPicker()
+{
+  this->Cell->Delete();
+  this->PointIds->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCellPicker::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgCellPicker::Pick(double selectionX, double selectionY,
+                          double selectionZ, vtkRenderer* renderer)
+{
+  int i;
+  vtkProp* prop;
+  vtkCamera* camera;
+  vtkAbstractMapper3D* mapper = NULL;
+  double p1World[4], p2World[4], p1Mapper[4], p2Mapper[4];
+  int winSize[2] = {1, 1};
+  double x, y, t;
+  double* viewport;
+  double cameraPos[4], cameraFP[4];
+  double* displayCoords, *worldCoords;
+  double* clipRange;
+  double ray[3], rayLength;
+  int pickable;
+  int LODId;
+  double windowLowerLeft[4], windowUpperRight[4];
+  double bounds[6], tol;
+  double tF, tB;
+  double hitPosition[3];
+  double cameraDOP[3];
+
+  bounds[0] = bounds[1] = bounds[2] = bounds[3] = bounds[4] = bounds[5] = 0;
+
+  //  Initialize picking process
+  this->Initialize();
+  this->Renderer = renderer;
+  this->SelectionPoint[0] = selectionX;
+  this->SelectionPoint[1] = selectionY;
+  this->SelectionPoint[2] = selectionZ;
+
+  // Invoke start pick method if defined
+  this->InvokeEvent(vtkCommand::StartPickEvent, NULL);
+
+  if (renderer == NULL)
+    {
+    vtkErrorMacro(<< "Must specify renderer!");
+    return 0;
+    }
+
+  // Get camera focal point and position. Convert to display (screen)
+  // coordinates. We need a depth value for z-buffer.
+  //
+  camera = renderer->GetActiveCamera();
+  camera->GetPosition(cameraPos);
+  cameraPos[3] = 1.0;
+  camera->GetFocalPoint(cameraFP);
+  cameraFP[3] = 1.0;
+
+  renderer->SetWorldPoint(cameraFP[0], cameraFP[1], cameraFP[2], cameraFP[3]);
+  renderer->WorldToDisplay();
+  displayCoords = renderer->GetDisplayPoint();
+  selectionZ = displayCoords[2];
+
+  // Convert the selection point into world coordinates.
+  //
+  renderer->SetDisplayPoint(selectionX, selectionY, selectionZ);
+  renderer->DisplayToWorld();
+  worldCoords = renderer->GetWorldPoint();
+  if (worldCoords[3] == 0.0)
+    {
+    vtkErrorMacro(<< "Bad homogeneous coordinates");
+    return 0;
+    }
+
+  for (i = 0; i < 3; i++)
+    {
+    this->PickPosition[i] = worldCoords[i] / worldCoords[3];
+    }
+
+  //  Compute the ray endpoints.  The ray is along the line running from
+  //  the camera position to the selection point, starting where this line
+  //  intersects the front clipping plane, and terminating where this
+  //  line intersects the back clipping plane.
+  for (i = 0; i < 3; i++)
+    {
+    ray[i] = this->PickPosition[i] - cameraPos[i];
+    }
+  for (i = 0; i < 3; i++)
+    {
+    cameraDOP[i] = cameraFP[i] - cameraPos[i];
+    }
+
+  vtkMath::Normalize(cameraDOP);
+
+  if ((rayLength = vtkMath::Dot(cameraDOP, ray)) == 0.0)
+    {
+    vtkWarningMacro("Cannot process points");
+    return 0;
+    }
+
+  clipRange = camera->GetClippingRange();
+
+  if (camera->GetParallelProjection())
+    {
+    tF = clipRange[0] - rayLength;
+    tB = clipRange[1] - rayLength;
+    for (i = 0; i < 3; i++)
+      {
+      p1World[i] = this->PickPosition[i] + tF * cameraDOP[i];
+      p2World[i] = this->PickPosition[i] + tB * cameraDOP[i];
+      }
+    }
+  else
+    {
+    tF = clipRange[0] / rayLength;
+    tB = clipRange[1] / rayLength;
+    for (i = 0; i < 3; i++)
+      {
+      p1World[i] = cameraPos[i] + tF * ray[i];
+      p2World[i] = cameraPos[i] + tB * ray[i];
+      }
+    }
+  p1World[3] = p2World[3] = 1.0;
+
+  // Compute the tolerance in world coordinates.  Do this by
+  // determining the world coordinates of the diagonal points of the
+  // window, computing the width of the window in world coordinates, and
+  // multiplying by the tolerance.
+  //
+  viewport = renderer->GetViewport();
+  if (renderer->GetRenderWindow())
+    {
+    int* winSizePtr = renderer->GetRenderWindow()->GetSize();
+    if (winSizePtr)
+      {
+      winSize[0] = winSizePtr[0];
+      winSize[1] = winSizePtr[1];
+      }
+    }
+  x = winSize[0] * viewport[0];
+  y = winSize[1] * viewport[1];
+  renderer->SetDisplayPoint(x, y, selectionZ);
+  renderer->DisplayToWorld();
+  renderer->GetWorldPoint(windowLowerLeft);
+
+  x = winSize[0] * viewport[2];
+  y = winSize[1] * viewport[3];
+  renderer->SetDisplayPoint(x, y, selectionZ);
+  renderer->DisplayToWorld();
+  renderer->GetWorldPoint(windowUpperRight);
+
+  for (tol = 0.0, i = 0; i < 3; i++)
+    {
+    tol += (windowUpperRight[i] - windowLowerLeft[i]) *
+           (windowUpperRight[i] - windowLowerLeft[i]);
+    }
+
+  tol = sqrt(tol) * this->Tolerance;
+
+  //  Loop over all props.  Transform ray (defined from position of
+  //  camera to selection point) into coordinates of mapper (not
+  //  transformed to actors coordinates!  Reduces overall computation!!!).
+  //  Note that only vtkProp3D's can be picked by vtkPicker.
+  //
+  vtkPropCollection* props;
+  vtkProp* propCandidate;
+  if (this->PickFromList)
+    {
+    props = this->GetPickList();
+    }
+  else
+    {
+    props = renderer->GetViewProps();
+    }
+
+  vtkActor* actor;
+  vtkLODProp3D* prop3D;
+  vtkVolume* volume;
+  vtkImageSlice* imageSlice = 0;
+  vtkAssemblyPath* path;
+  vtkProperty* tempProperty;
+  this->Transform->PostMultiply();
+  vtkCollectionSimpleIterator pit;
+  double scale[3];
+  for (props->InitTraversal(pit); (prop = props->GetNextProp(pit));)
+    {
+    for (prop->InitPathTraversal(); (path = prop->GetNextPath());)
+      {
+      pickable = 0;
+      actor = NULL;
+      propCandidate = path->GetLastNode()->GetViewProp();
+      if (propCandidate->GetPickable() && propCandidate->GetVisibility())
+        {
+        pickable = 1;
+        if ((actor = vtkActor::SafeDownCast(propCandidate)) != NULL)
+          {
+          mapper = actor->GetMapper();
+          if (actor->GetProperty()->GetOpacity() <= 0.0)
+            {
+            pickable = 0;
+            }
+          }
+        else if ((prop3D = vtkLODProp3D::SafeDownCast(propCandidate)) != NULL)
+          {
+          LODId = prop3D->GetPickLODID();
+          mapper = prop3D->GetLODMapper(LODId);
+
+          // if the mapper is a vtkMapper (as opposed to a vtkVolumeMapper),
+          // then check the transparency to see if the object is pickable
+          if (vtkMapper::SafeDownCast(mapper) != NULL)
+            {
+            prop3D->GetLODProperty(LODId, &tempProperty);
+            if (tempProperty->GetOpacity() <= 0.0)
+              {
+              pickable = 0;
+              }
+            }
+          }
+        else if ((volume = vtkVolume::SafeDownCast(propCandidate)) != NULL)
+          {
+          mapper = volume->GetMapper();
+          }
+        else if ((imageSlice = vtkImageSlice::SafeDownCast(propCandidate)))
+          {
+          mapper = imageSlice->GetMapper();
+          }
+        else
+          {
+          pickable = 0; //only vtkProp3D's (actors and volumes) can be picked
+          }
+        }
+
+      //  If actor can be picked, get its composite matrix, invert it, and
+      //  use the inverted matrix to transform the ray points into mapper
+      //  coordinates.
+      if (pickable)
+        {
+        vtkMatrix4x4* lastMatrix = path->GetLastNode()->GetMatrix();
+        if (lastMatrix == NULL)
+          {
+          vtkErrorMacro(<< "Pick: Null matrix.");
+          return 0;
+          }
+
+        this->Transform->SetMatrix(lastMatrix);
+        this->Transform->Push();
+        this->Transform->Inverse();
+        this->Transform->GetScale(scale); //need to scale the tolerance
+
+
+        this->PerspectiveTransform->SetMatrix(lastMatrix);
+        this->PerspectiveTransform->Inverse();
+        this->PerspectiveTransform->TransformPoint(p1World, p1Mapper);
+        this->PerspectiveTransform->TransformPoint(p2World, p2Mapper);
+
+        for (i = 0; i < 3; i++)
+          {
+          ray[i] = p2Mapper[i] - p1Mapper[i];
+          }
+
+        this->Transform->Pop();
+
+        //  Have the ray endpoints in mapper space, now need to compare this
+        //  with the mapper bounds to see whether intersection is possible.
+        //
+        //  Get the bounding box of the modeller.  Note that the tolerance is
+        //  added to the bounding box to make sure things on the edge of the
+        //  bounding box are picked correctly.
+        if (mapper != NULL)
+          {
+          mapper->GetBounds(bounds);
+          }
+
+        bounds[0] -= tol; bounds[1] += tol;
+        bounds[2] -= tol; bounds[3] += tol;
+        bounds[4] -= tol; bounds[5] += tol;
+
+        if (vtkBox::IntersectBox(bounds, p1Mapper, ray, hitPosition, t))
+          {
+          t = this->IntersectWithLine(
+                p1Mapper, p2Mapper, tol * 0.333 * (scale[0] + scale[1] + scale[2]),
+                path, static_cast<vtkProp3D*>(propCandidate), mapper);
+
+          if (t < VTK_DOUBLE_MAX)
+            {
+            double p[3];
+            p[0] = (1.0 - t) * p1World[0] + t * p2World[0];
+            p[1] = (1.0 - t) * p1World[1] + t * p2World[1];
+            p[2] = (1.0 - t) * p1World[2] + t * p2World[2];
+
+            // The IsItemPresent method returns "index+1"
+            int prevIndex = this->Prop3Ds->IsItemPresent(prop) - 1;
+
+            if (prevIndex >= 0)
+              {
+              // If already in list, set point to the closest point
+              double oldp[3];
+              this->PickedPositions->GetPoint(prevIndex, oldp);
+              if (vtkMath::Distance2BetweenPoints(p1World, p) <
+                  vtkMath::Distance2BetweenPoints(p1World, oldp))
+                {
+                this->PickedPositions->SetPoint(prevIndex, p);
+                }
+              }
+            else
+              {
+              this->Prop3Ds->AddItem(static_cast<vtkProp3D*>(prop));
+
+              this->PickedPositions->InsertNextPoint(p);
+
+              // backwards compatibility: also add to this->Actors
+              if (actor)
+                {
+                this->Actors->AddItem(actor);
+                }
+              }
+            }
+          }
+        }//if visible and pickable and not transparent
+      }//for all parts
+    }//for all actors
+
+  int picked = 0;
+
+  if (this->Path)
+    {
+    // Invoke pick method if one defined - prop goes first
+    this->Path->GetFirstNode()->GetViewProp()->Pick();
+    this->InvokeEvent(vtkCommand::PickEvent, NULL);
+    picked = 1;
+    }
+
+  // Invoke end pick method if defined
+  this->InvokeEvent(vtkCommand::EndPickEvent, NULL);
+
+  return picked;
+}
+
+//----------------------------------------------------------------------------
+double vtkVgCellPicker::IntersectActorWithLine(const double p1[3],
+                                               const double p2[3],
+                                               double t1, double t2,
+                                               double tol,
+                                               vtkProp3D* prop,
+                                               vtkMapper* mapper)
+{
+  vtkDataSet* data = mapper->GetInput();
+  double* bounds = data->GetBounds();
+
+  vtkCollectionSimpleIterator iter;
+  vtkAbstractCellLocator* locator = 0;
+  this->Locators->InitTraversal(iter);
+  while ((locator = static_cast<vtkAbstractCellLocator*>(
+                      this->Locators->GetNextItemAsObject(iter))))
+    {
+    if (locator->GetDataSet() == data)
+      {
+      break;
+      }
+    }
+
+  // If we have a locator, then use the original picking functionality.  Also,
+  // to use this "special" picking capability the data needs to be 2D, and for
+  // now that means z is constant.  Similarly, we are assuming, for now, that
+  // the pick ray is perpendicular to the z plane (thus p1==p2 except for z).
+  if (locator || bounds[4] != bounds[5] ||
+      p1[0] != p2[0] || p1[1] != p2[1] || p1[2] == p2[2])
+    {
+    return this->Superclass::IntersectActorWithLine(p1, p2, t1, t2,
+                                                    tol, prop, mapper);
+    }
+
+  // Intersect our pick ray with the 2D plane to come up with the pt to
+  // compare to cells in the polydata; need tMin to be parametric coordinate
+  // on our intersecting ray
+  double tMin = (bounds[4] - p2[2]) / (p1[2] - p2[2]);
+
+  // initially will assume ray perpendicular thus can just use x, y components
+  double planeIntersectionPt[3] = { p1[0], p1[1], bounds[4] };
+
+  double minDist2 = VTK_DOUBLE_MAX;
+  double backupMinDist2 = VTK_DOUBLE_MAX;
+  double minPCoords[3] = { 0.0, 0.0, 0.0 };
+  vtkIdType minCellId = -1;
+  int minSubId = -1;
+  double minXYZ[3] = { 0.0, 0.0, 0.0 };
+
+  // If pick is inside a cell, want to find inner most cell that is picked
+  double minInsideDistance = VTK_DOUBLE_MAX;
+  vtkIdType minInsideCellId = -1;
+  int minInsideSubId = -1;
+
+  vtkIdList* pointIds = this->PointIds;
+  vtkIdType numCells = data->GetNumberOfCells();
+  double* weights = new double [data->GetMaxCellSize()];
+  double* minWeights = new double [data->GetMaxCellSize()];
+  double cellNormal[3] = { 0, 0, 1.0 };
+
+  for (vtkIdType cellId = 0; cellId < numCells && minDist2 > 0; ++cellId)
+    {
+    double pcoords[3], closestPt[3], dist2;
+    int newSubId, numSubIds = 1;
+    bool pickedInsideClosedPolyline = false;
+
+    // If it is a strip, we need to iterate over the subIds
+    int cellType = data->GetCellType(cellId);
+    int useSubCells = this->HasSubCells(cellType);
+    if (useSubCells)
+      {
+      // Get the pointIds for the strip and the length of the strip
+      data->GetCellPoints(cellId, pointIds);
+      numSubIds = this->GetNumberOfSubCells(pointIds, cellType);
+
+      // If a closed polyline, test to see if picked "inside" the cell
+      // Note: for a polyline, numSubIds = NumberOfPoints - 1
+      if (cellType == VTK_POLY_LINE &&
+          pointIds->GetId(0) == pointIds->GetId(numSubIds))
+        {
+        data->GetCell(cellId, this->Cell);
+        vtkDoubleArray* cellPoints =
+          static_cast<vtkDoubleArray*>(this->Cell->GetPoints()->GetData());
+        if (vtkPolygon::PointInPolygon(planeIntersectionPt,
+                                       numSubIds, cellPoints->GetPointer(0),
+                                       this->Cell->GetBounds(), cellNormal))
+          {
+          pickedInsideClosedPolyline = true;
+          // Reset the min distance to make sure we're finding the closest
+          // subcell from this cell (but back it up first, as we may need to
+          // restore it)
+          backupMinDist2 = minDist2;
+          minDist2 = VTK_DOUBLE_MAX;
+          }
+        }
+      }
+
+    // This will only loop once unless we need to deal with a strip
+    for (vtkIdType subId = 0; subId < numSubIds; ++subId)
+      {
+      if (useSubCells)
+        {
+        // Get a sub-cell from the strip
+        this->GetSubCell(data, pointIds, subId, cellType, this->Cell);
+        }
+      else
+        {
+        data->GetCell(cellId, this->Cell);
+        }
+
+      // Evaluate the position of the point relative to the cell (subcell).
+      // Note: we really only care about the distance, but this is the common
+      // method within vtkGenericCell that returns the dist2
+      if (this->Cell->EvaluatePosition(planeIntersectionPt, closestPt,
+                                       newSubId, pcoords, dist2, weights) != -1)
+        {
+        if (dist2 < minDist2)
+          {
+          minDist2 = dist2;
+          // save all of these
+          minCellId = cellId;
+          minSubId = newSubId;
+          if (useSubCells)
+            {
+            minSubId = subId;
+            }
+          for (int k = 0; k < 3; k++)
+            {
+            minXYZ[k] = closestPt[k];
+            minPCoords[k] = pcoords[k];
+            }
+          vtkIdType numPoints = this->Cell->GetNumberOfPoints();
+          for (vtkIdType i = 0; i < numPoints; ++i)
+            {
+            minWeights[i] = weights[i];
+            }
+          }
+        }
+      }
+    if (pickedInsideClosedPolyline)
+      {
+      if (minDist2 < minInsideDistance)
+        {
+        minInsideDistance = minDist2;
+        minInsideCellId = minCellId;
+        minInsideSubId = minSubId;
+        }
+      else
+        {
+        // Very unlikely case that we determined we picked inside closed
+        // polyline but didn't succcessfuly EvaluatePosition for ANY of the sub
+        // cells; reset the min distance to our previous best
+        minDist2 = backupMinDist2;
+        }
+      }
+    }
+
+  // If we successfully detected a pick inside a cell, we want to use
+  // that as out picked cell/subcell
+  if (minInsideDistance < VTK_DOUBLE_MAX)
+    {
+    minDist2 = 0;  // inside the polyline, so an exact pick
+    minCellId = minInsideCellId;
+    minSubId = minInsideSubId;
+    }
+
+  // Did we find a cell that meets the tolerance requirements?  If so, we need
+  // to do some things with the cell.
+  if (minDist2 < tol * tol && minCellId >= 0 && tMin < this->GlobalTMin)
+    {
+    this->ResetPickInfo();
+
+    // Get the cell, convert to triangle if it is a strip
+    vtkGenericCell* cell = this->Cell;
+
+    // get the picked cell
+    int cellType = data->GetCellType(minCellId);
+    if (this->HasSubCells(cellType))
+      {
+      data->GetCellPoints(minCellId, this->PointIds);
+      this->GetSubCell(data, this->PointIds, minSubId, cellType, cell);
+      }
+    else
+      {
+      data->GetCell(minCellId, cell);
+      }
+
+    vtkIdType numPoints = cell->GetNumberOfPoints();
+    this->Mapper = mapper;
+
+    // Get the texture from the actor or the LOD
+    vtkActor* actor = 0;
+    vtkLODProp3D* lodActor = 0;
+    if ((actor = vtkActor::SafeDownCast(prop)))
+      {
+      this->Texture = actor->GetTexture();
+      }
+    else if ((lodActor = vtkLODProp3D::SafeDownCast(prop)))
+      {
+      int lodId = lodActor->GetPickLODID();
+      lodActor->GetLODTexture(lodId, &this->Texture);
+      }
+
+    if (this->PickTextureData && this->Texture)
+      {
+      // Return the texture's image data to the user
+      vtkImageData* image = this->Texture->GetInput();
+      this->DataSet = image;
+
+      // Get and check the image dimensions
+      int extent[6];
+      image->GetExtent(extent);
+      int dimensionsAreValid = 1;
+      int dimensions[3];
+      for (int i = 0; i < 3; i++)
+        {
+        dimensions[i] = extent[2 * i + 1] - extent[2 * i] + 1;
+        dimensionsAreValid = (dimensionsAreValid && dimensions[i] > 0);
+        }
+
+      // Use the texture coord to set the information
+      double tcoord[3];
+      if (dimensionsAreValid &&
+          this->ComputeSurfaceTCoord(data, cell, minWeights, tcoord))
+        {
+        // Take the border into account when computing coordinates
+        double x[3];
+        x[0] = extent[0] + tcoord[0] * dimensions[0] - 0.5;
+        x[1] = extent[2] + tcoord[1] * dimensions[1] - 0.5;
+        x[2] = extent[4] + tcoord[2] * dimensions[2] - 0.5;
+
+        this->SetImageDataPickInfo(x, extent);
+        }
+      }
+    else
+      {
+      // Return the polydata to the user
+      this->DataSet = data;
+      this->CellId = minCellId;
+      this->SubId = minSubId;
+      this->PCoords[0] = minPCoords[0];
+      this->PCoords[1] = minPCoords[1];
+      this->PCoords[2] = minPCoords[2];
+
+      // Find the point with the maximum weight
+      double maxWeight = 0;
+      vtkIdType iMaxWeight = -1;
+      for (vtkIdType i = 0; i < numPoints; i++)
+        {
+        if (minWeights[i] > maxWeight)
+          {
+          iMaxWeight = i;
+          }
+        }
+
+      // If maximum weight is found, use it to get the PointId
+      if (iMaxWeight != -1)
+        {
+        this->PointId = cell->PointIds->GetId(iMaxWeight);
+        }
+      }
+
+    // Set the mapper position
+    this->MapperPosition[0] = minXYZ[0];
+    this->MapperPosition[1] = minXYZ[1];
+    this->MapperPosition[2] = minXYZ[2];
+
+    // Compute the normal
+    if (!this->ComputeSurfaceNormal(data, cell, minWeights, this->MapperNormal))
+      {
+      // By default, the normal points back along view ray
+      this->MapperNormal[0] = p1[0] - p2[0];
+      this->MapperNormal[1] = p1[1] - p2[1];
+      this->MapperNormal[2] = p1[2] - p2[2];
+      vtkMath::Normalize(this->MapperNormal);
+      }
+    }
+  else
+    {
+    tMin = VTK_DOUBLE_MAX;  // must return large tMin if intersection not found
+    }
+
+  delete [] weights;
+  delete [] minWeights;
+
+  // return value is parametric coordinate along pick ray where hit occurred
+  return tMin;
+}
+
+
+
diff --git a/Libraries/VtkVgCore/vtkVgCellPicker.h b/Libraries/VtkVgCore/vtkVgCellPicker.h
new file mode 100644
index 00000000..48459fc6
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgCellPicker.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgCellPicker_h
+#define __vtkVgCellPicker_h
+
+#include <vtkCellPicker.h>
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkPerspectiveTransform;
+
+class VTKVG_CORE_EXPORT vtkVgCellPicker : public vtkCellPicker
+{
+public:
+  static vtkVgCellPicker* New();
+  vtkTypeMacro(vtkVgCellPicker, vtkCellPicker);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  virtual int Pick(double selectionX, double selectionY,
+                   double selectionZ, vtkRenderer* renderer);
+
+
+protected:
+  vtkVgCellPicker();
+  virtual ~vtkVgCellPicker();
+
+  virtual double IntersectActorWithLine(const double p1[3], const double p2[3],
+                                        double t1, double t2, double tol,
+                                        vtkProp3D* prop, vtkMapper* mapper);
+
+  vtkSmartPointer<vtkPerspectiveTransform> PerspectiveTransform;
+
+
+private:
+  // Not implemented.
+  vtkVgCellPicker(const vtkVgCellPicker&);
+
+  vtkGenericCell* Cell; // used to accelerate picking
+  vtkIdList* PointIds; // used to accelerate picking
+
+  // Not implemented.
+  void operator=(const vtkVgCellPicker&);
+};
+
+#endif // __vtkVgCellPicker_h
diff --git a/Libraries/VtkVgCore/vtkVgChartTimeline.cxx b/Libraries/VtkVgCore/vtkVgChartTimeline.cxx
new file mode 100644
index 00000000..372566f9
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgChartTimeline.cxx
@@ -0,0 +1,910 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgChartTimeline.h"
+
+#include "vtkVgPlotTimeline.h"
+
+#include "vtkAxis.h"
+#include "vtkCommand.h"
+#include "vtkContext2D.h"
+#include "vtkContextScene.h"
+#include "vtkContextMouseEvent.h"
+#include "vtkDoubleArray.h"
+#include "vtkIdTypeArray.h"
+#include "vtkFloatArray.h"
+#include "vtkObjectFactory.h"
+#include "vtkPen.h"
+#include "vtkPlot.h"
+#include "vtkPlotGrid.h"
+#include "vtkStringArray.h"
+#include "vtkTable.h"
+#include "vtkTextProperty.h"
+#include "vtkTooltipItem.h"
+#include "vtkTransform2D.h"
+
+#include "vtksys/ios/sstream"
+#include "boost/date_time/posix_time/posix_time.hpp"
+
+#define TIMELINE_MIN_RANGE 1.0e7  // 10 s
+#define TIMELINE_MAX_RANGE 1.0e15 // ~30 yrs
+
+namespace
+{
+
+boost::gregorian::date GetEpoch()
+{
+  return boost::gregorian::date(1970, 1, 1);
+}
+
+boost::posix_time::ptime GetPosixTimeSeconds(double us)
+{
+  boost::posix_time::ptime pt(GetEpoch());
+  return pt + boost::posix_time::seconds(us * 1.0e-6);
+}
+
+boost::posix_time::ptime GetPosixTime(double us)
+{
+  long long micros = static_cast<long long>(us);
+  return GetPosixTimeSeconds(us) +
+         boost::posix_time::microseconds(micros % 1000000);
+}
+
+double GetInputTime(boost::posix_time::ptime pt)
+{
+  return (pt - boost::posix_time::ptime(GetEpoch())).total_microseconds();
+}
+
+enum { NumFixedTickMarks = 5 };
+
+enum TickInterval
+{
+  TI_Day,
+  TI_Month,
+  TI_Year
+};
+
+} // end anonymous namespace
+
+//-----------------------------------------------------------------------------
+vtkStandardNewMacro(vtkVgChartTimeline);
+
+//-----------------------------------------------------------------------------
+vtkVgChartTimeline::vtkVgChartTimeline()
+{
+  this->GetAxis(vtkAxis::BOTTOM)->SetBehavior(vtkAxis::CUSTOM);
+  this->GetAxis(vtkAxis::BOTTOM)->SetRange(0.0, 1.0);
+
+  // The second x axis is a way to apply a different rendering style for the
+  // 'major' date tick marks and labels. The render order for these is not
+  // quite right, since we are forced to append them at the end of the item
+  // list...but it works well enough for now.
+  this->xAxis2 = vtkAxis::New();
+  this->xAxis2->SetRange(0.0, 1.0);
+  this->xAxis2->SetBehavior(vtkAxis::CUSTOM);
+  this->xAxis2->GetGridPen()->SetColor(100, 100, 100);
+  this->xAxis2->GetLabelProperties()->BoldOn();
+  this->xAxis2->SetPosition(vtkAxis::BOTTOM);
+  this->xAxis2->SetVisible(true);
+
+  vtkPlotGrid* grid = vtkPlotGrid::New();
+  grid->SetXAxis(xAxis2);
+  grid->SetYAxis(this->GetAxis(vtkAxis::LEFT));
+
+  this->AddItem(grid);
+  this->AddItem(this->xAxis2);
+
+  grid->FastDelete();
+
+  this->MinXLimit = 0.0;          // 1-1-1970
+  this->MaxXLimit = 2145916800e6; // 1-1-2038
+  this->MinX = MinXLimit;
+  this->MaxX = MaxXLimit;
+  this->NormalizeInput = false;
+  this->ExtentsAreValid = false;
+  this->Actions.Zoom() = vtkContextMouseEvent::LEFT_BUTTON;
+  this->Actions.Pan() = vtkContextMouseEvent::MIDDLE_BUTTON;
+  this->Actions.Select() = vtkContextMouseEvent::RIGHT_BUTTON;
+  this->ActionsClick.Select() = vtkContextMouseEvent::LEFT_BUTTON;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgChartTimeline::~vtkVgChartTimeline()
+{
+  this->xAxis2->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::FixZoomLevel()
+{
+  // Keep the chart from getting into a "bad state" by limiting the max zoom.
+  double range = this->MaxX - this->MinX;
+  double mid = 0.5 * (this->MinX + this->MaxX);
+  if (range < TIMELINE_MIN_RANGE)
+    {
+    this->SetXExtents(mid - 0.5 * TIMELINE_MIN_RANGE,
+                      mid + 0.5 * TIMELINE_MIN_RANGE);
+    }
+  else if (range > TIMELINE_MAX_RANGE)
+    {
+    this->SetXExtents(mid - 0.5 * TIMELINE_MAX_RANGE,
+                      mid + 0.5 * TIMELINE_MAX_RANGE);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::BuildAxis()
+{
+  this->AxisBuildTime.Modified();
+
+  vtkAxis* xAxis = this->GetAxis(vtkAxis::BOTTOM);
+  xAxis->Update();
+
+  // Figure out how many fixed ticks we want to show, based on chart width.
+  float width = xAxis->GetPosition2().GetX() - xAxis->GetPosition1().GetX();
+  float padding = 50.0f;
+  int maxTicks = 1 +
+                 vtkContext2D::FloatToInt((width - 2.0f * padding) / 100.0f);
+
+  boost::posix_time::ptime mint = GetPosixTime(this->MinX);
+  boost::posix_time::ptime maxt = GetPosixTime(this->MaxX);
+
+  bool showFixedTicks = true;
+
+  // Figure out a good interval for floating ticks.
+  TickInterval tickInterval = TI_Day;
+  int days = (maxt - mint).hours() / 24;
+  int daysPerTick = 1;
+  if (days >= 3)
+    {
+    showFixedTicks = false;
+    if (days >= 365 * 3)
+      {
+      tickInterval = TI_Year;
+      daysPerTick = 365;
+      }
+    else if (days >= 30 * 3)
+      {
+      tickInterval = TI_Month;
+      daysPerTick = 30;
+      }
+    }
+
+  // Compute how many ticks to skip between the ones that are actually drawn.
+  int stride = 0;
+  int totalTicks = days / daysPerTick;
+  while (totalTicks / ++stride > maxTicks)
+    ;
+
+  vtkStringArray* newLabels = vtkStringArray::New();
+  vtkDoubleArray* newPositions = vtkDoubleArray::New();
+
+  // Add ticks at fixed intervals displaying time at the level of seconds.
+  if (showFixedTicks)
+    {
+    newLabels->SetNumberOfTuples(maxTicks);
+    newPositions->SetNumberOfTuples(maxTicks);
+
+    double axisRange = xAxis->GetMaximum() - xAxis->GetMinimum();
+    double axisPadding = (padding / width) * axisRange;
+
+    double x = xAxis->GetMinimum() + axisPadding;
+    for (int i = 0; i < maxTicks; ++i)
+      {
+      double t = this->MinX + x * (this->MaxX - this->MinX);
+      vtksys_ios::ostringstream ostr;
+      ostr << GetPosixTimeSeconds(t).time_of_day() << 'Z';
+
+      newLabels->SetValue(i, ostr.str());
+      newPositions->SetValue(i, x);
+
+      x += (axisRange - 2 * axisPadding) / (maxTicks - 1);
+      }
+    }
+
+  // Don't attempt to display dates if the chart range is beyond what we are
+  // expecting. Doing so has little benefit and causes and seems to cause
+  // problems on linux systems.
+  if (this->MinXLimit < 0.0 || this->MaxXLimit > 2145916800e6)
+    {
+    xAxis->SetCustomTickPositions(newPositions, newLabels);
+
+    newPositions->FastDelete();
+    newLabels->FastDelete();
+    return;
+    }
+
+  boost::posix_time::ptime pt = GetPosixTime(this->MinX);
+
+  // Need a reference point to test stride against.
+  boost::gregorian::date epoch = GetEpoch();
+
+  // Compute the position of the first floating tick mark by 'rounding up'
+  // to the start of the next day, month, or year in the calendar that is
+  // an even multiple of the stride.
+  double t;
+  switch (tickInterval)
+    {
+    case TI_Day:
+      {
+      boost::posix_time::ptime tmp = pt + boost::gregorian::days(1);
+      tmp -= boost::posix_time::microseconds(1);
+      boost::gregorian::date d = tmp.date();
+      long days = (d - epoch).days();
+      if (long rem = days % stride)
+        {
+        d += boost::gregorian::days(stride - rem);
+        }
+      t = GetInputTime(boost::posix_time::ptime(d));
+      break;
+      }
+
+    case TI_Month:
+      {
+      boost::posix_time::ptime tmp = pt + boost::gregorian::months(1);
+      tmp -= boost::posix_time::microseconds(1);
+      boost::gregorian::date d(tmp.date().year(), tmp.date().month(), 1);
+      long months = 12 * (d.year() - epoch.year()) + d.month() - epoch.month();
+      if (long rem = months % stride)
+        {
+        d += boost::gregorian::months(stride - rem);
+        }
+      t = GetInputTime(boost::posix_time::ptime(d));
+      break;
+      }
+
+    case TI_Year:
+      {
+      boost::posix_time::ptime tmp = pt + boost::gregorian::years(1);
+      tmp -= boost::posix_time::microseconds(1);
+      boost::gregorian::date d(tmp.date().year(), 1, 1);
+      long years = d.year() - epoch.year();
+      if (long rem = years % stride)
+        {
+        d += boost::gregorian::years(stride - rem);
+        }
+      t = GetInputTime(boost::posix_time::ptime(d));
+      break;
+      }
+    }
+
+  double minLabelPadding = 65.0f / width;
+
+  vtkStringArray* newFloatingLabels = vtkStringArray::New();
+  vtkDoubleArray* newFloatingPositions = vtkDoubleArray::New();
+
+  // Add floating tick marks indicating the start of a day, month, or year.
+  while (t <= this->MaxX)
+    {
+    double val = (t - this->MinX) / (this->MaxX - this->MinX);
+
+    // Don't show the label of fixed ticks that are overlapping with us,
+    // but continue to show the tick itself as a reference point.
+    if (showFixedTicks)
+      {
+      for (int i = 0; i < maxTicks; ++i)
+        {
+        if (fabs(val - newPositions->GetValue(i)) < minLabelPadding)
+          {
+          newLabels->SetValue(i, "");
+          }
+        }
+      }
+
+    vtksys_ios::ostringstream ostr;
+    boost::posix_time::ptime pt = GetPosixTimeSeconds(t);
+    double prevt = t;
+
+    // Add a label and compute the position of the next floating tick.
+    switch (tickInterval)
+      {
+      case TI_Day:
+        ostr << pt.date();
+        t = GetInputTime(pt + boost::gregorian::days(stride));
+        break;
+
+      case TI_Month:
+        ostr << pt.date().year() << '-' << pt.date().month();
+        t = GetInputTime(pt + boost::gregorian::months(stride));
+        break;
+
+      case TI_Year:
+        ostr << pt.date().year();
+        t = GetInputTime(pt + boost::gregorian::years(stride));
+        break;
+      }
+
+    // Escape hatch in case we overflow.
+    if (t <= prevt)
+      {
+      break;
+      }
+
+    newFloatingPositions->InsertNextValue(val);
+    newFloatingLabels->InsertNextValue(ostr.str());
+    }
+
+  xAxis->SetCustomTickPositions(newPositions, newLabels);
+  xAxis->Update();
+
+  xAxis2->SetCustomTickPositions(newFloatingPositions, newFloatingLabels);
+  xAxis2->Update();
+
+  newPositions->FastDelete();
+  newLabels->FastDelete();
+  newFloatingPositions->FastDelete();
+  newFloatingLabels->FastDelete();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::Update()
+{
+  // Set some reasonable extents if this is the first update and no one
+  // has otherwise told us what the extents should be.
+  if (!this->ExtentsAreValid)
+    {
+    this->ResetExtents();
+    }
+
+  if (this->NormalizeInput)
+    {
+    if (this->GetMTime() > this->DataBuildTime)
+      {
+      this->BuildXColumn();
+      }
+    else
+      {
+      for (int i = 0, end = this->GetNumberOfPlots(); i < end; ++i)
+        {
+        if (this->GetPlot(i)->GetInput()->GetMTime() > this->DataBuildTime)
+          {
+          this->BuildXColumn();
+          break;
+          }
+        }
+      }
+    }
+
+  this->Superclass::Update();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgChartTimeline::UpdateLayout(vtkContext2D* painter)
+{
+  bool changed = this->Superclass::UpdateLayout(painter);
+
+  // This duplicates some code in vtkChartXY, which is necessary in order to
+  // keep the x axis border from from behaving badly.
+  vtkAxis* axis = this->GetAxis(vtkAxis::BOTTOM);
+  int border = 0;
+  if (axis->GetVisible())
+    {
+    vtkRectf bounds = axis->GetBoundingRect(painter);
+    border = static_cast<int>(bounds.GetHeight());
+
+    // The x axis may not have any ticks, but we still want to keep
+    // a consistent border height so that the second x axis (which
+    // the base class doesn't know about) doesn't get occluded.
+    border = std::max(24, border);
+    }
+  border += this->GetLegendBorder(painter, vtkAxis::BOTTOM);
+  border = border < this->HiddenAxisBorder ? this->HiddenAxisBorder : border;
+
+  // Fix the x axis border that was set by vtkChartXY::UpdateLayout()
+  if (changed || this->LayoutChanged)
+    {
+    this->SetBottomBorder(border);
+
+    this->GetAxis(vtkAxis::LEFT)->SetPoint1(this->Point1[0], this->Point1[1]);
+    this->GetAxis(vtkAxis::LEFT)->SetPoint2(this->Point1[0], this->Point2[1]);
+
+    this->GetAxis(vtkAxis::BOTTOM)->SetPoint1(this->Point1[0], this->Point1[1]);
+    this->GetAxis(vtkAxis::BOTTOM)->SetPoint2(this->Point2[0], this->Point1[1]);
+
+    this->GetAxis(vtkAxis::RIGHT)->SetPoint1(this->Point2[0], this->Point1[1]);
+    this->GetAxis(vtkAxis::RIGHT)->SetPoint2(this->Point2[0], this->Point2[1]);
+
+    this->GetAxis(vtkAxis::TOP)->SetPoint1(this->Point1[0], this->Point2[1]);
+    this->GetAxis(vtkAxis::TOP)->SetPoint2(this->Point2[0], this->Point2[1]);
+
+    this->xAxis2->SetPoint1(this->Point1[0], this->Point1[1]);
+    this->xAxis2->SetPoint2(this->Point2[0], this->Point1[1]);
+
+    for (int i = 0; i < 4; ++i)
+      {
+      this->GetAxis(i)->Update();
+      }
+    this->xAxis2->Update();
+    }
+
+  // Update the ticks and labels for the x axis. This is not really 'layout',
+  // but it needs to happen here since it follows vtkChartXY::UpdateLayout(),
+  // but precedes rendering.
+  if (this->NormalizeInput &&
+      (changed || this->LayoutChanged || this->MTime > this->AxisBuildTime))
+    {
+    this->BuildAxis();
+    }
+
+  return changed;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgChartTimeline::MouseMoveEvent(const vtkContextMouseEvent& mouse)
+{
+  if (mouse.GetButton() == vtkContextMouseEvent::NO_BUTTON)
+    {
+    this->Scene->SetDirty(true);
+    this->Tooltip->SetVisible(this->UpdateTooltip(mouse));
+    return true;
+    }
+
+  vtkAxis* y = this->GetAxis(vtkAxis::LEFT);
+  double min = y->GetMinimum();
+  double max = y->GetMaximum();
+
+  bool result = this->Superclass::MouseMoveEvent(mouse);
+
+  // never pan the y axis
+  if (mouse.GetButton() == this->Actions.Pan())
+    {
+    if (this->NormalizeInput)
+      {
+      this->NormalizeXAxis();
+      }
+    y->SetMinimum(min);
+    y->SetMaximum(max);
+    this->RecalculatePlotTransforms();
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgChartTimeline::MouseDoubleClickEvent(const vtkContextMouseEvent& mouse)
+{
+  if (mouse.GetButton() == this->ActionsClick.Select())
+    {
+    this->DoSelect(mouse, true);
+    return true;
+    }
+  return vtkAbstractContextItem::MouseDoubleClickEvent(mouse);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgChartTimeline::MouseButtonReleaseEvent(
+  const vtkContextMouseEvent& mouse)
+{
+  if (mouse.GetButton() == this->ActionsClick.Select())
+    {
+    // Treat as a single click if the event wasn't a valid drag.
+    if (fabs(mouse.GetPos().GetX() - this->MouseBox.GetX()) < 5.0f &&
+        fabs(mouse.GetPos().GetY() - this->MouseBox.GetY()) < 5.0f)
+      {
+      this->DoSelect(mouse, false);
+      this->MouseBox.SetWidth(0.0);
+      this->MouseBox.SetHeight(0.0);
+      this->DrawBox = false;
+      return true;
+      }
+    }
+
+  vtkAxis* y = this->GetAxis(vtkAxis::LEFT);
+  double min = y->GetMinimum();
+  double max = y->GetMaximum();
+
+  bool result = this->Superclass::MouseButtonReleaseEvent(mouse);
+
+  // force y axis scale to remain constant
+  if (mouse.GetButton() == this->Actions.Zoom() &&
+      this->Scene->GetDirty())
+    {
+    if (this->NormalizeInput)
+      {
+      this->NormalizeXAxis();
+      this->FixZoomLevel();
+      }
+    y->SetMinimum(min);
+    y->SetMaximum(max);
+    y->RecalculateTickSpacing();
+    this->RecalculatePlotTransforms();
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgChartTimeline::MouseWheelEvent(const vtkContextMouseEvent& event,
+                                         int delta)
+{
+  vtkAxis* y = this->GetAxis(vtkAxis::LEFT);
+  double min = y->GetMinimum();
+  double max = y->GetMaximum();
+
+  Superclass::MouseWheelEvent(event, delta);
+
+  if (this->NormalizeInput)
+    {
+    this->NormalizeXAxis();
+    this->FixZoomLevel();
+    }
+  // un-zoom the y axis - we want the y axis scale to remain constant
+  y->SetMinimum(min);
+  y->SetMaximum(max);
+  y->RecalculateTickSpacing();
+
+  this->RecalculatePlotTransforms();
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgChartTimeline::Hit(const vtkContextMouseEvent& mouse)
+{
+  // Allow a mouse event to be initiated anywhere within the bounds of the
+  // chart, *including* the borders. This allows rubberbands to still work
+  // correctly even if the first click is outside of the chart proper.
+  if (mouse.GetScenePos().GetX() >= this->Size.GetX() &&
+      mouse.GetScenePos().GetX() < this->Size.GetX() + this->Size.GetWidth() &&
+      mouse.GetScenePos().GetY() >= this->Size.GetY() &&
+      mouse.GetScenePos().GetY() < this->Size.GetY() + this->Size.GetHeight())
+    {
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::SetSelection(int p, vtkIdTypeArray* selection)
+{
+  vtkPlot* plot = this->GetPlot(p);
+  if (!plot)
+    {
+    return;
+    }
+
+  vtkTable* input = plot->GetInput();
+
+  // first make sure the selected item is visible
+  if (selection->GetNumberOfTuples() != 0)
+    {
+    this->MakePointVisible(input->GetValue(selection->GetValue(0), 0).ToFloat(),
+                           input->GetValue(selection->GetValue(0), 1).ToInt());
+    }
+
+  // select the item
+  plot->SetSelection(selection);
+  this->InvokeEvent(vtkCommand::SelectionChangedEvent);
+  this->Scene->SetDirty(true);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::ClearSelection()
+{
+  for (int i = 0; i < this->GetNumberOfPlots(); ++i)
+    {
+    this->GetPlot(i)->SetSelection(0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::MakePointVisible(float x, float y)
+{
+  double min = this->GetAxis(1)->GetMinimum();
+  double max = this->GetAxis(1)->GetMaximum();
+  double pad = 0.1 * (max - min);
+
+  bool boundsChanged = false;
+
+  if (x < min + pad)
+    {
+    this->GetAxis(1)->SetRange(x - pad, x - pad + max - min);
+    boundsChanged = true;
+    }
+  else if (x > max - pad)
+    {
+    this->GetAxis(1)->SetRange(x + pad - (max - min), x + pad);
+    boundsChanged = true;
+    }
+
+  min = this->GetAxis(0)->GetMinimum();
+  max = this->GetAxis(0)->GetMaximum();
+  pad = 0.0; // 0.2 * (max - min);
+
+  if (y < min + pad)
+    {
+    this->GetAxis(0)->SetRange(y - pad, y - pad + max - min);
+    boundsChanged = true;
+    }
+  else if (y > max - pad)
+    {
+    this->GetAxis(0)->SetRange(y + pad - (max - min), y + pad);
+    boundsChanged = true;
+    }
+
+  if (boundsChanged)
+    {
+    this->RecalculateBounds();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgChartTimeline::UpdateTooltip(const vtkContextMouseEvent& mouse)
+{
+  // iterate through the plots and build a selection
+  int plots = this->GetNumberOfPlots();
+  if (plots)
+    {
+    // @TODO: Since vtkChartXY keeps its transforms private, we have to
+    // recalculate the transform every time the mouse moves. We need access to
+    // the private transforms, or at least know when they have been invalidated.
+    vtkTransform2D* transform = vtkTransform2D::New();
+    this->CalculatePlotTransform(this->GetAxis(1), this->GetAxis(0), transform);
+
+    vtkVector2f position;
+    transform->InverseTransformPoints(mouse.GetPos().GetData(),
+                                      position.GetData(), 1);
+
+    // use a tolerance of +/- 5 pixels
+    vtkVector2f tolerance(5 * (1.0 / transform->GetMatrix()->GetElement(0, 0)),
+                          5 * (1.0 / transform->GetMatrix()->GetElement(1, 1)));
+    transform->Delete();
+
+    // search for hits
+    for (int j = 0; j < plots; ++j)
+      {
+      if (vtkVgPlotTimeline* plot =
+            vtkVgPlotTimeline::SafeDownCast(this->GetPlot(j)))
+        {
+        vtkIdTypeArray* ids;
+        if (plot->GetIsIntervalPlot())
+          {
+          ids = plot->GetIntervalIdsInArea(position, tolerance);
+          }
+        else
+          {
+          ids = plot->GetPointIdsInArea(position, tolerance);
+          }
+
+        if (ids && ids->GetNumberOfTuples() > 0)
+          {
+          vtksys_ios::ostringstream ostr;
+
+          // display the event ids in the tooltip
+          int size = ids->GetNumberOfTuples();
+          for (int k = 0; k < size; ++k)
+            {
+            ostr << plot->GetInput()->GetValueByName(ids->GetValue(k), "Id");
+
+            // limit the tooltip to a reasonable size
+            if (k + 1 == 16)
+              {
+              if (size > k + 1)
+                {
+                ostr << "...";
+                }
+              break;
+              }
+
+            if (size > k + 1)
+              {
+              ostr << ", ";
+              }
+            }
+
+          this->Tooltip->SetText(ostr.str().c_str());
+          this->Tooltip->SetPosition(mouse.GetScreenPos().GetX() + 20,
+                                     mouse.GetScreenPos().GetY() - 35);
+          return true;
+          }
+        }
+      }
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::DoSelect(const vtkContextMouseEvent& mouse,
+                                  bool activate)
+{
+  vtkPlot* plotChanged = 0;
+
+  // iterate through the plots and build a selection
+  int plots = this->GetNumberOfPlots();
+  if (plots)
+    {
+    vtkTransform2D* transform = vtkTransform2D::New();
+    this->CalculatePlotTransform(this->GetAxis(1),
+                                 this->GetAxis(0),
+                                 transform);
+
+    // check within a 5 pixel radius of the click
+    float tol = 5.0f;
+    float pos1[] = { mouse.GetPos().GetX() - tol, mouse.GetPos().GetY() - tol };
+    float pos2[] = { mouse.GetPos().GetX() + tol, mouse.GetPos().GetY() + tol };
+    transform->InverseTransformPoints(pos1, pos1, 1);
+    transform->InverseTransformPoints(pos2, pos2, 1);
+
+    vtkVector2f min(pos1);
+    vtkVector2f max(pos2);
+
+    // select nearby points in plots
+    for (int j = 0; j < plots; ++j)
+      {
+      if (vtkPlot* plot = this->GetPlot(j))
+        {
+        vtkVgPlotTimeline* timelinePlot =
+          vtkVgPlotTimeline::SafeDownCast(plot);
+        if (timelinePlot && timelinePlot->GetIsIntervalPlot())
+          {
+          // select intervals, not points
+          vtkVector2f pos (mouse.GetPos().GetX(), mouse.GetPos().GetY());
+          transform->InverseTransformPoints(pos.GetData(), pos.GetData(), 1);
+          vtkVector2f tolerance(
+            tol * (1.0 / transform->GetMatrix()->GetElement(0, 0)),
+            tol * (1.0 / transform->GetMatrix()->GetElement(1, 1)));
+
+          timelinePlot->SelectIntervals(pos, tolerance);
+          plotChanged = timelinePlot;
+          break;
+          }
+        else
+          {
+          plot->SelectPoints(min, max);
+          plotChanged = plot;
+          break;
+          }
+        }
+      }
+    transform->Delete();
+    }
+
+  SelectionData sd;
+  sd.Plot = plotChanged;
+  sd.IsActivation = activate;
+
+  this->InvokeEvent(vtkCommand::SelectionChangedEvent, &sd);
+  this->Scene->SetDirty(true);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::SetXExtents(double min, double max)
+{
+  this->MinX = std::max(min, this->MinXLimit);
+  this->MaxX = std::min(max, this->MaxXLimit);
+  this->ExtentsAreValid = true;
+
+  // Show the date that the chart is centered on.
+  double center = 0.5 * (this->MinX + this->MaxX);
+  boost::posix_time::ptime pt = GetPosixTime(center);
+  this->SetTitle(boost::gregorian::to_simple_string(pt.date()));
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::ResetExtents()
+{
+  double minx = VTK_DOUBLE_MAX;
+  double maxx = VTK_DOUBLE_MIN;
+
+  // Compute the extents of the input.
+  for (int i = 0, end = this->GetNumberOfPlots(); i < end; ++i)
+    {
+    vtkTable* table = this->GetPlot(i)->GetInput();
+    vtkDoubleArray* xd = vtkDoubleArray::SafeDownCast(
+                           table->GetColumnByName("XD"));
+    if (!xd)
+      {
+      return;
+      }
+
+    for (int row = 0, end = xd->GetNumberOfTuples(); row < end; ++row)
+      {
+      double val = xd->GetValue(row);
+      if (val < minx)
+        {
+        minx = val;
+        }
+      if (val > maxx)
+        {
+        maxx = val;
+        }
+      }
+    }
+
+  if (minx == maxx)
+    {
+    minx -= 1e-6;
+    maxx += 1e-6;
+    }
+
+  double padding = (maxx - minx) * 0.1;
+  minx -= padding;
+  maxx += padding;
+
+  // Fit the chart to the input extents plus a small amount of padding.
+  this->MinXLimit = minx;
+  this->MaxXLimit = maxx;
+  this->SetXExtents(minx, maxx);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::BuildXColumn()
+{
+  // This is where the X column data for the plots are built, based on the
+  // full precision input data ("XD"), and the current extents of the chart.
+  // The plots can't use the full precision data directly, since the plots'
+  // internal transform would cause unacceptable round-off error when
+  // the range of the X axis is small (e.g. spanning a few hours or less).
+  //
+  // In order to mitigate this, we fix the X axis range to [0,1] and normalize
+  // the data based on the current extents. This allows us to maintain
+  // sub-second precision when zoomed in, while allowing large input time
+  // spans (on the order of years).
+  for (int i = 0, end = this->GetNumberOfPlots(); i < end; ++i)
+    {
+    vtkTable* table = this->GetPlot(i)->GetInput();
+
+    vtkFloatArray* x = vtkFloatArray::SafeDownCast(
+                         table->GetColumnByName("X"));
+
+    vtkDoubleArray* xd = vtkDoubleArray::SafeDownCast(
+                           table->GetColumnByName("XD"));
+
+    assert(x && xd);
+    assert(x->GetNumberOfTuples() == xd->GetNumberOfTuples());
+
+    for (int row = 0, erow = xd->GetNumberOfTuples(); row < erow; ++row)
+      {
+      double v = xd->GetValue(row);
+      v = (v - this->MinX) / (this->MaxX - this->MinX);
+      x->SetValue(row, v);
+      }
+
+    x->Modified();
+    table->Modified();
+    }
+
+  this->DataBuildTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgChartTimeline::NormalizeXAxis()
+{
+  vtkAxis* x = this->GetAxis(vtkAxis::BOTTOM);
+  double xmin = x->GetMinimum();
+  double xmax = x->GetMaximum();
+
+  // Compute new extents based on the change to the x-axis range, and then
+  // renormalize the axis. The data will be updated elsewhere to ensure
+  // everything shows up in the right place.
+  double newXMin = this->MinX + xmin * (this->MaxX - this->MinX);
+  double newXMax = this->MinX + xmax * (this->MaxX - this->MinX);
+
+  if (newXMin < this->MinXLimit)
+    {
+    double delta = this->MinXLimit - newXMin;
+    this->SetXExtents(this->MinXLimit, newXMax + delta);
+    }
+  else if (newXMax > this->MaxXLimit)
+    {
+    double delta = newXMax - this->MaxXLimit;
+    this->SetXExtents(newXMin - delta, this->MaxXLimit);
+    }
+  else
+    {
+    this->SetXExtents(newXMin, newXMax);
+    }
+
+  x->SetRange(0.0, 1.0);
+}
diff --git a/Libraries/VtkVgCore/vtkVgChartTimeline.h b/Libraries/VtkVgCore/vtkVgChartTimeline.h
new file mode 100644
index 00000000..8ddb34a8
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgChartTimeline.h
@@ -0,0 +1,109 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgChartTimeline - Class for drawing timeline charts
+//
+// .SECTION Description
+// This class implements an XY chart.
+
+#ifndef __vtkVgChartTimeline_h
+#define __vtkVgChartTimeline_h
+
+#include "vtkChartXY.h"
+
+#include <vgExport.h>
+
+class vtkIdTypeArray;
+class vtkPlot;
+
+class VTKVG_CORE_EXPORT vtkVgChartTimeline : public vtkChartXY
+{
+public:
+  struct SelectionData
+    {
+    vtkPlot* Plot;
+    bool IsActivation;
+    };
+
+public:
+  vtkTypeMacro(vtkVgChartTimeline, vtkChartXY);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Creates a 2D Chart object.
+  static vtkVgChartTimeline* New();
+
+  virtual void Update();
+
+  // Description:
+  // Mouse move event.
+  virtual bool MouseMoveEvent(const vtkContextMouseEvent& mouse);
+
+  // Description:
+  // Mouse button double click event.
+  virtual bool MouseDoubleClickEvent(const vtkContextMouseEvent& mouse);
+
+  // Description:
+  // Mouse button release event.
+  virtual bool MouseButtonReleaseEvent(const vtkContextMouseEvent& mouse);
+
+  // Description:
+  // Mouse wheel event, positive delta indicates forward movement of the wheel.
+  virtual bool MouseWheelEvent(const vtkContextMouseEvent& mouse, int delta);
+
+  virtual bool Hit(const vtkContextMouseEvent& mouse);
+
+  // Description:
+  // Sets the selection for a plot and focuses it in the view.
+  void SetSelection(int plot, vtkIdTypeArray* selection);
+
+  // Description:
+  // Clear the selection for all plots.
+  void ClearSelection();
+
+  // Description:
+  // Set the min and max x value of the chart.
+  void SetXExtents(double min, double max);
+
+  // Description:
+  // Reset the chart extents to the default (fit to input).
+  void ResetExtents();
+
+  // Description:
+  // Whether to use supplemental x column to generate normalized input.
+  vtkSetMacro(NormalizeInput, bool);
+  vtkGetMacro(NormalizeInput, bool);
+
+protected:
+  vtkVgChartTimeline();
+  ~vtkVgChartTimeline();
+
+  void BuildAxis();
+  void FixZoomLevel();
+
+  void DoSelect(const vtkContextMouseEvent& mouse, bool activate);
+
+  virtual bool UpdateLayout(vtkContext2D* painter);
+
+private:
+  void MakePointVisible(float x, float y);
+  bool UpdateTooltip(const vtkContextMouseEvent& mouse);
+  void BuildXColumn();
+  void NormalizeXAxis();
+
+  double MinX, MaxX;
+  double MinXLimit, MaxXLimit;
+
+  bool NormalizeInput;
+  bool ExtentsAreValid;
+
+  vtkTimeStamp DataBuildTime;
+  vtkTimeStamp AxisBuildTime;
+
+  vtkAxis* xAxis2;
+};
+
+#endif //__vtkVgChartTimeline_h
diff --git a/Libraries/VtkVgCore/vtkVgClipPolyData.cxx b/Libraries/VtkVgCore/vtkVgClipPolyData.cxx
new file mode 100644
index 00000000..e809dc15
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgClipPolyData.cxx
@@ -0,0 +1,459 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgClipPolyData.h"
+
+#include "vtkCellArray.h"
+#include "vtkCellData.h"
+#include "vtkCharArray.h"
+#include "vtkExecutive.h"
+#include "vtkFloatArray.h"
+#include "vtkGenericCell.h"
+#include "vtkImplicitFunction.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkLine.h"
+#include "vtkMergePoints.h"
+#include "vtkObjectFactory.h"
+#include "vtkPointData.h"
+#include "vtkPolyData.h"
+#include "vtkTriangle.h"
+#include "vtkIncrementalPointLocator.h"
+
+#include <math.h>
+
+vtkStandardNewMacro(vtkVgClipPolyData);
+vtkCxxSetObjectMacro(vtkVgClipPolyData, ClipFunction, vtkImplicitFunction);
+
+//----------------------------------------------------------------------------
+// Construct with user-specified implicit function; InsideOut turned off; value
+// set to 0.0; and generate clip scalars turned off.
+vtkVgClipPolyData::vtkVgClipPolyData(vtkImplicitFunction* cf)
+{
+  this->ClipFunction = cf;
+  this->InsideOut = 0;
+  this->Locator = NULL;
+  this->Value = 0.0;
+  this->GenerateClipScalars = 0;
+
+  this->SetNumberOfOutputPorts(2);
+
+  this->GenerateClippedOutput = 0;
+  vtkPolyData* output2 = vtkPolyData::New();
+  this->GetExecutive()->SetOutputData(1, output2);
+  output2->Delete();
+}
+
+//----------------------------------------------------------------------------
+vtkVgClipPolyData::~vtkVgClipPolyData()
+{
+  if (this->Locator)
+    {
+    this->Locator->UnRegister(this);
+    this->Locator = NULL;
+    }
+  this->SetClipFunction(NULL);
+}
+
+//----------------------------------------------------------------------------
+// Overload standard modified time function. If Clip functions is modified,
+// then this object is modified as well.
+unsigned long vtkVgClipPolyData::GetMTime()
+{
+  unsigned long mTime = this->Superclass::GetMTime();
+  unsigned long time;
+
+  if (this->ClipFunction != NULL)
+    {
+    time = this->ClipFunction->GetMTime();
+    mTime = (time > mTime ? time : mTime);
+    }
+  if (this->Locator != NULL)
+    {
+    time = this->Locator->GetMTime();
+    mTime = (time > mTime ? time : mTime);
+    }
+
+  return mTime;
+}
+
+vtkPolyData* vtkVgClipPolyData::GetClippedOutput()
+{
+  return vtkPolyData::SafeDownCast(
+           this->GetExecutive()->GetOutputData(1));
+}
+
+
+//----------------------------------------------------------------------------
+//
+// Clip through data generating surface.
+//
+int vtkVgClipPolyData::RequestData(
+  vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** inputVector,
+  vtkInformationVector* outputVector)
+{
+  // get the info objects
+  vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  // get the input and output
+  vtkPolyData* input = vtkPolyData::SafeDownCast(
+                         inInfo->Get(vtkDataObject::DATA_OBJECT()));
+  vtkPolyData* output = vtkPolyData::SafeDownCast(
+                          outInfo->Get(vtkDataObject::DATA_OBJECT()));
+
+  vtkIdType cellId, i, updateTime;
+  vtkPoints* cellPts;
+  vtkDataArray* clipScalars;
+  vtkFloatArray* cellScalars;
+  vtkGenericCell* cell;
+  vtkCellArray* newVerts, *newLines, *newPolys, *connList = NULL;
+  vtkCellArray* clippedVerts = NULL, *clippedLines = NULL;
+  vtkCellArray* clippedPolys = NULL, *clippedList = NULL;
+  vtkPoints* newPoints;
+  vtkIdList* cellIds;
+  double s;
+  vtkIdType estimatedSize, numCells = input->GetNumberOfCells();
+  vtkIdType numPts = input->GetNumberOfPoints();
+  vtkPoints* inPts = input->GetPoints();
+  int numberOfPoints;
+  vtkPointData* inPD = input->GetPointData(), *outPD = output->GetPointData();
+  vtkCellData* inCD = input->GetCellData(), *outCD = output->GetCellData();
+  vtkCellData* outClippedCD = NULL;
+
+
+  vtkIdType numLinePts = 0;
+  vtkCellArray* lines = input->GetLines();
+  lines->InitTraversal();
+  vtkIdType npts, *pts;
+  while (lines->GetNextCell(npts, pts))
+    {
+    numLinePts += npts;
+    }
+  vtkDebugMacro(<< "Clipping polygonal data");
+
+  // Initialize self; create output objects
+  //
+  if (numLinePts < 1 || inPts == NULL)
+    {
+    vtkDebugMacro(<< "No data to clip");
+    return 1;
+    }
+
+  if (!this->ClipFunction && this->GenerateClipScalars)
+    {
+    vtkErrorMacro(<< "Cannot generate clip scalars if no clip function defined");
+    return 1;
+    }
+
+  // Determine whether we're clipping with input scalars or a clip function
+  // and to necessary setup.
+  if (this->ClipFunction)
+    {
+    vtkFloatArray* tmpScalars = vtkFloatArray::New();
+    tmpScalars->SetNumberOfTuples(numPts);
+    inPD = vtkPointData::New();
+    inPD->ShallowCopy(input->GetPointData());//copies original
+    if (this->GenerateClipScalars)
+      {
+      inPD->SetScalars(tmpScalars);
+      }
+    lines->InitTraversal();
+    while (lines->GetNextCell(npts, pts))
+      {
+      for (i = 0; i < npts; i++)
+        {
+        s = this->ClipFunction->FunctionValue(inPts->GetPoint(pts[i]));
+        tmpScalars->SetComponent(pts[i], 0, s);
+        }
+      }
+    clipScalars = tmpScalars;
+    }
+  else //using input scalars
+    {
+    clipScalars = inPD->GetScalars();
+    if (!clipScalars)
+      {
+      vtkErrorMacro(<< "Cannot clip without clip function or input scalars");
+      return 1;
+      }
+    }
+
+  // Create objects to hold output of clip operation
+  //
+  estimatedSize = numCells;
+  estimatedSize = estimatedSize / 1024 * 1024; //multiple of 1024
+  if (estimatedSize < 1024)
+    {
+    estimatedSize = 1024;
+    }
+
+  newPoints = vtkPoints::New();
+  newPoints->Allocate(numLinePts, numLinePts / 2);
+  newVerts = vtkCellArray::New();
+  newVerts->Allocate(estimatedSize, estimatedSize / 2);
+  newLines = vtkCellArray::New();
+  newLines->Allocate(estimatedSize, estimatedSize / 2);
+  newPolys = vtkCellArray::New();
+  newPolys->Allocate(estimatedSize, estimatedSize / 2);
+
+  // locator used to merge potentially duplicate points
+  if (this->Locator == NULL)
+    {
+    this->CreateDefaultLocator();
+    }
+  this->Locator->InitPointInsertion(newPoints, input->GetBounds());
+
+  if (!this->GenerateClipScalars && !input->GetPointData()->GetScalars())
+    {
+    outPD->CopyScalarsOff();
+    }
+  else
+    {
+    outPD->CopyScalarsOn();
+    }
+  outPD->InterpolateAllocate(inPD, estimatedSize, estimatedSize / 2);
+  outCD->CopyAllocate(inCD, estimatedSize, estimatedSize / 2);
+
+  // If generating second output, setup clipped output
+  if (this->GenerateClippedOutput)
+    {
+    this->GetClippedOutput()->Initialize();
+    outClippedCD = this->GetClippedOutput()->GetCellData();
+    outClippedCD->CopyAllocate(inCD, estimatedSize, estimatedSize / 2);
+    clippedVerts = vtkCellArray::New();
+    clippedVerts->Allocate(estimatedSize, estimatedSize / 2);
+    clippedLines = vtkCellArray::New();
+    clippedLines->Allocate(estimatedSize, estimatedSize / 2);
+    clippedPolys = vtkCellArray::New();
+    clippedPolys->Allocate(estimatedSize, estimatedSize / 2);
+    }
+
+  cellScalars = vtkFloatArray::New();
+  cellScalars->Allocate(VTK_CELL_SIZE);
+
+  vtkCharArray* skipArray = vtkCharArray::SafeDownCast(inCD->GetArray("Skip Cells"));
+  vtkIdList* idList = vtkIdList::New();
+
+  // perform clipping on cells
+  int abort = 0;
+  updateTime = numCells / 20 + 1; // update roughly every 5%
+  cell = vtkGenericCell::New();
+  for (cellId = 0; cellId < numCells && !abort; cellId++)
+    {
+    input->GetCell(cellId, cell);
+    cellPts = cell->GetPoints();
+    cellIds = cell->GetPointIds();
+    numberOfPoints = cellPts->GetNumberOfPoints();
+
+    // evaluate implicit cutting function
+    for (i = 0; i < numberOfPoints; i++)
+      {
+      s = clipScalars->GetComponent(cellIds->GetId(i), 0);
+      cellScalars->InsertTuple(i, &s);
+      }
+
+    switch (cell->GetCellDimension())
+      {
+      case 0: //points are generated-------------------------------
+        connList = newVerts;
+        clippedList = clippedVerts;
+        break;
+
+      case 1: //lines are generated----------------------------------
+        connList = newLines;
+        clippedList = clippedLines;
+        break;
+
+      case 2: //triangles are generated------------------------------
+        connList = newPolys;
+        clippedList = clippedPolys;
+        break;
+
+      } //switch
+
+
+    // if non-zero in skipArray, don't clip this cell
+    if (skipArray && skipArray->GetValue(cellId))
+      {
+      idList->Allocate(cell->GetNumberOfPoints());
+      // loop over all the points, inserting unique pts
+      for (int i = 0; i < cell->GetNumberOfPoints(); i++)
+        {
+        vtkIdType ptId;
+        if (this->Locator->InsertUniquePoint(cell->GetPoints()->GetPoint(i), ptId))
+          {
+          outPD->CopyData(inPD, cell->GetPointIds()->GetId(i), ptId);
+          }
+        idList->InsertNextId(ptId);
+        }
+      vtkIdType newCellId = connList->InsertNextCell(idList);
+      outCD->CopyData(inCD, cellId, newCellId);
+      }
+    else
+      {
+      cell->Clip(this->Value, cellScalars, this->Locator, connList,
+                 inPD, outPD, inCD, cellId, outCD, this->InsideOut);
+      }
+
+    if (this->GenerateClippedOutput)
+      {
+      cell->Clip(this->Value, cellScalars, this->Locator, clippedList,
+                 inPD, outPD, inCD, cellId, outClippedCD, !this->InsideOut);
+      }
+
+    if (!(cellId % updateTime))
+      {
+      this->UpdateProgress(static_cast<double>(cellId) / numCells);
+      abort = this->GetAbortExecute();
+      }
+    } //for each cell
+  cell->Delete();
+
+  vtkDebugMacro(<< "Created: "
+                << newPoints->GetNumberOfPoints() << " points, "
+                << newVerts->GetNumberOfCells() << " verts, "
+                << newLines->GetNumberOfCells() << " lines, "
+                << newPolys->GetNumberOfCells() << " polys");
+
+  if (this->GenerateClippedOutput)
+    {
+    vtkDebugMacro(<< "Created (clipped output): "
+                  << clippedVerts->GetNumberOfCells() << " verts, "
+                  << clippedLines->GetNumberOfCells() << " lines, "
+                  << clippedPolys->GetNumberOfCells() << " triangles");
+    }
+
+  // Update ourselves.  Because we don't know upfront how many verts, lines,
+  // polys we've created, take care to reclaim memory.
+  //
+  if (this->ClipFunction)
+    {
+    clipScalars->Delete();
+    inPD->Delete();
+    }
+
+  if (newVerts->GetNumberOfCells())
+    {
+    output->SetVerts(newVerts);
+    }
+  newVerts->Delete();
+
+  if (newLines->GetNumberOfCells())
+    {
+    output->SetLines(newLines);
+    }
+  newLines->Delete();
+
+  if (newPolys->GetNumberOfCells())
+    {
+    output->SetPolys(newPolys);
+    }
+  newPolys->Delete();
+
+  if (this->GenerateClippedOutput)
+    {
+    this->GetClippedOutput()->SetPoints(newPoints);
+
+    if (clippedVerts->GetNumberOfCells())
+      {
+      this->GetClippedOutput()->SetVerts(clippedVerts);
+      }
+    clippedVerts->Delete();
+
+    if (clippedLines->GetNumberOfCells())
+      {
+      this->GetClippedOutput()->SetLines(clippedLines);
+      }
+    clippedLines->Delete();
+
+    if (clippedPolys->GetNumberOfCells())
+      {
+      this->GetClippedOutput()->SetPolys(clippedPolys);
+      }
+    clippedPolys->Delete();
+
+    this->GetClippedOutput()->GetPointData()->PassData(outPD);
+    this->GetClippedOutput()->Squeeze();
+    }
+
+  output->SetPoints(newPoints);
+  newPoints->Delete();
+  cellScalars->Delete();
+
+  this->Locator->Initialize();//release any extra memory
+  output->Squeeze();
+
+  idList->Delete();
+
+  return 1;
+}
+
+
+//----------------------------------------------------------------------------
+// Specify a spatial locator for merging points. By default,
+// an instance of vtkMergePoints is used.
+void vtkVgClipPolyData::SetLocator(vtkIncrementalPointLocator* locator)
+{
+  if (this->Locator == locator)
+    {
+    return;
+    }
+
+  if (this->Locator)
+    {
+    this->Locator->UnRegister(this);
+    this->Locator = NULL;
+    }
+
+  if (locator)
+    {
+    locator->Register(this);
+    }
+
+  this->Locator = locator;
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgClipPolyData::CreateDefaultLocator()
+{
+  if (this->Locator == NULL)
+    {
+    this->Locator = vtkMergePoints::New();
+    }
+}
+
+
+//----------------------------------------------------------------------------
+void vtkVgClipPolyData::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  if (this->ClipFunction)
+    {
+    os << indent << "Clip Function: " << this->ClipFunction << "\n";
+    }
+  else
+    {
+    os << indent << "Clip Function: (none)\n";
+    }
+  os << indent << "InsideOut: " << (this->InsideOut ? "On\n" : "Off\n");
+  os << indent << "Value: " << this->Value << "\n";
+  if (this->Locator)
+    {
+    os << indent << "Locator: " << this->Locator << "\n";
+    }
+  else
+    {
+    os << indent << "Locator: (none)\n";
+    }
+
+  os << indent << "Generate Clip Scalars: " << (this->GenerateClipScalars ? "On\n" : "Off\n");
+
+  os << indent << "Generate Clipped Output: " << (this->GenerateClippedOutput ? "On\n" : "Off\n");
+}
diff --git a/Libraries/VtkVgCore/vtkVgClipPolyData.h b/Libraries/VtkVgCore/vtkVgClipPolyData.h
new file mode 100644
index 00000000..25bc2494
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgClipPolyData.h
@@ -0,0 +1,154 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgClipPolyData - clip polygonal data with user-specified implicit function or input scalar data
+// .SECTION Description
+// vtkVgClipPolyData is a filter that clips polygonal data using either
+// any subclass of vtkImplicitFunction, or the input scalar
+// data. Clipping means that it actually "cuts" through the cells of
+// the dataset, returning everything inside of the specified implicit
+// function (or greater than the scalar value) including "pieces" of
+// a cell. (Compare this with vtkExtractGeometry, which pulls out
+// entire, uncut cells.) The output of this filter is polygonal data.
+//
+// To use this filter, you must decide if you will be clipping with an
+// implicit function, or whether you will be using the input scalar
+// data.  If you want to clip with an implicit function, you must:
+// 1) define an implicit function
+// 2) set it with the SetClipFunction method
+// 3) apply the GenerateClipScalarsOn method
+// If a ClipFunction is not specified, or GenerateClipScalars is off
+// (the default), then the input's scalar data will be used to clip
+// the polydata.
+//
+// You can also specify a scalar value, which is used to
+// decide what is inside and outside of the implicit function. You can
+// also reverse the sense of what inside/outside is by setting the
+// InsideOut instance variable. (The cutting algorithm proceeds by
+// computing an implicit function value or using the input scalar data
+// for each point in the dataset. This is compared to the scalar value
+// to determine inside/outside.)
+//
+// This filter can be configured to compute a second output. The
+// second output is the polygonal data that is clipped away. Set the
+// GenerateClippedData boolean on if you wish to access this output data.
+
+// .SECTION Caveats
+// In order to cut all types of cells in polygonal data, vtkVgClipPolyData
+// triangulates some cells, and then cuts the resulting simplices
+// (i.e., points, lines, and triangles). This means that the resulting
+// output may consist of different cell types than the input data.
+
+// .SECTION See Also
+// vtkImplicitFunction vtkCutter vtkClipVolume
+
+#ifndef __vtkVgClipPolyData_h
+#define __vtkVgClipPolyData_h
+
+#include "vtkPolyDataAlgorithm.h"
+
+#include <vgExport.h>
+
+class vtkImplicitFunction;
+class vtkIncrementalPointLocator;
+
+class VTKVG_CORE_EXPORT vtkVgClipPolyData : public vtkPolyDataAlgorithm
+{
+public:
+  vtkTypeMacro(vtkVgClipPolyData, vtkPolyDataAlgorithm);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Construct with user-specified implicit function; InsideOut turned off;
+  // value set to 0.0; and generate clip scalars turned off.
+  static vtkVgClipPolyData* New();
+
+  // Description:
+  // Set the clipping value of the implicit function (if clipping with
+  // implicit function) or scalar value (if clipping with
+  // scalars). The default value is 0.0.
+  vtkSetMacro(Value, double);
+  vtkGetMacro(Value, double);
+
+  // Description:
+  // Set/Get the InsideOut flag. When off, a vertex is considered
+  // inside the implicit function if its value is greater than the
+  // Value ivar. When InsideOutside is turned on, a vertex is
+  // considered inside the implicit function if its implicit function
+  // value is less than or equal to the Value ivar.  InsideOut is off
+  // by default.
+  vtkSetMacro(InsideOut, int);
+  vtkGetMacro(InsideOut, int);
+  vtkBooleanMacro(InsideOut, int);
+
+  // Description
+  // Specify the implicit function with which to perform the
+  // clipping. If you do not define an implicit function, then the input
+  // scalar data will be used for clipping.
+  virtual void SetClipFunction(vtkImplicitFunction*);
+  vtkGetObjectMacro(ClipFunction, vtkImplicitFunction);
+
+  // Description:
+  // If this flag is enabled, then the output scalar values will be
+  // interpolated from the implicit function values, and not the
+  // input scalar data. If you enable this flag but do not provide an
+  // implicit function an error will be reported.
+  vtkSetMacro(GenerateClipScalars, int);
+  vtkGetMacro(GenerateClipScalars, int);
+  vtkBooleanMacro(GenerateClipScalars, int);
+
+  // Description:
+  // Control whether a second output is generated. The second output
+  // contains the polygonal data that's been clipped away.
+  vtkSetMacro(GenerateClippedOutput, int);
+  vtkGetMacro(GenerateClippedOutput, int);
+  vtkBooleanMacro(GenerateClippedOutput, int);
+
+  // Description:
+  // Return the Clipped output.
+  vtkPolyData* GetClippedOutput();
+
+  // Description:
+  // Return the output port (a vtkAlgorithmOutput) of the clipped output.
+  vtkAlgorithmOutput* GetClippedOutputPort()
+    {
+    return this->GetOutputPort(1);
+    }
+
+  // Description:
+  // Specify a spatial locator for merging points. By default, an
+  // instance of vtkMergePoints is used.
+  void SetLocator(vtkIncrementalPointLocator* locator);
+  vtkGetObjectMacro(Locator, vtkIncrementalPointLocator);
+
+  // Description:
+  // Create default locator. Used to create one when none is specified. The
+  // locator is used to merge coincident points.
+  void CreateDefaultLocator();
+
+  // Description:
+  // Return the mtime also considering the locator and clip function.
+  unsigned long GetMTime();
+
+protected:
+  vtkVgClipPolyData(vtkImplicitFunction* cf = NULL);
+  ~vtkVgClipPolyData();
+
+  int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*);
+  vtkImplicitFunction* ClipFunction;
+
+  vtkIncrementalPointLocator* Locator;
+  int InsideOut;
+  double Value;
+  int GenerateClipScalars;
+
+  int GenerateClippedOutput;
+private:
+  vtkVgClipPolyData(const vtkVgClipPolyData&);  // Not implemented.
+  void operator=(const vtkVgClipPolyData&);  // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgColorUtil.cxx b/Libraries/VtkVgCore/vtkVgColorUtil.cxx
new file mode 100644
index 00000000..13046d5d
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgColorUtil.cxx
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgColorUtil.h"
+
+//-----------------------------------------------------------------------------
+double vtkVgColorUtil::clamp(double a, double min, double max)
+{
+  return (a < min ? min : a > max ? max : a);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgColorUtil::convert(const double in[3], unsigned char (&out)[3])
+{
+  out[0] = static_cast<unsigned char>(clamp(in[0]) * 255.0);
+  out[1] = static_cast<unsigned char>(clamp(in[1]) * 255.0);
+  out[2] = static_cast<unsigned char>(clamp(in[2]) * 255.0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgColorUtil::convert(const double in[4], unsigned char (&out)[4])
+{
+  out[0] = static_cast<unsigned char>(clamp(in[0]) * 255.0);
+  out[1] = static_cast<unsigned char>(clamp(in[1]) * 255.0);
+  out[2] = static_cast<unsigned char>(clamp(in[2]) * 255.0);
+  out[3] = static_cast<unsigned char>(clamp(in[3]) * 255.0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgColorUtil::convertMultiplied(
+  const double in[3], double multiplier, unsigned char (&out)[3])
+{
+  out[0] = static_cast<unsigned char>(clamp(in[0] * multiplier) * 255.0);
+  out[1] = static_cast<unsigned char>(clamp(in[1] * multiplier) * 255.0);
+  out[2] = static_cast<unsigned char>(clamp(in[2] * multiplier) * 255.0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgColorUtil::convertMultiplied(
+  const double in[4], double multiplier, unsigned char (&out)[4])
+{
+  out[0] = static_cast<unsigned char>(clamp(in[0] * multiplier) * 255.0);
+  out[1] = static_cast<unsigned char>(clamp(in[1] * multiplier) * 255.0);
+  out[2] = static_cast<unsigned char>(clamp(in[2] * multiplier) * 255.0);
+  out[3] = static_cast<unsigned char>(clamp(in[3] * multiplier) * 255.0);
+}
diff --git a/Libraries/VtkVgCore/vtkVgColorUtil.h b/Libraries/VtkVgCore/vtkVgColorUtil.h
new file mode 100644
index 00000000..e74be31e
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgColorUtil.h
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgColorUtil_h
+#define __vtkVgColorUtil_h
+
+#include <vgExport.h>
+
+namespace vtkVgColorUtil
+{
+  VTKVG_CORE_EXPORT void convert(const double in[3], unsigned char (&out)[3]);
+  VTKVG_CORE_EXPORT void convert(const double in[4], unsigned char (&out)[4]);
+
+  VTKVG_CORE_EXPORT void convertMultiplied(
+    const double in[3], double multiplier, unsigned char (&out)[3]);
+  VTKVG_CORE_EXPORT void convertMultiplied(
+    const double in[4], double multiplier, unsigned char (&out)[4]);
+
+  VTKVG_CORE_EXPORT double clamp(double a, double min = 0.0, double max = 1.0);
+};
+
+#endif // __vtkVgColorUtil_h
diff --git a/Libraries/VtkVgCore/vtkVgContourOperatorManager.cxx b/Libraries/VtkVgCore/vtkVgContourOperatorManager.cxx
new file mode 100644
index 00000000..80fc0ebb
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgContourOperatorManager.cxx
@@ -0,0 +1,519 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgContourOperatorManager.h"
+
+#include "vtkCellArray.h"
+#include "vtkCellData.h"
+#include "vtkDoubleArray.h"
+#include "vtkImplicitBoolean.h"
+#include "vtkImplicitSelectionLoop.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkObjectFactory.h"
+#include "vtkMath.h"
+#include "vtkPointData.h"
+#include "vtkPolyData.h"
+#include "vtkPolyLine.h"
+#include "vtkSmartPointer.h"
+
+#include <map>
+
+vtkStandardNewMacro(vtkVgContourOperatorManager);
+
+struct vtkVgContourInfo
+{
+  vtkImplicitSelectionLoop* Loop;
+  bool Enabled;
+
+  vtkVgContourInfo()
+    {
+    this->Loop = 0;
+    this->Enabled = true;
+    }
+
+  ~vtkVgContourInfo()
+    {
+    if (this->Loop)
+      {
+      this->Loop->UnRegister(NULL);
+      this->Loop = 0;
+      }
+    }
+
+  // Function ensures proper reference counting.
+  void SetLoop(vtkImplicitSelectionLoop* loop)
+    {
+    if (this->Loop != loop)
+      {
+      // Before assigning a new one store the last one
+      // so that we can decrement the ref count later.
+      vtkImplicitSelectionLoop* temp = this->Loop;
+      this->Loop = loop;
+      // Increment the ref count.
+      if (this->Loop != NULL)
+        {
+        this->Loop->Register(NULL);
+        }
+      if (temp != NULL)
+        {
+        // Decrement the ref count.
+        temp->UnRegister(NULL);
+        }
+      }
+    }
+
+  vtkVgContourInfo(const vtkVgContourInfo& fromContourInfo)
+    {
+    this->Enabled = fromContourInfo.Enabled;
+    this->Loop = 0;
+    this->SetLoop(fromContourInfo.Loop);
+    }
+
+  vtkVgContourInfo& operator=(const vtkVgContourInfo& fromContourInfo)
+    {
+    this->Enabled = fromContourInfo.Enabled;
+    this->Loop = 0;
+    this->SetLoop(fromContourInfo.Loop);
+    return *this;
+    }
+
+};
+
+//----------------------------------------------------------------------------
+class vtkVgContourOperatorManager::vtkInternal
+{
+public:
+  vtkInternal()
+    {
+    }
+
+  ~vtkInternal()
+    {
+    this->RemoveAllContours(this->Filters);
+    this->RemoveAllContours(this->Selectors);
+    }
+
+  bool AddContour(vtkPoints* loopPoints, vtkImplicitBoolean* boolean,
+                  std::map<vtkPoints*, vtkVgContourInfo>& mainMap,
+                  std::map<vtkPoints*, vtkVgContourInfo>& otherMap);
+  bool RemoveContour(vtkPoints* loopPoints, vtkImplicitBoolean* boolean,
+                     std::map<vtkPoints*, vtkVgContourInfo>& theMap);
+  bool RemoveAllContours(
+    std::map<vtkPoints*, vtkVgContourInfo>& theMap,
+    vtkImplicitBoolean* boolean = 0);
+  bool SetContourEnabled(vtkPoints* loopPoints, bool state,
+    vtkImplicitBoolean* filterBoolean, vtkImplicitBoolean* selectorBoolean);
+  bool GetContourEnabled(vtkPoints* loopPoints);
+  int GetNumberOfEnabledContours(
+    std::map<vtkPoints*, vtkVgContourInfo>& theMap);
+  unsigned long GetContoursMTime(
+    std::map<vtkPoints*, vtkVgContourInfo>& theMap);
+
+  void UpdateBoolean(vtkImplicitBoolean* boolean,
+                     vtkImplicitSelectionLoop* selectorLoop, bool addFunction);
+
+  vtkImplicitSelectionLoop* GetContourLoop(vtkPoints* loopPoints);
+
+  std::map<vtkPoints*, vtkVgContourInfo> Filters;
+  std::map<vtkPoints*, vtkVgContourInfo> Selectors;
+};
+
+
+//----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::vtkInternal::AddContour(vtkPoints* loopPoints,
+    vtkImplicitBoolean* boolean,
+    std::map<vtkPoints*, vtkVgContourInfo>& mainMap,
+    std::map<vtkPoints*, vtkVgContourInfo>& otherMap)
+{
+  if (otherMap.find(loopPoints) != otherMap.end())
+    {
+    vtkGenericWarningMacro("Can not add; already added to another list!");
+    return false;
+    }
+
+  if (mainMap.find(loopPoints) != mainMap.end())
+    {
+    return false;  // already added
+    }
+
+  vtkVgContourInfo contourInfo;  // defaults to enablesd
+  vtkImplicitSelectionLoop* loop = vtkImplicitSelectionLoop::New();
+  loop->SetLoop(loopPoints);
+  contourInfo.SetLoop(loop);
+  mainMap[loopPoints] = contourInfo;
+  loop->FastDelete();
+
+  // that said, could potentially let the boolean hold onto the reference?
+  boolean->AddFunction(loop);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::vtkInternal::RemoveContour(
+    vtkPoints* loopPoints, vtkImplicitBoolean* boolean, std::map<vtkPoints*,
+    vtkVgContourInfo>& theMap)
+{
+  std::map<vtkPoints*, vtkVgContourInfo>::iterator iter =
+    theMap.find(loopPoints);
+  if (iter == theMap.end())
+    {
+    return false;
+    }
+
+  if (iter->second.Enabled)
+    {
+    boolean->RemoveFunction(iter->second.Loop);
+    }
+  theMap.erase(iter);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::vtkInternal::RemoveAllContours(
+  std::map<vtkPoints*, vtkVgContourInfo>& theMap,
+  vtkImplicitBoolean* boolean/*=0*/)
+{
+  if (theMap.size())
+    {
+    std::map<vtkPoints*, vtkVgContourInfo>::const_iterator iter;
+    for (iter = theMap.begin(); iter != theMap.end(); iter++)
+      {
+      if (boolean && iter->second.Enabled)
+        {
+        boolean->RemoveFunction(iter->second.Loop);
+        }
+      }
+    theMap.clear();
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::vtkInternal::
+SetContourEnabled(vtkPoints* loopPoints, bool state,
+                  vtkImplicitBoolean* filterBoolean,
+                  vtkImplicitBoolean* selectorBoolean)
+{
+  vtkImplicitBoolean* boolean = filterBoolean;
+  std::map<vtkPoints*, vtkVgContourInfo>::iterator iter =
+    this->Filters.find(loopPoints);
+  if (iter == this->Filters.end())
+    {
+    iter = this->Selectors.find(loopPoints);
+    if (iter == this->Selectors.end())
+      {
+      return false;
+      }
+    boolean = selectorBoolean;
+    }
+
+  if (iter->second.Enabled == state)
+    {
+    return false;
+    }
+
+  iter->second.Enabled = state;
+  if (state)
+    {
+    boolean->AddFunction(iter->second.Loop);
+    }
+  else
+    {
+    boolean->RemoveFunction(iter->second.Loop);
+    }
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::vtkInternal::
+GetContourEnabled(vtkPoints* loopPoints)
+{
+  std::map<vtkPoints*, vtkVgContourInfo>::iterator iter =
+    this->Filters.find(loopPoints);
+  if (iter == this->Filters.end())
+    {
+    iter = this->Selectors.find(loopPoints);
+    if (iter == this->Selectors.end())
+      {
+      return false;
+      }
+    }
+
+  return iter->second.Enabled;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgContourOperatorManager::vtkInternal::
+GetNumberOfEnabledContours(std::map<vtkPoints*, vtkVgContourInfo>& theMap)
+{
+  int count = 0;
+  std::map<vtkPoints*, vtkVgContourInfo>::const_iterator iter;
+  for (iter = theMap.begin(); iter != theMap.end(); iter++)
+    {
+    if (iter->second.Enabled)
+      {
+      count++;
+      }
+    }
+  return count;
+}
+
+//-----------------------------------------------------------------------------
+unsigned long vtkVgContourOperatorManager::vtkInternal::GetContoursMTime(
+  std::map<vtkPoints*, vtkVgContourInfo>& theMap)
+{
+  unsigned long time, mTime = 0;
+  std::map<vtkPoints*, vtkVgContourInfo>::const_iterator iter;
+  for (iter = theMap.begin(); iter != theMap.end(); iter++)
+    {
+    time = iter->first->GetMTime();
+    mTime = time > mTime ? time : mTime;
+    time = iter->second.Loop->GetMTime();
+    mTime = time > mTime ? time : mTime;
+    }
+
+  return mTime;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgContourOperatorManager::vtkInternal::UpdateBoolean(
+  vtkImplicitBoolean* boolean, vtkImplicitSelectionLoop* selectorLoop,
+  bool addFunction)
+{
+  if (addFunction)
+    {
+    boolean->AddFunction(selectorLoop);
+    }
+  else
+    {
+    boolean->RemoveFunction(selectorLoop);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkImplicitSelectionLoop*
+vtkVgContourOperatorManager::vtkInternal::GetContourLoop(vtkPoints* loopPoints)
+{
+  std::map<vtkPoints*, vtkVgContourInfo>::iterator iter =
+    this->Filters.find(loopPoints);
+  if (iter == this->Filters.end())
+    {
+    iter = this->Selectors.find(loopPoints);
+    if (iter == this->Selectors.end())
+      {
+      return 0;
+      }
+    }
+  return iter->second.Loop;
+}
+
+//----------------------------------------------------------------------------
+vtkVgContourOperatorManager::vtkVgContourOperatorManager()
+{
+  this->FilterBoolean = vtkImplicitBoolean::New();
+  this->FilterBoolean->SetOperationTypeToUnion();
+  this->SelectorBoolean = vtkImplicitBoolean::New();
+  this->SelectorBoolean->SetOperationTypeToUnion();
+  this->Internals = new vtkInternal;
+}
+
+//----------------------------------------------------------------------------
+vtkVgContourOperatorManager::~vtkVgContourOperatorManager()
+{
+  delete this->Internals;
+  this->FilterBoolean->Delete();
+  this->SelectorBoolean->Delete();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::RemoveAllOperators()
+{
+  bool removeFilters = this->RemoveAllFilters();
+  bool removeSelectors = this->RemoveAllSelectors();
+  if (removeFilters || removeSelectors)
+    {
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::AddFilter(vtkPoints* loopPoints)
+{
+  if (this->Internals->AddContour(loopPoints, this->FilterBoolean,
+                                  this->Internals->Filters, this->Internals->Selectors))
+    {
+    this->Modified();
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::RemoveFilter(vtkPoints* loopPoints)
+{
+  if (this->Internals->RemoveContour(loopPoints, this->FilterBoolean,
+                                     this->Internals->Filters))
+    {
+    this->Modified();
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::RemoveAllFilters()
+{
+  if (this->Internals->RemoveAllContours(this->Internals->Filters,
+                                         this->FilterBoolean))
+    {
+    this->Modified();
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgContourOperatorManager::GetNumberOfFilters()
+{
+  return static_cast<int>(this->Internals->Filters.size());
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::AddSelector(vtkPoints* loopPoints)
+{
+  if (this->Internals->AddContour(loopPoints, this->SelectorBoolean,
+                                  this->Internals->Selectors, this->Internals->Filters))
+    {
+    this->Modified();
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::RemoveSelector(vtkPoints* loopPoints)
+{
+  if (this->Internals->RemoveContour(loopPoints, this->SelectorBoolean,
+                                     this->Internals->Selectors))
+    {
+    this->Modified();
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::RemoveAllSelectors()
+{
+  if (this->Internals->RemoveAllContours(this->Internals->Selectors,
+                                         this->SelectorBoolean))
+    {
+    this->Modified();
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgContourOperatorManager::GetNumberOfSelectors()
+{
+  return static_cast<int>(this->Internals->Selectors.size());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgContourOperatorManager::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::EvaluatePath(vtkPoints* points, vtkIdList* ptIds)
+{
+  if (ptIds->GetNumberOfIds() == 0)
+    {
+    return true;
+    }
+  for (int i = 0; i < ptIds->GetNumberOfIds(); i++)
+    {
+    double* point = points->GetPoint(ptIds->GetId(i));
+    if ((!this->GetNumberOfEnabledSelectors() ||
+         this->SelectorBoolean->FunctionValue(point) < 0) &&
+        (!this->GetNumberOfEnabledFilters() ||
+         this->FilterBoolean->FunctionValue(point) > 0))
+      {
+      return true;
+      }
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::EvaluatePoint(double testPt[3])
+{
+  if ((!this->GetNumberOfEnabledSelectors() ||
+       this->SelectorBoolean->FunctionValue(testPt) < 0) &&
+      (!this->GetNumberOfEnabledFilters() ||
+       this->FilterBoolean->FunctionValue(testPt) > 0))
+    {
+    return true;
+    }
+  return false;
+}
+
+//----------------------------------------------------------------------------
+unsigned long vtkVgContourOperatorManager::GetMTime()
+{
+  unsigned long mTime = this->Superclass::GetMTime();
+  unsigned long time;
+
+  // filters
+  time = this->Internals->GetContoursMTime(this->Internals->Filters);
+  mTime = time > mTime ? time : mTime;
+  //selectors
+  time = this->Internals->GetContoursMTime(this->Internals->Selectors);
+  mTime = time > mTime ? time : mTime;
+
+  return mTime;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgContourOperatorManager::SetContourEnabled(vtkPoints* loopPts, bool state)
+{
+  if (this->Internals->SetContourEnabled(loopPts, state,
+                                         this->FilterBoolean, this->SelectorBoolean))
+    {
+    this->Modified();
+    }
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgContourOperatorManager::GetContourEnabled(vtkPoints* loopPts)
+{
+  return this->Internals->GetContourEnabled(loopPts);
+}
+
+//----------------------------------------------------------------------------
+int vtkVgContourOperatorManager::GetNumberOfEnabledFilters()
+{
+  return this->Internals->GetNumberOfEnabledContours(this->Internals->Filters);
+}
+
+//----------------------------------------------------------------------------
+int vtkVgContourOperatorManager::GetNumberOfEnabledSelectors()
+{
+  return this->Internals->GetNumberOfEnabledContours(this->Internals->Selectors);
+}
+
+//----------------------------------------------------------------------------
+vtkImplicitSelectionLoop*
+vtkVgContourOperatorManager::GetContourLoop(vtkPoints* loopPts)
+{
+  return this->Internals->GetContourLoop(loopPts);
+}
diff --git a/Libraries/VtkVgCore/vtkVgContourOperatorManager.h b/Libraries/VtkVgCore/vtkVgContourOperatorManager.h
new file mode 100644
index 00000000..c11a95d1
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgContourOperatorManager.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgContourOperatorManager_h
+#define __vtkVgContourOperatorManager_h
+
+#include "vtkObject.h"
+
+#include <vgExport.h>
+
+class vtkIdList;
+class vtkImplicitBoolean;
+class vtkImplicitSelectionLoop;
+class vtkPoints;
+class vtkPolyLine;
+
+class VTKVG_CORE_EXPORT vtkVgContourOperatorManager : public vtkObject
+{
+public:
+  static vtkVgContourOperatorManager* New();
+  vtkTypeMacro(vtkVgContourOperatorManager, vtkObject);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Remove all operators, regardless of type
+  bool RemoveAllOperators();
+
+  // Description:
+  // If not a filter, then it is a selector
+  bool AddFilter(vtkPoints* loopPts);
+  bool RemoveFilter(vtkPoints* loopPts);
+  bool RemoveAllFilters();
+  int GetNumberOfFilters();
+  int GetNumberOfEnabledFilters();
+
+  // Description:
+  // If not a filter, then it is a selector
+  bool AddSelector(vtkPoints* loopPts);
+  bool RemoveSelector(vtkPoints* loopPts);
+  bool RemoveAllSelectors();
+  int GetNumberOfSelectors();
+  int GetNumberOfEnabledSelectors();
+
+  void SetContourEnabled(vtkPoints* loopPts, bool state);
+  bool GetContourEnabled(vtkPoints* loopPts);
+
+  vtkGetObjectMacro(FilterBoolean, vtkImplicitBoolean);
+  vtkGetObjectMacro(SelectorBoolean, vtkImplicitBoolean);
+
+  vtkImplicitSelectionLoop* GetContourLoop(vtkPoints* loopPts);
+
+  // Description:
+  // Return true if any point in the "path" passes current set
+  // of filters and selectors
+  bool EvaluatePath(vtkPoints* points, vtkIdList* ptIds);
+
+  // Description:
+  // Return true if the passes current set of filters and selectors
+  bool EvaluatePoint(double testPt[3]);
+
+  // Description:
+  // Return the Modified tim accounting for changes to actual contour objects
+  virtual unsigned long GetMTime();
+
+//BTX
+protected:
+  vtkVgContourOperatorManager();
+  ~vtkVgContourOperatorManager();
+
+  vtkImplicitBoolean* FilterBoolean;
+  vtkImplicitBoolean* SelectorBoolean;
+
+  class vtkInternal;
+  vtkInternal* Internals;
+
+//ETX
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgContourRepresentation.cxx b/Libraries/VtkVgCore/vtkVgContourRepresentation.cxx
new file mode 100644
index 00000000..4ee5db51
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgContourRepresentation.cxx
@@ -0,0 +1,309 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgContourRepresentation.h"
+
+#include "vtkMath.h"
+#include "vtkMatrix4x4.h"
+#include "vtkObjectFactory.h"
+#include "vtkPointPlacer.h"
+#include "vtkPoints.h"
+#include "vtkProperty.h"
+#include "vtkRenderer.h"
+#include "vtkSphereSource.h"
+
+#include "vtkVgUtil.h"
+
+vtkStandardNewMacro(vtkVgContourRepresentation);
+
+//------------------------------------------------------------------------
+vtkVgContourRepresentation::vtkVgContourRepresentation()
+{
+  this->TransformMatrix = 0;
+  this->TransformedPoints = vtkPoints::New();
+  this->Points = vtkPoints::New();
+
+  vtkSphereSource* ss = vtkSphereSource::New();
+  ss->SetRadius(0.5);
+  ss->Update();
+  this->SetActiveCursorShape(ss->GetOutput());
+  ss->Delete();
+
+  this->GetProperty()->SetColor(0.25, 1.0, 0.25);
+
+  vtkProperty* property = this->GetActiveProperty();
+  property->SetRepresentationToSurface();
+  property->SetAmbient(0.1);
+  property->SetDiffuse(0.9);
+  property->SetSpecular(0.0);
+}
+
+//------------------------------------------------------------------------
+vtkVgContourRepresentation::~vtkVgContourRepresentation()
+{
+  if (this->TransformMatrix)
+    {
+    this->TransformMatrix->Delete();
+    }
+  this->TransformedPoints->Delete();
+  this->Points->Delete();
+}
+
+//------------------------------------------------------------------------
+void vtkVgContourRepresentation::Initialize(vtkPolyData* pd)
+{
+  this->Superclass::Initialize(pd);
+  this->TransformedPoints->SetNumberOfPoints(this->GetNumberOfNodes());
+  this->UpdateTransformedPoints();
+}
+
+//------------------------------------------------------------------------
+void vtkVgContourRepresentation::Initialize(vtkPolyData* pd, vtkIdList* list)
+{
+  this->Superclass::Initialize(pd, list);
+  this->TransformedPoints->SetNumberOfPoints(this->GetNumberOfNodes());
+  this->UpdateTransformedPoints();
+}
+
+//------------------------------------------------------------------------
+void vtkVgContourRepresentation::SetShowHandles(bool enable)
+{
+  double o = enable ? 1.0 : 0.0;
+  this->GetProperty()->SetOpacity(o);
+  this->GetActiveProperty()->SetOpacity(o);
+}
+
+//------------------------------------------------------------------------
+void vtkVgContourRepresentation::Finalize()
+{
+  this->ActiveNode = -1;
+  this->SetShowHandles(false);
+}
+
+//------------------------------------------------------------------------
+void vtkVgContourRepresentation::SetCurrentOperation(int op)
+{
+  if (op == vtkContourRepresentation::Inactive &&
+      this->GetCurrentOperation() != vtkContourRepresentation::Inactive)
+    {
+    this->UpdateTransformedPoints();
+    }
+  this->Superclass::SetCurrentOperation(op);
+}
+
+//------------------------------------------------------------------------
+int vtkVgContourRepresentation::AddNodeAtDisplayPosition(double displayPos[2])
+{
+  if (this->Superclass::AddNodeAtDisplayPosition(displayPos))
+    {
+    this->TransformedPoints->SetNumberOfPoints(this->GetNumberOfNodes());
+    this->UpdateTransformedPoints();
+    return 1;
+    }
+  return 0;
+}
+
+//------------------------------------------------------------------------
+int vtkVgContourRepresentation::AddNodeOnContour(int X, int Y)
+{
+  // Workaround crash bug in vtkContourRepresentation that shows up
+  // when manipulating single-point contours.
+  if (this->GetNumberOfNodes() < 2)
+    {
+    return 0;
+    }
+  if (this->Superclass::AddNodeOnContour(X, Y))
+    {
+    this->TransformedPoints->SetNumberOfPoints(this->GetNumberOfNodes());
+    this->UpdateTransformedPoints();
+    return 1;
+    }
+  return 0;
+}
+
+//------------------------------------------------------------------------
+int vtkVgContourRepresentation::DeleteNthNode(int n)
+{
+  if (this->Superclass::DeleteNthNode(n))
+    {
+    this->TransformedPoints->SetNumberOfPoints(this->GetNumberOfNodes());
+    this->UpdateTransformedPoints();
+    return 1;
+    }
+  return 0;
+}
+
+//------------------------------------------------------------------------
+void vtkVgContourRepresentation::SetTransformMatrix(vtkMatrix4x4* mat)
+{
+  if (!this->TransformMatrix)
+    {
+    this->TransformMatrix = vtkMatrix4x4::New();
+    }
+  this->TransformMatrix->DeepCopy(mat);
+
+  // Don't attempt to transform points if the contour is being dragged.
+  if (this->GetCurrentOperation() == vtkContourRepresentation::Shift)
+    {
+    return;
+    }
+
+  // Compute the new world positions of the contour nodes based on their
+  // initial transformed coordinates.
+  for (int i = 0, end = this->TransformedPoints->GetNumberOfPoints();
+       i < end; ++i)
+    {
+    // Don't fight the widget for control of the currently active node.
+    if (i == this->ActiveNode)
+      {
+      continue;
+      }
+
+    double point[3];
+    this->TransformedPoints->GetPoint(i, point);
+    vtkVgApplyHomography(point, this->TransformMatrix, point);
+    point[2] = 0.0;
+
+    this->SetNthNodeWorldPosition(i, point);
+    }
+}
+
+//------------------------------------------------------------------------
+void vtkVgContourRepresentation::UpdateTransformedPoints()
+{
+  if (!this->TransformedPoints)
+    {
+    return;
+    }
+
+  vtkMatrix4x4* invertMat = vtkMatrix4x4::New();
+
+  if (this->TransformMatrix)
+    {
+    invertMat->DeepCopy(this->TransformMatrix);
+    invertMat->Invert();
+    }
+  else
+    {
+    invertMat->Identity();
+    }
+
+  for (int i = 0, end = this->TransformedPoints->GetNumberOfPoints();
+       i < end; ++i)
+    {
+    double pos[3];
+    this->GetNthNodeWorldPosition(i, pos);
+    vtkVgApplyHomography(pos, invertMat, pos);
+    pos[2] = 0.0;
+
+    this->TransformedPoints->SetPoint(i, pos);
+    }
+
+  invertMat->Delete();
+}
+
+//------------------------------------------------------------------------
+vtkPoints* vtkVgContourRepresentation::GetPoints()
+{
+  if (this->PointsBuildTime > this->TransformedPoints->GetMTime())
+    {
+    return this->Points;
+    }
+
+  vtkIdType numPts = this->TransformedPoints->GetNumberOfPoints();
+
+  this->Points->Reset();
+  this->Points->Allocate(numPts);
+
+  // Remove (implicit) degenerate lines, which will cause problems for the
+  // line and polygon intersection tests used by vtkImplicitSelectionLoop.
+  for (int i = 0; i < numPts; ++i)
+    {
+    double a[3];
+    this->TransformedPoints->GetPoint(i, a);
+    if (i != 0)
+      {
+      double b[3];
+      this->TransformedPoints->GetPoint(i - 1, b);
+      if (a[0] == b[0] && a[1] == b[1] && a[2] == b[2])
+        {
+        continue;
+        }
+      }
+    this->Points->InsertNextPoint(a);
+    }
+
+  this->PointsBuildTime.Modified();
+  return this->Points;
+}
+
+//------------------------------------------------------------------------
+int vtkVgContourRepresentation::FindClosestPoint(int X, int Y, double pos[3])
+{
+  int idx;
+  return this->FindClosestPointOnContour(X, Y, pos, &idx);
+}
+
+//------------------------------------------------------------------------
+void vtkVgContourRepresentation::WidgetInteraction(double eventPos[2])
+{
+  if (this->CurrentOperation == vtkContourRepresentation::Scale)
+    {
+    // Call our corrected version of the vtkOrientedGlyphContourRep's
+    // ScaleContour function.
+    this->ScaleContourFixed(eventPos);
+    this->LastEventPosition[0] = eventPos[0];
+    this->LastEventPosition[1] = eventPos[1];
+    return;
+    }
+
+  this->Superclass::WidgetInteraction(eventPos);
+}
+
+//----------------------------------------------------------------------
+void vtkVgContourRepresentation::ScaleContourFixed(
+  double eventPos[2])
+{
+  double ref[3];
+
+  if (!this->GetActiveNodeWorldPosition(ref))
+    {
+    return;
+    }
+
+  double centroid[3];
+  ComputeCentroid(centroid);
+
+  double r2 = vtkMath::Distance2BetweenPoints(ref, centroid);
+
+  double displayPos[2];
+  displayPos[0] = eventPos[0] + this->InteractionOffset[0];
+  displayPos[1] = eventPos[1] + this->InteractionOffset[1];
+
+  double worldPos[3];
+  double worldOrient[9] = {1.0, 0.0, 0.0,
+                           0.0, 1.0, 0.0,
+                           0.0, 0.0, 1.0
+                          };
+  if (this->PointPlacer->ComputeWorldPosition(this->Renderer.GetPointer(),
+                                              displayPos, ref, worldPos,
+                                              worldOrient))
+    {
+    double d2 = vtkMath::Distance2BetweenPoints(worldPos, centroid);
+    if (d2 != 0.)
+      {
+      double ratio = sqrt(d2 / r2);
+      for (int i = 0; i < this->GetNumberOfNodes(); i++)
+        {
+        this->GetNthNodeWorldPosition(i, ref);
+        worldPos[0] = centroid[0] + ratio * (ref[0] - centroid[0]);
+        worldPos[1] = centroid[1] + ratio * (ref[1] - centroid[1]);
+        worldPos[2] = centroid[2] + ratio * (ref[2] - centroid[2]);
+        this->SetNthNodeWorldPosition(i, worldPos, worldOrient);
+        }
+      }
+    }
+}
diff --git a/Libraries/VtkVgCore/vtkVgContourRepresentation.h b/Libraries/VtkVgCore/vtkVgContourRepresentation.h
new file mode 100644
index 00000000..c30e9515
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgContourRepresentation.h
@@ -0,0 +1,81 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgContourRepresentation_h
+#define __vtkVgContourRepresentation_h
+
+#include "vtkOrientedGlyphContourRepresentation.h"
+#include "vtkTimeStamp.h"
+
+#include <vgExport.h>
+
+class vtkMatrix4x4;
+class vtkPoints;
+
+class VTKVG_CORE_EXPORT vtkVgContourRepresentation
+  : public vtkOrientedGlyphContourRepresentation
+{
+public:
+  vtkTypeMacro(vtkVgContourRepresentation, vtkOrientedGlyphContourRepresentation);
+
+  static vtkVgContourRepresentation* New();
+
+  void SetTransformMatrix(vtkMatrix4x4* mat);
+
+  void SetShowHandles(bool enable);
+
+  void Finalize();
+
+  // Description:
+  // Set / get the current operation. The widget is either
+  // inactive, or it is being translated.
+  virtual void SetCurrentOperation(int op);
+
+  // Description:
+  // Add a node at a specific display position. This will be
+  // converted into a world position according to the current
+  // constraints of the point placer. Return 0 if a point could
+  // not be added, 1 otherwise.
+  virtual int AddNodeAtDisplayPosition(double displayPos[2]);
+  using vtkOrientedGlyphContourRepresentation::AddNodeAtDisplayPosition;
+
+  // Description:
+  // Given a specific X, Y pixel location, add a new node
+  // on the contour at this location.
+  virtual int AddNodeOnContour(int X, int Y);
+
+  virtual void WidgetInteraction(double eventPos[2]);
+
+  // Description:
+  // Delete the nth node. Return 1 on success or 0 if n
+  // is out of range.
+  virtual int DeleteNthNode(int n);
+
+  vtkPoints* GetPoints();
+
+  // Description:
+  // Find position on contour nearest to the given display point. Returns 0 if
+  // no part of the contour comes near the display point.
+  int FindClosestPoint(int X, int Y, double pos[3]);
+
+protected:
+  vtkVgContourRepresentation();
+  ~vtkVgContourRepresentation();
+
+  virtual void Initialize(vtkPolyData* pd);
+  virtual void Initialize(vtkPolyData* pd, vtkIdList* list);
+
+  void UpdateTransformedPoints();
+  void ScaleContourFixed(double eventPos[2]);
+
+private:
+  vtkMatrix4x4* TransformMatrix;
+  vtkPoints* TransformedPoints;
+  vtkPoints* Points;
+  vtkTimeStamp PointsBuildTime;
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgContourWidget.cxx b/Libraries/VtkVgCore/vtkVgContourWidget.cxx
new file mode 100644
index 00000000..8c7cd833
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgContourWidget.cxx
@@ -0,0 +1,105 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgContourWidget.h"
+
+#include <vtkCallbackCommand.h>
+#include <vtkCommand.h>
+#include <vtkContourRepresentation.h>
+#include <vtkEvent.h>
+#include <vtkObjectFactory.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkWidgetCallbackMapper.h>
+#include <vtkWidgetEvent.h>
+#include <vtkWidgetEventTranslator.h>
+
+vtkStandardNewMacro(vtkVgContourWidget);
+
+//------------------------------------------------------------------------
+vtkVgContourWidget::vtkVgContourWidget()
+{
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::KeyPressEvent,
+                                          vtkEvent::NoModifier, 127, 1,
+                                          "Delete",
+                                          vtkWidgetEvent::Delete,
+                                          this,
+                                          vtkVgContourWidget::DeleteAction);
+
+  // vtkContourWidget tries to register two actions with the
+  // RightButtonPressEvent, AddFinalPointAction and ScaleContourAction.
+  // However, the event translator / callback mapper doesn't seem to support
+  // multiple mappings for a single VTK event, so the ScaleContourAction
+  // mapping ends up being ignored. Remedy this by removing the existing
+  // translations and adding back only the scale action (we don't care about
+  // AddFinalPoint).
+  this->CallbackMapper->GetEventTranslator()->RemoveTranslation(
+    vtkCommand::RightButtonPressEvent);
+
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::RightButtonPressEvent,
+                                          vtkWidgetEvent::Scale,
+                                          this,
+                                          vtkContourWidget::ScaleContourAction);
+}
+
+//-------------------------------------------------------------------------
+// This function is identical to vtkContourWidget::DeleteAction, except that
+// this version correctly sets the abort flag on a handled event so that
+// interactor observers further down the chain won't ever see it. We also invoke
+// Start/EndInteraction event so that observers who are only listening for
+// EndInteractionEvent will still get a notification.
+//-------------------------------------------------------------------------
+void vtkVgContourWidget::DeleteAction(vtkAbstractWidget* w)
+{
+  vtkVgContourWidget* self = reinterpret_cast<vtkVgContourWidget*>(w);
+
+  if (self->WidgetState == vtkContourWidget::Start)
+    {
+    return;
+    }
+
+  vtkContourRepresentation* rep =
+    reinterpret_cast<vtkContourRepresentation*>(self->WidgetRep);
+
+  if (self->WidgetState == vtkContourWidget::Define)
+    {
+    if (rep->DeleteLastNode())
+      {
+      self->InvokeEvent(vtkCommand::StartInteractionEvent, NULL);
+      self->InvokeEvent(vtkCommand::InteractionEvent, NULL);
+      self->InvokeEvent(vtkCommand::EndInteractionEvent, NULL);
+      self->EventCallbackCommand->SetAbortFlag(1);
+      }
+    }
+  else
+    {
+    int X = self->Interactor->GetEventPosition()[0];
+    int Y = self->Interactor->GetEventPosition()[1];
+    rep->ActivateNode(X, Y);
+    if (rep->DeleteActiveNode())
+      {
+      self->InvokeEvent(vtkCommand::StartInteractionEvent, NULL);
+      self->InvokeEvent(vtkCommand::InteractionEvent, NULL);
+      self->InvokeEvent(vtkCommand::EndInteractionEvent, NULL);
+      self->EventCallbackCommand->SetAbortFlag(1);
+      }
+    rep->ActivateNode(X, Y);
+    int numNodes = rep->GetNumberOfNodes();
+    if (numNodes < 3)
+      {
+      rep->ClosedLoopOff();
+      if (numNodes < 2)
+        {
+        self->WidgetState = vtkContourWidget::Define;
+        }
+      }
+    }
+
+  if (rep->GetNeedToRender())
+    {
+    self->Render();
+    rep->NeedToRenderOff();
+    }
+}
diff --git a/Libraries/VtkVgCore/vtkVgContourWidget.h b/Libraries/VtkVgCore/vtkVgContourWidget.h
new file mode 100644
index 00000000..2071b9d7
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgContourWidget.h
@@ -0,0 +1,27 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgContourWidget_h
+#define __vtkVgContourWidget_h
+
+#include <vtkContourWidget.h>
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgContourWidget : public vtkContourWidget
+{
+public:
+  vtkTypeMacro(vtkVgContourWidget, vtkContourWidget);
+
+  static vtkVgContourWidget* New();
+
+protected:
+  vtkVgContourWidget();
+
+  static void DeleteAction(vtkAbstractWidget*);
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgCoordinateTransformUtil.cxx b/Libraries/VtkVgCore/vtkVgCoordinateTransformUtil.cxx
new file mode 100644
index 00000000..3dccb393
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgCoordinateTransformUtil.cxx
@@ -0,0 +1,44 @@
+
+#include "vtkVgCoordinateTransformUtil.h"
+
+#include "vtkVgAdapt.h"
+
+#include <vtkMatrix4x4.h>
+
+#include <vgl/vgl_homg_point_2d.h>
+#include <vgl/algo/vgl_h_matrix_2d.h>
+#include <vgl/algo/vgl_h_matrix_2d_compute_linear.h>
+
+
+vtkSmartPointer<vtkMatrix4x4>
+  vtkVgCoordinateTransformUtil::ComputeImageToLatLonMatrix(
+  double llx, double lly,
+  double urx, double ury,
+  double geollx, double geolly,
+  double geolrx, double geolry,
+  double geourx, double geoury,
+  double geoulx, double geouly)
+{
+  vcl_vector<vgl_homg_point_2d<double> > toPoints;
+  toPoints.push_back(vgl_homg_point_2d<double>(geoulx, geouly, 1));
+  toPoints.push_back(vgl_homg_point_2d<double>(geourx, geoury, 1));
+  toPoints.push_back(vgl_homg_point_2d<double>(geolrx, geolry, 1));
+  toPoints.push_back(vgl_homg_point_2d<double>(geollx, geolly, 1));
+
+  vcl_vector<vgl_homg_point_2d<double> > fromPoints;
+  fromPoints.push_back(vgl_homg_point_2d<double>(llx, ury, 1.0));
+  fromPoints.push_back(vgl_homg_point_2d<double>(urx, ury, 1.0));
+  fromPoints.push_back(vgl_homg_point_2d<double>(urx, lly, 1.0));
+  fromPoints.push_back(vgl_homg_point_2d<double>(llx, lly, 1.0));
+
+  vgl_h_matrix_2d_compute_linear algo;
+  vgl_h_matrix_2d<double> homography;
+
+  if (algo.compute(fromPoints, toPoints, homography))
+   {
+   return vtkVgAdapt(homography.get_matrix());
+   }
+
+  vtkGenericWarningMacro("Failed to compute Image to Lat/Lon matrix!");
+  return 0;
+}
diff --git a/Libraries/VtkVgCore/vtkVgCoordinateTransformUtil.h b/Libraries/VtkVgCore/vtkVgCoordinateTransformUtil.h
new file mode 100644
index 00000000..98a79dd5
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgCoordinateTransformUtil.h
@@ -0,0 +1,24 @@
+#ifndef VTKVGCOORDINATETRANSFORMUTIL_H
+#define VTKVGCOORDINATETRANSFORMUTIL_H
+
+#include <vgExport.h>
+
+// VTK includes
+#include <vtkSmartPointer.h>
+
+// Forward declarations
+class vtkMatrix4x4;
+
+class VTKVG_CORE_EXPORT vtkVgCoordinateTransformUtil
+{
+public:
+   static vtkSmartPointer<vtkMatrix4x4>
+    ComputeImageToLatLonMatrix(double llx, double lly,
+                               double urx, double ury,
+                               double geollx, double geolly,
+                               double geolrx, double geolry,
+                               double geourx, double geoury,
+                               double geoulx, double geouly);
+};
+
+#endif // VTKVGCOORDINATETRANSFORMUTIL_H
diff --git a/Libraries/VtkVgCore/vtkVgEvent.cxx b/Libraries/VtkVgCore/vtkVgEvent.cxx
new file mode 100644
index 00000000..b2b1932b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgEvent.cxx
@@ -0,0 +1,594 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEvent.h"
+
+// VTK includes.
+#include <vtkBoundingBox.h>
+#include <vtkIdListCollection.h>
+#include <vtkIdList.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+
+#include "vtkVgTrack.h"
+#include "vtkVgTypeDefs.h"
+
+#include <set>
+
+vtkStandardNewMacro(vtkVgEvent);
+
+vtkImplementMetaObject(vtkVgEventTrackInfo, vtkVgEventTrackInfoBase);
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfo::vtkVgEventTrackInfo(vtkVgTrack* track,
+                                         const vtkVgTimeStamp& startFrame,
+                                         const vtkVgTimeStamp& endFrame) :
+  vtkVgEventTrackInfoBase(-1, startFrame, endFrame)
+{
+  this->Track = 0x0;
+  this->SetTrack(track);
+  this->TrackId = track->GetId();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfo::vtkVgEventTrackInfo(const vtkVgEventTrackInfoBase* fromTrackInfo) :
+  vtkVgEventTrackInfoBase(*fromTrackInfo)
+{
+  this->Track = 0x0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfo::vtkVgEventTrackInfo(const vtkVgEventTrackInfo* fromTrackInfo) :
+  vtkVgEventTrackInfoBase(*fromTrackInfo)
+{
+  this->Track = 0x0;
+  if (fromTrackInfo->Track)
+    {
+    this->SetTrack(fromTrackInfo->Track);
+    this->TrackId = this->Track->GetId();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfoBase* vtkVgEventTrackInfo::Clone() const
+{
+  return new vtkVgEventTrackInfo(this);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfo::~vtkVgEventTrackInfo()
+{
+  if (this->Track)
+    {
+    this->Track->UnRegister(NULL);
+    }
+}
+
+//-----------------------------------------------------------------------------
+const char* vtkVgEventTrackInfo::CheckValid() const
+{
+  if (!this->Track)
+    {
+    return "Invalid track.\n";
+    }
+
+  return vtkVgEventTrackInfoBase::CheckBaseValid();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventTrackInfo::SetTrack(vtkVgTrack* track)
+{
+  if (this->Track != track)
+    {
+    vtkVgTrack* temp = this->Track;
+    this->Track = track;
+    if (this->Track != NULL)
+      {
+      this->Track->Register(NULL);
+      }
+    if (temp != NULL)
+      {
+      temp->UnRegister(NULL);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent::vtkVgEvent()
+{
+  this->FullEventIdCollection = vtkIdListCollection::New();
+
+  this->IconIds = vtkIdList::New();
+
+  this->UseCustomColor = false;
+  this->CustomColor[0] = this->CustomColor[1] = this->CustomColor[2] = 0.5;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent::~vtkVgEvent()
+{
+  this->FullEventIdCollection->Delete();
+  this->IconIds->Delete();
+}
+
+//-----------------------------------------------------------------------------
+double* vtkVgEvent::GetFullBounds()
+{
+  if (this->GetNumberOfTracks() < 1)
+    {
+    vtkErrorMacro("Track must be set!");
+    return 0;
+    }
+  vtkBoundingBox bbox;
+  std::vector<vtkVgEventTrackInfoBase*>::iterator trackIter = this->Tracks.begin();
+  for (; trackIter != this->Tracks.end(); trackIter++)
+    {
+    vtkVgEventTrackInfo* trackInfoPtr =
+      vtkVgEventTrackInfo::SafeDownCast(*trackIter);
+    if (!trackInfoPtr)
+      {
+      vtkErrorMacro("Invalid TrackInfo type!");
+      return 0;
+      }
+    if (!trackInfoPtr->Track)
+      {
+      return 0;  // no tracks, so for now (until something breaks), no bounds
+      }
+    vtkIdList* trackIds = trackInfoPtr->Track->GetPointIds();
+    vtkIdType startFramePtId = trackInfoPtr->Track->GetClosestFramePtId(
+                                 trackInfoPtr->StartFrame);
+    if (startFramePtId < 0)
+      {
+      continue;  // for some reason track isn't started
+      }
+    vtkIdType endFramePtId = trackInfoPtr->Track->GetClosestFramePtId(
+                               trackInfoPtr->EndFrame);
+    vtkIdType startFrameIndex = trackIds->IsId(startFramePtId);
+    vtkIdType endFrameIndex = trackIds->IsId(endFramePtId);
+    for (vtkIdType i = startFrameIndex; i <= endFrameIndex; i++)
+      {
+      double* pt = trackInfoPtr->Track->GetPoints()->GetPoint(trackIds->GetId(i));
+      bbox.AddPoint(pt);
+      }
+    }
+  bbox.GetBounds(this->FullBounds);
+  return this->FullBounds;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEvent::GetFullBounds(double bounds[4])
+{
+  this->GetFullBounds();
+  bounds[0] = this->FullBounds[0];
+  bounds[1] = this->FullBounds[1];
+  bounds[2] = this->FullBounds[2];
+  bounds[3] = this->FullBounds[3];
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEvent::GetDisplayPosition(const vtkVgTimeStamp& timeStamp,
+                                    double position[2])
+{
+  position[0] = position[1] = 0.0;
+  double trackPt[2];
+  int numTracks = 0;
+  std::vector<vtkVgEventTrackInfoBase*>::iterator trackIter = this->Tracks.begin();
+  for (; trackIter != this->Tracks.end(); trackIter++)
+    {
+    vtkVgEventTrackInfo* trackInfoPtr =
+      vtkVgEventTrackInfo::SafeDownCast(*trackIter);
+    if (!trackInfoPtr)
+      {
+      vtkErrorMacro("Invalid TrackInfo type!");
+      return false;
+      }
+    // can't proceed without a track pointer, or a track that hasn't been started
+    if (!trackInfoPtr->Track || !trackInfoPtr->Track->IsStarted())
+      {
+      return false;
+      }
+
+    // what time stamp should we be using to pull the closest frame pt
+    vtkVgTimeStamp testTimeStamp = timeStamp;
+    if (timeStamp < trackInfoPtr->StartFrame)
+      {
+      testTimeStamp = trackInfoPtr->StartFrame;
+      }
+    else if (timeStamp > trackInfoPtr->EndFrame)
+      {
+      testTimeStamp = trackInfoPtr->EndFrame;
+      }
+
+    // if we get a valid point, add it to our sum
+    if (trackInfoPtr->Track->GetClosestFramePt(testTimeStamp, trackPt))
+      {
+      position[0] += trackPt[0];
+      position[1] += trackPt[1];
+      numTracks++;
+      }
+    }
+
+  if (numTracks  == 0)
+    {
+    return false;
+    }
+
+  position[0] /= numTracks;
+  position[1] /= numTracks;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdListCollection* vtkVgEvent::GetFullEventIdCollection()
+{
+  if (this->FullEventIdCollection->GetNumberOfItems() == 0)
+    {
+    std::vector<vtkVgEventTrackInfoBase*>::iterator trackIter = this->Tracks.begin();
+    for (; trackIter != this->Tracks.end(); trackIter++)
+      {
+      vtkVgEventTrackInfo* trackInfoPtr =
+        vtkVgEventTrackInfo::SafeDownCast(*trackIter);
+      if (!trackInfoPtr)
+        {
+        vtkErrorMacro("Invalid TrackInfo type!");
+        return 0;
+        }
+      if (!trackInfoPtr->Track)
+        {
+        continue; // can't proceed without a track pointer
+        }
+
+      vtkIdList* trackIds = trackInfoPtr->Track->GetPointIds();
+
+      vtkIdType startFramePtId = trackInfoPtr->Track->GetClosestFramePtId(
+                                   trackInfoPtr->StartFrame);
+      if (startFramePtId < 0)
+        {
+        continue;  // for some reason track isn't started
+        }
+      vtkIdType endFramePtId = trackInfoPtr->Track->GetClosestFramePtId(
+                                 trackInfoPtr->EndFrame);
+      vtkIdType startFrameIndex = trackIds->IsId(startFramePtId);
+      vtkIdType endFrameIndex = trackIds->IsId(endFramePtId);
+
+      vtkIdType numberOfFrames = endFrameIndex - startFrameIndex + 1;
+
+      vtkIdList* idList = vtkIdList::New();
+      memcpy(idList->WritePointer(0, numberOfFrames),
+             trackIds->GetPointer(startFrameIndex),
+             sizeof(vtkIdType) * numberOfFrames);
+      this->FullEventIdCollection->AddItem(idList);
+      idList->FastDelete();
+      }
+    }
+  return this->FullEventIdCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackDisplayData vtkVgEvent::GetTrackDisplayData(unsigned int trackIndex,
+                                                      bool useTrackGroups,
+                                                      vtkVgTimeStamp start,
+                                                      vtkVgTimeStamp end)
+{
+  if (this->Tracks.size() == 0)
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  vtkVgTrack* theTrack = 0;
+  vtkVgTimeStamp startTime, endTime;
+  if (useTrackGroups)
+    {
+    if (!this->GetTrackGroupInfo(trackIndex, theTrack, startTime, endTime))
+      {
+      return vtkVgTrackDisplayData();
+      }
+    }
+  else
+    {
+    vtkVgEventTrackInfo* eti = vtkVgEventTrackInfo::SafeDownCast(
+                                 this->Tracks[trackIndex]);
+
+    theTrack = eti->Track;
+    startTime = eti->StartFrame;
+    endTime = eti->EndFrame;
+    }
+
+  if (!theTrack || !theTrack->IsStarted())
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  // check if any of the event track is active in the requested time interval
+  if (end < startTime || start > endTime)
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  // clamp start time to valid range for this track
+  if (start < startTime)
+    {
+    start = startTime;
+    }
+  else if (start > endTime)
+    {
+    start = endTime;
+    }
+
+  // clamp end time to valid range for this track
+  if (end > endTime)
+    {
+    end = endTime;
+    }
+  else if (end < startTime)
+    {
+    end = startTime;
+    }
+
+  vtkIdType startId = theTrack->GetClosestFramePtId(start);
+  vtkIdType endId = theTrack->GetClosestFramePtId(end);
+
+  vtkIdList* trackIds = theTrack->GetPointIds();
+  vtkIdType startIndex = trackIds->IsId(startId); // linear lookup
+  vtkIdType endIndex = trackIds->IsId(endId);     // linear lookup
+
+  vtkVgTrackDisplayData tdd;
+  tdd.IdsStart = trackIds->GetPointer(startIndex);
+  tdd.NumIds = endIndex - startIndex + 1;
+  return tdd;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEvent::GetTrackGroupInfo(unsigned int trackGroupIndex,
+                                   vtkVgTrack*& theTrack,
+                                   vtkVgTimeStamp& startTime,
+                                   vtkVgTimeStamp& endTime)
+{
+  bool trackOnlyUsedOnce = true;
+  theTrack = 0;
+  std::vector<vtkVgEventTrackInfoBase*>::const_iterator trackIter;
+  std::set<vtkIdType> uniqueTracks;
+  for (trackIter = this->Tracks.begin();
+       trackIter != this->Tracks.end(); trackIter++)
+    {
+    uniqueTracks.insert((*trackIter)->TrackId);
+    if (!theTrack && uniqueTracks.size() > trackGroupIndex)
+      {
+      // this is the track group we want
+      theTrack = vtkVgEventTrackInfo::SafeDownCast(*trackIter)->GetTrack();
+      if (!theTrack || !theTrack->IsStarted())
+        {
+        return false;
+        }
+
+      startTime = (*trackIter)->StartFrame;
+      endTime = (*trackIter)->EndFrame;
+      }
+    else if (theTrack && (*trackIter)->TrackId == theTrack->GetId())
+      {
+      // we only make it here if there is more than one track in this group;
+      // if only one track, we can use the information we already set
+      trackOnlyUsedOnce = false;
+      break;
+      }
+    }
+
+  if (!theTrack)
+    {
+    return false;
+    }
+
+  if (trackOnlyUsedOnce)
+    {
+    return true;
+    }
+
+  // collect start / end time info from all track that match our
+  for (trackIter = this->Tracks.begin(); trackIter != this->Tracks.end();
+       trackIter++)
+    {
+    if ((*trackIter)->TrackId != theTrack->GetId())
+      {
+      continue;
+      }
+
+    vtkVgEventTrackInfo* eti = vtkVgEventTrackInfo::SafeDownCast(*trackIter);
+
+    if (eti->StartFrame < startTime)
+      {
+      startTime = eti->StartFrame;
+      }
+    if (eti->EndFrame > endTime)
+      {
+      endTime = eti->EndFrame;
+      }
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vtkPoints* vtkVgEvent::GetPoints()
+{
+  if (this->Tracks.size() == 0)
+    {
+    return 0;
+    }
+
+  vtkVgEventTrackInfo* infoPtr =
+    vtkVgEventTrackInfo::SafeDownCast(this->Tracks.front());
+  if (!infoPtr)
+    {
+    vtkErrorMacro("Invalid TrackInfo type!");
+    return 0;
+    }
+
+  if (!infoPtr->Track)  // make sure we have a track ptr
+    {
+    return 0;
+    }
+
+
+  return infoPtr->Track->GetPoints();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEvent::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEvent::AddTrack(vtkVgTrack* track, const vtkVgTimeStamp& startFrame,
+                          const vtkVgTimeStamp& endFrame)
+{
+  vtkVgEventTrackInfoBase* trackInfo = new vtkVgEventTrackInfo(track,
+      startFrame, endFrame);
+
+  this->Superclass::AddTrack(trackInfo);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEvent::GetTrack(unsigned int index, vtkVgTrack*& track,
+                          vtkVgTimeStamp& startFrame, vtkVgTimeStamp& endFrame)
+{
+  if (index >= this->Tracks.size())
+    {
+    vtkErrorMacro("Index out of range.\n");
+    return;
+    }
+
+  vtkVgEventTrackInfo* trackInfo =
+    vtkVgEventTrackInfo::SafeDownCast(this->Tracks[index]);
+  if (!trackInfo)
+    {
+    vtkErrorMacro("Invalid TrackInfo type!");
+    return;
+    }
+  track           = trackInfo->Track;
+  startFrame      = trackInfo->StartFrame;
+  endFrame        = trackInfo->EndFrame;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack* vtkVgEvent::GetTrack(unsigned int index)
+{
+  if (index >= this->Tracks.size())
+    {
+    vtkErrorMacro("Index out of range.\n");
+    return 0;
+    }
+
+  vtkVgEventTrackInfo* trackInfoPtr =
+    vtkVgEventTrackInfo::SafeDownCast(this->Tracks[index]);
+  if (!trackInfoPtr)
+    {
+    vtkErrorMacro("Invalid TrackInfo type!");
+    return 0;
+    }
+  return trackInfoPtr->Track;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack* vtkVgEvent::GetTrackGroupTrack(unsigned int trackGroupIndex)
+{
+  if (trackGroupIndex > this->GetNumberOfTrackGroups())
+    {
+    vtkErrorMacro("Index out of range.\n");
+    return 0;
+    }
+
+  vtkVgEventTrackInfo* trackInfoPtr = 0;
+  std::vector<vtkVgEventTrackInfoBase*>::const_iterator trackIter;
+  std::set<vtkIdType> uniqueTracks;
+  for (trackIter = this->Tracks.begin(); trackIter != this->Tracks.end();
+       trackIter++)
+    {
+    uniqueTracks.insert((*trackIter)->TrackId);
+    if (uniqueTracks.size() > trackGroupIndex)
+      {
+      // this is the track group we want
+      trackInfoPtr = vtkVgEventTrackInfo::SafeDownCast(*trackIter);
+      break;
+      }
+    }
+  if (!trackInfoPtr)
+    {
+    vtkErrorMacro("Invalid TrackInfo type!");
+    return 0;
+    }
+  return trackInfoPtr->Track;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEvent::HasTrack(int trackId)
+{
+  std::vector<vtkVgEventTrackInfoBase*>::const_iterator itr;
+  itr = this->Tracks.begin();
+
+  while (itr != this->Tracks.end())
+    {
+    if (vtkVgEventTrackInfo::SafeDownCast(*itr)->Track->GetId() == trackId)
+      {
+      return true;
+      }
+    ++itr;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEvent::CopyTracks(std::vector<vtkVgEventTrackInfoBase*>& tracks)
+{
+  vtkVgEventTrackInfo* infoPtr;
+  vtkVgEventTrackInfoBase* trackInfo;
+  std::vector<vtkVgEventTrackInfoBase*>::const_iterator trackIter;
+  for (trackIter = tracks.begin();
+       trackIter != tracks.end(); trackIter++)
+    {
+    infoPtr = vtkVgEventTrackInfo::SafeDownCast(*trackIter);
+    if (infoPtr)
+      {
+      trackInfo = new vtkVgEventTrackInfo(infoPtr);
+      }
+    else
+      {
+      trackInfo = new vtkVgEventTrackInfo(*trackIter);
+      }
+    this->Tracks.push_back(trackInfo);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEvent::SetTrackPtr(unsigned int index, vtkVgTrack* track)
+{
+  if (index >= this->Tracks.size())
+    {
+    vtkErrorMacro("Index out of range.\n");
+    return false;
+    }
+  else if (!track)
+    {
+    vtkErrorMacro("Null track ptr, can't set track ptr!");
+    return false;
+    }
+  else if (track->GetId() != this->Tracks[index]->TrackId)
+    {
+    vtkErrorMacro("TrackId doesn't match Id of TrackPtr: " <<
+                  this->Tracks[index]->TrackId << " " << track->GetId());
+    return false;
+    }
+
+  vtkVgEventTrackInfo* infoPtr;
+  if (!(infoPtr = vtkVgEventTrackInfo::SafeDownCast(this->Tracks[index])))
+    {
+    vtkErrorMacro("Invalid TrackInfo type!");
+    return 0;
+    }
+  infoPtr->SetTrack(track);
+  return true;
+}
diff --git a/Libraries/VtkVgCore/vtkVgEvent.h b/Libraries/VtkVgCore/vtkVgEvent.h
new file mode 100644
index 00000000..03a505d5
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgEvent.h
@@ -0,0 +1,182 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEvent_h
+#define __vtkVgEvent_h
+
+#include "vtkVgEventBase.h"
+#include "vtkVgSetGet.h"
+
+#include <vgExport.h>
+
+class vtkIdList;
+class vtkIdListCollection;
+class vtkPoints;
+class vtkVgTrack;
+
+#include "vtkVgTrack.h"
+
+class VTKVG_CORE_EXPORT vtkVgEventTrackInfo : public vtkVgEventTrackInfoBase
+{
+  vtkDeclareMetaObject(vtkVgEventTrackInfo);
+
+public:
+  vtkVgEventTrackInfo(vtkVgTrack* track,
+                      const vtkVgTimeStamp& startFrameIndex,
+                      const vtkVgTimeStamp& endFrameIndex);
+  vtkVgEventTrackInfo(const vtkVgEventTrackInfoBase* fromTrackInfo);
+  vtkVgEventTrackInfo(const vtkVgEventTrackInfo* fromTrackInfo);
+  virtual ~vtkVgEventTrackInfo();
+
+  virtual vtkVgEventTrackInfoBase* Clone() const;
+
+  virtual const char* CheckValid() const;
+
+  void SetTrack(vtkVgTrack* track);
+  vtkVgTrack* GetTrack()
+    {
+    return this->Track;
+    }
+
+protected:
+
+  friend class vtkVgEvent;
+
+  vtkVgTrack* Track;
+};
+
+
+class VTKVG_CORE_EXPORT vtkVgEvent : public vtkVgEventBase
+{
+public:
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVgEvent* New();
+  vtkTypeMacro(vtkVgEvent, vtkVgEventBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Return collection of vtkIdLists containing the complete event
+  vtkIdListCollection* GetFullEventIdCollection();
+
+  vtkVgTrackDisplayData GetTrackDisplayData(unsigned int trackIndex,
+                                            bool useTrackGroups,
+                                            vtkVgTimeStamp start,
+                                            vtkVgTimeStamp end);
+
+  vtkGetObjectMacro(IconIds, vtkIdList);
+
+  // Description:
+  // Get the underlying vtkPoints
+  vtkPoints* GetPoints();
+
+  // Description:
+  // Return the bounds of the entire event (xmin, xmax, ymin, ymax).
+  double* GetFullBounds();
+
+  // Description:
+  // Get the bounds for this entire event as (xmin, xmax, ymin, ymax).
+  void GetFullBounds(double bounds[4]);
+
+  // Description:
+  // The display position is the average of the current location of each track
+  // making up the event, at the specified timeStamp.  Returns false if no
+  // tracks (or if one of the tracks isn't valid).
+  bool GetDisplayPosition(const vtkVgTimeStamp& timeStamp, double position[2]);
+
+  // Description:
+  // Add a new track into the list of tracks related with the event.
+  void AddTrack(vtkVgTrack* track, const vtkVgTimeStamp& startFrame,
+                const vtkVgTimeStamp& endFrame);
+
+  // Description:
+  // Overload same signature from vtkVgEventBase, since we require a pointer to
+  // a vtkVgTrack when we add a track to a full blown vtkVgEvent.
+  virtual void AddTrack(vtkIdType vtkNotUsed(trackId),
+                        vtkVgTimeStamp& vtkNotUsed(startFrame),
+                        vtkVgTimeStamp& vtkNotUsed(endFrame))
+    {
+    vtkErrorMacro("Must specify vtkVgTrack*, not track id,"
+                  " when adding a track to vtkVgEvent!");
+    }
+
+  // Description:
+  // Overload same signature from vtkVgEventBase, since we require a pointer to
+  // a vtkVgTrack when we add a track to a full blown vtkVgEvent. Note that we
+  // will accept a vtkVgEventTrackInfo.
+  virtual void AddTrack(vtkVgEventTrackInfoBase* trackInfo)
+    {
+    vtkVgEventTrackInfo* ti = vtkVgEventTrackInfo::SafeDownCast(trackInfo);
+    if (ti)
+      {
+      this->Superclass::AddTrack(trackInfo);
+      }
+    else
+      {
+      vtkErrorMacro("Must specify vtkVgTrack* or vtkVgEventTrackInfo*"
+                    " when adding a track to vtkVgEvent!");
+      }
+    }
+
+  // Description:
+  // Given a valid index, fill in track and its related parameters.
+  // \TODO: This interface might change in the future.
+  void GetTrack(unsigned int index, vtkVgTrack*& track,
+                vtkVgTimeStamp& startFrame,
+                vtkVgTimeStamp& endFrame);
+
+  // Description:
+  // Return track at the specified index
+  vtkVgTrack* GetTrack(unsigned int index);
+
+  // Description:
+  // Return track at the specified index
+  vtkVgTrack* GetTrackGroupTrack(unsigned int trackGroupIndex);
+
+  // Description:
+  // Return if the event contains track with given id.
+  bool HasTrack(int trackId);
+
+  // Description:
+  // Specify a track
+  bool SetTrackPtr(unsigned int index, vtkVgTrack* track);
+
+  // Description:
+  // Support for per-event colors.
+  vtkVgSetVector3Macro(CustomColor, double);
+  vtkGetVector3Macro(CustomColor, double);
+
+  vtkSetMacro(UseCustomColor, bool);
+  vtkGetMacro(UseCustomColor, bool);
+  vtkBooleanMacro(UseCustomColor, bool);
+
+protected:
+  vtkVgEvent();
+  ~vtkVgEvent();
+
+  bool GetTrackGroupInfo(unsigned int trackGroupIndex, vtkVgTrack*& theTrack,
+                         vtkVgTimeStamp& startTime, vtkVgTimeStamp& endTime);
+
+  virtual void CopyTracks(std::vector<vtkVgEventTrackInfoBase*>& tracks);
+
+  vtkIdListCollection* FullEventIdCollection;
+
+  vtkIdList* IconIds;
+
+  // only use 4 or 6, but done for convenience right now
+  double FullBounds[6];
+
+  bool UseCustomColor;
+  double CustomColor[3];
+
+private:
+  vtkVgEvent(const vtkVgEvent&); // Not implemented.
+  void operator=(const vtkVgEvent&);  // Not implemented.
+
+};
+
+#endif // __vtkVgEvent_h
diff --git a/Libraries/VtkVgCore/vtkVgEventBase.cxx b/Libraries/VtkVgCore/vtkVgEventBase.cxx
new file mode 100644
index 00000000..8350378b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgEventBase.cxx
@@ -0,0 +1,1253 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// VisGUI includes
+#include "vtkVgEventBase.h"
+#include "vtkVgTypeDefs.h"
+#include "vtkVgTimeStamp.h"
+
+// VTK includes.
+#include <vtkBoundingBox.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkType.h>
+
+#include <set>
+
+vtkStandardNewMacro(vtkVgEventBase);
+vtkCxxSetObjectMacro(vtkVgEventBase, RegionPoints, vtkPoints);
+
+vtkImplementMetaObject(vtkVgEventTrackInfoBase, vtkVgMetaObject);
+
+namespace
+{
+
+//-----------------------------------------------------------------------------
+bool operator==(const vtkVgEventBase::RegionPoint& a,
+                const vtkVgEventBase::RegionPoint& b)
+{
+  return (a.X == b.X) && (a.Y == b.Y);
+}
+
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfoBase::vtkVgEventTrackInfoBase(vtkIdType trackId,
+                                                 const vtkVgTimeStamp& startFrame,
+                                                 const vtkVgTimeStamp& endFrame)
+{
+  this->TrackId = trackId;
+  this->StartFrame = startFrame;
+  this->EndFrame   = endFrame;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfoBase::vtkVgEventTrackInfoBase(
+  const vtkVgEventTrackInfoBase& fromTrackInfo)
+  : vtkVgMetaObject(fromTrackInfo)
+{
+  this->TrackId = fromTrackInfo.TrackId;
+  this->StartFrame = fromTrackInfo.StartFrame;
+  this->EndFrame   = fromTrackInfo.EndFrame;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfoBase* vtkVgEventTrackInfoBase::Clone() const
+{
+  return new vtkVgEventTrackInfoBase(*this);
+}
+
+//-----------------------------------------------------------------------------
+const char* vtkVgEventTrackInfoBase::CheckValid() const
+{
+  if (this->TrackId < 0)
+    {
+    return "Only non-negative track ID's are allowed.\n";
+    }
+
+  return this->CheckBaseValid();
+}
+
+//-----------------------------------------------------------------------------
+const char* vtkVgEventTrackInfoBase::CheckBaseValid() const
+{
+  // Check for times initialized
+  if (!(this->StartFrame.IsValid() && this->EndFrame.IsValid()))
+    {
+    return "Start or End frame time stamp isn't valid!\n";
+    }
+
+  // Check for order
+  if (this->EndFrame < this->StartFrame)
+    {
+    return "Start frame timestamp cannot be greater than end frame timestamp.\n";
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+class vtkVgEventBase::vtkInternal
+{
+public:
+  struct ClassifierInfo
+    {
+    double Normalcy;
+    double Probability;
+
+    ClassifierInfo()
+      {
+      this->Normalcy = 0.0;
+      this->Probability = 0.0;
+      }
+    };
+
+  std::map<int, ClassifierInfo> Classifiers;
+  std::map<int, ClassifierInfo>::const_iterator ClassifierIterator;
+  double ActiveClassifierScore;
+  int ActiveClassifierType;
+
+  // could use a vector instead of a map, but cleanest (At least for now)
+  // to use a map (don't have to worry about missing frames, among other things)
+  std::map<vtkVgTimeStamp, std::vector<vtkIdType> > RegionPtIds;
+  std::map<vtkVgTimeStamp, std::vector<vtkIdType> >::iterator RegionIterator;
+
+  vtkInternal()
+    {
+    this->ActiveClassifierScore = -1;
+    this->ActiveClassifierType = -1;
+    }
+
+  double ComputeClassifierScore(const ClassifierInfo& classifierInfo) const
+    {
+    return (1.0 + classifierInfo.Probability) / (1.0 + classifierInfo.Normalcy);
+    }
+
+  void Copy(vtkVgEventBase::vtkInternal* source, bool copyRegionPtIds)
+    {
+    this->Classifiers = source->Classifiers;
+    this->ClassifierIterator = this->Classifiers.end();
+    this->ActiveClassifierScore = source->ActiveClassifierScore;
+    this->ActiveClassifierType = source->ActiveClassifierType;
+
+    if (copyRegionPtIds)
+      {
+      this->RegionPtIds = source->RegionPtIds;
+      this->RegionIterator = this->RegionPtIds.end();
+      }
+    }
+
+private:
+  void operator=(const vtkVgEventBase::vtkInternal&);   // Not implemented.
+};
+
+//-----------------------------------------------------------------------------
+vtkVgEventBase::vtkVgEventBase()
+{
+  this->Id = -1;
+  this->Status = vgObjectStatus::None;
+  this->Flags = 0;
+  this->DisplayFlags = DF_TrackEvent;
+  this->Name = 0;
+  this->Note = 0;
+
+  this->RegionPoints = vtkPoints::New();
+
+  this->StartFrame.SetToMaxTime();
+  this->EndFrame.SetToMinTime();
+
+  this->TripEventPosition[0] = this->TripEventPosition[1] =
+                                 this->TripEventPosition[2] = 0.0;
+  this->TripEventFlag = false;
+
+  this->Internal = new vtkInternal;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventBase::~vtkVgEventBase()
+{
+  delete this->Internal;
+  this->SetRegionPoints(0);
+  this->ClearTracks();
+  this->SetNote(0);
+  this->SetName(0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::ClearTracks()
+{
+  std::vector<vtkVgEventTrackInfoBase*>::const_iterator trackIter;
+  for (trackIter = this->Tracks.begin(); trackIter != this->Tracks.end();
+       trackIter++)
+    {
+    delete *trackIter;
+    }
+  this->Tracks.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::ClearRegions()
+{
+  if (this->Internal->RegionPtIds.size() > 0)
+    {
+    this->Internal->RegionPtIds.clear();
+    this->Internal->RegionIterator = this->Internal->RegionPtIds.end();
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::AddRegion(const vtkVgTimeStamp& timeStamp,
+                               vtkIdType numberOfRegionPts,
+                               double* regionPts)
+{
+  // only add if at least 1 point AND region for this timeStamp not already set
+  if (numberOfRegionPts > 0 &&
+      this->Internal->RegionPtIds.find(timeStamp) ==
+      this->Internal->RegionPtIds.end())
+    {
+    // don't process last point if same as first (we automatically duplicate it)
+    if (regionPts[0] == regionPts[(numberOfRegionPts - 1) * 2] &&
+        regionPts[1] == regionPts[(numberOfRegionPts - 1) * 2 + 1])
+      {
+      numberOfRegionPts--;
+      }
+    std::vector<vtkIdType> ptIds(numberOfRegionPts + 1); // + 1 to repeat 1st pt
+    vtkIdType i;
+    for (i = 0; i < numberOfRegionPts; i++)
+      {
+      ptIds.at(i) = this->RegionPoints->InsertNextPoint(
+        regionPts[i * 2], regionPts[i * 2 + 1], 0.0);
+      }
+    ptIds.at(i) = ptIds[0];
+    this->Internal->RegionPtIds[timeStamp] = ptIds;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetRegion(const vtkVgTimeStamp& timeStamp,
+                               vtkIdType numberOfRegionPts,
+                               double* regionPts)
+{
+  // only add if at least 1 point (this fn can NOT be used to remove a region)
+  if (numberOfRegionPts <= 0)
+    {
+    return;
+    }
+
+  std::map<vtkVgTimeStamp, std::vector<vtkIdType> >::iterator region =
+    this->Internal->RegionPtIds.find(timeStamp);
+  if (region == this->Internal->RegionPtIds.end())
+    {
+    // if region not already set, use AddRegion
+    this->AddRegion(timeStamp, numberOfRegionPts, regionPts);
+    return;
+    }
+
+  // don't process last point if same as first (we automatically duplicate it)
+  if (regionPts[0] == regionPts[(numberOfRegionPts - 1) * 2] &&
+      regionPts[1] == regionPts[(numberOfRegionPts - 1) * 2 + 1])
+    {
+    numberOfRegionPts--;
+    }
+
+  // replace existing region with the update, IF there is a change
+  bool regionChanged = false;
+  size_t numberOfExistingRegionPts = region->second.size();
+  // "- 1" because we duplicate the 1st point at the end (and incoming points
+  // have already been decremented accordingly)
+  if (numberOfExistingRegionPts - 1 == numberOfRegionPts)
+    {
+    for (vtkIdType i = 0; i < numberOfRegionPts; ++i)
+      {
+      double* point = this->RegionPoints->GetPoint(region->second[i]);
+      if (point[0] != regionPts[i * 2] || point[1] != regionPts[i * 2 + 1])
+        {
+        regionChanged = true;
+        break;
+        }
+      }
+    }
+  else
+    {
+    regionChanged = true;
+    }
+
+  if (!regionChanged)  // no change
+    {
+    return;
+    }
+
+  if (numberOfRegionPts + 1 != numberOfExistingRegionPts)
+    {
+    // if new size of region is smaller than original, the difference is wasted
+    region->second.resize(numberOfRegionPts + 1);
+    region->second.at(numberOfRegionPts) = region->second[0];
+    }
+  for (vtkIdType i = 0; i < numberOfRegionPts; ++i)
+    {
+    if (i < numberOfExistingRegionPts)
+      {
+      this->RegionPoints->SetPoint(region->second[i], regionPts[i * 2],
+                                                      regionPts[i * 2 + 1],
+                                                      0.0);
+      }
+    else
+      {
+      region->second.at(i) =
+        this->RegionPoints->InsertNextPoint(regionPts[i * 2],
+                                            regionPts[i * 2 + 1], 0.0);
+      }
+    }
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::GetRegion(const vtkVgTimeStamp& timeStamp,
+                               vtkIdType& npts, vtkIdType*& pts)
+{
+  std::map<vtkVgTimeStamp, std::vector<vtkIdType> >::iterator region =
+    this->Internal->RegionPtIds.find(timeStamp);
+  if (region == this->Internal->RegionPtIds.end())
+    {
+    npts = 0;
+    }
+  else
+    {
+    npts = static_cast<vtkIdType>(region->second.size());
+    pts = &region->second[0];
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::GetRegionAtOrAfter(vtkVgTimeStamp& timeStamp,
+                                        vtkIdType& npts, vtkIdType*& pts)
+{
+  std::map<vtkVgTimeStamp, std::vector<vtkIdType> >::iterator region
+    = this->Internal->RegionPtIds.lower_bound(timeStamp);
+  if (region == this->Internal->RegionPtIds.end())
+    {
+    npts = 0;
+    return false;
+    }
+  else
+    {
+    npts = static_cast<vtkIdType>(region->second.size());
+    pts = &region->second[0];
+    if (!(region->first == timeStamp))
+      {
+      timeStamp = region->first;
+      return false;
+      }
+    return true;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::GetClosestDisplayRegion(vtkVgTimeStamp& timeStamp,
+                                             vtkIdType& npts, vtkIdType*& pts)
+{
+  if (this->Internal->RegionPtIds.empty())
+    {
+    // No regions in the map
+    npts = 0;
+    return false;
+    }
+
+  std::map<vtkVgTimeStamp, std::vector<vtkIdType> >::iterator region
+    = this->Internal->RegionPtIds.upper_bound(timeStamp);
+  if (region != this->Internal->RegionPtIds.begin())
+    {
+    --region;
+    }
+
+  npts = static_cast<vtkIdType>(region->second.size());
+  pts = &region->second[0];
+  if (!(region->first == timeStamp))
+    {
+    timeStamp = region->first;
+    return false;
+    }
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::GetRegionCenter(const vtkVgTimeStamp& timeStamp,
+                                     double* center,
+                                     bool interpolated)
+{
+  if (this->Internal->RegionPtIds.size() < 1)
+    {
+    return false;
+    }
+
+  interpolated = false;  // not intperolated until we actual do (interpolate)
+
+  // get reg
+  std::map<vtkVgTimeStamp, std::vector<vtkIdType> >::iterator region;
+  region = this->Internal->RegionPtIds.lower_bound(timeStamp);
+  if (region == this->Internal->RegionPtIds.end())
+    {
+    interpolated = true;
+    region--;
+    }
+  else if (timeStamp < this->Internal->RegionPtIds.begin()->first)
+    {
+    interpolated = true;
+    }
+
+  vtkBoundingBox bbox;
+  // 1st pt is repeated, so only consider once (ignore last point)
+  for (size_t i = 0; i < region->second.size() - 1; i++)
+    {
+    bbox.AddPoint(this->RegionPoints->GetPoint(region->second[i]));
+    }
+  double center3D[3];
+  bbox.GetCenter(center3D);
+
+  // if interpolated == true (already), means either before 1st region, or
+  // after last, in which case we use the exact pt
+  if (region->first == timeStamp || interpolated)
+    {
+    center[0] = center3D[0];
+    center[1] = center3D[1];
+    }
+  else // need to use preceding region and interpolate
+    {
+    vtkVgTimeStamp afterTimeStamp = timeStamp;
+
+    region--;
+    bbox.Reset();
+    // 1st pt is repeated, so only consider once (ignore last point)
+    for (size_t i = 0; i < region->second.size() - 1; i++)
+      {
+      bbox.AddPoint(this->RegionPoints->GetPoint(region->second[i]));
+      }
+    double centerBefore[3];
+    bbox.GetCenter(centerBefore);
+
+    double t;
+    if (timeStamp.HasTime())
+      {
+      t = (timeStamp.GetTime() - region->first.GetTime()) /
+          (afterTimeStamp.GetTime() - region->first.GetTime());
+      }
+    else
+      {
+      t = (timeStamp.GetFrameNumber() - region->first.GetFrameNumber()) /
+          (double)(afterTimeStamp.GetFrameNumber() - region->first.GetFrameNumber());
+      }
+
+    center[0] = centerBefore[0] + t * (center3D[0] - centerBefore[0]);
+    center[1] = centerBefore[1] + t * (center3D[1] - centerBefore[1]);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::AddRegion(const vtkVgTimeStamp& timeStamp,
+                               const vtkVgEventBase::Region& region)
+{
+  size_t numberOfRegionPts = region.size();
+
+  // only add if at least 1 point AND region for this timeStamp not already set
+  if (region.size() > 0 &&
+      this->Internal->RegionPtIds.find(timeStamp) ==
+      this->Internal->RegionPtIds.end())
+    {
+    // don't process last point if same as first (we automatically duplicate it)
+    if (region[0] == region[numberOfRegionPts - 1])
+      {
+      numberOfRegionPts--;
+      }
+    std::vector<vtkIdType> ptIds(numberOfRegionPts + 1); // + 1 to repeat first point
+    size_t i;
+    for (i = 0; i < numberOfRegionPts; ++i)
+      {
+      ptIds[i] = this->RegionPoints->InsertNextPoint(
+        region[i].X, region[i].Y, 0.0);
+      }
+    ptIds[i] = ptIds[0];
+    this->Internal->RegionPtIds[timeStamp] = ptIds;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventBase::Region vtkVgEventBase::GetRegion(
+  const vtkVgTimeStamp& timeStamp) const
+{
+  typedef std::vector<vtkIdType> PtIdList;
+  typedef std::map<vtkVgTimeStamp, PtIdList> PtMap;
+  typedef PtMap::const_iterator Iterator;
+
+  Region result;
+
+  Iterator region = this->Internal->RegionPtIds.find(timeStamp);
+  if (region != this->Internal->RegionPtIds.end())
+    {
+    const PtIdList& points = region->second;
+
+    // first point is repeated, so only consider once (ignore last point)
+    for (size_t i = 0, k = points.size(); i < k; ++i)
+      {
+      double pt[3];
+      this->RegionPoints->GetPoint(points[i], pt);
+      result.push_back(RegionPoint(pt[0], pt[1]));
+      }
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+std::map<vtkVgTimeStamp, vtkVgEventBase::Region>
+vtkVgEventBase::GetRegions() const
+{
+  typedef std::vector<vtkIdType> PtIdList;
+  typedef std::map<vtkVgTimeStamp, PtIdList> PtMap;
+  typedef PtMap::const_iterator Iterator;
+
+  Iterator iter = this->Internal->RegionPtIds.begin();
+  const Iterator end = this->Internal->RegionPtIds.end();
+
+  std::map<vtkVgTimeStamp, vtkVgEventBase::Region> result;
+
+  while (iter != end)
+    {
+    const PtIdList& points = iter->second;
+    Region region;
+
+    // first point is repeated, so only consider once (ignore last point)
+    for (size_t i = 0, k = points.size() - 1; i < k; ++i)
+      {
+      double pt[3];
+      this->RegionPoints->GetPoint(points[i], pt);
+      region.push_back(RegionPoint(pt[0], pt[1]));
+      }
+
+    result.insert(std::make_pair(iter->first, region));
+
+    ++iter;
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vtkVgEventBase::GetNumberOfRegions() const
+{
+  return static_cast<unsigned int>(this->Internal->RegionPtIds.size());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::InitRegionTraversal()
+{
+  this->Internal->RegionIterator = this->Internal->RegionPtIds.begin();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::GetNextRegion(vtkVgTimeStamp& timeStamp, vtkIdType& npts,
+                                   vtkIdType*& pts)
+{
+  if (this->Internal->RegionIterator == this->Internal->RegionPtIds.end())
+    {
+    return false;
+    }
+
+  timeStamp = this->Internal->RegionIterator->first;
+  npts = static_cast<vtkIdType>(this->Internal->RegionIterator->second.size());
+  pts = &this->Internal->RegionIterator->second[0];
+
+  ++this->Internal->RegionIterator;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::AddClassifier(int type,
+                                   double probability/*=0*/,
+                                   double normalcy/*=0*/)
+{
+  vtkInternal::ClassifierInfo classifierInfo;
+
+  if (normalcy < 0.0 || normalcy > 1.0)
+    {
+    vtkWarningMacro("Event normalcy out of range: " << this->GetId());
+    normalcy = normalcy < 0.0 ? 0.0 : (normalcy > 1.0 ? 1.0 : normalcy);
+    }
+
+  classifierInfo.Normalcy = normalcy;
+  classifierInfo.Probability = probability;
+
+  this->Internal->Classifiers[type] = classifierInfo;
+  this->Modified();
+
+  double score = this->Internal->ComputeClassifierScore(classifierInfo);
+  if (score > this->Internal->ActiveClassifierScore)
+    {
+    this->Internal->ActiveClassifierScore = score;
+    this->Internal->ActiveClassifierType = type;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::RemoveClassifier(int type)
+{
+  std::map<int, vtkInternal::ClassifierInfo>::iterator classifier =
+    this->Internal->Classifiers.find(type);
+  if (classifier != this->Internal->Classifiers.end())
+    {
+    this->Internal->Classifiers.erase(classifier);
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::ResetClassifiers()
+{
+  this->Internal->Classifiers.clear();
+  this->ResetActiveClassifier();
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vtkVgEventBase::GetNumberOfClassifiers()
+{
+  return static_cast<unsigned int>(this->Internal->Classifiers.size());
+}
+
+//-----------------------------------------------------------------------------
+std::vector<int> vtkVgEventBase::GetClassifierTypes()
+{
+  std::vector<int> types;
+  types.reserve(this->Internal->Classifiers.size());
+
+  std::map<int, vtkInternal::ClassifierInfo>::iterator iter, end;
+  for (iter = this->Internal->Classifiers.begin(),
+       end  = this->Internal->Classifiers.end();
+       iter != end; ++iter)
+    {
+    types.push_back(iter->first);
+    }
+
+  return types;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::InitClassifierTraversal()
+{
+  this->Internal->ClassifierIterator = this->Internal->Classifiers.begin();
+  return this->Internal->ClassifierIterator != this->Internal->Classifiers.end();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::NextClassifier()
+{
+  if (this->Internal->ClassifierIterator == this->Internal->Classifiers.end())
+    {
+    return false;
+    }
+  this->Internal->ClassifierIterator++;
+
+  return this->Internal->ClassifierIterator != this->Internal->Classifiers.end();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgEventBase::GetClassifierType()
+{
+  if (this->Internal->ClassifierIterator == this->Internal->Classifiers.end())
+    {
+    vtkErrorMacro("No more classifiers!");
+    return -1;
+    }
+
+  return this->Internal->ClassifierIterator->first;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventBase::GetClassifierProbability()
+{
+  if (this->Internal->ClassifierIterator == this->Internal->Classifiers.end())
+    {
+    vtkErrorMacro("No more classifiers!");
+    return -1;
+    }
+
+  return this->Internal->ClassifierIterator->second.Probability;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventBase::GetClassifierNormalcy()
+{
+  if (this->Internal->ClassifierIterator == this->Internal->Classifiers.end())
+    {
+    vtkErrorMacro("No more classifiers!");
+    return -1;
+    }
+
+  return this->Internal->ClassifierIterator->second.Normalcy;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventBase::GetClassifierScore()
+{
+  if (this->Internal->ClassifierIterator == this->Internal->Classifiers.end())
+    {
+    vtkErrorMacro("No more classifiers!");
+    return -1;
+    }
+
+  return this->Internal->ComputeClassifierScore(
+           this->Internal->ClassifierIterator->second);
+}
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::HasClassifier(int classifierType)
+{
+  return this->Internal->Classifiers.find(classifierType) !=
+         this->Internal->Classifiers.end();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetProbability(int classifierType, double probability)
+{
+  std::map<int, vtkInternal::ClassifierInfo>::iterator classifier =
+    this->Internal->Classifiers.find(classifierType);
+  if (classifier == this->Internal->Classifiers.end() ||
+      classifier->second.Probability == probability)
+    {
+    return;
+    }
+
+  classifier->second.Probability = probability;
+  double score = this->Internal->ComputeClassifierScore(classifier->second);
+  if (score > this->Internal->ActiveClassifierScore)
+    {
+    this->Internal->ActiveClassifierScore = score;
+    this->Internal->ActiveClassifierType = classifierType;
+    }
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventBase::GetProbability(int classifierType)
+{
+  std::map<int, vtkInternal::ClassifierInfo>::iterator classifier =
+    this->Internal->Classifiers.find(classifierType);
+  if (classifier == this->Internal->Classifiers.end())
+    {
+    return -1;
+    }
+  return classifier->second.Probability;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetNormalcy(int classifierType, double normalcy)
+{
+  std::map<int, vtkInternal::ClassifierInfo>::iterator classifier =
+    this->Internal->Classifiers.find(classifierType);
+  if (classifier == this->Internal->Classifiers.end() ||
+      classifier->second.Normalcy == normalcy)
+    {
+    return;
+    }
+
+  classifier->second.Normalcy = normalcy;
+  double score = this->Internal->ComputeClassifierScore(classifier->second);
+  if (score > this->Internal->ActiveClassifierScore)
+    {
+    this->Internal->ActiveClassifierScore = score;
+    this->Internal->ActiveClassifierType = classifierType;
+    }
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventBase::GetNormalcy(int classifierType)
+{
+  std::map<int, vtkInternal::ClassifierInfo>::iterator classifier =
+    this->Internal->Classifiers.find(classifierType);
+  if (classifier == this->Internal->Classifiers.end())
+    {
+    return -1;
+    }
+  return classifier->second.Normalcy;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetActiveClassifier(int classifierType)
+{
+  if (this->Internal->ActiveClassifierType == classifierType)
+    {
+    return;
+    }
+
+  if (this->Internal->Classifiers.find(classifierType) ==
+      this->Internal->Classifiers.end())
+    {
+    vtkErrorMacro("Classifier of type " << classifierType <<
+                  " is not present in this event");
+    }
+
+  this->Internal->ActiveClassifierType = classifierType;
+  this->Internal->ActiveClassifierScore = VTK_FLOAT_MAX;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::ResetActiveClassifier()
+{
+  std::map<int, vtkInternal::ClassifierInfo>::iterator classifierIter =
+    this->Internal->Classifiers.begin();
+  double bestScore = -1;
+  int bestClassifier = -1;
+  for (; classifierIter != this->Internal->Classifiers.end(); classifierIter++)
+    {
+    double score = this->Internal->ComputeClassifierScore(classifierIter->second);
+    if (score > bestScore)
+      {
+      bestScore = score;
+      bestClassifier = classifierIter->first;
+      }
+    }
+  this->Internal->ActiveClassifierType = bestClassifier;
+  this->Internal->ActiveClassifierScore = bestScore;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgEventBase::GetActiveClassifierType()
+{
+  return this->Internal->ActiveClassifierType;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventBase::GetActiveClassifierNormalcy()
+{
+  std::map<int, vtkInternal::ClassifierInfo>::iterator classifier =
+    this->Internal->Classifiers.find(this->Internal->ActiveClassifierType);
+  if (classifier == this->Internal->Classifiers.end())
+    {
+    return -1;
+    }
+  return classifier->second.Normalcy;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventBase::GetActiveClassifierProbability()
+{
+  std::map<int, vtkInternal::ClassifierInfo>::iterator classifier =
+    this->Internal->Classifiers.find(this->Internal->ActiveClassifierType);
+  if (classifier == this->Internal->Classifiers.end())
+    {
+    return -1;
+    }
+  return classifier->second.Probability;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::AddTrack(vtkIdType trackId, vtkVgTimeStamp& startFrame,
+                              vtkVgTimeStamp& endFrame)
+{
+  vtkVgEventTrackInfoBase* trackInfo =
+    new vtkVgEventTrackInfoBase(trackId, startFrame, endFrame);
+
+  this->AddTrack(trackInfo);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::AddTrack(vtkVgEventTrackInfoBase* trackInfo)
+{
+  // check for valid info
+  const char* error = trackInfo->CheckValid();
+  if (error)
+    {
+    vtkErrorMacro(<< error);
+    return;
+    }
+
+  // update event start/end given this track
+  if (trackInfo->StartFrame < this->StartFrame)
+    {
+    this->StartFrame = trackInfo->StartFrame;
+    }
+  if (this->EndFrame < trackInfo->EndFrame)
+    {
+    this->EndFrame = trackInfo->EndFrame;
+    }
+
+  this->Tracks.push_back(trackInfo);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::RemoveTrack(unsigned int index)
+{
+  delete this->Tracks[index];
+  this->Tracks.erase(this->Tracks.begin() + index);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SwapTracks(unsigned int index1, unsigned int index2)
+{
+  std::swap(this->Tracks[index1], this->Tracks[index2]);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::ReplaceTrack(unsigned int index, vtkIdType trackId)
+{
+  this->Tracks[index]->TrackId = trackId;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vtkVgEventBase::GetNumberOfTracks() const
+{
+  return static_cast<unsigned int>(this->Tracks.size());
+}
+
+//-----------------------------------------------------------------------------
+unsigned int vtkVgEventBase::GetNumberOfTrackGroups() const
+{
+  // initial implementation: all tracks of same id are grouped together
+  std::vector<vtkVgEventTrackInfoBase*>::const_iterator trackIter;
+  std::set<vtkIdType> uniqueTracks;
+  for (trackIter = this->Tracks.begin(); trackIter != this->Tracks.end();
+       trackIter++)
+    {
+    uniqueTracks.insert((*trackIter)->TrackId);
+    }
+  return static_cast<unsigned int>(uniqueTracks.size());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::GetTrack(unsigned int index, vtkIdType& trackId,
+                              vtkVgTimeStamp& startFrame,
+                              vtkVgTimeStamp& endFrame)
+{
+  if (index >= this->Tracks.size())
+    {
+    vtkErrorMacro("Index out of range.\n");
+    return;
+    }
+
+  vtkVgEventTrackInfoBase* trackInfo = this->Tracks[index];
+  trackId         = trackInfo->TrackId;
+  startFrame      = trackInfo->StartFrame;
+  endFrame        = trackInfo->EndFrame;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgEventBase::GetTrackId(unsigned int index) const
+{
+  if (index >= this->Tracks.size())
+    {
+    return -1;
+    }
+
+  return this->Tracks[index]->TrackId;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventTrackInfoBase* vtkVgEventBase::GetTrackInfo(unsigned int index) const
+{
+  if (index >= this->Tracks.size())
+    {
+    return 0;
+    }
+
+  return this->Tracks[index];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::DeepCopy(vtkVgEventBase* src, bool appendRegionPoints)
+{
+  if (src)
+    {
+    this->CopyEventInfo(src);
+
+    // event Id
+    this->Id = src->Id;
+
+    if (appendRegionPoints)
+      {
+      std::map<vtkVgTimeStamp, std::vector<vtkIdType> >::iterator regionIter;
+      for (regionIter = this->Internal->RegionPtIds.begin();
+           regionIter != this->Internal->RegionPtIds.end(); regionIter++)
+        {
+        std::vector<vtkIdType>::iterator ptIdIter;
+        for (ptIdIter = regionIter->second.begin();
+             ptIdIter != regionIter->second.end(); ptIdIter++)
+          {
+          *ptIdIter = this->RegionPoints->InsertNextPoint(
+                        src->RegionPoints->GetPoint(*ptIdIter));
+          }
+        }
+      }
+    else
+      {
+      this->RegionPoints->DeepCopy(src->RegionPoints);
+      }
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::Merge(vtkVgEventBase* other)
+{
+  if (this->GetNumberOfRegions() != 0 || other->GetNumberOfRegions() != 0)
+    {
+    vtkErrorMacro("Merging region-based events is not yet supported.");
+    return false;
+    }
+
+  if (this->GetNumberOfTracks() != 1 || other->GetNumberOfTracks() != 1)
+    {
+    vtkErrorMacro("Cannot merge multi-track events");
+    return false;
+    }
+
+  if (this->Internal->Classifiers.size() != other->Internal->Classifiers.size())
+    {
+    vtkErrorMacro("Cannot merge events with a differing number of classifiers.");
+    return false;
+    }
+
+  if (this->Internal->Classifiers.size() > 1 ||
+      other->Internal->Classifiers.size() > 1)
+    {
+    vtkErrorMacro("Cannot merge events with multiple classifiers.");
+    return false;
+    }
+
+  if (!this->Internal->Classifiers.empty() &&
+      this->Internal->Classifiers.begin()->first !=
+      other->Internal->Classifiers.begin()->first)
+    {
+    vtkErrorMacro("Cannot merge events with different classifier types.");
+    return false;
+    }
+
+  // Lengthen the track to cover the extents in both events.
+  // TODO: Do something with classifier score?
+  if (other->Tracks[0]->StartFrame < this->Tracks[0]->StartFrame)
+    {
+    this->SetTrackStartFrame(0, other->Tracks[0]->StartFrame);
+    }
+  if (other->Tracks[0]->EndFrame > this->Tracks[0]->EndFrame)
+    {
+    this->SetTrackEndFrame(0, other->Tracks[0]->EndFrame);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::CopyTracks(std::vector<vtkVgEventTrackInfoBase*>& tracks)
+{
+  std::vector<vtkVgEventTrackInfoBase*>::const_iterator trackIter;
+  for (trackIter = tracks.begin();
+       trackIter != tracks.end(); trackIter++)
+    {
+    vtkVgEventTrackInfoBase* trackInfo = (*trackIter)->Clone();
+    this->Tracks.push_back(trackInfo);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetTrackStartFrame(unsigned int trackIndex,
+                                        const vtkVgTimeStamp& startFrame)
+{
+  if (trackIndex >= this->GetNumberOfTracks())
+    {
+    vtkErrorMacro("Index out of range.\n");
+    return;
+    }
+
+  if (this->Tracks[trackIndex]->StartFrame == startFrame)
+    {
+    return;
+    }
+
+  this->Tracks[trackIndex]->StartFrame = startFrame;
+
+  this->UpdateEventFrameBounds();
+  this->Flags |= EF_Dirty;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetTrackEndFrame(unsigned int trackIndex,
+                                      const vtkVgTimeStamp& endFrame)
+{
+  if (trackIndex >= this->GetNumberOfTracks())
+    {
+    vtkErrorMacro("Index out of range.\n");
+    return;
+    }
+
+  if (this->Tracks[trackIndex]->EndFrame == endFrame)
+    {
+    return;
+    }
+
+  this->Tracks[trackIndex]->EndFrame = endFrame;
+
+  this->UpdateEventFrameBounds();
+  this->Flags |= EF_Dirty;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::UpdateEventFrameBounds()
+{
+  if (this->GetNumberOfTracks() == 0)
+    {
+    return;
+    }
+
+  const vtkVgEventTrackInfoBase* track0 = this->Tracks[0];
+
+  vtkVgTimeStamp minStartFrame = track0->StartFrame;
+  vtkVgTimeStamp maxEndFrame = track0->EndFrame;
+
+  for (unsigned int i = 1; i < this->GetNumberOfTracks(); ++i)
+    {
+    const vtkVgEventTrackInfoBase* track = this->Tracks[i];
+    if (track->StartFrame < minStartFrame)
+      {
+      minStartFrame = track->StartFrame;
+      }
+    if (maxEndFrame < track->EndFrame)
+      {
+      maxEndFrame = track->EndFrame;
+      }
+    }
+
+  // if values are unchanged, then "Set" won't do anything
+  this->SetStartFrame(minStartFrame);
+  this->SetEndFrame(maxEndFrame);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetStartFrame(const vtkVgTimeStamp& timeStamp)
+{
+  if (this->StartFrame == timeStamp)
+    {
+    return;
+    }
+
+  this->StartFrame = timeStamp;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetEndFrame(const vtkVgTimeStamp& timeStamp)
+{
+  if (this->EndFrame == timeStamp)
+    {
+    return;
+    }
+
+  this->EndFrame = timeStamp;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::ClearTripEvent()
+{
+  if (this->TripEventFlag)
+    {
+    this->TripEventFlag = false;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::SetTripEventInfo(double tripLocation[3],
+                                      const vtkVgTimeStamp& tripTime)
+{
+  this->TripEventFlag = true;
+  this->SetTripEventPosition(tripLocation);
+  this->TripEventTime = tripTime;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::UpdateEvent(vtkVgEventBase* fromEvent)
+{
+  // the one check we make... is that the Id matches the previous Id
+  if (fromEvent->GetId() != this->Id)
+    {
+    vtkErrorMacro("Can only update event if source Id matches original Id");
+    return;
+    }
+
+  this->CopyEventInfo(fromEvent, false);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::CloneEvent(vtkVgEventBase* fromEvent)
+{
+  this->CopyEventInfo(fromEvent);
+  this->SetRegionPoints(fromEvent->GetRegionPoints());
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventBase::CopyEventInfo(vtkVgEventBase* fromEvent,
+                                   bool copyRegionPtIds)
+{
+  this->ClearTracks();
+  this->CopyTracks(fromEvent->Tracks);
+
+  // event start and end info
+  this->StartFrame = fromEvent->StartFrame;
+  this->EndFrame = fromEvent->EndFrame;
+
+  this->Status = fromEvent->Status;
+  this->Flags = fromEvent->Flags;
+  this->SetName(fromEvent->GetName());
+  this->SetNote(fromEvent->GetNote());
+
+  // Trip event info
+  this->TripEventFlag = fromEvent->TripEventFlag;
+  this->SetTripEventPosition(fromEvent->TripEventPosition);
+  this->TripEventTime = fromEvent->TripEventTime;
+
+  // and the internals (classifiers and regions)
+  this->Internal->Copy(fromEvent->Internal, copyRegionPtIds);
+
+  // calling function left to handle the Modified state
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventBase::IsTimeWithinExtents(const vtkVgTimeStamp& timeStamp)
+{
+  // TODO: This seems either unnecessary or wrong. Investigate why the ctor
+  //       defaults the start/end to min_time/max_time.
+  bool hasStart = this->StartFrame.IsValid() && !this->StartFrame.IsMaxTime();
+  bool hasEnd = this->EndFrame.IsValid() && !this->EndFrame.IsMinTime();
+
+  if ((!hasStart || timeStamp >= this->StartFrame) &&
+      (!hasEnd || timeStamp <= this->EndFrame))
+    {
+    return true;
+    }
+  return false;
+}
diff --git a/Libraries/VtkVgCore/vtkVgEventBase.h b/Libraries/VtkVgCore/vtkVgEventBase.h
new file mode 100644
index 00000000..e437ec2c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgEventBase.h
@@ -0,0 +1,388 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventBase_h
+#define __vtkVgEventBase_h
+
+#include <vtkObject.h>
+
+#include "vtkVgMetaObject.h"
+#include "vtkVgTimeStamp.h"
+
+#include <map>
+#include <vector>
+
+#include <vgExport.h>
+
+class vtkIdList;
+class vtkPoints;
+
+class VTKVG_CORE_EXPORT vtkVgEventTrackInfoBase : public vtkVgMetaObject
+{
+  vtkDeclareMetaObject(vtkVgEventTrackInfoBase);
+
+public:
+  vtkVgEventTrackInfoBase(vtkIdType trackId, const vtkVgTimeStamp& startFrame,
+                          const vtkVgTimeStamp& endFrame);
+  vtkVgEventTrackInfoBase(const vtkVgEventTrackInfoBase& fromTrackInfo);
+  virtual ~vtkVgEventTrackInfoBase() {};
+
+  virtual vtkVgEventTrackInfoBase* Clone() const;
+
+  virtual const char* CheckValid() const;
+
+  vtkIdType TrackId;
+  vtkVgTimeStamp StartFrame;
+  vtkVgTimeStamp EndFrame;
+
+protected:
+  const char* CheckBaseValid() const;
+};
+
+class VTKVG_CORE_EXPORT vtkVgEventBase : public vtkObject
+{
+public:
+  enum EventFlags
+    {
+    EF_UserCreated  = 1 << 0,
+    EF_Modifiable   = 1 << 1,
+    EF_Dirty        = 1 << 2,
+    EF_Starred      = 1 << 3
+    };
+
+  enum DisplayFlags
+    {
+    DF_TrackEvent          = 1 << 0,
+    DF_RegionEvent         = 1 << 1,
+    DF_TrackAndRegionEvent = DF_TrackEvent | DF_RegionEvent,
+    DF_Selected            = 1 << 2
+    };
+
+  struct RegionPoint
+    {
+    RegionPoint() : X(0.0), Y(0.0) {}
+    RegionPoint(double x, double y) : X(x), Y(y) {}
+
+    double X;
+    double Y;
+    };
+
+  typedef std::vector<RegionPoint> Region;
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVgEventBase* New();
+  vtkTypeMacro(vtkVgEventBase, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get the points used for the "region" that may or may not be present at
+  // frames during the event.
+  vtkGetObjectMacro(RegionPoints, vtkPoints);
+  void SetRegionPoints(vtkPoints* points);
+
+  void AddRegion(const vtkVgTimeStamp& timeStamp,
+                 vtkIdType numberOfRegionPts, double* regionPts);
+  void SetRegion(const vtkVgTimeStamp& timeStamp,
+                 vtkIdType numberOfRegionPts, double* regionPts);
+  void GetRegion(const vtkVgTimeStamp& timeStamp,
+                 vtkIdType& npts, vtkIdType*& pts);
+  bool GetRegionCenter(const vtkVgTimeStamp& timeStamp, double* center,
+                       bool interpolated);
+  bool GetRegionAtOrAfter(vtkVgTimeStamp& timeStamp,
+                          vtkIdType& npts, vtkIdType*& pts);
+
+  void AddRegion(const vtkVgTimeStamp& timeStamp, const Region& region);
+  Region GetRegion(const vtkVgTimeStamp& timeStamp) const;
+  std::map<vtkVgTimeStamp, Region> GetRegions() const;
+
+  // Description:
+  // Get the closest region with time less than or equal to timestamp, or the
+  // region after if no other region is available. Returns false if the region
+  // found does not have the same timestamp as requested.
+  bool GetClosestDisplayRegion(vtkVgTimeStamp& timeStamp,
+                               vtkIdType& npts, vtkIdType*& pts);
+
+  // Description:
+  // Remove all regions from the event.
+  void ClearRegions();
+
+  // Description:
+  // Return the # of regions.
+  unsigned int GetNumberOfRegions() const;
+
+  // Description:
+  // Methods for efficient traversal of event regions.
+  void InitRegionTraversal();
+  bool GetNextRegion(vtkVgTimeStamp& timeStamp, vtkIdType& npts, vtkIdType*& pts);
+
+  // Description:
+  // Add a classifier, with probability and normalcy, to this event.  If don't
+  // have probability or normalcy, set to a constant value (same for all events)
+  // so that scoring works to set a default "Active" classifier
+  void AddClassifier(int type, double probability = 0, double normalcy = 0);
+
+  // Description:
+  // Remove a classifier.
+  bool RemoveClassifier(int type);
+
+  // Description:
+  // Remove all previously added classifiers.
+  void ResetClassifiers();
+
+  // Description:
+  // Return the # of classifiers for this event
+  unsigned int GetNumberOfClassifiers();
+
+  // Description:
+  // Returns a std::set of all classifier types for this event
+  std::vector<int> GetClassifierTypes();
+
+  // Description:
+  // Methods for iterator traversal of the classifiers.  Note, both the Init
+  // as well as NextClassifier fns return wether the current item is valid.
+  bool InitClassifierTraversal();
+  bool NextClassifier();
+  int GetClassifierType();
+  double GetClassifierProbability();
+  double GetClassifierNormalcy();
+  double GetClassifierScore();
+
+  // Description:
+  // Set/Get the probability for the specified classifier type.  This could
+  // update the ActiveClassifier, if the "score" (1 + prob) / (1 + normalcy)
+  // becomes the largest (if the user didn't already specify a particular
+  // classifier as active).
+  void SetProbability(int classifierType, double probability);
+  double GetProbability(int classifierType);
+
+  // Description:
+  // Set/Get the normalcy for the specified classifier type.  This could
+  // update the ActiveClassifier, if the "score" (1 + prob) / (1 + normalcy)
+  // becomes the largest (if the user didn't already specify a particular
+  // classifier as active).
+  void SetNormalcy(int classifierType, double normalcy);
+  double GetNormalcy(int classifierType);
+
+  // Description:
+  // Does this event use the specified classifier type
+  bool HasClassifier(int classifierType);
+
+  // Description:
+  // If the classifier type exists, set it as the "Active" classifier
+  void SetActiveClassifier(int classifierType);
+
+  // Description:
+  // Clear a user specified active classifier and set the active classifier
+  // to the classifier with the largest score
+  void ResetActiveClassifier();
+
+  // Description:
+  // Get the Type/Normalcy/Probability of the "Active" classifier
+  int GetActiveClassifierType();
+  double GetActiveClassifierNormalcy();
+  double GetActiveClassifierProbability();
+
+  vtkSetMacro(Id, vtkIdType);
+  vtkGetMacro(Id, vtkIdType);
+
+  // Description:
+  // Set/Get the "Name" of the event
+  vtkSetStringMacro(Name);
+  vtkGetStringMacro(Name);
+
+  // Description:
+  // Set/Get a "Note" that is to be associated with this event
+  vtkSetStringMacro(Note);
+  vtkGetStringMacro(Note);
+
+  void SetStartFrame(const vtkVgTimeStamp& timeStamp);
+  vtkVgTimeStamp GetStartFrame() const
+    {
+    return this->StartFrame;
+    }
+
+  void SetEndFrame(const vtkVgTimeStamp& timeStamp);
+  vtkVgTimeStamp GetEndFrame() const
+    {
+    return this->EndFrame;
+    }
+
+  // Description:
+  // Return true if specified time is within event's time range (start, end).
+  bool IsTimeWithinExtents(const vtkVgTimeStamp& timeStamp);
+
+  // Description:
+  // Add a new track Id into the list of tracks related with the event. Do NOT
+  // call this from a subclass (we overload in subclasses to give warning...
+  // if did force call, bad things (crash) likely later on.
+  virtual void AddTrack(vtkIdType trackId, vtkVgTimeStamp& startFrame,
+                        vtkVgTimeStamp& endFrame);
+
+  // Description:
+  // Add a new track info structure into the list of tracks related with the
+  // event. Do NOT call this from a subclass (we overload in subclasses to give
+  // warning... if did force call, bad things (crash) likely later on.
+  void AddTrack(vtkVgEventTrackInfoBase* trackInfo);
+
+  // Description:
+  // Remove track at the specified index
+  void RemoveTrack(unsigned int index);
+
+  // Description:
+  // Swap tracks at given indices
+  void SwapTracks(unsigned int index1, unsigned int index2);
+
+  // Description:
+  // Change the track id in the given slot without modifying the start or end
+  // time
+  void ReplaceTrack(unsigned int index, vtkIdType trackId);
+
+  // Description:
+  // Given a valid index, fill in track and its related parameters.
+  // \TODO: This interface might change in the future.
+  void GetTrack(unsigned int index, vtkIdType& trackId,
+                vtkVgTimeStamp& startFrame,
+                vtkVgTimeStamp& endFrame);
+
+  // Description:
+  // Return trackId at the specified index
+  vtkIdType GetTrackId(unsigned int index) const;
+
+  // Description:
+  // Return track info at the specified index
+  vtkVgEventTrackInfoBase* GetTrackInfo(unsigned int index) const;
+
+  // Description:
+  // Get the # of tracks.
+  unsigned int GetNumberOfTracks() const;
+
+  // Description:
+  // Get the # of track groups (tracks with same id can be grouped for display)
+  unsigned int GetNumberOfTrackGroups() const;
+
+  // Description:
+  // Set track frame info
+  void SetTrackStartFrame(unsigned int trackIndex,
+                          const vtkVgTimeStamp& startFrame);
+  void SetTrackEndFrame(unsigned int trackIndex,
+                        const vtkVgTimeStamp& endFrame);
+
+  void DeepCopy(vtkVgEventBase* src, bool appendRegionPoints = false);
+
+  // Description:
+  // Merge with another event, leaving the second event unmodified
+  bool Merge(vtkVgEventBase* other);
+
+  // Description:
+  // Set/Get the status of the event (adjudicated, excluded, or otherwise)
+  vtkSetMacro(Status, int);
+  vtkGetMacro(Status, int);
+
+  // Description:
+  // Set/Get the flags of the event
+  int GetFlags(int mask) const
+    { return this->Flags & mask; }
+
+  void SetFlags(int mask)
+    { this->Flags |= mask; }
+
+  void ClearFlags(int mask)
+    { this->Flags &= ~mask; }
+
+  bool IsUserCreated()
+    { return (this->Flags & EF_UserCreated) != 0; }
+
+  bool IsModifiable()
+    { return (this->Flags & EF_Modifiable) != 0; }
+
+  bool IsDirty()
+    { return (this->Flags & EF_Dirty) != 0; }
+
+  bool IsStarred()
+    { return (this->Flags & EF_Starred) != 0; }
+
+  // Description:
+  // Set/Get the display flags of the event
+  vtkSetMacro(DisplayFlags, unsigned);
+  vtkGetMacro(DisplayFlags, unsigned);
+
+  // Description:
+  // Since, for now, this is just to support trip wire events, I'm
+  // going to keep the implementation specific to that.  The trip "property"
+  // is a single point (and time, though actually don't need that right now).
+  // Note, the IsTripEvent state is set by setting the info and clearing it.
+  bool IsTripEvent()
+    {
+    return this->TripEventFlag;
+    }
+  void ClearTripEvent();
+  void SetTripEventInfo(double tripLocation[3], const vtkVgTimeStamp& tripTime);
+  vtkGetVector3Macro(TripEventPosition, double);
+  vtkVgTimeStamp GetTripEventTime()
+    {
+    return this->TripEventTime;
+    }
+
+  // Description:
+  // Replace event definition based on input event
+  virtual void UpdateEvent(vtkVgEventBase* fromEvent);
+
+  // Description:
+  // Make this event a copy of the input event.  Note that it will be set to
+  // use the same RegionPoints as the event being cloned.  Thus this is similar
+  // to a ShallowCopy, though the Id is NOT copied as part of the cloning
+  void CloneEvent(vtkVgEventBase* fromEvent);
+
+protected:
+  vtkVgEventBase();
+  ~vtkVgEventBase();
+
+  vtkSetVector3Macro(TripEventPosition, double);
+
+  void ClearTracks();
+  virtual void CopyTracks(std::vector<vtkVgEventTrackInfoBase*>& tracks);
+
+  // Recalculate start and end times based on component tracks
+  void UpdateEventFrameBounds();
+
+  // Copy almost everything but the RegionPoints, which is handled differently
+  // depending on whether calling DeepCopy, UpdateEvent, or CloneEvent.
+  // The copyRegionPtIds flag indicates whether the "internal" RegionPtIds
+  // should be copied. The default (true) is used by both DeepCopy and
+  // CloneEvent.  UpdateEvent, which does not assume an exactly matching
+  // RegionPoints, sets the flag to false when calling.
+  // The calling fn should handle calling Modified()
+  void CopyEventInfo(vtkVgEventBase* fromEvent, bool copyRegionPtIds = true);
+
+  std::vector<vtkVgEventTrackInfoBase*> Tracks;
+
+  vtkPoints* RegionPoints;
+
+  vtkIdType Id;
+  char* Name;
+  char* Note;
+
+  vtkVgTimeStamp StartFrame;
+  vtkVgTimeStamp EndFrame;
+
+  int Status;
+  unsigned Flags;
+  unsigned DisplayFlags;
+
+  bool TripEventFlag;
+  double TripEventPosition[3];
+  vtkVgTimeStamp TripEventTime;
+
+private:
+  vtkVgEventBase(const vtkVgEventBase&); // Not implemented.
+  void operator=(const vtkVgEventBase&);  // Not implemented.
+
+  class vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgEventBase_h
diff --git a/Libraries/VtkVgCore/vtkVgEventRenderSetup.cxx b/Libraries/VtkVgCore/vtkVgEventRenderSetup.cxx
new file mode 100644
index 00000000..b1b95b1b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgEventRenderSetup.cxx
@@ -0,0 +1,61 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventRenderSetup.h"
+
+vtkStandardNewMacro(vtkVgEventRenderSetup);
+
+//-----------------------------------------------------------------------------
+class vtkVgEventRenderSetup::vtkInternal
+{
+  vtkInternal();
+  ~vtkInternal();
+};
+
+//-----------------------------------------------------------------------------
+vtkVgEventRenderSetup::vtkInternal::vtkInternal()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventRenderSetup::vtkInternal::~vtkInternal()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventRenderSetup::vtkVgEventRenderSetup() : vtkObject()
+{
+  this->Internal = new vtkInternal();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventRenderSetup::~vtkVgEventRenderSetup()
+{
+  if (this->Internal)
+    {
+    delete this->Internal;
+    this->Internal = 0x0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRenderSetup::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRenderSetup::SetColor(int type, const double& r, const double& g,
+                                     const double& b)
+{
+  // @TODO: Implement this.
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRenderSetup::GetColor(int type, double& r, double& g, double& b)
+{
+  // @TODO: Implement this.
+}
diff --git a/Libraries/VtkVgCore/vtkVgEventRenderSetup.h b/Libraries/VtkVgCore/vtkVgEventRenderSetup.h
new file mode 100644
index 00000000..9bc25d34
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgEventRenderSetup.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventRenderSetup_h
+#define __vtkVgEventRenderSetup_h
+
+// VTK includes.
+#include <vtkObject.h>
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgEventRenderSetup : public vtkObject
+{
+public:
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVgRenderSetup* New();
+
+  vtkTypeMacro(vtkVgRenderSetup, vtkObject);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  void SetColor(int type, const double& r, const double& g, const double& b);
+  void GetColor(int type, const double& r, const double& g, const double& b);
+
+protected:
+  // Description:
+  // Constructor / Destructor.
+  vtkVgEventRenderSetup();
+  ~vtkVgEventRenderSetup();
+
+private:
+  vtkVgEventRenderSetup(const vtkVgEventRenderSetup&);  // Not implemented.
+  void operator=(const vtkVgEventRenderSetup&);         // Not implemented.
+
+  class vtkInternal;
+  vtkVgEventRenderSetup::vtkInternal* Internal;
+};
+
+
+#endif // __vtkVgEventRenderSetup_h
diff --git a/Libraries/VtkVgCore/vtkVgEventTypeRegistry.cxx b/Libraries/VtkVgCore/vtkVgEventTypeRegistry.cxx
new file mode 100644
index 00000000..90a6bcd5
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgEventTypeRegistry.cxx
@@ -0,0 +1,62 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventTypeRegistry.h"
+
+#include <vtkObjectFactory.h>
+
+template class vtkVgTypeRegistry<vgEventType>;
+
+vtkStandardNewMacro(vtkVgEventTypeRegistry);
+
+//-----------------------------------------------------------------------------
+vtkVgEventTypeRegistry::vtkVgEventTypeRegistry()
+{
+  this->InvalidType.SetName("Unknown");
+}
+
+//-----------------------------------------------------------------------------
+const vgEventType& vtkVgEventTypeRegistry::GetTypeById(int id)
+{
+  int index = this->GetTypeIndex(id);
+  if (index == -1)
+    {
+    this->WarnTypeNotFound(id);
+    return this->InvalidType;
+    }
+  return this->GetType(index);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventTypeRegistry::RemoveTypeById(int id)
+{
+  int index = this->GetTypeIndex(id);
+  if (index == -1)
+    {
+    this->WarnTypeNotFound(id);
+    return;
+    }
+  return this->RemoveType(index);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgEventTypeRegistry::GetTypeIndex(int id) const
+{
+  for (int i = 0, end = this->GetNumberOfTypes(); i < end; ++i)
+    {
+    if (this->GetType(i).GetId() == id)
+      {
+      return i;
+      }
+    }
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventTypeRegistry::WarnTypeNotFound(int id)
+{
+  vtkErrorMacro("Event type id is not registered: " << id);
+}
diff --git a/Libraries/VtkVgCore/vtkVgEventTypeRegistry.h b/Libraries/VtkVgCore/vtkVgEventTypeRegistry.h
new file mode 100644
index 00000000..3d85d71b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgEventTypeRegistry.h
@@ -0,0 +1,45 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventTypeRegistry_h
+#define __vtkVgEventTypeRegistry_h
+
+#include "vtkVgTypeRegistry.h"
+
+#include <vgExport.h>
+#include <vgEventType.h>
+
+class VTKVG_CORE_EXPORT vtkVgEventTypeRegistry
+  : public vtkVgTypeRegistry<vgEventType>
+{
+  typedef vtkVgTypeRegistry<vgEventType> BaseClassType;
+public:
+  static vtkVgEventTypeRegistry* New();
+
+  vtkTypeMacro(vtkVgEventTypeRegistry, BaseClassType);
+
+  vtkVgEventTypeRegistry();
+
+  // Description:
+  // Access to registered types.
+  const vgEventType& GetTypeById(int id);
+
+  // Description:
+  // Remove registered event type with given id.
+  void RemoveTypeById(int id);
+
+  // Description:
+  // Get index of registered event type or -1 if not found.
+  int GetTypeIndex(int id) const;
+
+protected:
+  virtual void WarnTypeNotFound(int id);
+
+private:
+  vgEventType InvalidType;
+};
+
+#endif // __vtkVgEventTypeRegistry_h
diff --git a/Libraries/VtkVgCore/vtkVgGeoCoord.cxx b/Libraries/VtkVgCore/vtkVgGeoCoord.cxx
new file mode 100644
index 00000000..dc1b283c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgGeoCoord.cxx
@@ -0,0 +1 @@
+#include "vtkVgGeoCoord.h"
diff --git a/Libraries/VtkVgCore/vtkVgGeoCoord.h b/Libraries/VtkVgCore/vtkVgGeoCoord.h
new file mode 100644
index 00000000..2a5b8570
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgGeoCoord.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgGeoCoord_h
+#define __vtkVgGeoCoord_h
+
+#include <vgExport.h>
+
+#include <vgGeodesy.h>
+#include <vgGeoTypes.h>
+
+#include "vtkVgPythonUtil.h"
+
+class VTKVG_CORE_EXPORT vtkVgGeoCoord : public vgGeocodedCoordinate
+{
+public:
+  vtkVgGeoCoord() {}
+  vtkVgGeoCoord(double northing, double easting,
+                int gcs = vgGeodesy::LatLon_Wgs84)
+    {
+    this->Northing = northing;
+    this->Easting = easting;
+    this->GCS = gcs;
+    }
+
+  vtkVgGeoCoord(const vgGeocodedCoordinate& other) :
+    vgGeocodedCoordinate(other)
+    {}
+
+  vtkVgPythonGetSet(int, GCS);
+  vtkVgPythonGetSet(double, Northing);
+  vtkVgPythonGetSet(double, Easting);
+  vtkVgPythonGetSet(double, Latitude);
+  vtkVgPythonGetSet(double, Longitude);
+
+  bool IsValid() const { return this->GCS != -1; }
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgGraphMapper.cxx b/Libraries/VtkVgCore/vtkVgGraphMapper.cxx
new file mode 100644
index 00000000..09a5b7c8
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgGraphMapper.cxx
@@ -0,0 +1,978 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgGraphMapper.cxx
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+/*-------------------------------------------------------------------------
+  Copyright 2008 Sandia Corporation.
+  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+  the U.S. Government retains certain rights in this software.
+-------------------------------------------------------------------------*/
+#include "vtkVgGraphMapper.h"
+
+#include "vtkVgApplySelectedColor.h"
+
+#include "vtkActor.h"
+#include "vtkActor2D.h"
+#include "vtkVgArcParallelEdgeStrategy.h"
+#include "vtkCamera.h"
+#include "vtkCellArray.h"
+#include "vtkCellData.h"
+#include "vtkDirectedGraph.h"
+#include "vtkEdgeLayout.h"
+#include "vtkExecutive.h"
+#include "vtkFollower.h"
+#include "vtkGarbageCollector.h"
+#include "vtkGlyph3DMapper.h"
+#include "vtkGraphToPolyData.h"
+#include "vtkIconGlyphFilter.h"
+#include "vtkImageData.h"
+#include "vtkInformation.h"
+#include "vtkLabelPlacementMapper.h"
+#include "vtkLookupTableWithEnabling.h"
+#include "vtkMapArrayValues.h"
+#include "vtkMath.h"
+#include "vtkObjectFactory.h"
+#include "vtkPassThroughEdgeStrategy.h"
+#include "vtkPNGReader.h"
+#include "vtkPlaneSource.h"
+#include "vtkPointData.h"
+#include "vtkPointSetToLabelHierarchy.h"
+#include "vtkPolyData.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkPolyDataMapper2D.h"
+#include "vtkProperty.h"
+#include "vtkRenderer.h"
+#include "vtkTextProperty.h"
+#include "vtkTexture.h"
+#include "vtkTexturedActor2D.h"
+#include "vtkTransformCoordinateSystems.h"
+#include "vtkUndirectedGraph.h"
+#include "vtkVertexGlyphFilter.h"
+#include "vtkViewTheme.h"
+
+vtkStandardNewMacro(vtkVgGraphMapper);
+
+#define VTK_CREATE(type,name) \
+  vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
+
+//----------------------------------------------------------------------------
+vtkVgGraphMapper::vtkVgGraphMapper()
+{
+  this->GraphToPoly       = vtkSmartPointer<vtkGraphToPolyData>::New();
+  this->VertexGlyph       = vtkSmartPointer<vtkVertexGlyphFilter>::New();
+  this->IconTypeToIndex   = vtkSmartPointer<vtkMapArrayValues>::New();
+  this->IconGlyph         = vtkSmartPointer<vtkIconGlyphFilter>::New();
+  this->IconTransform     = vtkSmartPointer<vtkTransformCoordinateSystems>::New();
+  this->EdgeMapper        = vtkSmartPointer<vtkPolyDataMapper>::New();
+  this->VertexMapper      = vtkSmartPointer<vtkGlyph3DMapper>::New();
+  this->IconMapper        = vtkSmartPointer<vtkPolyDataMapper2D>::New();
+  this->EdgeActor         = vtkSmartPointer<vtkActor>::New();
+  this->VertexActor       = vtkSmartPointer<vtkActor>::New();
+  this->IconActor         = vtkSmartPointer<vtkTexturedActor2D>::New();
+  this->LabelMapper       = vtkSmartPointer<vtkLabelPlacementMapper>::New();
+  this->LabelActor        = vtkSmartPointer<vtkActor2D>::New();
+  this->PointsToLabels    = vtkSmartPointer<vtkPointSetToLabelHierarchy>::New();
+  this->ApplyColors       = vtkSmartPointer<vtkVgApplySelectedColor>::New();
+
+  this->EdgeLayout  = vtkSmartPointer<vtkEdgeLayout>::New();
+  this->PassThroughEdgeStrategy
+    = vtkSmartPointer<vtkPassThroughEdgeStrategy>::New();
+  this->ArcParallelEdgeStrategy
+    = vtkSmartPointer<vtkVgArcParallelEdgeStrategy>::New();
+
+  this->ArcParallelEdgeStrategy->SetMinLoopHeight(0.05);
+  this->ArcParallelEdgeStrategy->SetMaxLoopHeight(0.15);
+  this->ArcParallelEdgeStrategy->SetNumberOfSubdivisions(20);
+  this->EdgeLayout->SetLayoutStrategy(this->PassThroughEdgeStrategy);
+
+  this->VertexLookupTable = vtkLookupTableWithEnabling::New();
+  this->EdgeLookupTable   = vtkLookupTableWithEnabling::New();
+  this->VertexColorArrayNameInternal = 0;
+  this->VertexSelectionArrayNameInternal = 0;
+  this->EdgeColorArrayNameInternal = 0;
+  this->EdgeSelectionArrayNameInternal = 0;
+  this->EnabledEdgesArrayName = 0;
+  this->EnabledVerticesArrayName = 0;
+  this->VertexPointSize = 5;
+  this->EdgeLineWidth = 1;
+  this->ScaledGlyphs = false;
+  this->ScalingArrayName = 0;
+
+  this->VertexMapper->SetScalarModeToUsePointFieldData();
+  this->VertexMapper->SelectColorArray("vtkVgApplySelectedColor color");
+  this->VertexMapper->SetLookupTable(this->VertexLookupTable);
+  this->VertexMapper->SetScalarVisibility(true);
+  this->VertexMapper->ImmediateModeRenderingOff();
+  this->VertexMapper->SetClamping(false);
+  this->VertexActor->PickableOn();
+  this->VertexActor->GetProperty()->SetPointSize(this->GetVertexPointSize());
+  this->EdgeMapper->SetScalarModeToUseCellFieldData();
+  this->EdgeMapper->SelectColorArray("vtkVgApplySelectedColor color");
+  this->EdgeMapper->SetLookupTable(this->EdgeLookupTable);
+  this->EdgeMapper->SetScalarVisibility(true);
+  this->EdgeMapper->ImmediateModeRenderingOff();
+  this->EdgeActor->SetPosition(0, 0, -0.003);
+  this->EdgeActor->GetProperty()->SetLineWidth(this->GetEdgeLineWidth());
+  //this->EdgeActor->GetProperty()->SetColor(0.5, 0.5, 0.5);
+  this->EdgeActor->GetProperty()->SetOpacity(0.9);
+
+  this->ApplyColors->SetDefaultCellColor(0.5, 0.5, 0.5);
+  this->ApplyColors->SetInputConnection(this->EdgeLayout->GetOutputPort());
+
+  this->IconTransform->SetInputCoordinateSystemToWorld();
+  this->IconTransform->SetOutputCoordinateSystemToDisplay();
+  this->IconTransform->SetInputConnection(this->VertexGlyph->GetOutputPort());
+
+  this->IconTypeToIndex->SetInputConnection(this->IconTransform->GetOutputPort());
+  this->IconTypeToIndex->SetFieldType(vtkMapArrayValues::POINT_DATA);
+  this->IconTypeToIndex->SetOutputArrayType(VTK_INT);
+  this->IconTypeToIndex->SetPassArray(0);
+  this->IconTypeToIndex->SetFillValue(-1);
+
+  this->IconGlyph->SetInputConnection(this->IconTypeToIndex->GetOutputPort());
+  this->IconGlyph->SetUseIconSize(true);
+  this->IconMapper->SetInputConnection(this->IconGlyph->GetOutputPort());
+  this->IconMapper->ScalarVisibilityOff();
+
+  this->IconActor->SetMapper(this->IconMapper);
+  this->IconArrayNameInternal = 0;
+
+  this->VertexMapper->SetInputConnection(this->VertexGlyph->GetOutputPort());
+  this->VertexActor->SetMapper(this->VertexMapper);
+  this->EdgeMapper->SetInputConnection(this->GraphToPoly->GetOutputPort());
+  this->EdgeActor->SetMapper(this->EdgeMapper);
+
+  this->PointsToLabels->SetInputConnection(this->GraphToPoly->GetOutputPort());
+  this->PointsToLabels->GetTextProperty()->SetJustificationToCentered();
+  this->PointsToLabels->GetTextProperty()->SetVerticalJustificationToCentered();
+  this->PointsToLabels->GetTextProperty()->SetBold(1);
+
+  this->LabelMapper->SetInputConnection(this->PointsToLabels->GetOutputPort());
+  this->LabelActor->SetMapper(this->LabelMapper);
+
+  // Set default parameters
+  this->SetVertexColorArrayName("VertexDegree");
+  this->SetVertexSelectionArrayName("Selected");
+  this->SetColorVertices(false);
+  this->SetEdgeColorArrayName("weight");
+  this->SetEdgeSelectionArrayName("Selected");
+  this->SetColorEdges(false);
+  this->SetEnabledEdgesArrayName("weight");
+  this->SetEnabledVerticesArrayName("VertexDegree");
+  this->EnableEdgesByArray = 0;
+  this->EnableVerticesByArray = 0;
+  this->IconVisibilityOff();
+  this->LabelVisibilityOff();
+}
+
+//----------------------------------------------------------------------------
+vtkVgGraphMapper::~vtkVgGraphMapper()
+{
+  // Delete internally created objects.
+  // Note: All of the smartpointer objects
+  //       will be deleted for us
+
+  this->SetVertexColorArrayNameInternal(0);
+  this->SetVertexSelectionArrayNameInternal(0);
+  this->SetEdgeColorArrayNameInternal(0);
+  this->SetEdgeSelectionArrayNameInternal(0);
+  this->SetEnabledEdgesArrayName(0);
+  this->SetEnabledVerticesArrayName(0);
+  this->SetIconArrayNameInternal(0);
+  this->VertexLookupTable->Delete();
+  this->VertexLookupTable = 0;
+  this->EdgeLookupTable->Delete();
+  this->EdgeLookupTable = 0;
+  if (this->ScalingArrayName != 0)
+    {
+    delete[] this->ScalingArrayName;
+    }
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetUseEdgeLayout(bool enabled)
+{
+  if (enabled)
+    {
+    this->EdgeLayout->SetLayoutStrategy(this->ArcParallelEdgeStrategy);
+    }
+  else
+    {
+    this->EdgeLayout->SetLayoutStrategy(this->PassThroughEdgeStrategy);
+    }
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetIconArrayName(const char* name)
+{
+  this->SetIconArrayNameInternal(name);
+  this->IconGlyph->SetInputArrayToProcess(0, 0, 0,
+                                          vtkDataObject::FIELD_ASSOCIATION_POINTS, name);
+  this->IconTypeToIndex->SetInputArrayName(name);
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVgGraphMapper::GetIconArrayName()
+{
+  return this->GetIconArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetScaledGlyphs(bool arg)
+{
+  if (arg)
+    {
+    if (this->ScalingArrayName)
+      {
+      if (this->VertexGeometries.empty())
+        {
+        vtkPolyData* circle = this->CreateCircle(true);
+        this->SetVertexGeometry(circle);
+        circle->Delete();
+        }
+
+      this->VertexMapper->SetScaling(1);
+      this->VertexMapper->SetScaleArray(this->ScalingArrayName);
+      this->VertexMapper->SetScaleModeToScaleByMagnitude();
+      }
+    else
+      {
+      vtkErrorMacro("No scaling array name set");
+      }
+    }
+  else
+    {
+    this->VertexMapper->SetInputConnection(this->VertexGlyph->GetOutputPort());
+    }
+}
+
+
+//----------------------------------------------------------------------------
+// Helper method
+vtkPolyData* vtkVgGraphMapper::CreateCircle(bool vtkNotUsed(filled))
+{
+  int circleRes = 16;
+  vtkIdType ptIds[17];
+  double x[3], theta;
+
+  // Allocate storage
+  vtkPolyData* poly = vtkPolyData::New();
+  VTK_CREATE(vtkPoints, pts);
+  VTK_CREATE(vtkCellArray, circle);
+
+  // generate points around the circle
+  x[2] = 0.0;
+  theta = 2.0 * vtkMath::Pi() / circleRes;
+  for (int i = 0; i < circleRes; i++)
+    {
+    x[0] = 0.5 * cos(i * theta);
+    x[1] = 0.5 * sin(i * theta);
+    ptIds[i] = pts->InsertNextPoint(x);
+    }
+  circle->InsertNextCell(circleRes, ptIds);
+
+  poly->SetPoints(pts);
+  poly->SetPolys(circle);
+  return poly;
+}
+
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexColorArrayName(const char* name)
+{
+  this->SetVertexColorArrayNameInternal(name);
+  this->ApplyColors->SetInputArrayToProcess(1, 0, 0,
+                                            vtkDataObject::FIELD_ASSOCIATION_VERTICES, name);
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVgGraphMapper::GetVertexColorArrayName()
+{
+  return this->GetVertexColorArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexSelectionArrayName(const char* name)
+{
+  this->SetVertexSelectionArrayNameInternal(name);
+  this->ApplyColors->SetInputArrayToProcess(0, 0, 0,
+                                            vtkDataObject::FIELD_ASSOCIATION_VERTICES, name);
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVgGraphMapper::GetVertexSelectionArrayName()
+{
+  return this->GetVertexSelectionArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetLabelArrayName(const char* name)
+{
+  this->PointsToLabels->SetLabelArrayName(name);
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVgGraphMapper::GetLabelArrayName()
+{
+  return this->PointsToLabels->GetLabelArrayName();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetUseVertexSelection(bool enable)
+{
+  this->ApplyColors->SetUsePointSelection(enable);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGraphMapper::GetUseVertexSelection()
+{
+  return this->ApplyColors->GetUsePointSelection();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetColorVertices(bool vis)
+{
+  this->ApplyColors->SetUsePointScalars(vis);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGraphMapper::GetColorVertices()
+{
+  return this->ApplyColors->GetUsePointScalars();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetIconVisibility(bool vis)
+{
+  this->IconActor->SetVisibility(vis);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGraphMapper::GetIconVisibility()
+{
+  return this->IconActor->GetVisibility() != 0;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetLabelVisibility(bool vis)
+{
+  this->LabelActor->SetVisibility(vis);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGraphMapper::GetLabelVisibility()
+{
+  return this->LabelActor->GetVisibility() != 0;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetEdgeColorArrayName(const char* name)
+{
+  this->SetEdgeColorArrayNameInternal(name);
+  this->ApplyColors->SetInputArrayToProcess(3, 0, 0,
+    vtkDataObject::FIELD_ASSOCIATION_EDGES, name);
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVgGraphMapper::GetEdgeColorArrayName()
+{
+  return this->GetEdgeColorArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetEdgeSelectionArrayName(const char* name)
+{
+  this->SetEdgeSelectionArrayNameInternal(name);
+  this->ApplyColors->SetInputArrayToProcess(2, 0, 0,
+    vtkDataObject::FIELD_ASSOCIATION_EDGES, name);
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVgGraphMapper::GetEdgeSelectionArrayName()
+{
+  return this->GetEdgeSelectionArrayNameInternal();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetUseEdgeSelection(bool enable)
+{
+  this->ApplyColors->SetUseCellSelection(enable);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGraphMapper::GetUseEdgeSelection()
+{
+  return this->ApplyColors->GetUseCellSelection();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetColorEdges(bool vis)
+{
+  this->ApplyColors->SetUseCellScalars(vis);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGraphMapper::GetColorEdges()
+{
+  return this->ApplyColors->GetUseCellScalars();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexPointSize(float size)
+{
+  this->VertexPointSize = size;
+  this->VertexActor->GetProperty()->SetPointSize(this->GetVertexPointSize());
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetEdgeLineWidth(float width)
+{
+  this->EdgeLineWidth = width;
+  this->EdgeActor->GetProperty()->SetLineWidth(this->GetEdgeLineWidth());
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::AddIconType(char* type, int index)
+{
+  this->IconTypeToIndex->AddToMap(type, index);
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::ClearIconTypes()
+{
+  this->IconTypeToIndex->ClearMap();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexVisibility(bool vis)
+{
+  this->VertexActor->SetVisibility(vis);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGraphMapper::GetVertexVisibility()
+{
+  return this->VertexActor->GetVisibility() ? true : false;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetEdgeVisibility(bool vis)
+{
+  this->EdgeActor->SetVisibility(vis);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGraphMapper::GetEdgeVisibility()
+{
+  return this->EdgeActor->GetVisibility() ? true : false;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetIconSize(int* size)
+{
+  this->IconGlyph->SetIconSize(size);
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetIconAlignment(int alignment)
+{
+  this->IconGlyph->SetGravity(alignment);
+}
+
+//----------------------------------------------------------------------------
+int* vtkVgGraphMapper::GetIconSize()
+{
+  return this->IconGlyph->GetIconSize();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetIconTexture(vtkTexture* texture)
+{
+  this->IconActor->SetTexture(texture);
+}
+
+//----------------------------------------------------------------------------
+vtkTexture* vtkVgGraphMapper::GetIconTexture()
+{
+  return this->IconActor->GetTexture();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetInputData(vtkGraph* input)
+{
+  if (input)
+    {
+    this->SetInputDataInternal(0, input);
+    }
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+vtkGraph* vtkVgGraphMapper::GetInput()
+{
+  vtkGraph* inputGraph =
+    vtkGraph::SafeDownCast(this->Superclass::GetInputAsDataSet());
+  return inputGraph;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexGeometry(vtkPolyData* vertexGeometry)
+{
+  this->SetVertexGeometry(0, vertexGeometry);
+}
+
+//----------------------------------------------------------------------------
+vtkSmartPointer<vtkPolyData> vtkVgGraphMapper::GetVertexGeometry()
+{
+  return this->GetVertexGeometry(0);
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexGeometry(vtkIdType index, vtkPolyData* vertexGeometry)
+{
+  if (!vertexGeometry)
+    {
+    vtkErrorMacro("ERROR: Invalid (NULL) vertex geometry\n");
+    return;
+    }
+
+  this->VertexGeometries[index] = vertexGeometry;
+
+  this->VertexMapper->SetSourceData(index, this->VertexGeometries[index]);
+
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+vtkSmartPointer<vtkPolyData> vtkVgGraphMapper::GetVertexGeometry(vtkIdType index)
+{
+  std::map<vtkIdType, vtkSmartPointer<vtkPolyData> >::iterator itr =
+    this->VertexGeometries.find(index);
+
+  if (itr != this->VertexGeometries.end())
+    {
+    return itr->second;
+    }
+  else
+    {
+    return 0;
+    }
+}
+
+// ---------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexGeometryIndexArray(const char* arrayName)
+{
+  this->VertexMapper->SetSourceIndexArray(arrayName);
+}
+
+// ---------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexGeometryIndexArray(int fieldAttributeType)
+{
+  this->VertexMapper->SetSourceIndexArray(fieldAttributeType);
+}
+
+// ---------------------------------------------------------------------------
+void vtkVgGraphMapper::SetVertexGeometryIndexing(int value)
+{
+  if (value == 1)
+    {
+    this->VertexMapper->SetSourceIndexing(true);
+    }
+  else if (value == 0)
+    {
+    this->VertexMapper->SetSourceIndexing(false);
+    }
+  else
+    {
+    // Do nothing.
+    }
+}
+
+// ---------------------------------------------------------------------------
+void vtkVgGraphMapper::GetVertexGeometryIndexing(int& value)
+{
+  value = this->VertexMapper->GetSourceIndexing();
+}
+
+// ---------------------------------------------------------------------------
+void vtkVgGraphMapper::SetNumberOfVertexGeometrySources(int number)
+{
+  this->VertexMapper->SetRange(0.0, static_cast<double>(number));
+}
+
+// ---------------------------------------------------------------------------
+void vtkVgGraphMapper::GetNumberOfVertexGeometrySources(int& number)
+{
+  double range[2];
+  this->VertexMapper->GetRange(range);
+
+  number = static_cast<int>(range[1]);
+}
+
+// ---------------------------------------------------------------------------
+void vtkVgGraphMapper::SetEdgeOpacity(double value)
+{
+  this->EdgeActor->GetProperty()->SetOpacity(value);
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::ReleaseGraphicsResources(vtkWindow* renWin)
+{
+  if (this->EdgeMapper)
+    {
+    this->EdgeMapper->ReleaseGraphicsResources(renWin);
+    }
+  if (this->VertexMapper)
+    {
+    this->VertexMapper->ReleaseGraphicsResources(renWin);
+    }
+  if (this->IconMapper)
+    {
+    this->IconMapper->ReleaseGraphicsResources(renWin);
+    }
+}
+
+//----------------------------------------------------------------------------
+// Receives from Actor -> maps data to primitives
+//
+void vtkVgGraphMapper::Render(vtkRenderer* ren, vtkActor* vtkNotUsed(act))
+{
+  // make sure that we've been properly initialized
+  if (!this->GetExecutive()->GetInputData(0, 0))
+    {
+    vtkErrorMacro(<< "No input!\n");
+    return;
+    }
+
+  // Update the pipeline up until the graph to poly data
+  vtkGraph* input = vtkGraph::SafeDownCast(this->GetExecutive()->GetInputData(0, 0));
+  if (!input)
+    {
+    vtkErrorMacro(<< "Input is not a graph!\n");
+    return;
+    }
+  vtkGraph* graph = 0;
+  if (vtkDirectedGraph::SafeDownCast(input))
+    {
+    graph = vtkDirectedGraph::New();
+    }
+  else
+    {
+    graph = vtkUndirectedGraph::New();
+    }
+  graph->ShallowCopy(input);
+
+  this->EdgeLayout->SetInputData(graph);
+  this->GraphToPoly->SetInputConnection(this->ApplyColors->GetOutputPort());
+  this->VertexGlyph->SetInputConnection(this->ApplyColors->GetOutputPort());
+  graph->Delete();
+  this->GraphToPoly->Update();
+  this->VertexGlyph->Update();
+  vtkPolyData* edgePd = this->GraphToPoly->GetOutput();
+  vtkPolyData* vertPd = this->VertexGlyph->GetOutput();
+
+  // Try to find the range the user-specified color array.
+  // If we cannot find that array, use the scalar range.
+  double range[2];
+  vtkDataArray* arr = 0;
+  if (this->GetColorEdges())
+    {
+    if (this->GetEdgeColorArrayName())
+      {
+      arr = edgePd->GetCellData()->GetArray(this->GetEdgeColorArrayName());
+      }
+    if (!arr)
+      {
+      arr = edgePd->GetCellData()->GetScalars();
+      }
+    if (arr)
+      {
+      arr->GetRange(range);
+      this->EdgeMapper->SetScalarRange(range[0], range[1]);
+      }
+    }
+
+  arr = 0;
+  if (this->EnableEdgesByArray && this->EnabledEdgesArrayName)
+    {
+    vtkLookupTableWithEnabling::SafeDownCast(this->EdgeLookupTable)->SetEnabledArray(
+      edgePd->GetCellData()->GetArray(this->GetEnabledEdgesArrayName()));
+    }
+  else
+    {
+    vtkLookupTableWithEnabling::SafeDownCast(this->EdgeLookupTable)->SetEnabledArray(0);
+    }
+
+  // Do the same thing for the vertex array.
+  arr = 0;
+  if (this->GetColorVertices())
+    {
+    if (this->GetVertexColorArrayName())
+      {
+      arr = vertPd->GetPointData()->GetArray(this->GetVertexColorArrayName());
+      }
+    if (!arr)
+      {
+      arr = vertPd->GetPointData()->GetScalars();
+      }
+    if (arr)
+      {
+      arr->GetRange(range);
+      this->VertexMapper->SetScalarRange(range[0], range[1]);
+      }
+    }
+
+  arr = 0;
+  if (this->EnableVerticesByArray && this->EnabledVerticesArrayName)
+    {
+    vtkLookupTableWithEnabling::SafeDownCast(this->VertexLookupTable)->SetEnabledArray(
+      vertPd->GetPointData()->GetArray(this->GetEnabledVerticesArrayName()));
+    }
+  else
+    {
+    vtkLookupTableWithEnabling::SafeDownCast(this->VertexLookupTable)->SetEnabledArray(0);
+    }
+
+  if (this->IconActor->GetTexture() &&
+      this->IconActor->GetTexture()->GetInput() &&
+      this->IconActor->GetVisibility())
+    {
+    this->IconTransform->SetViewport(ren);
+    this->IconActor->GetTexture()->MapColorScalarsThroughLookupTableOff();
+    this->IconActor->GetTexture()->Update();
+    int* dim = this->IconActor->GetTexture()->GetInput()->GetDimensions();
+    this->IconGlyph->SetIconSheetSize(dim);
+    // Override the array for vtkIconGlyphFilter to process if we have
+    // a map of icon types.
+    if (this->IconTypeToIndex->GetMapSize())
+      {
+      this->IconGlyph->SetInputArrayToProcess(0, 0, 0,
+        vtkDataObject::FIELD_ASSOCIATION_POINTS,
+        this->IconTypeToIndex->GetOutputArrayName());
+      }
+    }
+  if (this->EdgeActor->GetVisibility())
+    {
+    this->EdgeActor->RenderOpaqueGeometry(ren);
+    }
+  if (this->VertexActor->GetVisibility())
+    {
+    this->VertexActor->RenderOpaqueGeometry(ren);
+    }
+  if (this->IconActor->GetVisibility())
+    {
+    this->IconActor->RenderOpaqueGeometry(ren);
+    }
+  if (this->LabelActor->GetVisibility())
+    {
+    this->LabelActor->RenderOpaqueGeometry(ren);
+    }
+
+  if (this->EdgeActor->GetVisibility())
+    {
+    this->EdgeActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+  if (this->VertexActor->GetVisibility())
+    {
+    this->VertexActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+  if (this->IconActor->GetVisibility())
+    {
+    this->IconActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+  if (this->LabelActor->GetVisibility())
+    {
+    this->LabelActor->RenderTranslucentPolygonalGeometry(ren);
+    }
+
+  if (this->IconActor->GetVisibility())
+    {
+    this->IconActor->RenderOverlay(ren);
+    }
+  if (this->LabelActor->GetVisibility())
+    {
+    this->LabelActor->RenderOverlay(ren);
+    }
+
+  this->TimeToDraw = this->EdgeMapper->GetTimeToDraw() +
+                     this->VertexMapper->GetTimeToDraw() +
+                     this->IconMapper->GetTimeToDraw();
+}
+
+void vtkVgGraphMapper::ApplyViewTheme(vtkViewTheme* theme)
+{
+  this->VertexActor->GetProperty()->SetColor(theme->GetPointColor());
+  this->VertexActor->GetProperty()->SetOpacity(theme->GetPointOpacity());
+  this->SetVertexPointSize(theme->GetPointSize());
+  this->VertexLookupTable->SetHueRange(theme->GetPointHueRange());
+  this->VertexLookupTable->SetSaturationRange(theme->GetPointSaturationRange());
+  this->VertexLookupTable->SetValueRange(theme->GetPointValueRange());
+  this->VertexLookupTable->SetAlphaRange(theme->GetPointAlphaRange());
+  this->VertexLookupTable->Build();
+
+  this->EdgeActor->GetProperty()->SetColor(theme->GetCellColor());
+  this->EdgeActor->GetProperty()->SetOpacity(theme->GetCellOpacity());
+  this->SetEdgeLineWidth(theme->GetLineWidth());
+  this->EdgeLookupTable->SetHueRange(theme->GetCellHueRange());
+  this->EdgeLookupTable->SetSaturationRange(theme->GetCellSaturationRange());
+  this->EdgeLookupTable->SetValueRange(theme->GetCellValueRange());
+  this->EdgeLookupTable->SetAlphaRange(theme->GetCellAlphaRange());
+  this->EdgeLookupTable->Build();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  if (this->EdgeMapper)
+    {
+    os << indent << "EdgeMapper: (" << this->EdgeMapper << ")\n";
+    }
+  else
+    {
+    os << indent << "EdgeMapper: (none)\n";
+    }
+  if (this->VertexMapper)
+    {
+    os << indent << "VertexMapper: (" << this->VertexMapper << ")\n";
+    }
+  else
+    {
+    os << indent << "VertexMapper: (none)\n";
+    }
+  if (this->EdgeActor)
+    {
+    os << indent << "EdgeActor: (" << this->EdgeActor << ")\n";
+    }
+  else
+    {
+    os << indent << "EdgeActor: (none)\n";
+    }
+  if (this->VertexActor)
+    {
+    os << indent << "VertexActor: (" << this->VertexActor << ")\n";
+    }
+  else
+    {
+    os << indent << "VertexActor: (none)\n";
+    }
+
+  if (this->GraphToPoly)
+    {
+    os << indent << "GraphToPoly: (" << this->GraphToPoly << ")\n";
+    }
+  else
+    {
+    os << indent << "GraphToPoly: (none)\n";
+    }
+
+  if (this->VertexLookupTable)
+    {
+    os << indent << "VertexLookupTable: (" << this->VertexLookupTable << ")\n";
+    }
+  else
+    {
+    os << indent << "VertexLookupTable: (none)\n";
+    }
+
+  if (this->EdgeLookupTable)
+    {
+    os << indent << "EdgeLookupTable: (" << this->EdgeLookupTable << ")\n";
+    }
+  else
+    {
+    os << indent << "EdgeLookupTable: (none)\n";
+    }
+
+  os << indent << "VertexPointSize: " << this->VertexPointSize << endl;
+  os << indent << "EdgeLineWidth: " << this->EdgeLineWidth << endl;
+  os << indent << "ScaledGlyphs: " << this->ScaledGlyphs << endl;
+  os << indent << "ScalingArrayName: "
+     << (this->ScalingArrayName ? "" : "(null)") << endl;
+  os << indent << "EnableEdgesByArray: " << this->EnableEdgesByArray << endl;
+  os << indent << "EnableVerticesByArray: " << this->EnableVerticesByArray << endl;
+  os << indent << "EnabledEdgesArrayName: "
+     << (this->EnabledEdgesArrayName ? "" : "(null)") << endl;
+  os << indent << "EnabledVerticesArrayName: "
+     << (this->EnabledVerticesArrayName ? "" : "(null)") << endl;
+
+}
+
+//----------------------------------------------------------------------------
+unsigned long vtkVgGraphMapper::GetMTime()
+{
+  unsigned long mTime = this->vtkMapper::GetMTime();
+  unsigned long time;
+
+  if (this->LookupTable != NULL)
+    {
+    time = this->LookupTable->GetMTime();
+    mTime = (time > mTime ? time : mTime);
+    }
+
+  return mTime;
+}
+
+//----------------------------------------------------------------------------
+int vtkVgGraphMapper::FillInputPortInformation(
+  int vtkNotUsed(port), vtkInformation* info)
+{
+  info->Set(vtkAlgorithm::INPUT_REQUIRED_DATA_TYPE(), "vtkGraph");
+  return 1;
+}
+
+//----------------------------------------------------------------------------
+double* vtkVgGraphMapper::GetBounds()
+{
+  vtkGraph* graph = vtkGraph::SafeDownCast(this->GetExecutive()->GetInputData(0, 0));
+  if (!graph)
+    {
+    vtkMath::UninitializeBounds(this->Bounds);
+    return this->Bounds;
+    }
+  if (!this->Static)
+    {
+    this->Update();
+    graph = vtkGraph::SafeDownCast(this->GetExecutive()->GetInputData(0, 0));
+    }
+  if (!graph)
+    {
+    vtkMath::UninitializeBounds(this->Bounds);
+    return this->Bounds;
+    }
+
+  if (this->VertexGlyph->GetInput())
+    {
+    this->VertexMapper->GetBounds(this->Bounds);
+    }
+  else
+    {
+    graph->GetBounds(this->Bounds);
+    }
+
+  return this->Bounds;
+}
+
+#if 1
+//----------------------------------------------------------------------------
+void vtkVgGraphMapper::ReportReferences(vtkGarbageCollector* collector)
+{
+  this->Superclass::ReportReferences(collector);
+  // These filters share our input and are therefore involved in a
+  // reference loop.
+  //vtkGarbageCollectorReport(collector, this->GraphToPoly,
+  //                          "GraphToPoly");
+}
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgGraphMapper.h b/Libraries/VtkVgCore/vtkVgGraphMapper.h
new file mode 100644
index 00000000..bb983241
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgGraphMapper.h
@@ -0,0 +1,377 @@
+/*=========================================================================
+
+  Program:   Visualization Toolkit
+  Module:    vtkVgGraphMapper.h
+
+  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
+  All rights reserved.
+  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
+
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notice for more information.
+
+=========================================================================*/
+/*-------------------------------------------------------------------------
+  Copyright 2008 Sandia Corporation.
+  Under the terms of Contract DE-AC04-94AL85000 with Sandia Corporation,
+  the U.S. Government retains certain rights in this software.
+-------------------------------------------------------------------------*/
+// .NAME vtkVgGraphMapper - map vtkGraph and derived
+// classes to graphics primitives
+
+// .SECTION Description
+// vtkVgGraphMapper is a mapper to map vtkGraph
+// (and all derived classes) to graphics primitives.
+
+#ifndef __vtkVgGraphMapper_h
+#define __vtkVgGraphMapper_h
+
+#include "vtkMapper.h"
+
+#include "vtkSmartPointer.h"    // Required for smart pointer internal ivars.
+
+#include <vgExport.h>
+
+class vtkActor2D;
+class vtkVgArcParallelEdgeStrategy;
+class vtkCamera;
+class vtkCellCenters;
+class vtkEdgeLayout;
+class vtkFollower;
+class vtkGlyph3D;
+class vtkGlyph3DMapper;
+class vtkGraph;
+class vtkGraphToPolyData;
+class vtkIconGlyphFilter;
+class vtkLabelPlacementMapper;
+class vtkLookupTable;
+class vtkMapArrayValues;
+class vtkPassThroughEdgeStrategy;
+class vtkPointSetToLabelHierarchy;
+class vtkPolyData;
+class vtkPolyDataMapper;
+class vtkPolyDataMapper2D;
+class vtkTexture;
+class vtkTexturedActor2D;
+class vtkTransformCoordinateSystems;
+class vtkVertexGlyphFilter;
+class vtkViewTheme;
+
+class vtkVgApplySelectedColor;
+
+// C++ includes.
+#include <map>
+
+class VTKVG_CORE_EXPORT vtkVgGraphMapper : public vtkMapper
+{
+public:
+  static vtkVgGraphMapper* New();
+  vtkTypeMacro(vtkVgGraphMapper, vtkMapper);
+  void PrintSelf(ostream& os, vtkIndent indent);
+  void Render(vtkRenderer* ren, vtkActor* act);
+
+  // Description:
+  // The array to use for coloring vertices.  Default is "color".
+  void SetVertexColorArrayName(const char* name);
+  const char* GetVertexColorArrayName();
+
+  void SetVertexSelectionArrayName(const char* name);
+  const char* GetVertexSelectionArrayName();
+
+  // Description:
+  // The array to use for labeling vertices.
+  void SetLabelArrayName(const char* name);
+  const char* GetLabelArrayName();
+
+  // Description:
+  // Whether to use vertex selection array.  Default is off.
+  void SetUseVertexSelection(bool enable);
+  bool GetUseVertexSelection();
+
+  // Description:
+  // Whether to color vertices.  Default is off.
+  void SetColorVertices(bool vis);
+  bool GetColorVertices();
+
+  // Description:
+  // Whether scaled glyphs are on or not.  Default is off.
+  // By default this mapper uses vertex glyphs that do not
+  // scale. If you turn this option on you will get circles
+  // at each vertex and they will scale as you zoom in/out.
+  void SetScaledGlyphs(bool arg);
+  vtkGetMacro(ScaledGlyphs, bool);
+  vtkBooleanMacro(ScaledGlyphs, bool);
+
+  // Description:
+  // Glyph scaling array name. Default is "scale"
+  vtkSetStringMacro(ScalingArrayName);
+  vtkGetStringMacro(ScalingArrayName);
+
+  // Description:
+  // Whether to show vertices or not.  Default is on.
+  void SetVertexVisibility(bool vis);
+  bool GetVertexVisibility();
+  vtkBooleanMacro(VertexVisibility, bool);
+
+  // Description:
+  // Whether to show edges or not.  Default is on.
+  void SetEdgeVisibility(bool vis);
+  bool GetEdgeVisibility();
+  vtkBooleanMacro(EdgeVisibility, bool);
+
+  // Description:
+  // The array to use for coloring edges.  Default is "color".
+  void SetEdgeColorArrayName(const char* name);
+  const char* GetEdgeColorArrayName();
+
+  void SetEdgeSelectionArrayName(const char* name);
+  const char* GetEdgeSelectionArrayName();
+
+  // Description:
+  // Whether to use edge selection array.  Default is off.
+  void SetUseEdgeSelection(bool enable);
+  bool GetUseEdgeSelection();
+
+  // Description:
+  // Whether to color edges.  Default is off.
+  void SetColorEdges(bool vis);
+  bool GetColorEdges();
+
+  // Description:
+  // The array to use for coloring edges.  Default is "color".
+  vtkSetStringMacro(EnabledEdgesArrayName);
+  vtkGetStringMacro(EnabledEdgesArrayName);
+
+  // Description:
+  // Whether to enable/disable edges using array values.  Default is off.
+  vtkSetMacro(EnableEdgesByArray, int);
+  vtkGetMacro(EnableEdgesByArray, int);
+  vtkBooleanMacro(EnableEdgesByArray, int);
+
+  // Description:
+  // The array to use for coloring edges.  Default is "color".
+  vtkSetStringMacro(EnabledVerticesArrayName);
+  vtkGetStringMacro(EnabledVerticesArrayName);
+
+  // Description:
+  // Whether to enable/disable vertices using array values.  Default is off.
+  vtkSetMacro(EnableVerticesByArray, int);
+  vtkGetMacro(EnableVerticesByArray, int);
+  vtkBooleanMacro(EnableVerticesByArray, int);
+
+  // Description:
+  // Whether to layout edges or just pass through
+  void SetUseEdgeLayout(bool enable);
+
+  // Description:
+  // The array to use for assigning icons.
+  void SetIconArrayName(const char* name);
+  const char* GetIconArrayName();
+
+  // Description:
+  // Associate the icon at index "index" in the vtkTexture to all vertices
+  // containing "type" as a value in the vertex attribute array specified by
+  // IconArrayName.
+  void AddIconType(char* type, int index);
+
+  // Description:
+  // Clear all icon mappings.
+  void ClearIconTypes();
+
+  // Description:
+  // Specify the Width and Height, in pixels, of an icon in the icon sheet.
+  void SetIconSize(int* size);
+  int* GetIconSize();
+
+  // Description:
+  // Specify where the icons should be placed in relation to the vertex.
+  // See vtkIconGlyphFilter.h for possible values.
+  void SetIconAlignment(int alignment);
+
+  // Description:
+  // The texture containing the icon sheet.
+  vtkTexture* GetIconTexture();
+  void SetIconTexture(vtkTexture* texture);
+
+  // Description:
+  // Whether to show icons.  Default is off.
+  void SetIconVisibility(bool vis);
+  bool GetIconVisibility();
+  vtkBooleanMacro(IconVisibility, bool);
+
+  // Description:
+  // Whether to show labels.  Default is off.
+  void SetLabelVisibility(bool vis);
+  bool GetLabelVisibility();
+  vtkBooleanMacro(LabelVisibility, bool);
+
+  // Description:
+  // Get/Set the vertex point size
+  vtkGetMacro(VertexPointSize, float);
+  void SetVertexPointSize(float size);
+
+  // Description:
+  // Get/Set the edge line width
+  vtkGetMacro(EdgeLineWidth, float);
+  void SetEdgeLineWidth(float width);
+
+  // Description:
+  // Apply the theme to this view.
+  virtual void ApplyViewTheme(vtkViewTheme* theme);
+
+  // Description:
+  // Release any graphics resources that are being consumed by this mapper.
+  // The parameter window could be used to determine which graphic
+  // resources to release.
+  void ReleaseGraphicsResources(vtkWindow*);
+
+  // Description:
+  // Get the mtime also considering the lookup table.
+  unsigned long GetMTime();
+
+  // Description:
+  // Set the Input of this mapper.
+  void SetInputData(vtkGraph* input);
+  vtkGraph* GetInput();
+
+  // Description:
+  // Return bounding box (array of six doubles) of data expressed as
+  // (xmin,xmax, ymin,ymax, zmin,zmax).
+  virtual double* GetBounds();
+  virtual void GetBounds(double* bounds)
+    { Superclass::GetBounds(bounds); }
+
+  // Description:
+  // Access to the lookup tables used by the vertex and edge mappers.
+  vtkGetObjectMacro(EdgeLookupTable, vtkLookupTable);
+  vtkGetObjectMacro(VertexLookupTable, vtkLookupTable);
+
+  // Description:
+  // Set/Get polydata used for representing vertex.
+  void SetVertexGeometry(vtkPolyData* vertexGeometry);
+  vtkSmartPointer<vtkPolyData> GetVertexGeometry();
+
+  // Description:
+  // Set/Get polydata per index basis.
+  void SetVertexGeometry(vtkIdType index, vtkPolyData* vertexGeometry);
+  vtkSmartPointer<vtkPolyData> GetVertexGeometry(vtkIdType index);
+
+  // Description:
+  // Set/Get geometry index array.
+  void SetVertexGeometryIndexArray(const char* arrayname);
+
+  // Description:
+  // Convenience method to set the array to use as index within the sources.
+  void SetVertexGeometryIndexArray(int fieldAttributeType);
+
+  //  Description:
+  // Enable/disable indexing into table of the glyph sources. When disabled,
+  // only the 1st source input will be used to generate the glyph. Otherwise the
+  // source index array will be used to select the glyph source. The source
+  // index array can be specified using SetSourceIndexArray().
+  void SetVertexGeometryIndexing(int value);
+  void GetVertexGeometryIndexing(int& value);
+
+  // Description:
+  // Set number of sources for geometry.
+  void SetNumberOfVertexGeometrySources(int number);
+  void GetNumberOfVertexGeometrySources(int& number);
+
+  // Description:
+  // Set edge opacity.
+  void SetEdgeOpacity(double value);
+
+
+protected:
+  vtkVgGraphMapper();
+  ~vtkVgGraphMapper();
+
+  virtual bool GetSupportsSelection()
+    { return true; }
+
+  // Description:
+  // Used to store the vertex and edge color array names
+  vtkGetStringMacro(VertexColorArrayNameInternal);
+  vtkSetStringMacro(VertexColorArrayNameInternal);
+  vtkGetStringMacro(EdgeColorArrayNameInternal);
+  vtkSetStringMacro(EdgeColorArrayNameInternal);
+
+  vtkGetStringMacro(VertexSelectionArrayNameInternal);
+  vtkSetStringMacro(VertexSelectionArrayNameInternal);
+  vtkGetStringMacro(EdgeSelectionArrayNameInternal);
+  vtkSetStringMacro(EdgeSelectionArrayNameInternal);
+
+  int GeometryIndexing;
+
+  char* VertexColorArrayNameInternal;
+  char* VertexSelectionArrayNameInternal;
+
+  char* EdgeColorArrayNameInternal;
+  char* EdgeSelectionArrayNameInternal;
+
+  char* EnabledEdgesArrayName;
+  char* EnabledVerticesArrayName;
+  int EnableEdgesByArray;
+  int EnableVerticesByArray;
+
+  vtkGetStringMacro(IconArrayNameInternal);
+  vtkSetStringMacro(IconArrayNameInternal);
+  char* IconArrayNameInternal;
+
+  //BTX
+  vtkSmartPointer<vtkGlyph3D>                    VertexGlyph3d;
+  vtkSmartPointer<vtkGlyph3D>                    CircleOutlineGlyph;
+
+  vtkSmartPointer<vtkGraphToPolyData>            GraphToPoly;
+  vtkSmartPointer<vtkVertexGlyphFilter>          VertexGlyph;
+  vtkSmartPointer<vtkIconGlyphFilter>            IconGlyph;
+  vtkSmartPointer<vtkMapArrayValues>             IconTypeToIndex;
+  vtkSmartPointer<vtkTransformCoordinateSystems> IconTransform;
+  vtkSmartPointer<vtkPointSetToLabelHierarchy>   PointsToLabels;
+
+  vtkSmartPointer<vtkEdgeLayout>                 EdgeLayout;
+  vtkSmartPointer<vtkPassThroughEdgeStrategy>
+  PassThroughEdgeStrategy;
+  vtkSmartPointer<vtkVgArcParallelEdgeStrategy>
+  ArcParallelEdgeStrategy;
+
+  vtkSmartPointer<vtkPolyDataMapper>    EdgeMapper;
+  vtkSmartPointer<vtkGlyph3DMapper>     VertexMapper;
+  vtkSmartPointer<vtkPolyDataMapper2D>  IconMapper;
+  vtkSmartPointer<vtkLabelPlacementMapper> LabelMapper;
+
+  vtkSmartPointer<vtkActor>             EdgeActor;
+  vtkSmartPointer<vtkActor>             VertexActor;
+  vtkSmartPointer<vtkActor>             OutlineActor;
+  vtkSmartPointer<vtkTexturedActor2D>   IconActor;
+  vtkSmartPointer<vtkActor2D>           LabelActor;
+
+  vtkSmartPointer<vtkVgApplySelectedColor> ApplyColors;
+
+  std::map<vtkIdType, vtkSmartPointer<vtkPolyData> > VertexGeometries;
+  //ETX
+
+  // Color maps
+  vtkLookupTable* EdgeLookupTable;
+  vtkLookupTable* VertexLookupTable;
+
+  virtual void ReportReferences(vtkGarbageCollector*);
+
+  // see algorithm for more info
+  virtual int FillInputPortInformation(int port, vtkInformation* info);
+
+private:
+  vtkVgGraphMapper(const vtkVgGraphMapper&);  // Not implemented.
+  void operator=(const vtkVgGraphMapper&);  // Not implemented.
+
+  // Helper function
+  vtkPolyData* CreateCircle(bool filled);
+
+  float VertexPointSize;
+  float EdgeLineWidth;
+  bool ScaledGlyphs;
+  char* ScalingArrayName;
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgHull2D.cxx b/Libraries/VtkVgCore/vtkVgHull2D.cxx
new file mode 100644
index 00000000..56b5ec2a
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgHull2D.cxx
@@ -0,0 +1,584 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgHull2D.h"
+
+#include <vtkCellArray.h>
+#include <vtkMath.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+#include <vtkType.h>
+
+vtkStandardNewMacro(vtkVgHull2D);
+
+// Construct an the hull object with no lines
+vtkVgHull2D::vtkVgHull2D()
+{
+  this->Lines             = NULL;
+  this->LinesStorageSize  = 0;
+  this->NumberOfLines     = 0;
+}
+
+// Destructor for a hull object - remove the lines if necessary
+vtkVgHull2D::~vtkVgHull2D()
+{
+  if (this->Lines)
+    {
+    delete [] this->Lines;
+    this->Lines = NULL;
+    }
+}
+
+// Remove all lines.
+void vtkVgHull2D::RemoveAllLines()
+{
+  if (this->Lines)
+    {
+    delete [] this->Lines;
+    this->Lines = NULL;
+    }
+
+  this->LinesStorageSize  = 0;
+  this->NumberOfLines     = 0;
+  this->Modified();
+}
+
+// Add a line. The vector (A,B) is the line "normal" and is from the
+// line equation Ax + By + C = 0. The normal should point outwards
+// away from the center of the hull.
+int vtkVgHull2D::AddLine(double A, double B)
+{
+  double*     tmpPointer;
+  int       i;
+  double     norm, dotproduct;
+
+  // Normalize the direction,
+  // and make sure the vector has a length.
+  norm = sqrt(A * A + B * B);
+  if (norm == 0.0)
+    {
+    vtkErrorMacro(<< "Zero length vector not allowed for line normal!");
+    return -VTK_INT_MAX;
+    }
+  A /= norm;
+  B /= norm;
+
+  // Check that it is at least somewhat different from the other
+  // lines we have so far - can't have a normalized dot product of
+  // nearly 1.
+  for (i = 0; i < this->NumberOfLines; i++)
+    {
+    dotproduct =
+      A * this->Lines[i * 3 + 0] +
+      B * this->Lines[i * 3 + 1];
+
+    //If lines are parallel, we already have the line.
+    //Indicate this with the appropriate return value.
+    if (dotproduct > 0.99999 && dotproduct < 1.00001)
+      {
+      return -(i + 1);
+      }
+    }
+
+  // If adding this line would put us over the amount of space we've
+  // allocated for lines, then we'll have to allocated some more space
+  if ((this->NumberOfLines + 1) >= this->LinesStorageSize)
+    {
+    // Hang onto the previous set of lines
+    tmpPointer = this->Lines;
+
+    // Increase our storage
+    if (this->LinesStorageSize <= 0)
+      {
+      this->LinesStorageSize = 100;
+      }
+    else
+      {
+      this->LinesStorageSize *= 2;
+      }
+    this->Lines = new double [this->LinesStorageSize * 3];
+
+    if (!this->Lines)
+      {
+      vtkErrorMacro(<< "Unable to allocate space for lines");
+      this->Lines = tmpPointer;
+      return -VTK_INT_MAX;
+      }
+
+    // Copy the lines and delete the old storage space
+    for (i = 0; i < this->NumberOfLines * 3; i++)
+      {
+      this->Lines[i] = tmpPointer[i];
+      }
+    if (tmpPointer)
+      {
+      delete [] tmpPointer;
+      }
+    }
+
+  // Add the line at the end of the array.
+  // The fourth element doesn't actually need to be set, but it
+  // eliminates a purify uninitialized memory copy error if it is set
+  i = this->NumberOfLines;
+  this->Lines[i * 3 + 0] = A;
+  this->Lines[i * 3 + 1] = B;
+  this->Lines[i * 3 + 2] = 0.0;
+  this->NumberOfLines++;
+
+  this->Modified();
+
+  // Return the index to this line so that it can be set later
+  return i;
+}
+
+// Add a line, passing the line normal vector as a double array instead
+// of three doubles.
+int vtkVgHull2D::AddLine(double line[2])
+{
+  return this->AddLine(line[0], line[1], line[2]);
+}
+
+// Set a specific line - this line should already have been added with
+// AddLine, and the return value then used to modifiy the line normal
+// with this method.
+void vtkVgHull2D::SetLine(int i, double A, double B)
+{
+  double norm;
+
+  // Make sure this is a line that was already added
+  if (i < 0 || i >= this->NumberOfLines)
+    {
+    vtkErrorMacro(<< "Invalid index in SetLine");
+    return;
+    }
+
+  double* line = this->Lines + i * 4;
+  if (A == line[0] && B == line[1])
+    {
+    return; //no modified
+    }
+
+  // Set line that has index i. Normalize the direction,
+  // and make sure the vector has a length.
+  norm = sqrt(A * A + B * B);
+  if (norm == 0.0)
+    {
+    vtkErrorMacro(<< "Zero length vector not allowed for line normal!");
+    return;
+    }
+  this->Lines[i * 3 + 0] = A / norm;
+  this->Lines[i * 3 + 1] = B / norm;
+
+  this->Modified();
+}
+
+// Set a specific line (that has already been added) - passing the line
+// normal as a double array
+void vtkVgHull2D::SetLine(int i, double line[2])
+{
+  this->SetLine(i, line[0], line[1], line[2]);
+}
+
+int vtkVgHull2D::AddLine(double A, double B, double C)
+{
+  int i, j;
+
+  if ((i = this->AddLine(A, B)) >= 0)
+    {
+    this->Lines[3 * i + 2] = C;
+    }
+  else if (i >= -this->NumberOfLines)
+    {
+    //pick the D that minimizes the convex set
+    j = -i - 1;
+    this->Lines[3 * j + 2] = (C > this->Lines[3 * j + 2] ?
+                              C : this->Lines[3 * j + 2]);
+    }
+  return i;
+}
+
+int vtkVgHull2D::AddLine(double line[2], double C)
+{
+  int i, j;
+
+  if ((i = this->AddLine(line[0], line[1], line[2])) >= 0)
+    {
+    this->Lines[3 * i + 2] = C;
+    }
+  else if (i >= -this->NumberOfLines)
+    {
+    //pick the C that minimizes the convex set
+    j = -i - 1;
+    this->Lines[3 * j + 2] = (C > this->Lines[3 * j + 2] ?
+                              C : this->Lines[3 * j + 2]);
+    }
+  return i;
+}
+
+void vtkVgHull2D::SetLine(int i, double A, double B, double C)
+{
+  if (i >= 0 && i < this->NumberOfLines)
+    {
+    double* line = this->Lines + 4 * i;
+    if (line[0] != A || line[1] != B || line[2] != C)
+      {
+      this->SetLine(i, A, B);
+      line[3] = C;
+      this->Modified();
+      }
+    }
+}
+
+void vtkVgHull2D::SetLine(int i, double line[2], double C)
+{
+  this->SetLine(i, line[0], line[1], C);
+}
+
+// Add the four lines that represent the edges on a square
+void vtkVgHull2D::AddSquareEdgeLines()
+{
+  this->AddLine(1.0,  0.0);
+  this->AddLine(-1.0,  0.0);
+  this->AddLine(0.0,  1.0);
+  this->AddLine(0.0, -1.0);
+}
+
+// Add the four lines that represent the vertices on a square - halfway
+// between the two adjacent edge lines.
+void vtkVgHull2D::AddSquareVertexLines()
+{
+  this->AddLine(1.0,  1.0);
+  this->AddLine(1.0, -1.0);
+  this->AddLine(-1.0,  1.0);
+  this->AddLine(-1.0, -1.0);
+}
+
+
+// Add the lines that represent the normals of the vertices of a
+// circle formed by recursively subdividing the edges in a
+// square.  The level indicates how many subdivisions to do with a
+// level of 0 used to add the 4 lines from the original square, level 1
+// will add 8 lines, and so on.
+void vtkVgHull2D::AddRecursiveCircleLines(int level)
+{
+  if (level < 0)
+    {
+    vtkErrorMacro(<< "Cannot have a level less than 0!");
+    return;
+    }
+
+  if (level > 20)
+    {
+    vtkErrorMacro(<< "Cannot have a level greater than 20!");
+    return;
+    }
+
+  int numEdges = 4 * (1 << level);
+  double* points = new double[2 * numEdges];
+  int* edges = new int[2 * numEdges];
+
+  // add initial points
+  int idx = 0;
+  points[idx++] =  1.0; points[idx++] =  0.0;
+  points[idx++] =  0.0; points[idx++] =  1.0;
+  points[idx++] = -1.0; points[idx++] =  0.0;
+  points[idx++] =  0.0; points[idx++] = -1.0;
+  int pointCount = 4;
+
+  // add initial edges
+  idx = 0;
+  edges[idx++] = 0; edges[idx++] = 1;
+  edges[idx++] = 1; edges[idx++] = 2;
+  edges[idx++] = 2; edges[idx++] = 3;
+  edges[idx++] = 3; edges[idx++] = 0;
+  int edgeCount = 4;
+
+  for (int i = 0; i < level; ++i)
+    {
+    int limit = edgeCount;
+    for (int j = 0; j < limit; ++j)
+      {
+      int A = edges[j * 2 + 0];
+      int B = edges[j * 2 + 1];
+
+      // add new point to the end of the list
+      points[pointCount * 2 + 0] = (points[2 * A + 0] + points[2 * B + 0]) * 0.5;
+      points[pointCount * 2 + 1] = (points[2 * A + 1] + points[2 * B + 1]) * 0.5;
+
+      // add first new edge in place of old edge
+      edges[j * 2 + 0] = A;
+      edges[j * 2 + 1] = pointCount;
+
+      // add second new edge at end of list
+      edges[edgeCount * 2 + 0] = pointCount;
+      edges[edgeCount * 2 + 1] = B;
+
+      ++pointCount;
+      ++edgeCount;
+      }
+    }
+
+  for (int i = 0; i < pointCount; ++i)
+    {
+    this->AddLine(points[i * 2 + 0], points[i * 2 + 1]);
+    }
+
+  delete [] points;
+  delete [] edges;
+}
+
+
+// Create the n-sided convex hull from the input geometry according to the
+// set of lines.
+int vtkVgHull2D::RequestData(
+  vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** inputVector,
+  vtkInformationVector* outputVector)
+{
+  // get the info objects
+  vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  // get the input and output
+  vtkPolyData* input = vtkPolyData::SafeDownCast(
+                         inInfo->Get(vtkDataObject::DATA_OBJECT()));
+  vtkPolyData* output = vtkPolyData::SafeDownCast(
+                          outInfo->Get(vtkDataObject::DATA_OBJECT()));
+
+  // There should be at least three points for this to work.
+  if (input->GetNumberOfPoints() < 2)
+    {
+    vtkErrorMacro(<< "There must be>= 2 points in the input data!!!\n");
+    return 1;
+    }
+
+  // There should be at least three lines for this to work. There will need
+  // to be more lines than three if any of them are parallel.
+  if (this->NumberOfLines < 3)
+    {
+    vtkErrorMacro(<< "There must be>= 3 lines!!!\n");
+    return 1;
+    }
+
+  // Create a new set of points and lines into which the results will
+  // be stored
+  vtkPoints* outPoints = vtkPoints::New();
+  vtkCellArray* outLines  = vtkCellArray::New();
+
+  // Compute the D value for each line according to the vertices in the
+  // geometry
+  this->ComputeLineDistances(input);
+  this->UpdateProgress(0.25);
+
+  // Create a large segment representing each line, and clip that segment
+  // against all other lines to form the edges of the hull.
+  this->ClipSegmentsFromLines(outPoints, outLines, input->GetBounds());
+  this->UpdateProgress(0.80);
+
+  // Set the output vertices and lines
+  output->SetPoints(outPoints);
+  output->SetLines(outLines);
+
+  // Delete the temporary storage
+  outPoints->Delete();
+  outLines->Delete();
+
+  return 1;
+}
+
+// Compute the D value for each line. This is the largest D value obtained
+// by passing a line with the specified normal through each vertex in the
+// geometry. This line will have a normal pointing in towards the center of
+// the hull.
+void vtkVgHull2D::ComputeLineDistances(vtkPolyData* input)
+{
+  vtkIdType      i;
+  int            j;
+  double         coord[3];
+  double         v;
+
+  // Initialize all lines to the first vertex value
+  input->GetPoint(0, coord);
+  for (j = 0; j < this->NumberOfLines; j++)
+    {
+    this->Lines[j * 3 + 2] = -(this->Lines[j * 3 + 0] * coord[0] +
+                               this->Lines[j * 3 + 1] * coord[1]);
+    }
+  // For all other vertices in the geometry, check if it produces a larger
+  // D value for each of the lines.
+  for (i = 1; i < input->GetNumberOfPoints(); i++)
+    {
+    input->GetPoint(i, coord);
+    for (j = 0; j < this->NumberOfLines; j++)
+      {
+      v =  -(this->Lines[j * 3 + 0] * coord[0] +
+             this->Lines[j * 3 + 1] * coord[1]);
+      // negative means further in + direction of line
+      if (v < this->Lines[j * 3 + 2])
+        {
+        this->Lines[j * 3 + 2] = v;
+        }
+      }
+    }
+}
+
+// Given the set of lines, create a large segment for each, then use all the
+// other lines to clip this polygon.
+void vtkVgHull2D::ClipSegmentsFromLines(vtkPoints* outPoints,
+                                        vtkCellArray* outLines,
+                                        double* bounds)
+{
+  double verts[2 * 3];
+
+  // create a segment for each line
+  for (int i = 0; i < this->NumberOfLines; ++i)
+    {
+    this->CreateInitialSegment(verts, i, bounds);
+    bool bothVertsClipped = false;
+
+    // clip this segment against all other lines
+    for (int j = 0; j < this->NumberOfLines; ++j)
+      {
+      if (i == j)
+        {
+        continue;
+        }
+
+      double dist1 = vtkMath::Dot2D(&verts[0 * 3 + 0], &this->Lines[j * 3]) +
+                     this->Lines[j * 3 + 2];
+
+      double dist2 = vtkMath::Dot2D(&verts[1 * 3 + 0], &this->Lines[j * 3]) +
+                     this->Lines[j * 3 + 2];
+
+      bool clipped1 = dist1 > 0.0;
+      bool clipped2 = dist2 > 0.0;
+
+      // this line clips the segment if the two verts are on opposite sides
+      if ((clipped1) != (clipped2))
+        {
+        int vertToMove = clipped1 ? 0 : 1;
+        double crossing = -dist1 / (dist2 - dist1);
+
+        verts[vertToMove * 3 + 0] =
+          verts[0] + crossing * (verts[1 * 3 + 0] - verts[0]);
+        verts[vertToMove * 3 + 1] =
+          verts[1] + crossing * (verts[1 * 3 + 1] - verts[1]);
+        }
+      else if (clipped2)
+        {
+        // both verts are on the outside of the line - throw out this segment
+        bothVertsClipped = true;
+        break;
+        }
+      }
+
+    // add line segment to the output if we have one left
+    if (!bothVertsClipped)
+      {
+      vtkIdType pnts[2];
+      pnts[0] = outPoints->InsertNextPoint(verts + 0);
+      pnts[1] = outPoints->InsertNextPoint(verts + 3);
+      outLines->InsertNextCell(2, pnts);
+      }
+    }
+}
+
+// Create a sufficiently large segment from a line that will to cover the
+// bounds of the input
+void vtkVgHull2D::CreateInitialSegment(double* verts, int line, double* bounds)
+{
+  double center[3];
+
+  center[0] = (bounds[0] + bounds[1]) * 0.5;
+  center[1] = (bounds[2] + bounds[3]) * 0.5;
+  center[2] = (bounds[4] + bounds[5]) * 0.5;
+
+  double d =
+    this->Lines[line * 3 + 0] * center[0] +
+    this->Lines[line * 3 + 1] * center[1] +
+    this->Lines[line * 3 + 2];
+
+  // project bounding box center onto this line
+  double lineCenter[2];
+  lineCenter[0] = center[0] - d * this->Lines[line * 3 + 0];
+  lineCenter[1] = center[1] - d * this->Lines[line * 3 + 1];
+
+  double lineVec[2];
+  lineVec[0] = -this->Lines[line * 3 + 1];
+  lineVec[1] = this->Lines[line * 3];
+
+  // construct a segment large enough to cover the XY bounding rect
+  d =
+    (bounds[1] - bounds[0]) +
+    (bounds[3] - bounds[2]);
+
+  verts[0 * 3 + 0] = lineCenter[0] + d * lineVec[0];
+  verts[0 * 3 + 1] = lineCenter[1] + d * lineVec[1];
+  verts[0 * 3 + 2] = center[2];
+  verts[1 * 3 + 0] = lineCenter[0] - d * lineVec[0];
+  verts[1 * 3 + 1] = lineCenter[1] - d * lineVec[1];
+  verts[1 * 3 + 2] = center[2];
+}
+
+
+void vtkVgHull2D::GenerateHull(vtkPolyData* pd, double xmin, double xmax,
+                               double ymin, double ymax, double zmin, double zmax)
+{
+  double bounds[6];
+  bounds[0] = xmin; bounds[1] = xmax;
+  bounds[2] = ymin; bounds[3] = ymax;
+  bounds[4] = zmin; bounds[5] = zmax;
+
+  this->GenerateHull(pd, bounds);
+}
+
+void vtkVgHull2D::GenerateHull(vtkPolyData* pd, double* bounds)
+{
+  // There should be at least three lines for this to work. There will need
+  // to be more lines than three if any of them are parallel.
+  if (this->NumberOfLines < 3)
+    {
+    vtkErrorMacro(<< "There must be>= 3 lines!!!");
+    return;
+    }
+
+  // Create a new set of points and lines into which the results will
+  // be stored
+  vtkPoints* newPoints = vtkPoints::New();
+  newPoints->Allocate(this->NumberOfLines * 3);
+
+  vtkCellArray* newLines  = vtkCellArray::New();
+  newLines->Allocate(newLines->EstimateSize(this->NumberOfLines, 3));
+
+  this->ClipSegmentsFromLines(newPoints, newLines, bounds);
+
+  pd->SetPoints(newPoints);
+  pd->SetLines(newLines);
+  newPoints->Delete();
+  newLines->Delete();
+
+  pd->Squeeze();
+}
+
+// Print the object
+void vtkVgHull2D::PrintSelf(ostream& os, vtkIndent indent)
+{
+  int i;
+
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Number Of Lines: " << this->NumberOfLines << endl;
+
+  for (i = 0; i < this->NumberOfLines; i++)
+    {
+    os << indent << "Line " << i << ":  "
+       << this->Lines[i * 4] << " "
+       << this->Lines[i * 4 + 1] << " "
+       << this->Lines[i * 4 + 2] << endl;
+    }
+}
diff --git a/Libraries/VtkVgCore/vtkVgHull2D.h b/Libraries/VtkVgCore/vtkVgHull2D.h
new file mode 100644
index 00000000..1f99bf70
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgHull2D.h
@@ -0,0 +1,159 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgHull2D - produce a polygonal n-sided convex hull
+// .SECTION Description
+// vtkVgHull2D is a filter which will produce an n-sided convex hull given a
+// set of n lines. (The convex hull bounds the input polygonal data.)
+// The hull is generated by squeezing the lines towards the input
+// vtkPolyData, until the lines just touch the vtkPolyData. Then,
+// the resulting lines are used to generate a polygon (i.e., hull)
+// that is represented by a set of lines.  The depth component of the input
+// data will be ignored.
+//
+// The n lines can be defined in a number of ways including 1) manually
+// specifying each line; 2) choosing the four edge lines of the input's
+// bounding box; 3) choosing the four vertex lines of the input's
+// bounding box; 4) using a recursively subdivided circle.
+// Note that when specifying lines, the line "normals" should point
+// outside of the convex region.
+//
+// The output of this filter can be used in combination with vtkLODActor
+// to represent a levels-of-detail in the LOD hierarchy. Another use of
+// this class is to manually specify the lines, and then generate the
+// polygon from the lines (without squeezing the lines towards the
+// input). The method GenerateHull() is used to do this.
+//
+// Note: The output of this algorithm is a set of adjacent line segments,
+// in the same way that the output of vtkHull is a set of adjacent polygons.
+// In order to compute a closed polygon from this data you will need to do
+// further processing.
+
+#ifndef __vtkVgHull2D_h
+#define __vtkVgHull2D_h
+
+#include "vtkPolyDataAlgorithm.h"
+
+#include <vgExport.h>
+
+class vtkCellArray;
+class vtkPoints;
+class vtkPolyData;
+
+class VTKVG_CORE_EXPORT vtkVgHull2D : public vtkPolyDataAlgorithm
+{
+public:
+  static vtkVgHull2D* New();
+  vtkTypeMacro(vtkVgHull2D, vtkPolyDataAlgorithm);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Remove all lines from the current set of lines.
+  void RemoveAllLines(void);
+
+  // Description:
+  // Add a line to the current set of lines. It will be added at the
+  // end of the list, and an index that can later be used to set this
+  // line's normal will be returned. The values A, B, C are from the
+  // line equation Ax + By + C = 0. This vector does not have to
+  // have unit length (but it must have a non-zero length!). If a value
+  // 0> i>= -NumberOfLines is returned, then the line is parallel
+  // with a previously inserted line, and |-i-1| is the index of the
+  // line that was previously inserted. If a value i <-NumberOfLines
+  // is returned, then the line normal is zero length.
+  int  AddLine(double A, double B);
+  int  AddLine(double line[2]);
+
+  // Description:
+  // Set the normal values for line i. This is a line that was already
+  // added to the current set of lines with AddLine(), and is now being
+  // modified. The values A, B, and C are from the line equation
+  // Ax + By + C = 0. This vector does not have to have unit length.
+  // Note that C is set to zero, except in the case of the method taking
+  // a vtkLines* argument, where it is set to the C value defined there.
+  void SetLine(int i, double A, double B);
+  void SetLine(int i, double line[2]);
+
+  // Description:
+  // Variations of AddLine()/SetLine() that allow C to be set. These
+  // methods are used when GenerateHull() is used.
+  int AddLine(double A, double B, double C);
+  int AddLine(double line[2], double D);
+  void SetLine(int i, double A, double B, double C);
+  void SetLine(int i, double line[2], double C);
+
+  // Description:
+  // Get the number of lines in the current set of lines.
+  vtkGetMacro(NumberOfLines, int);
+
+  // Description:
+  // Add the 4 lines that represent the vertices of a square - the combination
+  // of the 2 edge lines connecting to a vertex - (1,1),(1,-1),(-1,1),(-1,-1).
+  void AddSquareVertexLines();
+
+  // Description:
+  // Add the 4 lines that represent the edges of a square -
+  // (1,0), (-1,0), (0,1), (0,-1)
+  void AddSquareEdgeLines();
+
+  // Description:
+  // Add the lines that represent the normals of the vertices of a
+  // circle formed by recursively subdividing the edges in a
+  // square.  The level indicates how many subdivisions to do with a
+  // level of 0 used to add the 4 lines from the original square, level 1
+  // will add 8 lines, and so on.
+  void AddRecursiveCircleLines(int level);
+
+  // Description:
+  // A special method that is used to generate a polygon directly
+  // from a set of n lines. The lines that are supplied by the user
+  // are not squeezed towards the input data (in fact the user need
+  // not specify an input). To use this method, you must provide an
+  // instance of vtkPolyData into which the points and cells defining
+  // the polygon are placed. You must also provide a bounding box
+  // where you expect the resulting polygon to lie. This can be
+  // a very generous fit, it's only used to create the initial polygons
+  // that are eventually clipped.
+  void GenerateHull(vtkPolyData* pd, double* bounds);
+  void GenerateHull(vtkPolyData* pd, double xmin, double xmax,
+                    double ymin, double ymax, double zmin, double zmax);
+
+protected:
+  vtkVgHull2D();
+  ~vtkVgHull2D();
+
+  // The lines - 4 doubles per line for A, B, C, D
+  double*     Lines;
+
+  // This indicates the current size (in lines - 4*sizeof(double)) of
+  // the this->Lines array. Lines are allocated in chunks so that the
+  // array does not need to be reallocated every time a new line is added
+  int       LinesStorageSize;
+
+  // The number of lines that have been added
+  int       NumberOfLines;
+
+  // Internal method used to find the position of each line
+  void      ComputeLineDistances(vtkPolyData* input);
+
+  // Internal method used to create the actual polygons from the set
+  // of lines
+  void      ClipSegmentsFromLines(vtkPoints* points, vtkCellArray* polys,
+                                  double* bounds);
+
+  // Internal method used to create the initial "big" polygon from the
+  // line equation. This polygon is clipped by all other lines to form
+  // the final polygon (or it may be clipped entirely)
+  void      CreateInitialSegment(double*, int, double*);
+
+  // The method that does it all...
+  int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*);
+private:
+  vtkVgHull2D(const vtkVgHull2D&);  // Not implemented.
+  void operator=(const vtkVgHull2D&);  // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgIcon.cxx b/Libraries/VtkVgCore/vtkVgIcon.cxx
new file mode 100644
index 00000000..f343c5e2
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgIcon.cxx
@@ -0,0 +1,27 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgIcon.h"
+#include "vtkVgEvent.h"
+#include "vtkObjectFactory.h"
+
+vtkStandardNewMacro(vtkVgIcon);
+
+//-----------------------------------------------------------------------------
+vtkVgIcon::vtkVgIcon()
+{
+  this->Category = vgEventTypeDefinitions::CategoryUnknown;
+  this->Type = vgSpecialIconTypeDefinitions::Unknown;
+  this->Visibility = 0;
+  this->Position[0] = this->Position[1] = 0;
+  this->Scale = 1.0;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIcon::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgIcon.h b/Libraries/VtkVgCore/vtkVgIcon.h
new file mode 100644
index 00000000..a387b1fc
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgIcon.h
@@ -0,0 +1,83 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgIcon - represent a single in the display
+// .SECTION Description
+// This class represents an icon. It defines a type, and whether it is
+// visible. It also requires representational information to display
+// including its size (in screen coordinates), an image, and a position.
+//
+#ifndef __vtkVgIcon_h
+#define __vtkVgIcon_h
+
+#include "vtkObject.h"
+#include "vtkVgEvent.h"
+#include "vtkVgTypeDefs.h"
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgIcon : public vtkObject
+{
+public:
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVgIcon* New();
+  vtkTypeMacro(vtkVgIcon, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Specify the type of the icon.
+  vtkSetMacro(Category, int);
+  vtkGetMacro(Category, int);
+  void SetCategoryToEvent()
+    {this->SetCategory(vgEventTypeDefinitions::Event);}
+  void SetCategoryToActivity()
+    {this->SetCategory(vgEventTypeDefinitions::Activity);}
+  void SetCategoryToIntelligence()
+    {this->SetCategory(vgEventTypeDefinitions::Intel);}
+  void SetCategoryToUnknown()
+    {this->SetCategory(vgEventTypeDefinitions::CategoryUnknown);}
+
+  // Description:
+  // Specify the type of the icon.
+  vtkSetMacro(Type, int);
+  vtkGetMacro(Type, int);
+
+  // Description:
+  // Specify whether the icon is visible.
+  vtkSetMacro(Visibility, int);
+  vtkGetMacro(Visibility, int);
+  vtkBooleanMacro(Visibility, int);
+
+  // Description:
+  // Set/get the icon position.
+  vtkSetVector2Macro(Position, int);
+  vtkGetVector2Macro(Position, int);
+
+  // Description:
+  // Set/get the icon scale.
+  vtkSetMacro(Scale, double);
+  vtkGetMacro(Scale, double);
+
+  // Description:
+  // Constructor / Destructor made public.
+  vtkVgIcon();
+  ~vtkVgIcon() {}
+
+private:
+  vtkVgIcon(const vtkVgIcon&); // Not implemented.
+  void operator=(const vtkVgIcon&);  // Not implemented.
+
+  int Category;
+  int Type;
+  int Visibility;
+  int Position[2];
+  double Scale;
+
+};
+
+#endif // __vtkVgIcon_h
diff --git a/Libraries/VtkVgCore/vtkVgIconManager.cxx b/Libraries/VtkVgCore/vtkVgIconManager.cxx
new file mode 100644
index 00000000..f560d6e9
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgIconManager.cxx
@@ -0,0 +1,691 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgIconManager.h"
+#include "vtkVgIcon.h"
+#include "vtkObjectFactory.h"
+#include "vtkPNGReader.h"
+#include "vtkTexturedActor2D.h"
+#include "vtkPolyDataMapper2D.h"
+#include "vtkTransformCoordinateSystems.h"
+#include "vtkPolyData.h"
+#include "vtkIconGlyphFilter.h"
+#include "vtkTexture.h"
+#include "vtkPointData.h"
+#include "vtkVgEvent.h"
+#include "vtkVgTrack.h"
+#include "vtkViewport.h"
+#include "vtkRenderer.h"
+#include "vtkPolyData.h"
+#include "vtkPoints.h"
+#include "vtkIdTypeArray.h"
+#include "vtkDoubleArray.h"
+#include "vtkCellArray.h"
+#include "vtkCellData.h"
+#include "vtkMath.h"
+#include "vtkImageData.h"
+#include "vtkExtractVOI.h"
+
+// STL includes.
+#include <sstream>
+#include <map>
+
+// VTK sys includes.
+#include <vtksys/SystemTools.hxx>
+
+vtkStandardNewMacro(vtkVgIconManager);
+
+typedef std::map<vtkIdType, vtkSmartPointer<vtkVgIcon> > IconMapType;
+typedef std::map<vtkIdType, vtkSmartPointer<vtkVgIcon> >::iterator IconMapIterator;
+
+struct EventIconInfo
+{
+  const char* Label;
+  int Type;
+};
+
+class vtkVgIconManager::vtkInternal
+{
+public:
+  IconMapType IconMap;
+  vtkSmartPointer<vtkTexturedActor2D> Actor;
+  vtkSmartPointer<vtkTexture> IconSheet;
+  vtkSmartPointer<vtkPolyDataMapper2D> Mapper;
+  vtkSmartPointer<vtkIconGlyphFilter> Glypher;
+  vtkSmartPointer<vtkTransformCoordinateSystems> XForm;
+  vtkSmartPointer<vtkPolyData> PolyData;
+  vtkSmartPointer<vtkPoints> Points;
+  vtkSmartPointer<vtkIntArray> Index;
+  vtkSmartPointer<vtkDoubleArray> IconScale;
+  vtkSmartPointer<vtkIdTypeArray> IconIds;
+  vtkSmartPointer<vtkTexture> Texture;
+  vtkSmartPointer<vtkPNGReader> IconSheetReader;
+
+  std::vector<EventIconInfo> StaticEventIcons;
+
+  vtkInternal()
+    {
+    this->Actor = vtkSmartPointer<vtkTexturedActor2D>::New();
+    this->Mapper = vtkSmartPointer<vtkPolyDataMapper2D>::New();
+    this->Glypher = vtkSmartPointer<vtkIconGlyphFilter>::New();
+    this->XForm = vtkSmartPointer<vtkTransformCoordinateSystems>::New();
+    this->PolyData = vtkSmartPointer<vtkPolyData>::New();
+    this->Points = vtkSmartPointer<vtkPoints>::New();
+    this->Index = vtkSmartPointer<vtkIntArray>::New();
+    this->IconScale = vtkSmartPointer<vtkDoubleArray>::New();
+    this->IconIds = vtkSmartPointer<vtkIdTypeArray>::New();
+    this->IconSheetReader = vtkSmartPointer<vtkPNGReader>::New();
+    this->Texture = vtkSmartPointer<vtkTexture>::New();
+
+    this->Texture->SetInputConnection(this->IconSheetReader->GetOutputPort());
+    this->Texture->MapColorScalarsThroughLookupTableOff();
+    this->Index->SetName("IconIndex");
+    this->Index->SetNumberOfComponents(1);
+    this->IconScale->SetName("IconScale");
+    this->IconScale->SetNumberOfComponents(1);
+    this->IconIds->SetName("IconIds");
+    this->IconIds->SetNumberOfComponents(1);
+    this->PolyData->SetPoints(this->Points);
+    this->PolyData->GetPointData()->SetScalars(this->Index);
+    this->PolyData->GetPointData()->AddArray(this->IconScale);
+    this->PolyData->GetPointData()->AddArray(this->IconIds);
+    this->XForm->SetInputData(this->PolyData);
+    this->XForm->SetInputCoordinateSystemToWorld();
+    this->XForm->SetOutputCoordinateSystemToDisplay();
+    this->Glypher->SetInputConnection(this->XForm->GetOutputPort());
+    this->Glypher->SetUseIconSize(true);
+    this->Glypher->SetIconScalingToScalingArray();
+    this->Mapper->SetInputConnection(this->Glypher->GetOutputPort());
+    this->Mapper->SetScalarVisibility(false);
+    this->Actor->SetMapper(this->Mapper);
+    this->Actor->SetTexture(this->Texture);
+    }
+
+};
+
+
+//-----------------------------------------------------------------------------
+vtkVgIconManager::vtkVgIconManager()
+{
+  this->ImageHeight = 0;
+  this->Internal = new vtkInternal();
+
+  this->MaxIconId = 0;
+
+  this->IconSize = 0.02;
+  this->MinimumIconSize = 10;
+  this->MaximumIconSize = 50;
+  this->OriginalIconSize[0] = this->OriginalIconSize[1] = 0;
+  this->SheetSize[0] = this->SheetSize[1] = 0;
+  this->Visibility = 1; //default to visible
+  this->IconOffset[0] = this->IconOffset[1] = 5;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgIconManager::~vtkVgIconManager()
+{
+  this->DeleteAllIcons();
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::SetIconSheetFileName(const char* fname)
+{
+  this->Internal->IconSheetReader->SetFileName(fname);
+}
+
+//-----------------------------------------------------------------------------
+char* vtkVgIconManager::GetIconSheetFileName()
+{
+  return this->Internal->IconSheetReader->GetFileName();
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkTexturedActor2D> vtkVgIconManager::GetIconActor()
+{
+  return this->Internal->Actor;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::SetRenderer(vtkViewport* ren)
+{
+  this->Internal->XForm->SetViewport(ren);
+}
+
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgIconManager::
+AddIcon(char* category, char* type, int visibility, int pos[2], double s)
+{
+  vtkIdType iconId = this->MaxIconId++;
+  this->AddIcon(iconId, category, type, visibility, pos, s);
+
+  return iconId;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::
+AddIcon(vtkIdType iconId, char* category, char* type, int visibility, int pos[2], double s)
+{
+  // Create an icon and add it to the map
+  std::string cat = category;
+  std::string lab = type;
+  int iCat, iType;
+
+  if (cat == "EVENT")
+    {
+    iCat = vgEventTypeDefinitions::Event;
+    }
+  else if (cat == "ACTIVITY")
+    {
+    iCat = vgEventTypeDefinitions::Activity;
+    }
+  else if (cat == "INTEL")
+    {
+    iCat = vgEventTypeDefinitions::Intel;
+    }
+  else
+    {
+    iCat = vgEventTypeDefinitions::CategoryUnknown;
+    }
+
+  if (lab == "INTEL")
+    {
+    iType = vgSpecialIconTypeDefinitions::Intelligence;
+    }
+  else if (lab == "FOLLOWER")
+    {
+    iType = vgSpecialIconTypeDefinitions::Follower;
+    }
+  else
+    {
+    bool found = false;
+    for (size_t i = 0, end = this->Internal->StaticEventIcons.size(); i < end;
+         ++i)
+      {
+      if (lab == this->Internal->StaticEventIcons[i].Label)
+        {
+        found = true;
+        iType = this->Internal->StaticEventIcons[i].Type;
+        break;
+        }
+      }
+    if (!found)
+      {
+      iType = vgSpecialIconTypeDefinitions::Unknown;
+      }
+    }
+
+  this->AddIcon(iconId, iCat, iType, visibility, pos, s);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgIconManager::
+AddIcon(int category, int type, int visibility, int pos[2], double s)
+{
+  vtkIdType iconId = this->MaxIconId++;
+  this->AddIcon(iconId, category, type, visibility, pos, s);
+
+  return iconId;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::
+AddIcon(vtkIdType iconId, int category, int type, int visibility, int pos[2], double s)
+{
+  if (iconId >= this->MaxIconId)
+    {
+    this->MaxIconId = iconId + 1;
+    }
+
+  vtkSmartPointer<vtkVgIcon> icon = vtkSmartPointer<vtkVgIcon>::New();
+  icon->SetCategory(category);
+  icon->SetType(type);
+  icon->SetVisibility(visibility);
+  icon->SetPosition(pos[0], pos[1]);
+  icon->SetScale(s);
+  this->Internal->IconMap[iconId] = icon;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::DeleteIcon(vtkIdType iconId)
+{
+  IconMapIterator end = this->Internal->IconMap.end();
+  IconMapIterator iter = this->Internal->IconMap.find(iconId);
+  if (iter != end)
+    {
+    this->Internal->IconMap.erase(iter);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::DeleteAllIcons()
+{
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+  this->Internal->IconMap.erase(begin, end);
+}
+
+
+//-----------------------------------------------------------------------------
+int vtkVgIconManager::GetNumberOfIcons()
+{
+  return static_cast<int>(this->Internal->IconMap.size());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::AllIconsOn()
+{
+  IconMapIterator iter;
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+
+  for (iter = begin; iter != end; ++iter)
+    {
+    iter->second->SetVisibility(1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::AllIconsOff()
+{
+  IconMapIterator iter;
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+
+  for (iter = begin; iter != end; ++iter)
+    {
+    iter->second->SetVisibility(0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::IntelligenceIconsOn()
+{
+  IconMapIterator iter;
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+
+  for (iter = begin; iter != end; ++iter)
+    {
+    if (iter->second->GetCategory() == vgEventTypeDefinitions::Intel)
+      {
+      iter->second->SetVisibility(1);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::IntelligenceIconsOff()
+{
+  IconMapIterator iter;
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+
+  for (iter = begin; iter != end; ++iter)
+    {
+    if (iter->second->GetCategory() == vgEventTypeDefinitions::Intel)
+      {
+      iter->second->SetVisibility(0);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::EventIconsOn()
+{
+  IconMapIterator iter;
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+
+  for (iter = begin; iter != end; ++iter)
+    {
+    if (iter->second->GetCategory() == vgEventTypeDefinitions::Event)
+      {
+      iter->second->SetVisibility(1);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::EventIconsOff()
+{
+  IconMapIterator iter;
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+
+  for (iter = begin; iter != end; ++iter)
+    {
+    if (iter->second->GetCategory() == vgEventTypeDefinitions::Event)
+      {
+      iter->second->SetVisibility(0);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkVgIcon> vtkVgIconManager::
+GetIcon(vtkIdType iconId)
+{
+  IconMapIterator end = this->Internal->IconMap.end();
+  IconMapIterator iter = this->Internal->IconMap.find(iconId);
+
+  return iter == end ? 0 : iter->second;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::
+SetIconVisibility(int category, int type, int visibility)
+{
+  IconMapIterator iter;
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+
+  for (iter = begin; iter != end; ++iter)
+    {
+    if (iter->second->GetCategory() == category)
+      {
+      if (iter->second->GetType() == type)
+        {
+        iter->second->SetVisibility(visibility);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::
+SetIconVisibility(vtkIdType iconId, int visibility)
+{
+  IconMapIterator iter = this->Internal->IconMap.find(iconId);
+  IconMapIterator end = this->Internal->IconMap.end();
+  if (iter != end)
+    {
+    iter->second->SetVisibility(visibility);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::
+SetIconScale(vtkIdType iconId, double scale)
+{
+  IconMapIterator iter = this->Internal->IconMap.find(iconId);
+  IconMapIterator end = this->Internal->IconMap.end();
+  if (iter != end)
+    {
+    iter->second->SetScale(scale);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::
+UpdateIconPosition(vtkIdType iconId, int pos[2])
+{
+  IconMapIterator iter = this->Internal->IconMap.find(iconId);
+  IconMapIterator end = this->Internal->IconMap.end();
+  if (iter != end)
+    {
+    iter->second->SetPosition(pos);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::
+GetIconPosition(vtkIdType iconId, int pos[2])
+{
+  IconMapIterator iter = this->Internal->IconMap.find(iconId);
+  IconMapIterator end = this->Internal->IconMap.end();
+  if (iter != end)
+    {
+    iter->second->GetPosition(pos);
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+int vtkVgIconManager::LoadIcons(const char* filename)
+{
+  this->DeleteAllIcons();
+
+  return this->AddIcons(filename);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgIconManager::AddIcons(const char* filename)
+{
+  ifstream in(filename);
+  if (!in.good())
+    {
+    vtkErrorMacro("can't open events file!");
+    return VTK_ERROR;
+    }
+  char fullLine[1024], fname[2048], category[1024], label[1024];
+  int iconId; // not vtkIdType because we are reading it via sscanf
+  int size, x, y;
+
+  // Read the comment line
+  in.getline(fullLine, 1024, '\n');
+
+  // Read the parameters for the icons
+  in.getline(fullLine, 1024, '\n');
+#ifdef _WIN32
+  sscanf_s(fullLine, "%d %d %d %s", &size, &x, &y,
+           fname, static_cast<unsigned>(sizeof(fname)));
+#else
+  sscanf(fullLine, "%d %d %d %s", &size, &x, &y, fname);
+#endif
+
+  std::string fullPath("");
+
+  if (vtksys::SystemTools::FileIsFullPath(fname))
+    {
+    fullPath = fname;
+    }
+  else
+    {
+    std::string path =
+      vtksys::SystemTools::GetFilenamePath(std::string(filename));
+    path.append("/");
+
+    fullPath = path + std::string(fname);
+    }
+
+  if (!vtksys::SystemTools::FileExists(fullPath.c_str(), true))
+    {
+    vtkErrorMacro("Cannot find icon sheet file ( " << fullPath << " )\n");
+    return VTK_ERROR;
+    }
+
+  this->SetIconSheetFileName(fullPath.c_str());
+  this->Internal->Glypher->SetIconSize(size, size);
+  this->SetOriginalIconSize(size, size);
+  this->SetSheetSize(x, y);
+
+  // Read the comment line
+  in.getline(fullLine, 1024, '\n');
+
+  // Read the icon definitions
+  int pos[2];
+  while (!in.eof())
+    {
+    in.getline(fullLine, 1024, '\n');
+#ifdef _WIN32
+    sscanf_s(fullLine, "%d %s %s %d %d", &iconId,
+             category, static_cast<unsigned>(sizeof(category)),
+             label, static_cast<unsigned>(sizeof(label)),
+             pos, pos + 1);
+#else
+    sscanf(fullLine, "%d %s %s %d %d", &iconId, category, label, pos, pos + 1);
+#endif
+    this->AddIcon(iconId, category, label, 1, pos, 1.0);
+    } //while
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+// There are two types of icons to update: 1) static icons defined in the
+// icon file, and 2) track icons which are related to the tracks and current events.
+void vtkVgIconManager::UpdateIconActors(vtkIdType vtkNotUsed(frameIndex))
+{
+  // Check to make sure there is something to see
+  if (!this->Visibility)
+    {
+    this->Internal->Actor->VisibilityOff();
+    return;
+    }
+  this->Internal->Actor->VisibilityOn();
+
+  IconMapIterator iter;
+  IconMapIterator begin = this->Internal->IconMap.begin();
+  IconMapIterator end = this->Internal->IconMap.end();
+
+  // Compute the current icon size. The coordinate system transform holds the renderer.
+  int iconSize = 16; //fallback value
+  vtkViewport* ren = this->Internal->XForm->GetViewport();
+  if (ren)
+    {
+    int* sze = ren->GetSize();
+    if (sze[0] > 0 && sze[1] > 0)
+      {
+      int xSze = static_cast<int>(this->IconSize * sze[0]);
+      int ySze = static_cast<int>(this->IconSize * sze[1]);
+      iconSize = (xSze < ySze ? xSze : ySze);
+      iconSize = (iconSize < this->MinimumIconSize ? this->MinimumIconSize : iconSize);
+      iconSize = (iconSize > this->MaximumIconSize ? this->MaximumIconSize : iconSize);
+      }
+    }
+
+  // First update the texture information
+  this->Internal->Glypher->SetIconSize(iconSize, iconSize);
+  this->Internal->Glypher->
+  SetIconSheetSize(this->SheetSize[0]*iconSize, this->SheetSize[1]*iconSize);
+  this->Internal->Glypher->SetOffset(this->IconOffset);
+
+  // Reset the pipeline information to empty state
+  this->Internal->Points->Reset();
+  this->Internal->Index->Reset();
+  this->Internal->IconScale->Reset();
+  this->Internal->IconIds->Reset();
+
+  // Loop over all icons, create a point for the visibile ones. The glyph
+  // process also requires an integer id to map into the sheet icons.
+  int pos[2], type;
+  vtkIdType ptId;
+  for (iter = begin; iter != end; ++iter)
+    {
+    if (iter->second->GetVisibility())
+      {
+      type = iter->second->GetType();
+      iter->second->GetPosition(pos);
+
+      if (type >= 0 && type != vgSpecialIconTypeDefinitions::Unknown)
+        {
+        ptId = this->Internal->Points->InsertNextPoint(pos[0], pos[1], 0.1);
+        this->Internal->IconScale->InsertTuple1(ptId, iter->second->GetScale());
+        this->Internal->IconIds->InsertTuple1(ptId, iter->first);
+        this->Internal->Index->InsertTuple1(ptId, type);
+        }
+      }
+    }
+
+  this->Internal->Points->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgIconManager::Pick(double renX, double renY, vtkRenderer*)
+{
+  // Check to make sure that a renderer has been defined, and that output
+  // is available from the glyph filter.
+  if (! this->Internal->XForm->GetViewport() ||
+      ! this->Internal->Glypher->GetOutput() ||
+      this->Internal->Glypher->GetOutput()->GetNumberOfPoints() < 1)
+    {
+    return -1;
+    }
+
+  // Okay we have some data to pick against. The glypher creates quads for each
+  // point, and the point coordinates are in display coordinates. For now we will
+  // simply look to see if the pick occurs in a quad.
+  vtkPolyData* pd = this->Internal->Glypher->GetOutput();
+  vtkCellArray* quads = pd->GetPolys();
+  vtkPoints* points = pd->GetPoints();
+  vtkIdTypeArray* iconIds = dynamic_cast<vtkIdTypeArray*>(pd->GetCellData()->GetArray("IconIds"));
+
+  vtkIdType cellId, npts, *pts, pickedCellId = (-1);
+  double x0[3], x2[3];
+  for (quads->InitTraversal(), cellId = 0; quads->GetNextCell(npts, pts); ++cellId)
+    {
+    // get the two opposing points of the quad
+    points->GetPoint(pts[0], x0);
+    points->GetPoint(pts[2], x2);
+
+    // determine if the quad contains the pick. Note that these quads may overlay one
+    // another, and the quad rendered last will win. Hence we return the last quad that
+    // contains the pick point.
+    if (x0[0] <= renX && renX <= x2[0] &&
+        x0[1] <= renY && renY <= x2[1])
+      {
+      pickedCellId = cellId;
+      }
+    }
+
+  // Return the icon id or -1 if nothing picked
+  if (pickedCellId < 0)
+    {
+    return -1; //nothing picked
+    }
+  else
+    {
+    return iconIds->GetValue(pickedCellId);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkImageData> vtkVgIconManager::GetIconImage(int type)
+{
+  // Make sure information is valid
+  if (type < 0 || type > vgSpecialIconTypeDefinitions::Unknown)
+    {
+    return NULL;
+    }
+
+  // Compute the location of the icon in the icon sheet.
+  // Note that the y-coordinate has to be flipped.
+  int sX = type % (this->SheetSize[0]);
+  int sY = type / (this->SheetSize[0]);
+  sY = this->SheetSize[1] - sY - 1;
+
+  int sizeX = this->OriginalIconSize[0];
+  int sizeY = this->OriginalIconSize[1];
+
+  // Now specify the offset information into the icon sheet, and
+  // extract the icon image.
+  vtkSmartPointer<vtkExtractVOI> voi = vtkSmartPointer<vtkExtractVOI>::New();
+  voi->SetInputConnection(this->Internal->IconSheetReader->GetOutputPort());
+  voi->SetVOI(sX * sizeX, sizeX * (sX + 1) - 1,
+              sY * sizeY, sizeY * (sY + 1) - 1, 0, 0);
+  voi->Update();
+
+  // Return the image
+  vtkSmartPointer<vtkImageData> iconImage = voi->GetOutput();
+  return iconImage;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::RegisterStaticEventIcon(const char* label, int type)
+{
+  EventIconInfo eii;
+  eii.Label = label;
+  eii.Type = type;
+  this->Internal->StaticEventIcons.push_back(eii);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgIconManager::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgIconManager.h b/Libraries/VtkVgCore/vtkVgIconManager.h
new file mode 100644
index 00000000..83d60a57
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgIconManager.h
@@ -0,0 +1,187 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgIconManager - manage icons in the display
+// .SECTION Description
+// This manages a set of icons in the display. Various options are available
+// for turning on and off different types of icons, and deleting them.
+//
+// Currently this class is aware of two types of icons: intelligence icons and
+// event icons. Methods for turning these on and off are available.
+
+#ifndef __vtkVgIconManager_h
+#define __vtkVgIconManager_h
+
+#include "vtkObject.h"
+#include "vtkSmartPointer.h"
+#include "vtkVgIcon.h"
+#include "vtkVgTypeDefs.h"
+
+#include <vgExport.h>
+
+class vtkTexturedActor2D;
+class vtkViewport;
+class vtkRenderer;
+class vtkImageData;
+
+
+class VTKVG_CORE_EXPORT vtkVgIconManager : public vtkObject
+{
+public:
+  // Description:
+  // Standard VTK functions.
+  static vtkVgIconManager* New();
+  vtkTypeMacro(vtkVgIconManager, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get the Height of the image, which is necessary to convert
+  // coordinates from upper left to lower left.
+  vtkSetMacro(ImageHeight, double);
+  vtkGetMacro(ImageHeight, double);
+
+  // Description:
+  // Method to add/remove an icon.
+  void AddIcon(vtkIdType iconId, int category, int type, int visibility, int pos[2], double scale);
+  vtkIdType AddIcon(int category, int type, int visibility, int pos[2], double scale);
+  void AddIcon(vtkIdType iconId, char* category, char* type, int visibility, int pos[2], double scale);
+  vtkIdType AddIcon(char* category, char* type, int visibility, int pos[2], double scale);
+  vtkSmartPointer<vtkVgIcon> GetIcon(vtkIdType iconId);
+  void DeleteIcon(vtkIdType iconId);
+  void DeleteAllIcons();
+
+  // Description:
+  // Method for controlling visibility of all icons. This method does not affect
+  // the state of any particular icon, it affects all of them.
+  vtkSetMacro(Visibility, int);
+  vtkGetMacro(Visibility, int);
+  vtkBooleanMacro(Visibility, int);
+
+  // Description:
+  // Methods for turning on/off different types of icons. The icon type
+  // is contained by the vtkVgIcon. These methods key in on this type.
+  int GetNumberOfIcons();
+  void AllIconsOn();
+  void AllIconsOff();
+  void IntelligenceIconsOn();
+  void IntelligenceIconsOff();
+  void EventIconsOn();
+  void EventIconsOff();
+  void SetIconVisibility(int category, int type, int visibility);
+  void SetIconVisibility(vtkIdType iconId, int visibility);
+  void SetIconScale(vtkIdType iconId, double scale);
+
+  // Description:
+  // Specify file name for the icon sheet.
+  virtual void SetIconSheetFileName(const char*);
+  char* GetIconSheetFileName();
+
+  // Description:
+  // Specify the icon size. This is expressed as a fraction of the shortest
+  // dimension of the rendering window. This normalized coordinate system
+  // enables the icon size to change as the window is resized.
+  vtkSetClampMacro(IconSize, double, 0.001, 0.25);
+  vtkGetMacro(IconSize, double);
+
+  // Description:
+  // Specify the icon offset, for example to offset from the track head. This
+  // is expressed in pixels (display coordinates).
+  vtkSetVector2Macro(IconOffset, int);
+  vtkGetVector2Macro(IconOffset, int);
+
+  // Description:
+  // Specify the maximum size of the icon (in pixels). The IconSize is
+  // initially used to compute the icon size in pixels, MinimumIconSize
+  // is used to make sure that the icon is at least this big.
+  vtkSetClampMacro(MinimumIconSize, int, 1, 1000);
+  vtkGetMacro(MinimumIconSize, int);
+
+  // Description:
+  // Specify the maximum size of the icon (in pixels). The IconSize is
+  // initially used to compute the icon size in pixels, MaximumIconSize
+  // is used to make sure that the icon is no bigger than this.
+  vtkSetClampMacro(MaximumIconSize, int, 10, 2000);
+  vtkGetMacro(MaximumIconSize, int);
+
+  // Description:
+  // Specify the original icon dimensions.
+  vtkSetVector2Macro(OriginalIconSize, int);
+  vtkGetVector2Macro(OriginalIconSize, int);
+
+  // Description:
+  // Specify the icon sheet size (number of icons in the x-direction by
+  // number of icons in the y-direction).
+  vtkSetVector2Macro(SheetSize, int);
+  vtkGetVector2Macro(SheetSize, int);
+
+  // Description:
+  // Retrieve the actor used to display the icons.
+  vtkSmartPointer<vtkTexturedActor2D> GetIconActor();
+
+  // Description:
+  // Load events from a file. The AddIcons() method adds to what is already
+  // there. Note that the file has an id, using the same id more than once
+  // will overwrite the previous icon.
+  int LoadIcons(const char* filename);
+  int AddIcons(const char* filename);
+
+  // Description:
+  // Called every frame, update the icons for display.
+  void UpdateIconActors(vtkIdType frameIndex);
+
+  // Description:
+  // The icons require a renderer for coordinate transformation. This must be
+  // called before UpdateIconActors() is invoked.
+  void SetRenderer(vtkViewport* ren);
+
+  // Description:
+  // Update the position of an existing icon.
+  void UpdateIconPosition(vtkIdType iconId, int pos[2]);
+  void GetIconPosition(vtkIdType iconId, int pos[2]);
+
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked iconId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account the
+  // visibility flags of the icons.
+  vtkIdType Pick(double renX, double renY, vtkRenderer* ren);
+
+  // Description:
+  // Convenience method to return the image that defines a particular type of icon.
+  vtkSmartPointer<vtkImageData> GetIconImage(int type);
+
+  // Description:
+  // Used when loading static events from a file.
+  void RegisterStaticEventIcon(const char* label, int type);
+
+protected:
+  // Description:
+  // Constructor / Destructor.
+  vtkVgIconManager();
+  ~vtkVgIconManager();
+
+private:
+  vtkVgIconManager(const vtkVgIconManager&); // Not implemented.
+  void operator=(const vtkVgIconManager&);  // Not implemented.
+
+  int Visibility; //control visibility of all icons
+
+  double ImageHeight;
+  double IconSize; //fraction of rendering window
+  int    MinimumIconSize; //in pixels
+  int    MaximumIconSize; //in pixels
+  int    OriginalIconSize[2]; //in pixels
+  int    SheetSize[2];    //in pixels
+  int    IconOffset[2];   //in pixels
+
+  class vtkInternal;
+  vtkInternal* Internal;
+
+  vtkIdType MaxIconId;
+};
+
+#endif // __vtkVgIconManager_h
diff --git a/Libraries/VtkVgCore/vtkVgImageIcon.cxx b/Libraries/VtkVgCore/vtkVgImageIcon.cxx
new file mode 100644
index 00000000..c8aceefc
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgImageIcon.cxx
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgImageIcon.h"
+#include "vtkJPEGReader.h"
+#include "vtkObjectFactory.h"
+#include "vtkTexture.h"
+
+vtkStandardNewMacro(vtkVgImageIcon);
+
+//-----------------------------------------------------------------------------
+vtkVgImageIcon::vtkVgImageIcon()
+{
+  this->Visibility = 1;
+  this->Offset[0] = 0;
+  this->Offset[1] = 0;
+
+  this->JPEGReader = vtkSmartPointer<vtkJPEGReader>::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgImageIcon::~vtkVgImageIcon()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgImageIcon::SetFileName(const char* fname)
+{
+  this->JPEGReader->SetFileName(fname);
+  this->JPEGReader->Update();
+  this->SetBalloonImage(this->JPEGReader->GetOutput());
+  this->Modified();
+}
+
+//----------------------------------------------------------------------
+void vtkVgImageIcon::ReleaseGraphicsResources(vtkWindow* w)
+{
+  this->Texture->ReleaseGraphicsResources(w);
+  this->Superclass::ReleaseGraphicsResources(w);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgImageIcon::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgImageIcon.h b/Libraries/VtkVgCore/vtkVgImageIcon.h
new file mode 100644
index 00000000..bdbfa6cf
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgImageIcon.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgImageIcon_h
+#define __vtkVgImageIcon_h
+
+#include "vtkBalloonRepresentation.h"
+#include "vtkSmartPointer.h"
+
+#include <vgExport.h>
+
+class vtkJPEGReader;
+
+class VTKVG_CORE_EXPORT vtkVgImageIcon : public vtkBalloonRepresentation
+{
+public:
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVgImageIcon* New();
+  vtkTypeMacro(vtkVgImageIcon, vtkBalloonRepresentation);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  void SetPosition(int x, int y)
+    {
+    if (x != this->StartEventPosition[0] ||
+        y != this->StartEventPosition[0])
+      {
+      this->StartEventPosition[0] = x;
+      this->StartEventPosition[1] = y;
+      this->StartEventPosition[2] = 0.0;
+      this->Modified();
+      }
+    }
+  void SetPosition(int pos[2])
+    {
+    this->SetPosition(pos[0], pos[1]);
+    }
+
+  // Description:
+  // Specify file name for the image file. If the data is stored in
+  // multiple files, then use SetFileNames or SetFilePrefix instead.
+  virtual void SetFileName(const char*);
+  vtkGetStringMacro(FileName);
+
+  // Description:
+  // Fix bug in vtkBalloonRepresentation.
+  virtual void ReleaseGraphicsResources(vtkWindow* w);
+
+protected:
+  // Description:
+  // Constructor / Destructor.
+  vtkVgImageIcon();
+  ~vtkVgImageIcon();
+
+  char* FileName;
+
+private:
+  vtkVgImageIcon(const vtkVgImageIcon&); // Not implemented.
+  void operator=(const vtkVgImageIcon&);  // Not implemented.
+
+  vtkSmartPointer<vtkJPEGReader> JPEGReader;
+};
+
+#endif // __vtkVgImageIcon_h
diff --git a/Libraries/VtkVgCore/vtkVgImageSource.cxx b/Libraries/VtkVgCore/vtkVgImageSource.cxx
new file mode 100644
index 00000000..ba4071a1
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgImageSource.cxx
@@ -0,0 +1,550 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgImageSource.h"
+
+// VTK includes.
+#include "vtkStreamingDemandDrivenPipeline.h"
+#include "vtkImageAppendComponents.h"
+#include "vtkImageData.h"
+#include "vtkImageFlip.h"
+#include "vtkImageImport.h"
+#include "vtkImageResample.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkObjectFactory.h"
+#include "vtkSmartPointer.h"
+
+#include <vtksys/SystemTools.hxx>
+
+// VIL includes.
+#include <vil/vil_load.h>
+#include <vil/vil_image_view.h>
+#include <vil/vil_pixel_format.h>
+
+// Standard VTK macro.
+vtkStandardNewMacro(vtkVgImageSource);
+
+//-----------------------------------------------------------------------------
+class vtkVgImageSourceInternal
+{
+public:
+  vtkVgImageSourceInternal(vtkVgImageSource* imgSrc);
+  ~vtkVgImageSourceInternal();
+
+  void          Init(const char* fileName);
+  vtkImageData* VXLToVTKImageData();
+  vtkImageData* DoOutputResolution(vtkImageData* inImg);
+
+  std::string PrevFileName;
+  vtkVgImageSource* VGImgSrc;
+  vil_image_resource_sptr VILImageResrc;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgImageSourceInternal::vtkVgImageSourceInternal(vtkVgImageSource* imgSrc) :
+  PrevFileName(""),
+  VGImgSrc(imgSrc),
+  VILImageResrc(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgImageSourceInternal::~vtkVgImageSourceInternal()
+{
+  this->VGImgSrc = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgImageSourceInternal::Init(const char* fileName)
+{
+  // Create a new resource if
+  // 1. This is the first time.
+  // 2. This is a different file than the last one.
+  if (!this->VILImageResrc || (this->PrevFileName != std::string(fileName)))
+    {
+    this->VILImageResrc = vil_load_image_resource(fileName);
+    this->PrevFileName = fileName;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkImageData* vtkVgImageSourceInternal::VXLToVTKImageData()
+{
+  if (this->VILImageResrc == 0)
+    {
+    std::cerr << "Invalid image resource. " << std::endl;
+    return 0;
+    }
+
+  const int* fullExtents = this->VGImgSrc->GetFullImageExtents();
+  int fw = fullExtents[2] + 1;
+  int fh = fullExtents[3] + 1;
+
+  // @TODO: Take this out.
+  std::cout  << "fw " << fw << std::endl;
+  std::cout  << "fh " << fh << std::endl;
+
+  int extents[4];
+  int x, y, dw, dh;
+
+  this->VGImgSrc->GetReadExtents(extents[0], extents[1], extents[2], extents[3]);
+
+  // @TODO: Need to take this out.
+  std::cout  << "extents: "
+                << extents[0] << " "
+                << extents[1] << " "
+                << extents[2] << " "
+                << extents[3] << std::endl;
+
+  // For the very first time.
+  if (extents[0] == -1 &&
+      extents[1] == -1 &&
+      extents[2] == -1 &&
+      extents[3] == -1)
+    {
+    this->VGImgSrc->SetReadExtents(0, 0, (fw - 1), (fh - 1));
+    this->VGImgSrc->GetReadExtents(extents[0], extents[1], extents[2], extents[3]);
+    }
+
+  // Check boundary conditions.
+  for (int i = 0; i < 4; ++i)
+    {
+    if (extents[i] < 0)
+      {
+      std::cerr << "Cannot have negative image extents." << std::endl;
+      return 0;
+      }
+    }
+
+  if ((extents[0] > (fw - 1) || extents[2] > (fw - 1)) ||
+      (extents[1] > (fh - 1) || extents[3] > (fh - 1)))
+    {
+    std::cerr << "Cannot have extents larger than the image extens."
+                 << std::endl;
+
+    return 0;
+    }
+
+  dw  = extents[2] - extents[0] + 1;
+  dh  = extents[3] - extents[1] + 1;
+
+  x = extents[0];
+
+  // In VXL world +Y is down.
+  y = fh - (extents[3] + 1);
+
+  // @TODO: Need to take this out.
+  std::cout  << "x " << x << " dw " << dw << " y " << y << " dh " << dh << std::endl;
+
+  vil_image_view<vxl_byte> image;
+  image = VILImageResrc->get_view(x, dw, y, dh);
+
+  if (!image)
+    {
+    std::cerr << "Invalid image view." << std::endl;
+    return 0;
+    }
+
+  int w   = static_cast<int>(image.ni());
+  int h   = static_cast<int>(image.nj());
+  int np  = static_cast<int>(image.nplanes());
+
+  // @NOTE: This is how you query pixel format on the incoming data.
+//  VILImageResrc->pixel_format();
+
+  // Currently we handle images with 1 - 3 components. (R, RG, RGB).
+  if (np < 1 || np > 3)
+    {
+    std::cerr << "Cannot handle image with 0 or more than 3 planes. "
+                 << std::endl;
+    return 0;
+    }
+
+  if (w < 0 || h < 0)
+    {
+    std::cerr << "Invalid image. " << std::endl;
+    return 0;
+    }
+
+  if (w == 0 && h == 0)
+    {
+    std::cerr << "Invalid image. Width and height values are 0."
+                 << std::endl;
+    return 0;
+    }
+
+  int pf = VILImageResrc->pixel_format();
+  std::cout << " pixel format " << VILImageResrc->pixel_format() << std::endl;
+
+  // @TODO: Need to take this out.
+  std::cout  << "w=" << w << std::endl;
+  std::cout  << "h=" << h << std::endl;
+  std::cout  << "nj=" << VILImageResrc->nj() << std::endl;
+  std::cout  << "nplanes=" << image.nplanes() << std::endl;
+  std::cout  << "is_contiguous=" << image.is_contiguous() << std::endl;
+  std::cout  << "size_bytes=" << image.size_bytes() << std::endl;
+  std::cout  << "istep=" << image.istep() << std::endl;
+  std::cout  << "jstep=" << image.jstep() << std::endl;
+  std::cout  << "planestep=" << image.planestep() << std::endl;
+
+  // @Note: This is somewhat limiting but sufficient as of now.
+  int sdt = -1;
+  if (pf == VIL_PIXEL_FORMAT_BYTE)
+    {
+    sdt = VTK_UNSIGNED_CHAR;
+    }
+  else if (pf == VIL_PIXEL_FORMAT_SBYTE)
+    {
+    sdt = VTK_UNSIGNED_SHORT;
+    }
+  else
+    {
+    std::cout << "Scalar data type " << sdt << " is not supported. "
+                 << std::endl;
+    return 0;
+    }
+
+  vtkSmartPointer<vtkImageImport> importerRed(vtkSmartPointer<vtkImageImport>::New());
+  importerRed->SetDataScalarType(sdt);
+  importerRed->SetNumberOfScalarComponents(1);
+  importerRed->SetImportVoidPointer(image.top_left_ptr());
+  importerRed->SetWholeExtent(0, w - 1, 0, h - 1, 0, 0);
+  importerRed->SetDataExtentToWholeExtent();
+  importerRed->Modified();
+  importerRed->Update();
+
+  vtkSmartPointer<vtkImageImport> importerGreen(0);
+  vtkSmartPointer<vtkImageImport> importerBlue(0);
+
+  if (np > 1)
+    {
+    importerGreen = vtkSmartPointer<vtkImageImport>::New();
+    importerGreen->SetDataScalarType(sdt);
+    importerGreen->SetNumberOfScalarComponents(1);
+    importerGreen->SetImportVoidPointer(image.top_left_ptr() + image.planestep());
+    importerGreen->SetWholeExtent(0, w - 1, 0, h - 1, 0, 0);
+    importerGreen->SetDataExtentToWholeExtent();
+    importerGreen->Modified();
+    importerGreen->Update();
+    }
+
+  if (np > 2)
+    {
+    importerBlue = vtkSmartPointer<vtkImageImport>::New();
+    importerBlue->SetDataScalarType(sdt);
+    importerBlue->SetNumberOfScalarComponents(1);
+    importerBlue->SetImportVoidPointer(image.top_left_ptr() + 2 * image.planestep());
+    importerBlue->SetWholeExtent(0, w - 1, 0, h - 1, 0, 0);
+    importerBlue->SetDataExtentToWholeExtent();
+    importerBlue->Modified();
+    importerBlue->Update();
+    }
+
+  vtkSmartPointer<vtkImageAppendComponents> compnts(
+    vtkSmartPointer<vtkImageAppendComponents>::New());
+  compnts->SetInputConnection(importerRed->GetOutputPort());
+
+  if (importerGreen)
+    {
+    compnts->AddInputConnection(importerGreen->GetOutputPort());
+    }
+  if (importerBlue)
+    {
+    compnts->AddInputConnection(importerBlue->GetOutputPort());
+    }
+
+  compnts->Update();
+
+  vtkSmartPointer<vtkImageFlip> flip(vtkSmartPointer<vtkImageFlip>::New());
+  flip->SetInputConnection(compnts->GetOutputPort());
+  flip->SetFlipAboutOrigin(false);
+  flip->SetFilteredAxes(1);
+  flip->Update();
+
+  vtkImageData* img(vtkImageData::New());
+  img->ShallowCopy(flip->GetOutput());
+  return img;
+}
+
+//----------------------------------------------------------------------------
+vtkImageData* vtkVgImageSourceInternal::DoOutputResolution(vtkImageData* inImg)
+{
+  if (!inImg)
+    {
+    std::cerr << "Invalid input image data." << std::endl;
+    return 0;
+    }
+
+  if (!this->VGImgSrc->GetUseOutputResolution())
+    {
+    std::cerr << "UseOutputResolution flag is set to false." << std::endl;
+    return 0;
+    }
+
+  int mx, my;
+  this->VGImgSrc->GetOutputResolution(mx, my);
+
+  if (mx < 0 || my < 0)
+    {
+    std::cerr << "Cannot have negavitve values for the resolution."
+                 << std::endl;
+    return 0;
+    }
+
+  const int* dims = inImg->GetDimensions();
+  if (!dims)
+    {
+    std::cerr << "Unable to query extents of the image." << std::endl;
+    return 0;
+    }
+
+  int w = dims[0];
+  int h = dims[1];
+
+  // Easy to use short name.
+  typedef vtkSmartPointer<vtkImageResample> vtkImageResampleRef;
+
+  vtkImageResampleRef imgRsmpl(vtkImageResampleRef::New());
+  imgRsmpl->SetInputData(inImg);
+  imgRsmpl->SetAxisMagnificationFactor(0, static_cast<double>(mx) / w);
+  imgRsmpl->SetAxisMagnificationFactor(1, static_cast<double>(my) / h);
+  imgRsmpl->Update();
+
+  vtkImageData* output(vtkImageData::New());
+  output->ShallowCopy(imgRsmpl->GetOutput());
+
+  return output;
+}
+
+//----------------------------------------------------------------------------
+vtkVgImageSource::vtkVgImageSource() : vtkVgBaseImageSource(),
+  Implementation(0)
+{
+  // Initialize to some resonable default values.
+  for (int i = 0; i < 4; ++i)
+    {
+    FullImageExtents[i] = -1;
+    }
+
+  this->Implementation = new vtkVgImageSourceInternal(this);
+
+  this->SetNumberOfInputPorts(0);
+  this->SetNumberOfOutputPorts(1);
+}
+
+//----------------------------------------------------------------------------
+vtkVgImageSource::~vtkVgImageSource()
+{
+  delete this->Implementation;
+
+  this->Implementation = 0;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgImageSource::PrintSelf(ostream& os, vtkIndent indent)
+{
+  Superclass::PrintSelf(os, indent);
+
+  // @TODO: Implement this.
+}
+
+//----------------------------------------------------------------------------
+void vtkVgImageSource::GetDimensions(int dim[2])
+{
+  if (this->GetFullImageExtents())
+    {
+    dim[0] = this->FullImageExtents[2] + 1;
+    dim[1] = this->FullImageExtents[3] + 1;
+    }
+  else
+    {
+    dim[0] = 0;
+    dim[1] = 0;
+    }
+}
+
+//----------------------------------------------------------------------------
+const int* vtkVgImageSource::GetFullImageExtents()
+{
+  if (this->FileName)
+    {
+    this->Implementation->Init(this->FileName);
+
+    if (this->Implementation->VGImgSrc)
+      {
+      this->FullImageExtents[0] = 0;
+      this->FullImageExtents[1] = 0;
+      this->FullImageExtents[2] =
+        static_cast<int>(this->Implementation->VILImageResrc->ni()) - 1;
+      this->FullImageExtents[3] =
+        static_cast<int>(this->Implementation->VILImageResrc->nj()) - 1;
+
+      return this->FullImageExtents;
+      }
+    else
+      {
+      vtkErrorMacro("Unable to query the image full extents");
+      return 0;
+      }
+    }
+  else
+    {
+    vtkErrorMacro("Unable to calculate full image extents "
+                  << "without a valid input file name.");
+    return 0;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgImageSource::CanRead(const std::string& source)
+{
+  std::string ciSource = vtksys::SystemTools::LowerCase(source);
+
+  // Check if it is a filename or if the argument is just an extension.
+  std::string ext = vtksys::SystemTools::GetFilenameLastExtension(ciSource);
+  if (ext.compare(".jp2") == 0 || (ciSource.compare("jp2") == 0) ||
+      (ciSource.compare(".jp2") == 0))
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgImageSource::GetShortDescription()
+{
+  return "Reader for PNG file format";
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgImageSource::GetLongDescription()
+{
+  return this->GetShortDescription();
+}
+
+//----------------------------------------------------------------------------
+vtkVgBaseImageSource* vtkVgImageSource::Create()
+{
+  return vtkVgImageSource::New();
+}
+
+//----------------------------------------------------------------------------
+int vtkVgImageSource::RequestInformation(vtkInformation* vtkNotUsed(request),
+                                         vtkInformationVector** vtkNotUsed(inputVector),
+                                         vtkInformationVector* outputVector)
+{
+  // Get the info objects
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  int dataExtent[6];
+  double spacing[3] = {1, 1, 1};
+  double origin[3] = {0, 0, 0};
+
+  if (this->GetUseOutputResolution())
+    {
+    dataExtent[0] = 0;
+    dataExtent[1] = this->OutputResolution[0] - 1;
+    dataExtent[2] = 0;
+    dataExtent[3] = this->OutputResolution[1] - 1;
+    dataExtent[4] = 0;
+    dataExtent[5] = 0;
+    }
+  else
+    {
+    bool getFullExtents(false);
+    for (int i = 0; i < 4; ++i)
+      {
+      if (this->ReadExtents[i] == -1)
+        {
+        getFullExtents = true;
+        break;
+        }
+      }
+
+    if (getFullExtents)
+      {
+      const int* extents = this->GetFullImageExtents();
+      this->SetReadExtents(extents[0], extents[1],
+                           extents[2], extents[3]);
+      }
+
+    origin[0] = this->ReadExtents[0];
+    origin[1] = this->ReadExtents[1];
+    dataExtent[0] = 0;
+    dataExtent[1] = this->ReadExtents[2] - this->ReadExtents[0] - 1;
+    dataExtent[2] = 0;
+    dataExtent[3] = this->ReadExtents[3] - this->ReadExtents[1] - 1;
+    dataExtent[4] = 0;
+    dataExtent[5] = 0;
+    }
+
+  outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),
+               dataExtent, 6);
+  outInfo->Set(vtkDataObject::SPACING(), spacing, 3);
+  outInfo->Set(vtkDataObject::ORIGIN(),  origin,  3);
+
+  return 1;
+}
+
+//----------------------------------------------------------------------------
+int vtkVgImageSource::RequestData(vtkInformation* vtkNotUsed(request),
+                                  vtkInformationVector** vtkNotUsed(inputVector),
+                                  vtkInformationVector* outputVector)
+{
+  if (!outputVector)
+    {
+    vtkErrorMacro("Invalid output information vector.") ;
+    return 1;
+    }
+
+  if (!this->FileName)
+    {
+    vtkErrorMacro("Requires valid input file name.") ;
+    return 1;
+    }
+
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information object.");
+    return 1;
+    }
+
+  vtkDataObject* dataObj = outInfo->Get(vtkDataObject::DATA_OBJECT());
+  if (!dataObj)
+    {
+    vtkErrorMacro("Invalid output data object.");
+    return 1;
+    }
+
+  vtkImageData* outputImage = vtkImageData::SafeDownCast(dataObj);
+  if (!outputImage)
+    {
+    vtkErrorMacro("Output data object is not an image data object.");
+    return 1;
+    }
+
+  this->Implementation->Init(this->FileName);
+  vtkSmartPointer<vtkImageData> output;
+
+  if (this->GetUseOutputResolution())
+    {
+    vtkSmartPointer<vtkImageData> input;
+    input.TakeReference(this->Implementation->VXLToVTKImageData());
+    output.TakeReference(this->Implementation->DoOutputResolution(input));
+    }
+  else
+    {
+    output.TakeReference(this->Implementation->VXLToVTKImageData());
+    }
+
+  outputImage->ShallowCopy(output);
+  outputImage->SetOrigin(this->ReadExtents[0], this->ReadExtents[1], 0);
+
+  return 1;
+}
diff --git a/Libraries/VtkVgCore/vtkVgImageSource.h b/Libraries/VtkVgCore/vtkVgImageSource.h
new file mode 100644
index 00000000..6c67adf7
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgImageSource.h
@@ -0,0 +1,66 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgImageSource_h
+#define __vtkVgImageSource_h
+
+#include "vtkVgBaseImageSource.h"
+
+#include <vgExport.h>
+
+class vtkVgImageSourceInternal;
+
+class VTKVG_CORE_EXPORT vtkVgImageSource : public vtkVgBaseImageSource
+{
+public:
+
+  static vtkVgImageSource* New();
+
+  vtkTypeMacro(vtkVgImageSource, vtkVgBaseImageSource);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  virtual void GetDimensions(int dim[2]);
+
+  const int* GetFullImageExtents();
+
+  virtual bool CanRead(const std::string& source);
+
+  virtual std::string GetShortDescription();
+
+  virtual std::string GetLongDescription();
+
+  static vtkVgBaseImageSource* Create();
+
+
+protected:
+
+  vtkVgImageSource();
+  virtual ~vtkVgImageSource();
+
+  virtual int RequestInformation(vtkInformation* request,
+                                 vtkInformationVector** inputVector,
+                                 vtkInformationVector* outputVector);
+
+  virtual int RequestData(vtkInformation* request,
+                          vtkInformationVector** inputVector,
+                          vtkInformationVector* outputVector);
+
+private:
+
+  vtkVgImageSource(const vtkVgImageSource&);  // Not implemented.
+  void operator=(const vtkVgImageSource&);    // Not implemented.
+
+
+// Data members.
+private:
+
+  int   FullImageExtents[4];
+
+  vtkVgImageSourceInternal* Implementation;
+};
+
+#endif // __vtkVgImageSource_h
diff --git a/Libraries/VtkVgCore/vtkVgInstance.h b/Libraries/VtkVgCore/vtkVgInstance.h
new file mode 100644
index 00000000..53980660
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgInstance.h
@@ -0,0 +1,211 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgInstance_h
+#define __vtkVgInstance_h
+
+// Description:
+// This class provides an instantiable, copyable and assignable wrapper around
+// vtkObject. Copying and assignment require that vtkObject subclass implements
+// the DeepCopy method.
+template <typename T>
+class vtkVgInstance
+{
+public:
+  enum AssignmentMode
+    {
+    // Description:
+    // Set the instance's underlying object to the source vtkObject*, and
+    // increment the vtkObject's reference count. Use TakeReference when
+    // creating an instance from a smart pointer, or when the pointer will be
+    // explicitly released later.
+    TakeReference,
+    // Description:
+    // Set the instance's underlying object to the source vtkObject*. The source
+    // vtkObject's reference count is not altered. Use TakeOwnership when the
+    // vtkVgInstance may take responsibility for managing the pointer.
+    TakeOwnership,
+    // Description:
+    // Create a new vtkObject and copy the data of the source object using
+    // DeepCopy. This is equivalent to constructing the instance with the
+    // default constructor and then assigning the existing vtkObject to the
+    // instance via ::operator=.
+    CopyByAssignment
+    };
+
+  // Description:
+  // Default constructor. Uses the default constructor of the underlying
+  // vtkObject.
+  vtkVgInstance();
+
+  // Description:
+  // Create an instance from an existing vtkObject. The ::AssignmentMode
+  // controls how the instance is created.
+  vtkVgInstance(T*, AssignmentMode);
+
+  // Description:
+  // "Copy" constructor. Create a new instance with a new underlying vtkObject,
+  // and copy the data of the other vtkObject onto the new one using DeepCopy.
+  vtkVgInstance(const T&);
+
+  // Description:
+  // Copy constructor. Create a new instance with a new underlying vtkObject,
+  // and copy the data of the other instance's underlying vtkObject onto the
+  // new one using DeepCopy.
+  vtkVgInstance(const vtkVgInstance<T>&);
+
+  // Description:
+  // Destructor. Release the underlying vtkObject.
+  ~vtkVgInstance();
+
+  // Description:
+  // Assign the data of another instance to this instance. The other instance's
+  // underlying vtkObject is copied onto this instance's underlying vtkObject
+  // using DeepCopy.
+  vtkVgInstance<T>& operator=(const vtkVgInstance<T>&);
+
+  // Description:
+  // Assign the data of another vtkObject to this instance. The object is
+  // copied onto this instance's underlying vtkObject using DeepCopy.
+  vtkVgInstance<T>& operator=(T*);
+
+  // Description:
+  // Cast operator. Return a reference to the underlying vtkObject.
+  operator T&();
+
+  // Description:
+  // Cast operator. Return a const reference to the underlying vtkObject.
+  operator const T&() const;
+
+  // Description:
+  // Cast operator. Return a pointer to the underlying vtkObject.
+  operator T*();
+
+  // Description:
+  // Cast operator. Return a const pointer to the underlying vtkObject.
+  operator const T*() const;
+
+  // Description:
+  // Dereference accessor operator. Access the underlying vtkObject.
+  T* operator->();
+
+  // Description:
+  // Dereference accessor operator. Access the underlying vtkObject.
+  const T* operator->() const;
+
+private:
+  T* Object;
+};
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::vtkVgInstance()
+  : Object(T::New())
+{
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::vtkVgInstance(T* object,
+                                typename vtkVgInstance<T>::AssignmentMode mode)
+  : Object(0)
+{
+  switch (mode)
+    {
+    case TakeReference:
+      object->Register(object);
+      // fall through
+    case TakeOwnership:
+      this->Object = object;
+      break;
+    default: // CopyByAssignment
+      this->Object = T::New();
+      *this = object;
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::vtkVgInstance(const T& object)
+  : Object(T::New())
+{
+  this->Object->DeepCopy(&object);
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::vtkVgInstance(const vtkVgInstance<T>& other)
+  : Object(T::New())
+{
+  this->Object->DeepCopy(other.Object);
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::~vtkVgInstance()
+{
+  this->Object->Delete();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>& vtkVgInstance<T>::operator=(const vtkVgInstance<T>& other)
+{
+  this->Object->DeepCopy(other.Object);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>& vtkVgInstance<T>::operator=(T* other)
+{
+  this->Object->DeepCopy(other);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::operator T&()
+{
+  return *this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::operator const T&() const
+{
+  return *this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::operator T*()
+{
+  return this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgInstance<T>::operator const T*() const
+{
+  return this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+T* vtkVgInstance<T>::operator->()
+{
+  return this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+const T* vtkVgInstance<T>::operator->() const
+{
+  return this->Object;
+}
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgInteractorStyleRubberBand2D.cxx b/Libraries/VtkVgCore/vtkVgInteractorStyleRubberBand2D.cxx
new file mode 100644
index 00000000..2fa0ae0c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgInteractorStyleRubberBand2D.cxx
@@ -0,0 +1,448 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgInteractorStyleRubberBand2D.h"
+
+#include "vtkVgRendererUtils.h"
+
+// VTK includes.
+#include <vtkActor2D.h>
+#include <vtkCamera.h>
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkCommand.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper2D.h>
+#include <vtkPoints.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkUnsignedCharArray.h>
+
+vtkStandardNewMacro(vtkVgInteractorStyleRubberBand2D);
+vtkCxxSetObjectMacro(vtkVgInteractorStyleRubberBand2D, Renderer, vtkRenderer);
+
+//-----------------------------------------------------------------------------
+vtkVgInteractorStyleRubberBand2D::vtkVgInteractorStyleRubberBand2D() :
+  vtkInteractorStyleRubberBand2D()
+{
+  this->AllowPanning = 1;
+  this->RubberBandMode = ZoomMode;
+  this->RubberBandSelectionWithCtrlKey = 0;
+  this->LeftButtonIsMiddleButton = false;
+  this->Renderer = 0;
+  this->RubberBandActor = 0;
+  this->RubberBandPoints = 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgInteractorStyleRubberBand2D::~vtkVgInteractorStyleRubberBand2D()
+{
+  if (this->Renderer)
+    {
+    this->Renderer->UnRegister(this);
+    }
+  if (this->RubberBandActor)
+    {
+    this->RubberBandActor->Delete();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//----------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnKeyPress()
+{
+  switch (this->Interactor->GetKeyCode())
+    {
+    case 'a':
+    case 'A':
+      this->InvokeEvent(KeyPressEvent_A);
+      break;
+    case 'r':
+    case 'R':
+      this->InvokeEvent(KeyPressEvent_R);
+      break;
+    case 'z':
+    case 'Z':
+      this->InvokeEvent(KeyPressEvent_Z);
+      break;
+    case 's':
+    case 'S':
+      this->InvokeEvent(KeyPressEvent_S);
+      break;
+    case 'p':
+    case 'P':
+      this->InvokeEvent(KeyPressEvent_P);
+      break;
+    default:
+      if (strcmp(this->Interactor->GetKeySym(), "Delete") == 0)
+        {
+        this->InvokeEvent(KeyPressEvent_Delete);
+        break;
+        }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnChar()
+{
+  // FIXME - may break vsPlay
+  // hide ResetCamera
+  switch (this->Interactor->GetKeyCode())
+    {
+    case 'r' :
+    case 'R' :
+      return;
+    default:
+      this->Superclass::OnChar();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnLeftButtonDown()
+{
+  if (this->Interactor->GetShiftKey())
+    {
+    this->LeftButtonIsMiddleButton = true;
+    this->Superclass::OnMiddleButtonDown();
+    return;
+    }
+  this->LeftButtonIsMiddleButton = false;
+
+  if (this->RubberBandMode == vtkVgInteractorStyleRubberBand2D::DisabledMode &&
+      !this->Interactor->GetControlKey())
+    {
+    return;
+    }
+
+  // fall back to built-in rubberband drawing if no renderer was given
+  if (!this->Renderer)
+    {
+    this->Superclass::OnLeftButtonDown();
+    return;
+    }
+
+  if (this->Interaction != NONE)
+    {
+    return;
+    }
+
+  this->Interaction = SELECTING;
+
+  // initialize the rubberband actor on first use
+  if (!this->RubberBandActor)
+    {
+    this->RubberBandActor = vtkActor2D::New();
+    this->RubberBandPoints = vtkPoints::New();
+    vtkPolyData* PD  = vtkPolyData::New();
+    vtkCellArray* CA = vtkCellArray::New();
+    vtkCellArray* CA2 = vtkCellArray::New();
+    vtkPolyDataMapper2D* PDM = vtkPolyDataMapper2D::New();
+    vtkUnsignedCharArray* UCA = vtkUnsignedCharArray::New();
+
+    this->RubberBandPoints->SetNumberOfPoints(4);
+
+    vtkIdType ids[] = { 0, 1, 2, 3, 0 };
+    CA2->InsertNextCell(5, ids);
+    CA->InsertNextCell(4, ids);
+
+    UCA->SetNumberOfComponents(4);
+    UCA->SetName("Colors");
+
+    unsigned char color[]     = { 200, 230, 250,  50 };
+    unsigned char edgeColor[] = {  60, 173, 255, 255 };
+    UCA->InsertNextTupleValue(edgeColor);
+    UCA->InsertNextTupleValue(color);
+
+    PD->GetCellData()->SetScalars(UCA);
+    PD->SetPoints(this->RubberBandPoints);
+    PD->SetPolys(CA);
+    PD->SetLines(CA2);
+    PDM->SetInputData(PD);
+
+    this->RubberBandActor->SetMapper(PDM);
+
+    this->Renderer->AddViewProp(this->RubberBandActor);
+
+    CA->FastDelete();
+    CA2->FastDelete();
+    UCA->FastDelete();
+    PD->FastDelete();
+    PDM->FastDelete();
+    this->RubberBandPoints->FastDelete();
+    }
+  else
+    {
+    this->RubberBandActor->VisibilityOn();
+
+    // Our actor may have been removed since it isn't in the scene graph.
+    // Don't bother checking if it has already been added, since the renderer
+    // will do that anyways.
+    this->Renderer->AddViewProp(this->RubberBandActor);
+    }
+
+  this->StartPosition[0] = this->Interactor->GetEventPosition()[0];
+  this->StartPosition[1] = this->Interactor->GetEventPosition()[1];
+  this->EndPosition[0] = this->StartPosition[0];
+  this->EndPosition[1] = this->StartPosition[1];
+
+  double pos[] =
+    {
+    this->StartPosition[0] + 0.5,
+    this->StartPosition[1] + 0.5,
+    0.0
+    };
+
+  this->RubberBandPoints->SetPoint(0, pos);
+  this->RubberBandPoints->SetPoint(1, pos);
+  this->RubberBandPoints->SetPoint(2, pos);
+  this->RubberBandPoints->SetPoint(3, pos);
+
+  vtkPolyDataMapper2D::SafeDownCast(this->RubberBandActor->GetMapper())
+  ->GetInput()->Modified();
+
+  this->SetCurrentRenderer(this->Renderer);
+  this->InvokeEvent(vtkCommand::StartInteractionEvent);
+  this->GetInteractor()->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnLeftButtonUp()
+{
+  if (this->LeftButtonIsMiddleButton)
+    {
+    this->LeftButtonIsMiddleButton = false;
+    this->Superclass::OnMiddleButtonUp();
+    return;
+    }
+
+  if (!this->RubberBandActor)
+    {
+    this->Superclass::OnLeftButtonUp();
+    return;
+    }
+
+  if (this->Interaction != SELECTING)
+    {
+    return;
+    }
+
+  this->RubberBandActor->VisibilityOff();
+
+  int area = (this->EndPosition[0] - this->StartPosition[0]) *
+             (this->EndPosition[1] - this->StartPosition[1]);
+
+  // just a left click?
+  if (this->RubberBandMode == DisabledMode ||
+      this->RubberBandMode == DisplayOnlyMode ||
+      area == 0)
+    {
+    this->InvokeEvent(LeftClickEvent);
+    }
+  // don't zoom or select for small rubberband; probably unintentional
+  else if (abs(area) > 25)
+    {
+    // ZoomMode and NOT selection instead because of Ctrl modifier
+    if (this->RubberBandMode == ZoomMode &&
+        !(this->RubberBandSelectionWithCtrlKey &&
+          this->Interactor->GetControlKey()))
+      {
+      this->Zoom();
+      this->InvokeEvent(vtkCommand::EndInteractionEvent);
+      }
+    else
+      {
+      this->InvokeEvent(SelectionCompleteEvent);
+      }
+    }
+
+  this->GetInteractor()->Render();
+  this->Interaction = NONE;
+}
+
+//--------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnRightButtonDown()
+{
+  this->StartPosition[0] = this->Interactor->GetEventPosition()[0];
+  this->StartPosition[1] = this->Interactor->GetEventPosition()[1];
+  this->Superclass::OnRightButtonDown();
+}
+
+//--------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnRightButtonUp()
+{
+  int pos[2];
+  this->Interactor->GetEventPosition(pos);
+
+  if (abs(pos[0] - this->StartPosition[0]) < 5 &&
+      abs(pos[1] - this->StartPosition[1]) < 5)
+    {
+    this->InvokeEvent(RightClickEvent);
+    }
+
+  this->Superclass::OnRightButtonUp();
+}
+
+//--------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnMiddleButtonDown()
+{
+  if (!this->AllowPanning)
+    {
+    // Do nothing.
+    }
+  else
+    {
+    this->Superclass::OnMiddleButtonDown();
+    }
+}
+
+//--------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnMiddleButtonUp()
+{
+  if (!this->AllowPanning)
+    {
+    // Do nothing.
+    }
+  else
+    {
+    this->Superclass::OnMiddleButtonUp();
+    }
+}
+
+//--------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::OnMouseMove()
+{
+  if (this->RubberBandMode == DisabledMode)
+    {
+    return;
+    }
+
+  if (this->Interaction != SELECTING || !this->RubberBandActor)
+    {
+    this->Superclass::OnMouseMove();
+    return;
+    }
+
+  this->EndPosition[0] = this->Interactor->GetEventPosition()[0];
+  this->EndPosition[1] = this->Interactor->GetEventPosition()[1];
+
+  int* size = this->Interactor->GetRenderWindow()->GetSize();
+  if (this->EndPosition[0] > (size[0] - 1))
+    {
+    this->EndPosition[0] = size[0] - 1;
+    }
+  if (this->EndPosition[0] < 0)
+    {
+    this->EndPosition[0] = 0;
+    }
+  if (this->EndPosition[1] > (size[1] - 1))
+    {
+    this->EndPosition[1] = size[1] - 1;
+    }
+  if (this->EndPosition[1] < 0)
+    {
+    this->EndPosition[1] = 0;
+    }
+
+  double pos1[] =
+    {
+    this->EndPosition[0] + 0.5,
+    this->StartPosition[1] + 0.5,
+    0.0
+    };
+
+  double pos2[] =
+    {
+    this->EndPosition[0] + 0.5,
+    this->EndPosition[1] + 0.5,
+    0.0
+    };
+
+  double pos3[] =
+    {
+    this->StartPosition[0] + 0.5,
+    this->EndPosition[1] + 0.5,
+    0.0
+    };
+
+  this->RubberBandPoints->SetPoint(1, pos1);
+  this->RubberBandPoints->SetPoint(2, pos2);
+  this->RubberBandPoints->SetPoint(3, pos3);
+
+  vtkPolyDataMapper2D::SafeDownCast(this->RubberBandActor->GetMapper())
+  ->GetInput()->Modified();
+
+  this->InvokeEvent(vtkCommand::InteractionEvent);
+  this->GetInteractor()->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::ZoomToExtents(vtkRenderer* ren,
+    double extents[4])
+{
+  vtkVgRendererUtils::ZoomToExtents2D(ren, extents);
+  this->InvokeEvent(ZoomCompleteEvent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgInteractorStyleRubberBand2D::Zoom()
+{
+  int width, height;
+  width = abs(this->EndPosition[0] - this->StartPosition[0]);
+  height = abs(this->EndPosition[1] - this->StartPosition[1]);
+
+  // compute world position of lower left corner
+  double rbmin[3];
+  rbmin[0] = this->StartPosition[0] < this->EndPosition[0] ?
+             this->StartPosition[0] : this->EndPosition[0];
+  rbmin[1] = this->StartPosition[1] < this->EndPosition[1] ?
+             this->StartPosition[1] : this->EndPosition[1];
+  rbmin[2] = 0.0;
+
+  this->CurrentRenderer->SetDisplayPoint(rbmin);
+  this->CurrentRenderer->DisplayToView();
+  this->CurrentRenderer->ViewToWorld();
+
+  double invw;
+  double worldRBMin[4];
+  this->CurrentRenderer->GetWorldPoint(worldRBMin);
+  invw = 1.0 / worldRBMin[3];
+  worldRBMin[0] *= invw;
+  worldRBMin[1] *= invw;
+
+  // compute world position of upper right corner
+  double rbmax[3];
+  rbmax[0] = rbmin[0] + width;
+  rbmax[1] = rbmin[1] + height;
+  rbmax[2] = 0.0;
+
+  this->CurrentRenderer->SetDisplayPoint(rbmax);
+  this->CurrentRenderer->DisplayToView();
+  this->CurrentRenderer->ViewToWorld();
+
+  double worldRBMax[4];
+  this->CurrentRenderer->GetWorldPoint(worldRBMax);
+  invw = 1.0 / worldRBMax[3];
+  worldRBMax[0] *= invw;
+  worldRBMax[1] *= invw;
+
+  double extents[] =
+    {
+    worldRBMin[0],
+    worldRBMax[0],
+    worldRBMin[1],
+    worldRBMax[1]
+    };
+
+  // zoom
+  this->ZoomToExtents(this->CurrentRenderer, extents);
+}
diff --git a/Libraries/VtkVgCore/vtkVgInteractorStyleRubberBand2D.h b/Libraries/VtkVgCore/vtkVgInteractorStyleRubberBand2D.h
new file mode 100644
index 00000000..d9163951
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgInteractorStyleRubberBand2D.h
@@ -0,0 +1,132 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgInteractorStyleRubberBand2D_h
+#define __vtkVgInteractorStyleRubberBand2D_h
+
+#include <vtkCommand.h>
+#include <vtkInteractorStyleRubberBand2D.h>
+
+#include <vgExport.h>
+
+class vtkActor2D;
+class vtkPoints;
+class vtkRenderer;
+
+class VTKVG_CORE_EXPORT vtkVgInteractorStyleRubberBand2D
+  : public vtkInteractorStyleRubberBand2D
+{
+public:
+  enum Commands
+    {
+    LeftClickEvent = vtkCommand::UserEvent + 1,
+    RightClickEvent,
+    KeyPressEvent_A,
+    KeyPressEvent_R,
+    KeyPressEvent_Z,
+    KeyPressEvent_S,
+    KeyPressEvent_P,
+    KeyPressEvent_Delete,
+    ZoomCompleteEvent,
+    SelectionCompleteEvent
+    };
+
+public:
+  // Description:
+  // Standard VTK functions.
+  static vtkVgInteractorStyleRubberBand2D* New();
+  vtkTypeMacro(vtkVgInteractorStyleRubberBand2D, vtkInteractorStyleRubberBand2D);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Constructor / Destructor.
+  vtkVgInteractorStyleRubberBand2D();
+  ~vtkVgInteractorStyleRubberBand2D();
+
+  // Description:
+  virtual void OnKeyPress();
+
+  virtual void OnChar();
+
+  // Description:
+  // Overriding these functions to implement custom
+  // interactions.
+  virtual void OnLeftButtonDown();
+  virtual void OnLeftButtonUp();
+  virtual void OnRightButtonDown();
+  virtual void OnRightButtonUp();
+  virtual void OnMiddleButtonDown();
+  virtual void OnMiddleButtonUp();
+  virtual void OnMouseMove();
+
+  using vtkInteractorStyleRubberBand2D::GetStartPosition;
+  using vtkInteractorStyleRubberBand2D::GetEndPosition;
+
+  int* GetStartPosition() { return this->StartPosition; }
+  int* GetEndPosition()   { return this->EndPosition; }
+
+  // Description:
+  // Enable/disable panning.
+  vtkSetMacro(AllowPanning, int);
+  vtkGetMacro(AllowPanning, int);
+  vtkBooleanMacro(AllowPanning, int);
+
+  // Description:
+  // Modes for RubberBandMode
+  enum enumRubberBandMode
+    {
+    ZoomMode = 0,
+    SelectionMode,
+    DisplayOnlyMode,
+    DisabledMode
+    };
+
+  // Description:
+  // Control whether we do zoom, selection, or nothing special if rubberband
+  vtkSetClampMacro(RubberBandMode, int, ZoomMode, DisabledMode);
+  vtkGetMacro(RubberBandMode, int);
+  void SetRubberBandModeToZoom()
+    {this->SetRubberBandMode(ZoomMode);}
+  void SetRubberBandModeToSelection()
+    {this->SetRubberBandMode(SelectionMode);}
+  void SetRubberBandModeToDisplayOnly()
+    {this->SetRubberBandMode(DisplayOnlyMode);}
+  void SetRubberBandModeToDisabled()
+    {this->SetRubberBandMode(DisabledMode);}
+
+  // Description:
+  // Enable rubberband selection (while in zoom mode) via Ctrl-key modifier
+  vtkSetMacro(RubberBandSelectionWithCtrlKey, int);
+  vtkGetMacro(RubberBandSelectionWithCtrlKey, int);
+  vtkBooleanMacro(RubberBandSelectionWithCtrlKey, int);
+
+  void ZoomToExtents(vtkRenderer* renderer, double extents[4]);
+
+  // Renderer to use for rubberband drawing.
+  void SetRenderer(vtkRenderer* renderer);
+
+protected:
+  void Zoom();
+
+private:
+// Not implemented.
+  vtkVgInteractorStyleRubberBand2D(const vtkVgInteractorStyleRubberBand2D&);
+  void operator=(const vtkVgInteractorStyleRubberBand2D&);
+
+  int AllowPanning;
+  int RubberBandMode;
+  int RubberBandSelectionWithCtrlKey;
+
+  bool LeftButtonIsMiddleButton;
+
+  vtkRenderer* Renderer;
+
+  vtkActor2D* RubberBandActor;
+  vtkPoints*  RubberBandPoints;
+};
+
+#endif // __vtkVgInteractorStyleRubberBand2D_h
diff --git a/Libraries/VtkVgCore/vtkVgJPEGMemoryReader.cxx b/Libraries/VtkVgCore/vtkVgJPEGMemoryReader.cxx
new file mode 100644
index 00000000..2e97439f
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgJPEGMemoryReader.cxx
@@ -0,0 +1,275 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgJPEGMemoryReader.h"
+
+#include "vtkDataArray.h"
+#include "vtkImageData.h"
+#include "vtkObjectFactory.h"
+#include "vtkPointData.h"
+
+extern "C" {
+#include "vtk_jpeg.h"
+#include "jmem_src.h"
+#include <setjmp.h>
+}
+
+
+vtkStandardNewMacro(vtkVgJPEGMemoryReader);
+
+
+// create an error handler for jpeg that
+// can longjmp out of the jpeg library
+struct vtk_jpeg_error_mgr
+{
+  struct jpeg_error_mgr pub;    /* "public" fields */
+  jmp_buf setjmp_buffer;        /* for return to caller */
+  vtkVgJPEGMemoryReader* JPEGReader;
+};
+
+// this is called on jpeg error conditions
+extern "C" void vtk_jpeg_error_exit_mr(j_common_ptr cinfo)
+{
+  /* cinfo->err really points to a my_error_mgr struct, so coerce pointer */
+  vtk_jpeg_error_mgr* err = reinterpret_cast<vtk_jpeg_error_mgr*>(cinfo->err);
+
+  /* Return control to the setjmp point */
+  longjmp(err->setjmp_buffer, 1);
+}
+
+extern "C" void vtk_jpeg_output_message_mr(j_common_ptr cinfo)
+{
+  char buffer[JMSG_LENGTH_MAX];
+
+  /* Create the message */
+  (*cinfo->err->format_message)(cinfo, buffer);
+  vtk_jpeg_error_mgr* err = reinterpret_cast<vtk_jpeg_error_mgr*>(cinfo->err);
+  vtkWarningWithObjectMacro(err->JPEGReader,
+                            "libjpeg error: " << buffer);
+}
+
+#ifdef _MSC_VER
+// Let us get rid of this funny warning on /W4:
+// warning C4611: interaction between '_setjmp' and C++ object
+// destruction is non-portable
+#pragma warning(disable : 4611)
+#endif
+
+void vtkVgJPEGMemoryReader::ExecuteInformation()
+{
+  this->ComputeInternalFileName(this->DataExtent[4]);
+  if (this->InternalFileName == NULL)
+    {
+    return;
+    }
+
+  if (!this->BufferSize || !this->Buffer)
+    {
+    vtkErrorWithObjectMacro(this,
+                            "No memory buffer set "
+                            << this->InternalFileName);
+    return;
+    }
+
+  // create jpeg decompression object and error handler
+  struct jpeg_decompress_struct cinfo;
+  struct vtk_jpeg_error_mgr jerr;
+  jerr.JPEGReader = this;
+
+  cinfo.err = jpeg_std_error(&jerr.pub);
+  // for any jpeg error call vtk_jpeg_error_exit
+  jerr.pub.error_exit = vtk_jpeg_error_exit_mr;
+  // for any output message call vtk_jpeg_output_message
+  jerr.pub.output_message = vtk_jpeg_output_message_mr;
+  if (setjmp(jerr.setjmp_buffer))
+    {
+    // clean up
+    jpeg_destroy_decompress(&cinfo);
+    // close the file
+    // this is not a valid jpeg file
+    vtkErrorWithObjectMacro(this, "libjpeg could not read file: "
+                            << this->InternalFileName);
+    return;
+    }
+  jpeg_create_decompress(&cinfo);
+
+  // set the source file
+  jpeg_memory_src(&cinfo, this->Buffer, this->BufferSize);
+
+  // read the header
+  jpeg_read_header(&cinfo, TRUE);
+
+  // force the output image size to be calculated (we could have used
+  // cinfo.image_height etc. but that would preclude using libjpeg's
+  // ability to scale an image on input).
+  jpeg_calc_output_dimensions(&cinfo);
+
+  // pull out the width/height, etc.
+  this->DataExtent[0] = 0;
+  this->DataExtent[1] = cinfo.output_width - 1;
+  this->DataExtent[2] = 0;
+  this->DataExtent[3] = cinfo.output_height - 1;
+
+  this->SetDataScalarTypeToUnsignedChar();
+  this->SetNumberOfScalarComponents(cinfo.output_components);
+
+  this->vtkImageReader2::ExecuteInformation();
+
+  // close the file
+  jpeg_destroy_decompress(&cinfo);
+}
+
+template <class OT>
+void vtkJPEGMemoryReaderUpdate2(vtkVgJPEGMemoryReader* self, OT* outPtr,
+                                int* outExt, vtkIdType* outInc, long)
+{
+  unsigned int ui;
+  int i;
+
+  // create jpeg decompression object and error handler
+  struct jpeg_decompress_struct cinfo;
+  struct vtk_jpeg_error_mgr jerr;
+  jerr.JPEGReader = self;
+
+  cinfo.err = jpeg_std_error(&jerr.pub);
+  // for any jpeg error call vtk_jpeg_error_exit
+  jerr.pub.error_exit = vtk_jpeg_error_exit_mr;
+  // for any output message call vtk_jpeg_output_message
+  jerr.pub.output_message = vtk_jpeg_output_message_mr;
+  if (setjmp(jerr.setjmp_buffer))
+    {
+    // clean up
+    jpeg_destroy_decompress(&cinfo);
+    // close the file
+    vtkErrorWithObjectMacro(self, "libjpeg could not read file: "
+                            << self->GetInternalFileName());
+    // this is not a valid jpeg file
+    return;
+    }
+  jpeg_create_decompress(&cinfo);
+
+  // set the source file
+  jpeg_memory_src(&cinfo, self->Buffer, self->BufferSize);
+
+  // read the header
+  jpeg_read_header(&cinfo, TRUE);
+
+  // prepare to read the bulk data
+  jpeg_start_decompress(&cinfo);
+
+  int rowbytes = cinfo.output_components * cinfo.output_width;
+  unsigned char* tempImage = new unsigned char [rowbytes * cinfo.output_height];
+  JSAMPROW* row_pointers = new JSAMPROW [cinfo.output_height];
+  for (ui = 0; ui < cinfo.output_height; ++ui)
+    {
+    row_pointers[ui] = tempImage + rowbytes * ui;
+    }
+
+  // read the bulk data
+  unsigned int remainingRows = cinfo.output_height;
+  while (cinfo.output_scanline < cinfo.output_height)
+    {
+    remainingRows = cinfo.output_height - cinfo.output_scanline;
+    jpeg_read_scanlines(&cinfo, &row_pointers[cinfo.output_scanline],
+                        remainingRows);
+    }
+
+  // finish the decompression step
+  jpeg_finish_decompress(&cinfo);
+
+  // destroy the decompression object
+  jpeg_destroy_decompress(&cinfo);
+
+  // copy the data into the outPtr
+  OT* outPtr2;
+  outPtr2 = outPtr;
+  long outSize = cinfo.output_components * (outExt[1] - outExt[0] + 1);
+  for (i = outExt[2]; i <= outExt[3]; ++i)
+    {
+    memcpy(outPtr2,
+           row_pointers[cinfo.output_height - i - 1]
+           + outExt[0]*cinfo.output_components,
+           outSize);
+    outPtr2 += outInc[1];
+    }
+  delete [] tempImage;
+  delete [] row_pointers;
+
+}
+
+//----------------------------------------------------------------------------
+// This function reads in one data of data.
+// templated to handle different data types.
+template <class OT>
+void vtkJPEGMemoryReaderUpdate(vtkVgJPEGMemoryReader* self, vtkImageData* data, OT* outPtr)
+{
+  vtkIdType outIncr[3];
+  int outExtent[6];
+  OT* outPtr2;
+
+  data->GetExtent(outExtent);
+  data->GetIncrements(outIncr);
+
+  long pixSize = data->GetNumberOfScalarComponents() * sizeof(OT);
+
+  outPtr2 = outPtr;
+  int idx2;
+  for (idx2 = outExtent[4]; idx2 <= outExtent[5]; ++idx2)
+    {
+    self->ComputeInternalFileName(idx2);
+    // read in a JPEG file
+    vtkJPEGMemoryReaderUpdate2(self, outPtr2, outExtent, outIncr, pixSize);
+    self->UpdateProgress((idx2 - outExtent[4]) /
+                         (outExtent[5] - outExtent[4] + 1.0));
+    outPtr2 += outIncr[2];
+    }
+}
+
+
+//----------------------------------------------------------------------------
+// This function reads a data from a file.  The datas extent/axes
+// are assumed to be the same as the file extent/order.
+void vtkVgJPEGMemoryReader::ExecuteDataWithInformation(vtkDataObject* output,
+                                                       vtkInformation *outInfo)
+{
+  vtkImageData* data = this->AllocateOutputData(output, outInfo);
+
+  if (this->InternalFileName == NULL)
+    {
+    vtkErrorMacro(<< "Either a FileName or FilePrefix must be specified.");
+    return;
+    }
+
+  this->ComputeDataIncrements();
+
+  data->GetPointData()->GetScalars()->SetName("JPEGImage");
+
+  // Call the correct templated function for the output
+  void* outPtr;
+
+  // Call the correct templated function for the input
+  outPtr = data->GetScalarPointer();
+  switch (data->GetScalarType())
+    {
+    vtkTemplateMacro(vtkJPEGMemoryReaderUpdate(this, data, (VTK_TT*)(outPtr)));
+    default:
+      vtkErrorMacro(<< "UpdateFromFile: Unknown data type");
+    }
+}
+
+
+
+#ifdef _MSC_VER
+// Put the warning back
+#pragma warning(default : 4611)
+#endif
+
+
+//----------------------------------------------------------------------------
+void vtkVgJPEGMemoryReader::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgJPEGMemoryReader.h b/Libraries/VtkVgCore/vtkVgJPEGMemoryReader.h
new file mode 100644
index 00000000..d783c659
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgJPEGMemoryReader.h
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgJPEGMemoryReader - read JPEG files
+// .SECTION Description
+// vtkVgJPEGMemoryReader is a source object that reads JPEG files.
+// It should be able to read most any JPEG file
+//
+// .SECTION See Also
+// vtkJPEGWriter
+
+#ifndef __vtkVgJPEGMemoryReader_h
+#define __vtkVgJPEGMemoryReader_h
+
+#include "vtkImageReader2.h"
+
+#include <vgExport.h>
+
+#include <cassert>
+
+class VTKVG_CORE_EXPORT vtkVgJPEGMemoryReader : public vtkImageReader2
+{
+public:
+  static vtkVgJPEGMemoryReader* New();
+  vtkTypeMacro(vtkVgJPEGMemoryReader, vtkImageReader2);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+  virtual void SetMemoryBuffer(void*) {assert(false);}
+  void SetMemoryBuffer(unsigned char* buff, int size)
+    {
+    this->Modified();
+    this->Buffer = buff;
+    this->BufferSize = size;
+    }
+protected:
+  vtkVgJPEGMemoryReader() {this->Buffer = 0; this->BufferSize = 0;};
+  ~vtkVgJPEGMemoryReader() {};
+
+  virtual void ExecuteInformation();
+  virtual void ExecuteDataWithInformation(vtkDataObject* out, vtkInformation* outInfo);
+public:
+  unsigned char* Buffer;
+  int BufferSize;
+private:
+  vtkVgJPEGMemoryReader(const vtkVgJPEGMemoryReader&);  // Not implemented.
+  void operator=(const vtkVgJPEGMemoryReader&);  // Not implemented.
+};
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgJPEGReader.cxx b/Libraries/VtkVgCore/vtkVgJPEGReader.cxx
new file mode 100644
index 00000000..12071fa4
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgJPEGReader.cxx
@@ -0,0 +1,200 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgJPEGReader.h"
+
+// VTK includes.
+#include <vtkImageData.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
+#include <vtkJPEGReader.h>
+#include <vtkObjectFactory.h>
+#include <vtkStreamingDemandDrivenPipeline.h>
+
+#include <vtksys/SystemTools.hxx>
+
+// Standard VTK macro to implement New().
+vtkStandardNewMacro(vtkVgJPEGReader);
+
+//-----------------------------------------------------------------------------
+vtkVgJPEGReader::vtkVgJPEGReader() : vtkVgBaseImageSource(),
+  ImageCache(0)
+{
+  this->Reader = vtkJPEGReader::New();
+
+  this->SetNumberOfInputPorts(0);
+  this->SetNumberOfOutputPorts(1);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgJPEGReader::~vtkVgJPEGReader()
+{
+  if (this->ImageCache)
+    {
+    this->ImageCache->Delete();
+    this->ImageCache = 0;
+    }
+
+  if (this->Reader)
+    {
+    this->Reader->Delete();
+    this->Reader = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgJPEGReader::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgJPEGReader::GetNumberOfLevels() const
+{
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgJPEGReader::GetDimensions(int dim[2])
+{
+  int* extents = this->Reader->GetDataExtent();
+  dim[0] = extents[1] + 1;
+  dim[1] = extents[3] + 1;
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgJPEGReader::CanRead(const std::string& source)
+{
+  std::string ciSource = vtksys::SystemTools::LowerCase(source);
+
+  // Check if it is a filename or if the argument is just an extension.
+  std::string ext = vtksys::SystemTools::LowerCase(
+    vtksys::SystemTools::GetFilenameLastExtension(ciSource));
+
+  if ((ext.compare(".jpeg") == 0) || (ext.compare(".jpg") == 0) ||
+      (ciSource.compare("jpeg") == 0) || (ciSource.compare(".jpeg") == 0) ||
+      (ciSource.compare("jpg") == 0) || (ciSource.compare(".jpg") == 0))
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgJPEGReader::GetShortDescription()
+{
+  return "Reader for JPEG file format";
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgJPEGReader::GetLongDescription()
+{
+  return this->GetShortDescription();
+}
+
+//----------------------------------------------------------------------------
+vtkVgBaseImageSource* vtkVgJPEGReader::Create()
+{
+  return vtkVgJPEGReader::New();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgJPEGReader::RequestInformation(vtkInformation* vtkNotUsed(request),
+                                       vtkInformationVector** vtkNotUsed(inputVector),
+                                       vtkInformationVector* outputVector)
+{
+  // get the info objects
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information object.");
+    return 1;
+    }
+
+  if (!this->FileName)
+    {
+    vtkErrorMacro("Requires valid input file name.") ;
+    return 1;
+    }
+
+  if (this->ImageCache)
+    {
+    this->ImageCache->Delete();
+    }
+
+  this->Reader->SetFileName(this->FileName);
+  this->Reader->SetDataOrigin(this->Origin);
+  this->Reader->SetDataSpacing(this->Spacing);
+  this->Reader->Update();
+  this->ImageCache = vtkImageData::New();
+  this->ImageCache->ShallowCopy(this->Reader->GetOutput());
+
+  if (!this->ImageCache)
+    {
+    vtkErrorMacro("Failed to provide pipeline information.");
+    }
+
+  int     extents[6];
+  this->ImageCache->GetExtent(extents);
+
+  outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),
+               extents, 6);
+  outInfo->Set(vtkDataObject::SPACING(), this->Spacing, 3);
+
+  outInfo->Set(vtkDataObject::ORIGIN(),  this->Origin, 3);
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgJPEGReader::RequestData(vtkInformation* vtkNotUsed(request),
+                                vtkInformationVector** vtkNotUsed(inputVector),
+                                vtkInformationVector* outputVector)
+{
+  if (!outputVector)
+    {
+    vtkErrorMacro("Invalid output information vector.") ;
+    return 1;
+    }
+
+  if (!this->FileName)
+    {
+    vtkErrorMacro("Requires valid input file name.") ;
+    return 1;
+    }
+
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information object.");
+    return 1;
+    }
+
+  vtkDataObject* dataObj = outInfo->Get(vtkDataObject::DATA_OBJECT());
+  if (!dataObj)
+    {
+    vtkErrorMacro("Invalid output data object.");
+    return 1;
+    }
+
+  vtkImageData* outputImage = vtkImageData::SafeDownCast(dataObj);
+  if (!outputImage)
+    {
+    vtkErrorMacro("Output data object is not an image data object.");
+    return 1;
+    }
+
+  if (!this->ImageCache)
+    {
+    vtkErrorMacro("Failed to create valid output.");
+    return 1;
+    }
+
+  outputImage->ShallowCopy(this->ImageCache);
+
+  return 1;
+}
diff --git a/Libraries/VtkVgCore/vtkVgJPEGReader.h b/Libraries/VtkVgCore/vtkVgJPEGReader.h
new file mode 100644
index 00000000..afa383df
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgJPEGReader.h
@@ -0,0 +1,81 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgJPEGReader_h
+#define __vtkVgJPEGReader_h
+
+// VTKExtensions includes.
+#include "vtkVgBaseImageSource.h"
+
+#include <vgExport.h>
+
+// Forward declaration.
+class vtkJPEGReader;
+
+class VTKVG_CORE_EXPORT vtkVgJPEGReader : public vtkVgBaseImageSource
+{
+public:
+  // Description:
+  // Create new instance.
+  static vtkVgJPEGReader* New();
+
+  // Description:
+  // Check type.
+  vtkTypeMacro(vtkVgJPEGReader, vtkVgBaseImageSource);
+
+  // Description:
+  // Print values of the member variables.
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Return number of level of detail.
+  virtual int GetNumberOfLevels() const;
+
+  // Description:
+  // Return dimensions of the image.
+  virtual void GetDimensions(int dim[2]);
+
+  // Description:
+  // Check if the reader can read a given source.
+  virtual bool CanRead(const std::string& source);
+
+  // Description:
+  // Return short description of reader
+  virtual std::string GetShortDescription();
+
+  // Description:
+  // Return long description of reader
+  virtual std::string GetLongDescription();
+
+  // Description:
+  // Create instance of reader
+  static vtkVgBaseImageSource* Create();
+
+protected:
+
+  vtkVgJPEGReader();
+  virtual ~vtkVgJPEGReader();
+
+  virtual int RequestInformation(vtkInformation* request,
+                                 vtkInformationVector** inputVector,
+                                 vtkInformationVector* outputVector);
+
+  virtual int RequestData(vtkInformation* request,
+                          vtkInformationVector** inputVector,
+                          vtkInformationVector* outputVector);
+
+  vtkImageData* ImageCache;
+
+  vtkJPEGReader* Reader;
+
+private:
+  // Not implemented.
+  vtkVgJPEGReader(const vtkVgJPEGReader&);
+  // Not implemented.
+  void operator= (const vtkVgJPEGReader&);
+};
+
+#endif // __vtkVgJPEGReader_h
diff --git a/Libraries/VtkVgCore/vtkVgLabeledRegion.cxx b/Libraries/VtkVgCore/vtkVgLabeledRegion.cxx
new file mode 100644
index 00000000..4e7fc072
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgLabeledRegion.cxx
@@ -0,0 +1,468 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgLabeledRegion.h"
+
+#include "vtkActor2D.h"
+#include "vtkCellArray.h"
+#include "vtkFloatArray.h"
+#include "vtkImageData.h"
+#include "vtkInteractorObserver.h"
+#include "vtkObjectFactory.h"
+#include "vtkPointData.h"
+#include "vtkPoints.h"
+#include "vtkPolyData.h"
+#include "vtkPolyDataMapper.h"
+#include "vtkPolyDataMapper2D.h"
+#include "vtkProperty.h"
+#include "vtkProperty2D.h"
+#include "vtkRenderer.h"
+#include "vtkTextActor.h"
+#include "vtkTextMapper.h"
+#include "vtkTextProperty.h"
+#include "vtkTexture.h"
+#include "vtkTexturedActor2D.h"
+#include "vtkWindow.h"
+
+vtkStandardNewMacro(vtkVgLabeledRegion);
+
+vtkCxxSetObjectMacro(vtkVgLabeledRegion, TextProperty, vtkTextProperty);
+vtkCxxSetObjectMacro(vtkVgLabeledRegion, FrameProperty, vtkProperty);
+vtkCxxSetObjectMacro(vtkVgLabeledRegion, Image, vtkImageData);
+vtkCxxSetObjectMacro(vtkVgLabeledRegion, ImageProperty, vtkProperty2D);
+
+//----------------------------------------------------------------------
+vtkProp* vtkVgLabeledRegion::GetFrameActor() { return this->FrameActor; }
+vtkProp* vtkVgLabeledRegion::GetImageActor() { return this->ImageActor; }
+vtkProp* vtkVgLabeledRegion::GetTextActor()  { return this->TextActor; }
+
+//----------------------------------------------------------------------
+vtkVgLabeledRegion::vtkVgLabeledRegion()
+{
+  this->Visibility = 1;
+  this->TextVisible = 0;
+  this->ImageVisible = 0;
+
+  this->Text = 0;
+  this->Image = 0;
+
+  // controlling layout
+  this->Layout = LayoutTextToRightOfImage;
+  this->Padding = 5;
+  this->NormalizedLabelPosition[0] = 0.0;
+  this->NormalizedLabelPosition[1] = 0.0;
+
+  this->ImageSize[0] = 50;
+  this->ImageSize[1] = 50;
+
+  this->Texture = vtkTexture::New();
+  this->TexturePoints = vtkPoints::New();
+  this->TexturePolyData = vtkPolyData::New();
+
+  this->TexturePoints->SetNumberOfPoints(4);
+  this->TexturePolyData->SetPoints(this->TexturePoints);
+
+  // create the quad for the image
+  vtkCellArray* polys = vtkCellArray::New();
+  vtkIdType ids[] = { 0, 1, 2, 3 };
+  polys->InsertNextCell(4, ids);
+  this->TexturePolyData->SetPolys(polys);
+  polys->FastDelete();
+
+  // setup texture coordinates
+  vtkFloatArray* tc = vtkFloatArray::New();
+  tc->SetNumberOfComponents(2);
+  tc->SetNumberOfTuples(4);
+  tc->InsertComponent(0, 0, 0.0);  tc->InsertComponent(0, 1, 0.0);
+  tc->InsertComponent(1, 0, 1.0);  tc->InsertComponent(1, 1, 0.0);
+  tc->InsertComponent(2, 0, 1.0);  tc->InsertComponent(2, 1, 1.0);
+  tc->InsertComponent(3, 0, 0.0);  tc->InsertComponent(3, 1, 1.0);
+  this->TexturePolyData->GetPointData()->SetTCoords(tc);
+  tc->FastDelete();
+
+  this->TextureMapper = vtkPolyDataMapper2D::New();
+  this->TextureMapper->SetInputData(this->TexturePolyData);
+  this->ImageProperty = vtkProperty2D::New();
+  this->ImageProperty->SetOpacity(1.0);
+
+  // image actor
+  this->ImageActor = vtkTexturedActor2D::New();
+  this->ImageActor->SetTexture(this->Texture);
+  this->ImageActor->SetMapper(this->TextureMapper);
+  this->ImageActor->SetProperty(this->ImageProperty);
+  this->ImageActor->GetPositionCoordinate()->SetCoordinateSystemToWorld();
+
+  // text actor
+  this->TextProperty = vtkTextProperty::New();
+  this->TextProperty->SetColor(0.8, 0.8, 0.8);
+  this->TextProperty->SetFontSize(14);
+  this->TextProperty->BoldOn();
+
+  this->TextMapper = vtkTextMapper::New();
+  this->TextMapper->SetTextProperty(this->TextProperty);
+
+  this->TextActor = vtkActor2D::New();
+  this->TextActor->SetMapper(this->TextMapper);
+
+  // use a reference coordinate so that the text can be anchored
+  // to a world position, but still use display positioning for layout
+  vtkCoordinate* ref = vtkCoordinate::New();
+  ref->SetCoordinateSystemToWorld();
+  this->TextActor->GetPositionCoordinate()->SetReferenceCoordinate(ref);
+  ref->FastDelete();
+
+  // frame actor
+  this->FrameProperty = vtkProperty::New();
+  this->FrameProperty->SetColor(1, 1, .882);
+  this->FrameProperty->SetOpacity(0.5);
+
+  this->FramePolyData = vtkPolyData::New();
+
+  this->FrameMapper = vtkPolyDataMapper::New();
+  this->FrameMapper->SetInputData(this->FramePolyData);
+
+  this->FrameActor = vtkActor::New();
+  this->FrameActor->SetMapper(this->FrameMapper);
+  this->FrameActor->SetProperty(this->FrameProperty);
+}
+
+//----------------------------------------------------------------------
+vtkVgLabeledRegion::~vtkVgLabeledRegion()
+{
+  delete [] this->Text;
+
+  if (this->Image)
+    {
+    this->Image->Delete();
+    }
+
+  this->FramePolyData->Delete();
+  this->FrameMapper->Delete();
+  this->FrameActor->Delete();
+  this->FrameProperty->Delete();
+
+  this->TextMapper->Delete();
+  this->TextActor->Delete();
+  this->TextProperty->Delete();
+
+  this->Texture->Delete();
+  this->TexturePolyData->Delete();
+  this->TexturePoints->Delete();
+  this->TextureMapper->Delete();
+  this->ImageActor->Delete();
+  this->ImageProperty->Delete();
+}
+
+//----------------------------------------------------------------------
+void vtkVgLabeledRegion::SetFramePolyData(vtkPolyData* pd)
+{
+  if (pd == NULL || pd == this->FramePolyData)
+    {
+    return;
+    }
+
+  if (this->FramePolyData)
+    {
+    this->FramePolyData->UnRegister(this);
+    }
+
+  this->FramePolyData = pd;
+  this->FrameMapper->SetInputData(pd);
+
+  this->FramePolyData->Register(this);
+  this->Modified();
+}
+
+//----------------------------------------------------------------------
+inline void vtkVgLabeledRegion::AdjustImageSize(double imageSize[2])
+{
+  double r0 = this->ImageSize[0] / imageSize[0];
+  double r1 = this->ImageSize[1] / imageSize[1];
+  if (r0 > r1)
+    {
+    imageSize[0] *= r1;
+    imageSize[1] *= r1;
+    }
+  else
+    {
+    imageSize[0] *= r0;
+    imageSize[1] *= r0;
+    }
+}
+
+//----------------------------------------------------------------------
+void vtkVgLabeledRegion::Update(vtkViewport* v)
+{
+  this->UpdateTime.Modified();
+
+  this->TextVisible = 0;
+  this->ImageVisible = 0;
+
+  // determine the size of the image
+  double imageSize[] = { 0.0, 0.0 };
+  if (this->Image)
+    {
+    if (this->Image->GetDataDimension() == 2)
+      {
+      imageSize[0] = this->Image->GetDimensions()[0];
+      imageSize[1] = this->Image->GetDimensions()[1];
+      this->ImageVisible = imageSize[0] > 0.0 && imageSize[1] > 0.0;
+      this->AdjustImageSize(imageSize);
+      }
+    }
+
+  // determine the size of the text
+  int textSize[] = { 0, 0 };
+  if (this->Text)
+    {
+    this->TextMapper->SetInput(this->Text);
+    this->TextMapper->GetSize(v, textSize);
+    this->TextVisible = textSize[0] > 0 && textSize[1] > 0;
+    }
+
+  // if there is no image or text, we are done
+  if (!(this->TextVisible || this->ImageVisible))
+    {
+    return;
+    }
+
+  double bounds[6];
+  this->FramePolyData->GetBounds(bounds);
+
+  // get the min point of the bounding rectangle
+  v->SetWorldPoint(bounds[0], bounds[2], 0.0, 1.0);
+  v->WorldToDisplay();
+  bounds[0] = v->GetDisplayPoint()[0];
+  bounds[2] = v->GetDisplayPoint()[1];
+
+  // get the max point of the bounding rectangle
+  v->SetWorldPoint(bounds[1], bounds[3], 0.0, 1.0);
+  v->WorldToDisplay();
+  bounds[1] = v->GetDisplayPoint()[0];
+  bounds[3] = v->GetDisplayPoint()[1];
+
+  // compute layout
+  double labelSize[2];
+  double textOffset[2];
+  double imageOffset[2];
+  switch (this->Layout)
+    {
+    case LayoutTextToRightOfImage:
+      labelSize[0] = this->TextVisible ? imageSize[0] + this->Padding + textSize[0]
+                     : imageSize[0];
+      labelSize[1] = std::max(imageSize[1], (double) textSize[1]);
+
+      imageOffset[0] = -0.5 * labelSize[0];
+      imageOffset[1] = -0.5 * imageSize[1];
+
+      textOffset[0] = imageOffset[0] + imageSize[0] + this->Padding;
+      textOffset[1] = -0.5 * textSize[1];
+      break;
+
+    case LayoutTextBelowImage:
+    default:
+      labelSize[0] = std::max(imageSize[0], (double) textSize[0]);
+      labelSize[1] = this->TextVisible ? imageSize[1] + this->Padding + textSize[1]
+                     : imageSize[1];
+
+      textOffset[0] = -0.5 * textSize[0];
+      textOffset[1] = -0.5 * labelSize[1];
+
+      imageOffset[0] = -0.5 * imageSize[0];
+      imageOffset[1] = this->TextVisible ? textOffset[1] + textSize[1] + this->Padding
+                       : -0.5 * imageSize[1];
+      break;
+    }
+
+  // compute the anchor position
+  double pos[3];
+  pos[0] = bounds[0] + this->NormalizedLabelPosition[0] * (bounds[1] - bounds[0]);
+  pos[1] = bounds[2] + this->NormalizedLabelPosition[1] * (bounds[3] - bounds[2]);
+  pos[2] = 0.0;
+
+  // get anchor in world coords
+  v->SetDisplayPoint(pos);
+  v->DisplayToWorld();
+  pos[0] = v->GetWorldPoint()[0];
+  pos[1] = v->GetWorldPoint()[1];
+  pos[2] = 0.5 * (bounds[4] + bounds[5]);
+
+  this->TextActor->GetPositionCoordinate()->GetReferenceCoordinate()->SetValue(pos);
+  this->ImageActor->GetPositionCoordinate()->SetValue(pos);
+
+  // offset the text
+  this->TextActor->SetPosition(textOffset);
+
+  // offset the image
+  if (this->ImageVisible)
+    {
+    double left = imageOffset[0];
+    double right = left + imageSize[0];
+    double bottom = imageOffset[1];
+    double top = bottom + imageSize[1];
+    this->Texture->SetInputData(this->Image);
+    this->TexturePoints->SetPoint(0, left, bottom, 0.0);
+    this->TexturePoints->SetPoint(1, right, bottom, 0.0);
+    this->TexturePoints->SetPoint(2, right, top, 0.0);
+    this->TexturePoints->SetPoint(3, left, top, 0.0);
+    }
+}
+
+//----------------------------------------------------------------------
+void vtkVgLabeledRegion::ReleaseGraphicsResources(vtkWindow* w)
+{
+  this->vtkProp::ReleaseGraphicsResources(w);
+  this->FrameActor->ReleaseGraphicsResources(w);
+  this->TextActor->ReleaseGraphicsResources(w);
+  this->ImageActor->ReleaseGraphicsResources(w);
+}
+
+//----------------------------------------------------------------------
+int vtkVgLabeledRegion::RenderOpaqueGeometry(vtkViewport* v)
+{
+  int rendered = 0;
+
+  // update the frame polydata if necessary
+  if (this->FramePolyData->GetMTime() > this->UpdateTime)
+    {
+    this->Modified();
+    }
+
+  // update the representation
+  if (this->GetMTime() > this->UpdateTime)
+    {
+    this->Update(v);
+    }
+
+  if (this->FrameActor->RenderOpaqueGeometry(v))
+    {
+    rendered = 1;
+    }
+
+  if (this->ImageVisible && this->ImageActor->RenderOpaqueGeometry(v))
+    {
+    rendered = 1;
+    }
+
+  if (this->TextVisible && this->TextActor->RenderOpaqueGeometry(v))
+    {
+    rendered = 1;
+    }
+
+  return rendered;
+}
+
+//----------------------------------------------------------------------
+int vtkVgLabeledRegion::RenderTranslucentPolygonalGeometry(vtkViewport* v)
+{
+  int rendered = 0;
+
+  if (this->FrameActor->RenderTranslucentPolygonalGeometry(v))
+    {
+    rendered = 1;
+    }
+
+  if (this->ImageVisible && this->ImageActor->RenderTranslucentPolygonalGeometry(v))
+    {
+    rendered = 1;
+    }
+
+  if (this->TextVisible && this->TextActor->RenderTranslucentPolygonalGeometry(v))
+    {
+    rendered = 1;
+    }
+
+  return rendered;
+}
+
+//----------------------------------------------------------------------
+int vtkVgLabeledRegion::RenderOverlay(vtkViewport* v)
+{
+  int rendered = 0;
+
+  if (this->FrameActor->RenderOverlay(v))
+    {
+    rendered = 1;
+    }
+
+  if (this->ImageVisible && this->ImageActor->RenderOverlay(v))
+    {
+    rendered = 1;
+    }
+
+  if (this->TextVisible && this->TextActor->RenderOverlay(v))
+    {
+    rendered = 1;
+    }
+
+  return rendered;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgLabeledRegion::HasTranslucentPolygonalGeometry()
+{
+  return this->FrameProperty->GetOpacity() < 1.0;
+}
+
+//----------------------------------------------------------------------
+void vtkVgLabeledRegion::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "LabeledRegion Text: ";
+  if (this->Text)
+    {
+    os << this->Text << "\n";
+    }
+  else
+    {
+    os << "(none)\n";
+    }
+
+  os << indent << "LabeledRegion Image: ";
+  if (this->Image)
+    {
+    os << this->Image << "\n";
+    }
+  else
+    {
+    os << "(none)\n";
+    }
+
+  os << indent << "Image Size: (" << this->ImageSize[0] << ","
+     << this->ImageSize[1] << ")\n";
+  os << indent << "Padding: " << this->Padding << "\n";
+
+  if (this->FrameProperty)
+    {
+    os << indent << "Frame Property:\n";
+    this->FrameProperty->PrintSelf(os, indent.GetNextIndent());
+    }
+  else
+    {
+    os << indent << "Frame Property: (none)\n";
+    }
+
+  if (this->ImageProperty)
+    {
+    os << indent << "Image Property:\n";
+    this->ImageProperty->PrintSelf(os, indent.GetNextIndent());
+    }
+  else
+    {
+    os << indent << "Image Property: (none)\n";
+    }
+
+  if (this->TextProperty)
+    {
+    os << indent << "Text Property:\n";
+    this->TextProperty->PrintSelf(os, indent.GetNextIndent());
+    }
+  else
+    {
+    os << indent << "Text Property: (none)\n";
+    }
+}
diff --git a/Libraries/VtkVgCore/vtkVgLabeledRegion.h b/Libraries/VtkVgCore/vtkVgLabeledRegion.h
new file mode 100644
index 00000000..8b4edacc
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgLabeledRegion.h
@@ -0,0 +1,162 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgLabeledRegion_h
+#define __vtkVgLabeledRegion_h
+
+#include "vtkProp.h"
+
+#include <vgExport.h>
+
+class vtkActor;
+class vtkActor2D;
+class vtkImageData;
+class vtkPoints;
+class vtkPolyData;
+class vtkPolyDataMapper2D;
+class vtkPolyDataMapper;
+class vtkProperty;
+class vtkProperty2D;
+class vtkTextActor;
+class vtkTextMapper;
+class vtkTextProperty;
+class vtkTexture;
+class vtkTexturedActor2D;
+
+class VTKVG_CORE_EXPORT vtkVgLabeledRegion : public vtkProp
+{
+public:
+  enum Layout
+    {
+    LayoutTextToRightOfImage,
+    LayoutTextBelowImage
+    };
+
+public:
+  // Description:
+  // Instantiate the class.
+  static vtkVgLabeledRegion* New();
+
+  // Description:
+  // Standard VTK methods.
+  vtkTypeMacro(vtkVgLabeledRegion, vtkProp);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Specify/retrieve the highlight polygon.
+  virtual void SetFramePolyData(vtkPolyData* pd);
+  vtkGetObjectMacro(FramePolyData, vtkPolyData);
+
+  // Description:
+  // Specify/retrieve the image to display.
+  virtual void SetImage(vtkImageData* img);
+  vtkGetObjectMacro(Image, vtkImageData);
+
+  // Description:
+  // Specify/retrieve the text to display.
+  vtkGetStringMacro(Text);
+  vtkSetStringMacro(Text);
+
+  // Description:
+  // Specify the minimum size for the image.
+  vtkSetVector2Macro(ImageSize, int);
+  vtkGetVector2Macro(ImageSize, int);
+
+  // Description:
+  // Get the component actors.
+  vtkProp* GetFrameActor();
+  vtkProp* GetImageActor();
+  vtkProp* GetTextActor();
+
+  // Description:
+  // Set/get the text property (relevant only if text is shown).
+  virtual void SetTextProperty(vtkTextProperty* p);
+  vtkGetObjectMacro(TextProperty, vtkTextProperty);
+
+  // Description:
+  // Set/get the frame property (relevant only if text is shown).
+  virtual void SetFrameProperty(vtkProperty* p);
+  vtkGetObjectMacro(FrameProperty, vtkProperty);
+
+  // Description:
+  // Set/get the image property (relevant only if an image is shown).
+  virtual void SetImageProperty(vtkProperty2D* p);
+  vtkGetObjectMacro(ImageProperty, vtkProperty2D);
+
+  // Description:
+  // Set/Get the layout of text and image.
+  vtkSetMacro(Layout, Layout);
+  vtkGetMacro(Layout, Layout);
+
+  // Description:
+  // Set/get the normalized position of the label (image + text)  relative to
+  // the frame bounding rectangle (0, 0 = upper left).
+  vtkSetVector2Macro(NormalizedLabelPosition, double);
+  vtkGetVector2Macro(NormalizedLabelPosition, double);
+
+  // Description:
+  // Set/Get the padding (in pixels) between the image and the text string.
+  vtkSetClampMacro(Padding, int, 0, 100);
+  vtkGetMacro(Padding, int);
+
+  // Description:
+  // Methods required by vtkProp superclass.
+  virtual void ReleaseGraphicsResources(vtkWindow* w);
+
+  virtual int HasTranslucentPolygonalGeometry();
+  virtual int RenderOpaqueGeometry(vtkViewport* viewport);
+  virtual int RenderTranslucentPolygonalGeometry(vtkViewport* viewport);
+  virtual int RenderOverlay(vtkViewport* viewport);
+
+protected:
+  vtkVgLabeledRegion();
+  ~vtkVgLabeledRegion();
+
+  // raw text and image data
+  char*         Text;
+  vtkImageData* Image;
+
+  // placement
+  Layout Layout;
+  int Padding;
+  int ImageSize[2];
+  double NormalizedLabelPosition[2];
+
+  // text
+  vtkActor2D*          TextActor;
+  vtkTextMapper*       TextMapper;
+  vtkTextProperty*     TextProperty;
+
+  // image
+  vtkTexture*          Texture;
+  vtkPolyData*         TexturePolyData;
+  vtkPoints*           TexturePoints;
+  vtkPolyDataMapper2D* TextureMapper;
+  vtkTexturedActor2D*  ImageActor;
+  vtkProperty2D*       ImageProperty;
+
+  // frame
+  vtkActor*            FrameActor;
+  vtkPolyDataMapper*   FrameMapper;
+  vtkPolyData*         FramePolyData;
+  vtkProperty*         FrameProperty;
+
+  // internal variable controlling rendering process
+  bool TextVisible;
+  bool ImageVisible;
+
+  vtkTimeStamp UpdateTime;
+
+protected:
+  void AdjustImageSize(double imageSize[2]);
+  void Update(vtkViewport* viewport);
+
+private:
+  vtkVgLabeledRegion(const vtkVgLabeledRegion&);  // not implemented
+  void operator=(const vtkVgLabeledRegion&);     // not implemented
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgLineRepresentation.cxx b/Libraries/VtkVgCore/vtkVgLineRepresentation.cxx
new file mode 100644
index 00000000..26c8be47
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgLineRepresentation.cxx
@@ -0,0 +1,112 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgLineRepresentation.h"
+
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkProperty.h>
+
+#include "vtkVgUtil.h"
+
+vtkStandardNewMacro(vtkVgLineRepresentation);
+
+//------------------------------------------------------------------------
+vtkVgLineRepresentation::vtkVgLineRepresentation()
+{
+  this->TransformMatrix = 0;
+  this->PointsAreValid = false;
+
+  this->SetLineColor(1.0, 1.0, 0.0);
+  this->GetEndPointProperty()->SetColor(1.0, 0.0, 0.0);
+  this->GetEndPoint2Property()->SetColor(1.0, 0.0, 0.0);
+}
+
+//------------------------------------------------------------------------
+vtkVgLineRepresentation::~vtkVgLineRepresentation()
+{
+  if (this->TransformMatrix)
+    {
+    this->TransformMatrix->Delete();
+    }
+}
+
+//------------------------------------------------------------------------
+void vtkVgLineRepresentation::WidgetInteraction(double e[2])
+{
+  this->Superclass::WidgetInteraction(e);
+  this->UpdateTransformedPoints();
+}
+
+//------------------------------------------------------------------------
+void vtkVgLineRepresentation::PlaceWidget(double bounds[6])
+{
+  this->Superclass::PlaceWidget(bounds);
+  this->UpdateTransformedPoints();
+}
+
+//------------------------------------------------------------------------
+void vtkVgLineRepresentation::SetTransformMatrix(vtkMatrix4x4* mat)
+{
+  if (!this->TransformMatrix)
+    {
+    this->TransformMatrix = vtkMatrix4x4::New();
+    }
+  this->TransformMatrix->DeepCopy(mat);
+
+  if (!this->PointsAreValid)
+    {
+    return;
+    }
+
+  // Compute the new world positions of the line endpoints based on their
+  // initial transformed coordinates. Don't attempt to transform points that
+  // are being dragged.
+  if (this->InteractionState != vtkLineRepresentation::TranslatingP1)
+    {
+    double point[3];
+    vtkVgApplyHomography(this->TransformedPoint1, this->TransformMatrix, point);
+    point[2] = this->TransformedPoint1[2];
+    this->SetPoint1WorldPosition(point);
+    }
+
+  if (this->InteractionState != vtkLineRepresentation::TranslatingP2)
+    {
+    double point[3];
+    vtkVgApplyHomography(this->TransformedPoint2, this->TransformMatrix, point);
+    point[2] = this->TransformedPoint2[2];
+    this->SetPoint2WorldPosition(point);
+    }
+}
+
+//------------------------------------------------------------------------
+void vtkVgLineRepresentation::UpdateTransformedPoints()
+{
+  vtkMatrix4x4* invertMat = vtkMatrix4x4::New();
+
+  if (this->TransformMatrix)
+    {
+    invertMat->DeepCopy(this->TransformMatrix);
+    invertMat->Invert();
+    }
+
+    {
+    double pos[3];
+    this->GetPoint1WorldPosition(pos);
+    vtkVgApplyHomography(pos, invertMat, this->TransformedPoint1);
+    this->TransformedPoint1[2] = 0.0;
+    }
+
+    {
+    double pos[3];
+    this->GetPoint2WorldPosition(pos);
+    vtkVgApplyHomography(pos, invertMat, this->TransformedPoint2);
+    this->TransformedPoint2[2] = 0.0;
+    }
+
+  invertMat->Delete();
+  this->PointsAreValid = true;
+}
diff --git a/Libraries/VtkVgCore/vtkVgLineRepresentation.h b/Libraries/VtkVgCore/vtkVgLineRepresentation.h
new file mode 100644
index 00000000..fc97ce61
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgLineRepresentation.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgLineRepresentation_h
+#define __vtkVgLineRepresentation_h
+
+#include <vtkLineRepresentation.h>
+
+#include <vgExport.h>
+
+class vtkMatrix4x4;
+
+class VTKVG_CORE_EXPORT vtkVgLineRepresentation : public vtkLineRepresentation
+{
+public:
+  vtkTypeMacro(vtkVgLineRepresentation, vtkLineRepresentation);
+
+  static vtkVgLineRepresentation* New();
+
+  void SetTransformMatrix(vtkMatrix4x4* mat);
+
+  virtual void WidgetInteraction(double e[2]);
+
+  virtual void PlaceWidget(double bounds[6]);
+
+protected:
+  vtkVgLineRepresentation();
+  ~vtkVgLineRepresentation();
+
+  void UpdateTransformedPoints();
+
+private:
+  vtkMatrix4x4* TransformMatrix;
+  double TransformedPoint1[3];
+  double TransformedPoint2[3];
+  bool PointsAreValid;
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgMacros.h b/Libraries/VtkVgCore/vtkVgMacros.h
new file mode 100644
index 00000000..3630a48b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgMacros.h
@@ -0,0 +1,16 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgMacros_h
+#define __vtkVgMacros_h
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#define vtkVgClassMacro(class)  \
+  typedef vtkSmartPointer<class> SmartPtr;
+
+#endif // __vtkVgMacros.h
diff --git a/Libraries/VtkVgCore/vtkVgMetaObject.cxx b/Libraries/VtkVgCore/vtkVgMetaObject.cxx
new file mode 100644
index 00000000..941dcf0a
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgMetaObject.cxx
@@ -0,0 +1,9 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgMetaObject.h"
+
+const vtkMetaObjectId vtkVgMetaObject::MetaObject = { "vtkVgMetaObject", 0 };
diff --git a/Libraries/VtkVgCore/vtkVgMetaObject.h b/Libraries/VtkVgCore/vtkVgMetaObject.h
new file mode 100644
index 00000000..fe454b7b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgMetaObject.h
@@ -0,0 +1,52 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgMetaObject_h
+#define __vtkVgMetaObject_h
+
+#include <vgExport.h>
+
+struct VTKVG_CORE_EXPORT vtkMetaObjectId
+{
+  const char* Name;
+  const vtkMetaObjectId* Parent;
+};
+
+#define vtkDeclareMetaObject(_class) \
+  public: \
+  static _class* SafeDownCast(vtkVgMetaObject *object) \
+  { \
+    const vtkMetaObjectId *metaId = object->MetaId(); \
+    while (metaId) \
+      { \
+      if (metaId == &_class::MetaObject) \
+        { \
+        return static_cast<_class*>(object); \
+        } \
+      metaId = metaId->Parent; \
+      } \
+    return 0; \
+  } \
+  virtual const vtkMetaObjectId* MetaId() \
+  { \
+    return &_class::MetaObject; \
+  } \
+  static const vtkMetaObjectId MetaObject;
+
+#define vtkImplementMetaObject(_class, _base) \
+  const vtkMetaObjectId _class::MetaObject = { #_class, &_base::MetaObject }
+
+class VTKVG_CORE_EXPORT vtkVgMetaObject
+{
+  vtkDeclareMetaObject(vtkVgMetaObject)
+
+public:
+  vtkVgMetaObject() {}
+  explicit vtkVgMetaObject(const vtkVgMetaObject&) {}
+  virtual ~vtkVgMetaObject() {}
+};
+
+#endif // __vtkVgMetaObject_h
diff --git a/Libraries/VtkVgCore/vtkVgMultiResJpgImageReader2.cxx b/Libraries/VtkVgCore/vtkVgMultiResJpgImageReader2.cxx
new file mode 100644
index 00000000..a6fe8246
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgMultiResJpgImageReader2.cxx
@@ -0,0 +1,397 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgMultiResJpgImageReader2.h"
+
+#include <vgUtil.h>
+
+#include "vtkObjectFactory.h"
+#include "vtkSmartPointer.h"
+#include "vtkByteSwap.h"
+#include "vtkImageData.h"
+#include "vtkImageShrink3D.h"
+#include "vtkInformationVector.h"
+#include "vtkInformation.h"
+#include "vtkImageReader2.h"
+#include "vtkStreamingDemandDrivenPipeline.h"
+
+#include "vtksys/SystemTools.hxx"
+
+#include "vtkVgJPEGMemoryReader.h"
+
+vtkStandardNewMacro(vtkVgMultiResJpgImageReader2);
+
+//----------------------------------------------------------------------------
+vtkVgMultiResJpgImageReader2::vtkVgMultiResJpgImageReader2() :
+  vtkVgBaseImageSource()
+{
+  this->ExactExtent = 1;
+//  this->FilePattern = 0;
+  this->Scale = 1.0;
+  this->Frame = 0;
+  this->NumberOfLevels = 0;
+  this->Dimensions[0] = this->Dimensions[1] = 0;
+
+  this->SetNumberOfInputPorts(0);
+}
+
+//----------------------------------------------------------------------------
+vtkVgMultiResJpgImageReader2::~vtkVgMultiResJpgImageReader2()
+{
+//  this->SetFilePattern(0);
+}
+
+//----------------------------------------------------------------------------
+void vtkVgMultiResJpgImageReader2::PrintSelf(ostream& os, vtkIndent indent)
+{
+//  os << indent << "FilePattern: " << this->FilePattern << endl;
+  os << indent << "ExactExtent: " << this->ExactExtent << endl;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgMultiResJpgImageReader2::GetDimensions(int dims[2])
+{
+  dims[0] = this->Dimensions[0];
+  dims[1] = this->Dimensions[1];
+}
+
+//----------------------------------------------------------------------------
+void vtkVgMultiResJpgImageReader2::GetTileDimensions(int dims[2])
+{
+  dims[0] = this->TileDimensions[0];
+  dims[1] = this->TileDimensions[1];
+}
+
+//----------------------------------------------------------------------------
+void vtkVgMultiResJpgImageReader2::ComputeLevel()
+{
+  double level = log(this->Scale) / log(2.0);
+
+  // Delay going to a higher level by a bit.
+  level = level * 1.1;
+
+  if (this->Level == -1)
+    {
+    this->Level = (int)(level);
+    }
+  if (this->Level < 0)
+    {
+    this->Level = 0;
+    }
+  if (this->Level >= this->NumberOfLevels)
+    {
+    this->Level = this->NumberOfLevels - 1;
+    }
+}
+
+//----------------------------------------------------------------------------
+int vtkVgMultiResJpgImageReader2::GetNumberOfLevels() const
+{
+  return static_cast<int>(this->NumberOfLevels);
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgMultiResJpgImageReader2::CanRead(const std::string& source)
+{
+  std::string ciSource = vtksys::SystemTools::LowerCase(source);
+
+  // Check if it is a filename or if the argument is just an extension.
+  std::string ext = vtksys::SystemTools::GetFilenameLastExtension(ciSource);
+  if ((ext.compare(".mrj") == 0) || (ciSource.compare("mrj") == 0) ||
+      (ciSource.compare(".mrj") == 0))
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgMultiResJpgImageReader2::GetShortDescription()
+{
+  return "Reader for MRJ file format";
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgMultiResJpgImageReader2::GetLongDescription()
+{
+  return this->GetShortDescription();
+}
+
+//----------------------------------------------------------------------------
+// This method returns the largest data that can be generated.
+int vtkVgMultiResJpgImageReader2::RequestInformation(
+  vtkInformation*        vtkNotUsed(request),
+  vtkInformationVector** vtkNotUsed(inputVector),
+  vtkInformationVector* outputVector)
+{
+//  char* fileName = new char[strlen(this->FilePattern)+1000];
+//  sprintf(fileName, this->FilePattern, this->Frame);
+//  this->SetFileName(fileName);
+//  delete [] fileName;
+  FILE* fp;
+#ifdef _WIN32
+  fopen_s(&fp, this->FileName, "rb");
+#else
+  fp = fopen(this->FileName, "rb");
+#endif
+  if (! fp)
+    {
+    cerr << "File " << this->FileName << " does not exist.\n";
+    return -1.0;
+    }
+
+  // Skip the class name.  Do not bother verifying class name yet.
+  fseek(fp, 30, SEEK_SET);
+  // read to location of the level table.
+  fread((void*)(&this->LevelTableLocation), sizeof(vtkTypeUInt32), 1, fp);
+  vtkByteSwap::Swap4LE(&this->LevelTableLocation);
+
+  // Read the meta data.
+  fread((void*)(this->Dimensions), sizeof(vtkTypeUInt32), 2, fp);
+  vtkByteSwap::Swap4LERange(this->Dimensions, 2);
+
+  fread((void*)(&this->TileDimensions), sizeof(vtkTypeUInt32), 2, fp);
+  vtkByteSwap::Swap4LERange(this->TileDimensions, 2);
+
+  unsigned char numScalarComponents;
+  fread((void*)(&numScalarComponents), sizeof(unsigned char), 1, fp);
+
+
+  unsigned char numLevels;
+  fread((void*)(&numLevels), sizeof(unsigned char), 1, fp);
+  this->NumberOfLevels = numLevels;
+  this->ComputeLevel();
+
+  // Skip any other meta data
+  fclose(fp);
+
+  // get the info objects
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  int ext[6];
+  ext[4] = ext[5] = 0;
+  // Copy the extent from the request.
+  ext[0] = this->ReadExtents[0];
+  ext[1] = this->ReadExtents[1];
+  ext[2] = this->ReadExtents[2];
+  ext[3] = this->ReadExtents[3];
+
+  if (ext[0] == -1 && ext[1] == -1 && ext[2] == -1 && ext[3] == -1)
+    {
+    ext[0] = ext[2] = 0;
+    ext[1] = this->Dimensions[0] - 1;
+    ext[3] = this->Dimensions[1] - 1;
+    }
+  else if (ext[0] >= static_cast<int>(this->Dimensions[0]) || ext[1] < 0 ||
+           ext[2] >= static_cast<int>(this->Dimensions[1]) || ext[3] < 0)
+    {
+    // Extent does not overlap image; set the information to indicate that
+    // there is nothing to do
+    ext[0] = ext[2] = ext[4] = -1;
+    ext[1] = ext[3] = ext[5] = -1;
+    outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), ext, 6);
+
+    int scalarType = VTK_UNSIGNED_CHAR;
+    vtkDataObject::SetPointDataActiveScalarInfo(outInfo, scalarType, numScalarComponents);
+
+    return 1;
+    }
+  else
+    {
+    // Crop with the image extent in the file.
+    vgTruncateLowerBoundary(ext[0], 0);
+    vgTruncateLowerBoundary(ext[2], 0);
+    vgTruncateUpperBoundary(ext[1], static_cast<int>(this->Dimensions[0]) - 1);
+    vgTruncateUpperBoundary(ext[3], static_cast<int>(this->Dimensions[1]) - 1);
+    }
+
+  // Change the resolution to the correct level
+  if (this->Level > 0)
+    {
+    const int k = 1 << this->Level;
+    ext[0] /= k;
+    ext[2] /= k;
+    ext[1] = ((ext[1] + 1) / k) - 1;
+    ext[3] = ((ext[3] + 1) / k) - 1;
+
+    // Ensure reduction doesn't reduce dimensions to 0
+    vgExpandUpperBoundary(ext[1], 0);
+    vgExpandUpperBoundary(ext[3], 0);
+    vgExpandLowerBoundary(ext[0], ext[1]);
+    vgExpandLowerBoundary(ext[2], ext[3]);
+    }
+  if (!this->ExactExtent)
+    {
+    // Extend extent to cover whole tiles
+    ext[0] = (ext[0] / this->TileDimensions[0]) * this->TileDimensions[0];
+    ext[1] = ((ext[1] / this->TileDimensions[0]) + 1) * this->TileDimensions[0] - 1;
+    ext[2] = (ext[2] / this->TileDimensions[1]) * this->TileDimensions[1];
+    ext[3] = ((ext[3] / this->TileDimensions[1]) + 1) * this->TileDimensions[1] - 1;
+    }
+
+  double spacing[3];
+  spacing[0] = static_cast<int>(this->Spacing[0]) << this->Level;
+  spacing[1] = static_cast<int>(this->Spacing[1]) << this->Level;
+  spacing[2] = static_cast<int>(this->Spacing[2]) << this->Level;
+
+  outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), ext, 6);
+  outInfo->Set(vtkDataObject::SPACING(), spacing, 3);
+  outInfo->Set(vtkDataObject::ORIGIN(),  this->Origin, 3);
+
+  int scalarType = VTK_UNSIGNED_CHAR;
+  vtkDataObject::SetPointDataActiveScalarInfo(outInfo, scalarType, numScalarComponents);
+  //fclose(fp);
+
+  return 1;
+}
+
+//----------------------------------------------------------------------------
+// This function reads a data from a file.  The datas extent/axes
+// are assumed to be the same as the file extent/order.
+void vtkVgMultiResJpgImageReader2::ExecuteDataWithInformation(
+  vtkDataObject* output, vtkInformation* outInfo)
+{
+  vtkImageData* image = vtkImageData::SafeDownCast(output);
+  if (image == 0)
+    {
+    vtkErrorMacro("Expecting an image.");
+    return;
+    }
+
+  int* const outExt = this->GetUpdateExtent();
+  if (outExt[0] < 0 || outExt[1] < 0 || outExt[2] < 0 || outExt[3] < 0)
+    {
+    // Any negative output extents are not valid... also, RequestInformation
+    // sets all extents to -1 when there is nothing to do, so we want to catch
+    // that and bail out early
+    return;
+    }
+
+  vtkSmartPointer<vtkVgJPEGMemoryReader> reader = vtkSmartPointer<vtkVgJPEGMemoryReader>::New();
+
+  FILE* fp;
+#ifdef _WIN32
+  fopen_s(&fp, this->FileName, "rb");
+#else
+  fp = fopen(this->FileName, "rb");
+#endif
+  if (! fp)
+    {
+    cerr << "File " << this->FileName << " does not exist.\n";
+    return;
+    }
+
+  // Skip the metadata and go directly to the level table.
+  // Read the location of the level we are reading.
+  fseek(fp, this->LevelTableLocation + (sizeof(vtkTypeUInt64)*this->Level), SEEK_SET);
+  vtkTypeUInt64 levelLocation;
+  fread((void*)(&levelLocation), sizeof(vtkTypeUInt64), 1, fp);
+  vtkByteSwap::Swap8LE(&levelLocation);
+  fseek(fp, levelLocation, SEEK_SET);
+
+  // Read level metadata.
+  vtkTypeUInt32 gridDims[2];
+  fread((void*)(gridDims), sizeof(vtkTypeUInt32), 2, fp);
+  vtkByteSwap::Swap8LERange(gridDims, 2);
+
+  // Read the whole tileTable.
+  size_t tableLength = (gridDims[0] * gridDims[1]) + 1;
+  vtkTypeUInt64* tileTable = new vtkTypeUInt64[tableLength];
+  fread((void*)(tileTable), sizeof(vtkTypeUInt64), tableLength, fp);
+  vtkByteSwap::Swap8LERange(tileTable, tableLength);
+
+  // Figure out which tiles to load.
+  image->SetExtent(outExt);
+  image->AllocateScalars(outInfo);
+
+  int tileExt[6];
+  size_t gridExt[4];
+  // Grid in a level.
+  gridExt[0] = outExt[0] / this->TileDimensions[0];
+  gridExt[1] = outExt[1] / this->TileDimensions[0];
+  gridExt[2] = outExt[2] / this->TileDimensions[1];
+  gridExt[3] = outExt[3] / this->TileDimensions[1];
+
+  // Guess at an initial buffer size that seems to work in most cases... this
+  // assumes an average compression factor of about C:1 where C is the number
+  // of components in the image (i.e. usually around 65% for RGB)
+  size_t tileBufLength =
+    (this->TileDimensions[0] * this->TileDimensions[1]) + 256;
+  unsigned char* tileBuf = new unsigned char[tileBufLength];
+
+  // The output is already allocated.
+  // Loop through all the tiles that we are going to load.
+  size_t yTileIdx, tileIdx;
+  vtkTypeUInt64 tileLocation, tileLength;
+
+  bool error = false;
+
+  for (size_t y = gridExt[2]; y <= gridExt[3]; ++y)
+    {
+    yTileIdx = y * gridDims[0];
+    for (size_t x = gridExt[0]; x <= gridExt[1]; ++x)
+      {
+
+      if (error)
+        {
+        break;
+        }
+
+      tileIdx = yTileIdx + x;
+
+      if (tileIdx + 1 >= tableLength)
+        {
+        error = true;
+        break;
+        }
+
+      tileLocation = tileTable[tileIdx];
+
+      tileLength = tileTable[tileIdx + 1] - tileLocation;
+      if (tileLength > tileBufLength)
+        {
+        // If the buffer is not large enough, reallocate a larger one that is
+        // the needed size plus a bit of fudge factor
+        tileBufLength = static_cast<size_t>(1.2 * tileLength);
+        delete [] tileBuf;
+        tileBuf = new unsigned char[tileBufLength];
+        }
+
+      fseek(fp, tileLocation, SEEK_SET);
+      fread((void*)(tileBuf), 1, tileLength, fp);
+
+      // Decompress the tile.
+      reader->SetMemoryBuffer(tileBuf, tileLength);
+      reader->Update();
+      // Shift image so we can use CopyAndCast.
+      reader->GetOutput()->GetExtent(tileExt);
+      const int xOffset = x * this->TileDimensions[0];
+      tileExt[0] += xOffset;
+      tileExt[1] += xOffset;
+      const int yOffset = y * this->TileDimensions[1];
+      tileExt[2] += yOffset;
+      tileExt[3] += yOffset;
+      reader->GetOutput()->SetExtent(tileExt);
+      // Take the intersection of the tile and output.
+      vgTruncateLowerBoundary(tileExt[0], outExt[0]);
+      vgTruncateUpperBoundary(tileExt[1], outExt[1]);
+      vgTruncateLowerBoundary(tileExt[2], outExt[2]);
+      vgTruncateUpperBoundary(tileExt[3], outExt[3]);
+      image->CopyAndCastFrom(reader->GetOutput(), tileExt);
+      }
+    }
+
+  delete [] tileTable;
+  delete [] tileBuf;
+  fclose(fp);
+}
+
+//----------------------------------------------------------------------------
+vtkVgBaseImageSource* vtkVgMultiResJpgImageReader2::Create()
+{
+  return vtkVgMultiResJpgImageReader2::New();
+}
diff --git a/Libraries/VtkVgCore/vtkVgMultiResJpgImageReader2.h b/Libraries/VtkVgCore/vtkVgMultiResJpgImageReader2.h
new file mode 100644
index 00000000..b83e0323
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgMultiResJpgImageReader2.h
@@ -0,0 +1,120 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgMultiResJpgImageReader2 - Implements an api for reading image LODs
+// .SECTION Description
+// .SECTION see also
+
+#ifndef __vtkVgMultiResJpgImageReader2_h
+#define __vtkVgMultiResJpgImageReader2_h
+
+#include "vtkVgBaseImageSource.h"
+
+#include <vgExport.h>
+
+class vtkImageData;
+
+class VTKVG_CORE_EXPORT vtkVgMultiResJpgImageReader2
+  : public vtkVgBaseImageSource
+{
+public:
+  // Description:
+  // Create new instance.
+  static vtkVgMultiResJpgImageReader2* New();
+
+  // Description:
+  // Check type.
+  vtkTypeMacro(vtkVgMultiResJpgImageReader2, vtkVgBaseImageSource);
+
+  // Description:
+  // Print values of the member variables.
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // @NOTE: Commented for now.
+  // Description:
+  // Pattern used in sprintf to create file name.
+  // Example: "C:/Image_%05d.mrj"
+  // First parameter is the frame.
+  // vtkSetStringMacro(FilePattern);
+  //  vtkGetStringMacro(FilePattern);
+
+  // Description:
+
+  // Description:
+  // ScreenPixelSize/ImagePixelSize.
+  vtkSetMacro(Scale, double);
+  vtkGetMacro(Scale, double);
+
+  // @NOTE: Commented for now.
+  // Description:
+  // Which video frame to load.
+  //  vtkSetMacro(Frame,int);
+  //  vtkGetMacro(Frame,int);
+
+  // Description:
+  // This flag is on by default.
+  // When it is off, the image returned may be larger than
+  // the requested crop extent.
+  vtkSetMacro(ExactExtent, int);
+  vtkGetMacro(ExactExtent, int);
+  vtkBooleanMacro(ExactExtent, int);
+
+  // Description:
+  // Set the level number for the level of detail.
+  vtkSetMacro(Level, int);
+  vtkGetMacro(Level, int);
+
+  // Description:
+  // MetaData filled in after UpdateInformation is called.
+  vtkGetVector2Macro(Dimensions, vtkTypeUInt32);
+  vtkGetVector2Macro(TileDimensions, vtkTypeUInt32);
+  virtual void GetDimensions(int dims[2]);
+  void GetTileDimensions(int dims[2]);
+
+  // Description:
+  // Return the number of level of details.
+  virtual int GetNumberOfLevels() const;
+
+  virtual bool CanRead(const std::string& source);
+
+  virtual std::string GetShortDescription();
+
+  virtual std::string GetLongDescription();
+
+  static vtkVgBaseImageSource* Create();
+
+
+protected:
+  vtkVgMultiResJpgImageReader2();
+  ~vtkVgMultiResJpgImageReader2();
+
+  virtual int RequestInformation(vtkInformation* request,
+                                 vtkInformationVector** inputVector,
+                                 vtkInformationVector* outputVector);
+
+  virtual void ExecuteDataWithInformation(vtkDataObject* data, vtkInformation* outInfo);
+
+  void ComputeLevel();
+
+private:
+
+  int ExactExtent;
+
+  // @NOTE: Commented for now.
+  //  char* FilePattern;
+
+  int Frame;
+
+
+  unsigned char NumberOfLevels;
+  vtkTypeUInt32 Dimensions[2];
+
+//  char* FileName;
+  vtkTypeUInt32 TileDimensions[2];
+  vtkTypeUInt32 LevelTableLocation;
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgMultiResJpgImageWriter2.cxx b/Libraries/VtkVgCore/vtkVgMultiResJpgImageWriter2.cxx
new file mode 100644
index 00000000..7fde529d
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgMultiResJpgImageWriter2.cxx
@@ -0,0 +1,355 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgMultiResJpgImageWriter2.h"
+#include "vtkSmartPointer.h"
+#include "vtkCommand.h"
+#include "vtkErrorCode.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkObjectFactory.h"
+#include "vtkPointData.h"
+#include "vtkStreamingDemandDrivenPipeline.h"
+#include "vtkImageData.h"
+#include "vtkJPEGWriter.h"
+#include "vtkImageShrink3D.h"
+#include "vtkUnsignedCharArray.h"
+
+#include <vtksys/SystemTools.hxx>
+
+vtkStandardNewMacro(vtkVgMultiResJpgImageWriter2);
+
+//----------------------------------------------------------------------------
+vtkVgMultiResJpgImageWriter2::vtkVgMultiResJpgImageWriter2()
+{
+  this->FileName = NULL;
+  this->NumberOfLevels = 5;
+  this->CompressionQuality = 30;
+  this->TileDimensions[0] = 128;
+  this->TileDimensions[1] = 128;
+
+  this->SetNumberOfOutputPorts(0);
+}
+
+
+
+//----------------------------------------------------------------------------
+vtkVgMultiResJpgImageWriter2::~vtkVgMultiResJpgImageWriter2()
+{
+  if (this->FileName)
+    {
+    delete [] this->FileName;
+    this->FileName = NULL;
+    }
+}
+
+
+//----------------------------------------------------------------------------
+void vtkVgMultiResJpgImageWriter2::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "FileName: " <<
+     (this->FileName ? this->FileName : "(none)") << "\n";
+}
+
+
+//----------------------------------------------------------------------------
+vtkImageData* vtkVgMultiResJpgImageWriter2::GetInput()
+{
+  if (this->GetNumberOfInputConnections(0) < 1)
+    {
+    return 0;
+    }
+  return vtkImageData::SafeDownCast(
+           this->GetExecutive()->GetInputData(0, 0));
+}
+
+//----------------------------------------------------------------------------
+int vtkVgMultiResJpgImageWriter2::RequestData(
+  vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** inputVector,
+  vtkInformationVector* vtkNotUsed(outputVector))
+{
+  this->SetErrorCode(vtkErrorCode::NoError);
+
+  vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
+  vtkImageData* input =
+    vtkImageData::SafeDownCast(inInfo->Get(vtkDataObject::DATA_OBJECT()));
+
+  // Error checking
+  if (input == NULL)
+    {
+    vtkErrorMacro(<< "Write:Please specify an input!");
+    return 0;
+    }
+  if (!this->FileName)
+    {
+    vtkErrorMacro(<< "Write:Please specify a FileName");
+    this->SetErrorCode(vtkErrorCode::NoFileNameError);
+    return 0;
+    }
+
+  // Fill in image information.
+  int* wExt = inInfo->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT());
+  if (wExt[4] != wExt[5])
+    {
+    vtkErrorMacro("Two dimensional images only please.");
+    return 0;
+    }
+
+  // Write
+  this->InvokeEvent(vtkCommand::StartEvent);
+  this->UpdateProgress(0.0);
+  this->WriteImage(input);
+
+  //if (this->ErrorCode == vtkErrorCode::OutOfDiskSpaceError)
+  //  {
+  //  this->DeleteFiles();
+  //  }
+
+  this->UpdateProgress(1.0);
+  this->InvokeEvent(vtkCommand::EndEvent);
+
+  return 1;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgMultiResJpgImageWriter2::Write()
+{
+  this->Update();
+  vtkImageData* input = this->GetInput();
+  this->WriteImage(input);
+}
+
+//----------------------------------------------------------------------------
+inline size_t fwriteLE(void* data, size_t size, size_t num, FILE* fp)
+{
+#ifdef VTK_WORDS_BIGENDIAN
+  char* temp = new char[size * num];
+  memcpy(temp, data, num * size);
+  if (size == 4)
+    {
+    vtkByteSwap::Swap4LERange(temp, num);
+    }
+  if (size == 8)
+    {
+    vtkByteSwap::Swap8LERange(temp, num);
+    }
+  if (size == 2)
+    {
+    vtkByteSwap::Swap2LERange(temp, num);
+    }
+  return fwrite(temp, size, num, fp);
+#else
+  return fwrite(data, size, num, fp);
+#endif
+}
+
+//----------------------------------------------------------------------------
+// Writes all the data from the input.
+// Modified from AngelFire format.
+int vtkVgMultiResJpgImageWriter2::WriteImage(vtkImageData* input)
+{
+  // Header and points.
+  // Table for starting location for each of the 6 levels.
+  // For each level.
+  // TileExtent.
+  // Table for each grid location for offset and length of tile.
+  FILE* fp;
+
+  // TODO ERROR checking.
+#ifdef _WIN32
+  fopen_s(&fp, this->FileName, "wb");
+#else
+  fp = fopen(this->FileName, "wb");
+#endif
+  if (fp == 0)
+    {
+    vtkErrorMacro("Could not open file " << this->FileName);
+    return VTK_ERROR;
+    }
+  int level;
+
+  // The class name is new.
+  // I am concerned with speed so I am going to allocate a fixed 25 characters
+  // For the file type.  Terminating character would require a loop.
+  fwrite("vtkMultiResJpgImageWriter22    ", 1, 30, fp);
+
+  // For flexibility I will put the start of the level table here.
+  // We can then have anysize header for metadata we want.
+  // We can just keep adding to the list.
+  // We might consider key value pairs for optional meta data.
+  long levelTableLocationLocation = ftell(fp);
+  fseek(fp, sizeof(vtkTypeUInt32), SEEK_CUR);
+
+  // Create a dataset that has the ortho image dimensions for
+  // the whole terrain.  This information allows the client to
+  // place the tile texture map in the appropriate spot.
+  int* wholeDimensions = input->GetDimensions();
+  vtkTypeUInt32 tmp[2];
+  tmp[0] = wholeDimensions[0];
+  tmp[1] = wholeDimensions[1];
+  fwriteLE((void*)tmp, sizeof(vtkTypeUInt32), 2, fp);
+  tmp[0] = this->TileDimensions[0];
+  tmp[1] = this->TileDimensions[1];
+  fwriteLE((void*)tmp, sizeof(int), 2, fp);
+  unsigned char numberOfScalarComponents = input->GetNumberOfScalarComponents();
+  fwrite((void*)(&numberOfScalarComponents), 1, 1, fp);
+
+  // I am skipping the points.  They were a good idea though.
+  // Tile 3d world corner points were used to determine tile visibility.
+
+  // Filter to shrink each level.
+  vtkSmartPointer<vtkImageData> tmpImage = vtkSmartPointer<vtkImageData>::New();
+  tmpImage->ShallowCopy(input);
+  vtkSmartPointer<vtkImageShrink3D> shrink = vtkSmartPointer<vtkImageShrink3D>::New();
+  shrink->SetShrinkFactors(2, 2, 1);
+  shrink->SetInputData(tmpImage);
+
+  // Create a dataset that has the number of levels as a single element.
+  unsigned char numberOfLevels = this->NumberOfLevels;
+  if (numberOfLevels > 10)
+    {
+    cerr << "Too many levels (" << numberOfLevels << ")\n";
+    numberOfLevels = 10;
+    }
+  fwrite((void*)(&numberOfLevels), 1, 1, fp);
+
+  vtkTypeUInt64 levelTable[10]; // hard coded to 10 levels.
+  // Skip space for the tile table.
+  // Save location to write later.
+  vtkTypeUInt32 levelTableLocation = ftell(fp);
+  fseek(fp, sizeof(vtkTypeUInt64)*numberOfLevels, SEEK_CUR);
+
+  // Save each level.
+  for (level = 0; level < numberOfLevels; ++level)
+    {
+    levelTable[level] = ftell(fp);
+    if (this->WriteLevel(fp, tmpImage) == VTK_ERROR)
+      {
+      fclose(fp);
+      return VTK_ERROR;
+      }
+    // Lets reduce the resolution after writing each level.
+    shrink->Update();
+    tmpImage->ShallowCopy(shrink->GetOutput());
+    }
+
+  // Go back and write the level table.
+  fseek(fp, levelTableLocation, SEEK_SET);
+  fwriteLE((void*)(levelTable), sizeof(vtkTypeUInt64), numberOfLevels, fp);
+  // Go to the start of the file and record the starting location of the level table.
+  fseek(fp, levelTableLocationLocation, SEEK_SET);
+  fwriteLE((void*)(&levelTableLocation), sizeof(vtkTypeUInt32), 1, fp);
+
+  fclose(fp);
+
+  return VTK_OK;
+}
+
+
+//----------------------------------------------------------------------------
+int vtkVgMultiResJpgImageWriter2::WriteLevel(FILE* fp, vtkImageData* input)
+{
+  // Angelfire had a tile grid extent.  I am just going to use dimensions.
+  int* imageDims = input->GetDimensions();
+  int gridDims[2];
+  gridDims[0] = (int)(ceil((double)(imageDims[0]) / (double)(this->TileDimensions[0])));
+  gridDims[1] = (int)(ceil((double)(imageDims[1]) / (double)(this->TileDimensions[1])));
+
+  // Temporary image holds cropped tile.
+  int croppedExt[6];
+  croppedExt[4] = croppedExt[5] = 0;
+  vtkSmartPointer<vtkImageData> croppedTile = vtkSmartPointer<vtkImageData>::New();
+  croppedTile->SetExtent(0, this->TileDimensions[0]-1,
+    0, this->TileDimensions[1]-1, 0, 0);
+  croppedTile->AllocateScalars(VTK_UNSIGNED_CHAR, input->GetNumberOfScalarComponents());
+  int* inputExt = input->GetExtent();
+
+  // Temporary memory used to hold compressed tile.
+  vtkUnsignedCharArray* jpgData;
+  vtkTypeUInt64 compressedTileSize;
+
+  // Writer used to compress the tile.
+  vtkSmartPointer<vtkJPEGWriter> vtkW = vtkSmartPointer<vtkJPEGWriter>::New();
+  vtkW->WriteToMemoryOn();
+  //valgrind says this needs to be set to ensure vtkW is OK below
+  //despite WriteToMemory. look at vtkJPEGWriter.cxx sprintf(this->InternalFileName,NULL,num)
+  vtkW->SetFilePattern("Tile_%d");
+  vtkW->SetInputData(croppedTile);
+  vtkW->SetQuality(this->CompressionQuality);
+  vtkW->ProgressiveOff();
+
+  // Add the level meta data to the file.
+  vtkTypeUInt64 numTiles = gridDims[0] * gridDims[1];
+  // Angelfire had an extent,  I am using dimensions.
+  fwriteLE((void*)(gridDims), sizeof(vtkTypeUInt32), 2, fp);
+  // Allocate array for tile offsets.
+  // Add one extra element to the table.  We use the difference between
+  // two table elements to compute the length of the compressed tile.
+  vtkTypeUInt64 tileTableLength = numTiles + 1;
+  vtkTypeUInt64* tileTable = new vtkTypeUInt64[tileTableLength];
+  vtkTypeUInt64 tileTableLocation = ftell(fp);
+  // Skip the tile table to write later.
+  fseek(fp, static_cast<long int>(sizeof(vtkTypeUInt64))*tileTableLength, SEEK_CUR);
+  int tileCount = 0;
+  tileTable[tileCount] = ftell(fp);
+
+  // Loop through the tiles.  Save those that have data.
+  int xPartial, yPartial;
+  for (int y = 0; y < gridDims[1]; ++y)
+    {
+    croppedExt[2] = y * this->TileDimensions[1];
+    croppedExt[3] = croppedExt[2] + this->TileDimensions[1] - 1;
+    yPartial = 0;
+    if (croppedExt[3] > inputExt[3])
+      {
+      yPartial = 1;
+      croppedExt[3] = inputExt[3];
+      }
+    for (int x = 0; x < gridDims[0]; ++x)
+      {
+      // Crop the tile out of the input.
+      croppedExt[0] = x * this->TileDimensions[0];
+      croppedExt[1] = croppedExt[0] + this->TileDimensions[0] - 1;
+      xPartial = 0;
+      if (croppedExt[1] > inputExt[1])
+        {
+        xPartial = 1;
+        croppedExt[1] = inputExt[1];
+        }
+      croppedTile->SetExtent(croppedExt);
+      // For tiles that hang over the edge.  We could make them smaller or
+      // pad with 0's.  Lets pad.
+      if (yPartial || xPartial)
+        {
+        memset(croppedTile->GetScalarPointer(), 0,
+               this->TileDimensions[0]*this->TileDimensions[1]);
+        }
+      croppedTile->CopyAndCastFrom(input, croppedExt);
+
+      // Compress the tile.
+      croppedTile->Modified();
+      vtkW->Write();
+      jpgData = vtkW->GetResult();
+      compressedTileSize = jpgData->GetNumberOfTuples();
+      fwriteLE((void*)(jpgData->GetVoidPointer(0)), 1, compressedTileSize, fp);
+      tileTable[++tileCount] = ftell(fp);
+      }
+    }
+
+  // Go back and write the table.
+  // Go back and write the level table.
+  vtkTypeUInt64 endLocation = ftell(fp);
+  fseek(fp, tileTableLocation, SEEK_SET);
+  fwriteLE((void*)(tileTable), sizeof(vtkTypeUInt64), tileTableLength, fp);
+  fseek(fp, endLocation, SEEK_SET);
+
+  delete [] tileTable;
+
+  return VTK_OK;
+}
diff --git a/Libraries/VtkVgCore/vtkVgMultiResJpgImageWriter2.h b/Libraries/VtkVgCore/vtkVgMultiResJpgImageWriter2.h
new file mode 100644
index 00000000..ad489e3f
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgMultiResJpgImageWriter2.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgMultiResJpgImageWriter2 - Writes images to files.
+// .SECTION Description
+
+#ifndef __vtkVgMultiResJpgImageWriter2_h
+#define __vtkVgMultiResJpgImageWriter2_h
+
+#include "vtkImageAlgorithm.h"
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgMultiResJpgImageWriter2 : public vtkImageAlgorithm
+{
+public:
+  static vtkVgMultiResJpgImageWriter2* New();
+  vtkTypeMacro(vtkVgMultiResJpgImageWriter2, vtkImageAlgorithm);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Specify file name for the image file. You should specify either
+  // a FileName or a FilePrefix. Use FilePrefix if the data is stored
+  // in multiple files.
+  vtkSetStringMacro(FileName);
+  vtkGetStringMacro(FileName);
+
+//BTX
+  // Description:
+  // Set/Get the input object from the image pipeline.
+  vtkImageData* GetInput();
+//ETX
+
+  // Description:
+  // Defaults to 5 levels.
+  vtkSetMacro(NumberOfLevels, int);
+  vtkGetMacro(NumberOfLevels, int);
+
+  // Description:
+  // Set/Get compression quality for the jpeg.
+  vtkSetMacro(CompressionQuality, int);
+  vtkGetMacro(CompressionQuality, int);
+
+  // Description:
+  // All tiles will have the same dimension.
+  // Somes tiles at the edge may have to be padded with 0's.
+  vtkSetVector2Macro(TileDimensions, int);
+  vtkGetVector2Macro(TileDimensions, int);
+
+  //void DeleteFiles();
+
+  void Write();
+
+protected:
+  vtkVgMultiResJpgImageWriter2();
+  ~vtkVgMultiResJpgImageWriter2();
+
+  char* FileName;
+
+  // This is called by the superclass.
+  // This is the method you should override.
+  virtual int RequestData(vtkInformation* request,
+                          vtkInformationVector** inputVector,
+                          vtkInformationVector* outputVector);
+
+  int WriteImage(vtkImageData* data);
+  int WriteLevel(FILE* fp, vtkImageData* input);
+
+
+private:
+  vtkVgMultiResJpgImageWriter2(const vtkVgMultiResJpgImageWriter2&);  // Not implemented.
+  void operator=(const vtkVgMultiResJpgImageWriter2&);  // Not implemented.
+
+  int NumberOfLevels;
+  int CompressionQuality;
+  int TileDimensions[2];
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgPNGReader.cxx b/Libraries/VtkVgCore/vtkVgPNGReader.cxx
new file mode 100644
index 00000000..0efa3d64
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgPNGReader.cxx
@@ -0,0 +1,192 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgPNGReader.h"
+
+// VTK includes.
+#include <vtkImageData.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
+#include <vtkObjectFactory.h>
+#include <vtkPNGReader.h>
+#include <vtkStreamingDemandDrivenPipeline.h>
+
+#include <vtksys/SystemTools.hxx>
+
+// Standard VTK macro to implement New().
+vtkStandardNewMacro(vtkVgPNGReader);
+
+//-----------------------------------------------------------------------------
+vtkVgPNGReader::vtkVgPNGReader() : vtkVgBaseImageSource(),
+  ImageCache(0)
+{
+  this->Reader = vtkPNGReader::New();
+
+  this->SetNumberOfInputPorts(0);
+  this->SetNumberOfOutputPorts(1);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPNGReader::~vtkVgPNGReader()
+{
+  if (this->ImageCache)
+    {
+    this->ImageCache->Delete();
+    this->ImageCache = 0;
+    }
+
+  if (this->Reader)
+    {
+    this->Reader->Delete();
+    this->Reader = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPNGReader::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgPNGReader::GetNumberOfLevels() const
+{
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPNGReader::GetDimensions(int dim[2])
+{
+  int* extents = this->Reader->GetDataExtent();
+  dim[0] = extents[1] + 1;
+  dim[1] = extents[3] + 1;
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgPNGReader::CanRead(const std::string& source)
+{
+  std::string ciSource = vtksys::SystemTools::LowerCase(source);
+
+  // Check if it is a filename or if the argument is just an extension.
+  std::string ext = vtksys::SystemTools::GetFilenameLastExtension(ciSource);
+  if (ext.compare(".png") == 0 || (ciSource.compare("png") == 0) ||
+      (ciSource.compare(".png") == 0))
+    {
+    return true;
+    }
+
+  return false;
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgPNGReader::GetShortDescription()
+{
+  return "Reader for PNG file format";
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgPNGReader::GetLongDescription()
+{
+  return this->GetShortDescription();
+}
+
+//----------------------------------------------------------------------------
+vtkVgBaseImageSource* vtkVgPNGReader::Create()
+{
+  return vtkVgPNGReader::New();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgPNGReader::RequestInformation(vtkInformation* vtkNotUsed(request),
+                                       vtkInformationVector** vtkNotUsed(inputVector),
+                                       vtkInformationVector* outputVector)
+{
+  // get the info objects
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information object.");
+    return 1;
+    }
+
+  if (!this->FileName)
+    {
+    vtkErrorMacro("Requires valid input file name.") ;
+    return 1;
+    }
+
+  if (this->ImageCache)
+    {
+    this->ImageCache->Delete();
+    }
+
+  this->Reader->SetFileName(this->FileName);
+  this->Reader->SetDataOrigin(this->Origin);
+  this->Reader->SetDataSpacing(this->Spacing);
+  this->Reader->Update();
+  this->ImageCache = vtkImageData::New();
+  this->ImageCache->ShallowCopy(this->Reader->GetOutput());
+
+  int extents[6];
+  this->ImageCache->GetExtent(extents);
+
+  outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),
+               extents, 6);
+  outInfo->Set(vtkDataObject::SPACING(), this->Spacing, 3);
+
+  outInfo->Set(vtkDataObject::ORIGIN(),  this->Origin, 3);
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgPNGReader::RequestData(vtkInformation* vtkNotUsed(request),
+                                vtkInformationVector** vtkNotUsed(inputVector),
+                                vtkInformationVector* outputVector)
+{
+  if (!outputVector)
+    {
+    vtkErrorMacro("Invalid output information vector.") ;
+    return 1;
+    }
+
+  if (!this->FileName)
+    {
+    vtkErrorMacro("Requires valid input file name.") ;
+    return 1;
+    }
+
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information object.");
+    return 1;
+    }
+
+  vtkDataObject* dataObj = outInfo->Get(vtkDataObject::DATA_OBJECT());
+  if (!dataObj)
+    {
+    vtkErrorMacro("Invalid output data object.");
+    return 1;
+    }
+
+  vtkImageData* outputImage = vtkImageData::SafeDownCast(dataObj);
+  if (!outputImage)
+    {
+    vtkErrorMacro("Output data object is not an image data object.");
+    return 1;
+    }
+
+  if (!this->ImageCache)
+    {
+    vtkErrorMacro("Failed to create valid output.");
+    return 1;
+    }
+
+  outputImage->ShallowCopy(this->ImageCache);
+
+  return 1;
+}
diff --git a/Libraries/VtkVgCore/vtkVgPNGReader.h b/Libraries/VtkVgCore/vtkVgPNGReader.h
new file mode 100644
index 00000000..14a344d7
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgPNGReader.h
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgPNGReader_h
+#define __vtkVgPNGReader_h
+
+// VTKExtensions includes.
+#include "vtkVgBaseImageSource.h"
+
+#include <vgExport.h>
+
+// Forward declaration.
+class vtkPNGReader;
+
+class VTKVG_CORE_EXPORT vtkVgPNGReader : public vtkVgBaseImageSource
+{
+public:
+  // Description:
+  // Create new instance.
+  static vtkVgPNGReader* New();
+
+  // Description:
+  // Check type.
+  vtkTypeMacro(vtkVgPNGReader, vtkVgBaseImageSource);
+
+  // Description:
+  // Print values of the member variables.
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Return number of level of detail.
+  virtual int GetNumberOfLevels() const;
+
+  // Description:
+  // Return dimensions of the image.
+  virtual void GetDimensions(int dim[2]);
+
+  virtual bool CanRead(const std::string& source);
+
+  virtual std::string GetShortDescription();
+
+  virtual std::string GetLongDescription();
+
+  static vtkVgBaseImageSource* Create();
+
+protected:
+
+  vtkVgPNGReader();
+  virtual ~vtkVgPNGReader();
+
+  virtual int RequestInformation(vtkInformation* request,
+                                 vtkInformationVector** inputVector,
+                                 vtkInformationVector* outputVector);
+
+  virtual int RequestData(vtkInformation* request,
+                          vtkInformationVector** inputVector,
+                          vtkInformationVector* outputVector);
+
+  vtkImageData* ImageCache;
+
+  vtkPNGReader* Reader;
+
+private:
+
+  vtkVgPNGReader(const vtkVgPNGReader&);        // Not implemented.
+  void operator= (const vtkVgPNGReader&);       // Not implemented.
+};
+
+#endif // __vtkVgPNGReader_h
diff --git a/Libraries/VtkVgCore/vtkVgPlotTimeline.cxx b/Libraries/VtkVgCore/vtkVgPlotTimeline.cxx
new file mode 100644
index 00000000..a633bd84
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgPlotTimeline.cxx
@@ -0,0 +1,438 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgPlotTimeline.h"
+
+#include "vtkIdTypeArray.h"
+#include "vtkContext2D.h"
+#include "vtkContextDevice2D.h"
+#include "vtkObjectFactory.h"
+#include "vtkPen.h"
+#include "vtkPoints2D.h"
+#include "vtkTransform2D.h"
+#include "vtkUnsignedCharArray.h"
+
+#include <algorithm>
+
+//-----------------------------------------------------------------------------
+vtkStandardNewMacro(vtkVgPlotTimeline);
+
+//-----------------------------------------------------------------------------
+vtkVgPlotTimeline::vtkVgPlotTimeline()
+{
+  this->MarkerStyle = vtkPlotPoints::CIRCLE;
+  this->SortedIds = 0;
+  this->AreaPointIds = 0;
+  this->IsIntervalPlot = false;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPlotTimeline::~vtkVgPlotTimeline()
+{
+  delete [] this->SortedIds;
+
+  if (this->AreaPointIds)
+    {
+    this->AreaPointIds->Delete();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPlotTimeline::SetSelection(vtkIdTypeArray* id)
+{
+  if (!this->Selection)
+    {
+    this->Selection = vtkIdTypeArray::New();
+    }
+  if (!id)
+    {
+    this->Selection->Reset();
+    }
+  else
+    {
+    this->Selection->DeepCopy(id);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgPlotTimeline::Paint(vtkContext2D* painter)
+{
+  if (!this->Visible || !this->Points)
+    {
+    return false;
+    }
+
+  // get scaling factor to convert input item dimensions to screen space
+  float widthScale = painter->GetTransform()->GetMatrix()->GetData()[0];
+  float minScreenWidth = 5.0f;
+
+  // don't try to draw a line with <2 points
+  vtkIdType numPoints = this->Points->GetNumberOfPoints();
+  if (numPoints > 1)
+    {
+    // interval plot requires a special paint sequence
+    if (this->IsIntervalPlot)
+      {
+      painter->ApplyPen(this->Pen);
+
+      vtkVector2f* data =
+        static_cast<vtkVector2f*>(this->Points->GetVoidPointer(0));
+
+      // coloring with scalars?
+      if (this->ScalarVisibility && this->Colors)
+        {
+        int nc = static_cast<int>(this->Colors->GetNumberOfTuples());
+        if (numPoints != nc)
+          {
+          vtkErrorMacro("Attempted to color points with array of wrong length");
+          return false;
+          }
+
+        int nc_comps = static_cast<int>(this->Colors->GetNumberOfComponents());
+        unsigned char* c = this->Colors->GetPointer(0);
+
+        painter->GetPen()->SetWidth(5);
+
+        // draw intervals
+        for (vtkIdType i = 0; i < numPoints - 1; i += 2)
+          {
+          float points[4] =
+            {
+            data[i].GetX(),
+            data[i].GetY(),
+            data[i + 1].GetX(),
+            data[i + 1].GetY()
+            };
+
+          // Enforce a minimum screen width to ensure the item remains visible.
+          if (widthScale > 0.0f)
+            {
+            float screenWidth = (points[2] - points[0]) * widthScale;
+            if (screenWidth < minScreenWidth)
+              {
+              float halfWidth = 0.5f * minScreenWidth / widthScale;
+              float mid = 0.5f * (points[0] + points[2]);
+              points[0] = mid - halfWidth;
+              points[2] = mid + halfWidth;
+              }
+            }
+
+          painter->DrawPoly(points, 2, c, nc_comps);
+          c += nc_comps * 2;
+          }
+        }
+      else // not coloring with scalars
+        {
+        for (vtkIdType i = 0; i < numPoints - 1; i += 2)
+          {
+          painter->DrawLine(data[i].GetX(),
+                            data[i].GetY(),
+                            data[i + 1].GetX(),
+                            data[i + 1].GetY());
+          }
+        }
+      }
+    else
+      {
+      return this->vtkPlotLine::Paint(painter);
+      }
+    }
+
+  if (!this->IsIntervalPlot)
+    {
+    return this->vtkPlotPoints::Paint(painter);
+    }
+
+  // draw interval selection highlight
+  if (this->Selection)
+    {
+    vtkDebugMacro(<< "Selection set " << this->Selection->GetNumberOfTuples());
+
+    painter->GetPen()->SetColor(0, 0, 255, 80);
+    painter->GetPen()->SetWidth(13);
+
+    for (int i = 0; i < this->Selection->GetNumberOfTuples(); ++i)
+      {
+      vtkIdType id = 0;
+      this->Selection->GetTupleValue(i, &id);
+      if (id % 2 == 0 && id < this->Points->GetNumberOfPoints() - 1)
+        {
+        double p[4];
+        this->Points->GetPoint(id, p);
+        this->Points->GetPoint(id + 1, p + 2);
+
+        // enforce min screen width
+        if (widthScale > 0.0f)
+          {
+          float screenWidth = (p[2] - p[0]) * widthScale;
+          if (screenWidth < minScreenWidth)
+            {
+            float halfWidth = 0.5f * minScreenWidth / widthScale;
+            float mid = 0.5f * (p[0] + p[2]);
+            p[0] = mid - halfWidth;
+            p[2] = mid + halfWidth;
+            }
+          }
+
+        painter->DrawLine(p[0], p[1], p[2], p[3]);
+        }
+      }
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+namespace
+{
+
+// compare the x component of the two points corresponding to two ids
+struct CompareIds
+{
+  vtkVector2f* Points;
+
+  CompareIds(vtkVector2f* p) : Points(p) { }
+
+  bool operator()(vtkIdType a, vtkIdType b)
+    {
+    return this->Points[a].GetX() < this->Points[b].GetX();
+    }
+};
+
+// define a minimal iterator to allow binary search
+// of point ids by their x value
+struct IdToPointXIter
+    : public std::iterator<std::forward_iterator_tag, double>
+{
+  vtkVector2f* Points;
+  vtkIdType*   Pointer;
+
+  IdToPointXIter(vtkVector2f* pts = 0, vtkIdType* start = 0)
+    : Points(pts), Pointer(start)
+    {}
+
+  double operator*()
+    { return this->Points[*Pointer].GetX(); }
+
+  IdToPointXIter& operator++()
+    { ++this->Pointer; return *this; }
+
+  bool operator==(const IdToPointXIter& other)
+    { return this->Pointer == other.Pointer; }
+
+  bool operator!=(const IdToPointXIter& other)
+    { return !(*this == other); }
+};
+
+// fills a sequence of length n with values [0, 1, 2, ..., n-1]
+struct GenSeries
+{
+  vtkIdType Current;
+  GenSeries() : Current(0)  { }
+  vtkIdType operator()() { return this->Current++; }
+};
+
+} // end anonymous namespace
+
+//-----------------------------------------------------------------------------
+bool vtkVgPlotTimeline::SelectIntervals(const vtkVector2f& point,
+                                        const vtkVector2f& tol)
+{
+  if (!this->Points)
+    {
+    return false;
+    }
+
+  if (!this->Selection)
+    {
+    this->Selection = vtkIdTypeArray::New();
+    }
+  this->Selection->SetNumberOfTuples(0);
+
+  // Iterate through all points and check whether any are in range
+  vtkVector2f* data = static_cast<vtkVector2f*>(
+                        this->Points->GetVoidPointer(0));
+  vtkIdType n = this->Points->GetNumberOfPoints();
+
+  for (vtkIdType i = 0; i < n - 1; i += 2)
+    {
+    if (this->InRange(point, tol, data[i], data[i + 1]))
+      {
+      // only add the 'head' id to the selection
+      this->Selection->InsertNextValue(i);
+      }
+    }
+  return this->Selection->GetNumberOfTuples() > 0;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgPlotTimeline::SelectPoints(const vtkVector2f& min,
+                                     const vtkVector2f& max)
+{
+  if (!this->IsIntervalPlot)
+    {
+    return this->Superclass::SelectPoints(min, max);
+    }
+
+  vtkVector2f pt;
+  vtkVector2f tol;
+  pt[0] = 0.5 * (min.GetX() + max.GetX());
+  pt[1] = 0.5 * (min.GetY() + max.GetY());
+  tol[0] = max.GetX() - pt[0];
+  tol[1] = max.GetY() - pt[1];
+  return this->SelectIntervals(pt, tol);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdTypeArray* vtkVgPlotTimeline::GetIntervalIdsInArea(
+  const vtkVector2f& point, const vtkVector2f& tol)
+{
+  if (!this->Points)
+    {
+    return 0;
+    }
+
+  vtkIdType n = this->Points->GetNumberOfPoints();
+  if (n == 0)
+    {
+    return 0;
+    }
+
+  vtkVector2f* points = static_cast<vtkVector2f*>(
+                          this->Points->GetVoidPointer(0));
+
+  // sort ids according to the x values of the corresponding points
+  if (!this->SortedIds || this->SortTime < this->BuildTime)
+    {
+    this->SortTime.Modified();
+    delete [] this->SortedIds;
+    this->SortedIds = new vtkIdType[n];
+    std::generate(this->SortedIds, this->SortedIds + n, GenSeries());
+    std::sort(this->SortedIds, this->SortedIds + n, CompareIds(points));
+    }
+
+  // get the lowest point we might hit within the supplied tolerance
+  double lowX = point.GetX() - tol.GetX();
+
+  IdToPointXIter begin(points, this->SortedIds);
+  IdToPointXIter end(points, this->SortedIds + n);
+  IdToPointXIter low = std::lower_bound(begin, end, lowX);
+
+  // set up the array
+  if (!this->AreaPointIds)
+    {
+    this->AreaPointIds = vtkIdTypeArray::New();
+    }
+  this->AreaPointIds->SetNumberOfTuples(0);
+
+  // now consider the y axis
+  for (; low != end; ++low)
+    {
+    // only consider interval end points
+    vtkIdType currId = *(low.Pointer);
+    if (currId % 2 == 1)
+      {
+      if (this->InRange(point, tol, points[currId - 1], points[currId]))
+        {
+        this->AreaPointIds->InsertNextValue(currId);
+        };
+      }
+    }
+
+  return this->AreaPointIds;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdTypeArray* vtkVgPlotTimeline::GetPointIdsInArea(const vtkVector2f& point,
+    const vtkVector2f& tol)
+{
+  if (!this->Points)
+    {
+    return 0;
+    }
+
+  vtkIdType n = this->Points->GetNumberOfPoints();
+  if (n == 0)
+    {
+    return 0;
+    }
+
+  vtkVector2f* points = static_cast<vtkVector2f*>(
+                          this->Points->GetVoidPointer(0));
+
+  // sort ids according to the x values of the corresponding points
+  if (!this->SortedIds)
+    {
+    this->SortedIds = new vtkIdType[n];
+    std::generate(this->SortedIds, this->SortedIds + n, GenSeries());
+    std::sort(this->SortedIds, this->SortedIds + n, CompareIds(points));
+    }
+
+  // get the lowest point we might hit within the supplied tolerance
+  double lowX = point.GetX() - tol.GetX();
+
+  IdToPointXIter begin(points, this->SortedIds);
+  IdToPointXIter end(points, this->SortedIds + n);
+  IdToPointXIter low = std::lower_bound(begin, end, lowX);
+
+  // set up the array
+  if (!this->AreaPointIds)
+    {
+    this->AreaPointIds = vtkIdTypeArray::New();
+    }
+  this->AreaPointIds->SetNumberOfTuples(0);
+
+  // now consider the y axis
+  float highX = point.GetX() + tol.GetX();
+  while (low != end)
+    {
+    vtkIdType currId = *(low.Pointer);
+    if (this->InRange(point, tol, points[currId]))
+      {
+      this->AreaPointIds->InsertNextValue(currId);
+      }
+    if (*low > highX)
+      {
+      break;
+      }
+    ++low;
+    }
+
+  return this->AreaPointIds;
+}
+
+// See if the point is within tolerance.
+bool vtkVgPlotTimeline::InRange(const vtkVector2f& point,
+                                const vtkVector2f& tol,
+                                const vtkVector2f& current)
+{
+  return current.GetX() > point.GetX() - tol.GetX() &&
+         current.GetX() < point.GetX() + tol.GetX() &&
+         current.GetY() > point.GetY() - tol.GetY() &&
+         current.GetY() < point.GetY() + tol.GetY();
+}
+
+// See if the point is within tolerance.
+bool vtkVgPlotTimeline::InRange(const vtkVector2f& point,
+                                const vtkVector2f& tol,
+                                const vtkVector2f& p1,
+                                const vtkVector2f& p2)
+{
+  if (p1.GetY() < point.GetY() - tol.GetY() ||
+      p1.GetY() > point.GetY() + tol.GetY())
+    {
+    return false;
+    }
+
+  return p1.GetX() < point.GetX() + tol.GetX() &&
+         p2.GetX() > point.GetX() - tol.GetX();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPlotTimeline::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgPlotTimeline.h b/Libraries/VtkVgCore/vtkVgPlotTimeline.h
new file mode 100644
index 00000000..de1d4cc1
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgPlotTimeline.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgPlotTimeline - Class for drawing an XY line plot given two columns from
+// a vtkTable.
+//
+// .SECTION Description
+//
+
+#ifndef __vtkVgPlotTimeline_h
+#define __vtkVgPlotTimeline_h
+
+#include "vtkPlotLine.h"
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgPlotTimeline : public vtkPlotLine
+{
+public:
+  vtkTypeMacro(vtkVgPlotTimeline, vtkPlotLine);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Creates a 2D Chart object.
+  static vtkVgPlotTimeline* New();
+
+  // Description:
+  // Paint event for the XY plot, called whenever the chart needs to be drawn
+  virtual bool Paint(vtkContext2D* painter);
+
+  // Description:
+  // Get an array containing the ids of all points in a given area
+  vtkIdTypeArray* GetPointIdsInArea(const vtkVector2f& center,
+                                    const vtkVector2f& tol);
+
+  vtkIdTypeArray* GetIntervalIdsInArea(const vtkVector2f& point,
+                                       const vtkVector2f& tol);
+
+  bool SelectIntervals(const vtkVector2f& point,
+                       const vtkVector2f& tol);
+
+  virtual bool SelectPoints(const vtkVector2f& min, const vtkVector2f& max);
+
+  // TODO: We shouldn't need this function, but it seems to prevent a memory
+  // leak in vtkCharts.
+  virtual void SetSelection(vtkIdTypeArray* id);
+
+  // Description:
+  // An interval plot will draw lines between every adjacent pair in the
+  // input table.
+  vtkSetMacro(IsIntervalPlot, bool);
+  vtkGetMacro(IsIntervalPlot, bool);
+
+//BTX
+protected:
+  vtkVgPlotTimeline();
+  ~vtkVgPlotTimeline();
+
+  bool InRange(const vtkVector2f& point, const vtkVector2f& tol,
+               const vtkVector2f& current);
+
+  bool InRange(const vtkVector2f& point, const vtkVector2f& tol,
+               const vtkVector2f& p1, const vtkVector2f& p2);
+
+  vtkIdType* SortedIds;
+  vtkIdTypeArray* AreaPointIds;
+
+  bool IsIntervalPlot;
+
+  vtkTimeStamp SortTime;
+
+private:
+  vtkVgPlotTimeline(const vtkVgPlotTimeline&);  // Not implemented.
+  void operator=(const vtkVgPlotTimeline&);  // Not implemented.
+
+//ETX
+};
+
+#endif //__vtkVgPlotTimeline_h
diff --git a/Libraries/VtkVgCore/vtkVgPythonUtil.h b/Libraries/VtkVgCore/vtkVgPythonUtil.h
new file mode 100644
index 00000000..aea3a1d9
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgPythonUtil.h
@@ -0,0 +1,19 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgPythonUtil_h
+#define __vtkVgPythonUtil_h
+
+#define vtkVgPythonAttribute(type, name) \
+  vtkVgPythonGetSet(type, name) \
+  type name
+
+#define vtkVgPythonGetSet(type, name) \
+  type& Get##name() { return this->name; } \
+  type const& Get##name() const { return this->name; } \
+  void Set##name(type const& value) { this->name = value; }
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgQuad.cxx b/Libraries/VtkVgCore/vtkVgQuad.cxx
new file mode 100644
index 00000000..2e2c71b9
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgQuad.cxx
@@ -0,0 +1,72 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgQuad.h"
+
+// VTK includes
+#include <vtkActor.h>
+#include <vtkCellArray.h>
+#include <vtkDoubleArray.h>
+#include <vtkPointData.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkActor> vtkVgQuad::CreateQuad(double ulx, double uly,
+                                                double llx, double lly,
+                                                double lrx, double lry,
+                                                double urx, double ury)
+{
+  vtkSmartPointer<vtkActor> actor (vtkSmartPointer<vtkActor>::New());
+  vtkSmartPointer<vtkPolyDataMapper> mapper
+    (vtkSmartPointer<vtkPolyDataMapper>::New());
+
+  // Points of the quad.
+  vtkSmartPointer<vtkPoints> pts = vtkSmartPointer<vtkPoints>::New();
+  pts->InsertNextPoint(ulx, uly, 0.0);
+  pts->InsertNextPoint(llx, lly, 0.0);
+  pts->InsertNextPoint(lrx, lry, 0.0);
+  pts->InsertNextPoint(urx, ury, 0.0);
+
+  // Formation.
+  vtkSmartPointer<vtkCellArray> polys = vtkSmartPointer<vtkCellArray>::New();
+  polys->InsertNextCell(4);
+  polys->InsertCellPoint(0);
+  polys->InsertCellPoint(1);
+  polys->InsertCellPoint(2);
+  polys->InsertCellPoint(3);
+
+  // Texture coordinates.
+  vtkSmartPointer<vtkDoubleArray> texCoords =
+    vtkSmartPointer<vtkDoubleArray>::New();
+  texCoords->SetNumberOfComponents(2);
+  texCoords->SetNumberOfTuples(4);
+
+  double texCoord[2];
+  texCoord[0]=0.0;
+  texCoord[1]=0.0;
+  texCoords->SetTupleValue(0,texCoord);
+  texCoord[0]=1.0;
+  texCoord[1]=0.0;
+  texCoords->SetTupleValue(1,texCoord);
+  texCoord[0]=1.0;
+  texCoord[1]=1.0;
+  texCoords->SetTupleValue(2,texCoord);
+  texCoord[0]=0.0;
+  texCoord[1]=1.0;
+  texCoords->SetTupleValue(3,texCoord);
+  texCoords->Modified();
+
+  vtkSmartPointer<vtkPolyData> quadGeom = vtkSmartPointer<vtkPolyData>::New();
+  quadGeom->SetPoints(pts);
+  quadGeom->SetPolys(polys);
+  quadGeom->GetPointData()->SetTCoords(texCoords);
+
+  mapper->SetInputData(quadGeom);
+  actor->SetMapper(mapper);
+
+  return actor;
+}
diff --git a/Libraries/VtkVgCore/vtkVgQuad.h b/Libraries/VtkVgCore/vtkVgQuad.h
new file mode 100644
index 00000000..990fab4c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgQuad.h
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgQuad_h
+#define __vtkVgQuad_h
+
+#include <vtkObject.h>
+
+// VTK includes
+#include <vtkSmartPointer.h>
+
+class vtkActor;
+
+class vtkVgQuad
+{
+public:
+  static vtkSmartPointer<vtkActor> CreateQuad(double ulx, double uly,
+                                              double llx, double lly,
+                                              double lrx, double lry,
+                                              double urx, double ury);
+};
+
+#endif // __vtkVgQuad_h
diff --git a/Libraries/VtkVgCore/vtkVgRendererUtils.cxx b/Libraries/VtkVgCore/vtkVgRendererUtils.cxx
new file mode 100644
index 00000000..04b696c4
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgRendererUtils.cxx
@@ -0,0 +1,155 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgRendererUtils.h"
+
+#include <vtkCamera.h>
+#include <vtkImageData.h>
+#include <vtkMath.h>
+#include <vtkPlane.h>
+#include <vtkRenderer.h>
+
+//-----------------------------------------------------------------------------
+void vtkVgRendererUtils::GetBounds(vtkRenderer* renderer,
+                                   double bounds[4])
+{
+  // do we actually want to offset by half-pixel????
+  double worldPt[4];
+  renderer->SetViewPoint(-1, -1, 1);
+  renderer->ViewToWorld();
+  renderer->GetWorldPoint(worldPt);
+
+  bounds[0] = worldPt[0];
+  bounds[2] = worldPt[1];
+
+  renderer->SetViewPoint(1, 1, 1);
+  renderer->ViewToWorld();
+  renderer->GetWorldPoint(worldPt);
+
+  bounds[1] = worldPt[0];
+  bounds[3] = worldPt[1];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRendererUtils::ZoomToImageExtents2D(
+  vtkRenderer* ren, vtkImageData* image, bool parallelProjection/*=true*/)
+{
+  if (image)
+    {
+    int iextents[6];
+    image->GetExtent(iextents);
+    double extents[4] =
+      {
+      static_cast<double>(iextents[0]),
+      static_cast<double>(iextents[1]),
+      static_cast<double>(iextents[2]),
+      static_cast<double>(iextents[3]),
+      };
+    ZoomToExtents2D(ren, extents, parallelProjection);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRendererUtils::ZoomToExtents2D(vtkRenderer* ren,
+                                         double extents[4],
+                                         bool parallelProjection/*=true*/)
+{
+  vtkCamera* cam = ren->GetActiveCamera();
+
+  double pos[3], fp[3];
+  cam->GetPosition(pos);
+  cam->GetFocalPoint(fp);
+
+  pos[0] = 0.5 * (extents[0] + extents[1]);
+  pos[1] = 0.5 * (extents[2] + extents[3]);
+
+  fp[0] = pos[0];
+  fp[1] = pos[1];
+
+  cam->SetPosition(pos);
+  cam->SetFocalPoint(fp);
+
+  double extsize[] = { extents[1] - extents[0], extents[3] - extents[2] };
+  if (extsize[1] == 0.0)
+    {
+    return;
+    }
+
+  double extAspect = extsize[0] / extsize[1];
+  ren->ComputeAspect();
+
+  double renAspect =  ren->GetAspect()[0];
+  double scale = 0.5 * extsize[1];
+  if (extAspect > renAspect)
+    scale *= extAspect / renAspect;
+
+  if (parallelProjection)
+    {
+    cam->SetParallelScale(scale);
+    }
+  else
+    {
+    double angle = 2 * atan((extsize[1] / 2) / cam->GetDistance());
+    cam->SetViewAngle(vtkMath::DegreesFromRadians(angle));
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgRendererUtils::GetLinePlaneIntersection(double point1[3],
+  double point2[3], double normal[3], double planePoint[3],
+  double intersectedPoint[3])
+{
+  double t;
+  int intersected = vtkPlane::IntersectWithLine(point1, point2, normal,
+                                                planePoint, t, intersectedPoint);
+  return (intersected == 1 ? true : false);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRendererUtils::CalculateBounds(const std::vector<double>& points,
+  double bounds[6])
+{
+  if (!(points.size() % 3 == 0))
+    {
+    std::cerr << "ERROR: Requires points with three components" << std::endl;
+    return;
+    }
+
+  for (size_t i = 0; i < points.size(); i += 3)
+    {
+    double point[3] =
+      {
+      points[i],
+      points[i + 1],
+      points[i + 2]
+      };
+
+    if (point[0] < bounds[0])
+      {
+      bounds[0] = point[0];
+      }
+    if (point[0] > bounds[1])
+      {
+      bounds[1] = point[0];
+      }
+    if (point[1] < bounds[2])
+      {
+      bounds[2] = point[1];
+      }
+    if (point[1] > bounds[3])
+      {
+      bounds[3] = point[1];
+      }
+    if (point[2] < bounds[4])
+      {
+      bounds[4] = point[2];
+      }
+    if (point[2] > bounds[5])
+      {
+      bounds[5] = point[2];
+      }
+    }
+}
diff --git a/Libraries/VtkVgCore/vtkVgRendererUtils.h b/Libraries/VtkVgCore/vtkVgRendererUtils.h
new file mode 100644
index 00000000..317a19ce
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgRendererUtils.h
@@ -0,0 +1,52 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgRendererUtils_h
+#define __vtkVgRendererUtils_h
+
+// C++ includes
+#include <vector>
+
+#include <vgExport.h>
+
+// Forward declarations
+class vtkImageData;
+class vtkRenderer;
+
+// FIXME: use namespace when we can wrap those
+struct VTKVG_CORE_EXPORT vtkVgRendererUtils
+{
+  // Description:
+  // Get the world bounds of renderer viewport as {xmin, ymin, xmax, ymax}.
+  static void GetBounds(vtkRenderer* renderer, double bounds[4]);
+
+  // Description:
+  // Set camera zoom to fill the viewport with the given image. Maintains
+  // aspect ratio.
+  static void ZoomToImageExtents2D(
+    vtkRenderer* renderer, vtkImageData* image, bool parallelProjection = true);
+
+  // Description:
+  // Set camera zoom to fill the viewport with the given extents,
+  // specified as {xmin, xmax, ymin, ymax}. Maintains aspect ratio.
+  static void ZoomToExtents2D(
+    vtkRenderer* renderer, double extents[4], bool parallelProjection = true);
+
+  // Description:
+  // Given two points on line, normal of a plane, a point on a plane return
+  // intersected point.
+  static bool GetLinePlaneIntersection(
+    double point1[3], double point2[3], double normal[3],
+    double planePoint[3], double intersectedPoint[3]);
+
+  // Description:
+  // Given points (each point has three components double[3]), return bounds of
+  // the bounding box.
+  static void CalculateBounds(const std::vector<double>& points,
+                              double bounds[6]);
+};
+
+#endif // __vtkVgRendererUtils_h
diff --git a/Libraries/VtkVgCore/vtkVgScalars.cxx b/Libraries/VtkVgCore/vtkVgScalars.cxx
new file mode 100644
index 00000000..241fcf40
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgScalars.cxx
@@ -0,0 +1,153 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgScalars.h"
+
+#include "vtkVgTimeStamp.h"
+
+#include <vtkObjectFactory.h>
+
+#include <map>
+#include <limits>
+
+vtkStandardNewMacro(vtkVgScalars);
+
+double vtkVgScalars::NotFoundValue = -std::numeric_limits<double>::max();
+
+class vtkVgScalars::vtkVgScalarsInternal
+{
+public:
+  double Range[2];
+  vtkTimeStamp ComputeRangeTime;
+  std::map<vtkVgTimeStamp, double> Scalars;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgScalars::vtkVgScalars() : vtkObject()
+{
+  this->Implementation = new vtkVgScalarsInternal();
+  this->Implementation->Range[0] =  std::numeric_limits<double>::max();
+  this->Implementation->Range[1] = -std::numeric_limits<double>::max();
+  this->Implementation->ComputeRangeTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgScalars::~vtkVgScalars()
+{
+  delete this->Implementation;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgScalars::SetNotFoundValue(double value)
+{
+  NotFoundValue = value;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgScalars::GetNotFoundValue()
+{
+  return NotFoundValue;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgScalars::PrintSelf(ostream &os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgScalars::HasValue(const vtkVgTimeStamp &timestamp) const
+{
+  return this->Implementation->Scalars.count(timestamp) != 0;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgScalars::InsertValue(const vtkVgTimeStamp& timestamp,
+                               const double& value)
+{
+  this->Implementation->Scalars[timestamp] = value;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgScalars::InsertValues(const std::map<vtkVgTimeStamp, double>& values)
+{
+  std::map<vtkVgTimeStamp, double>::const_iterator constItr =
+    values.begin();
+
+  for (; constItr != values.end(); ++constItr)
+    {
+    this->InsertValue(constItr->first, constItr->second);
+    }
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgScalars::GetValue(const vtkVgTimeStamp& timestamp,
+                              bool interpolate) const
+{
+  if (this->Implementation->Scalars.empty())
+    {
+    return vtkVgScalars::NotFoundValue;
+    }
+
+  std::map<vtkVgTimeStamp, double>::const_iterator itr;
+  itr = this->Implementation->Scalars.lower_bound(timestamp);
+
+  if (itr == this->Implementation->Scalars.end())
+    {
+    // There is no scalar in the map defined at this time or later
+    if (interpolate)
+      {
+      // Use the previously defined value
+      return (--itr)->second;
+      }
+    else
+      {
+      return vtkVgScalars::NotFoundValue;
+      }
+    }
+  if (itr->first == timestamp)
+    {
+    // Found an exact match
+    return itr->second;
+    }
+  if (!interpolate)
+    {
+    // Needed an exact match
+    return vtkVgScalars::NotFoundValue;
+    }
+
+  // Return the scalar defined at the next later timestamp
+  // TODO: really interpolate
+  return itr->second;
+}
+
+//-----------------------------------------------------------------------------
+const double* vtkVgScalars::GetRange()
+{
+  if (this->Implementation->ComputeRangeTime > this->GetMTime())
+    {
+    return this->Implementation->Range;
+    }
+
+  std::map<vtkVgTimeStamp, double>::const_iterator constItr =
+    this->Implementation->Scalars.begin();
+  for (; constItr != this->Implementation->Scalars.end(); ++constItr)
+    {
+    if (constItr->second < this->Implementation->Range[0])
+      {
+      this->Implementation->Range[0] = constItr->second;
+      }
+    if (constItr->second > this->Implementation->Range[1])
+      {
+      this->Implementation->Range[1] = constItr->second;
+      }
+    }
+
+  this->Implementation->ComputeRangeTime.Modified();
+
+  return this->Implementation->Range;
+}
diff --git a/Libraries/VtkVgCore/vtkVgScalars.h b/Libraries/VtkVgCore/vtkVgScalars.h
new file mode 100644
index 00000000..7dfc4733
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgScalars.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgScalars_h
+#define __vtkVgScalars_h
+
+#include <vtkObject.h>
+
+#include <map>
+
+#include <vgExport.h>
+
+class vtkVgTimeStamp;
+
+class VTKVG_CORE_EXPORT vtkVgScalars : public vtkObject
+{
+public:
+  vtkTypeMacro(vtkVgScalars, vtkObject);
+
+  static vtkVgScalars* New();
+
+  // Description:
+  // Define a value that will be identified as the value
+  // that will be returned when no scalars is found
+  // at a given timestamp.
+  static void SetNotFoundValue(double value);
+  static double GetNotFoundValue();
+
+  virtual void PrintSelf(ostream &os, vtkIndent indent);
+
+  // Description:
+  // Check if there is a scalar data at the given timestamp
+  bool HasValue(const vtkVgTimeStamp& timestamp) const;
+
+  // Description:
+  // Insert a new value at time t = \c timestamp
+  void InsertValue(const vtkVgTimeStamp& timestamp, const double& value);
+
+  // Description:
+  // Insert multiple values
+  void InsertValues(const std::map<vtkVgTimeStamp, double>& values);
+
+  // Description:
+  // Get scalar data at the given timestamp. If interpolate is
+  // true, then try to compute a new value by performing linear interpolation
+  // in case the data is not available at t = \c timestamp.
+  double GetValue(const vtkVgTimeStamp& timestamp,
+                  bool interpolate = false) const;
+
+  // Description:
+  // Get current range of scalars
+  const double* GetRange();
+
+protected:
+  vtkVgScalars();
+  virtual ~vtkVgScalars();
+
+  static double NotFoundValue;
+
+  class vtkVgScalarsInternal;
+  vtkVgScalarsInternal* Implementation;
+
+private:
+  vtkVgScalars(const vtkVgScalars&); // Not implemented
+  vtkVgScalars& operator=(const vtkVgScalars&); // Not implemented
+};
+
+#endif // __vtkVgScalars_h
diff --git a/Libraries/VtkVgCore/vtkVgSelectionListRepresentation.cxx b/Libraries/VtkVgCore/vtkVgSelectionListRepresentation.cxx
new file mode 100644
index 00000000..c7ea30ed
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSelectionListRepresentation.cxx
@@ -0,0 +1,773 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgSelectionListRepresentation.h"
+#include "vtkRenderer.h"
+#include "vtkPlaneSource.h"
+#include "vtkDoubleArray.h"
+#include "vtkIdTypeArray.h"
+#include "vtkPolyData.h"
+#include "vtkCellData.h"
+#include "vtkCellArray.h"
+#include "vtkPolyDataMapper2D.h"
+#include "vtkActor2D.h"
+#include "vtkProperty2D.h"
+#include "vtkLookupTable.h"
+#include "vtkBalloonRepresentation.h"
+#include "vtkWindow.h"
+#include "vtkObjectFactory.h"
+#include "vtkImageData.h"
+#include "vtkCamera.h"
+#include <set>
+#include <map>
+#include <utility>
+
+vtkStandardNewMacro(vtkVgSelectionListRepresentation);
+vtkCxxSetObjectMacro(vtkVgSelectionListRepresentation, LookupTable, vtkScalarsToColors);
+
+//-- Define the PIMPLd array defining the selection information
+struct vtkVgSelectionBalloon
+{
+  vtkIdType     ItemID;
+  double        Priority;
+  vtkStdString  Text;
+  vtkImageData* Image;
+
+  vtkVgSelectionBalloon() : ItemID(-1), Priority(1.0), Text(), Image(0) {}
+  vtkVgSelectionBalloon(vtkIdType itemID, double p, vtkStdString* str, vtkImageData* img)
+    {
+    this->ItemID = itemID;
+    this->Priority = p;
+    this->Text = *str;
+    this->Image = img;
+    }
+  vtkVgSelectionBalloon(vtkIdType itemID, double p, const char* str, vtkImageData* img)
+    {
+    this->ItemID = itemID;
+    this->Priority = p;
+    this->Text = vtkStdString(str);
+    this->Image = img;
+    }
+  ~vtkVgSelectionBalloon()
+    {
+    }
+  void operator=(const vtkVgSelectionBalloon& balloon)
+    {
+    this->ItemID = balloon.ItemID;
+    this->Priority = balloon.Priority;
+    this->Text = balloon.Text;
+    this->Image = balloon.Image;
+    }
+  int operator==(const vtkVgSelectionBalloon& balloon) const
+    {
+    if (this->ItemID == balloon.ItemID)
+      {
+      if (this->Priority == balloon.Priority)
+        {
+        if (this->Image == balloon.Image)
+          {
+          if (this->Text == balloon.Text)
+            {
+            return 1;
+            }
+          }
+        }
+      }
+    return 0;
+    }
+  int operator!=(const vtkVgSelectionBalloon& balloon) const
+    {
+    return !(*this == balloon);
+    }
+};
+
+// Comparison structure for set
+struct CompareBalloon
+{
+  bool operator()(vtkVgSelectionBalloon b1, vtkVgSelectionBalloon b2)
+    {
+    if (b1.Priority == b2.Priority)
+      {
+      return b1.ItemID > b2.ItemID;
+      }
+    else
+      {
+      return b1.Priority > b2.Priority;
+      }
+    }
+};
+
+class vtkVgSelectionSet :
+  public std::set<vtkVgSelectionBalloon, CompareBalloon>
+{
+};
+
+typedef std::set<vtkVgSelectionBalloon, CompareBalloon>::iterator
+  vtkVgSelectionSetIterator;
+typedef std::pair<vtkVgSelectionSetIterator, bool> vtkVgSelectionSetRValue;
+
+class vtkVgSelectionMap :
+  public std::map<vtkIdType, vtkVgSelectionSetIterator>
+{
+};
+
+typedef std::map<vtkIdType, vtkVgSelectionSetIterator>::iterator
+  vtkVgSelectionMapIterator;
+
+//-------------------------------------------------------------------------
+vtkVgSelectionListRepresentation::vtkVgSelectionListRepresentation()
+{
+  this->InteractionState = vtkVgSelectionListRepresentation::Outside;
+
+  // Initial positioning information
+  this->PositionCoordinate = vtkCoordinate::New();
+  this->PositionCoordinate->SetCoordinateSystemToWorld();
+  this->PositionCoordinate->SetValue(0, 0, 0);
+  this->Position2Coordinate = vtkCoordinate::New();
+  this->Position2Coordinate->SetCoordinateSystemToDisplay();
+  this->Position2Coordinate->SetValue(25, 100);
+  this->Position2Coordinate->SetReferenceCoordinate(this->PositionCoordinate);
+
+  // Initial lookup table is standard rainbow
+  this->LookupTable = vtkLookupTable::New();
+  this->LookupTable->Build();
+
+  // Control appearance
+  this->Orientation = VerticalList;
+
+  // Create the geometry in canonical coordinates
+  this->Buttons = vtkPlaneSource::New();
+  this->ColoredButtons = vtkPolyData::New();
+  this->Ids = vtkIdTypeArray::New();
+  this->ButtonMapper = vtkPolyDataMapper2D::New();
+  this->ButtonMapper->SetInputData(this->ColoredButtons);
+  this->ButtonActor = vtkActor2D::New();
+  this->ButtonActor->SetMapper(this->ButtonMapper);
+
+  // Internal state
+  this->SelectionSet = new vtkVgSelectionSet;
+  this->SelectionMap = new vtkVgSelectionMap;
+  this->CurrentLocation = -1;
+  this->CurrentItemId = -1;
+  this->SelectedLocation = -1;
+  this->SelectedItemId = -1;
+
+  // Create the balloon
+  this->Balloon = vtkBalloonRepresentation::New();
+  this->Balloon->SetBalloonLayoutToImageRight();
+  this->Balloon->SetPadding(1);
+  this->BalloonOffset = 5;
+
+  // Create the selection marker
+  vtkCellArray* markerPolys = vtkCellArray::New();
+  markerPolys->InsertNextCell(3);
+  markerPolys->InsertCellPoint(0);
+  markerPolys->InsertCellPoint(1);
+  markerPolys->InsertCellPoint(2);
+  markerPolys->InsertNextCell(3);
+  markerPolys->InsertCellPoint(3);
+  markerPolys->InsertCellPoint(4);
+  markerPolys->InsertCellPoint(5);
+  this->Marker = vtkPolyData::New();
+  this->MarkerPoints = vtkPoints::New();
+  this->MarkerPoints->SetNumberOfPoints(6);
+  this->Marker->SetPoints(this->MarkerPoints);
+  this->Marker->SetPolys(markerPolys);
+  markerPolys->Delete();
+  this->MarkerMapper = vtkPolyDataMapper2D::New();
+  this->MarkerMapper->SetInputData(this->Marker);
+  this->MarkerActor = vtkActor2D::New();
+  this->MarkerActor->SetMapper(this->MarkerMapper);
+}
+
+//-------------------------------------------------------------------------
+vtkVgSelectionListRepresentation::~vtkVgSelectionListRepresentation()
+{
+  this->PositionCoordinate->Delete();
+  this->Position2Coordinate->Delete();
+
+  delete this->SelectionSet;
+  delete this->SelectionMap;
+
+  this->SetLookupTable(0);
+  this->Balloon->Delete();
+  this->Buttons->Delete();
+  this->ColoredButtons->Delete();
+  this->Ids->Delete();
+  this->ButtonMapper->Delete();
+  this->ButtonActor->Delete();
+
+  this->Marker->Delete();
+  this->MarkerPoints->Delete();
+  this->MarkerMapper->Delete();
+  this->MarkerActor->Delete();
+}
+
+//-------------------------------------------------------------------------
+int vtkVgSelectionListRepresentation::
+ComputeInteractionState(int X, int Y, int vtkNotUsed(modify))
+{
+  vtkIdType currentId = this->CurrentItemId;
+  int state = this->InteractionState;
+
+  // Make sure something has been defined
+  int numItems = this->GetNumberOfItems();
+  if (numItems < 1)
+    {
+    this->InteractionState = vtkVgSelectionListRepresentation::Outside;
+    }
+  else // do more work
+    {
+    // Perform geometric query
+    int* pos1 = this->PositionCoordinate->
+                GetComputedDisplayValue(this->Renderer);
+    int* pos2 = this->Position2Coordinate->
+                GetComputedDisplayValue(this->Renderer);
+
+    // Figure out where we are in the widget. Exclude outside case first.
+    if (X < pos1[0] || pos2[0] < X || Y < pos1[1] || pos2[1] < Y)
+      {
+      this->InteractionState = vtkVgSelectionRepresentation::Outside;
+      }
+    else // we are on the boundary or inside the border
+      {
+      if (this->Orientation == HorizontalList)
+        {
+        double spacing = static_cast<double>(pos2[0] - pos1[0]) / numItems;
+        this->CurrentLocation = static_cast<int>(X - pos1[0]) / spacing;
+        }
+      else //VerticalList
+        {
+        double spacing = static_cast<double>(pos2[1] - pos1[1]) / numItems;
+        this->CurrentLocation = static_cast<int>(Y - pos1[1]) / spacing;
+        }
+      this->CurrentItemId = this->Ids->GetValue(this->CurrentLocation);
+      this->CurrentLocation = (numItems - 1) - this->CurrentLocation;
+      this->InteractionState = vtkVgSelectionRepresentation::OnItem;
+      }
+
+    if (state != this->InteractionState ||
+        currentId != this->CurrentItemId)
+      {
+      this->Modified();
+      }
+    }
+
+  return this->InteractionState;
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::SelectCurrentItem()
+{
+  int numItems = this->GetNumberOfItems();
+  if (this->CurrentItemId < 0 || numItems < 1)
+    {
+    this->MarkerActor->VisibilityOff();
+    this->SelectedLocation = -1;
+    this->SelectedItemId = -1;
+    }
+  else
+    {
+    this->SelectedLocation = this->CurrentLocation;
+    this->SelectedItemId = this->CurrentItemId;
+    this->MarkerActor->VisibilityOn();
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::DrawSelectionMarker()
+{
+  int numItems = this->GetNumberOfItems();
+  if (this->SelectedLocation < 0 || this->SelectedLocation > (numItems - 1))
+    {
+    this->MarkerActor->VisibilityOff();
+    return;
+    }
+
+  // Perform geometric query
+  int* pos1 = this->PositionCoordinate->
+              GetComputedDisplayValue(this->Renderer);
+  int* pos2 = this->Position2Coordinate->
+              GetComputedDisplayValue(this->Renderer);
+
+  double sx, sy, xOffset, yOffset, o[3];
+  double tp0[3], tp1[3], tp2[3], tp3[3], tp4[3], tp5[3];
+  tp0[2] = tp1[2] = tp2[2] = tp3[2] = tp4[2] = tp5[2] = 0.0;
+  o[0] = pos1[0]; o[1] = pos1[1]; o[2] = 0.0;
+  if (this->Orientation == HorizontalList)
+    {
+    sx = static_cast<double>(pos2[0] - pos1[0]) / numItems;
+    sy = static_cast<double>(pos2[0] - pos1[0]);
+    xOffset = o[0] + ((numItems - 1) - this->SelectedLocation) * sx + sx / 2;
+    yOffset = o[1] + sy / 2;
+    tp0[0] = xOffset;
+    tp0[1] = yOffset + sy / 2;
+    tp1[0] = xOffset + sx / 2;
+    tp1[1] = yOffset + sy;
+    tp2[0] = xOffset - sx / 2;
+    tp2[1] = yOffset + sy;
+    tp3[0] = xOffset;
+    tp3[1] = yOffset - sy / 2;
+    tp4[0] = xOffset + sx / 2;
+    tp4[1] = yOffset - sy;
+    tp5[0] = xOffset - sx / 2;
+    tp5[1] = yOffset - sy;
+    }
+  else //VerticalList
+    {
+    sx = static_cast<double>(pos2[0] - pos1[0]);
+    sy = static_cast<double>(pos2[1] - pos1[1]) / numItems;
+    xOffset = o[0] + sx / 2;
+    yOffset = o[1] + ((numItems - 1) - this->SelectedLocation) * sy + sy / 2;
+    tp0[0] = xOffset - sx / 2;
+    tp0[1] = yOffset;
+    tp1[0] = xOffset - sx;
+    tp1[1] = yOffset + sy / 2;
+    tp2[0] = xOffset - sx;
+    tp2[1] = yOffset - sy / 2;
+    tp3[0] = xOffset + sx / 2;
+    tp3[1] = yOffset;
+    tp4[0] = xOffset + sx;
+    tp4[1] = yOffset - sy / 2;
+    tp5[0] = xOffset + sx;
+    tp5[1] = yOffset + sy / 2;
+    }
+  this->MarkerPoints->SetPoint(0, tp0);
+  this->MarkerPoints->SetPoint(1, tp1);
+  this->MarkerPoints->SetPoint(2, tp2);
+  this->MarkerPoints->SetPoint(3, tp3);
+  this->MarkerPoints->SetPoint(4, tp4);
+  this->MarkerPoints->SetPoint(5, tp5);
+  this->MarkerPoints->Modified();
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::UnselectCurrentItem()
+{
+  this->MarkerActor->VisibilityOff();
+  this->SelectedLocation = -1;
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::SetSelectedItemId(vtkIdType id)
+{
+  vtkVgSelectionMapIterator miter = this->SelectionMap->find(id);
+  if (miter != this->SelectionMap->end())
+    {
+    this->SelectedItemId = (*miter->second).ItemID;
+    int numItems = this->GetNumberOfItems();
+    vtkVgSelectionSetIterator iter = this->SelectionSet->begin();
+    for (int i = 0; i < numItems; ++i)
+      {
+      if ((*iter).ItemID == id)
+        {
+        this->SelectedLocation = (numItems - 1) - i;
+        break;
+        }
+      ++iter;
+      }
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::SetSelectedLocation(int loc)
+{
+  int numItems = this->GetNumberOfItems();
+  if (loc < 0 || loc >= numItems)
+    {
+    return;
+    }
+
+  this->SelectedLocation = loc;
+  vtkVgSelectionSetIterator iter = this->SelectionSet->begin();
+  for (int i = 0; i < numItems; ++i)
+    {
+    if ((numItems - 1 - i) == this->SelectedLocation)
+      {
+      this->SelectedItemId = (*iter).ItemID;
+      break;
+      }
+    ++iter;
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::BuildRepresentation()
+{
+  // Nothing appears id no items defined
+  int numItems = this->GetNumberOfItems();
+  if (numItems < 1)
+    {
+    return;
+    }
+
+  this->Balloon->SetRenderer(this->Renderer);
+
+  if (this->GetMTime() > this->BuildTime ||
+      (this->Renderer && this->Renderer->GetActiveCamera() &&
+       this->Renderer->GetActiveCamera()->GetMTime() > this->BuildTime) ||
+      (this->Renderer && this->Renderer->GetVTKWindow() &&
+       this->Renderer->GetVTKWindow()->GetMTime() > this->BuildTime))
+    {
+    // Set things up
+    int* pos1 = this->PositionCoordinate->
+                GetComputedDisplayValue(this->Renderer);
+    int* pos2 = this->Position2Coordinate->
+                GetComputedDisplayValue(this->Renderer);
+
+    // Now transform the canonical widget into display coordinates
+    double size[2];
+    this->GetSize(size);
+    double sx = (pos2[0] - pos1[0]) / size[0];
+    double sy = (pos2[1] - pos1[1]) / size[1];
+
+    // Generate the buttons.
+    if (this->Orientation == VerticalList)
+      {
+      this->Buttons->SetResolution(1, numItems);
+      }
+    else
+      {
+      this->Buttons->SetResolution(numItems, 1);
+      }
+
+    double o[3], p1[3], p2[3];
+    o[0] = pos1[0]; o[1] = pos1[1]; o[2] = 0.0;
+    p1[0] = pos1[0] + sx; p1[1] = pos1[1]; p1[2] = 0.0;
+    p2[0] = pos1[0]; p2[1] = pos1[1] + sy; p2[2] = 0.0;
+    this->Buttons->SetOrigin(o);
+    this->Buttons->SetPoint1(p1);
+    this->Buttons->SetPoint2(p2);
+    this->Buttons->Update();
+    this->ColoredButtons->ShallowCopy(this->Buttons->GetOutput());
+
+    // Now create the scalars
+    this->ButtonMapper->SetLookupTable(this->LookupTable);
+    this->ButtonMapper->UseLookupTableScalarRangeOn();
+    vtkDoubleArray* scalars = vtkDoubleArray::New();
+    scalars->SetNumberOfTuples(numItems);
+    this->Ids->SetNumberOfTuples(numItems);
+    vtkVgSelectionSetIterator iter = this->SelectionSet->begin();
+    for (int i = 0; i < numItems; ++i)
+      {
+      this->Ids->SetTuple1(i, (*iter).ItemID);
+      scalars->SetTuple1(i, (*iter).Priority);
+      ++iter;
+      }
+    this->ColoredButtons->GetCellData()->SetScalars(scalars);
+    scalars->Delete();
+
+    // Bring up the balloon if valid
+    this->Balloon->VisibilityOff();
+    if (this->AnnotationVisibility &&
+        this->InteractionState == vtkVgSelectionRepresentation::OnItem)
+      {
+      vtkVgSelectionMapIterator miter = this->SelectionMap->find(this->CurrentItemId);
+      if (miter != this->SelectionMap->end())
+        {
+        this->AnnotationVisibilityOn();
+        iter = miter->second;
+        this->Balloon->VisibilityOn();
+        this->Balloon->SetRenderer(this->Renderer);
+        this->Balloon->SetBalloonText(const_cast<vtkStdString&>((*iter).Text));
+        this->Balloon->SetBalloonImage((*iter).Image);
+        // Compute offset
+        double spacing, xOffset, yOffset;
+        if (this->Orientation == HorizontalList)
+          {
+          spacing = static_cast<double>(pos2[0] - pos1[0]) / numItems;
+          xOffset = o[0] + ((numItems - 1) - this->CurrentLocation) * spacing;
+          yOffset = o[1] + sy + this->BalloonOffset;
+          }
+        else //VerticalList
+          {
+          spacing = static_cast<double>(pos2[1] - pos1[1]) / numItems;
+          xOffset = o[0] + sx + this->BalloonOffset;
+          yOffset = o[1] + ((numItems - 1) - this->CurrentLocation) * spacing;
+          }
+
+        this->Balloon->SetOffset(xOffset, yOffset);
+        }
+      }
+
+    // Draw marker if something selected
+    if (this->MarkerActor->GetVisibility())
+      {
+      this->DrawSelectionMarker();
+      }
+
+    this->BuildTime.Modified();
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::GetActors2D(vtkPropCollection* pc)
+{
+  pc->AddItem(this->ButtonActor);
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::ReleaseGraphicsResources(vtkWindow* w)
+{
+  this->ButtonActor->ReleaseGraphicsResources(w);
+}
+
+//-------------------------------------------------------------------------
+int vtkVgSelectionListRepresentation::RenderOverlay(vtkViewport* w)
+{
+  // Nothing appears id no items defined
+  if (this->GetNumberOfItems() < 1)
+    {
+    return 0;
+    }
+
+  if (! this->ButtonActor->GetVisibility())
+    {
+    return 0;
+    }
+
+  this->BuildRepresentation();
+
+  int count = 0;
+  count += this->ButtonActor->RenderOverlay(w);
+  if (this->AnnotationVisibility)
+    {
+    count += this->Balloon->RenderOverlay(w);
+    }
+  if (this->SelectedLocation >= 0)
+    {
+    count += this->MarkerActor->RenderOverlay(w);
+    }
+
+  return count;
+}
+
+//-------------------------------------------------------------------------
+int vtkVgSelectionListRepresentation::RenderOpaqueGeometry(vtkViewport* w)
+{
+  // Nothing appears id no items defined
+  if (this->GetNumberOfItems() < 1)
+    {
+    return 0;
+    }
+
+  if (! this->ButtonActor->GetVisibility())
+    {
+    return 0;
+    }
+  this->BuildRepresentation();
+
+  int count = 0;
+  count += this->ButtonActor->RenderOpaqueGeometry(w);
+  if (this->AnnotationVisibility)
+    {
+    count += this->Balloon->RenderOpaqueGeometry(w);
+    }
+  if (this->SelectedLocation >= 0)
+    {
+    count += this->MarkerActor->RenderOpaqueGeometry(w);
+    }
+
+  return count;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgSelectionListRepresentation::RenderTranslucentPolygonalGeometry(vtkViewport* w)
+{
+  // Nothing appears id no items defined
+  if (this->GetNumberOfItems() < 1)
+    {
+    return 0;
+    }
+
+  if (! this->ButtonActor->GetVisibility())
+    {
+    return 0;
+    }
+  this->BuildRepresentation();
+
+  int count = 0;
+  count += this->ButtonActor->RenderTranslucentPolygonalGeometry(w);
+  if (this->AnnotationVisibility)
+    {
+    count += this->Balloon->RenderTranslucentPolygonalGeometry(w);
+    }
+  if (this->SelectedLocation >= 0)
+    {
+    count += this->MarkerActor->RenderTranslucentPolygonalGeometry(w);
+    }
+
+  return count;
+}
+
+//-----------------------------------------------------------------------------
+// Description:
+// Does this prop have some translucent polygonal geometry?
+int vtkVgSelectionListRepresentation::HasTranslucentPolygonalGeometry()
+{
+  // Nothing appears id no items defined
+  if (this->GetNumberOfItems() < 1)
+    {
+    return 0;
+    }
+
+  if (! this->ButtonActor->GetVisibility())
+    {
+    return 0;
+    }
+  this->BuildRepresentation();
+
+  int hasIt = 0;
+  hasIt |= this->ButtonActor->HasTranslucentPolygonalGeometry();
+  if (this->AnnotationVisibility)
+    {
+    hasIt |= this->Balloon->HasTranslucentPolygonalGeometry();
+    }
+  if (this->SelectedLocation >= 0)
+    {
+    hasIt |= this->MarkerActor->HasTranslucentPolygonalGeometry();
+    }
+
+  return hasIt;
+}
+
+//-------------------------------------------------------------------------
+vtkIdType vtkVgSelectionListRepresentation::GetNumberOfItems()
+{
+  return static_cast<vtkIdType>(this->SelectionMap->size());
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::GetSize(double size[2])
+{
+  size[0] = 1.0;
+  size[1] = 1.0;
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::
+AddItem(vtkIdType itemID, double s, const char* str, vtkImageData* img)
+{
+  vtkVgSelectionMapIterator iter = this->SelectionMap->find(itemID);
+  if (iter == this->SelectionMap->end())
+    {
+    vtkVgSelectionSetRValue ret;
+
+    ret = this->SelectionSet->insert(vtkVgSelectionBalloon(itemID, s, str, img));
+    if (ret.second)   // successful insertion
+      {
+      (*this->SelectionMap)[itemID] = ret.first;
+      }
+    this->Modified();
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::
+UpdateItem(vtkIdType itemID, double s, const char* str, vtkImageData* img)
+{
+  vtkVgSelectionMapIterator iter = this->SelectionMap->find(itemID);
+  if (iter != this->SelectionMap->end())
+    {
+    this->SelectionMap->erase(itemID);
+    this->AddItem(itemID, s, str, img);
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::RemoveItem(vtkIdType itemID)
+{
+  vtkVgSelectionMapIterator iter = this->SelectionMap->find(itemID);
+  if (iter != this->SelectionMap->end())
+    {
+    if (itemID == this->CurrentItemId)
+      {
+      this->CurrentItemId = -1;
+      }
+    vtkVgSelectionSetIterator miter = (*iter).second;
+    this->SelectionSet->erase(miter);
+    this->SelectionMap->erase(iter);
+    this->Modified();
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::
+RemoveAllItems()
+{
+  this->SelectionMap->clear();
+  this->SelectionSet->clear();
+  this->CurrentItemId = -1;
+  this->Modified();
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::SetListPosition(double xyz[3])
+{
+  this->PositionCoordinate->SetValue(xyz);
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::SetListPosition(double x, double y, double z)
+{
+  this->PositionCoordinate->SetValue(x, y, z);
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::GetListPosition(double xyz[3])
+{
+  return this->PositionCoordinate->GetValue(xyz);
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::SetListSize(double xy[2])
+{
+  this->Position2Coordinate->SetValue(xy[0], xy[1]);
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::SetListSize(double x, double y)
+{
+  this->Position2Coordinate->SetValue(x, y);
+}
+
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::GetListSize(double xy[2])
+{
+  double p[3];
+  this->Position2Coordinate->GetValue(p);
+  xy[0] = p[0];
+  xy[1] = p[1];
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionListRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Orientation: ";
+  if (this->Orientation == HorizontalList)
+    {
+    os << "Horizontal\n";
+    }
+  else
+    {
+    os << "Vertical\n";
+    }
+
+  os << indent << "LookupTable: ";
+  if (this->LookupTable)
+    {
+    this->LookupTable->PrintSelf(os << endl, indent.GetNextIndent());
+    }
+  else
+    {
+    os << "(none)\n";
+    }
+
+  os << indent << "Balloon Offset: " << this->BalloonOffset << "\n";
+}
diff --git a/Libraries/VtkVgCore/vtkVgSelectionListRepresentation.h b/Libraries/VtkVgCore/vtkVgSelectionListRepresentation.h
new file mode 100644
index 00000000..fd84955c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSelectionListRepresentation.h
@@ -0,0 +1,205 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgSelectionListRepresentation - represent a vtkVgSelectionListWidget
+// .SECTION Description
+// This class is used to represent and render a specific type of
+// vtkVgSelectionWidget. In this particular implementation, the selection list
+// is a sorted list of rectangular buttons, colored according to a scalar
+// value. Associated with each button can be an item ID, and an optional descriptive text
+// string and/or thumbnail image.
+//
+// .SECTION Caveats
+// The separation of the widget event handling (e.g., vtkVgSelectionListWidget) from
+// the representation (vtkVgSelectionListRepresentation) enables users and developers
+// to create new appearances for the widget. It also facilitates parallel
+// processing, where the client application handles events, and remote
+// representations of the widget are slaves to the client (and do not handle
+// events).
+
+// .SECTION See Also
+// vtkVgSelectionListWidget vtkTextWidget
+
+
+#ifndef __vtkVgSelectionListRepresentation_h
+#define __vtkVgSelectionListRepresentation_h
+
+#include "vtkVgSelectionRepresentation.h"
+#include "vtkCoordinate.h" //Because of the viewport coordinate macro
+
+#include <vgExport.h>
+
+class vtkPoints;
+class vtkPlaneSource;
+class vtkPolyData;
+class vtkPolyDataMapper2D;
+class vtkActor2D;
+class vtkProperty2D;
+class vtkScalarsToColors;
+class vtkImageData;
+class vtkBalloonRepresentation;
+class vtkIdTypeArray;
+class vtkVgSelectionMap;
+class vtkVgSelectionSet;
+
+
+class VTKVG_CORE_EXPORT vtkVgSelectionListRepresentation
+  : public vtkVgSelectionRepresentation
+{
+public:
+  // Description:
+  // Instantiate this class.
+  static vtkVgSelectionListRepresentation* New();
+
+  // Description:
+  // Define standard methods.
+  vtkTypeMacro(vtkVgSelectionListRepresentation, vtkVgSelectionRepresentation);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Specify opposite corners of the box defining the boundary of the
+  // widget. The ListPosition (lower left corner) is specified in the world
+  // coordinate system, and ListSize an offset (in pixels) from the origin.
+  void SetListPosition(double x, double y, double z);
+  void SetListPosition(double xyz[3]);
+  void GetListPosition(double xyz[3]);
+  void SetListSize(double xy[2]);
+  void SetListSize(double x, double y);
+  void GetListSize(double xy[2]);
+
+//BTX
+  enum {HorizontalList = 0, VerticalList};
+//ETX
+  // Description:
+  // Control the orientation of the selection list.
+  vtkSetClampMacro(Orientation, int, HorizontalList, VerticalList);
+  vtkGetMacro(Orientation, int);
+  void SetOrientationToHorizontal()
+    {this->SetOrientation(HorizontalList);}
+  void SetOrientationToVertical()
+    {this->SetOrientation(VerticalList);}
+
+  // Description:
+  // Specify a lookup table which is used to map a scalar value through to
+  // generate an RGBA color.
+  virtual void SetLookupTable(vtkScalarsToColors*);
+  vtkGetObjectMacro(LookupTable, vtkScalarsToColors);
+
+  // Description:
+  // Add an item to the list; update the lists; and initialize the list. A
+  // variety of methods are provided. Note that the items are added using an
+  // itemId, but are sorted by scalar value. The scalar value is used to
+  // generate an item color using the lookup table.
+  void AddItem(vtkIdType itemID, double s, const char* str, vtkImageData* image);
+  void UpdateItem(vtkIdType itemID, double s, const char* str, vtkImageData* image);
+  void RemoveItem(vtkIdType itemID);
+  void RemoveAllItems();
+
+  // Description:
+  // Satisfy superclass' API. The current item ID is returned.
+  virtual vtkIdType GetNumberOfItems();
+  virtual vtkIdType GetCurrentItemId() {return this->CurrentItemId;}
+  virtual void SelectCurrentItem();
+  virtual void UnselectCurrentItem();
+  virtual vtkIdType GetSelectedItemId() {return this->SelectedItemId;}
+  virtual void SetSelectedItemId(vtkIdType itemID);
+
+  // Description:
+  // Keep track in the selection list of the location that it current,
+  // or that has been selected.
+  virtual vtkIdType GetCurrentLocation() {return this->CurrentLocation;}
+  virtual vtkIdType GetSelectedLocation() {return this->SelectedLocation;}
+  virtual void SetSelectedLocation(int loc);
+
+  // Description:
+  // Grab the actor that defines the marker. This can be used to change its
+  // color, etc.
+  vtkGetObjectMacro(MarkerActor, vtkActor2D);
+
+  // Description:
+  // Specify the balloon offset from the list.
+  vtkSetClampMacro(BalloonOffset, int, 0, 100);
+  vtkGetMacro(BalloonOffset, int);
+
+  // Description:
+  // Retrieve the internal balloon representation. Access to this instance
+  // enables the user to control image size and other properties of the
+  // balloon.
+  vtkGetObjectMacro(Balloon, vtkBalloonRepresentation);
+
+  // Description:
+  // Subclasses should implement these methods. See the superclasses'
+  // documentation for more information.
+  virtual void BuildRepresentation();
+  virtual void StartWidgetInteraction(double*) {};
+  virtual void WidgetInteraction(double*) {};
+  virtual int ComputeInteractionState(int X, int Y, int modify = 0);
+  virtual void GetSize(double size[2]); //canonical size
+
+  // Description:
+  // These methods are necessary to make this representation behave as
+  // a vtkProp.
+  virtual void GetActors2D(vtkPropCollection*);
+  virtual void ReleaseGraphicsResources(vtkWindow*);
+  virtual int RenderOverlay(vtkViewport*);
+  virtual int RenderOpaqueGeometry(vtkViewport*);
+  virtual int RenderTranslucentPolygonalGeometry(vtkViewport*);
+  virtual int HasTranslucentPolygonalGeometry();
+
+protected:
+  vtkVgSelectionListRepresentation();
+  ~vtkVgSelectionListRepresentation();
+
+  // Layout (position of lower left and upper right corners of border)
+  vtkCoordinate* PositionCoordinate;
+  vtkCoordinate* Position2Coordinate;
+
+  // For mapping to colors
+  vtkScalarsToColors* LookupTable;
+
+  // Keep track of start position when moving border
+  double StartPosition[2];
+  int    Orientation;
+
+  // Classes for managing balloons
+  vtkVgSelectionSet* SelectionSet; //PIMPL'd set
+  vtkVgSelectionMap* SelectionMap; //PIMPL'd map
+
+  // Represent the selection list. This is just a polydata with cells colored
+  // according to the supplied scalars.
+  vtkPlaneSource*      Buttons;
+  vtkPolyData*         ColoredButtons;
+  vtkIdTypeArray*      Ids;
+  vtkPolyDataMapper2D* ButtonMapper;
+  vtkActor2D*          ButtonActor;
+
+  // The thing that pops up
+  vtkBalloonRepresentation* Balloon;
+  int BalloonOffset;
+
+  // Mark the selected item
+  vtkPolyData*         Marker;
+  vtkPoints*           MarkerPoints;
+  vtkPolyDataMapper2D* MarkerMapper;
+  vtkActor2D*          MarkerActor;
+  void                 DrawSelectionMarker();
+
+
+  // Internal state
+  vtkIdType CurrentLocation;
+  vtkIdType SelectedLocation;
+  vtkIdType CurrentItemId;
+  vtkIdType SelectedItemId;
+
+  // Keep track of last build time
+  vtkTimeStamp BuildTime;
+
+private:
+  vtkVgSelectionListRepresentation(const vtkVgSelectionListRepresentation&);  //Not implemented
+  void operator=(const vtkVgSelectionListRepresentation&);  //Not implemented
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgSelectionRepresentation.cxx b/Libraries/VtkVgCore/vtkVgSelectionRepresentation.cxx
new file mode 100644
index 00000000..0cc9b90f
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSelectionRepresentation.cxx
@@ -0,0 +1,41 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgSelectionRepresentation.h"
+#include "vtkObjectFactory.h"
+
+
+//-------------------------------------------------------------------------
+vtkVgSelectionRepresentation::vtkVgSelectionRepresentation()
+{
+  this->InteractionState = vtkVgSelectionRepresentation::Outside;
+
+  this->SelectionPoint[0] = -1.0;
+  this->SelectionPoint[1] = -1.0;
+
+  this->AnnotationVisibility = 0;
+
+  this->MinimumSelectionMarkerSize = 10;
+}
+
+//-------------------------------------------------------------------------
+vtkVgSelectionRepresentation::~vtkVgSelectionRepresentation()
+{
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Number Of Items: " << this->GetNumberOfItems() << "\n";
+  os << indent << "Item Number: " << this->GetNumberOfItems() << "\n";
+
+  os << indent << "Selection Point: (" << this->SelectionPoint[0] << ","
+     << this->SelectionPoint[1] << "}\n";
+
+  os << indent << "Annotation Visibility: " << this->AnnotationVisibility << "\n";
+}
diff --git a/Libraries/VtkVgCore/vtkVgSelectionRepresentation.h b/Libraries/VtkVgCore/vtkVgSelectionRepresentation.h
new file mode 100644
index 00000000..830b1bfa
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSelectionRepresentation.h
@@ -0,0 +1,107 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgSelectionRepresentation - represent a vtkVgSelectionWidget
+// .SECTION Description
+// This class is used to represent and render a vtkVgSelectionWidget. It
+// defines an abstract API for selecting an item from a list of items.
+//
+// The class is must be subclassed so that specialized representations can be
+// created.  The class defines an API and a default implementation that the
+// vtkVgSelectionRepresentation interacts with to render itself in the scene.
+
+// .SECTION Caveats
+// The separation of the widget event handling (e.g., vtkVgSelectionWidget) from
+// the representation (vtkVgSelectionRepresentation) enables users and developers
+// to create new appearances for the widget. It also facilitates parallel
+// processing, where the client application handles events, and remote
+// representations of the widget are slaves to the client (and do not handle
+// events).
+
+// .SECTION See Also
+// vtkVgSelectionWidget
+
+
+#ifndef __vtkVgSelectionRepresentation_h
+#define __vtkVgSelectionRepresentation_h
+
+#include "vtkWidgetRepresentation.h"
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgSelectionRepresentation
+  : public vtkWidgetRepresentation
+{
+public:
+  // Description:
+  // Define standard methods.
+  vtkTypeMacro(vtkVgSelectionRepresentation, vtkWidgetRepresentation);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Retrieve the coordinate of selection after the representation is
+  // selected.
+  vtkGetVectorMacro(SelectionPoint, double, 2);
+
+  // Description:
+  // Methods to traverse the list of items.
+  virtual vtkIdType GetNumberOfItems() = 0;
+
+  // Description:
+  // Retrieve the item id if the interaction state is OnItem.  The meaning
+  // of the id value will vary depending on the subclasses' implementation.
+  virtual vtkIdType GetCurrentItemId() = 0;
+
+  // Description:
+  // Specify whether any supplemental annotation is on or off.
+  vtkSetMacro(AnnotationVisibility, int);
+  vtkGetMacro(AnnotationVisibility, int);
+  vtkBooleanMacro(AnnotationVisibility, int);
+
+  // Description:
+  // Mark the current item selected, or unselect. Retrieve the current
+  // selected item.
+  virtual void SelectCurrentItem() {}
+  virtual void UnselectCurrentItem() {}
+  virtual vtkIdType GetSelectedItemId() {return -1;}
+
+  // Description:
+  // Specify the minimum size for the selection marker (if any). Specified
+  // in pixels.
+  vtkSetClampMacro(MinimumSelectionMarkerSize, int, 1, 1000);
+  vtkGetMacro(MinimumSelectionMarkerSize, int);
+
+//BTX
+  // Description:
+  // Define the various states that the representation can be in.
+  enum _InteractionState
+    {
+    Outside = 0,
+    OnBorder,
+    OnItem
+    };
+//ETX
+
+protected:
+  vtkVgSelectionRepresentation();
+  ~vtkVgSelectionRepresentation();
+
+  // The point of last selection
+  double SelectionPoint[2];
+
+  // Annotation visibility
+  int AnnotationVisibility;
+
+  // Marker size
+  int MinimumSelectionMarkerSize;
+
+private:
+  vtkVgSelectionRepresentation(const vtkVgSelectionRepresentation&);  //Not implemented
+  void operator=(const vtkVgSelectionRepresentation&);  //Not implemented
+
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgSelectionWidget.cxx b/Libraries/VtkVgCore/vtkVgSelectionWidget.cxx
new file mode 100644
index 00000000..5f2ae7e9
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSelectionWidget.cxx
@@ -0,0 +1,231 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgSelectionWidget.h"
+
+#include "vtkVgSelectionRepresentation.h"
+#include "vtkVgSelectionListRepresentation.h"
+#include "vtkCommand.h"
+#include "vtkCallbackCommand.h"
+#include "vtkObjectFactory.h"
+#include "vtkRenderer.h"
+#include "vtkRendererCollection.h"
+#include "vtkRenderWindow.h"
+#include "vtkRenderWindowInteractor.h"
+#include "vtkWidgetEventTranslator.h"
+#include "vtkWidgetCallbackMapper.h"
+#include "vtkEvent.h"
+#include "vtkWidgetEvent.h"
+
+
+vtkStandardNewMacro(vtkVgSelectionWidget);
+
+
+//-------------------------------------------------------------------------
+vtkVgSelectionWidget::vtkVgSelectionWidget()
+{
+  this->WidgetState = Start;
+  this->TimerDuration = 250;
+
+  // Okay, define the events for this widget. Note that we look for extra events
+  // (like button press) because without it the hover widget thinks nothing has changed
+  // and doesn't begin retiming.
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::LeftButtonPressEvent,
+                                          vtkWidgetEvent::Select,
+                                          this, vtkVgSelectionWidget::SelectAction);
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::MiddleButtonPressEvent,
+                                          vtkWidgetEvent::Move,
+                                          this, vtkVgSelectionWidget::MoveAction);
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::RightButtonPressEvent,
+                                          vtkWidgetEvent::Move,
+                                          this, vtkVgSelectionWidget::MoveAction);
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::MouseWheelForwardEvent,
+                                          vtkWidgetEvent::Move,
+                                          this, vtkVgSelectionWidget::MoveAction);
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::MouseWheelBackwardEvent,
+                                          vtkWidgetEvent::Move,
+                                          this, vtkVgSelectionWidget::MoveAction);
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::MouseMoveEvent,
+                                          vtkWidgetEvent::Move,
+                                          this, vtkVgSelectionWidget::MoveAction);
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::TimerEvent,
+                                          vtkWidgetEvent::TimedOut,
+                                          this, vtkVgSelectionWidget::HoverAction);
+  this->CallbackMapper->SetCallbackMethod(vtkCommand::KeyPressEvent,
+                                          vtkEvent::AnyModifier, 13, 1, "Return",
+                                          vtkWidgetEvent::Select,
+                                          this, vtkVgSelectionWidget::SelectAction);
+}
+
+//-------------------------------------------------------------------------
+vtkVgSelectionWidget::~vtkVgSelectionWidget()
+{
+}
+
+
+//----------------------------------------------------------------------
+void vtkVgSelectionWidget::SetEnabled(int enabling)
+{
+  if (enabling)   //----------------
+    {
+    vtkDebugMacro(<< "Enabling widget");
+
+    if (this->Enabled)   //already enabled, just return
+      {
+      return;
+      }
+
+    if (! this->Interactor)
+      {
+      vtkErrorMacro(<< "The interactor must be set prior to enabling the widget");
+      return;
+      }
+
+    this->SetCurrentRenderer(this->Interactor->GetRenderWindow()->
+                             GetRenderers()->GetFirstRenderer());
+    if (!this->CurrentRenderer)
+      {
+      return;
+      }
+
+    // We're ready to enable
+    this->Enabled = 1;
+
+    // listen for the events found in the EventTranslator
+    this->EventTranslator->AddEventsToInteractor(this->Interactor,
+                                                 this->EventCallbackCommand, this->Priority);
+
+    // Start off the timer
+    this->TimerId = this->Interactor->CreateRepeatingTimer(this->TimerDuration);
+    this->WidgetState = vtkVgSelectionWidget::Timing;
+
+    // Create representation
+    this->CreateDefaultRepresentation();
+    this->WidgetRep->SetRenderer(this->CurrentRenderer);
+    this->WidgetRep->BuildRepresentation();
+    this->CurrentRenderer->AddViewProp(this->WidgetRep);
+
+    this->InvokeEvent(vtkCommand::EnableEvent, NULL);
+    }
+
+  else //disabling------------------
+    {
+    vtkDebugMacro(<< "Disabling widget");
+
+    if (! this->Enabled)   //already disabled, just return
+      {
+      return;
+      }
+
+    this->CurrentRenderer->RemoveViewProp(this->WidgetRep);
+    this->SetCurrentRenderer(NULL);
+
+    this->Enabled = 0;
+    this->Interactor->RemoveObserver(this->EventCallbackCommand);
+    this->InvokeEvent(vtkCommand::DisableEvent, NULL);
+    }
+
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionWidget::SetCursor(int cState)
+{
+  switch (cState)
+    {
+  case 0: default:
+      this->RequestCursorShape(VTK_CURSOR_DEFAULT);
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionWidget::MoveAction(vtkAbstractWidget* w)
+{
+  vtkVgSelectionWidget* self = reinterpret_cast<vtkVgSelectionWidget*>(w);
+
+  if (self->WidgetState == vtkVgSelectionWidget::Timing)
+    {
+    self->Interactor->DestroyTimer(self->TimerId);
+    }
+  else //we have already timed out, on this move we begin retiming
+    {
+    self->WidgetState = vtkVgSelectionWidget::Timing;
+
+    vtkVgSelectionRepresentation* rep = self->GetSelectionRepresentation();
+    rep->AnnotationVisibilityOff();
+    self->Render();
+    }
+  self->TimerId = self->Interactor->CreateRepeatingTimer(self->TimerDuration);
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionWidget::HoverAction(vtkAbstractWidget* w)
+{
+  vtkVgSelectionWidget* self = reinterpret_cast<vtkVgSelectionWidget*>(w);
+  int timerId = *(reinterpret_cast<int*>(self->CallData));
+
+  // If this is the timer event we are waiting for...
+  if (timerId == self->TimerId && self->WidgetState == vtkVgSelectionWidget::Timing)
+    {
+    self->Interactor->DestroyTimer(self->TimerId);
+    self->WidgetState = vtkVgSelectionWidget::TimedOut;
+
+    int X = self->Interactor->GetEventPosition()[0];
+    int Y = self->Interactor->GetEventPosition()[1];
+
+    vtkVgSelectionRepresentation* rep = self->GetSelectionRepresentation();
+    int state = rep->ComputeInteractionState(X, Y);
+    if (state == vtkVgSelectionRepresentation::OnItem)
+      {
+      rep->AnnotationVisibilityOn();
+      }
+    else
+      {
+      rep->AnnotationVisibilityOff();
+      }
+
+    self->InvokeEvent(vtkCommand::TimerEvent, NULL);
+    self->EventCallbackCommand->SetAbortFlag(1); //no one else gets this timer
+    self->Render();
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionWidget::SelectAction(vtkAbstractWidget* w)
+{
+  vtkVgSelectionWidget* self = reinterpret_cast<vtkVgSelectionWidget*>(w);
+
+  // If widget is hovering we grab the selection event
+  int X = self->Interactor->GetEventPosition()[0];
+  int Y = self->Interactor->GetEventPosition()[1];
+
+  vtkVgSelectionRepresentation* rep = self->GetSelectionRepresentation();
+  int state = rep->ComputeInteractionState(X, Y);
+  if (state == vtkVgSelectionRepresentation::OnItem)
+    {
+    rep->AnnotationVisibilityOn();
+    rep->SelectCurrentItem();
+    self->InvokeEvent(vtkCommand::WidgetActivateEvent, NULL);
+    self->EventCallbackCommand->SetAbortFlag(1); //no one else gets this event
+    self->Render();
+    }
+}
+
+//-------------------------------------------------------------------------
+void vtkVgSelectionWidget::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Timer Duration: " << this->TimerDuration << "\n";
+}
+
+//----------------------------------------------------------------------
+void vtkVgSelectionWidget::CreateDefaultRepresentation()
+{
+  if (! this->WidgetRep)
+    {
+    this->WidgetRep = vtkVgSelectionListRepresentation::New();
+    }
+}
diff --git a/Libraries/VtkVgCore/vtkVgSelectionWidget.h b/Libraries/VtkVgCore/vtkVgSelectionWidget.h
new file mode 100644
index 00000000..2ae6ca91
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSelectionWidget.h
@@ -0,0 +1,135 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgSelectionWidget - general widget to select items from a list
+// .SECTION Description
+// This class is used to select items from a list, where the list may be
+// structured (e.q., a linear list or rectangular matrix) or unstructured
+// (e.g., an arbitray scene). Generally the widget is paired with an
+// appropriate representation (i.e., subclass of vtkVgSelectionRepresentation).
+// The representation defines the visual appearance of the widget and coordinates
+// with the widget to manage the selection process.
+//
+// .SECTION Event Bindings
+// By default, the widget responds to the following VTK events (i.e., it
+// watches the vtkRenderWindowInteractor for these events):
+// <pre>
+// On the interior of the widget:
+//   LeftButtonPressEvent - select an item in the list that the mouse pointer is over.
+//   KeyPress <Enter> - select the item in the list that the mouse pointer is over
+// On the boundary of the widget:
+//   LeftButtonPressEvent - select boundary, can be used to move/resize the widget
+//                          (depending on the representation).
+//   LeftButtonReleaseEvent - deselect boundary
+//   MouseMoveEvent - move/resize widget depending on which portion of the
+//                    boundary was selected.
+// Anywhere on the widget:
+//   MiddleButtonPressEvent - move the widget
+// </pre>
+//
+// Note that the event bindings described above can be changed using this
+// class's vtkWidgetEventTranslator. This class translates VTK events
+// into the vtkVgSelectionWidget's widget events:
+// <pre>
+//   vtkWidgetEvent::Select -- the boundary or interior of the widget has been selected
+//   vtkWidgetEvent::EndSelect -- the selection process has completed
+//   vtkWidgetEvent::Translate -- the widget is to be translated
+//   vtkWidgetEvent::TimedOut -- the widget timer has expired
+// </pre>
+//
+// In turn, when these widget events are processed, this widget invokes the
+// following VTK events on itself (which observers can listen for):
+// <pre>
+//   vtkCommand::WidgetActivationEvent (on vtkWidgetEvent::Select when selecting interior)
+//   vtkCommand::StartInteractionEvent (on vtkWidgetEvent::Select when selecting
+//      the boundary)
+//   vtkCommand::EndInteractionEvent (on vtkWidgetEvent::EndSelect)
+//   vtkCommand::InteractionEvent (on vtkWidgetEvent::Move)
+// </pre>
+
+// .SECTION See Also
+// vtkInteractorObserver vtkVgSelectionRepresentation
+
+
+#ifndef __vtkVgSelectionWidget_h
+#define __vtkVgSelectionWidget_h
+
+#include "vtkAbstractWidget.h"
+
+#include <vgExport.h>
+
+class vtkVgSelectionRepresentation;
+
+
+class VTKVG_CORE_EXPORT vtkVgSelectionWidget : public vtkAbstractWidget
+{
+public:
+  // Description:
+  // Method to instantiate class.
+  static vtkVgSelectionWidget* New();
+
+  // Description;
+  // Standard methods for class.
+  vtkTypeMacro(vtkVgSelectionWidget, vtkAbstractWidget);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // The method for activiating and deactiviating this widget. This method
+  // must be overridden because it performs special timer-related operations.
+  virtual void SetEnabled(int);
+
+  // Description:
+  // Specify an instance of vtkWidgetRepresentation used to represent this
+  // widget in the scene. Note that the representation is a subclass of vtkProp
+  // so it can be added to the renderer independent of the widget.
+  void SetRepresentation(vtkVgSelectionRepresentation* r)
+    {this->Superclass::SetWidgetRepresentation(reinterpret_cast<vtkWidgetRepresentation*>(r));}
+
+  // Description:
+  // Return the representation as a vtkBorderRepresentation.
+  vtkVgSelectionRepresentation* GetSelectionRepresentation()
+    {return reinterpret_cast<vtkVgSelectionRepresentation*>(this->WidgetRep);}
+
+  // Description:
+  // Specify the hovering interval (in milliseconds). If after moving the
+  // mouse the pointer stays over a vtkProp for this duration, then a
+  // vtkTimerEvent::TimerEvent is invoked.
+  vtkSetClampMacro(TimerDuration, int, 1, 100000);
+  vtkGetMacro(TimerDuration, int);
+
+  // Description:
+  // Create the default widget representation if one is not set.
+  virtual void CreateDefaultRepresentation();
+
+protected:
+  vtkVgSelectionWidget();
+  ~vtkVgSelectionWidget();
+
+  // The state of the widget
+//BTX
+  enum {Start = 0, Timing, TimedOut};
+//ETX
+  int WidgetState;
+
+  // Callback interface to execute events
+  static void MoveAction(vtkAbstractWidget*);
+  static void HoverAction(vtkAbstractWidget*);
+  static void SelectAction(vtkAbstractWidget*);
+
+  // Description:
+  // Helper methods for creating and destroying timers.
+  int TimerId;
+  int TimerDuration;
+
+  // helper methods for cursoe management
+  virtual void SetCursor(int State);
+
+private:
+  vtkVgSelectionWidget(const vtkVgSelectionWidget&);  //Not implemented
+  void operator=(const vtkVgSelectionWidget&);  //Not implemented
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgSetGet.h b/Libraries/VtkVgCore/vtkVgSetGet.h
new file mode 100644
index 00000000..4259940c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSetGet.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgSetGet_h
+#define __vtkVgSetGet_h
+
+#include <vtkSetGet.h>
+
+#define vtkVgSetVector2Macro(name,type) \
+  vtkSetVector2Macro(name,type) \
+  void Set##name (const type _arg[2]) \
+  { this->Set##name (_arg[0], _arg[1]); }
+
+#define vtkVgSetVector3Macro(name,type) \
+  vtkSetVector3Macro(name,type) \
+  void Set##name (const type _arg[3]) \
+  { this->Set##name (_arg[0], _arg[1], _arg[2]); }
+
+#define vtkVgSetVector4Macro(name,type) \
+  vtkSetVector4Macro(name,type) \
+  void Set##name (const type _arg[4]) \
+  { this->Set##name (_arg[0], _arg[1], _arg[2], _arg[3]); }
+
+#define vtkVgSetVector6Macro(name,type) \
+  vtkSetVector6Macro(name,type) \
+  void Set##name (const type _arg[6]) \
+  { this->Set##name (_arg[0], _arg[1], _arg[2], _arg[3], _arg[4], _arg[5]); }
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgSharedInstance.h b/Libraries/VtkVgCore/vtkVgSharedInstance.h
new file mode 100644
index 00000000..7eee0aa7
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSharedInstance.h
@@ -0,0 +1,311 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgSharedInstance_h
+#define __vtkVgSharedInstance_h
+
+#include "vtkVgAtomic.h"
+
+// Description:
+// This class provides an instantiable, copyable and assignable wrapper around
+// vtkObject. The underlying object is shared to reduce the overhead of making
+// copies. Certain types of access will automatically make a deep copy of the
+// underlying vtkObject as needed so that each instance appears to have its
+// own copy. The sharing is thread safe.
+//
+// Note:
+// The vtkObject subclass must have a DeepCopy method to be shareable. If an
+// instantiable wrapper around vtkObject is desired, but the vtkObject subclass
+// does not implement DeepCopy, consider using vtkVgInstance instead.
+template <typename T>
+class vtkVgSharedInstance
+{
+public:
+  // Description:
+  // Default constructor. Uses the default constructor of the underlying
+  // vtkObject.
+  vtkVgSharedInstance();
+
+  // Description:
+  // Create an instance from an existing vtkObject and takes ownership of the
+  // vtkObject. Once the instance is constructed, the original pointer should
+  // be considered invalid.
+  explicit vtkVgSharedInstance(T*);
+
+  // Description:
+  // Copy constructor. If possible, the underlying vtkObject is reused.
+  // Otherwise, takes a DeepCopy of the underlying vtkObject.
+  vtkVgSharedInstance(const vtkVgSharedInstance<T>&);
+
+  // Description:
+  // Destructor. If no other instances reference the underlying object, it is
+  // released.
+  ~vtkVgSharedInstance();
+
+  // Description:
+  // Assignment operator. If possible, the underlying vtkObject is reused.
+  // Otherwise, takes a DeepCopy of the underlying vtkObject.
+  vtkVgSharedInstance<T>& operator=(const vtkVgSharedInstance<T>&);
+
+  // Description:
+  // Dereference operator. Allows access to the underlying vtkObject. If the
+  // underlying vtkObject is shared, a copy is made first so that changes made
+  // to this instance do not affect any other instances. If any operations
+  // retain a reference to the underlying vtkObject or any of its internal
+  // state, you must call GetPointer before making any copies of the instance
+  // to ensure that the reference is not invalidated.
+  T* operator->();
+
+  // Description:
+  // Dereference operator. Allows access to the underlying vtkObject. If any
+  // operations retain a reference to the underlying vtkObject or any of its
+  // internal state, you must call GetPointer before making any copies of the
+  // instance to ensure that the reference is not invalidated.
+  //
+  // Note:
+  // The compiler will only call the const flavor of operator-> if the object
+  // being accessed has const decoration. Merely accessing the object in a way
+  // that does not require that the object to be mutable will still call the
+  // non-const operator->, which may result in a copy being made of the
+  // underlying vtkObject.
+  const T* operator->() const;
+
+  // Description:
+  // Get the pointer to the underlying vtkObject. If the underlying vtkObject
+  // is shared, a copy is made first so that changes made to this instance do
+  // not affect any other instances. The internal pointer is then poisoned so
+  // that copies of the instance will not share the underlying object. This is
+  // necessary to ensure that subsequent calls to GetPointer on the same
+  // instance will return the same underlying vtkObject.
+  T* GetPointer();
+
+  // Description:
+  // Get a volatile pointer to the underlying vtkObject. If the underlying
+  // vtkObject is shared, a copy is made first so that changes made to this
+  // instance do not affect any other instances. The returned pointer is valid
+  // when the method is called, but may become invalid by future access to
+  // the instance, including making copies of or destroying the instance. By
+  // using this method, you warrant that no references to the underlying
+  // vtkObject or its internal state will be retained.
+  T* GetVolatilePointer();
+
+  // Description:
+  // Get a volatile pointer to the underlying vtkObject. The returned pointer
+  // may be shared with other instances, including instances in other threads.
+  // The returned pointer is valid when the method is called, but may become
+  // invalid by future access to the instance, including making copies of or
+  // destroying the instance. By using this method, you warrant that no
+  // references to the underlying vtkObject or its internal state will be
+  // retained.
+  const T* GetVolatileConstPointer() const;
+
+  // Description:
+  // Un-poison the internal pointer, allowing copies made of this instance to
+  // share the underlying object. By calling this method, you warrant that no
+  // references to the underlying vtkObject exist. After calling this method,
+  // the underlying vtkObject may be modified or deleted by other instances.
+  void ReleasePointer();
+
+  // Description:
+  // Assigns a different vtkObject to the instance. This is equivalent to
+  // assigning a new instance constructed with the vtkObject pointer to this
+  // instance. The instance takes ownership of the vtkObject. After calling
+  // this method, the original pointer should be considered invalid.
+  void Reset(T*);
+
+private:
+  void Copy(const vtkVgSharedInstance<T>&);
+  void Detach(bool poison = false);
+  void ResetInternal(T*);
+  void Release();
+
+  T* Object;
+  vtkVgSignedAtomic* RefCount;
+};
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgSharedInstance<T>::vtkVgSharedInstance()
+  : Object(0), RefCount(0)
+{
+  this->ResetInternal(T::New());
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgSharedInstance<T>::vtkVgSharedInstance(T* object)
+  : Object(0), RefCount(0)
+{
+  this->ResetInternal(object);
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgSharedInstance<T>::vtkVgSharedInstance(
+  const vtkVgSharedInstance<T>& other
+)
+  : Object(0), RefCount(0)
+{
+  this->Copy(other);
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgSharedInstance<T>::~vtkVgSharedInstance()
+{
+  this->Release();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+vtkVgSharedInstance<T>& vtkVgSharedInstance<T>::operator=(
+  const vtkVgSharedInstance<T>& other
+)
+{
+  this->Release();
+  this->Copy(other);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+T* vtkVgSharedInstance<T>::operator->()
+{
+  this->Detach();
+  return this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+const T* vtkVgSharedInstance<T>::operator->() const
+{
+  return this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+T* vtkVgSharedInstance<T>::GetPointer()
+{
+  this->Detach(true);
+  return this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+T* vtkVgSharedInstance<T>::GetVolatilePointer()
+{
+  this->Detach();
+  return this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+const T* vtkVgSharedInstance<T>::GetVolatileConstPointer() const
+{
+  return this->Object;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgSharedInstance<T>::ReleasePointer()
+{
+  if ((*this->RefCount) < 0)
+    {
+    (*this->RefCount) = 1;
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgSharedInstance<T>::Reset(T* object)
+{
+  this->Release();
+  this->ResetInternal(object);
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgSharedInstance<T>::Copy(const vtkVgSharedInstance<T>& other)
+{
+  if (other.Object)
+    {
+    // Reuse instance if not poisoned
+    if ((*other.RefCount) > 0)
+      {
+      // Not poisoned; increment reference count and share
+      this->RefCount = other.RefCount;
+      this->Object = other.Object;
+      ++(*this->RefCount);
+      }
+    else
+      {
+      // Poisoned; make a deep copy
+      T* newObject = T::New();
+      newObject->DeepCopy(other.Object);
+      this->ResetInternal(newObject);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgSharedInstance<T>::Detach(bool poison)
+{
+  if (this->Object)
+    {
+    // Ensure unique reference
+    if ((*this->RefCount) > 1)
+      {
+      // If other references are held, replace our object with new deep copy
+      T* newObject = T::New();
+      newObject->DeepCopy(this->Object);
+      --(*this->RefCount);
+      this->ResetInternal(newObject);
+      }
+
+    // Mark poisoned if requested
+    if (poison)
+      {
+      (*this->RefCount) = -1;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgSharedInstance<T>::ResetInternal(T* object)
+{
+  if (object)
+    {
+    this->Object = object;
+    this->RefCount = new vtkVgSignedAtomic(1);
+    }
+  else
+    {
+    this->Object = 0;
+    this->RefCount = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgSharedInstance<T>::Release()
+{
+  if (this->Object)
+    {
+    // Release reference and check result
+    if (--(*this->RefCount) <= 0)
+      {
+      // No other references; release reference counter and internal object
+      delete this->RefCount;
+      this->Object->Delete();
+      this->RefCount = 0;
+      this->Object = 0;
+      }
+    }
+}
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgSpaceConversion.cxx b/Libraries/VtkVgCore/vtkVgSpaceConversion.cxx
new file mode 100644
index 00000000..619e8f8b
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSpaceConversion.cxx
@@ -0,0 +1,120 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgSpaceConversion.h"
+
+// VTK includes
+#include <vtkRenderer.h>
+
+namespace
+{
+
+typedef void (*ConvertFunc)(vtkRenderer*, double*, double*);
+
+//-----------------------------------------------------------------------------
+void ConvertNormalized(vtkRenderer* renderer, double in[3], double out[3], ConvertFunc func)
+{
+  if (!renderer || !in || !out)
+    {
+    return;
+    }
+  double tmp[4];
+  (*func)(renderer, in, tmp);
+  if (fabs(tmp[3]) > 1e-10)
+    {
+    out[0] = tmp[0] / tmp[3];
+    out[1] = tmp[1] / tmp[3];
+    out[2] = tmp[2] / tmp[3];
+    }
+}
+
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSpaceConversion::WorldToView(vtkRenderer* renderer, double in[4], double out[3])
+{
+  if (!renderer || !in || !out)
+    {
+    return;
+    }
+
+  renderer->SetWorldPoint(in);
+  renderer->WorldToView();
+  renderer->GetViewPoint(out);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSpaceConversion::WorldToDisplay(vtkRenderer* renderer, double in[4], double out[3])
+{
+  if (!renderer || !in || !out)
+    {
+    return;
+    }
+
+  renderer->SetWorldPoint(in);
+  renderer->WorldToDisplay();
+  renderer->GetDisplayPoint(out);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSpaceConversion::ViewToDisplay(vtkRenderer* renderer, double in[3], double out[3])
+{
+  if (!renderer || !in || !out)
+    {
+    return;
+    }
+
+  renderer->SetViewPoint(in);
+  renderer->ViewToDisplay();
+  renderer->GetDisplayPoint(out);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSpaceConversion::ViewToWorld(vtkRenderer* renderer, double in[3], double out[4])
+{
+  if (!renderer || !in || !out)
+    {
+    return;
+    }
+
+  renderer->SetViewPoint(in);
+  renderer->ViewToWorld();
+  renderer->GetWorldPoint(out);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSpaceConversion::DisplayToWorld(vtkRenderer* renderer, double in[3], double out[4])
+{
+  if (!renderer || !in || !out)
+    {
+    return;
+    }
+
+  renderer->SetDisplayPoint(in);
+  renderer->DisplayToWorld();
+  renderer->GetWorldPoint(out);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSpaceConversion::DisplayToView(vtkRenderer* renderer, double in[3], double out[3])
+{
+  if (!renderer || !in || !out)
+    {
+    return;
+    }
+
+  renderer->SetDisplayPoint(in);
+  renderer->DisplayToView();
+  renderer->GetViewPoint(out);
+}
+
+//-----------------------------------------------------------------------------
+#define NORMALIZED_FLAVOR(_name_) \
+  void vtkVgSpaceConversion::_name_##Normalized( \
+    vtkRenderer *renderer, double in[3], double out[3]) \
+  { ConvertNormalized(renderer, in, out, &vtkVgSpaceConversion::_name_); }
+NORMALIZED_FLAVOR(ViewToWorld)
+NORMALIZED_FLAVOR(DisplayToWorld)
diff --git a/Libraries/VtkVgCore/vtkVgSpaceConversion.h b/Libraries/VtkVgCore/vtkVgSpaceConversion.h
new file mode 100644
index 00000000..7f660545
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgSpaceConversion.h
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgSpaceConversion_h
+#define __vtkVgSpaceConversion_h
+
+#include <vgExport.h>
+
+// Forward declarations
+class vtkRenderer;
+
+class VTKVG_CORE_EXPORT vtkVgSpaceConversion
+{
+public:
+  static void WorldToView(vtkRenderer* renderer, double in[4], double out[3]);
+  static void WorldToDisplay(vtkRenderer* renderer, double in[4], double out[3]);
+  static void ViewToDisplay(vtkRenderer* renderer, double in[3], double out[3]);
+  static void ViewToWorld(vtkRenderer* renderer, double in[3], double out[4]);
+  static void DisplayToView(vtkRenderer* renderer, double in[3], double out[3]);
+  static void DisplayToWorld(vtkRenderer* renderer, double in[3], double out[4]);
+
+  static void ViewToWorldNormalized(vtkRenderer* renderer, double in[3], double out[3]);
+  static void DisplayToWorldNormalized(vtkRenderer* renderer, double in[3], double out[3]);
+};
+
+
+#endif // __vtkVgSpaceConversion_h
diff --git a/Libraries/VtkVgCore/vtkVgTemporalFilters.cxx b/Libraries/VtkVgCore/vtkVgTemporalFilters.cxx
new file mode 100644
index 00000000..9fa63c95
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTemporalFilters.cxx
@@ -0,0 +1,230 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTemporalFilters.h"
+
+#include "vtkVgTimeStamp.h"
+
+#include <vtkObjectFactory.h>
+
+#include <vector>
+
+vtkStandardNewMacro(vtkVgTemporalFilters);
+
+namespace
+{
+
+//----------------------------------------------------------------------------
+struct vtkVgInterval
+{
+  vtkVgTimeStamp Start, End;
+
+  vtkVgInterval(const vtkVgTimeStamp& start, const vtkVgTimeStamp& end)
+    : Start(start), End(end)
+    {}
+
+  bool Intersects(const vtkVgInterval& other) const
+    {
+    if (this->Start > other.End)
+      {
+      return false;
+      }
+
+    if (this->End < other.Start)
+      {
+      return false;
+      }
+
+    return true;
+    }
+
+  bool Contains(const vtkVgInterval& other) const
+    {
+    if (other.End > this->End)
+      {
+      return false;
+      }
+
+    if (other.Start < this->Start)
+      {
+      return false;
+      }
+
+    return true;
+    }
+};
+
+//----------------------------------------------------------------------------
+struct vtkVgTemporalFilter
+{
+  int Id;
+  vtkVgTemporalFilters::FilterType Type;
+  vtkVgInterval Interval;
+  bool Enabled;
+
+  vtkVgTemporalFilter(int id, vtkVgTemporalFilters::FilterType type,
+                      const vtkVgTimeStamp& start,
+                      const vtkVgTimeStamp& end)
+    : Id(id), Type(type), Interval(start, end), Enabled(true)
+    {}
+};
+
+} // end anonymous namespace
+
+//----------------------------------------------------------------------------
+class vtkVgTemporalFilters::vtkInternal
+{
+public:
+  int CurrId;
+  std::vector<vtkVgTemporalFilter> Filters;
+
+public:
+  vtkInternal()
+    : CurrId(0)
+    {}
+
+  int AddFilter(FilterType type,
+                const vtkVgTimeStamp& start,
+                const vtkVgTimeStamp& end)
+    {
+    this->Filters.push_back(
+      vtkVgTemporalFilter(this->CurrId, type, start, end));
+
+    return this->CurrId++;
+    }
+};
+
+//----------------------------------------------------------------------------
+vtkVgTemporalFilters::vtkVgTemporalFilters()
+  : Internal(new vtkInternal)
+{
+}
+
+//----------------------------------------------------------------------------
+vtkVgTemporalFilters::~vtkVgTemporalFilters()
+{
+  delete this->Internal;
+}
+
+//----------------------------------------------------------------------------
+int vtkVgTemporalFilters::AddFilter(FilterType type,
+                                    const vtkVgTimeStamp& start,
+                                    const vtkVgTimeStamp& end)
+{
+  int id = this->Internal->AddFilter(type, start, end);
+  this->Modified();
+  return id;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgTemporalFilters::SetFilter(int id, FilterType type,
+                                     const vtkVgTimeStamp& start,
+                                     const vtkVgTimeStamp& end,
+                                     bool enabled)
+{
+  size_t filterIndex = this->GetFilterIndex(id);
+  if (filterIndex == -1)
+    {
+    vtkWarningMacro("Temporal filter not found!");
+    return;
+    }
+  vtkVgTemporalFilter& filter = this->Internal->Filters[filterIndex];
+  filter.Type = type;
+  filter.Enabled = enabled;
+  filter.Interval.Start = start;
+  filter.Interval.End = end;
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgTemporalFilters::GetFilterInfo(int id, FilterType& type,
+                                         vtkVgTimeStamp& start,
+                                         vtkVgTimeStamp& end,
+                                         bool& enabled)
+{
+  size_t filterIndex = this->GetFilterIndex(id);
+  if (filterIndex == -1)
+    {
+    vtkWarningMacro("Temporal filter not found!");
+    return false;
+    }
+  vtkVgTemporalFilter& filter = this->Internal->Filters[filterIndex];
+  type = filter.Type;
+  enabled = filter.Enabled;
+  start = filter.Interval.Start;
+  end = filter.Interval.End;
+  return true;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgTemporalFilters::RemoveFilter(int id)
+{
+  this->Internal->Filters.erase(this->Internal->Filters.begin() +
+                                this->GetFilterIndex(id));
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgTemporalFilters::RemoveAllFilters()
+{
+  this->Internal->Filters.clear();
+  this->Modified();
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgTemporalFilters::EvaluateInterval(const vtkVgTimeStamp& start,
+                                            const vtkVgTimeStamp& end)
+{
+  for (size_t i = 0, e = this->Internal->Filters.size(); i < e; ++i)
+    {
+    const vtkVgTemporalFilter& filter = this->Internal->Filters[i];
+    if (!filter.Enabled)
+      {
+      continue;
+      }
+    if (filter.Type == FT_Select)
+      {
+      if (!filter.Interval.Intersects(vtkVgInterval(start, end)))
+        {
+        return false;
+        }
+      }
+    else // FT_Exclude
+      {
+      if (filter.Interval.Contains(vtkVgInterval(start, end)))
+        {
+        return false;
+        }
+      }
+    }
+
+  return true;
+}
+
+//----------------------------------------------------------------------------
+const char* vtkVgTemporalFilters::StringForType(
+  vtkVgTemporalFilters::FilterType type)
+{
+  switch (type)
+    {
+    case vtkVgTemporalFilters::FT_Select:   return "Select";
+    case vtkVgTemporalFilters::FT_Exclude:  return "Exclude";
+    }
+  return "";
+}
+
+//----------------------------------------------------------------------------
+size_t vtkVgTemporalFilters::GetFilterIndex(int id)
+{
+  for (size_t i = 0, end = this->Internal->Filters.size(); i < end; ++i)
+    {
+    if (this->Internal->Filters[i].Id == id)
+      {
+      return i;
+      }
+    }
+  return -1;
+}
diff --git a/Libraries/VtkVgCore/vtkVgTemporalFilters.h b/Libraries/VtkVgCore/vtkVgTemporalFilters.h
new file mode 100644
index 00000000..691768e4
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTemporalFilters.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTemporalFilters_h
+#define __vtkVgTemporalFilters_h
+
+#include "vtkObject.h"
+
+#include <vgExport.h>
+
+class vtkVgTimeStamp;
+
+class VTKVG_CORE_EXPORT vtkVgTemporalFilters : public vtkObject
+{
+public:
+  enum FilterType
+    {
+    FT_Select,
+    FT_Exclude
+    };
+
+public:
+  static vtkVgTemporalFilters* New();
+
+  vtkTypeMacro(vtkVgTemporalFilters, vtkObject);
+
+  // Description:
+  // Add a new filter that is enabled by default. Returns the added filter id.
+  int  AddFilter(FilterType type,
+                 const vtkVgTimeStamp& start, const vtkVgTimeStamp& end);
+
+  // Description:
+  // Assign properties to an existing filter.
+  void SetFilter(int id, FilterType type,
+                 const vtkVgTimeStamp& start, const vtkVgTimeStamp& end,
+                 bool enabled);
+
+  // Description:
+  // Return ture if filter with id exists; if so, return properties of the
+  // filter via the other fn parameters.
+  bool GetFilterInfo(int id, FilterType& type,
+                     vtkVgTimeStamp& start, vtkVgTimeStamp& end,
+                     bool& enabled);
+
+  void RemoveFilter(int id);
+  void RemoveAllFilters();
+
+  // Description:
+  // Return true if any part of the interval is not excluded by the current
+  // set of filters.
+  bool EvaluateInterval(const vtkVgTimeStamp& start, const vtkVgTimeStamp& end);
+
+  static const char* StringForType(FilterType type);
+
+private:
+  vtkVgTemporalFilters();
+  ~vtkVgTemporalFilters();
+
+  size_t GetFilterIndex(int id);
+
+  class vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgTimeStamp.cxx b/Libraries/VtkVgCore/vtkVgTimeStamp.cxx
new file mode 100644
index 00000000..8599fcbd
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTimeStamp.cxx
@@ -0,0 +1,179 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTimeStamp.h"
+
+#include <iostream>
+
+//-----------------------------------------------------------------------------
+double vtkVgTimeStamp::GetTimeDifferenceInSecs(const vtkVgTimeStamp& other) const
+{
+  if (this->HasTime() && other.HasTime())
+    {
+    return (this->Time - other.Time) / 1e6;
+    }
+  else if (this->IsMaxTime() || other.IsMaxTime() ||
+           this->IsMinTime() || other.IsMinTime())
+    {
+    return VTK_DOUBLE_MAX;
+    }
+  else
+    {
+    return double(this->FrameNumber) - double(other.FrameNumber);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTimeStamp::operator<(const vtkVgTimeStamp& other) const
+{
+  if (this->HasTime() && other.HasTime())
+    {
+    return this->GetTime() < other.GetTime();
+    }
+  else if (this->IsMaxTime() || other.IsMinTime())
+    {
+    return false;
+    }
+  else if (other.IsMaxTime() || this->IsMinTime())
+    {
+    return true;
+    }
+  //else if (this->HasTime() || other.HasTime())
+  //  {
+  //  std::cerr << "comparing timestamps that don't both have time values\n";
+  //  return false;
+  //  }
+  else if (this->HasFrameNumber() && other.HasFrameNumber())
+    {
+    return this->GetFrameNumber() < other.GetFrameNumber();
+    }
+  else
+    {
+    std::cerr << "comparing timestamps that don't both have time values or frame number values, or are empty\n";
+    return false;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTimeStamp::operator==(const vtkVgTimeStamp& other) const
+{
+  if (this->HasTime() && other.HasTime())
+    {
+    return this->GetTime() == other.GetTime();
+    }
+  else if (this->IsMaxTime() || other.IsMaxTime() ||
+           this->IsMinTime() || other.IsMinTime())
+    {
+    return false;
+    }
+  //else if (this->HasTime() || other.HasTime())
+  //  {
+  //  std::cerr << "comparing timestamps that don't both have time values\n";
+  //  return false;
+  //  }
+  else if (this->HasFrameNumber() && other.HasFrameNumber())
+    {
+    return this->GetFrameNumber() == other.GetFrameNumber();
+    }
+  else
+    {
+    std::cerr << "comparing timestamps that don't both have time values or frame number values, or are empty\n";
+    return false;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp& vtkVgTimeStamp::operator-(const double& timeInterval)
+{
+  if(this->HasTime())
+    {
+    this->SetTime(this->GetTime() - timeInterval);
+    }
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp& vtkVgTimeStamp::operator-(const unsigned int& frameInterval)
+{
+  if(this->HasFrameNumber())
+    {
+    this->SetFrameNumber(this->GetFrameNumber() - frameInterval);
+    }
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp& vtkVgTimeStamp::operator+(const double& timeInterval)
+{
+  if(this->HasTime())
+    {
+    this->SetTime(this->GetTime() + timeInterval);
+    }
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp& vtkVgTimeStamp::operator+(const unsigned int& frameInterval)
+{
+  if(this->HasFrameNumber())
+    {
+    this->SetFrameNumber(this->GetFrameNumber() + frameInterval);
+    }
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTimeStamp::ShiftForward(const vtkVgTimeStamp& other)
+{
+  if (this->HasTime() && other.HasTime())
+    {
+    this->Time += other.GetTime();
+    }
+  if (this->HasFrameNumber() && other.HasFrameNumber())
+    {
+    this->FrameNumber += other.GetFrameNumber();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTimeStamp::ShiftBackward(const vtkVgTimeStamp& other)
+{
+  if (this->HasTime() && other.HasTime())
+    {
+    this->Time -= other.GetTime();
+    }
+  if (this->HasFrameNumber() && other.HasFrameNumber())
+    {
+    this->FrameNumber -= other.GetFrameNumber();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp& operator+(const double& time, vtkVgTimeStamp& timestamp)
+{
+  if(timestamp.HasTime())
+    {
+    timestamp.SetTime(timestamp.GetTime() + time);
+    }
+
+  return timestamp;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp& operator+(const unsigned int& interval,
+                           vtkVgTimeStamp& timestamp)
+{
+  if(timestamp.HasFrameNumber())
+    {
+    timestamp.SetFrameNumber(timestamp.GetFrameNumber() + interval);
+    }
+
+  return timestamp;
+}
diff --git a/Libraries/VtkVgCore/vtkVgTimeStamp.h b/Libraries/VtkVgCore/vtkVgTimeStamp.h
new file mode 100644
index 00000000..4e69e697
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTimeStamp.h
@@ -0,0 +1,301 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTimeStamp_h
+#define __vtkVgTimeStamp_h
+
+// \brief Represents a world time in microseconds (10^-6 seconds).
+//
+// A timestamp contains two pieces of information: a time and a frame
+// number.  Generally, one should use the time value over the frame
+// number if both are available.
+//
+// NOTE: This is a copy (functionality) of timestamp in vidtk
+#ifdef VTKEXTENSIONS_USE_VIDTK
+#include <utilities/timestamp.h>
+#endif
+#include <vtkType.h>
+
+#include <vgExport.h>
+#include <vgTimeStamp.h>
+
+class VTKVG_CORE_EXPORT vtkVgTimeStamp : private vgTimeStamp
+{
+public:
+  // Description:
+  // Default constructor
+  vtkVgTimeStamp() {}
+
+  vtkVgTimeStamp(const vtkVgTimeStamp& other)
+    : vgTimeStamp(other) {}
+
+  // Description:
+  // Implicit constructor from vgTimeStamp
+  vtkVgTimeStamp(const vgTimeStamp& vg_timestamp)
+    : vgTimeStamp(vg_timestamp) {}
+
+  // Description:
+  // Assign from a vgTimeStamp.
+  vtkVgTimeStamp& operator=(const vgTimeStamp& vg_timestamp)
+    {
+    this->Time = vg_timestamp.Time;
+    this->FrameNumber = vg_timestamp.FrameNumber;
+    return *this;
+    }
+
+  // Description:
+  // Cast operator to vgTimeStamp.
+  vgTimeStamp GetRawTimeStamp() const
+    {
+    return vgTimeStamp(*this);
+    }
+
+#ifdef VTKEXTENSIONS_USE_VIDTK
+  // Description:
+  // Pass a vidtk::timestamp.
+  explicit vtkVgTimeStamp(const vidtk::timestamp& vidtk_timestamp)
+    {
+    if (vidtk_timestamp.has_time())
+      {
+      this->Time = vidtk_timestamp.time();
+      }
+    if (vidtk_timestamp.has_frame_number())
+      {
+      this->FrameNumber = vidtk_timestamp.frame_number();
+      }
+    }
+
+  // Description:
+  // Assign from a vidtk::timestamp.
+  vtkVgTimeStamp& operator=(const vidtk::timestamp& vidtk_timestamp)
+    {
+    if (vidtk_timestamp.has_time())
+      {
+      this->Time = vidtk_timestamp.time();
+      }
+    else
+      {
+      this->Time = vgTimeStamp::InvalidTime();
+      }
+    if (vidtk_timestamp.has_frame_number())
+      {
+      this->FrameNumber = vidtk_timestamp.frame_number();
+      }
+    else
+      {
+      this->FrameNumber = vgTimeStamp::InvalidFrameNumber();
+      }
+    return *this;
+    }
+#endif
+
+  // Description:
+  // Pass a time.
+  // The constructor is explicit to make sure that the user did
+  // intend to create a timestamp that does not have a frame number.
+  explicit vtkVgTimeStamp(double time) : vgTimeStamp(time) {}
+
+  // Description:
+  // Constructor to initialize to min or max time
+  explicit vtkVgTimeStamp(bool maxTime)
+    {
+    if (maxTime)
+      {
+      this->SetToMaxTime();
+      }
+    else
+      {
+      this->SetToMinTime();
+      }
+    }
+
+  /// pass a time and a frame number.
+  vtkVgTimeStamp(double time, unsigned int frameNumber)
+    {
+    this->Time = time;
+    this->FrameNumber = frameNumber;
+    }
+
+  // Description:
+  // Returns true if contains time or frame number
+  bool IsValid() const
+    {
+    return vgTimeStamp::IsValid();
+    }
+
+  // Description:
+  // Reset to initialized state (no time or frame #)
+  void Reset()
+    {
+    this->Time = vgTimeStamp::InvalidTime();
+    this->FrameNumber = vgTimeStamp::InvalidFrameNumber();
+    }
+
+  // Description:
+  // Set time to large value, any comparison (frame or time), will have this
+  // timestamp grater than other, unless both at max time
+  void SetToMaxTime()
+    {
+    this->Time = VTK_DOUBLE_MAX;
+    }
+
+  // Return whether or not this timestamp set to max time
+  bool IsMaxTime() const
+    {
+    return this->Time == VTK_DOUBLE_MAX;
+    }
+
+  void SetToMinTime()
+    {
+    this->Time = VTK_DOUBLE_MIN;
+    }
+  bool IsMinTime() const
+    {
+    return this->Time == VTK_DOUBLE_MIN;
+    }
+
+  // Description:
+  // Returns true if this contains time, otherwise false.
+  bool HasTime() const
+    {
+    return vgTimeStamp::HasTime();
+    }
+
+  // Description:
+  // Set/Get the time.
+  void SetTime(double time)
+    {
+    this->Time = time;
+    }
+  double GetTime() const
+    {
+    return this->Time;
+    }
+
+  // Description:
+  // Return true if frame number is found, otherwise false.
+  bool HasFrameNumber()  const
+    {
+    return vgTimeStamp::HasFrameNumber();
+    }
+
+  // Description:
+  // Set/Get frame number.
+  void SetFrameNumber(unsigned int number)
+    {
+    this->FrameNumber = number;
+    }
+  unsigned int GetFrameNumber() const
+    {
+    return this->FrameNumber;
+    }
+
+  // Description:
+  // Return the time or frame number, depending on availability.
+  // If a time value is available, this will be a time value in seconds.  If
+  // not, it will be the frame number.
+  double GetTimeInSecs() const
+    {
+    return this->HasTime() ? this->Time / 1e6 : double(this->FrameNumber);
+    }
+
+  // Description:
+  // Return the time or frame number difference, depending on
+  // availability.
+  //
+  // If a time value is available in both numbers, the result is the
+  // difference expressed in seconds.  Otherwise, if the frame number
+  // if available in both, the result is the difference in frame
+  // numbers.  Finally, if neither of these hold, the result is
+  // undefined.
+  double GetTimeDifferenceInSecs(const vtkVgTimeStamp& other) const;
+
+  // Description:
+  // Ordering on timestamps.
+  // If the timestamps have time values, the order is based on time.
+  // Otherwise, if neither have time values, but have frame numbers,
+  // the order is based on frame number.  Otherwise, the comparison
+  // will always return \c false.
+  //
+  // Note that this means if one has a time value but the other does
+  // not, the result will be \c false.
+  bool operator<(const vtkVgTimeStamp& other) const;
+
+  bool operator>(const vtkVgTimeStamp& other) const
+    {
+    return other < *this;
+    }
+
+  // Description:
+  // Ordering on timestamps.
+  bool operator<(const vgTimeStamp& other) const
+    {
+    return *this < vtkVgTimeStamp(other);
+    }
+
+  bool operator>(const vgTimeStamp& other) const
+    {
+    return *this > vtkVgTimeStamp(other);
+    }
+
+  // Description:
+  // Equality of timestamps.
+  // If the timestamps have time values, the comparison is based on
+  // time.  If neither have time values, but both have frame numbers,
+  // the comparison is based on frame number.  In all other cases,
+  // the result is \c false.
+  bool operator==(const vtkVgTimeStamp& other) const;
+  bool operator!=(const vtkVgTimeStamp& other) const
+    {
+    return !(*this == other);
+    }
+
+  // Description:
+  // Combined ordering and equality operator
+  bool operator<=(const vtkVgTimeStamp& other) const
+    {
+    return (*this < other) || (*this == other);
+    }
+
+  bool operator>=(const vtkVgTimeStamp& other) const
+    {
+    return other <= *this;
+    }
+
+  // Description:
+  // Provide subtraction operators
+  vtkVgTimeStamp& operator-(const double& timeInterval);
+  vtkVgTimeStamp& operator-(const unsigned int& frameInterval);
+
+  // Description:
+  // Provide addition operators
+  vtkVgTimeStamp& operator+(const double& timeInterval);
+  vtkVgTimeStamp& operator+(const unsigned int& frameInterval);
+
+  // Description:
+  // Shift the timestamp forward
+  void ShiftForward(const vtkVgTimeStamp& other);
+
+  // Description:
+  // Shift the timestamp backward
+  void ShiftBackward(const vtkVgTimeStamp& other);
+};
+
+// Description:
+// Ordering on timestamps.
+inline bool operator<(const vgTimeStamp& a, const vtkVgTimeStamp& b)
+{
+  return vtkVgTimeStamp(a) < b;
+}
+
+// Description:
+// Provide global addition operators
+extern vtkVgTimeStamp& operator+(const double& timeInterval,
+                                  vtkVgTimeStamp& timestamp);
+extern vtkVgTimeStamp& operator+(const int& frameInterval,
+                                  vtkVgTimeStamp& timestamp);
+
+#endif // __vtkVgTimeStamp_h
diff --git a/Libraries/VtkVgCore/vtkVgTrack.cxx b/Libraries/VtkVgCore/vtkVgTrack.cxx
new file mode 100644
index 00000000..50a94860
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTrack.cxx
@@ -0,0 +1,1345 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrack.h"
+
+#include "vtkVgScalars.h"
+#include "vtkVgTypeDefs.h"
+
+// VTK includes.
+#include <vtkActor.h>
+#include <vtkBoundingBox.h>
+#include <vtkObjectFactory.h>
+#include <vtkMath.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkIdList.h>
+#include <vtkSmartPointer.h>
+
+#include <limits>
+#include <map>
+
+vtkStandardNewMacro(vtkVgTrack);
+vtkCxxSetObjectMacro(vtkVgTrack, Points, vtkPoints);
+
+typedef std::map<vtkVgTimeStamp, vtkIdType>         TimeToIdMap;
+typedef TimeToIdMap::iterator                       TimeToIdMapIter;
+typedef TimeToIdMap::const_iterator                 TimeToIdMapConstIter;
+typedef std::pair<TimeToIdMapIter, TimeToIdMapIter> TimeToIdMapRange;
+
+typedef vtkSmartPointer<vtkVgScalars> Scalars;
+
+//----------------------------------------------------------------------------
+class vtkVgTrack::vtkInternal
+{
+public:
+  TimeToIdMap PointIdMap;     // no interpolated points
+  TimeToIdMap AllPointsIdMap; // includes interpolated points
+  TimeToIdMap HeadIdentifierStartIndex;
+
+  vtkIdList* HeadIdentifierIds;
+  TimeToIdMapConstIter AllPointsIdMapIterator;
+
+  vtkTimeStamp BuildTime;
+  bool LastDisplayedRegardlessOfFrame;
+  bool ClosureOfEmptyTrack;
+
+  std::map<std::string, Scalars> IdToScalarsMap;
+  Scalars ActiveScalars;
+
+  std::map<vtkVgTimeStamp, vtkVgGeoCoord> LatLons;
+
+  vtkInternal()
+    {
+    this->HeadIdentifierIds = vtkIdList::New();
+    // allocate memory for 10 rectangular track heads (each head is specified
+    // via num points in head follow by the points, with 1st point repeated to
+    // close the loop)
+    this->HeadIdentifierIds->Allocate(60);
+    this->LastDisplayedRegardlessOfFrame = false;
+    this->ClosureOfEmptyTrack = false;
+    this->ActiveScalars = 0;
+    }
+
+  ~vtkInternal()
+    {
+    this->HeadIdentifierIds->Delete();
+    }
+
+  // Sets the HeadIdentifier at the specified timeStamp.  Note, that
+  // if this is called multiple times for the same timeStamp, memory
+  // will be wasted in the HeadIdentifierIds.  However, choosing this
+  // route because will result in less frequent memory allocation.
+  // Not sure if this is the best route, but works for now...
+  void SetHeadIdentifier(const vtkVgTimeStamp& timestamp,
+                         vtkPoints* points, vtkIdType numberOfPts,
+                         vtkPoints* fromPoints, vtkIdType fromPtsStart,
+                         float* pts = 0)
+    {
+    this->HeadIdentifierStartIndex[timestamp] =
+      this->HeadIdentifierIds->GetNumberOfIds();
+    this->HeadIdentifierIds->InsertNextId(
+      numberOfPts > 1 ? numberOfPts + 1 : numberOfPts);
+
+    // point ids must be consecutive
+    if (fromPoints)
+      {
+      double point[3];
+      for (vtkIdType i = 0; i < numberOfPts; i++)
+        {
+        fromPoints->GetPoint(fromPtsStart + i, point);
+        this->HeadIdentifierIds->InsertNextId(points->InsertNextPoint(point));
+        }
+      }
+    else
+      {
+      for (vtkIdType i = 0; i < numberOfPts; i++)
+        {
+        this->HeadIdentifierIds->InsertNextId(
+          points->InsertNextPoint(pts + i * 3));
+        }
+      }
+
+    // if greater than 1, then close the loop
+    if (numberOfPts > 1)
+      {
+      this->HeadIdentifierIds->InsertNextId(
+        this->HeadIdentifierIds->GetId(
+          this->HeadIdentifierIds->GetNumberOfIds() - numberOfPts));
+      }
+    }
+
+  void RemoveHeadIdentifier(const vtkVgTimeStamp& timeStamp)
+    {
+    this->HeadIdentifierStartIndex.erase(timeStamp);
+    }
+
+  // Get the half-open range in AllPointsIdMap containing all the interpolated
+  // points which depend on the non-interpolated PointIdMap point given as the
+  // parameter.
+  TimeToIdMapRange GetInterpolatedPointsRange(TimeToIdMapConstIter pointIter)
+    {
+    TimeToIdMapRange result;
+
+    // find the first ipoint with timestamp> previous non-interpolated point
+    if (pointIter != this->PointIdMap.begin())
+      {
+      TimeToIdMapConstIter beforeIter = pointIter;
+      --beforeIter;
+      result.first = this->AllPointsIdMap.find(beforeIter->first);
+      ++result.first;
+      }
+    else
+      {
+      result.first = this->AllPointsIdMap.begin();
+      }
+
+    // find the first ipoint with timestamp == the next non-interpolated point
+    if (pointIter != --this->PointIdMap.end())
+      {
+      TimeToIdMapConstIter afterIter = pointIter;
+      ++afterIter;
+      result.second = this->AllPointsIdMap.find(afterIter->first);
+      }
+    else
+      {
+      result.second = this->AllPointsIdMap.end();
+      }
+
+    return result;
+    }
+
+  // Get the half-open range in AllPointsIdMap containing all the interpolated
+  // heads which depend on the head corresponding to the non-interpolated
+  // PointIdMap point given as the parameter. The returned range will be empty
+  // if there is no head with this point's timestamp. If a non-interpolated
+  // head does exist, it is included in the range as well (by necessity).
+  TimeToIdMapRange GetInterpolatedHeadsRange(TimeToIdMapConstIter pointIter)
+    {
+    TimeToIdMapRange result;
+
+    // find the first head with timestamp> previous non-interpolated point
+    if (pointIter != this->PointIdMap.begin())
+      {
+      TimeToIdMapConstIter beforeIter = pointIter;
+      --beforeIter;
+      result.first
+        = this->HeadIdentifierStartIndex.upper_bound(beforeIter->first);
+      }
+    else
+      {
+      result.first = this->HeadIdentifierStartIndex.begin();
+      }
+
+    // find the first head with timestamp>= the next non-interpolated point
+    if (pointIter != --this->PointIdMap.end())
+      {
+      TimeToIdMapConstIter afterIter = pointIter;
+      ++afterIter;
+      result.second
+        = this->HeadIdentifierStartIndex.lower_bound(afterIter->first);
+      }
+    else
+      {
+      result.second = this->HeadIdentifierStartIndex.end();
+      }
+
+    return result;
+    }
+
+  // Get iterator to entry in map closest to timeStamp. If the map is empty,
+  // return end().
+  TimeToIdMapConstIter GetClosestMapEntry(TimeToIdMap& theMap,
+                                          const vtkVgTimeStamp& timeStamp)
+    {
+    if (theMap.empty())
+      {
+      return theMap.end();
+      }
+
+    TimeToIdMapIter candidateAfter = theMap.lower_bound(timeStamp);
+
+    // Did we find an exact match?
+    if (candidateAfter != theMap.end() && candidateAfter->first == timeStamp)
+      {
+      return candidateAfter;
+      }
+
+    // As long as we're not at the beginning of the map, we know we can step
+    // back one entry and have a valid iterator.
+    TimeToIdMapIter candidateBefore = theMap.end();
+    if (candidateAfter != theMap.begin())
+      {
+      candidateBefore = candidateAfter;
+      candidateBefore--;
+      }
+
+    // Return the "candidateAfter" if we don't have a candidate before (since
+    // the map is not empty, must therefore have one after) or we have
+    // candidates both before and after and the candidate after is closer.
+    if (candidateBefore == theMap.end() ||
+        (candidateAfter != theMap.end() &&
+         candidateAfter->first.GetTimeDifferenceInSecs(timeStamp) <
+         timeStamp.GetTimeDifferenceInSecs(candidateBefore->first)))
+      {
+      return candidateAfter;
+      }
+
+    // Either the candidate before is closer, or there was no candidate after.
+    return candidateBefore;
+    }
+};
+
+//-----------------------------------------------------------------------------
+vtkVgTrack::vtkVgTrack()
+{
+  this->Type = -1;
+  this->Id = 0;
+  this->Flags = 0;
+  this->DisplayFlags = DF_Normal;
+  this->InterpolateMissingPointsOnInsert = false;
+
+  this->InterpolationSpacing.SetFrameNumber(1);
+  this->InterpolationSpacing.SetTime(0.5e6);
+
+  this->Name = 0;
+
+  this->Normalcy = 1.0;
+
+  // track representation
+  this->Points = 0;
+  this->PointIds = vtkIdList::New();
+
+  // default to unclassified...
+  this->PVO[0] = this->PVO[1] = this->PVO[2] = 0.0;
+
+  this->Color[0] = 1.0;
+  this->Color[1] = 1.0;
+  this->Color[2] = 0.0;
+
+  this->Status = vgObjectStatus::None;
+
+  this->Internal = new vtkInternal;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack::~vtkVgTrack()
+{
+  delete [] this->Name;
+  if (this->Points)
+    {
+    this->Points->Delete();
+    }
+  this->PointIds->Delete();
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::Allocate(vtkIdType numberOfFrames)
+{
+  this->PointIds->Allocate(numberOfFrames);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::CopyData(vtkVgTrack* other)
+{
+  this->Internal->PointIdMap = other->Internal->PointIdMap;
+  this->Internal->AllPointsIdMap = other->Internal->AllPointsIdMap;
+  this->Internal->HeadIdentifierStartIndex =
+    other->Internal->HeadIdentifierStartIndex;
+
+  this->Internal->HeadIdentifierIds->DeepCopy(
+    other->Internal->HeadIdentifierIds);
+
+  this->SetPoints(other->GetPoints());
+  this->PointIds->DeepCopy(other->GetPointIds());
+
+  this->StartFrame = other->StartFrame;
+  this->EndFrame = other->EndFrame;
+
+  this->Normalcy = other->Normalcy;
+
+  this->PVO[0] = other->PVO[0];
+  this->PVO[1] = other->PVO[1];
+  this->PVO[2] = other->PVO[2];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::Merge(vtkVgTrack* other)
+{
+  TimeToIdMapConstIter headIter =
+    other->Internal->HeadIdentifierStartIndex.begin();
+
+  vtkVgTimeStamp origStart = this->GetStartFrame();
+  vtkVgTimeStamp origEnd = this->GetEndFrame();
+
+  for (TimeToIdMapConstIter iter = other->Internal->PointIdMap.begin(),
+                             end = other->Internal->PointIdMap.end();
+       iter != end; ++iter)
+    {
+    if (iter->first >= origStart && iter->first <= origEnd)
+      {
+      continue;
+      }
+
+    double point[3];
+    other->Points->GetPoint(iter->second, point);
+
+    vtkVgGeoCoord geoCoord = other->GetGeoCoord(iter->first);
+
+    while (headIter->first < iter->first)
+      {
+      ++headIter;
+      }
+
+    vtkIdType npts = 0;
+    vtkIdType firstPtId = -1;
+    if (headIter->first == iter->first)
+      {
+      npts = other->Internal->HeadIdentifierIds->GetId(headIter->second) - 1;
+      firstPtId = other->Internal->HeadIdentifierIds->GetId(headIter->second + 1);
+      }
+
+    this->SetPoint(iter->first, point, geoCoord, npts, 0,
+                   other->Points, firstPtId);
+    }
+}
+
+//-----------------------------------------------------------------------------
+double* vtkVgTrack::GetFullBounds()
+{
+  if (!this->Points)
+    {
+    vtkErrorMacro("Points must be set!");
+    return 0;
+    }
+
+  vtkBoundingBox bbox;
+  vtkIdList* pointIds = this->GetPointIds();
+  for (vtkIdType i = 0; i < pointIds->GetNumberOfIds(); i++)
+    {
+    double* pt = this->Points->GetPoint(pointIds->GetId(i));
+    bbox.AddPoint(pt);
+    }
+  bbox.GetBounds(this->FullBounds);
+  return this->FullBounds;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::GetFullBounds(double bounds[4])
+{
+  this->GetFullBounds();
+  bounds[0] = this->FullBounds[0];
+  bounds[1] = this->FullBounds[1];
+  bounds[2] = this->FullBounds[2];
+  bounds[3] = this->FullBounds[3];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::InsertNextPoint(const vtkVgTimeStamp& timeStamp,
+                                 double point[2],
+                                 const vtkVgGeoCoord& geoCoord,
+                                 vtkIdType numberOfShellPts,
+                                 float* shellPts,
+                                 vtkPoints* fromShellPoints,
+                                 vtkIdType fromShellPtsStart,
+                                 bool interpolateShell)
+{
+  if (!this->Points)
+    {
+    vtkErrorMacro("Must set Points before inserting track points!");
+    return;
+    }
+  if (this->EndFrame.IsValid())
+    {
+    vtkErrorMacro("The track has been Closed... can't add addition points!");
+    return;
+    }
+  if (this->Internal->PointIdMap.size() > 0 &&
+      timeStamp <= this->Internal->PointIdMap.rbegin()->first)
+    {
+    vtkErrorMacro("Can ONLY add point to track after ALL previously added points!");
+    return;
+    }
+
+  vtkIdType ptId;
+  if (this->Internal->PointIdMap.size() == 0)
+    {
+    this->StartFrame = timeStamp;
+    if (this->Internal->ClosureOfEmptyTrack)
+      {
+      this->EndFrame = timeStamp;
+      }
+    }
+  else if (this->InterpolateMissingPointsOnInsert)
+    {
+    const vtkVgTimeStamp& prevTimeStamp
+      = this->Internal->PointIdMap.rbegin()->first;
+
+    double prevPt[3];
+    this->Points->GetPoint(this->Internal->PointIdMap.rbegin()->second,
+                           prevPt);
+
+    this->AddInterpolationPoints(prevTimeStamp, timeStamp, prevPt, point,
+                                 interpolateShell ? numberOfShellPts : 0,
+                                 fromShellPoints, fromShellPtsStart, shellPts);
+    }
+  ptId = this->Points->InsertNextPoint(point[0], point[1], 0.0);
+  this->Internal->PointIdMap[timeStamp] = ptId;
+  this->Internal->AllPointsIdMap[timeStamp] = ptId;
+
+  if (geoCoord.IsValid())
+    {
+    this->Internal->LatLons[timeStamp] = geoCoord;
+    }
+
+  if (numberOfShellPts > 0)
+    {
+    this->Internal->SetHeadIdentifier(timeStamp, this->Points,
+                                      numberOfShellPts, fromShellPoints,
+                                      fromShellPtsStart, shellPts);
+    }
+
+  this->PointIds->Reset();
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::InsertNextPoint(
+  const vtkVgTimeStamp& timeStamp, double point[2],
+  const vtkVgGeoCoord& geoCoord,
+  vtkDenseArray<double>* shellPts)
+{
+  const vtkArray::SizeT shellArraySize = (shellPts ? shellPts->GetSize() : 0);
+  if (shellArraySize && ((shellArraySize % 3) == 0))
+    {
+    // Since python does not support single precision floats, we must convert
+    // the shell points array instead of just using vtkDenseArray::GetStorage().
+    float* shellPtsF = new float[shellArraySize];
+    for(vtkArray::SizeT i = 0; i < shellArraySize; i++)
+      {
+      shellPtsF[i] = static_cast<float>(shellPts->GetValueN(i));
+      }
+    this->InsertNextPoint(timeStamp, point, geoCoord,
+                          shellArraySize / 3, shellPtsF);
+    delete[] shellPtsF;
+    }
+  else
+    {
+    this->InsertNextPoint(timeStamp, point, geoCoord, 0, 0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::AddInterpolationPoints(const vtkVgTimeStamp& previousTimeStamp,
+                                        const vtkVgTimeStamp& timeStamp,
+                                        double previousPoint[2], double point[2],
+                                        vtkIdType numShellPts,
+                                        vtkPoints* fromShellPts,
+                                        vtkIdType fromShellPtsStart,
+                                        float* shellPts, bool warnOnFailure)
+{
+  vtkIdType numFrames;
+  if (timeStamp.HasTime())
+    {
+    double timeDelta = timeStamp.GetTime() - previousTimeStamp.GetTime();
+    numFrames = static_cast<vtkIdType>(
+                  0.5 + timeDelta / this->InterpolationSpacing.GetTime());
+    }
+  else // timeStamp has frame #
+    {
+    double frameDelta = timeStamp.GetFrameNumber() -
+                        previousTimeStamp.GetFrameNumber();
+    numFrames = static_cast<vtkIdType>(
+                  0.5 + frameDelta / this->InterpolationSpacing.GetFrameNumber());
+    }
+
+  if (numFrames <= 1)
+    {
+    return;
+    }
+
+  vtkIdType numPreviousShellPts, *prevShellPtIds, pointId;
+  this->GetHeadIdentifier(previousTimeStamp, numPreviousShellPts,
+                          prevShellPtIds, pointId);
+
+  // get the start index, since the pointer may be invalidated once we start
+  // allocating new heads
+  vtkIdType headIdsStart
+    = prevShellPtIds - this->Internal->HeadIdentifierIds->GetPointer(0);
+
+  double delta[2] =
+    {
+    (point[0] - previousPoint[0]) / numFrames,
+    (point[1] - previousPoint[1]) / numFrames
+    };
+
+  float* shellPtsTmp = 0;
+  if (numShellPts != 0 && numPreviousShellPts != 0)
+    {
+    if (numPreviousShellPts > 1)
+      {
+      --numPreviousShellPts;
+      }
+    if (numShellPts != numPreviousShellPts)
+      {
+      if (warnOnFailure)
+        {
+        vtkErrorMacro("Track regions do not have the same number of points - "
+                      "interpolating centers only.");
+        }
+      }
+    else
+      {
+      // allocate scratch space for doing interpolation of head regions,
+      // which could have an unknown number of points
+      shellPtsTmp = new float[3 * numShellPts];
+      }
+    }
+
+  vtkVgTimeStamp interpolateTimeStamp = previousTimeStamp;
+  interpolateTimeStamp.ShiftForward(this->InterpolationSpacing);
+
+  vtkIdType ptId;
+  for (int j = 1; j < numFrames; j++)
+    {
+    ptId = this->Points->InsertNextPoint(previousPoint[0] + delta[0] * j,
+                                         previousPoint[1] + delta[1] * j,
+                                         0.0);
+
+    this->Internal->AllPointsIdMap[interpolateTimeStamp] = ptId;
+
+    if (shellPtsTmp)
+      {
+      // compute interpolated region for this frame
+      float tempPt[3];
+      for (vtkIdType p = 0; p < numShellPts; ++p)
+        {
+        float* shellPt;
+        if (fromShellPts)
+          {
+          double* pt = fromShellPts->GetPoint(fromShellPtsStart + p);
+          tempPt[0] = pt[0];
+          tempPt[1] = pt[1];
+          tempPt[2] = pt[2];
+          shellPt = tempPt;
+          }
+        else
+          {
+          shellPt = shellPts + p * 3;
+          }
+
+        double prevShellPt[3];
+        this->Points->GetPoint(
+          this->Internal->HeadIdentifierIds->GetId(headIdsStart + p),
+          prevShellPt);
+
+        double delta[3] =
+          {
+          j* ((shellPt[0] - prevShellPt[0]) / numFrames),
+          j* ((shellPt[1] - prevShellPt[1]) / numFrames),
+          j* ((shellPt[2] - prevShellPt[2]) / numFrames)
+          };
+
+        shellPtsTmp[p * 3 + 0] = prevShellPt[0] + delta[0];
+        shellPtsTmp[p * 3 + 1] = prevShellPt[1] + delta[1];
+        shellPtsTmp[p * 3 + 2] = prevShellPt[2] + delta[2];
+        }
+
+      // insert interpolated head region
+      this->Internal->SetHeadIdentifier(interpolateTimeStamp, this->Points,
+                                        numShellPts, 0, -1, shellPtsTmp);
+      }
+
+    // advance to next "interpolated" timestamp
+    interpolateTimeStamp.ShiftForward(this->InterpolationSpacing);
+    }
+
+  delete[] shellPtsTmp;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::SetPoint(const vtkVgTimeStamp& timeStamp, double point[2],
+                          vtkVgGeoCoord geoCoord,
+                          vtkIdType numberOfShellPts, float* shellPts,
+                          vtkPoints* fromShellPts,
+                          vtkIdType fromShellPtsStart)
+{
+  // if not closed and after the last point, just use InsertNextPoint()
+  if (!this->EndFrame.IsValid() &&
+      (this->Internal->PointIdMap.size() == 0 ||
+       timeStamp > this->Internal->PointIdMap.rbegin()->first))
+    {
+    this->InsertNextPoint(timeStamp, point, geoCoord,
+                          numberOfShellPts, shellPts,
+                          fromShellPts, fromShellPtsStart, true);
+    return;
+    }
+
+  if (!this->Points)
+    {
+    vtkErrorMacro("Must set Points before inserting track points!");
+    return;
+    }
+
+  // any restrictions whatsoever on the timeStamp.... can it be before
+  // start or after end (even if closed)?
+
+  // could similarly verify we aren't repeating head/shell points
+  if (numberOfShellPts > 0)
+    {
+    this->Internal->SetHeadIdentifier(timeStamp, this->Points,
+                                      numberOfShellPts, fromShellPts,
+                                      fromShellPtsStart, shellPts);
+    }
+  else
+    {
+    // just in case we previously had a head identifier at this timeStamp
+    this->Internal->RemoveHeadIdentifier(timeStamp);
+    }
+
+  vtkIdType ptId = this->Points->InsertNextPoint(point[0], point[1], 0.0);
+  this->Internal->PointIdMap[timeStamp] = ptId;
+  this->BuildAllPointsIdMap(timeStamp, ptId, point);
+  this->PointIds->Reset();
+
+  if (geoCoord.IsValid())
+    {
+    this->Internal->LatLons[timeStamp] = geoCoord;
+    }
+  else
+    {
+    this->Internal->LatLons.erase(timeStamp);
+    }
+
+  // make sure StartFrame and EndFrame (if track has been closed) are valid
+  if (this->EndFrame.IsValid() && timeStamp > this->EndFrame)
+    {
+    this->EndFrame = timeStamp;
+    }
+  else if (timeStamp < this->StartFrame)
+    {
+    this->StartFrame = timeStamp;
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::DeletePoint(const vtkVgTimeStamp& timeStamp,
+                             bool isBatchDelete)
+{
+  // does it even exist (need to know if we need to rebuild AllPointIdsMap)
+  TimeToIdMapIter removeIter = this->Internal->PointIdMap.find(timeStamp);
+  if (removeIter == this->Internal->PointIdMap.end())
+    {
+    return;  // no track point for the timeStamp, so nothing to do
+    }
+
+  if (this->Internal->PointIdMap.size() == 1)
+    {
+    vtkErrorMacro("Can't delete the only point in a track!");
+    return;
+    }
+
+  // get points before and after the point being deleted (if exist)
+  TimeToIdMapRange iPointsRange
+    = this->Internal->GetInterpolatedPointsRange(removeIter);
+
+  TimeToIdMapRange iHeadsRange
+    = this->Internal->GetInterpolatedHeadsRange(removeIter);
+
+  // erase interpolated points and (interp and non-interp) heads
+  this->Internal->AllPointsIdMap.erase(iPointsRange.first,
+                                       iPointsRange.second);
+
+  this->Internal->HeadIdentifierStartIndex.erase(iHeadsRange.first,
+                                                 iHeadsRange.second);
+
+  // if there are track points before AND after the one we removed,
+  // need to interpolate between them
+  if (this->InterpolateMissingPointsOnInsert &&
+      removeIter != this->Internal->PointIdMap.begin() &&
+      removeIter != --this->Internal->PointIdMap.end())
+    {
+    TimeToIdMapConstIter pointBeforeIter(removeIter);
+    TimeToIdMapConstIter pointAfterIter(removeIter);
+    --pointBeforeIter;
+    ++pointAfterIter;
+
+    double pointBefore[3];
+    this->Points->GetPoint(pointBeforeIter->second, pointBefore);
+
+    vtkIdType npts, *pts, pointId;
+    this->GetHeadIdentifier(pointAfterIter->first, npts, pts, pointId);
+
+    double pointAfter[3];
+    this->Points->GetPoint(pointAfterIter->second, pointAfter);
+
+    this->AddInterpolationPoints(pointBeforeIter->first, pointAfterIter->first,
+                                 pointBefore, pointAfter,
+                                 npts > 1 ? npts - 1 : npts,
+                                 this->Points, npts == 0 ? -1 : pts[0], 0,
+                                 !isBatchDelete);
+    }
+
+  // erase the deleted point
+  this->Internal->PointIdMap.erase(removeIter);
+  this->PointIds->Reset();
+
+  this->Internal->LatLons.erase(timeStamp);
+
+  // make sure StartFrame and EndFrame (if track has been closed) are valid
+  if (this->EndFrame.IsValid() && timeStamp == this->EndFrame)
+    {
+    this->EndFrame = this->Internal->PointIdMap.rbegin()->first;
+    }
+  else if (timeStamp == this->StartFrame)
+    {
+    this->StartFrame = this->Internal->PointIdMap.begin()->first;
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::BuildAllPointsIdMap(const vtkVgTimeStamp& timeStamp,
+                                     vtkIdType newTrackPtId,
+                                     double point[2])
+{
+  // current assumption is that this method is called only from SetPoint, and
+  // every time a new point is added (and not simple case where we can call
+  // InsertNextPoint).  I can imagine that we might instead call
+  // only when AllPointsIdMap is actually needed, in which case some of the
+  // logic would need to be changed (since multiple points might have been
+  // added since the last time it was called).
+
+  // if no interpolation points, just copy PointIdMap
+  if (!this->InterpolateMissingPointsOnInsert)
+    {
+    this->Internal->AllPointsIdMap = this->Internal->PointIdMap;
+    return;
+    }
+
+  // given assumption stated above, we must have just inserted a point at a
+  // timestamp before the latest timestamp;  only want to recompute
+  // interpolation points around the modified point.  Thus, erase all map
+  // entries around the newly inserted (or modified) point, then...
+
+  // get iterator to the point we just set in SetPoint
+  TimeToIdMapConstIter currentPointIdIter =
+    this->Internal->PointIdMap.find(timeStamp);
+
+  TimeToIdMapRange iPointsRange
+    = this->Internal->GetInterpolatedPointsRange(currentPointIdIter);
+
+  TimeToIdMapRange iHeadsRange
+    = this->Internal->GetInterpolatedHeadsRange(currentPointIdIter);
+
+  // erase interpolated points
+  this->Internal->AllPointsIdMap.erase(iPointsRange.first,
+                                       iPointsRange.second);
+
+  // erase interpolated heads
+  TimeToIdMapIter head
+    = this->Internal->HeadIdentifierStartIndex.find(timeStamp);
+  if (head != this->Internal->HeadIdentifierStartIndex.end())
+    {
+    // skip over the non-interpolated head at this timestamp
+    this->Internal->HeadIdentifierStartIndex.erase(iHeadsRange.first,
+                                                   head);
+    this->Internal->HeadIdentifierStartIndex.erase(++head,
+                                                   iHeadsRange.second);
+    }
+  else
+    {
+    this->Internal->HeadIdentifierStartIndex.erase(iHeadsRange.first,
+                                                   iHeadsRange.second);
+    }
+
+  // interpolate before new point
+  if (currentPointIdIter != this->Internal->PointIdMap.begin())
+    {
+    TimeToIdMapConstIter pointBeforeIter(currentPointIdIter);
+    --pointBeforeIter;
+
+    vtkIdType npts, *ptIds, pointId;
+    this->GetHeadIdentifier(timeStamp, npts, ptIds, pointId);
+
+    double pointBefore[3];
+    this->Points->GetPoint(pointBeforeIter->second, pointBefore);
+
+    this->AddInterpolationPoints(pointBeforeIter->first, timeStamp,
+                                 pointBefore, point,
+                                 npts > 1 ? npts - 1 : npts,
+                                 this->Points, npts == 0 ? -1 : ptIds[0]);
+    }
+
+  // set the new / modified point
+  this->Internal->AllPointsIdMap[timeStamp] = newTrackPtId;
+
+  // interpolate after new point
+  if (currentPointIdIter != --this->Internal->PointIdMap.end())
+    {
+    TimeToIdMapConstIter pointAfterIter(currentPointIdIter);
+    ++pointAfterIter;
+
+    vtkIdType npts, *ptIds, pointId;
+    this->GetHeadIdentifier(pointAfterIter->first, npts, ptIds, pointId);
+
+    double pointAfter[3];
+    this->Points->GetPoint(pointAfterIter->second, pointAfter);
+
+    this->AddInterpolationPoints(timeStamp, pointAfterIter->first,
+                                 point, pointAfter,
+                                 npts > 1 ? npts - 1 : npts,
+                                 this->Points, npts == 0 ? -1 : ptIds[0]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::Close()
+{
+  if (this->Internal->PointIdMap.size() == 0)
+    {
+    // Closing an empty track; set flag indicating as much and we'll set the
+    // EndFrame (the main indicator of whether a track has been closed) when
+    // the 1st point is added to the track
+    this->Internal->ClosureOfEmptyTrack = true;
+    return;
+    }
+  this->EndFrame = this->Internal->PointIdMap.rbegin()->first;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdList* vtkVgTrack::GetPointIds()
+{
+  // build the list if it doesn't equal the number of entries in our map
+  // NOTE: temporary variables are to avoid signed/unsigned mismatch
+  unsigned long long listSize = this->PointIds->GetNumberOfIds();
+  unsigned long long mapSize = this->Internal->AllPointsIdMap.size();
+  if (listSize != mapSize)
+    {
+    this->PointIds->Allocate(
+      static_cast<vtkIdType>(this->Internal->AllPointsIdMap.size()));
+
+    TimeToIdMapConstIter pointIdIter;
+    for (pointIdIter = this->Internal->AllPointsIdMap.begin();
+         pointIdIter != this->Internal->AllPointsIdMap.end(); pointIdIter++)
+      {
+      this->PointIds->InsertNextId(pointIdIter->second);
+      }
+    }
+  return this->PointIds;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::GetHeadIdentifier(const vtkVgTimeStamp& timeStamp,
+                                   vtkIdType& npts, vtkIdType*& pts,
+                                   vtkIdType& trackPointId,
+                                   double tolerance/*= 0.001*/)
+{
+  trackPointId = -1; // "invalid" value unless we set it
+
+  TimeToIdMapConstIter headIter = this->Internal->GetClosestMapEntry(
+                                    this->Internal->HeadIdentifierStartIndex, timeStamp);
+  if (headIter != this->Internal->HeadIdentifierStartIndex.end() &&
+      fabs(headIter->first.GetTimeDifferenceInSecs(timeStamp)) < tolerance)
+    {
+    npts = this->Internal->HeadIdentifierIds->GetId(headIter->second);
+    pts = this->Internal->HeadIdentifierIds->GetPointer(headIter->second + 1);
+    return;
+    }
+
+  // No matching head identifier; make sure the result values are zeroed out.
+  npts = 0;
+  pts = 0;
+
+  // No head identifier; check if there is a track point within tolerance.
+  headIter = this->Internal->GetClosestMapEntry(this->Internal->AllPointsIdMap,
+                                                timeStamp);
+  if (headIter != this->Internal->AllPointsIdMap.end() &&
+      fabs(headIter->first.GetTimeDifferenceInSecs(timeStamp)) < tolerance)
+    {
+    trackPointId = headIter->second;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGeoCoord vtkVgTrack::GetGeoCoord(const vtkVgTimeStamp& timeStamp)
+{
+  std::map<vtkVgTimeStamp, vtkVgGeoCoord>::iterator itr =
+    this->Internal->LatLons.find(timeStamp);
+  if (itr != this->Internal->LatLons.end())
+    {
+    return itr->second;
+    }
+  return vtkVgGeoCoord();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTrack::GetFrameIsInterpolated(const vtkVgTimeStamp& timeStamp)
+{
+  return this->Internal->PointIdMap.find(timeStamp) ==
+         this->Internal->PointIdMap.end();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackDisplayData vtkVgTrack::GetDisplayData(vtkVgTimeStamp start,
+                                                 vtkVgTimeStamp end)
+{
+  if (!this->StartFrame.IsValid())
+    {
+    return vtkVgTrackDisplayData(); // track not started
+    }
+
+  vtkIdList* ids = this->GetPointIds();
+
+  vtkIdType startIndex;
+  if (start.IsMinTime())
+    {
+    startIndex = 0;
+    }
+  else
+    {
+    vtkIdType startId = this->GetClosestFramePtId(start);
+    startIndex = ids->IsId(startId); // linear lookup
+    }
+
+  vtkIdType endIndex;
+  if (end.IsMaxTime())
+    {
+    endIndex = ids->GetNumberOfIds() - 1;
+    }
+  else
+    {
+    vtkIdType endId = this->GetClosestFramePtId(end);
+    endIndex = ids->IsId(endId); // linear lookup
+    }
+
+  vtkVgTrackDisplayData tdi;
+  tdi.IdsStart = ids->GetPointer(startIndex);
+  tdi.NumIds = endIndex - startIndex + 1;
+
+  if (!this->GetActiveScalars())
+    {
+    return tdi;
+    }
+
+  TimeToIdMap::const_iterator itr =
+    this->Internal->AllPointsIdMap.upper_bound(start);
+
+  // Follow the same logic as implemented in GetClosestFramePtId(..)
+  if( (itr != this->Internal->AllPointsIdMap.begin()) &&
+       itr != this->Internal->AllPointsIdMap.end())
+    {
+    --itr;
+    }
+
+  vtkIdType count = 0;
+  for(; (count < tdi.NumIds) && itr != this->Internal->AllPointsIdMap.end();
+      ++count, ++itr)
+    {
+    tdi.Scalars.push_back(
+      this->Internal->ActiveScalars->GetValue(itr->first, true));
+    }
+
+  assert(tdi.Scalars.size() == static_cast<size_t>(tdi.NumIds));
+
+  return tdi;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::SetInterpolationSpacing(const vtkVgTimeStamp& timeStamp)
+{
+  if (this->InterpolationSpacing == timeStamp)
+    {
+    return;
+    }
+
+  this->InterpolationSpacing = timeStamp;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vtkVgTrack::GetEndFrame()
+{
+  vtkVgTimeStamp endFrame;
+  if (this->EndFrame.IsValid())
+    {
+    return this->EndFrame;
+    }
+  else if (this->StartFrame.IsValid())
+    {
+    return this->Internal->PointIdMap.rbegin()->first;
+    }
+  else
+    {
+    vtkWarningMacro("Track hasn't been started!");
+    }
+
+  return endFrame;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTrack::GetPoint(const vtkVgTimeStamp& timeStamp, double pt[2],
+                          bool includeInterpolated)
+{
+  TimeToIdMapConstIter iter;
+  if (includeInterpolated)
+    {
+    iter = this->Internal->AllPointsIdMap.find(timeStamp);
+    if (iter == this->Internal->AllPointsIdMap.end())
+      {
+      return false;
+      }
+    }
+  else
+    {
+    iter = this->Internal->PointIdMap.find(timeStamp);
+    if (iter == this->Internal->PointIdMap.end())
+      {
+      return false;
+      }
+    }
+
+  double point[3];
+  this->Points->GetPoint(iter->second, point);
+  pt[0] = point[0];
+  pt[1] = point[1];
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTrack::GetClosestFramePt(const vtkVgTimeStamp& timeStamp,
+                                   double pt[2])
+{
+  vtkIdType ptId = this->GetClosestFramePtId(timeStamp);
+
+  if (ptId != -1)
+    {
+    double point3D[3];
+    this->Points->GetPoint(ptId, point3D);
+
+    pt[0] = point3D[0];
+    pt[1] = point3D[1];
+    return true;
+    }
+  return false;
+}
+
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrack::GetClosestFramePtId(const vtkVgTimeStamp& timeStamp)
+{
+  if (!this->StartFrame.IsValid()) // track not started
+    {
+    vtkErrorMacro("Trying to retrieve ClosestFramePtId from track that hasn't been started!");
+    return -1;
+    }
+
+  TimeToIdMapConstIter ptIdIter;
+  ptIdIter = this->Internal->AllPointsIdMap.lower_bound(timeStamp);
+  if (ptIdIter == this->Internal->AllPointsIdMap.end() ||
+      (ptIdIter != this->Internal->AllPointsIdMap.begin() &&
+       timeStamp < ptIdIter->first))
+    {
+    ptIdIter--;
+    }
+
+  return ptIdIter->second;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTrack::GetPriorFramePt(const vtkVgTimeStamp& timeStamp, double pt[2],
+                                 vtkVgTimeStamp& priorTimeStamp)
+{
+  vtkIdType ptId = this->GetPriorFramePtId(timeStamp, priorTimeStamp);
+
+  if (ptId == -1)
+    {
+    return false;
+    }
+
+  double point3D[3];
+  this->Points->GetPoint(ptId, point3D);
+
+  pt[0] = point3D[0];
+  pt[1] = point3D[1];
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrack::GetPriorFramePtId(const vtkVgTimeStamp& timeStamp,
+                                        vtkVgTimeStamp& priorTimeStamp)
+{
+  if (!this->StartFrame.IsValid())   // track not started
+    {
+    vtkErrorMacro("Trying to retrieve ClosestFramePtId from track that hasn't been started!");
+    return -1;
+    }
+
+  TimeToIdMapConstIter ptIdIter;
+  ptIdIter = this->Internal->AllPointsIdMap.lower_bound(timeStamp);
+  if (ptIdIter == this->Internal->AllPointsIdMap.begin())
+    {
+    // we're interested in the item before lower_bound, so if we're at the
+    // beginning of the map we're not going to find what we want.
+    return -1;
+    }
+
+  ptIdIter--;
+  priorTimeStamp = ptIdIter->first;
+  return ptIdIter->second;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTrack::GetFrameAtOrBefore(vtkVgTimeStamp& timeStamp)
+{
+  if (this->Internal->PointIdMap.empty())
+    {
+    return false;
+    }
+
+  TimeToIdMapConstIter ptIdIter;
+  ptIdIter = this->Internal->PointIdMap.lower_bound(timeStamp);
+
+  if (ptIdIter != this->Internal->PointIdMap.end() &&
+      ptIdIter->first == timeStamp)
+    {
+    timeStamp = ptIdIter->first;
+    return true;
+    }
+  if (ptIdIter == this->Internal->PointIdMap.begin())
+    {
+    return false;
+    }
+
+  timeStamp = (--ptIdIter)->first;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTrack::GetFrameAtOrAfter(vtkVgTimeStamp& timeStamp)
+{
+  if (this->Internal->PointIdMap.empty())
+    {
+    return false;
+    }
+
+  TimeToIdMapConstIter ptIdIter;
+  ptIdIter = this->Internal->PointIdMap.lower_bound(timeStamp);
+
+  if (ptIdIter == this->Internal->PointIdMap.end())
+    {
+    return false;
+    }
+
+  timeStamp = ptIdIter->first;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrack::GetNumberOfPathPoints()
+{
+  return static_cast<vtkIdType>(this->Internal->AllPointsIdMap.size());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::InitPathTraversal()
+{
+  this->Internal->AllPointsIdMapIterator = this->Internal->AllPointsIdMap.begin();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrack::GetNextPathPt(vtkVgTimeStamp& timeStamp)
+{
+  if (this->Internal->AllPointsIdMapIterator != this->Internal->AllPointsIdMap.end())
+    {
+    timeStamp = this->Internal->AllPointsIdMapIterator->first;
+    return this->Internal->AllPointsIdMapIterator++->second;
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::SetPVO(double person, double vehicle, double other)
+{
+  double sum = person + vehicle + other;
+  if (sum != 1.0 && sum != 0.0)
+    {
+    person /= sum;
+    vehicle /= sum;
+    other /= sum;
+    }
+  if (this->PVO[0] == person && this->PVO[1] == vehicle && this->PVO[2] == other)
+    {
+    return;
+    }
+
+  this->PVO[0] = person;
+  this->PVO[1] = vehicle;
+  this->PVO[2] = other;
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::SetPVO(double pvo[3])
+{
+  this->SetPVO(pvo[0], pvo[1], pvo[2]);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgTrack::GetBestPVOClassifier()
+{
+  if (this->PVO[0] == 0 && this->PVO[1] == 0 && this->PVO[2] == 0)
+    {
+    return vtkVgTrack::Unclassified;
+    }
+
+  if (this->PVO[0] >= this->PVO[1] && this->PVO[0] >= this->PVO[2])
+    {
+    return vtkVgTrack::Person;
+    }
+  else if (this->PVO[1] > this->PVO[0] && this->PVO[1] >= PVO[2])
+    {
+    return vtkVgTrack::Vehicle;
+    }
+
+  return vtkVgTrack::Other;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTrack::SetActiveScalars(const std::string &name)
+{
+  if (this->Internal->IdToScalarsMap.find(name) ==
+      this->Internal->IdToScalarsMap.end())
+    {
+    return false;
+    }
+
+  this->Internal->ActiveScalars = this->Internal->IdToScalarsMap[name];
+  this->Modified();
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkVgScalars> vtkVgTrack::GetActiveScalars()
+{
+  return this->Internal->ActiveScalars;
+}
+
+//-----------------------------------------------------------------------------
+const vtkSmartPointer<vtkVgScalars> vtkVgTrack::GetActiveScalars() const
+{
+  return this->Internal->ActiveScalars;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::SetScalars(const std::string &name,
+                            vtkVgScalars *scalars)
+{
+  if (!scalars || (this->Internal->IdToScalarsMap[name] == scalars))
+    {
+    return;
+    }
+
+  this->Internal->IdToScalarsMap[name] = scalars;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkVgScalars> vtkVgTrack::GetScalars(const std::string& name)
+{
+  if (this->Internal->IdToScalarsMap.find(name) !=
+      this->Internal->IdToScalarsMap.end())
+    {
+    return this->Internal->IdToScalarsMap[name];
+    }
+  else
+    {
+    return 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+const vtkSmartPointer<vtkVgScalars> vtkVgTrack::GetScalars(
+  const std::string& name) const
+{
+  if (this->Internal->IdToScalarsMap.find(name) !=
+      this->Internal->IdToScalarsMap.end())
+    {
+    return this->Internal->IdToScalarsMap[name];
+    }
+  else
+    {
+    return 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+std::vector<std::string> vtkVgTrack::GetScalarsName() const
+{
+  std::vector<std::string> names;
+
+  std::map<std::string, Scalars>::const_iterator constItr =
+    this->Internal->IdToScalarsMap.begin();
+  for (; constItr != this->Internal->IdToScalarsMap.end(); ++constItr)
+    {
+    names.push_back(constItr->first);
+    }
+
+  return names;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrack::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgTrack.h b/Libraries/VtkVgCore/vtkVgTrack.h
new file mode 100644
index 00000000..34ee6734
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTrack.h
@@ -0,0 +1,379 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrack_h
+#define __vtkVgTrack_h
+
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+#include <vtkDenseArray.h>
+
+#include "vtkVgTimeStamp.h"
+
+#include <string>
+#include <vector>
+
+#include <vgExport.h>
+
+#include "vtkVgGeoCoord.h"
+
+class vtkIdList;
+class vtkPoints;
+
+class vtkVgScalars;
+
+class VTKVG_CORE_EXPORT vtkVgTrackDisplayData
+{
+public:
+  vtkVgTrackDisplayData() : IdsStart(0), NumIds(0) {}
+
+  vtkIdType* IdsStart;
+  vtkIdType NumIds;
+
+  std::vector<double> Scalars;
+};
+
+class VTKVG_CORE_EXPORT vtkVgTrack : public vtkObject
+{
+public:
+  enum TrackFlags
+    {
+    TF_Modifiable  = 1 << 0,
+    TF_UserCreated = 1 << 1
+    };
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVgTrack* New();
+  vtkTypeMacro(vtkVgTrack, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // The main identifier for the track
+  vtkSetMacro(Id, vtkIdType);
+  vtkGetMacro(Id, vtkIdType);
+
+  // Description:
+  // A name for the track
+  vtkGetStringMacro(Name);
+  vtkSetStringMacro(Name);
+
+  // Description:
+  // Set/Get the vtkPoints defining the track.  Note, the same vtkPoints
+  // should be shared across all tracks
+  void SetPoints(vtkPoints* points);
+  vtkGetObjectMacro(Points, vtkPoints);
+
+  // Description:
+  // Allocate id arrays for specified number of frames.  Not required, but
+  // more efficient for memory managemnet if known
+  void Allocate(vtkIdType numberOfFrames);
+
+  // Description:
+  // Copy geometry data from another track, replacing any existing points
+  void CopyData(vtkVgTrack* other);
+
+  // Description:
+  // Merge a second track into this one. Any overlapping portions of the other
+  // track will be ignored. The second track is not modified.
+  void Merge(vtkVgTrack* other);
+
+  // Description:
+  // Add a point (in world coordinates) to the track.  The timeStamp indicates
+  // the frame/time at which the point occurs.  numberOfShellPts indciates how
+  // many points in the following array of 3D points, which define the "shell"
+  // around the tracked object at this point. Shell points may be supplied
+  // either as a float* or vtkPoints* + start index. Caller should pass 0 in
+  // fromShellPts if the shell point data is provided in shellPts. If both are
+  // given, only the vtkPoints data will be used.
+  void InsertNextPoint(const vtkVgTimeStamp& timeStamp, double point[2],
+                       const vtkVgGeoCoord& geoCoord,
+                       vtkIdType numberOfShellPts,
+                       float* shellPts,
+                       vtkPoints* fromShellPoints = 0,
+                       vtkIdType fromShellPtsStart = -1,
+                       bool interpolateShell = false);
+
+  // Description:
+  // Wrapper around InsertNextPoint to facilitate python wrapping by using a
+  // vtkDenseArray instead of a C-style array with a size argument.
+  void InsertNextPoint(const vtkVgTimeStamp& timeStamp, double point[2],
+                       const vtkVgGeoCoord& geoCoord,
+                       vtkDenseArray<double>* shellPts = 0);
+
+  // Description: Set a point (in world coordinates) of the track, at the
+  // specified timeStamp.  As opposed to InsertNextPoint, this can be used to
+  // replace a previously set (or inserted) track point and can also be used on
+  // a closed track. Shell points may be supplied either as a float* or
+  // vtkPoints* + start index. Caller should pass 0 in fromShellPts if the shell
+  // point data is provided in shellPts. If both are given, only the vtkPoints
+  // data will be used.
+  void SetPoint(const vtkVgTimeStamp& timeStamp, double point[2],
+                vtkVgGeoCoord geoCoord,
+                vtkIdType numberOfShellPts = 0, float* shellPts = 0,
+                vtkPoints* fromShellPts = 0, vtkIdType fromShellPtsStart = -1);
+
+  // Description:
+  // Delete track point (and head) at the specified timeStamp.
+  void DeletePoint(const vtkVgTimeStamp& timeStamp, bool isBatchDelete = false);
+
+  // Description:
+  // Indicate that the track definition is finished, that no addition points
+  // will be added to the track.
+  void Close();
+
+  // Description:
+  // Get the set of point ids that, with the Points (vtkPoints), defines
+  // the geometry of the track
+  vtkIdList* GetPointIds();
+
+  // Description:
+  // Get the id pointer + offset that forms the polyline defining the track
+  // representation over the given time interval.
+  vtkVgTrackDisplayData GetDisplayData(vtkVgTimeStamp start,
+                                       vtkVgTimeStamp end);
+
+  // Description:
+  // Return the head identifier (typically a bbox around the tracked object).
+  // If no HeadIdentifier was specified for the timeStamp within the specified
+  // tolerance (default = 0.001), return id for a trackPoint if there is one
+  // within tolerance (in trackPointId; -1 if one doesn't exist). The tolerance
+  // is an absolute delta between the timeStamp parameter and the closest time
+  // stamp in the track, regardless of whether the time stamps are specified in
+  // seconds or frames.  Thus, the default tolerance is effectively 0 if only
+  // frame numbers are available.
+  void GetHeadIdentifier(const vtkVgTimeStamp& timeStamp, vtkIdType& npts,
+                         vtkIdType*& pts, vtkIdType& trackPointId,
+                         double tolerance = 0.001);
+
+  // Description:
+  // Return the geo coordinate for given time
+  vtkVgGeoCoord GetGeoCoord(const vtkVgTimeStamp& timeStamp);
+
+  // Description:
+  // Returns true if the given frame contains interpolated head data
+  bool GetFrameIsInterpolated(const vtkVgTimeStamp& timeStamp);
+
+  //Description:
+  // Get the frame index of the 1st frame in this track
+  vtkVgTimeStamp GetStartFrame()
+    {
+    return this->StartFrame;
+    }
+
+  //Description:
+  // Get the frame index of the last frame in this track.  If the track hasn't
+  // been closed, it returns the index of the last frame that was added.
+  vtkVgTimeStamp GetEndFrame();
+
+  // Description:
+  // Returns whether or not there is a valid "start" to this track
+  // (doesn't yet have to be closed)
+  bool IsStarted()
+    {
+    return this->StartFrame.IsValid();
+    }
+
+  // Description:
+  // Set/Get whether to interpolate missing points upon insertion (determined
+  // via InterpolationSpacing)
+  vtkBooleanMacro(InterpolateMissingPointsOnInsert, bool);
+  vtkSetMacro(InterpolateMissingPointsOnInsert, bool);
+  vtkGetMacro(InterpolateMissingPointsOnInsert, bool);
+
+  // Description:
+  // Set/Get the delta between "frames", or at least the delta we want to
+  // interpolate at when inserting points.
+  void SetInterpolationSpacing(const vtkVgTimeStamp& spacing);
+  vtkVgTimeStamp GetInterpolationSpacing()
+    {
+    return this->InterpolationSpacing;
+    }
+
+  // Description:
+  // Return the bounds of the entire track (xmin, xmax, ymin, ymax).
+  double* GetFullBounds();
+
+  // Description:
+  // Get the bounds for this entire track as (xmin, xmax, ymin, ymax).
+  void GetFullBounds(double bounds[4]);
+
+  // Description:
+  // Get the point of the track from the frame at timeStamp.
+  // Returns true if point exists at timeStamp.
+  bool GetPoint(const vtkVgTimeStamp& timeStamp, double pt[2],
+                bool includeInterpolated = true);
+
+  // Description:
+  // Get the point of the track from the frame closest to input timeStamp.
+  // Thus, if before the track, will retrieve beginning of track; if after
+  // the track will retrieve endPt of the track.  Returns true if successful.
+  bool GetClosestFramePt(const vtkVgTimeStamp& timeStamp, double pt[2]);
+
+  // Description:
+  // Get the point id of frame closest (equal to or before unless beginning
+  // of track) to input time stamp
+  vtkIdType GetClosestFramePtId(const vtkVgTimeStamp& timeStamp);
+
+  // Description:
+  // Get the point of the track (and associated TimeStamp) from the frame
+  // closest to, but before, the input timeStamp.  Returns false if no point
+  // before the input timeStamp.
+  bool GetPriorFramePt(const vtkVgTimeStamp& timeStamp, double pt[2],
+                       vtkVgTimeStamp& priorTimeStamp);
+
+  // Description:
+  // Get the point id (and TimeStamp) of pt immediately prior to input timeStamp.
+  // Returns -1 if no point before the input timestamp
+  vtkIdType GetPriorFramePtId(const vtkVgTimeStamp& timeStamp,
+                              vtkVgTimeStamp& priorTimeStamp);
+
+  // Description:
+  // Get the timestamp of the closest adjacent non-interpolated frame
+  bool GetFrameAtOrBefore(vtkVgTimeStamp& timeStamp);
+  bool GetFrameAtOrAfter(vtkVgTimeStamp& timeStamp);
+
+  vtkIdType GetNumberOfPathPoints();
+  void InitPathTraversal();
+  vtkIdType GetNextPathPt(vtkVgTimeStamp& timeStamp);
+
+  // Description:
+  // Get / set the normalcy value of the track.
+  vtkSetMacro(Normalcy, double);
+  vtkGetMacro(Normalcy, double);
+
+  // Description:
+  // Get / set the type of the track.
+  vtkSetMacro(Type, int);
+  vtkGetMacro(Type, int);
+
+  // Description:
+  // Set/Get the PVO classification for this track.  These must sum to 1;
+  // to guarantee summing to 1, we normalize on input.
+  void SetPVO(double person, double vehicle, double other);
+  void SetPVO(double pvo[3]);
+  vtkGetVector3Macro(PVO, double);
+
+  enum enumTrackPVOType
+    {
+    Person = 0,
+    Vehicle,
+    Other,
+    Unclassified
+    };
+
+  int GetBestPVOClassifier();
+
+  // Description:
+  // Support for per-track colors.
+  vtkSetVector3Macro(Color, double);
+  vtkGetVector3Macro(Color, double);
+
+  bool IsModifiable()
+    { return (this->Flags & TF_Modifiable) != 0; }
+
+  void SetModifiable(bool enable)
+    { enable ? this->Flags |= TF_Modifiable : this->Flags &= ~TF_Modifiable; }
+
+  bool IsUserCreated()
+    { return (this->Flags & TF_UserCreated) != 0; }
+
+  void SetUserCreated(bool enable)
+    { enable ? this->Flags |= TF_UserCreated : this->Flags &= ~TF_UserCreated; }
+
+  enum DisplayFlags
+    {
+    DF_Normal       = 1 << 0,
+    DF_Selected     = 1 << 1,
+    DF_SceneElement = 1 << 2
+    };
+
+  // Description:
+  // Set/Get the display flags of the track
+  vtkSetMacro(DisplayFlags, unsigned char);
+  vtkGetMacro(DisplayFlags, unsigned char);
+
+  // Description:
+  // Set/Get the status of the track (positive, negative, or none)
+  vtkSetMacro(Status, int);
+  vtkGetMacro(Status, int);
+
+  // Description:
+  // Set scalars to be used for visualization
+  bool SetActiveScalars(const std::string& name);
+  // Get scalars that are currently being used for the visualization
+  vtkSmartPointer<vtkVgScalars> GetActiveScalars();
+  const vtkSmartPointer<vtkVgScalars> GetActiveScalars() const;
+
+  // Description:
+  // Set scalars linked with the track
+  void SetScalars(const std::string& name, vtkVgScalars* scalars);
+  // Get scalars linked with the track
+  vtkSmartPointer<vtkVgScalars> GetScalars(const std::string& name);
+  const vtkSmartPointer<vtkVgScalars> GetScalars(const std::string& name) const;
+
+  // Description:
+  // Get scalars name
+  std::vector<std::string> GetScalarsName() const;
+
+private:
+  vtkVgTrack(const vtkVgTrack&); // Not implemented.
+  void operator=(const vtkVgTrack&);  // Not implemented.
+
+  // Description:
+  // Constructor / Destructor.
+  vtkVgTrack();
+  ~vtkVgTrack();
+
+  void AddTrackSegment(vtkVgTimeStamp& startFrame, vtkVgTimeStamp& endFrame,
+                       vtkVgTimeStamp& maximumDisplayDuration);
+
+  // Shell points may be supplied either as a float* or vtkPoints* + start
+  // index. Caller should pass 0 as fromShellPts if the shell data is given
+  // in a float array. If both are given, only the vtkPoints data will be used.
+  void AddInterpolationPoints(const vtkVgTimeStamp& previousTimeStamp,
+                              const vtkVgTimeStamp& timeStamp,
+                              double previousPoint[2], double point[2],
+                              vtkIdType numShellPts,
+                              vtkPoints* fromShellPts,
+                              vtkIdType fromShellPtsStart,
+                              float* shellPts = 0,
+                              bool warnOnFailure = true);
+
+  void BuildAllPointsIdMap(const vtkVgTimeStamp& timeStamp,
+                           vtkIdType newTrackPtId, double point[2]);
+
+  int Type;
+  vtkIdType Id;
+  unsigned char Flags;
+  unsigned char DisplayFlags;
+
+  bool InterpolateMissingPointsOnInsert;
+  vtkVgTimeStamp InterpolationSpacing;
+
+  vtkVgTimeStamp StartFrame;
+  vtkVgTimeStamp EndFrame;
+
+  vtkPoints* Points;
+  vtkIdList* PointIds;
+
+  char* Name;
+
+  double Normalcy;
+  double PVO[3];
+
+  double Color[3];
+
+  // only use 4 or 6, but done for convenience right now
+  double FullBounds[6];
+
+  int Status;
+
+  class vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgTrack_h
diff --git a/Libraries/VtkVgCore/vtkVgTrackTypeRegistry.cxx b/Libraries/VtkVgCore/vtkVgTrackTypeRegistry.cxx
new file mode 100644
index 00000000..2c735f28
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTrackTypeRegistry.cxx
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrackTypeRegistry.h"
+
+#include <vtkObjectFactory.h>
+
+template class vtkVgTypeRegistry<vgTrackType>;
+
+vtkStandardNewMacro(vtkVgTrackTypeRegistry);
+
+//-----------------------------------------------------------------------------
+int vtkVgTrackTypeRegistry::GetTypeIndex(const char* id) const
+{
+  for (int i = 0, end = this->GetNumberOfTypes(); i < end; ++i)
+    {
+    if (strcmp(this->GetType(i).GetId(), id) == 0)
+      {
+      return i;
+      }
+    }
+  return -1;
+}
diff --git a/Libraries/VtkVgCore/vtkVgTrackTypeRegistry.h b/Libraries/VtkVgCore/vtkVgTrackTypeRegistry.h
new file mode 100644
index 00000000..6bfa6912
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTrackTypeRegistry.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrackTypeRegistry_h
+#define __vtkVgTrackTypeRegistry_h
+
+#include "vtkVgTypeRegistry.h"
+
+#include <vgExport.h>
+#include <vgTrackType.h>
+
+class VTKVG_CORE_EXPORT vtkVgTrackTypeRegistry
+  : public vtkVgTypeRegistry<vgTrackType>
+{
+  typedef vtkVgTypeRegistry<vgTrackType> BaseClassType;
+public:
+  static vtkVgTrackTypeRegistry* New();
+
+  vtkTypeMacro(vtkVgTrackTypeRegistry, BaseClassType);
+
+  // Description:
+  // Get index of registered track type or -1 if not found.
+  int GetTypeIndex(const char* id) const;
+};
+
+#endif // __vtkVgTrackTypeRegistry_h
diff --git a/Libraries/VtkVgCore/vtkVgTriangulateConcavePolysFilter.cxx b/Libraries/VtkVgCore/vtkVgTriangulateConcavePolysFilter.cxx
new file mode 100644
index 00000000..53ca08d2
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTriangulateConcavePolysFilter.cxx
@@ -0,0 +1,212 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTriangulateConcavePolysFilter.h"
+
+#include "vtkCellArray.h"
+#include "vtkCellData.h"
+#include "vtkIdList.h"
+#include "vtkInformationVector.h"
+#include "vtkInformation.h"
+#include "vtkMath.h"
+#include "vtkObjectFactory.h"
+#include "vtkPolyData.h"
+#include "vtkPolygon.h"
+
+#include <queue>
+
+vtkStandardNewMacro(vtkVgTriangulateConcavePolysFilter);
+
+//-----------------------------------------------------------------------------
+int vtkVgTriangulateConcavePolysFilter::RequestData(
+  vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** inputVector,
+  vtkInformationVector* outputVector)
+{
+  // get the info object
+  vtkInformation* inInfo = inputVector[0]->GetInformationObject(0);
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  // get the input and ouptut
+  vtkPolyData* input = vtkPolyData::SafeDownCast(
+                         inInfo->Get(vtkPolyData::DATA_OBJECT()));
+  vtkPolyData* output = vtkPolyData::SafeDownCast(
+                          outInfo->Get(vtkPolyData::DATA_OBJECT()));
+
+  // setup output equal to (just passing though) input;  will modify Polys and
+  // CellData if we find any caoncave polys in the dataset
+  output->ShallowCopy(input);
+
+  // 1st check to see if there is anything other than triangles present;  if
+  // not, can't have concave polygons (and thus we're done)
+  if (input->GetPolys()->GetMaxCellSize() < 4)
+    {
+    return VTK_OK;
+    }
+
+  // anything greater than 3 needs to be inspected... do so and get a list (if
+  // any) of those that need to be split into triangles (so now concave)
+  vtkCellArray* inputPolys = input->GetPolys();
+  vtkPoints* inputPoints = input->GetPoints();
+
+  vtkIdType npts, *pts;
+  inputPolys->InitTraversal();
+  int additionalTriangles = 0, cellIndex = 0;
+  std::queue<int> concaveCells;
+  for (inputPolys->InitTraversal(); inputPolys->GetNextCell(npts, pts); cellIndex++)
+    {
+    if (npts > 3)
+      {
+      if (this->IsPolygonConcave(inputPoints, npts, pts))
+        {
+        // it's concave, add it to the queue
+        additionalTriangles += npts - 3;
+        concaveCells.push(cellIndex);
+        }
+      }
+    }
+
+  // if we didn't find any concave polygons then just pass input through (we're done)
+  if (additionalTriangles == 0)
+    {
+    return VTK_OK;
+    }
+
+  // allocate array for polys
+  vtkCellArray* outputPolys = vtkCellArray::New();
+  outputPolys->Allocate(
+    inputPolys->GetNumberOfConnectivityEntries() + (additionalTriangles * 4));
+
+  // setup cell data
+  vtkCellData* outputCellData = output->GetCellData();
+  outputCellData->Initialize();
+  outputCellData->CopyAllOn();
+  outputCellData->CopyAllocate(input->GetCellData(),
+                               input->GetNumberOfCells() + additionalTriangles);
+
+
+  // ids for copying CellData
+  vtkIdType inputCellId = 0, outputCellId = 0;
+
+  // Handle any Vertices
+  if (input->GetVerts())
+    {
+    output->SetVerts(input->GetVerts());
+    for (int i = 0; i < input->GetNumberOfVerts(); i++)
+      {
+      outputCellData->CopyData(input->GetCellData(), inputCellId++, outputCellId++);
+      }
+    }
+  // Handle any Lines
+  if (input->GetLines())
+    {
+    output->SetLines(input->GetLines());
+    for (int i = 0; i < input->GetNumberOfLines(); i++)
+      {
+      outputCellData->CopyData(input->GetCellData(), inputCellId++, outputCellId++);
+      }
+    }
+
+  // Now the main task... triangulate any concave polygons, copying all others
+  vtkPolygon* polygon = vtkPolygon::New();
+  vtkIdList* outTris = vtkIdList::New();
+
+  cellIndex = 0;
+  int concaveCellIndex = concaveCells.front();
+  concaveCells.pop();
+  for (inputPolys->InitTraversal(); inputPolys->GetNextCell(npts, pts); cellIndex++)
+    {
+    // is it one of the concave cells?  If so, triangulate and add each of the
+    // resulting triangles to the output polys; otherwise, just add the poly to
+    // the output polys
+    if (cellIndex == concaveCellIndex)
+      {
+      polygon->Initialize(npts, pts, inputPoints);
+      polygon->Triangulate(outTris);
+      vtkIdType newPts[3];
+      for (int i = 0; i < outTris->GetNumberOfIds();)
+        {
+        newPts[0] = pts[outTris->GetId(i++)];
+        newPts[1] = pts[outTris->GetId(i++)];
+        newPts[2] = pts[outTris->GetId(i++)];
+        outputPolys->InsertNextCell(3, newPts);
+        outputCellData->CopyData(input->GetCellData(), inputCellId, outputCellId++);
+        }
+      inputCellId++;
+
+      // get next concave cell, unless we've already processed them all, in
+      // which case set to -1 (know we won't get a match)
+      if (concaveCells.size() > 0)
+        {
+        concaveCellIndex = concaveCells.front();
+        concaveCells.pop();
+        }
+      else
+        {
+        concaveCellIndex = -1;
+        }
+      }
+    else
+      {
+      // cell wasn't concave, just copy it to the output
+      outputPolys->InsertNextCell(npts, pts);
+      outputCellData->CopyData(input->GetCellData(), inputCellId++, outputCellId++);
+      }
+    }
+
+  output->SetPolys(outputPolys);
+
+  // cleanup
+  outputPolys->Delete();
+  polygon->Delete();
+  outTris->Delete();
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTriangulateConcavePolysFilter::IsPolygonConcave(vtkPoints* points,
+    vtkIdType npts,
+    vtkIdType* pts)
+{
+  // look for flip of cross product (direction) between adjacent sets of three points
+  double v1[3], v2[3], pt[3][3], cross[2][3];
+
+  int basePt = 1, previousPt, nextPt;
+  points->GetPoint(pts[npts - 1], pt[0]);
+  points->GetPoint(pts[0], pt[1]);
+
+  for (vtkIdType i = 0; i < npts; i++, basePt++)
+    {
+    basePt %= 3;
+    nextPt = (basePt + 1) % 3;
+    previousPt = (basePt + 2) % 3;
+
+    points->GetPoint(pts[(i + 1) % npts], pt[nextPt]);
+
+    for (int j = 0; j < 3; j++)
+      {
+      v1[j] = pt[previousPt][j] - pt[basePt][j];
+      v2[j] = pt[nextPt][j] - pt[basePt][j];
+      }
+
+    vtkMath::Cross(v1, v2, cross[i % 2]);
+    if (i > 0)
+      {
+      if (vtkMath::Dot(cross[0], cross[1]) < 0)
+        {
+        return true;
+        }
+      }
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTriangulateConcavePolysFilter::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgTriangulateConcavePolysFilter.h b/Libraries/VtkVgCore/vtkVgTriangulateConcavePolysFilter.h
new file mode 100644
index 00000000..c941ff76
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTriangulateConcavePolysFilter.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgTriangulateConcavePolysFilter - triangulate any concave polygons
+// .SECTION Description
+// This filter takes input polydata and triangulates any concave polygons,
+// passing all other data through (cell data for a concave polygon is copied
+// to each of the output triangles resulting from that polygon)
+
+#ifndef __vtkVgTriangulateConcavePolysFilter_h
+#define __vtkVgTriangulateConcavePolysFilter_h
+
+#include "vtkPolyDataAlgorithm.h"
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgTriangulateConcavePolysFilter
+  : public vtkPolyDataAlgorithm
+{
+public:
+  static vtkVgTriangulateConcavePolysFilter* New();
+  vtkTypeMacro(vtkVgTriangulateConcavePolysFilter, vtkPolyDataAlgorithm);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Tests whether the cell is concave
+  static bool IsPolygonConcave(vtkPoints* points, vtkIdType npts, vtkIdType* pts);
+
+//BTX
+protected:
+  vtkVgTriangulateConcavePolysFilter() {};
+  ~vtkVgTriangulateConcavePolysFilter() {};
+
+  // Description:
+  // This is called within ProcessRequest when a request asks the algorithm
+  // to do its work. This is the method you should override to do whatever the
+  // algorithm is designed to do. This happens during the fourth pass in the
+  // pipeline execution process.
+  virtual int RequestData(vtkInformation*,
+                          vtkInformationVector**,
+                          vtkInformationVector*);
+
+private:
+  vtkVgTriangulateConcavePolysFilter(const vtkVgTriangulateConcavePolysFilter&); // Not implemented.
+  void operator=(const vtkVgTriangulateConcavePolysFilter&); // Not implemented.
+//ETX
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgTypeDefs.h b/Libraries/VtkVgCore/vtkVgTypeDefs.h
new file mode 100644
index 00000000..1a11f812
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTypeDefs.h
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTypeDefs_h
+#define __vtkVgTypeDefs_h
+
+struct vgObjectTypeDefinitions
+{
+  enum enumObjectTypes
+    {
+    Activity,
+    Event,
+    Track,
+    SceneElement
+    };
+};
+
+struct vgObjectStatus
+{
+  enum enumObjectStatus
+    {
+    None,
+    Adjudicated,
+    Excluded,
+    Positive = Adjudicated,
+    Negative = Excluded
+    };
+};
+
+struct vgEventTypeDefinitions
+{
+  enum enumEventCategories
+    {
+    Event = 0,
+    Activity,
+    Intel,
+    CategoryUnknown
+    };
+};
+
+struct vgSpecialIconTypeDefinitions
+{
+  enum enumSpecialIcons
+    {
+    Intelligence = 4,
+    Follower = 5,
+    Unknown = 100
+    };
+};
+
+
+#endif // __vtkVgTypeDefs_h
diff --git a/Libraries/VtkVgCore/vtkVgTypeRegistry.h b/Libraries/VtkVgCore/vtkVgTypeRegistry.h
new file mode 100644
index 00000000..89b2ec12
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTypeRegistry.h
@@ -0,0 +1,152 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTypeRegistry_h
+#define __vtkVgTypeRegistry_h
+
+#include "vtkVgTypeRegistryBase.h"
+
+#include <vtkObject.h>
+
+#include <vector>
+
+template <typename T>
+class vtkVgTypeRegistry : public vtkObject, vtkVgTypeRegistryBase
+{
+public:
+  vtkTypeMacro(vtkVgTypeRegistry<T>, vtkObject);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Current number of registered types.
+  virtual int GetNumberOfTypes() const;
+
+  // Description:
+  // Access to registered types.
+  const T& GetType(int index) const;
+  virtual const vgEntityType& GetEntityType(int index) const;
+
+  // Description:
+  // Add to registered types. The supplied type should have a unique id.
+  void SetType(int index, const T& type);
+  virtual void SetEntityType(int index, const vgEntityType& type);
+
+  // Description:
+  // Add to registered types. The supplied type should have a unique id.
+  void AddType(const T& type);
+
+  // Description:
+  // Remove registered type.
+  void RemoveType(int index);
+
+  // Description:
+  // Remove all registered types.
+  void Clear();
+
+  // Description:
+  // Convenience methods to toggle the 'used' bit on registered types.
+  virtual void MarkTypeUsed(int index);
+  virtual void MarkAllTypesUnused();
+
+private:
+  std::vector<T> Types;
+};
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgTypeRegistry<T>::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Types:\n";
+  for (int i = 0, end = this->GetNumberOfTypes(); i < end; ++i)
+    {
+    os << indent << this->Types[i].GetName()
+       << " (" << this->Types[i].GetId() << ")\n";
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+int vtkVgTypeRegistry<T>::GetNumberOfTypes() const
+{
+  return static_cast<int>(this->Types.size());
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+const T& vtkVgTypeRegistry<T>::GetType(int index) const
+{
+  return this->Types[index];
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+const vgEntityType& vtkVgTypeRegistry<T>::GetEntityType(int index) const
+{
+  return this->GetType(index);
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgTypeRegistry<T>::SetType(int index, const T& type)
+{
+  this->Types[index] = type;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgTypeRegistry<T>::SetEntityType(int index, const vgEntityType& type)
+{
+  this->Types[index].SetEntityTypeInfo(type);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgTypeRegistry<T>::AddType(const T& type)
+{
+  this->Types.push_back(type);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgTypeRegistry<T>::RemoveType(int index)
+{
+  this->Types.erase(this->Types.begin() + index);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgTypeRegistry<T>::Clear()
+{
+  this->Types.clear();
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgTypeRegistry<T>::MarkTypeUsed(int index)
+{
+  this->Types[index].SetIsUsed(true);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+void vtkVgTypeRegistry<T>::MarkAllTypesUnused()
+{
+  for (size_t i = 0, end = this->Types.size(); i < end; ++i)
+    {
+    this->Types[i].SetIsUsed(false);
+    }
+  this->Modified();
+}
+
+#endif // __vtkVgTypeRegistry_h
diff --git a/Libraries/VtkVgCore/vtkVgTypeRegistryBase.h b/Libraries/VtkVgCore/vtkVgTypeRegistryBase.h
new file mode 100644
index 00000000..b343c2a9
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgTypeRegistryBase.h
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTypeRegistryBase_h
+#define __vtkVgTypeRegistryBase_h
+
+class vgEntityType;
+
+class vtkVgTypeRegistryBase
+{
+public:
+  virtual ~vtkVgTypeRegistryBase() {}
+
+  virtual int GetNumberOfTypes() const = 0;
+
+  // Description:
+  // Access base entity type.
+  virtual const vgEntityType& GetEntityType(int index) const = 0;
+
+  // Description:
+  // Assign base entity type information.
+  virtual void SetEntityType(int index, const vgEntityType& type) = 0;
+
+  // Description:
+  // Convenience methods to toggle the 'used' bit on registered types.
+  virtual void MarkTypeUsed(int index) = 0;
+  virtual void MarkAllTypesUnused() = 0;
+};
+
+#endif // __vtkVgTypeRegistryBase_h
diff --git a/Libraries/VtkVgCore/vtkVgUtil.cxx b/Libraries/VtkVgCore/vtkVgUtil.cxx
new file mode 100644
index 00000000..a4dff81f
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgUtil.cxx
@@ -0,0 +1,22 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgUtil.h"
+
+#include <vtkMatrix4x4.h>
+
+#include <math.h>
+
+//-----------------------------------------------------------------------------
+vgPoint2d vtkVgApplyHomography(double x, double y, const vtkMatrix4x4& xf)
+{
+  double p[4] = { x, y, 0.0, 1.0 };
+  vtkMatrix4x4::MultiplyPoint(*xf.Element, p, p);
+
+  const double wi = (fabs(p[3]) > 1e-10 ? 1.0 / p[3] : 1.0);
+  vgPoint2d result = { p[0] * wi, p[1] * wi };
+  return result;
+}
diff --git a/Libraries/VtkVgCore/vtkVgUtil.h b/Libraries/VtkVgCore/vtkVgUtil.h
new file mode 100644
index 00000000..db3cd48f
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgUtil.h
@@ -0,0 +1,85 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgUtil_h
+#define __vtkVgUtil_h
+
+#include <vgExport.h>
+
+#include "vtkVgInstance.h"
+
+class vtkMatrix4x4;
+
+struct vgPoint2d
+{
+  double X;
+  double Y;
+};
+
+extern VTKVG_CORE_EXPORT vgPoint2d vtkVgApplyHomography(
+  double x, double y, const vtkMatrix4x4& xf);
+
+inline vgPoint2d vtkVgApplyHomography(
+  double x, double y, const vtkMatrix4x4* xf)
+{ return (xf ? vtkVgApplyHomography(x, y, *xf) : vgPoint2d()); }
+
+inline vgPoint2d vtkVgApplyHomography(
+  double x, double y, const vtkVgInstance<vtkMatrix4x4>& xf)
+{ return vtkVgApplyHomography(x, y, *xf); }
+
+#define IMPLEMENT_APPLY_HOMOGRAPHY(MatrixType) \
+inline void vtkVgApplyHomography( \
+  double inX, double inY, MatrixType xf, double result[2]) \
+{ \
+  const vgPoint2d p = vtkVgApplyHomography(inX, inY, xf); \
+  result[0] = p.X; \
+  result[1] = p.Y; \
+} \
+\
+inline vgPoint2d vtkVgApplyHomography(double in[2], MatrixType xf) \
+{ \
+  return vtkVgApplyHomography(in[0], in[1], xf); \
+} \
+\
+inline void vtkVgApplyHomography( \
+  const vgPoint2d& in, MatrixType xf, double result[2]) \
+{ \
+  const vgPoint2d p = vtkVgApplyHomography(in.X, in.Y, xf); \
+  result[0] = p.X; \
+  result[1] = p.Y; \
+} \
+\
+inline void vtkVgApplyHomography( \
+  double in[2], MatrixType xf, double result[2]) \
+{ \
+  const vgPoint2d p = vtkVgApplyHomography(in[0], in[1], xf); \
+  result[0] = p.X; \
+  result[1] = p.Y; \
+} \
+\
+inline void vtkVgApplyHomography( \
+  double inX, double inY, MatrixType xf, double& outX, double& outY) \
+{ \
+  const vgPoint2d p = vtkVgApplyHomography(inX, inY, xf); \
+  outX = p.X; \
+  outY = p.Y; \
+} \
+\
+inline void vtkVgApplyHomography( \
+  double in[2], MatrixType xf, double& outX, double& outY) \
+{ \
+  const vgPoint2d p = vtkVgApplyHomography(in[0], in[1], xf); \
+  outX = p.X; \
+  outY = p.Y; \
+}
+
+IMPLEMENT_APPLY_HOMOGRAPHY(const vtkMatrix4x4&)
+IMPLEMENT_APPLY_HOMOGRAPHY(const vtkMatrix4x4*)
+IMPLEMENT_APPLY_HOMOGRAPHY(const vtkVgInstance<vtkMatrix4x4>&)
+
+#undef IMPLEMENT_APPLY_HOMOGRAPHY
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgVideoCache.cxx b/Libraries/VtkVgCore/vtkVgVideoCache.cxx
new file mode 100644
index 00000000..b3e990e1
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoCache.cxx
@@ -0,0 +1,195 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// VTK includes.
+#include "vtkVgVideoCache.h"
+#include "vtkImageData.h"
+#include "vtkObjectFactory.h"
+#include "vtkSmartPointer.h"
+#include "vtkXMLImageDataReader.h"
+#include "vtkPointData.h"
+#include "vtkImageClip.h"
+
+// Standard VTK macro.
+vtkStandardNewMacro(vtkVgVideoCache);
+
+
+//----------------------------------------------------------------------------
+vtkVgVideoCache::vtkVgVideoCache()
+{
+  this->HasData = 0;
+  for (int i = 0; i < 6; ++i)
+    {
+    this->WholeExtent[i] = 0;
+    }
+  for (int i = 0; i < 6; ++i)
+    {
+    this->Extent[i] = 0;
+    }
+  this->ImageData = NULL;
+  this->CacheReader = NULL;
+  this->Resolution = 0;
+}
+
+//----------------------------------------------------------------------------
+vtkVgVideoCache::~vtkVgVideoCache()
+{
+}
+
+//----------------------------------------------------------------------------
+void vtkVgVideoCache::PrintSelf(ostream& os, vtkIndent indent)
+{
+  Superclass::PrintSelf(os, indent);
+
+  // @TODO: Implement this.
+}
+
+//----------------------------------------------------------------------------
+double vtkVgVideoCache::GetResolution()
+{
+  return this->Resolution;
+}
+
+//----------------------------------------------------------------------------
+int vtkVgVideoCache::ContainsRequest(unsigned int e[6])
+{
+  if (!this->HasData)
+    {
+    return 0;
+    }
+
+  for (int i = 0; i < 3; ++i)
+    {
+    if (e[2 * i] < this->Extent[2 * i] || e[2 * i + 1] > this->Extent[2 * i + 1])
+      {
+      return 0;
+      }
+    }
+
+  return 1;
+}
+
+
+//----------------------------------------------------------------------------
+void vtkVgVideoCache::
+GetData(unsigned int e[6], vtkSmartPointer<vtkImageData> image)
+{
+  // If no data then configure the image accordingly.
+  if (!this->HasData || this->ImageData == NULL)
+    {
+    image->SetWholeExtent(0, 0, 0, 0, 0, 0);
+    image->SetExtent(0, 0, 0, 0, 0, 0);
+    image->GetPointData()->SetScalars(NULL);
+    return;
+    }
+
+  // Okay we assume the request e[6] is in the cache (since we should have checked).
+  // We need to set up the image appropriately.
+  unsigned int cE[6];
+  vtkSmartPointer<vtkImageClip> clip = vtkSmartPointer<vtkImageClip>::New();
+  clip->SetInputData(this->ImageData);
+  this->ConvertWholeExtentsToCacheExtents(e, cE);
+  clip->SetOutputWholeExtent(cE[0], cE[1], cE[2], cE[3], cE[4], cE[5]);
+  clip->ClipDataOn();
+  clip->Update();
+  image->ShallowCopy(clip->GetOutput());
+
+  return;
+}
+
+
+//----------------------------------------------------------------------------
+void vtkVgVideoCache::RequestData(unsigned int vtkNotUsed(e)[6])
+{
+  //The cache needs to talk to the reader
+}
+
+//----------------------------------------------------------------------------
+void vtkVgVideoCache::LoadData(unsigned int vtkNotUsed(e)[6],
+                               vtkSmartPointer<vtkImageData> vtkNotUsed(image))
+{
+  //The reader should be invoking this method in response to a RequestData()
+}
+
+//----------------------------------------------------------------------------
+void vtkVgVideoCache::LoadCacheFromFile(char* file,
+  int wholeExtentFlag, unsigned int e[6])
+{
+  // First thing to do is clean out the existing data
+  this->ImageData = vtkSmartPointer<vtkImageData>::New();
+
+  // Okay read the data
+  this->CacheReader = vtkSmartPointer<vtkXMLImageDataReader>::New();
+  this->CacheReader->SetFileName(file);
+  this->CacheReader->Update();
+
+  // If successful read
+  this->HasData = 1;
+  this->ImageData = this->CacheReader->GetOutput();
+  this->CacheReader = NULL;
+
+  // If the wholeExtent flag is set then this cache data covers
+  // the whole data extent otherwise it satisfies the request e[6].
+  if (wholeExtentFlag)
+    {
+    for (int i = 0; i < 6; ++i)
+      {
+      this->Extent[i] = this->WholeExtent[i];
+      }
+    }
+  else
+    {
+    int i;
+    for (i = 0; i < 6; ++i)
+      {
+      this->Extent[i] = e[i];
+      }
+    for (i = 0; i < 3; ++i) //crop to whole extent
+      {
+      if (this->Extent[2 * i] < this->WholeExtent[2 * i])
+        {
+        this->Extent[2 * i] = this->WholeExtent[2 * i];
+        }
+      if (this->Extent[2 * i + 1] > this->WholeExtent[2 * i + 1])
+        {
+        this->Extent[2 * i + 1] = this->WholeExtent[2 * i + 1];
+        }
+      }
+    }
+}
+
+//----------------------------------------------------------------------------
+void vtkVgVideoCache::
+ConvertWholeExtentsToCacheExtents(unsigned int wE[6], unsigned int cE[6])
+{
+  // note that the extent should be contained in the cache
+
+  // Get the size of the cache (i.e., dimensions)
+  int cExtent[6], cDims[3];
+  this->ImageData->GetDimensions(cDims);
+  this->ImageData->GetExtent(cExtent);
+
+  // Perform the coordinate conversion. Pad out a tad.
+  for (int i = 0; i < 3; ++i)
+    {
+    cE[2 * i] = cExtent[2 * i] + cDims[i]
+      * static_cast<double>(wE[2 * i] - this->Extent[2 * i] + 1)
+      / (this->Extent[2 * i + 1] - this->Extent[2 * i] + 1) - 1;
+    cE[2 * i + 1] = cExtent[2 * i] + cDims[i]
+      * static_cast<double>(wE[2 * i + 1] - this->Extent[2 * i] + 1)
+      / (this->Extent[2 * i + 1] - this->Extent[2 * i] + 1) + 1;
+
+    if (cE[2 * i] < static_cast<unsigned int>(cExtent[2 * i]))
+      {
+      cE[2 * i] = cExtent[2 * i];
+      }
+    if (cE[2 * i + 1] > static_cast<unsigned int>(cExtent[2 * i + 1]))
+      {
+      cE[2 * i + 1] = cExtent[2 * i + 1];
+      }
+    }
+
+}
diff --git a/Libraries/VtkVgCore/vtkVgVideoCache.h b/Libraries/VtkVgCore/vtkVgVideoCache.h
new file mode 100644
index 00000000..5e11974f
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoCache.h
@@ -0,0 +1,116 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgVideoCache - cache a subset of a video stream.
+// .SECTION Description
+// Video streams are expressed as a series of frames (images) over time.
+// The entire video stream is characterized with a whole extent defining
+// a space-time range. Requests can be made of subsets of this video stream
+// which are returned in a vtkImageData.
+//
+// Note that the cache contains the actual data. It knows the whole extent
+// of the data, but maintains data representing a subset of the whole extent
+// at potentially a different resolution.
+
+
+#ifndef __vtkVgVideoCache_h
+#define __vtlVideoManager_h
+
+#include "vtkObject.h"
+#include "vtkSmartPointer.h" // for memory safety
+
+#include <vgExport.h>
+
+class vtkImageData;
+class vtkXMLImageDataReader;
+
+class VTKVG_CORE_EXPORT vtkVgVideoCache : public vtkObject
+{
+public:
+  static vtkVgVideoCache* New();
+  vtkTypeMacro(vtkVgVideoCache, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Specify the whole extent of the video stream. This is a 6-tuple
+  // indicating x-y-z-time min and max range. The ranges are zero
+  // offset, and time is expressed in frame numbers. The data values
+  // are (xmin,xmax,ymin,ymax,tmin,tmax).
+  vtkSetVector6Macro(WholeExtent, unsigned int);
+  vtkGetVector6Macro(WholeExtent, unsigned int);
+
+  // Description:
+  // Specify the extent of the video cache. This is a 6-tuple
+  // indicating x-y-time min and max range. The ranges are zero
+  // offset, and time is expressed in frame numbers. The data values
+  // are (xmin,xmax,ymin,ymax,tmin,tmax). Note that the extent should
+  // lie within the WholeExtent (and is in the coordinate system of the
+  // WholeExtent).
+  vtkSetVector6Macro(Extent, unsigned int);
+  vtkGetVector6Macro(Extent, unsigned int);
+
+  // Description:
+  // Return the resolution of this cache. This is the ratio of the actual
+  // extent to the whole extent of the data. (Note that the minimium
+  // resolution in the x-y directions is returned.)
+  double GetResolution();
+
+  // Description:
+  // Return 1 if the cache contains the requested data, 0 otherwise.
+  int ContainsRequest(unsigned int e[6]);
+
+  // Description:
+  // Given a request e[6], retrieve the data from the cache and place it into
+  // the vtkImageData. Note that request e[6] should have been validated
+  // previously with a ContainsRequest() invocation.
+  void GetData(unsigned int e[6], vtkSmartPointer<vtkImageData>);
+
+  // Description:
+  // Given a request for data (the request e[6] is expressed in the WholeExtent
+  // coordinate system), ask the cache's reader to load data asynchronously.
+  // We expect the reader to throw an event when the cache is loaded. Note that
+  // the response to this request is that the LoadData method will update the
+  // cache with data that covers e[6] (it may be greater in extent).
+  void RequestData(unsigned int e[6]);
+
+  // Description:
+  // This method loads data into the cache (typically in response to a
+  // RequestData() invocation). As it does so, it defines the Extent and
+  // DataExtent of the cache.
+  void LoadData(unsigned int extent[6], vtkSmartPointer<vtkImageData> image);
+
+  // Description:
+  // This special method reads data and configures the cache. This typically
+  // is used for the low-res, full extent cache (Cache 0, and e[6] ==
+  // WholeExtent[6]).  The WholeExtent and Extent are set (to the same value)
+  // on read if initializeCache is set.
+  void LoadCacheFromFile(char* file, int wholeExtentFlag, unsigned int e[6]);
+
+protected:
+  vtkVgVideoCache();
+  virtual ~vtkVgVideoCache();
+
+
+private:
+  vtkVgVideoCache(const vtkVgVideoCache&);  // Not implemented.
+  void operator=(const vtkVgVideoCache&);    // Not implemented.
+
+  unsigned int WholeExtent[6];
+  unsigned int Extent[6];
+  int          HasData;
+
+  vtkSmartPointer<vtkImageData> ImageData;
+  double Resolution;
+
+  // Various readers
+  vtkSmartPointer<vtkXMLImageDataReader> CacheReader;
+
+  // Convenience functions
+  void ConvertWholeExtentsToCacheExtents(unsigned int wE[6], unsigned int cE[6]);
+
+};
+
+#endif // __vtkVgVideoCache_h
diff --git a/Libraries/VtkVgCore/vtkVgVideoFrame.cxx b/Libraries/VtkVgCore/vtkVgVideoFrame.cxx
new file mode 100644
index 00000000..14c0b8e4
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoFrame.cxx
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoFrame.h"
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrame::vtkVgVideoFrame()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrame::vtkVgVideoFrame(const vtkSmartPointer<vtkImageData>& sptr) :
+  Image(sptr)
+{
+  sptr->Register(sptr);
+}
+
+//-----------------------------------------------------------------------------
+vtkImageData* vtkVgVideoFrame::GetImageData()
+{
+  return this->Image.GetPointer();
+}
diff --git a/Libraries/VtkVgCore/vtkVgVideoFrame.h b/Libraries/VtkVgCore/vtkVgVideoFrame.h
new file mode 100644
index 00000000..cfa175c7
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoFrame.h
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoFrame_h
+#define __vtkVgVideoFrame_h
+
+#include <vtkImageData.h>
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+#include "vtkVgPythonUtil.h"
+#include "vtkVgSharedInstance.h"
+#include "vtkVgVideoFrameMetaData.h"
+
+struct VTKVG_CORE_EXPORT vtkVgVideoFrame
+{
+  vtkVgVideoFrame();
+  explicit vtkVgVideoFrame(const vtkSmartPointer<vtkImageData>& sptr);
+
+  vtkVgSharedInstance<vtkImageData> Image;
+  vtkVgPythonAttribute(vtkVgVideoFrameMetaData, MetaData);
+
+public: // Accessor method for Python wrapping
+  // Description:
+  // Get mutable pointer to image data
+  vtkImageData* GetImageData();
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgVideoFrameCorner.cxx b/Libraries/VtkVgCore/vtkVgVideoFrameCorner.cxx
new file mode 100644
index 00000000..787c037a
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoFrameCorner.cxx
@@ -0,0 +1 @@
+#include "vtkVgVideoFrameCorner.h"
diff --git a/Libraries/VtkVgCore/vtkVgVideoFrameCorner.h b/Libraries/VtkVgCore/vtkVgVideoFrameCorner.h
new file mode 100644
index 00000000..bf0f6db0
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoFrameCorner.h
@@ -0,0 +1,19 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoFrameCorner_h
+#define __vtkVgVideoFrameCorner_h
+
+#include <vtkVgPythonUtil.h>
+
+//-----------------------------------------------------------------------------
+struct vtkVgVideoFrameCorner
+{
+  vtkVgPythonAttribute(double, Latitude);
+  vtkVgPythonAttribute(double, Longitude);
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgVideoFrameCorners.cxx b/Libraries/VtkVgCore/vtkVgVideoFrameCorners.cxx
new file mode 100644
index 00000000..e6115b9c
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoFrameCorners.cxx
@@ -0,0 +1 @@
+#include "vtkVgVideoFrameCorners.h"
diff --git a/Libraries/VtkVgCore/vtkVgVideoFrameCorners.h b/Libraries/VtkVgCore/vtkVgVideoFrameCorners.h
new file mode 100644
index 00000000..7e8e459e
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoFrameCorners.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoFrameCorners_h
+#define __vtkVgVideoFrameCorners_h
+
+#include <vtkMatrix4x4.h>
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+#include "vtkVgVideoFrameCorner.h"
+
+//-----------------------------------------------------------------------------
+struct vtkVgVideoFrameCorners
+{
+  vtkVgVideoFrameCorners() : GCS(-1) {}
+
+  vtkVgPythonAttribute(int, GCS);
+  vtkVgPythonAttribute(vtkVgVideoFrameCorner, UpperLeft);
+  vtkVgPythonAttribute(vtkVgVideoFrameCorner, UpperRight);
+  vtkVgPythonAttribute(vtkVgVideoFrameCorner, LowerLeft);
+  vtkVgPythonAttribute(vtkVgVideoFrameCorner, LowerRight);
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgVideoFrameMetaData.cxx b/Libraries/VtkVgCore/vtkVgVideoFrameMetaData.cxx
new file mode 100644
index 00000000..7de5a7b0
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoFrameMetaData.cxx
@@ -0,0 +1,163 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoFrameMetaData.h"
+
+#include <vgUtil.h>
+
+#include <vtkVgAdapt.h>
+
+#include <vtkLine.h>
+#include <vtkMath.h>
+
+#include <vgl/vgl_homg_point_2d.h>
+#include <vgl/algo/vgl_h_matrix_2d.h>
+#include <vgl/algo/vgl_h_matrix_2d_compute_linear.h>
+
+//-----------------------------------------------------------------------------
+static void prepareLine(const vtkVgVideoFrameCorner& p1,
+                        const vtkVgVideoFrameCorner& p2,
+                        double (&line)[2][3], double& length)
+{
+  line[0][0] = p1.Longitude;
+  line[0][1] = p1.Latitude;
+  line[0][2] = 0.0;
+  line[1][0] = p2.Longitude;
+  line[1][1] = p2.Latitude;
+  line[1][2] = 0.0;
+  length = sqrt(vtkMath::Distance2BetweenPoints(line[0], line[1]));
+}
+
+//-----------------------------------------------------------------------------
+static int checkIntersection(double (&line1)[2][3], double (&line2)[2][3])
+{
+  double u, v;
+  return vtkLine::Intersection(line1[0], line1[1], line2[0], line2[1], u, v);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrameMetaData::vtkVgVideoFrameMetaData() :
+  Gsd(-1.0),
+  HomographyReferenceFrame(-1),
+  Width(-1.0),
+  Height(-1.0)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgVideoFrameMetaData::AreCornerPointsValid() const
+{
+  if (this->Width < 1.0 || this->Height < 1.0)
+    {
+    vtkGenericWarningMacro(
+      "Unable to validate corner points due to invalid width/height!");
+    return false;
+    }
+
+  // Check for explicitly invalid corner points
+  if (this->WorldLocation.GCS == -1 ||
+      this->WorldLocation.UpperLeft.Latitude   > 400.0 ||
+      this->WorldLocation.UpperLeft.Longitude  > 400.0 ||
+      this->WorldLocation.LowerLeft.Latitude   > 400.0 ||
+      this->WorldLocation.LowerLeft.Longitude  > 400.0 ||
+      this->WorldLocation.UpperRight.Latitude  > 400.0 ||
+      this->WorldLocation.UpperRight.Longitude > 400.0 ||
+      this->WorldLocation.LowerRight.Latitude  > 400.0 ||
+      this->WorldLocation.LowerRight.Longitude > 400.0)
+    {
+    return false;
+    }
+
+  // Prepare to check if defined polygon is reasonable
+  double line1[2][3];
+  double line2[2][3];
+  double edgeLength[4];
+
+  // Check if top / bottom edges intersect
+  prepareLine(this->WorldLocation.UpperLeft,
+              this->WorldLocation.UpperRight, line1, edgeLength[0]);
+  prepareLine(this->WorldLocation.LowerLeft,
+              this->WorldLocation.LowerRight, line2, edgeLength[2]);
+  if (checkIntersection(line1, line2) == 2)
+    {
+    return false;
+    }
+
+  // Check if left / right edges intersect
+  prepareLine(this->WorldLocation.UpperLeft,
+              this->WorldLocation.LowerLeft, line1, edgeLength[1]);
+  prepareLine(this->WorldLocation.UpperRight,
+              this->WorldLocation.LowerRight, line2, edgeLength[3]);
+  if (checkIntersection(line1, line2) == 2)
+    {
+    return false;
+    }
+
+  // Normalize edge lengths relative to image aspect ratio; this will give
+  // lengths that approach equal as the projection approaches orthogonal
+  const double scale = static_cast<double>(this->Height) /
+                       static_cast<double>(this->Width);
+  edgeLength[0] *= scale;
+  edgeLength[2] *= scale;
+
+  // Compare shortest and longest edge lengths to determine divergence from
+  // orthogonality... some divergence is expected, but if it exceeds a given
+  // threshold, something is weird with the corners
+  const double edgeLengthFactor = 6;
+  double minLength = edgeLength[0], maxLength = edgeLength[0];
+  for (int i = 1; i < 4; i++)
+    {
+    vgExpandBoundaries(minLength, maxLength, edgeLength[i]);
+    }
+  return (maxLength <= minLength * edgeLengthFactor);
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkMatrix4x4>
+vtkVgVideoFrameMetaData::MakeImageToLatLonMatrix() const
+{
+  if (this->Width < 1.0 || this->Height < 1.0)
+    {
+    vtkGenericWarningMacro(
+      "Unable to make image to lat/lon matrix due to invalid width/height!");
+    return 0;
+    }
+
+  vcl_vector<vgl_homg_point_2d<double> > toPoints;
+  toPoints.push_back(
+    vgl_homg_point_2d<double>(this->WorldLocation.UpperLeft.Longitude,
+                              this->WorldLocation.UpperLeft.Latitude, 1));
+  toPoints.push_back(
+    vgl_homg_point_2d<double>(this->WorldLocation.UpperRight.Longitude,
+                              this->WorldLocation.UpperRight.Latitude, 1));
+  toPoints.push_back(
+    vgl_homg_point_2d<double>(this->WorldLocation.LowerRight.Longitude,
+                              this->WorldLocation.LowerRight.Latitude, 1));
+  toPoints.push_back(
+    vgl_homg_point_2d<double>(this->WorldLocation.LowerLeft.Longitude,
+                              this->WorldLocation.LowerLeft.Latitude, 1));
+
+  double llx = 0;
+  double lly = 0;
+  double urx = this->Width - 1.0;
+  double ury = this->Height - 1.0;
+
+  vcl_vector<vgl_homg_point_2d<double> > fromPoints;
+  fromPoints.push_back(vgl_homg_point_2d<double>(llx, ury, 1.0));
+  fromPoints.push_back(vgl_homg_point_2d<double>(urx, ury, 1.0));
+  fromPoints.push_back(vgl_homg_point_2d<double>(urx, lly, 1.0));
+  fromPoints.push_back(vgl_homg_point_2d<double>(llx, lly, 1.0));
+
+  vgl_h_matrix_2d_compute_linear algo;
+  vgl_h_matrix_2d<double> homography;
+
+  if (algo.compute(fromPoints, toPoints, homography))
+    {
+    return vtkVgAdapt(homography.get_matrix());
+    }
+
+  return 0;
+}
diff --git a/Libraries/VtkVgCore/vtkVgVideoFrameMetaData.h b/Libraries/VtkVgCore/vtkVgVideoFrameMetaData.h
new file mode 100644
index 00000000..758ac8c4
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoFrameMetaData.h
@@ -0,0 +1,47 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoFrameMetaData_h
+#define __vtkVgVideoFrameMetaData_h
+
+#include <vtkImageData.h>
+
+#include <vgExport.h>
+
+#include "vtkVgInstance.h"
+#include "vtkVgTimeStamp.h"
+#include "vtkVgVideoFrameCorners.h"
+
+//-----------------------------------------------------------------------------
+struct VTKVG_CORE_EXPORT vtkVgVideoFrameMetaData
+{
+  vtkVgVideoFrameMetaData();
+
+  vtkVgPythonAttribute(double, Gsd);
+  vtkVgPythonAttribute(vtkVgTimeStamp, Time);
+  vtkVgPythonAttribute(vtkVgVideoFrameCorners, WorldLocation);
+
+  vtkVgInstance<vtkMatrix4x4> Homography;
+  vtkVgPythonAttribute(int, HomographyReferenceFrame);
+
+  vtkVgPythonAttribute(int, Width);
+  vtkVgPythonAttribute(int, Height);
+
+  bool AreCornerPointsValid() const;
+  vtkSmartPointer<vtkMatrix4x4> MakeImageToLatLonMatrix() const;
+
+  void SetWidthAndHeight(int width, int height)
+    {
+    this->Width = width;
+    this->Height = height;
+    }
+
+  // Accessors for Python
+  vtkMatrix4x4* GetHomography() { return this->Homography; }
+  vtkMatrix4x4 const* GetHomography() const { return this->Homography; }
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgVideoSelectionSource.cxx b/Libraries/VtkVgCore/vtkVgVideoSelectionSource.cxx
new file mode 100644
index 00000000..6b9b4c10
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoSelectionSource.cxx
@@ -0,0 +1,197 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoSelectionSource.h"
+
+#include "vtkCellArray.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkObjectFactory.h"
+#include "vtkMath.h"
+#include "vtkPoints.h"
+#include "vtkPolyData.h"
+
+vtkStandardNewMacro(vtkVgVideoSelectionSource);
+
+//----------------------------------------------------------------------------
+vtkVgVideoSelectionSource::vtkVgVideoSelectionSource()
+{
+  for (int i = 0; i < 3; i++)
+    {
+    this->Bounds[2 * i] = -1.0;
+    this->Bounds[2 * i + 1] = 1.0;
+    }
+
+  this->RelativeTriangleSize = 0.05;
+
+  this->SetNumberOfInputPorts(0);
+}
+
+//----------------------------------------------------------------------------
+int vtkVgVideoSelectionSource::RequestData(
+  vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** vtkNotUsed(inputVector),
+  vtkInformationVector* outputVector)
+{
+  // get the info object
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+
+  // get the ouptut
+  vtkPolyData* output = vtkPolyData::SafeDownCast(
+                          outInfo->Get(vtkDataObject::DATA_OBJECT()));
+
+  // construct 4 equilateral triangles, the side of which are
+  // specifed % of sum of height and width of bounds
+
+  if (this->Bounds[0] > this->Bounds[1] ||
+      this->Bounds[2] > this->Bounds[3] ||
+      this->Bounds[4] > this->Bounds[5])
+    {
+    vtkErrorMacro("Invalid bounds!");
+    return VTK_ERROR;
+    }
+
+  double width = this->Bounds[1] - this->Bounds[0];
+  double height = this->Bounds[3] - this->Bounds[2];
+  double triangleSize = (width + height) * this->RelativeTriangleSize;
+
+  vtkPoints* outputPts = vtkPoints::New();
+  outputPts->Allocate(12);
+  output->SetPoints(outputPts);
+  outputPts->FastDelete();
+
+  vtkCellArray* polys = vtkCellArray::New();
+  polys->Allocate(16);
+  output->SetPolys(polys);
+  polys->FastDelete();
+
+  double center[3] = { (this->Bounds[1] + this->Bounds[0]) / 2.0,
+                       (this->Bounds[3] + this->Bounds[2]) / 2.0,
+                       (this->Bounds[5] + this->Bounds[4]) / 2.0
+                     };
+
+  double newPt[3];
+  vtkIdType pts[3];
+
+  if (0) // equilateral
+    {
+    // top
+    newPt[0] = center[0];
+    newPt[1] = this->Bounds[3];
+    newPt[2] = center[2];
+    pts[0] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] += 0.5 * triangleSize; // 0.5 = cos(vtkMath::Pi() / 3.0)
+    newPt[1] += sin(vtkMath::Pi() / 3.0) * triangleSize;
+    pts[1] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] -= triangleSize;
+    pts[2] = outputPts->InsertNextPoint(newPt);
+    polys->InsertNextCell(3, pts);
+
+    // bottom
+    newPt[0] = center[0];
+    newPt[1] = this->Bounds[2];
+    pts[0] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] -= 0.5 * triangleSize; // 0.5 = cos(vtkMath::Pi() / 3.0)
+    newPt[1] -= sin(vtkMath::Pi() / 3.0) * triangleSize;
+    pts[1] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] += triangleSize;
+    pts[2] = outputPts->InsertNextPoint(newPt);
+    polys->InsertNextCell(3, pts);
+
+    // left
+    newPt[0] = this->Bounds[0];
+    newPt[1] = center[1];
+    pts[0] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] -= sin(vtkMath::Pi() / 3.0) * triangleSize;
+    newPt[1] += 0.5 * triangleSize; // 0.5 = cos(vtkMath::Pi() / 3.0)
+    pts[1] = outputPts->InsertNextPoint(newPt);
+
+    newPt[1] -= triangleSize;
+    pts[2] = outputPts->InsertNextPoint(newPt);
+    polys->InsertNextCell(3, pts);
+
+    // right
+    newPt[0] = this->Bounds[1];
+    newPt[1] = center[1];
+    pts[0] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] += sin(vtkMath::Pi() / 3.0) * triangleSize;
+    newPt[1] -= 0.5 * triangleSize; // 0.5 = cos(vtkMath::Pi() / 3.0)
+    pts[1] = outputPts->InsertNextPoint(newPt);
+
+    newPt[1] += triangleSize;
+    pts[2] = outputPts->InsertNextPoint(newPt);
+    polys->InsertNextCell(3, pts);
+    }
+  else
+    {
+    // top
+    newPt[0] = center[0];
+    newPt[1] = this->Bounds[3];
+    newPt[2] = center[2];
+    pts[0] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] += width / 2.0;
+    newPt[1] += triangleSize;
+    pts[1] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] -= width;
+    pts[2] = outputPts->InsertNextPoint(newPt);
+    polys->InsertNextCell(3, pts);
+
+    // bottom
+    newPt[0] = center[0];
+    newPt[1] = this->Bounds[2];
+    pts[0] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] -= width / 2.0;
+    newPt[1] -= triangleSize;
+    pts[1] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] += width;
+    pts[2] = outputPts->InsertNextPoint(newPt);
+    polys->InsertNextCell(3, pts);
+
+    // left
+    newPt[0] = this->Bounds[0];
+    newPt[1] = center[1];
+    pts[0] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] -= triangleSize;
+    newPt[1] += height / 2.0;
+    pts[1] = outputPts->InsertNextPoint(newPt);
+
+    newPt[1] -= height;
+    pts[2] = outputPts->InsertNextPoint(newPt);
+    polys->InsertNextCell(3, pts);
+
+    // right
+    newPt[0] = this->Bounds[1];
+    newPt[1] = center[1];
+    pts[0] = outputPts->InsertNextPoint(newPt);
+
+    newPt[0] += triangleSize;
+    newPt[1] -= height / 2.0;
+    pts[1] = outputPts->InsertNextPoint(newPt);
+
+    newPt[1] += height;
+    pts[2] = outputPts->InsertNextPoint(newPt);
+    polys->InsertNextCell(3, pts);
+    }
+
+  return 1;
+}
+
+//----------------------------------------------------------------------------
+void vtkVgVideoSelectionSource::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgVideoSelectionSource.h b/Libraries/VtkVgCore/vtkVgVideoSelectionSource.h
new file mode 100644
index 00000000..f789bcdd
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoSelectionSource.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgVideoSelectionSource -
+// .SECTION Description
+
+#ifndef __vtkVgVideoSelectionSource_h
+#define __vtkVgVideoSelectionSource_h
+
+#include "vtkPolyDataAlgorithm.h"
+
+#include <vgExport.h>
+
+class VTKVG_CORE_EXPORT vtkVgVideoSelectionSource : public vtkPolyDataAlgorithm
+{
+public:
+  static vtkVgVideoSelectionSource* New();
+  vtkTypeMacro(vtkVgVideoSelectionSource, vtkPolyDataAlgorithm);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Specify the bounds of the box to be used in Axis Aligned mode.
+  vtkSetVector6Macro(Bounds, double);
+  vtkGetVectorMacro(Bounds, double, 6);
+
+protected:
+  vtkVgVideoSelectionSource();
+  ~vtkVgVideoSelectionSource() {}
+
+  int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*);
+  double Bounds[6];
+  double RelativeTriangleSize;
+
+private:
+  vtkVgVideoSelectionSource(const vtkVgVideoSelectionSource&);  // Not implemented.
+  void operator=(const vtkVgVideoSelectionSource&);  // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgCore/vtkVgVideoSourceBase.cxx b/Libraries/VtkVgCore/vtkVgVideoSourceBase.cxx
new file mode 100644
index 00000000..34c44f77
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoSourceBase.cxx
@@ -0,0 +1,23 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoSourceBase.h"
+
+//-----------------------------------------------------------------------------
+vtkVgVideoSourceBase::vtkVgVideoSourceBase()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoSourceBase::~vtkVgVideoSourceBase()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoSourceBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  vtkObject::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgCore/vtkVgVideoSourceBase.h b/Libraries/VtkVgCore/vtkVgVideoSourceBase.h
new file mode 100644
index 00000000..e91cb1f4
--- /dev/null
+++ b/Libraries/VtkVgCore/vtkVgVideoSourceBase.h
@@ -0,0 +1,74 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoSourceBase_h
+#define __vtkVgVideoSourceBase_h
+
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+#include <vgNamespace.h>
+
+#include "vtkVgMacros.h"
+
+class  vtkVgTimeStamp;
+struct vtkVgVideoFrame;
+struct vtkVgVideoFrameMetaData;
+
+class VTKVG_CORE_EXPORT vtkVgVideoSourceBase : public vtkObject
+{
+public:
+  vtkVgClassMacro(vtkVgVideoSourceBase);
+  vtkTypeMacro(vtkVgVideoSourceBase, vtkObject);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Get video time stamp matching seek request.
+  //
+  // This is intended to allow users to look up the time stamp that a frame
+  // request would give, in order to test if they already have that time stamp,
+  // in order to avoid the overhead of retrieving the actual pixels.
+  virtual vtkVgTimeStamp ResolveSeek(
+    const vtkVgTimeStamp&,
+    vg::SeekMode direction = vg::SeekNearest) const = 0;
+
+  // Description:
+  // Get a frame from the video.
+  virtual vtkVgVideoFrame GetFrame(
+    const vtkVgTimeStamp&,
+    vg::SeekMode direction = vg::SeekNearest) const = 0;
+
+  // Description:
+  // Get metadata for the specified frame.
+  virtual vtkVgVideoFrameMetaData GetMetadata(
+    const vtkVgTimeStamp&,
+    vg::SeekMode direction = vg::SeekNearest) const = 0;
+
+  // Description:
+  // Get the temporally 'smallest' time stamp available in the video.
+  virtual vtkVgTimeStamp GetMinTime() const = 0;
+
+  // Description:
+  // Get the temporally 'largest' time stamp available in the video.
+  virtual vtkVgTimeStamp GetMaxTime() const = 0;
+
+  // Description:
+  // Get the number of frames available in the video clip.
+  virtual int GetFrameCount() const = 0;
+
+protected:
+  vtkVgVideoSourceBase();
+  virtual ~vtkVgVideoSourceBase();
+
+private:
+  vtkVgVideoSourceBase(const vtkVgVideoSourceBase&); // disabled
+  vtkVgVideoSourceBase& operator=(const vtkVgVideoSourceBase&); // disabled
+};
+
+#endif // __vtkVgVideoSourceBase_h
diff --git a/Libraries/VtkVgIO/CMakeLists.txt b/Libraries/VtkVgIO/CMakeLists.txt
new file mode 100644
index 00000000..6f37ae11
--- /dev/null
+++ b/Libraries/VtkVgIO/CMakeLists.txt
@@ -0,0 +1,67 @@
+# Name of the project.
+project(vtkVgIO)
+
+# GDAL is required for NITF and JP2 support
+find_package(GDAL REQUIRED)
+
+if(NOT VTK_USE_SYSTEM_JPEG)
+  add_definitions(-DVTK_JPEG_INCLUDE_JERROR)
+endif(NOT VTK_USE_SYSTEM_JPEG)
+
+# Requires VTK and GDAL.
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+  ${GDAL_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS}
+)
+
+# Source files.
+set(vtkVgIOSrcs
+  vtkGDALReader.cxx
+  vtkVgGDALReader.cxx
+  vtkVgNitfEngrda.cxx
+  vtkVgNitfMetaDataParser.cxx
+)
+
+# Install headers
+set(vtkVgIOInstallHeaders
+  vtkGDALReader.h
+  vtkVgGDALReader.h
+  vtkVgNitfEngrda.h
+  vtkVgNitfMetaDataParser.h
+)
+
+set_source_files_properties(
+  vtkVgNitfEngrda
+  vtkVgNitfMetaDataParser
+  PROPERTIES WRAP_EXCLUDE TRUE
+)
+
+vg_vtk_module(${PROJECT_NAME}
+  DEPENDS
+  vtkIOCore
+  vtkIOLegacy
+  vtkRenderingOpenGL
+)
+
+vtk_module_library(${PROJECT_NAME}
+  ${vtkVgIOSrcs}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vgCommon
+  vtkVgCore
+  LINK_LIBRARIES
+  LINK_PRIVATE
+  ${GDAL_LIBRARY}
+  ${Boost_LIBRARIES}
+)
+
+vg_add_test_subdirectory()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vtkVgIOInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VtkVgIO)
+
+vg_wrap_vtk_library(${PROJECT_NAME})
diff --git a/Libraries/VtkVgIO/Testing/CMakeLists.txt b/Libraries/VtkVgIO/Testing/CMakeLists.txt
new file mode 100644
index 00000000..43b2aed6
--- /dev/null
+++ b/Libraries/VtkVgIO/Testing/CMakeLists.txt
@@ -0,0 +1,10 @@
+# FIXME: For now we are pulling jpeg library via vil in vtkVgCore.
+set(VGTEST_LINK_LIBRARIES vtkVgIO vtkVgCore vtkTestingRendering)
+
+vg_add_test(vtkVgIO-GDALReader testGDALReader
+            SOURCES TestGDALReader.cxx
+            LINK_LIBRARIES ${VGTEST_LINK_LIBRARIES}
+            ARGS -D "${VISGUI_DATA_ROOT}"
+                 -T "${visGUI_BINARY_DIR}/Testing/Temporary"
+                 -V "${VISGUI_BASELINE_ROOT}/20091021202634-01000197-VIS.ntf.r0"
+)
diff --git a/Libraries/VtkVgIO/Testing/TestGDALReader.cxx b/Libraries/VtkVgIO/Testing/TestGDALReader.cxx
new file mode 100644
index 00000000..55f3a221
--- /dev/null
+++ b/Libraries/VtkVgIO/Testing/TestGDALReader.cxx
@@ -0,0 +1,80 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <cstdio>
+
+// VG includes.
+#include "../vtkGDALReader.h"
+
+// VTK includes.
+#include <vtkCommand.h>
+#include <vtkImageActor.h>
+#include <vtkProp.h>
+#include <vtkRegressionTestImage.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkSmartPointer.h>
+#include <vtkTestUtilities.h>
+#include <vtkTransform.h>
+
+void PrintCornerPoints(const char* name, const double* corners)
+{
+  std::cerr << name << " " << corners[0] << " " << corners[1] << std::endl;
+}
+
+
+int main(int argc, char** argv)
+{
+  char* fileName = vtkTestUtilities::ExpandDataFileName(
+                     argc, argv, "Data/20091021202634-01000197-VIS.ntf.r0");
+
+  // Create and use GDAL reader
+  vtkSmartPointer<vtkGDALReader> reader(vtkSmartPointer<vtkGDALReader>::New());
+  reader->SetFileName(fileName);
+  reader->Update();
+
+  const char* projectionString = reader->GetProjectionString();
+  if (projectionString != NULL)
+    {
+    std::cerr << "Projection string: " << projectionString << std::endl;
+    }
+
+  const double* geocornerPoints = reader->GetGeoCornerPoints();
+  PrintCornerPoints("UpperLeft", &geocornerPoints[0]);
+  PrintCornerPoints("LowerLeft", &geocornerPoints[2]);
+  PrintCornerPoints("LowerRight", &geocornerPoints[4]);
+  PrintCornerPoints("UpperRight", &geocornerPoints[6]);
+
+  // Create actor
+  vtkSmartPointer<vtkImageActor> actor(vtkSmartPointer<vtkImageActor>::New());
+  actor->SetInputData(reader->GetOutput());
+
+  // Create renderer and attach our actor to it
+  vtkSmartPointer<vtkRenderer> ren(vtkSmartPointer<vtkRenderer>::New());
+  ren->AddViewProp(actor);
+
+  // Create render window and attach renderer to it
+  vtkSmartPointer<vtkRenderWindow> renWin = vtkSmartPointer<vtkRenderWindow>::New();
+  renWin->AddRenderer(ren);
+
+  vtkSmartPointer<vtkRenderWindowInteractor> interactor(
+    vtkSmartPointer<vtkRenderWindowInteractor>::New());
+  interactor->SetRenderWindow(renWin);
+
+  renWin->SetSize(400, 400);
+  renWin->Render();
+  interactor->Initialize();
+  renWin->Render();
+
+  int retVal = vtkRegressionTestImage(renWin);
+  if (retVal == vtkRegressionTester::DO_INTERACTOR)
+    {
+    interactor->Start();
+    }
+
+  return !retVal;
+}
diff --git a/Libraries/VtkVgIO/vtkGDALReader.cxx b/Libraries/VtkVgIO/vtkGDALReader.cxx
new file mode 100644
index 00000000..9d03f48c
--- /dev/null
+++ b/Libraries/VtkVgIO/vtkGDALReader.cxx
@@ -0,0 +1,842 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkGDALReader.h"
+
+// VTK includes
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkDoubleArray.h>
+#include <vtkFloatArray.h>
+#include <vtkImageData.h>
+#include <vtkInformationVector.h>
+#include <vtkInformation.h>
+#include <vtkIntArray.h>
+#include <vtkObjectFactory.h>
+#include <vtkPointData.h>
+#include <vtkPoints.h>
+#include <vtkShortArray.h>
+#include <vtkSmartPointer.h>
+#include <vtkStreamingDemandDrivenPipeline.h>
+#include <vtkUnsignedCharArray.h>
+#include <vtkUnsignedIntArray.h>
+#include <vtkUnsignedShortArray.h>
+
+// GDAL includes
+#include <gdal_priv.h>
+#include <ogr_spatialref.h>
+
+// C/C++ includes
+#include <cassert>
+#include <iostream>
+#include <vector>
+
+vtkStandardNewMacro(vtkGDALReader);
+
+namespace
+{
+  double Min(double val1, double val2)
+    {
+    return ((val1 < val2) ? val1 : val2);
+    }
+
+  double Max(double val1, double val2)
+    {
+    return ((val1 > val2) ? val1 : val2);
+    }
+}
+
+class vtkGDALReader::vtkGDALReaderInternal
+{
+public:
+  typedef void *OGRCoordinateTransformationH;
+
+  vtkGDALReaderInternal(vtkGDALReader* reader);
+  ~vtkGDALReaderInternal();
+
+  void ReadMetaData(const std::string& fileName);
+  void ReadData(const std::string& fileName);
+
+  template <typename VTK_TYPE, typename RAW_TYPE> void GenericReadData();
+  void ReleaseData();
+
+  template <typename VTK_TYPE, typename RAW_TYPE>
+  void Convert(std::vector<RAW_TYPE>& rawImageData,
+               int targetWidth, int targetHeight);
+
+  bool GetGeoCornerPoint(GDALDataset* dataset,
+                         OGRCoordinateTransformationH htransform,
+                         double x, double y, double* out) const;
+
+  const double* GetGeoCornerPoints();
+
+  int NumberOfBands;
+  int NumberOfBytesPerPixel;
+
+  int SourceOffset[2];
+  int SourceDimensions[2];
+
+  std::string PrevReadFileName;
+
+  GDALDataset* GDALData;
+  GDALDataType TargetDataType;
+
+  // Bad corner point
+  double BadCornerPoint;
+
+  // Upper left, lower left, upper right, lower right
+  double CornerPoints[8];
+
+  vtkSmartPointer<vtkImageData> ImageData;
+  vtkGDALReader* Reader;
+};
+
+//-----------------------------------------------------------------------------
+vtkGDALReader::vtkGDALReaderInternal::vtkGDALReaderInternal(
+  vtkGDALReader* reader) :
+  NumberOfBands(0),
+  NumberOfBytesPerPixel(0),
+  GDALData(0),
+  TargetDataType(GDT_Byte),
+  BadCornerPoint(-1),
+  ImageData(0),
+  Reader(reader)
+{
+  this->SourceOffset[0] = 0;
+  this->SourceOffset[1] = 0;
+  this->SourceDimensions[0] = 0;
+  this->SourceDimensions[1] = 0;
+
+  for (int i = 0; i < 8; ++i)
+    {
+    this->CornerPoints[i] = this->BadCornerPoint;
+    }
+
+  // Enable all the drivers.
+  GDALAllRegister();
+}
+
+//-----------------------------------------------------------------------------
+vtkGDALReader::vtkGDALReaderInternal::~vtkGDALReaderInternal()
+{
+  this->ReleaseData();
+}
+
+//-----------------------------------------------------------------------------
+void vtkGDALReader::vtkGDALReaderInternal::ReadMetaData(
+  const std::string& fileName)
+{
+  if (fileName.compare(this->PrevReadFileName) == 0)
+    {
+    return;
+    }
+
+  // Free up the last read data, if any.
+  this->ReleaseData();
+
+  this->GDALData = (GDALDataset*) GDALOpen(fileName.c_str(), GA_ReadOnly);
+
+  if (this->GDALData == NULL)
+    {
+    std::cout << "NO GDALData loaded for file "
+              << fileName << std::endl;
+    }
+  else
+    {
+    this->PrevReadFileName = fileName;
+    this->NumberOfBands = this->GDALData->GetRasterCount();
+
+    // Clear last read metadata
+    this->Reader->MetaData.clear();
+
+    this->Reader->RasterDimensions[0] = this->GDALData->GetRasterXSize();
+    this->Reader->RasterDimensions[1] = this->GDALData->GetRasterYSize();
+
+    GDALDriverH driver = GDALGetDatasetDriver(this->GDALData);
+    this->Reader->DriverShortName = GDALGetDriverShortName(driver);
+    this->Reader->DriverLongName = GDALGetDriverLongName(driver);
+
+    char** papszMetaData = GDALGetMetadata(this->GDALData, NULL);
+    if (CSLCount(papszMetaData) > 0)
+      {
+      for (int i = 0; papszMetaData[i] != NULL; ++i)
+        {
+        this->Reader->MetaData.push_back(papszMetaData[i]);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkGDALReader::vtkGDALReaderInternal::ReadData(
+  const std::string& fileName)
+{
+  // If data is not initialized by now, it means that we were unable to read
+  // the file.
+  if (!this->GDALData)
+    {
+    std::cerr << "Failed to read: " << fileName << std::endl;
+    return;
+    }
+
+  for (int i = 1; i <= this->NumberOfBands; ++i)
+    {
+    GDALRasterBand* rasterBand = this->GDALData->GetRasterBand(i);
+    if (this->NumberOfBytesPerPixel == 0)
+      {
+      this->TargetDataType = rasterBand->GetRasterDataType();
+      switch (this->TargetDataType)
+        {
+        case (GDT_Byte): this->NumberOfBytesPerPixel = 1; break;
+        case (GDT_UInt16): this->NumberOfBytesPerPixel = 2; break;
+        case (GDT_Int16): this->NumberOfBytesPerPixel = 2; break;
+        case (GDT_UInt32): this->NumberOfBytesPerPixel = 4; break;
+        case (GDT_Int32): this->NumberOfBytesPerPixel = 4; break;
+        case (GDT_Float32): this->NumberOfBytesPerPixel = 4; break;
+        case (GDT_Float64): this->NumberOfBytesPerPixel = 8; break;
+        default: this->NumberOfBytesPerPixel = 0; break;
+        }
+      }
+    }
+
+  // Initialize
+  this->ImageData = vtkSmartPointer<vtkImageData>::New();
+
+  switch (this->TargetDataType)
+    {
+    case (GDT_UInt16):
+      {
+      this->Reader->SetDataScalarTypeToUnsignedShort();
+      this->GenericReadData<vtkUnsignedShortArray, unsigned short>();
+      break;
+      }
+    case (GDT_Int16):
+      {
+      this->Reader->SetDataScalarTypeToShort();
+      this->GenericReadData<vtkShortArray, short>();
+      break;
+      }
+    case (GDT_UInt32):
+      {
+      this->Reader->SetDataScalarTypeToUnsignedInt();
+      this->GenericReadData<vtkUnsignedIntArray, unsigned int>();
+      break;
+      }
+    case (GDT_Int32):
+      {
+      this->Reader->SetDataScalarTypeToInt();
+      this->GenericReadData<vtkIntArray, int>();
+      break;
+      }
+    case (GDT_Float32):
+      {
+      this->Reader->SetDataScalarTypeToFloat();
+      this->GenericReadData<vtkFloatArray, float>();
+      break;
+      }
+    case (GDT_Float64):
+      {
+      this->Reader->SetDataScalarTypeToDouble();
+      this->GenericReadData<vtkDoubleArray, double>();
+      break;
+      }
+    case (GDT_Byte):
+    default:
+      {
+      this->Reader->SetDataScalarTypeToUnsignedChar();
+      this->GenericReadData<vtkUnsignedCharArray, unsigned char>();
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename VTK_TYPE, typename RAW_TYPE>
+void vtkGDALReader::vtkGDALReaderInternal::GenericReadData()
+{
+  // Pixel data.
+  std::vector<RAW_TYPE> rawImageData;
+
+  // Possible bands
+  GDALRasterBand* redBand = 0;
+  GDALRasterBand* greenBand = 0;
+  GDALRasterBand* blueBand = 0;
+  GDALRasterBand* alphaBand = 0;
+  GDALRasterBand* greyBand = 0;
+
+  for (int i = 1; i <= this->NumberOfBands; ++i)
+    {
+    GDALRasterBand* rasterBand = this->GDALData->GetRasterBand(i);
+    if (this->NumberOfBytesPerPixel == 0)
+      {
+      this->TargetDataType = rasterBand->GetRasterDataType();
+      switch (this->TargetDataType)
+        {
+        case (GDT_Byte): this->NumberOfBytesPerPixel = 1; break;
+        case (GDT_UInt16): this->NumberOfBytesPerPixel = 2; break;
+        case (GDT_Int16): this->NumberOfBytesPerPixel = 2; break;
+        case (GDT_UInt32): this->NumberOfBytesPerPixel = 4; break;
+        case (GDT_Int32): this->NumberOfBytesPerPixel = 4; break;
+        case (GDT_Float32): this->NumberOfBytesPerPixel = 4; break;
+        case (GDT_Float64): this->NumberOfBytesPerPixel = 8; break;
+        default: this->NumberOfBytesPerPixel = 0; break;
+        }
+      }
+
+    if ((rasterBand->GetColorInterpretation() == GCI_RedBand) ||
+        (rasterBand->GetColorInterpretation() == GCI_YCbCr_YBand))
+      {
+      redBand = rasterBand;
+      }
+    else if ((rasterBand->GetColorInterpretation() == GCI_GreenBand) ||
+             (rasterBand->GetColorInterpretation() == GCI_YCbCr_CbBand))
+      {
+      greenBand = rasterBand;
+      }
+    else if ((rasterBand->GetColorInterpretation() == GCI_BlueBand) ||
+             (rasterBand->GetColorInterpretation() == GCI_YCbCr_CrBand))
+      {
+      blueBand = rasterBand;
+      }
+    else if (rasterBand->GetColorInterpretation() == GCI_AlphaBand)
+      {
+      alphaBand = rasterBand;
+      }
+    else if (rasterBand->GetColorInterpretation() == GCI_GrayIndex)
+      {
+      greyBand = rasterBand;
+      }
+    }
+
+  const int& destWidth = this->Reader->TargetDimensions[0];
+  const int& destHeight = this->Reader->TargetDimensions[1];
+
+  // GDAL top left is at 0,0
+  const int& windowX = this->SourceOffset[0];
+  const int& windowY = this->SourceOffset[1];
+  const int& windowWidth = this->SourceDimensions[0];
+  const int& windowHeight = this->SourceDimensions[1];
+
+  const int& pixelSpace = this->NumberOfBytesPerPixel;
+  const int lineSpace = destWidth * pixelSpace;
+  const int bandSpace = destWidth * destHeight * this->NumberOfBytesPerPixel;
+  CPLErr err;
+
+  // TODO: Support other band types
+  if (redBand && greenBand && blueBand)
+    {
+    if (alphaBand)
+      {
+      this->Reader->SetNumberOfScalarComponents(4);
+      rawImageData.resize(4 * destWidth * destHeight * pixelSpace);
+
+      err = redBand->RasterIO(
+              GF_Read, windowX, windowY,  windowWidth, windowHeight,
+              (void*)((GByte*)&rawImageData[0] + 0 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, pixelSpace, lineSpace);
+      err = greenBand->RasterIO(
+              GF_Read, windowX, windowY,  windowWidth, windowHeight,
+              (void*)((GByte*)&rawImageData[0] + 1 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, pixelSpace, lineSpace);
+      err = blueBand->RasterIO(
+              GF_Read, windowX, windowY,  windowWidth, windowHeight,
+              (void*)((GByte*)&rawImageData[0] + 2 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, pixelSpace, lineSpace);
+      err = alphaBand->RasterIO(
+              GF_Read, windowX, windowY,  windowWidth, windowHeight,
+              (void*)((GByte*)&rawImageData[0] + 3 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, pixelSpace, lineSpace);
+      }
+    else
+      {
+      this->Reader->SetNumberOfScalarComponents(3);
+      rawImageData.resize(3 * destWidth * destHeight * pixelSpace);
+
+      err = redBand->RasterIO(
+              GF_Read, windowX, windowY,  windowWidth, windowHeight,
+              (void*)((GByte*)&rawImageData[0] + 0 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, 0, 0);
+      err = greenBand->RasterIO(GF_Read, windowX, windowY,  windowWidth, windowHeight,
+             (void*)((GByte*)&rawImageData[0] + 1 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, 0,0);
+      err = blueBand->RasterIO(GF_Read, windowX, windowY,  windowWidth, windowHeight,
+              (void*)((GByte*)&rawImageData[0] + 2 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, 0,0);
+      }
+    }
+  else if (greyBand)
+    {
+    if (alphaBand)
+      {
+      // Luminance alpha
+      this->Reader->SetNumberOfScalarComponents(2);
+      rawImageData.resize(2 * destWidth * destHeight * pixelSpace);
+
+      err = greyBand->RasterIO(
+              GF_Read, windowX, windowY,  windowWidth, windowHeight,
+              (void*)((GByte*)&rawImageData[0] + 0 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, pixelSpace, lineSpace);
+      err =  alphaBand->RasterIO(
+               GF_Read, windowX, windowY,  windowWidth, windowHeight,
+               (void*)((GByte*)&rawImageData[0] + 1 * bandSpace), destWidth, destHeight,
+               this->TargetDataType, pixelSpace, lineSpace);
+      }
+    else
+      {
+      // Luminance
+      this->Reader->SetNumberOfScalarComponents(1);
+      rawImageData.resize(destWidth * destHeight * pixelSpace);
+      err = greyBand->RasterIO(
+              GF_Read, windowX, windowY,  windowWidth, windowHeight,
+              (void*)((GByte*)&rawImageData[0] + 0 * bandSpace), destWidth, destHeight,
+              this->TargetDataType, pixelSpace, lineSpace);
+      }
+    }
+  else
+    {
+    std::cerr << "Unknown raster band type \n";
+    return;
+    }
+
+  assert(err == CE_None);
+
+  // SEt meta data on the image
+  this->ImageData->SetExtent(0, (destWidth - 1), 0, (destHeight - 1), 0, 0);
+  this->ImageData->SetSpacing(this->Reader->DataSpacing[0],
+                              this->Reader->DataSpacing[1],
+                              this->Reader->DataSpacing[2]);
+  this->ImageData->SetOrigin(this->Reader->DataOrigin[0],
+                             this->Reader->DataOrigin[1],
+                             this->Reader->DataOrigin[2]);
+
+  this->Convert<VTK_TYPE, RAW_TYPE>(rawImageData, destWidth, destHeight);
+}
+
+//----------------------------------------------------------------------------
+void vtkGDALReader::vtkGDALReaderInternal::ReleaseData()
+{
+  if (this->GDALData)
+    {
+    delete this->GDALData;
+    this->GDALData = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+template <typename VTK_TYPE, typename RAW_TYPE>
+void vtkGDALReader::vtkGDALReaderInternal::Convert(
+  std::vector<RAW_TYPE>& rawImageData, int targetWidth,
+  int targetHeight)
+{
+  if (!this->ImageData)
+    {
+    return;
+    }
+
+  vtkIdType targetIndex;
+  vtkIdType sourceIndex;
+
+  vtkSmartPointer<VTK_TYPE> scArr(vtkSmartPointer<VTK_TYPE>::New());
+  scArr->SetNumberOfComponents(this->NumberOfBands);
+  scArr->SetNumberOfTuples(targetWidth * targetHeight);
+
+  for (int j = 0, k = (targetHeight - 1); j < targetHeight; ++j, --k)
+    {
+    for (int i = 0; i < targetWidth; ++i)
+      {
+      // Each band GDALData is stored in width * height size array.
+      for (int bandIndex = 0; bandIndex < this->NumberOfBands; ++bandIndex)
+        {
+        targetIndex = i * NumberOfBands +
+                      j * targetWidth * NumberOfBands + bandIndex;
+        sourceIndex = i + k * targetWidth +
+                      bandIndex * targetWidth * targetHeight;
+
+        scArr->InsertValue(targetIndex, rawImageData[sourceIndex]);
+        }
+      }
+    }
+  this->ImageData->GetPointData()->SetScalars(scArr);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkGDALReader::vtkGDALReaderInternal::GetGeoCornerPoint(GDALDataset* dataset,
+  OGRCoordinateTransformationH htransform, double x, double y, double* out) const
+{
+  bool retVal = false;
+
+  if (!dataset)
+    {
+    std::cerr << "Empty GDAL dataset" << std::endl;
+    return retVal;
+    }
+
+  if (!out)
+    {
+    return retVal;
+    }
+
+  double dfGeoX;
+  double dfGeoY;
+  double adfGeoTransform[6];
+
+  const char *gcpProj = this->GDALData->GetGCPProjection();
+  const GDAL_GCP *gcps = this->GDALData->GetGCPs();
+
+  if (gcpProj == NULL || gcps == NULL)
+    {
+    // Transform the point into georeferenced coordinates
+    if (GDALGetGeoTransform(this->GDALData, adfGeoTransform) == CE_None)
+      {
+      dfGeoX = adfGeoTransform[0] + adfGeoTransform[1] * x +
+        adfGeoTransform[2] * y;
+      dfGeoY = adfGeoTransform[3] + adfGeoTransform[4] * x +
+        adfGeoTransform[5] * y;
+
+      retVal = true;
+      }
+    else
+      {
+      dfGeoX = x;
+      dfGeoY = y;
+
+      retVal = false;
+      }
+    }
+  else
+    {
+    // 1st pass: we should realy have a call to the reader that returns
+    // the homography, but for now, look for mathcing corner and pass back
+    // the matching corner point ("0" pixel on input means "0.5" as far as
+    // GDAL goes
+    bool leftCorner = (x == 0);
+    bool upperCorner = (y == 0);
+    for (int i = 0; i < 4; ++i)
+      {
+      bool gcpLeftCorner = (gcps[i].dfGCPPixel == 0.5);
+      bool gcpUpperCorner = (gcps[i].dfGCPLine == 0.5);
+      if (gcpLeftCorner == leftCorner && gcpUpperCorner == upperCorner)
+        {
+        dfGeoX = gcps[i].dfGCPX;
+        dfGeoY = gcps[i].dfGCPY;
+        }
+      }
+    }
+
+  out[0] = dfGeoX;
+  out[1] = dfGeoY;
+
+  return retVal;
+}
+
+//-----------------------------------------------------------------------------
+const double* vtkGDALReader::vtkGDALReaderInternal::GetGeoCornerPoints()
+{
+  this->GetGeoCornerPoint(this->GDALData, 0,
+                          0,
+                          0,
+                          &this->CornerPoints[0]);
+  this->GetGeoCornerPoint(this->GDALData, 0,
+                          0,
+                          this->Reader->RasterDimensions[1],
+                          &this->CornerPoints[2]);
+  this->GetGeoCornerPoint(this->GDALData, 0,
+                          this->Reader->RasterDimensions[0],
+                          this->Reader->RasterDimensions[1],
+                          &this->CornerPoints[4]);
+  this->GetGeoCornerPoint(this->GDALData, 0,
+                          this->Reader->RasterDimensions[0],
+                          0,
+                          &this->CornerPoints[6]);
+
+  return this->CornerPoints;
+}
+
+//-----------------------------------------------------------------------------
+vtkGDALReader::vtkGDALReader() :
+  FileName(0),
+  Implementation(0)
+{
+  this->Implementation = new vtkGDALReaderInternal(this);
+
+  this->SetNumberOfInputPorts(0);
+  this->SetNumberOfOutputPorts(1);
+
+  this->DataOrigin[0] = 0.0;
+  this->DataOrigin[1] = 0.0;
+  this->DataOrigin[2] = 0.0;
+
+  this->DataSpacing[0] = 1.0;
+  this->DataSpacing[1] = 1.0;
+  this->DataSpacing[2] = 1.0;
+
+  this->DataExtents[0] = -1;
+  this->DataExtents[1] = -1;
+  this->DataExtents[2] = -1;
+  this->DataExtents[3] = -1;
+  this->DataExtents[4] = -1;
+  this->DataExtents[5] = -1;
+
+  this->TargetDimensions[0] = -1;
+  this->TargetDimensions[1] = -1;
+
+  this->RasterDimensions[0] = -1;
+  this->RasterDimensions[1] = -1;
+}
+
+//-----------------------------------------------------------------------------
+vtkGDALReader::~vtkGDALReader()
+{
+  if (this->Implementation)
+    {
+    delete this->Implementation;
+    this->Implementation = 0;
+    }
+
+  if (this->FileName)
+    {
+    this->SetFileName(0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+const char* vtkGDALReader::GetProjectionString() const
+{
+  return this->Projection.c_str();
+}
+
+//-----------------------------------------------------------------------------
+const double* vtkGDALReader::GetGeoCornerPoints()
+{
+  return this->Implementation->GetGeoCornerPoints();
+}
+
+//-----------------------------------------------------------------------------
+int* vtkGDALReader::GetDataExtent()
+{
+  return this->DataExtents;
+}
+
+//-----------------------------------------------------------------------------
+const std::vector<std::string>& vtkGDALReader::GetMetaData()
+{
+  return this->MetaData;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<std::string> vtkGDALReader::GetDomainMetaData(
+  const std::string& domain)
+{
+  std::vector<std::string> domainMetaData;
+
+  char** papszMetadata =
+    GDALGetMetadata(this->Implementation->GDALData, domain.c_str());
+
+  if (CSLCount(papszMetadata) > 0)
+    {
+    for (int i = 0; papszMetadata[i] != NULL; ++i)
+      {
+      domainMetaData.push_back(papszMetadata[i]);
+      }
+    }
+
+  return domainMetaData;
+}
+
+//-----------------------------------------------------------------------------
+const std::string& vtkGDALReader::GetDriverShortName()
+{
+  return this->DriverShortName;
+}
+
+//-----------------------------------------------------------------------------
+const std::string& vtkGDALReader::GetDriverLongName()
+{
+  return this->DriverLongName;
+}
+
+#ifdef _MSC_VER
+#define strdup _strdup
+#endif
+
+//-----------------------------------------------------------------------------
+int vtkGDALReader::RequestData(vtkInformation* vtkNotUsed(request),
+                               vtkInformationVector** vtkNotUsed(inputVector),
+                               vtkInformationVector* outputVector)
+{
+  if (this->TargetDimensions[0] <= 0 || this->TargetDimensions[1] <= 0)
+    {
+    vtkWarningMacro( << "Invalid target dimensions")
+    }
+
+  this->Implementation->ReadData(this->FileName);
+  if (!this->Implementation->GDALData)
+    {
+    vtkErrorMacro("Failed to read "  << this->FileName);
+    return 0;
+    }
+
+  // Get the projection.
+  char* proj = strdup(this->Implementation->GDALData->GetProjectionRef());
+  OGRSpatialReference spRef(proj);
+
+  char* projection;
+  spRef.exportToProj4(&projection);
+  this->Projection = projection;
+  CPLFree(projection);
+
+  // Check if file has been changed here.
+  // If changed then throw the vtxId time and load a new one.
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    return 0;
+    }
+
+  vtkDataObject* dataObj = outInfo->Get(vtkDataObject::DATA_OBJECT());
+  if (!dataObj)
+    {
+    return 0;
+    }
+
+  vtkImageData::SafeDownCast(dataObj)->ShallowCopy(this->Implementation->ImageData);
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+int vtkGDALReader::RequestInformation(vtkInformation * vtkNotUsed(request),
+  vtkInformationVector **vtkNotUsed(inputVector),
+  vtkInformationVector *outputVector)
+{
+  // get the info objects
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information object");
+    return 0;
+    }
+
+  if (!this->FileName)
+    {
+    vtkErrorMacro("Requires valid input file name") ;
+    return 0;
+    }
+
+  this->Implementation->ReadMetaData(this->FileName);
+  if (!this->Implementation->GDALData)
+    {
+    vtkErrorMacro("Failed to read "  << this->FileName);
+    return 0;
+    }
+
+  if (this->RasterDimensions[0] <= 0 &&
+      this->RasterDimensions[1] <= 0)
+    {
+    vtkErrorMacro("Invalid image dimensions");
+    return 0;
+    }
+
+  if (this->TargetDimensions[0] == -1 &&
+      this->TargetDimensions[1] == -1)
+    {
+    this->TargetDimensions[0] = this->RasterDimensions[0];
+    this->TargetDimensions[1] = this->RasterDimensions[1];
+    }
+
+  if (this->DataExtents[0] == -1)
+    {
+    this->DataExtents[0] = 0;
+    this->DataExtents[1] = this->RasterDimensions[0] - 1;
+    this->DataExtents[2] = 0;
+    this->DataExtents[3] = this->RasterDimensions[1] - 1;
+    this->DataExtents[4] = 0;
+    this->DataExtents[5] = 0;
+    }
+
+  // GDAL top left is at 0,0
+  this->Implementation->SourceOffset[0] = this->DataExtents[0];
+  this->Implementation->SourceOffset[1] = this->RasterDimensions[1] -
+                                          (this->DataExtents[3] + 1);
+
+  this->Implementation->SourceDimensions[0] =
+    this->DataExtents[1] - this->DataExtents[0] + 1;
+  this->Implementation->SourceDimensions[1] =
+    this->DataExtents[3] - this->DataExtents[2] + 1;
+
+  // Clamp pixel offset and image dimension
+  this->Implementation->SourceOffset[0] =
+    Min(this->RasterDimensions[0], this->Implementation->SourceOffset[0]);
+  this->Implementation->SourceOffset[0] =
+    Max(0.0, this->Implementation->SourceOffset[0]);
+
+  this->Implementation->SourceOffset[1] =
+    Min(this->RasterDimensions[1], this->Implementation->SourceOffset[1]);
+  this->Implementation->SourceOffset[1] =
+    Max(0.0, this->Implementation->SourceOffset[1]);
+
+  this->Implementation->SourceDimensions[0] =
+    Max(0.0, this->Implementation->SourceDimensions[0]);
+  if ((this->Implementation->SourceDimensions[0] +
+       this->Implementation->SourceOffset[0]) >
+      this->RasterDimensions[0])
+    {
+    this->Implementation->SourceDimensions[0] =
+      this->RasterDimensions[0] - this->Implementation->SourceOffset[0];
+    }
+
+  this->Implementation->SourceDimensions[1] =
+    Max(0.0, this->Implementation->SourceDimensions[1]);
+  if ((this->Implementation->SourceDimensions[1] +
+       this->Implementation->SourceOffset[1]) >
+      this->RasterDimensions[1])
+    {
+    this->Implementation->SourceDimensions[1] =
+      this->RasterDimensions[1] - this->Implementation->SourceOffset[1];
+    }
+
+  this->DataExtents[0] = this->Implementation->SourceOffset[0];
+  this->DataExtents[1] = this->DataExtents[0] +
+                         this->Implementation->SourceDimensions[0] - 1;
+  this->DataExtents[3] = this->RasterDimensions[1] -
+                         this->Implementation->SourceOffset[1] - 1;
+  this->DataExtents[2] = this->DataExtents[3] -
+                         this->Implementation->SourceDimensions[1] + 1;
+  this->DataExtents[4] = 0;
+  this->DataExtents[5] = 0;
+
+  this->DataSpacing[0] =
+    static_cast<double>(this->Implementation->SourceDimensions[0]) /
+    this->TargetDimensions[0];
+  this->DataSpacing[1] =
+    static_cast<double>(this->Implementation->SourceDimensions[1]) /
+    this->TargetDimensions[1];
+  this->DataSpacing[2] = 1.0;
+
+  this->DataOrigin[0] = this->DataExtents[0];
+  this->DataOrigin[1] = this->DataExtents[2];
+
+  outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),
+               this->DataExtents, 6);
+  outInfo->Set(vtkDataObject::SPACING(), this->DataSpacing, 3);
+  outInfo->Set(vtkDataObject::ORIGIN(), this->DataOrigin, 3);
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+int vtkGDALReader::FillOutputPortInformation(int port, vtkInformation* info)
+{
+  if (port == 0)
+    {
+    info->Set(vtkDataObject::DATA_TYPE_NAME(), "vtkImageData");
+    return 1;
+    }
+  else
+    {
+    vtkErrorMacro("Port: " << port << " is not a valid port");
+    return 0;
+    }
+}
diff --git a/Libraries/VtkVgIO/vtkGDALReader.h b/Libraries/VtkVgIO/vtkGDALReader.h
new file mode 100644
index 00000000..c306b725
--- /dev/null
+++ b/Libraries/VtkVgIO/vtkGDALReader.h
@@ -0,0 +1,115 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkGDALReader_h
+#define __vtkGDALReader_h
+
+#include <vgExport.h>
+
+#include <vtkImageReader2.h>
+
+// C++ includes
+#include <string>
+#include <vector>
+
+class VTKVG_IO_EXPORT vtkGDALReader : public vtkImageReader2
+{
+public:
+  static vtkGDALReader* New();
+  vtkTypeMacro(vtkGDALReader, vtkImageReader2);
+
+  vtkGDALReader();
+  virtual ~vtkGDALReader();
+
+  // Description:
+  // Set input file name
+  vtkSetStringMacro(FileName);
+  // Get input file name
+  vtkGetStringMacro(FileName);
+
+  // Description:
+  // Return proj4 spatial reference.
+  const char*  GetProjectionString() const;
+
+  // Description:
+  // Return geo-referenced corner points (Upper left,
+  // lower left, lower right, upper right)
+  const double* GetGeoCornerPoints();
+
+  // Description:
+  // Return extent of the data
+  vtkSetVector6Macro(DataExtents, int);
+  int* GetDataExtent();
+
+  // Description:
+  // Set desired width and height of the image
+  vtkSetVector2Macro(TargetDimensions, int);
+  vtkGetVector2Macro(TargetDimensions, int);
+
+  // Description:
+  // Get raster width and heigth
+  vtkGetVector2Macro(RasterDimensions, int);
+
+  // Description:
+  // Set spacing of the data in the file.
+  vtkSetVector3Macro(DataSpacing, double);
+  // Get spacing of the data in the file.
+  vtkGetVector3Macro(DataSpacing, double);
+
+  // Description:
+  // Set origin of the data (location of first pixel in the file).
+  vtkSetVector3Macro(DataOrigin, double);
+  // Get origin of the data (location of first pixel in the file).
+  vtkGetVector3Macro(DataOrigin, double);
+
+  // Description:
+  // Return metadata as reported by GDAL
+  const std::vector<std::string>& GetMetaData();
+
+  // Description:
+  // Return domain metadata
+  std::vector<std::string> GetDomainMetaData(const std::string& domain);
+
+  // Description:
+  // Return driver name which was used to read the current data
+  const std::string& GetDriverShortName();
+  const std::string& GetDriverLongName();
+
+protected:
+  virtual int RequestData(vtkInformation* request,
+                          vtkInformationVector** inputVector,
+                          vtkInformationVector* outputVector);
+
+  virtual int RequestInformation(vtkInformation* request,
+                                 vtkInformationVector** inputVector,
+                                 vtkInformationVector* outputVector);
+
+  virtual int FillOutputPortInformation(int port,
+                                        vtkInformation* info);
+
+protected:
+  char* FileName;
+  double DataSpacing[3];
+  double DataOrigin[3];
+  int DataExtents[6];
+  int TargetDimensions[2];
+  int RasterDimensions[2];
+  std::string Projection;
+  std::string DomainMetaData;
+  std::string DriverShortName;
+  std::string DriverLongName;
+  std::vector<std::string> Domains;
+  std::vector<std::string> MetaData;
+
+  class vtkGDALReaderInternal;
+  vtkGDALReaderInternal* Implementation;
+
+private:
+  vtkGDALReader(const vtkGDALReader&); // Not implemented.
+  vtkGDALReader& operator=(const vtkGDALReader&); // Not implemented.
+};
+
+#endif // __vtkGDALReader_h
diff --git a/Libraries/VtkVgIO/vtkVgGDALReader.cxx b/Libraries/VtkVgIO/vtkVgGDALReader.cxx
new file mode 100644
index 00000000..244c74ba
--- /dev/null
+++ b/Libraries/VtkVgIO/vtkVgGDALReader.cxx
@@ -0,0 +1,305 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgGDALReader.h"
+
+#include "vtkGDALReader.h"
+#include "vtkVgNitfMetaDataParser.h"
+
+#include <vtkVgCoordinateTransformUtil.h>
+
+#include <vgStringUtils.h>
+
+// VTK includes.
+#include <vtkImageData.h>
+#include <vtkInformation.h>
+#include <vtkInformationVector.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkStreamingDemandDrivenPipeline.h>
+
+#include <vtksys/SystemTools.hxx>
+
+// C++ includes
+#include <sstream>
+
+// Standard VTK macro to implement New().
+vtkStandardNewMacro(vtkVgGDALReader);
+
+//-----------------------------------------------------------------------------
+vtkVgGDALReader::vtkVgGDALReader() : vtkVgBaseImageSource(),
+  ImageCache(0)
+{
+  this->Reader = vtkGDALReader::New();
+
+  this->OutputResolution[0] = 1280;
+  this->OutputResolution[1] = 1024;
+
+  this->SetNumberOfInputPorts(0);
+  this->SetNumberOfOutputPorts(1);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGDALReader::~vtkVgGDALReader()
+{
+  if (this->ImageCache)
+    {
+    this->ImageCache->Delete();
+    this->ImageCache = 0;
+    }
+
+  if (this->Reader)
+    {
+    this->Reader->Delete();
+    this->Reader = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGDALReader::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGDALReader::GetNumberOfLevels() const
+{
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+const double* vtkVgGDALReader::GetGeoCornerPoints()
+{
+  if (this->Reader)
+    {
+    return this->Reader->GetGeoCornerPoints();
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgGDALReader::GetRasterDimensions(int dim[2])
+{
+  this->Reader->GetRasterDimensions(dim);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGDALReader::GetDimensions(int dim[2])
+{
+  int* extents = this->Reader->GetDataExtent();
+  dim[0] = extents[1] - extents[0] + 1;
+  dim[1] = extents[3] - extents[2] + 1;
+}
+
+//----------------------------------------------------------------------------
+vtkVgTimeStamp vtkVgGDALReader::GetImageTimeStamp()
+{
+  return this->ImageTimeStamp;
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgGDALReader::CanRead(const std::string& source)
+{
+  std::string ciSource = vtksys::SystemTools::LowerCase(source);
+
+  // Check if it is a filename or if the argument is just an extension.
+  std::string ext = vtksys::SystemTools::LowerCase(
+                      vtksys::SystemTools::GetFilenameLastExtension(ciSource));
+
+  // Do not read PNG, JPEG, MRJ
+  if ((ext.compare(".jpeg") == 0) || (ext.compare(".jpg") == 0) ||
+      (ciSource.compare("jpeg") == 0) || (ciSource.compare(".jpeg") == 0) ||
+      (ciSource.compare("jpg") == 0) || (ciSource.compare(".jpg") == 0) ||
+      (ext.compare(".png") == 0) || (ciSource.compare("png") == 0) ||
+      (ciSource.compare(".png") == 0) ||
+      (ext.compare(".mrj") == 0) || (ciSource.compare("mrj") == 0) ||
+      (ciSource.compare(".mrj") == 0))
+    {
+    return false;
+    }
+
+  return true;
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgGDALReader::GetShortDescription()
+{
+  return "Generic image reader implemented using GDAL library";
+}
+
+//----------------------------------------------------------------------------
+std::string vtkVgGDALReader::GetLongDescription()
+{
+  return this->GetShortDescription();
+}
+
+//----------------------------------------------------------------------------
+vtkSmartPointer<vtkMatrix4x4> vtkVgGDALReader::GetImageToWorldMatrix()
+{
+  int imageDimensions[2];
+  this->Reader->GetRasterDimensions(imageDimensions);
+  const double* geoCornerPts = this->Reader->GetGeoCornerPoints();
+
+  // In GDAL 0,0 refers to the corner of a pixel while in VTK it refers to the
+  // center, hence the offsets of 0.5 need to be applied here.
+  return vtkVgCoordinateTransformUtil::ComputeImageToLatLonMatrix(
+    -0.5, -0.5, imageDimensions[0] - 0.5, imageDimensions[1] - 0.5,
+    geoCornerPts[2], geoCornerPts[3],
+    geoCornerPts[4], geoCornerPts[5],
+    geoCornerPts[6], geoCornerPts[7],
+    geoCornerPts[0], geoCornerPts[1]);
+}
+
+//----------------------------------------------------------------------------
+vtkVgBaseImageSource* vtkVgGDALReader::Create()
+{
+  return vtkVgGDALReader::New();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGDALReader::RequestInformation(
+  vtkInformation* vtkNotUsed(request),
+  vtkInformationVector** vtkNotUsed(inputVector),
+  vtkInformationVector* outputVector)
+{
+  // get the info objects
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information object.");
+    return 1;
+    }
+
+  if (!this->FileName)
+    {
+    vtkErrorMacro("Requires valid input file name.") ;
+    return 1;
+    }
+
+  int extents[6] =
+    {
+    this->ReadExtents[0],
+    this->ReadExtents[1],
+    this->ReadExtents[2],
+    this->ReadExtents[3],
+    0,
+    0
+    };
+
+  this->Reader->SetFileName(this->FileName);
+  this->Reader->SetDataExtents(extents);
+  this->Reader->SetTargetDimensions(this->OutputResolution[0],
+                                    this->OutputResolution[1]);
+  this->Reader->UpdateInformation();
+
+  this->Reader->GetDataSpacing(this->Spacing);
+  this->Reader->GetDataOrigin(this->Origin);
+
+  int* ext = this->Reader->GetDataExtent();
+  extents[0] = ext[0];
+  extents[1] = ext[1];
+  extents[2] = ext[2];
+  extents[3] = ext[3];
+  extents[4] = ext[4];
+  extents[5] = ext[5];
+
+  // Now compute image timestamp if the information is available
+  this->ComputeImageTimeStamp();
+
+  outInfo->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),
+               extents, 6);
+  outInfo->Set(vtkDataObject::SPACING(), this->Spacing, 3);
+
+  outInfo->Set(vtkDataObject::ORIGIN(),  this->Origin, 3);
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGDALReader::RequestData(vtkInformation* vtkNotUsed(request),
+                                 vtkInformationVector** vtkNotUsed(inputVector),
+                                 vtkInformationVector* outputVector)
+{
+  if (!outputVector)
+    {
+    vtkErrorMacro("Invalid output information vector.") ;
+    return 1;
+    }
+
+  if (!this->FileName)
+    {
+    vtkErrorMacro("Requires valid input file name.") ;
+    return 1;
+    }
+
+  vtkInformation* outInfo = outputVector->GetInformationObject(0);
+  if (!outInfo)
+    {
+    vtkErrorMacro("Invalid output information object.");
+    return 1;
+    }
+
+  vtkDataObject* dataObj = outInfo->Get(vtkDataObject::DATA_OBJECT());
+  if (!dataObj)
+    {
+    vtkErrorMacro("Invalid output data object.");
+    return 1;
+    }
+
+  vtkImageData* outputImage = vtkImageData::SafeDownCast(dataObj);
+  if (!outputImage)
+    {
+    vtkErrorMacro("Output data object is not an image data object.");
+    return 1;
+    }
+
+  if (this->ImageCache)
+    {
+    this->ImageCache->Delete();
+    }
+
+  this->ImageCache = vtkImageData::New();
+  this->Reader->Update();
+  this->ImageCache->ShallowCopy(this->Reader->GetOutput());
+
+  if (!this->ImageCache)
+    {
+    vtkErrorMacro("Failed to create valid output.");
+    return 1;
+    }
+
+  this->Reader->GetDataSpacing(this->Spacing);
+  this->Reader->GetDataOrigin(this->Origin);
+  this->ImageCache->SetSpacing(this->Spacing);
+  this->ImageCache->SetOrigin(this->Origin);
+
+  outputImage->ShallowCopy(this->ImageCache);
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGDALReader::ComputeImageTimeStamp()
+{
+  if (this->Reader->GetMTime() > this->GetMTime())
+    {
+    std::string ext =
+      vtksys::SystemTools::GetFilenameLastExtension(this->FileName);
+    ext = vtksys::SystemTools::LowerCase(ext);
+
+    // TODO Use regex
+    if (ext.compare(".nitf") == 0 ||
+        ext.compare(".ntf") == 0 ||
+        ext.compare(".r0") == 0)
+      {
+      vtkVgNitfMetaDataParser::ParseDateTime(
+        this->Reader->GetMetaData(), this->Reader->GetDomainMetaData("TRE"),
+        this->ImageTimeStamp);
+      }
+    }
+}
diff --git a/Libraries/VtkVgIO/vtkVgGDALReader.h b/Libraries/VtkVgIO/vtkVgGDALReader.h
new file mode 100644
index 00000000..ba422fd0
--- /dev/null
+++ b/Libraries/VtkVgIO/vtkVgGDALReader.h
@@ -0,0 +1,91 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgGDALReader_h
+#define __vtkVgGDALReader_h
+
+#include <vgExport.h>
+
+#include <vtkVgBaseImageSource.h>
+
+#include <istream>
+
+// Forward declaration.
+class vtkGDALReader;
+class vtkMatrix4x4;
+
+class VTKVG_IO_EXPORT vtkVgGDALReader : public vtkVgBaseImageSource
+{
+public:
+  // Description:
+  // Create new instance.
+  static vtkVgGDALReader* New();
+
+  // Description:
+  // Check type.
+  vtkTypeMacro(vtkVgGDALReader, vtkVgBaseImageSource);
+
+  // Description:
+  // Print values of the member variables.
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Return number of level of detail.
+  virtual int GetNumberOfLevels() const;
+
+  // Description:
+  // Return geo-referenced corner points (Upper left,
+  // lower left, lower right, upper right)
+  virtual const double* GetGeoCornerPoints();
+
+  // Description:
+  // Get the dimension of the entire image; returns whether or not it is
+  // supported by this reader.
+  virtual bool GetRasterDimensions(int dim[2]);
+
+  // Description:
+  // Return dimensions of the image.
+  virtual void GetDimensions(int dim[2]);
+
+  // Description:
+  // Get image timestamp
+  virtual vtkVgTimeStamp GetImageTimeStamp();
+
+  virtual bool CanRead(const std::string& source);
+
+  virtual std::string GetShortDescription();
+  virtual std::string GetLongDescription();
+
+  virtual vtkSmartPointer<vtkMatrix4x4> GetImageToWorldMatrix();
+
+  static vtkVgBaseImageSource* Create();
+
+protected:
+
+  vtkVgGDALReader();
+  virtual ~vtkVgGDALReader();
+
+  virtual int RequestInformation(vtkInformation* request,
+                                 vtkInformationVector** inputVector,
+                                 vtkInformationVector* outputVector);
+
+  virtual int RequestData(vtkInformation* request,
+                          vtkInformationVector** inputVector,
+                          vtkInformationVector* outputVector);
+
+  void ComputeImageTimeStamp();
+
+  vtkImageData* ImageCache;
+
+  vtkGDALReader* Reader;
+
+private:
+
+  vtkVgGDALReader(const vtkVgGDALReader&);  // Not implemented.
+  void operator= (const vtkVgGDALReader&);  // Not implemented.
+};
+
+#endif // __vtkVgGDALReader_h
diff --git a/Libraries/VtkVgIO/vtkVgNitfEngrda.cxx b/Libraries/VtkVgIO/vtkVgNitfEngrda.cxx
new file mode 100644
index 00000000..49c5bfa6
--- /dev/null
+++ b/Libraries/VtkVgIO/vtkVgNitfEngrda.cxx
@@ -0,0 +1,303 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgNitfEngrda.h"
+
+// VTK includes
+#include <vtkObjectFactory.h>
+
+// C++ includes
+#include <cstring>
+#include <sstream>
+#include <iostream>
+
+vtkStandardNewMacro(vtkVgNitfEngrdaElement);
+
+//----------------------------------------------------------------------------
+vtkVgNitfEngrdaElement::vtkVgNitfEngrdaElement(void) : Data(NULL)
+{
+}
+
+//----------------------------------------------------------------------------
+vtkVgNitfEngrdaElement::~vtkVgNitfEngrdaElement(void)
+{
+  if (this->Data)
+    {
+    delete[] this->Data;
+    this->Data = NULL;
+    }
+}
+
+//----------------------------------------------------------------------------
+const std::string& vtkVgNitfEngrdaElement::GetLabel(void)
+{
+  return this->Label;
+}
+
+//----------------------------------------------------------------------------
+vtkVgNitfEngrdaType vtkVgNitfEngrdaElement::GetType(void)
+{
+  switch (this->Type)
+    {
+    case 'A': return VG_NITF_ENGRDA_TYPE_ASCII;
+    case 'B': return VG_NITF_ENGRDA_TYPE_BINARY;
+    case 'I':
+      switch (this->DataTypeSize)
+        {
+        case 1: return VG_NITF_ENGRDA_TYPE_UINT_8;
+        case 2: return VG_NITF_ENGRDA_TYPE_UINT_16;
+        case 4: return VG_NITF_ENGRDA_TYPE_UINT_32;
+        case 8: return VG_NITF_ENGRDA_TYPE_UINT_64;
+        default: return VG_NITF_ENGRDA_TYPE_UNKNOWN;
+        }
+    case 'S':
+      switch (this->DataTypeSize)
+        {
+        case 1: return VG_NITF_ENGRDA_TYPE_INT_8;
+        case 2: return VG_NITF_ENGRDA_TYPE_INT_16;
+        case 4: return VG_NITF_ENGRDA_TYPE_INT_32;
+        case 8: return VG_NITF_ENGRDA_TYPE_INT_64;
+        default: return VG_NITF_ENGRDA_TYPE_UNKNOWN;
+        }
+    case 'R':
+      switch (this->DataTypeSize)
+        {
+        case 4: return VG_NITF_ENGRDA_TYPE_FLOAT;
+        case 8: return VG_NITF_ENGRDA_TYPE_DOUBLE;
+        default: return VG_NITF_ENGRDA_TYPE_UNKNOWN;
+        }
+    case 'C':
+      switch (this->DataTypeSize)
+        {
+        case 4: return VG_NITF_ENGRDA_TYPE_COMPLEX_FLOAT;
+        case 8: return VG_NITF_ENGRDA_TYPE_COMPLEX_DOUBLE;
+        default: return VG_NITF_ENGRDA_TYPE_UNKNOWN;
+        }
+    default: return VG_NITF_ENGRDA_TYPE_UNKNOWN;
+    }
+}
+
+//----------------------------------------------------------------------------
+void* vtkVgNitfEngrdaElement::GetData(void)
+{
+  return this->Data;
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgNitfEngrdaElement::GetData(std::string& value)
+{
+  if (this->Type != 'A')
+    {
+    return false;
+    }
+  std::stringstream ss;
+  ss.write(this->Data, this->DataCount);
+  value = ss.str();
+  return true;
+}
+
+//----------------------------------------------------------------------------
+std::string& vtkVgNitfEngrdaElement::GetUnits(void)
+{
+  return this->DataUnits;
+}
+
+//----------------------------------------------------------------------------
+vtkVgNitfEngrda::vtkVgNitfEngrda()
+{
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgNitfEngrda::Parse(const char* data, size_t len)
+{
+  // Parse engrda metadata from a given data buffer
+  std::stringstream block;
+  block.write(data, len);
+  if (!block)
+    {
+    return false;
+    }
+
+    {
+    // Read the resource name
+    char buf[21];
+    memset(buf, 0, 21);
+    block.read(buf, 20);
+    this->Resource = buf;
+    }
+
+  size_t recnt;
+    {
+    // Read the record count
+    char buf[4];
+    std::memset(buf, 0, 4);
+    block.read(buf, 3);
+    if (!block)
+      {
+      return false;
+      }
+    std::stringstream ssconv;
+    ssconv << buf;
+    ssconv >> recnt;
+    }
+
+  // Read each record
+  for (size_t i = 0; i < recnt; ++i)
+    {
+    vtkVgNitfEngrdaElementRefPtr element = new vtkVgNitfEngrdaElement;
+      {
+      // 1: Parse the label length
+      size_t ln;
+      char bufln[3];
+      std::memset(bufln, 0, 3);
+      block.read(bufln, 2);
+      if (!block)
+        {
+        return false;
+        }
+      std::stringstream ssconv(bufln);
+      ssconv >> ln;
+      if (!ssconv)
+        {
+        return false;
+        }
+      // 2: Parse the label
+      char* buf_lbl = new char[ln + 1];
+      std::memset(buf_lbl, 0, ln + 1);
+      block.read(buf_lbl, ln);
+      if (!block)
+        {
+        return false;
+        }
+      element->Label = buf_lbl;
+      delete[] buf_lbl;
+      }
+      {
+      // 3: Parse the matrix column count
+      char bufmtxc[5];
+      std::memset(bufmtxc, 0, 5);
+      block.read(bufmtxc, 4);
+      if (!block)
+        {
+        return false;
+        }
+      std::stringstream ssconv(bufmtxc);
+      ssconv >> element->MatrixColumnCount;
+      if (!ssconv) return false;
+      }
+      {
+      // 4: Parse the matrix row count
+      char bufmtxr[5];
+      std::memset(bufmtxr, 0, 5);
+      block.read(bufmtxr, 4);
+      if (!block)
+        {
+        return false;
+        }
+      std::stringstream ssconv(bufmtxr);
+      ssconv >> element->MatrixRowCount;
+      if (!ssconv)
+        {
+        return false;
+        }
+      }
+      {
+      // 5: Parse the data type
+      block.read(&element->Type, 1);
+      if (!block)
+        {
+        return false;
+        }
+      }
+      {
+      // 6: Parse the data type size
+      char bufdts[2];
+      std::memset(bufdts, 0, 2);
+      block.read(bufdts, 1);
+      if (!block)
+        {
+        return false;
+        }
+      std::stringstream ssconv(bufdts);
+      ssconv >> element->DataTypeSize;
+      if (!ssconv)
+        {
+        return false;
+        }
+      }
+      {
+      // 7: Parse the data units
+      char bufdatu[3];
+      std::memset(bufdatu, 0, 3);
+      block.read(bufdatu, 2);
+      if (!block)
+        {
+        return false;
+        }
+      element->DataUnits = bufdatu;
+      }
+      {
+      // 8: Parse the data count
+      char bufdatc[9];
+      std::memset(bufdatc, 0, 9);
+      block.read(bufdatc, 8);
+      if (!block)
+        {
+        return false;
+        }
+      std::stringstream ssconv(bufdatc);
+      ssconv >> element->DataCount;
+      if (!ssconv)
+        {
+        return false;
+        }
+      }
+      {
+      // 9: Parse the data
+      size_t len = element->DataTypeSize * element->DataCount;
+      element->Data = new char[len];
+      std::memset(element->Data, 0, len);
+      block.read(element->Data, len);
+      if (!block)
+        {
+        return false;
+        }
+      }
+    this->Elements[element->Label] = element;
+    }
+  return true;
+}
+
+//----------------------------------------------------------------------------
+const std::string& vtkVgNitfEngrda ::GetSource(void) const
+{
+  return this->Resource;
+}
+
+//----------------------------------------------------------------------------
+const vtkVgNitfEngrdaElementRefPtr
+vtkVgNitfEngrda::Get(const std::string& label) const
+{
+  vtkVgNitfEngrda::const_iterator i;
+  i = this->Elements.find(label);
+  if (i == this->Elements.end())
+    {
+    return NULL;
+    }
+  return i->second;
+}
+
+//----------------------------------------------------------------------------
+vtkVgNitfEngrda::const_iterator vtkVgNitfEngrda ::Begin(void) const
+{
+  return this->Elements.begin();
+}
+
+//----------------------------------------------------------------------------
+vtkVgNitfEngrda::const_iterator vtkVgNitfEngrda::End(void) const
+{
+  return this->Elements.end();
+}
diff --git a/Libraries/VtkVgIO/vtkVgNitfEngrda.h b/Libraries/VtkVgIO/vtkVgNitfEngrda.h
new file mode 100644
index 00000000..fb31762b
--- /dev/null
+++ b/Libraries/VtkVgIO/vtkVgNitfEngrda.h
@@ -0,0 +1,146 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgNitfEngrda_h
+#define __vtkVgNitfEngrda_h
+
+// VTK includes
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+#include <vtkTypeTraits.h>
+
+// C++ includes
+#include <map>
+#include <string>
+
+class vtkVgNitfEngrda;
+
+// Different types for the ENGRDA data
+enum vtkVgNitfEngrdaType
+{
+  VG_NITF_ENGRDA_TYPE_ASCII,
+  VG_NITF_ENGRDA_TYPE_BINARY,
+  VG_NITF_ENGRDA_TYPE_UINT_8,
+  VG_NITF_ENGRDA_TYPE_INT_8,
+  VG_NITF_ENGRDA_TYPE_UINT_16,
+  VG_NITF_ENGRDA_TYPE_INT_16,
+  VG_NITF_ENGRDA_TYPE_UINT_32,
+  VG_NITF_ENGRDA_TYPE_INT_32,
+  VG_NITF_ENGRDA_TYPE_UINT_64,
+  VG_NITF_ENGRDA_TYPE_INT_64,
+  VG_NITF_ENGRDA_TYPE_FLOAT,
+  VG_NITF_ENGRDA_TYPE_DOUBLE,
+  VG_NITF_ENGRDA_TYPE_COMPLEX_FLOAT,
+  VG_NITF_ENGRDA_TYPE_COMPLEX_DOUBLE,
+  VG_NITF_ENGRDA_TYPE_UNKNOWN
+};
+
+// Container for a single data element in a set of ENGRD records
+class vtkVgNitfEngrdaElement: public vtkObject
+{
+public:
+  vtkVgNitfEngrdaElement(void);
+
+  static vtkVgNitfEngrdaElement* New();
+
+  const std::string& GetLabel(void);
+  vtkVgNitfEngrdaType GetType(void);
+
+  // Description:
+  // Get the raw data pointer
+  void* GetData(void);
+
+  // Description:
+  // Get the data formatted as a string.
+  // Return false if type is not ASCII
+  bool GetData(std::string& value);
+
+  // Description:
+  // Get the units of the stored data
+  // Return false if type is not ASCII
+  std::string& GetUnits(void);
+
+protected:
+  ~vtkVgNitfEngrdaElement(void);
+
+private:
+  friend class vtkVgNitfEngrda;
+
+  std::string Label;
+  size_t MatrixColumnCount;
+  size_t MatrixRowCount;
+  char Type;
+  size_t DataTypeSize;
+  std::string DataUnits;
+  size_t DataCount;
+
+  // FIXME: Extend for other data types
+  union
+    {
+    char* Data;
+    int DataInt;
+    float DataFloat;
+    double DataDouble;
+    };
+};
+typedef vtkSmartPointer<vtkVgNitfEngrdaElement> vtkVgNitfEngrdaElementRefPtr;
+
+
+// Parser for NITF ENGRDA metadata blocks.
+// This is implemented based on the defined standards in:
+// "Compendium of Controlled Extensions (CE) for the National Imagery
+// Transmission Format (NITF) Volume 1, Tagged Record Extensions, Version 4.0"
+// Specifically Appendix N:
+// "Engineering Data (ENGRD) Support Data Extension (SDE)"
+//
+// At the time of writing, January 2012, this document is available at:
+// https://nsgreg.nga.mil/NSGDOC/documents/STDI-0002-1_4.0%20CE%20NITF.zip
+class vtkVgNitfEngrda
+{
+public:
+  typedef std::map<std::string, vtkVgNitfEngrdaElementRefPtr>::iterator
+    iterator;
+  typedef std::map<std::string, vtkVgNitfEngrdaElementRefPtr>::const_iterator
+    const_iterator;
+
+  vtkVgNitfEngrda();
+
+  // Description:
+  // Parse engrda metadata from a given data buffer
+  bool Parse(const char* data, size_t len);
+
+  // Description:
+  // Parse engrda metadata from a given data buffer
+  bool Parse(const std::string& data)
+    {
+    return this->Parse(data.c_str(), data.size());
+    }
+
+  // Description:
+  // Rietrieve the Unique Source System Name
+  const std::string& GetSource(void) const;
+
+  // Description:
+  // Retrieve a data element given it's label
+  const vtkVgNitfEngrdaElementRefPtr Get(const std::string& label) const;
+
+  // Description:
+  // Retrieve an iterator to the start of all data elements
+  vtkVgNitfEngrda::const_iterator Begin(void) const;
+
+  // Description:
+  // Retrieve an iterator to the end of all data elements
+  vtkVgNitfEngrda::const_iterator End(void) const;
+
+private:
+  // Unique Source System Name
+  std::string Resource;
+
+  // All records
+  std::map<std::string, vtkVgNitfEngrdaElementRefPtr> Elements;
+};
+
+#endif
diff --git a/Libraries/VtkVgIO/vtkVgNitfMetaDataParser.cxx b/Libraries/VtkVgIO/vtkVgNitfMetaDataParser.cxx
new file mode 100644
index 00000000..7c2a7b0a
--- /dev/null
+++ b/Libraries/VtkVgIO/vtkVgNitfMetaDataParser.cxx
@@ -0,0 +1,140 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgNitfMetaDataParser.h"
+
+#include "vtkVgNitfEngrda.h"
+
+#include <vgStringUtils.h>
+
+#include <vtkVgTimeStamp.h>
+
+// Boost includes
+#include <boost/date_time/gregorian/conversion.hpp>
+#include <boost/date_time/gregorian/gregorian.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+// C/C++ includes
+#include <ctime>
+
+namespace bt = boost::posix_time;
+
+//----------------------------------------------------------------------------
+namespace
+{
+  // FIXME Move this code somewhere else
+  // Convert boost posix time to std time
+  std::time_t Convert(const bt::ptime& pt)
+    {
+      bt::ptime timet_start(boost::gregorian::date(1970,1,1));
+      bt::time_duration diff = pt - timet_start;
+      return diff.total_milliseconds();
+    }
+
+  int ConvertToInt(const std::string& str)
+    {
+    int result;
+    std::istringstream iss (str);
+    iss >> result;
+    return result;
+    }
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgNitfMetaDataParser::ParseDateTime(
+  const std::vector<std::string>& mdata,
+  const std::vector<std::string>& treMetaData,
+  vtkVgTimeStamp& time)
+{
+  if (mdata.empty())
+    {
+    return false;
+    }
+
+  std::vector<std::string> tokens;
+
+  for (size_t i = 0; i < mdata.size(); ++i)
+    {
+    size_t found = mdata[i].find("NITF_IDATIM");
+    if (found != std::string::npos)
+      {
+      tokens = vgStringUtils::Split(mdata[i], '=');
+
+      // We get time in CCYYMMDDhhmmss format, that is
+      // (century, year, months, hours, minutes, and seconds)
+      if (tokens[1].empty())
+        {
+        return false;
+        }
+      else
+        {
+        break;
+        }
+      }
+    }
+
+  std::string nitfTime = tokens[1];
+  std::tm utm;
+
+  int years = 1970;
+  int months = 0;
+  int days = 0;
+  int hrs = 0;
+  int mins = 0;
+  int secs = 0;
+  // Milliseconds
+  int ms = 0;
+
+  years = ConvertToInt(std::string(nitfTime, 0, 4)) - 1900;
+  months = ConvertToInt(std::string(nitfTime, 4, 2)) - 1;
+  days = ConvertToInt(std::string(nitfTime, 6, 2));
+  hrs = ConvertToInt(std::string(nitfTime, 8, 2));
+  mins = ConvertToInt(std::string(nitfTime, 10, 2));
+  secs = ConvertToInt(std::string(nitfTime, 12, 2));
+
+  for (size_t i = 0; i < treMetaData.size(); ++i)
+    {
+    size_t found = treMetaData[i].find("ENGRDA");
+
+    if (found != std::string::npos)
+      {
+      tokens = vgStringUtils::Split(treMetaData[i], '=');
+
+      if (!tokens[1].empty())
+        {
+        std::string msstr;
+        vtkVgNitfEngrda nitfEngdra;
+        vtkVgNitfMetaDataParser::ParseEngrda(tokens[1], nitfEngdra);
+        nitfEngdra.Get("milliseconds")->GetData(msstr);
+
+        if (!msstr.empty())
+          {
+          ms = ConvertToInt(msstr);
+          }
+        }
+      }
+    }
+
+  utm.tm_mday = days;
+  utm.tm_mon = months;
+  utm.tm_year = years;
+
+  boost::posix_time::ptime pt (boost::gregorian::date_from_tm(utm),
+    bt::hours(hrs) + bt::minutes(mins) + bt::seconds(secs) +
+    bt::milliseconds(ms));
+
+  // To micoseconds
+  time.SetTime(static_cast<double>(Convert(pt)) * 1e3);
+
+  return true;
+}
+
+//----------------------------------------------------------------------------
+bool vtkVgNitfMetaDataParser::ParseEngrda(const char* data, int len,
+                                          vtkVgNitfEngrda& engrda)
+{
+  return engrda.Parse(data, len);
+}
diff --git a/Libraries/VtkVgIO/vtkVgNitfMetaDataParser.h b/Libraries/VtkVgIO/vtkVgNitfMetaDataParser.h
new file mode 100644
index 00000000..d9959fb7
--- /dev/null
+++ b/Libraries/VtkVgIO/vtkVgNitfMetaDataParser.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgNitfMetaDataParser_h
+#define __vtkVgNitfMetaDataParser_h
+
+#include <vgExport.h>
+
+// C++ includes
+#include <string>
+#include <vector>
+
+class vtkVgNitfEngrda;
+class vtkVgTimeStamp;
+
+namespace vtkVgNitfMetaDataParser
+{
+  VTKVG_IO_EXPORT bool ParseDateTime(const std::vector<std::string>& mdata,
+                                     const std::vector<std::string>& treMetaData,
+                                     vtkVgTimeStamp& time);
+
+  VTKVG_IO_EXPORT bool ParseEngrda(const char* data, int len,
+                                   vtkVgNitfEngrda& engrda);
+
+  inline bool ParseEngrda(const std::string& meta,
+                          vtkVgNitfEngrda& engrda)
+    {
+    return vtkVgNitfMetaDataParser::ParseEngrda(
+      meta.c_str(), static_cast<int>(meta.size()), engrda);
+    }
+};
+
+#endif // __vtkVgNitfMetaDataParser_h
diff --git a/Libraries/VtkVgModelView/CMakeLists.txt b/Libraries/VtkVgModelView/CMakeLists.txt
new file mode 100644
index 00000000..c9c33f5d
--- /dev/null
+++ b/Libraries/VtkVgModelView/CMakeLists.txt
@@ -0,0 +1,120 @@
+project(vtkVgModelView)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+set(vtkVgModelViewSrcs
+  vtkVgActivityManager.cxx
+  vtkVgCompositeEventRepresentation.cxx
+  vtkVgDataSourceBase.cxx
+  vtkVgEventFilter.cxx
+  vtkVgEventIconRepresentation.cxx
+  vtkVgEventInfo.cxx
+  vtkVgEventLabelRepresentation.cxx
+  vtkVgEventModel.cxx
+  vtkVgEventModelCollection.cxx
+  vtkVgEventRegionRepresentation.cxx
+  vtkVgEventRepresentation.cxx
+  vtkVgEventRepresentationBase.cxx
+  vtkVgGraphModel.cxx
+  vtkVgGraphRepresentation.cxx
+  vtkVgModelBase.cxx
+  vtkVgPicker.cxx
+  vtkVgRepresentationBase.cxx
+  vtkVgTrackFilter.cxx
+  vtkVgTrackHeadRepresentation.cxx
+  vtkVgTrackInfo.cxx
+  vtkVgTrackLabelRepresentation.cxx
+  vtkVgTrackModel.cxx
+  vtkVgTrackModelCollection.cxx
+  vtkVgTrackRepresentation.cxx
+  vtkVgTrackRepresentationBase.cxx
+  vtkVgTripWireManager.cxx
+  vtkVgVideoModel.cxx
+  Deprecated/vtkVgVideoFrameData.cxx
+  Deprecated/vtkVgVideoModel0.cxx
+  Deprecated/vtkVgVideoProviderBase.cxx
+  Deprecated/vtkVgVideoRepresentation0.cxx
+  Deprecated/vtkVgVideoRepresentationBase0.cxx
+)
+
+set(vtkVgModelViewInstallHeaders
+  vtkVgActivityManager.h
+  vtkVgCompositeEventRepresentation.h
+  vtkVgDataSourceBase.h
+  vtkVgEventFilter.h
+  vtkVgEventIconRepresentation.h
+  vtkVgEventInfo.h
+  vtkVgEventLabelRepresentation.h
+  vtkVgEventModelCollection.h
+  vtkVgEventModel.h
+  vtkVgEventRegionRepresentation.h
+  vtkVgEventRepresentationBase.h
+  vtkVgEventRepresentation.h
+  vtkVgGraphModel.h
+  vtkVgGraphRepresentation.h
+  vtkVgModelBase.h
+  vtkVgPickData.h
+  vtkVgPicker.h
+  vtkVgRepresentationBase.h
+  vtkVgTimeStampBase.h
+  vtkVgTrackFilter.h
+  vtkVgTrackHeadRepresentation.h
+  vtkVgTrackInfo.h
+  vtkVgTrackLabelRepresentation.h
+  vtkVgTrackModelCollection.h
+  vtkVgTrackModel.h
+  vtkVgTrackRepresentationBase.h
+  vtkVgTrackRepresentation.h
+  vtkVgTripWireManager.h
+  vtkVgVideoModel.h
+  Deprecated/vtkVgVideoFrameData.h
+  Deprecated/vtkVgVideoMetadata.h
+  Deprecated/vtkVgVideoModel0.h
+  Deprecated/vtkVgVideoProviderBase.h
+  Deprecated/vtkVgVideoRepresentationBase0.h
+  Deprecated/vtkVgVideoRepresentation0.h
+)
+
+set_source_files_properties(
+  Deprecated/vtkVgVideoFrameData
+  Deprecated/vtkVgVideoMetadata
+  Deprecated/vtkVgVideoModel0
+  Deprecated/vtkVgVideoProviderBase
+  Deprecated/vtkVgVideoRepresentation0
+  Deprecated/vtkVgVideoRepresentationBase0
+  PROPERTIES WRAP_EXCLUDE TRUE
+)
+
+set_source_files_properties(
+  vtkVgEventInfo
+  vtkVgTrackInfo
+  PROPERTIES WRAP_SPECIAL TRUE
+)
+
+vg_vtk_module(${PROJECT_NAME}
+  DEPENDS
+  vtkFiltersModeling
+  vtkIOCore
+  vtkInteractionStyle
+  vtkRenderingFreeTypeOpenGL
+  vtkRenderingOpenGL
+  vtkVgCore
+)
+
+# Build and link library.
+vtk_module_library(${PROJECT_NAME} ${vtkVgModelViewSrcs})
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vtkVgCore
+)
+
+vg_add_test_subdirectory()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vtkVgModelViewInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VtkVgModelView)
+
+vg_wrap_vtk_library(${PROJECT_NAME})
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoFrameData.cxx b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoFrameData.cxx
new file mode 100644
index 00000000..d1aa7ce3
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoFrameData.cxx
@@ -0,0 +1,23 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoFrameData.h"
+
+// VTK includes.
+#include "vtkImageData.h"
+#include "vtkMatrix4x4.h"
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrameData::vtkVgVideoFrameData()
+{
+  this->VideoImage  = vtkSmartPointer<vtkImageData>::New();
+  this->VideoMatrix = NULL;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrameData::~vtkVgVideoFrameData()
+{
+}
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoFrameData.h b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoFrameData.h
new file mode 100644
index 00000000..ff767285
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoFrameData.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoFrameData_h
+#define __vtkVgVideoFrameData_h
+
+#include "vtkVgTimeStamp.h"
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkImageData;
+class vtkMatrix4x4;
+
+struct VTKVG_MODELVIEW_EXPORT vtkVgVideoFrameData
+{
+  vtkVgVideoFrameData();
+  ~vtkVgVideoFrameData();
+
+  vtkVgTimeStamp                      TimeStamp;
+  vtkSmartPointer<vtkImageData>       VideoImage;
+  vtkSmartPointer<vtkMatrix4x4>       VideoMatrix;
+};
+
+#endif // __vtkVgVideoFrameData_h
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoMetadata.h b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoMetadata.h
new file mode 100644
index 00000000..81fdfb17
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoMetadata.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoMetadata_h
+#define __vtkVgVideoMetadata_h
+
+#include <vtkVgInstance.h>
+#include <vtkVgTimeStamp.h>
+
+#include <vtkMatrix4x4.h>
+
+struct vtkVgVideoMetadata
+{
+  vtkVgVideoMetadata() : Gsd(-1.0), HomographyReferenceFrame(-1) {}
+  vtkVgVideoMetadata(vtkVgTimeStamp time, double gsd,
+                     const vtkMatrix4x4& homography,
+                     int homographyReferenceFrame)
+    : Gsd(gsd), Time(time), Homography(homography),
+      HomographyReferenceFrame(homographyReferenceFrame)
+    {}
+
+  double Gsd;
+  vtkVgTimeStamp Time;
+  vtkVgInstance<vtkMatrix4x4> Homography;
+  int HomographyReferenceFrame;
+};
+
+#endif // __vtkVgVideoMetadata_h
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoModel0.cxx b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoModel0.cxx
new file mode 100644
index 00000000..82f62ec2
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoModel0.cxx
@@ -0,0 +1,597 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoModel0.h"
+
+#include "vtkVgEventModel.h"
+#include "vtkVgTimeStamp.h"
+#include "vtkVgTrackModel.h"
+#include "vtkVgVideoProviderBase.h"
+
+// VTK includes
+#include <vtkCommand.h>
+#include <vtkImageData.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkTimerLog.h>
+
+// C++
+#include <vector>
+
+vtkStandardNewMacro(vtkVgVideoModel0);
+vtkCxxSetObjectMacro(vtkVgVideoModel0, EventModel, vtkVgEventModel);
+vtkCxxSetObjectMacro(vtkVgVideoModel0, TrackModel, vtkVgTrackModel);
+
+//-----------------------------------------------------------------------------
+vtkVgVideoModel0::vtkVgVideoModel0() : vtkVgModelBase(),
+  NumberOfFrames(0),
+  VisibleScale(1),
+  UseSourceTimeStamp(false),
+  Playing(0),
+  Paused(0),
+  Stopped(0),
+  Looping(0),
+  LastLoopingState(Looping),
+  UseFrameIndex(1),
+  VideoSource(NULL),
+  EventModel(NULL),
+  TrackModel(NULL),
+  PlayFromBeginning(0),
+  UseTimeStamp(1),
+  PlaybackSpeed(1.0),
+  CurrentSeekTime(0.0),
+  LastAppTime(0.0),
+  CurrentAppTime(0.0)
+{
+  this->ClipTimeRangeCache[0] = this->ClipTimeRangeCache[1] = 0.0;
+
+  this->VideoFrameData = new vtkVgVideoFrameData();
+
+  for (int i = 0; i < 6; ++i)
+    {
+    this->VisibleExtents[i] = -1.0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoModel0::~vtkVgVideoModel0()
+{
+  delete this->VideoFrameData;
+  this->VideoFrameData = NULL;
+  this->SetEventModel(0);
+  this->SetTrackModel(0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel0::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  // \TODO Fill this one up.
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel0::SetVideoSource(vtkVgVideoProviderBase* videoSource)
+{
+  if (videoSource && this->VideoSource != videoSource)
+    {
+    this->VideoSource = videoSource;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoProviderBase* vtkVgVideoModel0::GetVideoSource()
+{
+  return this->VideoSource;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgVideoProviderBase* vtkVgVideoModel0::GetVideoSource() const
+{
+  return this->VideoSource;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::Update(
+  const vtkVgTimeStamp& timeStamp,
+  const vtkVgTimeStamp* referenceFrameTimeStamp/*=0*/)
+{
+  this->CurrentTimeStamp = timeStamp;
+
+  // \TODO Pass the visibile extents and scale to the source
+  int retVal = VTK_OK;
+
+  // Skip padding always when in neutral (play,pause,stop = fasle) state
+  if (!this->Initialized)
+    {
+    this->SkipPadding();
+    }
+
+  if (this->Playing || !this->GetInitialized())
+    {
+    retVal = this->ActionPlay(timeStamp, referenceFrameTimeStamp);
+
+    switch (retVal)
+      {
+      case VTK_OK:
+        this->OnActionPlaySuccess(timeStamp, referenceFrameTimeStamp);
+        break;
+      case VTK_ERROR:
+        this->OnActionPlayFailure(timeStamp, referenceFrameTimeStamp);
+        break;
+      default:
+        break;
+      }
+    }
+  else if (this->Paused)
+    {
+    this->ActionPause(timeStamp, referenceFrameTimeStamp);
+    }
+  else if (this->Stopped)
+    {
+    this->ActionStop(timeStamp, referenceFrameTimeStamp);
+    }
+
+  return retVal;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::Play()
+{
+  if (!this->Paused && this->PlayFromBeginning)
+    {
+    this->UndoSkipPadding();
+
+    // Since play by default advances the clip and since
+    // the first clip has not been rendered yet, recede to previous
+    // frame to show off the first frame when playing.
+    if (!this->UseTimeStamp)
+      {
+      this->VideoSource->Recede();
+      }
+    }
+
+  this->Playing = 1;
+  this->Paused  = 0;
+  this->Stopped = 0;
+
+  // Reset cached application time
+  this->LastAppTime = 0.0;
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::IsPlaying()
+{
+  return this->Playing;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::Pause()
+{
+  this->Playing = 0;
+  this->Paused  = 1;
+  this->Stopped = 0;
+
+  this->PlayFromBeginningOff();
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::IsPaused()
+{
+  return this->Paused;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::Stop()
+{
+  this->Playing = 0;
+  this->Paused  = 0;
+  this->Stopped = 1;
+
+  this->CurrentAppTime  = 0.0;
+  this->LastAppTime     = this->CurrentAppTime;
+  this->CurrentSeekTime = this->ClipTimeRangeCache[0];
+
+  this->PlayFromBeginningOff();
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::IsStopped()
+{
+  return this->Stopped;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::Next()
+{
+  int retVal = VTK_ERROR;
+
+  // If we are playing this won't do anything.
+  if (this->IsPlaying())
+    {
+    this->Pause();
+    }
+
+  if (this->VideoSource)
+    {
+    this->VideoSource->Update();
+    retVal = this->VideoSource->GetNextFrame(this->VideoFrameData);
+
+    if (retVal == VTK_OK)
+      {
+      this->UpdateDataRequestTime.Modified();
+
+      // Also invoke the event.
+      this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+      if (this->TrackModel)
+        {
+        this->TrackModel->Update(this->VideoFrameData->TimeStamp);
+        }
+
+      // We may need to clarify what is expected here.
+      if (this->EventModel)
+        {
+        this->EventModel->Update(this->VideoFrameData->TimeStamp);
+        }
+      }
+    }
+
+  return retVal;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::Previous()
+{
+  int retVal = VTK_ERROR;
+
+  if (this->Playing)
+    {
+    retVal = VTK_ERROR;
+    return retVal;
+    }
+
+  if (this->VideoSource)
+    {
+    this->VideoSource->Update();
+    retVal = this->VideoSource->GetPreviousFrame(this->VideoFrameData);
+
+    if (retVal == VTK_OK)
+      {
+      this->UpdateDataRequestTime.Modified();
+
+      // Also invoke the event.
+      this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+      if (this->TrackModel)
+        {
+        this->TrackModel->Update(this->VideoFrameData->TimeStamp);
+        }
+
+      // We may need to clarify what is expected here.
+      if (this->EventModel)
+        {
+        this->EventModel->Update(this->VideoFrameData->TimeStamp);
+        }
+      }
+    }
+
+  return retVal;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::SeekTo(double time)
+{
+  if (this->Playing)
+    {
+    return VTK_ERROR;
+    }
+
+  if (!this->VideoSource)
+    {
+    return VTK_ERROR;
+    }
+
+  this->VideoSource->Update();
+  int retVal = this->VideoSource->GetFrame(this->VideoFrameData, time);
+
+  if (retVal == VTK_OK)
+    {
+    // Update internal seek time
+    this->CurrentSeekTime = time;
+
+    this->UpdateDataRequestTime.Modified();
+
+    // Also invoke the event.
+    this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+    if (this->TrackModel)
+      {
+      this->TrackModel->Update(this->VideoFrameData->TimeStamp);
+      }
+
+    // We may need to clarify what is expected here.
+    if (this->EventModel)
+      {
+      this->EventModel->Update(this->VideoFrameData->TimeStamp);
+      }
+    }
+
+  return retVal;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgVideoFrameData* vtkVgVideoModel0::GetFrameData()
+{
+  return this->VideoFrameData;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel0::SetVideoMatrix(vtkMatrix4x4* matrix)
+{
+  if (!matrix || (this->VideoFrameData->VideoMatrix == matrix))
+    {
+    return;
+    }
+
+  // Don't need to register as done by the assignment operator.
+  this->VideoFrameData->VideoMatrix = matrix;
+
+  this->UpdateDataRequestTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+unsigned long vtkVgVideoModel0::GetUpdateTime()
+{
+  return this->UpdateTime.GetMTime();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel0::SetInitialized(int arg)
+{
+  if (this->Initialized != arg)
+    {
+    this->Initialized = arg;
+    if (!this->Initialized)
+      {
+      // reset to initial system state
+      this->Playing = 0;
+      this->Paused = 0;
+      this->Stopped = 0;
+      }
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::ActionPlay(
+  const vtkVgTimeStamp& timeStamp,
+  const vtkVgTimeStamp* vtkNotUsed(referenceFrameTimeStamp))
+{
+  // Mostly expecting success
+  int retVal = VTK_OK;
+
+  this->UpdateTime.Modified();
+
+  // Update the source first.
+  this->VideoSource->Update();
+
+  retVal = (this->UseTimeStamp ? this->GetFrameUsingTimeStamp(timeStamp) :
+            this->GetSequencialFrame());
+
+  if (!this->VideoFrameData->VideoMatrix)
+    {
+    return VTK_ERROR;
+    }
+
+  return retVal;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::ActionPause(
+  const vtkVgTimeStamp& vtkNotUsed(timeStamp),
+  const vtkVgTimeStamp* vtkNotUsed(referenceFrameTimeStamp))
+{
+  // Do nothing
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::ActionStop(
+  const vtkVgTimeStamp& vtkNotUsed(timeStamp),
+  const vtkVgTimeStamp* vtkNotUsed(referenceFrameTimeStamp))
+{
+  this->SetInitialized(0);
+  this->UpdateTime.Modified();
+  this->VideoSource->Reset();
+
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+  this->InvokeEvent(vtkCommand::EndAnimationCueEvent);
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel0::OnActionPlaySuccess(
+  const vtkVgTimeStamp& timeStamp,
+  const vtkVgTimeStamp* referenceFrameTimeStamp)
+{
+  this->UpdateDataRequestTime.Modified();
+
+  // Also invoke events
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+  this->InvokeEvent(vtkCommand::AnimationCueTickEvent);
+
+  // Update models only when we have a valid frame data.
+  if (this->TrackModel)
+    {
+    this->TrackModel->Update(this->UseSourceTimeStamp ?
+                             this->VideoFrameData->TimeStamp :
+                             timeStamp, referenceFrameTimeStamp);
+    }
+
+  if (this->EventModel)
+    {
+    this->EventModel->Update(this->UseSourceTimeStamp ?
+                             this->VideoFrameData->TimeStamp :
+                             timeStamp, referenceFrameTimeStamp);
+    }
+
+  this->SetInitialized(1);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel0::OnActionPlayFailure(
+  const vtkVgTimeStamp& timeStamp,
+  const vtkVgTimeStamp* referenceFrameTimeStamp)
+{
+  this->InvokeEvent(vtkCommand::AnimationCueTickEvent);
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+  if (this->TrackModel)
+    {
+    this->TrackModel->Update(this->UseSourceTimeStamp ?
+                             this->VideoFrameData->TimeStamp :
+                             timeStamp, referenceFrameTimeStamp);
+    }
+
+  if (this->EventModel)
+    {
+    this->EventModel->Update(this->UseSourceTimeStamp ?
+                             this->VideoFrameData->TimeStamp :
+                             timeStamp, referenceFrameTimeStamp);
+    }
+
+  this->SetInitialized(1);
+  this->InvokeEvent(vtkCommand::ErrorEvent);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgVideoModel0::SkipPadding(bool updateSouce)
+{
+  std::vector<std::pair<double, double> > timeMarks;
+  timeMarks = this->VideoSource->GetTimeMarks();
+
+  if (timeMarks.empty())
+    {
+    // This should not happen
+    return false;
+    }
+  else
+    {
+    double timeRange[2];
+    this->VideoSource->GetTimeRange(timeRange);
+
+    this->ClipTimeRangeCache[0] = timeMarks[0].first;
+
+    // Do not skip padding for the end time
+    this->ClipTimeRangeCache[1] = timeRange[1];
+
+    this->CurrentSeekTime = this->ClipTimeRangeCache[0];
+
+    // Assuming that first time mark should be the original start time
+    if (updateSouce)
+      {
+      return this->VideoSource->SeekNearestEarlier(this->CurrentSeekTime);
+      }
+
+    return false;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgVideoModel0::UndoSkipPadding(bool updateSouce)
+{
+  this->VideoSource->GetTimeRange(this->ClipTimeRangeCache);
+
+  this->CurrentSeekTime = this->ClipTimeRangeCache[0];
+
+  if (updateSouce)
+    {
+    return this->VideoSource->SeekNearestEarlier(this->CurrentSeekTime);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::GetFrameUsingTimeStamp(const vtkVgTimeStamp& timeStamp)
+{
+  this->UseSourceTimeStamp = true;
+
+  // Use internal time and calculate delta time using application timestamp
+  if (this->UseInternalTimeStamp)
+    {
+    // Time is in microseconds
+    this->CurrentAppTime = timeStamp.GetTime();
+
+    // This will happen if user has paused or stopped
+    if (this->LastAppTime <= 0.0)
+      {
+      this->LastAppTime = this->CurrentAppTime;
+      }
+
+    const double delta = (this->CurrentAppTime - this->LastAppTime) *
+                         (this->PlaybackSpeed);
+
+    this->CurrentSeekTime += delta;
+
+    this->LastAppTime = this->CurrentAppTime;
+
+    int retVal = this->VideoSource->GetFrame(
+                   this->VideoFrameData, this->CurrentSeekTime);
+
+    // \TODO When not looping we need to stop and notify observers that
+    // we have reached the end of the video.
+    if (this->Looping && this->CurrentSeekTime > this->ClipTimeRangeCache[1])
+      {
+      this->UndoSkipPadding(false);
+      this->LastAppTime = 0.0;
+      }
+
+    return retVal;
+    }
+
+  // Use application timestamp as it is
+  if (this->UseFrameIndex && this->Looping)
+    {
+    const int frameNumber = static_cast<int>(
+      timeStamp.GetFrameNumber() % this->VideoSource->GetNumberOfFrames());
+
+    return this->VideoSource->GetFrame(this->VideoFrameData, frameNumber);
+    }
+  else if (this->UseFrameIndex && !this->Looping)
+    {
+    const int frameNumber = static_cast<int>(timeStamp.GetFrameNumber());
+    return this->VideoSource->GetFrame(this->VideoFrameData, frameNumber);
+    }
+  else
+    {
+    // Looping is not supported in this case
+    return this->VideoSource->GetFrame(this->VideoFrameData, timeStamp.GetTime());
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel0::GetSequencialFrame()
+{
+  this->UseSourceTimeStamp = true;
+
+  if (this->LastLoopingState != this->Looping)
+    {
+    this->VideoSource->SetLooping(this->Looping);
+    this->LastLoopingState = this->Looping;
+    }
+
+  return this->VideoSource->GetNextFrame(this->VideoFrameData);
+}
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoModel0.h b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoModel0.h
new file mode 100644
index 00000000..400c61d7
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoModel0.h
@@ -0,0 +1,258 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoModel0_h
+#define __vtkVgVideoModel0_h
+
+// Single entity that represents a video with tracks, events, and other
+// items.
+
+// VG includes.
+#include "vtkVgModelBase.h"
+#include "vtkVgVideoFrameData.h"
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgBaseImageSource;
+class vtkVgEventModel;
+class vtkVgTrackModel;
+class vtkVgVideoProviderBase;
+
+class vtkImageData;
+class vtkMatrix4x4;
+class vtkTimerLog;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgVideoModel0 : public vtkVgModelBase
+{
+public:
+  // Description:
+  // Using Macro for convenience
+  vtkVgClassMacro(vtkVgVideoModel0);
+
+  // Description:
+  // Use \c New() to create instance of \c vtkVgVideoModel0
+  static vtkVgVideoModel0* New();
+
+  // Description:
+  // Using VTK macro for convenience
+  vtkTypeMacro(vtkVgVideoModel0, vtkVgModelBase);
+
+  // Description:
+  // Serialize various states
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set \c UseFrameIndex to ( 1 ), if frame inden should be used
+  // when using timestamp to retrive frame data or ( 0 ), if time
+  // should be used instead.
+  // \sa UseTimeStamp
+  vtkSetMacro(UseFrameIndex, int);
+  vtkBooleanMacro(UseFrameIndex, int);
+
+  // Description:
+  // Return whether \UseFrameIndex is enabled ( 1 ) or disabled ( 0 )
+  vtkGetMacro(UseFrameIndex, int);
+
+  // Description:
+  // Set \c Looping to ( 1 ) or ( 0 ) to enable and disable
+  // looping at any given time.
+  // Default is ( 0 )
+  vtkSetMacro(Looping, int);
+  vtkBooleanMacro(Looping, int);
+
+  // Description:
+  // Return whether Looping is enabled ( 1 ) or disabled ( 0 )
+  vtkGetMacro(Looping, int);
+
+  // Description:
+  // Set if video needs to played from beginning or from padded offset
+  vtkSetMacro(PlayFromBeginning, int);
+  vtkGetMacro(PlayFromBeginning, int);
+  vtkBooleanMacro(PlayFromBeginning, int);
+
+  // Description:
+  // Set/Get \c vtkVgVideoProviderBase.
+  void SetVideoSource(vtkVgVideoProviderBase* videoSource);
+  vtkVgVideoProviderBase* GetVideoSource();
+  const vtkVgVideoProviderBase* GetVideoSource() const;
+
+  // Description:
+  virtual int Update(const vtkVgTimeStamp& timeStamp,
+                     const vtkVgTimeStamp* referenceFrameTimeStamp);
+  using Superclass::Update;
+
+  // Description:
+  // Method for playback controls
+  virtual int Play();
+  virtual int IsPlaying();
+
+  virtual int Pause();
+  virtual int IsPaused();
+
+  virtual int Stop();
+  virtual int IsStopped();
+
+  int Next();
+  int Previous();
+
+  int SeekTo(double time);
+
+  // Description:
+  // Return raw data related to a frame
+  const vtkVgVideoFrameData* GetFrameData();
+
+  // Description:
+  // Set homogeneous transformation matrix for the video
+  void SetVideoMatrix(vtkMatrix4x4* matrix);
+
+  void SetEventModel(vtkVgEventModel* eventModel);
+  vtkGetObjectMacro(EventModel, vtkVgEventModel);
+
+  void SetTrackModel(vtkVgTrackModel* trackModel);
+  vtkGetObjectMacro(TrackModel, vtkVgTrackModel);
+
+  // Description:
+  // Return the MTime for the last Update (that did something).
+  virtual unsigned long GetUpdateTime();
+
+  // Description:
+  // Set \UseTimeStamp to ( 1 ), if timestamp should be used to
+  // fetch frame from a source or ( 0 ), if next or previous
+  // frame in sequence should be fetched.
+  vtkSetMacro(UseTimeStamp, int);
+  vtkGetMacro(UseTimeStamp, int);
+
+  // Description:
+  vtkSetMacro(PlaybackSpeed, double);
+  vtkGetMacro(PlaybackSpeed, double);
+
+  // Description:
+  // Return current seek time. \c CurrentSeekTime is
+  // used when playing video in real time mode.
+  inline double GetCurrentSeekTime() const
+    {
+    return this->CurrentSeekTime;
+    }
+
+
+protected:
+
+  // \copydoc vtkVgModelBase::SetInitialized
+  virtual void SetInitialized(int arg);
+
+  int ActionPlay(const vtkVgTimeStamp& timeStamp,
+                 const vtkVgTimeStamp* referenceFrameTimeStamp = 0);
+  int ActionPause(const vtkVgTimeStamp& timeStamp,
+                  const vtkVgTimeStamp* referenceFrameTimeStamp = 0);
+  int ActionStop(const vtkVgTimeStamp& timeStamp,
+                 const vtkVgTimeStamp* referenceFrameTimeStamp = 0);
+
+  void OnActionPlaySuccess(const vtkVgTimeStamp& timeStamp,
+                           const vtkVgTimeStamp* referenceFrameTimeStamp = 0);
+  void OnActionPlayFailure(const vtkVgTimeStamp& timeStamp,
+                           const vtkVgTimeStamp* referenceFrameTimeStamp = 0);
+
+  bool SkipPadding(bool updateSeekTo = true);
+  bool UndoSkipPadding(bool updateSeekTo = true);
+
+  int GetFrameUsingTimeStamp(const vtkVgTimeStamp& timeStamp);
+  int GetSequencialFrame();
+
+  typedef vtkSmartPointer<vtkImageData>   vtkImageDataRef;
+
+  vtkVgVideoModel0();
+  virtual ~vtkVgVideoModel0();
+
+  // Description:
+  // Local time / global time?
+  // WE MAY NEED BEGIN / END TIME FOR THIS VIDEO ITEM.
+
+  // Description:
+  int                   NumberOfFrames;
+
+  // Description:
+  // Ratio of width of camera to viewport width.
+  double                VisibleScale;
+
+  // Description:
+  // Visible extents in object space.
+  vtkIdType             VisibleExtents[6];
+
+  // Description:
+  // States.
+  bool                  UseSourceTimeStamp;
+
+  int                   Playing;
+  int                   Paused;
+  int                   Stopped;
+
+  int                   Looping;
+  int                   LastLoopingState;
+
+  // Description:
+  // Use index or time?
+  int                   UseFrameIndex;
+
+  // Description:
+  // In future we may have an even higher level abstract
+  // source.
+  vtkSmartPointer<vtkVgVideoProviderBase>
+  VideoSource;
+
+  // Description:
+  // Data per frame for a video clip
+  vtkVgVideoFrameData*   VideoFrameData;
+
+  // Description:
+  // The EventModel for this clip
+  vtkVgEventModel*       EventModel;
+  vtkVgTrackModel*       TrackModel;
+
+  // Description:
+  // MTime for the last Update (that did something)
+  vtkTimeStamp          UpdateTime;
+
+  // Description:
+  // Flag used to set the behavior of play. If set to true
+  // video will be played from first frame or else it will be played
+  // starting from its current position.
+  int                   PlayFromBeginning;
+
+  // Description:
+  // Flag that determines if timestamp should be used to fetch
+  // frame data.
+  // Default is \c true.
+  int                   UseTimeStamp;
+
+  // Description:
+  // Default is 1.0
+  double                PlaybackSpeed;
+
+  // Description:
+  // Current seek time. \c CurrenSeekTime is used for realtime mode
+  // or when \c UseInternalTimeStamp is set to \c true.
+  double                CurrentSeekTime;
+
+  // Description:
+  // Variables that are used for tracking application time
+  double                LastAppTime;
+  double                CurrentAppTime;
+
+  // Description:
+  // Cache start and end time of the clip. This is used when playing
+  // in real time mode or when \c UseInternalTimeStamp is set to true.
+  double                ClipTimeRangeCache[2];
+
+private:
+  vtkVgVideoModel0(const vtkVgVideoModel0&);  // Not implemented.
+  void operator=(const vtkVgVideoModel0&);   // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoProviderBase.cxx b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoProviderBase.cxx
new file mode 100644
index 00000000..0171040c
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoProviderBase.cxx
@@ -0,0 +1,97 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoProviderBase.h"
+
+//-----------------------------------------------------------------------------
+vtkVgVideoProviderBase::vtkVgVideoProviderBase() : vtkVgDataSourceBase()
+{
+  this->TimeRange[1] = this->TimeRange[0] = -1.0;
+  this->TimeInterval = -1.0;
+  this->RequestedPadding = 0;
+  this->Looping = 0;
+  this->StreamId = 0;
+  this->MissionId = 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoProviderBase::~vtkVgVideoProviderBase()
+{
+  this->SetStreamId(0);
+  this->SetMissionId(0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoProviderBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoProviderBase::ShallowCopy(vtkVgDataSourceBase& other)
+{
+  this->Superclass::ShallowCopy(other);
+
+  vtkVgVideoProviderBase* otherDerived =
+    vtkVgVideoProviderBase::SafeDownCast(&other);
+  if (otherDerived)
+    {
+    this->TimeRange[0] = otherDerived->TimeRange[0];
+    this->TimeRange[1] = otherDerived->TimeRange[1];
+
+    this->TimeInterval = otherDerived->TimeInterval;
+
+    this->FrameRange[0] = otherDerived->FrameRange[0];
+    this->FrameRange[1] = otherDerived->FrameRange[1];
+
+    this->FrameInterval = otherDerived->FrameInterval;
+
+    this->RequestedPadding = otherDerived->RequestedPadding;
+    this->Looping = otherDerived->Looping;
+
+    this->SetStreamId(otherDerived->StreamId);
+    this->SetMissionId(otherDerived->MissionId);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoProviderBase::DeepCopy(vtkVgDataSourceBase& other)
+{
+  this->Superclass::DeepCopy(other);
+
+  vtkVgVideoProviderBase* otherDerived =
+    vtkVgVideoProviderBase::SafeDownCast(&other);
+  if (otherDerived)
+    {
+    this->TimeRange[0] = otherDerived->TimeRange[0];
+    this->TimeRange[1] = otherDerived->TimeRange[1];
+
+    this->TimeInterval = otherDerived->TimeInterval;
+
+    this->FrameRange[0] = otherDerived->FrameRange[0];
+    this->FrameRange[1] = otherDerived->FrameRange[1];
+
+    this->FrameInterval = otherDerived->FrameInterval;
+
+    this->RequestedPadding = otherDerived->RequestedPadding;
+    this->Looping = otherDerived->Looping;
+
+    this->SetStreamId(otherDerived->StreamId);
+    this->SetMissionId(otherDerived->MissionId);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoProviderBase::AddTimeMark(double startTime, double endTime)
+{
+  this->TimeMarks.push_back(TimeMark(startTime, endTime));
+}
+
+//-----------------------------------------------------------------------------
+std::vector<std::pair<double, double> > vtkVgVideoProviderBase::GetTimeMarks()
+{
+  return this->TimeMarks;
+}
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoProviderBase.h b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoProviderBase.h
new file mode 100644
index 00000000..9f50b0c7
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoProviderBase.h
@@ -0,0 +1,159 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoProviderBase_h
+#define __vtkVgVideoProviderBase_h
+
+#include "vtkVgDataSourceBase.h"
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+// C++ includes
+#include <map>
+#include <utility>
+#include <vector>
+
+#include <vgExport.h>
+
+class  vtkVgTimeStamp;
+struct vtkVgVideoFrameData;
+struct vtkVgVideoMetadata;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgVideoProviderBase : public vtkVgDataSourceBase
+{
+public:
+  // Description:
+  // Easy to use types.
+  vtkVgClassMacro(vtkVgVideoProviderBase);
+
+  vtkTypeMacro(vtkVgVideoProviderBase, vtkVgDataSourceBase);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get the time range for this source if there is any.
+  vtkSetVector2Macro(TimeRange, double);
+  vtkGetVector2Macro(TimeRange, double);
+
+  // Description:
+  // Set/Get time interval.
+  vtkSetMacro(TimeInterval, double);
+  vtkGetMacro(TimeInterval, double);
+
+  // Description:
+  // Set/Get frame range.
+  vtkSetVector2Macro(FrameRange, int);
+  vtkGetVector2Macro(FrameRange, int);
+
+  // Description:
+  // Set/Get frame interval.
+  vtkSetMacro(FrameInterval, int);
+  vtkGetMacro(FrameInterval, int);
+
+  // Decription:
+  // Set/Get the padding requested on either end of the clip (defaults to 0)
+  vtkSetMacro(RequestedPadding, double);
+  vtkGetMacro(RequestedPadding, double);
+
+  // Description:
+  // Toggle looping.
+  vtkSetMacro(Looping, int);
+  vtkGetMacro(Looping, int);
+  vtkBooleanMacro(Looping, int);
+
+  // Description:
+  // Set / Get mission id to be used when retrieving video.
+  vtkSetStringMacro(MissionId);
+  vtkGetStringMacro(MissionId);
+
+  // Description:
+  // Set / Get stream id to be used when retrieving video.
+  vtkSetStringMacro(StreamId);
+  vtkGetStringMacro(StreamId);
+
+  // Description:
+  // Get the next frame based on time or frame number.
+  virtual int GetFrame(vtkVgVideoFrameData* frameData, double time)  = 0;
+  virtual int GetFrame(vtkVgVideoFrameData* frameData, int frameNumber) = 0;
+
+  // Description:
+  // Get the next frame regardless of time or frame number.
+  virtual int GetNextFrame(vtkVgVideoFrameData* frameData) = 0;
+
+  // Description:
+  // Get current frame.
+  virtual int GetCurrentFrame(vtkVgVideoFrameData* frameData) = 0;
+
+  // Description:
+  // Get the previous frame regardless of time or frame number.
+  virtual int GetPreviousFrame(vtkVgVideoFrameData* frameData) = 0;
+
+  // Description:
+  // Return total number of frames. A value of lower than 0 could mean
+  // that this source either streams the frames or its unable
+  // to calculate number of frames.
+  virtual int GetNumberOfFrames() = 0;
+
+  // Description:
+  // Get a map of all currently available metadata.
+  virtual std::map<vtkVgTimeStamp, vtkVgVideoMetadata> GetMetadata() = 0;
+
+  // Description:
+  // Get metadata for the current frame.
+  virtual int GetCurrentMetadata(vtkVgVideoMetadata* metadata) = 0;
+
+  // Description:
+  // Reset to beginning of frame.
+  // This won't work if you are using time stamps.
+  virtual int Reset() = 0;
+
+  // Description:
+  // Advance the clip
+  virtual bool Advance() = 0;
+
+  // Description:
+  // Recede the clip
+  virtual bool Recede() = 0;
+
+  // Description:
+  // Position the internal frame pointer such that the next call to
+  // GetNextFrame will retrieve a frame with timestamp the same as \a
+  // time, or as close as possible earlier than \a time.
+  // Return false if \a time is out of the range of the clip.
+  virtual bool SeekNearestEarlier(double time) = 0;
+
+  virtual void ShallowCopy(vtkVgDataSourceBase& other);
+  virtual void DeepCopy(vtkVgDataSourceBase& other);
+
+  void AddTimeMark(double startTime, double endTime);
+  std::vector<std::pair<double, double> > GetTimeMarks();
+
+protected:
+  vtkVgVideoProviderBase();
+  virtual ~vtkVgVideoProviderBase();
+
+  typedef std::pair<double, double> TimeMark;
+  std::vector<TimeMark> TimeMarks;
+
+  double TimeRange[2];
+  double TimeInterval;
+  double RequestedPadding;
+
+  int    FrameRange[2];
+  int    FrameInterval;
+
+  int    Looping;
+
+  char* MissionId;
+  char* StreamId;
+
+private:
+  vtkVgVideoProviderBase(const vtkVgVideoProviderBase&);  // Not implemented.
+  void operator= (const vtkVgVideoProviderBase&);       // Not implemented.
+};
+
+#endif // __vtkVgVideoProviderBase_h
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentation0.cxx b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentation0.cxx
new file mode 100644
index 00000000..63d9b174
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentation0.cxx
@@ -0,0 +1,575 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoRepresentation0.h"
+
+// VG includes.
+#include "vtkVgEventRepresentationBase.h"
+#include "vtkVgTrackRepresentationBase.h"
+#include "vtkVgVideoModel0.h"
+
+// VTK includes.
+#include <vtkActor.h>
+#include <vtkCellArray.h>
+#include <vtkCommand.h>
+#include <vtkImageActor.h>
+#include <vtkImageData.h>
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkOutlineFilter.h>
+#include <vtkPNGWriter.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkPropCollection.h>
+#include <vtkProperty.h>
+#include <vtkTransform.h>
+#include <vtkVertex.h>
+
+vtkStandardNewMacro(vtkVgVideoRepresentation0);
+
+//-----------------------------------------------------------------------------
+vtkVgVideoRepresentation0::vtkVgVideoRepresentation0() :
+  vtkVgVideoRepresentationBase0()
+{
+  this->VideoActor = vtkImageActorRef::New();
+  this->OutlineActor = vtkActorRef::New();
+  this->MarkerActor = vtkActorRef::New();
+  this->MarkerMapper = 0;
+
+  this->VideoTransform = vtkTransformRef::New();
+  this->OutlineTransform = vtkTransformRef::New();
+  this->MarkerTransform = vtkTransformRef::New();
+
+  this->VideoActor->SetUserTransform(this->VideoTransform);
+  this->OutlineActor->SetUserTransform(this->OutlineTransform);
+  this->MarkerActor->SetUserTransform(this->MarkerTransform);
+
+  this->EventVisible = 1;
+  this->TrackVisible = 1;
+  this->OutlineVisible = 0;
+  this->VideoVisible = 1;
+  this->SelectionVisible = 0;
+  this->MarkerVisible = 1;
+
+  this->OutlineFilter = 0;
+  this->OutlineStippled = false;
+
+  this->DummyImageData = vtkImageDataRef::New();
+
+  this->MarkerPointId = 0;
+  this->MarkerLocation[0] = 0.0;
+  this->MarkerLocation[1] = 0.0;
+  this->MarkerLocation[2] = 0.0;
+
+  this->OutlineActor->VisibilityOff();
+  this->OutlineColor[0] = 1.0;
+  this->OutlineColor[1] = 1.0;
+  this->OutlineColor[2] = 0.0;
+  this->OutlineActor->GetProperty()->SetColor(this->OutlineColor);
+  this->OutlineActor->GetProperty()->SetLineWidth(4.0f);
+
+  this->MarkerActor->GetProperty()->SetPointSize(10.0f);
+  this->MarkerActor->GetProperty()->SetColor(this->OutlineColor);
+
+  this->SelectionColor[0] = 1.0;
+  this->SelectionColor[1] = 0.08;
+  this->SelectionColor[2] = 0.58;
+
+  // \NOTE: Apply some offset to avoid Z fighting.
+  this->VideoZOffset = 0.1;
+  this->OutlineZOffset = 0.2;
+  this->MarkerZOffset = 0.3;
+  this->SelectionZOffset = 0.2;
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+
+  this->NewPropCollection->AddItem(this->VideoActor);
+  this->NewPropCollection->AddItem(this->OutlineActor);
+  this->NewPropCollection->AddItem(this->MarkerActor);
+
+  this->ActivePropCollection->AddItem(this->VideoActor);
+  this->ActivePropCollection->AddItem(this->OutlineActor);
+  this->ActivePropCollection->AddItem(this->MarkerActor);
+
+  this->SetLayerIndex(0);
+
+  this->ModelError = false;
+
+  UpdateRenderObjectsTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoRepresentation0::~vtkVgVideoRepresentation0()
+{
+  if (this->OutlineFilter)
+    {
+    this->OutlineFilter->Delete();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgVideoRepresentation0::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgVideoRepresentation0::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgVideoRepresentation0::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgVideoRepresentation0::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgVideoRepresentation0::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgVideoRepresentation0::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetVisible(int flag)
+{
+  if (this->Visible == flag || this->ModelError)
+    {
+    return;
+    }
+
+  this->Visible = flag;
+
+  this->VideoActor->SetVisibility(flag && this->VideoVisible);
+  this->OutlineActor->SetVisibility(flag && this->OutlineVisible);
+  this->MarkerActor->SetVisibility(flag && this->MarkerVisible);
+
+  // Turn off other related representations.
+  // \NOTE: This might change in future.
+  if (this->TrackRepresentation)
+    {
+    this->TrackRepresentation->SetVisible(flag && this->TrackVisible);
+    }
+
+  if (this->EventRepresentation)
+    {
+    this->EventRepresentation->SetVisible(flag && this->EventVisible);
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetOutlineVisible(int flag)
+{
+  if (this->OutlineVisible != flag && this->GetVisible())
+    {
+    this->OutlineVisible = flag;
+    this->OutlineActor->SetVisibility(this->OutlineVisible);
+    this->Modified();
+    }
+  // Postpone actually setting the visibility until later when the representation
+  // will become visible.
+  else if (this->OutlineVisible != flag)
+    {
+    this->OutlineVisible = flag;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoRepresentation0::GetOutlineVisible() const
+{
+  return (this->OutlineVisible && this->GetVisible());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetSelectionVisible(int flag)
+{
+  if (flag)
+    {
+    this->OutlineActor->GetProperty()->SetColor(this->SelectionColor);
+    this->OutlineActor->GetProperty()->SetLineWidth(8.0f);
+    }
+  else
+    {
+    this->OutlineActor->GetProperty()->SetColor(this->OutlineColor);
+    this->OutlineActor->GetProperty()->SetLineWidth(4.0f);
+    }
+
+  // In sync with outline color
+  this->MarkerActor->GetProperty()->SetColor(
+    this->OutlineActor->GetProperty()->GetColor());
+
+  this->SelectionVisible = flag;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetMarkerVisible(int flag)
+{
+  if (this->MarkerVisible != flag && this->GetVisible())
+    {
+    this->MarkerVisible = flag;
+    this->MarkerActor->SetVisibility(this->MarkerVisible);
+    this->Modified();
+    }
+  // Postpone actually setting the visibility until later when the representation
+  // will become visible.
+  else if (this->MarkerVisible != flag)
+    {
+    this->MarkerVisible = flag;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetVideoVisible(int flag)
+{
+  if (this->VideoVisible != flag && this->GetVisible())
+    {
+    this->VideoVisible = flag;
+    this->VideoActor->SetVisibility(this->VideoVisible);
+    this->Modified();
+    }
+  // Postpone actually setting the visibility until later when the representation
+  // will become visible.
+  else if (this->VideoVisible != flag)
+    {
+    this->VideoVisible = flag;
+    this->Modified();
+    }
+
+  // Pass visibility flag to event as well
+  this->SetEventVisible(flag);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoRepresentation0::GetVideoVisible() const
+{
+  return (this->VideoVisible && this->GetVisible());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetTrackVisible(int flag)
+{
+  if (this->TrackVisible != flag)
+    {
+    this->TrackVisible = flag;
+    if (this->TrackRepresentation)
+      {
+      this->TrackRepresentation->SetVisible(this->GetVisible() &&
+                                            this->TrackVisible);
+      }
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetEventVisible(int flag)
+{
+  // Do not turn visibility ON if we are not playing and video clip
+  // is not visible.
+  if (flag && this->VideoModel && !this->VideoModel->IsPlaying()
+      && !this->GetVideoVisible())
+    {
+    return;
+    }
+
+  if (this->EventVisible != flag)
+    {
+    this->EventVisible = flag;
+    if (this->EventRepresentation)
+      {
+      this->EventRepresentation->SetVisible(this->GetVisible() &&
+                                            this->EventVisible);
+      }
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoRepresentation0::GetVisible() const
+{
+  return this->Visible;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetOutlineColor(double r, double g, double b)
+{
+  if (this->SelectionVisible)
+    {
+    return;
+    }
+
+  if (this->OutlineColor[0] != r || this->OutlineColor[1] != g ||
+      this->OutlineColor[2] != b)
+    {
+    this->OutlineColor[0] = r;
+    this->OutlineColor[1] = g;
+    this->OutlineColor[2] = b;
+    this->OutlineActor->GetProperty()->SetColor(this->OutlineColor);
+
+    // Outline color and marker color should be in sync
+    this->MarkerActor->GetProperty()->SetColor(this->OutlineColor);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetOutlineColor(double rgb[3])
+{
+  this->SetOutlineColor(rgb[0], rgb[1], rgb[2]);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetOutlineStippled(bool enable)
+{
+  if (enable != this->OutlineStippled)
+    {
+    this->OutlineStippled = enable;
+    this->OutlineActor->GetProperty()->SetLineStipplePattern(enable ?
+      0xf0f0 : 0xffff);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetSelectionColor(double r, double g, double b)
+{
+  if (this->SelectionColor[0] != r || this->SelectionColor[1] != g ||
+      this->SelectionColor[2] != b)
+    {
+    this->SelectionColor[0] = r;
+    this->SelectionColor[1] = g;
+    this->SelectionColor[2] = b;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::SetSelectionColor(double rgb[3])
+{
+  this->SetSelectionColor(rgb[0], rgb[1], rgb[2]);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::Update()
+{
+  if (this->VideoModel->GetUpdateDataRequestTime() >
+      this->UpdateTime.GetMTime() || this->GetUpdateRequest())
+    {
+    const vtkVgVideoFrameData* frameData = this->VideoModel->GetFrameData();
+
+    if (frameData->VideoImage)
+      {
+      if (!this->OutlineFilter)
+        {
+        this->OutlineFilter = vtkOutlineFilter::New();
+        this->OutlineFilter->SetInputData(frameData->VideoImage);
+        vtkPolyDataMapper* PDM = vtkPolyDataMapper::New();
+        PDM->SetInputConnection(this->OutlineFilter->GetOutputPort());
+        this->OutlineActor->SetMapper(PDM);
+        PDM->FastDelete();
+        }
+      else
+        {
+        this->OutlineFilter->SetInputData(frameData->VideoImage);
+        }
+      this->VideoActor->SetInputData(frameData->VideoImage);
+
+      if (!this->MarkerMapper)
+        {
+        this->CreateMarker(frameData->VideoImage);
+        }
+      else
+        {
+        this->UpdateMarker(frameData->VideoImage);
+        }
+      }
+
+    // Calculate the render matrix.
+    this->RenderMatrix->Identity();
+
+    if (frameData->VideoMatrix && this->UseModelMatrix)
+      {
+      vtkMatrix4x4::Multiply4x4(
+        this->VideoModel->GetModelMatrix(), frameData->VideoMatrix,
+        this->RenderMatrix);
+      }
+    else
+      {
+      this->RenderMatrix = this->VideoModel->GetModelMatrix();
+      }
+
+    vtkMatrix4x4::Multiply4x4(
+      this->RepresentationMatrix, this->RenderMatrix,
+      this->RenderMatrix);
+
+    // HACK - This is needed to make picking work correctly.
+    this->MakeLinear(this->RenderMatrix);
+
+    // prepare transformations... add in z offset
+    this->VideoTransform->PostMultiply();  // just to be sure
+    this->VideoTransform->SetMatrix(this->RenderMatrix);
+    this->VideoTransform->Translate(0.0, 0.0, this->VideoZOffset  +
+      vtkVgRepresentationBase::GetZOffset(this->VideoActor));
+
+    this->OutlineTransform->PostMultiply();  // just to be sure
+    this->OutlineTransform->SetMatrix(this->RenderMatrix);
+    this->OutlineTransform->Translate(0.0, 0.0, this->OutlineZOffset  +
+      vtkVgRepresentationBase::GetZOffset(this->OutlineActor));
+
+    this->MarkerTransform->PostMultiply();  // just to be sure
+    this->MarkerTransform->SetMatrix(this->RenderMatrix);
+    this->MarkerTransform->Translate(0.0, 0.0, this->MarkerZOffset  +
+      vtkVgRepresentationBase::GetZOffset(this->MarkerActor));
+
+    if (this->EventRepresentation)
+      {
+      this->EventRepresentation->SetRepresentationMatrix(this->RenderMatrix);
+      this->EventRepresentation->Update();
+      }
+
+    if (this->TrackRepresentation)
+      {
+      this->TrackRepresentation->SetRepresentationMatrix(this->RenderMatrix);
+      this->TrackRepresentation->Update();
+      }
+
+    this->UpdateTime.Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::HandleModelError()
+{
+  this->VideoActor->SetUseBounds(0);
+  this->OutlineActor->SetUseBounds(0);
+  this->MarkerActor->SetUseBounds(0);
+
+  // \NOTE It is important that we call \c SetVisible(0) before
+  // we make the \c ModelError set to \c true since \c ModelError
+  // prevents changing visibility state of all the drawable
+  // entries in this representation.
+  this->SetVisible(0);
+  this->ModelError = true;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::HandleAnimationCueTickEvent()
+{
+  if (this->VideoModel->IsPlaying() && !this->GetEventVisible())
+    {
+    this->SetEventVisible(1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::HandleEndAnimationCueEvent()
+{
+  // Set event visibility to false only when event representation is visible.
+  // Why? This is to diffrentiate between states when we receive this
+  // event while playing a video without video image shown vs when
+  // we receive this event when other video started playing. We have this
+  // requirement where we need to turn on the visibility of even region
+  // when we play a video (video image not shown) and turn off when we are stopped.
+  if (this->EventRepresentation->GetVisible() && !this->GetVideoVisible())
+    {
+    this->SetEventVisible(0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::CreateMarker(vtkImageData* imageData)
+{
+  if (!imageData)
+    {
+    return;
+    }
+
+  this->MarkerMapper = vtkPolyDataMapperRef::New();
+  this->MarkerPolyData = vtkSmartPointer<vtkPolyData>::New();
+  this->MarkerPoints = vtkSmartPointer<vtkPoints>::New();
+  vtkSmartPointer<vtkCellArray> mVerts(vtkSmartPointer<vtkCellArray>::New());
+
+  this->MarkerActor->SetMapper(this->MarkerMapper);
+  this->MarkerPolyData->SetPoints(this->MarkerPoints);
+  this->MarkerPolyData->SetVerts(mVerts);
+  this->MarkerPointId = this->MarkerPoints->InsertNextPoint(
+    this->MarkerLocation);
+
+  vtkIdType pts[1] = {this->MarkerPointId};
+  mVerts->InsertNextCell(1, pts);
+
+  this->MarkerMapper->SetInputData(this->MarkerPolyData);
+
+
+  this->UpdateMarker(imageData);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::UpdateMarker(vtkImageData* imageData)
+{
+  if (!imageData)
+    {
+    return;
+    }
+
+  int dims[3];
+  imageData->GetDimensions(dims);
+
+  this->MarkerLocation[0] = static_cast<double>(dims[0]) * 0.5;
+  this->MarkerLocation[1] = static_cast<double>(dims[1]) * 0.5;
+  this->MarkerLocation[2] = static_cast<double>(dims[2]);
+
+  this->MarkerPoints->SetPoint(this->MarkerPointId, this->MarkerLocation);
+  this->MarkerPolyData->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentation0::MakeLinear(vtkMatrix4x4* mat)
+{
+  double w = mat->Element[3][3];
+  for (int i = 0; i < 4; ++i)
+    {
+    for (int j = 0; j < 4; ++j)
+      {
+      mat->Element[i][j] /= w;
+      }
+    }
+  mat->Element[2][2] = 1.0;
+}
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentation0.h b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentation0.h
new file mode 100644
index 00000000..b0b3321f
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentation0.h
@@ -0,0 +1,199 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoRepresentation0_h
+#define __vtkVgVideoRepresentation0_h
+
+#include "vtkVgVideoRepresentationBase0.h"
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+// Forware declations.
+class vtkActor;
+class vtkImageActor;
+class vtkImageData;
+class vtkOutlineFilter;
+class vtkPoints;
+class vtkPolyData;
+class vtkPolyDataMapper;
+class vtkPropCollection;
+class vtkTransform;
+class vtkVgVideoSelectionSource;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgVideoRepresentation0
+  : public vtkVgVideoRepresentationBase0
+{
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vtkVgVideoRepresentation0);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgVideoRepresentation0, vtkVgVideoRepresentationBase0);
+
+  static vtkVgVideoRepresentation0* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  virtual const vtkPropCollection* GetNewRenderObjects()      const;
+  virtual const vtkPropCollection* GetActiveRenderObjects()   const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects()  const;
+  virtual void  ResetTemporaryRenderObjects();
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const;
+
+  virtual void Update();
+
+  void SetTrackVisible(int flag);
+  vtkGetMacro(TrackVisible, int);
+  vtkBooleanMacro(TrackVisible, int);
+
+  void SetEventVisible(int flag);
+  vtkGetMacro(EventVisible, int);
+  vtkBooleanMacro(EventVisible, int);
+
+  void SetOutlineVisible(int flag);
+  int GetOutlineVisible() const;
+  vtkBooleanMacro(OutlineVisible, int);
+
+  void SetVideoVisible(int flag);
+  int GetVideoVisible() const;
+  vtkBooleanMacro(VideoVisible, int);
+
+  void SetSelectionVisible(int flag);
+  vtkGetMacro(SelectionVisible, int);
+  vtkBooleanMacro(SelectionVisible, int);
+
+  void SetMarkerVisible(int flag);
+  vtkGetMacro(MarkerVisible, int);
+  vtkBooleanMacro(MarkerVisible, int);
+
+  // Description:
+  // Set/Get the color for the outline of the clip (0 to 1).
+  void SetOutlineColor(double r, double g, double b);
+  void SetOutlineColor(double rgb[3]);
+  vtkGetVector3Macro(OutlineColor, double);
+
+  // Description:
+  // Set/Get the whether outline will be stippled.
+  void SetOutlineStippled(bool enable);
+  vtkGetMacro(OutlineStippled, bool);
+
+  // Description:
+  // Set/Get the color for the outline of the clip (0 to 1).
+  void SetSelectionColor(double r, double g, double b);
+  void SetSelectionColor(double rgb[3]);
+  vtkGetVector3Macro(SelectionColor, double);
+
+  // Description:
+  // Set/Get the Z offset to be applied to the video actor
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(VideoZOffset, double);
+  vtkGetMacro(VideoZOffset, double);
+
+  // Description:
+  // Set/Get the Z offset to be applied to the outline actor
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(OutlineZOffset, double);
+  vtkGetMacro(OutlineZOffset, double);
+
+  // Description:
+  // Set/Get the Z offset to be applied to the marker actor
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(MarkerZOffset, double);
+  vtkGetMacro(MarkerZOffset, double);
+
+  // Description:
+  // Set/Get the Z offset to be applied to the selection actor
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(SelectionZOffset, double);
+  vtkGetMacro(SelectionZOffset, double);
+
+  vtkGetMacro(ModelError, bool);
+
+protected:
+  // Easy to use vars.
+  typedef vtkSmartPointer<vtkActor>          vtkActorRef;
+  typedef vtkSmartPointer<vtkImageActor>     vtkImageActorRef;
+  typedef vtkSmartPointer<vtkImageData>      vtkImageDataRef;
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+  typedef vtkSmartPointer<vtkTransform>      vtkTransformRef;
+  typedef vtkSmartPointer<vtkPolyData>       vtkPolyDataRef;
+  typedef vtkSmartPointer<vtkPolyDataMapper> vtkPolyDataMapperRef;
+  typedef vtkSmartPointer<vtkPoints>         vtkPointsRef;
+
+  vtkVgVideoRepresentation0();
+  virtual ~vtkVgVideoRepresentation0();
+
+  // TODO: Get rid of this function once we get support in VTK for picking
+  // actors with non-homogeneous transforms.
+  void MakeLinear(vtkMatrix4x4* mat);
+
+  virtual void HandleModelError();
+  virtual void HandleAnimationCueTickEvent();
+  virtual void HandleEndAnimationCueEvent();
+
+  void CreateMarker(vtkImageData* imageData);
+  void UpdateMarker(vtkImageData* imageData);
+
+
+protected:
+  vtkVgVideoRepresentation0(const vtkVgVideoRepresentation0&);
+  void operator= (const vtkVgVideoRepresentation0&);
+
+  vtkImageActorRef      VideoActor;
+  vtkActorRef           OutlineActor;
+
+  vtkActorRef           MarkerActor;
+  vtkPolyDataMapperRef  MarkerMapper;
+  vtkPolyDataRef        MarkerPolyData;
+  vtkPointsRef          MarkerPoints;
+
+  vtkTransformRef       VideoTransform;
+  vtkTransformRef       OutlineTransform;
+  vtkTransformRef       MarkerTransform;
+
+  double VideoZOffset;
+  double OutlineZOffset;
+  double MarkerZOffset;
+  double SelectionZOffset;
+
+  vtkOutlineFilter*     OutlineFilter;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  int                   TrackVisible;
+  int                   EventVisible;
+  int                   OutlineVisible;
+  int                   VideoVisible;
+  int                   SelectionVisible;
+  int                   MarkerVisible;
+
+  double                OutlineColor[3];
+  double                SelectionColor[3];
+
+  bool                  OutlineStippled;
+
+  vtkImageDataRef       DummyImageData;
+
+  vtkIdType             MarkerPointId;
+  double                MarkerLocation[3];
+
+  bool                  ModelError;
+};
+
+#endif
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentationBase0.cxx b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentationBase0.cxx
new file mode 100644
index 00000000..f52a6275
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentationBase0.cxx
@@ -0,0 +1,126 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoRepresentationBase0.h"
+
+#include "vtkVgEventRepresentationBase.h"
+#include "vtkVgTrackRepresentationBase.h"
+#include "vtkVgVideoModel0.h"
+
+// VTK includes.
+#include <vtkCommand.h>
+#include <vtkMatrix4x4.h>
+
+//-----------------------------------------------------------------------------
+vtkVgVideoRepresentationBase0::vtkVgVideoRepresentationBase0() :
+  vtkVgRepresentationBase(),
+  Visible(1),
+  VideoModel(NULL),
+  EventRepresentation(NULL),
+  TrackRepresentation(NULL)
+{
+  this->SetLayerIndex(0);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoRepresentationBase0::~vtkVgVideoRepresentationBase0()
+{
+  this->SetEventRepresentation(0);
+  this->SetTrackRepresentation(0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentationBase0::SetTrackRepresentation(
+  vtkVgTrackRepresentationBase* trackRep)
+{
+  if (this->TrackRepresentation != trackRep)
+    {
+    vtkVgTrackRepresentationBase* temp = this->TrackRepresentation;
+    this->TrackRepresentation = trackRep;
+    if (this->TrackRepresentation)
+      {
+      this->TrackRepresentation->Register(this);
+      this->TrackRepresentation->SetVisible(
+        this->GetVisible() && this->GetTrackVisible());
+      }
+    if (temp)
+      {
+      temp->UnRegister(this);
+      }
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentationBase0::SetEventRepresentation(
+  vtkVgEventRepresentationBase* eventRep)
+{
+  if (this->EventRepresentation != eventRep)
+    {
+    vtkVgEventRepresentationBase* temp = this->EventRepresentation;
+    this->EventRepresentation = eventRep;
+    if (this->EventRepresentation)
+      {
+      this->EventRepresentation->Register(this);
+      this->EventRepresentation->SetVisible(
+        this->GetVisible() && this->GetEventVisible());
+      }
+    if (temp)
+      {
+      temp->UnRegister(this);
+      }
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentationBase0::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoRepresentationBase0::SetVideoModel(vtkVgVideoModel0* videoModel)
+{
+  if (videoModel && (this->VideoModel.GetPointer() != videoModel))
+    {
+    this->VideoModel = videoModel;
+
+    if (this->UseAutoUpdate)
+      {
+      this->VideoModel->AddObserver(vtkCommand::UpdateDataEvent, this,
+                                    &vtkVgVideoRepresentationBase0::Update);
+      }
+
+    this->VideoModel->AddObserver(vtkCommand::ErrorEvent, this,
+      &vtkVgVideoRepresentationBase0::HandleModelError);
+
+    this->VideoModel->AddObserver(vtkCommand::StartAnimationCueEvent, this,
+      &vtkVgVideoRepresentationBase0::HandleStartAnimationCueEvent);
+
+    this->VideoModel->AddObserver(vtkCommand::AnimationCueTickEvent, this,
+      &vtkVgVideoRepresentationBase0::HandleAnimationCueTickEvent);
+
+    this->VideoModel->AddObserver(vtkCommand::EndAnimationCueEvent, this,
+      &vtkVgVideoRepresentationBase0::HandleEndAnimationCueEvent);
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoModel0* vtkVgVideoRepresentationBase0::GetVideoModel()
+{
+  return this->VideoModel;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgVideoModel0* vtkVgVideoRepresentationBase0::GetVideoModel() const
+{
+  return this->VideoModel;
+}
diff --git a/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentationBase0.h b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentationBase0.h
new file mode 100644
index 00000000..6222b304
--- /dev/null
+++ b/Libraries/VtkVgModelView/Deprecated/vtkVgVideoRepresentationBase0.h
@@ -0,0 +1,67 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoRepresentationBase0_h
+#define __vtkVgVideoRepresentationBase0_h
+
+// VTK includes.
+
+// VG includes.
+#include "vtkVgRepresentationBase.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgEventRepresentationBase;
+class vtkVgTrackRepresentationBase;
+class vtkVgVideoModel0;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgVideoRepresentationBase0
+  : public vtkVgRepresentationBase
+{
+public:
+  vtkVgClassMacro(vtkVgVideoRepresentationBase0);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgVideoRepresentationBase0, vtkVgRepresentationBase);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set the item on the representation.
+  void  SetVideoModel(vtkVgVideoModel0* videoModel);
+  vtkVgVideoModel0* GetVideoModel();
+  const vtkVgVideoModel0* GetVideoModel() const;
+
+  void SetTrackRepresentation(vtkVgTrackRepresentationBase* trackRep);
+  vtkGetObjectMacro(TrackRepresentation, vtkVgTrackRepresentationBase);
+
+  void SetEventRepresentation(vtkVgEventRepresentationBase* eventRep);
+  vtkGetObjectMacro(EventRepresentation, vtkVgEventRepresentationBase);
+
+  virtual void SetEventVisible(int flag) = 0;
+  virtual int GetEventVisible() = 0;
+
+  virtual void SetTrackVisible(int flag) = 0;
+  virtual int GetTrackVisible() = 0;
+
+protected:
+  vtkVgVideoRepresentationBase0();
+  virtual ~vtkVgVideoRepresentationBase0();
+
+  int Visible;
+
+  vtkSmartPointer<vtkVgVideoModel0>  VideoModel;
+  vtkVgEventRepresentationBase*      EventRepresentation;
+  vtkVgTrackRepresentationBase*      TrackRepresentation;
+
+private:
+  vtkVgVideoRepresentationBase0(const vtkVgVideoRepresentationBase0&); // Not implemented.
+  void operator= (const vtkVgVideoRepresentationBase0&);               // Not implemented.
+};
+
+#endif
diff --git a/Libraries/VtkVgModelView/Testing/CMakeLists.txt b/Libraries/VtkVgModelView/Testing/CMakeLists.txt
new file mode 100644
index 00000000..89e28327
--- /dev/null
+++ b/Libraries/VtkVgModelView/Testing/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Command line tests.
+include_directories(../)
+set(VGTEST_LINK_LIBRARIES vtkVgModelView)
+
+set(Tests
+#     testModelViewAPI.cxx
+)
+
+set(TestsToRun ${Tests})
+
+foreach(test ${TestsToRun})
+  get_filename_component(TName ${test} NAME_WE)
+  string(REPLACE "test" "" testname ${TName})
+  vg_add_test(vtkVgModelView-${testname} ${TName} SOURCES ${test} ARGS ${VISGUI_DATA_ROOT}/CLIF/images.txt)
+endforeach(test)
diff --git a/Libraries/VtkVgModelView/Testing/testModelViewAPI.cxx b/Libraries/VtkVgModelView/Testing/testModelViewAPI.cxx
new file mode 100644
index 00000000..30cd0e52
--- /dev/null
+++ b/Libraries/VtkVgModelView/Testing/testModelViewAPI.cxx
@@ -0,0 +1,99 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <cstdio>
+
+// VTK includes.
+#include <vtkCommand.h>
+#include <vtkProp.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkSmartPointer.h>
+#include <vtkTransform.h>
+
+// VG includes.
+#include "vtkVgVideoProviderBase.h"
+#include "vtkVgFileVideoSource.h"
+#include "vtkVgVideoRepresentation0.h"
+#include "vtkVgVideoModel0.h"
+#include "vtkVgTimeStamp.h"
+
+int main(int argc, char** argv)
+{
+  if (argc < 2)
+    {
+    std::cerr << "Requires second argument for data source" << std::endl;
+    return 1;
+    }
+
+  vtkVgTimeStamp timeStamp;
+
+  // Create two \c video model and corresponding representations.
+  vtkVgVideoModel0::SmartPtr videoModel  = vtkVgVideoModel0::SmartPtr::New();
+  vtkVgVideoModel0::SmartPtr videoModel2 = vtkVgVideoModel0::SmartPtr::New();
+
+  vtkVgVideoRepresentationBase0::SmartPtr videoRep
+    = vtkVgVideoRepresentation0::SmartPtr::New();
+  vtkVgVideoRepresentationBase0::SmartPtr videoRep2
+    = vtkVgVideoRepresentation0::SmartPtr::New();
+
+  vtkSmartPointer<vtkRenderWindow> renWin = vtkSmartPointer<vtkRenderWindow>::New();
+
+  vtkVgVideoProviderBase::SmartPtr videoSource = vtkVgFileVideoSource::SmartPtr::New();
+
+  videoSource->SetDataSource(argv[1]);
+
+  videoModel->SetVideoSource(videoSource);
+  videoModel->SetLooping(1);
+  videoModel2->SetVideoSource(videoSource);
+  videoModel2->SetLooping(1);
+
+  videoRep ->SetVideoModel(videoModel);
+  videoRep2->SetVideoModel(videoModel2);
+
+  vtkSmartPointer<vtkRenderer> ren(vtkSmartPointer<vtkRenderer>::New());
+
+  renWin->AddRenderer(ren);
+
+  vtkSmartPointer<vtkRenderWindowInteractor> renWinIntr(
+    vtkSmartPointer<vtkRenderWindowInteractor>::New());
+  renWinIntr->SetRenderWindow(renWin);
+
+  timeStamp.SetFrameNumber(1);
+
+  videoModel->Update(timeStamp);
+  videoModel2->Update(timeStamp);
+
+  // Add props from video items.
+  vtkPropCollection* collection = videoRep->GetActiveRenderObjects();
+  collection->InitTraversal();
+
+  vtkProp* prop = collection->GetNextProp();
+  while (prop)
+    {
+    ren->AddViewProp(prop);
+    prop = collection->GetNextProp();
+    }
+
+  vtkPropCollection* collection2 = videoRep2->GetActiveRenderObjects();
+  collection2->InitTraversal();
+
+  prop = collection2->GetNextProp();
+  while (prop)
+    {
+    ren->AddViewProp(prop);
+    prop = collection->GetNextProp();
+    }
+
+  ren->SetBackground(0.5, 0.5, 0.5);
+
+  ren->ResetCamera();
+
+  // \NOTE: Don't render.
+
+  return 0;
+}
diff --git a/Libraries/VtkVgModelView/vtkVgActivityManager.cxx b/Libraries/VtkVgModelView/vtkVgActivityManager.cxx
new file mode 100644
index 00000000..4a294bfc
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgActivityManager.cxx
@@ -0,0 +1,631 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgActivityManager.h"
+
+// VTK includes.
+#include <vtkActor.h>
+#include <vtkCellArray.h>
+#include <vtkCollection.h>
+#include <vtkIdList.h>
+#include <vtkMath.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkPolyData.h>
+#include <vtkPropPicker.h>
+#include <vtkRenderer.h>
+
+#include "vgActivityType.h"
+
+#include "vtkVgActivity.h"
+#include "vtkVgActivityTypeRegistry.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgIcon.h"
+#include "vtkVgIconManager.h"
+
+#include "vtkVgLabeledRegion.h"
+
+#include <vector>
+#include <map>
+#include <set>
+
+vtkStandardNewMacro(vtkVgActivityManager);
+vtkCxxSetObjectMacro(vtkVgActivityManager, IconManager, vtkVgIconManager);
+vtkCxxSetObjectMacro(vtkVgActivityManager, EventModel, vtkVgEventModel);
+vtkCxxSetObjectMacro(vtkVgActivityManager, Renderer, vtkRenderer);
+vtkCxxSetObjectMacro(vtkVgActivityManager, ActivityTypeRegistry,
+                     vtkVgActivityTypeRegistry);
+
+struct ActivityInfo
+{
+  vtkVgActivity* Activity;
+  bool Active;
+  bool DisplayActivity;
+
+  ActivityInfo()
+    {
+    this->Activity = 0;
+    this->Active = false;
+    this->DisplayActivity = false;
+    }
+
+  ~ActivityInfo()
+    {
+    if (this->Activity)
+      {
+      this->Activity->UnRegister(NULL);
+      this->Activity = 0;
+      }
+    }
+
+  // Function ensures proper reference counting.
+  void SetActivity(vtkVgActivity* activity)
+    {
+    // Proceed only if the incoming event is not
+    // this->Event.
+    if (this->Activity != activity)
+      {
+      // Before assigning a new one store the last one
+      // so that we can decrement the ref count later.
+      vtkVgActivity* temp = this->Activity;
+      this->Activity = activity;
+      // Increment the ref count.
+      if (this->Activity != NULL)
+        {
+        this->Activity->Register(NULL);
+        }
+      if (temp != NULL)
+        {
+        // Decrement the ref count.
+        temp->UnRegister(NULL);
+        }
+      }
+    }
+
+  ActivityInfo(const ActivityInfo& fromActivityInfo)
+    {
+    this->Activity = 0;
+    this->SetActivity(fromActivityInfo.Activity);
+    this->Active = fromActivityInfo.Active;
+    this->DisplayActivity = fromActivityInfo.DisplayActivity;
+    }
+
+  ActivityInfo& operator=(const ActivityInfo& fromActivityInfo)
+    {
+    this->Activity = 0;
+    this->SetActivity(fromActivityInfo.Activity);
+    this->Active = fromActivityInfo.Active;
+    this->DisplayActivity = fromActivityInfo.DisplayActivity;
+    return *this;
+    }
+};
+
+//----------------------------------------------------------------------------
+class vtkVgActivityManager::vtkInternal
+{
+public:
+  std::vector<ActivityInfo> Activities;
+
+  std::vector<bool> DisplayActivityType;
+  std::vector<double> SaliencyThreshold;
+
+  std::multimap<vtkVgTrack*, vtkVgActivity*> TrackToActivityMap;
+
+  typedef std::multimap<vtkVgTrack*, vtkVgActivity*>::const_iterator TrackActivityConstIterator;
+
+  std::multimap<vtkVgTrack*, vtkVgActivity*>::const_iterator AdjudicationIterator;
+
+  vtkInternal(vtkVgActivityManager* activityManager) : ActivityManager(activityManager)
+    {
+    }
+
+  ~vtkInternal()
+    {
+    }
+
+  vtkVgActivityManager* ActivityManager;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgActivityManager::vtkVgActivityManager()
+{
+  this->IconManager = 0;
+  this->EventModel = 0;
+  this->Renderer = 0;
+  this->Internal = new vtkInternal(this);
+  this->Visibility = true; // default to visible
+  this->OverlayOpacity = 0.3;
+  this->ColorMultiplier = 1.0;
+
+  // Support picking
+  this->Picker = vtkSmartPointer<vtkPropPicker>::New();
+  this->Picker->PickFromListOn();
+  this->PickPosition[0] = this->PickPosition[1] = this->PickPosition[2] = 0.0;
+
+  this->ActivityTypeRegistry = vtkVgActivityTypeRegistry::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgActivityManager::~vtkVgActivityManager()
+{
+  this->SetIconManager(0);
+  this->SetEventModel(0);
+  this->SetRenderer(0);
+
+  this->ActivityTypeRegistry->Delete();
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgActivityManager::IsTrackUsedByActivity(vtkVgTrack* track)
+{
+  return this->Internal->TrackToActivityMap.find(track) !=
+         this->Internal->TrackToActivityMap.end();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgActivityManager::IsEventUsedByActivity(vtkIdType eventId)
+{
+  for (size_t i = 0, size = this->Internal->Activities.size(); i < size; ++i)
+    {
+    vtkVgActivity* activity = this->Internal->Activities[i].Activity;
+    for (unsigned int i = 0, size = activity->GetNumberOfEvents(); i < size;
+         ++i)
+      {
+      if (activity->GetEvent(i)->GetId() == eventId)
+        {
+        return true;
+        }
+      }
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgActivityManager::GetNumberOfActivities()
+{
+  return static_cast<int>(this->Internal->Activities.size());
+}
+
+//-----------------------------------------------------------------------------
+vtkVgActivity* vtkVgActivityManager::GetActivity(int activityIndex)
+{
+  if (activityIndex < 0 || activityIndex >=
+      static_cast<int>(this->Internal->Activities.size()))
+    {
+    vtkErrorMacro("Invalid index: " << activityIndex);
+    return 0;
+    }
+  return this->Internal->Activities[activityIndex].Activity;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgActivityManager::GetActivityDisplayState(int activityIndex)
+{
+  if (activityIndex < 0 || activityIndex >=
+      static_cast<int>(this->Internal->Activities.size()))
+    {
+    vtkErrorMacro("Invalid index: " << activityIndex);
+    return false;
+    }
+  return this->Internal->Activities[activityIndex].DisplayActivity;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgActivityManager::GetActivityFilteredDisplayState(int activityIndex)
+{
+  if (activityIndex < 0 || activityIndex >=
+      static_cast<int>(this->Internal->Activities.size()))
+    {
+    vtkErrorMacro("Invalid index: " << activityIndex);
+    return false;
+    }
+
+  assert(this->EventModel &&
+         "Event model is needed to support activity spatial filtering");
+
+  // If at least one supporting event passes the spatial filter, the activity
+  // passes as well.
+  vtkVgActivity* a = this->Internal->Activities[activityIndex].Activity;
+  for (int i = 0, end = a->GetNumberOfEvents(); i < end; ++i)
+    {
+    vtkIdType id = a->GetEvent(i)->GetId();
+    vtkVgEventInfo info = this->EventModel->GetEventInfo(id);
+    if (info.GetPassesFilters())
+      {
+      return true;
+      }
+    }
+
+  // All supporting events are filtered out.
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::Initialize()
+{
+  this->Internal->Activities.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::AddActivity(vtkVgActivity* vgActivity)
+{
+  ActivityInfo activityInfo;
+  vgActivity->SetRenderer(this->Renderer);
+  vgActivity->SetIconManager(this->IconManager);
+  vgActivity->SetOverlayOpacity(this->OverlayOpacity);
+  activityInfo.SetActivity(vgActivity);
+  activityInfo.DisplayActivity = true;
+  this->Internal->Activities.push_back(activityInfo);
+
+  this->SetActivityColors(vgActivity);
+
+  // add map from track to activity for each of the tracks in this activity
+  std::set<vtkVgTrack*> tempSet;  // quick "hack" to prevent adding the
+                                  // activity multiple times for a track
+  for (unsigned int i = 0; i < vgActivity->GetNumberOfEvents(); i++)
+    {
+    tempSet.clear();
+    vtkVgEvent* theEvent = vgActivity->GetEvent(i);
+    for (unsigned int j = 0; j < theEvent->GetNumberOfTracks(); j++)
+      {
+      vtkVgTrack* track = theEvent->GetTrack(j);
+      if (tempSet.count(track) == 0)
+        {
+        this->Internal->TrackToActivityMap.insert(
+          std::make_pair(track, vgActivity));
+        tempSet.insert(track);
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::UpdateActivityDisplayStates()
+{
+  std::vector<ActivityInfo>::iterator activityIter;
+  for (activityIter = this->Internal->Activities.begin();
+       activityIter != this->Internal->Activities.end(); activityIter++)
+    {
+    activityIter->DisplayActivity =
+      this->Internal->DisplayActivityType[activityIter->Activity->GetType()];
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::InitializeAdjudication(vtkVgTrack* track)
+{
+  this->Internal->AdjudicationIterator =
+    this->Internal->TrackToActivityMap.lower_bound(track);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgActivity* vtkVgActivityManager::GetNextAdjudicationActivity()
+{
+  vtkVgTrack* track = this->Internal->AdjudicationIterator->first;
+  vtkVgActivity* activity = this->Internal->AdjudicationIterator->second;
+  this->Internal->AdjudicationIterator++;
+  if (this->Internal->AdjudicationIterator ==
+      this->Internal->TrackToActivityMap.upper_bound(track))
+    {
+    this->Internal->AdjudicationIterator =
+      this->Internal->TrackToActivityMap.lower_bound(track);
+    }
+  return activity;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetActivityState(vtkVgActivity* activity, bool state)
+{
+  std::vector<ActivityInfo>::iterator activityIter;
+  for (activityIter = this->Internal->Activities.begin();
+       activityIter != this->Internal->Activities.end(); activityIter++)
+    {
+    if (activityIter->Activity == activity)
+      {
+      activityIter->DisplayActivity = state;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetAllActivitiesDisplayState(bool state)
+{
+  std::vector<ActivityInfo>::iterator activityIter;
+  for (activityIter = this->Internal->Activities.begin();
+       activityIter != this->Internal->Activities.end(); activityIter++)
+    {
+    activityIter->DisplayActivity = state;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetDisplayActivityType(int activityType, bool state)
+{
+  this->Internal->DisplayActivityType[activityType] = state;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgActivityManager::GetDisplayActivityType(int activityType)
+{
+  return this->Internal->DisplayActivityType[activityType];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetVisibility(int visibility)
+{
+  if (this->Visibility == visibility)
+    {
+    return;
+    }
+  this->Visibility = visibility;
+
+  // even if setting visibility on, the activity actor may not be setup since
+  // only do so when Visibility is on in call to SetCurrentDisplayFrame.  Thus
+  // if turning on, should call UpdateActivityActors after this call
+  bool visible = visibility ? true : false;
+  std::vector<ActivityInfo>::iterator activityIter;
+  for (activityIter = this->Internal->Activities.begin();
+       activityIter != this->Internal->Activities.end(); activityIter++)
+    {
+    activityIter->Activity->SetVisibility(
+      activityIter->DisplayActivity ? visible : false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetOverlayOpacity(double opacity)
+{
+  this->OverlayOpacity = opacity;
+
+  std::vector<ActivityInfo>::iterator iter;
+  for (iter = this->Internal->Activities.begin();
+       iter != this->Internal->Activities.end(); ++iter)
+    {
+    iter->Activity->SetOverlayOpacity(opacity);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgActivityManager::UpdateActivityActors(vtkVgTimeStamp& timeStamp)
+{
+  if (!this->Visibility)
+    {
+    return false;
+    }
+
+  bool actorAdded = false;
+
+  std::vector<ActivityInfo>::iterator activityIter;
+  int index = 0;
+  for (activityIter = this->Internal->Activities.begin();
+       activityIter != this->Internal->Activities.end(); activityIter++, ++index)
+    {
+    if (activityIter->DisplayActivity  &&
+        !this->ActivityIsFiltered(activityIter->Activity) &&
+        this->GetActivityFilteredDisplayState(index))
+      {
+      if (activityIter->Activity->SetCurrentDisplayFrame(timeStamp))
+        {
+        actorAdded = true;
+        }
+      activityIter->Activity->SetVisibility(true);   // making sure
+      }
+    else
+      {
+      activityIter->Activity->SetVisibility(false);
+      }
+    }
+  return actorAdded;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgActivityManager::
+Pick(double renX, double renY, vtkRenderer* ren)
+{
+  if (!this->Visibility)
+    {
+    return -1;
+    }
+
+  this->Picker->InitializePickList();
+
+  // add actors to pick list
+  std::vector<ActivityInfo>::iterator activityIter;
+  for (activityIter = this->Internal->Activities.begin();
+       activityIter != this->Internal->Activities.end(); activityIter++)
+    {
+    if (activityIter->DisplayActivity)
+      {
+      vtkVgLabeledRegion* activityActor = activityIter->Activity->GetActor();
+      if (activityActor)
+        {
+        this->Picker->AddPickList(activityActor->GetFrameActor());
+        this->Picker->AddPickList(activityActor->GetImageActor());
+        }
+      }
+    }
+
+  if (this->Picker->Pick(renX, renY, 0.0, ren))
+    {
+    vtkProp* pickedActor = this->Picker->GetViewProp();
+    if (!pickedActor)
+      {
+      return -1;
+      }
+
+    // look up the picked actor
+    for (size_t i = 0, end = this->Internal->Activities.size(); i < end; ++i)
+      {
+      const ActivityInfo& info = this->Internal->Activities[i];
+      if (info.DisplayActivity)
+        {
+        vtkVgLabeledRegion* activityActor = info.Activity->GetActor();
+        if (activityActor &&
+            (pickedActor == activityActor->GetFrameActor() ||
+             pickedActor == activityActor->GetImageActor()))
+          {
+          return static_cast<vtkIdType>(i);
+          }
+        }
+      }
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgActivityManager::ActivityIsFiltered(vtkVgActivity* a)
+{
+  return !this->Internal->DisplayActivityType[a->GetType()] ||
+         a->GetSaliency() < this->Internal->SaliencyThreshold[a->GetType()];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::GetActivities(vtkVgTrack* track,
+  std::vector<vtkVgActivity*>& activities)
+{
+  if (!track)
+    {
+    vtkErrorMacro("ERROR: Invalid track pointer\n");
+    return;
+    }
+
+  std::pair < vtkInternal::TrackActivityConstIterator,
+      vtkInternal::TrackActivityConstIterator > ret;
+
+  ret = this->Internal->TrackToActivityMap.equal_range(track);
+
+  vtkInternal::TrackActivityConstIterator constItr;
+  for (constItr = ret.first; constItr != ret.second; ++constItr)
+    {
+    activities.push_back(constItr->second);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::InitializeTypeInfo()
+{
+  int numTypes = this->ActivityTypeRegistry->GetNumberOfTypes();
+  this->Internal->DisplayActivityType.resize(numTypes);
+  this->Internal->SaliencyThreshold.resize(numTypes);
+
+  std::fill(this->Internal->DisplayActivityType.begin(),
+            this->Internal->DisplayActivityType.end(), true);
+  std::fill(this->Internal->SaliencyThreshold.begin(),
+            this->Internal->SaliencyThreshold.end(), 0.0);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgActivityManager::GetNumberOfActivityTypes()
+{
+  return this->ActivityTypeRegistry->GetNumberOfTypes();
+}
+
+//-----------------------------------------------------------------------------
+const char* vtkVgActivityManager::GetActivityName(int activityType)
+{
+  return this->ActivityTypeRegistry->GetType(activityType).GetName();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetSaliencyThreshold(int type, double threshold)
+{
+  this->Internal->SaliencyThreshold[type] = threshold;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgActivityManager::GetSaliencyThreshold(int type)
+{
+  return this->Internal->SaliencyThreshold[type];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetActivityColors(vtkVgActivity* vgActivity)
+{
+  int type = vgActivity->GetType();
+  const vgActivityType& at = this->ActivityTypeRegistry->GetType(type);
+
+  vgActivity->SetMultiColorEnabled(false);
+
+  if (at.GetUseRandomColors())
+    {
+    // Color the activity "randomly" based on its id.
+    vtkMath::RandomSeed(vgActivity->GetId());
+    double rgb[] =
+      {
+      vtkMath::Random(0.2, 1.0)* this->ColorMultiplier,
+      vtkMath::Random(0.2, 1.0)* this->ColorMultiplier,
+      vtkMath::Random(0.2, 1.0)* this->ColorMultiplier
+      };
+    vgActivity->SetColor(rgb);
+    }
+  else
+    {
+    // Color using the configured color values.
+    double rgb[3];
+    at.GetColor(rgb[0], rgb[1], rgb[2]);
+    rgb[0] *= this->ColorMultiplier;
+    rgb[1] *= this->ColorMultiplier;
+    rgb[2] *= this->ColorMultiplier;
+    vgActivity->SetColor(rgb);
+
+    if (at.GetHasSecondaryColor())
+      {
+      double rgb2[3];
+      at.GetSecondaryColor(rgb2[0], rgb2[1], rgb2[2]);
+      rgb2[0] *= this->ColorMultiplier;
+      rgb2[1] *= this->ColorMultiplier;
+      rgb2[2] *= this->ColorMultiplier;
+      vgActivity->SetSecondaryColor(rgb2);
+      vgActivity->SetMultiColorEnabled(true);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::UpdateActivityColors()
+{
+  // Update the colors of all activities.
+  for (std::vector<ActivityInfo>::iterator iter =
+         this->Internal->Activities.begin();
+       iter != this->Internal->Activities.end(); ++iter)
+    {
+    this->SetActivityColors(iter->Activity);
+    iter->Activity->ApplyColors();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetShowFullVolume(bool show)
+{
+  for (std::vector<ActivityInfo>::iterator iter =
+         this->Internal->Activities.begin();
+       iter != this->Internal->Activities.end(); ++iter)
+    {
+    iter->Activity->SetShowAlways(show);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgActivityManager::SetActivityExpirationOffset(const vtkVgTimeStamp& ts)
+{
+  for (std::vector<ActivityInfo>::iterator iter =
+         this->Internal->Activities.begin();
+       iter != this->Internal->Activities.end(); ++iter)
+    {
+    iter->Activity->SetExpirationOffset(ts);
+    }
+}
diff --git a/Libraries/VtkVgModelView/vtkVgActivityManager.h b/Libraries/VtkVgModelView/vtkVgActivityManager.h
new file mode 100644
index 00000000..1403b3e3
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgActivityManager.h
@@ -0,0 +1,184 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgActivityManager_h
+#define __vtkVgActivityManager_h
+
+#include "vtkObject.h"
+#include "vtkSmartPointer.h" //to support picker object
+
+// VisGUI includes.
+#include "vtkVgTimeStamp.h"
+#include "vtkVgTypeDefs.h"
+
+// C++ includes.
+#include <vector> // STL required.
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgActivity;
+class vtkVgActivityTypeRegistry;
+class vtkVgEvent;
+class vtkVgEventModel;
+class vtkVgIconManager;
+class vtkVgTrack;
+
+class vgActivityType;
+
+class vtkActor;
+class vtkPropPicker;
+class vtkRenderer;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgActivityManager : public vtkObject
+{
+public:
+
+  // Description:
+  // Standard VTK functions.
+  static vtkVgActivityManager* New();
+  vtkTypeMacro(vtkVgActivityManager, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  void Initialize();
+  void AddActivity(vtkVgActivity* activity);
+
+  int GetNumberOfActivities();
+  vtkVgActivity* GetActivity(int activityIndex);
+
+  bool GetActivityDisplayState(int activityIndex);
+  bool GetActivityFilteredDisplayState(int activityIndex);
+
+  // Description:
+  // Return whether a track is used by any activities
+  bool IsTrackUsedByActivity(vtkVgTrack* track);
+
+  // Description:
+  // Return whether a event is used by any activities
+  bool IsEventUsedByActivity(vtkIdType eventId);
+
+  // Description:
+  // Specify a renderer that individual activity actors will use.
+  void SetRenderer(vtkRenderer* ren);
+  vtkGetObjectMacro(Renderer, vtkRenderer);
+
+  // Description:
+  // Specify an icon manager to coordinate with.
+  void SetIconManager(vtkVgIconManager* iconManager);
+  vtkGetObjectMacro(IconManager, vtkVgIconManager);
+
+  // Description:
+  // Specify an event model to coordinate with.
+  void SetEventModel(vtkVgEventModel* EventModel);
+  vtkGetObjectMacro(EventModel, vtkVgEventModel);
+
+  // Description:
+  // Update all the activity actor(s). Generally called by the application layer.
+  // Returns true if a new actor was added.
+  bool UpdateActivityActors(vtkVgTimeStamp& timeStamp);
+
+  // Description:
+  // Method for controlling visibility of all events.  Note, Visibility is
+  // different from the Display state.  For a particular event to be
+  // rendered, it must be "displayed" and visibility must be on.
+  void SetVisibility(int visibility);
+  vtkGetMacro(Visibility, int);
+  vtkBooleanMacro(Visibility, int);
+
+  void TurnOnAllActivities()  { this->SetAllActivitiesDisplayState(true); }
+  void TurnOffAllActivities() { this->SetAllActivitiesDisplayState(false); }
+
+  void UpdateActivityDisplayStates();
+
+  void InitializeAdjudication(vtkVgTrack* track);
+  vtkVgActivity* GetNextAdjudicationActivity();
+  void SetActivityState(vtkVgActivity* activity, bool state);
+
+  void SetDisplayActivityType(int activityType, bool state);
+  bool GetDisplayActivityType(int activityType);
+
+  void SetOverlayOpacity(double opacity);
+  vtkGetMacro(OverlayOpacity, double);
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked activityId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the activity is currently visible or not.
+  vtkIdType Pick(double renX, double renY, vtkRenderer* ren);
+
+  // Description:
+  // After a successful pick occurs, return the position of the pick (in
+  // world coordinates).
+  vtkGetVector3Macro(PickPosition, double);
+
+  // Description:
+  // Don't show activities of this type with a saliency below the threshold value.
+  void SetSaliencyThreshold(int type, double threshold);
+  double GetSaliencyThreshold(int type);
+
+  void SetActivityTypeRegistry(vtkVgActivityTypeRegistry* registry);
+  vtkGetObjectMacro(ActivityTypeRegistry, vtkVgActivityTypeRegistry);
+
+  void InitializeTypeInfo();
+
+  int GetNumberOfActivityTypes();
+
+  const char* GetActivityName(int activityType);
+
+  void UpdateActivityColors();
+
+  bool ActivityIsFiltered(vtkVgActivity* a);
+
+  // Description:
+  // Given a track pointer return list of activities linked.
+  void GetActivities(vtkVgTrack* track, std::vector<vtkVgActivity*>& activities);
+
+  // Description:
+  // Show all activities regardless of current frame.
+  void SetShowFullVolume(bool show);
+
+  // Description:
+  // Additional amount of time to display activities past their end.
+  void SetActivityExpirationOffset(const vtkVgTimeStamp& ts);
+
+  vtkSetClampMacro(ColorMultiplier, double, 0.0, 1.0);
+  vtkGetMacro(ColorMultiplier, double);
+
+private:
+  vtkVgActivityManager(const vtkVgActivityManager&); // Not implemented.
+  void operator=(const vtkVgActivityManager&);  // Not implemented.
+
+  // Description:
+  // Constructor / Destructor.
+  vtkVgActivityManager();
+  ~vtkVgActivityManager();
+
+  void SetActivityColors(vtkVgActivity* vgActivity);
+
+  void SetAllActivitiesDisplayState(bool state);
+
+  vtkVgActivityTypeRegistry* ActivityTypeRegistry;
+
+  vtkVgEventModel* EventModel;
+  vtkVgIconManager* IconManager;
+
+  vtkRenderer* Renderer;
+
+  // Internal data members to support picking
+  vtkSmartPointer<vtkPropPicker> Picker;
+  double PickPosition[3];
+
+  int Visibility;
+
+  double OverlayOpacity;
+  double ColorMultiplier;
+
+  class vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgActivityManager_h
diff --git a/Libraries/VtkVgModelView/vtkVgCompositeEventRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgCompositeEventRepresentation.cxx
new file mode 100644
index 00000000..305aa5b4
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgCompositeEventRepresentation.cxx
@@ -0,0 +1,254 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgCompositeEventRepresentation.h"
+
+#include <vtkObjectFactory.h>
+
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgPickData.h"
+#include "vtkVgPicker.h"
+
+#include <vector>
+
+vtkStandardNewMacro(vtkVgCompositeEventRepresentation);
+
+//-----------------------------------------------------------------------------
+class vtkVgCompositeEventRepresentation::vtkInternal
+{
+public:
+  std::vector<vtkSmartPointer<vtkVgEventRepresentationBase> > EventRepresentations;
+  vtkVgEventModel* EventModel;
+  vtkVgEventFilter* EventFilter;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgCompositeEventRepresentation::vtkVgCompositeEventRepresentation()
+  : vtkVgEventRepresentationBase()
+{
+  this->Visible = 1;
+  this->Internal = new vtkInternal;
+  this->Internal->EventModel = 0;
+  this->Internal->EventFilter = 0;
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgCompositeEventRepresentation::~vtkVgCompositeEventRepresentation()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCompositeEventRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgCompositeEventRepresentation::GetNewRenderObjects() const
+{
+  return const_cast<vtkVgCompositeEventRepresentation*>(this)->GetNewRenderObjects();
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgCompositeEventRepresentation::GetActiveRenderObjects() const
+{
+  return const_cast<vtkVgCompositeEventRepresentation*>(this)->GetActiveRenderObjects();
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgCompositeEventRepresentation::GetExpiredRenderObjects() const
+{
+  return const_cast<vtkVgCompositeEventRepresentation*>(this)->GetExpiredRenderObjects();
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgCompositeEventRepresentation::GetNewRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    vtkPropCollection* PC =
+      this->Internal->EventRepresentations[i]->GetNewRenderObjects();
+
+    PC->InitTraversal();
+    while (vtkProp* prop = PC->GetNextProp())
+      {
+      this->NewPropCollection->AddItem(prop);
+      }
+    }
+
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgCompositeEventRepresentation::GetActiveRenderObjects()
+{
+  this->ActivePropCollection->RemoveAllItems();
+
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    vtkPropCollection* PC =
+      this->Internal->EventRepresentations[i]->GetActiveRenderObjects();
+
+    PC->InitTraversal();
+    while (vtkProp* prop = PC->GetNextProp())
+      {
+      this->ActivePropCollection->AddItem(prop);
+      }
+    }
+
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgCompositeEventRepresentation::GetExpiredRenderObjects()
+{
+  this->ExpirePropCollection->RemoveAllItems();
+
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    vtkPropCollection* PC =
+      this->Internal->EventRepresentations[i]->GetExpiredRenderObjects();
+
+    PC->InitTraversal();
+    while (vtkProp* prop = PC->GetNextProp())
+      {
+      this->ExpirePropCollection->AddItem(prop);
+      }
+    }
+
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCompositeEventRepresentation::ResetTemporaryRenderObjects()
+{
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    this->Internal->EventRepresentations[i]->ResetTemporaryRenderObjects();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCompositeEventRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    this->Internal->EventRepresentations[i]->SetVisible(flag);
+    }
+
+  this->Visible = flag;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCompositeEventRepresentation::SetEventModel(vtkVgEventModel* model)
+{
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    this->Internal->EventRepresentations[i]->SetEventModel(model);
+    }
+
+  this->Internal->EventModel = model;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCompositeEventRepresentation::SetEventFilter(vtkVgEventFilter* filter)
+{
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    this->Internal->EventRepresentations[i]->SetEventFilter(filter);
+    }
+
+  this->Internal->EventFilter = filter;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCompositeEventRepresentation::Update()
+{
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    this->Internal->EventRepresentations[i]->Update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgCompositeEventRepresentation::Pick(
+  double renX, double renY, vtkRenderer* ren, vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    vtkIdType result =
+      this->Internal->EventRepresentations[i]->Pick(renX, renY, ren, pickType);
+    if (result != -1)
+      {
+      return result;
+      }
+    }
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCompositeEventRepresentation::
+AddEventRepresentation(vtkVgEventRepresentationBase* rep)
+{
+  // Add representation
+  this->Internal->EventRepresentations.push_back(rep);
+
+  // Set representation's model and filter to match ours, if we have them
+  if (this->Internal->EventModel)
+    {
+    rep->SetEventModel(this->Internal->EventModel);
+    }
+  if (this->Internal->EventFilter)
+    {
+    rep->SetEventFilter(this->Internal->EventFilter);
+    }
+
+  // Set representation visibility to match ours
+  rep->SetVisible(this->Visible);
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgCompositeEventRepresentation::
+RemoveEventRepresentation(vtkVgEventRepresentationBase* rep)
+{
+  for (size_t i = 0, size = this->Internal->EventRepresentations.size();
+       i < size; ++i)
+    {
+    if (this->Internal->EventRepresentations[i] == rep)
+      {
+      this->Internal->EventRepresentations.erase(
+        this->Internal->EventRepresentations.begin() + i);
+      break;
+      }
+    }
+  this->Modified();
+}
diff --git a/Libraries/VtkVgModelView/vtkVgCompositeEventRepresentation.h b/Libraries/VtkVgModelView/vtkVgCompositeEventRepresentation.h
new file mode 100644
index 00000000..5ea307e4
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgCompositeEventRepresentation.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgCompositeEventRepresentation_h
+#define __vtkVgCompositeEventRepresentation_h
+
+#include "vtkVgEventRepresentationBase.h"
+
+#include <vgExport.h>
+
+class VTKVG_MODELVIEW_EXPORT vtkVgCompositeEventRepresentation
+  : public vtkVgEventRepresentationBase
+{
+public:
+  vtkTypeMacro(vtkVgCompositeEventRepresentation, vtkVgEventRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgCompositeEventRepresentation* New();
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  // Description:
+  // Update all the event actors. Generally called by the application layer.
+  virtual void Update();
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked eventId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the event is currently visible or not.
+  virtual vtkIdType Pick(double renX, double renY, vtkRenderer* ren, vtkIdType& pickType);
+
+  // Description:
+  // Set the item on the representation.
+  virtual void SetEventModel(vtkVgEventModel* modelItem);
+  vtkGetObjectMacro(EventModel, vtkVgEventModel);
+
+  // Description:
+  // Set the event filter that this representation will use.
+  virtual void SetEventFilter(vtkVgEventFilter* filter);
+  vtkGetObjectMacro(EventFilter, vtkVgEventFilter);
+
+  void AddEventRepresentation(vtkVgEventRepresentationBase* rep);
+  void RemoveEventRepresentation(vtkVgEventRepresentationBase* rep);
+
+protected:
+  vtkVgCompositeEventRepresentation();
+  virtual ~vtkVgCompositeEventRepresentation();
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  int Visible;
+
+  class vtkInternal;
+  vtkInternal* Internal;
+
+private:
+  vtkVgCompositeEventRepresentation(const vtkVgCompositeEventRepresentation&);
+  void operator=(const vtkVgCompositeEventRepresentation&);
+};
+
+#endif // __vtkVgCompositeEventRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgDataSourceBase.cxx b/Libraries/VtkVgModelView/vtkVgDataSourceBase.cxx
new file mode 100644
index 00000000..69328819
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgDataSourceBase.cxx
@@ -0,0 +1,43 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgDataSourceBase.h"
+
+//-----------------------------------------------------------------------------
+vtkVgDataSourceBase::vtkVgDataSourceBase() : vtkObject(),
+  DataSource(NULL)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgDataSourceBase::~vtkVgDataSourceBase()
+{
+  this->SetDataSource(NULL);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgDataSourceBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const char* vtkVgDataSourceBase::GetDataSource() const
+{
+  return this->DataSource;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgDataSourceBase::ShallowCopy(vtkVgDataSourceBase& other)
+{
+  this->SetDataSource(other.DataSource);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgDataSourceBase::DeepCopy(vtkVgDataSourceBase& other)
+{
+  this->SetDataSource(other.DataSource);
+}
diff --git a/Libraries/VtkVgModelView/vtkVgDataSourceBase.h b/Libraries/VtkVgModelView/vtkVgDataSourceBase.h
new file mode 100644
index 00000000..61e00221
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgDataSourceBase.h
@@ -0,0 +1,66 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgDataSourceBase_h
+#define __vtkVgDataSourceBase_h
+
+// VTK includes.
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+
+// VG includes.
+#include "vtkVgMacros.h"
+
+#include <vgExport.h>
+
+class VTKVG_MODELVIEW_EXPORT vtkVgDataSourceBase : public vtkObject
+{
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vtkVgDataSourceBase);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgDataSourceBase, vtkObject);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get data source.
+  vtkSetStringMacro(DataSource);
+  vtkGetStringMacro(DataSource);
+  const char* GetDataSource() const;
+
+  // Description:
+  // These parameters could be used to tweak video performance.
+  // Default is to do nothing.
+  virtual void SetVisibleExtents(const int vtkNotUsed(extents)[4]) {;}
+  virtual void SetVisibleScale(const double& vtkNotUsed(scale)) {;}
+
+  // Description:
+  // LOD control
+  virtual void SetImageLevel(int vtkNotUsed(level)) {;}
+
+  // Description:
+  // Update. Does nothing by default.
+  virtual void Update() {;}
+
+  virtual void ShallowCopy(vtkVgDataSourceBase& other);
+  virtual void DeepCopy(vtkVgDataSourceBase& other);
+
+protected:
+  vtkVgDataSourceBase();
+  virtual  ~vtkVgDataSourceBase();
+
+  char*     DataSource;
+
+private:
+  vtkVgDataSourceBase(const vtkVgDataSourceBase&);  // Not implemened.
+  void operator= (const vtkVgDataSourceBase&);      // Not implemented.
+};
+
+#endif // __vtkVgDataSourceBase_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventFilter.cxx b/Libraries/VtkVgModelView/vtkVgEventFilter.cxx
new file mode 100644
index 00000000..32d679c6
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventFilter.cxx
@@ -0,0 +1,225 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventFilter.h"
+
+#include "vtkVgEvent.h"
+
+#include <vtkObjectFactory.h>
+
+#include <map>
+
+vtkStandardNewMacro(vtkVgEventFilter);
+
+struct FilterInfo
+{
+  bool   Show;
+  bool   Inverse;
+  double MaxNormalcy;
+  double MinProbability;
+
+  FilterInfo()
+    : Show(true), Inverse(false), MaxNormalcy(1.0), MinProbability(0.0) { }
+};
+
+//----------------------------------------------------------------------------
+struct vtkVgEventFilter::vtkInternal
+{
+  std::map<int, FilterInfo> FilterInfoMap;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgEventFilter::vtkVgEventFilter()
+{
+  this->Internal = new vtkInternal;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventFilter::~vtkVgEventFilter()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventFilter::SetShowType(int eventType, bool state)
+{
+  this->Internal->FilterInfoMap[eventType].Show = state;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventFilter::GetShowType(int eventType)
+{
+  if (this->Internal->FilterInfoMap.find(eventType) ==
+      this->Internal->FilterInfoMap.end())
+    {
+    return false;
+    }
+  return this->Internal->FilterInfoMap[eventType].Show;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventFilter::SetInverse(int eventType, bool state)
+{
+  this->Internal->FilterInfoMap[eventType].Inverse = state;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventFilter::GetInverse(int eventType)
+{
+  if (this->Internal->FilterInfoMap.find(eventType) ==
+      this->Internal->FilterInfoMap.end())
+    {
+    return false;
+    }
+  return this->Internal->FilterInfoMap[eventType].Inverse;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventFilter::SetMaxNormalcy(int eventType, double threshold)
+{
+  this->Internal->FilterInfoMap[eventType].MaxNormalcy = threshold;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventFilter::GetMaxNormalcy(int eventType)
+{
+  if (this->Internal->FilterInfoMap.find(eventType) ==
+      this->Internal->FilterInfoMap.end())
+    {
+    return -1.0;
+    }
+  return this->Internal->FilterInfoMap[eventType].MaxNormalcy;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventFilter::SetMinProbability(int eventType, double threshold)
+{
+  this->Internal->FilterInfoMap[eventType].MinProbability = threshold;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventFilter::GetMinProbability(int eventType)
+{
+  if (this->Internal->FilterInfoMap.find(eventType) ==
+      this->Internal->FilterInfoMap.end())
+    {
+    return 2.0;
+    }
+  return this->Internal->FilterInfoMap[eventType].MinProbability;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vtkVgEventFilter::ScoredClassifier>
+vtkVgEventFilter::GetActiveClassifiers(vtkVgEvent* event)
+{
+  std::vector<ScoredClassifier> classifiers;
+
+  for (bool valid = event->InitClassifierTraversal(); valid;
+       valid = event->NextClassifier())
+    {
+    int eventType = event->GetClassifierType();
+    if (this->Internal->FilterInfoMap.find(eventType) ==
+        this->Internal->FilterInfoMap.end())
+      {
+      continue;
+      }
+    const FilterInfo& info = this->Internal->FilterInfoMap[eventType];
+
+    if (!info.Show)
+      continue;
+
+    if (info.Inverse)
+      {
+      if (event->GetClassifierNormalcy() < info.MaxNormalcy)
+        continue;
+      }
+    else
+      {
+      if (event->GetClassifierNormalcy() > info.MaxNormalcy)
+        continue;
+      }
+
+    if (info.Inverse)
+      {
+      if (event->GetClassifierProbability() > info.MinProbability)
+        continue;
+      }
+    else
+      {
+      if (event->GetClassifierProbability() < info.MinProbability)
+        continue;
+      }
+
+    double score = event->GetClassifierScore();
+    classifiers.push_back(ScoredClassifier(eventType, score));
+    }
+
+  return classifiers;
+}
+
+
+//-----------------------------------------------------------------------------
+int vtkVgEventFilter::GetBestClassifier(vtkVgEvent* event)
+{
+  int bestType = -1;
+  double bestScore = -1.0;
+
+  for (bool valid = event->InitClassifierTraversal(); valid;
+       valid = event->NextClassifier())
+    {
+    int eventType = event->GetClassifierType();
+    if (this->Internal->FilterInfoMap.find(eventType) ==
+        this->Internal->FilterInfoMap.end())
+      {
+      continue;
+      }
+    const FilterInfo& info = this->Internal->FilterInfoMap[eventType];
+
+    if (!info.Show)
+      continue;
+
+    if (info.Inverse)
+      {
+      if (event->GetClassifierNormalcy() < info.MaxNormalcy)
+        continue;
+      }
+    else
+      {
+      if (event->GetClassifierNormalcy() > info.MaxNormalcy)
+        continue;
+      }
+
+    if (info.Inverse)
+      {
+      if (event->GetClassifierProbability() > info.MinProbability)
+        continue;
+      }
+    else
+      {
+      if (event->GetClassifierProbability() < info.MinProbability)
+        continue;
+      }
+
+    double score = event->GetClassifierScore();
+    if (score > bestScore)
+      {
+      bestScore = score;
+      bestType = eventType;
+      }
+    }
+
+  return bestType;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventFilter::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgModelView/vtkVgEventFilter.h b/Libraries/VtkVgModelView/vtkVgEventFilter.h
new file mode 100644
index 00000000..463c4885
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventFilter.h
@@ -0,0 +1,69 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventFilter_h
+#define __vtkVgEventFilter_h
+
+#include "vtkObject.h"
+
+#include <vector>
+#include <utility>
+
+#include <vgExport.h>
+
+class vtkVgEvent;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgEventFilter : public vtkObject
+{
+public:
+  vtkTypeMacro(vtkVgEventFilter, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgEventFilter* New();
+
+  // Description:
+  // Enable or disable filtering of all events of a certain type.
+  void SetShowType(int eventType, bool state);
+  bool GetShowType(int eventType);
+
+  // Description:
+  // Enable or disable inverse state of filtering.
+  void SetInverse(int eventType, bool state);
+  bool GetInverse(int eventType);
+
+  // Description:
+  // Don't display events of this type with a normalcy above the threshold value.
+  void   SetMaxNormalcy(int eventType, double threshold);
+  double GetMaxNormalcy(int eventType);
+
+  // Description:
+  // Don't display events of this type with a probability below the threshold value.
+  void   SetMinProbability(int eventType, double threshold);
+  double GetMinProbability(int eventType);
+
+  // Description:
+  // Get the list of all classifiers that pass the filter, along with their
+  // associated scores. Returns an empty list if no classifiers pass the filter.
+  typedef std::pair<int, double> ScoredClassifier;
+  std::vector<ScoredClassifier> GetActiveClassifiers(vtkVgEvent* event);
+
+  // Description:
+  // Get the highest scoring classifier for an event given the current filter settings.
+  // Returns -1 if no classifiers pass the filter.
+  int GetBestClassifier(vtkVgEvent* event);
+
+private:
+  vtkVgEventFilter(const vtkVgEventFilter&); // Not implemented.
+  void operator=(const vtkVgEventFilter&);   // Not implemented.
+
+  vtkVgEventFilter();
+  ~vtkVgEventFilter();
+
+  struct vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgEventFilter_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventIconRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgEventIconRepresentation.cxx
new file mode 100644
index 00000000..6a9d04ec
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventIconRepresentation.cxx
@@ -0,0 +1,228 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventIconRepresentation.h"
+
+#include <vtkIdListCollection.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkTimeStamp.h>
+
+#include "vgEventType.h"
+
+#include "vtkVgEvent.h"
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgIconManager.h"
+#include "vtkVgTrack.h"
+#include "vtkVgTrackModel.h"
+
+vtkStandardNewMacro(vtkVgEventIconRepresentation);
+
+vtkCxxSetObjectMacro(vtkVgEventIconRepresentation, IconManager, vtkVgIconManager);
+
+//-----------------------------------------------------------------------------
+vtkVgEventIconRepresentation::vtkVgEventIconRepresentation()
+{
+  this->IconManager = 0;
+
+  // These aren't actually used right now...
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventIconRepresentation::~vtkVgEventIconRepresentation()
+{
+  if (this->IconManager)
+    {
+    this->IconManager->UnRegister(this);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventIconRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventIconRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventIconRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventIconRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventIconRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventIconRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventIconRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventIconRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventIconRepresentation::SetVisible(int flag)
+{
+  if (this->IconManager->GetVisibility() != flag)
+    {
+    this->IconManager->SetVisibility(flag);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgEventIconRepresentation::GetVisible() const
+{
+  return this->IconManager->GetVisibility();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventIconRepresentation::UpdateEventIcons(vtkVgEvent* event)
+{
+  int id = this->EventFilter->GetBestClassifier(event);
+  if (id == -1)
+    {
+    this->HideEventIcons(event);
+    return;
+    }
+
+  vtkIdList* iconIds = event->GetIconIds();
+  int numDisplayedIcons = 0;
+
+  // show an icon at the head of each event track
+  int end = this->EventModel->GetUseTrackGroups() ?
+            event->GetNumberOfTrackGroups() : event->GetNumberOfTracks();
+  for (int i = 0; i < end; ++i)
+    {
+    vtkVgTrackDisplayData tdd = this->EventModel->GetTrackDisplayData(event, i);
+    if (tdd.NumIds == 0)
+      {
+      if (i < iconIds->GetNumberOfIds())
+        {
+        this->IconManager->SetIconVisibility(iconIds->GetId(i), 0);
+        }
+      continue;
+      }
+
+    ++numDisplayedIcons;
+
+    double x[3];
+    this->EventModel->GetTrackModel()->GetPoints()
+    ->GetPoint(tdd.IdsStart[tdd.NumIds - 1], x);
+
+    double scale = 1.0;
+    if (this->UseNormalcyCues)
+      {
+      scale = 1.0 - 0.7 * event->GetActiveClassifierNormalcy();
+      if (this->NormalcyCuesSwapped)
+        {
+        scale = 1.0 - scale;
+        }
+      }
+
+    int pos[] = { static_cast<int>(x[0]), static_cast<int>(x[1]) };
+    if (i >= iconIds->GetNumberOfIds())
+      {
+      int iconType =
+        this->EventTypeRegistry->GetTypeById(id).GetTrackIconIndex(i);
+
+      if (iconType >= 0)
+        {
+        iconIds->InsertNextId(
+          this->IconManager->AddIcon(vgEventTypeDefinitions::Event,
+                                     iconType, 1, pos, scale));
+        }
+      }
+    else
+      {
+      // @TODO: Recreate the icon if the classifier has changed.
+      vtkIdType id = iconIds->GetId(i);
+      this->IconManager->SetIconVisibility(id, 1);
+      this->IconManager->SetIconScale(id, scale);
+      this->IconManager->UpdateIconPosition(id, pos);
+      }
+    }
+
+  if (numDisplayedIcons == 0)
+    {
+    this->HideEventIcons(event);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventIconRepresentation::HideEventIcons(vtkVgEvent* event)
+{
+  vtkIdList* iconIds = event->GetIconIds();
+  for (vtkIdType i = 0; i < iconIds->GetNumberOfIds(); i++)
+    {
+    this->IconManager->SetIconVisibility(iconIds->GetId(i), 0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventIconRepresentation::Update()
+{
+  if (!this->GetVisible())
+    {
+    if (this->GetMTime() > this->UpdateTime)
+      {
+      this->IconManager->UpdateIconActors(
+        this->EventModel->GetCurrentTimeStamp().GetFrameNumber());
+      this->UpdateTime.Modified();
+      }
+    return;
+    }
+
+  this->EventModel->InitEventTraversal();
+  vtkVgEventInfo info;
+  while ((info = this->EventModel->GetNextEvent()).GetEvent())
+    {
+    if (info.GetDisplayEvent())
+      {
+      this->UpdateEventIcons(info.GetEvent());
+      }
+    else
+      {
+      this->HideEventIcons(info.GetEvent());
+      }
+    }
+
+  this->IconManager->UpdateIconActors(
+    this->EventModel->GetCurrentTimeStamp().GetFrameNumber());
+
+  this->UpdateTime.Modified();
+}
diff --git a/Libraries/VtkVgModelView/vtkVgEventIconRepresentation.h b/Libraries/VtkVgModelView/vtkVgEventIconRepresentation.h
new file mode 100644
index 00000000..3c5e8ce3
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventIconRepresentation.h
@@ -0,0 +1,75 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventIconRepresentation_h
+#define __vtkVgEventIconRepresentation_h
+
+#include "vtkSmartPointer.h"
+#include "vtkTimeStamp.h"
+#include "vtkVgEventRepresentationBase.h"
+
+#include <vgExport.h>
+
+class vtkPropCollection;
+class vtkRenderer;
+
+class vtkVgEvent;
+class vtkVgIconManager;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgEventIconRepresentation
+  : public vtkVgEventRepresentationBase
+{
+public:
+  vtkTypeMacro(vtkVgEventIconRepresentation, vtkVgEventRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgEventIconRepresentation* New();
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  virtual void SetVisible(int flag);
+  virtual int GetVisible() const;
+
+  // Description:
+  // Update all the event actors. Generally called by the application layer.
+  virtual void Update();
+
+  // Description:
+  // Set the icon manager to coordinate with.
+  void SetIconManager(vtkVgIconManager* im);
+  vtkGetObjectMacro(IconManager, vtkVgIconManager);
+
+private:
+  vtkVgEventIconRepresentation(const vtkVgEventIconRepresentation&);
+  void operator=(const vtkVgEventIconRepresentation&);
+
+  vtkVgEventIconRepresentation();
+  virtual ~vtkVgEventIconRepresentation();
+
+  void UpdateEventIcons(vtkVgEvent* event);
+  void HideEventIcons(vtkVgEvent* event);
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  vtkVgIconManager* IconManager;
+};
+
+#endif // __vtkVgEventIconRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventInfo.cxx b/Libraries/VtkVgModelView/vtkVgEventInfo.cxx
new file mode 100644
index 00000000..9e0bcc9c
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventInfo.cxx
@@ -0,0 +1 @@
+#include "vtkVgEventInfo.h"
diff --git a/Libraries/VtkVgModelView/vtkVgEventInfo.h b/Libraries/VtkVgModelView/vtkVgEventInfo.h
new file mode 100644
index 00000000..29bc1ab0
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventInfo.h
@@ -0,0 +1,107 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// The size of this class is kept small (sizeof(void*)) so that it can be
+// efficiently passed by value and inserted into "inline" data structures
+// with minimal overhead.
+
+#ifndef __vtkVgEventInfo_h
+#define __vtkVgEventInfo_h
+
+#include "vgPointerInt.h"
+
+class vtkVgEvent;
+
+class vtkVgEventInfo
+{
+  enum EventTraits
+    {
+    DisplayEvent          = 1 << 0,
+    PassesSpatialFilters  = 1 << 1,
+    PassesTemporalFilters = 1 << 2,
+    PassesFilters         = PassesSpatialFilters | PassesTemporalFilters
+    };
+
+public:
+  explicit vtkVgEventInfo(vtkVgEvent* event = 0)
+    : EventAndTraits(event, DisplayEvent | PassesFilters)
+    {}
+
+  void SetEvent(vtkVgEvent* e)
+    {
+    this->EventAndTraits.SetPointer(e);
+    }
+
+  vtkVgEvent* GetEvent() const
+    {
+    return this->EventAndTraits.GetPointer();
+    }
+
+  void SetDisplayEventOn()
+    {
+    this->EventAndTraits.SetBits(DisplayEvent);
+    }
+
+  void SetDisplayEventOff()
+    {
+    this->EventAndTraits.ClearBits(DisplayEvent);
+    }
+
+  bool GetDisplayEvent() const
+    {
+    return this->EventAndTraits.GetBitsAreSet(DisplayEvent);
+    }
+
+  void SetPassesSpatialFiltersOn()
+    {
+    this->EventAndTraits.SetBits(PassesSpatialFilters);
+    }
+
+  void SetPassesSpatialFiltersOff()
+    {
+    this->EventAndTraits.ClearBits(PassesSpatialFilters);
+    }
+
+  bool GetPassesSpatialFilters() const
+    {
+    return this->EventAndTraits.GetBitsAreSet(PassesSpatialFilters);
+    }
+
+  void SetPassesTemporalFiltersOn()
+    {
+    this->EventAndTraits.SetBits(PassesTemporalFilters);
+    }
+
+  void SetPassesTemporalFiltersOff()
+    {
+    this->EventAndTraits.ClearBits(PassesTemporalFilters);
+    }
+
+  bool GetPassesTemporalFilters() const
+    {
+    return this->EventAndTraits.GetBitsAreSet(PassesTemporalFilters);
+    }
+
+  void SetPassesFiltersOn()
+    {
+    this->EventAndTraits.SetBits(PassesFilters);
+    }
+
+  void SetPassesFiltersOff()
+    {
+    this->EventAndTraits.ClearBits(PassesFilters);
+    }
+
+  bool GetPassesFilters() const
+    {
+    return this->EventAndTraits.GetBitsAreSet(PassesFilters);
+    }
+
+private:
+  vgPointerInt<vtkVgEvent*> EventAndTraits;
+};
+
+#endif // __vtkVgEventInfo_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventLabelRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgEventLabelRepresentation.cxx
new file mode 100644
index 00000000..08407bca
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventLabelRepresentation.cxx
@@ -0,0 +1,477 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventLabelRepresentation.h"
+
+#include <vtkActor2D.h>
+#include <vtkIdListCollection.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkProperty2D.h>
+#include <vtkPropPicker.h>
+#include <vtkTextProperty.h>
+#include <vtkTimeStamp.h>
+
+#include <vgEventType.h>
+#include <vgUtil.h>
+
+#include <vtkVgAnnotationActor.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgTrack.h>
+#include <vtkVgUtil.h>
+
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgPickData.h"
+
+#include <map>
+#include <sstream>
+#include <algorithm>
+
+vtkStandardNewMacro(vtkVgEventLabelRepresentation);
+
+typedef std::map<vtkIdType, vtkVgAnnotationActor*> ActorMap;
+
+//----------------------------------------------------------------------------
+struct vtkVgEventLabelRepresentation::vtkInternal
+{
+  ~vtkInternal();
+
+  ActorMap Actors;
+  vtkSmartPointer<vtkPropPicker> Picker;
+  vtkSmartPointer<vtkMatrix4x4> InvRepresentationMatrix;
+};
+
+vtkVgEventLabelRepresentation::vtkInternal::~vtkInternal()
+{
+  for (ActorMap::iterator iter = this->Actors.begin(), end = this->Actors.end();
+       iter != end; ++iter)
+    {
+    if (iter->second)
+      {
+      iter->second->Delete();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventLabelRepresentation::vtkVgEventLabelRepresentation()
+{
+  this->Visible = 1;
+  this->ShowId = true;
+  this->ShowClassifiers = 1;
+  this->ShowProbability = false;
+  this->LabelPrefix = 0;
+  this->LocationSourceMode = LSM_Track;
+  this->Internal = new vtkInternal;
+
+  this->Internal->Picker = vtkSmartPointer<vtkPropPicker>::New();
+  this->Internal->Picker->PickFromListOn();
+
+  this->Internal->InvRepresentationMatrix =
+    vtkSmartPointer<vtkMatrix4x4>::New();
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventLabelRepresentation::~vtkVgEventLabelRepresentation()
+{
+  this->SetLabelPrefix(0);
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventLabelRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventLabelRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventLabelRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventLabelRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventLabelRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventLabelRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventLabelRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventLabelRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventLabelRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+
+  this->Visible = flag;
+  this->ActivePropCollection->InitTraversal();
+  while (vtkProp* prop = this->ActivePropCollection->GetNextProp())
+    {
+    prop->SetVisibility(flag);
+    }
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+bool CompareClassifiers(const vtkVgEventFilter::ScoredClassifier& a,
+                        const vtkVgEventFilter::ScoredClassifier& b)
+{
+  return a.second > b.second;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventLabelRepresentation::GetLabelPosition(vtkVgEvent* event,
+    double labelPosition[3])
+{
+  // determine location for label, returning false if none available
+
+  bool havePosition = false;
+
+  // 1st see if Track preferred mode, and can get from track
+  if (this->LocationSourceMode == LSM_Track ||
+      this->LocationSourceMode == LSM_TrackThenRegion)
+    {
+    havePosition = this->GetPositionBasedOnTrack(event, labelPosition);
+    }
+
+  // then, if no position yet, see if mode includes position from region
+  if (!havePosition && this->LocationSourceMode != LSM_Track)
+    {
+    havePosition = this->GetPositionBasedOnRegion(event, labelPosition);
+    }
+
+  // finally, if no position yet, see if considered region 1st THEN track
+  if (!havePosition && this->LocationSourceMode == LSM_RegionThenTrack)
+    {
+    havePosition = this->GetPositionBasedOnTrack(event, labelPosition);
+    }
+
+  return havePosition;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventLabelRepresentation::GetPositionBasedOnRegion(vtkVgEvent* event,
+  double labelPosition[3])
+{
+  vtkVgTimeStamp now = this->EventModel->GetCurrentTimeStamp();
+  if (!event->IsTimeWithinExtents(now))
+    {
+    // Display time not within event's time range; nothing to do
+    return false;
+    }
+
+  vtkIdType npts, *pts;
+  event->GetClosestDisplayRegion(now, npts, pts);
+
+  if (npts > 0)
+    {
+    vtkPoints* points = event->GetRegionPoints();
+
+    // Loop through points, transforming to get the minimum "y" (v) point. If
+    // there are several points close to the minimum y, average their min and
+    // max x values together.
+    // TODO: This is identical to the code used to position to track labels,
+    //       factor this out into a common base?
+    double minX = VTK_DOUBLE_MAX;
+    double maxX = VTK_DOUBLE_MIN;
+    double minY = VTK_DOUBLE_MAX;
+    for (int i = 0; i < npts; ++i)
+      {
+      double point[3];
+      points->GetPoint(pts[i], point);
+      const vgPoint2d tpoint =
+        vtkVgApplyHomography(point, this->RepresentationMatrix);
+      if (fabs(tpoint.Y - minY) < 1.0) // Expect always true for first point
+        {
+        vgExpandBoundaries(minX, maxX, tpoint.X);
+        vgExpandLowerBoundary(minY, tpoint.Y);
+        }
+      else if (tpoint.Y < minY)
+        {
+        // Found a new distinct min point, so reset x limits
+        minX = maxX = tpoint.X;
+        minY = tpoint.Y;
+        }
+      }
+
+    // Now that we have a good anchor point in world space, transform it back
+    // to model space before setting the actor position.
+    const vgPoint2d point = { 0.5 * (minX + maxX), minY };
+    vtkVgApplyHomography(point, this->Internal->InvRepresentationMatrix,
+                         labelPosition);
+    labelPosition[2] = 0.0;
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventLabelRepresentation::GetPositionBasedOnTrack(vtkVgEvent* event,
+  double labelPosition[3])
+{
+  // position the annotation at the head of the first track, if there is one
+  vtkVgTrackDisplayData tdd = this->EventModel->GetTrackDisplayData(event, 0);
+  if (tdd.NumIds > 0)   // if at least one id, we know we have a track
+    {
+    vtkIdType headId = tdd.IdsStart[tdd.NumIds - 1];
+    event->GetTrack(0)->GetPoints()->GetPoint(headId, labelPosition);
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventLabelRepresentation::ShowEventAnnotation(vtkVgEvent* event,
+  double labelPosition[3], bool rebuild)
+{
+  vtkVgAnnotationActor*& actor = this->Internal->Actors[event->GetId()];
+
+  // @TODO: Maintain a pool of actors that can be reused in order to
+  // avoid some of this reallocation.
+  if (!actor)
+    {
+    actor = vtkVgAnnotationActor::New();
+    actor->SetClampToViewport(false);
+    actor->SetOffset(0, -15);
+    actor->AutoCenterXOn();
+
+    this->NewPropCollection->AddItem(actor);
+    this->ActivePropCollection->AddItem(actor);
+    rebuild = true;
+    }
+
+  actor->SetUserMatrix(this->RepresentationMatrix);
+  actor->SetPosition(labelPosition);
+
+  if (rebuild)
+    {
+    std::ostringstream ostr;
+
+    if (this->LabelPrefix)
+      {
+      ostr << this->LabelPrefix;
+      }
+
+    if (this->ShowId)
+      {
+      ostr << 'E' << event->GetId();
+      }
+
+    if (this->ShowClassifiers)
+      {
+      // Get active classifiers, and sort by score
+      std::vector<vtkVgEventFilter::ScoredClassifier> classifiers =
+        this->EventFilter->GetActiveClassifiers(event);
+      std::sort(classifiers.begin(), classifiers.end(), CompareClassifiers);
+
+      // Show the top classifiers
+      for (unsigned n = 0; n < classifiers.size() && n < this->ShowClassifiers; ++n)
+        {
+        if (this->ShowId || n > 0)
+          {
+          ostr << '\n';
+          }
+
+        int idx = this->EventTypeRegistry->GetTypeIndex(classifiers[n].first);
+        if (idx >= 0)
+          {
+          const vgEventType& type = this->EventTypeRegistry->GetType(idx);
+
+          if (n == 0)
+            {
+            double bg[3];
+            double fg[3];
+            type.GetLabelBackgroundColor(bg[0], bg[1], bg[2]);
+            type.GetLabelForegroundColor(fg[0], fg[1], fg[2]);
+
+            actor->GetFrameProperty()->SetColor(bg[0], bg[1], bg[2]);
+            actor->GetTextProperty()->SetColor(fg[0], fg[1], fg[2]);
+            }
+
+          ostr << type.GetName();
+          }
+        else
+          {
+          ostr << classifiers[n].first;
+          }
+
+        // Add probability score, if requested
+        if (this->ShowProbability)
+          {
+          ostr.setf(ios::fixed, ios::floatfield);
+          ostr.precision(3);
+          ostr << " (" << event->GetProbability(classifiers[n].first) << ")";
+          }
+        }
+      }
+
+    actor->SetText(ostr.str().c_str());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventLabelRepresentation::HideEventAnnotation(vtkVgEvent* event)
+{
+  ActorMap::iterator iter = this->Internal->Actors.find(event->GetId());
+  if (iter != this->Internal->Actors.end() && iter->second)
+    {
+    this->ExpirePropCollection->AddItem(iter->second);
+
+    // linear search here could get expensive...
+    this->ActivePropCollection->RemoveItem(iter->second);
+
+    iter->second->Delete();
+    iter->second = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventLabelRepresentation::Update()
+{
+  if (!this->GetVisible())
+    {
+    return;
+    }
+
+  bool forceRebuild = this->EventFilter->GetMTime() > this->UpdateTime ||
+                      this->EventTypeRegistry->GetMTime() > this->UpdateTime ||
+                      this->GetMTime() > this->UpdateTime;
+
+  if (!forceRebuild && this->EventModel->GetMTime() < this->UpdateTime &&
+      this->EventModel->GetUpdateTime() < this->UpdateTime)
+    {
+    return;
+    }
+
+  if (this->Internal->InvRepresentationMatrix->GetMTime() <
+      this->RepresentationMatrix->GetMTime())
+    {
+    vtkMatrix4x4::Invert(this->RepresentationMatrix,
+                         this->Internal->InvRepresentationMatrix);
+    }
+
+  double labelPosition[3];
+  vtkVgEventInfo info;
+  this->EventModel->InitEventTraversal();
+  while ((info = this->EventModel->GetNextEvent()).GetEvent())
+    {
+    vtkVgEvent* event = info.GetEvent();
+    if (info.GetDisplayEvent() &&
+        info.GetPassesFilters() &&
+        this->GetLabelPosition(event, labelPosition) &&
+        this->EventFilter->GetBestClassifier(event) != -1)
+      {
+      this->ShowEventAnnotation(event, labelPosition, forceRebuild);
+      }
+    else
+      {
+      this->HideEventAnnotation(event);
+      }
+    }
+
+  this->UpdateTime.Modified();
+}
+
+
+//-----------------------------------------------------------------------------
+void vtkVgEventLabelRepresentation::EventRemoved(
+  vtkObject* vtkNotUsed(caller),
+  unsigned long vtkNotUsed(invokedEventId),
+  void* theEvent)
+{
+  this->HideEventAnnotation(static_cast<vtkVgEvent*>(theEvent));
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgEventLabelRepresentation::Pick(double renX,
+                                              double renY,
+                                              vtkRenderer* ren,
+                                              vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+
+  if (!this->GetVisible())
+    {
+    return -1;
+    }
+
+  // Set up the pick list and add the actors to it
+  this->Internal->Picker->InitializePickList();
+
+  for (ActorMap::iterator iter = this->Internal->Actors.begin(),
+       end = this->Internal->Actors.end();
+       iter != end; ++iter)
+    {
+    if (iter->second)
+      {
+      this->Internal->Picker->AddPickList(iter->second->GetFrameActor());
+      }
+    }
+
+  if (this->Internal->Picker->Pick(renX, renY, 0.0, ren))
+    {
+    vtkProp* pickedActor = this->Internal->Picker->GetViewProp();
+    if (!pickedActor)
+      {
+      return -1;
+      }
+
+    // Look up the picked actor
+    for (ActorMap::iterator iter = this->Internal->Actors.begin(),
+         end = this->Internal->Actors.end();
+         iter != end; ++iter)
+      {
+      if (iter->second && pickedActor == iter->second->GetFrameActor())
+        {
+        pickType = vtkVgPickData::PickedEvent;
+        return iter->first;
+        }
+      }
+    }
+
+  return -1;
+}
diff --git a/Libraries/VtkVgModelView/vtkVgEventLabelRepresentation.h b/Libraries/VtkVgModelView/vtkVgEventLabelRepresentation.h
new file mode 100644
index 00000000..f97409f4
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventLabelRepresentation.h
@@ -0,0 +1,140 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventLabelRepresentation_h
+#define __vtkVgEventLabelRepresentation_h
+
+#include "vtkSmartPointer.h"
+#include "vtkVgEventRepresentationBase.h"
+
+#include <vgExport.h>
+
+class vtkCollection;
+class vtkMatrix4x4;
+class vtkPropCollection;
+class vtkRenderer;
+
+class vtkVgEvent;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgEventLabelRepresentation
+  : public vtkVgEventRepresentationBase
+{
+public:
+  vtkTypeMacro(vtkVgEventLabelRepresentation, vtkVgEventRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgEventLabelRepresentation* New();
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  virtual vtkIdType Pick(double renX,
+                         double renY,
+                         vtkRenderer* ren,
+                         vtkIdType& pickType);
+
+  // Description:
+  // Set if the label should include the event ID
+  vtkSetMacro(ShowId, bool);
+  vtkGetMacro(ShowId, bool);
+
+  // Description:
+  // Set how many classifiers (max) the label should show
+  vtkSetMacro(ShowClassifiers, unsigned int);
+  vtkGetMacro(ShowClassifiers, unsigned int);
+
+  // Description:
+  // Set if the label should include the classifier score
+  vtkSetMacro(ShowProbability, bool);
+  vtkGetMacro(ShowProbability, bool);
+
+  // Description:
+  // Update all the event actors. Generally called by the application layer.
+  virtual void Update();
+
+  // Description:
+  // Set/Get prefix to add to the label
+  vtkSetStringMacro(LabelPrefix);
+  vtkGetStringMacro(LabelPrefix);
+
+  enum enumLocationSourceMode
+    {
+    LSM_Track,            // Place based on track (if present)
+    LSM_Region,           // Place based on region (if present)
+    LSM_TrackThenRegion,  // Place based on track, if available; region if not
+    LSM_RegionThenTrack   // Place based on region, if available; track if not
+    };
+
+  // Description:
+  // Set/Get the source (track and/or region) for location of the label
+  vtkSetMacro(LocationSourceMode, enumLocationSourceMode);
+  vtkGetMacro(LocationSourceMode, enumLocationSourceMode);
+  void SetLocationSourceModeToTrack()
+    {
+    this->SetLocationSourceMode(LSM_Track);
+    }
+  void SetLocationSourceModeToRegion()
+    {
+    this->SetLocationSourceMode(LSM_Region);
+    }
+  void SetLocationSourceModeToTrackThenRegion()
+    {
+    this->SetLocationSourceMode(LSM_TrackThenRegion);
+    }
+  void SetLocationSourceModeToRegionThenTrack()
+    {
+    this->SetLocationSourceMode(LSM_RegionThenTrack);
+    }
+
+protected:
+  virtual void EventRemoved(vtkObject* caller, unsigned long invokedEventId,
+                            void* theEvent);
+
+private:
+  vtkVgEventLabelRepresentation(const vtkVgEventLabelRepresentation&);
+  void operator=(const vtkVgEventLabelRepresentation&);
+
+  vtkVgEventLabelRepresentation();
+  virtual ~vtkVgEventLabelRepresentation();
+
+  bool GetLabelPosition(vtkVgEvent* event, double labelPosition[3]);
+  bool GetPositionBasedOnRegion(vtkVgEvent* event, double labelPosition[3]);
+  bool GetPositionBasedOnTrack(vtkVgEvent* event, double labelPosition[3]);
+  void ShowEventAnnotation(vtkVgEvent* event, double labelPosition[3],
+                           bool rebuild);
+  void HideEventAnnotation(vtkVgEvent* event);
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  int          Visible;
+  bool         ShowId;
+  unsigned int ShowClassifiers;
+  bool         ShowProbability;
+  char*        LabelPrefix;
+  enumLocationSourceMode LocationSourceMode;
+
+  struct vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgEventLabelRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventModel.cxx b/Libraries/VtkVgModelView/vtkVgEventModel.cxx
new file mode 100644
index 00000000..0c9f910f
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventModel.cxx
@@ -0,0 +1,641 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventModel.h"
+
+#include "vgEventType.h"
+#include "vtkVgContourOperatorManager.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventInfo.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgTemporalFilters.h"
+#include "vtkVgTrack.h"
+#include "vtkVgTrackModel.h"
+
+#include <vtkCommand.h>
+#include <vtkIdList.h>
+#include <vtkIdListCollection.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkTimeStamp.h>
+
+#include <assert.h>
+#include <map>
+
+vtkStandardNewMacro(vtkVgEventModel);
+
+vtkCxxSetObjectMacro(vtkVgEventModel, TrackModel, vtkVgTrackModel);
+vtkCxxSetObjectMacro(vtkVgEventModel, SharedRegionPoints, vtkPoints);
+
+typedef std::map<vtkIdType, vtkVgEventInfo>           EventMap;
+typedef std::map<vtkIdType, vtkVgEventInfo>::iterator EventMapIterator;
+typedef std::map<int, double> EventNormalcyMap;
+
+//----------------------------------------------------------------------------
+struct vtkVgEventModel::vtkInternal
+{
+  EventMap         EventIdMap;
+  EventMapIterator EventIter;
+
+  EventNormalcyMap NormalcyMinimum;
+  EventNormalcyMap NormalcyMaximum;
+
+  vtkTimeStamp UpdateTime;
+  vtkTimeStamp SpatialFilteringUpdateTime;
+  vtkTimeStamp TemporalFilteringUpdateTime;
+
+  std::vector<EventLink> EventLinks;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgEventModel::vtkVgEventModel()
+{
+  this->TrackModel = 0;
+  this->UseSharedRegionPoints = true;
+  this->SharedRegionPoints = vtkPoints::New();
+
+  this->Internal = new vtkInternal;
+
+  this->ShowEventsBeforeStart = false;
+  this->ShowEventsAfterExpiration = false;
+  this->ShowEventsUntilSupportingTracksExpire = false;
+
+  this->UseTrackGroups = false;
+
+  this->EventExpirationOffset.SetFrameNumber(0u);
+  this->EventExpirationOffset.SetTime(0.0);
+
+  this->CurrentTimeStamp.SetToMinTime();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventModel::~vtkVgEventModel()
+{
+  this->SetTrackModel(0);
+  this->SetSharedRegionPoints(0);
+
+  for (EventMapIterator itr = this->Internal->EventIdMap.begin(),
+       end = this->Internal->EventIdMap.end(); itr != end; ++itr)
+    {
+    itr->second.GetEvent()->UnRegister(this);
+    }
+
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vtkVgEventModel::GetEvent(vtkIdType eventId)
+{
+  EventMapIterator eventIter = this->Internal->EventIdMap.find(eventId);
+  if (eventIter != this->Internal->EventIdMap.end())
+    {
+    return eventIter->second.GetEvent();
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventInfo vtkVgEventModel::GetEventInfo(vtkIdType eventId)
+{
+  EventMapIterator eventIter = this->Internal->EventIdMap.find(eventId);
+  if (eventIter != this->Internal->EventIdMap.end())
+    {
+    return eventIter->second;
+    }
+  return vtkVgEventInfo();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackDisplayData vtkVgEventModel::GetTrackDisplayData(vtkVgEvent* event,
+  int trackIndex)
+{
+  vtkVgTimeStamp eventStart = event->GetStartFrame();
+  vtkVgTimeStamp eventExpiration = event->GetEndFrame();
+  eventExpiration.ShiftForward(this->EventExpirationOffset);
+
+  // Never display the event track if its start occurs before the reference time.
+  if (this->ReferenceTimeStamp.IsValid() &&
+      eventStart < this->ReferenceTimeStamp)
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  if (!this->ShowEventsBeforeStart &&
+      this->CurrentTimeStamp < eventStart)
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  if (!this->ShowEventsAfterExpiration &&
+      this->CurrentTimeStamp > eventExpiration)
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  // Display the whole event if showing before the start of the event.
+  if (this->CurrentTimeStamp < eventStart)
+    {
+    return event->GetTrackDisplayData(trackIndex, this->UseTrackGroups,
+                                      vtkVgTimeStamp(false),
+                                      vtkVgTimeStamp(true));
+    }
+
+  // Waiting for track expiration?
+  if (this->ShowEventsUntilSupportingTracksExpire)
+    {
+    vtkVgTimeStamp maxTime(false);
+    int end = this->UseTrackGroups ?
+              event->GetNumberOfTrackGroups() : event->GetNumberOfTracks();
+    for (int i = 0; i < end; ++i)
+      {
+      vtkVgTimeStamp endFrame = this->TrackModel->GetTrackEndDisplayFrame(
+        this->UseTrackGroups ? event->GetTrackGroupTrack(i) :
+          event->GetTrack(i));
+      if (endFrame > maxTime)
+        {
+        maxTime = endFrame;
+        }
+      }
+    if (this->CurrentTimeStamp > maxTime)
+      {
+      return vtkVgTrackDisplayData();
+      }
+    }
+
+  // Display from the first frame of the event track up to the current frame.
+  return event->GetTrackDisplayData(trackIndex, this->UseTrackGroups,
+                                    vtkVgTimeStamp(false),
+                                    this->CurrentTimeStamp);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::GetEvents(vtkIdType trackId,
+  std::vector<vtkVgEvent*>& events)
+{
+  EventMapIterator eventIter = this->Internal->EventIdMap.begin();
+  while (eventIter != this->Internal->EventIdMap.end())
+    {
+    vtkVgEvent* event = eventIter->second.GetEvent();
+    if (event->HasTrack(trackId))
+      {
+      events.push_back(event);
+      }
+    ++eventIter;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::GetEvents(vtkVgTrack* track,
+  std::vector<vtkVgEvent*>& events)
+{
+  if (!track)
+    {
+    vtkErrorMacro("ERROR: NULL or invalid track\n");
+    return;
+    }
+
+  this->GetEvents(track->GetId(), events);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::InitEventTraversal()
+{
+  this->Internal->EventIter = this->Internal->EventIdMap.begin();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventInfo vtkVgEventModel::GetNextEvent()
+{
+  if (this->Internal->EventIter != this->Internal->EventIdMap.end())
+    {
+    return this->Internal->EventIter++->second;
+    }
+
+  return vtkVgEventInfo();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventInfo vtkVgEventModel::GetNextDisplayedEvent()
+{
+  while (this->Internal->EventIter != this->Internal->EventIdMap.end())
+    {
+    if (this->Internal->EventIter->second.GetDisplayEvent() &&
+        this->Internal->EventIter->second.GetPassesFilters())
+      {
+      return this->Internal->EventIter++->second;
+      }
+    ++this->Internal->EventIter;
+    }
+
+  return vtkVgEventInfo();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgEventModel::GetNumberOfEvents()
+{
+  return static_cast<vtkIdType>(this->Internal->EventIdMap.size());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::SetEventExpirationOffset(const vtkVgTimeStamp& offset)
+{
+  if (offset != this->EventExpirationOffset)
+    {
+    this->EventExpirationOffset = offset;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::Initialize()
+{
+  this->Internal->EventIdMap.clear();
+  this->Internal->NormalcyMinimum.clear();
+  this->Internal->NormalcyMaximum.clear();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vtkVgEventModel::AddEvent(vtkVgEventBase* vgEventBase)
+{
+  vtkVgEventInfo eventInfo;
+  vtkVgEvent* vgEvent = vtkVgEvent::SafeDownCast(vgEventBase);
+  if (!vgEvent)
+    {
+    vgEvent = vtkVgEvent::New();
+    if (this->UseSharedRegionPoints)
+      {
+      vgEvent->SetRegionPoints(this->SharedRegionPoints);
+      }
+    vgEvent->DeepCopy(vgEventBase, true);
+    if (this->TrackModel)
+      {
+      // if we have a track model, try to resolve the track ptr
+
+      for (unsigned int i = 0; i < vgEvent->GetNumberOfTracks(); i++)
+        {
+        if (!vgEvent->SetTrackPtr(i,
+            this->TrackModel->GetTrack(vgEvent->GetTrackId(i))))
+          {
+          // not sure how to handle this yet... since now have events that
+          // might not have resolved tracks (display something of interest
+          // via region), we don't necessarily need to throw away events
+          // that we can't link up.  However, we will throw them away if
+          // were able to find some of the tracks for the events, but not al.
+          if (i != 0)
+            {
+            vtkErrorMacro("Resolved some, but not all, track ptrs in event... thus NOT added!");
+            vgEvent->Delete();
+            return 0;
+            }
+          else
+            {
+            vtkErrorMacro("Failed to resolve track ptrs in event... but event added anyway!");
+            break;
+            }
+          }
+        }
+      }
+    eventInfo.SetEvent(vgEvent);
+    vgEvent->Register(this);
+    vgEvent->FastDelete();
+    }
+  else
+    {
+    eventInfo.SetEvent(vgEvent);
+    vgEvent->Register(this);
+    }
+  this->Modified();
+
+  eventInfo.SetDisplayEventOn();
+  this->Internal->EventIdMap[vgEvent->GetId()] = eventInfo;
+
+  // Update minimum and maximum normalcy for this event's classifiers
+  EventNormalcyMap::iterator itr;
+  for (bool valid = vgEvent->InitClassifierTraversal(); valid;
+       valid = vgEvent->NextClassifier())
+    {
+    int type = vgEvent->GetClassifierType();
+    double normalcy = vgEvent->GetClassifierNormalcy();
+
+    itr = this->Internal->NormalcyMinimum.find(type);
+    if (itr == this->Internal->NormalcyMinimum.end() ||
+        itr->second > normalcy)
+      {
+      this->Internal->NormalcyMinimum[type] = normalcy;
+      }
+
+    itr = this->Internal->NormalcyMaximum.find(type);
+    if (itr == this->Internal->NormalcyMaximum.end() ||
+        itr->second < normalcy)
+      {
+      this->Internal->NormalcyMaximum[type] = normalcy;
+      }
+    }
+  return vgEvent;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::AddEventLink(const EventLink& link)
+{
+  this->Internal->EventLinks.push_back(link);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::GetEventLink(int index, EventLink& link)
+{
+  link = this->Internal->EventLinks[index];
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgEventModel::GetNumberOfEventLinks()
+{
+  return static_cast<int>(this->Internal->EventLinks.size());
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vtkVgEventModel::CreateAndAddEvent(int type, vtkIdList* trackIds)
+{
+  if (!this->TrackModel)
+    {
+    return 0;
+    }
+  vtkVgEvent* event = vtkVgEvent::New();
+  if (this->UseSharedRegionPoints)
+    {
+    event->SetRegionPoints(this->SharedRegionPoints);
+    }
+
+  vtkIdType id = this->GetNextAvailableId();
+
+  event->SetId(id);
+  event->AddClassifier(type, 0.0, 1.0);
+
+  event->SetFlags(vtkVgEvent::EF_UserCreated |
+                  vtkVgEvent::EF_Dirty |
+                  vtkVgEvent::EF_Modifiable);
+
+  vtkVgTimeStamp minFrame(true);
+  vtkVgTimeStamp maxFrame(false);
+
+  for (vtkIdType i = 0, end = trackIds->GetNumberOfIds(); i < end; ++i)
+    {
+    vtkVgTrack* track = this->TrackModel->GetTrack(trackIds->GetId(i));
+
+    vtkVgTimeStamp startFrame = track->GetStartFrame();
+    vtkVgTimeStamp endFrame = track->GetEndFrame();
+
+    event->AddTrack(track, startFrame, endFrame);
+
+    minFrame = std::min(minFrame, startFrame);
+    maxFrame = std::max(maxFrame, endFrame);
+    }
+
+  // for now, have the event span the entire duration of all child tracks
+  event->SetStartFrame(minFrame);
+  event->SetEndFrame(maxFrame);
+
+  this->AddEvent(event);
+  event->FastDelete();
+
+  this->Modified();
+  return event;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vtkVgEventModel::CloneEvent(vtkIdType eventId)
+{
+  vtkVgEvent* srcEvent = this->GetEvent(eventId);
+  if (!srcEvent)
+    {
+    return 0;
+    }
+
+  vtkVgEvent* event = vtkVgEvent::New();
+  event->CloneEvent(srcEvent);
+
+  vtkIdType id = this->Internal->EventIdMap.empty()
+                   ? 0
+                   : (--this->Internal->EventIdMap.end())->first + 1;
+
+  event->SetId(id);
+  this->AddEvent(event);
+  event->FastDelete();
+
+  this->Modified();
+  return event;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventModel::RemoveEvent(vtkIdType eventId)
+{
+  EventMapIterator iter = this->Internal->EventIdMap.find(eventId);
+  if (iter != this->Internal->EventIdMap.end())
+    {
+    vtkVgEvent* event = iter->second.GetEvent();
+    this->InvokeEvent(vtkVgEventModel::EventRemoved, event);
+    this->Internal->EventIdMap.erase(iter);
+    event->UnRegister(this);
+    this->Modified();
+    return true;
+    }
+  return false;  // not removed (not present)
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventModel::GetNormalcyMinForType(int type)
+{
+  EventNormalcyMap::iterator itr = this->Internal->NormalcyMinimum.find(type);
+  if (itr == this->Internal->NormalcyMinimum.end())
+    {
+    return VTK_DOUBLE_MAX;
+    }
+  return itr->second;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgEventModel::GetNormalcyMaxForType(int type)
+{
+  EventNormalcyMap::iterator itr = this->Internal->NormalcyMaximum.find(type);
+  if (itr == this->Internal->NormalcyMaximum.end())
+    {
+    return VTK_DOUBLE_MIN;
+    }
+  return itr->second;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgEventModel::Update(const vtkVgTimeStamp& timeStamp,
+                            const vtkVgTimeStamp* referenceFrameTimeStamp/*=0*/)
+{
+  bool updateSpatial = this->ContourOperatorManager &&
+                       (this->GetMTime() >
+                        this->Internal->SpatialFilteringUpdateTime ||
+                        this->ContourOperatorManager->GetMTime() >
+                        this->Internal->SpatialFilteringUpdateTime);
+
+  bool updateTemporal = this->TemporalFilters &&
+                        (this->GetMTime() >
+                         this->Internal->TemporalFilteringUpdateTime ||
+                         this->TemporalFilters->GetMTime() >
+                         this->Internal->TemporalFilteringUpdateTime);
+
+  if (this->CurrentTimeStamp == timeStamp &&
+      this->Internal->UpdateTime > this->GetMTime() &&
+      !(updateSpatial || updateTemporal))
+    {
+    return VTK_OK;
+    }
+
+  this->CurrentTimeStamp = timeStamp;
+  this->ReferenceTimeStamp = referenceFrameTimeStamp ? *referenceFrameTimeStamp
+                             : vtkVgTimeStamp();
+
+  this->Internal->UpdateTime.Modified();
+  if (updateSpatial)
+    {
+    this->Internal->SpatialFilteringUpdateTime.Modified();
+    }
+  if (updateTemporal)
+    {
+    this->Internal->TemporalFilteringUpdateTime.Modified();
+    }
+
+  EventMapIterator eventIter;
+  for (eventIter = this->Internal->EventIdMap.begin();
+       eventIter != this->Internal->EventIdMap.end(); eventIter++)
+    {
+    vtkVgEventInfo& info = eventIter->second;
+
+    // hide this event if it is not displayed
+    if (!info.GetDisplayEvent())
+      {
+      continue;
+      }
+
+    if (updateTemporal)
+      {
+      this->UpdateTemporalFiltering(info);
+      }
+
+    if (updateSpatial)
+      {
+      this->UpdateSpatialFiltering(info);
+      }
+    }
+
+  // Let the representation (if listening) know it needs to update
+  //this->UpdateTime.ModifieDataRequestOn();
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::SetEventDisplayState(vtkIdType eventId, bool displayEvent)
+{
+  EventMapIterator eventIter = this->Internal->EventIdMap.find(eventId);
+  if (eventIter != this->Internal->EventIdMap.end() &&
+      eventIter->second.GetDisplayEvent() != displayEvent)
+    {
+    displayEvent ? eventIter->second.SetDisplayEventOn()
+    : eventIter->second.SetDisplayEventOff();
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+unsigned long vtkVgEventModel::GetUpdateTime()
+{
+  return this->Internal->UpdateTime.GetMTime();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::SetAllEventsDisplayState(bool state)
+{
+  for (EventMapIterator itr = this->Internal->EventIdMap.begin(),
+       end = this->Internal->EventIdMap.end(); itr != end; ++itr)
+    {
+    if (state)
+      {
+      itr->second.SetDisplayEventOn();
+      }
+    else
+      {
+      itr->second.SetDisplayEventOff();
+      }
+    }
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgEventModel::GetNextAvailableId()
+{
+  if (this->Internal->EventIdMap.empty())
+    {
+    return 0;
+    }
+  return (--this->Internal->EventIdMap.end())->first + 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::UpdateTemporalFiltering(vtkVgEventInfo& info)
+{
+  vtkVgEvent* event = info.GetEvent();
+
+  bool pass =
+    this->TemporalFilters->EvaluateInterval(event->GetStartFrame(),
+                                            event->GetEndFrame());
+
+  pass ? info.SetPassesTemporalFiltersOn() : info.SetPassesTemporalFiltersOff();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModel::UpdateSpatialFiltering(vtkVgEventInfo& info)
+{
+  vtkVgEvent* event = info.GetEvent();
+
+  // if no track (in which case we should really test the regions,
+  // but not right now) or track isn't started, don't mark the event as
+  // having failed filtering / selecting
+  if (event->GetNumberOfTracks() == 0 || !event->GetTrack(0) ||
+      !event->GetTrack(0)->IsStarted())
+    {
+    info.SetPassesSpatialFiltersOn();
+    return;
+    }
+
+  if (event->IsTripEvent())
+    {
+    if (this->ContourOperatorManager->EvaluatePoint(
+          event->GetTripEventPosition()))
+      {
+      info.SetPassesSpatialFiltersOn();
+      return;
+      }
+    }
+  else
+    {
+    vtkIdListCollection* idLists = event->GetFullEventIdCollection();
+    for (int i = 0; i < idLists->GetNumberOfItems(); ++i)
+      {
+      // does any of the event "pass" the filters and selectors
+      if (this->ContourOperatorManager->EvaluatePath(
+            event->GetPoints(), idLists->GetItem(i)))
+        {
+        info.SetPassesSpatialFiltersOn();
+        return;
+        }
+      }
+    }
+
+  info.SetPassesSpatialFiltersOff();
+}
diff --git a/Libraries/VtkVgModelView/vtkVgEventModel.h b/Libraries/VtkVgModelView/vtkVgEventModel.h
new file mode 100644
index 00000000..8f3bee8a
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventModel.h
@@ -0,0 +1,179 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventModel_h
+#define __vtkVgEventModel_h
+
+#include "vtkVgModelBase.h"
+
+#include "vtkVgEventInfo.h"
+
+#include <vector>
+
+#include <vgExport.h>
+
+#include <vtkVgTrack.h>
+
+class vgEventType;
+
+class vtkIdList;
+class vtkPoints;
+class vtkVgEvent;
+class vtkVgEventBase;
+class vtkVgEventTypeRegistry;
+class vtkVgTrack;
+class vtkVgTrackModel;
+
+struct EventLink
+{
+  vtkIdType Source;
+  vtkIdType Destination;
+  double Probability;
+};
+
+class VTKVG_MODELVIEW_EXPORT vtkVgEventModel : public vtkVgModelBase
+{
+public:
+  // Description:
+  // Easy to use.
+  vtkVgClassMacro(vtkVgEventModel);
+
+  vtkTypeMacro(vtkVgEventModel, vtkVgModelBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgEventModel* New();
+
+  enum EventIds
+    {
+    EventRemoved = 1000000
+    };
+
+  void Initialize();
+
+  // Description:
+  // Set/Get whether or not to have event share the same set of region points.
+  // Not required, but if shared, much easier to use one actor. default = true.
+  // Disabling (commenting out) about until the vtkVgEventRegionRepresentation
+  // is corrected to handle this being "false", or there is some other need/use
+  // for this not to be "true".
+  //vtkSetMacro(UseSharedRegionPoints, bool);
+  //vtkGetMacro(UseSharedRegionPoints, bool);
+
+  // Description:
+  // Set/Get the points to be shared by events CREATED when doing AddEvent
+  // from a EventBase.  Those that are already vtkVgEvents are not affected.
+  void SetSharedRegionPoints(vtkPoints* points);
+  vtkGetObjectMacro(SharedRegionPoints, vtkPoints);
+
+  vtkVgEvent* AddEvent(vtkVgEventBase* vgEventBase);
+
+  void AddEventLink(const EventLink& link);
+  void GetEventLink(int index, EventLink& link);
+  int  GetNumberOfEventLinks();
+
+  vtkVgEvent* CreateAndAddEvent(int type, vtkIdList* trackIds);
+  vtkVgEvent* CloneEvent(vtkIdType eventId);
+
+  bool RemoveEvent(vtkIdType eventId);
+
+  vtkVgEvent* GetEvent(vtkIdType eventId);
+  vtkVgEventInfo GetEventInfo(vtkIdType eventId);
+
+  vtkVgTrackDisplayData GetTrackDisplayData(vtkVgEvent* event, int trackIndex);
+
+  // Description:
+  // Given a track id return a list of events associated.
+  void GetEvents(vtkIdType trackId, std::vector<vtkVgEvent*>& events);
+
+  // Description:
+  // Given a track pointer return a list of events associated.
+  void GetEvents(vtkVgTrack* track, std::vector<vtkVgEvent*>& events);
+
+  double GetNormalcyMinForType(int type);
+  double GetNormalcyMaxForType(int type);
+
+  void InitEventTraversal();
+  vtkVgEventInfo GetNextEvent();
+  vtkVgEventInfo GetNextDisplayedEvent();
+
+  vtkIdType GetNumberOfEvents();
+
+  virtual int Update(const vtkVgTimeStamp& timeStamp,
+                     const vtkVgTimeStamp* referenceFrameTimeStamp);
+  using Superclass::Update;
+
+  // Description:
+  // Specify a track manager to coordinate with.
+  void SetTrackModel(vtkVgTrackModel* TrackModel);
+  vtkGetObjectMacro(TrackModel, vtkVgTrackModel);
+
+  void SetEventExpirationOffset(const vtkVgTimeStamp& offset);
+
+  vtkSetMacro(ShowEventsBeforeStart, bool);
+  vtkGetMacro(ShowEventsBeforeStart, bool);
+  vtkBooleanMacro(ShowEventsBeforeStart, bool);
+
+  vtkSetMacro(ShowEventsAfterExpiration, bool);
+  vtkGetMacro(ShowEventsAfterExpiration, bool);
+  vtkBooleanMacro(ShowEventsAfterExpiration, bool);
+
+  vtkSetMacro(ShowEventsUntilSupportingTracksExpire, bool);
+  vtkGetMacro(ShowEventsUntilSupportingTracksExpire, bool);
+  vtkBooleanMacro(ShowEventsUntilSupportingTracksExpire, bool);
+
+  vtkSetMacro(UseTrackGroups, bool);
+  vtkGetMacro(UseTrackGroups, bool);
+  vtkBooleanMacro(UseTrackGroups, bool);
+
+  // Description:
+  // Set/Get whether the event should be displayed.
+  void SetEventDisplayState(vtkIdType eventId, bool displayEvent);
+
+  // Description:
+  // Return the MTime for the last Update (that did something).
+  virtual unsigned long GetUpdateTime();
+
+  // Description
+  // Set/Get whether all events are to be displayed.  If true, the event model
+  // will turn off the events disregarding any other parameters and vice versa.
+  void SetAllEventsDisplayState(bool state);
+
+  void TurnOnAllEvents()  { this->SetAllEventsDisplayState(true); }
+  void TurnOffAllEvents() { this->SetAllEventsDisplayState(false); }
+
+  vtkIdType GetNextAvailableId();
+
+private:
+  vtkVgEventModel(const vtkVgEventModel&); // Not implemented.
+  void operator=(const vtkVgEventModel&);  // Not implemented.
+
+  void UpdateTemporalFiltering(vtkVgEventInfo& info);
+  void UpdateSpatialFiltering(vtkVgEventInfo& info);
+
+  // Description:
+  // Constructor / Destructor.
+  vtkVgEventModel();
+  ~vtkVgEventModel();
+
+  vtkVgTrackModel* TrackModel;
+
+  bool ShowEventsBeforeStart;
+  bool ShowEventsAfterExpiration;
+  bool ShowEventsUntilSupportingTracksExpire;
+
+  bool UseTrackGroups;
+
+  vtkVgTimeStamp ReferenceTimeStamp;
+  vtkVgTimeStamp EventExpirationOffset;
+
+  bool UseSharedRegionPoints;
+  vtkPoints* SharedRegionPoints;
+
+  struct vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgEventModel_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventModelCollection.cxx b/Libraries/VtkVgModelView/vtkVgEventModelCollection.cxx
new file mode 100644
index 00000000..8c44c18d
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventModelCollection.cxx
@@ -0,0 +1,200 @@
+
+#include "vtkVgEventModelCollection.h"
+
+// VisGUI includes.
+#include "vtkVgEventModel.h"
+#include "vtkVgEventInfo.h"
+
+#include <vtkVgEvent.h>
+#include <vtkVgEventBase.h>
+
+// VTK includes.
+#include <vtkObjectFactory.h>
+
+// C++ includes.
+#include <algorithm>
+#include <list>
+
+vtkStandardNewMacro(vtkVgEventModelCollection);
+
+//-----------------------------------------------------------------------------
+// Pimpl implementation.
+class vtkVgEventModelCollection::Internal
+{
+public:
+
+  Internal()
+    {
+    this->InternalEventModel = vtkVgEventModel::SmartPtr::New();
+
+    // \note: Make sure internal event model is the first model
+    // in the list.
+    this->EventModels.push_back(this->InternalEventModel);
+    }
+
+  ~Internal()
+    {
+    this->EventModels.clear();
+    }
+
+  void AddEvents(vtkVgEventModel* otherEventModel);
+
+  vtkVgEventModel::SmartPtr InternalEventModel;
+
+  std::list<vtkVgEventModel::SmartPtr> EventModels;
+
+  typedef std::list<vtkVgEventModel::SmartPtr>::iterator Itr;
+  typedef std::list<vtkVgEventModel::SmartPtr>::const_iterator ConstItr;
+};
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModelCollection::Internal::AddEvents(vtkVgEventModel* otherEventModel)
+{
+  vtkVgEvent* event;
+  this->InternalEventModel->InitEventTraversal();
+
+  while ((event = this->InternalEventModel->GetNextEvent().GetEvent()))
+    {
+    otherEventModel->AddEvent(event);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventModelCollection::vtkVgEventModelCollection() : vtkObject()
+{
+  this->Implementation = new Internal();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventModelCollection::~vtkVgEventModelCollection()
+{
+  delete this->Implementation; this->Implementation = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModelCollection::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Number of event models in the collection: "
+     << (this->Implementation->EventModels.size() - 1) << "\n";
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModelCollection::Modified()
+{
+  this->Implementation->InternalEventModel->Modified();
+
+  Internal::Itr itr = this->Implementation->EventModels.begin();
+
+  // Skip internal event model.
+  for (++itr; itr != this->Implementation->EventModels.end(); ++itr)
+    {
+    (*itr)->Modified();
+    }
+
+  vtkObject::Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vtkVgEventModelCollection::AddEvent(vtkVgEventBase* event)
+{
+  if (!event)
+    {
+    vtkErrorMacro("ERROR: Invalid (or NULL) event \n");
+    return 0;
+    }
+
+  vtkVgEvent* newEvent =
+    this->Implementation->InternalEventModel->AddEvent(event);
+
+  if (!newEvent)
+    {
+    vtkErrorMacro("ERROR: Failed to add event to the list of event models\n");
+    return 0;
+    }
+
+  Internal::Itr itr = this->Implementation->EventModels.begin();
+
+  // Skip internal event model.
+  for (++itr; itr != this->Implementation->EventModels.end(); ++itr)
+    {
+    (*itr)->AddEvent(newEvent);
+    }
+
+  this->Modified();
+
+  return newEvent;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModelCollection::RemoveEvent(vtkIdType id)
+{
+  Internal::Itr itr = this->Implementation->EventModels.begin();
+
+  for (; itr != this->Implementation->EventModels.end(); ++itr)
+    {
+    // \note: Currently we are not checking if the action has succeeded.
+    (*itr)->RemoveEvent(id);
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vtkVgEventModelCollection::GetEvent(vtkIdType id)
+{
+  return this->Implementation->InternalEventModel->GetEvent(id);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventModel* vtkVgEventModelCollection::GetInternalEventModel()
+{
+  return this->Implementation->InternalEventModel;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModelCollection::AddEventModel(vtkVgEventModel* eventModel)
+{
+  if (!eventModel)
+    {
+    vtkErrorMacro("ERROR: Invalid (or NULL) event model \n");
+    return;
+    }
+
+  // Check if the event model already exists, if yes do nothing.
+  std::list<vtkVgEventModel::SmartPtr>::iterator itr =
+    std::find(this->Implementation->EventModels.begin(),
+              this->Implementation->EventModels.end(),  eventModel);
+
+  if (itr != this->Implementation->EventModels.end())
+    {
+    return;
+    }
+
+  // Set new model to use same SharedRegionPoints as other models
+  // in the collection.
+  eventModel->SetSharedRegionPoints(
+    this->GetInternalEventModel()->GetSharedRegionPoints());
+
+  this->Implementation->EventModels.push_back(eventModel);
+
+  // Add current events to the newly added event model.
+  this->Implementation->AddEvents(eventModel);
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventModelCollection::RemoveEventModel(vtkVgEventModel* eventModel)
+{
+  if (!eventModel)
+    {
+    vtkErrorMacro("ERROR: Invalid (or NULL) event model \n");
+    return;
+    }
+
+  this->Implementation->EventModels.remove(eventModel);
+
+  this->Modified();
+}
diff --git a/Libraries/VtkVgModelView/vtkVgEventModelCollection.h b/Libraries/VtkVgModelView/vtkVgEventModelCollection.h
new file mode 100644
index 00000000..0eb7422e
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventModelCollection.h
@@ -0,0 +1,79 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventModelCollection_h
+#define __vtkVgEventModelCollection_h
+
+// VisGUI includes.
+#include <vtkVgMacros.h>
+
+// VTK includes.
+#include <vtkObject.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgEvent;
+class vtkVgEventBase;
+class vtkVgEventModel;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgEventModelCollection : public vtkObject
+{
+public:
+  // Description:
+  // Macro defined for SmartPtr.
+  vtkVgClassMacro(vtkVgEventModelCollection);
+
+  // Description:
+  // Macro defined for object hierarchy and internal management.
+  vtkTypeMacro(vtkVgEventModelCollection, vtkObject);
+
+  // Description:
+  // Print information about data members.
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Create a new instance of this class.
+  static vtkVgEventModelCollection* New();
+
+  // Description:
+  // Update modified time on contained models
+  virtual void Modified();
+
+  // Description:
+  // Add/Remove \c vtkVgEventBase to/from known event models.
+  vtkVgEvent* AddEvent(vtkVgEventBase* event);
+  void        RemoveEvent(vtkIdType id);
+
+  // Description:
+  // Get a event give a event id.
+  vtkVgEvent* GetEvent(vtkIdType id);
+
+  // Description:
+  // Provide access to the internal model.
+  vtkVgEventModel* GetInternalEventModel();
+
+  // Description:
+  // Add/Remove \c vtkVgEventModel to/from internal store of event models.
+  void AddEventModel(vtkVgEventModel* eventModel);
+  void RemoveEventModel(vtkVgEventModel* eventModel);
+
+
+protected:
+  vtkVgEventModelCollection();
+  virtual ~vtkVgEventModelCollection();
+
+
+private:
+
+  class Internal;
+  Internal* Implementation;
+
+  vtkVgEventModelCollection(const vtkVgEventModelCollection&); // Not implemented.
+  void operator= (const vtkVgEventModelCollection&);           // Not implemented.
+};
+
+#endif // __vtkVgEventModelCollection_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventRegionRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgEventRegionRepresentation.cxx
new file mode 100644
index 00000000..562c8b0a
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventRegionRepresentation.cxx
@@ -0,0 +1,380 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventRegionRepresentation.h"
+
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkIdTypeArray.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataCollection.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkTransform.h>
+#include <vtkUnsignedCharArray.h>
+
+#include "vgEventType.h"
+
+#include "vtkVgAnnotationActor.h"
+#include "vtkVgCellPicker.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgPickData.h"
+#include "vtkVgPicker.h"
+
+#include <set>
+
+vtkStandardNewMacro(vtkVgEventRegionRepresentation);
+
+//----------------------------------------------------------------------------
+struct vtkVgEventRegionRepresentation::vtkInternal
+{
+public:
+  vtkActor* RegionActor;
+  vtkPolyData* PolyData;
+  vtkCellArray* Lines;
+  vtkIdTypeArray* EventIds;
+  vtkUnsignedCharArray* EventColorArray;
+  vtkTransform* RegionTransform;
+
+  vtkInternal()
+    {
+    this->PolyData = vtkPolyData::New();
+    this->Lines = vtkCellArray::New();
+    this->PolyData->SetLines(this->Lines);
+    this->Lines->FastDelete();
+    this->EventIds = vtkIdTypeArray::New();
+    this->EventIds->SetName("Event Ids");
+    this->PolyData->GetCellData()->AddArray(this->EventIds);
+    this->EventIds->FastDelete();
+
+    this->EventColorArray = vtkUnsignedCharArray::New();
+    this->EventColorArray->SetNumberOfComponents(4);
+    this->EventColorArray->SetName("Event Color");
+    this->PolyData->GetCellData()->SetScalars(this->EventColorArray);
+    this->EventColorArray->FastDelete();
+
+    vtkPolyDataMapper* mapper = vtkPolyDataMapper::New();
+    mapper->SetInputData(this->PolyData);
+    this->RegionActor = vtkActor::New();
+    this->RegionActor->SetMapper(mapper);
+    this->RegionActor->GetProperty()->SetColor(1, 0, 0);  // temporary hardcode to a color
+    this->RegionActor->GetProperty()->SetLineWidth(3);
+
+    this->RegionTransform = vtkTransform::New();
+    this->RegionActor->SetUserTransform(this->RegionTransform);
+    this->RegionTransform->FastDelete();
+
+    mapper->FastDelete();
+    }
+
+  ~vtkInternal()
+    {
+    this->PolyData->Delete();
+    this->RegionActor->Delete();
+    }
+};
+
+//-----------------------------------------------------------------------------
+vtkVgEventRegionRepresentation::vtkVgEventRegionRepresentation()
+{
+  this->Visible = 1;
+  this->Internal = new vtkInternal;
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+
+  this->NewPropCollection->AddItem(this->Internal->RegionActor);
+  this->ActivePropCollection->AddItem(this->Internal->RegionActor);
+
+  this->Picker = vtkSmartPointer<vtkVgCellPicker>::New();
+  this->Picker->PickFromListOn();
+  this->Picker->SetTolerance(0.001);
+
+  this->RegionZOffset = 1.0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventRegionRepresentation::~vtkVgEventRegionRepresentation()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRegionRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventRegionRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventRegionRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventRegionRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventRegionRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventRegionRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventRegionRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRegionRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+float vtkVgEventRegionRepresentation::GetLineWidth() const
+{
+  return this->Internal->RegionActor->GetProperty()->GetLineWidth();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRegionRepresentation::SetLineWidth(float value)
+{
+  this->Internal->RegionActor->GetProperty()->SetLineWidth(value);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRegionRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+  this->Internal->RegionActor->SetVisibility(
+    flag && this->Internal->PolyData->GetNumberOfCells());
+  this->Visible = flag;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRegionRepresentation::Update()
+{
+  if (!this->GetVisible())
+    {
+    return;
+    }
+
+  this->Internal->Lines->Reset();
+  this->Internal->EventIds->Reset();
+  this->Internal->EventColorArray->Reset();
+
+  // not the best place for the allocate, but it doesn't do anything unless
+  // the number of events has increased.
+  this->Internal->EventIds->Allocate(this->EventModel->GetNumberOfEvents());
+
+  // should do this somehwere else once...
+  this->Internal->PolyData->SetPoints(this->EventModel->GetSharedRegionPoints());
+
+  this->EventModel->InitEventTraversal();
+  while (vtkVgEvent* theEvent =
+           this->EventModel->GetNextDisplayedEvent().GetEvent())
+    {
+    // is event masked in this representation?
+    unsigned int mask = this->GetDisplayMask();
+    if ((mask & theEvent->GetDisplayFlags()) != mask)
+      {
+      continue;
+      }
+
+    // don't display if this event is being filtered out
+    int eventType = theEvent->GetActiveClassifierType();
+    if (this->EventFilter &&
+        this->EventFilter->GetBestClassifier(theEvent) == -1)
+      {
+      continue;
+      }
+
+    // if we don't recognize the active type of the event, ignore it
+    //int eventType = theEvent->GetActiveClassifierType();
+    //if (this->Internal->EventActor.find(eventType) ==
+    //    this->Internal->EventActor.end())
+    //  {
+    //  continue;
+    //  }
+
+    // When "display full volume" is used for a region-based event, show the
+    // first, last, or current region as appropriate. Don't attempt to show
+    // every region.
+    vtkIdType npts, *pts;
+    if (this->EventModel->GetShowEventsBeforeStart() &&
+        this->EventModel->GetCurrentTimeStamp() < theEvent->GetStartFrame())
+      {
+      vtkVgTimeStamp startTime =  theEvent->GetStartFrame();
+      theEvent->GetRegionAtOrAfter(startTime, npts, pts);
+      }
+    else if (this->EventModel->GetShowEventsAfterExpiration() &&
+             this->EventModel->GetCurrentTimeStamp() > theEvent->GetEndFrame())
+      {
+      vtkVgTimeStamp endTime =  theEvent->GetStartFrame();
+      theEvent->GetRegionAtOrAfter(endTime, npts, pts);
+      }
+    else
+      {
+      vtkVgTimeStamp now = this->EventModel->GetCurrentTimeStamp();
+      if (theEvent->IsTimeWithinExtents(now))
+        {
+        // TODO: Make the region translucent if it's not defined at the
+        // current time.
+        theEvent->GetClosestDisplayRegion(now, npts, pts);
+        }
+      else
+        {
+        npts = 0;
+        }
+      }
+
+    if (npts > 0)
+      {
+      this->Internal->Lines->InsertNextCell(npts, pts);
+      this->Internal->EventIds->InsertNextValue(theEvent->GetId());
+
+      double dcolor[3];
+
+      // Use the event type color if one is available.
+      int index = this->EventTypeRegistry ?
+                  this->EventTypeRegistry->GetTypeIndex(eventType) : -1;
+      if (index >= 0)
+        {
+        const vgEventType& type = this->EventTypeRegistry->GetType(index);
+        type.GetColor(dcolor[0], dcolor[1], dcolor[2]);
+        }
+      else
+        {
+        this->Internal->RegionActor->GetProperty()->GetColor(dcolor);
+        }
+
+      unsigned char color[4];
+      if (theEvent->GetUseCustomColor())
+        {
+        double customColor[3];
+        theEvent->GetCustomColor(customColor);
+        color[0] = 255 * customColor[0] * this->ColorMultiplier;
+        color[1] = 255 * customColor[1] * this->ColorMultiplier;
+        color[2] = 255 * customColor[2] * this->ColorMultiplier;
+        color[3] = 255;
+        }
+      else
+        {
+        color[0] = 255 * dcolor[0] * this->ColorMultiplier;
+        color[1] = 255 * dcolor[1] * this->ColorMultiplier;
+        color[2] = 255 * dcolor[2] * this->ColorMultiplier;
+        color[3] = 255 *
+                   this->Internal->RegionActor->GetProperty()->GetOpacity();
+        }
+
+      this->Internal->EventColorArray->InsertNextTupleValue(color);
+      }
+    }
+
+  // An actor should only be visible if there is at least one cell to
+  // display because the bounds of an "empty" polydata actor are determined
+  // from its points; we may be storing points in image and points world
+  // coordinates in the same vtkPoints but using only one or the other -
+  // if there is nothing to display for a frame, the bounds might then be
+  // computed incorrectly.
+  this->Internal->RegionActor->SetVisibility(
+    this->Internal->PolyData->GetNumberOfCells());
+
+  this->Internal->PolyData->Modified();
+  this->Internal->PolyData->DeleteCells();
+
+  // Finally, setup the transform.  Test the RepresentationMatrix against
+  // a single point in our result if (any), to determine whether or not to
+  // multiply through by -1 to handle OpenGL issue with -1 homogeneous
+  // coordinate
+  vtkSmartPointer<vtkPolyDataCollection> polyDataCollection =
+    vtkSmartPointer<vtkPolyDataCollection>::New();
+  polyDataCollection->AddItem(this->Internal->PolyData);
+  this->SetupActorTransform(polyDataCollection, this->RepresentationMatrix,
+                            this->Internal->RegionTransform);
+
+  // finish setting up the transform
+  this->Internal->RegionTransform->Translate(0.0, 0.0, this->RegionZOffset
+    + vtkVgRepresentationBase::GetZOffset(this->Internal->RegionActor));
+
+
+  this->UpdateTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgEventRegionRepresentation::Pick(double renX, double renY,
+                                               vtkRenderer* ren,
+                                               vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+
+  if (!this->GetVisible())
+    {
+    return -1;
+    }
+
+  // Set up the pick list and add the actors to it
+  this->Picker->InitializePickList();
+
+  this->ActivePropCollection->InitTraversal();
+  while (vtkProp* prop = this->ActivePropCollection->GetNextProp())
+    {
+    this->Picker->AddPickList(prop);
+    }
+
+  if (this->Picker->Pick(renX, renY, 0.0, ren))
+    {
+    vtkIdTypeArray* da =
+      dynamic_cast<vtkIdTypeArray*>(
+        this->Picker->GetDataSet()->GetCellData()->GetArray("Event Ids"));
+    if (!da)
+      {
+      return -1;
+      }
+
+    vtkIdType cellId = this->Picker->GetCellId();
+    vtkIdType eventId = da->GetValue(cellId);
+    pickType = vtkVgPickData::PickedEvent;
+    return eventId;
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRegionRepresentation::SetColor(double r, double g, double b)
+{
+  this->Internal->RegionActor->GetProperty()->SetColor(r, g, b);
+}
diff --git a/Libraries/VtkVgModelView/vtkVgEventRegionRepresentation.h b/Libraries/VtkVgModelView/vtkVgEventRegionRepresentation.h
new file mode 100644
index 00000000..f0ee8a3a
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventRegionRepresentation.h
@@ -0,0 +1,96 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventRegionRepresentation_h
+#define __vtkVgEventRegionRepresentation_h
+
+#include "vtkSmartPointer.h"
+#include "vtkVgEventRepresentationBase.h"
+
+#include <vgExport.h>
+
+class vtkVgCellPicker;
+
+class vtkIdList;
+class vtkPropCollection;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgEventRegionRepresentation
+  : public vtkVgEventRepresentationBase
+{
+public:
+  enum ExclusionMode
+    {
+    EM_ExcludeNone,
+    EM_ExcludeMarked,
+    EM_ExcludeUnmarked
+    };
+
+public:
+  // Description:
+  // Easy to use.
+  vtkVgClassMacro(vtkVgEventRegionRepresentation);
+
+  vtkTypeMacro(vtkVgEventRegionRepresentation, vtkVgEventRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgEventRegionRepresentation* New();
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  virtual float GetLineWidth() const;
+  virtual void SetLineWidth(float value);
+
+  // Description:
+  // Update all the event actors. Generally called by the application layer.
+  virtual void Update();
+
+  virtual vtkIdType Pick(double renX, double renY, vtkRenderer* ren,
+                         vtkIdType& pickType);
+
+  // Description:
+  // Set/Get the Z offset to be applied to the region actor.
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(RegionZOffset, double);
+  vtkGetMacro(RegionZOffset, double);
+
+  void SetColor(double r, double g, double b);
+
+private:
+  vtkVgEventRegionRepresentation(const vtkVgEventRegionRepresentation&);
+  void operator=(const vtkVgEventRegionRepresentation&);
+
+  vtkVgEventRegionRepresentation();
+  virtual ~vtkVgEventRegionRepresentation();
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  int      Visible;
+  double   RegionZOffset;
+
+  struct vtkInternal;
+  vtkInternal* Internal;
+
+  vtkSmartPointer<vtkVgCellPicker> Picker;
+};
+
+#endif // __vtkVgEventRegionRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgEventRepresentation.cxx
new file mode 100644
index 00000000..acb1b414
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventRepresentation.cxx
@@ -0,0 +1,770 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventRepresentation.h"
+
+#include <vtkActor.h>
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkCollection.h>
+#include <vtkIdList.h>
+#include <vtkIdListCollection.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataCollection.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkTransform.h>
+#include <vtkUnsignedCharArray.h>
+
+#include "vgEventType.h"
+
+#include <vtkVgCellPicker.h>
+
+#include "vtkVgEvent.h"
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgPickData.h"
+#include "vtkVgPicker.h"
+#include "vtkVgTrackModel.h"
+#include "vtkVgTrackRepresentation.h"
+#include "vtkVgTypeDefs.h"
+
+#include <map>
+
+vtkStandardNewMacro(vtkVgEventRepresentation);
+
+vtkCxxSetObjectMacro(vtkVgEventRepresentation, TrackRepresentation, vtkVgTrackRepresentation);
+
+namespace
+{
+
+// perhaps checkout http://colorschemedesigner.com/ to come up with a "better"
+unsigned char RandomColors[][3] =
+{
+    {   0, 255, 255 }, // Cyan
+    { 240, 230, 140 }, // Khaki
+    { 178,  34,  34 }, // Firebrick
+    { 106,  90, 205 }, // Slate Blue
+    { 255,   0,   0 }, // Red
+    {   0, 100,   0 }, // Dark Green
+    { 188, 143, 143 }, // Rosy Brown
+    {   0,   0, 255 }, // Blue
+    { 127, 255,   0 }, // Chartreuse
+    { 208,  32, 144 }, // Violet Red
+    { 255,  69,   0 }  // Orange Red
+};
+
+enum { NumRandomColors = sizeof(RandomColors) / sizeof(RandomColors[0]) };
+
+//----------------------------------------------------------------------------
+struct EventBin
+{
+  EventBin();
+  ~EventBin();
+
+  vtkPolyData*          PolyData;
+  vtkCellArray*         Verts;
+  vtkCellArray*         Lines;
+  vtkActor*             EventActor;
+  vtkIdTypeArray*       EventIds;
+  vtkUnsignedCharArray* EventColorArray;
+  vtkIdTypeArray*       TemporaryEventIds;
+  vtkUnsignedCharArray* TemporaryEventColorArray;
+};
+
+//----------------------------------------------------------------------------
+EventBin::EventBin()
+{
+}
+
+//----------------------------------------------------------------------------
+EventBin::~EventBin()
+{
+  this->PolyData->Delete();
+  this->EventActor->Delete();
+  this->TemporaryEventIds->Delete();
+  this->TemporaryEventColorArray->Delete();
+}
+
+//----------------------------------------------------------------------------
+struct EventTypeInfo
+{
+  explicit EventTypeInfo(const int type) : Type(type) {}
+  ~EventTypeInfo();
+
+  int Type;
+
+  // Mapping event type to map that has key as normalcy.
+  // We could have used vectors instead of maps here, but in the future we
+  // might not have the bin numbers in a row?
+  std::map<int, EventBin*> NormalcyBin;
+
+  bool   DisplayState;
+  double DisplayNormalcyThreshold;
+  double DisplayProbabilityThreshold;
+};
+
+typedef std::map<int, EventTypeInfo*> EventTypeMap;
+
+//----------------------------------------------------------------------------
+EventTypeInfo::~EventTypeInfo()
+{
+  std::map<int, EventBin*>::iterator iter = this->NormalcyBin.begin();
+  while (iter != this->NormalcyBin.end())
+    {
+    delete iter->second;
+    ++iter;
+    }
+}
+
+} // end anonymous namespace
+
+//----------------------------------------------------------------------------
+struct vtkVgEventRepresentation::vtkInternal
+{
+  vtkInternal(vtkVgEventRepresentation* rep);
+  ~vtkInternal();
+
+  void RandomizeEventColors(bool state);
+
+  int  RegisterEventType(const int id);
+
+  bool UpdateActiveClassifier(vtkVgEvent* event);
+
+  bool RandomEventColors;
+
+  EventTypeMap EventTypes;
+  vtkTimeStamp TypesBuildTime;
+
+  // use the same transform for all event actors
+  vtkTransform*  ActorTransform;
+
+  float NormalcyBinOpacity[NumberOfNormalcyBins];
+
+  vtkVgEventRepresentation* Representation;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgEventRepresentation::vtkInternal::vtkInternal(vtkVgEventRepresentation* rep)
+  : Representation(rep)
+{
+  this->RandomEventColors = false;
+  this->ActorTransform = vtkTransform::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventRepresentation::vtkInternal::~vtkInternal()
+{
+  std::map<int, EventTypeInfo*>::iterator iter = this->EventTypes.begin();
+  while (iter != this->EventTypes.end())
+    {
+    delete iter->second;
+    ++iter;
+    }
+  this->ActorTransform->Delete();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::vtkInternal::RandomizeEventColors(bool state)
+{
+  this->RandomEventColors = state;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgEventRepresentation::vtkInternal::RegisterEventType(const int id)
+{
+  int numOfNormalcyBins = this->Representation->NumberOfNormalcyBins;
+
+  double opacityDelta = 0.6 / (numOfNormalcyBins - 1);
+
+  EventTypeInfo* eti = new EventTypeInfo(id);
+  this->EventTypes.insert(std::make_pair(id, eti));
+
+  eti->DisplayState = false;
+  eti->DisplayNormalcyThreshold = 1.0;
+  eti->DisplayProbabilityThreshold = 0.0;
+
+  for (int j = 0; j < numOfNormalcyBins; j++)
+    {
+    EventBin* bin = new EventBin;
+    eti->NormalcyBin.insert(std::make_pair(j, bin));
+
+    bin->PolyData = vtkPolyData::New();
+    bin->Verts    = vtkCellArray::New();
+    bin->Lines    = vtkCellArray::New();
+
+    bin->PolyData->SetVerts(bin->Verts);
+    bin->Verts->FastDelete();
+    bin->PolyData->SetLines(bin->Lines);
+    bin->Lines->FastDelete();
+
+    bin->EventIds = vtkIdTypeArray::New();
+    bin->EventIds->SetName("Event Ids");
+
+    bin->PolyData->GetCellData()->AddArray(bin->EventIds);
+    bin->EventIds->FastDelete();
+
+    vtkPolyDataMapper* mapper = vtkPolyDataMapper::New();
+    mapper->SetInputData(bin->PolyData);
+
+    bin->EventActor = vtkActor::New();
+    bin->EventActor->SetMapper(mapper);
+    bin->EventActor->SetUserTransform(this->ActorTransform);
+
+    this->Representation->NewPropCollection->AddItem(bin->EventActor);
+    this->Representation->ActivePropCollection->AddItem(bin->EventActor);
+
+    bin->EventColorArray = vtkUnsignedCharArray::New();
+    bin->EventColorArray->SetNumberOfComponents(4);
+    bin->EventColorArray->SetName("Event Color");
+    bin->PolyData->GetCellData()->SetScalars(bin->EventColorArray);
+    bin->EventColorArray->FastDelete();
+
+    bin->TemporaryEventIds = vtkIdTypeArray::New();
+    bin->TemporaryEventColorArray = vtkUnsignedCharArray::New();
+    bin->TemporaryEventColorArray->SetNumberOfComponents(4);
+
+    // set correct initial visibility
+    bin->EventActor->SetVisibility(this->Representation->GetVisible());
+
+    // Compute the opacities to be used in scalar data later. We do this
+    // instead of setting opacity on the actor itself, since it allows us to
+    // trick the renderer into enabling Z-writes for this geometry. Events need
+    // to write to the Z buffer so that underlying tracks (which are rendered
+    // later) will be masked. If vtkActor supported enabling Z-writes
+    // unconditionally, we wouldn't need to do this.
+    int ji = numOfNormalcyBins - 1 - j;
+    this->NormalcyBinOpacity[j] = 0.4 + ji * opacityDelta;
+
+    // swapping "top" and "bottom" of normalcy scaling
+    bin->EventActor->GetProperty()->SetLineWidth(
+      this->Representation->GetLineWidth() + ji);
+    bin->EventActor->GetProperty()->SetPointSize(
+      this->Representation->GetLineWidth() + ji);
+
+    mapper->FastDelete();
+
+    bin->PolyData->SetPoints(this->Representation->GetEventModel()
+                             ->GetTrackModel()->GetPoints());
+    }
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgEventRepresentation::vtkInternal::UpdateActiveClassifier(
+  vtkVgEvent* event)
+{
+  event->ResetActiveClassifier();
+
+  if (!this->Representation->EventFilter)
+    {
+    return true;
+    }
+
+  int bestType = this->Representation->EventFilter->GetBestClassifier(event);
+  if (bestType != -1)
+    {
+    event->SetActiveClassifier(bestType);
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventRepresentation::vtkVgEventRepresentation()
+{
+  this->Visible = 1;
+  this->Internal = new vtkInternal(this);
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+
+  this->Picker = vtkSmartPointer<vtkVgCellPicker>::New();
+  this->Picker->PickFromListOn();
+  this->Picker->SetTolerance(0.01);
+  this->PickPosition[0] = this->PickPosition[1] = this->PickPosition[2] = 0.0;
+
+  this->TrackRepresentation = 0;
+  this->ZOffset = 0.0;
+  this->LineWidth = 3.0f;
+
+  this->UseNormalcyCues = false;
+  this->NormalcyCuesSwapped = false;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventRepresentation::~vtkVgEventRepresentation()
+{
+  if (this->TrackRepresentation)
+    {
+    this->TrackRepresentation->UnRegister(this);
+    }
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgEventRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgEventRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+
+  this->Visible = flag;
+  this->ActivePropCollection->InitTraversal();
+  while (vtkProp* prop = this->ActivePropCollection->GetNextProp())
+    {
+    // FIXME - really should only make visible if there is polydata
+    prop->SetVisibility(flag);
+    }
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::Initialize()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::RandomizeEventColors(bool state)
+{
+  if (state != this->Internal->RandomEventColors)
+    {
+    this->Internal->RandomizeEventColors(state);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::Update()
+{
+  // Note: We do this assuming no one else is adding forced tracks.
+  if (this->TrackRepresentation)
+    {
+    this->TrackRepresentation->ClearForceShownTracks();
+    }
+
+  if (!this->EventModel || !this->GetVisible())
+    {
+    return;
+    }
+
+  if ((this->EventTypeRegistry &&
+       this->EventTypeRegistry->GetMTime() > this->Internal->TypesBuildTime) ||
+      (!this->EventTypeRegistry && !this->Internal->EventTypes.empty()))
+    {
+    this->UpdateEventTypes();
+    }
+
+  EventTypeMap::const_iterator iter, end = this->Internal->EventTypes.end();
+  for (iter = this->Internal->EventTypes.begin(); iter != end; ++iter)
+    {
+    for (int j = 0; j < this->NumberOfNormalcyBins; j++)
+      {
+      EventBin* bin = iter->second->NormalcyBin[j];
+      bin->Verts->Reset();
+      bin->Lines->Reset();
+      bin->EventIds->Reset();
+      bin->TemporaryEventIds->Reset();
+      bin->PolyData->GetCellData()->GetScalars()->Reset();
+      bin->TemporaryEventColorArray->Reset();
+
+      // Not the best place for the allocate, but it doesn't do anything after
+      // the first allocation.  Granted, it is also quite wasteful of memory
+      // since we're handling the case where all events are in all bins and are
+      // displayed at the same time (but is an upper bounds, thus we won't do
+      // any additional allocating of memory).
+      bin->EventIds->Allocate(this->EventModel->GetNumberOfEvents());
+      bin->TemporaryEventIds->Allocate(this->EventModel->GetNumberOfEvents());
+      bin->PolyData->GetCellData()->GetScalars()->Allocate(
+        this->EventModel->GetNumberOfEvents() * 3);
+      bin->TemporaryEventColorArray->Allocate(
+        this->EventModel->GetNumberOfEvents() * 3);
+      }
+    }
+
+  this->EventModel->InitEventTraversal();
+  while (vtkVgEvent* theEvent =
+           this->EventModel->GetNextDisplayedEvent().GetEvent())
+    {
+    // is event masked in this representation?
+    unsigned int mask = this->GetDisplayMask();
+    if ((mask & theEvent->GetDisplayFlags()) != mask)
+      {
+      continue;
+      }
+
+    bool shown = this->Internal->UpdateActiveClassifier(theEvent);
+
+    // if we don't recognize the active type of the event, ignore it
+    int eventType = theEvent->GetActiveClassifierType();
+    if (this->Internal->EventTypes.find(eventType) ==
+        this->Internal->EventTypes.end())
+      {
+      continue;
+      }
+
+    // don't display if this event is being filtered out
+    if (!shown)
+      continue;
+
+    int normalcyBin =
+      this->NormalcyCuesSwapped ? this->NumberOfNormalcyBins - 1 : 0;
+
+    if (this->UseNormalcyCues)
+      {
+      // which normalcy bin does it fall in
+      double min = this->EventModel->GetNormalcyMinForType(eventType);
+      double max = this->EventModel->GetNormalcyMaxForType(eventType);
+
+      double delta = theEvent->GetActiveClassifierNormalcy() - min;
+      double range = max - min;
+
+      if (range == 0.0)
+        {
+        range = 1.0;
+        }
+
+      normalcyBin = this->NumberOfNormalcyBins * delta / range;
+
+      if (normalcyBin == this->NumberOfNormalcyBins)
+        {
+        normalcyBin = NumberOfNormalcyBins - 1;
+        }
+      }
+
+    const vgEventType& type = this->EventTypeRegistry->GetTypeById(eventType);
+    EventBin* bin =
+      this->Internal->EventTypes[eventType]->NormalcyBin[normalcyBin];
+
+    int numberOfTracks = this->EventModel->GetUseTrackGroups() ?
+                         theEvent->GetNumberOfTrackGroups() : theEvent->GetNumberOfTracks();
+    // force the display of supporting tracks if we have a track representation
+    vtkIdList* forcedTracks = 0;
+    if (this->TrackRepresentation)
+      {
+      forcedTracks = vtkIdList::New();
+      forcedTracks->Allocate(numberOfTracks);
+      }
+
+    vtkUnsignedCharArray* colors;
+    for (int i = 0; i < numberOfTracks; ++i)
+      {
+      vtkVgTrackDisplayData tdd =
+        this->EventModel->GetTrackDisplayData(theEvent, i);
+      if (tdd.NumIds == 0)
+        {
+        continue;
+        }
+
+      if (forcedTracks)
+        {
+        forcedTracks->InsertNextId(this->EventModel->GetUseTrackGroups() ?
+                                   theEvent->GetTrackGroupTrack(i)->GetId() :
+                                   theEvent->GetTrack(i)->GetId());
+        }
+
+      // if only a single point (curently) for the event, display as Vert
+      if (tdd.NumIds == 1)
+        {
+        bin->Verts->InsertNextCell(1, tdd.IdsStart);
+        bin->EventIds->InsertNextValue(theEvent->GetId());
+        colors = vtkUnsignedCharArray::SafeDownCast(
+                   bin->PolyData->GetCellData()->GetScalars());
+        }
+      else
+        {
+        bin->Lines->InsertNextCell(tdd.NumIds, tdd.IdsStart);
+        bin->TemporaryEventIds->InsertNextValue(theEvent->GetId());
+        colors = bin->TemporaryEventColorArray;
+        }
+
+      unsigned char color[4];
+      if (theEvent->GetUseCustomColor())
+        {
+        double customColor[3];
+        theEvent->GetCustomColor(customColor);
+        color[0] = 255 * customColor[0];
+        color[1] = 255 * customColor[1];
+        color[2] = 255 * customColor[2];
+        }
+      else if (this->HasOverrideColor)
+        {
+        color[0] = 255 * this->OverrideColor[0];
+        color[1] = 255 * this->OverrideColor[1];
+        color[2] = 255 * this->OverrideColor[2];
+        }
+      else if (this->Internal->RandomEventColors || type.GetUseRandomColors())
+        {
+        int colorIndex = (theEvent->GetId() + i) % NumRandomColors;
+        color[0] = RandomColors[colorIndex][0];
+        color[1] = RandomColors[colorIndex][1];
+        color[2] = RandomColors[colorIndex][2];
+        }
+      else
+        {
+        double c[3];
+        type.GetTrackColor(i, c[0], c[1], c[2]);
+        color[0] = 255 * c[0];
+        color[1] = 255 * c[1];
+        color[2] = 255 * c[2];
+        }
+      color[3] = 255 * this->Internal->NormalcyBinOpacity[normalcyBin];
+
+      double m = this->GetColorMultiplier();
+      if (m != 1.0)
+        {
+        color[0] *= m;
+        color[1] *= m;
+        color[2] *= m;
+        }
+      colors->InsertNextTupleValue(color);
+      }
+
+    if (forcedTracks)
+      {
+      this->TrackRepresentation->ForceShowTracks(forcedTracks);
+      forcedTracks->Delete();
+      }
+    }
+  for (iter = this->Internal->EventTypes.begin(); iter != end; ++iter)
+    {
+    for (int j = 0; j < this->NumberOfNormalcyBins; j++)
+      {
+      EventBin* bin = iter->second->NormalcyBin[j];
+
+      // An actor should only be visible if there is at least one cell to
+      // display because the bounds of an "empty" polydata actor are determined
+      // from its points; we may be storing points in image and points world
+      // coordinates in the same vtkPoints but using only one or the other -
+      // if there is nothing to display for a frame, the bounds might then be
+      // computed incorrectly.
+      bin->EventActor->SetVisibility(bin->PolyData->GetNumberOfCells());
+
+      // copy "line" event id and color info to the approriate arrays
+      if (bin->TemporaryEventIds->GetNumberOfTuples())
+        {
+        void* writePointer = bin->EventIds->WriteVoidPointer(
+          bin->EventIds->GetNumberOfTuples(),
+          bin->TemporaryEventIds->GetNumberOfTuples());
+        memcpy(writePointer, bin->TemporaryEventIds->GetPointer(0),
+               bin->TemporaryEventIds->GetNumberOfTuples() * sizeof(vtkIdType));
+
+        writePointer = bin->EventColorArray->WriteVoidPointer(
+          bin->EventColorArray->GetNumberOfTuples() * 4,
+          bin->TemporaryEventColorArray->GetNumberOfTuples() * 4);
+        memcpy(writePointer, bin->TemporaryEventColorArray->GetPointer(0),
+               bin->TemporaryEventColorArray->GetNumberOfTuples() * 4);
+        }
+
+      bin->PolyData->Modified();
+      bin->PolyData->DeleteCells();
+      }
+    }
+
+  // Finally, setup the transform.  Test the RepresentationMatrix against
+  // a single point in our result if (any), to determine whether or not to
+  // multiply through by -1 to handle OpenGL issue with -1 homogeneous
+  // coordinate
+  vtkSmartPointer<vtkPolyDataCollection> polyDataCollection =
+    vtkSmartPointer<vtkPolyDataCollection>::New();
+  EventBin* bin = 0;
+  for (iter = this->Internal->EventTypes.begin(); iter != end; ++iter)
+    {
+    for (int j = 0; j < this->NumberOfNormalcyBins; j++)
+      {
+      bin = iter->second->NormalcyBin[j];
+      polyDataCollection->AddItem(bin->PolyData);
+      }
+    }
+  if (bin)
+    {
+    this->SetupActorTransform(polyDataCollection, this->RepresentationMatrix,
+                              this->Internal->ActorTransform);
+
+    this->Internal->ActorTransform->Translate(0.0, 0.0, this->ZOffset +
+      vtkVgRepresentationBase::GetZOffset(bin->EventActor));
+    }
+
+  this->UpdateTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::UpdateEventTypes()
+{
+  this->Internal->TypesBuildTime.Modified();
+
+  if (this->EventTypeRegistry)
+    {
+    // Add mappings for new types.
+    for (int i = 0; i < this->EventTypeRegistry->GetNumberOfTypes(); ++i)
+      {
+      const vgEventType& type = this->EventTypeRegistry->GetType(i);
+      if (this->Internal->EventTypes.count(type.GetId()) == 0)
+        {
+        this->Internal->RegisterEventType(type.GetId());
+        }
+      }
+
+    // Remove mappings for types that have been removed.
+    EventTypeMap::iterator iter = this->Internal->EventTypes.begin();
+    while (iter != this->Internal->EventTypes.end())
+      {
+      if (this->EventTypeRegistry->GetTypeIndex(iter->first) < 0)
+        {
+        for (int i = 0; i < this->NumberOfNormalcyBins; ++i)
+          {
+          this->ExpirePropCollection->AddItem(
+            iter->second->NormalcyBin[i]->EventActor);
+          }
+        delete iter->second;
+        this->Internal->EventTypes.erase(iter++);
+        }
+      else
+        {
+        ++iter;
+        }
+      }
+    }
+  else
+    {
+    EventTypeMap::const_iterator iter, end = this->Internal->EventTypes.end();
+    for (iter = this->Internal->EventTypes.begin(); iter != end; ++iter)
+      {
+      delete iter->second;
+      }
+    this->Internal->EventTypes.clear();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgEventRepresentation::
+Pick(double renX, double renY, vtkRenderer* ren, vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+
+  if (!this->GetVisible())
+    {
+    return -1;
+    }
+
+  // Set up the pick list and add the actors to it
+  this->Picker->InitializePickList();
+
+  this->ActivePropCollection->InitTraversal();
+  while (vtkProp* prop = this->ActivePropCollection->GetNextProp())
+    {
+    this->Picker->AddPickList(prop);
+    }
+
+  if (this->Picker->Pick(renX, renY, 0.0, ren))
+    {
+    vtkIdType cellId = this->Picker->GetCellId();
+    this->Picker->GetPickPosition(this->PickPosition);
+    vtkIdTypeArray* da = dynamic_cast<vtkIdTypeArray*>(
+      this->Picker->GetDataSet()->GetCellData()->GetArray("Event Ids"));
+    if (!da)
+      {
+      return -1;
+      }
+    vtkIdType eventId = da->GetValue(cellId);
+    pickType = vtkVgPickData::PickedEvent;
+    return eventId;
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentation::SwapNormalcyCues()
+{
+  for (int i = 0; i < this->EventTypeRegistry->GetNumberOfTypes(); i++)
+    {
+    int type = this->EventTypeRegistry->GetType(i).GetId();
+    int top = this->NumberOfNormalcyBins - 1;
+    for (int j = 0; j < this->NumberOfNormalcyBins; j++, top--)
+      {
+      if (j >= top)
+        {
+        break;
+        }
+
+      EventTypeInfo* eti = this->Internal->EventTypes[type];
+      vtkActor* A = eti->NormalcyBin[j]->EventActor;
+      vtkActor* B = eti->NormalcyBin[top]->EventActor;
+
+      double tmpWidth = A->GetProperty()->GetLineWidth();
+      A->GetProperty()->SetLineWidth(B->GetProperty()->GetLineWidth());
+      A->GetProperty()->SetPointSize(B->GetProperty()->GetLineWidth());
+      B->GetProperty()->SetLineWidth(tmpWidth);
+      B->GetProperty()->SetPointSize(tmpWidth);
+      }
+    }
+
+  for (int i = 0, j = this->NumberOfNormalcyBins - 1; i < j; ++i, --j)
+    {
+    std::swap(this->Internal->NormalcyBinOpacity[i],
+              this->Internal->NormalcyBinOpacity[j]);
+    }
+
+  this->Superclass::SwapNormalcyCues();
+}
diff --git a/Libraries/VtkVgModelView/vtkVgEventRepresentation.h b/Libraries/VtkVgModelView/vtkVgEventRepresentation.h
new file mode 100644
index 00000000..55f29a88
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventRepresentation.h
@@ -0,0 +1,126 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventRepresentation_h
+#define __vtkVgEventRepresentation_h
+
+#include "vtkSmartPointer.h"
+
+#include "vtkVgEventRepresentationBase.h"
+
+#include <vgExport.h>
+
+class vtkCollection;
+class vtkPropCollection;
+class vtkRenderer;
+
+class vtkVgCellPicker;
+class vtkVgEvent;
+class vtkVgEventTypeRegistry;
+class vtkVgTrackRepresentation;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgEventRepresentation
+  : public vtkVgEventRepresentationBase
+{
+public:
+  vtkTypeMacro(vtkVgEventRepresentation, vtkVgEventRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgEventRepresentation* New();
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  void Initialize();
+
+  // Description:
+  // Update all the event actors. Generally called by the application layer.
+  virtual void Update();
+
+  // Description:
+  // If state = true, randomize the event colors.  Otherwise, randomly
+  // color each event.
+  void RandomizeEventColors(bool state);
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked eventId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the event is currently visible or not.
+  virtual vtkIdType Pick(double renX, double renY, vtkRenderer* ren, vtkIdType& pickType);
+
+  // Description:
+  // After a successful pick occurs, return the position of the pick (in
+  // world coordinates).
+  vtkGetVector3Macro(PickPosition, double);
+
+  // Description:
+  // Invert normalcy indicators (line width, opacity, etc.)
+  virtual void SwapNormalcyCues();
+
+  // Description:
+  // Optionally provide a track representation, which implicitly
+  // causes supporting tracks to be rendered.
+  void SetTrackRepresentation(vtkVgTrackRepresentation* rep);
+  vtkGetObjectMacro(TrackRepresentation, vtkVgTrackRepresentation);
+
+  // Description:
+  // Set/Get the Z offset to be applied to all the events
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(ZOffset, double);
+  vtkGetMacro(ZOffset, double);
+
+  // Description:
+  // Set/Get the default line width of event tracks.
+  // Note: Setting this after initialization will have no effect.
+  vtkSetMacro(LineWidth, float);
+  vtkGetMacro(LineWidth, float);
+
+  void UpdateEventTypes();
+
+private:
+  vtkVgEventRepresentation(const vtkVgEventRepresentation&); // Not implemented.
+  void operator=(const vtkVgEventRepresentation&);           // Not implemented.
+
+  vtkVgEventRepresentation();
+  virtual ~vtkVgEventRepresentation();
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  int Visible;
+
+  enum { NumberOfNormalcyBins = 5 };
+
+  struct vtkInternal;
+  vtkInternal* Internal;
+
+  vtkSmartPointer<vtkVgCellPicker> Picker;
+  double PickPosition[3];
+
+  vtkVgTrackRepresentation* TrackRepresentation;
+
+  double ZOffset;
+  float LineWidth;
+};
+
+#endif // __vtkVgEventRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgEventRepresentationBase.cxx b/Libraries/VtkVgModelView/vtkVgEventRepresentationBase.cxx
new file mode 100644
index 00000000..f72d5a2e
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventRepresentationBase.cxx
@@ -0,0 +1,92 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgEventRepresentationBase.h"
+
+#include "vtkVgContourOperatorManager.h"
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgPickData.h"
+#include "vtkVgPicker.h"
+
+#include <vtkCommand.h>
+
+vtkCxxSetObjectMacro(vtkVgEventRepresentationBase,
+                     EventFilter,
+                     vtkVgEventFilter);
+
+vtkCxxSetObjectMacro(vtkVgEventRepresentationBase,
+                     ContourOperatorManager,
+                     vtkVgContourOperatorManager);
+
+vtkCxxSetObjectMacro(vtkVgEventRepresentationBase,
+                     EventTypeRegistry,
+                     vtkVgEventTypeRegistry);
+
+//-----------------------------------------------------------------------------
+vtkVgEventRepresentationBase::vtkVgEventRepresentationBase()
+  : vtkVgRepresentationBase(),
+    EventModel(0), EventFilter(0), EventTypeRegistry(0),
+    ContourOperatorManager(0),
+    UseNormalcyCues(false), NormalcyCuesSwapped(false)
+{
+  this->SetLayerIndex(2);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEventRepresentationBase::~vtkVgEventRepresentationBase()
+{
+  this->SetEventModel(0);
+  this->SetEventFilter(0);
+  this->SetEventTypeRegistry(0);
+  this->SetContourOperatorManager(0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentationBase::SetEventModel(vtkVgEventModel* eventModel)
+{
+  vtkSetObjectBodyMacro(EventModel, vtkVgEventModel, eventModel);
+
+  if (this->EventModel)
+    {
+    this->EventModel->AddObserver(vtkVgEventModel::EventRemoved, this,
+                                  &vtkVgEventRepresentationBase::EventRemoved);
+    if (this->UseAutoUpdate)
+      {
+      this->EventModel->AddObserver(vtkCommand::UpdateDataEvent, this,
+                                    &vtkVgEventRepresentationBase::Update);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentationBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgEventRepresentationBase::Pick(double vtkNotUsed(renX),
+                                             double vtkNotUsed(renY),
+                                             vtkRenderer* vtkNotUsed(ren),
+                                             vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentationBase::GetPickPosition(double vtkNotUsed(pos)[])
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgEventRepresentationBase::SwapNormalcyCues()
+{
+  this->NormalcyCuesSwapped = !this->NormalcyCuesSwapped;
+  this->Modified();
+}
diff --git a/Libraries/VtkVgModelView/vtkVgEventRepresentationBase.h b/Libraries/VtkVgModelView/vtkVgEventRepresentationBase.h
new file mode 100644
index 00000000..162f1e1a
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgEventRepresentationBase.h
@@ -0,0 +1,102 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgEventRepresentationBase_h
+#define __vtkVgEventRepresentationBase_h
+
+#include "vtkVgRepresentationBase.h"
+
+#include <vgExport.h>
+
+class vtkRenderer;
+
+class vtkVgContourOperatorManager;
+class vtkVgEventFilter;
+class vtkVgEventModel;
+class vtkVgEventTypeRegistry;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgEventRepresentationBase
+  : public vtkVgRepresentationBase
+{
+public:
+  vtkTypeMacro(vtkVgEventRepresentationBase, vtkVgRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Update all the event actors. Generally called by the application layer.
+  virtual void Update() = 0;
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked eventId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the event is currently visible or not.
+  virtual vtkIdType Pick(double renX, double renY, vtkRenderer* ren,
+                         vtkIdType& pickType);
+
+  // Description:
+  // After a successful pick occurs, return the position of the pick (in
+  // world coordinates).
+  virtual void GetPickPosition(double pos[]);
+
+  // Description:
+  // Set the item on the representation.
+  virtual void SetEventModel(vtkVgEventModel* modelItem);
+  vtkGetObjectMacro(EventModel, vtkVgEventModel);
+
+  // Description:
+  // Set the event filter that this representation will use.
+  virtual void SetEventFilter(vtkVgEventFilter* filter);
+  vtkGetObjectMacro(EventFilter, vtkVgEventFilter);
+
+  // Description:
+  // Assign an event type registry. Must be done before initialization.
+  void SetEventTypeRegistry(vtkVgEventTypeRegistry* registry);
+  vtkGetObjectMacro(EventTypeRegistry, vtkVgEventTypeRegistry);
+
+  // Description:
+  // Set/Get the manager for filters and selectors
+  void SetContourOperatorManager(vtkVgContourOperatorManager* manager);
+  vtkGetObjectMacro(ContourOperatorManager, vtkVgContourOperatorManager);
+
+  // Description:
+  // Invert normalcy indicators.
+  virtual void SwapNormalcyCues();
+
+  // Description:
+  // Enable / disable normalcy indicators (line width, opacity, icon size, etc.)
+  // Off by default.
+  vtkSetMacro(UseNormalcyCues, bool);
+  vtkGetMacro(UseNormalcyCues, bool);
+
+protected:
+  vtkVgEventRepresentationBase();
+  virtual ~vtkVgEventRepresentationBase();
+
+  vtkVgEventModel*  EventModel;
+  vtkVgEventFilter* EventFilter;
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+
+  vtkVgContourOperatorManager* ContourOperatorManager;
+
+  bool UseNormalcyCues;
+  bool NormalcyCuesSwapped;
+
+  // Description:
+  // Method called (event/observer mechanism with EventModel) when an event is
+  // removed.  Essentially giving the representation a chance to react to an
+  // event being removed.
+  virtual void EventRemoved(vtkObject* vtkNotUsed(caller),
+                            unsigned long vtkNotUsed(invokedEventId),
+                            void* vtkNotUsed(theEvent))
+    {};
+
+private:
+  vtkVgEventRepresentationBase(const vtkVgEventRepresentationBase&);
+  void operator=(const vtkVgEventRepresentationBase&);
+};
+
+#endif // __vtkVgEventRepresentationBase_h
diff --git a/Libraries/VtkVgModelView/vtkVgGraphModel.cxx b/Libraries/VtkVgModelView/vtkVgGraphModel.cxx
new file mode 100644
index 00000000..4cd7b595
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgGraphModel.cxx
@@ -0,0 +1,591 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgGraphModel.h"
+
+#include "vtkVgActivity.h"
+#include "vtkVgActivityManager.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgTrack.h"
+#include "vtkVgTrackModel.h"
+
+#include <vtkCommand.h>
+#include <vtkDataSetAttributes.h>
+#include <vtkIdListCollection.h>
+#include <vtkIntArray.h>
+#include <vtkMutableDirectedGraph.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkTimeStamp.h>
+
+// C++ includes
+#include <map>
+
+vtkStandardNewMacro(vtkVgGraphModel);
+
+vtkCxxSetObjectMacro(vtkVgGraphModel, TrackModel, vtkVgTrackModel);
+vtkCxxSetObjectMacro(vtkVgGraphModel, EventModel, vtkVgEventModel);
+vtkCxxSetObjectMacro(vtkVgGraphModel, ActivityManager, vtkVgActivityManager);
+
+vtkCxxSetObjectMacro(vtkVgGraphModel, EventFilter, vtkVgEventFilter);
+
+#define vtkCreateMacro(type, name) \
+  vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
+
+//----------------------------------------------------------------------------
+struct vtkVgGraphModel::vtkInternal
+{
+  vtkInternal();
+  ~vtkInternal();
+
+  void reset();
+
+  vtkTimeStamp UpdateTime;
+
+  const double EventZOffset;
+  const double ActivityZOffset;
+  const double EventZThickness;
+  const double ActivityZThickness;
+  const double ZScaleFactor;
+
+  bool Initialized;
+
+  typedef std::map<vtkIdType, vtkIdType> EntityIdGraphVertexIdMap;
+  typedef std::map<vtkIdType, vtkIdType> GraphVertexIdEntityTypeMap;
+
+  typedef EntityIdGraphVertexIdMap::const_iterator   EntityIdGraphVertexIdConstItr;
+  typedef GraphVertexIdEntityTypeMap::const_iterator VertexIdEntityTypeConstItr;
+
+  EntityIdGraphVertexIdMap TrackIdVertexIdMap;
+  EntityIdGraphVertexIdMap EventIdVertexIdMap;
+  EntityIdGraphVertexIdMap ActivityIdVertexIdMap;
+
+  // 0 is for event-track, 1 is for event - activity, 2 is event-event.
+  std::map<vtkIdType, vtkIdType>  EdgeIdEdgeTypeMap;
+  std::map<vtkIdType, double>     EdgeProbabilityMap;
+
+  GraphVertexIdEntityTypeMap VertexIdEntityTypeMap;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgGraphModel::vtkInternal::vtkInternal() :
+  UpdateTime(),
+  EventZOffset(50.0),
+  ActivityZOffset(500.0),
+  EventZThickness(400.0),
+  ActivityZThickness(200.0),
+  ZScaleFactor(10.0),
+  Initialized(false)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGraphModel::vtkInternal::~vtkInternal()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphModel::vtkInternal::reset()
+{
+  this->TrackIdVertexIdMap.clear();
+  this->EventIdVertexIdMap.clear();
+  this->ActivityIdVertexIdMap.clear();
+
+  this->EdgeIdEdgeTypeMap.clear();
+  this->EdgeProbabilityMap.clear();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGraphModel::vtkVgGraphModel()
+{
+  this->EventFilter         = 0;
+  this->TrackModel          = 0;
+  this->EventModel          = 0;
+  this->ActivityManager     = 0;
+  this->Graph               = 0;
+
+  this->CurrentZOffsetMode  = ZOffsetUsingNormalcy;
+
+  this->Internal            = new vtkInternal;
+
+  this->CurrentTimeStamp.SetToMinTime();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGraphModel::~vtkVgGraphModel()
+{
+  this->SetEventFilter(0);
+  this->SetTrackModel(0);
+  this->SetEventModel(0);
+  this->SetActivityManager(0);
+
+  if (this->Graph)
+    {
+    this->Graph->Delete();
+    }
+
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphModel::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphModel::Initialize(const vtkVgTimeStamp& timeStamp)
+{
+  this->Internal->reset();
+
+  if (!this->EventModel || !this->TrackModel || !this->ActivityManager)
+    {
+    vtkErrorMacro("Sub-models must be set before initialization.");
+    return;
+    }
+
+  if (this->Graph)
+    {
+    this->Graph->Delete();
+    }
+
+  this->Graph = vtkMutableDirectedGraph::New();
+  vtkMutableDirectedGraph* graph =
+    vtkMutableDirectedGraph::SafeDownCast(this->Graph);
+
+  vtkCreateMacro(vtkPoints, points);
+
+  double eventTimeRange = 1;
+  vtkVgTimeStamp minTime, maxTime;
+  if (this->CurrentZOffsetMode)
+    {
+    this->EventModel->InitEventTraversal();
+    vtkVgEvent* e = this->EventModel->GetNextEvent().GetEvent();
+    if (e)
+      {
+      minTime = e->GetStartFrame();
+      maxTime = e->GetStartFrame();
+      while ((e = this->EventModel->GetNextEvent().GetEvent()))
+        {
+        if (e->GetStartFrame() < minTime)
+          {
+          minTime = e->GetStartFrame();
+          }
+        else if (maxTime < e->GetStartFrame())
+          {
+          maxTime = e->GetStartFrame();
+          }
+        }
+      }
+
+    // want non-zero to divide by below in case MaxTime == MinTime
+    if (maxTime != minTime)
+      {
+      eventTimeRange = maxTime.GetTimeDifferenceInSecs(minTime);
+      }
+    }
+
+
+  vtkVgEventInfo info;
+  this->EventModel->InitEventTraversal();
+  while ((info = this->EventModel->GetNextEvent()).GetEvent())
+    {
+    vtkVgEvent* e = info.GetEvent();
+    if (this->Internal->Initialized && this->EventFilter)
+      {
+      int bestType = this->EventFilter->GetBestClassifier(e);
+      if (bestType < 0 || !info.GetDisplayEvent())
+        {
+        continue;
+        }
+      }
+
+    double eventPosition[3] = { 0.0 };
+
+    std::vector<vtkIdType> trackVertexIds;
+
+    int numTracks = this->EventModel->GetUseTrackGroups() ?
+                    e->GetNumberOfTrackGroups() : e->GetNumberOfTracks();
+    int numDisplayedTracks = 0;
+    for (int i = 0; i < numTracks; ++i)
+      {
+      vtkVgTrackDisplayData tdd = this->EventModel->GetTrackDisplayData(e, i);
+      if (tdd.NumIds == 0)
+        {
+        continue;
+        }
+
+      ++numDisplayedTracks;
+
+      // display the last point returned from this track within the event,
+      // UNLESS timeStamp is before the start of the event. This is primarily
+      // (only?) for full volume mode... don't use end as location if we are
+      // before the event
+      vtkIdType pointId;
+      if (timeStamp < e->GetStartFrame())
+        {
+        pointId = tdd.IdsStart[0];
+        }
+      else
+        {
+        pointId = tdd.IdsStart[tdd.NumIds - 1];
+        }
+
+      double point[3];
+      e->GetPoints()->GetPoint(pointId, point);
+
+      // Add a vertex at just determined track location (if doesn't already exist).
+      if (this->Internal->TrackIdVertexIdMap.find(pointId) ==
+          this->Internal->TrackIdVertexIdMap.end())
+        {
+        vtkIdType trackGraphId = graph->AddVertex();
+        this->Internal->TrackIdVertexIdMap[pointId] = trackGraphId;
+        this->Internal->VertexIdEntityTypeMap[trackGraphId] = 0;
+        points->InsertNextPoint(point);
+        }
+
+      trackVertexIds.push_back(this->Internal->TrackIdVertexIdMap[pointId]);
+      }
+
+    if (numDisplayedTracks == 0) // nothing to display for the event
+      {
+      continue;
+      }
+
+    // Get x,y component of event position
+    e->GetDisplayPosition(timeStamp, eventPosition);
+
+    // Compute z component of event position
+    if (this->CurrentZOffsetMode == vtkVgGraphModel::ZOffsetUsingNormalcy)
+      {
+      eventPosition[2] = this->Internal->EventZOffset +
+        e->GetNormalcy(e->GetActiveClassifierType())  *
+        this->Internal->ZScaleFactor;
+      }
+    else if (this->CurrentZOffsetMode == vtkVgGraphModel::ZOffsetUsingStartTime)
+      {
+      eventPosition[2] = this->Internal->EventZOffset +
+        this->Internal->EventZThickness *
+        e->GetStartFrame().GetTimeDifferenceInSecs(minTime) / eventTimeRange;
+      }
+    else
+      {
+      vtkErrorMacro("ERROR: ZOffsetMode " << this->CurrentZOffsetMode
+                    << " is not implemented\n");
+      return;
+      }
+
+    // Add event vertex at the midpoint of supporting track positions.
+    vtkIdType eventGraphId = graph->AddVertex();
+    this->Internal->EventIdVertexIdMap[e->GetId()] = eventGraphId;
+    this->Internal->VertexIdEntityTypeMap[eventGraphId] = 1;
+    points->InsertNextPoint(eventPosition);
+
+    // Add edges from event to supporting track verts.
+    for (size_t i = 0; i < trackVertexIds.size(); ++i)
+      {
+      vtkEdgeType edgeType = graph->AddEdge(eventGraphId, trackVertexIds[i]);
+      this->Internal->EdgeIdEdgeTypeMap[edgeType.Id] = 0;
+      }
+    }
+
+  // Add event link edges.
+  for (int i = 0, end = this->EventModel->GetNumberOfEventLinks(); i < end; ++i)
+    {
+    EventLink link;
+    this->EventModel->GetEventLink(i, link);
+
+    // Add the edge only if both event vertices are in the graph.
+    vtkInternal::EntityIdGraphVertexIdMap::iterator srcItr =
+      this->Internal->EventIdVertexIdMap.find(link.Source);
+    if (srcItr == this->Internal->EventIdVertexIdMap.end())
+      {
+      continue;
+      }
+
+    vtkInternal::EntityIdGraphVertexIdMap::iterator destItr =
+      this->Internal->EventIdVertexIdMap.find(link.Destination);
+    if (destItr == this->Internal->EventIdVertexIdMap.end())
+      {
+      continue;
+      }
+
+    vtkEdgeType edgeType = graph->AddEdge(srcItr->second, destItr->second);
+    this->Internal->EdgeIdEdgeTypeMap[edgeType.Id] = 2;
+    this->Internal->EdgeProbabilityMap[edgeType.Id] = link.Probability;
+    }
+
+  // Add activity graph data.
+  // initialize to times that aren't desired min/max such that we don't have to
+  // check for validity of the min/max time variables
+  double activityTimeRange = 1;
+  vtkVgTimeStamp activityMinTime = maxTime, activityMaxTime = minTime;
+  int numActivities = this->ActivityManager->GetNumberOfActivities();
+  if (this->CurrentZOffsetMode)
+    {
+    for (int i = 0; i < numActivities; ++i)
+      {
+      vtkVgActivity* a = this->ActivityManager->GetActivity(i);
+      // Add all events in this activity
+      int numEvents = a->GetNumberOfEvents();
+
+      if (numEvents > 0) // JUST IN CASE!!!!
+        {
+        vtkVgTimeStamp minEventTime = a->GetEvent(0)->GetStartFrame();
+        for (int j = 1; j < numEvents; ++j)
+          {
+          vtkVgEvent* e = a->GetEvent(j);
+
+          if (e->GetStartFrame() < minEventTime)
+            {
+            minEventTime = e->GetStartFrame();
+            }
+          }
+        if (minEventTime < activityMinTime)
+          {
+          activityMinTime = minEventTime;
+          }
+        if (activityMaxTime < minEventTime)
+          {
+          activityMaxTime = minEventTime;
+          }
+        }
+      }
+
+    // want non-zero to divide by below in case MaxTime == MinTime
+    if (activityMaxTime != activityMinTime)
+      {
+      activityTimeRange =
+        activityMaxTime.GetTimeDifferenceInSecs(activityMinTime);
+      }
+    }
+
+  for (int i = 0; i < numActivities; ++i)
+    {
+    double maxEventNormalcy  = VTK_DOUBLE_MIN;
+    double avg[3] = {0.0, 0.0, 0.0};
+
+    vtkVgActivity* a = this->ActivityManager->GetActivity(i);
+    // should we display the activity?
+    if (!this->ActivityManager->GetActivityDisplayState(i) ||
+        !this->ActivityManager->GetActivityFilteredDisplayState(i) ||
+        this->ActivityManager->ActivityIsFiltered(a))
+      {
+      continue;
+      }
+
+    std::vector<vtkIdType> eventVertexIds;
+
+    // Add all events in this activity
+    int numEvents = a->GetNumberOfEvents();
+    if (numEvents == 0) // shouldn't happen... but???
+      {
+      continue;
+      }
+
+    vtkVgTimeStamp minEventTime;
+    for (int j = 0; j < numEvents; ++j)
+      {
+      double point[3];
+
+      vtkVgEvent* e = a->GetEvent(j);
+
+      int bestType = e->GetActiveClassifierType();
+      if (this->Internal->Initialized && this->EventFilter)
+        {
+        bestType = this->EventFilter->GetBestClassifier(e);
+        }
+      if (bestType >= 0)
+        {
+        double eventNormalcy = e->GetNormalcy(bestType);
+
+        if (eventNormalcy > maxEventNormalcy)
+          {
+          maxEventNormalcy = eventNormalcy;
+          }
+        }
+
+      // all events within activity contribute, even if not currently displayed
+      vtkIdType eventVertexId = this->GetEventGraphVertexId(e->GetId());
+      if (eventVertexId != -1)
+        {
+        eventVertexIds.push_back(eventVertexId);
+        points->GetPoint(eventVertexId, point);
+        }
+      else
+        {
+        // currently no vertex, so need to get from event
+        e->GetDisplayPosition(timeStamp, point);
+        }
+      avg[0] += point[0];
+      avg[1] += point[1];
+
+      if (!minEventTime.IsValid() || e->GetStartFrame() < minEventTime)
+        {
+        minEventTime = e->GetStartFrame();
+        }
+      }
+
+    // display activity if show always or time during activity
+    vtkVgTimeStamp activityStart, activityEnd;
+    a->GetActivityFrameExtents(activityStart, activityEnd);
+    if (a->GetShowAlways() ||
+        (timeStamp <= activityEnd && activityStart <= timeStamp))
+      {
+      avg[0] /= numEvents;
+      avg[1] /= numEvents;
+
+      if (this->CurrentZOffsetMode == vtkVgGraphModel::ZOffsetUsingNormalcy)
+        {
+        avg[2] = this->Internal->ActivityZOffset +
+                 maxEventNormalcy * this->Internal->ZScaleFactor;
+        }
+      else if (this->CurrentZOffsetMode == vtkVgGraphModel::ZOffsetUsingStartTime)
+        {
+        avg[2] = this->Internal->ActivityZOffset +
+                 this->Internal->ActivityZThickness *
+                 minEventTime.GetTimeDifferenceInSecs(activityMinTime) / activityTimeRange;
+        }
+      else
+        {
+        vtkErrorMacro("ERROR: ZPositionMode " << this->CurrentZOffsetMode
+                      << " is not implemented\n");
+        return;
+        }
+
+      vtkIdType activityVertexId = graph->AddVertex();
+      vtkIdType activityId = i;
+      this->Internal->ActivityIdVertexIdMap[activityId] = activityVertexId;
+      this->Internal->VertexIdEntityTypeMap[activityVertexId] = 2;
+
+      for (size_t eid = 0; eid < eventVertexIds.size(); ++eid)
+        {
+        vtkEdgeType edgeType = graph->AddEdge(activityVertexId, eventVertexIds[eid]);
+        this->Internal->EdgeIdEdgeTypeMap[edgeType.Id] = 1;
+        }
+
+      points->InsertPoint(activityVertexId, avg);
+      }
+    }
+
+  graph->SetPoints(points);
+
+  this->Internal->Initialized = true;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGraphModel::Update(const vtkVgTimeStamp& timeStamp,
+  const vtkVgTimeStamp* vtkNotUsed(referenceFrameTimeStamp)/*=0*/)
+{
+  if (this->CurrentTimeStamp == timeStamp &&
+      this->Internal->UpdateTime > this->GetMTime() && !this->Internal->Initialized)
+    {
+    return VTK_OK;
+    }
+
+  this->CurrentTimeStamp = timeStamp;
+
+  this->Internal->UpdateTime.Modified();
+
+  // Update graph model here...
+  this->Initialize(timeStamp);
+
+  // Let the representation (if listening) know it needs to update
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+unsigned long vtkVgGraphModel::GetUpdateTime()
+{
+  return this->Internal->UpdateTime.GetMTime();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgGraphModel::GetTrackGraphVertexId(const vtkIdType& trackId)
+{
+  vtkInternal::EntityIdGraphVertexIdConstItr constItr =
+    this->Internal->TrackIdVertexIdMap.find(trackId);
+  if (constItr != this->Internal->TrackIdVertexIdMap.end())
+    {
+    return constItr->second;
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgGraphModel::GetEventGraphVertexId(const vtkIdType& eventId)
+{
+  vtkInternal::EntityIdGraphVertexIdConstItr constItr =
+    this->Internal->EventIdVertexIdMap.find(eventId);
+  if (constItr != this->Internal->EventIdVertexIdMap.end())
+    {
+    return constItr->second;
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgGraphModel::GetActivityGraphVertexId(const vtkIdType& activityId)
+{
+  vtkInternal::EntityIdGraphVertexIdConstItr constItr =
+    this->Internal->TrackIdVertexIdMap.find(activityId);
+  if (constItr != this->Internal->ActivityIdVertexIdMap.end())
+    {
+    return constItr->second;
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+const std::map<vtkIdType, vtkIdType>& vtkVgGraphModel::GetTracksVerticesMap()
+{
+  return this->Internal->TrackIdVertexIdMap;
+}
+
+//-----------------------------------------------------------------------------
+const std::map<vtkIdType, vtkIdType>& vtkVgGraphModel::GetEventsVerticesMap()
+{
+  return this->Internal->EventIdVertexIdMap;
+}
+
+//-----------------------------------------------------------------------------
+const std::map<vtkIdType, vtkIdType>& vtkVgGraphModel::GetActivitiesVerticesMap()
+{
+  return this->Internal->ActivityIdVertexIdMap;
+}
+
+//-----------------------------------------------------------------------------
+const std::map<vtkIdType, vtkIdType>& vtkVgGraphModel::GetEdgeIdToEdgeTypeMap()
+{
+  return this->Internal->EdgeIdEdgeTypeMap;
+}
+
+//-----------------------------------------------------------------------------
+const std::map<vtkIdType, double>& vtkVgGraphModel::GetEdgeProbabilityMap()
+{
+  return this->Internal->EdgeProbabilityMap;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgGraphModel::GetVertexEntityType(vtkIdType vertexId)
+{
+  vtkInternal::VertexIdEntityTypeConstItr constItr =
+    this->Internal->VertexIdEntityTypeMap.find(vertexId);
+
+  if (constItr != this->Internal->VertexIdEntityTypeMap.end())
+    {
+    return constItr->second;
+    }
+
+  return -1;
+}
diff --git a/Libraries/VtkVgModelView/vtkVgGraphModel.h b/Libraries/VtkVgModelView/vtkVgGraphModel.h
new file mode 100644
index 00000000..904d6a55
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgGraphModel.h
@@ -0,0 +1,149 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgGraphModel_h
+#define __vtkVgGraphModel_h
+
+#include "vtkVgModelBase.h"
+
+// C++ includes.
+#include <map>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgActivityManager;
+class vtkVgEventFilter;
+class vtkVgEventModel;
+class vtkVgTrackModel;
+
+class vtkGraph;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgGraphModel : public vtkVgModelBase
+{
+public:
+
+  enum ZOffsetMode
+    {
+    ZOffsetUsingNormalcy = 0,
+    ZOffsetUsingStartTime
+    };
+
+  vtkVgClassMacro(vtkVgGraphModel);
+
+  vtkTypeMacro(vtkVgGraphModel, vtkVgModelBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgGraphModel* New();
+
+  // Description:
+  // Specify a track model.
+  void SetTrackModel(vtkVgTrackModel* tm);
+  vtkGetObjectMacro(TrackModel, vtkVgTrackModel);
+
+  // Description:
+  // Specify an event model.
+  void SetEventModel(vtkVgEventModel* em);
+  vtkGetObjectMacro(EventModel, vtkVgEventModel);
+
+  // Description:
+  // Specify an activity manager.
+  void SetActivityManager(vtkVgActivityManager* am);
+  vtkGetObjectMacro(ActivityManager, vtkVgActivityManager);
+
+  // Description:
+  // Create and initialize graph structures using the sub-models.
+  void Initialize(const vtkVgTimeStamp& timeStamp);
+
+  virtual int Update(const vtkVgTimeStamp& timeStamp,
+                     const vtkVgTimeStamp* referenceFrameTimeStamp);
+  using Superclass::Update;
+
+  // Description:
+  // Get current frame (index) as of the most recent Update() call
+  vtkGetMacro(CurrentFrame, vtkIdType);
+
+  // Description:
+  // Return the MTime for the last Update (that did something).
+  virtual unsigned long GetUpdateTime();
+
+  // Description:
+  // Get the vtkGraph built by the latest update of the model.
+  vtkGetObjectMacro(Graph, vtkGraph);
+
+  // Description:
+  // Set the mode to be used for Z positioning.
+  vtkSetMacro(CurrentZOffsetMode, vtkIdType);
+  vtkGetMacro(CurrentZOffsetMode, vtkIdType);
+
+  // Description:
+  // Set the event filter that this representation will use.
+  virtual void SetEventFilter(vtkVgEventFilter* filter);
+  vtkGetObjectMacro(EventFilter, vtkVgEventFilter);
+
+  // Description:
+  // Given a track id return graph vertex id.
+  // Return -1 if not found.
+  virtual vtkIdType GetTrackGraphVertexId(const vtkIdType& trackId);
+
+  // Description:
+  // Given a track id return graph vertex id.
+  // Return -1 if not found.
+  virtual vtkIdType GetEventGraphVertexId(const vtkIdType& eventId);
+
+  // Description:
+  // Given a track id return graph vertex id.
+  // Return -1 if not found.
+  virtual vtkIdType GetActivityGraphVertexId(const vtkIdType& activityId);
+
+  // Description:
+  // Return map of tracks contained in the graph.
+  virtual const std::map<vtkIdType, vtkIdType>& GetTracksVerticesMap();
+
+  // Description:
+  // Return map of events contained in the graph.
+  virtual const std::map<vtkIdType, vtkIdType>& GetEventsVerticesMap();
+
+  // Description:
+  // Return map of activities contained in the graph.
+  virtual const std::map<vtkIdType, vtkIdType>& GetActivitiesVerticesMap();
+
+  // Description:
+  // Return map of edge id to edge type.
+  // 0 is track-event edge, 1 is event-activity edge.
+  virtual const std::map<vtkIdType, vtkIdType>& GetEdgeIdToEdgeTypeMap();
+
+  // Description:
+  // Return map of edge id to edge probability.
+  virtual const std::map<vtkIdType, double>& GetEdgeProbabilityMap();
+
+  virtual vtkIdType GetVertexEntityType(vtkIdType vertexId);
+
+
+private:
+  vtkVgGraphModel(const vtkVgGraphModel&); // Not implemented.
+  void operator=(const vtkVgGraphModel&);  // Not implemented.
+
+  vtkVgGraphModel();
+  ~vtkVgGraphModel();
+
+  vtkVgTrackModel*           TrackModel;
+  vtkVgEventModel*           EventModel;
+  vtkVgActivityManager*      ActivityManager;
+
+  vtkIdType                 CurrentFrame;
+
+  vtkGraph*                  Graph;
+
+  vtkIdType                 CurrentZOffsetMode;
+
+  struct vtkInternal;
+  vtkInternal*               Internal;
+
+  vtkVgEventFilter*          EventFilter;
+};
+
+#endif // __vtkVgGraphModel_h
diff --git a/Libraries/VtkVgModelView/vtkVgGraphRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgGraphRepresentation.cxx
new file mode 100644
index 00000000..d1e8c2d8
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgGraphRepresentation.cxx
@@ -0,0 +1,838 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgGraphRepresentation.h"
+
+#include <vtkVgActivity.h>
+#include <vtkVgActivityTypeRegistry.h>
+
+#include "vtkVgActivityManager.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventFilter.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventTypeRegistry.h"
+#include "vtkVgGraphModel.h"
+#include "vtkVgPicker.h"
+
+#include <vgActivityType.h>
+#include <vgEventType.h>
+
+#include <vtkVgCellPicker.h>
+#include <vtkVgColorUtil.h>
+#include <vtkVgGraphMapper.h>
+
+#include <vtkActor.h>
+#include <vtkCellData.h>
+#include <vtkCommand.h>
+#include <vtkCubeSource.h>
+#include <vtkDataSet.h>
+#include <vtkDataSetAttributes.h>
+#include <vtkDoubleArray.h>
+#include <vtkEdgeListIterator.h>
+#include <vtkGlyph3D.h>
+#include <vtkGlyphSource2D.h>
+#include <vtkGraph.h>
+#include <vtkGraphToPolyData.h>
+#include <vtkInEdgeIterator.h>
+#include <vtkIdListCollection.h>
+#include <vtkIdTypeArray.h>
+#include <vtkObjectFactory.h>
+#include <vtkOutEdgeIterator.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkSelection.h>
+#include <vtkSelectionNode.h>
+#include <vtkSphereSource.h>
+
+// C++ includes
+#include <cassert>
+#include <map>
+
+vtkStandardNewMacro(vtkVgGraphRepresentation);
+vtkCxxSetObjectMacro(vtkVgGraphRepresentation, EventTypeRegistry,
+                     vtkVgEventTypeRegistry);
+
+#define vtkCreateMacro(type, name) \
+  vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
+
+//----------------------------------------------------------------------------
+struct vtkVgGraphRepresentation::vtkInternal
+{
+  vtkInternal();
+  ~vtkInternal();
+
+  vtkSmartPointer<vtkActor>       GraphActor;
+
+  vtkSmartPointer<vtkDoubleArray> ScaleArray;
+  vtkSmartPointer<vtkUnsignedCharArray>
+  VertexColorArray;
+
+  vtkSmartPointer<vtkUnsignedCharArray>
+  EdgeColorArray;
+  vtkSmartPointer<vtkIdTypeArray> GeometryIndexArray;
+
+  vtkSmartPointer<vtkPolyData>    TrackGeometry;
+  vtkSmartPointer<vtkPolyData>    EventGeometry;
+  vtkSmartPointer<vtkPolyData>    ActivityGeometry;
+
+  static std::string              EdgeColorModeStrings
+  [vtkVgGraphRepresentation::CountEdgeColorModes];
+
+  static std::string              EdgeThicknessModeStrings
+  [vtkVgGraphRepresentation::CountEdgeThicknessModes];
+
+  inline void SetColor(vtkUnsignedCharArray* array,
+                       vtkIdType id, double rgba[4]);
+
+  inline void SetVertexColor(vtkIdType id, double rgba[4]);
+  inline void SetVertexScale(vtkIdType id, double scale);
+  inline void SetVertexGeometryIndex(vtkIdType id, vtkIdType value);
+
+  inline void SetEdgeColor(vtkIdType id, double rgba[4]);
+
+  static std::string GetGraphEdgeColorModeString
+  (vtkIdType index);
+  static std::string GetGraphEdgeThicknessModeString
+  (vtkIdType index);
+};
+
+//-----------------------------------------------------------------------------
+std::string vtkVgGraphRepresentation::vtkInternal::EdgeColorModeStrings
+[vtkVgGraphRepresentation::CountEdgeColorModes] =
+{
+  "Default",
+  "RoleBased"
+};
+
+//-----------------------------------------------------------------------------
+std::string vtkVgGraphRepresentation::vtkInternal::EdgeThicknessModeStrings
+[vtkVgGraphRepresentation::CountEdgeThicknessModes] =
+{
+  "Thin",
+  "Thick",
+  "Thicker"
+};
+
+//-----------------------------------------------------------------------------
+vtkVgGraphRepresentation::vtkInternal::vtkInternal()
+{
+  this->TrackGeometry     = vtkSmartPointer<vtkPolyData>::New();
+  this->EventGeometry     = vtkSmartPointer<vtkPolyData>::New();
+  this->ActivityGeometry  = vtkSmartPointer<vtkPolyData>::New();
+
+  // Currently track and event are represented as spheres.
+  // Create geometric representation of nodes.
+  vtkSmartPointer<vtkSphereSource> sphereSource(vtkSmartPointer<vtkSphereSource>::New());
+  sphereSource->SetRadius(10.0);
+  sphereSource->Update();
+
+  this->TrackGeometry->DeepCopy(sphereSource->GetOutput());
+  this->EventGeometry->DeepCopy(sphereSource->GetOutput());
+
+  // Activities are represented as cones.
+  vtkSmartPointer<vtkCubeSource> cubeSource(vtkSmartPointer<vtkCubeSource>::New());
+  cubeSource->SetXLength(20.0);
+  cubeSource->SetYLength(20.0);
+  cubeSource->SetZLength(20.0);
+  cubeSource->Update();
+
+  this->ActivityGeometry->DeepCopy(cubeSource->GetOutput());
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGraphRepresentation::vtkInternal::~vtkInternal()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::vtkInternal::SetColor(vtkUnsignedCharArray* array,
+    vtkIdType id, double rgba[4])
+{
+  unsigned char c[4];
+  vtkVgColorUtil::convert(rgba, c);
+  array->SetTupleValue(id, c);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::vtkInternal::SetVertexColor(vtkIdType id, double rgba[4])
+{
+  this->SetColor(this->VertexColorArray, id, rgba);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::vtkInternal::SetVertexScale(vtkIdType id, double scale)
+{
+  // \note: No null pointer check for performance reasons.
+  this->ScaleArray->SetValue(id, scale);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::vtkInternal::SetVertexGeometryIndex(vtkIdType id, vtkIdType value)
+{
+  this->GeometryIndexArray->SetValue(id, value);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::vtkInternal::SetEdgeColor(vtkIdType id, double rgba[4])
+{
+  this->SetColor(this->EdgeColorArray, id, rgba);
+}
+
+//-----------------------------------------------------------------------------
+std::string vtkVgGraphRepresentation::vtkInternal::GetGraphEdgeColorModeString(
+  vtkIdType index)
+{
+  const std::string emptyString("");
+  if (index < 0 || index >= vtkVgGraphRepresentation::CountEdgeColorModes)
+    {
+    return emptyString;
+    }
+  else
+    {
+    return vtkInternal::EdgeColorModeStrings[index];
+    }
+}
+
+//-----------------------------------------------------------------------------
+std::string vtkVgGraphRepresentation::vtkInternal::GetGraphEdgeThicknessModeString(
+  vtkIdType index)
+{
+  const std::string emptyString("");
+  if (index < 0 || index >= vtkVgGraphRepresentation::CountEdgeThicknessModes)
+    {
+    return emptyString;
+    }
+  else
+    {
+    return vtkInternal::EdgeThicknessModeStrings[index];
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGraphRepresentation::vtkVgGraphRepresentation()
+{
+  this->Visible = 1;
+
+  this->GraphEdgeColorMode      = DefaultEdgeColor;
+
+  this->GraphEdgeThicknessMode  = ThinEdge;
+
+  this->GraphModel = 0;
+
+  this->Internal = new vtkInternal;
+
+  this->Internal->GraphActor  = vtkSmartPointer<vtkActor>::New();
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+
+  this->NewPropCollection->AddItem(this->Internal->GraphActor);
+  this->ActivePropCollection->AddItem(this->Internal->GraphActor);
+
+  this->Picker = vtkSmartPointer<vtkVgCellPicker>::New();
+  this->Picker->PickFromListOn();
+  this->Picker->SetTolerance(0.01);
+  this->PickPosition[0] = this->PickPosition[1] = this->PickPosition[2] = 0.0;
+
+  this->EventTypeRegistry = 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGraphRepresentation::~vtkVgGraphRepresentation()
+{
+  this->SetGraphModel(0);
+
+  this->SetEventTypeRegistry(0);
+
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::SetGraphModel(vtkVgGraphModel* graphModel)
+{
+  if (this->GraphModel != graphModel)
+    {
+    vtkVgGraphModel* temp = this->GraphModel;
+    this->GraphModel = graphModel;
+    if (this->GraphModel)
+      {
+      this->GraphModel->Register(this);
+      }
+    if (temp)
+      {
+      temp->UnRegister(this);
+      }
+
+    if (this->GraphModel)
+      {
+      if (this->UseAutoUpdate)
+        {
+        this->GraphModel->AddObserver(vtkCommand::UpdateDataEvent, this,
+                                      &vtkVgGraphRepresentation::Update);
+        }
+      }
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgGraphRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgGraphRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgGraphRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgGraphRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgGraphRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgGraphRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+
+  this->Visible = flag;
+  this->ActivePropCollection->InitTraversal();
+  while (vtkProp* prop = this->ActivePropCollection->GetNextProp())
+    {
+    prop->SetVisibility(flag);
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::Initialize()
+{
+  if (!this->GraphModel)
+    {
+    vtkErrorMacro("Event model must be set before initialization.");
+    return;
+    }
+
+  vtkGraph* graph = this->GraphModel->GetGraph();
+  vtkIdType numVerts = graph->GetNumberOfVertices();
+  vtkIdType numEdges = graph->GetNumberOfEdges();
+
+  this->Internal->ScaleArray  = vtkSmartPointer<vtkDoubleArray>::New();
+  this->Internal->ScaleArray->SetName("vertex_scale");
+  this->Internal->ScaleArray->SetNumberOfTuples(numVerts);
+  this->Internal->ScaleArray->SetNumberOfComponents(1);
+
+  this->Internal->VertexColorArray = vtkSmartPointer<vtkUnsignedCharArray>::New();
+  this->Internal->VertexColorArray->SetName("vertex_color");
+  this->Internal->VertexColorArray->SetNumberOfComponents(4);
+  this->Internal->VertexColorArray->SetNumberOfTuples(numVerts);
+
+  this->Internal->GeometryIndexArray = vtkSmartPointer<vtkIdTypeArray>::New();
+  this->Internal->GeometryIndexArray->SetName("geometry_index");
+  this->Internal->GeometryIndexArray->SetNumberOfComponents(1);
+  this->Internal->GeometryIndexArray->SetNumberOfTuples(numVerts);
+
+  this->Internal->EdgeColorArray = vtkSmartPointer<vtkUnsignedCharArray>::New();
+  this->Internal->EdgeColorArray->SetName("edge_color");
+  this->Internal->EdgeColorArray->SetNumberOfComponents(4);
+  this->Internal->EdgeColorArray->SetNumberOfTuples(numEdges);
+
+  // Color
+  double rgba[4] = {0.7, 0.7, 0.7, 0.7};
+
+  // Tracks.
+  const std::map<vtkIdType, vtkIdType> tracksVerticesMap =
+    this->GraphModel->GetTracksVerticesMap();
+  std::map<vtkIdType, vtkIdType>::const_iterator tvConstItr =
+    tracksVerticesMap.begin();
+
+  while (tvConstItr != tracksVerticesMap.end())
+    {
+    this->Internal->SetVertexColor(tvConstItr->second, rgba);
+    this->Internal->SetVertexScale(tvConstItr->second, 0.01);
+    this->Internal->SetVertexGeometryIndex(tvConstItr->second, 0);
+
+    ++tvConstItr;
+    }
+
+  // Events.
+  const std::map<vtkIdType, vtkIdType> eventsVerticesMap =
+    this->GraphModel->GetEventsVerticesMap();
+  std::map<vtkIdType, vtkIdType>::const_iterator evConstItr =
+    eventsVerticesMap.begin();
+
+  while (evConstItr != eventsVerticesMap.end())
+    {
+    vtkVgEvent* event =
+      this->GraphModel->GetEventModel()->GetEvent(evConstItr->first);
+
+    if (event && this->EventTypeRegistry)
+      {
+      const vgEventType& et = this->EventTypeRegistry->GetTypeById(
+                                event->GetActiveClassifierType());
+
+      et.GetTrackColor(0, rgba[0], rgba[1], rgba[2]);
+
+      double normalcyScale = 0.25 +
+        (1 - event->GetNormalcy(event->GetActiveClassifierType())) * 0.75;
+
+      this->Internal->SetVertexColor(evConstItr->second, rgba);
+      this->Internal->SetVertexScale(evConstItr->second, normalcyScale);
+      this->Internal->SetVertexGeometryIndex(evConstItr->second, 1);
+      }
+
+    ++evConstItr;
+    }
+
+  // Activities.
+  vtkVgActivityTypeRegistry* activityTypeRegistry
+  (this->GraphModel->GetActivityManager()->GetActivityTypeRegistry());
+  const std::map<vtkIdType, vtkIdType> activitiesVerticesMap =
+    this->GraphModel->GetActivitiesVerticesMap();
+  std::map<vtkIdType, vtkIdType>::const_iterator avConstItr =
+    activitiesVerticesMap.begin();
+
+  // get range of saliency scores to compute a scale factor
+  double maxSaliency = 0;
+  while (avConstItr != activitiesVerticesMap.end())
+    {
+    vtkVgActivity* activity =
+      this->GraphModel->GetActivityManager()->GetActivity(avConstItr->first);
+
+    if (activity && activityTypeRegistry &&
+        activity->GetSaliency() > maxSaliency)
+      {
+      maxSaliency = activity->GetSaliency();
+      }
+
+    ++avConstItr;
+    }
+  double scaleFactor = 2;
+  if (maxSaliency > 1)
+    {
+    scaleFactor /= maxSaliency;
+    }
+
+  avConstItr = activitiesVerticesMap.begin();
+  while (avConstItr != activitiesVerticesMap.end())
+    {
+    vtkVgActivity* activity =
+      this->GraphModel->GetActivityManager()->GetActivity(avConstItr->first);
+
+    if (activity && activityTypeRegistry)
+      {
+      int type = activity->GetType();
+      const vgActivityType& at = activityTypeRegistry->GetType(type);
+      at.GetColor(rgba[0], rgba[1], rgba[2]);
+
+      this->Internal->SetVertexColor(avConstItr->second, rgba);
+      this->Internal->SetVertexScale(avConstItr->second, 1.25 +
+                                     scaleFactor * activity->GetSaliency());
+      this->Internal->SetVertexGeometryIndex(avConstItr->second, 2);
+      }
+
+    ++avConstItr;
+    }
+
+  // Edges
+  const std::map<vtkIdType, vtkIdType> edgeIdToEdgeTypeMap =
+    this->GraphModel->GetEdgeIdToEdgeTypeMap();
+  const std::map<vtkIdType, double> edgeProbabilityMap =
+    this->GraphModel->GetEdgeProbabilityMap();
+  std::map<vtkIdType, vtkIdType>::const_iterator edgeConstItr =
+    edgeIdToEdgeTypeMap.begin();
+  while (edgeConstItr != edgeIdToEdgeTypeMap.end())
+    {
+    if (edgeConstItr->second == 0)
+      {
+      double rgba[4] = {0.3, 0.6, 0.3, 0.5};
+      this->Internal->SetEdgeColor(edgeConstItr->first, rgba);
+      }
+    else if (edgeConstItr->second == 1)
+      {
+      double rgba[4] = {0.3, 0.8, 0.8, 0.5};
+      this->Internal->SetEdgeColor(edgeConstItr->first, rgba);
+      }
+    else if (edgeConstItr->second == 2)
+      {
+      // Look up probability value of link edge.
+      const std::map<vtkIdType, double>::const_iterator itr
+        = edgeProbabilityMap.find(edgeConstItr->first);
+      double p = itr->second;
+      p = p > 1.0 ? 1.0 : (p < 0.0 ? 0.0 : p);
+
+      // Make low probability links darker than more likely ones.
+      double rgba[] = { p, p, p, 0.5 };
+      this->Internal->SetEdgeColor(edgeConstItr->first, rgba);
+      }
+    else
+      {
+      vtkErrorMacro("ERROR: Bad edge type " << edgeConstItr->second);
+      }
+    ++edgeConstItr;
+    }
+
+  assert(this->Internal->ScaleArray->GetNumberOfTuples()         == numVerts);
+  assert(this->Internal->VertexColorArray->GetNumberOfTuples()   == numVerts);
+  assert(this->Internal->GeometryIndexArray->GetNumberOfTuples() == numVerts);
+  assert(this->Internal->EdgeColorArray->GetNumberOfTuples()     == numEdges);
+
+  // Add scalar data to the graph.
+  graph->GetVertexData()->AddArray(this->Internal->ScaleArray);
+  graph->GetVertexData()->AddArray(this->Internal->VertexColorArray);
+  graph->GetVertexData()->AddArray(this->Internal->GeometryIndexArray);
+  graph->GetEdgeData()->AddArray(this->Internal->EdgeColorArray);
+
+  vtkCreateMacro(vtkVgGraphMapper, mapper);
+  mapper->SetInputData(graph);
+  mapper->SetVertexGeometryIndexing(1);
+  mapper->SetNumberOfVertexGeometrySources(3);
+  mapper->SetVertexGeometry(0, this->Internal->TrackGeometry);
+  mapper->SetVertexGeometry(1, this->Internal->EventGeometry);
+  mapper->SetVertexGeometry(2, this->Internal->ActivityGeometry);
+  mapper->SetVertexGeometryIndexArray(this->Internal->GeometryIndexArray->GetName());
+  mapper->SetScalingArrayName(this->Internal->ScaleArray->GetName());
+  mapper->SetScaledGlyphs(1);
+  mapper->SetVertexPointSize(1.0f);
+  mapper->SetVertexColorArrayName(this->Internal->VertexColorArray->GetName());
+  mapper->SetColorVertices(true);
+
+  this->ActivePropCollection->RemoveItem(this->Internal->GraphActor);
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->AddItem(this->Internal->GraphActor);
+
+  this->Internal->GraphActor = vtkSmartPointer<vtkActor>::New();
+  this->NewPropCollection->AddItem(this->Internal->GraphActor);
+
+  this->Internal->GraphActor->SetMapper(mapper);
+  this->Internal->GraphActor->PickableOn();
+
+  if (numEdges)
+    {
+    this->SetGraphEdgeColorMode(this->GraphEdgeColorMode);
+    this->SetGraphEdgeThicknessMode(this->GraphEdgeThicknessMode);
+    }
+  mapper->Update();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::Update()
+{
+
+  if (!this->GetVisible())
+    {
+    return;
+    }
+
+  // \note: Currently call initialize every update as the graph model has
+  // changed.
+  this->Initialize();
+
+  this->Internal->GraphActor->GetMapper()->Update();
+
+  this->UpdateTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgGraphRepresentation::
+Pick(double renX, double renY, vtkRenderer* ren, vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+
+  return -1;
+
+  if (!this->GetVisible())
+    {
+    return -1;
+    }
+
+  // Set up the pick list and add the actors to it
+  this->Picker->InitializePickList();
+
+  this->ActivePropCollection->InitTraversal();
+  while (vtkProp* prop = this->ActivePropCollection->GetNextProp())
+    {
+    this->Picker->AddPickList(prop);
+    }
+
+  if (this->Picker->Pick(renX, renY, 0.0, ren))
+    {
+    vtkIdType cellId = this->Picker->GetCellId();
+    this->Picker->GetPickPosition(this->PickPosition);
+
+    if (vtkIdTypeArray* da =
+          dynamic_cast<vtkIdTypeArray*>(
+            this->Picker->GetDataSet()->GetCellData()->GetArray("Event Ids")))
+      {
+      pickType = vtkVgPickData::PickedGraph;
+      return da->GetValue(cellId);
+      }
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::SetGraphEdgeColorMode(int mode)
+{
+  if (mode < CountEdgeColorModes)
+    {
+    this->GraphEdgeColorMode = mode;
+    }
+
+  vtkVgGraphMapper* graphMapper =
+    vtkVgGraphMapper::SafeDownCast(this->Internal->GraphActor->GetMapper());
+  if (!graphMapper)
+    {
+    vtkErrorMacro("ERROR: Invalid graph mapper\n");
+    return;
+    }
+
+  switch (mode)
+    {
+    case DefaultEdgeColor:
+      {
+      graphMapper->SetColorEdges(false);
+      graphMapper->Update();
+      break;
+      }
+    case RoleBasedEdgeColor:
+      {
+      vtkGraph* graph = this->GraphModel->GetGraph();
+      if (graph && graph->GetNumberOfEdges()
+        && this->Internal->EdgeColorArray->GetNumberOfTuples())
+        {
+        graphMapper->SetColorEdges(true);
+        graphMapper->SetEdgeColorArrayName(
+          this->Internal->EdgeColorArray->GetName());
+
+        this->SetGraphEdgeThicknessMode(this->GraphEdgeThicknessMode);
+
+        graphMapper->Update();
+        }
+      break;
+      }
+    default:
+      {
+      vtkErrorMacro("ERROR: Unknown edge color mode\n");
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGraphRepresentation::GetGraphEdgeColorMode()
+{
+  return this->GraphEdgeColorMode;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::SetGraphEdgeThicknessMode(int mode)
+{
+  if (mode < CountEdgeThicknessModes)
+    {
+    this->GraphEdgeThicknessMode = mode;
+    }
+
+  vtkVgGraphMapper* graphMapper =
+    vtkVgGraphMapper::SafeDownCast(this->Internal->GraphActor->GetMapper());
+  if (!graphMapper)
+    {
+    vtkErrorMacro("ERROR: Invalid graph mapper\n");
+    return;
+    }
+
+  switch (mode)
+    {
+    case ThinEdge:
+      {
+      graphMapper->SetEdgeLineWidth(1.0f);
+      this->SetGraphEdgeOpacity(0.5);
+      break;
+      }
+    case ThickEdge:
+      {
+      graphMapper->SetEdgeLineWidth(2.0f);
+      this->SetGraphEdgeOpacity(0.7);
+      break;
+      }
+    case ThickerEdge:
+      {
+      graphMapper->SetEdgeLineWidth(4.0f);
+      this->SetGraphEdgeOpacity(1.0);
+      break;
+      }
+    default:
+      {
+      vtkErrorMacro("ERROR: Unknown edge thickness mode\n");
+      break;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGraphRepresentation::GetGraphEdgeThicknessMode()
+{
+  return this->GraphEdgeThicknessMode;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGraphRepresentation::SetGraphEdgeOpacity(double value)
+{
+  vtkVgGraphMapper* graphMapper =
+    vtkVgGraphMapper::SafeDownCast(this->Internal->GraphActor->GetMapper());
+  if (!graphMapper)
+    {
+    vtkErrorMacro("ERROR: Invalid graph mapper\n");
+    return;
+    }
+
+  if (this->GraphEdgeColorMode == DefaultEdgeColor)
+    {
+    graphMapper->SetEdgeOpacity(value);
+    }
+  else if (this->GraphEdgeColorMode == RoleBasedEdgeColor)
+    {
+    vtkIdType count = this->Internal->EdgeColorArray->GetNumberOfTuples();
+    for (vtkIdType i = 0; i < count; ++i)
+      {
+      unsigned char newRGBA[4];
+      unsigned char previousRGBA[4];
+      this->Internal->EdgeColorArray->GetTupleValue(i, previousRGBA);
+      newRGBA[0] = previousRGBA[0];
+      newRGBA[1] = previousRGBA[1];
+      newRGBA[2] = previousRGBA[2];
+      newRGBA[3] = value * 255;
+
+      this->Internal->EdgeColorArray->SetTupleValue(i, newRGBA);
+      }
+    }
+  else
+    {
+    // Do nothing.
+    }
+  graphMapper->Update();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPickData::PickData vtkVgGraphRepresentation::Pick(vtkSelection* selection)
+{
+  vtkVgPickData::PickData pickedData;
+
+  if (!selection)
+    {
+    return pickedData;
+    }
+
+  vtkSelectionNode* glyphIds = selection->GetNode(0);
+
+  if (!glyphIds)
+    {
+    return pickedData;
+    }
+
+  vtkAbstractArray* selectionList = glyphIds->GetSelectionList();
+  if (!selectionList)
+    {
+    return pickedData;
+    }
+
+  vtkIdTypeArray* ids = vtkIdTypeArray::SafeDownCast(selectionList);
+  if (ids != 0)
+    {
+    vtkIdType numSelPoints = ids->GetNumberOfTuples();
+    for (vtkIdType i = 0; i < numSelPoints; i++)
+      {
+      vtkIdType id = ids->GetValue(i);
+      vtkIdType type = this->GraphModel->GetVertexEntityType(id);
+
+      if (type != -1)
+        {
+        vtkVgPickData::PickEntity pickedEntity;
+        pickedEntity.PickedType = type;
+        pickedEntity.PickedId = id;
+
+        pickedData.PickedEntities.push_back(pickedEntity);
+        }
+      }
+    }
+
+  return pickedData;
+}
+
+//-----------------------------------------------------------------------------
+std::string vtkVgGraphRepresentation::GetGraphEdgeColorModeString(int mode)
+{
+  if (mode < CountEdgeColorModes)
+    {
+    for (int i = 0; i < CountEdgeColorModes; ++i)
+      {
+      if (mode == i)
+        {
+        return vtkInternal::GetGraphEdgeColorModeString(i);
+        }
+      }
+    }
+
+  return vtkInternal::GetGraphEdgeColorModeString(-1);
+}
+
+//-----------------------------------------------------------------------------
+std::string vtkVgGraphRepresentation::GetGraphEdgeThicknessModeString(int mode)
+{
+  if (mode < CountEdgeThicknessModes)
+    {
+    for (int i = 0; i < CountEdgeThicknessModes; ++i)
+      {
+      if (mode == i)
+        {
+        return vtkInternal::GetGraphEdgeThicknessModeString(i);
+        }
+      }
+    }
+
+  return vtkInternal::GetGraphEdgeThicknessModeString(-1);
+}
diff --git a/Libraries/VtkVgModelView/vtkVgGraphRepresentation.h b/Libraries/VtkVgModelView/vtkVgGraphRepresentation.h
new file mode 100644
index 00000000..a0bf5f21
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgGraphRepresentation.h
@@ -0,0 +1,150 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgGraphRepresentation_h
+#define __vtkVgGraphRepresentation_h
+
+// VisGUI includes.
+#include "vtkVgRepresentationBase.h"
+
+#include "vtkVgPickData.h"
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+class vtkVgEventFilter;
+class vtkVgEventTypeRegistry;
+class vtkVgGraphModel;
+
+class vtkVgCellPicker;
+class vtkPropCollection;
+class vtkRenderer;
+class vtkSelection;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgGraphRepresentation
+  : public vtkVgRepresentationBase
+{
+public:
+  enum GraphEdgeColorMode
+    {
+    DefaultEdgeColor = 0,
+    RoleBasedEdgeColor = 1,
+    CountEdgeColorModes
+    };
+
+  enum GraphEdgeThicknessMode
+    {
+    ThinEdge      = 0,
+    ThickEdge     = 1,
+    ThickerEdge   = 2,
+    CountEdgeThicknessModes
+    };
+
+  vtkTypeMacro(vtkVgGraphRepresentation, vtkVgRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgGraphRepresentation* New();
+
+  static std::string GetGraphEdgeColorModeString(int mode);
+  static std::string GetGraphEdgeThicknessModeString(int mode);
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  // Control visibility.
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  // Description:
+  // Build and initialize representation structures.
+  void Initialize();
+
+  // Description:
+  // Set the item on the representation.
+  void SetGraphModel(vtkVgGraphModel* modelItem);
+  vtkGetObjectMacro(GraphModel, vtkVgGraphModel);
+
+  // Description:
+  // Update all the event actors. Generally called by the application layer.
+  virtual void Update();
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked eventId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the event is currently visible or not.
+  virtual vtkIdType Pick(double renX, double renY, vtkRenderer* ren, vtkIdType& pickType);
+
+  // Description:
+  // After a successful pick occurs, return the position of the pick (in
+  // world coordinates).
+  vtkGetVector3Macro(PickPosition, double);
+
+  // Description:
+  // Assign an event type registry. Must be done before initialization.
+  void SetEventTypeRegistry(vtkVgEventTypeRegistry* registry);
+  vtkGetObjectMacro(EventTypeRegistry, vtkVgEventTypeRegistry);
+
+  // Description:
+  // Set edge colors based on some mode.
+  void SetGraphEdgeColorMode(int mode);
+  int  GetGraphEdgeColorMode();
+
+  // Description:
+  // Set edge colors based on some mode.
+  void SetGraphEdgeThicknessMode(int mode);
+  int  GetGraphEdgeThicknessMode();
+
+  // Description:
+  // Set edge opacity for all the edges.
+  void SetGraphEdgeOpacity(double value);
+
+  // Description:
+  vtkVgPickData::PickData Pick(vtkSelection* selection);
+
+
+private:
+  vtkVgGraphRepresentation(const vtkVgGraphRepresentation&); // Not implemented.
+  void operator=(const vtkVgGraphRepresentation&);           // Not implemented.
+
+  vtkVgGraphRepresentation();
+  virtual ~vtkVgGraphRepresentation();
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  int Visible;
+
+  int GraphEdgeColorMode;
+  int GraphEdgeThicknessMode;
+
+  vtkVgGraphModel* GraphModel;
+
+  struct vtkInternal;
+  vtkInternal* Internal;
+
+  vtkSmartPointer<vtkVgCellPicker> Picker;
+  double PickPosition[3];
+
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+};
+
+#endif // __vtkVgGraphRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgModelBase.cxx b/Libraries/VtkVgModelView/vtkVgModelBase.cxx
new file mode 100644
index 00000000..b8eb3005
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgModelBase.cxx
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgModelBase.h"
+
+// VTK includes
+#include <vtkMatrix4x4.h>
+
+// VG includes
+#include "vtkVgContourOperatorManager.h"
+#include "vtkVgTemporalFilters.h"
+
+vtkCxxSetObjectMacro(vtkVgModelBase, ContourOperatorManager,
+                     vtkVgContourOperatorManager);
+
+vtkCxxSetObjectMacro(vtkVgModelBase, TemporalFilters,
+                     vtkVgTemporalFilters);
+
+//-----------------------------------------------------------------------------
+vtkVgModelBase::vtkVgModelBase() : vtkObject(),
+  Id(-1),
+  UseInternalTimeStamp(0),
+  Initialized(0),
+  ContourOperatorManager(0),
+  TemporalFilters(0)
+{
+  this->ModelMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgModelBase::~vtkVgModelBase()
+{
+  this->SetContourOperatorManager(0);
+  this->SetTemporalFilters(0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgModelBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgModelBase::SetModelMatrix(vtkMatrix4x4* matrix)
+{
+  if (!matrix || (this->ModelMatrix == matrix))
+    {
+    return;
+    }
+
+  this->ModelMatrix = matrix;
+  this->UpdateDataRequestTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+const vtkMatrix4x4* vtkVgModelBase::GetModelMatrix() const
+{
+  return this->ModelMatrix;
+}
+
+//-----------------------------------------------------------------------------
+vtkMatrix4x4* vtkVgModelBase::GetModelMatrix()
+{
+  return this->ModelMatrix;
+}
diff --git a/Libraries/VtkVgModelView/vtkVgModelBase.h b/Libraries/VtkVgModelView/vtkVgModelBase.h
new file mode 100644
index 00000000..031fa93a
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgModelBase.h
@@ -0,0 +1,128 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgModelBase_h
+#define __vtkVgModelBase_h
+
+// VTK includes.
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+
+// VG includes.
+#include <vtkVgMacros.h>
+#include "vtkVgTimeStamp.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkMatrix4x4;
+class vtkVgContourOperatorManager;
+class vtkVgTemporalFilters;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgModelBase : public vtkObject
+{
+public:
+  vtkVgClassMacro(vtkVgModelBase);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgModelBase, vtkObject);
+
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  vtkSetMacro(Id, vtkIdType);
+  vtkGetMacro(Id, vtkIdType);
+
+  // Description:
+  vtkSetMacro(UseInternalTimeStamp, int);
+  vtkGetMacro(UseInternalTimeStamp, int);
+  vtkBooleanMacro(UseInternalTimeStamp, int);
+
+  // Description:
+  // This is model specific matrix. This could be anything, a matrix
+  // that puts the  model in world space or a homography matrix.
+  void SetModelMatrix(vtkMatrix4x4* matrix);
+  const vtkMatrix4x4* GetModelMatrix() const;
+  vtkMatrix4x4* GetModelMatrix();
+
+  // Description:
+  // Return the MTime for the UpdateDataRequest of the model
+  unsigned long GetUpdateDataRequestTime()
+    {
+    return this->UpdateDataRequestTime.GetMTime();
+    }
+
+  virtual int Update(
+    const vtkVgTimeStamp& vtkNotUsed(timeStamp),
+    const vtkVgTimeStamp* vtkNotUsed(referenceFrameTimeStamp))
+    { return VTK_OK; }
+
+  // Overloads required for Python wrapping, which does not support pointer to
+  // vtkVgTimeStamp as a parameter type
+  int Update(const vtkVgTimeStamp& timeStamp)
+    { return this->Update(timeStamp, 0); }
+  int Update(const vtkVgTimeStamp& timeStamp,
+             const vtkVgTimeStamp& referenceFrameTimeStamp)
+    { return this->Update(timeStamp, &referenceFrameTimeStamp); }
+
+  // Description:
+  // Return current time stamp.
+  const vtkVgTimeStamp& GetCurrentTimeStamp() const
+    {
+    return this->CurrentTimeStamp;
+    }
+
+  // Description:
+  // Return the MTime for the last Update (that did something).
+  virtual unsigned long GetUpdateTime() = 0;
+
+  // Set/Get the manager for filters and selectors
+  void SetContourOperatorManager(vtkVgContourOperatorManager* manager);
+  vtkGetObjectMacro(ContourOperatorManager, vtkVgContourOperatorManager);
+
+  // Set/Get the manager for temporal filters
+  void SetTemporalFilters(vtkVgTemporalFilters* temporalFilters);
+  vtkGetObjectMacro(TemporalFilters, vtkVgTemporalFilters);
+
+protected:
+  vtkVgModelBase();
+  virtual ~vtkVgModelBase();
+
+  // Description:
+  // Set/Get flag if the model is initialized
+  vtkSetMacro(Initialized, int);
+  vtkGetMacro(Initialized, int)
+  vtkBooleanMacro(Initialized, int);
+
+// Description:
+  vtkIdType                      Id;
+
+// Description:
+// The MTime of an update data request
+  vtkTimeStamp                   UpdateDataRequestTime;
+
+// Description:
+// Flag to allow model to use its internal timestamp.
+  int                            UseInternalTimeStamp;
+
+  int                            Initialized;
+
+  vtkSmartPointer<vtkMatrix4x4>  ModelMatrix;
+
+// Description:
+// The Current timestamp
+  vtkVgTimeStamp                 CurrentTimeStamp;
+
+  vtkVgContourOperatorManager*   ContourOperatorManager;
+  vtkVgTemporalFilters* TemporalFilters;
+
+private:
+  vtkVgModelBase(const vtkVgModelBase&);    // Not implemented.
+  void operator= (const vtkVgModelBase&);   // Not implemented.
+};
+
+#endif // __vtkVgModelBase_h
diff --git a/Libraries/VtkVgModelView/vtkVgPickData.h b/Libraries/VtkVgModelView/vtkVgPickData.h
new file mode 100644
index 00000000..975c0f3c
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgPickData.h
@@ -0,0 +1,41 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgPickData_h
+#define __vtkVgPickData_h
+
+// C++ includes.
+#include <vector>
+
+namespace vtkVgPickData
+{
+enum enumPickType
+{
+  EmptyPick = 0,
+  PickedIcon = 1,
+  PickedTrack = 2,
+  PickedImage = 3,
+  PickedEvent = 4,
+  PickedActivity = 5,
+  PickedGraph = 6,
+  PickedActor = 7,
+  PickedGraphNode = 8,
+  PickedGraphEdge = 9
+};
+
+struct PickEntity
+{
+  vtkIdType PickedType;
+  vtkIdType PickedId;
+};
+
+struct PickData
+{
+  std::vector<PickEntity> PickedEntities;
+};
+}
+
+#endif // __vtkVgPickData_h
diff --git a/Libraries/VtkVgModelView/vtkVgPicker.cxx b/Libraries/VtkVgModelView/vtkVgPicker.cxx
new file mode 100644
index 00000000..0f0f6e4b
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgPicker.cxx
@@ -0,0 +1,237 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgPicker.h"
+
+#include "vtkVgCellPicker.h"
+#include "vtkObjectFactory.h"
+#include "vtkVgIconManager.h"
+#include "vtkVgTrackRepresentationBase.h"
+#include "vtkVgEventRepresentationBase.h"
+#include "vtkVgActivityManager.h"
+
+#include "vtkVgPickData.h"
+
+#include "vtkImageActor.h"
+#include "vtkRenderer.h"
+#include "vtkCommand.h"
+
+// C++ includes
+#include <algorithm>
+
+
+vtkStandardNewMacro(vtkVgPicker);
+vtkCxxSetObjectMacro(vtkVgPicker, IconManager, vtkVgIconManager);
+vtkCxxSetObjectMacro(vtkVgPicker, ActivityManager, vtkVgActivityManager);
+vtkCxxSetObjectMacro(vtkVgPicker, ImageActor, vtkImageActor);
+vtkCxxSetObjectMacro(vtkVgPicker, Actor, vtkActor);
+
+
+// Construct object with initial tolerance of 1/40th of window. There are no
+// pick methods and picking is performed from the renderer's actors.
+//-----------------------------------------------------------------------------
+vtkVgPicker::vtkVgPicker()
+{
+  this->Verbose = 1;
+
+  this->PickedId = -1;
+
+  this->IconManager = NULL;
+  this->IconId = -1;
+
+  this->ActivityManager = NULL;
+  this->ActivityIndex = -1;
+
+  this->ImageActor = NULL;
+
+  this->Actor = NULL;
+
+  this->Picker = vtkSmartPointer<vtkVgCellPicker>::New();
+  this->Picker->PickFromListOn();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPicker::~vtkVgPicker()
+{
+  if (this->IconManager)
+    {
+    this->IconManager->Delete();
+    }
+  if (this->ActivityManager)
+    {
+    this->ActivityManager->Delete();
+    }
+  if (this->ImageActor)
+    {
+    this->ImageActor->Delete();
+    }
+  if (this->Actor)
+    {
+    this->Actor->Delete();
+    }
+
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPicker::AddRepresentation(vtkVgRepresentationBase* representation)
+{
+  if (!representation)
+    {
+    vtkErrorMacro("ERROR: Invalid representation \n");
+    return;
+    }
+
+  if (std::find(this->Representations.begin(), this->Representations.end(),  representation) !=
+      this->Representations.end())
+    {
+    vtkErrorMacro("ERROR: Representation " << representation << " already exists\n");
+    return;
+    }
+
+  this->Representations.push_back(representation);
+}
+
+//-----------------------------------------------------------------------------
+// There is an order to the picking process. 1) icons 2) tracks 3) background image
+// 4) event 5) activity.
+int vtkVgPicker::
+Pick(double selectionX, double selectionY, double selectionZ, vtkRenderer* renderer)
+{
+  // Invoke start pick method if defined
+  this->InvokeEvent(vtkCommand::StartPickEvent, NULL);
+
+  // Set up the pick
+  this->Initialize();
+  this->IconId = -1;
+  this->Renderer = renderer;
+  this->SelectionPoint[0] = selectionX;
+  this->SelectionPoint[1] = selectionY;
+  this->SelectionPoint[2] = 0;
+
+  // Try picking against the icon manager
+  if (this->IconManager)
+    {
+    this->IconId = this->IconManager->Pick(selectionX, selectionY, renderer);
+    if (this->IconId > -1)
+      {
+      this->InvokeEvent(vtkCommand::PickEvent, NULL);
+
+      int pos[2];
+      this->IconManager->GetIconPosition(this->IconId, pos);
+
+      if (this->Verbose)
+        {
+        cout << "Icon Id/Type: (" << this->IconId << ","
+             << this->IconManager->GetIcon(this->IconId)->GetType() << ")\n";
+        cout << "Icon Position: (" << pos[0] << "," << pos[1] << ")\n";
+        }
+      this->PickPosition[0] = static_cast<double>(pos[0]);
+      this->PickPosition[1] = static_cast<double>(pos[1]);
+      this->PickPosition[2] = 0.0;
+      return vtkVgPickData::PickedIcon;
+      }
+    }
+
+  std::vector<vtkSmartPointer<vtkVgRepresentationBase> >::const_iterator constItr
+    = this->Representations.begin();
+  while (constItr != this->Representations.end())
+    {
+    vtkIdType pickType = vtkVgPickData::EmptyPick;
+    this->PickedId = (*constItr)->Pick(selectionX, selectionY, renderer, pickType);
+
+    if (this->PickedId > -1)
+      {
+      double pos[3];
+      (*constItr)->GetPickPosition(pos);
+
+      if (this->Verbose)
+        {
+        cout << "PickedId Id: " << this->PickedId << "\n";
+        cout << "PickedId Position: (" << pos[0] << "," << pos[1] << ")\n";
+        }
+      this->PickPosition[0] = pos[0];
+      this->PickPosition[1] = pos[1];
+      this->PickPosition[2] = 0.0;
+
+      return pickType;
+      }
+
+    ++constItr;
+    }
+
+  // Try picking against the activity manager
+  if (this->ActivityManager)
+    {
+    this->ActivityIndex =
+      this->ActivityManager->Pick(selectionX, selectionY, renderer);
+
+    if (this->ActivityIndex > -1)
+      {
+      this->InvokeEvent(vtkCommand::PickEvent, NULL);
+
+      double pos[3];
+      this->ActivityManager->GetPickPosition(pos);
+      if (this->Verbose)
+        {
+        cout << "Activity Index: " << this->ActivityIndex << "\n";
+        cout << "Activity Position: (" << pos[0] << "," << pos[1] << ")\n";
+        }
+      this->PickPosition[0] = pos[0];
+      this->PickPosition[1] = pos[1];
+      this->PickPosition[2] = 0.0;
+      return vtkVgPickData::PickedActivity;
+      }
+    }
+
+  // If we are at this point there is no icon picked, try picking background image.
+  if (this->ImageActor)
+    {
+    this->Picker->InitializePickList();
+    this->Picker->AddPickList(this->ImageActor);
+    int pickStatus = this->Picker->Pick(selectionX, selectionY, selectionZ, renderer);
+    if (pickStatus)
+      {
+      this->Picker->GetPickPosition(this->PickPosition);
+      if (this->Verbose)
+        {
+        cout << "Picked Image\n";
+        cout << "Pick Position: (" << this->PickPosition[0] << ","
+             << this->PickPosition[1] << ")\n";
+        }
+      return vtkVgPickData::PickedImage;
+      }
+    }
+
+  if (this->Actor)
+    {
+    this->Picker->InitializePickList();
+    this->Picker->AddPickList(this->Actor);
+    int pickStatus = this->Picker->Pick(selectionX, selectionY, selectionZ, renderer);
+    if (pickStatus)
+      {
+      this->Picker->GetPickPosition(this->PickPosition);
+      if (this->Verbose)
+        {
+        cout << "Picked Actor\n";
+        cout << "Pick Position: (" << this->PickPosition[0] << ","
+             << this->PickPosition[1] << ")\n";
+        }
+      return vtkVgPickData::PickedActor;
+      }
+    }
+
+  // Complete the picking process.
+  this->InvokeEvent(vtkCommand::EndPickEvent, NULL);
+
+  return vtkVgPickData::EmptyPick;
+}
+
+
+//-----------------------------------------------------------------------------
+void vtkVgPicker::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgModelView/vtkVgPicker.h b/Libraries/VtkVgModelView/vtkVgPicker.h
new file mode 100644
index 00000000..d2051e4a
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgPicker.h
@@ -0,0 +1,146 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// .NAME vtkVgPicker - picker for visGUI application
+// .SECTION Description
+// This class takes advantage of the visgui data structures in order to pick
+// icons, tracks, events and the locations on the image. Basically it
+// interfaces with the VG Manager classes to perform the pick. It returns
+// information particular to the visgui application.
+//
+// vtkPicker fires events during the picking process.  These events are
+// StartPickEvent, PickEvent, and EndPickEvent which are invoked prior to
+// picking, when something is picked, and after all picking candidates have
+// been tested. Note that during the pick process the PickEvent of vtkProp
+// (and its subclasses such as vtkActor) is fired prior to the PickEvent of
+// vtkPicker.
+
+#ifndef __vtkVgPicker_h
+#define __vtkVgPicker_h
+
+#include "vtkAbstractPicker.h"
+#include "vtkSmartPointer.h"
+
+// C++ includes
+#include <vector>
+
+#include <vgExport.h>
+
+class vtkRenderer;
+class vtkVgCellPicker;
+class vtkVgIconManager;
+class vtkVgTrackRepresentationBase;
+class vtkVgEventRepresentationBase;
+class vtkVgRepresentationBase;
+class vtkVgActivityManager;
+
+class vtkActor;
+class vtkImageActor;
+
+//-----------------------------------------------------------------------------
+class VTKVG_MODELVIEW_EXPORT vtkVgPicker : public vtkAbstractPicker
+{
+public:
+  // Description:
+  // Standard VTK functions.
+  static vtkVgPicker* New();
+  vtkTypeMacro(vtkVgPicker, vtkAbstractPicker);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Perform pick operation with selection point provided. Normally the first
+  // two values for the selection point are x-y pixel coordinate, and the
+  // third value is =0. Return non-zero if something was successfully
+  // picked. Note that return value==PickedIcon means an icon was picked. If
+  // return value==PickedTrack then a track was picked. If return
+  // value==PickedImage then the background image was picked. If return
+  // value==PickedEvent then an event was picked. If return
+  // value==PickedActivity then an activity was picked.
+  virtual int
+  Pick(double selectionX, double selectionY, double selectionZ, vtkRenderer* renderer);
+
+  // Description:
+  // Specify the icon manager to pick.
+  void SetIconManager(vtkVgIconManager* im);
+  vtkGetObjectMacro(IconManager, vtkVgIconManager);
+
+  // Description:
+  // Add representation to pick.
+  void AddRepresentation(vtkVgRepresentationBase* representation);
+
+  // Description:
+  // Specify the activity manager to pick.
+  void SetActivityManager(vtkVgActivityManager* tm);
+  vtkGetObjectMacro(ActivityManager, vtkVgActivityManager);
+
+  // Description:
+  // Specify the image actor corresponding to the display.
+  void SetImageActor(vtkImageActor* ia);
+  vtkGetObjectMacro(ImageActor, vtkImageActor);
+
+  // Description:
+  // Specify the actor to pick.
+  void SetActor(vtkActor* actor);
+  vtkGetObjectMacro(Actor, vtkActor);
+
+  // Description:
+  // After a successful icon pick (i.e., Pick() returns PickedIcon), retrieve
+  // the icon id of the picked icon. This can be used to retrieve other
+  // information related to the icon.
+  vtkGetMacro(IconId, vtkIdType);
+
+  // Description:
+  // After a successful pick (i.e., Pick() returns PickedTrack),
+  // retrieve the id of the picked entity.
+  vtkGetMacro(PickedId, vtkIdType);
+
+
+  // Description:
+  // After a successful track pick (i.e., Pick() returns PickedActivity),
+  // retrieve the activity id of the picked activity. This can be used to
+  // retrieve other information related to the activity.
+  vtkGetMacro(ActivityIndex, vtkIdType);
+
+  // Description:
+  // Set/Get verbosity to on or off. If on information
+  // regarding picked entity will be spit out using
+  // standard output stream.
+  vtkSetMacro(Verbose, int);
+  vtkGetMacro(Verbose, int)
+  vtkBooleanMacro(Verbose, int);
+
+protected:
+  vtkVgPicker();
+  ~vtkVgPicker();
+
+  int                       Verbose;
+
+  vtkIdType                 PickedId;
+
+  vtkVgIconManager*          IconManager;
+  vtkIdType                 IconId;
+
+  vtkVgActivityManager*      ActivityManager;
+  vtkIdType                 ActivityIndex;
+
+  vtkImageActor*             ImageActor;
+
+  vtkActor*                  Actor;
+
+  std::vector<vtkSmartPointer<vtkVgRepresentationBase> >
+  Representations;
+
+
+private:
+  vtkVgPicker(const vtkVgPicker&);  // Not implemented.
+  void operator=(const vtkVgPicker&);  // Not implemented.
+
+  // Internal cell picker for fallback
+  vtkSmartPointer<vtkVgCellPicker> Picker;
+
+};
+
+#endif
diff --git a/Libraries/VtkVgModelView/vtkVgRepresentationBase.cxx b/Libraries/VtkVgModelView/vtkVgRepresentationBase.cxx
new file mode 100644
index 00000000..d31f9494
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgRepresentationBase.cxx
@@ -0,0 +1,250 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgRepresentationBase.h"
+
+// VTK includes.
+#include <vtkCommand.h>
+#include <vtkCellArray.h>
+#include <vtkInformation.h>
+#include <vtkInformationDoubleKey.h>
+#include <vtkLookupTable.h>
+#include <vtkMatrix4x4.h>
+#include <vtkPolyDataCollection.h>
+#include <vtkTransform.h>
+
+vtkInformationKeyMacro(vtkVgRepresentationBase, Z_OFFSET, Double);
+
+//-----------------------------------------------------------------------------
+vtkVgRepresentationBase::vtkVgRepresentationBase() : vtkObject(),
+  UseAutoUpdate(true),
+  LayerIndex(0),
+  UpdateRequest(1),
+  UseModelMatrix(true),
+  ColorMultiplier(1.0),
+  HasOverrideColor(false),
+  DisplayMask(0)
+{
+  this->RepresentationMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->RepresentationMatrix->Identity();
+
+  this->OffsetRepresentationMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->OffsetRepresentationMatrix->Identity();
+
+  this->RenderMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->RenderMatrix->Identity();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgRepresentationBase::~vtkVgRepresentationBase()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRepresentationBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRepresentationBase::SetRepresentationMatrix(vtkMatrix4x4* matrix)
+{
+  if (!matrix || (this->RepresentationMatrix == matrix))
+    {
+    return;
+    }
+
+  this->RepresentationMatrix->DeepCopy(matrix);
+
+  // Reset offset as offset is offset wrt representation matrix.
+//  this->OffsetRepresentationMatrix->Identity();
+//  this->ApplyOffset(this->OffsetRepresentationMatrix);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRepresentationBase::SetLookupTable(vtkLookupTable* lookupTable)
+{
+  if (!lookupTable || this->LookupTable == lookupTable)
+    {
+    return;
+    }
+
+  this->LookupTable = lookupTable;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkLookupTable* vtkVgRepresentationBase::GetLookupTable()
+{
+  return this->LookupTable;
+}
+
+//-----------------------------------------------------------------------------
+const vtkLookupTable* vtkVgRepresentationBase::GetLookupTable() const
+{
+  return this->LookupTable;
+}
+
+//-----------------------------------------------------------------------------
+vtkMatrix4x4* vtkVgRepresentationBase::GetRepresentationMatrix()
+{
+  return this->RepresentationMatrix;
+}
+
+//-----------------------------------------------------------------------------
+const vtkMatrix4x4* vtkVgRepresentationBase::GetRepresentationMatrix() const
+{
+  return this->RepresentationMatrix;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRepresentationBase::ApplyOffset(const vtkMatrix4x4* matrix,
+                                          bool pre/*=true*/)
+{
+  if (!matrix)
+    {
+    return;
+    }
+
+  switch (static_cast<int>(pre))
+    {
+    case 0:
+      {
+      vtkMatrix4x4::Multiply4x4(const_cast<vtkMatrix4x4*>(matrix), this->RepresentationMatrix,
+                                this->OffsetRepresentationMatrix);
+      break;
+      }
+    case 1:
+      {
+      vtkMatrix4x4::Multiply4x4(this->RepresentationMatrix, const_cast<vtkMatrix4x4*>(matrix),
+                                this->OffsetRepresentationMatrix);
+      break;
+      }
+    }
+
+  // Update needs to be called on this now.
+  this->UpdateRequestOn();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRepresentationBase::SetZOffset(vtkProp* prop, double offset)
+{
+  if (vtkVgRepresentationBase::GetZOffset(prop) == offset)
+    {
+    return;
+    }
+
+  // Get in if test above creates information object if it doesn't exist
+  prop->GetPropertyKeys()->Set(Z_OFFSET(), offset);
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgRepresentationBase::GetZOffset(vtkProp* prop)
+{
+  vtkInformation* keys = prop->GetPropertyKeys();
+  if (!keys)
+    {
+    keys = vtkInformation::New();
+    prop->SetPropertyKeys(keys);
+    keys->FastDelete();
+    }
+
+  if (!keys->Has(vtkVgRepresentationBase::Z_OFFSET()))
+    {
+    keys->Set(vtkVgRepresentationBase::Z_OFFSET(), 0.0);
+    }
+
+  return keys->Get(vtkVgRepresentationBase::Z_OFFSET());
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgRepresentationBase::HasZOffset(vtkProp* prop)
+{
+  vtkInformation* keys = prop->GetPropertyKeys();
+  return keys && keys->Has(vtkVgRepresentationBase::Z_OFFSET());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRepresentationBase::
+SetupActorTransform(vtkPolyDataCollection* polyDataCollection,
+                    vtkMatrix4x4* originalMatrix,
+                    vtkTransform* actorTransform)
+{
+  // Setup the transform.  Test the RepresentationMatrix against
+  // any point in our result (if any), to determine whether or not to
+  // multiply through by -1 to handle OpenGL issue with -1 homogeneous
+  // coordinate
+  vtkMatrix4x4* representationMatrix = originalMatrix;
+  vtkSmartPointer<vtkMatrix4x4> correctedMatrix; // if necessary
+  if (originalMatrix)
+    {
+    vtkIdType npts, *pts, thePtId = -1;
+    vtkPolyData* polyData;
+    polyDataCollection->InitTraversal();
+    for (; thePtId == -1 && (polyData = polyDataCollection->GetNextItem());)
+      {
+      if (polyData->GetLines()->GetNumberOfCells())
+        {
+        polyData->GetLines()->GetCell(0, npts, pts);
+        thePtId = pts[0];
+        }
+      else if (polyData->GetVerts()->GetNumberOfCells())
+        {
+        polyData->GetVerts()->GetCell(0, npts, pts);
+        thePtId = pts[0];
+        }
+      }
+    if (thePtId != -1)   // we do have data for this rep
+      {
+      double theTestPoint[4] = {0, 0, 0, 1};
+      // if thePtId != -1 (which is the case), then polyData is valid
+      polyData->GetPoints()->GetPoint(thePtId, theTestPoint);
+      // Check the homogeneous component of the result to see if <0
+      if (originalMatrix->MultiplyDoublePoint(theTestPoint)[3] < 0)
+        {
+        // Multiply by -1 throughout to give homogeneous component> 0;
+        // Note, this is guaranteed for this point only, but will usually
+        // work for all points
+        correctedMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+        correctedMatrix->DeepCopy(originalMatrix);
+        for (int i = 0; i < 4; i++)
+          {
+          for (int j = 0; j < 4; j++)
+            {
+            correctedMatrix->Element[i][j] *= -1;
+            }
+          }
+        representationMatrix = correctedMatrix;
+        }
+      }
+    }
+
+  actorTransform->PostMultiply();  // just to be sure
+  actorTransform->SetMatrix(representationMatrix);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRepresentationBase::SetOverrideColor(const double color[3])
+{
+  if (!color && this->HasOverrideColor)
+    {
+    this->HasOverrideColor = false;
+    this->Modified();
+    return;
+    }
+
+  if (color && (!this->HasOverrideColor ||
+                this->OverrideColor[0] != color[0] ||
+                this->OverrideColor[1] != color[1] ||
+                this->OverrideColor[2] != color[2]))
+    {
+    this->HasOverrideColor = true;
+    this->OverrideColor[0] = color[0];
+    this->OverrideColor[1] = color[1];
+    this->OverrideColor[2] = color[2];
+    this->Modified();
+    }
+}
diff --git a/Libraries/VtkVgModelView/vtkVgRepresentationBase.h b/Libraries/VtkVgModelView/vtkVgRepresentationBase.h
new file mode 100644
index 00000000..52ddc94f
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgRepresentationBase.h
@@ -0,0 +1,212 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgRepresentationBase_h
+#define __vtkVgRepresentationBase_h
+
+// VTK includes.
+#include <vtkObject.h>
+#include <vtkPropCollection.h>
+#include <vtkSmartPointer.h>
+
+// VG includes.
+#include "vtkVgMacros.h"
+
+// C++ includes
+#include <limits>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkInformationDoubleKey;
+class vtkLookupTable;
+class vtkMatrix4x4;
+class vtkPolyDataCollection;
+class vtkRenderer;
+class vtkTransform;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgRepresentationBase : public vtkObject
+{
+public:
+  vtkVgClassMacro(vtkVgRepresentationBase);
+
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgRepresentationBase, vtkObject);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // This Key is for indicating a Z offset on the prop to be added to any offset
+  // the representation controls (see subclasses)
+  static vtkInformationDoubleKey* Z_OFFSET();
+  static void SetZOffset(vtkProp* prop, double offset);
+  static double GetZOffset(vtkProp* prop);
+  static bool HasZOffset(vtkProp* prop);
+
+  // Description:
+  vtkSetMacro(LayerIndex, int);
+  vtkGetMacro(LayerIndex, int);
+
+  // Description:
+  // UpdateRequest = 1 indicates that state has changed and
+  // requires rendering. This should be set to 0 once
+  // render call is invoked.
+  vtkSetMacro(UpdateRequest, int);
+  vtkGetMacro(UpdateRequest, int);
+  vtkBooleanMacro(UpdateRequest, int);
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects()     const =  0;
+  virtual const vtkPropCollection* GetActiveRenderObjects()  const =  0;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const =  0;
+
+  virtual vtkPropCollection* GetNewRenderObjects()     =  0;
+  virtual vtkPropCollection* GetActiveRenderObjects()  =  0;
+  virtual vtkPropCollection* GetExpiredRenderObjects() =  0;
+
+  virtual void ResetTemporaryRenderObjects() = 0;
+
+  // Description:
+  // Set the matrix for represenation.
+  void SetRepresentationMatrix(vtkMatrix4x4* matrix);
+  vtkMatrix4x4* GetRepresentationMatrix();
+  const vtkMatrix4x4* GetRepresentationMatrix() const;
+
+  // Description:
+  // Set look table for scalars to colors conversion
+  void SetLookupTable(vtkLookupTable* lookupTable);
+  vtkLookupTable* GetLookupTable();
+  const vtkLookupTable* GetLookupTable() const;
+
+  // Description:
+  // Set/Get visible flag. This makes the representation not to show
+  // in any given render frame if flag is set to 0.
+  virtual void SetVisible(int flag) = 0;
+  virtual int  GetVisible() const   = 0;
+
+  // Description:
+  // This is the matrix that could be used to offset the representation
+  // from its true location / position. This could be useful for some
+  // layout algorithms / scene graphs.
+  void ApplyOffset(const vtkMatrix4x4* matrix, bool pre = true);
+
+  // \NOTE: One thing I am not so sure if this update does not require
+  // timestamp. May be it does.
+  virtual void Update() = 0;
+
+  // Handle the case where an error in a model causes no frame data
+  // for the representation.
+  virtual void HandleModelError() {;}
+
+  // Handle animation start event
+  virtual void HandleStartAnimationCueEvent() {;}
+
+  // Handle animation tick event
+  virtual void HandleAnimationCueTickEvent() {;}
+
+  // Handle animation end event
+  virtual void HandleEndAnimationCueEvent() {;}
+
+  // Description:
+  vtkSetMacro(UseAutoUpdate, bool);
+  vtkGetMacro(UseAutoUpdate, bool);
+  vtkBooleanMacro(UseAutoUpdate, bool);
+
+  // Description:
+  // Set/Get if should use model matrix for render matrix
+  // calculation.
+  vtkSetMacro(UseModelMatrix, bool);
+  vtkGetMacro(UseModelMatrix, bool);
+  vtkBooleanMacro(UseModelMatrix, bool);
+
+  virtual unsigned long GetUpdateTime()
+    {
+    return this->UpdateTime.GetMTime();
+    }
+
+  virtual unsigned long GetUpdateRenderObjectsTime()
+    {
+    return this->UpdateRenderObjectsTime.GetMTime();
+    }
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked trackId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the track is currently visible or not.
+  virtual vtkIdType Pick(
+    double vtkNotUsed(renX), double vtkNotUsed(renY),
+    vtkRenderer* vtkNotUsed(ren), vtkIdType& vtkNotUsed(pickType))
+    {
+    return -1;
+    }
+
+  // Description:
+  // After a successful pick occurs, return the position of the pick (in
+  // world coordinates).
+  virtual void GetPickPosition(double pos[3])
+    {
+    pos[0] = VTK_DOUBLE_MIN;
+    pos[1] = VTK_DOUBLE_MIN;
+    pos[2] = VTK_DOUBLE_MIN;
+    }
+
+  // Description:
+  // Color value modifier.
+  vtkSetClampMacro(ColorMultiplier, double, 0.0, 1.0);
+  vtkGetMacro(ColorMultiplier, double);
+
+  // Description:
+  // Force the representation to display all objects in a single color
+  void SetOverrideColor(const double color[3]);
+
+  // Description:
+  // Set the display mask that this representation will use.
+  vtkSetMacro(DisplayMask, unsigned);
+  vtkGetMacro(DisplayMask, unsigned);
+
+protected:
+  vtkVgRepresentationBase();
+  virtual  ~vtkVgRepresentationBase();
+
+  void SetupActorTransform(
+    vtkPolyDataCollection* polyDataCollection,
+    vtkMatrix4x4* originalMatrix, vtkTransform* actorTransform);
+
+  vtkSmartPointer<vtkMatrix4x4> RepresentationMatrix;
+  vtkSmartPointer<vtkMatrix4x4> OffsetRepresentationMatrix;
+  vtkSmartPointer<vtkMatrix4x4> RenderMatrix;
+
+  bool                          UseAutoUpdate;
+
+  int                           LayerIndex;
+
+  int                           UpdateRequest;
+
+  bool                          UseModelMatrix;
+
+  vtkTimeStamp                  UpdateTime;
+
+  // \NOTE: Not useed right now.
+  vtkTimeStamp                  UpdateRenderObjectsTime;
+
+  vtkSmartPointer<vtkLookupTable> LookupTable;
+
+  double ColorMultiplier;
+
+  bool HasOverrideColor;
+  double OverrideColor[3];
+
+  unsigned DisplayMask;
+
+private:
+  vtkVgRepresentationBase(const vtkVgRepresentationBase&); // Not implemented.
+  void operator= (const vtkVgRepresentationBase&);        // Not implemented.
+};
+
+
+#endif // __vtkVgRepresentationBase_h
diff --git a/Libraries/VtkVgModelView/vtkVgTimeStampBase.h b/Libraries/VtkVgModelView/vtkVgTimeStampBase.h
new file mode 100644
index 00000000..cab084db
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTimeStampBase.h
@@ -0,0 +1,131 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTimeStampBase_h
+#define __vtkVgTimeStampBase_h
+
+// \brief Represents a world time in microseconds (10^-6 seconds).
+//
+// A timestamp contains two pieces of information: a time and a frame
+// number.  Generally, one should use the time value over the frame
+// number if both are available.
+
+// VTK includes.
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+
+// VG includes.
+#include "vtkVgMacros.h"
+
+class vtkVgTimeStampBase : public vtkObject
+{
+public:
+  // Description:
+  // Easy to use vars.
+  vtkVgClassMacro(vtkVgTimeStampBase);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgTimeStampBase, vtkObject);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent)
+    {
+    this->Superclass::PrintSelf(os, indent);
+    }
+
+  void Copy(const vtkVgTimeStampBase& srcTimeStamp)
+    {
+    this->SetFrameNumber(srcTimeStamp.GetFrameNumber());
+    this->SetTime(srcTimeStamp.GetTime());
+    }
+
+  // Description:
+  // Returns true if this contains time, otherwise false.
+  virtual bool HasTime() const = 0;
+
+  // Description:
+  // Set/Get the time.
+  virtual void   SetTime(double time) = 0;
+  virtual double GetTime() const      = 0;
+
+  // Description:
+  // Return true if frame number is found, otherwise false.
+  virtual bool   HasFrameNumber()  const = 0;
+
+  // Description:
+  // Set/Get frame number.
+  virtual void   SetFrameNumber(int number) = 0;
+  virtual int    GetFrameNumber() const     = 0;
+
+  // Description:
+  // Return the time or frame number, depending on availability.
+  // If a time value is available, this will be a time value in seconds.  If
+  // not, it will be the frame number.
+  virtual double GetTimeInSecs() const = 0;
+
+  // Description:
+  // \brief Return the time or frame number difference, depending on
+  // availability.
+  //
+  // The return value is conceptually <tt>*this - \a other</tt>
+  // expressed in seconds or in frames.
+  //
+  // If a time value is available in both numbers, the result is the
+  // difference expressed in seconds.  Otherwise, if the frame number
+  // if available in both, the result is the difference in frame
+  // numbers.  Finally, if neither of these hold, the result is
+  // undefined.
+  virtual double GetTimeDifferenceInSecs(vtkVgTimeStampBase* other) const = 0;
+
+  // Description:
+  // \brief Ordering on timestamps.
+  //
+  // If the timestamps have time values, the order is based on time.
+  // Otherwise, if neither have time values, but have frame numbers,
+  // the order is based on frame number.  Otherwise, the comparison
+  // will always return \c false.
+  //
+  // Note that this means if one has a time value but the other does
+  // not, the result will be \c false.
+  virtual bool operator<(const vtkVgTimeStampBase& other) const = 0;
+
+  // Description:
+  // \brief Equality of timestamps.
+  //
+  // If the timestamps have time values, the comparison is based on
+  // time.  If neither have time values, but both have frame numbers,
+  // the comparison is based on frame number.  In all other cases,
+  // the result is \c false.
+  virtual bool operator==(const vtkVgTimeStampBase& other) const = 0;
+
+  // Description:
+  // \brief Combined ordering and equality operator
+  //
+  // Logically identical to (*this < other) || (*this == other)
+  virtual bool operator<=(const vtkVgTimeStampBase& other) const = 0;
+
+  // Description:
+  // \brief Shift the timestamps.
+  //
+  // Shift the timestamp forward
+  virtual void   ShiftForward(const vtkVgTimeStampBase& other) = 0;
+
+  // Description:
+  // Shift the timestamp backward
+  virtual void   ShiftBackward(const vtkVgTimeStampBase& other) = 0;
+
+protected:
+  vtkVgTimeStampBase() {;}
+  virtual ~vtkVgTimeStampBase() {;}
+
+
+private:
+
+  vtkVgTimeStampBase(const vtkVgTimeStampBase&);  // Not implemented.
+  void operator=(const vtkVgTimeStampBase&);      // Not implemented.
+};
+
+#endif // __vtkVgTimeStampBase_h
diff --git a/Libraries/VtkVgModelView/vtkVgTrackFilter.cxx b/Libraries/VtkVgModelView/vtkVgTrackFilter.cxx
new file mode 100644
index 00000000..79251f4c
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackFilter.cxx
@@ -0,0 +1,165 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrackFilter.h"
+
+#include "vtkVgTrack.h"
+
+#include <vtkObjectFactory.h>
+
+vtkStandardNewMacro(vtkVgTrackFilter);
+
+//-----------------------------------------------------------------------------
+vtkVgTrackFilter::vtkVgTrackFilter()
+{
+  this->FilterShow[0] = this->FilterShow[1] = this->FilterShow[2] = false;
+  this->FilterMinProbability[0] = 1.0;
+  this->FilterMinProbability[1] = 1.0;
+  this->FilterMinProbability[2] = 1.0;
+  this->FilterMaxProbability[0] = 0.0;
+  this->FilterMaxProbability[1] = 0.0;
+  this->FilterMaxProbability[2] = 0.0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackFilter::~vtkVgTrackFilter()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackFilter::SetShowType(int trackType, bool state)
+{
+  if (trackType < vtkVgTrack::Person || trackType > vtkVgTrack::Other)
+    {
+    vtkErrorMacro("Invalid track type: " << trackType);
+    return;
+    }
+
+  if (this->FilterShow[trackType] == state)
+    {
+    return;
+    }
+
+  this->FilterShow[trackType] = state;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTrackFilter::GetShowType(int trackType)
+{
+  if (trackType < vtkVgTrack::Person || trackType > vtkVgTrack::Other)
+    {
+    vtkErrorMacro("Invalid track type: " << trackType);
+    return false;
+    }
+  return this->FilterShow[trackType];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackFilter::SetMinProbability(int trackType, double threshold)
+{
+  if (trackType < vtkVgTrack::Person || trackType > vtkVgTrack::Other)
+    {
+    vtkErrorMacro("Invalid track type: " << trackType);
+    return;
+    }
+
+  if (this->FilterMinProbability[trackType] == threshold)
+    {
+    return;
+    }
+
+  this->FilterMinProbability[trackType] = threshold;
+  this->Modified();
+}
+
+
+//-----------------------------------------------------------------------------
+double vtkVgTrackFilter::GetMinProbability(int trackType)
+{
+  if (trackType < vtkVgTrack::Person || trackType > vtkVgTrack::Other)
+    {
+    vtkErrorMacro("Invalid track type: " << trackType);
+    return 1.0;
+    }
+  return this->FilterMinProbability[trackType];
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackFilter::SetMaxProbability(int trackType, double threshold)
+{
+  if (trackType < vtkVgTrack::Person || trackType > vtkVgTrack::Other)
+    {
+    vtkErrorMacro("Invalid track type: " << trackType);
+    return;
+    }
+
+  if (this->FilterMaxProbability[trackType] == threshold)
+    {
+    return;
+    }
+
+  this->FilterMaxProbability[trackType] = threshold;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgTrackFilter::GetMaxProbability(int trackType)
+{
+  if (trackType < vtkVgTrack::Person || trackType > vtkVgTrack::Other)
+    {
+    vtkErrorMacro("Invalid track type: " << trackType);
+    return 1.0;
+    }
+  return this->FilterMaxProbability[trackType];
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgTrackFilter::GetBestClassifier(vtkVgTrack* track)
+{
+  int bestType = -1;
+  double bestScore = -1.0;
+
+  double pvo[3];
+  track->GetPVO(pvo);
+
+  // if unclassified, doesn't matter what he filter setting are
+  if (pvo[0] == 0 && pvo[1] == 0 && pvo[2] == 0)
+    {
+    return vtkVgTrack::Unclassified;
+    }
+
+  int filterType;
+  for (filterType = vtkVgTrack::Person; filterType <= vtkVgTrack::Other; filterType++)
+    {
+    if (!this->FilterShow[filterType])
+      {
+      continue;
+      }
+    if (pvo[filterType] < this->FilterMinProbability[filterType])
+      {
+      continue;
+      }
+    double maxProbability = this->FilterMaxProbability[filterType];
+    if (pvo[filterType] > maxProbability)
+      {
+      continue;
+      }
+    if (pvo[filterType] > bestScore)
+      {
+      bestScore = pvo[filterType];
+      bestType = filterType;
+      }
+    }
+
+  return bestType;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackFilter::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgModelView/vtkVgTrackFilter.h b/Libraries/VtkVgModelView/vtkVgTrackFilter.h
new file mode 100644
index 00000000..6c553020
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackFilter.h
@@ -0,0 +1,57 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrackFilter_h
+#define __vtkVgTrackFilter_h
+
+#include "vtkObject.h"
+
+#include <vgExport.h>
+
+class vtkVgTrack;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgTrackFilter : public vtkObject
+{
+public:
+  vtkTypeMacro(vtkVgTrackFilter, vtkObject);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgTrackFilter* New();
+
+  // Description:
+  // Enable or disable filtering of all tracks of a certain type.
+  void SetShowType(int trackType, bool state);
+  bool GetShowType(int trackType);
+
+  // Description:
+  // Don't display tracks of this type with a probability below the threshold value.
+  void   SetMinProbability(int trackType, double threshold);
+  double GetMinProbability(int trackType);
+
+  // Description:
+  // Don't display tracks of this type with a probability above the threshold
+  // value. Set to -1.0 to disable the filter (default setting).
+  void   SetMaxProbability(int trackType, double threshold);
+  double GetMaxProbability(int trackType);
+
+  // Description:
+  // Get the highest scoring PVO classifier for a track given the current
+  // filter settings. Returns -1 if no classifiers pass the filter.
+  int GetBestClassifier(vtkVgTrack* track);
+
+private:
+  vtkVgTrackFilter(const vtkVgTrackFilter&); // Not implemented.
+  void operator=(const vtkVgTrackFilter&);   // Not implemented.
+
+  vtkVgTrackFilter();
+  ~vtkVgTrackFilter();
+
+  bool   FilterShow[3];
+  double FilterMinProbability[3];
+  double FilterMaxProbability[3];
+};
+
+#endif // __vtkVgTrackFilter_h
diff --git a/Libraries/VtkVgModelView/vtkVgTrackHeadRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgTrackHeadRepresentation.cxx
new file mode 100644
index 00000000..130b5e02
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackHeadRepresentation.cxx
@@ -0,0 +1,459 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrackHeadRepresentation.h"
+
+#include <vtkActor.h>
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkIdList.h>
+#include <vtkIdListCollection.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataCollection.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkTransform.h>
+
+#include <vtkVgCellPicker.h>
+#include <vtkVgColorUtil.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTriangulateConcavePolysFilter.h>
+
+#include "vtkVgPickData.h"
+#include "vtkVgTrackFilter.h"
+#include "vtkVgTrackModel.h"
+
+vtkStandardNewMacro(vtkVgTrackHeadRepresentation);
+
+//----------------------------------------------------------------------------
+class vtkVgTrackHeadRepresentation::vtkInternal
+{
+public:
+
+  vtkCellArray* HeadVerts;
+  vtkPolyData* HeadPolyData;
+  vtkCellArray* HeadLines;
+  vtkIdTypeArray* HeadTrackIds;
+
+  vtkPolyData* HeadFillPolyData;
+
+  vtkIdTypeArray* TemporaryTrackIds;
+  vtkUnsignedCharArray* TemporaryColors;
+
+  vtkInternal()
+    {
+    this->HeadPolyData = vtkPolyData::New();
+    this->HeadTrackIds = vtkIdTypeArray::New();
+    this->HeadTrackIds->SetName("Track Ids");
+    this->HeadPolyData->GetCellData()->AddArray(this->HeadTrackIds);
+    this->HeadTrackIds->FastDelete();
+    this->HeadLines = vtkCellArray::New();
+    this->HeadPolyData->SetLines(this->HeadLines);
+    this->HeadLines->FastDelete();
+    this->HeadVerts = vtkCellArray::New();
+    this->HeadPolyData->SetVerts(this->HeadVerts);
+    this->HeadVerts->FastDelete();
+
+    this->HeadFillPolyData = vtkPolyData::New();
+
+    vtkUnsignedCharArray* scalars = vtkUnsignedCharArray::New();
+    scalars->SetNumberOfComponents(3);
+    scalars->SetName("Track Color");
+    this->HeadPolyData->GetCellData()->SetScalars(scalars);
+    scalars->FastDelete();
+
+    this->TemporaryTrackIds = vtkIdTypeArray::New();
+    this->TemporaryColors = vtkUnsignedCharArray::New();
+    this->TemporaryColors->SetNumberOfComponents(3);
+    }
+
+  ~vtkInternal()
+    {
+    this->TemporaryTrackIds->Delete();
+    this->TemporaryColors->Delete();
+    this->HeadPolyData->Delete();
+    this->HeadFillPolyData->Delete();
+    }
+};
+
+//-----------------------------------------------------------------------------
+vtkVgTrackHeadRepresentation::vtkVgTrackHeadRepresentation()
+{
+  this->Internal = new vtkInternal();
+
+  vtkPolyDataMapper* mapper = vtkPolyDataMapper::New();
+  mapper->SetInputData(this->Internal->HeadPolyData);
+  this->HeadActor = vtkActor::New();
+  this->HeadActor->SetMapper(mapper);
+  mapper->FastDelete();
+  this->Visible = 1;
+
+  this->ActorTransform = vtkTransform::New();
+  this->HeadActor->SetUserTransform(this->ActorTransform);
+  this->ActorTransform->FastDelete();
+
+  this->HeadActor->GetProperty()->SetColor(1, 1, 0);
+  this->HeadActor->GetProperty()->SetLineWidth(1);
+  this->HeadActor->GetProperty()->SetPointSize(6);
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+
+  this->NewPropCollection->AddItem(this->HeadActor);
+  this->ActivePropCollection->AddItem(this->HeadActor);
+
+  this->DisplayAllHeads = false;
+  this->ShowFill = false;
+  this->ZOffset = 0;
+
+  // "Fill" actor
+  this->FillOpacity = 0.2;
+  vtkPolyDataMapper* fillMapper = vtkPolyDataMapper::New();
+  fillMapper->SetInputData(this->Internal->HeadFillPolyData);
+  this->HeadFillActor = vtkActor::New();
+  this->HeadFillActor->SetMapper(fillMapper);
+  fillMapper->FastDelete();
+  this->HeadFillActor->GetProperty()->SetColor(1, 1, 0);
+  this->HeadFillActor->GetProperty()->SetOpacity(this->FillOpacity);
+  this->HeadFillActor->SetUserTransform(this->ActorTransform);
+  this->NewPropCollection->AddItem(this->HeadFillActor);
+  this->ActivePropCollection->AddItem(this->HeadFillActor);
+  this->HeadFillActor->VisibilityOff();
+
+  // Support picking
+  this->Picker = vtkSmartPointer<vtkVgCellPicker>::New();
+  this->Picker->PickFromListOn();
+  this->Picker->SetTolerance(0.001);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackHeadRepresentation::~vtkVgTrackHeadRepresentation()
+{
+  this->HeadActor->Delete();
+  this->HeadFillActor->Delete();
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackHeadRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackHeadRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackHeadRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackHeadRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackHeadRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackHeadRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackHeadRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackHeadRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+
+  this->Visible = flag;
+  this->HeadActor->SetVisibility(
+    flag && this->Internal->HeadPolyData->GetNumberOfCells());
+  this->HeadFillActor->SetVisibility(this->ShowFill &&
+    flag && this->Internal->HeadFillPolyData->GetNumberOfCells());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackHeadRepresentation::SetShowFill(bool showFill)
+{
+  if (showFill == this->ShowFill)
+    {
+    return;
+    }
+
+  this->ShowFill = showFill;
+  // for now, we only hide a previously visible actor; we don't compute the
+  // fill for a previously non-visible actor (dependent on the application to
+  // update).
+  if (!showFill)
+    {
+    this->HeadFillActor->VisibilityOff();
+    }
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackHeadRepresentation::SetFillOpacity(double opacity)
+{
+  if (opacity == this->FillOpacity)
+    {
+    return;
+    }
+
+  this->FillOpacity = opacity;
+  this->HeadFillActor->GetProperty()->SetOpacity(this->FillOpacity);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackHeadRepresentation::Update()
+{
+  if (!this->GetVisible())
+    {
+    return;
+    }
+
+  this->Internal->HeadVerts->Reset();
+  this->Internal->HeadLines->Reset();
+
+  this->Internal->HeadTrackIds->Reset();
+  this->Internal->TemporaryTrackIds->Reset();
+  this->Internal->TemporaryColors->Reset();
+
+  this->Internal->HeadPolyData->GetCellData()->GetScalars()->Reset();
+
+  vtkSmartPointer<vtkCellArray> fillPolys;
+  vtkSmartPointer<vtkUnsignedCharArray> fillColors;
+  if (this->ShowFill)
+    {
+    // setup objects for fill
+    fillPolys = vtkSmartPointer<vtkCellArray>::New();
+    fillColors = vtkSmartPointer<vtkUnsignedCharArray>::New();
+    fillColors->SetNumberOfComponents(3);
+    fillColors->SetName("Track Fill Color");
+    }
+
+  // not the best place for the allocate, but it doesn't do anything after the
+  // 1st allocation.  Just an estimate, as we don't know how many pieces tracks
+  // will be broken up into
+  vtkIdType numTracks = this->TrackModel->GetNumberOfTracks();
+  this->Internal->HeadTrackIds->Allocate(2 * numTracks);
+  this->Internal->TemporaryTrackIds->Allocate(numTracks);
+  this->Internal->TemporaryColors->Allocate(3 * numTracks);
+
+  this->Internal->HeadPolyData->SetPoints(this->TrackModel->GetPoints());
+
+  vtkVgTimeStamp currFrame = this->TrackModel->GetCurrentTimeStamp();
+
+  vtkUnsignedCharArray* colors =
+    vtkUnsignedCharArray::SafeDownCast(
+      this->Internal->HeadPolyData->GetCellData()->GetScalars());
+
+  vtkVgTrackInfo trackInfo;
+  this->TrackModel->InitTrackTraversal();
+  while ((trackInfo = this->TrackModel->GetNextTrack()).GetTrack())
+    {
+    vtkVgTrack* track = trackInfo.GetTrack();
+    if (track == this->ExcludedTrack)
+      {
+      continue;
+      }
+    unsigned int mask = this->GetDisplayMask();
+    if ((mask & track->GetDisplayFlags()) != mask)
+      {
+      continue;
+      }
+    if (!(trackInfo.GetDisplayTrack() || this->DisplayAllHeads) ||
+        !(trackInfo.GetPassesFilters() && trackInfo.GetHeadVisible()))
+      {
+      continue;
+      }
+    if (this->TrackFilter &&
+        this->TrackFilter->GetBestClassifier(track) < 0)
+      {
+      continue;
+      }
+
+    const double* color = this->GetTrackColor(trackInfo);
+    unsigned char rgb[3];
+    vtkVgColorUtil::convertMultiplied(color, this->ColorMultiplier, rgb);
+
+    vtkIdType npts, *pts, trackPointId;
+    track->GetHeadIdentifier(currFrame, npts, pts, trackPointId);
+    if (npts == 1 || (npts == 0 && trackPointId > -1))
+      {
+      if (npts == 1)
+        {
+        this->Internal->HeadVerts->InsertNextCell(1, pts);
+        }
+      else
+        {
+        this->Internal->HeadVerts->InsertNextCell(1, &trackPointId);
+        }
+      this->Internal->HeadTrackIds->InsertNextValue(track->GetId());
+      colors->InsertNextTupleValue(rgb);
+      }
+    else if (npts > 1)
+      {
+      this->Internal->HeadLines->InsertNextCell(npts, pts);
+      this->Internal->TemporaryTrackIds->InsertNextValue(track->GetId());
+      this->Internal->TemporaryColors->InsertNextTupleValue(rgb);
+      if (this->ShowFill)
+        {
+        fillPolys->InsertNextCell(npts, pts);
+        fillColors->InsertNextTupleValue(rgb);
+        }
+      }
+    }
+
+  if (this->Internal->TemporaryTrackIds->GetNumberOfTuples())
+    {
+    vtkIdType* writePointer = this->Internal->HeadTrackIds->WritePointer(
+      this->Internal->HeadTrackIds->GetNumberOfTuples(),
+      this->Internal->TemporaryTrackIds->GetNumberOfTuples());
+
+    memcpy(writePointer, this->Internal->TemporaryTrackIds->GetPointer(0),
+           this->Internal->TemporaryTrackIds->GetNumberOfTuples() * sizeof(vtkIdType));
+
+    unsigned char* colorsWritePointer = colors->WritePointer(
+      colors->GetNumberOfTuples() * 3,
+      this->Internal->TemporaryColors->GetNumberOfTuples() * 3);
+
+    memcpy(colorsWritePointer, this->Internal->TemporaryColors->GetPointer(0),
+           this->Internal->TemporaryColors->GetNumberOfTuples() * 3);
+    }
+
+
+  if (this->ShowFill && fillPolys->GetNumberOfCells())
+    {
+    vtkPolyData *fillPolyData = vtkPolyData::New();
+    fillPolyData->SetPoints(this->TrackModel->GetPoints());
+    fillPolyData->SetPolys(fillPolys);
+    fillPolyData->GetCellData()->SetScalars(fillColors);
+    vtkVgTriangulateConcavePolysFilter* concavePolys =
+      vtkVgTriangulateConcavePolysFilter::New();
+    concavePolys->SetInputData(fillPolyData);
+    fillPolyData->FastDelete();
+    concavePolys->Update();
+    this->Internal->HeadFillPolyData->DeepCopy(concavePolys->GetOutput());
+    concavePolys->Delete();
+    }
+  else
+    {
+    this->Internal->HeadFillPolyData->Reset();
+    }
+
+  // An actor should only be visible if there is at least one cell to
+  // display because the bounds of an "empty" polydata actor are determined
+  // from its points; we may be storing points in image and points world
+  // coordinates in the same vtkPoints but using only one or the other -
+  // if there is nothing to display for a frame, the bounds might then be
+  // computed incorrectly.
+  this->HeadActor->SetVisibility(
+    this->Internal->HeadPolyData->GetNumberOfCells());
+  this->HeadFillActor->SetVisibility(
+    this->Internal->HeadFillPolyData->GetNumberOfCells());
+
+  this->Internal->HeadPolyData->Modified();
+  this->Internal->HeadPolyData->DeleteCells();
+
+  // Finally, setup the transform.  Test the RepresentationMatrix against
+  // a single point in our result if (any), to determine whether or not to
+  // multiply through by -1 to handle OpenGL issue with -1 homogeneous
+  // coordinate
+  vtkSmartPointer<vtkPolyDataCollection> polyDataCollection =
+    vtkSmartPointer<vtkPolyDataCollection>::New();
+  polyDataCollection->AddItem(this->Internal->HeadPolyData);
+  this->SetupActorTransform(polyDataCollection, this->RepresentationMatrix,
+                            this->ActorTransform);
+
+  // finish setting up the transform
+  this->ActorTransform->Translate(
+    0.0, 0.0,
+    this->ZOffset + vtkVgRepresentationBase::GetZOffset(this->HeadActor));
+  this->ActorTransform->Translate(
+    0.0, 0.0,
+    this->ZOffset + vtkVgRepresentationBase::GetZOffset(this->HeadFillActor));
+
+  this->UpdateTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrackHeadRepresentation::Pick(double renX, double renY,
+                                             vtkRenderer* ren,
+                                             vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+
+  if (!this->GetVisible())
+    {
+    return -1;
+    }
+
+  this->Picker->InitializePickList();
+
+  this->Picker->AddPickList(this->HeadActor);
+
+  int pickStatus = this->Picker->Pick(renX, renY, 0.0, ren);
+
+  if (pickStatus)
+    {
+    vtkIdType cellId = this->Picker->GetCellId();
+    vtkIdTypeArray* da =
+      dynamic_cast<vtkIdTypeArray*>(
+        this->Picker->GetDataSet()->GetCellData()->GetArray("Track Ids"));
+    if (!da)
+      {
+      return -1;
+      }
+    vtkIdType trackId = da->GetValue(cellId);
+    pickType = vtkVgPickData::PickedTrack;
+    return trackId;
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackHeadRepresentation::SetLineWidth(float width)
+{
+  this->HeadActor->GetProperty()->SetLineWidth(width);
+}
+
+//-----------------------------------------------------------------------------
+float vtkVgTrackHeadRepresentation::GetLineWidth()
+{
+  return this->HeadActor->GetProperty()->GetLineWidth();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackHeadRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgModelView/vtkVgTrackHeadRepresentation.h b/Libraries/VtkVgModelView/vtkVgTrackHeadRepresentation.h
new file mode 100644
index 00000000..8a09bf92
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackHeadRepresentation.h
@@ -0,0 +1,118 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrackHeadRepresentation_h
+#define __vtkVgTrackHeadRepresentation_h
+
+#include "vtkVgTrackRepresentationBase.h"
+
+#include <vgExport.h>
+
+class vtkVgCellPicker;
+
+class vtkActor;
+class vtkPoints;
+class vtkRenderer;
+class vtkTransform;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgTrackHeadRepresentation
+  : public vtkVgTrackRepresentationBase
+{
+public:
+  vtkTypeMacro(vtkVgTrackHeadRepresentation, vtkVgTrackRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgTrackHeadRepresentation* New();
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  // Description:
+  // Update the representation in preparation for rendering.
+  virtual void Update();
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked trackId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the track is currently visible or not.
+  virtual vtkIdType Pick(double renX, double renY,
+                         vtkRenderer* ren, vtkIdType& pickType);
+
+  // Description
+  // Set/Get whether all heads are to be displayed.  If true, then ALL tracks
+  // heads will be rendered, regardless of the display state of the
+  // corresponding track. If false, only those track heads will be rendered
+  // whose corresponding tracks are turned on.
+  vtkSetMacro(DisplayAllHeads, bool);
+  vtkGetMacro(DisplayAllHeads, bool);
+
+  // Description:
+  // Set/Get the Z offset to be applied to the actor
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(ZOffset, double);
+  vtkGetMacro(ZOffset, double);
+
+  // Description:
+  // Set/Get the line width to be applied to the track actors.
+  void  SetLineWidth(float width);
+  float GetLineWidth();
+
+  // Description:
+  // Set/Get whether to show transparent fill of / for the head
+  void SetShowFill(bool showFill);
+  vtkGetMacro(ShowFill, bool);
+
+  // Description:
+  // Set/Get whether to show transparent fill of / for the head
+  void SetFillOpacity(double opacity);
+  vtkGetMacro(FillOpacity, double);
+
+private:
+  vtkVgTrackHeadRepresentation(const vtkVgTrackHeadRepresentation&); // Not implemented.
+  void operator=(const vtkVgTrackHeadRepresentation&);               // Not implemented.
+
+  vtkVgTrackHeadRepresentation();
+  virtual ~vtkVgTrackHeadRepresentation();
+
+  vtkActor* HeadActor;
+  vtkActor* HeadFillActor;
+
+  bool DisplayAllHeads;
+  bool ShowFill;
+  double FillOpacity;
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  vtkTransform*         ActorTransform;
+  double                ZOffset;
+
+  vtkSmartPointer<vtkVgCellPicker> Picker;
+
+  class vtkInternal;
+  vtkInternal* Internal;
+
+  int Visible;
+};
+
+#endif // __vtkVgTrackHeadRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgTrackInfo.cxx b/Libraries/VtkVgModelView/vtkVgTrackInfo.cxx
new file mode 100644
index 00000000..c114ecd5
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackInfo.cxx
@@ -0,0 +1 @@
+#include "vtkVgTrackInfo.h"
diff --git a/Libraries/VtkVgModelView/vtkVgTrackInfo.h b/Libraries/VtkVgModelView/vtkVgTrackInfo.h
new file mode 100644
index 00000000..8f748435
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackInfo.h
@@ -0,0 +1,91 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// The size of this class is kept small (sizeof(void*)) so that it can be
+// efficiently passed by value and inserted into "inline" data structures
+// with minimal overhead.
+
+#ifndef __vtkVgTrackInfo_h
+#define __vtkVgTrackInfo_h
+
+#include "vgPointerInt.h"
+
+class vtkVgTrack;
+
+class vtkVgTrackInfo
+{
+  enum TrackTraits
+    {
+    DisplayTrack   = 1 << 0,
+    PassesFilters  = 1 << 1,
+    HeadVisible    = 1 << 2
+    };
+
+public:
+  explicit vtkVgTrackInfo(vtkVgTrack* track = 0)
+    : TrackAndTraits(track, DisplayTrack | PassesFilters | HeadVisible)
+    {}
+
+  void SetTrack(vtkVgTrack* t)
+    {
+    this->TrackAndTraits.SetPointer(t);
+    }
+
+  vtkVgTrack* GetTrack() const
+    {
+    return this->TrackAndTraits.GetPointer();
+    }
+
+  void SetDisplayTrackOn()
+    {
+    this->TrackAndTraits.SetBits(DisplayTrack);
+    }
+
+  void SetDisplayTrackOff()
+    {
+    this->TrackAndTraits.ClearBits(DisplayTrack);
+    }
+
+  bool GetDisplayTrack() const
+    {
+    return this->TrackAndTraits.GetBitsAreSet(DisplayTrack);
+    }
+
+  void SetPassesFiltersOn()
+    {
+    this->TrackAndTraits.SetBits(PassesFilters);
+    }
+
+  void SetPassesFiltersOff()
+    {
+    this->TrackAndTraits.ClearBits(PassesFilters);
+    }
+
+  bool GetPassesFilters() const
+    {
+    return this->TrackAndTraits.GetBitsAreSet(PassesFilters);
+    }
+
+  void SetHeadVisibleOn()
+    {
+    this->TrackAndTraits.SetBits(HeadVisible);
+    }
+
+  void SetHeadVisibleOff()
+    {
+    this->TrackAndTraits.ClearBits(HeadVisible);
+    }
+
+  bool GetHeadVisible() const
+    {
+    return this->TrackAndTraits.GetBitsAreSet(HeadVisible);
+    }
+
+private:
+  vgPointerInt<vtkVgTrack*> TrackAndTraits;
+};
+
+#endif // __vtkVgTrackInfo_h
diff --git a/Libraries/VtkVgModelView/vtkVgTrackLabelRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgTrackLabelRepresentation.cxx
new file mode 100644
index 00000000..3c173476
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackLabelRepresentation.cxx
@@ -0,0 +1,499 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrackLabelRepresentation.h"
+
+#include <vtkActor2D.h>
+#include <vtkIdListCollection.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+#include <vtkProperty2D.h>
+#include <vtkPropPicker.h>
+#include <vtkTextProperty.h>
+#include <vtkTimeStamp.h>
+#include <vtkVgUtil.h>
+
+#include <vgUtil.h>
+
+#include <vtkVgAnnotationActor.h>
+#include <vtkVgTrack.h>
+
+#include "vtkVgPickData.h"
+#include "vtkVgTrackFilter.h"
+#include "vtkVgTrackModel.h"
+
+#include <map>
+#include <sstream>
+
+vtkStandardNewMacro(vtkVgTrackLabelRepresentation);
+
+typedef std::map<vtkIdType, vtkVgAnnotationActor*> ActorMap;
+
+//----------------------------------------------------------------------------
+struct vtkVgTrackLabelRepresentation::vtkInternal
+{
+  ~vtkInternal();
+
+  struct TrackInfoItem
+    {
+    double BackgroundColor[3];
+    double ForegroundColor[3];
+    };
+
+  ActorMap Actors;
+  std::map<int, TrackInfoItem> TrackInfo;
+
+  vtkSmartPointer<vtkPropPicker> Picker;
+
+  vtkSmartPointer<vtkMatrix4x4> InvRepresentationMatrix;
+
+  typedef std::map<int, TrackInfoItem>::iterator       TrackInfoIterator;
+  typedef std::map<int, TrackInfoItem>::const_iterator TrackInfoConstIterator;
+};
+
+vtkVgTrackLabelRepresentation::vtkInternal::~vtkInternal()
+{
+  for (ActorMap::iterator iter = this->Actors.begin(), end = this->Actors.end();
+       iter != end; ++iter)
+    {
+    if (iter->second)
+      {
+      iter->second->Delete();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackLabelRepresentation::vtkVgTrackLabelRepresentation()
+{
+  this->Visible = 1;
+  this->ShowName = true;
+  this->ShowProbability = false;
+  this->LabelPrefix = 0;
+  this->Internal = new vtkInternal;
+
+  this->Internal->Picker = vtkSmartPointer<vtkPropPicker>::New();
+  this->Internal->Picker->PickFromListOn();
+
+  this->Internal->InvRepresentationMatrix =
+    vtkSmartPointer<vtkMatrix4x4>::New();
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackLabelRepresentation::~vtkVgTrackLabelRepresentation()
+{
+  this->SetLabelPrefix(0);
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackLabelRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgTrackLabelRepresentation::SetTrackTypeColors(
+  const int id, const double bcolor[3]/*=0*/,
+  const double fcolor[3]/*=0*/)
+{
+  vtkInternal::TrackInfoItem ei;
+
+  if (bcolor)
+    {
+    ei.BackgroundColor[0] = bcolor[0];
+    ei.BackgroundColor[1] = bcolor[1];
+    ei.BackgroundColor[2] = bcolor[2];
+    }
+  else
+    {
+    ei.BackgroundColor[0] = 0.0;
+    ei.BackgroundColor[1] = 0.4;
+    ei.BackgroundColor[2] = 0.0;
+    }
+
+  if (fcolor)
+    {
+    ei.ForegroundColor[0] = fcolor[0];
+    ei.ForegroundColor[1] = fcolor[1];
+    ei.ForegroundColor[2] = fcolor[2];
+    }
+  else
+    {
+    ei.ForegroundColor[0] = 1.0;
+    ei.ForegroundColor[1] = 1.0;
+    ei.ForegroundColor[2] = 1.0;
+    }
+
+  this->Internal->TrackInfo[id] = ei;
+  this->Modified();
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackLabelRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackLabelRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackLabelRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackLabelRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackLabelRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackLabelRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackLabelRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackLabelRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+
+  this->Visible = flag;
+  this->ActivePropCollection->InitTraversal();
+  while (vtkProp* prop = this->ActivePropCollection->GetNextProp())
+    {
+    prop->SetVisibility(flag);
+    }
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackLabelRepresentation::SetLabelColorHelper(
+  vtkVgTrackLabelColorHelper* labelColorHelper)
+{
+  if (this->LabelColorHelper != labelColorHelper)
+    {
+    this->LabelColorHelper = labelColorHelper;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackLabelRepresentation::ShowTrackAnnotation(vtkVgTrack* track,
+  bool rebuild)
+{
+  vtkVgAnnotationActor*& actor = this->Internal->Actors[track->GetId()];
+
+  // @TODO: Maintain a pool of actors that can be reused in order to
+  // avoid some of this reallocation.
+  if (!actor)
+    {
+    actor = vtkVgAnnotationActor::New();
+    actor->SetClampToViewport(false);
+
+    this->NewPropCollection->AddItem(actor);
+    this->ActivePropCollection->AddItem(actor);
+    rebuild = true;
+    }
+
+  actor->SetUserMatrix(this->RepresentationMatrix);
+
+  if (rebuild)
+    {
+    const double* backgroundColor = 0;
+    const double* foregroundColor = 0;
+
+    if (this->LabelColorHelper)
+      {
+      backgroundColor =
+        this->LabelColorHelper->GetTrackLabelBackgroundColor(track);
+      foregroundColor =
+        this->LabelColorHelper->GetTrackLabelForegroundColor(track);
+      }
+
+    if (!backgroundColor || !foregroundColor)
+      {
+      const vtkInternal::TrackInfoItem* info;
+      if (this->TrackFilter)
+        {
+        info = &this->Internal->TrackInfo[
+                this->TrackFilter->GetBestClassifier(track)];
+        }
+      else
+        {
+        info = &this->Internal->TrackInfo[track->GetBestPVOClassifier()];
+        }
+
+      if (!backgroundColor)
+        {
+        backgroundColor = info->BackgroundColor;
+        }
+      if (!foregroundColor)
+        {
+        foregroundColor = info->ForegroundColor;
+        }
+      }
+
+    actor->GetFrameProperty()->SetColor(backgroundColor[0],
+                                        backgroundColor[1],
+                                        backgroundColor[2]);
+
+    actor->GetTextProperty()->SetColor(foregroundColor[0],
+                                       foregroundColor[1],
+                                       foregroundColor[2]);
+
+    actor->SetOffset(0, -15);
+    actor->AutoCenterXOn();
+
+    std::ostringstream ostr;
+
+    if (this->LabelPrefix)
+      {
+      ostr << this->LabelPrefix;
+      }
+
+    if (this->ShowName)
+      {
+      const char* name = track->GetName();
+      if (name)
+        {
+        ostr << name;
+        }
+      else
+        {
+        ostr << 'T' << track->GetId();
+        }
+      }
+
+    if (this->ShowProbability)
+      {
+      double PVO[3];
+      track->GetPVO(PVO);
+
+      // show PVO from top to bottom if the track isn't unclassified
+      if (PVO[0] != 0.0 || PVO[1] != 0.0 || PVO[2] != 0.0)
+        {
+        if (this->ShowName)
+          {
+          ostr << ' ';
+          }
+
+        ostr.setf(ios::fixed, ios::floatfield);
+        ostr.precision(2);
+        ostr << "(P:" << PVO[0] << ", V:" << PVO[1] << ", O:" << PVO[2] << ')';
+        }
+      }
+
+    actor->SetText(ostr.str().c_str());
+    }
+
+  vtkIdType npts, *pts, trackPointId;
+  double labelPosition[3];
+  vtkVgTimeStamp now = this->TrackModel->GetCurrentTimeStamp();
+  track->GetHeadIdentifier(now, npts, pts, trackPointId);
+
+  if (npts > 0)
+    {
+    vtkPoints* points = track->GetPoints();
+
+    // Loop through points, transforming to get the minimum "y" (v) point. If
+    // there are several points close to the minimum y, average their min and
+    // max x values together.
+    // TODO: This is identical to the code used to position to event labels,
+    //       factor this out into a common base?
+    double minX = VTK_DOUBLE_MAX;
+    double maxX = VTK_DOUBLE_MIN;
+    double minY = VTK_DOUBLE_MAX;
+    for (int i = 0; i < npts; ++i)
+      {
+      double point[3];
+      points->GetPoint(pts[i], point);
+      const vgPoint2d tpoint =
+        vtkVgApplyHomography(point, this->RepresentationMatrix);
+      if (fabs(tpoint.Y - minY) < 1.0) // Expect always true for first point
+        {
+        vgExpandBoundaries(minX, maxX, tpoint.X);
+        vgExpandLowerBoundary(minY, tpoint.Y);
+        }
+      else if (tpoint.Y < minY)
+        {
+        // Found a new distinct min point, so reset x limits
+        minX = maxX = tpoint.X;
+        minY = tpoint.Y;
+        }
+      }
+
+    // Now that we have a good anchor point in world space, transform it back
+    // to model space before setting the actor position.
+    const vgPoint2d point = { 0.5 * (minX + maxX), minY };
+    vtkVgApplyHomography(point, this->Internal->InvRepresentationMatrix,
+                         labelPosition);
+    labelPosition[2] = 0.0;
+    }
+  else
+    {
+    // position the annotation at the head of the track
+    vtkVgTrackDisplayData tdd = this->TrackModel->GetTrackDisplayData(track);
+    vtkIdType headId = tdd.IdsStart[tdd.NumIds - 1];
+
+    track->GetPoints()->GetPoint(headId, labelPosition);
+    }
+  actor->SetPosition(labelPosition);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackLabelRepresentation::HideTrackAnnotation(vtkVgTrack* track)
+{
+  ActorMap::iterator iter = this->Internal->Actors.find(track->GetId());
+  if (iter != this->Internal->Actors.end() && iter->second)
+    {
+    this->ExpirePropCollection->AddItem(iter->second);
+
+    // linear search here could get expensive...
+    this->ActivePropCollection->RemoveItem(iter->second);
+
+    iter->second->Delete();
+    iter->second = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackLabelRepresentation::Update()
+{
+  if (!this->GetVisible())
+    {
+    return;
+    }
+
+  bool forceRebuild =
+    this->GetMTime() > this->UpdateTime ||
+    this->TrackFilter->GetMTime() > this->UpdateTime;
+
+  if (!forceRebuild && this->TrackModel->GetMTime() < this->UpdateTime &&
+      this->TrackModel->GetUpdateTime() < this->UpdateTime)
+    {
+    return;
+    }
+
+  // Recompute the cached inverse matrix if necessary
+  if (this->Internal->InvRepresentationMatrix->GetMTime() <
+      this->RepresentationMatrix->GetMTime())
+    {
+    vtkMatrix4x4::Invert(this->RepresentationMatrix,
+                         this->Internal->InvRepresentationMatrix);
+    }
+
+  vtkVgTrackInfo trackInfo;
+  this->TrackModel->InitTrackTraversal();
+  while ((trackInfo = this->TrackModel->GetNextTrack()).GetTrack())
+    {
+    vtkVgTrack* track = trackInfo.GetTrack();
+    bool visible = track != this->ExcludedTrack &&
+                   trackInfo.GetDisplayTrack() &&
+                   trackInfo.GetPassesFilters() &&
+                   trackInfo.GetHeadVisible();
+
+    if (!visible || this->TrackFilter->GetBestClassifier(track) == -1)
+      {
+      this->HideTrackAnnotation(track);
+      continue;
+      }
+    else if (this->TrackModel->GetTrackDisplayData(track).NumIds == 0)
+      {
+      // Only do the work of getting the HeadIdentifier (which is preferred
+      // display vehicle) if we know we don't have the trail as backup
+      vtkIdType npts, *pts, trackPointId;
+      track->GetHeadIdentifier(this->TrackModel->GetCurrentTimeStamp(), npts,
+                               pts, trackPointId);
+      if (npts == 0)
+        {
+        this->HideTrackAnnotation(track);
+        continue;
+        }
+      }
+    this->ShowTrackAnnotation(track, forceRebuild);
+    }
+
+  this->UpdateTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrackLabelRepresentation::Pick(double renX,
+                                              double renY,
+                                              vtkRenderer* ren,
+                                              vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+
+  if (!this->GetVisible())
+    {
+    return -1;
+    }
+
+  // Set up the pick list and add the actors to it
+  this->Internal->Picker->InitializePickList();
+
+  for (ActorMap::iterator iter = this->Internal->Actors.begin(),
+       end = this->Internal->Actors.end();
+       iter != end; ++iter)
+    {
+    if (iter->second)
+      {
+      this->Internal->Picker->AddPickList(iter->second->GetFrameActor());
+      }
+    }
+
+  if (this->Internal->Picker->Pick(renX, renY, 0.0, ren))
+    {
+    vtkProp* pickedActor = this->Internal->Picker->GetViewProp();
+    if (!pickedActor)
+      {
+      return -1;
+      }
+
+    // Look up the picked actor
+    for (ActorMap::iterator iter = this->Internal->Actors.begin(),
+         end = this->Internal->Actors.end();
+         iter != end; ++iter)
+      {
+      if (iter->second && pickedActor == iter->second->GetFrameActor())
+        {
+        pickType = vtkVgPickData::PickedEvent;
+        return iter->first;
+        }
+      }
+    }
+
+  return -1;
+}
diff --git a/Libraries/VtkVgModelView/vtkVgTrackLabelRepresentation.h b/Libraries/VtkVgModelView/vtkVgTrackLabelRepresentation.h
new file mode 100644
index 00000000..cdc49efa
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackLabelRepresentation.h
@@ -0,0 +1,115 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrackLabelRepresentation_h
+#define __vtkVgTrackLabelRepresentation_h
+
+#include "vtkSmartPointer.h"
+#include "vtkVgTrackRepresentationBase.h"
+
+#include <vgExport.h>
+
+class vtkPropCollection;
+class vtkVgTrack;
+
+class vtkVgTrackLabelColorHelper
+{
+public:
+  virtual ~vtkVgTrackLabelColorHelper() {}
+  virtual const double* GetTrackLabelBackgroundColor(vtkVgTrack* track) = 0;
+  virtual const double* GetTrackLabelForegroundColor(vtkVgTrack* track) = 0;
+};
+
+class VTKVG_MODELVIEW_EXPORT vtkVgTrackLabelRepresentation
+  : public vtkVgTrackRepresentationBase
+{
+public:
+  vtkTypeMacro(vtkVgTrackLabelRepresentation, vtkVgTrackRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgTrackLabelRepresentation* New();
+
+  // Description:
+  // Set the foreground and background label colors for a given track type.
+  int SetTrackTypeColors(const int id,
+                         const double bcolor[3] = 0,
+                         const double fcolor[3] = 0);
+
+  // Description:
+  // Set track label color helper for the representation. The caller is
+  // responsible for managing the life of the helper, and ensuring it is not
+  // deleted while the representation holds a reference to it.
+  void SetLabelColorHelper(vtkVgTrackLabelColorHelper* labelColorHelper);
+  vtkGetObjectMacro(LabelColorHelper, vtkVgTrackLabelColorHelper);
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  virtual vtkIdType Pick(double renX,
+                         double renY,
+                         vtkRenderer* ren,
+                         vtkIdType& pickType);
+
+  // Description:
+  // Set if the label should include the track name (will show ID if name unset)
+  vtkSetMacro(ShowName, bool);
+  vtkGetMacro(ShowName, bool);
+
+  // Description:
+  // Set if the label should include the classifier score
+  vtkSetMacro(ShowProbability, bool);
+  vtkGetMacro(ShowProbability, bool);
+
+  // Description:
+  // Set/Get prefix to add to the label
+  vtkSetStringMacro(LabelPrefix);
+  vtkGetStringMacro(LabelPrefix);
+
+  // Description:
+  // Update all the track actors. Generally called by the application layer.
+  virtual void Update();
+
+private:
+  vtkVgTrackLabelRepresentation(const vtkVgTrackLabelRepresentation&);
+  void operator=(const vtkVgTrackLabelRepresentation&);
+
+  vtkVgTrackLabelRepresentation();
+  virtual ~vtkVgTrackLabelRepresentation();
+
+  void ShowTrackAnnotation(vtkVgTrack* track, bool rebuild);
+  void HideTrackAnnotation(vtkVgTrack* track);
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  vtkVgTrackLabelColorHelper* LabelColorHelper;
+
+  int          Visible;
+  bool         ShowName;
+  bool         ShowProbability;
+  char*        LabelPrefix;
+
+  struct vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgTrackLabelRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgTrackModel.cxx b/Libraries/VtkVgModelView/vtkVgTrackModel.cxx
new file mode 100644
index 00000000..48cc467d
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackModel.cxx
@@ -0,0 +1,640 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrackModel.h"
+
+#include "vtkVgContourOperatorManager.h"
+#include "vtkVgScalars.h"
+#include "vtkVgTemporalFilters.h"
+#include "vtkVgTrack.h"
+
+#include <vtkObjectFactory.h>
+#include <vtkCommand.h>
+#include <vtkPoints.h>
+#include <vtkPolyLine.h>
+#include <vtkTimeStamp.h>
+
+#include <assert.h>
+#include <limits>
+#include <set>
+
+vtkStandardNewMacro(vtkVgTrackModel);
+
+vtkSetObjectImplementationMacro(vtkVgTrackModel, Points, vtkPoints);
+
+typedef std::map<vtkIdType, vtkVgTrackInfo>           TrackMap;
+typedef std::map<vtkIdType, vtkVgTrackInfo>::iterator TrackMapIterator;
+
+static const vtkVgTrackInfo InvalidTrackInfo = vtkVgTrackInfo();
+
+//-----------------------------------------------------------------------------
+struct vtkVgTrackModel::vtkInternal
+{
+  TrackMap         TrackIdMap;
+  TrackMapIterator TrackIterator;
+
+  vtkTimeStamp UpdateTime;
+  vtkTimeStamp SpatialFilteringUpdateTime;
+  vtkTimeStamp TemporalFilteringUpdateTime;
+  vtkTimeStamp ComputedAllScalarsNameTime;
+
+  std::vector<std::string> AllScalarsName;
+
+  // Scalars field name to scalars range map
+  std::map<std::string, ScalarsRange> ScalarsNameToRangeMap;
+
+  // Scalars field name to last computed range timestamp map
+  std::map<std::string, vtkTimeStamp> ScalarsNameToTimeMap;
+};
+
+//-----------------------------------------------------------------------------
+vtkVgTrackModel::vtkVgTrackModel()
+{
+  this->Internal = new vtkInternal();
+  this->DisplayAllTracks = true;
+  this->Points = vtkPoints::New();
+  this->CurrentTimeStamp.SetToMinTime();
+
+  this->ShowTracksBeforeStart = false;
+  this->ShowTracksAfterExpiration = false;
+
+  this->TrackExpirationOffset.SetFrameNumber(0u);
+  this->TrackExpirationOffset.SetTime(0.0);
+
+  this->SceneElementIdsOffset = 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackModel::~vtkVgTrackModel()
+{
+  this->Points->Delete();
+  this->ClearTracks();
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::ClearTracks()
+{
+  for (TrackMapIterator itr = this->Internal->TrackIdMap.begin(),
+       end = this->Internal->TrackIdMap.end(); itr != end; ++itr)
+    {
+    itr->second.GetTrack()->UnRegister(this);
+    }
+  this->Internal->TrackIdMap.clear();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::Initialize()
+{
+  this->ClearTracks();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::AddTrack(vtkVgTrack* track)
+{
+  // Check if the incoming track is using same points
+  // as the track model, if not toss it.
+  if (!track->GetPoints())
+    {
+    track->SetPoints(this->GetPoints());
+    }
+  else if (track->GetPoints() != this->GetPoints())
+    {
+    vtkWarningMacro("Mismatch between track and model points.\n")
+    vtkWarningMacro("Resetting track points\n");
+
+    track->SetPoints(this->GetPoints());
+    }
+
+  vtkVgTrackInfo trackInfo(track);
+  if (!this->DisplayAllTracks)
+    {
+    trackInfo.SetDisplayTrackOff();
+    }
+  trackInfo.GetTrack()->Register(this);
+  this->Internal->TrackIdMap[track->GetId()] = trackInfo;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::RemoveTrack(vtkIdType trackId)
+{
+  TrackMapIterator trackIter = this->Internal->TrackIdMap.find(trackId);
+  if (trackIter != this->Internal->TrackIdMap.end())
+    {
+    trackIter->second.GetTrack()->UnRegister(this);
+    this->Internal->TrackIdMap.erase(trackIter);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack* vtkVgTrackModel::GetTrack(vtkIdType trackId)
+{
+  TrackMapIterator trackIter = this->Internal->TrackIdMap.find(trackId);
+  if (trackIter != this->Internal->TrackIdMap.end())
+    {
+    return trackIter->second.GetTrack();
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackInfo vtkVgTrackModel::GetTrackInfo(vtkIdType trackId)
+{
+  TrackMapIterator trackIter = this->Internal->TrackIdMap.find(trackId);
+  if (trackIter != this->Internal->TrackIdMap.end())
+    {
+    return trackIter->second;
+    }
+  return InvalidTrackInfo;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackDisplayData vtkVgTrackModel::GetTrackDisplayData(vtkVgTrack* track,
+  bool forceDisplay)
+{
+  if (!track->IsStarted())    // verify track is even started
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  vtkVgTimeStamp trackStart = this->GetTrackStartDisplayFrame(track);
+  vtkVgTimeStamp trackExpiration = this->GetTrackEndDisplayFrame(track);
+
+  // Never display the track if its start occurs before the reference time.
+  if (this->ReferenceTimeStamp.IsValid() &&
+      trackStart < this->ReferenceTimeStamp)
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  if (!forceDisplay &&
+      !this->ShowTracksBeforeStart &&
+      this->CurrentTimeStamp < trackStart)
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  if (!forceDisplay &&
+      !this->ShowTracksAfterExpiration &&
+      this->CurrentTimeStamp > trackExpiration)
+    {
+    return vtkVgTrackDisplayData();
+    }
+
+  // Display the whole track if showing before the start of the track.
+  if (this->CurrentTimeStamp < trackStart)
+    {
+    return track->GetDisplayData(vtkVgTimeStamp(false),
+                                 vtkVgTimeStamp(true));
+    }
+
+  // May need to move the start time forward if max duration is set.
+  if (!forceDisplay && this->MaxDisplayDuration.IsValid())
+    {
+    // Don't show completed tracks if a max duration is set.
+    if (this->CurrentTimeStamp > track->GetEndFrame())
+      {
+      return vtkVgTrackDisplayData();
+      }
+
+    vtkVgTimeStamp duration = this->CurrentTimeStamp;
+    duration.ShiftBackward(trackStart);
+    if (duration > this->MaxDisplayDuration)
+      {
+      vtkVgTimeStamp start = this->CurrentTimeStamp;
+      start.ShiftBackward(this->MaxDisplayDuration);
+      return track->GetDisplayData(start, this->CurrentTimeStamp);
+      }
+    }
+
+  // By default, display the track from its start up until the current frame.
+  return track->GetDisplayData(vtkVgTimeStamp(false), this->CurrentTimeStamp);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vtkVgTrackModel::GetTrackStartDisplayFrame(vtkVgTrack* track)
+{
+  return track->GetStartFrame();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vtkVgTrackModel::GetTrackEndDisplayFrame(vtkVgTrack* track)
+{
+  vtkVgTimeStamp endFrame = track->GetEndFrame();
+  if (!endFrame.IsValid())
+    {
+    // Track not yet closed.
+    endFrame.SetToMaxTime();
+    return endFrame;
+    }
+
+  endFrame.ShiftForward(this->TrackExpirationOffset);
+  return endFrame;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::InitTrackTraversal()
+{
+  this->Internal->TrackIterator = this->Internal->TrackIdMap.begin();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackInfo vtkVgTrackModel::GetNextTrack()
+{
+  if (this->Internal->TrackIterator != this->Internal->TrackIdMap.end())
+    {
+    return (this->Internal->TrackIterator++)->second;
+    }
+
+  return InvalidTrackInfo;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackInfo vtkVgTrackModel::GetNextDisplayedTrack()
+{
+  while (this->Internal->TrackIterator != this->Internal->TrackIdMap.end())
+    {
+    if (this->Internal->TrackIterator->second.GetDisplayTrack() &&
+        this->Internal->TrackIterator->second.GetPassesFilters())
+      {
+      return (this->Internal->TrackIterator++)->second;
+      }
+    ++this->Internal->TrackIterator;
+    }
+
+  return InvalidTrackInfo;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgTrackModel::GetNumberOfTracks()
+{
+  return static_cast<int>(this->Internal->TrackIdMap.size());
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgTrackModel::Update(const vtkVgTimeStamp& timestamp,
+                            const vtkVgTimeStamp* referenceFrameTimeStamp/*=0*/)
+{
+  bool updateSpatial = this->ContourOperatorManager &&
+                       (this->GetMTime() >
+                        this->Internal->SpatialFilteringUpdateTime ||
+                        this->ContourOperatorManager->GetMTime() >
+                        this->Internal->SpatialFilteringUpdateTime);
+
+  bool updateTemporal = this->TemporalFilters &&
+                        (this->GetMTime() >
+                         this->Internal->TemporalFilteringUpdateTime ||
+                         this->TemporalFilters->GetMTime() >
+                         this->Internal->TemporalFilteringUpdateTime);
+
+  if (this->CurrentTimeStamp == timestamp &&
+      this->Internal->UpdateTime > this->GetMTime() &&
+      !(updateSpatial || updateTemporal))
+    {
+    return VTK_OK;
+    }
+
+  this->CurrentTimeStamp = timestamp;
+  this->ReferenceTimeStamp = referenceFrameTimeStamp ? *referenceFrameTimeStamp
+                             : vtkVgTimeStamp();
+
+  this->Internal->UpdateTime.Modified();
+  if (updateSpatial || updateTemporal)
+    {
+    this->Internal->SpatialFilteringUpdateTime.Modified();
+    this->Internal->TemporalFilteringUpdateTime.Modified();
+    }
+
+  for (TrackMapIterator trackIter = this->Internal->TrackIdMap.begin();
+       trackIter != this->Internal->TrackIdMap.end(); ++trackIter)
+    {
+    vtkVgTrackInfo& info = trackIter->second;
+
+    // Update filtering. Since we only track one "filtered" bit, both must
+    // update at the same time. If updating both ends up being a performance
+    // problem, use separate filtered bits to optimize.
+    if (updateTemporal || updateSpatial)
+      {
+      info.SetPassesFiltersOn();
+      if (this->TemporalFilters)
+        {
+        this->UpdateTemporalFiltering(info);
+        }
+      if (this->ContourOperatorManager && info.GetPassesFilters())
+        {
+        this->UpdateSpatialFiltering(info);
+        }
+      }
+
+    // Update head visibility flag.
+    info.SetHeadVisibleOn();
+    if (this->ContourOperatorManager &&
+        (this->ContourOperatorManager->GetNumberOfEnabledFilters() > 0 ||
+         this->ContourOperatorManager->GetNumberOfEnabledSelectors() > 0))
+      {
+      vtkVgTrackDisplayData tdd = this->GetTrackDisplayData(info.GetTrack());
+      if (tdd.NumIds > 0)
+        {
+        bool headVisible =
+          this->ContourOperatorManager->EvaluatePoint(
+            info.GetTrack()->GetPoints()->GetPoint(
+              tdd.IdsStart[tdd.NumIds - 1]));
+
+        headVisible ? info.SetHeadVisibleOn() : info.SetHeadVisibleOff();
+        }
+      }
+    }
+
+  this->InvokeEvent(vtkCommand::UpdateDataEvent);
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::SetTrackDisplayState(vtkIdType trackId, bool displayTrack)
+{
+  TrackMapIterator trackIter = this->Internal->TrackIdMap.find(trackId);
+  if (trackIter != this->Internal->TrackIdMap.end() &&
+      trackIter->second.GetDisplayTrack() != displayTrack)
+    {
+    displayTrack ? trackIter->second.SetDisplayTrackOn()
+    : trackIter->second.SetDisplayTrackOff();
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::SetDisplayAllTracks(bool state)
+{
+  if (state != this->DisplayAllTracks)
+    {
+    this->DisplayAllTracks = state;
+    if (state)
+      {
+      this->SetAllTracksDisplayState(state);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::SetAllTracksDisplayState(bool state)
+{
+  bool modified = false;
+  for (TrackMapIterator trackIter = this->Internal->TrackIdMap.begin();
+       trackIter != this->Internal->TrackIdMap.end(); ++trackIter)
+    {
+    if (trackIter->second.GetDisplayTrack() != state)
+      {
+      state ? trackIter->second.SetDisplayTrackOn()
+      : trackIter->second.SetDisplayTrackOff();
+      modified = true;
+      }
+    }
+  if (modified)
+    {
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::SetTrackExpirationOffset(const vtkVgTimeStamp& offset)
+{
+  this->TrackExpirationOffset = offset;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::SetMaximumDisplayDuration(const vtkVgTimeStamp &
+                                                maxDisplayDuration)
+{
+  this->MaxDisplayDuration = maxDisplayDuration;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::SetTrackColor(vtkIdType trackId, double color[3])
+{
+  TrackMapIterator trackIter = this->Internal->TrackIdMap.find(trackId);
+  if (trackIter != this->Internal->TrackIdMap.end())
+    {
+    trackIter->second.GetTrack()->SetColor(color);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+double* vtkVgTrackModel::GetTrackColor(vtkIdType trackId)
+{
+  TrackMapIterator trackIter = this->Internal->TrackIdMap.find(trackId);
+  if (trackIter != this->Internal->TrackIdMap.end())
+    {
+    return trackIter->second.GetTrack()->GetColor();
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+unsigned long vtkVgTrackModel::GetUpdateTime()
+{
+  return this->Internal->UpdateTime.GetMTime();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::SetActiveScalars(const std::string& name)
+{
+  if (name.empty())
+    {
+    vtkWarningMacro("<< Name is empty \n");
+    return;
+    }
+
+  if (this->ActiveScalarsName == name)
+    {
+    return;
+    }
+
+  bool modified = false;
+  for (TrackMapIterator trackIter = this->Internal->TrackIdMap.begin();
+       trackIter != this->Internal->TrackIdMap.end(); ++trackIter)
+    {
+      vtkVgTrack* track = trackIter->second.GetTrack();
+
+      if (track)
+        {
+        track->SetActiveScalars(name);
+        modified = true;
+        }
+    }
+
+  if (modified)
+    {
+    this->ActiveScalarsName = name;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const std::string& vtkVgTrackModel::GetActiveScalars()
+{
+  return this->ActiveScalarsName;
+}
+
+//-----------------------------------------------------------------------------
+const std::string& vtkVgTrackModel::GetActiveScalars() const
+{
+  return this->ActiveScalarsName;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<std::string> vtkVgTrackModel::GetAllScalarsName()
+{
+  std::set<std::string> existingNames;
+
+  if (this->Internal->ComputedAllScalarsNameTime.GetMTime() > this->GetMTime())
+    {
+    return this->Internal->AllScalarsName;
+    }
+
+  for (TrackMapIterator trackIter = this->Internal->TrackIdMap.begin();
+       trackIter != this->Internal->TrackIdMap.end(); ++trackIter)
+    {
+    vtkVgTrack* track = trackIter->second.GetTrack();
+
+    if (track)
+      {
+      std::vector<std::string> names = track->GetScalarsName();
+      for (size_t i = 0; i < names.size(); ++i)
+        {
+        if (existingNames.find(names[i]) == existingNames.end())
+          {
+          existingNames.insert(names[i]);
+          this->Internal->AllScalarsName.push_back(names[i]);
+          }
+        }
+      }
+    }
+
+  this->Internal->ComputedAllScalarsNameTime.Modified();
+
+  return this->Internal->AllScalarsName;
+}
+
+//-----------------------------------------------------------------------------
+vgRange<double> vtkVgTrackModel::GetScalarsRange(const std::string& name)
+{
+  if (this->Internal->ScalarsNameToTimeMap.find(name) !=
+      this->Internal->ScalarsNameToTimeMap.end() &&
+      this->Internal->ScalarsNameToTimeMap[name].GetMTime() > this->GetMTime())
+    {
+    return this->Internal->ScalarsNameToRangeMap[name];
+    }
+
+  ScalarsRange overallRange;
+  overallRange.lower =  std::numeric_limits<double>::max();
+  overallRange.upper = -std::numeric_limits<double>::max();
+
+  for (TrackMapIterator trackIter = this->Internal->TrackIdMap.begin();
+       trackIter != this->Internal->TrackIdMap.end(); ++trackIter)
+    {
+    vtkVgTrack* track = trackIter->second.GetTrack();
+
+    if (track)
+      {
+      vtkVgScalars* scalars = track->GetScalars(name);
+      if (!scalars)
+        {
+        continue;
+        }
+      const double* scalarsRange = scalars->GetRange();
+      if (!scalarsRange)
+        {
+        continue;
+        }
+
+      if (scalarsRange[0] < overallRange.lower)
+        {
+        overallRange.lower = scalarsRange[0];
+        }
+      if (scalarsRange[1] > overallRange.upper)
+        {
+        overallRange.upper = scalarsRange[1];
+        }
+      }
+    }
+
+  this->Internal->ScalarsNameToRangeMap[name] = overallRange;
+  vtkTimeStamp lastComputedTimeStamp;
+  lastComputedTimeStamp.Modified();
+  this->Internal->ScalarsNameToTimeMap[name] = lastComputedTimeStamp;
+
+  return overallRange;
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrackModel::GetNextAvailableId()
+{
+  if (this->Internal->TrackIdMap.empty())
+    {
+    return 0;
+    }
+  return (--this->Internal->TrackIdMap.end())->first + 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::UpdateTemporalFiltering(vtkVgTrackInfo& info)
+{
+  vtkVgTrack* track = info.GetTrack();
+
+  bool pass =
+    this->TemporalFilters->EvaluateInterval(track->GetStartFrame(),
+                                            track->GetEndFrame());
+  if (!pass)
+    {
+    info.SetPassesFiltersOff();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::UpdateSpatialFiltering(vtkVgTrackInfo& info)
+{
+  vtkVgTrack* track = info.GetTrack();
+
+  bool pass =
+    this->ContourOperatorManager->EvaluatePath(track->GetPoints(),
+                                               track->GetPointIds());
+  if (!pass)
+    {
+    info.SetPassesFiltersOff();
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModel::UpdateColorOfTracksOfType(int typeIndex, double *rgb)
+{
+  bool modified = false;
+  for (TrackMapIterator trackIter = this->Internal->TrackIdMap.begin();
+       trackIter != this->Internal->TrackIdMap.end(); ++trackIter)
+    {
+    if (trackIter->second.GetTrack()->GetType() == typeIndex)
+      {
+      trackIter->second.GetTrack()->SetColor(rgb);
+      modified = true;
+      }
+    }
+  if (modified)
+    {
+    this->Modified();
+    }
+}
diff --git a/Libraries/VtkVgModelView/vtkVgTrackModel.h b/Libraries/VtkVgModelView/vtkVgTrackModel.h
new file mode 100644
index 00000000..12e4241a
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackModel.h
@@ -0,0 +1,195 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrackModel_h
+#define __vtkVgTrackModel_h
+
+#include "vtkVgModelBase.h"
+
+#include <vtkVgTrackInfo.h>
+#include <vtkVgTrack.h>
+
+#include <vgRange.h>
+
+#include <vtkVgMacros.h>
+
+#include <string>
+#include <vector>
+
+#include <vgExport.h>
+
+class vtkPoints;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgTrackModel : public vtkVgModelBase
+{
+public:
+  typedef vgRange<double> ScalarsRange;
+
+  vtkVgClassMacro(vtkVgTrackModel);
+
+  vtkTypeMacro(vtkVgTrackModel, vtkVgModelBase);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgTrackModel* New();
+
+  void Initialize();
+
+  // Description:
+  // Set/Get the points defining the tracks. All the points for all the tracks
+  // are included in this list.
+  void SetPoints(vtkPoints* points);
+  vtkGetObjectMacro(Points, vtkPoints);
+
+  void AddTrack(vtkVgTrack* track);
+  void RemoveTrack(vtkIdType trackId);
+
+  vtkVgTrack*    GetTrack(vtkIdType trackId);
+  vtkVgTrackInfo GetTrackInfo(vtkIdType trackId);
+
+  vtkVgTrackDisplayData GetTrackDisplayData(vtkVgTrack* track,
+                                            bool forceDisplay = false);
+
+  vtkVgTimeStamp GetTrackStartDisplayFrame(vtkVgTrack* track);
+  vtkVgTimeStamp GetTrackEndDisplayFrame(vtkVgTrack* track);
+
+  void InitTrackTraversal();
+  vtkVgTrackInfo GetNextTrack();
+  vtkVgTrackInfo GetNextDisplayedTrack();
+
+  int GetNumberOfTracks();
+
+  // Description:
+  // Updates the model to the given timestamp. This should become a true
+  // timestamp once this class derives from vtkVgModelBase
+  virtual int Update(const vtkVgTimeStamp& timestamp,
+                     const vtkVgTimeStamp* referenceFrameTimeStamp);
+  using Superclass::Update;
+
+  // Description:
+  // Set/Get whether the track should be displayed.  Functionality
+  // could go in the track itself, but didn't seem like something the
+  // track should do.
+  void SetTrackDisplayState(vtkIdType trackId, bool displayTrack);
+
+  // Description:
+  // Set the TrackDisplay state for all tracks to "true" (ON).  Note, this does
+  // NOT change the state of the DisplayAllTracks flag.
+  void TurnOnAllTracks()
+    {
+    this->SetAllTracksDisplayState(true);
+    }
+
+  void SetTrackExpirationOffset(const vtkVgTimeStamp& offset);
+
+  vtkSetMacro(ShowTracksBeforeStart, bool);
+  vtkGetMacro(ShowTracksBeforeStart, bool);
+  vtkBooleanMacro(ShowTracksBeforeStart, bool);
+
+  vtkSetMacro(ShowTracksAfterExpiration, bool);
+  vtkGetMacro(ShowTracksAfterExpiration, bool);
+  vtkBooleanMacro(ShowTracksAfterExpiration, bool);
+
+  // Description:
+  // Convenience method to set the MaximumDisplayDuration for all tracks.
+  void SetMaximumDisplayDuration(const vtkVgTimeStamp& maxDisplayDuration);
+
+  // Description:
+  // Set the TrackDisplay state for all tracks to "true" (ON).  Note, this does
+  // NOT change the state of the DisplayAllTracks flag.
+  void TurnOffAllTracks()
+    {
+    this->SetAllTracksDisplayState(false);
+    }
+
+  // Description:
+  // Set/Get whether all tracks are to be displayed.  If true, then the EventManager
+  // won't turn off tracks not used by events.  If false, only those tracks used
+  // by events will be turned on (the act of setting this flag will turn on all
+  // tracks if set to true, but do nothign to track state if false
+  void SetDisplayAllTracks(bool state);
+  vtkGetMacro(DisplayAllTracks, bool);
+
+  void    SetTrackColor(vtkIdType trackId, double color[3]);
+  double* GetTrackColor(vtkIdType trackId);
+
+  // Description:
+  // Return the MTime for the last Update (that did something).
+  virtual unsigned long GetUpdateTime();
+
+  // Description:
+  // Set scalars identified by \c name as active. Active
+  // scalars could be used for the display purposes.
+  void SetActiveScalars(const std::string& name);
+  // Get active scalars
+  const std::string& GetActiveScalars();
+  const std::string& GetActiveScalars() const;
+
+  // Description:
+  // Return name of the scalars for all the existing tracks
+  std::vector<std::string> GetAllScalarsName();
+
+  // Description:
+  // Return range of the scalars
+  vgRange<double> GetScalarsRange(const std::string& name);
+
+  // Description:
+  // Get the smallest id which is greater than the id of any track in the model
+  vtkIdType GetNextAvailableId();
+
+  // Description:
+  // Set the id offset to be applied to scene element tracks to avoid collisions
+  // with normal tracks. This is for bookkeeping only, it does not affect the
+  // behavior of the model.
+  vtkSetMacro(SceneElementIdsOffset, vtkIdType);
+  vtkGetMacro(SceneElementIdsOffset, vtkIdType);
+
+  vtkIdType GetSceneElementIdForTrack(vtkIdType trackId)
+    {
+    return trackId - this->SceneElementIdsOffset;
+    }
+
+  vtkIdType GetTrackIdForSceneElement(vtkIdType sceneElementId)
+    {
+    return sceneElementId + this->SceneElementIdsOffset;
+    }
+
+  void UpdateColorOfTracksOfType(int typeIndex, double *rgb);
+
+private:
+  vtkVgTrackModel(const vtkVgTrackModel&); // Not implemented.
+  void operator=(const vtkVgTrackModel&);  // Not implemented.
+
+  vtkVgTrackModel();
+  ~vtkVgTrackModel();
+
+  void SetAllTracksDisplayState(bool state);
+
+  void UpdateTemporalFiltering(vtkVgTrackInfo& info);
+  void UpdateSpatialFiltering(vtkVgTrackInfo& info);
+
+  void ClearTracks();
+
+  bool DisplayAllTracks;
+
+  bool ShowTracksBeforeStart;
+  bool ShowTracksAfterExpiration;
+
+  vtkVgTimeStamp ReferenceTimeStamp;
+  vtkVgTimeStamp MaxDisplayDuration;
+  vtkVgTimeStamp TrackExpirationOffset;
+
+  vtkPoints* Points;
+
+  std::string ActiveScalarsName;
+
+  vtkIdType SceneElementIdsOffset;
+
+  struct vtkInternal;
+  vtkInternal* Internal;
+};
+
+#endif // __vtkVgTrackModel_h
diff --git a/Libraries/VtkVgModelView/vtkVgTrackModelCollection.cxx b/Libraries/VtkVgModelView/vtkVgTrackModelCollection.cxx
new file mode 100644
index 00000000..c3ea7d16
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackModelCollection.cxx
@@ -0,0 +1,188 @@
+
+#include "vtkVgTrackModelCollection.h"
+
+// VisGUI includes.
+#include "vtkVgTrackModel.h"
+#include "vtkVgTrackInfo.h"
+
+#include <vtkVgTrack.h>
+
+
+// VTK includes.
+#include <vtkObjectFactory.h>
+
+// C++ includes.
+#include <algorithm>
+#include <list>
+
+vtkStandardNewMacro(vtkVgTrackModelCollection);
+
+//-----------------------------------------------------------------------------
+// Pimpl implementation.
+class vtkVgTrackModelCollection::Internal
+{
+public:
+
+  Internal()
+    {
+    this->InternalTrackModel = vtkVgTrackModel::SmartPtr::New();
+
+    this->TrackModels.push_back(this->InternalTrackModel);
+    }
+
+  ~Internal()
+    {
+    this->TrackModels.clear();
+    }
+
+  void AddTracks(vtkVgTrackModel* otherTrackModel);
+
+  vtkVgTrackModel::SmartPtr InternalTrackModel;
+
+  std::list<vtkVgTrackModel::SmartPtr> TrackModels;
+
+  typedef std::list<vtkVgTrackModel::SmartPtr>::iterator Itr;
+  typedef std::list<vtkVgTrackModel::SmartPtr>::const_iterator ConstItr;
+};
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModelCollection::Internal::AddTracks(vtkVgTrackModel* otherTrackModel)
+{
+  vtkVgTrack* track;
+  this->InternalTrackModel->InitTrackTraversal();
+
+  while ((track = this->InternalTrackModel->GetNextTrack().GetTrack()))
+    {
+    otherTrackModel->AddTrack(track);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackModelCollection::vtkVgTrackModelCollection() : vtkObject()
+{
+  this->Implementation = new Internal();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackModelCollection::~vtkVgTrackModelCollection()
+{
+  delete this->Implementation; this->Implementation = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModelCollection::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Number of track models in the collection: "
+     << (this->Implementation->TrackModels.size() - 1) << "\n";
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModelCollection::AddTrack(vtkVgTrack* track)
+{
+  if (!track)
+    {
+    vtkErrorMacro("ERROR: Invalid (or NULL) track \n");
+    return;
+    }
+
+  Internal::Itr itr = this->Implementation->TrackModels.begin();
+
+  if (!track->GetPoints())
+    {
+    track->SetPoints(this->Implementation->InternalTrackModel->GetPoints());
+    }
+  else if (track->GetPoints() !=
+           this->Implementation->InternalTrackModel->GetPoints())
+    {
+    vtkWarningMacro("ERROR: Points in incoming track does not match internal points \n");
+    track->SetPoints(this->Implementation->InternalTrackModel->GetPoints());
+    }
+
+  for (; itr != this->Implementation->TrackModels.end(); ++itr)
+    {
+    (*itr)->AddTrack(track);
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModelCollection::RemoveTrack(vtkIdType id)
+{
+  Internal::Itr itr = this->Implementation->TrackModels.begin();
+
+  for (; itr != this->Implementation->TrackModels.end(); ++itr)
+    {
+    (*itr)->RemoveTrack(id);
+    }
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrack* vtkVgTrackModelCollection::GetTrack(vtkIdType id)
+{
+  return this->Implementation->InternalTrackModel->GetTrack(id);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackModel* vtkVgTrackModelCollection::GetInternalTrackModel()
+{
+  return this->Implementation->InternalTrackModel;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModelCollection::AddTrackModel(vtkVgTrackModel* trackModel)
+{
+  if (!trackModel)
+    {
+    vtkErrorMacro("ERROR: Invalid (or NULL) track model \n");
+    return;
+    }
+
+  // Check if the track model already exists.
+  std::list<vtkVgTrackModel::SmartPtr>::iterator itr =
+    std::find(this->Implementation->TrackModels.begin(),
+              this->Implementation->TrackModels.end(),  trackModel);
+
+  if (itr != this->Implementation->TrackModels.end())
+    {
+    return;
+    }
+
+  // Make sure that all track models with in this collection are sharing
+  // same vtkPoints.
+  if (trackModel->GetPoints() !=
+      this->Implementation->InternalTrackModel->GetPoints())
+    {
+    vtkWarningMacro("WARNING: Points in incoming track model does not match internal points \n");
+
+    trackModel->SetPoints(
+      this->Implementation->InternalTrackModel->GetPoints());
+    }
+
+  this->Implementation->TrackModels.push_back(trackModel);
+
+  // Add current tracks to the newly added track model.
+  this->Implementation->AddTracks(trackModel);
+
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackModelCollection::RemoveTrackModel(vtkVgTrackModel* trackModel)
+{
+  if (!trackModel)
+    {
+    vtkErrorMacro("ERROR: Invalid (or NULL) track model \n");
+    return;
+    }
+
+  this->Implementation->TrackModels.remove(trackModel);
+
+  this->Modified();
+}
+
+
diff --git a/Libraries/VtkVgModelView/vtkVgTrackModelCollection.h b/Libraries/VtkVgModelView/vtkVgTrackModelCollection.h
new file mode 100644
index 00000000..c74ec460
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackModelCollection.h
@@ -0,0 +1,74 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrackModelCollection_h
+#define __vtkVgTrackModelCollection_h
+
+// VisGUI includes.
+#include <vtkVgMacros.h>
+
+// VTK includes.
+#include <vtkObject.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgTrack;
+class vtkVgTrackModel;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgTrackModelCollection : public vtkObject
+{
+public:
+  // Description:
+  // Macro defined for SmartPtr.
+  vtkVgClassMacro(vtkVgTrackModelCollection);
+
+  // Description:
+  // Macro defined for object hierarchy and internal management.
+  vtkTypeMacro(vtkVgTrackModelCollection, vtkObject);
+
+  // Description:
+  // Print information about data members.
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Create a new instance of this class.
+  static vtkVgTrackModelCollection* New();
+
+  // Description:
+  // Add/Remove \c vtkVgTrack to/from known track models.
+  void AddTrack(vtkVgTrack* track);
+  void RemoveTrack(vtkIdType id);
+
+  // Description:
+  // Get a track give a track id.
+  vtkVgTrack* GetTrack(vtkIdType id);
+
+  // Description:
+  // Provide access to the internal model.
+  vtkVgTrackModel* GetInternalTrackModel();
+
+  // Description:
+  // Add/Remove \c vtkVgTrackModel to/from internal store of track models.
+  void AddTrackModel(vtkVgTrackModel* trackModel);
+  void RemoveTrackModel(vtkVgTrackModel* trackModel);
+
+
+protected:
+  vtkVgTrackModelCollection();
+  virtual ~vtkVgTrackModelCollection();
+
+
+private:
+
+  class Internal;
+  Internal* Implementation;
+
+  vtkVgTrackModelCollection(const vtkVgTrackModelCollection&);  // Not implemented.
+  void operator= (const vtkVgTrackModelCollection&);            // Not implemented.
+};
+
+#endif // __vtkVgTrackModelCollection_h
diff --git a/Libraries/VtkVgModelView/vtkVgTrackRepresentation.cxx b/Libraries/VtkVgModelView/vtkVgTrackRepresentation.cxx
new file mode 100644
index 00000000..a1252642
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackRepresentation.cxx
@@ -0,0 +1,763 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrackRepresentation.h"
+
+#include "vtkVgContourOperatorManager.h"
+#include "vtkVgPickData.h"
+#include "vtkVgPicker.h"
+#include "vtkVgTrackFilter.h"
+#include "vtkVgTrackModel.h"
+#include "vtkVgTrack.h"
+
+#include <vtkVgCellPicker.h>
+#include <vtkVgClipPolyData.h>
+#include <vtkVgColorUtil.h>
+
+#include <vtkActor.h>
+#include <vtkCellArray.h>
+#include <vtkCellData.h>
+#include <vtkCharArray.h>
+#include <vtkIdList.h>
+#include <vtkIdListCollection.h>
+#include <vtkImplicitBoolean.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPolyData.h>
+#include <vtkPolyDataCollection.h>
+#include <vtkPolyDataMapper.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkSmartPointer.h>
+#include <vtkTransform.h>
+
+// C/C++ includes
+#include <cassert>
+#include <set>
+
+vtkStandardNewMacro(vtkVgTrackRepresentation);
+
+typedef std::set<vtkIdType> TrackIdSet;
+
+//----------------------------------------------------------------------------
+class vtkVgTrackRepresentation::vtkInternal
+{
+public:
+  vtkPolyData*    ActiveTrackPolyData;
+  vtkCellArray*   ActiveTrackVerts;
+  vtkCellArray*   ActiveTrackLines;
+  vtkIdTypeArray* ActiveTrackIds;
+  vtkVgClipPolyData* ActiveSelectorClipPolyData;
+  vtkVgClipPolyData* ActiveFilterClipPolyData;
+  vtkCharArray*   ActiveSkipClipCells;
+
+  vtkPolyData*    ExpiringTrackPolyData;
+  vtkCellArray*   ExpiringTrackVerts;
+  vtkCellArray*   ExpiringTrackLines;
+  vtkIdTypeArray* ExpiringTrackIds;
+  vtkVgClipPolyData* ExpiringSelectorClipPolyData;
+  vtkVgClipPolyData* ExpiringFilterClipPolyData;
+  vtkCharArray*   ExpiringSkipClipCells;
+
+  // Variables to support verts/lines ordering issue in vtkPolyData
+  vtkCharArray*   TemporarySkipClipCells;
+  vtkIdTypeArray* TemporaryTrackIds;
+  vtkUnsignedCharArray* TemporaryColors;
+  vtkCharArray*   TemporaryExpiringSkipClipCells;
+  vtkIdTypeArray* TemporaryExpiringTrackIds;
+  vtkUnsignedCharArray* TemporaryExpiringColors;
+
+  TrackIdSet ForceShownTracks;
+
+  vtkInternal()
+    {
+    this->ActiveTrackPolyData = vtkPolyData::New();
+    this->ActiveTrackVerts = vtkCellArray::New();
+    this->ActiveTrackPolyData->SetVerts(this->ActiveTrackVerts);
+    this->ActiveTrackVerts->FastDelete();
+    this->ActiveTrackLines = vtkCellArray::New();
+    this->ActiveTrackPolyData->SetLines(this->ActiveTrackLines);
+    this->ActiveTrackLines->FastDelete();
+    this->ActiveTrackIds = vtkIdTypeArray::New();
+    this->ActiveTrackIds->SetName("Track Ids");
+    this->ActiveTrackPolyData->GetCellData()->AddArray(this->ActiveTrackIds);
+    this->ActiveTrackIds->FastDelete();
+    this->ActiveSkipClipCells = vtkCharArray::New();
+    this->ActiveSkipClipCells->SetName("Skip Cells");
+    this->ActiveTrackPolyData->GetCellData()->AddArray(this->ActiveSkipClipCells);
+    this->ActiveSkipClipCells->FastDelete();
+    this->ActiveSelectorClipPolyData = vtkVgClipPolyData::New();
+    this->ActiveSelectorClipPolyData->InsideOutOn();
+    this->ActiveFilterClipPolyData = vtkVgClipPolyData::New();
+    this->ActiveFilterClipPolyData->InsideOutOff();
+
+    // selector input (when used), will always be the raw poly data; filter input
+    // could be the selector or the raw poly data
+    this->ActiveSelectorClipPolyData->SetInputData(this->ActiveTrackPolyData);
+
+    this->ExpiringTrackPolyData = vtkPolyData::New();
+    this->ExpiringTrackIds = vtkIdTypeArray::New();
+    this->ExpiringTrackIds->SetName("Track Ids");
+    this->ExpiringTrackPolyData->GetCellData()->AddArray(this->ExpiringTrackIds);
+    this->ExpiringTrackIds->FastDelete();
+    this->ExpiringSkipClipCells = vtkCharArray::New();
+    this->ExpiringSkipClipCells->SetName("Skip Cells");
+    this->ExpiringTrackPolyData->GetCellData()->AddArray(this->ExpiringSkipClipCells);
+    this->ExpiringSkipClipCells->FastDelete();
+    this->ExpiringTrackVerts = vtkCellArray::New();
+    this->ExpiringTrackPolyData->SetVerts(this->ExpiringTrackVerts);
+    this->ExpiringTrackVerts->FastDelete();
+    this->ExpiringTrackLines = vtkCellArray::New();
+    this->ExpiringTrackPolyData->SetLines(this->ExpiringTrackLines);
+    this->ExpiringTrackLines->FastDelete();
+    this->ExpiringSelectorClipPolyData = vtkVgClipPolyData::New();
+    this->ExpiringSelectorClipPolyData->InsideOutOn();
+    this->ExpiringFilterClipPolyData = vtkVgClipPolyData::New();
+    this->ExpiringFilterClipPolyData->InsideOutOff();
+
+    // selector input (when used), will always be the raw poly data; filter input
+    // could be the selector or the raw poly data
+    this->ExpiringSelectorClipPolyData->SetInputData(this->ExpiringTrackPolyData);
+
+    this->TemporarySkipClipCells = vtkCharArray::New();
+    this->TemporaryTrackIds = vtkIdTypeArray::New();
+    this->TemporaryColors = vtkUnsignedCharArray::New();
+    this->TemporaryColors->SetNumberOfComponents(3);
+
+    this->TemporaryExpiringSkipClipCells = vtkCharArray::New();
+    this->TemporaryExpiringTrackIds = vtkIdTypeArray::New();
+    this->TemporaryExpiringColors = vtkUnsignedCharArray::New();
+    this->TemporaryExpiringColors->SetNumberOfComponents(3);
+    }
+
+  ~vtkInternal()
+    {
+    this->ActiveTrackPolyData->Delete();
+    this->ExpiringTrackPolyData->Delete();
+    this->ActiveSelectorClipPolyData->Delete();
+    this->ActiveFilterClipPolyData->Delete();
+    this->ExpiringSelectorClipPolyData->Delete();
+    this->ExpiringFilterClipPolyData->Delete();
+    this->TemporarySkipClipCells->Delete();
+    this->TemporaryTrackIds->Delete();
+    this->TemporaryColors->Delete();
+    this->TemporaryExpiringSkipClipCells->Delete();
+    this->TemporaryExpiringTrackIds->Delete();
+    this->TemporaryExpiringColors->Delete();
+    }
+};
+
+//-----------------------------------------------------------------------------
+vtkVgTrackRepresentation::vtkVgTrackRepresentation()
+{
+  this->Internal = new vtkInternal();
+
+  this->Visible = true;
+
+  vtkPolyDataMapper* mapper = vtkPolyDataMapper::New();
+  mapper->SetInputData(this->Internal->ActiveTrackPolyData);
+  this->TrackActor = vtkActor::New();
+  this->TrackActor->SetMapper(mapper);
+  this->TrackActor->GetProperty()->SetColor(1.0, 1.0, 1.0);
+  this->TrackActor->GetProperty()->SetLineWidth(3);
+  this->TrackActor->GetProperty()->SetPointSize(3);
+  mapper->FastDelete();
+
+  vtkPolyDataMapper* mapper2 = vtkPolyDataMapper::New();
+  mapper2->SetInputData(this->Internal->ExpiringTrackPolyData);
+  this->ExpiringTrackActor = vtkActor::New();
+  this->ExpiringTrackActor->SetMapper(mapper2);
+  this->ExpiringTrackActor->GetProperty()->SetColor(0.8, 0.8, 0.8);
+  this->ExpiringTrackActor->GetProperty()->SetLineWidth(2);
+  this->ExpiringTrackActor->GetProperty()->SetPointSize(2);
+  mapper2->FastDelete();
+
+  // Use same transform for both Track and ExpiringTrack
+  this->ActorTransform = vtkSmartPointer<vtkTransform>::New();
+  this->TrackActor->SetUserTransform(this->ActorTransform);
+  this->ExpiringTrackActor->SetUserTransform(this->ActorTransform);
+
+  this->ZOffset = 0;
+
+  vtkUnsignedCharArray* scalars = vtkUnsignedCharArray::New();
+  scalars->SetNumberOfComponents(3);
+  scalars->SetName("Track Color");
+  this->Internal->ActiveTrackPolyData->GetCellData()->SetScalars(scalars);
+  scalars->FastDelete();
+
+  scalars = vtkUnsignedCharArray::New();
+  scalars->SetNumberOfComponents(3);
+  scalars->SetName("Track Color");
+  this->Internal->ExpiringTrackPolyData->GetCellData()->SetScalars(scalars);
+  scalars->FastDelete();
+
+  // Make track actors imperceptibly translucent so that they will be rendered
+  // during the during the same phase of the pipeline as events. This is a hack
+  // that allows tracks to be rendered *after* events so that events can mask
+  // underlying tracks.
+  this->TrackActor->GetProperty()->SetOpacity(0.999);
+  this->ExpiringTrackActor->GetProperty()->SetOpacity(0.999);
+
+  // Support picking
+  this->Picker = vtkSmartPointer<vtkVgCellPicker>::New();
+  this->Picker->PickFromListOn();
+  this->Picker->SetTolerance(0.01);
+  this->PickPosition[0] = this->PickPosition[1] = this->PickPosition[2] = 0.0;
+
+  this->NewPropCollection    = vtkPropCollectionRef::New();
+  this->ActivePropCollection = vtkPropCollectionRef::New();
+  this->ExpirePropCollection = vtkPropCollectionRef::New();
+
+  this->NewPropCollection->AddItem(this->TrackActor);
+  this->NewPropCollection->AddItem(this->ExpiringTrackActor);
+
+  this->ActivePropCollection->AddItem(this->TrackActor);
+  this->ActivePropCollection->AddItem(this->ExpiringTrackActor);
+
+  this->OnlyDisplayForcedTracks = false;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackRepresentation::~vtkVgTrackRepresentation()
+{
+  this->TrackActor->Delete();
+  this->ExpiringTrackActor->Delete();
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackRepresentation::GetNewRenderObjects() const
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackRepresentation::GetActiveRenderObjects() const
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgTrackRepresentation::GetExpiredRenderObjects() const
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackRepresentation::GetNewRenderObjects()
+{
+  return this->NewPropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackRepresentation::GetActiveRenderObjects()
+{
+  return this->ActivePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgTrackRepresentation::GetExpiredRenderObjects()
+{
+  return this->ExpirePropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::ResetTemporaryRenderObjects()
+{
+  this->NewPropCollection->RemoveAllItems();
+  this->ExpirePropCollection->RemoveAllItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::SetVisible(int flag)
+{
+  if (flag == this->Visible)
+    {
+    return;
+    }
+
+  this->Visible = flag;
+  this->TrackActor->SetVisibility(
+    flag && this->Internal->ActiveTrackPolyData->GetNumberOfCells());
+  this->ExpiringTrackActor->SetVisibility(
+    flag && this->Internal->ExpiringTrackPolyData->GetNumberOfCells());
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::Update()
+{
+  if (!this->GetVisible())
+    {
+    return;
+    }
+
+  this->SetupPipelineForFiltersAndSelectors();
+
+  assert(this->ActorTransform ==
+         static_cast<vtkTransform*>(this->TrackActor->GetUserTransform()));
+  assert(this->ActorTransform ==
+         static_cast<vtkTransform*>(this->ExpiringTrackActor->GetUserTransform()));
+
+  this->Internal->ActiveTrackVerts->Reset();
+  this->Internal->ActiveTrackLines->Reset();
+  this->Internal->ExpiringTrackVerts->Reset();
+  this->Internal->ExpiringTrackLines->Reset();
+
+  this->Internal->ActiveTrackIds->Reset();
+  this->Internal->ExpiringTrackIds->Reset();
+
+  this->Internal->TemporarySkipClipCells->Reset();
+  this->Internal->TemporaryTrackIds->Reset();
+  this->Internal->TemporaryColors->Reset();
+  this->Internal->TemporaryExpiringSkipClipCells->Reset();
+  this->Internal->TemporaryExpiringTrackIds->Reset();
+  this->Internal->TemporaryExpiringColors->Reset();
+
+  this->Internal->ActiveTrackPolyData->GetCellData()->GetScalars()->Reset();
+  this->Internal->ExpiringTrackPolyData->GetCellData()->GetScalars()->Reset();
+
+  this->Internal->ActiveSkipClipCells->Reset();
+  this->Internal->ExpiringSkipClipCells->Reset();
+
+  // not the best place for the allocate, but it doesn't do anything after the
+  // 1st allocation.
+  int numTracks = this->TrackModel->GetNumberOfTracks();
+  this->Internal->ActiveTrackIds->Allocate(numTracks);
+  this->Internal->ExpiringTrackIds->Allocate(numTracks);
+  this->Internal->ActiveSkipClipCells->Allocate(numTracks);
+  this->Internal->ExpiringSkipClipCells->Allocate(numTracks);
+
+  this->Internal->TemporaryTrackIds->Allocate(numTracks);
+  this->Internal->TemporaryColors->Allocate(3 * numTracks);
+  this->Internal->TemporarySkipClipCells->Allocate(numTracks);
+
+  this->Internal->TemporaryExpiringTrackIds->Allocate(numTracks);
+  this->Internal->TemporaryExpiringColors->Allocate(3 * numTracks);
+  this->Internal->TemporaryExpiringSkipClipCells->Allocate(numTracks);
+
+  this->Internal->ActiveTrackPolyData->SetPoints(this->TrackModel->GetPoints());
+  this->Internal->ExpiringTrackPolyData->SetPoints(this->TrackModel->GetPoints());
+
+  vtkVgTimeStamp currFrame = this->TrackModel->GetCurrentTimeStamp();
+
+  TrackIdSet& forceShownTracks = this->Internal->ForceShownTracks;
+
+  vtkUnsignedCharArray* activeColors =
+    vtkUnsignedCharArray::SafeDownCast(
+      this->Internal->ActiveTrackPolyData->GetCellData()->GetScalars());
+
+  vtkUnsignedCharArray* expiredColors =
+    vtkUnsignedCharArray::SafeDownCast(
+      this->Internal->ExpiringTrackPolyData->GetCellData()->GetScalars());
+
+  // add 'force shown' tracks
+  bool showExtraTracks = forceShownTracks.size() != 0;
+  if (showExtraTracks)
+    {
+    TrackIdSet::iterator itr = forceShownTracks.begin();
+    for (TrackIdSet::iterator end(forceShownTracks.end()); itr != end; ++itr)
+      {
+      vtkVgTrackInfo info = this->TrackModel->GetTrackInfo(*itr);
+      if (!info.GetTrack())
+        {
+        continue;
+        }
+
+      this->AddTrackRep(info.GetTrack(), currFrame, true,
+                        info, activeColors, expiredColors);
+      }
+    }
+
+  // build polydata for displayed tracks
+  if (!this->OnlyDisplayForcedTracks)
+    {
+    vtkVgTrackInfo trackInfo;
+    this->TrackModel->InitTrackTraversal();
+    while ((trackInfo = this->TrackModel->GetNextDisplayedTrack()).GetTrack())
+      {
+      vtkVgTrack* track = trackInfo.GetTrack();
+      if (track == this->ExcludedTrack)
+        {
+        continue;
+        }
+      unsigned int mask = this->GetDisplayMask();
+      if ((mask & track->GetDisplayFlags()) != mask)
+        {
+        continue;
+        }
+      if (this->TrackFilter && this->TrackFilter->GetBestClassifier(track) < 0)
+        {
+        continue;
+        }
+
+      // make sure we don't add the same track twice
+      if (!showExtraTracks ||
+          forceShownTracks.find(track->GetId()) == forceShownTracks.end())
+        {
+        this->AddTrackRep(track, currFrame, false,
+                          trackInfo, activeColors, expiredColors);
+        }
+      }
+    }
+
+  if (this->Internal->TemporaryTrackIds->GetNumberOfTuples())
+    {
+    this->AppendArray(this->Internal->ActiveTrackIds,
+                      this->Internal->TemporaryTrackIds,
+                      this->Internal->TemporaryTrackIds->GetPointer(0));
+    this->AppendArray(activeColors, this->Internal->TemporaryColors,
+                      this->Internal->TemporaryColors->GetPointer(0));
+    this->AppendArray(this->Internal->ActiveSkipClipCells,
+                      this->Internal->TemporarySkipClipCells,
+                      this->Internal->TemporarySkipClipCells->GetPointer(0));
+    }
+  if (this->Internal->TemporaryExpiringTrackIds->GetNumberOfTuples())
+    {
+    this->AppendArray(this->Internal->ExpiringTrackIds,
+                      this->Internal->TemporaryExpiringTrackIds,
+                      this->Internal->TemporaryExpiringTrackIds->GetPointer(0));
+    this->AppendArray(expiredColors, this->Internal->TemporaryExpiringColors,
+                      this->Internal->TemporaryExpiringColors->GetPointer(0));
+    this->AppendArray(
+      this->Internal->ExpiringSkipClipCells,
+      this->Internal->TemporaryExpiringSkipClipCells,
+      this->Internal->TemporaryExpiringSkipClipCells->GetPointer(0));
+    }
+
+  // An actor should only be visible if there is at least one cell to
+  // display because the bounds of an "empty" polydata actor are determined
+  // from its points; we may be storing points in image and points world
+  // coordinates in the same vtkPoints but using only one or the other -
+  // if there is nothing to display for a frame, the bounds might then be
+  // computed incorrectly.
+  this->ExpiringTrackActor->SetVisibility(
+    this->Internal->ExpiringTrackPolyData->GetNumberOfCells());
+  this->TrackActor->SetVisibility(
+    this->Internal->ActiveTrackPolyData->GetNumberOfCells());
+
+  this->Internal->ExpiringTrackPolyData->Modified();
+  this->Internal->ExpiringTrackPolyData->DeleteCells();
+
+  this->Internal->ActiveTrackPolyData->Modified();
+  this->Internal->ActiveTrackPolyData->DeleteCells();
+
+  // Finally, setup the transform.  Test the RepresentationMatrix against
+  // a single point in our result if (any), to determine whether or not to
+  // multiply through by -1 to handle OpenGL issue with -1 homogeneous
+  // coordinate
+  vtkSmartPointer<vtkPolyDataCollection> polyDataCollection =
+    vtkSmartPointer<vtkPolyDataCollection>::New();
+  polyDataCollection->AddItem(this->Internal->ActiveTrackPolyData);
+  polyDataCollection->AddItem(this->Internal->ExpiringTrackPolyData);
+  this->SetupActorTransform(polyDataCollection, this->RepresentationMatrix,
+                            this->ActorTransform);
+
+  // finish setting up the transform
+  this->ActorTransform->Translate(0.0, 0.0, this->ZOffset +
+    vtkVgRepresentationBase::GetZOffset(this->TrackActor));
+
+  this->UpdateTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::AddTrackRep(vtkVgTrack* track,
+                                           vtkVgTimeStamp& currFrame,
+                                           bool displayRegardlessOfFrame,
+                                           const vtkVgTrackInfo& info,
+                                           vtkUnsignedCharArray* activeColors,
+                                           vtkUnsignedCharArray* expiredColors)
+{
+  // TODO: Clean up this code
+  vtkVgTrackDisplayData displayData =
+    this->TrackModel->GetTrackDisplayData(track, displayRegardlessOfFrame);
+  if (!displayData.IdsStart)
+    {
+    return;
+    }
+
+  const double* color;
+  unsigned char activeRGB[3];
+  unsigned char expiredRGB[3];
+
+  if (!this->UsingPerFrameColors())
+    {
+    color = this->GetTrackColor(info);
+    vtkVgColorUtil::convertMultiplied(color, this->ColorMultiplier, activeRGB);
+
+    // Use a slightly darker shade for expired tracks
+    const double expiredMultiplier = this->ColorMultiplier * 0.7;
+    vtkVgColorUtil::convertMultiplied(color, expiredMultiplier, expiredRGB);
+    }
+
+  if (currFrame < track->GetStartFrame() || track->GetEndFrame() < currFrame)
+    {
+    if (displayData.NumIds == 1)   // Verts (single/1st pt of track)
+      {
+      this->Internal->ExpiringTrackVerts->InsertNextCell(1, displayData.IdsStart);
+      if (this->UsingPerFrameColors())
+        {
+        color = this->GetTrackColor(info, displayData.Scalars[0]);
+        vtkVgColorUtil::convertMultiplied(color, this->ColorMultiplier,
+                                          expiredRGB);
+        }
+
+      expiredColors->InsertNextTupleValue(expiredRGB);
+
+      this->Internal->ExpiringTrackIds->InsertNextValue(track->GetId());
+      this->Internal->ExpiringSkipClipCells->InsertNextValue(
+        displayRegardlessOfFrame ? 1 : 0);
+      }
+    else // Lines
+      {
+      if (!this->UsingPerFrameColors())
+        {
+        this->Internal->ExpiringTrackLines->InsertNextCell(displayData.NumIds,
+            displayData.IdsStart);
+        this->Internal->TemporaryExpiringColors->InsertNextTupleValue(expiredRGB);
+        this->Internal->TemporaryExpiringTrackIds->InsertNextValue(track->GetId());
+        this->Internal->TemporaryExpiringSkipClipCells->InsertNextValue(
+          displayRegardlessOfFrame ? 1 : 0);
+        }
+      else
+        {
+        // Number of cells = number of points - 1
+        int numberOfIds = static_cast<int>(displayData.NumIds) - 1;
+        for (int i = 0; i < numberOfIds; ++i)
+          {
+          this->Internal->ExpiringTrackLines->InsertNextCell(
+            2, displayData.IdsStart + i);
+
+          color = this->GetTrackColor(info, displayData.Scalars[i]);
+          vtkVgColorUtil::convertMultiplied(color, this->ColorMultiplier,
+                                            expiredRGB);
+          this->Internal->TemporaryExpiringColors->InsertNextTupleValue(expiredRGB);
+          this->Internal->TemporaryExpiringTrackIds->InsertNextValue(track->GetId());
+          this->Internal->TemporaryExpiringSkipClipCells->InsertNextValue(
+            displayRegardlessOfFrame ? 1 : 0);
+          }
+        }
+      }
+    }
+  else
+    {
+    if (displayData.NumIds == 1)   // Verts (single/1st pt of track)
+      {
+      if (this->UsingPerFrameColors())
+        {
+        color = this->GetTrackColor(info, displayData.Scalars[0]);
+        vtkVgColorUtil::convertMultiplied(color, this->ColorMultiplier,
+                                          activeRGB);
+        }
+
+      this->Internal->ActiveTrackVerts->InsertNextCell(1, displayData.IdsStart);
+      activeColors->InsertNextTupleValue(activeRGB);
+      this->Internal->ActiveTrackIds->InsertNextValue(track->GetId());
+      this->Internal->ActiveSkipClipCells->InsertNextValue(
+        displayRegardlessOfFrame ? 1 : 0);
+      }
+    else // Lines
+      {
+      if (!this->UsingPerFrameColors())
+        {
+        this->Internal->ActiveTrackLines->InsertNextCell(displayData.NumIds,
+                                                         displayData.IdsStart);
+        this->Internal->TemporaryColors->InsertNextTupleValue(activeRGB);
+        this->Internal->TemporaryTrackIds->InsertNextValue(track->GetId());
+        this->Internal->TemporarySkipClipCells->InsertNextValue(
+          displayRegardlessOfFrame ? 1 : 0);
+        }
+      else
+        {
+        // Number of cells = number of points - 1
+        int numberOfIds = static_cast<int>(displayData.NumIds) - 1;
+        for (int i = 0; i < numberOfIds; ++i)
+          {
+          this->Internal->ActiveTrackLines->InsertNextCell(2,
+              displayData.IdsStart + i);
+
+          color = this->GetTrackColor(info, displayData.Scalars[i]);
+          vtkVgColorUtil::convertMultiplied(color, this->ColorMultiplier,
+                                            activeRGB);
+          this->Internal->TemporaryColors->InsertNextTupleValue(activeRGB);
+          this->Internal->TemporaryTrackIds->InsertNextValue(track->GetId());
+          this->Internal->TemporarySkipClipCells->InsertNextValue(
+            displayRegardlessOfFrame ? 1 : 0);
+          }
+        }
+
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrackRepresentation::Pick(double renX, double renY,
+                                         vtkRenderer* ren, vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+
+  if (!this->GetVisible())
+    {
+    return -1;
+    }
+
+  this->Picker->InitializePickList();
+
+  this->Picker->AddPickList(this->TrackActor);
+  this->Picker->AddPickList(this->ExpiringTrackActor);
+
+  int pickStatus = this->Picker->Pick(renX, renY, 0.0, ren);
+
+  if (pickStatus)
+    {
+    vtkIdType cellId = this->Picker->GetCellId();
+    this->Picker->GetPickPosition(this->PickPosition);
+    vtkIdTypeArray* da =
+      dynamic_cast<vtkIdTypeArray*>(
+        this->Picker->GetDataSet()->GetCellData()->GetArray("Track Ids"));
+    if (!da)
+      {
+      return -1;
+      }
+    vtkIdType trackId = da->GetValue(cellId);
+    pickType = vtkVgPickData::PickedTrack;
+    return trackId;
+    }
+
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::ForceShowTracks(vtkIdList* ids)
+{
+  vtkIdType* idsArray = ids->GetPointer(0);
+  this->Internal->ForceShownTracks.insert(idsArray,
+                                          idsArray + ids->GetNumberOfIds());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::ClearForceShownTracks()
+{
+  if (!this->Internal->ForceShownTracks.empty())
+    {
+    this->Internal->ForceShownTracks.clear();
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::SetupPipelineForFiltersAndSelectors()
+{
+  // nothing to do if we don't have "contours"
+  if (!this->ContourOperatorManager)
+    {
+    return;
+    }
+
+  bool useSelectors = this->ContourOperatorManager->GetNumberOfEnabledSelectors() ?
+                      true : false;
+  bool useFilters = this->ContourOperatorManager->GetNumberOfEnabledFilters() ?
+                    true : false;
+
+  vtkPolyDataMapper* trackMapper = vtkPolyDataMapper::SafeDownCast(
+    this->TrackActor->GetMapper());
+  vtkPolyDataMapper* expiringTrackMapper = vtkPolyDataMapper::SafeDownCast(
+    this->ExpiringTrackActor->GetMapper());
+
+  if (!useSelectors && !useFilters)
+    {
+    trackMapper->SetInputData(
+      this->Internal->ActiveTrackPolyData);
+    expiringTrackMapper->SetInputData(
+      this->Internal->ExpiringTrackPolyData);
+    }
+  else if (useSelectors)  // where does the output of the selector go
+    {
+    this->Internal->ActiveSelectorClipPolyData->SetClipFunction(
+      this->ContourOperatorManager->GetSelectorBoolean());
+    this->Internal->ExpiringSelectorClipPolyData->SetClipFunction(
+      this->ContourOperatorManager->GetSelectorBoolean());
+    if (useFilters)
+      {
+      this->Internal->ActiveFilterClipPolyData->SetInputConnection(
+        this->Internal->ActiveSelectorClipPolyData->GetOutputPort());
+      this->Internal->ExpiringFilterClipPolyData->SetInputConnection(
+        this->Internal->ExpiringSelectorClipPolyData->GetOutputPort());
+      }
+    else
+      {
+      trackMapper->SetInputConnection(
+        this->Internal->ActiveSelectorClipPolyData->GetOutputPort());
+      expiringTrackMapper->SetInputConnection(
+        this->Internal->ExpiringSelectorClipPolyData->GetOutputPort());
+      }
+    }
+
+  if (useFilters)
+    {
+    this->Internal->ActiveFilterClipPolyData->SetClipFunction(
+      this->ContourOperatorManager->GetFilterBoolean());
+    this->Internal->ExpiringFilterClipPolyData->SetClipFunction(
+      this->ContourOperatorManager->GetFilterBoolean());
+
+    if (!useSelectors)
+      {
+      this->Internal->ActiveFilterClipPolyData->SetInputData(
+        this->Internal->ActiveTrackPolyData);
+      this->Internal->ExpiringFilterClipPolyData->SetInputData(
+        this->Internal->ExpiringTrackPolyData);
+      }
+    trackMapper->SetInputConnection(
+      this->Internal->ActiveFilterClipPolyData->GetOutputPort());
+    expiringTrackMapper->SetInputConnection(
+      this->Internal->ExpiringFilterClipPolyData->GetOutputPort());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::SetActiveTrackLineWidth(float width)
+{
+  this->TrackActor->GetProperty()->SetLineWidth(width);
+  this->TrackActor->GetProperty()->SetPointSize(width);
+}
+
+//-----------------------------------------------------------------------------
+float vtkVgTrackRepresentation::GetActiveTrackLineWidth()
+{
+  return this->TrackActor->GetProperty()->GetLineWidth();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::SetExpiringTrackLineWidth(float width)
+{
+  this->ExpiringTrackActor->GetProperty()->SetLineWidth(width);
+  this->ExpiringTrackActor->GetProperty()->SetPointSize(width);
+}
+
+//-----------------------------------------------------------------------------
+float vtkVgTrackRepresentation::GetExpiringTrackLineWidth()
+{
+  return this->ExpiringTrackActor->GetProperty()->GetLineWidth();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentation::AppendArray(vtkDataArray* base,
+                                           vtkDataArray* add,
+                                           void* addPointer)
+{
+  void* writePointer = base->WriteVoidPointer(
+    base->GetNumberOfTuples() * base->GetNumberOfComponents(),
+    add->GetNumberOfTuples() * add->GetNumberOfComponents());
+  memcpy(writePointer, addPointer,
+         add->GetNumberOfTuples() * add->GetNumberOfComponents() *
+         add->GetElementComponentSize());
+}
diff --git a/Libraries/VtkVgModelView/vtkVgTrackRepresentation.h b/Libraries/VtkVgModelView/vtkVgTrackRepresentation.h
new file mode 100644
index 00000000..3b94fc06
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackRepresentation.h
@@ -0,0 +1,134 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrackRepresentation_h
+#define __vtkVgTrackRepresentation_h
+
+#include "vtkVgTrackRepresentationBase.h"
+
+#include "vtkVgTimeStamp.h"
+
+#include <vgExport.h>
+
+class vtkActor;
+class vtkDataArray;
+class vtkIdList;
+class vtkPoints;
+class vtkRenderer;
+class vtkTransform;
+class vtkUnsignedCharArray;
+class vtkVgCellPicker;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgTrackRepresentation
+  : public vtkVgTrackRepresentationBase
+{
+public:
+  vtkVgClassMacro(vtkVgTrackRepresentation);
+  vtkTypeMacro(vtkVgTrackRepresentation, vtkVgTrackRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgTrackRepresentation* New();
+
+  // Description:
+  // Return all the objects that can be rendered.
+  virtual const vtkPropCollection* GetNewRenderObjects() const;
+  virtual const vtkPropCollection* GetActiveRenderObjects() const;
+  virtual const vtkPropCollection* GetExpiredRenderObjects() const;
+
+  virtual vtkPropCollection* GetNewRenderObjects();
+  virtual vtkPropCollection* GetActiveRenderObjects();
+  virtual vtkPropCollection* GetExpiredRenderObjects();
+
+  virtual void ResetTemporaryRenderObjects();
+
+  // Description:
+  virtual void SetVisible(int flag);
+  virtual int  GetVisible() const { return this->Visible; }
+
+  // Description:
+  // Update the representation in preparation for rendering.
+  virtual void Update();
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked trackId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the track is currently visible or not.
+  virtual vtkIdType Pick(double renX, double renY, vtkRenderer* ren, vtkIdType& pickType);
+
+  // Description:
+  // After a successful pick occurs, return the position of the pick (in
+  // world coordinates).
+  vtkGetVector3Macro(PickPosition, double);
+
+  // Description:
+  // Set/Get whether display of tracks should be limited to only those
+  // tracks that are "forced" on.  In other words, if this variable is true,
+  // tracks that are "on" in the model will not be displayed (unless forced)
+  vtkSetMacro(OnlyDisplayForcedTracks, bool);
+  vtkGetMacro(OnlyDisplayForcedTracks, bool);
+  vtkBooleanMacro(OnlyDisplayForcedTracks, bool);
+
+  // Description:
+  // Set/Clear tracks which are "forced" on, regardless of visibility state in
+  // the model.
+  void ForceShowTracks(vtkIdList* ids);
+  void ClearForceShownTracks();
+
+  // Description:
+  // Set/Get the Z offset to be applied to the track and expiring track actors
+  // Note: the Z_OFFSET of the prop will be added to get final Z offset
+  vtkSetMacro(ZOffset, double);
+  vtkGetMacro(ZOffset, double);
+
+  // Description:
+  // Set/Get the line width to be applied to the track actors.
+  void  SetActiveTrackLineWidth(float width);
+  float GetActiveTrackLineWidth();
+
+  // Description:
+  // Set/Get the line width to be applied to the track actors.
+  void  SetExpiringTrackLineWidth(float width);
+  float GetExpiringTrackLineWidth();
+
+private:
+  vtkVgTrackRepresentation(const vtkVgTrackRepresentation&); // Not implemented.
+  void operator=(const vtkVgTrackRepresentation&);           // Not implemented.
+
+  vtkVgTrackRepresentation();
+  virtual ~vtkVgTrackRepresentation();
+
+  void AddTrackRep(vtkVgTrack* track, vtkVgTimeStamp& currFrame,
+                   bool displayRegardlessOfFrame, const vtkVgTrackInfo &info,
+                   vtkUnsignedCharArray* activeColors,
+                   vtkUnsignedCharArray* expiredColors);
+
+  void SetupPipelineForFiltersAndSelectors();
+
+  void AppendArray(vtkDataArray* base, vtkDataArray* add, void* addPointer);
+  vtkActor* TrackActor;
+  vtkActor* ExpiringTrackActor;
+
+  vtkSmartPointer<vtkTransform> ActorTransform;
+  double ZOffset;
+
+  typedef vtkSmartPointer<vtkPropCollection> vtkPropCollectionRef;
+
+  vtkPropCollectionRef  NewPropCollection;
+  vtkPropCollectionRef  ActivePropCollection;
+  vtkPropCollectionRef  ExpirePropCollection;
+
+  class vtkInternal;
+  vtkInternal* Internal;
+
+  vtkSmartPointer<vtkVgCellPicker> Picker;
+  double PickPosition[3];
+  bool OnlyDisplayForcedTracks;
+
+  int Visible;
+};
+
+#endif // __vtkVgTrackRepresentation_h
diff --git a/Libraries/VtkVgModelView/vtkVgTrackRepresentationBase.cxx b/Libraries/VtkVgModelView/vtkVgTrackRepresentationBase.cxx
new file mode 100644
index 00000000..5920b11f
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackRepresentationBase.cxx
@@ -0,0 +1,277 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrackRepresentationBase.h"
+
+#include "vtkVgContourOperatorManager.h"
+#include "vtkVgPickData.h"
+#include "vtkVgPicker.h"
+#include "vtkVgTrackFilter.h"
+#include "vtkVgTrackModel.h"
+
+#include <vtkCommand.h>
+#include <vtkLookupTable.h>
+
+vtkCxxSetObjectMacro(vtkVgTrackRepresentationBase,
+                     TrackFilter,
+                     vtkVgTrackFilter);
+vtkCxxSetObjectMacro(vtkVgTrackRepresentationBase,
+                     ContourOperatorManager,
+                     vtkVgContourOperatorManager);
+vtkCxxSetObjectMacro(vtkVgTrackRepresentationBase,
+                     ExcludedTrack,
+                     vtkVgTrack);
+
+double RandomColors[][3] =
+  {
+    {  0.0,  1.0,  1.0 }, // Cyan
+    { .941, .902, .549 }, // Khaki
+    { .698, .133, .133 }, // Firebrick
+    { .416, .353, .980 }, // Slate Blue
+    {  1.0,  0.0,  0.0 }, // Red
+    {  0.0, .392,  0.0 }, // Dark Green
+    { .737, .561, .561 }, // Rosy Brown
+    {  0.0,  0.0,  1.0 }, // Blue
+    { .498,  1.0,  0.0 }, // Chartreuse
+    { .816, .125, .565 }, // Violet Red
+    {  1.0, .271,  0.0 }  // Orange Red
+  };
+
+enum { NumRandomColors = sizeof(RandomColors) / sizeof(RandomColors[0]) };
+
+//-----------------------------------------------------------------------------
+vtkVgTrackRepresentationBase::vtkVgTrackRepresentationBase()
+  : vtkVgRepresentationBase(), ContourOperatorManager(0),
+    TrackModel(0), TrackFilter(0), ColorMode(TCM_Model), ColorHelper(0),
+    StateAttributeGroupMask(0), ExcludedTrack(0)
+{
+  // for now, PVO colors default to P=b, V=g, O=r
+  this->PersonColor[0] = 0.0;
+  this->PersonColor[1] = 0.0;
+  this->PersonColor[2] = 1.0;
+  this->VehicleColor[0] = 0.0;
+  this->VehicleColor[1] = 1.0;
+  this->VehicleColor[2] = 0.0;
+  this->OtherColor[0] = 1.0;
+  this->OtherColor[1] = 0.0;
+  this->OtherColor[2] = 0.0;
+  this->UnclassifiedColor[0] = 1.0;
+  this->UnclassifiedColor[1] = 1.0;
+  this->UnclassifiedColor[2] = 0.0;
+  this->ScalarColor[0] = 0.0;
+  this->ScalarColor[1] = 0.0;
+  this->ScalarColor[2] = 0.0;
+  this->DefaultColor[0] = 1.0;
+  this->DefaultColor[1] = 1.0;
+  this->DefaultColor[2] = 1.0;
+  this->SetLayerIndex(1);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackRepresentationBase::~vtkVgTrackRepresentationBase()
+{
+  this->SetTrackFilter(0);
+  this->SetTrackModel(0);
+  this->SetContourOperatorManager(0);
+  this->SetExcludedTrack(0);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTrackRepresentationBase::Pick(double vtkNotUsed(renX),
+                                             double vtkNotUsed(renY),
+                                             vtkRenderer* vtkNotUsed(ren),
+                                             vtkIdType& pickType)
+{
+  pickType = vtkVgPickData::EmptyPick;
+  return -1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentationBase::GetPickPosition(double vtkNotUsed(pos)[])
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentationBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentationBase::SetTrackModel(vtkVgTrackModel* trackModel)
+{
+  if (this->TrackModel != trackModel)
+    {
+    vtkVgTrackModel* temp = this->TrackModel;
+    this->TrackModel = trackModel;
+    if (this->TrackModel != NULL)
+      {
+      this->TrackModel->Register(this);
+      }
+    if (temp != NULL)
+      {
+      temp->UnRegister(this);
+      }
+
+    if (this->TrackModel && this->UseAutoUpdate)
+      {
+      this->TrackModel->AddObserver(vtkCommand::UpdateDataEvent, this,
+                                    &vtkVgTrackRepresentationBase::Update);
+      }
+
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentationBase::AddStateAttributeMask(unsigned int mask)
+{
+  this->RegisteredAttributeMasks.push_back(mask);
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentationBase::ClearStateAttributeMasks()
+{
+  this->RegisteredAttributeMasks.clear();
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentationBase::SetColor(vtkVgTrack::enumTrackPVOType type,
+                                            double color[3])
+{
+  switch (type)
+    {
+    case vtkVgTrack::Person:
+      this->SetPersonColor(color);
+      break;
+    case vtkVgTrack::Vehicle:
+      this->SetVehicleColor(color);
+      break;
+    case vtkVgTrack::Other:
+      this->SetOtherColor(color);
+      break;
+    default:
+      this->SetUnclassifiedColor(color);
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackRepresentationBase::SetColorHelper(
+  vtkVgTrackColorHelper* colorHelper)
+{
+  if (this->ColorHelper != colorHelper)
+    {
+    this->ColorHelper = colorHelper;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgTrackRepresentationBase::GetTrackPVOType(vtkVgTrack* track)
+{
+  if (this->TrackFilter)
+    {
+    return this->TrackFilter->GetBestClassifier(track);
+    }
+  return track->GetBestPVOClassifier();
+}
+
+//-----------------------------------------------------------------------------
+const double* vtkVgTrackRepresentationBase::GetTrackColor(
+  vtkVgTrackInfo trackInfo, double scalar)
+{
+  if (this->HasOverrideColor)
+    {
+    return this->OverrideColor;
+    }
+
+  if (this->ColorHelper)
+    {
+    const double* const customColor =
+      this->ColorHelper->GetTrackColor(trackInfo, scalar);
+    if (customColor)
+      {
+      return customColor;
+      }
+    }
+
+  switch (this->ColorMode)
+    {
+    case TCM_Model:
+      return trackInfo.GetTrack()->GetColor();
+
+    case TCM_PVO:
+      {
+      if (!trackInfo.GetDisplayTrack())
+        {
+        return this->UnclassifiedColor;
+        }
+
+      switch (this->GetTrackPVOType(trackInfo.GetTrack()))
+        {
+        case vtkVgTrack::Person:  return this->PersonColor;
+        case vtkVgTrack::Vehicle: return this->VehicleColor;
+        case vtkVgTrack::Other:   return this->OtherColor;
+        default:                  return this->UnclassifiedColor;
+        }
+      }
+
+    case TCM_Random:
+      return RandomColors[trackInfo.GetTrack()->GetId() % NumRandomColors];
+
+    case TCM_StateAttrs:
+      {
+      int bits = static_cast<int>(scalar + 0.5);
+      bits &= this->StateAttributeGroupMask;
+
+      // if there are no active attributes in this group, use the normal track
+      // model color
+      if (bits == 0)
+        {
+        return trackInfo.GetTrack()->GetColor();
+        }
+
+      // unknown attributes are mapped as scalar 0
+      scalar = 0.0;
+
+      // map from attribute mask to LUT index
+      for (size_t i = 0, size = this->RegisteredAttributeMasks.size(); i < size;
+           ++i)
+        {
+        if (static_cast<unsigned>(bits) == this->RegisteredAttributeMasks[i])
+          {
+          scalar = static_cast<double>(i + 1);
+          break;
+          }
+        }
+
+      // fall through
+      }
+
+    case TCM_Scalars:
+      {
+      if (this->LookupTable)
+        {
+        this->LookupTable->GetColor(scalar, this->ScalarColor);
+        return this->ScalarColor;
+        }
+      else
+        {
+        vtkErrorMacro("<< No lookup table is found \n");
+        }
+      }
+
+    case TCM_Default:
+      {
+      return this->DefaultColor;
+      }
+    }
+
+  return 0;
+}
diff --git a/Libraries/VtkVgModelView/vtkVgTrackRepresentationBase.h b/Libraries/VtkVgModelView/vtkVgTrackRepresentationBase.h
new file mode 100644
index 00000000..d177ee74
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTrackRepresentationBase.h
@@ -0,0 +1,193 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTrackRepresentationBase_h
+#define __vtkVgTrackRepresentationBase_h
+
+#include "vtkVgRepresentationBase.h"
+#include "vtkVgTrack.h"
+#include "vtkVgTrackInfo.h"
+
+#include <vector>
+
+#include <vgExport.h>
+
+class vtkActor;
+class vtkPoints;
+class vtkRenderer;
+
+class vtkVgContourOperatorManager;
+class vtkVgTrackFilter;
+class vtkVgTrackModel;
+
+class vtkVgTrackColorHelper
+{
+public:
+  virtual ~vtkVgTrackColorHelper() {}
+  virtual const double* GetTrackColor(vtkVgTrackInfo track,
+                                      double scalar = 0.0) = 0;
+};
+
+class VTKVG_MODELVIEW_EXPORT vtkVgTrackRepresentationBase
+  : public vtkVgRepresentationBase
+{
+public:
+  enum TrackColorMode
+    {
+    TCM_Model,      // Use track colors supplied by the model
+    TCM_PVO,        // Color based on PVO classification
+    TCM_Random,     // Random coloring based on track id
+    TCM_Scalars,    // Color based on scalars
+    TCM_StateAttrs, // Color using track state attributes
+    TCM_Default     // Use single default color
+    };
+
+public:
+  vtkTypeMacro(vtkVgTrackRepresentationBase, vtkVgRepresentationBase);
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Update the representation in preparation for rendering.
+  virtual void Update() = 0;
+
+  // Description:
+  // Pick operation from display (i.e., pixel) coordinates in the current
+  // renderer. Return the picked trackId if a successful pick occurs,
+  // otherwise return -1. Note that the pick operation takes into account
+  // whether the track is currently visible or not.
+  virtual vtkIdType Pick(double renX, double renY, vtkRenderer* ren, vtkIdType& pickType);
+
+  // Description:
+  // After a successful pick occurs, return the position of the pick (in
+  // world coordinates).
+  virtual void GetPickPosition(double pos[3]);
+
+  // Description:
+  // Set the item on the representation.
+  void SetTrackModel(vtkVgTrackModel* trackItem);
+  vtkGetObjectMacro(TrackModel, vtkVgTrackModel);
+
+  // Description:
+  // Set the track filter that this representation will use.
+  virtual void SetTrackFilter(vtkVgTrackFilter* filter);
+  vtkGetObjectMacro(TrackFilter, vtkVgTrackFilter);
+
+  // Description:
+  // Set track color helper for the representation. The caller is responsible
+  // for managing the life of the helper, and ensuring it is not deleted while
+  // the representation holds a reference to it.
+  void SetColorHelper(vtkVgTrackColorHelper* colorHelper);
+  vtkGetObjectMacro(ColorHelper, vtkVgTrackColorHelper);
+
+  // Description:
+  // Set/Get the way track color is determined.
+  vtkSetMacro(ColorMode, TrackColorMode);
+  vtkGetMacro(ColorMode, TrackColorMode);
+
+  void SetColorModeToModel()  { this->SetColorMode(TCM_Model); }
+  void SetColorModeToPVO()    { this->SetColorMode(TCM_PVO); }
+  void SetColorModeToRandom() { this->SetColorMode(TCM_Random); }
+
+  bool UsingPerFrameColors()
+    {
+    return this->ColorMode == TCM_Scalars ||
+           this->ColorMode == TCM_StateAttrs;
+    }
+
+  // Description:
+  // Set/Get the group mask to apply when coloring by state attributes
+  vtkSetMacro(StateAttributeGroupMask, unsigned int);
+  vtkGetMacro(StateAttributeGroupMask, unsigned int);
+
+  // Description:
+  // Add an implicit mapping for an individual attribute mask. Masks should be
+  // registered in the same order that their colors appear in the lookup table,
+  // starting at the second entry. The color in the first table entry will be
+  // used for any attribute combination that hasn't been registered.
+  void AddStateAttributeMask(unsigned int mask);
+  void ClearStateAttributeMasks();
+
+  // Description:
+  // Set/Get the rgb components of the "Person" color (if ColorByPVO).
+  // Note: expecting color values between 0 and 1.
+  vtkSetVector3Macro(PersonColor, double);
+  vtkGetVector3Macro(PersonColor, double);
+
+  // Description:
+  // Set/Get the rgb components of the "Vehicle" color (if ColorByPVO).
+  // Note: expecting color values between 0 and 1.
+  vtkSetVector3Macro(VehicleColor, double);
+  vtkGetVector3Macro(VehicleColor, double);
+
+  // Description:
+  // Set/Get the rgb components of the "Other" color (if ColorByPVO).
+  // Note: expecting color values between 0 and 1.
+  vtkSetVector3Macro(OtherColor, double);
+  vtkGetVector3Macro(OtherColor, double);
+
+  // Description:
+  // Set/Get the rgb components of the "Unclassified" color (if ColorByPVO).
+  // Note: expecting color values between 0 and 1.
+  vtkSetVector3Macro(UnclassifiedColor, double);
+  vtkGetVector3Macro(UnclassifiedColor, double);
+
+  // Description:
+  // Set the rgb components of the specified track type color (if ColorByPVO).
+  // Note: expecting color values between 0 and 1.
+  void SetColor(vtkVgTrack::enumTrackPVOType type, double color[3]);
+
+  // Description:
+  // Set the rgb components of the default track color.
+  // Note: expecting color values between 0 and 1.
+  vtkSetVector3Macro(DefaultColor, double);
+  vtkGetVector3Macro(DefaultColor, double);
+
+  // Description:
+  // Set/Get the manager for filters and selectors
+  void SetContourOperatorManager(vtkVgContourOperatorManager* manager);
+  vtkGetObjectMacro(ContourOperatorManager, vtkVgContourOperatorManager);
+
+  // Description:
+  // Set/Get track to exclude from display
+  void SetExcludedTrack(vtkVgTrack* track);
+  vtkGetObjectMacro(ExcludedTrack, vtkVgTrack);
+
+protected:
+  vtkVgTrackRepresentationBase();
+  virtual ~vtkVgTrackRepresentationBase();
+
+  int GetTrackPVOType(vtkVgTrack* track);
+  const double* GetTrackColor(vtkVgTrackInfo track, double scalar = 0.0);
+
+  void SetNormalizedColor(double memberColor[3], double inputColor[3]);
+
+  vtkVgContourOperatorManager* ContourOperatorManager;
+
+  vtkVgTrackModel*  TrackModel;
+  vtkVgTrackFilter* TrackFilter;
+
+  TrackColorMode   ColorMode;
+  double           PersonColor[3];
+  double           VehicleColor[3];
+  double           OtherColor[3];
+  double           UnclassifiedColor[3];
+  double           ScalarColor[3];
+  double           DefaultColor[3];
+
+  vtkVgTrackColorHelper* ColorHelper;
+
+  unsigned int StateAttributeGroupMask;
+
+  std::vector<unsigned int> RegisteredAttributeMasks;
+
+  vtkVgTrack* ExcludedTrack;
+
+private:
+  vtkVgTrackRepresentationBase(const vtkVgTrackRepresentationBase&);
+  void operator=(const vtkVgTrackRepresentationBase&);
+};
+
+#endif // __vtkVgTrackRepresentationBase_h
diff --git a/Libraries/VtkVgModelView/vtkVgTripWireManager.cxx b/Libraries/VtkVgModelView/vtkVgTripWireManager.cxx
new file mode 100644
index 00000000..df66cfcf
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTripWireManager.cxx
@@ -0,0 +1,869 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTripWireManager.h"
+
+#include "vtkCellArray.h"
+#include "vtkCellData.h"
+#include "vtkDoubleArray.h"
+#include "vtkImplicitBoolean.h"
+#include "vtkImplicitSelectionLoop.h"
+#include "vtkInformation.h"
+#include "vtkInformationVector.h"
+#include "vtkObjectFactory.h"
+#include "vtkMath.h"
+#include "vtkPointData.h"
+#include "vtkPolyData.h"
+#include "vtkPolyLine.h"
+#include "vtkSmartPointer.h"
+
+#include "vtkVgEvent.h"
+#include "vtkVgTrack.h"
+#include "vtkVgTrackModel.h"
+#include "vtkVgEventModel.h"
+
+#include <map>
+
+vtkCxxSetObjectMacro(vtkVgTripWireManager, TrackModel, vtkVgTrackModel);
+vtkCxxSetObjectMacro(vtkVgTripWireManager, EventModel, vtkVgEventModel);
+
+vtkStandardNewMacro(vtkVgTripWireManager);
+
+struct vtkVgTripWireEventInfo
+{
+  vtkVgEvent* Event;
+  std::vector<vtkVgTimeStamp>  EndTimes;
+
+  vtkVgTripWireEventInfo()
+    {
+    this->Event = 0;
+    }
+
+  ~vtkVgTripWireEventInfo()
+    {
+    if (this->Event)
+      {
+      this->Event->UnRegister(NULL);
+      this->Event = 0;
+      }
+    }
+
+  // Function ensures proper reference counting.
+  void SetEvent(vtkVgEvent* theEvent)
+    {
+    if (this->Event != theEvent)
+      {
+      // Before assigning a new one store the last one
+      // so that we can decrement the ref count later.
+      vtkVgEvent* temp = this->Event;
+      this->Event = theEvent;
+      // Increment the ref count.
+      if (this->Event != NULL)
+        {
+        this->Event->Register(NULL);
+        }
+      if (temp != NULL)
+        {
+        // Decrement the ref count.
+        temp->UnRegister(NULL);
+        }
+      }
+    }
+
+  vtkVgTripWireEventInfo(const vtkVgTripWireEventInfo& fromTripWireEventInfo)
+    {
+    this->Event = 0;
+    this->SetEvent(fromTripWireEventInfo.Event);
+    }
+
+  vtkVgTripWireEventInfo& operator=(
+    const vtkVgTripWireEventInfo& fromTripWireEventInfo)
+    {
+    this->Event = 0;
+    this->SetEvent(fromTripWireEventInfo.Event);
+
+    return *this;
+    }
+};
+
+typedef std::map<vtkIdType, std::vector<vtkVgTripWireEventInfo> > TrackEventMap;
+
+struct vtkVgTripWireInfo
+{
+  vtkPolyLine* TripWire;
+  vtkImplicitSelectionLoop* TripWireLoop;
+  vtkTimeStamp CheckWireTime;
+  TrackEventMap TriggeredEventMap;
+  bool Enabled;
+
+  vtkVgTripWireInfo()
+    {
+    this->Enabled = true;
+    this->TripWire = 0;
+    this->TripWireLoop = 0;
+    }
+
+  ~vtkVgTripWireInfo()
+    {
+    if (this->TripWire)
+      {
+      this->TripWire->UnRegister(NULL);
+      this->TripWire = 0;
+      }
+    if (this->TripWireLoop)
+      {
+      this->TripWireLoop->UnRegister(NULL);
+      this->TripWireLoop = 0;
+      }
+    }
+
+  // Function ensures proper reference counting.
+  void SetTripWire(vtkPolyLine* tripWire)
+    {
+    if (this->TripWire != tripWire)
+      {
+      // Before assigning a new one store the last one
+      // so that we can decrement the ref count later.
+      vtkPolyLine* temp = this->TripWire;
+      this->TripWire = tripWire;
+      // Increment the ref count.
+      if (this->TripWire != NULL)
+        {
+        this->TripWire->Register(NULL);
+        }
+      if (temp != NULL)
+        {
+        // Decrement the ref count.
+        temp->UnRegister(NULL);
+        }
+      }
+    }
+
+  // Function ensures proper reference counting.
+  void SetTripWireLoop(vtkImplicitSelectionLoop* tripWireLoop)
+    {
+    if (this->TripWireLoop != tripWireLoop)
+      {
+      // Before assigning a new one store the last one
+      // so that we can decrement the ref count later.
+      vtkImplicitSelectionLoop* temp = this->TripWireLoop;
+      this->TripWireLoop = tripWireLoop;
+      // Increment the ref count.
+      if (this->TripWireLoop != NULL)
+        {
+        this->TripWireLoop->Register(NULL);
+        }
+      if (temp != NULL)
+        {
+        // Decrement the ref count.
+        temp->UnRegister(NULL);
+        }
+      }
+    }
+
+  vtkVgTripWireInfo(const vtkVgTripWireInfo& fromTripWireInfo)
+    {
+    this->Enabled = fromTripWireInfo.Enabled;
+    this->TripWire = 0;
+    this->TripWireLoop = 0;
+    this->SetTripWire(fromTripWireInfo.TripWire);
+    this->SetTripWireLoop(fromTripWireInfo.TripWireLoop);
+    this->TriggeredEventMap = fromTripWireInfo.TriggeredEventMap;
+    }
+
+  vtkVgTripWireInfo& operator=(const vtkVgTripWireInfo& fromTripWireInfo)
+    {
+    this->Enabled = fromTripWireInfo.Enabled;
+    this->TripWire = 0;
+    this->TripWireLoop = 0;
+    this->SetTripWire(fromTripWireInfo.TripWire);
+    this->SetTripWireLoop(fromTripWireInfo.TripWireLoop);
+    this->TriggeredEventMap = fromTripWireInfo.TriggeredEventMap;
+
+    return *this;
+    }
+};
+
+
+
+//----------------------------------------------------------------------------
+class vtkVgTripWireManager::vtkInternal
+{
+public:
+  vtkInternal(vtkVgTripWireManager* tripWireManager)
+    {
+    this->TripWireManager = tripWireManager;
+    }
+
+  ~vtkInternal()
+    {
+    }
+
+  void RemoveTripWireEvents(vtkIdType tripWireId);
+  void RemoveEventsFromModel(std::vector<vtkVgTripWireEventInfo>& events);
+
+  void GetTripWireVsTrackIntersections(
+    vtkVgTrack* track, vtkVgTripWireInfo& tripWireInfo,
+    std::vector<vtkVgTripWireManager::IntersectionInfo>& intersections);
+  bool GetTripWireVsSegmentIntersections(
+    double trackPts[2][3], const vtkVgTimeStamp (&timeStamps)[2],
+    vtkVgTripWireInfo& tripWireInfo,
+    vtkVgTripWireManager::IntersectionInfo& intersectionInfo);
+
+  void AddEvent(
+    vtkVgTrack* track, vtkVgTimeStamp& startTime,
+    vtkVgTripWireManager::IntersectionInfo& intersectionInfo,
+    int classifierType, int nextEventId,
+    TrackEventMap::iterator& trackEventMap);
+
+  vtkVgTripWireManager* TripWireManager;
+  vtkTimeStamp CheckTripWiresTime;
+
+  std::map<vtkIdType, vtkVgTripWireInfo>              TripWires;
+};
+
+//----------------------------------------------------------------------------
+void vtkVgTripWireManager::vtkInternal::
+RemoveTripWireEvents(vtkIdType tripWireId)
+{
+  std::map<vtkIdType, vtkVgTripWireInfo>::iterator tripWireIter =
+    this->TripWires.find(tripWireId);
+  if (tripWireIter == this->TripWires.end())
+    {
+    return;  // trip wire not found
+    }
+
+  if (!this->TripWireManager->EventModel)
+    {
+    vtkGenericWarningMacro("EventModel must be set!");
+    return;
+    }
+
+  TrackEventMap::iterator tripWireTrackIter;
+  for (tripWireTrackIter = tripWireIter->second.TriggeredEventMap.begin();
+       tripWireTrackIter != tripWireIter->second.TriggeredEventMap.end(); tripWireTrackIter++)
+    {
+    this->RemoveEventsFromModel(tripWireTrackIter->second);
+    }
+
+  tripWireIter->second.TriggeredEventMap.clear();
+}
+
+//----------------------------------------------------------------------------
+void vtkVgTripWireManager::vtkInternal::
+RemoveEventsFromModel(std::vector<vtkVgTripWireEventInfo>& events)
+{
+  if (!this->TripWireManager->EventModel)
+    {
+    vtkGenericWarningMacro("EventModel must be set!");
+    return;
+    }
+  std::vector<vtkVgTripWireEventInfo>::const_iterator eventInfoIter;
+  for (eventInfoIter = events.begin(); eventInfoIter != events.end(); eventInfoIter++)
+    {
+    this->TripWireManager->EventModel->RemoveEvent(eventInfoIter->Event->GetId());
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::vtkInternal::
+GetTripWireVsTrackIntersections(
+  vtkVgTrack* track, vtkVgTripWireInfo& tripWireInfo,
+  std::vector<vtkVgTripWireManager::IntersectionInfo>& intersections)
+{
+  vtkVgTripWireManager::IntersectionInfo intersectionInfo;
+  vtkIdType ptId[2];
+  vtkVgTimeStamp timeStamps[2];
+  track->InitPathTraversal();
+  ptId[0] = track->GetNextPathPt(timeStamps[0]);
+  // check each line segment for intersection with the trip wire
+  double trackPoints[2][3];
+  track->GetPoints()->GetPoint(ptId[0], trackPoints[0]);
+  for (vtkIdType i = 1; i < track->GetNumberOfPathPoints(); i++)
+    {
+    ptId[i % 2] = track->GetNextPathPt(timeStamps[i % 2]);
+    track->GetPoints()->GetPoint(ptId[i % 2], trackPoints[i % 2]);
+    if (this->GetTripWireVsSegmentIntersections(
+      trackPoints, timeStamps, tripWireInfo, intersectionInfo))
+      {
+      intersectionInfo.TrackId = track->GetId();
+      intersections.push_back(intersectionInfo);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTripWireManager::vtkInternal::GetTripWireVsSegmentIntersections(
+  double trackPts[2][3], const vtkVgTimeStamp (&timeStamps)[2],
+  vtkVgTripWireInfo& tripWireInfo,
+  vtkVgTripWireManager::IntersectionInfo& intersectionInfo)
+{
+  double t, x[3], pCoords[3], tol = 1e-7;
+  int subId;
+  int classifierType = this->TripWireManager->TripWireId;
+  if (tripWireInfo.TripWire->IntersectWithLine(trackPts[0], trackPts[1], tol, t,
+                                               x, pCoords, subId))
+    {
+
+    // interpolate to get "time" at intersection
+    if (timeStamps[0].HasTime())
+      {
+      intersectionInfo.IntersectionTime.SetTime(
+        timeStamps[0].GetTime() +
+        t * (timeStamps[1].GetTime() - timeStamps[0].GetTime()));
+      }
+    if (timeStamps[0].HasFrameNumber())
+      {
+      unsigned int frameNumber = 0.5 +
+        static_cast<double>(timeStamps[0].GetFrameNumber()) +
+        t * (timeStamps[1].GetFrameNumber() - timeStamps[0].GetFrameNumber());
+      intersectionInfo.IntersectionTime.SetFrameNumber(frameNumber);
+      }
+
+    int earlierPtIndex = 0;  // index (of array of 2 input) of earlier Pt
+    if (timeStamps[0] > timeStamps[1])
+      {
+      earlierPtIndex = 1;
+      }
+
+    // if closed loop, additional test to see if entering or exiting
+    if (tripWireInfo.TripWireLoop)
+      {
+      // if> 0, then must have exited
+      if (tripWireInfo.TripWireLoop->FunctionValue(trackPts[!earlierPtIndex]) > 0)
+        {
+        classifierType = this->TripWireManager->ExitingRegionId;
+        // both points outside, but crossed a boundary, thus enter AND exit
+        if (tripWireInfo.TripWireLoop->FunctionValue(trackPts[earlierPtIndex]) > 0)
+          {
+          classifierType = -1;
+          }
+        }
+      else
+        {
+        classifierType = this->TripWireManager->EnteringRegionId;
+        // both points inside, but crossed a boundary, thus enter AND exit
+        if (tripWireInfo.TripWireLoop->FunctionValue(trackPts[earlierPtIndex]) < 0)
+          {
+          classifierType = -1;
+          }
+        }
+      }
+
+    intersectionInfo.PreFrame = timeStamps[earlierPtIndex];
+    intersectionInfo.PostFrame = timeStamps[!earlierPtIndex];
+    intersectionInfo.ClassifierType = classifierType;
+    intersectionInfo.IntersectionPt[0] = x[0];
+    intersectionInfo.IntersectionPt[1] = x[1];
+    return true;
+    }
+  return false; // does NOT intersect
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::vtkInternal::
+AddEvent(vtkVgTrack* track, vtkVgTimeStamp& startTime,
+         vtkVgTripWireManager::IntersectionInfo& intersectionInfo,
+         int classifierType,
+         int nextEventId,
+         TrackEventMap::iterator& trackEventMap)
+{
+  vtkVgEvent* newEvent = vtkVgEvent::New();
+  newEvent->SetStartFrame(startTime);
+  newEvent->SetEndFrame(intersectionInfo.PostFrame);
+  newEvent->AddTrack(track, startTime, intersectionInfo.PostFrame);
+  newEvent->AddClassifier(classifierType, 1.0);
+  newEvent->SetId(nextEventId);
+  double tripLocation[3] = {intersectionInfo.IntersectionPt[0],
+                            intersectionInfo.IntersectionPt[1],
+                            0.0
+                           };
+  newEvent->SetTripEventInfo(tripLocation,
+                             intersectionInfo.IntersectionTime);
+
+  vtkVgTripWireEventInfo eventInfo;
+  eventInfo.SetEvent(newEvent);
+  newEvent->FastDelete();
+
+  trackEventMap->second.push_back(eventInfo);
+}
+
+//----------------------------------------------------------------------------
+vtkVgTripWireManager::vtkVgTripWireManager()
+  : EnteringRegionId(-1),  ExitingRegionId(-1), TripWireId(-1),
+    EventIdCounter(1000000)
+{
+  this->TrackModel = 0;
+  this->EventModel = 0;
+  this->PreTripDuration.SetTime(3e6);   // 3 seconds
+  this->PreTripDuration.SetFrameNumber(90);    // 3 seconds, assuming 30 fps
+  this->Internals = new vtkInternal(this);
+}
+
+//----------------------------------------------------------------------------
+vtkVgTripWireManager::~vtkVgTripWireManager()
+{
+  delete this->Internals;
+  this->SetTrackModel(0);
+  this->SetEventModel(0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::SetPreTripDuration(const vtkVgTimeStamp& timeStamp)
+{
+  if (this->PreTripDuration == timeStamp)
+    {
+    return;
+    }
+
+  this->PreTripDuration = timeStamp;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vtkVgTripWireManager::AddTripWire(vtkPoints* loopPoints,
+                                            bool closedLoop,
+                                            vtkIdType tripWireId/* = -1*/)
+{
+  if (tripWireId != -1 &&
+      this->Internals->TripWires.find(tripWireId) !=
+      this->Internals->TripWires.end())
+    {
+    return -1;
+    }
+  else if (tripWireId == -1)
+    {
+    // if already entries in our trip-wire map, just use one greater (which does mean that
+    // we might reuse trip-wire ids).  If no entries yet, start with id = 0
+    if (this->Internals->TripWires.size())
+      {
+      tripWireId = 1 + this->Internals->TripWires.rbegin()->first;
+      if (tripWireId == -1)
+        {
+        // id -1 is not allowed... skip to next one;  only possible if
+        // externally specified a negative (<-1) id
+        tripWireId = 0;
+        }
+      }
+    else // no id yet, start with 0
+      {
+      tripWireId = 0;
+      }
+    }
+
+  vtkVgTripWireInfo tripWireInfo;
+
+  vtkPolyLine* polyLine = vtkPolyLine::New();
+  vtkIdType npts = loopPoints->GetNumberOfPoints();
+  vtkIdType* pts = new vtkIdType [npts];
+  for (vtkIdType i = 0; i < npts; i++)
+    {
+    pts[i] = i;
+    }
+  polyLine->Initialize(npts, pts, loopPoints);
+  tripWireInfo.SetTripWire(polyLine);
+  polyLine->FastDelete();
+  delete [] pts;
+
+  if (closedLoop)
+    {
+    vtkImplicitSelectionLoop* loop = vtkImplicitSelectionLoop::New();
+    loop->SetLoop(loopPoints);
+    tripWireInfo.SetTripWireLoop(loop);
+    loop->FastDelete();
+    }
+  this->Internals->TripWires[tripWireId] = tripWireInfo;
+
+  this->Modified();
+  return tripWireId;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTripWireManager::IsTripWire(vtkIdType tripWireId)
+{
+  return this->Internals->TripWires.find(tripWireId) !=
+         this->Internals->TripWires.end();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTripWireManager::RemoveTripWire(vtkIdType tripWireId)
+{
+  std::map<vtkIdType, vtkVgTripWireInfo>::iterator iter =
+    this->Internals->TripWires.find(tripWireId);
+  if (iter == this->Internals->TripWires.end())
+    {
+    return false;
+    }
+
+  // Remove the events from the EventModel
+  if (this->EventModel)
+    {
+    this->Internals->RemoveTripWireEvents(tripWireId);
+    }
+  this->Internals->TripWires.erase(iter);
+  this->Modified();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTripWireManager::RemoveAllTripWires()
+{
+  if (this->Internals->TripWires.size())
+    {
+    if (this->EventModel)
+      {
+      // Make sure the events associated with the trip wires are removed
+      // from the EventModel
+      std::map<vtkIdType, vtkVgTripWireInfo>::iterator iter;
+      for (iter = this->Internals->TripWires.begin();
+           iter != this->Internals->TripWires.end(); iter++)
+        {
+        this->Internals->RemoveTripWireEvents(iter->first);
+        }
+      }
+    this->Internals->TripWires.clear();
+    this->Modified();
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgTripWireManager::GetNumberOfTripWires()
+{
+  return static_cast<int>(this->Internals->TripWires.size());
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::CheckTripWires()
+{
+  if (!this->TrackModel || !this->EventModel)
+    {
+    vtkErrorMacro("Both the TrackModel and EventModel must be set!");
+    return;
+    }
+
+  if (this->TripWireId == -1 || this->EnteringRegionId == -1 ||
+      this->ExitingRegionId == -1)
+    {
+    vtkErrorMacro("Must set TripWire, EnteringRegion, and ExitingRegion identifiers!");
+    return;
+    }
+
+  // if neither the track model nor this object (should just care about ADDing
+  // a trip wire, but currently will catch both adding and removing) have
+  // changed since lst "check time", there is nothing to do here.
+  if (this->TrackModel->GetMTime() < this->Internals->CheckTripWiresTime &&
+      this->GetMTime() < this->Internals->CheckTripWiresTime)
+    {
+    // we've
+    return;
+    }
+
+//  // only reexecute trip wire if trip wire changed (assumed not to happen for now)
+//  // or track data changes (also not assumed to happen for now)
+//
+//  // thus, we only execute a trip wire when we haven't seen it before (well, that's the plan)
+
+  std::map<vtkIdType, vtkVgTripWireInfo>::iterator iter;
+  for (iter = this->Internals->TripWires.begin();
+       iter != this->Internals->TripWires.end(); iter++)
+    {
+    vtkVgTrack* track;
+
+    if (!iter->second.Enabled ||
+        this->TrackModel->GetMTime() < iter->second.CheckWireTime)
+      {
+      // nothing has changed (because we can't yet modify a trip wire)
+      continue;
+      }
+
+    // for now, always clear all (if any) for this trip wire, and recompute
+    this->Internals->RemoveTripWireEvents(iter->first);
+    iter->second.CheckWireTime.Modified();
+
+    this->TrackModel->InitTrackTraversal();
+    while ((track = this->TrackModel->GetNextTrack().GetTrack()))
+      {
+      if (track->GetNumberOfPathPoints() < 2)
+        {
+        continue;
+        }
+
+      std::vector<IntersectionInfo> intersections;
+      this->Internals->GetTripWireVsTrackIntersections(
+        track, iter->second, intersections);
+
+      if (intersections.size() > 0)
+        {
+        TrackEventMap::iterator trackEventMap =
+          iter->second.TriggeredEventMap.find(track->GetId());
+        if (trackEventMap == iter->second.TriggeredEventMap.end())
+          {
+          // no entry yet for this track; create one
+          std::vector<vtkVgTripWireEventInfo> tripWireEventInfo;
+          iter->second.TriggeredEventMap[track->GetId()] = tripWireEventInfo;
+          trackEventMap =
+            iter->second.TriggeredEventMap.find(track->GetId());
+          }
+
+        std::vector<IntersectionInfo>::iterator intersectionIter;
+        for (intersectionIter = intersections.begin();
+             intersectionIter != intersections.end(); intersectionIter++)
+          {
+          // right now, computing start time for the event regardless of whether
+          // entering/exiting or open trip wire
+
+          vtkVgTimeStamp startTime = intersectionIter->PostFrame;
+          // for now, PreTripDuration measured from the point that
+          // caused the crossing, NOT where the interesetion occurred (which
+          // we should maybe do at some point)
+          startTime.ShiftBackward(this->PreTripDuration);
+          if (intersectionIter->PreFrame < startTime)
+            {
+            // if previous track point is more than PreTripDuration "old",
+            // use it for the start
+            startTime = intersectionIter->PreFrame;
+            }
+          else if (startTime < track->GetStartFrame())
+            {
+            // if PreTripDuration puts us before start of track, use start of
+            // track as start
+            startTime = track->GetStartFrame();
+            }
+
+          // create events for both entering and exiting
+          if (intersectionIter->ClassifierType == -1)
+            {
+            this->Internals->AddEvent(
+              track, startTime, *intersectionIter,
+              this->EnteringRegionId, this->EventIdCounter++, trackEventMap);
+            this->Internals->AddEvent(
+              track, startTime, *intersectionIter,
+              this->ExitingRegionId, this->EventIdCounter++, trackEventMap);
+            }
+          else
+            {
+            this->Internals->AddEvent(
+              track, startTime, *intersectionIter,
+              intersectionIter->ClassifierType, this->EventIdCounter++,
+              trackEventMap);
+            }
+          }
+        }
+      }
+    }
+
+  this->Internals->CheckTripWiresTime.Modified();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::CheckTripWire(
+  vtkIdType tripWireId, std::vector<IntersectionInfo>& intersections)
+{
+  intersections.clear(); // just to be sure
+
+  std::map<vtkIdType, vtkVgTripWireInfo>::iterator tripWire =
+    this->Internals->TripWires.find(tripWireId);
+  if (tripWire == this->Internals->TripWires.end())
+    {
+    vtkWarningMacro("TripWire not found! Id = " << tripWireId);
+    return;
+    }
+
+  // should we NOT test if the indicated trip-wire is disabled????
+
+  vtkVgTrack* track;
+  this->TrackModel->InitTrackTraversal();
+  while ((track = this->TrackModel->GetNextTrack().GetTrack()))
+    {
+    if (track->GetNumberOfPathPoints() < 2)
+      {
+      continue;
+      }
+
+    // continue appending any intersections to the output vector
+    this->Internals->GetTripWireVsTrackIntersections(
+      track, tripWire->second, intersections);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::CheckTrackSegment(double pt1[2], double pt2[2],
+  const vtkVgTimeStamp& timeStamp1, const vtkVgTimeStamp& timeStamp2,
+  std::vector<IntersectionInfo>& intersections)
+{
+  if (this->TripWireId == -1 || this->EnteringRegionId == -1 ||
+      this->ExitingRegionId == -1)
+    {
+    vtkErrorMacro("Must set TripWire, EnteringRegion, and ExitingRegion identifiers!");
+    return;
+    }
+
+  intersections.clear();  // just to be sure
+
+  double pts[2][3] = { {pt1[0], pt1[1], 0.0}, {pt2[0], pt2[1], 0.0} };
+  const vtkVgTimeStamp timeStamps[2] = {timeStamp1, timeStamp2};
+
+  std::map<vtkIdType, vtkVgTripWireInfo>::iterator iter;
+  for (iter = this->Internals->TripWires.begin();
+       iter != this->Internals->TripWires.end(); iter++)
+    {
+    if (!iter->second.Enabled)
+      {
+      continue;
+      }
+    IntersectionInfo intersectionInfo;
+    if (this->Internals->GetTripWireVsSegmentIntersections(pts, timeStamps,
+        iter->second, intersectionInfo))
+      {
+      intersections.push_back(intersectionInfo);
+      }
+
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::UpdateEventModel(
+  const vtkVgTimeStamp& vtkNotUsed(timestamp))
+{
+  if (!this->TrackModel || !this->EventModel)
+    {
+    vtkErrorMacro("Both the TrackModel and EventModel must be set!");
+    return;
+    }
+
+  std::map<vtkIdType, vtkVgTripWireInfo>::const_iterator tripWireIter;
+  // for each trip wire
+  for (tripWireIter = this->Internals->TripWires.begin();
+       tripWireIter != this->Internals->TripWires.end(); tripWireIter++)
+    {
+    // for each track that intersects the trip wire
+    TrackEventMap::const_iterator trackEventMapIter;
+    for (trackEventMapIter = tripWireIter->second.TriggeredEventMap.begin();
+         trackEventMapIter != tripWireIter->second.TriggeredEventMap.end();
+         trackEventMapIter++)
+      {
+      std::vector<vtkVgTripWireEventInfo>::const_iterator eventsIter;
+      for (eventsIter = trackEventMapIter->second.begin();
+           eventsIter != trackEventMapIter->second.end(); eventsIter++)
+        {
+        // if not already added to the model, do so now
+        if (tripWireIter->second.Enabled &&
+            !this->EventModel->GetEvent(eventsIter->Event->GetId()))
+          {
+          this->EventModel->AddEvent(eventsIter->Event);
+          }
+        else if (!tripWireIter->second.Enabled)
+          {
+          this->EventModel->RemoveEvent(eventsIter->Event->GetId());
+          }
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::CheckTrackForTripWireEvents(
+  vtkVgTrack* track, bool& tripEvent, bool& enterEvent,
+  bool& exitEvent)
+{
+  // setup variables for results we are looking for
+  bool checkForTrip = tripEvent;
+  bool checkForEnter = enterEvent;
+  bool checkForExit = exitEvent;
+
+  // and then reset, bcasue we use same variables for output
+  tripEvent = enterEvent = exitEvent = false;
+
+  if (this->TripWireId == -1 || this->EnteringRegionId == -1 ||
+      this->ExitingRegionId == -1)
+    {
+    vtkErrorMacro("Must set TripWire, EnteringRegion, and ExitingRegion identifiers!");
+    return;
+    }
+
+  std::map<vtkIdType, vtkVgTripWireInfo>::iterator iter;
+  for (iter = this->Internals->TripWires.begin();
+       iter != this->Internals->TripWires.end(); iter++)
+    {
+    if (!iter->second.Enabled)
+      {
+      continue;
+      }
+    std::vector<IntersectionInfo> intersections;
+    this->Internals->GetTripWireVsTrackIntersections(track, iter->second, intersections);
+
+    std::vector<IntersectionInfo>::iterator intersectionIter;
+    for (intersectionIter = intersections.begin();
+         intersectionIter != intersections.end(); intersectionIter++)
+      {
+      if (checkForTrip && intersectionIter->ClassifierType == this->TripWireId)
+        {
+        tripEvent = true;
+        }
+      if (checkForEnter &&
+          (intersectionIter->ClassifierType == this->EnteringRegionId ||
+           intersectionIter->ClassifierType == -1))
+        {
+        enterEvent = true;
+        }
+      if (checkForExit &&
+          (intersectionIter->ClassifierType == this->ExitingRegionId ||
+           intersectionIter->ClassifierType == -1))
+        {
+        exitEvent = true;
+        }
+      }
+
+    // have we already found true for everything we're looking for?  If so, return
+    if ((!checkForTrip || tripEvent) &&
+        (!checkForEnter || enterEvent) &&
+        (!checkForExit || exitEvent))
+      {
+      return;
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTripWireManager::SetTripWireEnabled(vtkIdType tripWireId, bool state)
+{
+  std::map<vtkIdType, vtkVgTripWireInfo>::iterator iter =
+    this->Internals->TripWires.find(tripWireId);
+  if (iter == this->Internals->TripWires.end() ||
+      iter->second.Enabled == state)
+    {
+    return;
+    }
+
+  // perhaps should remove from event model NOW, but let UpdateEventModel do
+  // the work
+
+  iter->second.Enabled = state;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgTripWireManager::GetTripWireEnabled(vtkIdType tripWireId)
+{
+  std::map<vtkIdType, vtkVgTripWireInfo>::const_iterator iter =
+    this->Internals->TripWires.find(tripWireId);
+  if (iter == this->Internals->TripWires.end())
+    {
+    return false;
+    }
+
+  return iter->second.Enabled;
+}
diff --git a/Libraries/VtkVgModelView/vtkVgTripWireManager.h b/Libraries/VtkVgModelView/vtkVgTripWireManager.h
new file mode 100644
index 00000000..691084b6
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgTripWireManager.h
@@ -0,0 +1,158 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTripWireManager_h
+#define __vtkVgTripWireManager_h
+
+#include "vtkObject.h"
+
+#include "vtkVgTimeStamp.h"
+
+#include <vector>
+
+#include <vgExport.h>
+
+class vtkIdList;
+class vtkImplicitBoolean;
+class vtkPoints;
+class vtkPolyLine;
+class vtkVgEventModel;
+class vtkVgTrack;
+class vtkVgTrackModel;
+
+class VTKVG_MODELVIEW_EXPORT vtkVgTripWireManager : public vtkObject
+{
+public:
+  static vtkVgTripWireManager* New();
+  vtkTypeMacro(vtkVgTripWireManager, vtkObject);
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Structure describing an intersection event
+  struct IntersectionInfo
+    {
+    vtkIdType TrackId;         // when available, set the track id for the intersection
+    vtkVgTimeStamp PreFrame;   // the "time" of the track point immediately before
+    vtkVgTimeStamp PostFrame;  // the "time" of the track point immediately after
+    int ClassifierType;        // Entering, Exiting, or TripWire
+    double IntersectionPt[2];  // x, y of intersection
+    vtkVgTimeStamp IntersectionTime;  // Interpolated "Time" at IntersectionPt
+    };
+
+  // Description:
+  // Main "execute" function to check the status of all "trip wires" relative
+  // to the tracks in the track model.
+  void CheckTripWires();
+
+  // Description:
+  // Check the specified trip-wire for interesections against all tracks in the
+  // TrackModel.
+  void CheckTripWire(vtkIdType tripWireId, std::vector<IntersectionInfo>& intersections);
+
+  // Description:
+  //int ClassifierType, // Entering, Exiting, or TripWire
+  //double IntersectionPt[2],  // x, y of intersection
+  //vtkVgTimeStamp &IntersectionTime);  // Interpolated "Time" at IntersectionPt
+  void CheckTrackSegment(double pt1[2], double p2[2],
+                         const vtkVgTimeStamp& timeStamp1, const vtkVgTimeStamp& timeStamp2,
+                         std::vector<IntersectionInfo>& intersections);
+
+  // Description:
+  // Make sure the event model is up to date regarding detected trip wire events
+  void UpdateEventModel(const vtkVgTimeStamp& timestamp);
+
+  // Description:
+  // Add a trip-wire.  The id for the trip-wire can be specified as the final
+  // argument; otherwise, an internally determined (unique) id will be
+  // determined and returned.  A returned value of -1 indicates that the
+  // requested id was already in use.
+  vtkIdType AddTripWire(vtkPoints* loopPts, bool closedLoop, vtkIdType tripWireId = -1);
+  bool RemoveTripWire(vtkIdType tripWireId);
+  bool IsTripWire(vtkIdType tripWireId);
+  bool RemoveAllTripWires();
+  int GetNumberOfTripWires();
+  //void InitTripWireTraversal();
+  //vtkPolyLine *GetNextTripWire();
+
+  // Description:
+  // Set/Get trip wire enabled state
+  void SetTripWireEnabled(vtkIdType tripWireId, bool state);
+  bool GetTripWireEnabled(vtkIdType tripWireId);
+
+  // Description:
+  // Set/Get the TrackModel used to test against trip wires
+  void SetTrackModel(vtkVgTrackModel* model);
+  vtkGetObjectMacro(TrackModel, vtkVgTrackModel);
+
+  // Description:
+  // Set/Get the EventModel on/to which triggered events are managed
+  void SetEventModel(vtkVgEventModel* model);
+  vtkGetObjectMacro(EventModel, vtkVgEventModel);
+
+  void SetPreTripDuration(const vtkVgTimeStamp& duration);
+  vtkVgTimeStamp GetPreTripDuration()
+    {
+    return this->PreTripDuration;
+    }
+
+  // Description:
+  // Set/Get the id for EnteringRegion events.  Defaults to -1 because should
+  // be set according to its application
+  vtkSetMacro(EnteringRegionId, int);
+  vtkGetMacro(EnteringRegionId, int);
+
+  // Description:
+  // Set/Get the id for ExitingRegion events.  Defaults to -1 because should
+  // be set according to its application
+  vtkSetMacro(ExitingRegionId, int);
+  vtkGetMacro(ExitingRegionId, int);
+
+  // Description:
+  // Set/Get the id for TripWire events.  Defaults to -1 because should
+  // be set according to its application
+  vtkSetMacro(TripWireId, int);
+  vtkGetMacro(TripWireId, int);
+
+  // Description:
+  // Set/Get the EventIdCounter, used to set the ids for triggered events.
+  // The value monotically increases, and really should only be set once.  This
+  // is temporary (imagine it should really have ids in sync with other
+  // events).  Defaults to 1,000,000.
+  // be set according to its application
+  vtkSetMacro(EventIdCounter, int);
+  vtkGetMacro(EventIdCounter, int);
+
+  // Description:
+  // Check the indicated track against all existing trip wires, and return
+  // whether any trip, enter, or exit events occur.  Note, each of the bool
+  // values acts as input as well, indicting whether we're looking for that
+  // result (so we know if we can stop as soon as found true).
+  void CheckTrackForTripWireEvents(vtkVgTrack* track, bool& tripEvent,
+                                   bool& enterEvent, bool& exitEvent);
+
+//BTX
+protected:
+  vtkVgTripWireManager();
+  ~vtkVgTripWireManager();
+
+  vtkVgTimeStamp PreTripDuration;
+
+  vtkVgTrackModel* TrackModel;
+  vtkVgEventModel* EventModel;
+
+  int EnteringRegionId;
+  int ExitingRegionId;
+  int TripWireId;
+
+  int EventIdCounter;
+
+  class vtkInternal;
+  vtkInternal* Internals;
+
+//ETX
+};
+
+#endif
diff --git a/Libraries/VtkVgModelView/vtkVgVideoModel.cxx b/Libraries/VtkVgModelView/vtkVgVideoModel.cxx
new file mode 100644
index 00000000..f6150d23
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgVideoModel.cxx
@@ -0,0 +1,180 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoModel.h"
+
+#include <algorithm>
+
+#include <vtkObjectFactory.h>
+
+vtkStandardNewMacro(vtkVgVideoModel);
+
+//-----------------------------------------------------------------------------
+vtkVgVideoModel::vtkVgVideoModel() :
+  VideoSource(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoModel::~vtkVgVideoModel()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel::PrintSelf(ostream& os, vtkIndent indent)
+{
+  // TODO
+  vtkVgModelBase::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoSourceBase* vtkVgVideoModel::GetVideoSource()
+{
+  return this->VideoSource;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgVideoSourceBase* vtkVgVideoModel::GetVideoSource() const
+{
+  return this->VideoSource;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel::SetVideoSource(vtkVgVideoSourceBase* videoSource)
+{
+  if (videoSource == this->VideoSource)
+    {
+    // Do nothing if already using specified source
+    return;
+    }
+
+  this->VideoSource = videoSource;
+  this->CurrentVideoFrame = vtkVgVideoFrame();
+
+  this->UpdateChildren(vtkVgTimeStamp());
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoModel::Update(const vtkVgTimeStamp& timeStamp,
+                            const vtkVgTimeStamp* referenceFrameTimeStamp)
+{
+  if (!this->VideoSource)
+    {
+    // Can't update without video source
+    return VTK_ERROR;
+    }
+
+  vtkVgTimeStamp newTime = this->VideoSource->ResolveSeek(timeStamp);
+  if (this->CurrentTimeStamp == newTime)
+    {
+    // If frame time has not changed, do nothing
+    return VTK_OK;
+    }
+
+  this->CurrentVideoFrame = this->VideoSource->GetFrame(timeStamp);
+  this->CurrentTimeStamp = this->CurrentVideoFrame.MetaData.Time;
+
+  this->UpdateChildren(this->CurrentTimeStamp, referenceFrameTimeStamp);
+  this->Modified();
+
+  return VTK_OK;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgVideoFrame& vtkVgVideoModel::GetCurrentVideoFrame() const
+{
+  return this->CurrentVideoFrame;
+}
+
+//-----------------------------------------------------------------------------
+unsigned long vtkVgVideoModel::GetUpdateTime()
+{
+  return this->UpdateTime.GetMTime();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel::AddChildModel(vtkVgModelBase* model)
+{
+  if (model && !this->HasChildModel(model))
+    {
+    this->ChildModels.push_back(model);
+    model->Register(this);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgVideoModel::HasChildModel(vtkVgModelBase* model)
+{
+  const size_t count =
+   std::count(this->ChildModels.begin(), this->ChildModels.end(), model);
+  return count > 0;
+}
+
+//-----------------------------------------------------------------------------
+size_t vtkVgVideoModel::GetChildModelCount() const
+{
+  return this->ChildModels.size();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgModelBase* vtkVgVideoModel::GetChildModel(size_t index) const
+{
+  if (index >= this->ChildModels.size())
+    {
+    // Index out of bounds
+    return 0;
+    }
+
+  return this->ChildModels[index];
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgVideoModel::RemoveChildModel(vtkVgModelBase* model)
+{
+  typedef std::vector<vtkVgModelBase*>::iterator Iterator;
+  for (Iterator i = this->ChildModels.begin(), end = this->ChildModels.end();
+       i != end; ++i)
+    {
+    if (*i == model)
+      {
+      (*i)->UnRegister(this);
+      this->ChildModels.erase(i);
+      return true;
+      }
+    }
+
+  // Not found
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgVideoModel::RemoveChildModel(size_t index)
+{
+  if (index >= this->ChildModels.size())
+    {
+    // Index out of bounds
+    return false;
+    }
+
+  std::vector<vtkVgModelBase*>::iterator i = this->ChildModels.begin() + index;
+  (*i)->UnRegister(this);
+  this->ChildModels.erase(i);
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoModel::UpdateChildren(
+  const vtkVgTimeStamp& timeStamp,
+  const vtkVgTimeStamp* referenceFrameTimeStamp)
+{
+  for (size_t n = 0, k = this->ChildModels.size(); n < k; ++n)
+    {
+    this->ChildModels[n]->Update(timeStamp, referenceFrameTimeStamp);
+    }
+}
diff --git a/Libraries/VtkVgModelView/vtkVgVideoModel.h b/Libraries/VtkVgModelView/vtkVgVideoModel.h
new file mode 100644
index 00000000..6b6bc1ee
--- /dev/null
+++ b/Libraries/VtkVgModelView/vtkVgVideoModel.h
@@ -0,0 +1,102 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoModel_h
+#define __vtkVgVideoModel_h
+
+#include <vector>
+
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+#include <vtkVgVideoFrame.h>
+#include <vtkVgVideoSourceBase.h>
+
+#include "vtkVgModelBase.h"
+
+// Single entity that represents a video with optional child models.
+class VTKVG_MODELVIEW_EXPORT vtkVgVideoModel : public vtkVgModelBase
+{
+public:
+  vtkVgClassMacro(vtkVgVideoModel);
+  vtkTypeMacro(vtkVgVideoModel, vtkVgModelBase);
+
+  // Description:
+  // Use \c New() to create an instance of \c vtkVgVideoModel
+  static vtkVgVideoModel* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get \c vtkVgVideoSourceBase.
+  void SetVideoSource(vtkVgVideoSourceBase* videoSource);
+  vtkVgVideoSourceBase* GetVideoSource();
+  const vtkVgVideoSourceBase* GetVideoSource() const;
+
+  // Description:
+  // Seek video to the specified time stamp and update child models with the
+  // result of the seek.
+  virtual int Update(const vtkVgTimeStamp& timeStamp,
+                     const vtkVgTimeStamp* referenceFrameTimeStamp);
+  using Superclass::Update;
+
+  // Description:
+  // Return current video frame.
+  const vtkVgVideoFrame& GetCurrentVideoFrame() const;
+
+  // Description:
+  // Add a child model to this video model. The child model's time stamp will
+  // be synchronized with the video.
+  void AddChildModel(vtkVgModelBase* model);
+
+  // Description:
+  // Test if the specified model is a registered child model of this video
+  // model.
+  bool HasChildModel(vtkVgModelBase* model);
+
+  // Description:
+  // Return count of child models.
+  size_t GetChildModelCount() const;
+
+  // Description:
+  // Return child model at specified index, or nullptr if index is not valid.
+  vtkVgModelBase* GetChildModel(size_t index) const;
+
+  // Description:
+  // Remove specified child model. Return true if the model was removed, false
+  // if the specified model is not a child of this video model.
+  bool RemoveChildModel(vtkVgModelBase* model);
+
+  // Description:
+  // Remove child model at specified index. Return true if a model was removed,
+  // false if the index is not valid.
+  bool RemoveChildModel(size_t index);
+
+  // Description:
+  // Return the MTime for the last Update (that did something).
+  virtual unsigned long GetUpdateTime();
+
+protected:
+  vtkVgVideoModel();
+  virtual ~vtkVgVideoModel();
+
+  void UpdateChildren(const vtkVgTimeStamp& timeStamp,
+                      const vtkVgTimeStamp* referenceFrameTimeStamp = 0);
+
+  vtkSmartPointer<vtkVgVideoSourceBase> VideoSource;
+  vtkVgVideoFrame CurrentVideoFrame;
+
+  std::vector<vtkVgModelBase*> ChildModels;
+
+  vtkTimeStamp UpdateTime;
+
+private:
+  vtkVgVideoModel(const vtkVgVideoModel&);  // Not implemented.
+  void operator=(const vtkVgVideoModel&);   // Not implemented.
+};
+
+#endif // __vtkVgVideoModel_h
diff --git a/Libraries/VtkVgQtUtil/CMakeLists.txt b/Libraries/VtkVgQtUtil/CMakeLists.txt
new file mode 100644
index 00000000..50365bc9
--- /dev/null
+++ b/Libraries/VtkVgQtUtil/CMakeLists.txt
@@ -0,0 +1,42 @@
+project(vtkVgQtUtil)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+vg_include_library_sdk_directories(
+  vtkVgCore
+)
+
+set(vtkVgQtUtilSources
+  vtkVgQtAdapt.cxx
+  vtkVgQtUtil.cxx
+)
+
+set(vtkVgQtUtilInstallHeaders
+  vtkVgQtAdapt.h
+  vtkVgQtUtil.h
+)
+
+vg_vtk_module(${PROJECT_NAME}
+  DEPENDS
+  vtkGUISupportQt
+  vtkRenderingFreeTypeOpenGL
+)
+
+# Build and link library.
+vtk_module_library(${PROJECT_NAME}
+  ${vtkVgQtUtilSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  LINK_LIBRARIES
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vtkVgQtUtilInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VtkVgQtUtil)
+
+vg_wrap_vtk_library(${PROJECT_NAME})
diff --git a/Libraries/VtkVgQtUtil/vtkVgQtAdapt.cxx b/Libraries/VtkVgQtUtil/vtkVgQtAdapt.cxx
new file mode 100644
index 00000000..0f7b99fd
--- /dev/null
+++ b/Libraries/VtkVgQtUtil/vtkVgQtAdapt.cxx
@@ -0,0 +1,52 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgQtAdapt.h"
+
+#include <QMatrix4x4>
+
+#include <vtkMatrix4x4.h>
+
+//-----------------------------------------------------------------------------
+QMatrix4x4 qtAdapt(const vtkMatrix4x4* in)
+{
+  QMatrix4x4 out;
+  if (sizeof(qreal) == sizeof(double))
+    {
+    memcpy(out.data(), in->Element, 16 * sizeof(double));
+    return out.transposed();
+    }
+  else
+    {
+    for (int i = 0; i < 4; ++i)
+      {
+      for (int j = 0; j < 4; ++j)
+        {
+        out(i, j) = in->Element[i][j];
+        }
+      }
+    return out;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void qtAdapt(const QMatrix4x4& in, vtkMatrix4x4* out)
+{
+  if (sizeof(qreal) == sizeof(double))
+    {
+    memcpy(out->Element, in.transposed().constData(), 16 * sizeof(double));
+    }
+  else
+    {
+    for (int i = 0; i < 4; ++i)
+      {
+      for (int j = 0; j < 4; ++j)
+        {
+        out->Element[i][j] = in(i, j);
+        }
+      }
+    }
+}
diff --git a/Libraries/VtkVgQtUtil/vtkVgQtAdapt.h b/Libraries/VtkVgQtUtil/vtkVgQtAdapt.h
new file mode 100644
index 00000000..24a68ec3
--- /dev/null
+++ b/Libraries/VtkVgQtUtil/vtkVgQtAdapt.h
@@ -0,0 +1,19 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgQtAdapt_h
+#define __vtkVgQtAdapt_h
+
+#include <vgExport.h>
+
+class QMatrix4x4;
+
+class vtkMatrix4x4;
+
+extern VTKVGQT_UTIL_EXPORT QMatrix4x4 qtAdapt(const vtkMatrix4x4*);
+extern VTKVGQT_UTIL_EXPORT void qtAdapt(const QMatrix4x4&, vtkMatrix4x4*);
+
+#endif
diff --git a/Libraries/VtkVgQtUtil/vtkVgQtUtil.cxx b/Libraries/VtkVgQtUtil/vtkVgQtUtil.cxx
new file mode 100644
index 00000000..df7bc708
--- /dev/null
+++ b/Libraries/VtkVgQtUtil/vtkVgQtUtil.cxx
@@ -0,0 +1,73 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgQtUtil.h"
+
+#include <QApplication>
+#include <QThreadStorage>
+
+#include <vtkEventQtSlotConnect.h>
+
+#include <vtkVgInstance.h>
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+class vtkVgQtConnectionManager : public QObject
+{
+public:
+  vtkVgQtConnectionManager() {}
+  virtual ~vtkVgQtConnectionManager() {}
+
+  vtkEventQtSlotConnect* manager();
+
+protected:
+  typedef vtkVgInstance<vtkEventQtSlotConnect> Manager;
+  QThreadStorage<Manager*> tls;
+};
+
+Q_GLOBAL_STATIC(vtkVgQtConnectionManager, globalConnectionManager)
+
+//-----------------------------------------------------------------------------
+vtkEventQtSlotConnect* vtkVgQtConnectionManager::manager()
+{
+  if (!this->tls.hasLocalData())
+    {
+    this->tls.setLocalData(new Manager);
+    }
+  return *this->tls.localData();
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+void vtkConnect(
+  vtkObject* sender, unsigned long event, QObject* receiver, const char* slot,
+  Qt::ConnectionType type)
+{
+  vtkConnect(sender, event, receiver, slot, 0, 0.0f, type);
+}
+
+//-----------------------------------------------------------------------------
+void vtkConnect(
+  vtkObject* sender, unsigned long event, QObject* receiver, const char* slot,
+  void* data, float priority, Qt::ConnectionType type)
+{
+  vtkEventQtSlotConnect* m = globalConnectionManager()->manager();
+  m->Connect(sender, static_cast<vtkCommand::EventIds>(event),
+             receiver, slot, data, priority, type);
+}
+
+//-----------------------------------------------------------------------------
+void vtkDisconnect(
+  vtkObject* sender, unsigned long event,
+  QObject* receiver, const char* slot,
+  void* data)
+{
+  vtkEventQtSlotConnect* m = globalConnectionManager()->manager();
+  m->Disconnect(sender, event, receiver, slot, data);
+}
diff --git a/Libraries/VtkVgQtUtil/vtkVgQtUtil.h b/Libraries/VtkVgQtUtil/vtkVgQtUtil.h
new file mode 100644
index 00000000..40092d86
--- /dev/null
+++ b/Libraries/VtkVgQtUtil/vtkVgQtUtil.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgQtUtil_h
+#define __vtkVgQtUtil_h
+
+#include <QObject>
+
+#include <vgExport.h>
+
+class vtkObject;
+
+extern VTKVGQT_UTIL_EXPORT void vtkConnect(
+  vtkObject* sender, unsigned long event,
+  QObject* receiver, const char* slot,
+  Qt::ConnectionType type = Qt::AutoConnection);
+
+extern VTKVGQT_UTIL_EXPORT void vtkConnect(
+  vtkObject* sender, unsigned long event,
+  QObject* receiver, const char* slot,
+  void* data, float priority = 0.0f,
+  Qt::ConnectionType type = Qt::AutoConnection);
+
+extern VTKVGQT_UTIL_EXPORT void vtkDisconnect(
+  vtkObject* sender = 0, unsigned long event = 0,
+  QObject* receiver = 0, const char* slot = 0,
+  void* data = 0);
+
+#endif
diff --git a/Libraries/VtkVgQtWidgets/CMakeLists.txt b/Libraries/VtkVgQtWidgets/CMakeLists.txt
new file mode 100644
index 00000000..94b998e6
--- /dev/null
+++ b/Libraries/VtkVgQtWidgets/CMakeLists.txt
@@ -0,0 +1,49 @@
+project(vtkVgQtWidgets)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(vtkVgQtWidgetsSources
+  vtkVgRegionWidget.cxx
+)
+
+set(vtkVgQtWidgetsMocHeaders
+  vtkVgRegionWidget.h
+)
+
+set(vtkVgQtWidgetsInstallHeaders
+  vtkVgRegionWidget.h
+)
+
+qt4_wrap_cpp(vtkVgQtWidgetsMocSources ${vtkVgQtWidgetsMocHeaders})
+
+add_library(${PROJECT_NAME}
+  ${vtkVgQtWidgetsSources}
+  ${vtkVgQtWidgetsMocSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PRIVATE_INTERFACE_TARGETS
+  qtVgCommon
+  qtExtensions
+  vtkVgModelView
+  vtkVgQtUtil
+  LINK_LIBRARIES
+  LINK_PRIVATE
+  vtkGUISupportQt
+  vtkRenderingFreeTypeOpenGL
+  vtkRenderingVolumeOpenGL
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+  vtkInteractionWidgets
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vtkVgQtWidgetsInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/vtkVgQtWidgets)
diff --git a/Libraries/VtkVgQtWidgets/vtkVgRegionWidget.cxx b/Libraries/VtkVgQtWidgets/vtkVgRegionWidget.cxx
new file mode 100644
index 00000000..1f826405
--- /dev/null
+++ b/Libraries/VtkVgQtWidgets/vtkVgRegionWidget.cxx
@@ -0,0 +1,547 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgRegionWidget.h"
+
+#include <QDebug>
+#include <QMouseEvent>
+#include <QTimer>
+
+#include <qtStatusSource.h>
+
+#include <vtkBorderWidget.h>
+#include <vtkCommand.h>
+#include <vtkProperty2D.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindowInteractor.h>
+
+#include <vtkVgBorderRepresentation.h>
+#include <vtkVgInstance.h>
+#include <vtkVgSpaceConversion.h>
+
+#include <vgColor.h>
+
+#include <vtkVgQtUtil.h>
+
+QTE_IMPLEMENT_D_FUNC(vtkVgRegionWidget)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vtkVgRegionWidgetPrivate
+
+class vtkVgRegionWidgetPrivate
+{
+public:
+  vtkVgRegionWidgetPrivate(vtkVgRegionWidget* q);
+
+  enum InteractionState
+    {
+    Off,
+    Drop,
+    DragDrop,
+    IgnoreDrop,
+    PickFirst,
+    DragDraw,
+    PickSecond,
+    Manipulate
+    };
+
+  void setState(InteractionState);
+  InteractionState state() { return this->State; }
+
+  void updateDropPosition();
+  void updateSecondCorner();
+
+  qtStatusSource StatusSource;
+
+  vtkRenderWindowInteractor* Interactor;
+
+  vtkVgInstance<vtkBorderWidget> BorderWidget;
+  vtkVgInstance<vtkVgBorderRepresentation> BorderRepresentation;
+
+  QPoint FirstPoint, SecondPoint;
+  QSize DropSize;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vtkVgRegionWidget)
+
+  void postStatusMessage(const QString&);
+
+  InteractionState State;
+  bool QuickMode;
+  bool DropDrawCentered;
+  bool IsWithinView;
+
+private:
+  QTE_DECLARE_PUBLIC(vtkVgRegionWidget)
+};
+
+//-----------------------------------------------------------------------------
+vtkVgRegionWidgetPrivate::vtkVgRegionWidgetPrivate(vtkVgRegionWidget* q) :
+  StatusSource(q),
+  q_ptr(q),
+  State(Off),
+  DropDrawCentered(false),
+  IsWithinView(true)
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidgetPrivate::setState(InteractionState s)
+{
+  if (this->State == s)
+    return;
+
+  QTE_Q(vtkVgRegionWidget);
+
+  switch (this->State = s)
+    {
+    case Drop:
+      this->BorderWidget->Render();
+      this->postStatusMessage("Click to drop box; right-click to cancel");
+      break;
+    case PickFirst:
+      this->BorderRepresentation->SetShowBorderToOn();
+      this->BorderWidget->Render();
+      this->postStatusMessage("Select first corner; right-click to cancel");
+      break;
+    case PickSecond:
+      this->BorderRepresentation->SetShowBorderToOn();
+      this->BorderWidget->Render();
+      this->postStatusMessage("Select second corner; right-click to cancel");
+      break;
+    case Manipulate:
+      this->BorderWidget->ProcessEventsOn();
+      this->BorderRepresentation->SetShowBorderToOn();
+      this->postStatusMessage("Editing region; right-click when done");
+      vtkConnect(
+        this->Interactor, vtkCommand::RightButtonPressEvent, q,
+        SLOT(viewMouseEvent(vtkObject*, unsigned long)));
+      emit q->beginningManipulation();
+      break;
+    case Off:
+      this->BorderWidget->Off();
+      break;
+    case DragDraw:
+    case DragDrop:
+    case IgnoreDrop:
+      break;
+    }
+  this->BorderWidget->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidgetPrivate::updateDropPosition()
+{
+  int pos1[2];
+  this->Interactor->GetEventPosition(pos1);
+  this->DropDrawCentered = this->Interactor->GetControlKey();
+
+  if (this->DropDrawCentered)
+    {
+    pos1[0] -= this->DropSize.width() / 2;
+    pos1[1] += this->DropSize.height() / 2;
+    }
+
+  int pos2[2] =
+    {
+    pos1[0] + this->DropSize.width(),
+    pos1[1] - this->DropSize.height()
+    };
+
+  this->BorderRepresentation->SetDisplayPoint1(pos1);
+  this->BorderRepresentation->SetDisplayPoint2(pos2);
+  this->BorderWidget->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidgetPrivate::updateSecondCorner()
+{
+  int pos1[2] = { this->FirstPoint.x(), this->FirstPoint.y() };
+  int pos2[2];
+  this->Interactor->GetEventPosition(pos2);
+
+  if (this->Interactor->GetControlKey())
+    {
+    pos1[0] -= (pos2[0] - pos1[0]);
+    pos1[1] -= (pos2[1] - pos1[1]);
+    }
+  this->BorderRepresentation->SetDisplayPoint1(pos1);
+  this->BorderRepresentation->SetDisplayPoint2(pos2);
+  this->BorderWidget->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidgetPrivate::postStatusMessage(const QString& message)
+{
+  QTE_Q(vtkVgRegionWidget);
+  emit q->statusMessageAvailable(message);
+  emit q->statusMessageAvailable(this->StatusSource, message);
+}
+
+//END vtkVgRegionWidgetPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vtkVgRegionWidget
+
+//-----------------------------------------------------------------------------
+vtkVgRegionWidget::vtkVgRegionWidget(
+  vtkRenderWindowInteractor* interactor, QObject* parent)
+  : QObject(parent), d_ptr(new vtkVgRegionWidgetPrivate(this))
+{
+  QTE_D(vtkVgRegionWidget);
+
+  d->StatusSource.setName(this);
+
+  d->Interactor = interactor;
+  d->BorderWidget->SetRepresentation(d->BorderRepresentation);
+  d->BorderWidget->SetInteractor(interactor);
+  d->BorderWidget->SetSelectable(false);
+  d->BorderWidget->Off();
+  d->BorderWidget->SetKeyPressActivation(false);
+
+  d->BorderRepresentation->GetBorderProperty()->SetColor(0.0, 1.0, 1.0);
+  d->BorderRepresentation->GetBorderProperty()->SetLineWidth(3);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgRegionWidget::~vtkVgRegionWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+QRect vtkVgRegionWidget::rect()
+{
+  QTE_D(vtkVgRegionWidget);
+
+  QRect r;
+  r.setLeft(qRound(d->BorderRepresentation->GetPosition()[0]));
+  r.setTop(qRound(d->BorderRepresentation->GetPosition()[1]));
+  r.setRight(qRound(d->BorderRepresentation->GetPosition2()[0]));
+  r.setBottom(qRound(d->BorderRepresentation->GetPosition2()[1]));
+
+  return r.normalized();
+}
+
+
+//-----------------------------------------------------------------------------
+QSize vtkVgRegionWidget::displaySize()
+{
+  QTE_D(vtkVgRegionWidget);
+
+  vtkRenderer* renderer = d->BorderRepresentation->GetRenderer();
+
+  double point1[3], point2[3];
+  double worldPt[4] = { d->BorderRepresentation->GetPosition()[0],
+                        d->BorderRepresentation->GetPosition()[1], 0.0, 1.0};
+  vtkVgSpaceConversion::WorldToDisplay(renderer, worldPt, point1);
+
+  worldPt[0] = d->BorderRepresentation->GetPosition2()[0];
+  worldPt[1] = d->BorderRepresentation->GetPosition2()[1];
+  vtkVgSpaceConversion::WorldToDisplay(renderer, worldPt, point2);
+
+  return QSize(abs(qRound(point2[0] - point1[0])),
+               abs(qRound(point2[1] - point1[1])));
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::setRect(const QRect& r)
+{
+  QTE_D(vtkVgRegionWidget);
+
+  d->BorderRepresentation->SetPosition(r.left(), r.top());
+  d->BorderRepresentation->SetPosition2(r.right(), r.bottom());
+
+  d->BorderWidget->On();
+  d->setState(vtkVgRegionWidgetPrivate::Manipulate);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::setColor(QColor c)
+{
+  QTE_D(vtkVgRegionWidget);
+
+  vgColor vgc(c);
+  d->BorderRepresentation->GetBorderProperty()->SetColor(vgc.data().array);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::setLineWidth(qreal w)
+{
+  QTE_D(vtkVgRegionWidget);
+
+  d->BorderRepresentation->GetBorderProperty()->SetLineWidth(w);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::setStyle(QColor color, qreal lineWidth)
+{
+  this->setColor(color);
+  this->setLineWidth(lineWidth);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::begin()
+{
+  QTE_D(vtkVgRegionWidget);
+
+  const char* const kslot = SLOT(viewKeyEvent(vtkObject*, unsigned long));
+  const char* const mslot = SLOT(viewMouseEvent(vtkObject*, unsigned long));
+
+  // Connect this to the interactor style to prevent it from handling drags
+  // (e.g. rubber band zoom)
+  vtkConnect(d->Interactor->GetInteractorStyle(),
+             vtkCommand::LeftButtonPressEvent,
+             this, mslot);
+
+  vtkConnect(d->Interactor, vtkCommand::LeftButtonReleaseEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::RightButtonPressEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::MouseMoveEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::KeyPressEvent, this, kslot);
+  vtkConnect(d->Interactor, vtkCommand::KeyReleaseEvent, this, kslot);
+
+  d->BorderWidget->On();
+  d->BorderWidget->ProcessEventsOff();
+  d->BorderRepresentation->SetShowBorderToOff();
+  d->QuickMode = false;
+  d->setState(vtkVgRegionWidgetPrivate::PickFirst);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::beginQuick(const QSize& size)
+{
+  QTE_D(vtkVgRegionWidget);
+
+  const char* const kslot = SLOT(viewKeyEvent(vtkObject*, unsigned long));
+  const char* const mslot = SLOT(viewMouseEvent(vtkObject*, unsigned long));
+
+  vtkConnect(d->Interactor, vtkCommand::LeftButtonPressEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::LeftButtonReleaseEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::RightButtonPressEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::MouseMoveEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::EnterEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::LeaveEvent, this, mslot);
+  vtkConnect(d->Interactor, vtkCommand::KeyPressEvent, this, kslot);
+  vtkConnect(d->Interactor, vtkCommand::KeyReleaseEvent, this, kslot);
+
+  d->DropSize = size;
+  d->BorderWidget->On();
+  d->BorderWidget->ProcessEventsOff();
+  d->BorderRepresentation->SetShowBorderToOff();
+  d->QuickMode = true;
+  d->setState(vtkVgRegionWidgetPrivate::Drop);
+  d->BorderWidget->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::viewKeyEvent(
+  vtkObject* sender, unsigned long event)
+{
+  Q_UNUSED(sender);
+  Q_UNUSED(event);
+
+  QTE_D(vtkVgRegionWidget);
+
+  if (d->Interactor->GetKeyCode() == 0) // modifier key pressed/released
+    {
+    const char* const slot = SLOT(viewMouseEvent(vtkObject*, unsigned long));
+
+    vtkVgRegionWidgetPrivate::InteractionState const state = d->state();
+    if (d->Interactor->GetShiftKey())
+      {
+      if (state == vtkVgRegionWidgetPrivate::Drop)
+        {
+        // Connect this to the interactor style to prevent it from handling
+        // drags (e.g. rubber band zoom)
+        vtkConnect(d->Interactor->GetInteractorStyle(),
+                   vtkCommand::LeftButtonPressEvent,
+                   this, slot);
+        d->BorderRepresentation->SetVisibility(false);
+        d->setState(vtkVgRegionWidgetPrivate::PickFirst);
+        emit this->dropDrawStarted();
+        }
+      }
+    else if (d->QuickMode)
+      {
+      switch (state)
+        {
+        case vtkVgRegionWidgetPrivate::PickFirst:
+          // Disconnect this from the interactor style to allow it to handle
+          // drags (e.g. rubber band zoom), since we do not need to block that
+          // in drop mode
+          vtkDisconnect(d->Interactor->GetInteractorStyle(),
+                        vtkCommand::LeftButtonPressEvent,
+                        this);
+          d->setState(vtkVgRegionWidgetPrivate::Drop);
+          d->BorderRepresentation->SetVisibility(d->IsWithinView);
+          d->updateDropPosition();
+          emit this->dropDrawCanceled();
+        case vtkVgRegionWidgetPrivate::Drop:
+        case vtkVgRegionWidgetPrivate::DragDrop:
+          d->updateDropPosition();
+          break;
+        default:
+          break;
+        }
+      }
+
+    if (state == vtkVgRegionWidgetPrivate::PickSecond)
+      {
+      d->updateSecondCorner();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::viewMouseEvent(
+  vtkObject* sender, unsigned long event)
+{
+  Q_UNUSED(sender);
+
+  QTE_D(vtkVgRegionWidget);
+
+  vtkVgRegionWidgetPrivate::InteractionState state = d->state();
+  int pos[2];
+  d->Interactor->GetEventPosition(pos);
+
+  switch (event)
+    {
+    case vtkCommand::LeftButtonPressEvent:
+      if (state == vtkVgRegionWidgetPrivate::PickFirst)
+        {
+        vtkConnect(d->Interactor, vtkCommand::LeftButtonPressEvent, this,
+                   SLOT(viewMouseEvent(vtkObject*, unsigned long)));
+
+        d->FirstPoint = QPoint(pos[0], pos[1]);
+        d->BorderRepresentation->SetDisplayPoint1(pos);
+        d->BorderRepresentation->SetDisplayPoint2(pos);
+        d->BorderRepresentation->SetVisibility(true);
+        d->setState(vtkVgRegionWidgetPrivate::DragDraw);
+        QTimer::singleShot(700, this, SLOT(beginSecondPick()));
+        }
+      else if (state == vtkVgRegionWidgetPrivate::Drop)
+        {
+        d->FirstPoint = QPoint(pos[0], pos[1]);
+        d->setState(vtkVgRegionWidgetPrivate::DragDrop);
+        }
+      break;
+    case vtkCommand::MouseMoveEvent:
+      if (state == vtkVgRegionWidgetPrivate::DragDrop)
+        {
+        d->SecondPoint = QPoint(pos[0], pos[1]);
+        int dist = (d->FirstPoint - d->SecondPoint).manhattanLength();
+        if (dist > 6)
+          {
+          // Suppress drop once a drag has started
+          d->setState(vtkVgRegionWidgetPrivate::IgnoreDrop);
+          d->BorderRepresentation->SetVisibility(false);
+          d->BorderWidget->Render();
+          }
+        else
+          {
+          state = vtkVgRegionWidgetPrivate::Drop;
+          }
+        }
+      if (state == vtkVgRegionWidgetPrivate::Drop)
+        {
+        d->BorderRepresentation->SetShowBorderToOn();
+        d->updateDropPosition();
+        }
+      else
+        {
+        if (state == vtkVgRegionWidgetPrivate::DragDraw)
+          {
+          d->SecondPoint = QPoint(pos[0], pos[1]);
+          int dist = (d->FirstPoint - d->SecondPoint).manhattanLength();
+          if (dist > 6)
+            {
+            state = vtkVgRegionWidgetPrivate::PickSecond;
+            d->setState(state);
+            }
+          }
+        if (state == vtkVgRegionWidgetPrivate::PickSecond)
+          {
+          d->updateSecondCorner();
+          }
+        }
+      break;
+    case vtkCommand::EnterEvent:
+      d->IsWithinView = true;
+      if (state == vtkVgRegionWidgetPrivate::Drop ||
+          state == vtkVgRegionWidgetPrivate::DragDrop)
+        {
+        d->BorderRepresentation->SetVisibility(true);
+        d->BorderWidget->Render();
+        }
+      break;
+    case vtkCommand::LeaveEvent:
+      d->IsWithinView = false;
+      if (state == vtkVgRegionWidgetPrivate::Drop ||
+          state == vtkVgRegionWidgetPrivate::DragDrop)
+        {
+        d->BorderRepresentation->SetVisibility(false);
+        d->BorderWidget->Render();
+        }
+      break;
+    case vtkCommand::LeftButtonReleaseEvent:
+      switch (state)
+        {
+        case vtkVgRegionWidgetPrivate::PickFirst:
+        case vtkVgRegionWidgetPrivate::DragDraw:
+          d->setState(vtkVgRegionWidgetPrivate::PickSecond);
+          break;
+        case vtkVgRegionWidgetPrivate::PickSecond:
+          if (d->QuickMode)
+            {
+            emit this->dropDrawCompleted();
+            emit this->completed();
+            }
+          else
+            {
+            // Done handling mouse events
+            vtkDisconnect(d->Interactor->GetInteractorStyle(),
+                          vtkCommand::NoEvent, this);
+            vtkDisconnect(d->Interactor, vtkCommand::NoEvent, this);
+            d->setState(vtkVgRegionWidgetPrivate::Manipulate);
+            }
+          break;
+        case vtkVgRegionWidgetPrivate::Drop:
+        case vtkVgRegionWidgetPrivate::DragDrop:
+          emit this->completed();
+          break;
+        case vtkVgRegionWidgetPrivate::IgnoreDrop:
+          d->setState(vtkVgRegionWidgetPrivate::Drop);
+          d->BorderRepresentation->SetVisibility(d->IsWithinView);
+          d->updateDropPosition();
+          break;
+        default: // Should never happen
+          qWarning() << "in" << __FUNCTION__
+                     << "at" << QString("%1:%2").arg(__FILE__).arg(__LINE__)
+                     << "unhandled state" << state;
+          break;
+        }
+      break;
+    case vtkCommand::RightButtonPressEvent:
+      emit (state == vtkVgRegionWidgetPrivate::Manipulate
+            ? this->completed() : this->canceled());
+    default:
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgRegionWidget::beginSecondPick()
+{
+  QTE_D(vtkVgRegionWidget);
+
+  if (d->state() == vtkVgRegionWidgetPrivate::DragDraw)
+    {
+    d->setState(vtkVgRegionWidgetPrivate::PickSecond);
+    }
+}
+
+//END vtkVgRegionWidget
diff --git a/Libraries/VtkVgQtWidgets/vtkVgRegionWidget.h b/Libraries/VtkVgQtWidgets/vtkVgRegionWidget.h
new file mode 100644
index 00000000..f18ff02f
--- /dev/null
+++ b/Libraries/VtkVgQtWidgets/vtkVgRegionWidget.h
@@ -0,0 +1,70 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgRegionWidget_h
+#define __vtkVgRegionWidget_h
+
+#include <QColor>
+#include <QObject>
+#include <QRect>
+
+#include <qtGlobal.h>
+#include <qtStatusSource.h>
+
+#include <vgExport.h>
+
+class vtkObject;
+class vtkRenderWindowInteractor;
+
+class vtkVgRegionWidgetPrivate;
+
+class VTKVGQT_WIDGETS_EXPORT vtkVgRegionWidget : public QObject
+{
+  Q_OBJECT
+
+public:
+  vtkVgRegionWidget(vtkRenderWindowInteractor*, QObject* parent = 0);
+  ~vtkVgRegionWidget();
+
+  QRect rect();
+  void setRect(const QRect&);
+
+  QSize displaySize();
+
+  void setStyle(QColor color, qreal lineWidth);
+
+  void beginQuick(const QSize&);
+
+signals:
+  void dropDrawStarted();
+  void dropDrawCanceled();
+  void dropDrawCompleted();
+  void beginningManipulation();
+  void completed();
+  void canceled();
+  void statusMessageAvailable(QString = QString());
+  void statusMessageAvailable(qtStatusSource, QString = QString());
+
+public slots:
+  void begin();
+
+  void setColor(QColor);
+  void setLineWidth(qreal);
+
+protected slots:
+  void viewKeyEvent(vtkObject* sender, unsigned long event);
+  void viewMouseEvent(vtkObject* sender, unsigned long event);
+  void beginSecondPick();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vtkVgRegionWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(vtkVgRegionWidget)
+  Q_DISABLE_COPY(vtkVgRegionWidget)
+};
+
+#endif
diff --git a/Libraries/VtkVgSceneGraph/CMakeLists.txt b/Libraries/VtkVgSceneGraph/CMakeLists.txt
new file mode 100644
index 00000000..2ddc47e9
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/CMakeLists.txt
@@ -0,0 +1,74 @@
+project(vtkVgSceneGraph)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+set(vtkVgSceneGraphSrcs
+  vtkVgAreaPicker.cxx
+  vtkVgComputeBounds.cxx
+  vtkVgFindNode.cxx
+  vtkVgFindNodeVisitor.cxx
+  vtkVgGeode.cxx
+  vtkVgGroupNode.cxx
+  vtkVgLeafNodeBase.cxx
+  vtkVgNodeBase.cxx
+  vtkVgNodeVisitor.cxx
+  vtkVgNodeVisitorBase.cxx
+  vtkVgPropCollection.cxx
+  vtkVgRenderer.cxx
+  vtkVgSceneManager.cxx
+  vtkVgTerrain.cxx
+  vtkVgTrackNode.cxx
+  vtkVgTransformNode.cxx
+  vtkVgVideoNode.cxx
+  vtkVgVideoViewer.cxx
+  vtkVgViewBase.cxx
+  vtkVgViewer.cxx
+  vtkVgViewerBase.cxx
+)
+
+set(vtkVgSceneGraphInstallHeaders
+  vtkVgAreaPicker.h
+  vtkVgComputeBounds.h
+  vtkVgFindNode.h
+  vtkVgFindNodeVisitor.h
+  vtkVgGeode.h
+  vtkVgGroupNode.h
+  vtkVgLeafNodeBase.h
+  vtkVgNodeBase.h
+  vtkVgNodeVisitorBase.h
+  vtkVgNodeVisitor.h
+  vtkVgPropCollection.h
+  vtkVgRenderer.h
+  vtkVgSceneManager.h
+  vtkVgTerrain.h
+  vtkVgTrackNode.h
+  vtkVgTransformNode.h
+  vtkVgVideoNode.h
+  vtkVgVideoViewer.h
+  vtkVgViewBase.h
+  vtkVgViewerBase.h
+  vtkVgViewer.h
+)
+
+vg_vtk_module(${PROJECT_NAME}
+  DEPENDS
+  vtkInteractionStyle
+  vtkRenderingFreeTypeOpenGL
+  vtkRenderingOpenGL
+)
+
+# Build and link library.
+vtk_module_library(${PROJECT_NAME} ${vtkVgSceneGraphSrcs})
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vtkVgModelView
+)
+
+vg_add_test_subdirectory()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vtkVgSceneGraphInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VtkVgSceneGraph)
diff --git a/Libraries/VtkVgSceneGraph/Testing/CMakeLists.txt b/Libraries/VtkVgSceneGraph/Testing/CMakeLists.txt
new file mode 100644
index 00000000..bc7653bf
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/Testing/CMakeLists.txt
@@ -0,0 +1,15 @@
+# Command line tests.
+include_directories(../)
+set(VGTEST_LINK_LIBRARIES vtkVgSceneGraph vtkVgModelView)
+
+set(Tests
+#     testSceneGraphAPI.cxx
+)
+
+set(TestsToRun ${Tests})
+
+foreach(test ${TestsToRun})
+  get_filename_component(TName ${test} NAME_WE)
+  string(REPLACE "test" "" testname ${TName})
+  vg_add_test(vtkVgSceneGraph-${testname} ${TName} SOURCES ${test} ARGS ${VISGUI_DATA_ROOT}/CLIF/images.txt)
+endforeach(test)
diff --git a/Libraries/VtkVgSceneGraph/Testing/testSceneGraphAPI.cxx b/Libraries/VtkVgSceneGraph/Testing/testSceneGraphAPI.cxx
new file mode 100644
index 00000000..f9a58d12
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/Testing/testSceneGraphAPI.cxx
@@ -0,0 +1,113 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <cstdio>
+
+// VTK includes.
+#include <vtkCommand.h>
+#include <vtkProp.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+#include <vtkSmartPointer.h>
+#include <vtkTransform.h>
+
+// VG includes.
+#include "vtkVgVideoProviderBase.h"
+#include "vtkVgFileVideoSource.h"
+#include "vtkVgVideoRepresentation0.h"
+#include "vtkVgVideoModel0.h"
+#include "vtkVgTimeStamp.h"
+
+#include "vtkVgSceneManager.h"
+#include "vtkVgGroupNode.h"
+#include "vtkVgTransformNode.h"
+#include "vtkVgVideoNode.h"
+
+int main(int argc, char** argv)
+{
+  if (argc < 2)
+    {
+    std::cerr << "Requires second argument for data source" << std::endl;
+    return 1;
+    }
+
+  vtkVgTimeStamp                         timeStamp;
+
+  // Video item 1.
+  vtkVgVideoModel0::SmartPtr              videoModel;
+  vtkVgVideoRepresentationBase0::SmartPtr videoRep;
+
+  // Video item 2.
+  vtkVgVideoModel0::SmartPtr              videoModel2;
+  vtkVgVideoRepresentationBase0::SmartPtr videoRep2;
+
+  // Scene nodes and scene manager.
+  vtkVgSceneManager::SmartPtr            sceneManager;
+
+  vtkVgGroupNode::SmartPtr               root;
+  vtkVgVideoNode::SmartPtr               videoNode;
+  vtkVgVideoNode::SmartPtr               videoNode2;
+  vtkVgTransformNode::SmartPtr           transformNode;
+
+  // Render window.
+  vtkSmartPointer<vtkRenderWindow>       renWin;
+
+  vtkVgVideoProviderBase::SmartPtr videoSource = vtkVgFileVideoSource::SmartPtr::New();
+  videoSource->SetDataSource(argv[1]);
+
+  // Transform for videoModel2.
+  vtkSmartPointer<vtkTransform> transform(vtkSmartPointer<vtkTransform>::New());
+  transform->Translate(10000.0, 10000.0, 0.0);
+
+  // Create video item 1.
+  videoModel = vtkVgVideoModel0::SmartPtr::New();
+  videoModel->SetVideoSource(videoSource);
+  videoModel->SetLooping(1);
+  videoRep  = vtkVgVideoRepresentation0::SmartPtr::New();
+  videoRep->SetVideoModel(videoModel);
+
+  // Create video item 2.
+  videoModel2 = vtkVgVideoModel0::SmartPtr::New();
+  videoModel2->SetVideoSource(videoSource);
+  videoModel2->SetLooping(1);
+  videoModel2->SetVideoMatrix(transform->GetMatrix());
+  videoRep2  = vtkVgVideoRepresentation0::SmartPtr::New();
+  videoRep2->SetVideoModel(videoModel2);
+
+  // Create scene nodes and scene manager.
+  sceneManager = vtkVgSceneManager::SmartPtr::New();
+
+  root          = vtkVgGroupNode::SmartPtr::New();
+  videoNode     = vtkVgVideoNode::SmartPtr::New();
+  videoNode2    = vtkVgVideoNode::SmartPtr::New();
+  transformNode = vtkVgTransformNode::SmartPtr::New();
+
+  transformNode->AddChild(videoNode2);
+  root->AddChild(videoNode);
+  root->AddChild(transformNode);
+
+  videoNode->SetVideoRepresentation(videoRep);
+  videoNode2->SetVideoRepresentation(videoRep2);
+
+  timeStamp.SetFrameNumber(1);
+
+  sceneManager->SetSceneRoot(root);
+
+  // Update it once.
+  sceneManager->Update(timeStamp);
+
+  // Set the VTK render pipeline.
+  renWin = vtkSmartPointer<vtkRenderWindow>::New();
+  renWin->AddRenderer(sceneManager->GetSceneRenderer());
+
+  vtkSmartPointer<vtkRenderWindowInteractor> renWinIntr
+  (vtkSmartPointer<vtkRenderWindowInteractor>::New());
+  renWinIntr->SetRenderWindow(renWin);
+
+  // \NOTE: Don't render. This is a test for the API.
+  return 0;
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgAreaPicker.cxx b/Libraries/VtkVgSceneGraph/vtkVgAreaPicker.cxx
new file mode 100644
index 00000000..e30d2bef
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgAreaPicker.cxx
@@ -0,0 +1,149 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgAreaPicker.h"
+
+// VTK includes.
+#include "vtkAreaPicker.h"
+#include "vtkObjectFactory.h"
+#include "vtkMapper.h"
+#include "vtkAbstractVolumeMapper.h"
+#include "vtkImageMapper3D.h"
+#include "vtkAbstractMapper3D.h"
+#include "vtkProp.h"
+#include "vtkLODProp3D.h"
+#include "vtkActor.h"
+#include "vtkPropCollection.h"
+#include "vtkImageSlice.h"
+#include "vtkProp3DCollection.h"
+#include "vtkAssemblyPath.h"
+#include "vtkImageData.h"
+#include "vtkVolume.h"
+#include "vtkRenderer.h"
+#include "vtkProperty.h"
+#include "vtkCommand.h"
+#include "vtkPlanes.h"
+#include "vtkPlane.h"
+#include "vtkPoints.h"
+#include "vtkExtractSelectedFrustum.h"
+
+vtkStandardNewMacro(vtkVgAreaPicker);
+
+int vtkVgAreaPicker::PickProps(vtkRenderer* renderer)
+{
+  vtkProp* prop;
+  int pickable;
+  double bounds[6];
+
+  //  Initialize picking process
+  this->Initialize();
+  this->Renderer = renderer;
+
+  // Invoke start pick method if defined
+  this->InvokeEvent(vtkCommand::StartPickEvent, NULL);
+
+  if (renderer == NULL)
+    {
+    vtkErrorMacro(<< "Must specify renderer!");
+    return 0;
+    }
+
+  //  Loop over all props.
+  //
+  vtkPropCollection* props;
+  vtkProp* propCandidate;
+  if (this->PickFromList)
+    {
+    props = this->GetPickList();
+    }
+  else
+    {
+    props = renderer->GetViewProps();
+    }
+
+  vtkAbstractMapper3D* mapper = NULL;
+  vtkAssemblyPath* path;
+
+  double mindist = VTK_DOUBLE_MAX;
+
+  vtkCollectionSimpleIterator pit;
+  for (props->InitTraversal(pit); (prop = props->GetNextProp(pit));)
+    {
+    for (prop->InitPathTraversal(); (path = prop->GetNextPath());)
+      {
+      propCandidate = path->GetLastNode()->GetViewProp();
+      pickable = this->TypeDecipher(propCandidate, &mapper);
+
+      //  If actor can be picked, see if it is within the pick frustum.
+      if (pickable)
+        {
+        if (mapper)
+          {
+          double* bds = propCandidate->GetBounds();
+          for (int i = 0; i < 6; i++)
+            {
+            bounds[i] = bds[i];
+            }
+
+          double dist;
+          //cerr << "mapper ABFISECT" << endl;
+          if (this->ABoxFrustumIsect(bounds, dist))
+            {
+            if (! this->Prop3Ds->IsItemPresent(prop))
+              {
+              this->Prop3Ds->AddItem(static_cast<vtkProp3D*>(prop));
+              //cerr << "picked a mapper" << endl;
+              if (dist < mindist) //new nearest, remember it
+                {
+                mindist = dist;
+                this->SetPath(path);
+                this->Mapper = mapper;
+                vtkMapper* map1;
+                vtkAbstractVolumeMapper* vmap;
+                vtkImageMapper3D* imap;
+                if ((map1 = vtkMapper::SafeDownCast(mapper)) != NULL)
+                  {
+                  this->DataSet = map1->GetInput();
+                  this->Mapper = map1;
+                  }
+                else if ((vmap = vtkAbstractVolumeMapper::SafeDownCast(mapper)) != NULL)
+                  {
+                  this->DataSet = vmap->GetDataSetInput();
+                  this->Mapper = vmap;
+                  }
+                else if ((imap = vtkImageMapper3D::SafeDownCast(mapper)) != NULL)
+                  {
+                  this->DataSet = imap->GetDataSetInput();
+                  this->Mapper = imap;
+                  }
+                else
+                  {
+                  this->DataSet = NULL;
+                  }
+                }
+              }
+            }
+          }//mapper
+        }//pickable
+
+      }//for all parts
+    }//for all props
+
+  int picked = 0;
+
+  if (this->Path)
+    {
+    // Invoke pick method if one defined - prop goes first
+    this->Path->GetFirstNode()->GetViewProp()->Pick();
+    this->InvokeEvent(vtkCommand::PickEvent, NULL);
+    picked = 1;
+    }
+
+  // Invoke end pick method if defined
+  this->InvokeEvent(vtkCommand::EndPickEvent, NULL);
+
+  return picked;
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgAreaPicker.h b/Libraries/VtkVgSceneGraph/vtkVgAreaPicker.h
new file mode 100644
index 00000000..f732acfd
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgAreaPicker.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgAreaPicker_h
+#define __vtkVgAreaPicker_h
+
+#include <vtkAreaPicker.h>
+
+#include <vgExport.h>
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgAreaPicker : public vtkAreaPicker
+{
+public:
+  vtkTypeMacro(vtkVgAreaPicker, vtkAreaPicker);
+
+  static vtkVgAreaPicker* New();
+
+  virtual int PickProps(vtkRenderer* renderer);
+
+protected:
+  vtkVgAreaPicker() : vtkAreaPicker() {;}
+  virtual ~vtkVgAreaPicker() {;}
+
+private:
+  vtkVgAreaPicker(const vtkVgAreaPicker&);
+  void operator= (const vtkVgAreaPicker&);
+};
+
+#endif // __vtkVgAreaPicker_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgComputeBounds.cxx b/Libraries/VtkVgSceneGraph/vtkVgComputeBounds.cxx
new file mode 100644
index 00000000..b61ba23e
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgComputeBounds.cxx
@@ -0,0 +1,139 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgComputeBounds.h"
+
+// VG includes.
+#include "vtkVgGroupNode.h"
+
+// VTK includes.
+#include <vtkMath.h>
+#include <vtkProp.h>
+#include <vtkPropCollection.h>
+
+//-----------------------------------------------------------------------------
+void vtkVgComputeBounds::ComputeVisiblePropBounds(vtkPropCollection* props,
+                                                  double allBounds[6])
+{
+  vtkProp*    prop;
+  double*     bounds;
+  int        nothingVisible = 1;
+
+  allBounds[0] = allBounds[2] = allBounds[4] = VTK_DOUBLE_MAX;
+  allBounds[1] = allBounds[3] = allBounds[5] = -VTK_DOUBLE_MAX;
+
+  // loop through all props
+  vtkCollectionSimpleIterator pit;
+  for (props->InitTraversal(pit);
+       (prop = props->GetNextProp(pit));)
+    {
+    // For now consider bounds for invisible props as well.
+    // If prop bounds should be ignored, or has no geometry, we can skip the rest
+    if (prop->GetUseBounds())
+      {
+      bounds = prop->GetBounds();
+
+      // make sure we haven't got bogus bounds
+      if (bounds != NULL && vtkMath::AreBoundsInitialized(bounds))
+        {
+        nothingVisible = 0;
+
+        if (bounds[0] < allBounds[0])
+          {
+          allBounds[0] = bounds[0];
+          }
+        if (bounds[1] > allBounds[1])
+          {
+          allBounds[1] = bounds[1];
+          }
+        if (bounds[2] < allBounds[2])
+          {
+          allBounds[2] = bounds[2];
+          }
+        if (bounds[3] > allBounds[3])
+          {
+          allBounds[3] = bounds[3];
+          }
+        if (bounds[4] < allBounds[4])
+          {
+          allBounds[4] = bounds[4];
+          }
+        if (bounds[5] > allBounds[5])
+          {
+          allBounds[5] = bounds[5];
+          }
+        }//not bogus
+      }
+    }
+
+  if (nothingVisible)
+    {
+    vtkMath::UninitializeBounds(allBounds);
+    return;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgComputeBounds::ComputeVisiblePropBounds(vtkVgGroupNode* groupNode)
+{
+  bool useCalculatedBounds = false;
+  double groupBounds[6];
+  groupBounds[0] = groupBounds[2] = groupBounds[4] = VTK_DOUBLE_MAX;
+  groupBounds[1] = groupBounds[3] = groupBounds[5] = -VTK_DOUBLE_MAX;
+
+  int numberOfChildren = groupNode->GetNumberOfChildren();
+
+  for (int i = 0; i < numberOfChildren; ++i)
+    {
+    vtkVgNodeBase* node = groupNode->GetChild(i);
+    double* bounds = const_cast<double*>(node->GetBounds());
+
+    if (bounds != NULL && !vtkMath::AreBoundsInitialized(bounds))
+      {
+      if (node->GetBoundsDirty())
+        {
+        node->ComputeBounds();
+        }
+      }
+
+    if (bounds != NULL && vtkMath::AreBoundsInitialized(bounds))
+      {
+      useCalculatedBounds = true;
+
+      if (bounds[0] < groupBounds[0])
+        {
+        groupBounds[0] = bounds[0];
+        }
+      if (bounds[1] > groupBounds[1])
+        {
+        groupBounds[1] = bounds[1];
+        }
+      if (bounds[2] < groupBounds[2])
+        {
+        groupBounds[2] = bounds[2];
+        }
+      if (bounds[3] > groupBounds[3])
+        {
+        groupBounds[3] = bounds[3];
+        }
+      if (bounds[4] < groupBounds[4])
+        {
+        groupBounds[4] = bounds[4];
+        }
+      if (bounds[5] > groupBounds[5])
+        {
+        groupBounds[5] = bounds[5];
+        }
+      }
+    }
+
+  if (!useCalculatedBounds)
+    {
+    vtkMath::UninitializeBounds(groupBounds);
+    }
+
+  groupNode->SetBounds(groupBounds);
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgComputeBounds.h b/Libraries/VtkVgSceneGraph/vtkVgComputeBounds.h
new file mode 100644
index 00000000..ab6ee803
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgComputeBounds.h
@@ -0,0 +1,27 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgComputeBounds_h
+#define __vtkVgComputeBounds_h
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkPropCollection;
+class vtkVgGroupNode;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgComputeBounds
+{
+public:
+
+  static void ComputeVisiblePropBounds(vtkPropCollection* props,
+                                       double bounds[6]);
+
+  static void ComputeVisiblePropBounds(vtkVgGroupNode* groupNode);
+
+};
+
+#endif // __vtkVgComputeBounds_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgFindNode.cxx b/Libraries/VtkVgSceneGraph/vtkVgFindNode.cxx
new file mode 100644
index 00000000..f94569bf
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgFindNode.cxx
@@ -0,0 +1,45 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgFindNode.h"
+
+#include "vtkVgGroupNode.h"
+#include "vtkVgNodeBase.h"
+
+bool vtkVgFindNode::ContainsNode(vtkVgGroupNode* root, vtkVgNodeBase* searchNode)
+{
+  bool retVal = false;
+
+  if (!root || !searchNode)
+    {
+    return retVal;
+    }
+
+  int numberOfChildren = root->GetNumberOfChildren();
+  for (int i = 0; i < numberOfChildren; ++i)
+    {
+    vtkVgNodeBase* node = root->GetChild(i);
+
+    if (node == searchNode)
+      {
+      retVal = true;
+      return retVal;
+      }
+
+    vtkVgGroupNode* groupNode = dynamic_cast<vtkVgGroupNode*>(node);
+    if (groupNode)
+      {
+      retVal = vtkVgFindNode::ContainsNode(groupNode, searchNode);
+
+      if (retVal)
+        {
+        return retVal;
+        }
+      }
+    }
+
+  return false;
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgFindNode.h b/Libraries/VtkVgSceneGraph/vtkVgFindNode.h
new file mode 100644
index 00000000..c4ab9b0a
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgFindNode.h
@@ -0,0 +1,23 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgFindNode_h
+#define __vtkVgFindNode_h
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgGroupNode;
+class vtkVgNodeBase;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgFindNode
+{
+public:
+
+  static bool ContainsNode(vtkVgGroupNode* root, vtkVgNodeBase* searchNode);
+};
+
+#endif // __vtkVgFindNode_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgFindNodeVisitor.cxx b/Libraries/VtkVgSceneGraph/vtkVgFindNodeVisitor.cxx
new file mode 100644
index 00000000..2641c126
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgFindNodeVisitor.cxx
@@ -0,0 +1,140 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// VG includes.
+#include "vtkVgFindNodeVisitor.h"
+#include "vtkVgVideoNode.h"
+#include "vtkVgGeode.h"
+#include "vtkVgVideoRepresentationBase0.h"
+
+// VTK includes.
+#include <vtkPropCollection.h>
+#include <vtkProp3D.h>
+
+//-----------------------------------------------------------------------------
+vtkVgFindNodeVisitor::vtkVgFindNodeVisitor() : vtkVgNodeVisitor(),
+  UsingProp3D(NULL),
+  Node(NULL)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgFindNodeVisitor::~vtkVgFindNodeVisitor()
+{
+  this->SetVisitorType(vtkVgNodeVisitorBase::NODE_VISITOR);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgFindNodeVisitor::SetUsingProp3D(vtkProp3D* prop3D)
+{
+  if (prop3D && (this->UsingProp3D != prop3D))
+    {
+    this->UsingProp3D = prop3D;
+
+    this->ModifiedTimeStamp.Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkProp3D* vtkVgFindNodeVisitor::GetUsingProp3D()
+{
+  return this->UsingProp3D;
+}
+
+//-----------------------------------------------------------------------------
+const vtkProp3D* vtkVgFindNodeVisitor::GetUsingProp3D() const
+{
+  return this->UsingProp3D;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgNodeBase* vtkVgFindNodeVisitor::GetNode()
+{
+  return this->Node;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgFindNodeVisitor::Visit(vtkVgVideoNode& videoNode)
+{
+  if (!this->UsingProp3D)
+    {
+    return;
+    }
+
+  vtkVgNodeVisitorBase::Visit(videoNode);
+
+  vtkVgVideoRepresentationBase0* videoRep = videoNode.GetVideoRepresentation();
+  vtkPropCollection* propCollection = videoRep->GetActiveRenderObjects();
+  if (propCollection)
+    {
+    propCollection->InitTraversal();
+
+    int numberOfItems = propCollection->GetNumberOfItems();
+
+    for (int i = 0; i < numberOfItems; ++i)
+      {
+      if (vtkProp3D::SafeDownCast(propCollection->GetNextProp()) ==
+          this->UsingProp3D)
+        {
+        this->Node = static_cast<vtkVgNodeBase*>(&videoNode);
+        break;
+        }
+      }
+    }
+
+  this->Traverse(videoNode);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgFindNodeVisitor::Visit(vtkVgGeode& geode)
+{
+  if (!this->UsingProp3D)
+    {
+    return;
+    }
+
+  vtkVgNodeVisitorBase::Visit(geode);
+
+  vtkPropCollection* propCollection = geode.GetActiveDrawables();
+  if (propCollection)
+    {
+    propCollection->InitTraversal();
+
+    int numberOfItems = propCollection->GetNumberOfItems();
+
+    for (int i = 0; i < numberOfItems; ++i)
+      {
+      // Put a loop in here.
+      if (vtkProp3D::SafeDownCast(propCollection->GetNextProp()) ==
+          this->UsingProp3D)
+        {
+        this->Node = static_cast<vtkVgNodeBase*>(&geode);
+        break;
+        }
+      }
+    }
+
+  this->Traverse(geode);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgFindNodeVisitor::Visit(vtkVgGroupNode& groupNode)
+{
+  vtkVgNodeVisitor::Visit(groupNode);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgFindNodeVisitor::Visit(vtkVgTransformNode& transformNode)
+{
+  vtkVgNodeVisitor::Visit(transformNode);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgFindNodeVisitor::Visit(vtkVgLeafNodeBase& leafNode)
+{
+  vtkVgNodeVisitor::Visit(leafNode);
+}
+
diff --git a/Libraries/VtkVgSceneGraph/vtkVgFindNodeVisitor.h b/Libraries/VtkVgSceneGraph/vtkVgFindNodeVisitor.h
new file mode 100644
index 00000000..d98ead95
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgFindNodeVisitor.h
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgFindNodeVisitor_h
+#define __vtkVgFindNodeVisitor_h
+
+#include "vtkVgNodeVisitor.h"
+
+#include <vgExport.h>
+
+class vtkVgVideoRepresentationBase0;
+class vtkVgGeode;
+class vtkVgVideoNode;
+class vtkPropCollection;
+class vtkProp3D;
+
+//-----------------------------------------------------------------------------
+class VTKVG_SCENEGRAPH_EXPORT vtkVgFindNodeVisitor : public vtkVgNodeVisitor
+{
+public:
+  vtkVgFindNodeVisitor();
+  virtual ~vtkVgFindNodeVisitor();
+
+  // Description:
+  // Overridden function. This traverse a video node.
+  virtual void Visit(vtkVgVideoNode&     videoNode);
+  virtual void Visit(vtkVgGeode&         geode);
+  virtual void Visit(vtkVgGroupNode&     groupNode);
+  virtual void Visit(vtkVgTransformNode& transformNode);
+  virtual void Visit(vtkVgLeafNodeBase&  leafNode);
+
+
+  // Description:
+  // Set/Get \c vtkProp3D that is used as search criteria.
+  void SetUsingProp3D(vtkProp3D* prop3D);
+  vtkProp3D* GetUsingProp3D();
+  const vtkProp3D* GetUsingProp3D() const;
+
+  // Description:
+  // Return the first node that found during the search
+  // containing  \c vtkProp3D set using \c SetUsingProp3D(..).
+  vtkVgNodeBase* GetNode();
+
+private:
+  vtkProp3D*       UsingProp3D;
+  vtkVgNodeBase*   Node;
+
+  vtkVgFindNodeVisitor(const vtkVgFindNodeVisitor&); // Not implemented.
+  void operator= (const vtkVgFindNodeVisitor&);           // Not implemented.
+};
+
+#endif // __vtkVgFindNodeVisitor_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgGeode.cxx b/Libraries/VtkVgSceneGraph/vtkVgGeode.cxx
new file mode 100644
index 00000000..31baf967
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgGeode.cxx
@@ -0,0 +1,233 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// VG includes.
+#include "vtkVgComputeBounds.h"
+#include "vtkVgGeode.h"
+#include "vtkVgGroupNode.h"
+#include "vtkVgNodeVisitorBase.h"
+#include "vtkVgPropCollection.h"
+#include "vtkVgSceneManager.h"
+
+// VTK includes.
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkProp.h>
+#include <vtkPropCollection.h>
+#include <vtkRenderer.h>
+
+vtkStandardNewMacro(vtkVgGeode);
+
+//-----------------------------------------------------------------------------
+vtkVgGeode::vtkVgGeode() : vtkVgLeafNodeBase()
+{
+  this->ActiveDrawables  = vtkSmartPointer<vtkPropCollection>::New();
+  this->NewDrawables     = vtkSmartPointer<vtkPropCollection>::New();
+  this->ExpiredDrawables = vtkSmartPointer<vtkPropCollection>::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGeode::~vtkVgGeode()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGeode::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGeode::SetVisible(int flag)
+{
+  if (!this->Superclass::SetVisible(flag))
+    {
+    return 0;
+    }
+
+  this->ActiveDrawables->InitTraversal();
+
+  int numberOfItems =  this->ActiveDrawables->GetNumberOfItems();
+  for (int i = 0; i < numberOfItems; ++i)
+    {
+    // \TODO: We are dealing with only 3d props. We need to find a way for
+    // setting a user transform to vtkProp if needed.
+    vtkProp3D* currentProp =
+      static_cast<vtkProp3D*>(this->ActiveDrawables->GetNextProp());
+    if (currentProp)
+      {
+      currentProp->SetVisibility(flag);
+      }
+    }
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGeode::AddDrawable(vtkProp* prop)
+{
+  if (prop)
+    {
+    this->ActiveDrawables->AddItem(prop);
+
+    this->NewDrawables->AddItem(prop);
+
+    this->BoundsDirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGeode::RemoveDrawable(vtkProp* prop)
+{
+  if (prop)
+    {
+    this->ActiveDrawables->RemoveItem(prop);
+    this->ExpiredDrawables->AddItem(prop);
+
+    this->BoundsDirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgGeode::GetActiveDrawables()
+{
+  return this->ActiveDrawables;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgGeode::GetActiveDrawables() const
+{
+  return this->ActiveDrawables;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgGeode::GetNewDrawables()
+{
+  return this->NewDrawables;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgGeode::GetNewDrawables() const
+{
+  return this->NewDrawables;
+}
+
+//-----------------------------------------------------------------------------
+vtkPropCollection* vtkVgGeode::GetExpiredDrawables()
+{
+  return this->ExpiredDrawables;
+}
+
+//-----------------------------------------------------------------------------
+const vtkPropCollection* vtkVgGeode::GetExpiredDrawables() const
+{
+  return this->ExpiredDrawables;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGeode::Update(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  this->UpdateRenderObjects(nodeVisitor.GetPropCollection());
+
+  if (((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Parent->GetDirty()) ||
+      ((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Dirty))
+    {
+    this->FinalMatrix->DeepCopy(this->Parent->GetFinalMatrix());
+
+    this->ActiveDrawables->InitTraversal();
+    for (int i = 0; i < this->ActiveDrawables->GetNumberOfItems(); ++i)
+      {
+      // \TODO: We are dealing with only 3d props. We need to find a way for
+      // setting a user transform to vtkProp if needed.
+      vtkProp3D* currentProp = static_cast<vtkProp3D*>(this->ActiveDrawables->GetNextProp());
+      if (currentProp)
+        {
+        double w = vtkMath::Norm(this->FinalMatrix->Element[3], 4);
+        for (int i = 0; i < 4; ++i)
+          {
+          for (int j = 0; j < 4; ++j)
+            {
+            this->FinalMatrix->Element[i][j] /= w;
+            }
+          }
+
+        currentProp->SetUserMatrix(this->FinalMatrix);
+        }
+      }
+
+    this->BoundsDirtyOn();
+    }
+
+  if (this->GetBoundsDirty())
+    {
+    this->ComputeBounds();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGeode::UpdateRenderObjects(vtkVgPropCollection* propCollection)
+{
+  if (this->GetRemoveNode())
+    {
+    propCollection->AddExpired(this->GetActiveDrawables());
+
+    // Since we removed the active render objects, we would need to copy them to the
+    // new render objects to have them shown up if this node is added to SG again.
+    this->ActiveDrawables->InitTraversal();
+    int numberOfItems = this->ActiveDrawables->GetNumberOfItems();
+    for (int i = 0; i < numberOfItems; ++i)
+      {
+      this->NewDrawables->AddItem(this->ActiveDrawables->GetNextProp());
+      }
+
+    this->ActiveDrawables->RemoveAllItems();
+    this->RemoveNodeOff();
+    }
+  else
+    {
+    propCollection->AddNew(this->NewDrawables);
+    propCollection->AddExpired(this->ExpiredDrawables);
+
+    this->NewDrawables->RemoveAllItems();
+    this->ExpiredDrawables->RemoveAllItems();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGeode::Accept(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  nodeVisitor.Visit(*this);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGeode::Traverse(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  // Then call base class Traverse which calls Update on this.
+  this->Superclass::Traverse(nodeVisitor);
+
+  if (this->BoundsDirty)
+    {
+    this->ComputeBounds();
+    }
+
+  this->DirtyOff();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGeode::ComputeBounds()
+{
+  vtkVgComputeBounds::ComputeVisiblePropBounds(this->GetActiveDrawables(),
+                                               this->Bounds);
+
+  if (vtkMath::AreBoundsInitialized(this->Bounds) ||
+      (this->GetActiveDrawables()->GetNumberOfItems() < 1))
+    {
+    this->BoundsDirtyOff();
+    }
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgGeode.h b/Libraries/VtkVgSceneGraph/vtkVgGeode.h
new file mode 100644
index 00000000..2f445b36
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgGeode.h
@@ -0,0 +1,95 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgGeode_h
+#define __vtkVgGeode_h
+
+// VG includes.
+#include "vtkVgMacros.h"
+#include "vtkVgLeafNodeBase.h"
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkProp;
+class vtkPropCollection;
+class vtkVgPropCollection;
+class vtkVgTimeStamp;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgGeode : public vtkVgLeafNodeBase
+{
+public:
+  // Description:
+  // Easy to use types.
+  vtkVgClassMacro(vtkVgGeode);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgGeode, vtkVgLeafNodeBase);
+
+  static vtkVgGeode* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Overridden function.
+  virtual int SetVisible(int flag);
+
+  // Description:
+  // Add/Remove drawables \c vtkProp 's from the collection.
+  void AddDrawable(vtkProp* prop);
+  void RemoveDrawable(vtkProp* prop);
+
+  // Description:
+  // Get active drawables.
+  vtkPropCollection*       GetActiveDrawables();
+  const vtkPropCollection* GetActiveDrawables() const;
+
+  // Description:
+  // Get new drawables.
+  vtkPropCollection*       GetNewDrawables();
+  const vtkPropCollection* GetNewDrawables() const;
+
+  // Description:
+  // Get expired drawables.
+  vtkPropCollection*       GetExpiredDrawables();
+  const vtkPropCollection* GetExpiredDrawables() const;
+
+  // Description:
+  // Overridden functions.
+  virtual void Update(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void UpdateRenderObjects(vtkVgPropCollection* propCollection);
+
+  // Description
+  virtual void Accept(vtkVgNodeVisitorBase&  nodeVisitor);
+
+  virtual void Traverse(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void ComputeBounds();
+
+
+protected:
+  vtkVgGeode();
+  virtual  ~vtkVgGeode();
+
+
+
+  vtkSmartPointer<vtkPropCollection> ActiveDrawables;
+  vtkSmartPointer<vtkPropCollection> NewDrawables;
+  vtkSmartPointer<vtkPropCollection> ExpiredDrawables;
+
+
+private:
+
+  vtkVgGeode(const vtkVgGeode&);
+  void operator=(vtkVgGeode&);
+};
+
+#endif // __vtkVgGeode_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgGroupNode.cxx b/Libraries/VtkVgSceneGraph/vtkVgGroupNode.cxx
new file mode 100644
index 00000000..b12469e0
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgGroupNode.cxx
@@ -0,0 +1,305 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgGroupNode.h"
+
+// VG includes.
+#include "vtkVgComputeBounds.h"
+#include "vtkVgNodeVisitorBase.h"
+
+// VTk includes.
+#include <vtkCollection.h>
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+
+#include <string>
+
+vtkStandardNewMacro(vtkVgGroupNode);
+
+//-----------------------------------------------------------------------------
+vtkVgGroupNode::vtkVgGroupNode() : vtkVgNodeBase()
+{
+  this->Children        = vtkSmartPointer<vtkCollection>::New();
+  this->RemoveChildren  = vtkSmartPointer<vtkCollection>::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGroupNode::~vtkVgGroupNode()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::AddChild(vtkVgNodeBase* child)
+{
+  if (child)
+    {
+    // Don't add this child twice.
+    if (child->GetParent() && (child->GetParent() == this))
+      {
+      return;
+      }
+
+    // If this child has another parent, remove this child from
+    // its parent.
+    if (child->GetParent())
+      {
+      child->GetParent()->RemoveChild(child);
+      }
+
+    child->SetRemoveNode(0);
+
+    // Set this as new parent.
+    child->SetParent(this);
+
+    this->Children->AddItem(child);
+
+    this->BoundsDirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGroupNode::RemoveChild(vtkVgNodeBase* child)
+{
+  if (child)
+    {
+    // Lazy removal.
+    child->SetRemoveNode(1);
+
+    // Set parent to null for children that belong to this node only.
+    if (child->GetParent() && child->GetParent() == this)
+      {
+      child->SetParent(0);
+      }
+
+    this->RemoveChildren->AddItem(child);
+
+    this->Children->RemoveItem(child);
+
+    this->BoundsDirtyOn();
+
+    return VTK_OK;
+    }
+
+  return VTK_ERROR;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgNodeBase* vtkVgGroupNode::GetChild(int index)
+{
+  if (index >= this->GetNumberOfChildren())
+    {
+    return 0;
+    }
+
+  return static_cast<vtkVgNodeBase*>(this->Children->GetItemAsObject(index));
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vtkVgNodeBase::SmartPtr> vtkVgGroupNode::GetChildren()
+{
+  std::vector<vtkVgNodeBase::SmartPtr> children;
+  int numberOfChildren = this->GetNumberOfChildren();
+  if (numberOfChildren)
+    {
+    this->Children->InitTraversal();
+
+    for (int i = 0; i < numberOfChildren; ++i)
+      {
+      children.push_back(this->GetChild(i));
+      }
+    }
+
+  return children;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGroupNode::GetNumberOfChildren() const
+{
+  return this->Children->GetNumberOfItems();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::MakeAllChildrenDirty()
+{
+  int numberOfItems = this->Children->GetNumberOfItems();
+  if (numberOfItems)
+    {
+    this->Children->InitTraversal();
+
+    for (int i = 0; i < numberOfItems; ++i)
+      {
+      (static_cast<vtkVgNodeBase*>(this->Children->GetNextItemAsObject()))->DirtyOn();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::SetParent(vtkVgGroupNode* parent)
+{
+  this->Superclass::SetParent(parent);
+
+  this->DirtyOn();
+
+  this->MakeAllChildrenDirty();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgGroupNode::SetVisible(int flag)
+{
+  if (!this->Superclass::SetVisible(flag))
+    {
+    return 0;
+    }
+
+  int numberOfItems = this->Children->GetNumberOfItems();
+  if (numberOfItems)
+    {
+    this->Children->InitTraversal();
+
+    for (int i = 0; i < numberOfItems; ++i)
+      {
+      vtkVgNodeBase* node =
+        static_cast<vtkVgNodeBase*>(this->Children->GetNextItemAsObject());
+      node->SetVisible(flag);
+      }
+    }
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::Update(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  this->Superclass::Update(nodeVisitor);
+
+  if (this->GetBoundsDirty())
+    {
+    this->ComputeBounds();
+    }
+
+  if (((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Parent->GetDirty()) ||
+      ((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Dirty))
+    {
+    this->FinalMatrix->DeepCopy(this->Parent->GetFinalMatrix());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::Accept(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  nodeVisitor.Visit(*this);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::Traverse(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  this->Superclass::Traverse(nodeVisitor);
+
+  this->TraverseChildren(nodeVisitor);
+
+  // Calculate the bounds.
+  if (this->GetBoundsDirty())
+    {
+    this->ComputeBounds();
+    }
+
+  // At the end of the traversal reset the dirty state.
+  this->DirtyOff();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::ComputeBounds()
+{
+  vtkVgComputeBounds::ComputeVisiblePropBounds(this);
+
+  // If bounds are initialized or if this node does not have any children
+  // then we won't be calculating the bounds as it will not lead to any
+  // real bounds.
+  if (vtkMath::AreBoundsInitialized(this->Bounds) || (this->GetNumberOfChildren() < 1))
+    {
+    this->BoundsDirtyOff();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::TraverseChildren(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  int numberOfItems = this->Children->GetNumberOfItems();
+
+  if (numberOfItems)
+    {
+    this->Children->InitTraversal();
+
+    vtkVgNodeBase* node =
+      static_cast<vtkVgNodeBase*>(this->Children->GetNextItemAsObject());
+    while (node)
+      {
+      node->Accept(nodeVisitor);
+
+      node = static_cast<vtkVgNodeBase*>(this->Children->GetNextItemAsObject());
+      }
+    }
+
+  // Now remove the nodes.
+  numberOfItems = this->RemoveChildren->GetNumberOfItems();
+  if (numberOfItems)
+    {
+    this->RemoveChildren->InitTraversal();
+
+    vtkVgNodeBase* node =
+      static_cast<vtkVgNodeBase*>(this->RemoveChildren->GetNextItemAsObject());
+    while (node)
+      {
+      // Traverse only if this node has remove node flag set to true.
+      if (node->GetRemoveNode())
+        {
+        node->Accept(nodeVisitor);
+        }
+
+      node = static_cast<vtkVgNodeBase*>(this->RemoveChildren->GetNextItemAsObject());
+      }
+
+    this->RemoveChildren->RemoveAllItems();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgGroupNode::SetRemoveNode(int flag)
+{
+  if (this->RemoveNode != flag)
+    {
+    this->RemoveNode = flag;
+
+    int numberOfItems = this->Children->GetNumberOfItems();
+    if (numberOfItems)
+      {
+      this->Children->InitTraversal();
+
+      for (int i = 0; i < numberOfItems; ++i)
+        {
+        vtkVgNodeBase* node =
+          static_cast<vtkVgNodeBase*>(this->Children->GetNextItemAsObject());
+
+        // Don't set the flag if the parent of this node is not this.
+        if (node->GetParent() && node->GetParent() != this)
+          {
+          continue;
+          }
+
+        node->SetRemoveNode(flag);
+        }
+      }
+    }
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgGroupNode.h b/Libraries/VtkVgSceneGraph/vtkVgGroupNode.h
new file mode 100644
index 00000000..2e7d88f1
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgGroupNode.h
@@ -0,0 +1,88 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgGroupNode_h
+#define __vtkVgGroupNode_h
+
+#include "vtkVgNodeBase.h"
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+// STL includes.
+#include <vector> // STL required.
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkCollection;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgGroupNode : public vtkVgNodeBase
+{
+public:
+  // Description:
+  vtkVgClassMacro(vtkVgGroupNode);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgGroupNode, vtkVgNodeBase);
+
+  static vtkVgGroupNode* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // \TODO: We could have index based functions here too.
+  void AddChild(vtkVgNodeBase* child);
+  int  RemoveChild(vtkVgNodeBase* child);
+
+  // Description:
+  // Get a particular child.
+  vtkVgNodeBase* GetChild(int index);
+
+  std::vector<vtkVgNodeBase::SmartPtr>
+  GetChildren();
+
+  // Description:
+  // Get number of children.
+  int GetNumberOfChildren() const;
+
+  // Description:
+  virtual void MakeAllChildrenDirty();
+
+  // Description:
+  virtual void SetParent(vtkVgGroupNode* parent);
+
+  // Description:
+  // Overridden functions.
+  virtual int SetVisible(int flag);
+
+  virtual void Update(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void Accept(vtkVgNodeVisitorBase&  nodeVisitor);
+
+  virtual void Traverse(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void ComputeBounds();
+
+  virtual void SetRemoveNode(int flag);
+
+
+protected:
+  vtkVgGroupNode();
+  virtual ~vtkVgGroupNode();
+
+  void TraverseChildren(vtkVgNodeVisitorBase& nodeVisitor);
+
+  vtkSmartPointer<vtkCollection> Children;
+  vtkSmartPointer<vtkCollection> RemoveChildren;
+
+private:
+  vtkVgGroupNode(const vtkVgGroupNode&); // Not implemented.
+  void operator=(const vtkVgGroupNode&); // Not implemented.
+};
+
+#endif // __vtkVgGroupNode_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgLeafNodeBase.cxx b/Libraries/VtkVgSceneGraph/vtkVgLeafNodeBase.cxx
new file mode 100644
index 00000000..b4357572
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgLeafNodeBase.cxx
@@ -0,0 +1,60 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgLeafNodeBase.h"
+
+// SceneGraph includes.
+#include "vtkVgPropCollection.h"
+#include "vtkVgRepresentationBase.h"
+
+//-----------------------------------------------------------------------------
+void vtkVgLeafNodeBase::PrepareForAddition(
+  vtkVgPropCollection* propCollection, vtkVgRepresentationBase* representation)
+{
+  if (!representation || !propCollection)
+    {
+    // Do nothing.
+    return;
+    }
+
+  propCollection->AddNew(
+    representation->GetNewRenderObjects(),
+    representation->GetLayerIndex());
+
+  propCollection->AddExpired(
+    representation->GetExpiredRenderObjects(),
+    representation->GetLayerIndex());
+
+  representation->ResetTemporaryRenderObjects();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgLeafNodeBase::PrepareForRemoval(
+  vtkVgPropCollection* propCollection, vtkVgRepresentationBase* representation)
+{
+  if (!representation || !propCollection)
+    {
+    // Do nothing.
+    return;
+    }
+
+  representation->ResetTemporaryRenderObjects();
+
+  propCollection->AddExpired(representation->GetActiveRenderObjects(),
+                             representation->GetLayerIndex());
+
+  // Since we removed the active render objects, we would need to copy them to the
+  // new render objects to have them shown up if this node is added to SG again.
+  vtkPropCollection* activeRO = representation->GetActiveRenderObjects();
+  vtkPropCollection* newRO    = representation->GetNewRenderObjects();
+
+  activeRO->InitTraversal();
+  int numberOfItems = activeRO->GetNumberOfItems();
+  for (int i = 0; i < numberOfItems; ++i)
+    {
+    newRO->AddItem(activeRO->GetNextProp());
+    }
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgLeafNodeBase.h b/Libraries/VtkVgSceneGraph/vtkVgLeafNodeBase.h
new file mode 100644
index 00000000..c75350dd
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgLeafNodeBase.h
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgLeafNodeBase_h
+#define __vtkVgLeafNodeBase_h
+
+// VG includes.
+#include "vtkVgMacros.h"
+#include "vtkVgNodeBase.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgPropCollection;
+class vtkVgRepresentationBase;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgLeafNodeBase : public vtkVgNodeBase
+{
+public:
+
+  // Description:
+  // Easy to use types.
+  vtkVgClassMacro(vtkVgLeafNodeBase);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgLeafNodeBase, vtkVgNodeBase);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent)
+    {this->Superclass::PrintSelf(os, indent);}
+
+  // Description:
+  // Update \c vtkVgPropCollection with new and expired
+  // \c vtkPropCollection 's.
+  // Derived classes need to override this.
+  virtual void UpdateRenderObjects(
+    vtkVgPropCollection* vtkNotUsed(propCollection)) {;}
+
+
+
+protected:
+  vtkVgLeafNodeBase() {;}
+  virtual ~vtkVgLeafNodeBase() {;}
+
+  void     PrepareForAddition(vtkVgPropCollection* propCollection,
+                              vtkVgRepresentationBase* representation);
+  void     PrepareForRemoval(vtkVgPropCollection* propCollection,
+                             vtkVgRepresentationBase* representation);
+
+
+private:
+  vtkVgLeafNodeBase(const vtkVgLeafNodeBase&);
+  void operator= (const vtkVgLeafNodeBase&);
+};
+
+#endif // __vtkVgLeafNodeBase_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgNodeBase.cxx b/Libraries/VtkVgSceneGraph/vtkVgNodeBase.cxx
new file mode 100644
index 00000000..c67fc277
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgNodeBase.cxx
@@ -0,0 +1,175 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgNodeBase.h"
+#include "vtkVgGroupNode.h"
+#include "vtkVgNodeVisitorBase.h"
+
+// VTK includes.
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+
+
+vtkStandardNewMacro(vtkVgNodeBase)
+
+//-----------------------------------------------------------------------------
+vtkVgNodeBase::vtkVgNodeBase() : vtkObject(),
+  Name(0),
+  Dirty(1),
+  BoundsDirty(1),
+  Visible(1),
+  RemoveNode(0),
+  FinalMatrix(NULL),
+  Parent(NULL),
+  NodeReferenceFrame
+  (RELATIVE),
+  VisibleNodeMask
+  (VISIBLE_NODE_MASK)
+{
+  this->SetName("");
+  this->FinalMatrix = vtkSmartPointer<vtkMatrix4x4>::New();
+
+  // Set the bounds to uninitialized state.
+  vtkMath::UninitializeBounds(this->Bounds);
+}
+
+//-----------------------------------------------------------------------------
+vtkVgNodeBase::~vtkVgNodeBase()
+{
+  this->SetName(NULL);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeBase::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+
+  os << indent << "Name: " << ((Name == NULL) ? "" : this->Name) << "\n";
+  os << indent << "Visible: " << (this->Visible ? "True" : "False") << "\n";
+  os << indent << "Dirty: " << (this->Dirty ? "True" : "False") << "\n";
+}
+
+//-----------------------------------------------------------------------------
+const char* vtkVgNodeBase::GetName() const
+{
+  return this->Name;
+}
+
+
+//-----------------------------------------------------------------------------
+int vtkVgNodeBase::SetVisible(int flag)
+{
+  if (this->Visible != flag &&
+      (this->GetVisibleNodeMask() & VISIBLE_NODE_MASK))
+    {
+    this->Visible = flag;
+    return 1;
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeBase::SetBoundsDirty(int flag)
+{
+  if (this->BoundsDirty != flag)
+    {
+    this->BoundsDirty = flag;
+    if (this->Parent && flag)
+      {
+      this->Parent->BoundsDirtyOn();
+      }
+
+    // \NOTE: Do We need to set this on?
+//    this->DirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeBase::BoundsDirtyOn()
+{
+  this->SetBoundsDirty(static_cast<int>(1));
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeBase::BoundsDirtyOff()
+{
+  this->SetBoundsDirty(static_cast<int>(0));
+}
+
+//-----------------------------------------------------------------------------
+const vtkMatrix4x4* vtkVgNodeBase::GetFinalMatrix() const
+{
+  return this->FinalMatrix;
+}
+
+//-----------------------------------------------------------------------------
+vtkMatrix4x4* vtkVgNodeBase::GetFinalMatrix()
+{
+  return this->FinalMatrix;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeBase::SetParent(vtkVgGroupNode* parent)
+{
+  if (this->Parent != parent)
+    {
+    this->Parent = parent;
+    this->DirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgGroupNode* vtkVgNodeBase::GetParent()
+{
+  return this->Parent;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgGroupNode* vtkVgNodeBase::GetParent() const
+{
+  return this->Parent;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeBase::GetBounds(double bounds[6])
+{
+  for (int i = 0; i < 6; ++i)
+    {
+    bounds[i] = this->Bounds[i];
+    }
+}
+
+//-----------------------------------------------------------------------------
+const double* vtkVgNodeBase::GetBounds() const
+{
+  return this->Bounds;
+}
+
+//-----------------------------------------------------------------------------
+double* vtkVgNodeBase::GetBounds()
+{
+  return this->Bounds;
+}
+
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeBase::Update(vtkVgNodeVisitorBase& vtkNotUsed(nodeVisitor))
+{
+  // Do nothing.
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeBase::Traverse(vtkVgNodeVisitorBase&  nodeVisitor)
+{
+  if (nodeVisitor.GetVisitorType() == vtkVgNodeVisitorBase::UPDATE_VISITOR)
+    {
+    this->Update(nodeVisitor);
+    }
+
+  // \NOTE: Don't call DirtyOff here. As that is the responsibility of the derived class.
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgNodeBase.h b/Libraries/VtkVgSceneGraph/vtkVgNodeBase.h
new file mode 100644
index 00000000..7d6e3ea4
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgNodeBase.h
@@ -0,0 +1,181 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgNodeBase_h
+#define __vtkVgNodeBase_h
+
+// VG includes.
+#include "vtkVgMacros.h"
+
+// VTK includes.
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgTimeStamp;
+class vtkVgGroupNode;
+class vtkVgNodeVisitorBase;
+
+class vtkMatrix4x4;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgNodeBase : public vtkObject
+{
+public:
+  typedef unsigned int NodeMaskType;
+
+  // Description:
+  // Defines reference frame of this wrt its parent.
+  enum ReferenceFrame
+    {
+    ABSOLUTE,
+    RELATIVE
+    };
+
+  // Description:
+  // Easy to use types.
+  vtkVgClassMacro(vtkVgNodeBase);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgNodeBase, vtkObject);
+
+  static vtkVgNodeBase* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get name for the node.
+  vtkSetStringMacro(Name);
+  const char* GetName() const;
+
+  // Description:
+  // Set/Get visibility flag.
+  virtual int SetVisible(int flag);
+  vtkGetMacro(Visible, int);
+  vtkBooleanMacro(Visible, int);
+
+  // Description:
+  // Flag that indicates is state of this node is dirty.
+  vtkSetMacro(Dirty, int);
+  vtkGetMacro(Dirty, int);
+  vtkBooleanMacro(Dirty, int);
+
+  // Description:
+  // Flag that indicates is state of this node is dirty.
+  void SetBoundsDirty(int flag);
+  vtkGetMacro(BoundsDirty, int);
+  virtual void BoundsDirtyOn();
+  virtual void BoundsDirtyOff();
+
+  // Description:
+  // Return the accumulated matrix (top down). This
+  // matrix could be used for rendering.
+  // \NOTE: Changing the value of the matrix does not make the
+  // state dirty. Hence use carefully.
+  virtual const vtkMatrix4x4* GetFinalMatrix() const;
+  virtual vtkMatrix4x4* GetFinalMatrix();
+
+  // Description:
+  // Set/Get this node's parent.
+  void SetParent(vtkVgGroupNode* parent);
+  vtkVgGroupNode* GetParent();
+  const vtkVgGroupNode* GetParent() const;
+
+  // Description:
+  // Set/Get reference frame.
+  vtkSetMacro(NodeReferenceFrame, int);
+  vtkGetMacro(NodeReferenceFrame, int);
+
+  // Description:
+  // Set/Get state if this node is set to be removed from its parent.
+  vtkSetMacro(RemoveNode, int);
+  vtkGetMacro(RemoveNode, int);
+  vtkBooleanMacro(RemoveNode, int);
+
+  // Description:
+  // Set/Get node bounds.
+  vtkSetVector6Macro(Bounds, double);
+  virtual void GetBounds(double bounds[6]);
+  virtual const double* GetBounds() const;
+  virtual double* GetBounds();
+
+  // Description:
+  // Set/Get node visibility node mask.
+  vtkSetMacro(VisibleNodeMask, NodeMaskType);
+  vtkGetMacro(VisibleNodeMask, NodeMaskType);
+
+  // Description:
+  // Update this node and use \param timeStamp information if needed.
+  virtual void Update(vtkVgNodeVisitorBase& nodeVisitor);
+
+  // Description:
+  // Start traversing the node using \param nodeVisitor.
+  virtual void Accept(vtkVgNodeVisitorBase&  vtkNotUsed(nodeVisitor)) {;}
+
+  // Description:
+  // Traverse this node using \param nodeVisitor.
+  virtual void Traverse(vtkVgNodeVisitorBase&  nodeVisitor);
+
+  // Description:
+  // Computer bounds of this node.
+  virtual void ComputeBounds() {;}
+
+  static const NodeMaskType     VISIBLE_NODE_MASK    = 0xffffffff;
+
+  // Not used right now.
+  static const NodeMaskType     TRAVERSAL_NODE_MASK  = 0xeeeeeeee;
+
+  // Not used right now.
+  static const NodeMaskType     UPDATE_NODE_MASK     = 0xdddddddd;
+
+protected:
+  vtkVgNodeBase();
+  virtual ~vtkVgNodeBase();
+
+  // Description:
+  char*                         Name;
+
+  // Description:
+  // Check if the node is dirty. This means that node and its children (if applicable)
+  // needs traversal and are dirty as well. Once traversed this should set to false.
+  int                           Dirty;
+
+  // Description:
+  // Check if the bounds of this node is dirty. If dirty calculate new bounds.
+  int                           BoundsDirty;
+
+  // Description:
+  // Check if this node and if applicable its children will be visible.
+  int                           Visible;
+
+  int                           RemoveNode;
+
+  // Description:
+  // Complete matrix transform for this node. If the parent is dirty
+  // this needs to be recalculated.
+  vtkSmartPointer<vtkMatrix4x4> FinalMatrix;
+
+  // Description:
+  vtkVgGroupNode*               Parent;
+
+  // Description:
+  int                           NodeReferenceFrame;
+
+  double                        Bounds[6];  \
+
+  NodeMaskType                  VisibleNodeMask;
+
+
+private:
+
+  // Description:
+  vtkVgNodeBase(const vtkVgNodeBase&);    // Not implemented.
+  void operator=(const vtkVgNodeBase&);   // Not implemented.
+};
+
+#endif // __vtkVgNodeBase_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgNodeVisitor.cxx b/Libraries/VtkVgSceneGraph/vtkVgNodeVisitor.cxx
new file mode 100644
index 00000000..5ceb9e3b
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgNodeVisitor.cxx
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgNodeVisitor.h"
+
+#include "vtkVgGeode.h"
+#include "vtkVgGroupNode.h"
+#include "vtkVgTransformNode.h"
+#include "vtkVgVideoNode.h"
+#include "vtkVgPropCollection.h"
+
+//-----------------------------------------------------------------------------
+vtkVgNodeVisitor::vtkVgNodeVisitor() : vtkVgNodeVisitorBase()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgNodeVisitor::~vtkVgNodeVisitor()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitor::Visit(vtkVgGeode& geode)
+{
+  this->Traverse(geode);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitor::Visit(vtkVgGroupNode& groupNode)
+{
+  this->Traverse(groupNode);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitor::Visit(vtkVgTransformNode& transformNode)
+{
+  this->Traverse(transformNode);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitor::Visit(vtkVgVideoNode& videoNode)
+{
+  this->Traverse(videoNode);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitor::Visit(vtkVgLeafNodeBase& leafNode)
+{
+  this->Traverse(leafNode);
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgNodeVisitor.h b/Libraries/VtkVgSceneGraph/vtkVgNodeVisitor.h
new file mode 100644
index 00000000..9b060f75
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgNodeVisitor.h
@@ -0,0 +1,43 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgNodeVisitor_h
+#define __vtkVgNodeVisitor_h
+
+#include "vtkVgNodeVisitorBase.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgGeode;
+class vtkVgGroupNode;
+class vtkVgLeafNodeBase;
+class vtkVgTransformNode;
+class vtkVgVideoNode;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgNodeVisitor : public vtkVgNodeVisitorBase
+{
+public:
+  vtkVgNodeVisitor();
+  virtual ~vtkVgNodeVisitor();
+
+  // Description:
+  // Overridden functions.
+  virtual void Visit(vtkVgGeode& geode);
+  virtual void Visit(vtkVgGroupNode&  groupNode);
+  virtual void Visit(vtkVgTransformNode& transformNode);
+  virtual void Visit(vtkVgVideoNode&  videoNode);
+  virtual void Visit(vtkVgLeafNodeBase&  leafNode);
+
+protected:
+
+
+private:
+  vtkVgNodeVisitor(const vtkVgNodeVisitor&); // Not implemented.
+  void operator= (const vtkVgNodeVisitor&);  // Not implemented.
+};
+
+#endif // __vtkVgNodeVisitor_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgNodeVisitorBase.cxx b/Libraries/VtkVgSceneGraph/vtkVgNodeVisitorBase.cxx
new file mode 100644
index 00000000..c5673847
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgNodeVisitorBase.cxx
@@ -0,0 +1,90 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgNodeVisitorBase.h"
+
+#include "vtkVgNodeBase.h"
+#include "vtkVgPropCollection.h"
+
+//-----------------------------------------------------------------------------
+vtkVgNodeVisitorBase::vtkVgNodeVisitorBase() :
+  NodeVisitorType(NODE_VISITOR),
+  PropCollection(NULL)
+{
+  this->TimeStamp.SetTime(-1.0);
+  this->ModifiedTimeStamp.Modified();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgNodeVisitorBase::~vtkVgNodeVisitorBase()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitorBase::Traverse(vtkVgNodeBase& node)
+{
+  node.Traverse(*this);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitorBase::SetTimeStamp(const vtkVgTimeStamp& timeStamp)
+{
+  if (!(this->TimeStamp == timeStamp))
+    {
+    this->TimeStamp = timeStamp;
+    this->ModifiedTimeStamp.Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgTimeStamp& vtkVgNodeVisitorBase::GetTimeStamp() const
+{
+  return this->TimeStamp;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp& vtkVgNodeVisitorBase::GetTimeStamp()
+{
+  return this->TimeStamp;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitorBase::SetPropCollection(vtkVgPropCollection* propCollection)
+{
+  if (propCollection && (this->PropCollection != propCollection))
+    {
+    this->PropCollection = propCollection;
+    this->ModifiedTimeStamp.Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgPropCollection* vtkVgNodeVisitorBase::GetPropCollection() const
+{
+  return this->PropCollection;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPropCollection* vtkVgNodeVisitorBase::GetPropCollection()
+{
+  return this->PropCollection;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgNodeVisitorBase::ShallowCopy(vtkVgNodeVisitorBase* other)
+{
+  if (!other)
+    {
+    return;
+    }
+
+  this->NodeVisitorType = other->NodeVisitorType;
+  this->TimeStamp       = other->TimeStamp;
+
+  this->ModifiedTimeStamp.Modified();
+
+  this->PropCollection = other->GetPropCollection();
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgNodeVisitorBase.h b/Libraries/VtkVgSceneGraph/vtkVgNodeVisitorBase.h
new file mode 100644
index 00000000..39fbce38
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgNodeVisitorBase.h
@@ -0,0 +1,100 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgNodeVisitorBase_h
+#define __vtkVgNodeVisitorBase_h
+
+// VTK includes.
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+#include <vtkTimeStamp.h>
+
+// VG includes.
+#include "vtkVgTimeStamp.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgGeode;
+class vtkVgGroupNode;
+class vtkVgLeafNodeBase;
+class vtkVgNodeBase;
+class vtkVgTransformNode;
+class vtkVgVideoNode;
+
+
+class vtkVgPropCollection;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgNodeVisitorBase
+{
+public:
+  vtkVgNodeVisitorBase();
+  virtual ~vtkVgNodeVisitorBase();
+
+
+  // Description:
+  // Types of node visitor.
+  enum VisitorType
+    {
+    NODE_VISITOR = 0,
+    UPDATE_VISITOR,
+    EVENT_VISITOR,
+    COLLECT_OCCLUDER_VISITOR,
+    CULL_VISITOR
+    };
+
+  // Description:
+  // Set the VisitorType, used to distinguish different visitors during
+  // traversal of the scene, typically used in the \c Node::Traverse() method
+  // to decided what action to take.
+  void SetVisitorType(VisitorType type) {this->NodeVisitorType = type; }
+
+  // Description:
+  // Get the VisitorType.
+  VisitorType GetVisitorType() const { return this->NodeVisitorType; }
+
+  // Description:
+  // Start traversing a particular node type.
+  // Derived class need to implement this as needed.
+  virtual void Visit(vtkVgGeode& vtkNotUsed(geode)) {;}
+  virtual void Visit(vtkVgGroupNode& vtkNotUsed(groupNode)) {;}
+  virtual void Visit(vtkVgTransformNode& vtkNotUsed(transformNode)) {;}
+  virtual void Visit(vtkVgVideoNode& vtkNotUsed(videoNode)) {;}
+  virtual void Visit(vtkVgLeafNodeBase& vtkNotUsed(leafNode)) {;}
+
+  // Description:
+  // Traverse a node.
+  virtual void Traverse(vtkVgNodeBase& node);
+
+
+  void SetTimeStamp(const vtkVgTimeStamp& timeStamp);
+  const vtkVgTimeStamp& GetTimeStamp() const;
+  vtkVgTimeStamp& GetTimeStamp();
+
+  void SetPropCollection(vtkVgPropCollection* propCollection);
+  const vtkVgPropCollection* GetPropCollection() const;
+  vtkVgPropCollection* GetPropCollection();
+
+  virtual void ShallowCopy(vtkVgNodeVisitorBase* other);
+
+
+protected:
+
+  VisitorType                           NodeVisitorType;
+
+  vtkVgTimeStamp                        TimeStamp;
+
+  vtkTimeStamp                          ModifiedTimeStamp;
+
+  vtkSmartPointer<vtkVgPropCollection>  PropCollection;
+
+
+private:
+  vtkVgNodeVisitorBase(const vtkVgNodeVisitorBase&); // Not implemented.
+  void operator= (const vtkVgNodeVisitorBase&);      // Not implemented.
+};
+
+#endif //  __vtkVgNodeVisitorBase_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgPropCollection.cxx b/Libraries/VtkVgSceneGraph/vtkVgPropCollection.cxx
new file mode 100644
index 00000000..d6615caa
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgPropCollection.cxx
@@ -0,0 +1,141 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgPropCollection.h"
+
+// VTK includes.
+#include <vtkObjectFactory.h>
+#include <vtkPropCollection.h>
+
+// STL includes.
+#include <algorithm>
+#include <vector>
+
+vtkStandardNewMacro(vtkVgPropCollection);
+
+
+//-----------------------------------------------------------------------------
+vtkVgPropCollection::vtkVgPropCollection() : vtkObject(),
+  Dirty(true),
+  DirtyCache(true),
+  AllocationSize(200)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPropCollection::~vtkVgPropCollection()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPropCollection::PrintSelf(ostream& vtkNotUsed(os),
+                                    vtkIndent vtkNotUsed(indent))
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPropCollection::AddNew(vtkPropCollection* collection, int layerIndex)
+{
+  if (!collection)
+    {
+    return;
+    }
+
+  int numberOfItems = collection->GetNumberOfItems();
+
+  if (numberOfItems)
+    {
+
+    collection->InitTraversal();
+
+    if (this->ActiveProps[layerIndex].empty())
+      {
+      this->ActiveProps[layerIndex].reserve(this->AllocationSize);
+      }
+
+    for (int i = 0; i < numberOfItems; ++i)
+      {
+      this->ActiveProps[layerIndex].push_back(collection->GetNextProp());
+      }
+
+    this->DirtyCacheOn();
+    this->DirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPropCollection::AddExpired(vtkPropCollection* collection, int layerIndex)
+{
+  if (!collection)
+    {
+    return;
+    }
+
+  int numberOfItems = collection->GetNumberOfItems();
+
+  if (numberOfItems)
+    {
+    collection->InitTraversal();
+
+    for (int i = 0; i < numberOfItems; ++i)
+      {
+      vtkProp* nextProp = collection->GetNextProp();
+      this->ExpiredProps[layerIndex].push_back(nextProp);
+
+      // Remove from the active props here.
+      // \NOTE: We have to check the performance. May be it is better to use
+      // STL list but then traversal will be expensive.
+      vtkVgPropCollection::Props props = this->ActiveProps[layerIndex];
+      props.erase(std::remove(props.begin(), props.end(), nextProp), props.end());
+      this->ActiveProps[layerIndex] = props;
+      }
+
+    this->DirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPropCollection::Reset()
+{
+  this->ExpiredProps.clear();
+
+  this->DirtyCacheOff();
+  this->DirtyOff();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgPropCollection::ResetComplete()
+{
+  this->ActiveProps.clear();
+  this->ExpiredProps.clear();
+
+  this->DirtyCacheOff();
+  this->DirtyOff();
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgPropCollection::SortedProps& vtkVgPropCollection::GetActiveProps() const
+{
+  return this->ActiveProps;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPropCollection::SortedProps& vtkVgPropCollection::GetActiveProps()
+{
+  return this->ActiveProps;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgPropCollection::SortedProps& vtkVgPropCollection::GetExpiredProps() const
+{
+  return this->ExpiredProps;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgPropCollection::SortedProps& vtkVgPropCollection::GetExpiredProps()
+{
+  return this->ExpiredProps;
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgPropCollection.h b/Libraries/VtkVgSceneGraph/vtkVgPropCollection.h
new file mode 100644
index 00000000..9853ff08
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgPropCollection.h
@@ -0,0 +1,95 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgPropCollection_h
+#define __vtkVgPropCollection_h
+
+// VTK includes.
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+
+// STL includes.
+#include <map>
+#include <vector>
+
+// VG includes.
+#include "vtkVgMacros.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkProp;
+class vtkPropCollection;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgPropCollection : public vtkObject
+{
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vtkVgPropCollection);
+
+  // Keys will be sorted if using STL map.
+  typedef std::map<int, std::vector< vtkSmartPointer<vtkProp> > > SortedProps;
+  typedef SortedProps::iterator                   Itertor;
+  typedef SortedProps::const_iterator             ConstItertor;
+  typedef std::vector<vtkSmartPointer<vtkProp> > Props;
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgPropCollection, vtkObject);
+
+  static vtkVgPropCollection* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get dirty flag. This indicates state is dirty.
+  vtkSetMacro(Dirty, bool);
+  vtkGetMacro(Dirty, bool);
+  vtkBooleanMacro(Dirty, bool);
+
+  // Description:
+  // Set/Get dirty flag. This indicates state is dirty.
+  vtkSetMacro(DirtyCache, bool);
+  vtkGetMacro(DirtyCache, bool);
+  vtkBooleanMacro(DirtyCache, bool);
+
+  // Description:
+  // Add new / expired \c vtkPropCollection. \param layerIndex
+  // decided which order vtkProps gets rendered.
+  void AddNew(vtkPropCollection* collection, int layerIndex = 1000);
+  void AddExpired(vtkPropCollection* collection, int layerIndex = 1000);
+
+  // Description:
+  // Reset state.
+  void Reset();
+  void ResetComplete();
+
+  const SortedProps& GetActiveProps() const;
+  SortedProps& GetActiveProps();
+
+  const SortedProps& GetExpiredProps() const;
+  SortedProps& GetExpiredProps();
+
+
+protected:
+  vtkVgPropCollection();
+  virtual ~vtkVgPropCollection();
+
+  bool        Dirty;
+  bool        DirtyCache;
+
+  const int   AllocationSize;
+
+  SortedProps ActiveProps;
+  SortedProps ExpiredProps;
+
+private:
+  vtkVgPropCollection(const vtkVgPropCollection&); // Not implemented.
+  void operator= (const vtkVgPropCollection&);     // Not implemented.
+};
+
+#endif // __vtkVgPropCollection_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgRenderer.cxx b/Libraries/VtkVgSceneGraph/vtkVgRenderer.cxx
new file mode 100644
index 00000000..ed8dc746
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgRenderer.cxx
@@ -0,0 +1,162 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgRenderer.h"
+
+#include "vtkVgAreaPicker.h"
+
+// VTK inlcludes.
+#include "vtkRenderer.h"
+#include "vtkAssemblyNode.h"
+#include "vtkAssemblyPath.h"
+#include "vtkCamera.h"
+#include "vtkCommand.h"
+#include "vtkCullerCollection.h"
+#include "vtkCuller.h"
+#include "vtkFrustumCoverageCuller.h"
+#include "vtkGraphicsFactory.h"
+#include "vtkHardwareSelector.h"
+#include "vtkLightCollection.h"
+#include "vtkLight.h"
+#include "vtkMath.h"
+#include "vtkMatrix4x4.h"
+#include "vtkObjectFactory.h"
+#include "vtkOutputWindow.h"
+#include "vtkPainterPolyDataMapper.h"
+#include "vtkPicker.h"
+#include "vtkProp3DCollection.h"
+#include "vtkPropCollection.h"
+#include "vtkRendererDelegate.h"
+#include "vtkRenderWindow.h"
+#include "vtkTimerLog.h"
+#include "vtkVolume.h"
+#include "vtkRenderPass.h"
+#include "vtkRenderState.h"
+#include "vtkTexture.h"
+
+vtkStandardNewMacro(vtkVgRenderer);
+
+void vtkVgRenderer::PickRender(vtkPropCollection* props)
+{
+  vtkProp*  aProp;
+  vtkAssemblyPath* path;
+
+  this->InvokeEvent(vtkCommand::StartEvent, NULL);
+  if (props->GetNumberOfItems() <= 0)
+    {
+    return;
+    }
+
+  // Create a place to store all props that remain after culling
+  vtkPropCollection* pickFrom = vtkPropCollection::New();
+
+  // Extract all the prop3D's out of the props collection.
+  // This collection will be further culled by using a bounding box
+  // pick later (vtkPicker). Things that are not vtkProp3D will get
+  // put into the Paths list directly.
+  vtkCollectionSimpleIterator pit;
+  for (props->InitTraversal(pit); (aProp = props->GetNextProp(pit));)
+    {
+    if (aProp->GetPickable() && aProp->GetVisibility())
+      {
+      if (aProp->IsA("vtkProp3D"))
+        {
+        pickFrom->AddItem(aProp);
+        }
+      else //must be some other type of prop (e.g., vtkActor2D)
+        {
+        for (aProp->InitPathTraversal(); (path = aProp->GetNextPath());)
+          {
+          this->PathArray[this->PathArrayCount++] = path;
+          }
+        }
+      }//pickable & visible
+    }//for all props
+
+  // For a first pass at the pick process, just use a vtkPicker to
+  // intersect with bounding boxes of the objects.  This should greatly
+  // reduce the number of polygons that the hardware has to pick from, and
+  // speeds things up substantially.
+  //
+
+  vtkPicker* pCullPicker = NULL;
+  vtkVgAreaPicker* aCullPicker = NULL;
+  vtkProp3DCollection* cullPicked;
+  if (this->GetPickWidth() == 1 && this->GetPickHeight() == 1)
+    {
+    // Create a picker to do the culling process
+    pCullPicker = vtkPicker::New();
+
+    // Add each of the Actors from the pickFrom list into the picker
+    for (pickFrom->InitTraversal(pit); (aProp = pickFrom->GetNextProp(pit));)
+      {
+      pCullPicker->AddPickList(aProp);
+      }
+
+    // make sure this selects from the pickers list and not the renderers list
+    pCullPicker->PickFromListOn();
+
+    // do the pick
+    pCullPicker->Pick(this->GetPickX(), this->GetPickY(), 0, this);
+
+    cullPicked = pCullPicker->GetProp3Ds();
+    }
+  else
+    {
+    aCullPicker = vtkVgAreaPicker::New();
+
+    // Add each of the Actors from the pickFrom list into the picker
+    for (pickFrom->InitTraversal(pit); (aProp = pickFrom->GetNextProp(pit));)
+      {
+      aCullPicker->AddPickList(aProp);
+      }
+
+    // make sure this selects from the pickers list and not the renderers list
+    aCullPicker->PickFromListOn();
+
+    // do the pick
+    aCullPicker->AreaPick(this->PickX1, this->PickY1,
+                          this->PickX2, this->PickY2,
+                          this);
+
+    cullPicked = aCullPicker->GetProp3Ds();
+    }
+
+  // Put all the ones that were picked by the cull process
+  // into the PathArray to be picked from
+  vtkCollectionSimpleIterator p3dit;
+  for (cullPicked->InitTraversal(p3dit);
+       (aProp = cullPicked->GetNextProp3D(p3dit));)
+    {
+    if (aProp != NULL)
+      {
+      for (aProp->InitPathTraversal(); (path = aProp->GetNextPath());)
+        {
+        this->PathArray[this->PathArrayCount++] = path;
+        }
+      }
+    }
+
+  // Clean picking support objects up
+  pickFrom->Delete();
+  if (pCullPicker)
+    {
+    pCullPicker->Delete();
+    }
+  if (aCullPicker)
+    {
+    aCullPicker->Delete();
+    }
+
+  if (this->PathArrayCount == 0)
+    {
+    vtkDebugMacro(<< "There are no visible props!");
+    return;
+    }
+
+  // do the render library specific pick render
+  this->DevicePickRender();
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgRenderer.h b/Libraries/VtkVgSceneGraph/vtkVgRenderer.h
new file mode 100644
index 00000000..838ae8de
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgRenderer.h
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgRenderer_h
+#define __vtkVgRenderer_h
+
+#include "vtkOpenGLRenderer.h"
+
+#include <vgExport.h>
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgRenderer : public vtkOpenGLRenderer
+{
+public:
+  vtkTypeMacro(vtkVgRenderer, vtkOpenGLRenderer);
+
+  static vtkVgRenderer* New();
+
+protected:
+  vtkVgRenderer() : vtkOpenGLRenderer() {}
+  virtual ~vtkVgRenderer() {}
+
+  virtual void PickRender(vtkPropCollection* props);
+
+private:
+  vtkVgRenderer(const vtkVgRenderer&);
+  void operator= (const vtkVgRenderer&);
+};
+
+
+#endif // VTKVGRENDERER_H
diff --git a/Libraries/VtkVgSceneGraph/vtkVgSceneManager.cxx b/Libraries/VtkVgSceneGraph/vtkVgSceneManager.cxx
new file mode 100644
index 00000000..2506bf34
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgSceneManager.cxx
@@ -0,0 +1,203 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgFindNodeVisitor.h"
+#include "vtkVgGroupNode.h"
+#include "vtkVgNodeBase.h"
+#include "vtkVgNodeVisitor.h"
+#include "vtkVgPropCollection.h"
+#include "vtkVgRenderer.h"
+#include "vtkVgSceneManager.h"
+#include "vtkVgTimeStamp.h"
+
+// VTK includes.
+#include <vtkObjectFactory.h>
+#include <vtkPropPicker.h>
+#include <vtkRenderer.h>
+
+vtkStandardNewMacro(vtkVgSceneManager);
+
+//-----------------------------------------------------------------------------
+vtkVgSceneManager::vtkVgSceneManager() : vtkObject(),
+  Initialized(false),
+  SceneRoot(NULL),
+  NodeVisitor(NULL)
+{
+  this->SceneRenderer = vtkSmartPointer<vtkVgRenderer>::New();
+  this->ScenePicker   = vtkSmartPointer<vtkPropPicker>::New();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgSceneManager::~vtkVgSceneManager()
+{
+  delete this->NodeVisitor;
+  this->NodeVisitor = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSceneManager::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSceneManager::SetSceneRenderer(vtkRenderer* renderer)
+{
+  if (renderer && (this->SceneRenderer != renderer))
+    {
+    this->SceneRenderer = renderer;
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const vtkRenderer* vtkVgSceneManager::GetSceneRenderer() const
+{
+  return this->SceneRenderer;
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderer* vtkVgSceneManager::GetSceneRenderer()
+{
+  return this->SceneRenderer;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSceneManager::SetSceneRoot(vtkVgNodeBase* root)
+{
+  if (root && (this->SceneRoot != root))
+    {
+    this->SceneRenderer->RemoveAllViewProps();
+
+    if (this->NodeVisitor && this->NodeVisitor->GetPropCollection())
+      {
+      this->NodeVisitor->GetPropCollection()->ResetComplete();
+      }
+
+    this->SceneRoot = root;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgNodeBase* vtkVgSceneManager::GetSceneRoot()
+{
+  return this->SceneRoot;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgNodeBase* vtkVgSceneManager::GetSceneRoot() const
+{
+  return this->SceneRoot;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSceneManager::SetNodeVisitor(vtkVgNodeVisitorBase* nodeVisitor)
+{
+  if (nodeVisitor)
+    {
+    this->NodeVisitor->ShallowCopy(nodeVisitor);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgNodeVisitorBase* vtkVgSceneManager::GetNodeVisitor() const
+{
+  return this->NodeVisitor;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSceneManager::Update(const vtkVgTimeStamp& timeStamp)
+{
+  if (!this->Initialized)
+    {
+    this->Initialize();
+    }
+
+  // Set the timestamp on node visitor.
+  this->NodeVisitor->SetTimeStamp(timeStamp);
+
+  // Traverse the scene.
+  this->SceneRoot->Accept(*this->NodeVisitor);
+
+  // Reset and add new props or remove expired props.
+  vtkVgPropCollection* propCollection = this->NodeVisitor->GetPropCollection();
+  if (propCollection->GetDirty())
+    {
+    if (propCollection->GetDirtyCache())
+      {
+      this->SceneRenderer->RemoveAllViewProps();
+
+      vtkVgPropCollection::ConstItertor beginItr =
+        propCollection->GetActiveProps().begin();
+      vtkVgPropCollection::ConstItertor endItr =
+        propCollection->GetActiveProps().end();
+
+      while (beginItr != endItr)
+        {
+        vtkVgPropCollection::Props props = beginItr->second;
+        for (size_t i = 0; i < props.size(); ++i)
+          {
+          this->SceneRenderer->AddViewProp(props[i]);
+          this->ScenePicker->AddPickList(props[i]);
+          }
+        ++beginItr;
+        }
+      }
+    else
+      {
+      vtkVgPropCollection::ConstItertor beginItr =
+        propCollection->GetExpiredProps().begin();
+      vtkVgPropCollection::ConstItertor endItr =
+        propCollection->GetExpiredProps().end();
+
+      while (beginItr != endItr)
+        {
+        vtkVgPropCollection::Props props = beginItr->second;
+        for (size_t i = 0; i < props.size(); ++i)
+          {
+          this->SceneRenderer->RemoveViewProp(props[i]);
+          this->ScenePicker->DeletePickList(props[i]);
+          }
+        ++beginItr;
+        }
+      }
+
+    propCollection->Reset();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgSceneManager::Initialize()
+{
+  // Create a default one.
+  if (!this->NodeVisitor)
+    {
+    this->NodeVisitor = new vtkVgNodeVisitor();
+    this->NodeVisitor->SetVisitorType(vtkVgNodeVisitorBase::UPDATE_VISITOR);
+    this->NodeVisitor->SetPropCollection(vtkVgPropCollection::SmartPtr::New());
+    }
+
+  this->Initialized = true;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgNodeBase* vtkVgSceneManager::Pick(const double& x, const double& y, const double& z)
+{
+  if (this->ScenePicker->Pick(x, y, z, this->SceneRenderer))
+    {
+    vtkProp3D* prop3D = this->ScenePicker->GetProp3D();
+
+    vtkVgFindNodeVisitor findNodeVisitor;
+    findNodeVisitor.SetUsingProp3D(prop3D);
+
+    this->SceneRoot->Accept(findNodeVisitor);
+
+    return findNodeVisitor.GetNode();
+    }
+
+  return NULL;
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgSceneManager.h b/Libraries/VtkVgSceneGraph/vtkVgSceneManager.h
new file mode 100644
index 00000000..268892a6
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgSceneManager.h
@@ -0,0 +1,96 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgSceneManager_h
+#define __vtkVgSceneManager_h
+
+// VG includes.
+#include "vtkVgMacros.h"
+
+// VTK includes.
+#include <vtkObject.h>
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgGroupNode;
+class vtkVgTimeStamp;
+class vtkVgNodeVisitorBase;
+class vtkVgNodeBase;
+
+class vtkAbstractPropPicker;;
+class vtkRenderer;
+
+//-----------------------------------------------------------------------------
+class VTKVG_SCENEGRAPH_EXPORT vtkVgSceneManager : public vtkObject
+{
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vtkVgSceneManager);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgSceneManager, vtkObject);
+
+  static vtkVgSceneManager* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // \c SceneManager creates its own renderer.This is important
+  // As nodes expect that scene manager is going to have only one
+  // scene renderer and they attach all their render objects (vtkActor)
+  // to it.
+  void SetSceneRenderer(vtkRenderer* renderer);
+  vtkRenderer* GetSceneRenderer();
+  const vtkRenderer* GetSceneRenderer() const;
+
+  // Description:
+  // Set/Get scene root. This is the top most node in the
+  // scene tree.
+  void SetSceneRoot(vtkVgNodeBase* root);
+  vtkVgNodeBase* GetSceneRoot();
+  const vtkVgNodeBase* GetSceneRoot() const;
+
+  // Description:
+  // Set node visitor that will be used for scene traversal.
+  // Don't set this unless required.
+  void SetNodeVisitor(vtkVgNodeVisitorBase* nodeVisitor);
+  const vtkVgNodeVisitorBase* GetNodeVisitor() const;
+
+  // Description:
+  // Update scene using \param timeStamp.
+  void Update(const vtkVgTimeStamp& timeStamp);
+
+  // Description:
+  // Pick a node in this view.
+  virtual vtkVgNodeBase* Pick(const double& x, const double& y, const double& z);
+
+protected:
+  vtkVgSceneManager();
+  virtual ~vtkVgSceneManager();
+
+  // Description:
+  //
+  void Initialize();
+
+  bool                                        Initialized;
+
+  vtkSmartPointer<vtkVgNodeBase>              SceneRoot;
+  vtkSmartPointer<vtkRenderer>                SceneRenderer;
+
+  vtkVgNodeVisitorBase*                        NodeVisitor;
+
+  vtkSmartPointer<vtkAbstractPropPicker>      ScenePicker;
+
+private:
+  vtkVgSceneManager(const vtkVgSceneManager&);
+  void operator= (vtkVgSceneManager&);
+};
+
+#endif // __vtkVgSceneManager_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgTerrain.cxx b/Libraries/VtkVgSceneGraph/vtkVgTerrain.cxx
new file mode 100644
index 00000000..a272b8df
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgTerrain.cxx
@@ -0,0 +1,28 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTerrain.h"
+
+// VTK includes.
+#include <vtkObjectFactory.h>
+
+vtkStandardNewMacro(vtkVgTerrain);
+
+//-----------------------------------------------------------------------------
+vtkVgTerrain::vtkVgTerrain()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTerrain::~vtkVgTerrain()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTerrain::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgTerrain.h b/Libraries/VtkVgSceneGraph/vtkVgTerrain.h
new file mode 100644
index 00000000..7c2b76b4
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgTerrain.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTerrain_h
+#define __vtkVgTerrain_h
+
+// VG includes.
+#include "vtkVgGeode.h"
+
+#include <vgExport.h>
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgTerrain : public vtkVgGeode
+{
+public:
+  // Description:
+  // Define easy to use types
+  vtkVgClassMacro(vtkVgTerrain);
+
+  // Description:
+  // Usual VTK methods
+  vtkTypeMacro(vtkVgTerrain, vtkVgGeode);
+
+  static vtkVgTerrain* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+protected:
+  vtkVgTerrain();
+  virtual ~vtkVgTerrain();
+
+private:
+  vtkVgTerrain(const vtkVgTerrain&);   // Not implemented.
+  void operator=(const vtkVgTerrain&); // Not implemented.
+};
+
+#endif // __vtkVgTerrain_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgTrackNode.cxx b/Libraries/VtkVgSceneGraph/vtkVgTrackNode.cxx
new file mode 100644
index 00000000..034d0a91
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgTrackNode.cxx
@@ -0,0 +1,201 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTrackNode.h"
+
+// VisGUI includes.
+#include "vtkVgComputeBounds.h"
+#include "vtkVgGroupNode.h"
+#include "vtkVgNodeVisitorBase.h"
+#include "vtkVgTimeStamp.h"
+
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+
+// VTK includes.
+#include <vtkCommand.h>
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkRenderer.h>
+
+// C/C++ includes
+#include <cassert>
+
+
+vtkStandardNewMacro(vtkVgTrackNode);
+
+
+//-----------------------------------------------------------------------------
+vtkVgTrackNode::vtkVgTrackNode() : vtkVgLeafNodeBase(),
+  TrackModel(0x0),
+  TrackRepresentation(0x0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackNode::~vtkVgTrackNode()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackNode::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackNode::SetTrackModel(vtkVgTrackModel* trackModel)
+{
+  if (trackModel && (trackModel != this->TrackModel))
+    {
+    this->TrackModel = trackModel;
+
+    this->BoundsDirtyOn();
+
+    // \NOTE: This flag is on or else there won't be any data transfer to
+    // video representation in \c Update call.
+    this->DirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgTrackModel* vtkVgTrackNode::GetTrackModel() const
+{
+  return this->TrackModel;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackModel* vtkVgTrackNode::GetTrackModel()
+{
+  return this->TrackModel;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackNode::SetTrackRepresentation(vtkVgTrackRepresentation* trackRepresentation)
+{
+  if (trackRepresentation && (trackRepresentation != this->TrackRepresentation))
+    {
+    this->TrackRepresentation = trackRepresentation;
+
+    this->BoundsDirtyOn();
+
+    // \NOTE: This flag is on or else there won't be any data transfer to
+    // video representation in \c Update call.
+    this->DirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgTrackRepresentation* vtkVgTrackNode::GetTrackRepresentation() const
+{
+  return this->TrackRepresentation;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTrackRepresentation* vtkVgTrackNode::GetTrackRepresentation()
+{
+  return this->TrackRepresentation;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackNode::ComputeBounds()
+{
+  assert(this->TrackRepresentation);
+
+  vtkVgComputeBounds::ComputeVisiblePropBounds(
+    this->TrackRepresentation->GetActiveRenderObjects(), this->Bounds);
+
+  if (vtkMath::AreBoundsInitialized(this->Bounds) ||
+      this->TrackRepresentation->GetActiveRenderObjects()->GetNumberOfItems() < 1)
+    {
+    this->BoundsDirtyOff();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackNode::Update(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  assert(this->TrackModel);
+  assert(this->TrackRepresentation);
+
+  // Update the model first.
+  this->TrackModel->Update(nodeVisitor.GetTimeStamp());
+
+  if (this->TrackModel->GetNumberOfTracks() > 0)
+    {
+    this->TrackRepresentation->Update();
+    }
+
+  // First update the render objects.
+  this->UpdateRenderObjects(nodeVisitor.GetPropCollection());
+
+  if (((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Parent->GetDirty()) ||
+      ((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Dirty))
+    {
+    // We might need a concatenation instead of apply transformation here.
+    this->FinalMatrix->DeepCopy(this->Parent->GetFinalMatrix());
+
+    this->TrackRepresentation->SetRepresentationMatrix(this->FinalMatrix);
+    this->TrackRepresentation->Update();
+
+    this->BoundsDirtyOn();
+    }
+
+  // Check if bounds are dirty.If dirty compute bounds.
+  if (this->BoundsDirty)
+    {
+    this->ComputeBounds();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackNode::UpdateRenderObjects(vtkVgPropCollection* propCollection)
+{
+  assert(this->TrackModel);
+  assert(this->TrackRepresentation);
+
+  if (this->GetRemoveNode())
+    {
+    if (this->TrackRepresentation)
+      {
+      this->PrepareForRemoval(propCollection, this->TrackRepresentation);
+      }
+
+    this->RemoveNodeOff();
+    } // if (this->GetRemoveNode())
+  else
+    {
+    if (this->TrackRepresentation)
+      {
+      this->PrepareForAddition(propCollection, this->TrackRepresentation);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackNode::Accept(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  nodeVisitor.Visit(static_cast<vtkVgLeafNodeBase&>(*this));
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTrackNode::Traverse(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  // Then call the base class which will call Update on this.
+  this->Superclass::Traverse(nodeVisitor);
+
+  // Check if bounds are dirty.If dirty compute bounds.
+  if (this->BoundsDirty)
+    {
+    this->ComputeBounds();
+    }
+
+  this->DirtyOff();
+}
+
diff --git a/Libraries/VtkVgSceneGraph/vtkVgTrackNode.h b/Libraries/VtkVgSceneGraph/vtkVgTrackNode.h
new file mode 100644
index 00000000..5763d386
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgTrackNode.h
@@ -0,0 +1,79 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVGTrackNode_h
+#define __vtkVGTrackNode_h
+
+#include "vtkVgLeafNodeBase.h"
+
+// VisGUI includes
+#include <vtkVgMacros.h>
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkVgNodeVisitorBase;
+class vtkVgTrackModel;
+class vtkVgTrackRepresentation;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgTrackNode : public vtkVgLeafNodeBase
+{
+public:
+
+  // Description:
+  // Standard macros.
+  vtkVgClassMacro(vtkVgTrackNode);
+  vtkTypeMacro(vtkVgTrackNode, vtkVgLeafNodeBase);
+
+  // Description:
+  // Print information on data members.
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  static vtkVgTrackNode* New();
+
+  // Description:
+  // Get track model for the track node.
+  const vtkVgTrackModel* GetTrackModel() const;
+  vtkVgTrackModel*       GetTrackModel();
+  void                   SetTrackModel(vtkVgTrackModel* trackModel);
+
+  // Description:
+  // Get track representation for the track node.
+  const vtkVgTrackRepresentation* GetTrackRepresentation() const;
+  vtkVgTrackRepresentation*       GetTrackRepresentation();
+  void                            SetTrackRepresentation(
+    vtkVgTrackRepresentation* trackRepresentation);
+
+  virtual void ComputeBounds();
+
+  virtual void Update(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void UpdateRenderObjects(vtkVgPropCollection* propCollection);
+
+  virtual void Accept(vtkVgNodeVisitorBase&  nodeVisitor);
+
+  virtual void Traverse(vtkVgNodeVisitorBase& nodeVisitor);
+
+
+protected:
+
+  vtkVgTrackNode();
+  virtual ~vtkVgTrackNode();
+
+  vtkSmartPointer<vtkVgTrackModel>          TrackModel;
+  vtkSmartPointer<vtkVgTrackRepresentation> TrackRepresentation;
+
+private:
+
+  // Not implemented.
+  vtkVgTrackNode(const vtkVgTrackNode&);
+
+  // Not implemented.
+  void operator= (const vtkVgTrackNode&);
+};
+
+
+#endif // __vtkVGTrackNode_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgTransformNode.cxx b/Libraries/VtkVgSceneGraph/vtkVgTransformNode.cxx
new file mode 100644
index 00000000..1fcb3e83
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgTransformNode.cxx
@@ -0,0 +1,109 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgTransformNode.h"
+#include "vtkVgNodeVisitorBase.h"
+
+// VTK includes.
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+
+#include <sstream>
+
+vtkStandardNewMacro(vtkVgTransformNode);
+
+//-----------------------------------------------------------------------------
+vtkVgTransformNode::vtkVgTransformNode() : vtkVgGroupNode()
+{
+  this->PreMultiply = false;
+  this->Matrix = vtkSmartPointer<vtkMatrix4x4>::New();
+  this->Matrix->Identity();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTransformNode::~vtkVgTransformNode()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTransformNode::PrintSelf(ostream& vtkNotUsed(os),
+                                   vtkIndent vtkNotUsed(indent))
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTransformNode::SetMatrix(vtkMatrix4x4* matrix, bool preMultiply)
+{
+  // \TODO: Visit this code again.
+  if (matrix && matrix != this->Matrix)
+    {
+    this->Matrix = matrix;
+    this->PreMultiply = preMultiply;
+    this->DirtyOn();
+
+    this->MakeAllChildrenDirty();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkMatrix4x4* vtkVgTransformNode::GetMatrix()
+{
+  return this->Matrix;
+}
+
+//-----------------------------------------------------------------------------
+const vtkMatrix4x4* vtkVgTransformNode::GetMatrix() const
+{
+  return this->Matrix;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTransformNode::Update(vtkVgNodeVisitorBase& vtkNotUsed(nodeVisitor))
+{
+  if (this->GetBoundsDirty())
+    {
+    this->ComputeBounds();
+    }
+
+  // \NOTE:
+  // If the reference frame is RELATIVE and if this node has a parent and if either
+  // its parent state or its state is dirty then only calculate the \c FinalMatrix
+  // using its parent \c FinalMatrix.
+  if (((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Parent->GetDirty()) ||
+      ((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Dirty))
+    {
+    this->FinalMatrix->Identity();
+
+    if (!this->PreMultiply)
+      {
+      vtkMatrix4x4::Multiply4x4(this->Parent->GetFinalMatrix(), this->Matrix,
+                                this->FinalMatrix);
+      }
+    else
+      {
+      vtkMatrix4x4::Multiply4x4(this->Matrix, this->Parent->GetFinalMatrix(),
+                                this->FinalMatrix);
+      }
+    }
+  else if (this->Dirty)
+    {
+    this->FinalMatrix->DeepCopy(this->Matrix);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTransformNode::Accept(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  nodeVisitor.Visit(*this);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgTransformNode::Traverse(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  this->Superclass::Traverse(nodeVisitor);
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgTransformNode.h b/Libraries/VtkVgSceneGraph/vtkVgTransformNode.h
new file mode 100644
index 00000000..e260e21f
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgTransformNode.h
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgTransformNode_h
+#define __vtkVgTransformNode_h
+
+// VG includes.
+#include "vtkVgGroupNode.h"
+#include "vtkVgMacros.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkMatrix4x4;
+
+class vtkVgTimeStamp;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgTransformNode : public vtkVgGroupNode
+{
+public:
+  // Description:
+  // Usual VTK functions.
+  vtkVgClassMacro(vtkVgTransformNode);
+
+  vtkTypeMacro(vtkVgTransformNode, vtkVgGroupNode);
+
+  static vtkVgTransformNode* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Descrption:
+  // Set/Get transformation matrix.
+  void SetMatrix(vtkMatrix4x4* matrix, bool preMultiply = false);
+  vtkMatrix4x4* GetMatrix();
+  const vtkMatrix4x4* GetMatrix() const;
+
+  // Descrption:
+  // Pre/Post multiply existing transformation matrix using \param matrix.
+  void PreMultiplyMatrix(vtkMatrix4x4* matrix);
+  void PostMultiplyMatrix(vtkMatrix4x4* matrix);
+
+  // Descrption:
+  // \TODO: Not implemented yet.
+  const vtkMatrix4x4* GetInverseInternalMatrix() const {return NULL;}
+
+  // Descrption:
+  // \TODO: Not implemented yet.
+  virtual bool ComputeLocalToWorldMatrix(vtkMatrix4x4*) const {return false;}
+  virtual bool ComputeWorldToLocalMatrix(vtkMatrix4x4*) const {return false;}
+
+
+  // Descrption:
+  // Overridden functions.
+  virtual void Update(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void Accept(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void Traverse(vtkVgNodeVisitorBase& nodeVisitor);
+
+
+protected:
+
+  bool                          PreMultiply;
+  vtkSmartPointer<vtkMatrix4x4> Matrix;
+
+  vtkVgTransformNode();
+  virtual ~vtkVgTransformNode();
+
+private:
+  vtkVgTransformNode(const vtkVgTransformNode&); // Not implemented.
+  void operator= (const vtkVgTransformNode&);    // Not implemented.
+
+};
+
+#endif // __vtkVgTransformNode_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgVideoNode.cxx b/Libraries/VtkVgSceneGraph/vtkVgVideoNode.cxx
new file mode 100644
index 00000000..a2af5968
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgVideoNode.cxx
@@ -0,0 +1,233 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoNode.h"
+
+#include "vtkVgEventRepresentationBase.h"
+#include "vtkVgGroupNode.h"
+#include "vtkVgSceneManager.h"
+#include "vtkVgVideoRepresentationBase0.h"
+#include "vtkVgVideoModel0.h"
+#include "vtkVgPropCollection.h"
+#include "vtkVgNodeBase.h"
+#include "vtkVgNodeVisitorBase.h"
+#include "vtkVgTimeStamp.h"
+#include "vtkVgTrackRepresentationBase.h"
+#include "vtkVgComputeBounds.h"
+
+// VTK includes.
+#include <vtkCommand.h>
+#include <vtkMath.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkRenderer.h>
+
+vtkStandardNewMacro(vtkVgVideoNode);
+
+//-----------------------------------------------------------------------------
+vtkVgVideoNode::vtkVgVideoNode() : vtkVgLeafNodeBase(),
+  StreamId(NULL),
+  MissionId(NULL),
+  InstanceId(-1),
+  UserScore(0),
+  RelevancyScore(0.0),
+  PreferenceScore(0.0),
+  ColorScalar(0.0),
+  Rank(-1),
+  IsNormalResult(false),
+  IsRefinementResult(false),
+  IsStarResult(false),
+  HasVideoData(false),
+  ActivityType(-1),
+  Note(NULL),
+  VideoModel(NULL),
+  VideoRepresentation(NULL)
+{
+  this->TimeRange[0] = this->TimeRange[1] = -1.0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoNode::~vtkVgVideoNode()
+{
+  this->SetStreamId(0);
+  this->SetMissionId(0);
+  this->SetNote(0);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoNode::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoNode::SetVideoRepresentation(vtkVgVideoRepresentationBase0* videoRepresentation)
+{
+  if (videoRepresentation && (videoRepresentation != this->VideoRepresentation))
+    {
+    this->VideoRepresentation = videoRepresentation;
+    this->VideoModel = this->VideoRepresentation->GetVideoModel();
+
+    if (!this->VideoModel)
+      {
+      vtkErrorMacro("VideoModel is not set. Expect unusual behavior.")
+      }
+
+    this->BoundsDirtyOn();
+
+    // \NOTE: This flag is on or else there won't be any data transfer to
+    // video representation in \c Update call.
+    this->DirtyOn();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoRepresentationBase0* vtkVgVideoNode::GetVideoRepresentation()
+{
+  return this->VideoRepresentation;
+}
+
+//-----------------------------------------------------------------------------
+const vtkVgVideoRepresentationBase0* vtkVgVideoNode::GetVideoRepresentation() const
+{
+  return this->VideoRepresentation;
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgVideoNode::SetVisible(int flag)
+{
+  // Call the base class function first so that ivar is
+  // set to correct value.
+  if (!vtkVgNodeBase::SetVisible(flag))
+    {
+    return 0;
+    }
+
+  vtkVgEventRepresentationBase* eventRep =
+    this->VideoRepresentation->GetEventRepresentation();
+  vtkVgTrackRepresentationBase* trackRep =
+    this->VideoRepresentation->GetTrackRepresentation();
+  int eventRepVisibilityBefore = eventRep ? eventRep->GetVisible() : 0;
+  int trackRepVisibilityBefore = trackRep ? trackRep->GetVisible() : 0;
+
+  this->VideoRepresentation->SetVisible(flag);
+
+  if (flag)
+    {
+    if (eventRep && !eventRepVisibilityBefore)
+      {
+      eventRep->Update();
+      }
+    if (trackRep && !trackRepVisibilityBefore)
+      {
+      trackRep->Update();
+      }
+    }
+
+  return 1;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoNode::Update(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  // Update the model first.
+  this->VideoModel->Update(nodeVisitor.GetTimeStamp());
+
+  // First update the render objects.
+  this->UpdateRenderObjects(nodeVisitor.GetPropCollection());
+
+  if (((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Parent->GetDirty()) ||
+      ((this->NodeReferenceFrame ==
+        vtkVgNodeBase::RELATIVE) && this->Parent && this->Dirty))
+    {
+    // We might need a concatenation instead of apply transformation here.
+    this->FinalMatrix->DeepCopy(this->Parent->GetFinalMatrix());
+
+    this->VideoRepresentation->SetRepresentationMatrix(this->FinalMatrix);
+    this->VideoRepresentation->Update();
+
+    this->BoundsDirtyOn();
+    }
+
+  // Check if bounds are dirty.If dirty compute bounds.
+  if (this->BoundsDirty)
+    {
+    this->ComputeBounds();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoNode::UpdateRenderObjects(vtkVgPropCollection* propCollection)
+{
+  if (this->GetRemoveNode())
+    {
+    this->PrepareForRemoval(propCollection, this->VideoRepresentation);
+
+    if (vtkVgRepresentationBase* trackRep =
+          this->VideoRepresentation->GetTrackRepresentation())
+      {
+      this->PrepareForRemoval(propCollection, trackRep);
+      }
+
+    if (vtkVgRepresentationBase* eventRep =
+          this->VideoRepresentation->GetEventRepresentation())
+      {
+      this->PrepareForRemoval(propCollection, eventRep);
+      }
+    this->RemoveNodeOff();
+    } // if (this->GetRemoveNode())
+  else
+    {
+    this->PrepareForAddition(propCollection, this->VideoRepresentation);
+
+    if (vtkVgRepresentationBase* trackRep =
+          this->VideoRepresentation->GetTrackRepresentation())
+      {
+      this->PrepareForAddition(propCollection, trackRep);
+      }
+
+    if (vtkVgRepresentationBase* eventRep =
+          this->VideoRepresentation->GetEventRepresentation())
+      {
+      this->PrepareForAddition(propCollection, eventRep);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoNode::Accept(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  nodeVisitor.Visit(*this);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoNode::Traverse(vtkVgNodeVisitorBase& nodeVisitor)
+{
+  // Then call the base class which will call Update on this.
+  this->Superclass::Traverse(nodeVisitor);
+
+  // Check if bounds are dirty.If dirty compute bounds.
+  if (this->BoundsDirty)
+    {
+    this->ComputeBounds();
+    }
+
+  this->DirtyOff();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoNode::ComputeBounds()
+{
+  vtkVgComputeBounds::ComputeVisiblePropBounds(
+    this->VideoRepresentation->GetActiveRenderObjects(), this->Bounds);
+
+  if (vtkMath::AreBoundsInitialized(this->Bounds) ||
+      this->VideoRepresentation->GetActiveRenderObjects()->GetNumberOfItems() < 1)
+    {
+    this->BoundsDirtyOff();
+    }
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgVideoNode.h b/Libraries/VtkVgSceneGraph/vtkVgVideoNode.h
new file mode 100644
index 00000000..9074bfd9
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgVideoNode.h
@@ -0,0 +1,162 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoNode_h
+#define __vtkVgVideoNode_h
+
+#include "vtkVgLeafNodeBase.h"
+
+#include <vgExport.h>
+
+// Forware declarations.
+class vtkVgNodeVisitorBase;
+class vtkVgPropCollection;
+class vtkVgRepresentationBase;
+class vtkVgVideoModel0;
+class vtkVgVideoRepresentationBase0;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgVideoNode : public vtkVgLeafNodeBase
+{
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vtkVgVideoNode);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgVideoNode, vtkVgNodeBase);
+
+  static vtkVgVideoNode* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get video relevancy score.
+  vtkSetMacro(UserScore, int);
+  vtkGetMacro(UserScore, int);
+
+  // Description:
+  // Set/Get video relevancy score.
+  vtkSetMacro(RelevancyScore, double);
+  vtkGetMacro(RelevancyScore, double);
+
+  // Description:
+  // Set/Get video preference score (for feedback results)
+  vtkSetMacro(PreferenceScore, double);
+  vtkGetMacro(PreferenceScore, double);
+
+  // Description:
+  // Set/Get video relevancy score.
+  vtkSetMacro(InstanceId, vtkIdType);
+  vtkGetMacro(InstanceId, vtkIdType);
+
+  // Description:
+  // Set/Get video stream id.
+  vtkSetStringMacro(StreamId);
+  vtkGetStringMacro(StreamId);
+
+  // Description:
+  // Set/Get video mission id.
+  vtkSetStringMacro(MissionId);
+  vtkGetStringMacro(MissionId);
+
+  // Description:
+  // Set/Get video time range.
+  vtkSetVector2Macro(TimeRange, double);
+  vtkGetVector2Macro(TimeRange, double);
+
+  // Description:
+  // Set/Get the color scalar for this item. This value depends on all the other
+  // video items visible in the scene, and is computed externally.  This may
+  // be rank or score-based depending on configuration options. 0.0 means 'hot',
+  // 1.0 means 'cold', and 2.0 is special value indicating an unscored item.
+  vtkSetMacro(ColorScalar, double);
+  vtkGetMacro(ColorScalar, double);
+
+  // Description:
+  // Set/Get ranking of this video based on some criteria.
+  vtkSetMacro(Rank, long long);
+  vtkGetMacro(Rank, long long);
+
+  // Description:
+  // Set/Get whether this is a refinement result, a normal result, or both.
+  vtkSetMacro(IsNormalResult, bool);
+  vtkGetMacro(IsNormalResult, bool);
+
+  vtkSetMacro(IsRefinementResult, bool);
+  vtkGetMacro(IsRefinementResult, bool);
+
+  vtkSetMacro(ActivityType, int);
+  vtkGetMacro(ActivityType, int);
+
+  vtkSetMacro(IsStarResult, bool);
+  vtkGetMacro(IsStarResult, bool);
+
+  vtkSetMacro(HasVideoData, bool);
+  vtkGetMacro(HasVideoData, bool);
+
+  // Description:
+  // Set/Get video note.
+  vtkSetStringMacro(Note);
+  vtkGetStringMacro(Note);
+
+  // Description:
+  // Set/Get video representation.
+  void SetVideoRepresentation(vtkVgVideoRepresentationBase0* videoRepresentation);
+  vtkVgVideoRepresentationBase0* GetVideoRepresentation();
+  const vtkVgVideoRepresentationBase0* GetVideoRepresentation() const;
+
+  // Description:
+  // Set visibility of this node.
+  virtual int SetVisible(int flag);
+
+  // Description:
+  // Overridden functions.
+  virtual void Update(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void UpdateRenderObjects(vtkVgPropCollection* propCollection);
+
+  virtual void Accept(vtkVgNodeVisitorBase&  nodeVisitor);
+
+  virtual void Traverse(vtkVgNodeVisitorBase& nodeVisitor);
+
+  virtual void ComputeBounds();
+
+protected:
+  vtkVgVideoNode();
+  virtual ~vtkVgVideoNode();
+
+
+  char*     StreamId;
+  char*     MissionId;
+  vtkIdType InstanceId;
+  double    TimeRange[2];
+
+  int       UserScore;
+  double    RelevancyScore;
+  double    PreferenceScore;
+  double    ColorScalar;
+  long long Rank;
+
+  bool      IsNormalResult;
+  bool      IsRefinementResult;
+
+  bool      IsStarResult;
+  bool      HasVideoData;
+
+  int       ActivityType;
+
+  char* Note;
+
+  vtkSmartPointer<vtkVgVideoModel0>              VideoModel;
+  vtkSmartPointer<vtkVgVideoRepresentationBase0> VideoRepresentation;
+
+private:
+  vtkVgVideoNode(const vtkVgVideoNode&); // Not implemented.
+  void operator=(const vtkVgVideoNode&); // Not implemented.
+};
+
+#endif // __vtkVgVideoNode_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgVideoViewer.cxx b/Libraries/VtkVgSceneGraph/vtkVgVideoViewer.cxx
new file mode 100644
index 00000000..9c9a28f8
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgVideoViewer.cxx
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgVideoViewer.h"
+
+#include <vtkObjectFactory.h>
+
+vtkStandardNewMacro(vtkVgVideoViewer);
+
+//-----------------------------------------------------------------------------
+vtkVgVideoViewer::vtkVgVideoViewer() : vtkVgViewer()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoViewer::~vtkVgVideoViewer()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoViewer::Realize()
+{
+  // Do nothing other than setting the state to true.
+  this->Realized = true;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgVideoViewer::Run()
+{
+  if (!this->IsRealized())
+    {
+    this->Realize();
+    }
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgVideoViewer.h b/Libraries/VtkVgSceneGraph/vtkVgVideoViewer.h
new file mode 100644
index 00000000..6eb2e3f2
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgVideoViewer.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgVideoViewer_h
+#define __vtkVgVideoViewer_h
+
+#include "vtkVgViewer.h"
+
+#include <vgExport.h>
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgVideoViewer : public vtkVgViewer
+{
+public:
+  // Description:
+  // Usual VG macro.
+  vtkVgClassMacro(vtkVgVideoViewer);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgVideoViewer, vtkVgViewer);
+
+  static vtkVgVideoViewer* New();
+
+  // Description:
+  // Overridden function. Since we don't use
+  // VTK render window interactor directly
+  // we don't initialize it.
+  virtual void Realize();
+
+  // Overridden function. Since we don't use
+  // VTK render window interactor directly
+  // we don't start VTK event loop.
+  virtual void Run();
+
+
+protected:
+
+  vtkVgVideoViewer();
+  virtual ~vtkVgVideoViewer();
+
+
+private:
+
+  vtkVgVideoViewer(const vtkVgVideoViewer&); // Not implemented.
+  void operator=(const vtkVgVideoViewer&); // Not implemented.
+};
+
+#endif //__vqViewer_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgViewBase.cxx b/Libraries/VtkVgSceneGraph/vtkVgViewBase.cxx
new file mode 100644
index 00000000..f978bc37
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgViewBase.cxx
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgViewBase.h"
+
+// VTK includes.
+#include <vtkCamera.h>
+#include <vtkObjectFactory.h>
+
+// VG includes.
+#include "vtkVgGroupNode.h"
+#include "vtkVgSceneManager.h"
+
+vtkStandardNewMacro(vtkVgViewBase);
+
+//-----------------------------------------------------------------------------
+vtkVgViewBase::vtkVgViewBase() : vtkVgSceneManager()
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgViewBase::~vtkVgViewBase()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewBase::PrintSelf(ostream& vtkNotUsed(os),
+                              vtkIndent vtkNotUsed(indent))
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewBase::Update(const vtkVgTimeStamp& timestamp)
+{
+  this->Superclass::Update(timestamp);
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgViewBase.h b/Libraries/VtkVgSceneGraph/vtkVgViewBase.h
new file mode 100644
index 00000000..78c4170b
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgViewBase.h
@@ -0,0 +1,54 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgViewBase_h
+#define __vtkVgViewBase_h
+
+// VG includes.
+#include "vtkVgSceneManager.h"
+
+#include <vgExport.h>
+
+// Forward declarations.
+class vtkRenderer;
+
+class vtkVQLayoutManagerBase;
+class vtkVgGroupNode;
+class vtkVgSceneManager;
+class vtkVgTimeStamp;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgViewBase : public vtkVgSceneManager
+{
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vtkVgViewBase);
+
+  // Description:
+  // Usual VTK functions.
+  static vtkVgViewBase* New();
+
+  vtkTypeMacro(vtkVgViewBase, vtkVgSceneManager);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+
+protected:
+
+  vtkVgViewBase();
+  virtual ~vtkVgViewBase();
+
+  // Description:
+  // Update view and underlying objects.
+  virtual void Update(const vtkVgTimeStamp& timestamp);
+
+
+private:
+  vtkVgViewBase(const vtkVgViewBase&);        // Not implemented.
+  void operator= (const vtkVgViewBase&);      // Not implemented.
+};
+
+#endif // __vtkVgViewBase_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgViewer.cxx b/Libraries/VtkVgSceneGraph/vtkVgViewer.cxx
new file mode 100644
index 00000000..ce67a277
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgViewer.cxx
@@ -0,0 +1,172 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgViewer.h"
+
+// VTK includes.
+#include <vtkCamera.h>
+#include <vtkCommand.h>
+#include <vtkObjectFactory.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+
+vtkStandardNewMacro(vtkVgViewer);
+
+//-----------------------------------------------------------------------------
+vtkVgViewer::vtkVgViewer() : vtkVgViewerBase(),
+  FirstFrame(true),
+  Realized(false)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgViewer::~vtkVgViewer()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewer::PrintSelf(ostream& os, vtkIndent indent)
+{
+  os << indent << "Realized: " << (this->Realized ? "TRUE" : "FALSE") << "\n";
+
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgViewer::IsFirstFrame()
+{
+  return this->FirstFrame;
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgViewer::IsRealized()
+{
+  return this->Realized;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewer::Realize()
+{
+  this->Interactor->Initialize();
+
+  this->Realized = true;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewer::Frame(const vtkVgTimeStamp& timestamp)
+{
+  if (!this->IsRealized())
+    {
+    this->Realize();
+    }
+
+  this->Update(timestamp);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewer::ForceRender(bool resetCameraOnFirstFrame/*=true*/)
+{
+  if (this->IsFirstFrame())
+    {
+    this->FirstFrame = false;
+    if (resetCameraOnFirstFrame)
+      {
+      this->SceneRenderer->ResetCamera();
+      }
+    }
+  Superclass::ForceRender();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewer::Run()
+{
+  if (!this->IsRealized())
+    {
+    this->Realize();
+    }
+
+  this->Interactor->CreateRepeatingTimer(100);
+
+  this->Interactor->Start();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewer::GetCurrentViewExtents(double* viewExtents)
+{
+  vtkCamera* camera = this->SceneRenderer->GetActiveCamera();
+
+  double cameraCurrentPosition[3];
+  camera->GetPosition(cameraCurrentPosition);
+  double* rendererAspect = this->SceneRenderer->GetAspect();
+
+  // xmin, xmax, ymin, ymax
+  double renderedBounds[4] =
+    {
+    VTK_DOUBLE_MAX, VTK_DOUBLE_MIN,
+    VTK_DOUBLE_MAX, VTK_DOUBLE_MIN
+    };
+
+  // might be rotated, so need to do all four corners to make sure we
+  // got axis-aligned bounds
+
+  for (int i = -1; i < 2; i += 2)
+    {
+    for (int j = -1; j < 2; j += 2)
+      {
+      double worldPt[4];
+      this->SceneRenderer->SetViewPoint(i, j, 1);
+      this->SceneRenderer->ViewToWorld();
+      this->SceneRenderer->GetWorldPoint(worldPt);
+      if (renderedBounds[0] > worldPt[0])
+        {
+        renderedBounds[0] = worldPt[0];
+        }
+      if (renderedBounds[1] < worldPt[0])
+        {
+        renderedBounds[1] = worldPt[0];
+        }
+      if (renderedBounds[2] > worldPt[1])
+        {
+        renderedBounds[2] = worldPt[1];
+        }
+      if (renderedBounds[3] < worldPt[1])
+        {
+        renderedBounds[3] = worldPt[1];
+        }
+      }
+    }
+
+  double extentHeight, extentWidth;
+  extentWidth = renderedBounds[1] - renderedBounds[0];
+
+  viewExtents[0] = cameraCurrentPosition[0] - extentWidth * 0.5;
+  viewExtents[1] = cameraCurrentPosition[0] + extentWidth * 0.5;
+  extentHeight = (viewExtents[1] - viewExtents[0]) * rendererAspect[1] / rendererAspect[0];
+  viewExtents[2] = cameraCurrentPosition[1] - extentHeight * 0.5;
+  viewExtents[3] = cameraCurrentPosition[1] + extentHeight * 0.5;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewer::UpdateView(double bounds[6])
+{
+  vtkCamera* camera = this->SceneRenderer->GetActiveCamera();
+
+  double center[2] = {(bounds[1] + bounds[0]) * 0.5,
+                      (bounds[3] + bounds[2]) * 0.5
+                     };
+
+  camera->SetPosition(center[0], center[1], 1.0);
+  camera->SetFocalPoint(center[0], center[1], 1.0);
+
+  this->ForceRender();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgViewer::UpdateViewTriggersEvent() const
+{
+  return vtkCommand::UpdateEvent;
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgViewer.h b/Libraries/VtkVgSceneGraph/vtkVgViewer.h
new file mode 100644
index 00000000..7a235448
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgViewer.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgViewer_h
+#define __vtkVgViewer_h
+
+// VG includes.
+#include "vtkVgViewerBase.h"
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgViewer : public vtkVgViewerBase
+{
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vtkVgViewer);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgViewer, vtkVgViewerBase);
+
+  static vtkVgViewer* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Overridden functions.
+  virtual bool IsFirstFrame();
+
+  virtual bool IsRealized();
+
+  virtual void Realize();
+
+  virtual void Frame(const vtkVgTimeStamp& timestamp);
+
+  virtual void ForceRender(bool resetCameraOnFirstFrame = true);
+
+  virtual void Run();
+
+  virtual void GetCurrentViewExtents(double* viewExtents);
+
+  virtual void UpdateView(double bounds[6]);
+
+  virtual int UpdateViewTriggersEvent() const;
+
+
+protected:
+  vtkVgViewer();
+  virtual ~vtkVgViewer();
+
+  bool    FirstFrame;
+  bool    Realized;
+
+
+private:
+  vtkVgViewer(const vtkVgViewer&);    // Not implemented.
+  void operator=(const vtkVgViewer&); // Not implemented.
+};
+
+
+#endif // __vtkVgViewer_h
diff --git a/Libraries/VtkVgSceneGraph/vtkVgViewerBase.cxx b/Libraries/VtkVgSceneGraph/vtkVgViewerBase.cxx
new file mode 100644
index 00000000..39e8f468
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgViewerBase.cxx
@@ -0,0 +1,112 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgViewerBase.h"
+
+// VTK includes.
+#include <vtkCamera.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+
+//-----------------------------------------------------------------------------
+vtkVgViewerBase::vtkVgViewerBase() : vtkVgViewBase()
+{
+  this->RenderWindow = vtkSmartPointer<vtkRenderWindow>::New();
+  this->Interactor   = vtkSmartPointer<vtkRenderWindowInteractor>::New();
+
+  this->RenderWindow->AddRenderer(this->SceneRenderer);
+  this->RenderWindow->SetInteractor(this->Interactor);
+
+  // We are using orthographic camera.
+  this->SceneRenderer->GetActiveCamera()->ParallelProjectionOn();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgViewerBase::~vtkVgViewerBase()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewerBase::PrintSelf(ostream& vtkNotUsed(os),
+                                vtkIndent vtkNotUsed(indent))
+{
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewerBase::SetRenderWindow(vtkRenderWindow* renderWindow)
+{
+  if (renderWindow && (renderWindow != this->RenderWindow))
+    {
+    this->RenderWindow = renderWindow;
+    this->RenderWindow->AddRenderer(this->SceneRenderer);
+    this->RenderWindow->SetInteractor(this->Interactor);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderWindow* vtkVgViewerBase::GetRenderWindow()
+{
+  return this->RenderWindow;
+}
+
+//-----------------------------------------------------------------------------
+const vtkRenderWindow* vtkVgViewerBase::GetRenderWindow() const
+{
+  return this->RenderWindow;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewerBase::SetRenderWindowInteractor(vtkRenderWindowInteractor* interactor)
+{
+  if (interactor && (this->Interactor != interactor))
+    {
+    this->Interactor = interactor;
+    this->RenderWindow->SetInteractor(this->Interactor);
+    this->Modified();
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderWindowInteractor* vtkVgViewerBase::GetRenderWindowInteractor()
+{
+  return this->Interactor;
+}
+
+//-----------------------------------------------------------------------------
+const vtkRenderWindowInteractor* vtkVgViewerBase::GetRenderWindowInteractor() const
+{
+  return this->Interactor;
+}
+
+//-----------------------------------------------------------------------------
+double vtkVgViewerBase::GetCurrentScale()
+{
+  // If not a valid renderer return 1.
+  if (!this->SceneRenderer)
+    {
+    return 1.0;
+    }
+
+  int*   viewPortSize = this->SceneRenderer->GetSize();
+  double cameraWidth  = this->SceneRenderer->GetActiveCamera()->GetParallelScale() *
+                        ((double)viewPortSize[0] / viewPortSize[1]);
+
+  return ((cameraWidth) / (double)viewPortSize[0]);
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewerBase::ForceRender(bool vtkNotUsed(resetCameraOnFirstFrame))
+{
+  this->RenderWindow->Render();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgViewerBase::ResetView()
+{
+  this->SceneRenderer->ResetCamera();
+}
diff --git a/Libraries/VtkVgSceneGraph/vtkVgViewerBase.h b/Libraries/VtkVgSceneGraph/vtkVgViewerBase.h
new file mode 100644
index 00000000..ba508952
--- /dev/null
+++ b/Libraries/VtkVgSceneGraph/vtkVgViewerBase.h
@@ -0,0 +1,109 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgViewerBase_h
+#define __vtkVgViewerBase_h
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+// VG includes.
+#include "vtkVgViewBase.h"
+
+#include <vgExport.h>
+
+class vtkRenderWindow;
+class vtkRenderWindowInteractor;
+class vtkVgTimeStamp;
+
+class VTKVG_SCENEGRAPH_EXPORT vtkVgViewerBase : public vtkVgViewBase
+{
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vtkVgViewerBase);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vtkVgViewerBase, vtkVgViewBase);
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get render window.
+  void SetRenderWindow(vtkRenderWindow* renderWindow);
+  vtkRenderWindow* GetRenderWindow();
+  const vtkRenderWindow* GetRenderWindow() const;
+
+  // Description:
+  // Set/Get render window interactor.
+  void SetRenderWindowInteractor(vtkRenderWindowInteractor* interactor);
+  vtkRenderWindowInteractor* GetRenderWindowInteractor();
+  const vtkRenderWindowInteractor* GetRenderWindowInteractor() const;
+
+  // Description:
+  // Get current scale. A scale is ratio of camera view width
+  // to viewport width.
+  virtual double GetCurrentScale();
+
+  // Description:
+  // Get current view extents.
+  virtual void GetCurrentViewExtents(double* viewExtents) = 0;
+
+  // Description:
+  // Given a viewing volume (in world space now)  update the view.
+  virtual void UpdateView(double bounds[6]) = 0;
+
+  // Description:
+  // Does update view triggers events? If yes which one?
+  // -1 means no event is triggered by the update view.
+  virtual int UpdateViewTriggersEvent() const = 0;
+
+  // Description:
+  // Check if this is the first frame and if it is do something special about it.
+  virtual bool IsFirstFrame() = 0;
+
+  // Description:
+  // Check if one of the render window has been realized.
+  virtual bool IsRealized() = 0;
+
+  // Description:
+  // Setup to initialize a render window and threads if any.
+  virtual void Realize() = 0;
+
+  // Description:
+  // Derived classes need to implement this.
+  virtual void Frame(const vtkVgTimeStamp& timestamp) = 0;
+
+  // Description:
+  // Executes the main loop.
+  virtual void Run() = 0;
+
+  // Description:
+  // Force render regardless of state.
+  virtual void ForceRender(bool resetCameraOnFirstFrame = true);
+
+  // Description:
+  // Reset camera position and other view parameters to
+  // their original state.
+  virtual void ResetView();
+
+protected:
+  vtkVgViewerBase();
+  virtual ~vtkVgViewerBase();
+
+  vtkSmartPointer<vtkRenderWindow>            RenderWindow;
+  vtkSmartPointer<vtkRenderWindowInteractor>  Interactor;
+
+
+private:
+  vtkVgViewerBase(const vtkVgViewerBase&);
+  void operator= (const vtkVgViewerBase&);
+
+};
+
+
+#endif // __vtkVgViewerBase_h
diff --git a/Libraries/VtkVgVideo/CMakeLists.txt b/Libraries/VtkVgVideo/CMakeLists.txt
new file mode 100644
index 00000000..ff3d8405
--- /dev/null
+++ b/Libraries/VtkVgVideo/CMakeLists.txt
@@ -0,0 +1,49 @@
+project(vtkVgVideo)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+set(vtkVgVideoSources
+  vtkVgAdaptImage.cxx
+  vtkVgKwaVideoSource.cxx
+)
+
+set(vtkVgVideoInstallHeaders
+  vtkVgAdaptImage.h
+  vtkVgKwaVideoSource.h
+)
+
+set_source_files_properties(
+  vtkVgAdaptImage
+  PROPERTIES WRAP_EXCLUDE TRUE
+)
+
+vg_vtk_module(${PROJECT_NAME}
+  DEPENDS
+  vtkCommonCore
+  vtkImagingCore
+  vtkIOImage
+  vtkVgCore
+)
+
+vtk_module_library(${PROJECT_NAME}
+  ${vtkVgVideoSources}
+  ${vtkVgVideoMocSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vtkVgCore
+  PRIVATE_INTERFACE_TARGETS
+  vgVideo
+  LINK_LIBRARIES
+  LINK_PRIVATE
+  vgl_algo
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vtkVgVideoInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VtkVgVideo)
+
+vg_wrap_vtk_library(${PROJECT_NAME})
diff --git a/Libraries/VtkVgVideo/vtkVgAdaptImage.cxx b/Libraries/VtkVgVideo/vtkVgAdaptImage.cxx
new file mode 100644
index 00000000..5e6ea2d0
--- /dev/null
+++ b/Libraries/VtkVgVideo/vtkVgAdaptImage.cxx
@@ -0,0 +1,181 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgAdaptImage.h"
+
+#include <QDebug>
+
+#include <vtkImageAppendComponents.h>
+#include <vtkImageData.h>
+#include <vtkImageFlip.h>
+#include <vtkImageImport.h>
+
+#include <vgImage.h>
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkImageData> vtkVgAdapt(const vgImage& image)
+{
+  if (!image.isValid())
+    {
+    return 0;
+    }
+
+  const int w  = image.iCount();
+  const int h  = image.jCount();
+  const int np = image.planeCount();
+
+  // Currently we handle images with 1 - 3 components. (R, RG, RGB).
+  if (np < 1 || np > 3)
+    {
+    qDebug() << "vtkVgAdapt<vgImage>: failed to convert image with"
+             << np << "planes; only 1-, 2- or 3-plane images are supported";
+    return 0;
+    }
+
+  if (w == 0 || h == 0)
+    {
+    qDebug()
+      << "vtkVgAdapt<vgImage>: failed to convert image with dimension 0";
+    return 0;
+    }
+
+  // Assume vgImage uses 8-bit pixels
+  const int pdt = VTK_UNSIGNED_CHAR, pds = 1;
+
+  vtkSmartPointer<vtkImageAppendComponents>
+    components(vtkSmartPointer<vtkImageAppendComponents>::New());
+  components->SetNumberOfThreads(1);
+  const int ps = image.planeStep();
+
+  // Get data pointer... do this up front instead of when needed because VTK is
+  // not const-safe, and so we must get rid of const qualifier on the pointer
+  unsigned char* const imageData =
+    const_cast<unsigned char*>(image.constData());
+
+  if (ps > pds)
+    {
+    // Image data is packed RRRR...RR[GGGG...GG[BBBB...BB]], so we have to
+    // import each channel independently
+    vtkSmartPointer<vtkImageImport> importerRed(0);
+    vtkSmartPointer<vtkImageImport> importerGreen(0);
+    vtkSmartPointer<vtkImageImport> importerBlue(0);
+
+    importerRed = vtkSmartPointer<vtkImageImport>::New();
+    importerRed->SetDataScalarType(pdt);
+    importerRed->SetNumberOfScalarComponents(1);
+    importerRed->SetImportVoidPointer(imageData + (0 * ps));
+    importerRed->SetWholeExtent(0, w - 1, 0, h - 1, 0, 0);
+    importerRed->SetDataExtentToWholeExtent();
+    importerRed->Modified();
+    importerRed->Update();
+
+    if (np > 1)
+      {
+      importerGreen = vtkSmartPointer<vtkImageImport>::New();
+      importerGreen->SetDataScalarType(pdt);
+      importerGreen->SetNumberOfScalarComponents(1);
+      importerGreen->SetImportVoidPointer(imageData + (1 * ps));
+      importerGreen->SetWholeExtent(0, w - 1, 0, h - 1, 0, 0);
+      importerGreen->SetDataExtentToWholeExtent();
+      importerGreen->Modified();
+      importerGreen->Update();
+      }
+
+    if (np > 2)
+      {
+      importerBlue = vtkSmartPointer<vtkImageImport>::New();
+      importerBlue->SetDataScalarType(pdt);
+      importerBlue->SetNumberOfScalarComponents(1);
+      importerBlue->SetImportVoidPointer(imageData + (2 * ps));
+      importerBlue->SetWholeExtent(0, w - 1, 0, h - 1, 0, 0);
+      importerBlue->SetDataExtentToWholeExtent();
+      importerBlue->Modified();
+      importerBlue->Update();
+      }
+
+    components->SetInputConnection(importerRed->GetOutputPort());
+    if (importerGreen)
+      {
+      components->AddInputConnection(importerGreen->GetOutputPort());
+      if (importerBlue)
+        {
+        components->AddInputConnection(importerBlue->GetOutputPort());
+        }
+      }
+
+    }
+  else if (ps == 1 && image.iStep() == np && image.jStep() == w * np)
+    {
+    // Image data is packed R[G[B]]R[G[B]]...R[G[B]], so we can import all
+    // channels directly
+    vtkSmartPointer<vtkImageImport> importer =
+      vtkSmartPointer<vtkImageImport>::New();
+    importer->SetDataScalarType(pdt);
+    importer->SetNumberOfScalarComponents(np);
+    importer->SetImportVoidPointer(imageData + (0 * ps));
+    importer->SetWholeExtent(0, w - 1, 0, h - 1, 0, 0);
+    importer->SetDataExtentToWholeExtent();
+    importer->Modified();
+    importer->Update();
+
+    components->SetInputConnection(importer->GetOutputPort());
+    }
+  else
+    {
+    // Image data is plane-interlaced, but either has additional padding and/or
+    // the channels are stored in memory backward (ps < 0); e.g. 32-bit pixels
+    // in BGR order with an unused byte
+    vtkSmartPointer<vtkImageData> vtkimage =
+      vtkSmartPointer<vtkImageData>::New();
+    vtkimage->SetExtent(0, w - 1, 0, h - 1, 0, 0);
+    vtkimage->SetSpacing(1.0, 1.0, 1.0);
+    vtkimage->AllocateScalars(VTK_UNSIGNED_CHAR, np);
+
+    unsigned char* vtkimagePtr =
+      static_cast<unsigned char*>(vtkimage->GetScalarPointer());
+
+    const int iStep = image.iStep();
+    const int jStep = image.jStep();
+
+    int y = image.jCount();
+    while (y--)
+      {
+      int x = image.iCount();
+      // Compute source and destination scanline offsets; destination offset
+      // is flipped over Y axis because vtkImageData needs to be Y-up, but
+      // source is Y-down
+      const ptrdiff_t yos = y * jStep;
+      const ptrdiff_t yod = (h - y - 1) * w;
+      while (x--)
+        {
+        const unsigned char* const pixoff = imageData + (x * iStep) + yos;
+        const unsigned char r = *(pixoff + (0 * ps));
+        const unsigned char g = *(pixoff + (1 * ps));
+        const unsigned char b = *(pixoff + (2 * ps));
+
+        const ptrdiff_t xo = (yod + x) * 3;
+        vtkimagePtr[xo + 0] = r;
+        vtkimagePtr[xo + 1] = g;
+        vtkimagePtr[xo + 2] = b;
+        }
+      }
+
+      return vtkimage;
+    }
+
+  components->Update();
+
+  vtkSmartPointer<vtkImageFlip> flip(vtkSmartPointer<vtkImageFlip>::New());
+  flip->SetInputConnection(components->GetOutputPort());
+  flip->SetFlipAboutOrigin(false);
+  flip->SetFilteredAxes(1);
+  flip->SetNumberOfThreads(1);
+  flip->Update();
+
+  vtkSmartPointer<vtkImageData> img = vtkSmartPointer<vtkImageData>::New();
+  img->ShallowCopy(flip->GetOutput());
+  return img;
+}
diff --git a/Libraries/VtkVgVideo/vtkVgAdaptImage.h b/Libraries/VtkVgVideo/vtkVgAdaptImage.h
new file mode 100644
index 00000000..27c8de3d
--- /dev/null
+++ b/Libraries/VtkVgVideo/vtkVgAdaptImage.h
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgAdaptImage_h
+#define __vtkVgAdaptImage_h
+
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+class vtkImageData;
+
+class vgImage;
+
+extern VTKVG_VIDEO_EXPORT vtkSmartPointer<vtkImageData>
+vtkVgAdapt(const vgImage&);
+
+#endif
diff --git a/Libraries/VtkVgVideo/vtkVgKwaVideoSource.cxx b/Libraries/VtkVgVideo/vtkVgKwaVideoSource.cxx
new file mode 100644
index 00000000..e26deb26
--- /dev/null
+++ b/Libraries/VtkVgVideo/vtkVgKwaVideoSource.cxx
@@ -0,0 +1,196 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVgKwaVideoSource.h"
+
+#include <QUrl>
+
+#include <vtkObjectFactory.h>
+
+#include <vgKwaFrameMetadata.h>
+#include <vgKwaVideoClip.h>
+
+#include <vtkVgTimeStamp.h>
+#include <vtkVgVideoFrame.h>
+
+#include "vtkVgAdaptImage.h"
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrameCorner vtkVgAdapt(const vgGeoRawCoordinate& in)
+{
+  vtkVgVideoFrameCorner out;
+  out.Latitude = in.Latitude;
+  out.Longitude = in.Longitude;
+  return out;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrameMetaData vtkVgAdapt(const vgKwaFrameMetadata& in)
+{
+  vtkVgVideoFrameMetaData result;
+
+  result.Time = in.timestamp();
+  result.Gsd = in.gsd();
+
+  result.Width = in.imageSize().width();
+  result.Height = in.imageSize().height();
+
+  result.Homography->Identity();
+  result.Homography->SetElement(0, 0, in.homography()(0, 0));
+  result.Homography->SetElement(0, 1, in.homography()(0, 1));
+  result.Homography->SetElement(0, 3, in.homography()(0, 2));
+  result.Homography->SetElement(1, 0, in.homography()(1, 0));
+  result.Homography->SetElement(1, 1, in.homography()(1, 1));
+  result.Homography->SetElement(1, 3, in.homography()(1, 2));
+  result.Homography->SetElement(3, 0, in.homography()(2, 0));
+  result.Homography->SetElement(3, 1, in.homography()(2, 1));
+  result.Homography->SetElement(3, 3, in.homography()(2, 2));
+  result.HomographyReferenceFrame = in.homographyReferenceFrameNumber();
+
+  const vgKwaWorldBox& corners = in.worldCornerPoints();
+  result.WorldLocation.GCS = corners.GCS;
+  result.WorldLocation.UpperLeft = vtkVgAdapt(corners.UpperLeft);
+  result.WorldLocation.UpperRight = vtkVgAdapt(corners.UpperRight);
+  result.WorldLocation.LowerLeft = vtkVgAdapt(corners.LowerLeft);
+  result.WorldLocation.LowerRight = vtkVgAdapt(corners.LowerRight);
+
+  return result;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vtkVgKwaVideoSource::vtkInternal
+{
+public:
+  vtkInternal(const QUrl& uri) : Clip(uri) {}
+
+  vgKwaVideoClip Clip;
+};
+
+vtkStandardNewMacro(vtkVgKwaVideoSource);
+
+//-----------------------------------------------------------------------------
+vtkVgKwaVideoSource::vtkVgKwaVideoSource() : Internal(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVgKwaVideoSource::~vtkVgKwaVideoSource()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+void vtkVgKwaVideoSource::PrintSelf(ostream& os, vtkIndent indent)
+{
+  // TODO
+  Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVgKwaVideoSource::Open(const char* uri)
+{
+  delete this->Internal;
+  this->Internal = new vtkInternal(QUrl(QString::fromLocal8Bit(uri)));
+  return this->Internal->Clip.frameCount() > 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vtkVgKwaVideoSource::GetMinTime() const
+{
+  if (this->Internal)
+    {
+    return this->Internal->Clip.firstTime();
+    }
+  return vtkVgTimeStamp();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vtkVgKwaVideoSource::GetMaxTime() const
+{
+  if (this->Internal)
+    {
+    return this->Internal->Clip.lastTime();
+    }
+  return vtkVgTimeStamp();
+}
+
+//-----------------------------------------------------------------------------
+int vtkVgKwaVideoSource::GetFrameCount() const
+{
+  if (this->Internal)
+    {
+    return this->Internal->Clip.frameCount();
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vtkVgKwaVideoSource::ResolveSeek(
+  const vtkVgTimeStamp& ts, vg::SeekMode direction) const
+{
+  if (this->Internal)
+    {
+    // Get requested frame
+    const vgVideoFramePtr frame =
+      this->Internal->Clip.frameAt(ts.GetRawTimeStamp(), direction);
+    return frame.time();
+    }
+  return vtkVgTimeStamp();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrame vtkVgKwaVideoSource::GetFrame(
+  const vtkVgTimeStamp& ts, vg::SeekMode direction) const
+{
+  if (this->Internal)
+    {
+    // Get requested frame
+    const vgVideoFramePtr frame =
+      this->Internal->Clip.frameAt(ts.GetRawTimeStamp(), direction);
+
+    // If frame is valid, construct result object
+    if (frame.isValid())
+      {
+      vtkVgVideoFrame result(vtkVgAdapt(frame.image()));
+      result.MetaData.Time = frame.time();
+
+      // Get metadata
+      const vgKwaFrameMetadata md =
+        this->Internal->Clip.metadataAt(frame.time(), vg::SeekExact);
+      result.MetaData = vtkVgAdapt(md);
+
+      return result;
+      }
+    }
+
+  // Return encoded frame
+  return vtkVgVideoFrame();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoFrameMetaData vtkVgKwaVideoSource::GetMetadata(
+  const vtkVgTimeStamp& ts, vg::SeekMode direction) const
+{
+  if (this->Internal)
+    {
+    // Get requested frame
+    const vgKwaFrameMetadata md =
+      this->Internal->Clip.metadataAt(ts.GetRawTimeStamp(), direction);
+
+    // If frame is valid, construct result object
+    if (md.timestamp().IsValid())
+      {
+      return vtkVgAdapt(md);
+      }
+    }
+
+  return vtkVgVideoFrameMetaData();
+}
diff --git a/Libraries/VtkVgVideo/vtkVgKwaVideoSource.h b/Libraries/VtkVgVideo/vtkVgKwaVideoSource.h
new file mode 100644
index 00000000..6b9b2281
--- /dev/null
+++ b/Libraries/VtkVgVideo/vtkVgKwaVideoSource.h
@@ -0,0 +1,62 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVgKwaVideoSource_h
+#define __vtkVgKwaVideoSource_h
+
+#include <vtkObject.h>
+
+#include <vtkVgVideoSourceBase.h>
+
+class VTKVG_VIDEO_EXPORT vtkVgKwaVideoSource : public vtkVgVideoSourceBase
+{
+public:
+  static vtkVgKwaVideoSource* New();
+  vtkTypeMacro(vtkVgKwaVideoSource, vtkVgVideoSourceBase);
+
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Open a video.
+  bool Open(const char* uri);
+
+  // \copydoc vtkVgVideoSourceBase::ResolveSeek
+  virtual vtkVgTimeStamp ResolveSeek(
+    const vtkVgTimeStamp&,
+    vg::SeekMode direction = vg::SeekNearest) const;
+
+  // \copydoc vtkVgVideoSourceBase::GetFrame
+  virtual vtkVgVideoFrame GetFrame(
+    const vtkVgTimeStamp&,
+    vg::SeekMode direction = vg::SeekNearest) const;
+
+  // \copydoc vtkVgVideoSourceBase::GetMetadata
+  virtual vtkVgVideoFrameMetaData GetMetadata(
+    const vtkVgTimeStamp&,
+    vg::SeekMode direction = vg::SeekNearest) const;
+
+  // \copydoc vtkVgVideoSourceBase::GetMinTime
+  virtual vtkVgTimeStamp GetMinTime() const;
+
+  // \copydoc vtkVgVideoSourceBase::GetMaxTime
+  virtual vtkVgTimeStamp GetMaxTime() const;
+
+  // \copydoc vtkVgVideoSourceBase::GetFrameCount
+  virtual int GetFrameCount() const;
+
+protected:
+  vtkVgKwaVideoSource();
+  virtual ~vtkVgKwaVideoSource();
+
+private:
+  class vtkInternal;
+  const vtkInternal* Internal;
+
+  vtkVgKwaVideoSource(const vtkVgKwaVideoSource&); // disabled
+  vtkVgKwaVideoSource& operator=(const vtkVgKwaVideoSource&); // disabled
+};
+
+#endif
diff --git a/Libraries/VtkVwCore/CMakeLists.txt b/Libraries/VtkVwCore/CMakeLists.txt
new file mode 100644
index 00000000..eeb040f6
--- /dev/null
+++ b/Libraries/VtkVwCore/CMakeLists.txt
@@ -0,0 +1,49 @@
+project(vtkVwCore)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+  ${LIBJSON_INCLUDE_DIR}
+  ${PYTHON_INCLUDE_DIRS}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(vtkVwCoreSources
+  vtkVwVideo.cxx
+)
+
+set(vtkVwCoreInstallHeaders
+  vtkVwVideo.h
+)
+
+qt4_wrap_cpp(vtkVwCoreMocSources ${vtkVwCoreMocHeaders})
+
+vg_vtk_module(${PROJECT_NAME}
+  DEPENDS vtkCommonCore
+  EXCLUDE_FROM_WRAP_HIERARCHY
+)
+vtk_module_library(${PROJECT_NAME}
+  ${vtkVwCoreSources}
+  ${vtkVwCoreMocSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PRIVATE_INTERFACE_TARGETS
+  vgVideo
+  vtkVgCore
+  vvIO
+  LINK_LIBRARIES
+  LINK_PRIVATE
+  ${QT_LIBRARIES}
+  ${LIBJSON_LIBRARY}
+  ${PYTHON_LIBRARIES}
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vtkVwCoreInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/vtkVwCore)
+
+vg_wrap_vtk_library(${PROJECT_NAME})
diff --git a/Libraries/VtkVwCore/jsUtil.h b/Libraries/VtkVwCore/jsUtil.h
new file mode 100644
index 00000000..95e13b64
--- /dev/null
+++ b/Libraries/VtkVwCore/jsUtil.h
@@ -0,0 +1,28 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __jsUtil_h
+#define __jsUtil_h
+
+#include <vvJson.h>
+
+namespace jsUtil
+{
+  namespace qt
+  {
+    // Need both of these so template below can determine correct overload
+    using qtJson::encode;
+    using vvJson::encode;
+  }
+
+  template <typename T> std::string encode(const T& object)
+    {
+    const qtJson::JsonData data = qt::encode(object);
+    return std::string(data.constData(), data.length());
+    }
+}
+
+#endif
diff --git a/Libraries/VtkVwCore/vtkVwVideo.cxx b/Libraries/VtkVwCore/vtkVwVideo.cxx
new file mode 100644
index 00000000..33726db1
--- /dev/null
+++ b/Libraries/VtkVwCore/vtkVwVideo.cxx
@@ -0,0 +1,238 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vtkVwVideo.h"
+
+#include <QBuffer>
+#include <QImage>
+#include <QUrl>
+
+#define JSON_INT_TYPE long long
+#include <json.h>
+
+#include <vgKwaFrameMetadata.h>
+#include <vgKwaVideoClip.h>
+
+#include "jsUtil.h"
+
+//BEGIN JS conversion helpers
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+qtJson::Value js(const vgKwaWorldBox& corners)
+{
+  if (corners.GCS == -1)
+    {
+    return qtJson::Value();
+    }
+
+  qtJson::Object object;
+
+  object.insert("gcs", corners.GCS);
+  object.insert("ll", vvJson::serialize(corners.LowerLeft));
+  object.insert("lr", vvJson::serialize(corners.LowerRight));
+  object.insert("ul", vvJson::serialize(corners.UpperLeft));
+  object.insert("ur", vvJson::serialize(corners.UpperRight));
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+QByteArray recode(const vgImage& pixels)
+{
+  const int ni = pixels.iCount();
+  const int nj = pixels.jCount();
+  const int np = pixels.planeCount();
+
+  const ptrdiff_t si = pixels.iStep();
+  const ptrdiff_t sj = pixels.jStep();
+  const ptrdiff_t sp = pixels.planeStep();
+
+  const char* const pixelData =
+    reinterpret_cast<const char*>(pixels.constData());
+  const int pixelDataSize = ni * nj * np;
+
+  // Test if recoding is needed
+  if (sp == 1 && si == np && sj == (ni * np))
+    {
+    return QByteArray(pixelData, pixelDataSize);
+    }
+
+  QByteArray result;
+  result.resize(pixelDataSize);
+  for (int j = 0; j < nj; ++j)
+    {
+    const ptrdiff_t oj = j * sj;
+    const int xj = j * ni * np;
+    for (int i = 0; i < ni; ++i)
+      {
+      const ptrdiff_t oi = i * si;
+      const int xi = i * np;
+      for (int p = 0; p < np; ++p)
+        {
+        const ptrdiff_t op = p * sp;
+        result[xi + xj + p] = *(pixelData + oi + oj + op);
+        }
+      }
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp decodeTimeStamp(const char* jsData)
+{
+  vgTimeStamp result;
+
+  const JSONNode jsObject = libjson::parse(jsData);
+  const JSONNode::const_iterator end = jsObject.end();
+  for (JSONNode::const_iterator iter = jsObject.begin(); iter != end; ++iter)
+    {
+    if (iter->name() == "time")
+      {
+      result.Time = iter->as_int();
+      }
+    else if (iter->name() == "frame")
+      {
+      result.FrameNumber = static_cast<unsigned int>(iter->as_int());
+      }
+    }
+
+  return result;
+}
+
+} // namespace <anonymous>
+
+//END JS conversion helpers
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vtkVwVideo
+
+//-----------------------------------------------------------------------------
+class vtkVwVideo::vtkInternal
+{
+public:
+  vtkInternal(const QUrl& uri) : Clip(uri) {}
+
+  vgKwaVideoClip Clip;
+};
+
+//-----------------------------------------------------------------------------
+vtkVwVideo::vtkVwVideo() : Internal(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vtkVwVideo::~vtkVwVideo()
+{
+  delete this->Internal;
+}
+
+//-----------------------------------------------------------------------------
+vtkVwVideo* vtkVwVideo::New()
+{
+  return new vtkVwVideo();
+}
+
+//-----------------------------------------------------------------------------
+void vtkVwVideo::PrintSelf(ostream& os, vtkIndent indent)
+{
+  // TODO
+  vtkObject::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+bool vtkVwVideo::Open(const char* uri)
+{
+  delete this->Internal;
+  this->Internal = new vtkInternal(QUrl(QString::fromLocal8Bit(uri)));
+  return this->Internal->Clip.frameCount() > 0;
+}
+
+//-----------------------------------------------------------------------------
+std::string vtkVwVideo::GetFirstTime() const
+{
+  qtJson::Value result;
+  if (this->Internal)
+    {
+    result = vvJson::serialize(this->Internal->Clip.firstTime());
+    }
+  return jsUtil::encode(result);
+}
+
+//-----------------------------------------------------------------------------
+std::string vtkVwVideo::GetLastTime() const
+{
+  qtJson::Value result;
+  if (this->Internal)
+    {
+    result = vvJson::serialize(this->Internal->Clip.lastTime());
+    }
+  return jsUtil::encode(result);
+}
+
+//-----------------------------------------------------------------------------
+int vtkVwVideo::GetFrameCount() const
+{
+  if (this->Internal)
+    {
+    return this->Internal->Clip.frameCount();
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+std::string vtkVwVideo::GetFrame(const char* jsReferenceTime,
+                                 int direction) const
+{
+  qtJson::Value result;
+  if (this->Internal)
+    {
+    // Get requested frame
+    const vgVideoFramePtr frame =
+      this->Internal->Clip.frameAt(decodeTimeStamp(jsReferenceTime),
+                                   static_cast<vg::SeekMode>(direction));
+
+    // If frame is valid, construct result object
+    if (frame.isValid())
+      {
+      qtJson::Object jsFrame;
+      jsFrame.insert("t", vvJson::serialize(frame.time()));
+
+      // Get pixel data
+      const QImage pixels = frame.image().toQImage();
+      QByteArray pixelData;
+      QBuffer buffer(&pixelData);
+      buffer.open(QIODevice::WriteOnly);
+      pixels.save(&buffer, "JPG");
+
+      // Add pixel data to the JSON object
+      jsFrame.insert("w", pixels.width());
+      jsFrame.insert("h", pixels.height());
+      jsFrame.insert("format", "image/jpeg");
+      jsFrame.insert("d", pixelData.toBase64().prepend('\"').append('\"'));
+
+      // Get metadata
+      const vgKwaFrameMetadata md =
+        this->Internal->Clip.metadataAt(frame.time(), vg::SeekExact);
+
+      // Add metadata to JSON object
+      jsFrame.insert("gsd", md.gsd());
+      jsFrame.insert("corners", js(md.worldCornerPoints()));
+      // TODO homography matrix and reference time
+
+      result = jsFrame;
+      }
+    }
+
+  // Return encoded frame
+  return jsUtil::encode(result);
+}
+
+//END vtkVwVideo
diff --git a/Libraries/VtkVwCore/vtkVwVideo.h b/Libraries/VtkVwCore/vtkVwVideo.h
new file mode 100644
index 00000000..9d60e573
--- /dev/null
+++ b/Libraries/VtkVwCore/vtkVwVideo.h
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vtkVwVideo_h
+#define __vtkVwVideo_h
+
+#include <vtkObject.h>
+
+#include <vtkVgTimeStamp.h>
+#include <vgNamespace.h>
+
+class VTKVW_CORE_EXPORT vtkVwVideo : public vtkObject
+{
+public:
+  static vtkVwVideo* New();
+  vtkTypeMacro(vtkVwVideo, vtkObject);
+
+  void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Open a video.
+  bool Open(const char* uri);
+
+  // Description:
+  // Get a frame from the video.
+  std::string GetFrame(const char* jsReferenceTime, int direction) const;
+
+  // Description:
+  // Get the first time stamp available in the video.
+  std::string GetFirstTime() const;
+
+  // Description:
+  // Get the last time stamp available in the video.
+  std::string GetLastTime() const;
+
+  // Description:
+  // Get the number of frames available in the video clip.
+  int GetFrameCount() const;
+
+protected:
+  vtkVwVideo();
+  virtual ~vtkVwVideo();
+
+private:
+  class vtkInternal;
+  const vtkInternal* Internal;
+
+  vtkVwVideo(const vtkVwVideo&); // disabled
+  vtkVwVideo& operator=(const vtkVwVideo&); // disabled
+};
+
+#endif
diff --git a/Libraries/VvData/CMakeLists.txt b/Libraries/VvData/CMakeLists.txt
new file mode 100644
index 00000000..b65a1b12
--- /dev/null
+++ b/Libraries/VvData/CMakeLists.txt
@@ -0,0 +1,15 @@
+vg_include_library_sdk_directories(
+  TARGET vvData INTERFACE vgCommon
+)
+
+set(vvData_InstallHeaders
+  vvDescriptor.h
+  vvIqr.h
+  vvQuery.h
+  vvQueryResult.h
+  vvTrack.h
+  vvUserData.h
+)
+
+install_headers(${vvData_InstallHeaders} TARGET vvData
+                DESTINATION include/VvData)
diff --git a/Libraries/VvData/vvDescriptor.h b/Libraries/VvData/vvDescriptor.h
new file mode 100644
index 00000000..7b53a45e
--- /dev/null
+++ b/Libraries/VvData/vvDescriptor.h
@@ -0,0 +1,66 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvDescriptor_h
+#define __vvDescriptor_h
+
+#include <vector>
+
+#include <vgExport.h>
+
+#include <vgTimeStamp.h>
+
+#include "vvTrack.h"
+
+// Disable warning about the STL members of vvDescriptor not being exported.
+// This is not 'fixable', since classes from MS STL can't be exported, with the
+// possible exception of vector (see http://support.microsoft.com/kb/168958).
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable:4251)
+#endif
+
+//-----------------------------------------------------------------------------
+struct vvDescriptorRegionEntry
+{
+  vgTimeStamp TimeStamp;
+  vvImageBoundingBox ImageRegion;
+
+  bool operator<(const vvDescriptorRegionEntry& other) const
+    { return this->TimeStamp < other.TimeStamp; }
+};
+
+typedef std::set<vvDescriptorRegionEntry> vvDescriptorRegionMap;
+
+//-----------------------------------------------------------------------------
+struct vvDescriptor
+{
+  vvDescriptor() : InstanceId(-1), Confidence(-1.0) {}
+
+  std::string DescriptorName;
+  std::string ModuleName;
+  long long InstanceId;
+  double Confidence;
+  std::vector<std::vector<float> > Values;
+  vvDescriptorRegionMap Region;
+  std::vector<vvTrackId> TrackIds;
+
+  enum CompareMode
+    {
+    CompareExact,
+    CompareDetection
+    };
+
+  // NOTE: implemented in vvIO
+  VV_IO_EXPORT static bool compare(const vvDescriptor&, const vvDescriptor&,
+                                   CompareMode = CompareExact);
+};
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif
diff --git a/Libraries/VvData/vvIqr.h b/Libraries/VvData/vvIqr.h
new file mode 100644
index 00000000..b1706a7e
--- /dev/null
+++ b/Libraries/VvData/vvIqr.h
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvIqr_h
+#define __vvIqr_h
+
+//-----------------------------------------------------------------------------
+namespace vvIqr
+{
+  enum Classification
+    {
+    PositiveExample,
+    NegativeExample,
+    UnclassifiedExample
+    };
+}
+
+#endif
diff --git a/Libraries/VvData/vvQuery.h b/Libraries/VvData/vvQuery.h
new file mode 100644
index 00000000..756b38d8
--- /dev/null
+++ b/Libraries/VvData/vvQuery.h
@@ -0,0 +1,102 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQuery_h
+#define __vvQuery_h
+
+#include <vgGeoTypes.h>
+
+#include "vvDescriptor.h"
+
+//-----------------------------------------------------------------------------
+struct vvDatabaseQuery
+{
+  enum QueryType
+    {
+    Abstract = 0,
+    Retrieval,
+    Similarity
+    };
+
+  enum IntersectionType
+    {
+    Ignore,
+    ContainsWholly,
+    ContainsAny,
+    Intersects, // partly but not wholly contained
+    IntersectsInbound, // first does not contain, then contains
+    IntersectsOutbound, // first contains, then does not contain
+    DoesNotContain
+    };
+
+  vvDatabaseQuery()
+    : Type(Abstract), SpatialFilter(ContainsAny),
+      TemporalLowerLimit(-1), TemporalUpperLimit(-1),
+      TemporalFilter(ContainsAny) {}
+
+  const QueryType Type;
+  std::string QueryId;
+  std::string StreamIdLimit;
+  vgGeocodedPoly SpatialLimit;
+  IntersectionType SpatialFilter;
+  long long TemporalLowerLimit;
+  long long TemporalUpperLimit;
+  IntersectionType TemporalFilter;
+
+protected:
+  vvDatabaseQuery(QueryType t)
+    : Type(t), SpatialFilter(ContainsAny),
+      TemporalLowerLimit(-1), TemporalUpperLimit(-1),
+      TemporalFilter(ContainsAny) {}
+
+  vvDatabaseQuery& operator=(const vvDatabaseQuery& other)
+    {
+    this->QueryId = other.QueryId;
+    this->StreamIdLimit = other.StreamIdLimit;
+    this->SpatialLimit = other.SpatialLimit;
+    this->SpatialFilter = other.SpatialFilter;
+    this->TemporalLowerLimit = other.TemporalLowerLimit;
+    this->TemporalUpperLimit = other.TemporalUpperLimit;
+    this->TemporalFilter = other.TemporalFilter;
+    return *this;
+    }
+};
+
+//-----------------------------------------------------------------------------
+struct vvRetrievalQuery : vvDatabaseQuery
+{
+  enum EntityType
+    {
+    Tracks,
+    Descriptors,
+    TracksAndDescriptors
+    };
+
+  vvRetrievalQuery(EntityType et = Descriptors)
+    : vvDatabaseQuery(Retrieval), RequestedEntities(et) {}
+  explicit vvRetrievalQuery(const vvDatabaseQuery& other)
+    : vvDatabaseQuery(Retrieval), RequestedEntities(Descriptors)
+    { this->vvDatabaseQuery::operator=(other); }
+
+  EntityType RequestedEntities;
+};
+
+//-----------------------------------------------------------------------------
+struct vvSimilarityQuery : vvDatabaseQuery
+{
+  vvSimilarityQuery()
+    : vvDatabaseQuery(Similarity), SimilarityThreshold(0.0) {}
+  explicit vvSimilarityQuery(const vvDatabaseQuery& other)
+    : vvDatabaseQuery(Similarity), SimilarityThreshold(0.0)
+    { this->vvDatabaseQuery::operator=(other); }
+
+  std::vector<vvTrack> Tracks;
+  std::vector<vvDescriptor> Descriptors;
+  std::vector<unsigned char> IqrModel;
+  double SimilarityThreshold;
+};
+
+#endif
diff --git a/Libraries/VvData/vvQueryResult.h b/Libraries/VvData/vvQueryResult.h
new file mode 100644
index 00000000..7c490adb
--- /dev/null
+++ b/Libraries/VvData/vvQueryResult.h
@@ -0,0 +1,43 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryResult_h
+#define __vvQueryResult_h
+
+#include <string>
+#include <vector>
+
+#include <vgGeoTypes.h>
+
+#include "vvDescriptor.h"
+#include "vvIqr.h"
+#include "vvUserData.h"
+
+//-----------------------------------------------------------------------------
+struct vvQueryResult
+{
+  vvQueryResult()
+    : InstanceId(-1), StartTime(0), EndTime(0), Rank(-1),
+      RelevancyScore(-1.0), PreferenceScore(-1.0),
+      UserScore(vvIqr::UnclassifiedExample) {}
+
+  std::string MissionId;
+  std::string QueryId;
+  std::string StreamId;
+  long long InstanceId;
+  std::vector<vvTrack> Tracks;
+  std::vector<vvDescriptor> Descriptors;
+  long long StartTime;
+  long long EndTime;
+  vgGeocodedCoordinate Location;
+  long long Rank;
+  double RelevancyScore;
+  double PreferenceScore;
+  vvIqr::Classification UserScore;
+  vvUserData::Data UserData;
+};
+
+#endif
diff --git a/Libraries/VvData/vvTrack.h b/Libraries/VvData/vvTrack.h
new file mode 100644
index 00000000..44c89802
--- /dev/null
+++ b/Libraries/VvData/vvTrack.h
@@ -0,0 +1,126 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvTrack_h
+#define __vvTrack_h
+
+#include <map>
+#include <set>
+#include <string>
+
+#include <vgGeoTypes.h>
+#include <vgTimeStamp.h>
+
+//-----------------------------------------------------------------------------
+struct vvImagePoint
+{
+  vvImagePoint() : X(-1), Y(-1) {}
+  vvImagePoint(int x, int y) : X(x), Y(y) {}
+  int X, Y;
+};
+
+//-----------------------------------------------------------------------------
+struct vvImagePointF
+{
+  vvImagePointF() : X(-1), Y(-1) {}
+  vvImagePointF(double x, double y) : X(x), Y(y) {}
+
+  double X, Y;
+};
+typedef std::vector<vvImagePointF> vvImagePolygonF;
+
+//-----------------------------------------------------------------------------
+struct vvImageBoundingBox
+{
+  vvImagePoint TopLeft, BottomRight;
+};
+
+//-----------------------------------------------------------------------------
+struct vvTrackId
+{
+  int Source;
+  long long SerialNumber;
+
+  vvTrackId()
+    : Source(-1), SerialNumber(-1) {}
+  vvTrackId(int source, long long serialNumber)
+    : Source(source), SerialNumber(serialNumber) {}
+
+  inline bool operator==(const vvTrackId& other) const;
+  inline bool operator<(const vvTrackId& other) const;
+};
+
+//-----------------------------------------------------------------------------
+struct vvTrackState
+{
+  vgTimeStamp TimeStamp;
+  vvImagePointF ImagePoint;
+  vvImageBoundingBox ImageBox;
+  vvImagePolygonF ImageObject;
+  vgGeocodedCoordinate WorldLocation;
+
+  inline bool operator<(const vvTrackState& other) const;
+  inline bool operator<(const vgTimeStamp& timestamp) const;
+  inline bool operator>(const vgTimeStamp& timestamp) const;
+};
+
+//-----------------------------------------------------------------------------
+typedef std::map<std::string, double> vvTrackObjectClassification;
+typedef std::set<vvTrackState> vvTrackTrajectory;
+struct vvTrack
+{
+  vvTrackId Id;
+  vvTrackObjectClassification Classification;
+  vvTrackTrajectory Trajectory;
+};
+
+//-----------------------------------------------------------------------------
+bool vvTrackId::operator==(const vvTrackId& other) const
+{
+  return (this->SerialNumber == other.SerialNumber &&
+          this->Source == other.Source);
+}
+//-----------------------------------------------------------------------------
+bool vvTrackId::operator<(const vvTrackId& other) const
+{
+  return (this->Source < other.Source) ||
+         ((this->Source == other.Source) &&
+          (this->SerialNumber < other.SerialNumber));
+}
+
+//-----------------------------------------------------------------------------
+bool vvTrackState::operator<(const vvTrackState& other) const
+{
+  return this->TimeStamp < other.TimeStamp;
+}
+
+//-----------------------------------------------------------------------------
+bool vvTrackState::operator<(const vgTimeStamp& timestamp) const
+{
+  return this->TimeStamp < timestamp;
+}
+
+//-----------------------------------------------------------------------------
+bool vvTrackState::operator>(const vgTimeStamp& timestamp) const
+{
+  return timestamp < this->TimeStamp;
+}
+
+//-----------------------------------------------------------------------------
+extern unsigned int qHash(long long);
+inline unsigned int qHash(const vvTrackId& tid)
+{
+  static const int sourceRotateBits = 4;
+  static const int sourceReverseRotateBits =
+    ((8 * sizeof(unsigned int)) - sourceRotateBits);
+
+  unsigned int source = static_cast<unsigned int>(tid.Source);
+  unsigned int sourceHash = (source >> sourceRotateBits) & (~0U);
+  sourceHash ^= (source << sourceReverseRotateBits & (~0U));
+  return qHash(tid.SerialNumber) ^ sourceHash;
+}
+
+#endif
diff --git a/Libraries/VvData/vvUserData.h b/Libraries/VvData/vvUserData.h
new file mode 100644
index 00000000..90eec8a6
--- /dev/null
+++ b/Libraries/VvData/vvUserData.h
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvUserData_h
+#define __vvUserData_h
+
+#include <vgFlags.h>
+
+#include <string>
+
+//-----------------------------------------------------------------------------
+namespace vvUserData
+{
+  enum Flag
+    {
+    Starred = 1 << 0
+    };
+
+  VG_DECLARE_FLAGS(Flags, Flag)
+
+  struct Data
+    {
+    vvUserData::Flags Flags;
+    std::string Notes;
+    };
+}
+
+VG_DECLARE_OPERATORS_FOR_FLAGS(vvUserData::Flags)
+
+#endif
diff --git a/Libraries/VvIO/CMakeLists.txt b/Libraries/VvIO/CMakeLists.txt
new file mode 100644
index 00000000..8678c598
--- /dev/null
+++ b/Libraries/VvIO/CMakeLists.txt
@@ -0,0 +1,105 @@
+project(vvIO)
+
+include_directories(SYSTEM
+  ${Boost_INCLUDE_DIRS}
+  ${KML_INCLUDE_DIRS}
+)
+
+set(vvIO_Sources
+  # Read/Write core
+  vvHeader.cxx
+  vvReader.cxx
+  vvWriter.cxx
+  # Read/Write file formats
+  vvKmlWriter.cxx
+  vvKstReader.cxx
+  vvKstWriter.cxx
+  vvXmlReader.cxx
+  vvXmlWriter.cxx
+  vvXmlUtil.cxx
+  # Query Server Interface
+  vvQueryInstance.cxx
+  vvQueryService.cxx
+  vvQuerySession.cxx
+  # Utility Functions
+  vvChecksum.cxx
+  vvCompare.cxx
+  vvJson.cxx
+  vvKmlLine.cxx
+  vvMakeId.cxx
+  vvUtil.cxx
+)
+
+set(vvIO_MocHeaders
+  # Query Server Interface
+  vvQueryNotifier.h
+  vvQuerySession.h
+)
+
+set(vvIOInstallHeaders
+  vvChecksum.h
+  vvEventSetInfo.h
+  vvHeader.h
+  vvJson.h
+  vvKmlLine.h
+  vvKmlWriter.h
+  vvKstReader.h
+  vvKstWriter.h
+  vvMakeId.h
+  vvQueryFormulation.h
+  vvQueryInstance.h
+  vvQueryNotifier.h
+  vvQueryService.h
+  vvQueryServiceInterface.h
+  vvQuerySession.h
+  vvReader.h
+  vvUtil.h
+  vvWriterData.h
+  vvWriter.h
+  vvXmlReader.h
+  vvXmlWriter.h
+)
+
+set(vvIOWrapObjects
+  vvQueryResult
+  BY_VALUE
+  vvImageBoundingBox
+  vvImagePoint
+  vvImagePointF
+  vvQueryInstance
+  vvTrack
+  vvTrackId
+)
+
+qt4_wrap_cpp(vvIO_MocSources ${vvIO_MocHeaders})
+
+add_library(${PROJECT_NAME} ${vvIO_Sources} ${vvIO_MocSources})
+
+vg_include_library_sdk_directories(
+  TARGET ${PROJECT_NAME} INTERFACE vvData
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  qtExtensions
+  qtVgCommon
+  LINK_LIBRARIES
+  LINK_PRIVATE
+  ${Boost_LIBRARIES}
+  ${KML_LIBRARY}
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+)
+
+vg_add_test_subdirectory()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vvIOInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VvIO)
+
+vg_wrap_library(${PROJECT_NAME}
+  TYPESYSTEM typesystem.xml
+  OBJECTS ${vvIOWrapObjects}
+  HEADERS ${vvIOInstallHeaders}
+  DEPENDS PySide:Core vgCommon qtExtensions
+)
diff --git a/Libraries/VvIO/Testing/CMakeLists.txt b/Libraries/VvIO/Testing/CMakeLists.txt
new file mode 100644
index 00000000..4d3189bf
--- /dev/null
+++ b/Libraries/VvIO/Testing/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(VGTEST_LINK_LIBRARIES vvIO qtExtensions ${QT_LIBRARIES})
+
+vg_add_test(vvIO-Checksum testVvChecksum SOURCES TestChecksum.cxx)
+
+vg_add_test(vvIO-KstReadWrite testVvKstReadWrite
+            SOURCES TestKstReadWrite.cxx TestReadWrite.cxx
+            ARGS ${CMAKE_CURRENT_SOURCE_DIR}/rw)
+
+vg_add_test(vvIO-XmlReadWrite testVvXmlReadWrite
+            SOURCES TestXmlReadWrite.cxx TestReadWrite.cxx
+            ARGS ${CMAKE_CURRENT_SOURCE_DIR}/rw)
+
+vg_add_test(testVvRead INTERACTIVE SOURCES TestVvRead.cxx)
diff --git a/Libraries/VvIO/Testing/TestChecksum.cxx b/Libraries/VvIO/Testing/TestChecksum.cxx
new file mode 100644
index 00000000..4be0a0ee
--- /dev/null
+++ b/Libraries/VvIO/Testing/TestChecksum.cxx
@@ -0,0 +1,63 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtTest.h>
+
+#include "../vvChecksum.h"
+
+//-----------------------------------------------------------------------------
+int testChecksum(qtTest& testObject)
+{
+  vvDescriptor d1;
+  d1.DescriptorName = "test";
+  d1.ModuleName = "test";
+  d1.InstanceId = 0;
+  d1.Confidence = 0.5;
+  d1.Values.push_back(std::vector<float>(1, 0.3f));
+  vvDescriptorRegionEntry re;
+  re.TimeStamp = vgTimeStamp(1302025968.521, 3571U);
+  re.ImageRegion.TopLeft.X = 300;
+  re.ImageRegion.TopLeft.Y = 210;
+  re.ImageRegion.BottomRight.X = 307;
+  re.ImageRegion.BottomRight.Y = 214;
+  d1.Region.insert(re);
+  d1.TrackIds.push_back(vvTrackId(1, 1));
+
+  vvDescriptor d2(d1);
+  d2.InstanceId = 1;
+
+  // Test uniqueness
+  quint16 sum1 = vvChecksum(d1), sum2 = vvChecksum(d2);
+  TEST(sum1 != sum2);
+
+  // Test array uniqueness
+  QList<vvDescriptor> qa;
+  qa << d1 << d2;
+  quint16 sumqa = vvChecksum(qa);
+  TEST(sumqa != sum1);
+  TEST(sumqa != sum2);
+
+  // Test same checksum from either array type
+  std::vector<vvDescriptor> sa;
+  sa.push_back(d1);
+  sa.push_back(d2);
+  quint16 sumsa = vvChecksum(sa);
+  TEST(sumqa == sumsa);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  Q_UNUSED(argc);
+  Q_UNUSED(argv);
+
+  qtTest testObject;
+
+  testObject.runSuite("Checksum Tests", testChecksum);
+  return testObject.result();
+}
diff --git a/Libraries/VvIO/Testing/TestKstReadWrite.cxx b/Libraries/VvIO/Testing/TestKstReadWrite.cxx
new file mode 100644
index 00000000..9f7322fd
--- /dev/null
+++ b/Libraries/VvIO/Testing/TestKstReadWrite.cxx
@@ -0,0 +1,594 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QByteArray>
+#include <QFile>
+
+#include <qtKstReader.h>
+#include <qtTest.h>
+
+#include "../vvKstReader.h"
+#include "../vvKstWriter.h"
+
+#include "TestReadWrite.h"
+
+QString testFileBase;
+
+//-----------------------------------------------------------------------------
+int testTrack(qtTest& testObject)
+{
+  QFile fileA(testFileBase + "-a.vst");
+  if (!fileA.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file A\n";
+    return 1;
+    }
+  QString inDataA = QString::fromUtf8(fileA.readAll());
+
+  QFile fileB(testFileBase + "-b.vst");
+  if (!fileB.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file B\n";
+    return 1;
+    }
+  QString inDataB = QString::fromUtf8(fileB.readAll());
+
+  // Read first header
+  vvReader reader;
+  vvHeader header;
+  TEST(reader.setInput(inDataA));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::Tracks);
+  TEST_EQUAL(header.version, vvKstWriter::TracksVersion);
+
+  // Read tracks
+  QList<vvTrack> tracks;
+  TEST(reader.readTracks(tracks));
+  if (TEST_EQUAL(tracks.count(), 2) == 0)
+    {
+    // Verify tracks
+    TEST_CALL(testTrack1, tracks[0]);
+    TEST_CALL(testTrack2, tracks[1]);
+    }
+
+  // Write tracks
+  QString outDataA;
+  QTextStream outA(&outDataA);
+  vvWriter writerA(outA, vvWriter::Kst);
+  writerA << vvHeader::Tracks << tracks;
+
+  // Verify output
+  TEST_EQUAL(outDataA, inDataA);
+
+  // Test terse output
+  QString terseDataA;
+  QTextStream terseA(&terseDataA);
+  vvKstWriter terseWriterA(terseA, false);
+  terseWriterA << tracks;
+
+  qtKstReader terseKstA(terseDataA);
+  vvKstReader terseReader;
+  TEST(terseKstA.isValid());
+  TEST(terseReader.readTracks(terseKstA, tracks,
+                              vvKstWriter::TracksVersion));
+
+  if (TEST_EQUAL(tracks.count(), 2) == 0)
+    {
+    // Verify tracks
+    TEST_CALL(testTrack1, tracks[0]);
+    TEST_CALL(testTrack2, tracks[1]);
+    }
+
+  // Read second header
+  TEST(reader.setInput(inDataB));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::Tracks);
+  TEST_EQUAL(header.version, vvKstWriter::TracksVersion);
+
+  // Read track
+  TEST(reader.readTracks(tracks));
+  if (TEST_EQUAL(tracks.count(), 1) == 0)
+    {
+    // Verify track
+    TEST_CALL(testTrack3, tracks[0]);
+    }
+
+  // Write track
+  QString outDataB;
+  QTextStream outB(&outDataB);
+  vvWriter writerB(outB, vvWriter::Kst);
+  writerB << vvHeader::Tracks << tracks;
+
+  // Verify output
+  TEST_EQUAL(outDataB, inDataB);
+
+  // Test terse output
+  QString terseDataB;
+  QTextStream terseB(&terseDataB);
+  vvKstWriter terseWriterB(terseB, false);
+  terseWriterB << tracks;
+
+  qtKstReader terseKstB(terseDataB);
+  TEST(terseKstB.isValid());
+  TEST(terseReader.readTracks(terseKstB, tracks,
+                              vvKstWriter::TracksVersion));
+
+  if (TEST_EQUAL(tracks.count(), 1) == 0)
+    {
+    // Verify track
+    TEST_CALL(testTrack3, tracks[0]);
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testDescriptor(qtTest& testObject)
+{
+  QFile file(testFileBase + ".vsd");
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file\n";
+    return 1;
+    }
+  QString inData = QString::fromUtf8(file.readAll());
+
+  // Read header
+  vvReader reader;
+  vvHeader header;
+  TEST(reader.setInput(inData));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::Descriptors);
+  TEST_EQUAL(header.version, vvKstWriter::DescriptorsVersion);
+
+  // Read descriptors
+  QList<vvDescriptor> descriptors;
+  TEST(reader.readDescriptors(descriptors));
+  if (TEST_EQUAL(descriptors.count(), 3) == 0)
+    {
+    // Verify descriptors
+    TEST_CALL(testDescriptor1, descriptors[0]);
+    TEST_CALL(testDescriptor2, descriptors[1]);
+    TEST_CALL(testDescriptor3, descriptors[2]);
+    }
+
+  // Write descriptors
+  QString outData;
+  QTextStream out(&outData);
+  vvWriter writer(out, vvWriter::Kst);
+  writer << vvHeader::Descriptors << descriptors;
+
+  // Verify output
+  TEST_EQUAL(outData, inData);
+
+  // Test terse output
+  QString terseData;
+  QTextStream terse(&terseData);
+  vvKstWriter terseWriter(terse, false);
+  terseWriter << descriptors;
+
+  qtKstReader terseKst(terseData);
+  vvKstReader terseReader;
+  TEST(terseKst.isValid());
+  TEST(terseReader.readDescriptors(terseKst, descriptors,
+                                   vvKstWriter::DescriptorsVersion));
+
+  if (TEST_EQUAL(descriptors.count(), 3) == 0)
+    {
+    // Verify descriptors
+    TEST_CALL(testDescriptor1, descriptors[0]);
+    TEST_CALL(testDescriptor2, descriptors[1]);
+    TEST_CALL(testDescriptor3, descriptors[2]);
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testQueryPlan(qtTest& testObject)
+{
+  QFile fileA(testFileBase + "-a.vqp");
+  if (!fileA.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file A\n";
+    return 1;
+    }
+  QString inDataA = QString::fromUtf8(fileA.readAll());
+
+  QFile fileB(testFileBase + "-b.vqp");
+  if (!fileB.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file B(in)\n";
+    return 1;
+    }
+  QString inDataB = QString::fromUtf8(fileB.readAll());
+
+  QFile fileBO(testFileBase + "-bo.vqp");
+  if (!fileBO.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file B(out)\n";
+    return 1;
+    }
+  QString refDataB = QString::fromUtf8(fileBO.readAll());
+
+  QFile fileC(testFileBase + "-c.vqp");
+  if (!fileC.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file C\n";
+    return 1;
+    }
+  QString inDataC = QString::fromUtf8(fileC.readAll());
+
+  vvReader reader;
+  vvHeader header;
+  vvQueryInstance query;
+
+  // Read first header
+  TEST(reader.setInput(inDataA));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryPlan);
+  TEST_EQUAL(header.version, vvKstWriter::QueryPlanVersion);
+
+  // Read and verify first plan
+  TEST(reader.readQueryPlan(query));
+  TEST_CALL(testQueryPlan1, query);
+
+  // Write first plan
+  QString outDataA;
+  QTextStream outA(&outDataA);
+  vvWriter writerA(outA, vvWriter::Kst);
+  writerA << vvHeader::QueryPlan << query;
+
+  // Verify output
+  TEST_EQUAL(outDataA, inDataA);
+
+  // Test terse output (first plan)
+  QString terseDataA;
+  QTextStream terseA(&terseDataA);
+  vvKstWriter terseWriterA(terseA, false);
+  terseWriterA << query;
+
+  qtKstReader terseKstA(terseDataA);
+  vvKstReader terseReader;
+  TEST(terseKstA.isValid());
+  TEST(terseReader.readQueryPlan(terseKstA, query,
+                                 vvKstWriter::QueryPlanVersion));
+  TEST_CALL(testQueryPlan1, query);
+
+  // Read second header
+  TEST(reader.setInput(inDataB));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryPlan);
+  TEST_EQUAL(header.version, 0u); // test file B is old version
+
+  // Read and verify second plan
+  TEST(reader.readQueryPlan(query));
+  TEST_CALL(testQueryPlan2, query);
+
+  // Write second plan
+  QString outDataB;
+  QTextStream outB(&outDataB);
+  vvWriter writerB(outB, vvWriter::Kst);
+  writerB << vvHeader::QueryPlan << query;
+
+  // Verify output
+  TEST_EQUAL(outDataB, refDataB);
+
+  // Test terse output (second plan)
+  QString terseDataB;
+  QTextStream terseB(&terseDataB);
+  vvKstWriter terseWriterB(terseB, false);
+  terseWriterB << query;
+
+  qtKstReader terseKstB(terseDataB);
+  TEST(terseKstB.isValid());
+  TEST(terseReader.readQueryPlan(terseKstB, query,
+                                 vvKstWriter::QueryPlanVersion));
+  TEST_CALL(testQueryPlan2, query);
+
+  // Read third header
+  TEST(reader.setInput(inDataC));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryPlan);
+  TEST_EQUAL(header.version, vvKstWriter::QueryPlanVersion);
+
+  // Read and verify third plan
+  TEST(reader.readQueryPlan(query));
+  TEST_CALL(testQueryPlan3, query);
+
+  // Write third plan
+  QString outDataC;
+  QTextStream outC(&outDataC);
+  vvWriter writerC(outC, vvWriter::Kst);
+  writerC << vvHeader::QueryPlan << query;
+
+  // Verify output
+  TEST_EQUAL(outDataC, inDataC);
+
+  // Test terse output (third plan)
+  QString terseDataC;
+  QTextStream terseC(&terseDataC);
+  vvKstWriter terseWriterC(terseC, false);
+  terseWriterC << query;
+
+  qtKstReader terseKstC(terseDataC);
+  TEST(terseKstC.isValid());
+  TEST(terseReader.readQueryPlan(terseKstC, query,
+                                 vvKstWriter::QueryPlanVersion));
+  TEST_CALL(testQueryPlan3, query);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testQueryResult(qtTest& testObject)
+{
+  QFile file1(testFileBase + "-1.vqr");
+  if (!file1.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open v1 test file\n";
+    return 1;
+    }
+  QString inData1 = QString::fromUtf8(file1.readAll());
+
+  QFile file2(testFileBase + "-2.vqr");
+  if (!file2.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open v2 test file\n";
+    return 1;
+    }
+  QString inData2 = QString::fromUtf8(file2.readAll());
+
+  // Read v1 header
+  vvReader reader;
+  vvHeader header;
+  TEST(reader.setInput(inData1));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryResults);
+  TEST_EQUAL(header.version, 1u);
+
+  // Read v1 results
+  QList<vvQueryResult> results;
+  TEST(reader.readQueryResults(results));
+  if (TEST_EQUAL(results.count(), 2) == 0)
+    {
+    // Verify v1 results
+    TEST_EQUAL(results[0].Rank, -1LL);
+    TEST_EQUAL(results[1].Rank, -1LL);
+    results[0].Rank = 0;
+    results[1].Rank = 1;
+    TEST_CALL(testQueryResult1, results[0], header.version);
+    TEST_CALL(testQueryResult2, results[1], header.version);
+    }
+
+  // Read v2 header
+  TEST(reader.setInput(inData2));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryResults);
+  TEST_EQUAL(header.version, vvKstWriter::QueryResultsVersion);
+
+  // Read v2 results
+  TEST(reader.readQueryResults(results));
+  if (TEST_EQUAL(results.count(), 2) == 0)
+    {
+    // Verify v1 results
+    TEST_CALL(testQueryResult1, results[0], header.version);
+    TEST_CALL(testQueryResult2, results[1], header.version);
+    }
+
+  // Write results
+  QString outData;
+  QTextStream out(&outData);
+  vvWriter writer(out, vvWriter::Kst);
+  writer << vvHeader::QueryResults << results;
+
+  // Verify output
+  TEST_EQUAL(outData, inData2);
+
+  // Test terse output
+  QString terseData;
+  QTextStream terse(&terseData);
+  vvKstWriter terseWriter(terse, false);
+  terseWriter << results;
+
+  qtKstReader terseKst(terseData);
+  vvKstReader terseReader;
+  TEST(terseKst.isValid());
+  TEST(terseReader.readQueryResults(terseKst, results,
+                                    vvKstWriter::QueryResultsVersion));
+
+  if (TEST_EQUAL(results.count(), 2) == 0)
+    {
+    // Verify results
+    TEST_CALL(testQueryResult1, results[0], vvKstWriter::QueryResultsVersion);
+    TEST_CALL(testQueryResult2, results[1], vvKstWriter::QueryResultsVersion);
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testGeoPoly(qtTest& testObject)
+{
+  QFile fileA(testFileBase + "-a.vgp");
+  if (!fileA.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file A\n";
+    return 1;
+    }
+
+  QString inDataA = QString::fromUtf8(fileA.readAll());
+  qtKstReader kstA(inDataA);
+  if (!kstA.isValid())
+    {
+    testObject.out() << "error parsing test file A (KST invalid)\n";
+    return 1;
+    }
+
+  QFile fileB(testFileBase + "-b.vgp");
+  if (!fileB.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file B\n";
+    return 1;
+    }
+
+  QString inDataB = QString::fromUtf8(fileB.readAll());
+  qtKstReader kstB(inDataB);
+  if (!kstB.isValid())
+    {
+    testObject.out() << "error parsing test file B (KST invalid)\n";
+    return 1;
+    }
+
+  // Read first header
+  int version;
+  if (!(kstA.readInt(version) && kstA.nextRecord()))
+    {
+    testObject.out() << "error parsing test file (unable to read version)\n";
+    return 1;
+    }
+
+  // Read first polygon
+  vvKstReader reader;
+  vgGeocodedPoly geoPoly;
+  TEST(reader.readGeoPoly(kstA, geoPoly, version));
+
+  // Verify polygon
+  TEST_CALL(testGeoPoly1, geoPoly);
+
+  // Write first polygon
+  QString outDataA = QString::number(vvKstWriter::GeoPolyVersion) + ";\n";
+  QTextStream outA(&outDataA);
+  vvKstWriter writerA(outA);
+  writerA << geoPoly;
+
+  // Verify output
+  TEST_EQUAL(outDataA + ";\n", inDataA);
+
+  // Test terse output (first polygon)
+  QString terseDataA;
+  QTextStream terseA(&terseDataA);
+  vvKstWriter terseWriterA(terseA, false);
+  terseWriterA << geoPoly;
+
+  qtKstReader terseKstA(terseDataA + ';');
+  TEST(terseKstA.isValid());
+  TEST(reader.readGeoPoly(terseKstA, geoPoly, vvKstWriter::GeoPolyVersion));
+
+  // Verify polygon
+  TEST_CALL(testGeoPoly1, geoPoly);
+
+  // Read second header
+  if (!(kstB.readInt(version) && kstB.nextRecord()))
+    {
+    testObject.out() << "error parsing test file (unable to read version)\n";
+    return 1;
+    }
+
+  // Read second polygon
+  TEST(reader.readGeoPoly(kstB, geoPoly, version));
+
+  // Verify polygon
+  TEST_CALL(testGeoPoly2, geoPoly);
+
+  // Write second polygon
+  QString outDataB = QString::number(vvKstWriter::GeoPolyVersion) + ";\n";
+  QTextStream outB(&outDataB);
+  vvKstWriter writerB(outB);
+  writerB << geoPoly;
+
+  // Verify output
+  TEST_EQUAL(outDataB + ";\n", inDataB);
+
+  // Test terse output (second polygon)
+  QString terseDataB;
+  QTextStream terseB(&terseDataB);
+  vvKstWriter terseWriterB(terseB, false);
+  terseWriterB << geoPoly;
+
+  qtKstReader terseKstB(terseDataB + ';');
+  TEST(terseKstB.isValid());
+  TEST(reader.readGeoPoly(terseKstB, geoPoly, vvKstWriter::GeoPolyVersion));
+
+  // Verify polygon
+  TEST_CALL(testGeoPoly2, geoPoly);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testEventSetInfo(qtTest& testObject)
+{
+  QFile file(testFileBase + ".vem");
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file\n";
+    return 1;
+    }
+  QString inData = QString::fromUtf8(file.readAll());
+
+  // Read header
+  vvReader reader;
+  vvHeader header;
+  TEST(reader.setInput(inData));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::EventSetInfo);
+  TEST_EQUAL(header.version, vvKstWriter::EventSetInfoVersion);
+
+  // Read event set info
+  vvEventSetInfo info;
+  TEST(reader.readEventSetInfo(info));
+
+  // Verify event set info
+  TEST_CALL(testEventSetInfo, info);
+
+  // Write event set info
+  QString outData;
+  QTextStream out(&outData);
+  vvKstWriter writer(out);
+  writer << vvHeader::EventSetInfo << info;
+
+  // Verify output
+  TEST_EQUAL(outData, inData);
+
+  // Test terse output
+  QString terseData;
+  QTextStream terse(&terseData);
+  vvKstWriter terseWriter(terse, false);
+  terseWriter << info;
+
+  qtKstReader terseKst(terseData);
+  vvKstReader terseReader;
+  TEST(terseKst.isValid());
+  TEST(terseReader.readEventSetInfo(terseKst, info,
+                                    vvKstWriter::EventSetInfoVersion));
+
+  // Verify event set info
+  TEST_CALL(testEventSetInfo, info);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  qtTest testObject;
+
+  if (argc < 2)
+    {
+    testObject.out() << "invocation error, path to test data files required\n";
+    return 1;
+    }
+  testFileBase = QString::fromLocal8Bit(argv[1]);
+
+  testObject.runSuite("Track Tests",                testTrack);
+  testObject.runSuite("Descriptor Tests",           testDescriptor);
+  testObject.runSuite("Query Plan Tests",           testQueryPlan);
+  testObject.runSuite("Query Result Tests",         testQueryResult);
+  testObject.runSuite("Geospatial Polygon Tests",   testGeoPoly);
+  testObject.runSuite("Event Set Info Tests",       testEventSetInfo);
+  return testObject.result();
+}
diff --git a/Libraries/VvIO/Testing/TestReadWrite.cxx b/Libraries/VvIO/Testing/TestReadWrite.cxx
new file mode 100644
index 00000000..a3648172
--- /dev/null
+++ b/Libraries/VvIO/Testing/TestReadWrite.cxx
@@ -0,0 +1,413 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtTest.h>
+
+#include <vvQueryResult.h>
+
+#include "../vvEventSetInfo.h"
+#include "../vvQueryInstance.h"
+
+#include "TestReadWrite.h"
+
+//-----------------------------------------------------------------------------
+template <typename T> static
+const T* data(const std::vector<T>& vector)
+{
+#ifdef __GLIBCXX__
+  // std::vector from gcc libstdc++ has ::data()
+  return vector.data();
+#else
+  // std::vector from MSVC does not have ::data(), so we must fake it
+  return (vector.empty() ? 0 : &vector[0]);
+#endif
+}
+
+//-----------------------------------------------------------------------------
+void testRegion(qtTest& testObject, const vvDescriptorRegionEntry& region,
+                unsigned int frameNumber, double time,
+                int tlY, int tlX, int brY, int brX)
+{
+  TEST_EQUAL(region.TimeStamp.FrameNumber, frameNumber);
+  TEST_EQUAL(region.TimeStamp.Time, time);
+  TEST_EQUAL(region.ImageRegion.TopLeft.X, tlX);
+  TEST_EQUAL(region.ImageRegion.TopLeft.Y, tlY);
+  TEST_EQUAL(region.ImageRegion.BottomRight.X, brX);
+  TEST_EQUAL(region.ImageRegion.BottomRight.Y, brY);
+}
+
+//-----------------------------------------------------------------------------
+void testTrackState(qtTest& testObject, const vvTrackState& state,
+                    unsigned int frameNumber, double time,
+                    bool expectObjectAndLocation)
+{
+  TEST_EQUAL(state.TimeStamp.FrameNumber, frameNumber);
+  TEST_EQUAL(state.TimeStamp.Time, time);
+  TEST_EQUAL(state.ImagePoint.X, 434.5);
+  TEST_EQUAL(state.ImagePoint.Y, 241.0);
+  TEST_EQUAL(state.ImageBox.TopLeft.X, 428);
+  TEST_EQUAL(state.ImageBox.TopLeft.Y, 231);
+  TEST_EQUAL(state.ImageBox.BottomRight.X, 441);
+  TEST_EQUAL(state.ImageBox.BottomRight.Y, 241);
+  if (expectObjectAndLocation)
+    {
+    if (TEST_EQUAL(state.ImageObject.size(), size_t(4)) == 0)
+      {
+      TEST_EQUAL(state.ImageObject[0].X, 428);
+      TEST_EQUAL(state.ImageObject[0].Y, 231);
+      TEST_EQUAL(state.ImageObject[1].X, 441);
+      TEST_EQUAL(state.ImageObject[1].Y, 231);
+      TEST_EQUAL(state.ImageObject[2].X, 441);
+      TEST_EQUAL(state.ImageObject[2].Y, 241);
+      TEST_EQUAL(state.ImageObject[3].X, 428);
+      TEST_EQUAL(state.ImageObject[3].Y, 241);
+      }
+    TEST_EQUAL(state.WorldLocation.GCS, 4269);
+    TEST_EQUAL(state.WorldLocation.Latitude, 38.2117);
+    TEST_EQUAL(state.WorldLocation.Longitude, -81.481);
+    }
+  else
+    {
+    TEST_EQUAL(state.ImageObject.size(), size_t(0));
+    TEST_EQUAL(state.WorldLocation.GCS, -1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testTrack1(qtTest& testObject, const vvTrack& track)
+{
+  TEST_EQUAL(track.Id.Source, 0);
+  TEST_EQUAL(track.Id.SerialNumber, 1LL);
+  if (TEST_EQUAL(track.Classification.size(), size_t(2)) == 0)
+    {
+    typedef vvTrackObjectClassification::const_iterator TocIterator;
+    TocIterator iter, notFound = track.Classification.end();
+
+    TEST((iter = track.Classification.find("Person")) != notFound);
+    (iter != notFound) && TEST_EQUAL(iter->second, 0.8);
+    TEST((iter = track.Classification.find("Vehicle")) != notFound);
+    (iter != notFound) && TEST_EQUAL(iter->second, 0.2);
+    }
+  if (TEST_EQUAL(track.Trajectory.size(), size_t(1)) == 0)
+    {
+    vvTrackTrajectory::const_iterator i = track.Trajectory.begin();
+    TEST_CALL(testTrackState, *(i++), 26, 1222116851008654, true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testTrack2(qtTest& testObject, const vvTrack& track)
+{
+  TEST_EQUAL(track.Id.Source, 0);
+  TEST_EQUAL(track.Id.SerialNumber, 2LL);
+  if (TEST_EQUAL(track.Classification.size(), size_t(3)) == 0)
+    {
+    typedef vvTrackObjectClassification::const_iterator TocIterator;
+    TocIterator iter, notFound = track.Classification.end();
+
+    TEST((iter = track.Classification.find("Person")) != notFound);
+    (iter != notFound) && TEST_EQUAL(iter->second, 0.6);
+    TEST((iter = track.Classification.find("Vehicle")) != notFound);
+    (iter != notFound) && TEST_EQUAL(iter->second, 0.3);
+    TEST((iter = track.Classification.find("Other")) != notFound);
+    (iter != notFound) && TEST_EQUAL(iter->second, 0.1);
+    }
+  if (TEST_EQUAL(track.Trajectory.size(), size_t(2)) == 0)
+    {
+    vvTrackTrajectory::const_iterator i = track.Trajectory.begin();
+    TEST_CALL(testTrackState, *(i++), 30, 1222116851409054, true);
+    TEST_CALL(testTrackState, *(i++), 31, 1222116851509154, true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testTrack3(qtTest& testObject, const vvTrack& track)
+{
+  TEST_EQUAL(track.Id.Source, 0);
+  TEST_EQUAL(track.Id.SerialNumber, 1LL);
+  TEST_EQUAL(track.Classification.size(), size_t(0));
+  if (TEST_EQUAL(track.Trajectory.size(), size_t(1)) == 0)
+    {
+    vvTrackTrajectory::const_iterator i = track.Trajectory.begin();
+    TEST_CALL(testTrackState, *(i++), 26, 1222116851008654, false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testDescriptor1(qtTest& testObject, const vvDescriptor& descriptor)
+{
+  TEST_EQUAL(descriptor.DescriptorName, std::string("TEST1"));
+  TEST_EQUAL(descriptor.ModuleName, std::string("sample"));
+  TEST_EQUAL(descriptor.InstanceId, 0LL);
+  TEST_EQUAL(descriptor.Confidence, 0.3);
+  if (TEST_EQUAL(descriptor.Values.size(), size_t(2)) == 0)
+    {
+    if (TEST_EQUAL(descriptor.Values[0].size(), size_t(2)) == 0)
+      {
+      TEST_EQUAL(descriptor.Values[0][0], 1.0f);
+      TEST_EQUAL(descriptor.Values[0][1], 42.0f);
+      }
+    if (TEST_EQUAL(descriptor.Values[1].size(), size_t(1)) == 0)
+      {
+      TEST_EQUAL(descriptor.Values[1][0], 3.1416f);
+      }
+    }
+  if (TEST_EQUAL(descriptor.Region.size(), size_t(3)) == 0)
+    {
+    vvDescriptorRegionMap::const_iterator i = descriptor.Region.begin();
+    TEST_CALL(testRegion, *(i++), 13, 1302035289300000, 230, 430, 240, 440);
+    TEST_CALL(testRegion, *(i++), 14, 1302035289400000, 230, 430, 240, 440);
+    TEST_CALL(testRegion, *(i++), 15, 1302035289500000, 230, 430, 240, 440);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testDescriptor2(qtTest& testObject, const vvDescriptor& descriptor)
+{
+  TEST_EQUAL(descriptor.DescriptorName, std::string("TEST2"));
+  TEST_EQUAL(descriptor.ModuleName, std::string("sample"));
+  TEST_EQUAL(descriptor.InstanceId, 1LL);
+  TEST_EQUAL(descriptor.Confidence, 0.1);
+  if (TEST_EQUAL(descriptor.Values.size(), size_t(1)) == 0)
+    {
+    if (TEST_EQUAL(descriptor.Values[0].size(), size_t(3)) == 0)
+      {
+      TEST_EQUAL(descriptor.Values[0][0], 2.0f);
+      TEST_EQUAL(descriptor.Values[0][1], 37.0f);
+      TEST_EQUAL(descriptor.Values[0][2], 2.71828f);
+      }
+    }
+  if (TEST_EQUAL(descriptor.Region.size(), size_t(5)) == 0)
+    {
+    vvDescriptorRegionMap::const_iterator i = descriptor.Region.begin();
+    TEST_CALL(testRegion, *(i++), 27, 1302035290700000, 110, 350, 120, 360);
+    TEST_CALL(testRegion, *(i++), 28, 1302035290800000, 110, 350, 120, 360);
+    TEST_CALL(testRegion, *(i++), 29, 1302035290900000, 110, 350, 120, 360);
+    TEST_CALL(testRegion, *(i++), 30, 1302035291000000, 110, 350, 120, 360);
+    TEST_CALL(testRegion, *(i++), 31, 1302035291100000, 110, 350, 120, 360);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testDescriptor3(qtTest& testObject, const vvDescriptor& descriptor)
+{
+  TEST_EQUAL(descriptor.DescriptorName, std::string("TEST3"));
+  TEST_EQUAL(descriptor.ModuleName, std::string("sample"));
+  TEST_EQUAL(descriptor.InstanceId, 2LL);
+  TEST_EQUAL(descriptor.Confidence, 0.7);
+  if (TEST_EQUAL(descriptor.Values.size(), size_t(3)) == 0)
+    {
+    if (TEST_EQUAL(descriptor.Values[0].size(), size_t(1)) == 0)
+      {
+      TEST_EQUAL(descriptor.Values[0][0], 3.0f);
+      }
+    if (TEST_EQUAL(descriptor.Values[1].size(), size_t(2)) == 0)
+      {
+      TEST_EQUAL(descriptor.Values[1][0], 1.618f);
+      TEST_EQUAL(descriptor.Values[1][1], 9.80665f);
+      }
+    if (TEST_EQUAL(descriptor.Values[2].size(), size_t(2)) == 0)
+      {
+      TEST_EQUAL(descriptor.Values[2][0], 49.0f);
+      TEST_EQUAL(descriptor.Values[2][1], 12.0f);
+      }
+    }
+  if (TEST_EQUAL(descriptor.Region.size(), size_t(2)) == 0)
+    {
+    vvDescriptorRegionMap::const_iterator i = descriptor.Region.begin();
+    TEST_CALL(testRegion, *(i++), 63, 1302035294300000, 460, 180, 470, 190);
+    TEST_CALL(testRegion, *(i++), 64, 1302035294400000, 460, 180, 470, 190);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testGeoPoly1(qtTest& testObject, const vgGeocodedPoly& geoPoly)
+{
+  TEST_EQUAL(geoPoly.GCS, 4269);
+  if (TEST_EQUAL(geoPoly.Coordinate.size(), size_t(4)) == 0)
+    {
+    TEST_EQUAL(geoPoly.Coordinate[0].Latitude, 38.2);
+    TEST_EQUAL(geoPoly.Coordinate[1].Latitude, 38.3);
+    TEST_EQUAL(geoPoly.Coordinate[2].Latitude, 38.3);
+    TEST_EQUAL(geoPoly.Coordinate[3].Latitude, 38.2);
+    TEST_EQUAL(geoPoly.Coordinate[0].Longitude, -81.4);
+    TEST_EQUAL(geoPoly.Coordinate[1].Longitude, -81.4);
+    TEST_EQUAL(geoPoly.Coordinate[2].Longitude, -81.6);
+    TEST_EQUAL(geoPoly.Coordinate[3].Longitude, -81.6);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testGeoPoly2(qtTest& testObject, const vgGeocodedPoly& geoPoly)
+{
+  TEST_EQUAL(geoPoly.GCS, -1);
+  TEST_EQUAL(geoPoly.Coordinate.size(), size_t(0));
+}
+
+//-----------------------------------------------------------------------------
+void testGeoPoly3(qtTest& testObject, const vgGeocodedPoly& geoPoly)
+{
+  TEST_EQUAL(geoPoly.GCS, 4269);
+  if (TEST_EQUAL(geoPoly.Coordinate.size(), size_t(4)) == 0)
+    {
+    TEST_EQUAL(geoPoly.Coordinate[0].Latitude, 42.8);
+    TEST_EQUAL(geoPoly.Coordinate[1].Latitude, 42.9);
+    TEST_EQUAL(geoPoly.Coordinate[2].Latitude, 42.9);
+    TEST_EQUAL(geoPoly.Coordinate[3].Latitude, 42.8);
+    TEST_EQUAL(geoPoly.Coordinate[0].Longitude, -73.7);
+    TEST_EQUAL(geoPoly.Coordinate[1].Longitude, -73.7);
+    TEST_EQUAL(geoPoly.Coordinate[2].Longitude, -73.8);
+    TEST_EQUAL(geoPoly.Coordinate[3].Longitude, -73.8);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testQueryPlan1(qtTest& testObject, const vvQueryInstance& qi)
+{
+  if (TEST(qi.isSimilarityQuery()) != 0)
+    return;
+
+  const vvSimilarityQuery& query = *qi.constSimilarityQuery();
+  TEST_EQUAL(query.QueryId, std::string("QUERY-EXAMPLE-12345"));
+  TEST_EQUAL(query.StreamIdLimit,
+             std::string("file:///example/path/to/video.mpg"));
+  if (TEST_EQUAL(query.Descriptors.size(), size_t(2)) == 0)
+    {
+    TEST_CALL(testDescriptor1, query.Descriptors[0]);
+    TEST_CALL(testDescriptor2, query.Descriptors[1]);
+    }
+  if (TEST_EQUAL(query.Tracks.size(), size_t(1)) == 0)
+    {
+    TEST_CALL(testTrack1, query.Tracks[0]);
+    }
+  TEST_EQUAL(query.TemporalLowerLimit, -1LL);
+  TEST_EQUAL(query.TemporalUpperLimit, -1LL);
+  TEST_EQUAL(query.TemporalFilter, vvDatabaseQuery::Ignore);
+  TEST_CALL(testGeoPoly2, query.SpatialLimit);
+  TEST_EQUAL(query.SpatialFilter, vvDatabaseQuery::Ignore);
+  TEST_EQUAL(query.SimilarityThreshold, 0.1);
+
+  const char* rawModel =
+    reinterpret_cast<const char*>(data(query.IqrModel));
+  const int modelSize = static_cast<int>(query.IqrModel.size());
+
+  const QByteArray expected = QByteArray("Hello, world!").toBase64();
+  const QByteArray actual = QByteArray::fromRawData(rawModel, modelSize);
+
+  TEST_EQUAL(actual.toBase64(), expected);
+}
+
+//-----------------------------------------------------------------------------
+void testQueryPlan2(qtTest& testObject, const vvQueryInstance& qi)
+{
+  if (TEST(qi.isSimilarityQuery()) != 0)
+    return;
+
+  const vvSimilarityQuery& query = *qi.constSimilarityQuery();
+  TEST_EQUAL(query.QueryId, std::string("QUERY-EXAMPLE-9876"));
+  TEST_EQUAL(query.StreamIdLimit, std::string());
+  if (TEST_EQUAL(query.Descriptors.size(), size_t(1)) == 0)
+    {
+    TEST_CALL(testDescriptor3, query.Descriptors[0]);
+    }
+  TEST_EQUAL(query.TemporalLowerLimit, 1302213938000000LL);
+  TEST_EQUAL(query.TemporalUpperLimit, 1302215277000000LL);
+  TEST_EQUAL(query.TemporalFilter, vvDatabaseQuery::ContainsAny);
+  TEST_CALL(testGeoPoly1, query.SpatialLimit);
+  TEST_EQUAL(query.SpatialFilter, vvDatabaseQuery::ContainsAny);
+  TEST_EQUAL(query.SimilarityThreshold, 0.0);
+}
+
+//-----------------------------------------------------------------------------
+void testQueryPlan3(qtTest& testObject, const vvQueryInstance& qi)
+{
+  if (TEST(qi.isRetrievalQuery()) != 0)
+    {
+    return;
+    }
+
+  const vvRetrievalQuery& query = *qi.constRetrievalQuery();
+  TEST_EQUAL(query.QueryId, std::string("QUERY-EXAMPLE-24680"));
+  TEST_EQUAL(query.StreamIdLimit, std::string());
+  TEST_EQUAL(query.RequestedEntities, vvRetrievalQuery::Tracks);
+  TEST_EQUAL(query.TemporalLowerLimit, 1313790109000000LL);
+  TEST_EQUAL(query.TemporalUpperLimit, 1313847211000000LL);
+  TEST_EQUAL(query.TemporalFilter, vvDatabaseQuery::ContainsWholly);
+  TEST_CALL(testGeoPoly3, query.SpatialLimit);
+  TEST_EQUAL(query.SpatialFilter, vvDatabaseQuery::Intersects);
+}
+
+//-----------------------------------------------------------------------------
+void testQueryResult1(qtTest& testObject, const vvQueryResult& result,
+                      unsigned int version)
+{
+  TEST_EQUAL(result.MissionId, std::string("MISSION-6734"));
+  TEST_EQUAL(result.QueryId, std::string("QUERY-EXAMPLE-2298537"));
+  TEST_EQUAL(result.StreamId, std::string("INGEST-769235514"));
+  TEST_EQUAL(result.InstanceId, 0LL);
+  TEST_EQUAL(result.StartTime, 1302035289300000LL);
+  TEST_EQUAL(result.EndTime, 1302035291100000LL);
+  TEST_EQUAL(result.Location.GCS, 4326);
+  TEST_EQUAL(result.Location.Latitude, 38.27);
+  TEST_EQUAL(result.Location.Longitude, -81.51);
+  TEST_EQUAL(result.Rank, 0LL);
+  TEST_EQUAL(result.RelevancyScore, 0.6);
+  TEST_EQUAL(result.UserScore, vvIqr::UnclassifiedExample);
+  if (TEST_EQUAL(result.Descriptors.size(), size_t(2)) == 0)
+    {
+    TEST_CALL(testDescriptor1, result.Descriptors[0]);
+    TEST_CALL(testDescriptor2, result.Descriptors[1]);
+    }
+  if (version > 1)
+    {
+    TEST_EQUAL(result.Tracks.size(), size_t(0));
+    TEST_EQUAL(result.UserData.Flags.testFlag(vvUserData::Starred), true);
+    TEST_EQUAL(result.UserData.Notes,
+               std::string("This result is fascinating!"));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testQueryResult2(qtTest& testObject, const vvQueryResult& result,
+                      unsigned int version)
+{
+  TEST_EQUAL(result.MissionId, std::string("MISSION-6734"));
+  TEST_EQUAL(result.QueryId, std::string("QUERY-EXAMPLE-2298537"));
+  TEST_EQUAL(result.StreamId, std::string("INGEST-769235514"));
+  TEST_EQUAL(result.InstanceId, 1LL);
+  TEST_EQUAL(result.StartTime, 1302035294300000LL);
+  TEST_EQUAL(result.EndTime, 1302035294400000LL);
+  TEST_EQUAL(result.Location.GCS, 4326);
+  TEST_EQUAL(result.Location.Latitude, 38.23);
+  TEST_EQUAL(result.Location.Longitude, -81.42);
+  TEST_EQUAL(result.Rank, 1LL);
+  TEST_EQUAL(result.RelevancyScore, 0.4);
+  TEST_EQUAL(result.UserScore, vvIqr::PositiveExample);
+  if (TEST_EQUAL(result.Descriptors.size(), size_t(1)) == 0)
+    {
+    TEST_CALL(testDescriptor3, result.Descriptors[0]);
+    }
+  if (version > 1)
+    {
+    if (TEST_EQUAL(result.Tracks.size(), size_t(2)) == 0)
+      {
+      TEST_CALL(testTrack1, result.Tracks[0]);
+      TEST_CALL(testTrack2, result.Tracks[1]);
+      }
+    TEST_EQUAL(result.UserData.Flags.testFlag(vvUserData::Starred), false);
+    TEST_EQUAL(result.UserData.Notes, std::string(""));
+    }
+}
+
+//-----------------------------------------------------------------------------
+void testEventSetInfo(qtTest& testObject, const vvEventSetInfo& info)
+{
+  TEST_EQUAL(info.Name, QString("Example"));
+  TEST_EQUAL(info.PenColor, QColor(Qt::red));
+  TEST_EQUAL(info.ForegroundColor, QColor(Qt::white));
+  TEST_EQUAL(info.BackgroundColor, QColor::fromRgb(0, 0, 255, 128));
+  TEST_EQUAL(info.DisplayThreshold, 0.1);
+}
diff --git a/Libraries/VvIO/Testing/TestReadWrite.h b/Libraries/VvIO/Testing/TestReadWrite.h
new file mode 100644
index 00000000..19b08dee
--- /dev/null
+++ b/Libraries/VvIO/Testing/TestReadWrite.h
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+class qtTest;
+
+struct vvDescriptor;
+struct vgGeocodedPoly;
+struct vvQueryResult;
+struct vvTrack;
+
+class vvQueryInstance;
+
+extern void testTrack1(qtTest&, const vvTrack&);
+extern void testTrack2(qtTest&, const vvTrack&);
+extern void testTrack3(qtTest&, const vvTrack&);
+extern void testDescriptor1(qtTest&, const vvDescriptor&);
+extern void testDescriptor2(qtTest&, const vvDescriptor&);
+extern void testDescriptor3(qtTest&, const vvDescriptor&);
+extern void testGeoPoly1(qtTest&, const vgGeocodedPoly&);
+extern void testGeoPoly2(qtTest&, const vgGeocodedPoly&);
+extern void testGeoPoly3(qtTest&, const vgGeocodedPoly&);
+extern void testQueryPlan1(qtTest&, const vvQueryInstance&);
+extern void testQueryPlan2(qtTest&, const vvQueryInstance&);
+extern void testQueryPlan3(qtTest&, const vvQueryInstance&);
+extern void testQueryResult1(qtTest&, const vvQueryResult&, unsigned int);
+extern void testQueryResult2(qtTest&, const vvQueryResult&, unsigned int);
+extern void testEventSetInfo(qtTest&, const vvEventSetInfo&);
diff --git a/Libraries/VvIO/Testing/TestVvRead.cxx b/Libraries/VvIO/Testing/TestVvRead.cxx
new file mode 100644
index 00000000..41a03f15
--- /dev/null
+++ b/Libraries/VvIO/Testing/TestVvRead.cxx
@@ -0,0 +1,85 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QDebug>
+#include <QUrl>
+
+#include <qtCliArgs.h>
+
+#include <vvQueryResult.h>
+
+#include "../vvEventSetInfo.h"
+#include "../vvHeader.h"
+#include "../vvReader.h"
+
+#define die(_msg) do { \
+  qWarning() << "error parsing input file" << fileName << '-' << _msg; \
+  return 1; \
+  } while (0)
+
+#define test_or_die(_expr, _msg) \
+  if (!(_expr)) die(_msg)
+
+//-----------------------------------------------------------------------------
+int testRead(const QString& fileName)
+{
+  vvReader reader;
+  vvHeader header;
+
+  if (!reader.open(QUrl::fromLocalFile(fileName)))
+    {
+    qWarning() << "unable to open input file" << fileName;
+    return 1;
+    }
+
+  while (!reader.atEnd())
+    {
+    test_or_die(reader.readHeader(header), "unable to read header");
+
+    switch (header.type)
+      {
+      case vvHeader::EventSetInfo:
+        {
+        vvEventSetInfo info;
+        test_or_die(reader.readEventSetInfo(info),
+                    "unable to read event set info");
+        qDebug() << "read an event set info";
+        } break;
+      case vvHeader::QueryResults:
+        {
+        QList<vvQueryResult> results;
+        test_or_die(reader.readQueryResults(results),
+                    "unable to read query results");
+        qDebug() << "read" << results.count() << "results";
+        } break;
+      default:
+        die("data format not supported");
+      }
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char* argv[])
+{
+  qtCliArgs args(argc, argv);
+
+  qtCliOptions nargs;
+  nargs.add("file", "KST file(s) to read", qtCliOption::NamedList);
+
+  args.addNamedArguments(nargs);
+
+  args.parseOrDie();
+
+  int result = 0;
+  foreach (const QString& fileName, args.values("file"))
+    {
+    result |= testRead(fileName);
+    }
+
+  return result;
+}
diff --git a/Libraries/VvIO/Testing/TestXmlReadWrite.cxx b/Libraries/VvIO/Testing/TestXmlReadWrite.cxx
new file mode 100644
index 00000000..99ac76a1
--- /dev/null
+++ b/Libraries/VvIO/Testing/TestXmlReadWrite.cxx
@@ -0,0 +1,359 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QUrl>
+
+#include <qtTest.h>
+
+#include "../vvReader.h"
+#include "../vvXmlWriter.h"
+
+#include "TestReadWrite.h"
+
+QString testFileBase;
+
+//-----------------------------------------------------------------------------
+int testTrack(qtTest& testObject)
+{
+  QFile fileA(testFileBase + "-a.vst.xml");
+  if (!fileA.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file A\n";
+    return 1;
+    }
+  QString inDataA = QString::fromUtf8(fileA.readAll());
+
+  QFile fileB(testFileBase + "-b.vst.xml");
+  if (!fileB.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file B\n";
+    return 1;
+    }
+  QString inDataB = QString::fromUtf8(fileB.readAll());
+
+  // Read first header
+  vvReader reader;
+  vvHeader header;
+  TEST(reader.setInput(inDataA));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::Tracks);
+
+  // Read tracks
+  QList<vvTrack> tracks;
+  TEST(reader.readTracks(tracks));
+  if (TEST_EQUAL(tracks.count(), 2) == 0)
+    {
+    // Verify tracks
+    TEST_CALL(testTrack1, tracks[0]);
+    TEST_CALL(testTrack2, tracks[1]);
+    }
+
+  // Write tracks
+  QString outDataA;
+  QTextStream outA(&outDataA);
+  vvWriter(outA, vvWriter::Xml) << tracks;
+
+  // Verify output
+  TEST_EQUAL(outDataA, inDataA);
+
+  // Read second header
+  TEST(reader.setInput(inDataB));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::Tracks);
+
+  // Read track
+  TEST(reader.readTracks(tracks));
+  if (TEST_EQUAL(tracks.count(), 1) == 0)
+    {
+    // Verify track
+    TEST_CALL(testTrack3, tracks[0]);
+    }
+
+  // Write track
+  QString outDataB;
+  QTextStream outB(&outDataB);
+  vvWriter(outB, vvWriter::Xml) << tracks;
+
+  // Verify output
+  TEST_EQUAL(outDataB, inDataB);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testDescriptor(qtTest& testObject)
+{
+  QFile file(testFileBase + ".vsd.xml");
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file\n";
+    return 1;
+    }
+  QString inData = QString::fromUtf8(file.readAll());
+
+  // Read header
+  vvReader reader;
+  vvHeader header;
+  TEST(reader.setInput(inData));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::Descriptors);
+
+  // Read descriptors
+  QList<vvDescriptor> descriptors;
+  TEST(reader.readDescriptors(descriptors));
+  if (TEST_EQUAL(descriptors.count(), 3) == 0)
+    {
+    // Verify descriptors
+    TEST_CALL(testDescriptor1, descriptors[0]);
+    TEST_CALL(testDescriptor2, descriptors[1]);
+    TEST_CALL(testDescriptor3, descriptors[2]);
+    }
+
+  // Write descriptors
+  QString outData;
+  QTextStream out(&outData);
+  vvWriter(out, vvWriter::Xml) << descriptors;
+
+  // Verify output
+  TEST_EQUAL(outData, inData);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testQueryPlan(qtTest& testObject)
+{
+  QFile fileA(testFileBase + "-a.vqp.xml");
+  if (!fileA.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file A\n";
+    return 1;
+    }
+  QString inDataA = QString::fromUtf8(fileA.readAll());
+
+  QFile fileB(testFileBase + "-b.vqp.xml");
+  if (!fileB.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file B(in)\n";
+    return 1;
+    }
+  QString inDataB = QString::fromUtf8(fileB.readAll());
+
+  QFile fileC(testFileBase + "-c.vqp.xml");
+  if (!fileC.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file C\n";
+    return 1;
+    }
+  QString inDataC = QString::fromUtf8(fileC.readAll());
+
+  vvReader reader;
+  vvHeader header;
+  vvQueryInstance query;
+
+  // Read first header
+  TEST(reader.setInput(inDataA));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryPlan);
+
+  // Read and verify first plan
+  TEST(reader.readQueryPlan(query));
+  TEST_CALL(testQueryPlan1, query);
+
+  // Write first plan
+  QString outDataA;
+  QTextStream outA(&outDataA);
+  vvWriter(outA, vvWriter::Xml) << query;
+
+  // Verify output
+  TEST_EQUAL(outDataA, inDataA);
+
+  // Read second header
+  TEST(reader.setInput(inDataB));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryPlan);
+
+  // Read and verify second plan
+  TEST(reader.readQueryPlan(query));
+  TEST_CALL(testQueryPlan2, query);
+
+  // Write second plan
+  QString outDataB;
+  QTextStream outB(&outDataB);
+  vvWriter(outB, vvWriter::Xml) << query;
+
+  // Verify output
+  TEST_EQUAL(outDataB, inDataB);
+
+  // Read third header
+  TEST(reader.setInput(inDataC));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryPlan);
+
+  // Read and verify third plan
+  TEST(reader.readQueryPlan(query));
+  TEST_CALL(testQueryPlan3, query);
+
+  // Write third plan
+  QString outDataC;
+  QTextStream outC(&outDataC);
+  vvWriter(outC, vvWriter::Xml) << query;
+
+  // Verify output
+  TEST_EQUAL(outDataC, inDataC);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testQueryResult(qtTest& testObject)
+{
+  QFile file(testFileBase + ".vqr.xml");
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file\n";
+    return 1;
+    }
+  QString inData = QString::fromUtf8(file.readAll());
+
+  // Read header
+  vvReader reader;
+  vvHeader header;
+  TEST(reader.setInput(inData));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::QueryResults);
+
+  // Read results
+  QList<vvQueryResult> results;
+  TEST(reader.readQueryResults(results));
+  if (TEST_EQUAL(results.count(), 2) == 0)
+    {
+    // Verify results
+    TEST_CALL(testQueryResult1, results[0], static_cast<uint>(-1));
+    TEST_CALL(testQueryResult2, results[1], static_cast<uint>(-1));
+    }
+
+  // Write results
+  QString outData;
+  QTextStream out(&outData);
+  vvWriter(out, vvWriter::Xml) << results;
+
+  // Verify output
+  TEST_EQUAL(outData, inData);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testGeoPoly(qtTest& testObject)
+{
+  QFile fileA(testFileBase + "-a.vgp.xml");
+  if (!fileA.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file A\n";
+    return 1;
+    }
+  QString inDataA = QString::fromUtf8(fileA.readAll());
+
+  QFile fileB(testFileBase + "-b.vgp.xml");
+  if (!fileB.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file B\n";
+    return 1;
+    }
+  QString inDataB = QString::fromUtf8(fileB.readAll());
+
+  // Read first polygon
+  vvReader reader;
+  vgGeocodedPoly geoPoly;
+  TEST(reader.setInput(inDataA));
+  TEST(reader.readGeoPoly(geoPoly));
+
+  // Verify polygon
+  TEST_CALL(testGeoPoly1, geoPoly);
+
+  // Write first polygon
+  QString outDataA;
+  QTextStream outA(&outDataA);
+  vvWriter(outA, vvWriter::Xml) << geoPoly;
+
+  // Verify output
+  TEST_EQUAL(outDataA, inDataA);
+
+  // Read second polygon
+  TEST(reader.setInput(inDataB));
+  TEST(reader.readGeoPoly(geoPoly));
+
+  // Verify polygon
+  TEST_CALL(testGeoPoly2, geoPoly);
+
+  // Write second polygon
+  QString outDataB;
+  QTextStream outB(&outDataB);
+  vvWriter(outB, vvWriter::Xml) << geoPoly;
+
+  // Verify output
+  TEST_EQUAL(outDataB, inDataB);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int testEventSetInfo(qtTest& testObject)
+{
+  QFile file(testFileBase + ".vem.xml");
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    testObject.out() << "unable to open test file\n";
+    return 1;
+    }
+  QString inData = QString::fromUtf8(file.readAll());
+
+  // Read header
+  vvReader reader;
+  vvHeader header;
+  TEST(reader.setInput(inData));
+  TEST(reader.readHeader(header));
+  TEST_EQUAL(header.type, vvHeader::EventSetInfo);
+
+  // Read event set info
+  vvEventSetInfo info;
+  TEST(reader.readEventSetInfo(info));
+
+  // Verify event set info
+  TEST_CALL(testEventSetInfo, info);
+
+  // Write event set info
+  QString outData;
+  QTextStream out(&outData);
+  vvWriter(out, vvWriter::Xml) << info;
+
+  // Verify output
+  TEST_EQUAL(outData, inData);
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, const char* argv[])
+{
+  qtTest testObject;
+
+  if (argc < 2)
+    {
+    testObject.out() << "invocation error, path to test data files required\n";
+    return 1;
+    }
+  testFileBase = QString::fromLocal8Bit(argv[1]);
+
+  testObject.runSuite("Track Tests",                testTrack);
+  testObject.runSuite("Descriptor Tests",           testDescriptor);
+  testObject.runSuite("Query Plan Tests",           testQueryPlan);
+  testObject.runSuite("Query Result Tests",         testQueryResult);
+  testObject.runSuite("Geospatial Polygon Tests",   testGeoPoly);
+  testObject.runSuite("Event Set Info Tests",       testEventSetInfo);
+  return testObject.result();
+}
diff --git a/Libraries/VvIO/Testing/rw-1.vqr b/Libraries/VvIO/Testing/rw-1.vqr
new file mode 100644
index 00000000..6d6bde67
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-1.vqr
@@ -0,0 +1,40 @@
+RESULTS, 1;
+# Mission ID, Query ID, Stream ID, Instance ID, Start time, End time,
+# GCS, Location, Relevancy score, User score, Descriptors
+#  Descriptor name, Module name, Instance ID, Confidence, Values, Region, Track ID's
+#   Frame Number, Time, Image Region { { Top, Left }, { Bottom, Right } }
+#   Source, Serial Number
+"MISSION-6734", "QUERY-EXAMPLE-2298537",
+  "INGEST-769235514",
+  0, 1302035289300000, 1302035291100000,
+  4326, -81.51, 38.27, 0.6, 2,
+  [
+    [ "TEST1", "sample", 0, 0.3,
+      [ [ 1, 42 ],
+        [ 3.1416 ] ],
+      [ [ 13, 1302035289300000, [ [ 230, 430 ], [ 240, 440 ] ] ],
+        [ 14, 1302035289400000, [ [ 230, 430 ], [ 240, 440 ] ] ],
+        [ 15, 1302035289500000, [ [ 230, 430 ], [ 240, 440 ] ] ] ],
+      [ [ 0, 1 ], [ 0, 2 ] ] ],
+    [ "TEST2", "sample", 1, 0.1,
+      [ [ 2, 37, 2.71828 ] ],
+      [ [ 27, 1302035290700000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+        [ 28, 1302035290800000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+        [ 29, 1302035290900000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+        [ 30, 1302035291000000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+        [ 31, 1302035291100000, [ [ 110, 350 ], [ 120, 360 ] ] ] ],
+      [ [ 0, 1 ], [ 0, 2 ] ] ]
+    ];
+"MISSION-6734", "QUERY-EXAMPLE-2298537",
+  "INGEST-769235514",
+  1, 1302035294300000, 1302035294400000,
+  4326, -81.42, 38.23, 0.4, 0,
+  [
+    [ "TEST3", "sample", 2, 0.7,
+      [ [ 3 ],
+        [ 1.618, 9.80665 ],
+        [ 49, 12 ] ],
+      [ [ 63, 1302035294300000, [ [ 460, 180 ], [ 470, 190 ] ] ],
+        [ 64, 1302035294400000, [ [ 460, 180 ], [ 470, 190 ] ] ] ],
+      [ [ 0, 1 ], [ 0, 2 ] ] ]
+    ];
diff --git a/Libraries/VvIO/Testing/rw-2.vqr b/Libraries/VvIO/Testing/rw-2.vqr
new file mode 100644
index 00000000..9fd59007
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-2.vqr
@@ -0,0 +1,61 @@
+RESULTS, 2;
+# Mission ID, Query ID, Stream ID, Instance ID, Start time, End time,
+# Location, Score, Descriptors, Tracks [, User Notes ]
+#  GCS, Easting, Northing
+#  Rank, Relevancy, User Classification, User Flags
+#  Descriptor name, Module name, Instance ID, Confidence, Values, Region, Track ID's
+#   Frame Number, Time, Image Region { { Top, Left }, { Bottom, Right } }
+#   Source, Serial Number
+"MISSION-6734", "QUERY-EXAMPLE-2298537",
+  "INGEST-769235514",
+  0, 1302035289300000, 1302035291100000,
+  [ 4326, -81.51, 38.27 ], [ 0, 0.6, 2, 1 ],
+  [
+    [ "TEST1", "sample", 0, 0.3,
+      [ [ 1, 42 ],
+        [ 3.1416 ] ],
+      [ [ 13, 1302035289300000, [ [ 230, 430 ], [ 240, 440 ] ] ],
+        [ 14, 1302035289400000, [ [ 230, 430 ], [ 240, 440 ] ] ],
+        [ 15, 1302035289500000, [ [ 230, 430 ], [ 240, 440 ] ] ] ],
+      [ [ 0, 1 ], [ 0, 2 ] ] ],
+    [ "TEST2", "sample", 1, 0.1,
+      [ [ 2, 37, 2.71828 ] ],
+      [ [ 27, 1302035290700000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+        [ 28, 1302035290800000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+        [ 29, 1302035290900000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+        [ 30, 1302035291000000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+        [ 31, 1302035291100000, [ [ 110, 350 ], [ 120, 360 ] ] ] ],
+      [ [ 0, 1 ], [ 0, 2 ] ] ]
+    ], [], "This result is fascinating!";
+"MISSION-6734", "QUERY-EXAMPLE-2298537",
+  "INGEST-769235514",
+  1, 1302035294300000, 1302035294400000,
+  [ 4326, -81.42, 38.23 ], [ 1, 0.4, 0, 0 ],
+  [
+    [ "TEST3", "sample", 2, 0.7,
+      [ [ 3 ],
+        [ 1.618, 9.80665 ],
+        [ 49, 12 ] ],
+      [ [ 63, 1302035294300000, [ [ 460, 180 ], [ 470, 190 ] ] ],
+        [ 64, 1302035294400000, [ [ 460, 180 ], [ 470, 190 ] ] ] ],
+      [ [ 0, 1 ], [ 0, 2 ] ] ]
+    ], [
+    [ [ 0, 1 ],
+      [ [ "Person", 0.8 ],
+        [ "Vehicle", 0.2 ] ],
+      [ [ 26, 1222116851008654, 434.5, 241, [ [ 231, 428 ], [ 241, 441 ] ],
+          [ [ 428, 231 ], [ 441, 231 ], [ 441, 241 ], [ 428, 241 ] ],
+          [ 4269, 38.2117, -81.481 ] ]
+        ] ],
+    [ [ 0, 2 ],
+      [ [ "Other", 0.1 ],
+        [ "Person", 0.6 ],
+        [ "Vehicle", 0.3 ] ],
+      [ [ 30, 1222116851409054, 434.5, 241, [ [ 231, 428 ], [ 241, 441 ] ],
+          [ [ 428, 231 ], [ 441, 231 ], [ 441, 241 ], [ 428, 241 ] ],
+          [ 4269, 38.2117, -81.481 ] ],
+        [ 31, 1222116851509154, 434.5, 241, [ [ 231, 428 ], [ 241, 441 ] ],
+          [ [ 428, 231 ], [ 441, 231 ], [ 441, 241 ], [ 428, 241 ] ],
+          [ 4269, 38.2117, -81.481 ] ]
+        ] ]
+    ];
diff --git a/Libraries/VvIO/Testing/rw-a.vgp b/Libraries/VvIO/Testing/rw-a.vgp
new file mode 100644
index 00000000..c75101e5
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-a.vgp
@@ -0,0 +1,6 @@
+0;
+[ 4269,
+  [ [ 38.2, -81.4 ],
+    [ 38.3, -81.4 ],
+    [ 38.3, -81.6 ],
+    [ 38.2, -81.6 ] ] ];
diff --git a/Libraries/VvIO/Testing/rw-a.vgp.xml b/Libraries/VvIO/Testing/rw-a.vgp.xml
new file mode 100644
index 00000000..673b0b40
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-a.vgp.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE VVXML>
+<xml>
+  <geo_poly gcs="4269">
+    <coordinate easting="-81.40000000000001" northing="38.2"/>
+    <coordinate easting="-81.40000000000001" northing="38.3"/>
+    <coordinate easting="-81.60000000000001" northing="38.3"/>
+    <coordinate easting="-81.60000000000001" northing="38.2"/>
+  </geo_poly>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw-a.vqp b/Libraries/VvIO/Testing/rw-a.vqp
new file mode 100644
index 00000000..cea4b7f4
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-a.vqp
@@ -0,0 +1,48 @@
+QUERY, 1;
+# Query Type
+# Query ID [, Stream ID Limit ]
+# Descriptors [, Tracks ] | Entity Type
+#  Descriptor name, Module name, Instance ID, Confidence, Values, Region, Track ID's
+#   Frame Number, Time, Image Region { { Top, Left }, { Bottom, Right } }
+#   Source, Serial Number
+#  Track ID, Classification Entries, Trajectory States
+#   Source, Serial Number
+#   Type, Probability
+#   Frame Number, Time, Image Point X, Image Point Y,
+#   Image Box, Image Object Points, World Location
+#    { Top, Left }, { Bottom, Right }
+#    X, Y
+#    [ GCS, Easting, Northing ]
+# { [ Temporal Lower, Temporal Upper [, Temporal Filter ] ] },
+# { [ GCS, Geospatial Limit Points [, Geospatial Filter ] ] }
+#   { Easting, Northing }
+# [ Similarity Threshold, [ IQR Model ] ]
+SIMILARITY;
+"QUERY-EXAMPLE-12345",
+  "file:///example/path/to/video.mpg";
+[
+  [ "TEST1", "sample", 0, 0.3,
+    [ [ 1, 42 ],
+      [ 3.1416 ] ],
+    [ [ 13, 1302035289300000, [ [ 230, 430 ], [ 240, 440 ] ] ],
+      [ 14, 1302035289400000, [ [ 230, 430 ], [ 240, 440 ] ] ],
+      [ 15, 1302035289500000, [ [ 230, 430 ], [ 240, 440 ] ] ] ],
+    [ [ 0, 1 ], [ 0, 2 ] ] ],
+  [ "TEST2", "sample", 1, 0.1,
+    [ [ 2, 37, 2.71828 ] ],
+    [ [ 27, 1302035290700000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+      [ 28, 1302035290800000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+      [ 29, 1302035290900000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+      [ 30, 1302035291000000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+      [ 31, 1302035291100000, [ [ 110, 350 ], [ 120, 360 ] ] ] ],
+    [ [ 0, 1 ], [ 0, 2 ] ] ] ],
+  [
+    [ [ 0, 1 ],
+      [ [ "Person", 0.8 ],
+        [ "Vehicle", 0.2 ] ],
+      [ [ 26, 1222116851008654, 434.5, 241, [ [ 231, 428 ], [ 241, 441 ] ],
+          [ [ 428, 231 ], [ 441, 231 ], [ 441, 241 ], [ 428, 241 ] ],
+          [ 4269, 38.2117, -81.481 ] ]
+        ] ] ];
+[], [];
+0.1, "SGVsbG8sIHdvcmxkIQ==";
diff --git a/Libraries/VvIO/Testing/rw-a.vqp.xml b/Libraries/VvIO/Testing/rw-a.vqp.xml
new file mode 100644
index 00000000..9afb1dff
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-a.vqp.xml
@@ -0,0 +1,46 @@
+<!DOCTYPE VVXML>
+<xml>
+  <query threshold="0.1" type="similarity" id="QUERY-EXAMPLE-12345">
+    <stream_limit value="file:///example/path/to/video.mpg"/>
+    <track source="0" serial_number="1">
+      <classification type="Person" value="0.8"/>
+      <classification type="Vehicle" value="0.2"/>
+      <trajectory_state x="434.5" y="241" bbox_bottom="241" bbox_top="231" frame_number="26" time="1222116851008654" bbox_right="441" bbox_left="428">
+        <world_location gcs="4269" easting="-81.48100000000001" northing="38.2117"/>
+        <image_object_point x="428" y="231"/>
+        <image_object_point x="441" y="231"/>
+        <image_object_point x="441" y="241"/>
+        <image_object_point x="428" y="241"/>
+      </trajectory_state>
+    </track>
+    <descriptor instance_id="0" confidence="0.3" module="sample" name="TEST1">
+      <value_vector>
+        <value data="1"/>
+        <value data="42"/>
+      </value_vector>
+      <value_vector>
+        <value data="3.1416"/>
+      </value_vector>
+      <region right="440" left="430" bottom="240" frame_number="13" time="1302035289300000" top="230"/>
+      <region right="440" left="430" bottom="240" frame_number="14" time="1302035289400000" top="230"/>
+      <region right="440" left="430" bottom="240" frame_number="15" time="1302035289500000" top="230"/>
+      <track source="0" serial_number="1"/>
+      <track source="0" serial_number="2"/>
+    </descriptor>
+    <descriptor instance_id="1" confidence="0.1" module="sample" name="TEST2">
+      <value_vector>
+        <value data="2"/>
+        <value data="37"/>
+        <value data="2.71828"/>
+      </value_vector>
+      <region right="360" left="350" bottom="120" frame_number="27" time="1302035290700000" top="110"/>
+      <region right="360" left="350" bottom="120" frame_number="28" time="1302035290800000" top="110"/>
+      <region right="360" left="350" bottom="120" frame_number="29" time="1302035290900000" top="110"/>
+      <region right="360" left="350" bottom="120" frame_number="30" time="1302035291000000" top="110"/>
+      <region right="360" left="350" bottom="120" frame_number="31" time="1302035291100000" top="110"/>
+      <track source="0" serial_number="1"/>
+      <track source="0" serial_number="2"/>
+    </descriptor>
+    <iqr_model data="SGVsbG8sIHdvcmxkIQ=="/>
+  </query>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw-a.vst b/Libraries/VvIO/Testing/rw-a.vst
new file mode 100644
index 00000000..c2ae12d8
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-a.vst
@@ -0,0 +1,27 @@
+TRACKS;
+# Track ID, Classification Entries, Trajectory States
+#  Source, Serial Number
+#  Type, Probability
+#  Frame Number, Time, Image Point X, Image Point Y,
+#  Image Box, Image Object Points, World Location
+#   { Top, Left }, { Bottom, Right }
+#   X, Y
+#   [ GCS, Easting, Northing ]
+[ 0, 1 ],
+  [ [ "Person", 0.8 ],
+    [ "Vehicle", 0.2 ] ],
+  [ [ 26, 1222116851008654, 434.5, 241, [ [ 231, 428 ], [ 241, 441 ] ],
+      [ [ 428, 231 ], [ 441, 231 ], [ 441, 241 ], [ 428, 241 ] ],
+      [ 4269, 38.2117, -81.481 ] ]
+    ];
+[ 0, 2 ],
+  [ [ "Other", 0.1 ],
+    [ "Person", 0.6 ],
+    [ "Vehicle", 0.3 ] ],
+  [ [ 30, 1222116851409054, 434.5, 241, [ [ 231, 428 ], [ 241, 441 ] ],
+      [ [ 428, 231 ], [ 441, 231 ], [ 441, 241 ], [ 428, 241 ] ],
+      [ 4269, 38.2117, -81.481 ] ],
+    [ 31, 1222116851509154, 434.5, 241, [ [ 231, 428 ], [ 241, 441 ] ],
+      [ [ 428, 231 ], [ 441, 231 ], [ 441, 241 ], [ 428, 241 ] ],
+      [ 4269, 38.2117, -81.481 ] ]
+    ];
diff --git a/Libraries/VvIO/Testing/rw-a.vst.xml b/Libraries/VvIO/Testing/rw-a.vst.xml
new file mode 100644
index 00000000..fa88c34b
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-a.vst.xml
@@ -0,0 +1,33 @@
+<!DOCTYPE VVXML>
+<xml>
+  <track source="0" serial_number="1">
+    <classification type="Person" value="0.8"/>
+    <classification type="Vehicle" value="0.2"/>
+    <trajectory_state x="434.5" y="241" bbox_bottom="241" bbox_top="231" frame_number="26" time="1222116851008654" bbox_right="441" bbox_left="428">
+      <world_location gcs="4269" easting="-81.48100000000001" northing="38.2117"/>
+      <image_object_point x="428" y="231"/>
+      <image_object_point x="441" y="231"/>
+      <image_object_point x="441" y="241"/>
+      <image_object_point x="428" y="241"/>
+    </trajectory_state>
+  </track>
+  <track source="0" serial_number="2">
+    <classification type="Other" value="0.1"/>
+    <classification type="Person" value="0.6000000000000001"/>
+    <classification type="Vehicle" value="0.3"/>
+    <trajectory_state x="434.5" y="241" bbox_bottom="241" bbox_top="231" frame_number="30" time="1222116851409054" bbox_right="441" bbox_left="428">
+      <world_location gcs="4269" easting="-81.48100000000001" northing="38.2117"/>
+      <image_object_point x="428" y="231"/>
+      <image_object_point x="441" y="231"/>
+      <image_object_point x="441" y="241"/>
+      <image_object_point x="428" y="241"/>
+    </trajectory_state>
+    <trajectory_state x="434.5" y="241" bbox_bottom="241" bbox_top="231" frame_number="31" time="1222116851509154" bbox_right="441" bbox_left="428">
+      <world_location gcs="4269" easting="-81.48100000000001" northing="38.2117"/>
+      <image_object_point x="428" y="231"/>
+      <image_object_point x="441" y="231"/>
+      <image_object_point x="441" y="241"/>
+      <image_object_point x="428" y="241"/>
+    </trajectory_state>
+  </track>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw-b.vgp b/Libraries/VvIO/Testing/rw-b.vgp
new file mode 100644
index 00000000..c202fbd1
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-b.vgp
@@ -0,0 +1,2 @@
+0;
+[];
diff --git a/Libraries/VvIO/Testing/rw-b.vgp.xml b/Libraries/VvIO/Testing/rw-b.vgp.xml
new file mode 100644
index 00000000..7dca4e1a
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-b.vgp.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE VVXML>
+<xml>
+  <geo_poly gcs="-1"/>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw-b.vqp b/Libraries/VvIO/Testing/rw-b.vqp
new file mode 100644
index 00000000..f0f8422c
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-b.vqp
@@ -0,0 +1,24 @@
+QUERY;
+# Query ID [, Video URI ]
+# Descriptors
+#  Descriptor name, Module name, Instance ID, Confidence, Values, Region, Track ID's
+#   Frame Number, Time, Image Region { { Top, Left }, { Bottom, Right } }
+#   Source, Serial Number
+# { Temporal Lower, Temporal Upper }, { GCS, Geospatial Limit Points }
+#   { Easting, Northing }
+# [ Similarity Threshold ]
+"QUERY-EXAMPLE-9876";
+[
+  [ "TEST3", "sample", 2, 0.7,
+    [ [ 3 ],
+      [ 1.618, 9.80665 ],
+      [ 49, 12 ] ],
+    [ [ 63, 1302035294300000, [ [ 460, 180 ], [ 470, 190 ] ] ],
+      [ 64, 1302035294400000, [ [ 460, 180 ], [ 470, 190 ] ] ] ],
+    [ [ 0, 1 ], [ 0, 2 ] ] ] ];
+[ 1302213938000000, 1302215277000000 ],
+  [ 4269,
+    [ [ 38.2, -81.4 ],
+      [ 38.3, -81.4 ],
+      [ 38.3, -81.6 ],
+      [ 38.2, -81.6 ] ] ];
diff --git a/Libraries/VvIO/Testing/rw-b.vqp.xml b/Libraries/VvIO/Testing/rw-b.vqp.xml
new file mode 100644
index 00000000..f6591350
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-b.vqp.xml
@@ -0,0 +1,29 @@
+<!DOCTYPE VVXML>
+<xml>
+  <query threshold="0" type="similarity" id="QUERY-EXAMPLE-9876">
+    <temporal_limit mode="contains_any" lower="1302213938000000" upper="1302215277000000"/>
+    <spatial_limit gcs="4269" mode="contains_any">
+      <coordinate easting="-81.40000000000001" northing="38.2"/>
+      <coordinate easting="-81.40000000000001" northing="38.3"/>
+      <coordinate easting="-81.60000000000001" northing="38.3"/>
+      <coordinate easting="-81.60000000000001" northing="38.2"/>
+    </spatial_limit>
+    <descriptor instance_id="2" confidence="0.7000000000000001" module="sample" name="TEST3">
+      <value_vector>
+        <value data="3"/>
+      </value_vector>
+      <value_vector>
+        <value data="1.618"/>
+        <value data="9.80665"/>
+      </value_vector>
+      <value_vector>
+        <value data="49"/>
+        <value data="12"/>
+      </value_vector>
+      <region right="190" left="180" bottom="470" frame_number="63" time="1302035294300000" top="460"/>
+      <region right="190" left="180" bottom="470" frame_number="64" time="1302035294400000" top="460"/>
+      <track source="0" serial_number="1"/>
+      <track source="0" serial_number="2"/>
+    </descriptor>
+  </query>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw-b.vst b/Libraries/VvIO/Testing/rw-b.vst
new file mode 100644
index 00000000..09c00e6d
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-b.vst
@@ -0,0 +1,14 @@
+TRACKS;
+# Track ID, Classification Entries, Trajectory States
+#  Source, Serial Number
+#  Type, Probability
+#  Frame Number, Time, Image Point X, Image Point Y,
+#  Image Box, Image Object Points, World Location
+#   { Top, Left }, { Bottom, Right }
+#   X, Y
+#   [ GCS, Easting, Northing ]
+[ 0, 1 ],
+  [],
+  [ [ 26, 1222116851008654, 434.5, 241, [ [ 231, 428 ], [ 241, 441 ] ],
+      [], [] ]
+    ];
diff --git a/Libraries/VvIO/Testing/rw-b.vst.xml b/Libraries/VvIO/Testing/rw-b.vst.xml
new file mode 100644
index 00000000..8babc3f6
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-b.vst.xml
@@ -0,0 +1,6 @@
+<!DOCTYPE VVXML>
+<xml>
+  <track source="0" serial_number="1">
+    <trajectory_state x="434.5" y="241" bbox_bottom="241" bbox_top="231" frame_number="26" time="1222116851008654" bbox_right="441" bbox_left="428"/>
+  </track>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw-bo.vqp b/Libraries/VvIO/Testing/rw-bo.vqp
new file mode 100644
index 00000000..61565fdb
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-bo.vqp
@@ -0,0 +1,37 @@
+QUERY, 1;
+# Query Type
+# Query ID [, Stream ID Limit ]
+# Descriptors [, Tracks ] | Entity Type
+#  Descriptor name, Module name, Instance ID, Confidence, Values, Region, Track ID's
+#   Frame Number, Time, Image Region { { Top, Left }, { Bottom, Right } }
+#   Source, Serial Number
+#  Track ID, Classification Entries, Trajectory States
+#   Source, Serial Number
+#   Type, Probability
+#   Frame Number, Time, Image Point X, Image Point Y,
+#   Image Box, Image Object Points, World Location
+#    { Top, Left }, { Bottom, Right }
+#    X, Y
+#    [ GCS, Easting, Northing ]
+# { [ Temporal Lower, Temporal Upper [, Temporal Filter ] ] },
+# { [ GCS, Geospatial Limit Points [, Geospatial Filter ] ] }
+#   { Easting, Northing }
+# [ Similarity Threshold, [ IQR Model ] ]
+SIMILARITY;
+"QUERY-EXAMPLE-9876";
+[
+  [ "TEST3", "sample", 2, 0.7,
+    [ [ 3 ],
+      [ 1.618, 9.80665 ],
+      [ 49, 12 ] ],
+    [ [ 63, 1302035294300000, [ [ 460, 180 ], [ 470, 190 ] ] ],
+      [ 64, 1302035294400000, [ [ 460, 180 ], [ 470, 190 ] ] ] ],
+    [ [ 0, 1 ], [ 0, 2 ] ] ] ];
+[ 1302213938000000, 1302215277000000, CONTAINS_ANY ],
+  [ 4269,
+    [ [ 38.2, -81.4 ],
+      [ 38.3, -81.4 ],
+      [ 38.3, -81.6 ],
+      [ 38.2, -81.6 ] ],
+    CONTAINS_ANY ];
+0, "";
diff --git a/Libraries/VvIO/Testing/rw-c.vqp b/Libraries/VvIO/Testing/rw-c.vqp
new file mode 100644
index 00000000..52451dcc
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-c.vqp
@@ -0,0 +1,29 @@
+QUERY, 1;
+# Query Type
+# Query ID [, Stream ID Limit ]
+# Descriptors [, Tracks ] | Entity Type
+#  Descriptor name, Module name, Instance ID, Confidence, Values, Region, Track ID's
+#   Frame Number, Time, Image Region { { Top, Left }, { Bottom, Right } }
+#   Source, Serial Number
+#  Track ID, Classification Entries, Trajectory States
+#   Source, Serial Number
+#   Type, Probability
+#   Frame Number, Time, Image Point X, Image Point Y,
+#   Image Box, Image Object Points, World Location
+#    { Top, Left }, { Bottom, Right }
+#    X, Y
+#    [ GCS, Easting, Northing ]
+# { [ Temporal Lower, Temporal Upper [, Temporal Filter ] ] },
+# { [ GCS, Geospatial Limit Points [, Geospatial Filter ] ] }
+#   { Easting, Northing }
+# [ Similarity Threshold, [ IQR Model ] ]
+RETRIEVAL;
+"QUERY-EXAMPLE-24680";
+TRACKS;
+[ 1313790109000000, 1313847211000000, CONTAINS_WHOLLY ],
+  [ 4269,
+    [ [ 42.8, -73.7 ],
+      [ 42.9, -73.7 ],
+      [ 42.9, -73.8 ],
+      [ 42.8, -73.8 ] ],
+    INTERSECTS ];
diff --git a/Libraries/VvIO/Testing/rw-c.vqp.xml b/Libraries/VvIO/Testing/rw-c.vqp.xml
new file mode 100644
index 00000000..cf0b4bd1
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw-c.vqp.xml
@@ -0,0 +1,12 @@
+<!DOCTYPE VVXML>
+<xml>
+  <query requested_entities="tracks" type="retrieval" id="QUERY-EXAMPLE-24680">
+    <temporal_limit mode="contains_wholly" lower="1313790109000000" upper="1313847211000000"/>
+    <spatial_limit gcs="4269" mode="intersects">
+      <coordinate easting="-73.7" northing="42.8"/>
+      <coordinate easting="-73.7" northing="42.90000000000001"/>
+      <coordinate easting="-73.8" northing="42.90000000000001"/>
+      <coordinate easting="-73.8" northing="42.8"/>
+    </spatial_limit>
+  </query>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw.vem b/Libraries/VvIO/Testing/rw.vem
new file mode 100644
index 00000000..07d66945
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw.vem
@@ -0,0 +1,3 @@
+EVENT_META;
+# Name, Pen Color, Foreground Color, Background Color, Initial Filter Threshold
+"Example", 0xffff0000, 0xffffffff, 0x800000ff, 0.1;
diff --git a/Libraries/VvIO/Testing/rw.vem.xml b/Libraries/VvIO/Testing/rw.vem.xml
new file mode 100644
index 00000000..b2e75b83
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw.vem.xml
@@ -0,0 +1,4 @@
+<!DOCTYPE VVXML>
+<xml>
+  <event_meta background_color="rgba(0,0,255,0.501961)" foreground_color="#ffffff" name="Example" display_threshold="0.1" pen_color="#ff0000"/>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw.vqr.xml b/Libraries/VvIO/Testing/rw.vqr.xml
new file mode 100644
index 00000000..47d74734
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw.vqr.xml
@@ -0,0 +1,88 @@
+<!DOCTYPE VVXML>
+<xml>
+  <query_result stream="INGEST-769235514" instance_id="0" query="QUERY-EXAMPLE-2298537" mission="MISSION-6734" notes="This result is fascinating!">
+    <temporal_location end="1302035291100000" start="1302035289300000"/>
+    <spatial_location gcs="4326" easting="-81.51000000000001" northing="38.27"/>
+    <score flags="starred" relevancy="0.6000000000000001" rank="0"/>
+    <descriptor instance_id="0" confidence="0.3" module="sample" name="TEST1">
+      <value_vector>
+        <value data="1"/>
+        <value data="42"/>
+      </value_vector>
+      <value_vector>
+        <value data="3.1416"/>
+      </value_vector>
+      <region right="440" left="430" bottom="240" frame_number="13" time="1302035289300000" top="230"/>
+      <region right="440" left="430" bottom="240" frame_number="14" time="1302035289400000" top="230"/>
+      <region right="440" left="430" bottom="240" frame_number="15" time="1302035289500000" top="230"/>
+      <track source="0" serial_number="1"/>
+      <track source="0" serial_number="2"/>
+    </descriptor>
+    <descriptor instance_id="1" confidence="0.1" module="sample" name="TEST2">
+      <value_vector>
+        <value data="2"/>
+        <value data="37"/>
+        <value data="2.71828"/>
+      </value_vector>
+      <region right="360" left="350" bottom="120" frame_number="27" time="1302035290700000" top="110"/>
+      <region right="360" left="350" bottom="120" frame_number="28" time="1302035290800000" top="110"/>
+      <region right="360" left="350" bottom="120" frame_number="29" time="1302035290900000" top="110"/>
+      <region right="360" left="350" bottom="120" frame_number="30" time="1302035291000000" top="110"/>
+      <region right="360" left="350" bottom="120" frame_number="31" time="1302035291100000" top="110"/>
+      <track source="0" serial_number="1"/>
+      <track source="0" serial_number="2"/>
+    </descriptor>
+  </query_result>
+  <query_result stream="INGEST-769235514" instance_id="1" query="QUERY-EXAMPLE-2298537" mission="MISSION-6734">
+    <temporal_location end="1302035294400000" start="1302035294300000"/>
+    <spatial_location gcs="4326" easting="-81.42" northing="38.23"/>
+    <score relevancy="0.4" rank="1" rating="positive"/>
+    <track source="0" serial_number="1">
+      <classification type="Person" value="0.8"/>
+      <classification type="Vehicle" value="0.2"/>
+      <trajectory_state x="434.5" y="241" bbox_bottom="241" bbox_top="231" frame_number="26" time="1222116851008654" bbox_right="441" bbox_left="428">
+        <world_location gcs="4269" easting="-81.48100000000001" northing="38.2117"/>
+        <image_object_point x="428" y="231"/>
+        <image_object_point x="441" y="231"/>
+        <image_object_point x="441" y="241"/>
+        <image_object_point x="428" y="241"/>
+      </trajectory_state>
+    </track>
+    <track source="0" serial_number="2">
+      <classification type="Other" value="0.1"/>
+      <classification type="Person" value="0.6000000000000001"/>
+      <classification type="Vehicle" value="0.3"/>
+      <trajectory_state x="434.5" y="241" bbox_bottom="241" bbox_top="231" frame_number="30" time="1222116851409054" bbox_right="441" bbox_left="428">
+        <world_location gcs="4269" easting="-81.48100000000001" northing="38.2117"/>
+        <image_object_point x="428" y="231"/>
+        <image_object_point x="441" y="231"/>
+        <image_object_point x="441" y="241"/>
+        <image_object_point x="428" y="241"/>
+      </trajectory_state>
+      <trajectory_state x="434.5" y="241" bbox_bottom="241" bbox_top="231" frame_number="31" time="1222116851509154" bbox_right="441" bbox_left="428">
+        <world_location gcs="4269" easting="-81.48100000000001" northing="38.2117"/>
+        <image_object_point x="428" y="231"/>
+        <image_object_point x="441" y="231"/>
+        <image_object_point x="441" y="241"/>
+        <image_object_point x="428" y="241"/>
+      </trajectory_state>
+    </track>
+    <descriptor instance_id="2" confidence="0.7000000000000001" module="sample" name="TEST3">
+      <value_vector>
+        <value data="3"/>
+      </value_vector>
+      <value_vector>
+        <value data="1.618"/>
+        <value data="9.80665"/>
+      </value_vector>
+      <value_vector>
+        <value data="49"/>
+        <value data="12"/>
+      </value_vector>
+      <region right="190" left="180" bottom="470" frame_number="63" time="1302035294300000" top="460"/>
+      <region right="190" left="180" bottom="470" frame_number="64" time="1302035294400000" top="460"/>
+      <track source="0" serial_number="1"/>
+      <track source="0" serial_number="2"/>
+    </descriptor>
+  </query_result>
+</xml>
diff --git a/Libraries/VvIO/Testing/rw.vsd b/Libraries/VvIO/Testing/rw.vsd
new file mode 100644
index 00000000..d0e5ea7a
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw.vsd
@@ -0,0 +1,26 @@
+DESCRIPTORS;
+# Descriptor name, Module name, Instance ID, Confidence, Values, Region, Track ID's
+#  Frame Number, Time, Image Region { { Top, Left }, { Bottom, Right } }
+#  Source, Serial Number
+"TEST1", "sample", 0, 0.3,
+  [ [ 1, 42 ],
+    [ 3.1416 ] ],
+  [ [ 13, 1302035289300000, [ [ 230, 430 ], [ 240, 440 ] ] ],
+    [ 14, 1302035289400000, [ [ 230, 430 ], [ 240, 440 ] ] ],
+    [ 15, 1302035289500000, [ [ 230, 430 ], [ 240, 440 ] ] ] ],
+  [ [ 0, 1 ], [ 0, 2 ] ];
+"TEST2", "sample", 1, 0.1,
+  [ [ 2, 37, 2.71828 ] ],
+  [ [ 27, 1302035290700000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+    [ 28, 1302035290800000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+    [ 29, 1302035290900000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+    [ 30, 1302035291000000, [ [ 110, 350 ], [ 120, 360 ] ] ],
+    [ 31, 1302035291100000, [ [ 110, 350 ], [ 120, 360 ] ] ] ],
+  [ [ 0, 1 ], [ 0, 2 ] ];
+"TEST3", "sample", 2, 0.7,
+  [ [ 3 ],
+    [ 1.618, 9.80665 ],
+    [ 49, 12 ] ],
+  [ [ 63, 1302035294300000, [ [ 460, 180 ], [ 470, 190 ] ] ],
+    [ 64, 1302035294400000, [ [ 460, 180 ], [ 470, 190 ] ] ] ],
+  [ [ 0, 1 ], [ 0, 2 ] ];
diff --git a/Libraries/VvIO/Testing/rw.vsd.xml b/Libraries/VvIO/Testing/rw.vsd.xml
new file mode 100644
index 00000000..09a293a8
--- /dev/null
+++ b/Libraries/VvIO/Testing/rw.vsd.xml
@@ -0,0 +1,48 @@
+<!DOCTYPE VVXML>
+<xml>
+  <descriptor instance_id="0" confidence="0.3" module="sample" name="TEST1">
+    <value_vector>
+      <value data="1"/>
+      <value data="42"/>
+    </value_vector>
+    <value_vector>
+      <value data="3.1416"/>
+    </value_vector>
+    <region right="440" left="430" bottom="240" frame_number="13" time="1302035289300000" top="230"/>
+    <region right="440" left="430" bottom="240" frame_number="14" time="1302035289400000" top="230"/>
+    <region right="440" left="430" bottom="240" frame_number="15" time="1302035289500000" top="230"/>
+    <track source="0" serial_number="1"/>
+    <track source="0" serial_number="2"/>
+  </descriptor>
+  <descriptor instance_id="1" confidence="0.1" module="sample" name="TEST2">
+    <value_vector>
+      <value data="2"/>
+      <value data="37"/>
+      <value data="2.71828"/>
+    </value_vector>
+    <region right="360" left="350" bottom="120" frame_number="27" time="1302035290700000" top="110"/>
+    <region right="360" left="350" bottom="120" frame_number="28" time="1302035290800000" top="110"/>
+    <region right="360" left="350" bottom="120" frame_number="29" time="1302035290900000" top="110"/>
+    <region right="360" left="350" bottom="120" frame_number="30" time="1302035291000000" top="110"/>
+    <region right="360" left="350" bottom="120" frame_number="31" time="1302035291100000" top="110"/>
+    <track source="0" serial_number="1"/>
+    <track source="0" serial_number="2"/>
+  </descriptor>
+  <descriptor instance_id="2" confidence="0.7000000000000001" module="sample" name="TEST3">
+    <value_vector>
+      <value data="3"/>
+    </value_vector>
+    <value_vector>
+      <value data="1.618"/>
+      <value data="9.80665"/>
+    </value_vector>
+    <value_vector>
+      <value data="49"/>
+      <value data="12"/>
+    </value_vector>
+    <region right="190" left="180" bottom="470" frame_number="63" time="1302035294300000" top="460"/>
+    <region right="190" left="180" bottom="470" frame_number="64" time="1302035294400000" top="460"/>
+    <track source="0" serial_number="1"/>
+    <track source="0" serial_number="2"/>
+  </descriptor>
+</xml>
diff --git a/Libraries/VvIO/typesystem.xml b/Libraries/VvIO/typesystem.xml
new file mode 100644
index 00000000..99dbf095
--- /dev/null
+++ b/Libraries/VvIO/typesystem.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<typesystem package="@TYPESYSTEM_NAME@">
+
+  @EXTRA_TYPESYSTEMS@
+
+  <template name="hash_vvTrackState">
+  inline static long vvPyHash(const %CPPTYPE&amp; in) {
+    return vgPyHash(in.TimeStamp);
+  }
+  </template>
+
+  <template name="hash_vvDescriptorRegionEntry">
+  inline static long vvPyHash(const %CPPTYPE&amp; in) {
+    return vgPyHash(in.TimeStamp);
+  }
+  </template>
+
+  <namespace-type name="vvUserData">
+    <enum-type name="Flag" flags="Flags"/>
+    <value-type name="Data"/>
+  </namespace-type>
+
+  <value-type name="vvTrackState" hash-function="vvPyHash">
+    <inject-code class="native" position="beginning">
+      <insert-template name="hash_vgTimeStamp"/>
+      <insert-template name="hash_vvTrackState"/>
+    </inject-code>
+  </value-type>
+
+  <value-type name="vvDescriptor">
+    <enum-type name="CompareMode"/>
+  </value-type>
+
+  <value-type name="vvDescriptorRegionEntry" hash-function="vvPyHash">
+    <inject-code class="native" position="beginning">
+      <insert-template name="hash_vgTimeStamp"/>
+      <insert-template name="hash_vvDescriptorRegionEntry"/>
+    </inject-code>
+  </value-type>
+
+  <object-type name="vvDatabaseQuery">
+    <enum-type name="QueryType"/>
+    <enum-type name="IntersectionType"/>
+  </object-type>
+  <object-type name="vvRetrievalQuery">
+    <enum-type name="EntityType"/>
+  </object-type>
+  <object-type name="vvSimilarityQuery"/>
+
+  <value-type name="vvHeader">
+    <enum-type name="FileType"/>
+  </value-type>
+  <object-type name="vvReader">
+    <enum-type name="Format"/>
+  </object-type>
+
+  <namespace-type name="vvIqr">
+    <enum-type name="Classification"/>
+  </namespace-type>
+
+  <namespace-type name="vvJson"/>
+
+  @EXTRA_OBJECTS@
+
+</typesystem>
diff --git a/Libraries/VvIO/vvChecksum.cxx b/Libraries/VvIO/vvChecksum.cxx
new file mode 100644
index 00000000..6b4d257f
--- /dev/null
+++ b/Libraries/VvIO/vvChecksum.cxx
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QByteArray>
+#include <QDataStream>
+
+#include <qtGlobal.h>
+
+#include "vvChecksum.h"
+
+//-----------------------------------------------------------------------------
+QDataStream& operator<<(QDataStream& ds, const vvDescriptor& d)
+{
+  ds << d.ModuleName.c_str() << d.DescriptorName.c_str()
+     << d.InstanceId << d.Confidence;
+
+  foreach_iter (vvDescriptorRegionMap::const_iterator, iter, d.Region)
+    {
+    ds << iter->TimeStamp.FrameNumber << iter->TimeStamp.Time
+       << iter->ImageRegion.TopLeft.X << iter->ImageRegion.TopLeft.Y
+       << iter->ImageRegion.BottomRight.X << iter->ImageRegion.BottomRight.Y;
+    }
+
+  size_t i, j;
+  for (i = 0; i < d.Values.size(); ++i)
+    for (j = 0; j < d.Values[i].size(); ++j)
+      ds << d.Values[i][j];
+
+  for (i = 0; i < d.TrackIds.size(); ++i)
+    ds << d.TrackIds[i].Source << d.TrackIds[i].SerialNumber;
+
+  return ds;
+}
+
+//-----------------------------------------------------------------------------
+quint16 vvChecksum(const vvDescriptor& d)
+{
+  QByteArray data;
+  QDataStream stream(&data, QIODevice::WriteOnly);
+
+  stream << d;
+
+  return qChecksum(data.constData(), data.size());
+}
+
+//-----------------------------------------------------------------------------
+quint16 vvChecksum(const QList<vvDescriptor>& list)
+{
+  QByteArray data;
+  QDataStream stream(&data, QIODevice::WriteOnly);
+
+  foreach (const vvDescriptor& d, list)
+    stream << d;
+
+  return qChecksum(data.constData(), data.size());
+}
+
+//-----------------------------------------------------------------------------
+quint16 vvChecksum(const std::vector<vvDescriptor>& list)
+{
+  QByteArray data;
+  QDataStream stream(&data, QIODevice::WriteOnly);
+
+  for (size_t n = 0; n < list.size(); ++n)
+    stream << list[n];
+
+  return qChecksum(data.constData(), data.size());
+}
diff --git a/Libraries/VvIO/vvChecksum.h b/Libraries/VvIO/vvChecksum.h
new file mode 100644
index 00000000..e45a5063
--- /dev/null
+++ b/Libraries/VvIO/vvChecksum.h
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvChecksum_h
+#define __vvChecksum_h
+
+#include <QList>
+
+#include <vgExport.h>
+
+#include "vvDescriptor.h"
+
+extern VV_IO_EXPORT quint16 vvChecksum(const vvDescriptor&);
+extern VV_IO_EXPORT quint16 vvChecksum(const QList<vvDescriptor>&);
+extern VV_IO_EXPORT quint16 vvChecksum(const std::vector<vvDescriptor>&);
+
+#endif
diff --git a/Libraries/VvIO/vvCompare.cxx b/Libraries/VvIO/vvCompare.cxx
new file mode 100644
index 00000000..81fbd9eb
--- /dev/null
+++ b/Libraries/VvIO/vvCompare.cxx
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qglobal.h>
+
+#include <vvDescriptor.h>
+
+//-----------------------------------------------------------------------------
+bool operator==(const vvDescriptorRegionEntry& a,
+                const vvDescriptorRegionEntry& b)
+{
+  return a.ImageRegion.TopLeft.X == b.ImageRegion.TopLeft.X &&
+         a.ImageRegion.TopLeft.Y == b.ImageRegion.TopLeft.Y &&
+         a.ImageRegion.BottomRight.X == a.ImageRegion.BottomRight.X &&
+         a.ImageRegion.BottomRight.Y == a.ImageRegion.BottomRight.Y &&
+         qFuzzyCompare(a.TimeStamp.Time, b.TimeStamp.Time) &&
+         (!(a.TimeStamp.HasFrameNumber() && b.TimeStamp.HasFrameNumber())
+          || (a.TimeStamp.FrameNumber == b.TimeStamp.FrameNumber));
+}
+
+//-----------------------------------------------------------------------------
+bool vvDescriptor::compare(const vvDescriptor& a, const vvDescriptor& b,
+                           vvDescriptor::CompareMode mode)
+{
+  if (mode == vvDescriptor::CompareDetection)
+    {
+    // Compare detections, rather than exact match... i.e. the track ID's and
+    // instance ID are allowed to be different, but the name, module, region
+    // and values must match
+    return a.DescriptorName == b.DescriptorName &&
+           a.ModuleName == b.ModuleName &&
+           a.Confidence == b.Confidence &&
+           a.Region == b.Region &&
+           a.Values == b.Values &&
+           a.TrackIds.size() == b.TrackIds.size();
+    }
+  else
+    {
+    // Compare exactly
+    return a.InstanceId == b.InstanceId &&
+           a.DescriptorName == b.DescriptorName &&
+           a.ModuleName == b.ModuleName &&
+           a.Confidence == b.Confidence &&
+           a.Region == b.Region &&
+           a.Values == b.Values &&
+           a.TrackIds == b.TrackIds;
+    }
+}
diff --git a/Libraries/VvIO/vvEventSetInfo.h b/Libraries/VvIO/vvEventSetInfo.h
new file mode 100644
index 00000000..8e392280
--- /dev/null
+++ b/Libraries/VvIO/vvEventSetInfo.h
@@ -0,0 +1,25 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvEventSetInfo_h
+#define __vvEventSetInfo_h
+
+#include <QColor>
+#include <QString>
+
+//-----------------------------------------------------------------------------
+struct vvEventSetInfo
+{
+  vvEventSetInfo() : DisplayThreshold(0.0) {}
+
+  QString Name;
+  QColor PenColor;
+  QColor BackgroundColor;
+  QColor ForegroundColor;
+  double DisplayThreshold;
+};
+
+#endif
diff --git a/Libraries/VvIO/vvHeader.cxx b/Libraries/VvIO/vvHeader.cxx
new file mode 100644
index 00000000..6966c902
--- /dev/null
+++ b/Libraries/VvIO/vvHeader.cxx
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvHeader.h"
+
+const char* vvHeader::TracksTag = "TRACKS";
+const char* vvHeader::DescriptorsTag = "DESCRIPTORS";
+const char* vvHeader::QueryPlanTag = "QUERY";
+const char* vvHeader::QueryResultsTag = "RESULTS";
+const char* vvHeader::EventSetInfoTag = "EVENT_META";
+
+//-----------------------------------------------------------------------------
+bool vvHeader::isValid()
+{
+  return this->type != Unknown
+         && this->version != static_cast<unsigned int>(-1);
+}
diff --git a/Libraries/VvIO/vvHeader.h b/Libraries/VvIO/vvHeader.h
new file mode 100644
index 00000000..055ad819
--- /dev/null
+++ b/Libraries/VvIO/vvHeader.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvHeader_h
+#define __vvHeader_h
+
+#include <vgExport.h>
+
+struct VV_IO_EXPORT vvHeader
+{
+  static const char* TracksTag;
+  static const char* DescriptorsTag;
+  static const char* QueryPlanTag;
+  static const char* QueryResultsTag;
+  static const char* EventSetInfoTag;
+
+  vvHeader() : type(Unknown), version(static_cast<unsigned int>(-1)) {}
+  bool isValid();
+
+  enum FileType
+    {
+    Unknown,
+    Tracks,
+    Descriptors,
+    QueryPlan,
+    QueryResults,
+    EventSetInfo
+    };
+
+  FileType type;
+  unsigned int version;
+};
+
+#endif
diff --git a/Libraries/VvIO/vvJson.cxx b/Libraries/VvIO/vvJson.cxx
new file mode 100644
index 00000000..0a9d1552
--- /dev/null
+++ b/Libraries/VvIO/vvJson.cxx
@@ -0,0 +1,264 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvJson.h"
+
+#include <vvDescriptor.h>
+#include <vvQueryResult.h>
+#include <vvTrack.h>
+#include <vvUserData.h>
+
+#include <vgGeoTypes.h>
+#include <vgTimeStamp.h>
+
+#include <qtStlUtil.h>
+
+namespace vvJson
+{
+
+namespace // anonymous
+{
+
+template <typename T> qtJson::Array serialize(const std::vector<T>&);
+template <typename T> qtJson::Array serialize(const std::set<T>&);
+
+using vvJson::serialize;
+
+//-----------------------------------------------------------------------------
+QVariant serialize(float value)
+{
+  // This seemingly silly function allows us to convert descriptor values
+  // entirely leveraging the generic array handler below. Gotta love
+  // templates...
+  return value;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+qtJson::Array serialize(const std::vector<T>& list)
+{
+  qtJson::Array result;
+
+  const size_t k = list.size();
+  result.reserve(static_cast<int>(k));
+
+  for (size_t i = 0; i < k; ++i)
+    {
+    result.append(serialize(list[i]));
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+qtJson::Array serialize(const std::set<T>& set)
+{
+  qtJson::Array result;
+
+  typedef typename std::set<T>::const_iterator Iterator;
+  const Iterator end = set.end();
+  for (Iterator iter = set.begin(); iter != end; ++iter)
+    {
+    result.append(serialize(*iter));
+    }
+
+  return result;
+}
+
+} // namespace <anonymous>
+
+} // namespace vvJson
+
+//-----------------------------------------------------------------------------
+qtJson::Value vvJson::serialize(const vgTimeStamp& ts)
+{
+  if (!ts.IsValid())
+    {
+    return qtJson::Value();
+    }
+
+  qtJson::Object object;
+
+  if (ts.HasTime())
+    {
+    object.insert("time", qRound64(ts.Time));
+    }
+  if (ts.HasFrameNumber())
+    {
+    object.insert("frame", ts.FrameNumber);
+    }
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vgGeoRawCoordinate& coord)
+{
+  qtJson::Object object;
+
+  object.insert("northing", coord.Northing);
+  object.insert("easting", coord.Easting);
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Value vvJson::serialize(const vgGeocodedCoordinate& coord)
+{
+  if (coord.GCS == -1)
+    {
+    return qtJson::Value();
+    }
+
+  const vgGeoRawCoordinate& rawCoord = coord;
+  qtJson::Object object = serialize(rawCoord);
+
+  object.insert("gcs", coord.GCS);
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvImagePointF& point)
+{
+  qtJson::Object object;
+
+  object.insert("x", point.X);
+  object.insert("y", point.Y);
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvImageBoundingBox& box)
+{
+  qtJson::Object object;
+
+  object.insert("top", box.TopLeft.Y);
+  object.insert("left", box.TopLeft.X);
+  object.insert("bottom", box.BottomRight.Y);
+  object.insert("right", box.BottomRight.X);
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvTrackId& tid)
+{
+  qtJson::Object object;
+
+  object.insert("source", tid.Source);
+  object.insert("serialNumber", tid.SerialNumber);
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvTrackState& state)
+{
+  qtJson::Object object;
+
+  object.insert("timeStamp", serialize(state.TimeStamp));
+  object.insert("imagePoint", serialize(state.ImagePoint));
+  object.insert("imageBox", serialize(state.ImageBox));
+  object.insert("imageObject", serialize(state.ImageObject));
+  object.insert("worldLocation", serialize(state.WorldLocation));
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvTrack& track)
+{
+  qtJson::Object object;
+
+  object.insert("id", serialize(track.Id));
+  object.insert("trajectory", serialize(track.Trajectory));
+
+  qtJson::Object classification;
+  typedef vvTrackObjectClassification::const_iterator Iterator;
+  const Iterator end = track.Classification.end();
+  for (Iterator iter = track.Classification.begin(); iter != end; ++iter)
+    {
+    classification.insert(qtString(iter->first), iter->second);
+    }
+  object.insert("classification", classification);
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvDescriptorRegionEntry& region)
+{
+  qtJson::Object object;
+
+  object.insert("timeStamp", serialize(region.TimeStamp));
+  object.insert("imageRegion", serialize(region.ImageRegion));
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvDescriptor& descriptor)
+{
+  qtJson::Object object;
+
+  object.insert("descriptorName", qtString(descriptor.DescriptorName));
+  object.insert("moduleName", qtString(descriptor.ModuleName));
+  object.insert("instanceId", descriptor.InstanceId);
+  object.insert("confidence", descriptor.Confidence);
+  object.insert("values", serialize(descriptor.Values));
+  object.insert("trackIds", serialize(descriptor.TrackIds));
+
+  qtJson::Array regions;
+  const vvDescriptorRegionMap::const_iterator end = descriptor.Region.end();
+  for (vvDescriptorRegionMap::const_iterator iter = descriptor.Region.begin();
+       iter != end; ++iter)
+    {
+    regions.append(serialize(*iter));
+    }
+  object.insert("regions", regions);
+
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvUserData::Data& data)
+{
+  qtJson::Object object;
+  object.insert("flags", static_cast<int>(data.Flags));
+  object.insert("notes", qtString(data.Notes));
+  return object;
+}
+
+//-----------------------------------------------------------------------------
+qtJson::Object vvJson::serialize(const vvQueryResult& result)
+{
+  qtJson::Object object;
+
+  object.insert("instanceId", result.InstanceId);
+
+  object.insert("rank", result.Rank);
+  object.insert("relevancyScore", result.RelevancyScore);
+  object.insert("preferenceScore", result.PreferenceScore);
+
+  object.insert("queryId", qtString(result.QueryId));
+  object.insert("missionId", qtString(result.MissionId));
+  object.insert("streamId", qtString(result.StreamId));
+
+  object.insert("startTime", result.StartTime);
+  object.insert("endTime", result.EndTime);
+  object.insert("location", serialize(result.Location));
+
+  object.insert("tracks", serialize(result.Tracks));
+  object.insert("descriptors", serialize(result.Descriptors));
+
+  object.insert("userScore", static_cast<int>(result.UserScore));
+  object.insert("userData", serialize(result.UserData));
+
+  return object;
+}
diff --git a/Libraries/VvIO/vvJson.h b/Libraries/VvIO/vvJson.h
new file mode 100644
index 00000000..8ab2c25f
--- /dev/null
+++ b/Libraries/VvIO/vvJson.h
@@ -0,0 +1,60 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvJson_h
+#define __vvJson_h
+
+#include <qtJson.h>
+
+#include <vgExport.h>
+
+#include <set>
+
+struct vgGeoRawCoordinate;
+struct vgGeocodedCoordinate;
+struct vgTimeStamp;
+
+struct vvDescriptor;
+struct vvDescriptorRegionEntry;
+struct vvImageBoundingBox;
+struct vvImagePointF;
+struct vvQueryResult;
+struct vvTrack;
+struct vvTrackId;
+struct vvTrackState;
+
+namespace vvUserData { struct Data; }
+
+namespace vvJson
+{
+  extern VV_IO_EXPORT qtJson::Value serialize(const vgTimeStamp&);
+  extern VV_IO_EXPORT qtJson::Object serialize(const vgGeoRawCoordinate&);
+  extern VV_IO_EXPORT qtJson::Value serialize(const vgGeocodedCoordinate&);
+
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvImagePointF&);
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvImageBoundingBox&);
+
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvTrackId&);
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvTrackState&);
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvTrack&);
+
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvDescriptorRegionEntry&);
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvDescriptor&);
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvUserData::Data&);
+
+  extern VV_IO_EXPORT qtJson::Object serialize(const vvQueryResult&);
+
+  template <typename T> qtJson::JsonData encode(const T&);
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+qtJson::JsonData vvJson::encode(const T& object)
+{
+    return qtJson::encode(serialize(object));
+}
+
+#endif
diff --git a/Libraries/VvIO/vvKmlLine.cxx b/Libraries/VvIO/vvKmlLine.cxx
new file mode 100644
index 00000000..fa37af0a
--- /dev/null
+++ b/Libraries/VvIO/vvKmlLine.cxx
@@ -0,0 +1,94 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvKmlLine.h"
+
+#include <QColor>
+
+// KML includes.
+#include <kml/dom.h>
+
+using kmldom::KmlFactory;
+using kmldom::LineStringPtr;
+using kmldom::LineStylePtr;
+
+//-----------------------------------------------------------------------------
+vvKmlLine::vvKmlLine()
+{
+  KmlFactory* factory = KmlFactory::GetFactory();
+  this->Line = factory->CreateLineString();
+  this->LineStyle = factory->CreateLineStyle();
+  this->Coordinates = factory->CreateCoordinates();
+
+  this->Line->set_coordinates(this->Coordinates);
+
+  // Set default width to 2.0
+  this->setWidth(2.0);
+}
+
+//-----------------------------------------------------------------------------
+vvKmlLine::~vvKmlLine()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vvKmlLine::setId(const QString& id)
+{
+  this->Id = id;
+}
+
+//-----------------------------------------------------------------------------
+const QString& vvKmlLine::getId() const
+{
+  return this->Id;
+}
+
+//-----------------------------------------------------------------------------
+LineStringPtr vvKmlLine::getLineString() const
+{
+  return this->Line;
+}
+
+//-----------------------------------------------------------------------------
+LineStylePtr vvKmlLine::getLineStyle() const
+{
+  return this->LineStyle;
+}
+
+//-----------------------------------------------------------------------------
+void vvKmlLine::setDescription(const QString& desc)
+{
+  this->Description = desc;
+}
+
+//-----------------------------------------------------------------------------
+const QString& vvKmlLine::getDescription() const
+{
+  return this->Description;
+}
+
+//-----------------------------------------------------------------------------
+void vvKmlLine::addPoint(double lat, double lon, double alt)
+{
+  this->Coordinates->add_latlngalt(lat, lon, alt);
+}
+
+//-----------------------------------------------------------------------------
+void vvKmlLine::setColor(double r, double g, double b, double a)
+{
+  QColor color;
+  color.setRgbF(r, g, b, a);
+  QRgb argbColor = color.rgba();
+  kmlbase::Color32 kmlColor;
+  kmlColor.set_color_argb(argbColor);
+  this->LineStyle->set_color(kmlColor);
+}
+
+//-----------------------------------------------------------------------------
+void vvKmlLine::setWidth(double width)
+{
+  this->LineStyle->set_width(width);
+}
diff --git a/Libraries/VvIO/vvKmlLine.h b/Libraries/VvIO/vvKmlLine.h
new file mode 100644
index 00000000..86f3faed
--- /dev/null
+++ b/Libraries/VvIO/vvKmlLine.h
@@ -0,0 +1,47 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvKmlLine_h
+#define __vvKmlLine_h
+
+#include <qtUtil.h>
+
+#include <QString>
+
+// KML includes.
+#include <kml/dom.h>
+
+#include <vgExport.h>
+
+//-----------------------------------------------------------------------------
+class VV_IO_EXPORT vvKmlLine
+{
+public:
+  vvKmlLine();
+  ~vvKmlLine();
+
+  void setId(const QString& id);
+  const QString& getId() const;
+
+  kmldom::LineStringPtr getLineString() const;
+  kmldom::LineStylePtr getLineStyle() const;
+
+  void setDescription(const QString& desc);
+  const QString& getDescription() const;
+
+  void addPoint(double lat, double lon, double alt);
+  void setColor(double r, double g, double b, double a);
+  void setWidth(double width);
+
+protected:
+  QString Id;
+  QString Description;
+  kmldom::LineStringPtr Line;
+  kmldom::LineStylePtr LineStyle;
+  kmldom::CoordinatesPtr Coordinates;
+};
+
+#endif
diff --git a/Libraries/VvIO/vvKmlWriter.cxx b/Libraries/VvIO/vvKmlWriter.cxx
new file mode 100644
index 00000000..a7efe7f1
--- /dev/null
+++ b/Libraries/VvIO/vvKmlWriter.cxx
@@ -0,0 +1,109 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvKmlWriter.h"
+
+// #include <QColor>
+#include <QDebug>
+#include <QFile>
+// #include <QTextStream>
+
+#include <qtStlUtil.h>
+
+// KML includes.
+#include <kml/dom.h>
+
+#include "vvKmlLine.h"
+
+using kmldom::DocumentPtr;
+using kmldom::KmlPtr;
+using kmldom::KmlFactory;
+using kmldom::PlacemarkPtr;
+using kmldom::StylePtr;
+
+//-----------------------------------------------------------------------------
+vvKmlWriter::vvKmlWriter()
+{
+  // Do nothing
+}
+
+//-----------------------------------------------------------------------------
+vvKmlWriter::~vvKmlWriter()
+{
+  foreach (vvKmlLine* line, Lines)
+    {
+    delete line;
+    }
+
+  this->Lines.clear();
+}
+
+//-----------------------------------------------------------------------------
+bool vvKmlWriter::isEmpty() const
+{
+  // As of now we only support lines
+  return this->Lines.isEmpty();
+}
+
+//-----------------------------------------------------------------------------
+vvKmlLine* vvKmlWriter::createLine()
+{
+  vvKmlLine* kmlLine = new vvKmlLine();
+
+  this->Lines.push_back(kmlLine);
+
+  return kmlLine;
+}
+
+//-----------------------------------------------------------------------------
+int vvKmlWriter::write(QFile& file)
+{
+  // First create the factory.
+  KmlFactory* factory = KmlFactory::GetFactory();
+
+  // Create KML.
+  KmlPtr kml = factory->CreateKml();
+
+  // Create document.
+  DocumentPtr doc = factory->CreateDocument();
+
+  // Now set document as feature.
+  kml->set_feature(doc);
+
+  foreach (vvKmlLine* line, Lines)
+    {
+    PlacemarkPtr linePlacemark = factory->CreatePlacemark();
+    linePlacemark->set_name(stdString(line->getId()));
+    linePlacemark->set_geometry(line->getLineString());
+    linePlacemark->set_description(stdString(line->getDescription()));
+
+    if (line->getLineStyle())
+      {
+      StylePtr style = factory->CreateStyle();
+      QString styleId = QString("LineStyle%1").arg(line->getId());
+      style->set_id(stdString(styleId));
+      style->set_linestyle(line->getLineStyle());
+      doc->add_styleselector(style);
+      QString styleUrl = QString("#").append(styleId);
+      linePlacemark->set_styleurl(stdString(styleUrl));
+      }
+
+    doc->add_feature(linePlacemark);
+    }
+
+  QTextStream out(&file);
+
+  if (out.status() == QTextStream::Ok)
+    {
+    out << qtString(kmldom::SerializePretty(kml));
+    return 0;
+    }
+  else
+    {
+    qDebug() << "Invalid text stream. Failed to write write KML";
+    return 1;
+    }
+}
diff --git a/Libraries/VvIO/vvKmlWriter.h b/Libraries/VvIO/vvKmlWriter.h
new file mode 100644
index 00000000..d2286fac
--- /dev/null
+++ b/Libraries/VvIO/vvKmlWriter.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvKmlWriter_h
+#define __vvKmlWriter_h
+
+#include <QList>
+
+#include <vgExport.h>
+
+class QFile;
+
+class vvKmlLine;
+
+//-----------------------------------------------------------------------------
+class VV_IO_EXPORT vvKmlWriter
+{
+public:
+  vvKmlWriter();
+  ~vvKmlWriter();
+
+  bool isEmpty() const;
+
+  vvKmlLine* createLine();
+
+  int write(QFile& file);
+
+protected:
+  QList<vvKmlLine*> Lines;
+};
+
+#endif
diff --git a/Libraries/VvIO/vvKstReader.cxx b/Libraries/VvIO/vvKstReader.cxx
new file mode 100644
index 00000000..c49ae379
--- /dev/null
+++ b/Libraries/VvIO/vvKstReader.cxx
@@ -0,0 +1,1077 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvKstReader.h"
+
+#include <QDebug>
+
+#include <qtKstReader.h>
+#include <qtStlUtil.h>
+
+#include "vvKstWriter.h"
+
+#define die(_msg) return this->abort(_msg)
+#define accept(_expr) do { _expr; return true; } while (0)
+
+#define test_or_fail(_cond) if (!(_cond)) return false
+#define test_or_die(_cond, _msg) if (!(_cond)) die(_msg)
+#define test_and_accept(_cond, _expr) if (_cond) accept(_expr)
+
+#define check_version(_name, _ver) \
+  if (version> _ver) \
+    die("Unable to read " _name " version " + QString::number(version) \
+        + ": latest recognized version is " + QString::number(_ver))
+
+#define BEGIN_MAP_FROM_STRING(_type, _str, _val) \
+  do { const QString _mfs_in = _str; _type &_mfs_out = _val; if (0)
+#define MAP_FROM_STRING(_str, _val) \
+  else if (_mfs_in == _str) _mfs_out = _val
+#define END_MAP_FROM_STRING(_expr) \
+  else { _expr; } } while (0)
+
+QTE_IMPLEMENT_D_FUNC(vvKstReader)
+
+//BEGIN vvKstReaderPrivate
+
+//-----------------------------------------------------------------------------
+class vvKstReaderPrivate
+{
+public:
+  QScopedPointer<qtKstReader> kst;
+  vvHeader header;
+
+  QString lastError;
+
+  bool abort(const QString&);
+
+  template <typename T>
+  bool read(T& result, vvHeader::FileType type, vvKstReader& q,
+            bool (vvKstReader::*method)(qtKstReader&, T&, unsigned int));
+  template <typename L, typename T>
+  bool read(L& list, qtKstReader& reader, vvKstReader& q, unsigned int version,
+            bool (vvKstReader::*method)(qtKstReader&, T&, unsigned int));
+
+  bool readColor(qtKstReader& reader, QColor& color,
+                 const QString& itemName, int value = -1);
+  bool readTimeStamp(qtKstReader& reader, vgTimeStamp& ts,
+                     const QString& itemName, int value = -1);
+  bool readImageBoundingBox(qtKstReader& reader, vvImageBoundingBox& box,
+                            const QString& itemName, int value = -1);
+  bool readTrackState(qtKstReader& reader, vvTrackState& state);
+  bool readDescriptorRegion(qtKstReader& reader, vvDescriptor& descriptor);
+  bool readGeoPoly(qtKstReader& reader, vgGeocodedPoly& poly,
+                   unsigned int version, QString* filterMode = 0);
+  bool readQueryCommonHeader(qtKstReader& reader, vvDatabaseQuery& query,
+                             unsigned int version);
+  bool readQueryCommonLimits(qtKstReader& reader, vvDatabaseQuery& query,
+                             unsigned int version);
+  bool setFilterMode(vvDatabaseQuery::IntersectionType& out, QString in);
+};
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::abort(const QString& error)
+{
+  qDebug() << "vvKstReader:" << qPrintable(error);
+  this->lastError = error;
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+bool vvKstReaderPrivate::read(
+  T& result, vvHeader::FileType type, vvKstReader& q,
+  bool (vvKstReader::*method)(qtKstReader&, T&, unsigned int))
+{
+  test_or_die(this->kst, "No data is available");
+  test_or_die(this->header.isValid(),
+              "Header is invalid or has not been read/set");
+  test_or_die(this->header.type == type,
+              "Header type does not match requested data type");
+
+  return (q.*method)(*this->kst, result, this->header.version);
+}
+
+//-----------------------------------------------------------------------------
+template <typename L, typename T>
+bool vvKstReaderPrivate::read(
+  L& list, qtKstReader& reader, vvKstReader& q, unsigned int version,
+  bool (vvKstReader::*method)(qtKstReader&, T&, unsigned int))
+{
+  test_or_die(reader.isValid(), "No data is available");
+  test_or_die(!reader.isEndOfFile(), "Read position is at end of data");
+
+  list.clear();
+  while (!reader.isEndOfFile())
+    {
+    // Read item
+    T item;
+    test_or_fail((q.*method)(reader, item, version));
+    list.push_back(item);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::readColor(
+  qtKstReader& reader, QColor& color, const QString& itemName, int value)
+{
+  long long rawValue;
+  test_or_die(reader.readLong(rawValue, value),
+              "Error reading " + itemName + " color");
+  color = QColor::fromRgba(static_cast<QRgb>(rawValue));
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::readTimeStamp(
+  qtKstReader& reader, vgTimeStamp& ts, const QString& itemName, int value)
+{
+  (value < 0) && (value = reader.currentValue());
+
+  long long frameNumber, timeCode;
+  test_or_die(reader.readLong(frameNumber, value),
+              "Error reading " + itemName + " frame number");
+  ts.FrameNumber = (frameNumber > 0
+                    ? static_cast<unsigned int>(frameNumber)
+                    : vgTimeStamp::InvalidFrameNumber());
+  test_or_die(reader.readLong(timeCode, value + 1),
+              "Error reading " + itemName + " time");
+  ts.Time = static_cast<double>(timeCode);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::readImageBoundingBox(
+  qtKstReader& reader, vvImageBoundingBox& box,
+  const QString& itemName, int value)
+{
+  qtKstReader boxReader;
+  test_or_die(reader.readTable(boxReader, value),
+              "Error reading " + itemName);
+  test_or_die(boxReader.readInt(box.TopLeft.Y, 0, 0),
+              "Error reading " + itemName + " top");
+  test_or_die(boxReader.readInt(box.TopLeft.X, 1, 0),
+              "Error reading " + itemName + " left");
+  test_or_die(boxReader.readInt(box.BottomRight.Y, 0, 1),
+              "Error reading " + itemName + " bottom");
+  test_or_die(boxReader.readInt(box.BottomRight.X, 1, 1),
+              "Error reading " + itemName + " right");
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::readTrackState(
+  qtKstReader& reader, vvTrackState& state)
+{
+  // Read timestamp
+  test_or_fail(
+    this->readTimeStamp(reader, state.TimeStamp, "track trajectory", 0));
+
+  // Read image point
+  test_or_die(reader.readReal(state.ImagePoint.X, 2),
+              "Error reading track trajectory image point X");
+  test_or_die(reader.readReal(state.ImagePoint.Y, 3),
+              "Error reading track trajectory image point Y");
+
+  // Read image box
+  test_or_fail(this->readImageBoundingBox(reader, state.ImageBox,
+                                          "track trajectory image box", 4));
+
+  // Read image object
+  if (!reader.isArrayEmpty(5))
+    {
+    qtKstReader tableReader;
+    test_or_die(reader.readTable(tableReader, 5),
+                "Error reading track trajectory image object point list");
+    while (!tableReader.isEndOfFile())
+      {
+      vvImagePointF pt;
+      test_or_die(tableReader.readReal(pt.X, 0),
+                  "Error reading track trajectory image object point X");
+      test_or_die(tableReader.readReal(pt.Y, 1),
+                  "Error reading track trajectory image object point Y");
+      state.ImageObject.push_back(pt);
+      tableReader.nextRecord();
+      }
+    }
+
+  // Read world location
+  if (!reader.isArrayEmpty(6))
+    {
+    qtKstReader arrayReader;
+    test_or_die(reader.readArray(arrayReader, 6),
+                "Error reading track trajectory world location");
+    test_or_die(arrayReader.readInt(state.WorldLocation.GCS, 0),
+                "Error reading track trajectory world location GCS");
+    test_or_die(arrayReader.readReal(state.WorldLocation.Northing, 1),
+                "Error reading track trajectory world location northing");
+    test_or_die(arrayReader.readReal(state.WorldLocation.Easting, 2),
+                "Error reading track trajectory world location easting");
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::readDescriptorRegion(
+  qtKstReader& reader, vvDescriptor& descriptor)
+{
+  while (!reader.isEndOfFile())
+    {
+    vvDescriptorRegionEntry re;
+
+    // Read entry time stamp
+    test_or_fail(this->readTimeStamp(reader, re.TimeStamp,
+                                     "descriptor region entry", 0));
+
+    // Read entry image region
+    test_or_fail(
+      this->readImageBoundingBox(reader, re.ImageRegion,
+                                 "descriptor region entry image region", 2));
+
+    // Continue to next record
+    descriptor.Region.insert(re);
+    reader.nextRecord();
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::readGeoPoly(
+  qtKstReader& reader, vgGeocodedPoly& poly, unsigned int version,
+  QString* filterMode)
+{
+  Q_UNUSED(version); // For now there is no difference
+
+  if (reader.isValueEmpty() || reader.isArrayEmpty())
+    {
+    poly.GCS = -1;
+    poly.Coordinate.clear();
+    filterMode && (*filterMode = "IGNORE", true);
+    return true;
+    }
+
+  qtKstReader boundReader;
+  test_or_die(reader.readArray(boundReader),
+              "Error reading geospatial polygon");
+
+  test_or_die(boundReader.readInt(poly.GCS, 0),
+              "Error reading geospatial polygon GCS");
+
+  // Read coordinate list
+  qtKstReader polyReader;
+  test_or_die(boundReader.readTable(polyReader, 1),
+              "Error reading geospatial polygon coordinate list");
+  poly.Coordinate.clear();
+  while (!polyReader.isEndOfFile())
+    {
+    // Read coordinate
+    vgGeoRawCoordinate coord;
+    test_or_die(polyReader.readReal(coord.Northing, 0),
+                "Error reading geospatial polygon coordinate northing");
+    test_or_die(polyReader.readReal(coord.Easting, 1),
+                "Error reading geospatial polygon coordinate easting");
+    poly.Coordinate.push_back(coord);
+
+    // Continue to next coordinate
+    polyReader.nextRecord();
+    }
+
+  if (filterMode)
+    {
+    test_and_accept(boundReader.isEndOfRecord(2),
+                    *filterMode = "CONTAINS_ANY");
+
+    test_or_die(boundReader.readString(*filterMode, 2),
+                "Error reading geospatial filter mode");
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::readQueryCommonHeader(
+  qtKstReader& reader, vvDatabaseQuery& query, unsigned int version)
+{
+  Q_UNUSED(version); // For now there is no difference
+
+  // Read query ID
+  QString string;
+  test_or_die(reader.readString(string, 0), "Error reading query ID");
+  query.QueryId = stdString(string);
+
+  // Read stream ID limit
+  if (!reader.isEndOfRecord(1))
+    {
+    test_or_die(reader.readString(string, 1),
+                "Error reading query stream ID limit");
+    query.StreamIdLimit = stdString(string);
+    }
+  else
+    {
+    query.StreamIdLimit = std::string();
+    }
+
+  return reader.nextRecord();
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::readQueryCommonLimits(
+  qtKstReader& reader, vvDatabaseQuery& query, unsigned int version)
+{
+  Q_UNUSED(version); // For now there is no difference
+
+  // Read result limits
+  if (!reader.isEndOfFile())
+    {
+    QString mode;
+    if (!(reader.isValueEmpty(0) || reader.isArrayEmpty(0)))
+      {
+      qtKstReader tkst;
+      test_or_die(reader.readArray(tkst, 0),
+                  "Error reading query temporal limit");
+      test_or_die(tkst.valueCount() >= 2 && tkst.valueCount() <= 3,
+                  "Error reading query temporal limit");
+      test_or_die(tkst.readLong(query.TemporalLowerLimit, 0),
+                  "Error reading query temporal lower limit");
+      test_or_die(tkst.readLong(query.TemporalUpperLimit, 1),
+                  "Error reading query temporal lower limit");
+      if (!tkst.isEndOfRecord(2))
+        {
+        test_or_die(tkst.readString(mode, 2),
+                    "Error reading query temporal filter mode");
+        test_or_fail(this->setFilterMode(query.TemporalFilter, mode));
+        }
+      }
+    else
+      {
+      query.TemporalFilter = vvDatabaseQuery::Ignore;
+      }
+
+    reader.seek(reader.currentRecord(), 1);
+    test_or_die(this->readGeoPoly(reader, query.SpatialLimit, 0, &mode),
+                "Error reading query geospatial limit");
+    if (!mode.isEmpty())
+      {
+      test_or_fail(this->setFilterMode(query.SpatialFilter, mode));
+      }
+    }
+
+  return reader.nextRecord();
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReaderPrivate::setFilterMode(
+  vvDatabaseQuery::IntersectionType& out, QString in)
+{
+  in = in.toUpper();
+
+  test_and_accept(in == "IGNORE",
+                  out = vvDatabaseQuery::Ignore);
+  test_and_accept(in == "CONTAINS_WHOLLY",
+                  out = vvDatabaseQuery::ContainsWholly);
+  test_and_accept(in == "CONTAINS_ANY",
+                  out = vvDatabaseQuery::ContainsAny);
+  test_and_accept(in == "INTERSECTS",
+                  out = vvDatabaseQuery::Intersects);
+  test_and_accept(in == "INTERSECTS_INBOUND",
+                  out = vvDatabaseQuery::IntersectsInbound);
+  test_and_accept(in == "INTERSECTS_OUTBOUND",
+                  out = vvDatabaseQuery::IntersectsOutbound);
+  test_and_accept(in == "DOES_NOT_CONTAIN",
+                  out = vvDatabaseQuery::DoesNotContain);
+
+  // No match
+  die("Unrecognized filter mode " + in);
+}
+
+//END vvKstReaderPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvKstReader general
+
+//-----------------------------------------------------------------------------
+vvKstReader::vvKstReader() : d_ptr(new vvKstReaderPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvKstReader::~vvKstReader()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::abort(const QString& error)
+{
+  QTE_D(vvKstReader);
+  return d->abort(error);
+}
+
+//-----------------------------------------------------------------------------
+QString vvKstReader::error()
+{
+  QTE_D(vvKstReader);
+  return d->lastError;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::open(const QUrl& uri, vvReader::Format format)
+{
+  test_or_die(format == Auto || format == Kst,
+              "Requested format not supported");
+
+  QString error;
+  test_or_die(this->open(uri, error), error);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::setInput(const QString& data, vvReader::Format format)
+{
+  test_or_die(format == Auto || format == Kst,
+              "Requested format not supported");
+
+  QTE_D(vvKstReader);
+  d->kst.reset(new qtKstReader(data));
+  if (!d->kst->isValid())
+    {
+    d->kst.reset();
+    return this->abort("Unable to parse KST");
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vvKstReader::setHeader(const vvHeader& header)
+{
+  QTE_D(vvKstReader);
+  d->header = header;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::rewind()
+{
+  QTE_D(vvKstReader);
+  return (d->kst && d->kst->seek());
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::advance()
+{
+  QTE_D(vvKstReader);
+  return (d->kst && d->kst->nextRecord());
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::atEnd() const
+{
+  QTE_D_CONST(vvKstReader);
+  return (!d->kst || d->kst->isEndOfFile());
+}
+
+//END vvKstReader general
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvKstReader struct readers
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readHeader(qtKstReader& reader, vvHeader& header)
+{
+  // Read type
+  QString type;
+  test_or_die(reader.isValid() && reader.readString(type),
+              "Unable to read header");
+
+  BEGIN_MAP_FROM_STRING(vvHeader::FileType, type, header.type);
+  MAP_FROM_STRING(vvHeader::TracksTag,        vvHeader::Tracks);
+  MAP_FROM_STRING(vvHeader::DescriptorsTag,   vvHeader::Descriptors);
+  MAP_FROM_STRING(vvHeader::QueryPlanTag,     vvHeader::QueryPlan);
+  MAP_FROM_STRING(vvHeader::QueryResultsTag,  vvHeader::QueryResults);
+  MAP_FROM_STRING(vvHeader::EventSetInfoTag,  vvHeader::EventSetInfo);
+  // For backwards compatibility, "ALERT" is considered to be EventSetInfo
+  MAP_FROM_STRING("ALERT",                    vvHeader::EventSetInfo);
+  END_MAP_FROM_STRING(die("Unrecognized file format " + type));
+
+  // Read version
+  int version = 0;
+  test_or_die(reader.isEndOfRecord(1) || reader.readInt(version, 1),
+              "Unable to read header");
+  header.version = version;
+
+  // Advance reader
+  test_or_die(reader.nextRecord(), "Unable to read header");
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readTrack(
+  qtKstReader& reader, vvTrack& track, unsigned int version)
+{
+  // Check that we understand the version
+  check_version("track", vvKstWriter::TracksVersion);
+
+  // Read track ID
+  qtKstReader tidReader;
+  test_or_die(reader.readArray(tidReader, 0), "Error reading track ID");
+  test_or_die(tidReader.readInt(track.Id.Source, 0),
+              "Error reading track source");
+  test_or_die(tidReader.readLong(track.Id.SerialNumber, 1),
+              "Error reading track serial number");
+
+  // Read track classification
+  if (!reader.isArrayEmpty(1))
+    {
+    qtKstReader tableReader;
+    test_or_die(reader.readTable(tableReader, 1),
+                "Error reading track classification");
+    while (!tableReader.isEndOfFile())
+      {
+      QString type;
+      double probability;
+      test_or_die(tableReader.readString(type, 0),
+                  "Error reading track classification entry type");
+      test_or_die(tableReader.readReal(probability, 1),
+                  "Error reading track classification entry probability");
+      track.Classification.insert(
+        std::make_pair(stdString(type), probability));
+      tableReader.nextRecord();
+      }
+    }
+
+  // Read track trajectory
+  if (!reader.isArrayEmpty(2))
+    {
+    QTE_D(vvKstReader);
+
+    qtKstReader tableReader;
+    test_or_die(reader.readTable(tableReader, 2),
+                "Error reading track trajectory");
+    while (!tableReader.isEndOfFile())
+      {
+      vvTrackState state;
+      test_or_fail(d->readTrackState(tableReader, state));
+      track.Trajectory.insert(state);
+      tableReader.nextRecord();
+      }
+    }
+
+  reader.nextRecord();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readDescriptor(
+  qtKstReader& reader, vvDescriptor& descriptor, unsigned int version)
+{
+  // Check that we understand the version
+  check_version("descriptor", vvKstWriter::DescriptorsVersion);
+
+  QString string;
+  QList<double> array;
+
+  // Read descriptor
+  test_or_die(reader.readString(string, 0),
+              "Error reading descriptor name");
+  descriptor.DescriptorName = stdString(string);
+  test_or_die(reader.readString(string, 1),
+              "Error reading descriptor module name");
+  descriptor.ModuleName = stdString(string);
+  test_or_die(reader.readLong(descriptor.InstanceId, 2),
+              "Error reading descriptor instance ID");
+  test_or_die(reader.readReal(descriptor.Confidence, 3),
+              "Error reading descriptor confidence");
+
+  // Read values
+  if (!(reader.isValueEmpty(4) || reader.isArrayEmpty(4)))
+    {
+    qtKstReader arrayReader;
+    test_or_die(reader.readArray(arrayReader, 4),
+                "Error reading descriptor values");
+    reader.nextValue();
+    while (!arrayReader.isEndOfRecord())
+      {
+      test_or_die(arrayReader.readRealArray(array),
+                  "Error reading descriptor values");
+      std::vector<float> a;
+      foreach (double v, array)
+        {
+        a.push_back(static_cast<float>(v));
+        }
+      descriptor.Values.push_back(a);
+      arrayReader.nextValue();
+      }
+    }
+
+  // Read region
+  if (!(reader.isValueEmpty(5) || reader.isArrayEmpty(5)))
+    {
+    qtKstReader tableReader;
+    test_or_die(reader.readTable(tableReader, 5),
+                "Error reading descriptor region");
+    QTE_D(vvKstReader);
+    test_or_fail(d->readDescriptorRegion(tableReader, descriptor));
+    }
+
+  // Read track ID's
+  if (!(reader.isValueEmpty(6) || reader.isArrayEmpty(6)))
+    {
+    qtKstReader tableReader;
+    test_or_die(reader.readTable(tableReader, 6),
+                "Error reading descriptor tracks");
+    while (!tableReader.isEndOfFile())
+      {
+      vvTrackId t;
+      test_or_die(tableReader.readInt(t.Source, 0),
+                  "Error reading descriptor track source");
+      test_or_die(tableReader.readLong(t.SerialNumber, 1),
+                  "Error reading descriptor track serial number");
+      descriptor.TrackIds.push_back(t);
+      tableReader.nextRecord();
+      }
+    }
+
+  reader.nextRecord();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readQueryPlan(
+  qtKstReader& reader, vvQueryInstance& query, unsigned int version)
+{
+  // Check that we understand the version
+  // NOTE: The query plan version was briefly changed to 2, before being
+  // changed again in a way that is incompatible with that format, but forwards
+  // compatible with v1 (which is again the current version). Temporarily
+  // accept plans marked v2.
+  check_version("query plan", 2);
+
+  // Read query type
+  QString type = "SIMILARITY";
+  if (version > 0)
+    {
+    test_or_die(reader.readString(type, 0), "Error reading query type");
+    reader.nextRecord();
+    type = type.toUpper();
+    }
+
+  // Hand off to type-specific reader
+  if (type == "RETRIEVAL")
+    {
+    vvRetrievalQuery rq;
+    test_and_accept(this->readQueryPlan(reader, rq, version), query = rq);
+    }
+  else if (type == "SIMILARITY")
+    {
+    vvSimilarityQuery sq;
+    test_and_accept(this->readQueryPlan(reader, sq, version), query = sq);
+    }
+  else
+    {
+    die("Unknown query type " + type);
+    }
+
+  // If we get here, reading the specific query type went wrong
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readQueryPlan(
+  qtKstReader& reader, vvRetrievalQuery& query, unsigned int version)
+{
+  // Check that we understand the version
+  // NOTE: The query plan version was briefly changed to 2, before being
+  // changed again in a way that is incompatible with that format, but forwards
+  // compatible with v1 (which is again the current version). Temporarily
+  // accept plans marked v2.
+  check_version("query plan", 2);
+
+  QTE_D(vvKstReader);
+
+  // Read abstract query (part 1)
+  test_or_fail(d->readQueryCommonHeader(reader, query, version));
+
+  // Read query entity type
+  QString entityType;
+  test_or_die(reader.readString(entityType),
+              "Error reading query retrieval entity type");
+
+  BEGIN_MAP_FROM_STRING(vvRetrievalQuery::EntityType, entityType.toUpper(),
+                        query.RequestedEntities);
+  MAP_FROM_STRING("TRACKS", vvRetrievalQuery::Tracks);
+  MAP_FROM_STRING("DESCRIPTORS", vvRetrievalQuery::Descriptors);
+  MAP_FROM_STRING("ALL", vvRetrievalQuery::TracksAndDescriptors);
+  END_MAP_FROM_STRING(
+    die("Unrecognized retrieval query entity type " + entityType));
+
+  // Read abstract query (part 2)
+  reader.nextRecord();
+  return d->readQueryCommonLimits(reader, query, version);
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readQueryPlan(
+  qtKstReader& reader, vvSimilarityQuery& query, unsigned int version)
+{
+  // Check that we understand the version
+  // NOTE: The query plan version was briefly changed to 2, before being
+  // changed again in a way that is incompatible with that format, but forwards
+  // compatible with v1 (which is again the current version). Temporarily
+  // accept plans marked v2.
+  check_version("query plan", 2);
+
+  QTE_D(vvKstReader);
+
+  // Read abstract query (part 1)
+  test_or_fail(d->readQueryCommonHeader(reader, query, version));
+
+  // Read query descriptors
+  qtKstReader descriptorReader;
+  test_or_die(reader.readTable(descriptorReader),
+              "Error reading query descriptors");
+  test_or_die(this->readDescriptors(descriptorReader, query.Descriptors, 0),
+              "Error reading query descriptors");
+
+  // Read query tracks, if present
+  reader.nextValue();
+  if (!reader.isEndOfRecord())
+    {
+    qtKstReader trackReader;
+    test_or_die(reader.readTable(trackReader),
+                "Error reading query tracks");
+    test_or_die(this->readTracks(trackReader, query.Tracks, 0),
+                "Error reading query tracks");
+    }
+
+  // Read abstract query (part 2)
+  reader.nextRecord();
+  test_or_fail(d->readQueryCommonLimits(reader, query, version));
+
+  // Read similarity threshold and IQR model, if present
+  if (!reader.isEndOfFile())
+    {
+    test_or_die(reader.readReal(query.SimilarityThreshold, 0),
+                "Error reading query similarity threshold");
+    if (!reader.isEndOfRecord(1))
+      {
+      // Read IQR model
+      QString encodedModel;
+      test_or_die(reader.readString(encodedModel, 1),
+                  "Error reading query IQR model");
+      QByteArray model = QByteArray::fromBase64(encodedModel.toAscii());
+
+      // Convert to std::vector<uchar>... oh, the pain...
+      const uchar* rawModel =
+        reinterpret_cast<const uchar*>(model.constData());
+      int n = model.size();
+      query.IqrModel.resize(n);
+      while (n--)
+        {
+        query.IqrModel[n] = rawModel[n];
+        }
+      reader.nextRecord();
+      }
+    else
+      {
+      query.SimilarityThreshold = 0.0;
+      }
+    }
+
+  // NOTE: This code for reading v2 tracks should be temporary; nothing is
+  // going to write tracks in this way. (The old v2 writer code was also
+  // broken; this will only read a single track.)
+  if (version == 2 && !reader.isEndOfFile())
+    {
+    qtKstReader trackReader;
+    test_or_die(reader.readTable(trackReader),
+                "Error reading query tracks");
+    test_or_die(this->readTracks(trackReader, query.Tracks, 0),
+                "Error reading query tracks");
+    reader.nextRecord();
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readQueryResult(
+  qtKstReader& reader, vvQueryResult& result, unsigned int version)
+{
+  // Check that we understand the version
+  check_version("query result", vvKstWriter::QueryResultsVersion);
+
+  int vi = 0;
+  QString string;
+
+  // Read result
+  test_or_die(reader.readString(string, vi++),
+              "Error reading result mission ID");
+  result.MissionId = stdString(string);
+
+  if (version > 0)
+    {
+    test_or_die(reader.readString(string, vi++),
+                "Error reading result query ID");
+    result.QueryId = stdString(string);
+    test_or_die(reader.readString(string, vi++),
+                "Error reading result stream ID");
+    result.StreamId = stdString(string);
+    test_or_die(reader.readLong(result.InstanceId, vi++),
+                "Error reading result instance ID");
+    }
+
+  test_or_die(reader.readLong(result.StartTime, vi++),
+              "Error reading result time range");
+  test_or_die(reader.readLong(result.EndTime, vi++),
+              "Error reading result time range");
+
+  int userScore = -1;
+  if (version > 1)
+    {
+    // Read location
+    if (!reader.isArrayEmpty(vi))
+      {
+      qtKstReader arrayReader;
+      test_or_die(reader.readArray(arrayReader, vi),
+                  "Error reading result location");
+      test_or_die(arrayReader.readInt(result.Location.GCS, 0),
+                  "Error reading result location GCS");
+      test_or_die(arrayReader.readReal(result.Location.Easting, 1),
+                  "Error reading result location easting");
+      test_or_die(arrayReader.readReal(result.Location.Northing, 2),
+                  "Error reading result location northing");
+      }
+    ++vi;
+
+    // Read score
+    if (!reader.isArrayEmpty(vi))
+      {
+      qtKstReader arrayReader;
+      test_or_die(reader.readArray(arrayReader, vi),
+                  "Error reading result score");
+      test_or_die(arrayReader.readLong(result.Rank, 0),
+                  "Error reading result rank");
+      test_or_die(arrayReader.readReal(result.RelevancyScore, 1),
+                  "Error reading result relevancy");
+      test_or_die(arrayReader.readInt(userScore, 2),
+                  "Error reading result user classification");
+      // Read user flags
+      if (!arrayReader.isEndOfRecord(3))
+        {
+        int flags;
+        test_or_die(arrayReader.readInt(flags, 3),
+                    "Error reading result user flags");
+        result.UserData.Flags = static_cast<vvUserData::Flag>(flags);
+        }
+      }
+    ++vi;
+    }
+  else
+    {
+    // Read location
+    test_or_die(reader.readInt(result.Location.GCS, vi++),
+                "Error reading result GCS");
+    test_or_die(reader.readReal(result.Location.Easting, vi++),
+                "Error reading result easting");
+    test_or_die(reader.readReal(result.Location.Northing, vi++),
+                "Error reading result northing");
+
+    // Read score
+    test_or_die(reader.readReal(result.RelevancyScore, vi++),
+                "Error reading result relevancy score");
+    test_or_die(reader.readInt(userScore, vi++),
+                "Error reading result user score");
+    result.Rank = -1; // rank not available
+    }
+
+  // Translate user score to enum value
+  switch (userScore)
+    {
+    case static_cast<int>(vvIqr::PositiveExample):
+      result.UserScore = vvIqr::PositiveExample;
+      break;
+    case static_cast<int>(vvIqr::NegativeExample):
+      result.UserScore = vvIqr::NegativeExample;
+      break;
+    default:
+      result.UserScore = vvIqr::UnclassifiedExample;
+      break;
+    }
+
+  // Read descriptors
+  if (!(reader.isValueEmpty(vi) || reader.isArrayEmpty(vi)))
+    {
+    qtKstReader descriptorReader;
+    test_or_die(reader.readTable(descriptorReader, vi),
+                "Error reading result descriptors");
+    const bool okay =
+      this->readDescriptors(descriptorReader, result.Descriptors, 0);
+    test_or_die(okay, "Error reading result descriptors");
+    }
+  ++vi;
+
+  // Read tracks
+  if (!(reader.isValueEmpty(vi) || reader.isArrayEmpty(vi)))
+    {
+    qtKstReader trackReader;
+    test_or_die(reader.readTable(trackReader, vi),
+                "Error reading result tracks");
+    test_or_die(this->readTracks(trackReader, result.Tracks, 0),
+                "Error reading result tracks");
+    }
+  ++vi;
+
+  // Read user notes
+  if (!reader.isEndOfRecord(vi))
+    {
+    QString notes;
+    test_or_die(reader.readString(notes, vi++),
+                "Error reading result user notes");
+    result.UserData.Notes = stdString(notes);
+    }
+
+  reader.nextRecord();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readGeoPoly(
+  qtKstReader& reader, vgGeocodedPoly& poly, unsigned int version,
+  vvDatabaseQuery::IntersectionType* filterMode)
+{
+  // Check that we understand the version
+  check_version("geo-poly", vvKstWriter::GeoPolyVersion);
+
+  QTE_D(vvKstReader);
+  if (filterMode)
+    {
+    QString mode;
+    test_or_fail(d->readGeoPoly(reader, poly, version, &mode));
+    test_or_fail(d->setFilterMode(*filterMode, mode));
+    }
+  else
+    {
+    test_or_fail(d->readGeoPoly(reader, poly, version));
+    }
+
+  reader.nextRecord();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readEventSetInfo(
+  qtKstReader& reader, vvEventSetInfo& info, unsigned int version)
+{
+  // Check that we understand the version
+  check_version("event set info", vvKstWriter::GeoPolyVersion);
+
+  QTE_D(vvKstReader);
+
+  // Read name and colors
+  test_or_die(reader.readString(info.Name, 0),
+              "Error reading event set name");
+  test_or_fail(d->readColor(reader, info.PenColor,
+                            "event set pen", 1));
+  test_or_fail(d->readColor(reader, info.ForegroundColor,
+                            "event set foreground", 2));
+  test_or_fail(d->readColor(reader, info.BackgroundColor,
+                            "event set background", 3));
+
+  // Check for threshold (will be missing in old alerts)
+  if (!reader.isEndOfRecord(4))
+    {
+    // Read threshold
+    test_or_die(reader.readReal(info.DisplayThreshold, 4),
+                "Error reading event set display threshold");
+    }
+  else
+    {
+    // If no threshold present, use 0.0
+    info.DisplayThreshold = 0.0;
+    }
+
+  reader.nextRecord();
+  return true;
+}
+
+//END vvKstReader struct readers
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvKstReader bound data readers
+#define vvKstReader_Implement_Read(_name, _type, _htype) \
+  bool vvKstReader::read##_name(_type& data) \
+  { \
+    QTE_D(vvKstReader); \
+    bool (vvKstReader::*method)(qtKstReader&, _type&, unsigned int) = \
+      &vvKstReader::read##_name; \
+    return d->read(data, vvHeader::_htype, *this, method); \
+  }
+
+vvKstReader_Implement_Read(Track,         vvTrack,            Tracks)
+vvKstReader_Implement_Read(Descriptor,    vvDescriptor,       Descriptors)
+vvKstReader_Implement_Read(QueryPlan,     vvQueryInstance,    QueryPlan)
+vvKstReader_Implement_Read(QueryPlan,     vvRetrievalQuery,   QueryPlan)
+vvKstReader_Implement_Read(QueryPlan,     vvSimilarityQuery,  QueryPlan)
+vvKstReader_Implement_Read(QueryResult,   vvQueryResult,      QueryResults)
+vvKstReader_Implement_Read(EventSetInfo,  vvEventSetInfo,     EventSetInfo)
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readHeader(vvHeader& header)
+{
+  QTE_D(vvKstReader);
+
+  test_or_die(d->kst, "No data is available");
+  if (this->readHeader(*d->kst, header))
+    {
+    d->header = header;
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vvKstReader::readGeoPoly(
+  vgGeocodedPoly& poly, vvDatabaseQuery::IntersectionType* filterMode)
+{
+  QTE_D(vvKstReader);
+
+  test_or_die(d->kst, "No data is available");
+  return this->readGeoPoly(*d->kst, poly, d->header.version, filterMode);
+}
+
+//END vvKstReader bound data readers
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvKstReader array helpers
+
+#define vvKstReader_Implement_ReadTypedArray(_name, _type, _list) \
+  bool vvKstReader::read##_name##s( \
+    qtKstReader& reader, _list<_type>& list, unsigned int version) \
+  { \
+    QTE_D(vvKstReader); \
+    bool (vvKstReader::*method)(qtKstReader&, _type&, unsigned int) = \
+      &vvKstReader::read##_name; \
+    return d->read(list, reader, *this, version, method); \
+  }
+
+#define vvKstReader_Implement_ReadArray(_name, _type) \
+  vvKstReader_Implement_Read(_name##s, QList<_type>, _name##s) \
+  vvKstReader_Implement_Read(_name##s, std::vector<_type>, _name##s) \
+  vvKstReader_Implement_ReadTypedArray(_name, _type, std::vector) \
+  vvKstReader_Implement_ReadTypedArray(_name, _type, QList)
+
+vvKstReader_Implement_ReadArray(Track, vvTrack)
+vvKstReader_Implement_ReadArray(Descriptor, vvDescriptor)
+vvKstReader_Implement_ReadArray(QueryResult, vvQueryResult)
+
+//END vvKstReader array helpers
diff --git a/Libraries/VvIO/vvKstReader.h b/Libraries/VvIO/vvKstReader.h
new file mode 100644
index 00000000..08947867
--- /dev/null
+++ b/Libraries/VvIO/vvKstReader.h
@@ -0,0 +1,119 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvKstReader_h
+#define __vvKstReader_h
+
+#include <vgExport.h>
+
+#include "vvReader.h"
+
+class qtKstReader;
+
+class vvKstReaderPrivate;
+
+class VV_IO_EXPORT vvKstReader : public vvReader
+{
+public:
+  vvKstReader();
+  virtual ~vvKstReader();
+
+  virtual QString error();
+
+  // Data binding
+  virtual bool open(const QUrl&, Format format = Kst);
+  virtual bool setInput(const QString&, Format format = Kst);
+
+  virtual void setHeader(const vvHeader&);
+
+  // Random access
+  virtual bool rewind();
+  virtual bool advance();
+  virtual bool atEnd() const;
+
+  // Bound data readers
+  virtual bool readHeader(vvHeader& header);
+
+  virtual bool readTrack(vvTrack& track);
+  virtual bool readDescriptor(vvDescriptor& descriptor);
+
+  virtual bool readQueryPlan(vvQueryInstance& query);
+  virtual bool readQueryPlan(vvRetrievalQuery& query);
+  virtual bool readQueryPlan(vvSimilarityQuery& query);
+
+  virtual bool readQueryResult(vvQueryResult& result);
+
+  virtual bool readGeoPoly(vgGeocodedPoly& poly,
+                           vvDatabaseQuery::IntersectionType* filterMode = 0);
+
+  virtual bool readEventSetInfo(vvEventSetInfo& info);
+
+  // External data readers
+  bool readHeader(qtKstReader& reader, vvHeader& header);
+
+  bool readTrack(qtKstReader& reader,
+                 vvTrack& track,
+                 unsigned int version);
+
+  bool readDescriptor(qtKstReader& reader,
+                      vvDescriptor& descriptor,
+                      unsigned int version);
+
+  bool readQueryPlan(qtKstReader& reader,
+                     vvQueryInstance& query,
+                     unsigned int version);
+
+  bool readQueryPlan(qtKstReader& reader,
+                     vvRetrievalQuery& query,
+                     unsigned int version);
+
+  bool readQueryPlan(qtKstReader& reader,
+                     vvSimilarityQuery& query,
+                     unsigned int version);
+
+  bool readQueryResult(qtKstReader& reader,
+                       vvQueryResult& result,
+                       unsigned int version);
+
+  bool readGeoPoly(qtKstReader& reader,
+                   vgGeocodedPoly& poly,
+                   unsigned int version,
+                   vvDatabaseQuery::IntersectionType* filterMode = 0);
+
+  bool readEventSetInfo(qtKstReader& reader,
+                        vvEventSetInfo& info,
+                        unsigned int version);
+
+  // Array helpers
+#define vvKstReader_ReadArray(_name, _type) \
+  virtual bool read##_name(std::vector<_type>& list); \
+  virtual bool read##_name(QList<_type>& list); \
+  bool read##_name(qtKstReader& reader, \
+                   std::vector<_type>& list, \
+                   unsigned int version); \
+  bool read##_name(qtKstReader& reader, \
+                   QList<_type>& list, \
+                   unsigned int version)
+
+  vvKstReader_ReadArray(Tracks, vvTrack);
+  vvKstReader_ReadArray(Descriptors, vvDescriptor);
+  vvKstReader_ReadArray(QueryResults, vvQueryResult);
+
+#undef vvKstReader_ReadArray
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvKstReader)
+
+  using vvReader::open;
+
+  bool abort(const QString&);
+
+private:
+  QTE_DECLARE_PRIVATE(vvKstReader)
+  Q_DISABLE_COPY(vvKstReader)
+};
+
+#endif
diff --git a/Libraries/VvIO/vvKstWriter.cxx b/Libraries/VvIO/vvKstWriter.cxx
new file mode 100644
index 00000000..febc5244
--- /dev/null
+++ b/Libraries/VvIO/vvKstWriter.cxx
@@ -0,0 +1,768 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtStlUtil.h>
+
+#include "vvKstWriter.h"
+
+QTE_IMPLEMENT_D_FUNC(vvKstWriter)
+
+//-----------------------------------------------------------------------------
+const unsigned int vvKstWriter::TracksVersion = 0;
+const unsigned int vvKstWriter::DescriptorsVersion = 0;
+const unsigned int vvKstWriter::QueryPlanVersion = 1;
+const unsigned int vvKstWriter::QueryResultsVersion = 2;
+const unsigned int vvKstWriter::EventSetInfoVersion = 0;
+const unsigned int vvKstWriter::GeoPolyVersion = 0;
+
+//-----------------------------------------------------------------------------
+class vvKstWriterPrivate
+{
+public:
+  enum Part
+    {
+    Record,
+    Array,
+    Value,
+    String,
+    None
+    };
+
+  vvKstWriterPrivate(QTextStream*, bool pretty, bool free);
+  ~vvKstWriterPrivate() { if (this->freeStream) delete this->stream; }
+
+  QTextStream* stream;
+  bool freeStream;
+
+  bool pretty;
+  Part part;
+  unsigned int indent;
+  unsigned int arrayCount;
+};
+
+//-----------------------------------------------------------------------------
+vvKstWriterPrivate::vvKstWriterPrivate(
+  QTextStream* stream, bool pretty, bool free)
+  : stream(stream), freeStream(free), pretty(pretty),
+    part(None), indent(0), arrayCount(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter::vvKstWriter(QFile& file, bool pretty)
+  : d_ptr(new vvKstWriterPrivate(new QTextStream(&file), pretty, true))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter::vvKstWriter(QTextStream& stream, bool pretty)
+  : d_ptr(new vvKstWriterPrivate(&stream, pretty, false))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter::~vvKstWriter()
+{
+  QTE_D(vvKstWriter);
+
+  // Terminate open strings
+  *this << EndValue;
+
+  // Terminate open arrays
+  while (d->arrayCount)
+    {
+    *this << EndArray;
+    }
+
+  // Terminate record
+  *this << (d->part == vvKstWriterPrivate::Value ? EndRecord : NoOp);
+}
+
+//-----------------------------------------------------------------------------
+#define RECT_HEAD       "{ Top, Left }, { Bottom, Right }"
+#define TRACK_ID_HEAD   " Source, Serial Number"
+
+#define DESCRIPTOR_HEAD_1   "Descriptor name, Module name, Instance ID," \
+                            " Confidence, Values, Region, Track ID's"
+#define DESCRIPTOR_HEAD_2   " Frame Number, Time, Image Region" \
+                            " { " RECT_HEAD " }"
+#define DESCRIPTOR_HEAD_3   TRACK_ID_HEAD
+
+#define TRACK_HEAD_1    "Track ID, Classification Entries, Trajectory States"
+#define TRACK_HEAD_2    TRACK_ID_HEAD
+#define TRACK_HEAD_3    " Type, Probability"
+#define TRACK_HEAD_4    " Frame Number, Time, Image Point X, Image Point Y,"
+#define TRACK_HEAD_5    " Image Box, Image Object Points, World Location"
+#define TRACK_HEAD_6    "  " RECT_HEAD
+#define TRACK_HEAD_7    "  X, Y"
+#define TRACK_HEAD_8    "  [ GCS, Easting, Northing ]"
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(vvHeader::FileType fileType)
+{
+  switch (fileType)
+    {
+    case vvHeader::Tracks:
+      *this << BeginValue << vvHeader::TracksTag << EndRecord
+            << Comment << TRACK_HEAD_1 << NewLine
+            << Comment << TRACK_HEAD_2 << NewLine
+            << Comment << TRACK_HEAD_3 << NewLine
+            << Comment << TRACK_HEAD_4 << NewLine
+            << Comment << TRACK_HEAD_5 << NewLine
+            << Comment << TRACK_HEAD_6 << NewLine
+            << Comment << TRACK_HEAD_7 << NewLine
+            << Comment << TRACK_HEAD_8 << NewLine;
+      break;
+    case vvHeader::Descriptors:
+      *this << BeginValue << vvHeader::DescriptorsTag << EndRecord
+            << Comment << DESCRIPTOR_HEAD_1 << NewLine
+            << Comment << DESCRIPTOR_HEAD_2 << NewLine
+            << Comment << DESCRIPTOR_HEAD_3 << NewLine;
+      break;
+    case vvHeader::QueryPlan:
+      *this << BeginValue << vvHeader::QueryPlanTag
+            << BeginValue << vvKstWriter::QueryPlanVersion << EndRecord
+            << Comment << "Query Type" << NewLine
+            << Comment << "Query ID [, Stream ID Limit ]" << NewLine
+            << Comment << "Descriptors [, Tracks ] | Entity Type" << NewLine
+            << Comment << " " DESCRIPTOR_HEAD_1 << NewLine
+            << Comment << " " DESCRIPTOR_HEAD_2 << NewLine
+            << Comment << " " DESCRIPTOR_HEAD_3 << NewLine
+            << Comment << " " TRACK_HEAD_1 << NewLine
+            << Comment << " " TRACK_HEAD_2 << NewLine
+            << Comment << " " TRACK_HEAD_3 << NewLine
+            << Comment << " " TRACK_HEAD_4 << NewLine
+            << Comment << " " TRACK_HEAD_5 << NewLine
+            << Comment << " " TRACK_HEAD_6 << NewLine
+            << Comment << " " TRACK_HEAD_7 << NewLine
+            << Comment << " " TRACK_HEAD_8 << NewLine
+            << Comment << "{ [ Temporal Lower, Temporal Upper"
+                          " [, Temporal Filter ] ] }," << NewLine
+            << Comment << "{ [ GCS, Geospatial Limit Points"
+                          " [, Geospatial Filter ] ] }" << NewLine
+            << Comment << "  { Easting, Northing }" << NewLine
+            << Comment << "[ Similarity Threshold, [ IQR Model ] ]" << NewLine;
+      break;
+    case vvHeader::QueryResults:
+      *this << BeginValue << vvHeader::QueryResultsTag
+            << BeginValue << vvKstWriter::QueryResultsVersion << EndRecord
+            << Comment << "Mission ID, Query ID, Stream ID, Instance ID,"
+                          " Start time, End time," << NewLine
+            << Comment << "Location, Score, Descriptors, Tracks"
+                          " [, User Notes ]" << NewLine
+            << Comment << " GCS, Easting, Northing" << NewLine
+            << Comment << " Rank, Relevancy, User Classification,"
+                          " User Flags" << NewLine
+            << Comment << " " DESCRIPTOR_HEAD_1 << NewLine
+            << Comment << " " DESCRIPTOR_HEAD_2 << NewLine
+            << Comment << " " DESCRIPTOR_HEAD_3 << NewLine;
+      break;
+    case vvHeader::EventSetInfo:
+      *this << BeginValue << vvHeader::EventSetInfoTag << EndRecord
+            << Comment << "Name, Pen Color, Foreground Color,"
+                          " Background Color, Initial Filter Threshold"
+                       << NewLine;
+      break;
+    default:
+      break;
+    }
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(vvKstWriter::Marker marker)
+{
+  QTE_D(vvKstWriter);
+
+  if (d->part == vvKstWriterPrivate::String)
+    {
+    d->part = vvKstWriterPrivate::Value;
+    *this << '"';
+    }
+
+  switch (marker)
+    {
+    case EndValue:
+      // Any marker ends a value, so this is essentially a no-op... useful for
+      // things like '(condition ? NewLine : EndValue)'
+    case NoOp:
+      break;
+
+    case NewLine:
+      if (d->part == vvKstWriterPrivate::Value)
+        {
+        *this << ',';
+        }
+      if (d->part != vvKstWriterPrivate::None)
+        {
+        d->indent = qMax(d->indent, 1u);
+        d->part = vvKstWriterPrivate::Record;
+        }
+      if (d->pretty)
+        {
+        *this << '\n' << QString(d->indent * 2, ' ');
+        }
+      break;
+
+    case BeginRecord:
+      if (d->part != vvKstWriterPrivate::None)
+        {
+        *this << EndRecord;
+        }
+      d->part = vvKstWriterPrivate::Record;
+      break;
+
+    case EndRecord:
+      while (d->arrayCount)
+        {
+        *this << EndArray;
+        }
+      if (d->pretty)
+        {
+        *this << ";\n";
+        }
+      else
+        {
+        *this << ';';
+        }
+      d->part = vvKstWriterPrivate::None;
+      d->indent = 0;
+      break;
+
+    case BeginArray:
+      *this << BeginValue << '[';
+      ++d->arrayCount;
+      ++d->indent;
+      d->part = vvKstWriterPrivate::Array;
+      break;
+
+    case EndArray:
+      if (!d->arrayCount)
+        {
+        break;
+        }
+      if (d->part == vvKstWriterPrivate::Value && d->pretty)
+        {
+        *this << ' ';
+        }
+      *this << ']';
+      --d->indent;
+      --d->arrayCount;
+      d->part = vvKstWriterPrivate::Value;
+      break;
+
+    case EndArrayNewLine:
+      if (!d->arrayCount)
+        {
+        break;
+        }
+      if (d->pretty)
+        {
+        *this << '\n' << QString(d->indent * 2, ' ');
+        }
+      *this << ']';
+      --d->indent;
+      --d->arrayCount;
+      d->part = vvKstWriterPrivate::Value;
+      break;
+
+    case BeginValue:
+      if (d->part == vvKstWriterPrivate::Value)
+        {
+        if (d->pretty)
+          {
+          *this << ", ";
+          }
+        else
+          {
+          *this << ',';
+          }
+        }
+      else if (d->part == vvKstWriterPrivate::Array && d->pretty)
+        {
+        *this << ' ';
+        }
+      d->part = vvKstWriterPrivate::Value;
+      break;
+
+    case BeginString:
+      *this << BeginValue << '"';
+      d->part = vvKstWriterPrivate::String;
+      break;
+
+    case Comment:
+      *this << "# ";
+      break;
+    }
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vvTrack& track)
+{
+  // Write ID
+  *this << track.Id << NewLine;
+
+  // Write classification
+  *this << BeginArray;
+  int n = 0;
+  typedef vvTrackObjectClassification::const_iterator ClassificationIterator;
+  foreach_iter (ClassificationIterator, iter, track.Classification)
+    {
+    *this << (n ? NewLine : NoOp) << BeginArray
+          << BeginString << iter->first
+          << BeginValue << iter->second
+          << EndArray;
+    ++n;
+    }
+  *this << EndArray << NewLine;
+
+  // Write trajectory
+  *this << BeginArray;
+  n = 0;
+  foreach_iter (vvTrackTrajectory::const_iterator, iter, track.Trajectory)
+    {
+    *this << (n ? NewLine : NoOp) << *iter;
+    ++n;
+    }
+  *this << (n ? EndArrayNewLine : EndArray);
+
+  // Terminate record, unless this is an array
+  QTE_D(vvKstWriter);
+  *this << (!d->arrayCount ? EndRecord : EndValue);
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vvDescriptor& descriptor)
+{
+  size_t i;
+
+  // Write descriptor header
+  *this << BeginString << descriptor.DescriptorName
+        << BeginString << descriptor.ModuleName
+        << BeginValue << descriptor.InstanceId
+        << BeginValue << descriptor.Confidence
+        << NewLine;
+
+  // Write descriptor values
+  *this << BeginArray;
+  for (i = 0; i < descriptor.Values.size(); ++i)
+    {
+    *this << (i ? NewLine : NoOp) << BeginArray;
+    for (size_t j = 0; j < descriptor.Values[i].size(); ++j)
+      {
+      *this << BeginValue << descriptor.Values[i][j];
+      }
+    *this << EndArray;
+    }
+  *this << EndArray << NewLine;
+
+  // Write descriptor image regions
+  *this << BeginArray;
+  foreach_iter (vvDescriptorRegionMap::const_iterator, iter, descriptor.Region)
+    {
+    *this << (iter != descriptor.Region.begin() ? NewLine : NoOp)
+          << BeginArray << BeginValue;
+    (iter->TimeStamp.HasFrameNumber()
+     ? *this << iter->TimeStamp.FrameNumber
+     : *this << -1);
+    *this << BeginValue << static_cast<long long>(iter->TimeStamp.Time)
+          << iter->ImageRegion
+          << EndArray;
+    }
+  *this << EndArray << NewLine;
+
+  // Write descriptor tracks
+  *this << BeginArray;
+  for (i = 0; i < descriptor.TrackIds.size(); ++i)
+    {
+    *this << descriptor.TrackIds[i];
+    }
+  *this << EndArray;
+
+
+  // Terminate record, unless this is an array
+  QTE_D(vvKstWriter);
+  *this << (!d->arrayCount ? EndRecord : EndValue);
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vvQueryInstance& query)
+{
+  if (query.isRetrievalQuery())
+    {
+    *this << "RETRIEVAL" << EndRecord;
+    *this << *query.constRetrievalQuery();
+    }
+  else if (query.isSimilarityQuery())
+    {
+    *this << "SIMILARITY" << EndRecord;
+    *this << *query.constSimilarityQuery();
+    }
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vvRetrievalQuery& query)
+{
+  // Write query ID
+  *this << BeginString << query.QueryId;
+  if (!query.StreamIdLimit.empty())
+    {
+    *this << NewLine << BeginString << query.StreamIdLimit;
+    }
+  *this << EndRecord;
+
+  // Write retrieval entity type
+  switch (query.RequestedEntities)
+    {
+    case vvRetrievalQuery::Tracks:
+      *this << BeginValue << "TRACKS" << EndRecord;
+      break;
+    case vvRetrievalQuery::Descriptors:
+      *this << BeginValue << "TRACKS" << EndRecord;
+      break;
+    default:
+      *this << BeginValue << "ALL" << EndRecord;
+      break;
+    }
+
+  // Write temporal and geospatial limits
+  *this << static_cast<const vvDatabaseQuery&>(query);
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vvSimilarityQuery& query)
+{
+  size_t n;
+
+  // Write query ID
+  *this << BeginString << query.QueryId;
+  if (!query.StreamIdLimit.empty())
+    {
+    *this << NewLine << BeginString << query.StreamIdLimit;
+    }
+  *this << EndRecord;
+
+  // Write descriptors and tracks
+  *this << BeginArray;
+  for (n = 0; n < query.Descriptors.size(); ++n)
+    {
+    *this << NewLine << BeginArray << query.Descriptors[n];
+    *this << EndArray;
+    }
+  if (!query.Tracks.empty())
+    {
+    *this << EndArray << NewLine << BeginArray;
+    for (n = 0; n < query.Tracks.size(); ++n)
+      {
+      *this << NewLine << BeginArray << query.Tracks[n];
+      *this << EndArray;
+      }
+    }
+  *this << EndRecord;
+
+  // Write temporal and geospatial limits
+  *this << static_cast<const vvDatabaseQuery&>(query);
+
+  // Write similarity
+  *this << BeginValue << query.SimilarityThreshold;
+
+  // Convert IQR model from std::vector<uchar>
+  const char* rawModel =
+    reinterpret_cast<const char*>(
+      query.IqrModel.empty() ? 0 : &query.IqrModel[0]);
+  const int modelSize = static_cast<int>(query.IqrModel.size());
+  const QByteArray model = QByteArray::fromRawData(rawModel, modelSize);
+
+  // Write IQR model
+  *this << BeginValue << '\"' << model.toBase64().constData() << '\"'
+        << EndRecord;
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vvQueryResult& result)
+{
+  size_t n, k;
+
+  // Write out result header
+  *this << BeginString << result.MissionId
+        << BeginString << result.QueryId << NewLine
+        << BeginString << result.StreamId << NewLine
+        << BeginValue << result.InstanceId
+        << BeginValue << result.StartTime
+        << BeginValue << result.EndTime << NewLine;
+  *this << BeginArray
+        << BeginValue << result.Location.GCS
+        << BeginValue << result.Location.Easting
+        << BeginValue << result.Location.Northing
+        << EndArray;
+  *this << BeginArray
+        << BeginValue << result.Rank
+        << BeginValue << result.RelevancyScore
+        << BeginValue << static_cast<int>(result.UserScore)
+        << BeginValue << static_cast<int>(result.UserData.Flags)
+        << EndArray;
+
+  // Write out descriptors
+  *this << NewLine << BeginArray;
+  for (n = 0, k = result.Descriptors.size(); n < k; ++n)
+    {
+    *this << NewLine << BeginArray << result.Descriptors[n];
+    *this << EndArray;
+    }
+  *this << EndArrayNewLine;
+
+  // Write out tracks
+  *this << BeginArray;
+  for (n = 0, k = result.Tracks.size(); n < k; ++n)
+    {
+    *this << NewLine << BeginArray << result.Tracks[n];
+    *this << EndArray;
+    }
+  *this << (result.Tracks.empty() ? EndArray : EndArrayNewLine);
+
+  // Write out notes
+  if (!result.UserData.Notes.empty())
+    {
+    *this << BeginString << result.UserData.Notes;
+    }
+
+  *this << EndRecord;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vgGeocodedPoly& poly)
+{
+  return *this << vvSpatialFilter(poly);
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vvSpatialFilter& sf)
+{
+  *this << BeginArray;
+  if (sf.poly.Coordinate.size())
+    {
+    *this << BeginValue << sf.poly.GCS << NewLine << BeginArray;
+    for (size_t n = 0; n < sf.poly.Coordinate.size(); ++n)
+      {
+      const vgGeoRawCoordinate& coord = sf.poly.Coordinate[n];
+      *this << (n ? NewLine : NoOp)
+            << BeginArray
+            << BeginValue << coord.Northing
+            << BeginValue << coord.Easting
+            << EndArray;
+      }
+    *this << EndArray;
+    if (sf.filter)
+      {
+      *this << NewLine << BeginValue << *sf.filter;
+      }
+    }
+  *this << EndArray;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvKstWriter::operator<<(const vvEventSetInfo& info)
+{
+  *this << BeginString << info.Name
+        << BeginValue << info.PenColor
+        << BeginValue << info.ForegroundColor
+        << BeginValue << info.BackgroundColor
+        << BeginValue << info.DisplayThreshold
+        << EndRecord;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(const vvImageBoundingBox& box)
+{
+  *this << BeginArray << BeginArray
+        << BeginValue << box.TopLeft.Y
+        << BeginValue << box.TopLeft.X
+        << EndArray << BeginArray
+        << BeginValue << box.BottomRight.Y
+        << BeginValue << box.BottomRight.X
+        << EndArray << EndArray;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(const vvTrackId& tid)
+{
+  *this << BeginArray
+        << BeginValue << tid.Source << BeginValue << tid.SerialNumber
+        << EndArray;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(const vvTrackState& state)
+{
+  // Write time, image point, and image box
+  *this << BeginArray
+        << BeginValue << state.TimeStamp.FrameNumber
+        << BeginValue << static_cast<long long>(state.TimeStamp.Time)
+        << BeginValue << state.ImagePoint.X
+        << BeginValue << state.ImagePoint.Y
+        << state.ImageBox;
+
+  // Write image object
+  size_t n;
+  *this << NewLine << BeginArray;
+  for (n = 0; n < state.ImageObject.size(); ++n)
+    {
+    const vvImagePointF& p = state.ImageObject[n];
+    *this << BeginArray << BeginValue << p.X << BeginValue << p.Y << EndArray;
+    *this << ((n + 1) % 5 ? EndValue : NewLine);
+    }
+  *this << EndArray << (n ? NewLine : EndValue);
+
+  // Write world location
+  *this << BeginArray;
+  if (state.WorldLocation.GCS != -1)
+    {
+    *this << BeginValue << state.WorldLocation.GCS
+          << BeginValue << state.WorldLocation.Northing
+          << BeginValue << state.WorldLocation.Easting;
+    }
+  *this << EndArray << EndArray;
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(const vvDatabaseQuery& query)
+{
+  // Write temporal limit
+  *this << BeginArray;
+  if (query.TemporalLowerLimit != -1 || query.TemporalUpperLimit != -1)
+    {
+    *this << BeginValue << query.TemporalLowerLimit
+          << BeginValue << query.TemporalUpperLimit
+          << BeginValue << query.TemporalFilter;
+    }
+  *this << EndArray;
+
+  // Write geospatial limit
+  *this << (query.SpatialLimit.Coordinate.size() ? NewLine : NoOp)
+        << vvSpatialFilter(query.SpatialLimit, query.SpatialFilter);
+  *this << EndRecord;
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(vvDatabaseQuery::IntersectionType filter)
+{
+  switch (filter)
+    {
+    case vvDatabaseQuery::Ignore:
+      *this << "IGNORE";
+      break;
+    case vvDatabaseQuery::ContainsWholly:
+      *this << "CONTAINS_WHOLLY";
+      break;
+    case vvDatabaseQuery::ContainsAny:
+      *this << "CONTAINS_ANY";
+      break;
+    case vvDatabaseQuery::Intersects:
+      *this << "INTERSECTS";
+      break;
+    case vvDatabaseQuery::IntersectsInbound:
+      *this << "INTERSECTS_INBOUND";
+      break;
+    case vvDatabaseQuery::IntersectsOutbound:
+      *this << "INTERSECTS_OUTBOUND";
+      break;
+    case vvDatabaseQuery::DoesNotContain:
+      *this << "DOES_NOT_CONTAIN";
+      break;
+    }
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(const QColor& color)
+{
+  QTE_D(vvKstWriter);
+  (*d->stream) << QString("0x%1").arg(color.rgba(), 8, 16, QChar('0'));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(const char* data)
+{
+  QTE_D(vvKstWriter);
+  if (d->part == vvKstWriterPrivate::String)
+    {
+    *this << QString::fromLocal8Bit(data);
+    }
+  else
+    {
+    (*d->stream) << data;
+    }
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(const std::string& data)
+{
+  QTE_D(vvKstWriter);
+  if (d->part == vvKstWriterPrivate::String)
+    {
+    *this << qtString(data);
+    }
+  else
+    {
+    (*d->stream) << qtString(data);
+    }
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvKstWriter& vvKstWriter::operator<<(const QString& data)
+{
+  QTE_D(vvKstWriter);
+
+  QString edata = data;
+  if (d->part == vvKstWriterPrivate::String)
+    {
+    edata.replace("\\", "\\\\");
+    edata.replace("\"", "\\\"");
+    }
+
+  *d->stream << edata;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+#define writer_sout_operator(_class) \
+  vvKstWriter& vvKstWriter::operator<<(_class data) \
+  { \
+    QTE_D(vvKstWriter); \
+    (*d->stream) << data; \
+    return *this; \
+  }
+writer_sout_operator(const QChar&)
+writer_sout_operator(char)
+writer_sout_operator(qint32)
+writer_sout_operator(qint64)
+writer_sout_operator(quint32)
+writer_sout_operator(quint64)
+writer_sout_operator(float)
+writer_sout_operator(double)
diff --git a/Libraries/VvIO/vvKstWriter.h b/Libraries/VvIO/vvKstWriter.h
new file mode 100644
index 00000000..ec9b0165
--- /dev/null
+++ b/Libraries/VvIO/vvKstWriter.h
@@ -0,0 +1,87 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvKstWriter_h
+#define __vvKstWriter_h
+
+#include <vgExport.h>
+
+#include "vvWriter.h"
+
+class vvKstWriterPrivate;
+
+class VV_IO_EXPORT vvKstWriter : public vvWriter
+{
+public:
+  explicit vvKstWriter(QFile&, bool pretty = true);
+  explicit vvKstWriter(QTextStream&, bool pretty = true);
+  virtual ~vvKstWriter();
+
+  static const unsigned int TracksVersion;
+  static const unsigned int DescriptorsVersion;
+  static const unsigned int QueryPlanVersion;
+  static const unsigned int QueryResultsVersion;
+  static const unsigned int EventSetInfoVersion;
+  static const unsigned int GeoPolyVersion;
+
+  virtual vvWriter& operator<<(vvHeader::FileType);
+
+  virtual vvWriter& operator<<(const vvTrack&);
+  virtual vvWriter& operator<<(const vvDescriptor&);
+  virtual vvWriter& operator<<(const vvQueryInstance&);
+  virtual vvWriter& operator<<(const vvRetrievalQuery&);
+  virtual vvWriter& operator<<(const vvSimilarityQuery&);
+  virtual vvWriter& operator<<(const vvQueryResult&);
+  virtual vvWriter& operator<<(const vgGeocodedPoly&);
+  virtual vvWriter& operator<<(const vvSpatialFilter&);
+  virtual vvWriter& operator<<(const vvEventSetInfo&);
+
+  using vvWriter::operator<<; // Copy template overload
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvKstWriter)
+
+  enum Marker
+    {
+    NoOp,
+    NewLine,
+    BeginRecord,
+    EndRecord,
+    BeginArray,
+    EndArray,
+    EndArrayNewLine,
+    BeginValue,
+    BeginString,
+    EndValue,
+    Comment
+    };
+
+  virtual vvKstWriter& operator<<(Marker);
+  virtual vvKstWriter& operator<<(const vvImageBoundingBox&);
+  virtual vvKstWriter& operator<<(const vvTrackId&);
+  virtual vvKstWriter& operator<<(const vvTrackState&);
+  virtual vvKstWriter& operator<<(const vvDatabaseQuery&);
+  virtual vvKstWriter& operator<<(vvDatabaseQuery::IntersectionType);
+
+  virtual vvKstWriter& operator<<(const QColor&);
+  virtual vvKstWriter& operator<<(const QChar&);
+  virtual vvKstWriter& operator<<(const QString&);
+  virtual vvKstWriter& operator<<(char);
+  virtual vvKstWriter& operator<<(const char*);
+  virtual vvKstWriter& operator<<(const std::string&);
+  virtual vvKstWriter& operator<<(qint32);
+  virtual vvKstWriter& operator<<(qint64);
+  virtual vvKstWriter& operator<<(quint32);
+  virtual vvKstWriter& operator<<(quint64);
+  virtual vvKstWriter& operator<<(float);
+  virtual vvKstWriter& operator<<(double);
+
+private:
+  QTE_DECLARE_PRIVATE(vvKstWriter)
+  Q_DISABLE_COPY(vvKstWriter)
+};
+
+#endif
diff --git a/Libraries/VvIO/vvMakeId.cxx b/Libraries/VvIO/vvMakeId.cxx
new file mode 100644
index 00000000..98a230ad
--- /dev/null
+++ b/Libraries/VvIO/vvMakeId.cxx
@@ -0,0 +1,21 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvMakeId.h"
+
+#include <QUuid>
+
+#include <qtStlUtil.h>
+
+//-----------------------------------------------------------------------------
+std::string vvMakeId(QString prefix)
+{
+  QString id = QUuid::createUuid().toString();
+  id = id.mid(1, id.length() - 2).toUpper();
+  if (!prefix.isEmpty())
+    id = QString("%2-%1").arg(id).arg(prefix);
+  return stdString(id);
+}
diff --git a/Libraries/VvIO/vvMakeId.h b/Libraries/VvIO/vvMakeId.h
new file mode 100644
index 00000000..cd1abd25
--- /dev/null
+++ b/Libraries/VvIO/vvMakeId.h
@@ -0,0 +1,18 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvMakeId_h
+#define __vvMakeId_h
+
+#include <string>
+
+#include <QString>
+
+#include <vgExport.h>
+
+extern VV_IO_EXPORT std::string vvMakeId(QString prefix = QString());
+
+#endif
diff --git a/Libraries/VvIO/vvQueryFormulation.h b/Libraries/VvIO/vvQueryFormulation.h
new file mode 100644
index 00000000..387f6981
--- /dev/null
+++ b/Libraries/VvIO/vvQueryFormulation.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryFormulation_h
+#define __vvQueryFormulation_h
+
+#include <string>
+
+//-----------------------------------------------------------------------------
+struct vvProcessingRequest
+{
+  vvProcessingRequest() : StartTime(-1), EndTime(-1) {}
+
+  std::string QueryId;
+  std::string VideoUri;
+
+  long long StartTime;
+  long long EndTime;
+};
+
+//-----------------------------------------------------------------------------
+namespace vvQueryFormulation
+{
+  enum Type
+    {
+    FromImage,
+    FromVideo,
+    FromDatabase,
+    UserDefined
+    };
+}
+typedef vvQueryFormulation::Type vvQueryFormulationType;
+
+#endif
diff --git a/Libraries/VvIO/vvQueryInstance.cxx b/Libraries/VvIO/vvQueryInstance.cxx
new file mode 100644
index 00000000..98b74f5c
--- /dev/null
+++ b/Libraries/VvIO/vvQueryInstance.cxx
@@ -0,0 +1,252 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvQueryInstance.h"
+
+QTE_IMPLEMENT_D_FUNC_SHARED(vvQueryInstance)
+
+//-----------------------------------------------------------------------------
+class vvQueryInstanceData : public QSharedData
+{
+public:
+  virtual ~vvQueryInstanceData() {}
+
+  virtual vvQueryInstanceData* clone() { return new vvQueryInstanceData; }
+
+  virtual bool isRetrievalQuery() const { return false; }
+  virtual bool isSimilarityQuery() const { return false; }
+
+  virtual vvDatabaseQuery* abstractQuery() { return 0; }
+  virtual const vvDatabaseQuery* abstractQuery() const { return 0; }
+  virtual vvRetrievalQuery* retrievalQuery() { return 0; }
+  virtual const vvRetrievalQuery* retrievalQuery() const { return 0; }
+  virtual vvSimilarityQuery* similarityQuery() { return 0; }
+  virtual const vvSimilarityQuery* similarityQuery() const { return 0; }
+
+protected:
+  vvQueryInstanceData() {}
+
+private:
+  Q_DISABLE_COPY(vvQueryInstanceData)
+};
+
+//-----------------------------------------------------------------------------
+class vvDatabaseQueryInstanceData : public vvQueryInstanceData,
+                                    public vvDatabaseQuery
+{
+public:
+  vvDatabaseQueryInstanceData() {}
+  vvDatabaseQueryInstanceData(const vvDatabaseQuery& other)
+    : vvDatabaseQuery(other) {}
+
+  virtual ~vvDatabaseQueryInstanceData() {}
+
+  virtual vvQueryInstanceData* clone()
+    { return new vvDatabaseQueryInstanceData(*this->abstractQuery()); }
+
+  virtual vvDatabaseQuery* abstractQuery() { return this; }
+  virtual const vvDatabaseQuery* abstractQuery() const { return this; }
+};
+
+//-----------------------------------------------------------------------------
+class vvRetrievalQueryInstanceData : public vvQueryInstanceData,
+                                     public vvRetrievalQuery
+{
+public:
+  vvRetrievalQueryInstanceData() {}
+  vvRetrievalQueryInstanceData(const vvRetrievalQuery& other)
+    : vvRetrievalQuery(other) {}
+
+  virtual ~vvRetrievalQueryInstanceData() {}
+
+  virtual vvQueryInstanceData* clone()
+    { return new vvRetrievalQueryInstanceData(*this->retrievalQuery()); }
+
+  virtual bool isRetrievalQuery() const { return true; }
+
+  virtual vvDatabaseQuery* abstractQuery() { return this; }
+  virtual const vvDatabaseQuery* abstractQuery() const { return this; }
+  virtual vvRetrievalQuery* retrievalQuery() { return this; }
+  virtual const vvRetrievalQuery* retrievalQuery() const { return this; }
+};
+
+//-----------------------------------------------------------------------------
+class vvSimilarityQueryInstanceData : public vvQueryInstanceData,
+                                      public vvSimilarityQuery
+{
+public:
+  vvSimilarityQueryInstanceData() {}
+  vvSimilarityQueryInstanceData(const vvSimilarityQuery& other)
+    : vvSimilarityQuery(other) {}
+
+  virtual ~vvSimilarityQueryInstanceData() {}
+
+  virtual vvQueryInstanceData* clone()
+    { return new vvSimilarityQueryInstanceData(*this->similarityQuery()); }
+
+  virtual bool isSimilarityQuery() const { return true; }
+
+  virtual vvDatabaseQuery* abstractQuery() { return this; }
+  virtual const vvDatabaseQuery* abstractQuery() const { return this; }
+  virtual vvSimilarityQuery* similarityQuery() { return this; }
+  virtual const vvSimilarityQuery* similarityQuery() const { return this; }
+};
+
+//-----------------------------------------------------------------------------
+template <>
+vvQueryInstanceData* QSharedDataPointer<vvQueryInstanceData>::clone()
+{
+  return d->clone();
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance::vvQueryInstance()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance::~vvQueryInstance()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance::vvQueryInstance(const vvQueryInstance& other)
+  : d_ptr(other.d_ptr)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance& vvQueryInstance::operator=(const vvQueryInstance& other)
+{
+  this->d_ptr = other.d_ptr;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance::vvQueryInstance(vvDatabaseQuery::QueryType type)
+{
+  switch (type)
+    {
+    case vvDatabaseQuery::Similarity:
+      this->d_ptr = new vvSimilarityQueryInstanceData;
+      break;
+    case vvDatabaseQuery::Retrieval:
+      this->d_ptr = new vvRetrievalQueryInstanceData;
+      break;
+    case vvDatabaseQuery::Abstract:
+      this->d_ptr = new vvDatabaseQueryInstanceData;
+      break;
+    default:
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vvQueryInstance::isValid() const
+{
+  return this->d_ptr;
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInstance::clear()
+{
+  this->d_ptr = 0;
+}
+
+//-----------------------------------------------------------------------------
+vvDatabaseQuery* vvQueryInstance::abstractQuery()
+{
+  QTE_D_MUTABLE(vvQueryInstance);
+  return (d ? d->abstractQuery() : 0);
+}
+
+//-----------------------------------------------------------------------------
+const vvDatabaseQuery* vvQueryInstance::constAbstractQuery() const
+{
+  QTE_D_SHARED(vvQueryInstance);
+  return (d ? d->abstractQuery() : 0);
+}
+
+//-----------------------------------------------------------------------------
+bool vvQueryInstance::isRetrievalQuery() const
+{
+  QTE_D_SHARED(vvQueryInstance);
+  return (d && d->isRetrievalQuery());
+}
+
+//-----------------------------------------------------------------------------
+bool vvQueryInstance::isSimilarityQuery() const
+{
+  QTE_D_SHARED(vvQueryInstance);
+  return (d && d->isSimilarityQuery());
+}
+
+//-----------------------------------------------------------------------------
+vvRetrievalQuery* vvQueryInstance::retrievalQuery()
+{
+  QTE_D_MUTABLE(vvQueryInstance);
+  return (d ? d->retrievalQuery() : 0);
+}
+
+//-----------------------------------------------------------------------------
+const vvRetrievalQuery* vvQueryInstance::constRetrievalQuery() const
+{
+  QTE_D_SHARED(vvQueryInstance);
+  return (d ? d->retrievalQuery() : 0);
+}
+
+//-----------------------------------------------------------------------------
+vvSimilarityQuery* vvQueryInstance::similarityQuery()
+{
+  QTE_D_MUTABLE(vvQueryInstance);
+  return (d ? d->similarityQuery() : 0);
+}
+
+//-----------------------------------------------------------------------------
+const vvSimilarityQuery* vvQueryInstance::constSimilarityQuery() const
+{
+  QTE_D_SHARED(vvQueryInstance);
+  return (d ? d->similarityQuery() : 0);
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance::vvQueryInstance(const vvDatabaseQuery& other)
+  : d_ptr(new vvDatabaseQueryInstanceData(other))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance::vvQueryInstance(const vvRetrievalQuery& other)
+  : d_ptr(new vvRetrievalQueryInstanceData(other))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance::vvQueryInstance(const vvSimilarityQuery& other)
+  : d_ptr(new vvSimilarityQueryInstanceData(other))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance& vvQueryInstance::operator=(const vvDatabaseQuery& other)
+{
+  this->d_ptr = new vvDatabaseQueryInstanceData(other);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance& vvQueryInstance::operator=(const vvRetrievalQuery& other)
+{
+  this->d_ptr = new vvRetrievalQueryInstanceData(other);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInstance& vvQueryInstance::operator=(const vvSimilarityQuery& other)
+{
+  this->d_ptr = new vvSimilarityQueryInstanceData(other);
+  return *this;
+}
diff --git a/Libraries/VvIO/vvQueryInstance.h b/Libraries/VvIO/vvQueryInstance.h
new file mode 100644
index 00000000..a8c59ea7
--- /dev/null
+++ b/Libraries/VvIO/vvQueryInstance.h
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryInstance_h
+#define __vvQueryInstance_h
+
+#include <QSharedDataPointer>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvQuery.h>
+
+class vvQueryInstanceData;
+
+class VV_IO_EXPORT vvQueryInstance
+{
+public:
+  vvQueryInstance();
+  virtual ~vvQueryInstance();
+
+  vvQueryInstance(const vvQueryInstance&);
+  vvQueryInstance& operator=(const vvQueryInstance&);
+
+  explicit vvQueryInstance(vvDatabaseQuery::QueryType);
+
+  bool isValid() const;
+  void clear();
+
+  vvDatabaseQuery* abstractQuery();
+  const vvDatabaseQuery* constAbstractQuery() const;
+
+  bool isRetrievalQuery() const;
+  bool isSimilarityQuery() const;
+
+  vvRetrievalQuery* retrievalQuery();
+  const vvRetrievalQuery* constRetrievalQuery() const;
+  vvSimilarityQuery* similarityQuery();
+  const vvSimilarityQuery* constSimilarityQuery() const;
+
+  vvQueryInstance(const vvDatabaseQuery&);
+  vvQueryInstance(const vvRetrievalQuery&);
+  vvQueryInstance(const vvSimilarityQuery&);
+  vvQueryInstance& operator=(const vvDatabaseQuery&);
+  vvQueryInstance& operator=(const vvRetrievalQuery&);
+  vvQueryInstance& operator=(const vvSimilarityQuery&);
+
+protected:
+  QTE_DECLARE_SHARED_PTR(vvQueryInstance)
+
+private:
+  QTE_DECLARE_SHARED(vvQueryInstance)
+};
+
+#endif
diff --git a/Libraries/VvIO/vvQueryNotifier.h b/Libraries/VvIO/vvQueryNotifier.h
new file mode 100644
index 00000000..4452ce11
--- /dev/null
+++ b/Libraries/VvIO/vvQueryNotifier.h
@@ -0,0 +1,89 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryNotifier_h
+#define __vvQueryNotifier_h
+
+#include <qtStatusNotifier.h>
+
+#include <vgExport.h>
+
+#include <vvQueryResult.h>
+
+//-----------------------------------------------------------------------------
+class VV_IO_EXPORT vvQueryNotifier : public qtStatusNotifier
+{
+  Q_OBJECT
+
+public:
+  virtual ~vvQueryNotifier() {}
+
+signals:
+  void formulationComplete(QList<vvDescriptor>,
+                           QList<vvTrack> = QList<vvTrack>());
+
+  void resultAvailable(vvQueryResult, bool requestScoring = false);
+  void resultSetComplete(bool requestScoring = false);
+
+  void error(qtStatusSource, QString = QString());
+  void finished();
+
+protected:
+  vvQueryNotifier() {}
+
+  void postError(QString message = QString())
+    {
+    emit this->progressAvailable(this->statusSource());
+    emit this->error(this->statusSource(), message);
+    }
+
+private:
+  Q_DISABLE_COPY(vvQueryNotifier)
+};
+
+//-----------------------------------------------------------------------------
+class vvQueryNotifierHelper : public vvQueryNotifier
+{
+public:
+  vvQueryNotifierHelper() {}
+  virtual ~vvQueryNotifierHelper() {}
+
+  void postFormulationComplete(QList<vvDescriptor> descriptors,
+                               QList<vvTrack> tracks)
+    { emit this->formulationComplete(descriptors, tracks); }
+
+  void postResult(vvQueryResult result, bool requestScoring = false)
+    { emit this->resultAvailable(result, requestScoring); }
+
+  void postResultSetComplete(bool requestScoring = false)
+    { emit this->resultSetComplete(requestScoring); }
+
+  void postStatus(QString message, bool clearProgress = false)
+    { vvQueryNotifier::postStatus(message, clearProgress); }
+
+  void postStatus(QString message, qreal progress)
+    { vvQueryNotifier::postStatus(message, progress); }
+
+  void postStatus(QString message, int progressValue, int progressSteps)
+    { vvQueryNotifier::postStatus(message, progressValue, progressSteps); }
+
+  void clearStatus()
+    { vvQueryNotifier::clearStatus(); }
+
+  void postError(QString message = QString())
+    { vvQueryNotifier::postError(message); }
+
+  void postFinished()
+    { emit this->finished(); }
+
+  void forwardSignal(const char* signal, QObject* receiver)
+    { connect(this, signal, receiver, signal); }
+
+private:
+  Q_DISABLE_COPY(vvQueryNotifierHelper)
+};
+
+#endif
diff --git a/Libraries/VvIO/vvQueryService.cxx b/Libraries/VvIO/vvQueryService.cxx
new file mode 100644
index 00000000..5b491808
--- /dev/null
+++ b/Libraries/VvIO/vvQueryService.cxx
@@ -0,0 +1,77 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvQueryService.h"
+
+#include <QHash>
+#include <QStringList>
+
+#include <qtGlobal.h>
+#include <qtMap.h>
+
+#include <vgPluginLoader.h>
+
+#include "vvQueryServiceInterface.h"
+
+//-----------------------------------------------------------------------------
+class vvQueryServiceInstance
+{
+public:
+  vvQueryServiceInstance();
+
+  void load(QObject*);
+
+  QList<vvQueryServiceInterface*> Plugins;
+  QHash<QString, vvQueryServiceInterface*> PluginMap;
+};
+
+QTE_PRIVATE_SINGLETON(vvQueryServiceInstance, qsInstance)
+
+//-----------------------------------------------------------------------------
+vvQueryServiceInstance::vvQueryServiceInstance()
+{
+  qtUtil::mapBound(vgPluginLoader::plugins(), this,
+                   &vvQueryServiceInstance::load);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryServiceInstance::load(QObject* object)
+{
+  vvQueryServiceInterface* plugin =
+    qobject_cast<vvQueryServiceInterface*>(object);
+  if (plugin)
+    {
+    this->Plugins.append(plugin);
+    const QStringList& schemes = plugin->supportedSchemes();
+    foreach (const QString& scheme, schemes)
+      {
+      this->PluginMap.insert(scheme, plugin);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+QStringList vvQueryService::supportedSchemes()
+{
+  return qsInstance()->PluginMap.keys();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryService::registerChoosers(vvQueryServerDialog* dialog)
+{
+  foreach (vvQueryServiceInterface* plugin, qsInstance()->Plugins)
+    {
+    plugin->registerChoosers(dialog);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vvQuerySession* vvQueryService::createSession(const QUrl& uri)
+{
+  vvQueryServiceInterface* plugin =
+    qsInstance()->PluginMap.value(uri.scheme().toLower());
+  return (plugin ? plugin->createSession(uri) : 0);
+}
diff --git a/Libraries/VvIO/vvQueryService.h b/Libraries/VvIO/vvQueryService.h
new file mode 100644
index 00000000..0f668908
--- /dev/null
+++ b/Libraries/VvIO/vvQueryService.h
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryService_h
+#define __vvQueryService_h
+
+#include <QUrl>
+
+#include <vgExport.h>
+
+class QStringList;
+
+class vvQueryServerDialog;
+class vvQuerySession;
+
+//-----------------------------------------------------------------------------
+/// Methods for interfacing with the query service framework.
+///
+/// This namespace provides methods to query and interact with the query
+/// service framework, which is a generic front-end for service provider
+/// plugins. Plugin loading is done on first use (that is, the first time any
+/// function in the namespace is called).
+namespace vvQueryService
+{
+  /// Get list of supported schemes.
+  ///
+  /// This method returns a unified list of all URI schemes supported by all
+  /// loaded service provider plugins.
+  VV_IO_EXPORT QStringList supportedSchemes();
+
+  /// Register server choosers with chooser dialog.
+  ///
+  /// This method registers server choosers for all loaded service provider
+  /// plugins with the specified server chooser dialog.
+  VV_IO_EXPORT void registerChoosers(vvQueryServerDialog*);
+
+  /// Create session for URI.
+  ///
+  /// This method attempts to create a ::vvQuerySession instance for the
+  /// specified URI, by searching all loaded service provider plugins for one
+  /// which is able to handle the URI. If no provider can be found, a null
+  /// pointer is returned.
+  VV_IO_EXPORT vvQuerySession* createSession(const QUrl&);
+};
+
+#endif
diff --git a/Libraries/VvIO/vvQueryServiceInterface.h b/Libraries/VvIO/vvQueryServiceInterface.h
new file mode 100644
index 00000000..4e5cd976
--- /dev/null
+++ b/Libraries/VvIO/vvQueryServiceInterface.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryServiceInterface_h
+#define __vvQueryServiceInterface_h
+
+#include <QtPlugin>
+
+class QStringList;
+class QUrl;
+
+class vvQueryServerDialog;
+class vvQuerySession;
+
+//-----------------------------------------------------------------------------
+class vvQueryServiceInterface
+{
+public:
+  virtual ~vvQueryServiceInterface() {}
+
+  /// Get list of supported schemes.
+  ///
+  /// This method returns a list of all URI schemes supported by this provider
+  /// instance.
+  virtual QStringList supportedSchemes() const = 0;
+
+  /// Register server choosers with chooser dialog.
+  ///
+  /// This method registers a provider's server chooser(s) with the specified
+  /// server chooser dialog.
+  virtual void registerChoosers(vvQueryServerDialog*) = 0;
+
+  /// Create session for URI.
+  ///
+  /// This method creates a new ::vvQuerySession instance for the specified
+  /// URI. In case of errors, a null pointer is returned.
+  virtual vvQuerySession* createSession(const QUrl&) = 0;
+};
+
+Q_DECLARE_INTERFACE(vvQueryServiceInterface,
+                    "org.visgui.vvQueryServiceInterface")
+
+#endif
diff --git a/Libraries/VvIO/vvQuerySession.cxx b/Libraries/VvIO/vvQuerySession.cxx
new file mode 100644
index 00000000..013e8f29
--- /dev/null
+++ b/Libraries/VvIO/vvQuerySession.cxx
@@ -0,0 +1,90 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QFileInfo>
+#include <QMetaType>
+#include <QUrl>
+
+#include <qtOnce.h>
+
+#include <vgFileDialog.h>
+
+#include "vvQuerySession.h"
+
+namespace // anonymous
+{
+
+QTE_ONCE(rmtGuard);
+
+//-----------------------------------------------------------------------------
+void registerMetaTypes()
+{
+  QTE_REGISTER_METATYPE(qtStatusSource);
+  QTE_REGISTER_METATYPE(vvProcessingRequest);
+  QTE_REGISTER_METATYPE(vvQueryInstance);
+  QTE_REGISTER_METATYPE(vvQueryResult);
+  QTE_REGISTER_METATYPE(vvIqr::ScoringClassifiers);
+  QTE_REGISTER_METATYPE(QList<vvTrack>);
+  QTE_REGISTER_METATYPE(QList<vvDescriptor>);
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vvQuerySession::vvQuerySession()
+{
+  qtOnce(rmtGuard, &registerMetaTypes);
+}
+
+//-----------------------------------------------------------------------------
+vvQuerySession::~vvQuerySession()
+{
+}
+
+//-----------------------------------------------------------------------------
+QUrl vvQuerySession::getFormulationSourceUri(
+  const QUrl& oldUri, vvQueryFormulationType type, QWidget* dialogParent)
+{
+  QFileInfo vfi(oldUri.toLocalFile());
+  QString fileName =
+    vgFileDialog::getOpenFileName(
+      dialogParent, "Select video or image from which to formulate query...",
+      vfi.dir().path(),
+      "Common Formats (*.jpg *.png *.mpg);;"
+      "MPEG Videos (*.mpg);;"
+      "Common Image Formats (*.jpg *.png);;"
+      "All files (*)");
+
+  QUrl uri;
+  if (!fileName.isEmpty())
+    {
+    uri = QUrl::fromLocalFile(fileName);
+    uri = this->fixupFormulationSourceUri(uri, type);
+    }
+  return uri;
+}
+
+//-----------------------------------------------------------------------------
+QUrl vvQuerySession::fixupFormulationSourceUri(
+  QUrl uri, vvQueryFormulationType type)
+{
+  if (!uri.isEmpty())
+    {
+    uri.setEncodedQuery(QByteArray());
+    switch (type)
+      {
+      case vvQueryFormulation::FromImage:
+        uri.addQueryItem("FormulationType", "Image");
+        break;
+      case vvQueryFormulation::FromVideo:
+        uri.addQueryItem("FormulationType", "Video");
+        break;
+      default:
+        break;
+      }
+    }
+  return uri;
+}
diff --git a/Libraries/VvIO/vvQuerySession.h b/Libraries/VvIO/vvQuerySession.h
new file mode 100644
index 00000000..042e66c9
--- /dev/null
+++ b/Libraries/VvIO/vvQuerySession.h
@@ -0,0 +1,60 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQuerySession_h
+#define __vvQuerySession_h
+
+#include <QUrl>
+
+#include <qtThread.h>
+
+#include <vgExport.h>
+
+#include <vvIqr.h>
+#include <vvQuery.h>
+
+#include "vvQueryFormulation.h"
+#include "vvQueryInstance.h"
+#include "vvQueryNotifier.h"
+
+//-----------------------------------------------------------------------------
+namespace vvIqr
+{
+  typedef QHash<long long, vvIqr::Classification> ScoringClassifiers;
+}
+
+//-----------------------------------------------------------------------------
+class VV_IO_EXPORT vvQuerySession
+  : public qtInternallyThreadedObject<vvQueryNotifier>
+{
+  Q_OBJECT
+
+public:
+  vvQuerySession();
+  virtual ~vvQuerySession();
+
+public:
+  virtual QUrl getFormulationSourceUri(
+    const QUrl& oldUri, vvQueryFormulationType type, QWidget* dialogParent);
+  virtual QUrl fixupFormulationSourceUri(QUrl, vvQueryFormulationType);
+
+public slots:
+  virtual bool formulateQuery(vvProcessingRequest request) = 0;
+  virtual bool processQuery(vvQueryInstance query, int workingSetSize) = 0;
+  virtual bool requestRefinement(int resultsToScore) = 0;
+  virtual bool refineQuery(vvIqr::ScoringClassifiers feedback) = 0;
+
+  virtual void endQuery() = 0;
+  virtual void shutdown() = 0;
+
+  virtual bool updateIqrModel(vvQueryInstance& query)
+    { Q_UNUSED(query); return false; }
+
+private:
+  Q_DISABLE_COPY(vvQuerySession)
+};
+
+#endif
diff --git a/Libraries/VvIO/vvReader.cxx b/Libraries/VvIO/vvReader.cxx
new file mode 100644
index 00000000..e97d64a6
--- /dev/null
+++ b/Libraries/VvIO/vvReader.cxx
@@ -0,0 +1,202 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvReader.h"
+
+#include <QFile>
+#include <QRegExp>
+#include <QUrl>
+
+#include <vvQueryResult.h>
+
+#include "vvHeader.h"
+#include "vvKstReader.h"
+#include "vvQueryInstance.h"
+#include "vvXmlReader.h"
+
+#define test_and_pass(_cond, _expr) if (_cond) return true
+
+QTE_IMPLEMENT_D_FUNC(vvReader)
+
+//-----------------------------------------------------------------------------
+class vvReaderPrivate
+{
+public:
+  template <typename T>
+  bool read(T& result, bool (vvReader::*method)(T&));
+
+  QScopedPointer<vvReader> reader;
+  QString lastError;
+};
+
+//-----------------------------------------------------------------------------
+template <typename T>
+bool vvReaderPrivate::read(T& result, bool (vvReader::*method)(T&))
+{
+  if (!this->reader)
+    {
+    this->lastError = "No data is available";
+    return false;
+    }
+  return (*this->reader.*method)(result);
+}
+
+//-----------------------------------------------------------------------------
+vvReader::vvReader() : d_ptr(new vvReaderPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvReader::~vvReader()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vvReader::error()
+{
+  QTE_D(vvReader);
+  return (d->reader ? d->reader->error() : d->lastError);
+}
+
+//-----------------------------------------------------------------------------
+bool vvReader::open(const QUrl& uri, vvReader::Format format)
+{
+  QTE_D(vvReader);
+
+  if (format == Kst)
+    {
+    d->reader.reset(new vvKstReader);
+    return d->reader->open(uri);
+    }
+  else if (format == Xml)
+    {
+    d->reader.reset(new vvXmlReader);
+    return d->reader->open(uri);
+    }
+  else
+    {
+    // No matter what, calling open() resets the reader
+    d->reader.reset();
+    return this->open(uri, d->lastError);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vvReader::open(const QUrl& uri, QString& error)
+{
+  // First, try to open the file
+  QFile file(uri.toLocalFile());
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+    error = "Unable to open \"" + uri.toString() + "\": "
+            + file.errorString();
+    return false;
+    }
+
+  // Read the data, and hand off to setInput
+  const QString data = QString::fromLocal8Bit(file.readAll());
+  return this->setInput(data);
+}
+
+//-----------------------------------------------------------------------------
+bool vvReader::setInput(const QString& data, vvReader::Format format)
+{
+  QTE_D(vvReader);
+
+  if (format == Kst)
+    {
+    d->reader.reset(new vvKstReader);
+    return d->reader->setInput(data);
+    }
+  else if (format == Xml)
+    {
+    d->reader.reset(new vvXmlReader);
+    return d->reader->setInput(data);
+    }
+  else
+    {
+    // Guess format from data
+    format = (data.contains(QRegExp("^\\s*<")) ? Xml : Kst);
+
+    // Attempt to load as guessed format
+    if (!this->setInput(data, format))
+      {
+      d->reader.reset();
+      d->lastError = "No handler was able to process the input";
+      return false;
+      }
+
+    return true;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvReader::setHeader(const vvHeader& header)
+{
+  QTE_D(vvReader);
+  if (d->reader)
+    d->reader->setHeader(header);
+}
+
+//-----------------------------------------------------------------------------
+bool vvReader::rewind()
+{
+  QTE_D(vvReader);
+  return (d->reader && d->reader->rewind());
+}
+
+//-----------------------------------------------------------------------------
+bool vvReader::advance()
+{
+  QTE_D(vvReader);
+  return (d->reader && d->reader->advance());
+}
+
+//-----------------------------------------------------------------------------
+bool vvReader::atEnd() const
+{
+  QTE_D_CONST(vvReader);
+  return (!d->reader || d->reader->atEnd());
+}
+
+
+//-----------------------------------------------------------------------------
+#define vvReader_Implement_Read(_name, _type) \
+  bool vvReader::read##_name(_type& data) \
+  { \
+    QTE_D(vvReader); \
+    return d->read(data, &vvReader::read##_name); \
+  }
+
+vvReader_Implement_Read(Header,         vvHeader)
+vvReader_Implement_Read(Track,          vvTrack)
+vvReader_Implement_Read(Descriptor,     vvDescriptor)
+vvReader_Implement_Read(QueryPlan,      vvQueryInstance)
+vvReader_Implement_Read(QueryPlan,      vvRetrievalQuery)
+vvReader_Implement_Read(QueryPlan,      vvSimilarityQuery)
+vvReader_Implement_Read(QueryResult,    vvQueryResult)
+vvReader_Implement_Read(EventSetInfo,   vvEventSetInfo)
+
+vvReader_Implement_Read(Tracks,               QList<vvTrack>)
+vvReader_Implement_Read(Tracks,         std::vector<vvTrack>)
+vvReader_Implement_Read(Descriptors,          QList<vvDescriptor>)
+vvReader_Implement_Read(Descriptors,    std::vector<vvDescriptor>)
+vvReader_Implement_Read(QueryResults,         QList<vvQueryResult>)
+vvReader_Implement_Read(QueryResults,   std::vector<vvQueryResult>)
+
+//-----------------------------------------------------------------------------
+bool vvReader::readGeoPoly(
+  vgGeocodedPoly& poly, vvDatabaseQuery::IntersectionType* filterMode)
+{
+  QTE_D(vvReader);
+
+  if (!d->reader)
+    {
+    d->lastError = "No data is available";
+    return false;
+    }
+  return d->reader->readGeoPoly(poly, filterMode);
+}
diff --git a/Libraries/VvIO/vvReader.h b/Libraries/VvIO/vvReader.h
new file mode 100644
index 00000000..8ce18a9c
--- /dev/null
+++ b/Libraries/VvIO/vvReader.h
@@ -0,0 +1,90 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvReader_h
+#define __vvReader_h
+
+#include <QList>
+#include <QScopedPointer>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvQuery.h>
+
+class QString;
+class QUrl;
+
+struct vvQueryResult;
+
+struct vvEventSetInfo;
+struct vvHeader;
+class vvQueryInstance;
+
+class vvReaderPrivate;
+
+class VV_IO_EXPORT vvReader
+{
+public:
+  enum Format
+    {
+    Auto,
+    Kst,
+    Xml
+    };
+
+  vvReader();
+  virtual ~vvReader();
+
+  virtual bool open(const QUrl&, Format format = Auto);
+  virtual bool setInput(const QString&, Format format = Auto);
+
+  virtual void setHeader(const vvHeader&);
+
+  virtual bool rewind();
+  virtual bool advance();
+  virtual bool atEnd() const;
+
+  virtual bool readHeader(vvHeader& header);
+
+  virtual bool readTrack(vvTrack& track);
+  virtual bool readDescriptor(vvDescriptor& descriptor);
+
+  virtual bool readQueryPlan(vvQueryInstance& query);
+  virtual bool readQueryPlan(vvRetrievalQuery& query);
+  virtual bool readQueryPlan(vvSimilarityQuery& query);
+
+  virtual bool readQueryResult(vvQueryResult& result);
+
+  virtual bool readGeoPoly(vgGeocodedPoly& poly,
+                           vvDatabaseQuery::IntersectionType* filterMode = 0);
+
+  virtual bool readEventSetInfo(vvEventSetInfo& info);
+
+#define vvReader_ReadArray(_name, _type) \
+  virtual bool read##_name(std::vector<_type>& list); \
+  virtual bool read##_name(QList<_type>& list)
+
+  vvReader_ReadArray(Tracks, vvTrack);
+  vvReader_ReadArray(Descriptors, vvDescriptor);
+  vvReader_ReadArray(QueryResults, vvQueryResult);
+
+#undef vvReader_ReadArray
+
+  virtual QString error();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvReader)
+
+  virtual bool open(const QUrl&, QString& error);
+
+private:
+  QTE_DECLARE_PRIVATE(vvReader)
+  Q_DISABLE_COPY(vvReader)
+};
+
+#endif
diff --git a/Libraries/VvIO/vvUtil.cxx b/Libraries/VvIO/vvUtil.cxx
new file mode 100644
index 00000000..e733e092
--- /dev/null
+++ b/Libraries/VvIO/vvUtil.cxx
@@ -0,0 +1,24 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvUtil.h"
+
+#include <vvDescriptor.h>
+
+//-----------------------------------------------------------------------------
+std::size_t vvUtil::findMergedRegions(
+  const std::vector<vvDescriptor>& descriptors)
+{
+  const std::size_t k = descriptors.size();
+  for (std::size_t n = 0; n < k; ++n)
+    {
+    const vvDescriptor& d = descriptors[n];
+    if (d.ModuleName == "MergedDescriptors" && d.DescriptorName == "metadata")
+      return n;
+    }
+
+  return k;
+}
diff --git a/Libraries/VvIO/vvUtil.h b/Libraries/VvIO/vvUtil.h
new file mode 100644
index 00000000..aec96935
--- /dev/null
+++ b/Libraries/VvIO/vvUtil.h
@@ -0,0 +1,22 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvUtil_h
+#define __vvUtil_h
+
+#include <vector>
+
+#include <vgExport.h>
+
+struct vvDescriptor;
+
+namespace vvUtil
+{
+  extern VV_IO_EXPORT std::size_t findMergedRegions(
+    const std::vector<vvDescriptor>&);
+}
+
+#endif
diff --git a/Libraries/VvIO/vvWriter.cxx b/Libraries/VvIO/vvWriter.cxx
new file mode 100644
index 00000000..8329372e
--- /dev/null
+++ b/Libraries/VvIO/vvWriter.cxx
@@ -0,0 +1,99 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvWriter.h"
+
+#include <qtUtil.h>
+
+#include "vvKstWriter.h"
+#include "vvXmlWriter.h"
+
+QTE_IMPLEMENT_D_FUNC(vvWriter)
+
+//-----------------------------------------------------------------------------
+class vvWriterPrivate
+{
+public:
+  QScopedPointer<vvWriter> writer;
+
+  vvWriterPrivate(QFile&, vvWriter::Format, bool pretty);
+  vvWriterPrivate(QTextStream&, vvWriter::Format, bool pretty);
+};
+
+//-----------------------------------------------------------------------------
+vvWriterPrivate::vvWriterPrivate(
+  QFile& file, vvWriter::Format format, bool pretty)
+{
+  switch (format)
+    {
+    case vvWriter::Kst:
+      this->writer.reset(new vvKstWriter(file, pretty));
+      break;
+    case vvWriter::Xml:
+      this->writer.reset(new vvXmlWriter(file, pretty ? 2 : -1));
+      break;
+    default:
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vvWriterPrivate::vvWriterPrivate(
+  QTextStream& stream, vvWriter::Format format, bool pretty)
+{
+  switch (format)
+    {
+    case vvWriter::Kst:
+      this->writer.reset(new vvKstWriter(stream, pretty));
+      break;
+    case vvWriter::Xml:
+      this->writer.reset(new vvXmlWriter(stream, pretty ? 2 : -1));
+      break;
+    default:
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+vvWriter::vvWriter(QFile& file, Format format, bool pretty)
+  : d_ptr(new vvWriterPrivate(file, format, pretty))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvWriter::vvWriter(QTextStream& stream, Format format, bool pretty)
+  : d_ptr(new vvWriterPrivate(stream, format, pretty))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvWriter::vvWriter()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvWriter::~vvWriter()
+{
+}
+
+//-----------------------------------------------------------------------------
+#define writer_sout_operator(_class) \
+  vvWriter& vvWriter::operator<<(_class data) \
+  { \
+    QTE_D(vvWriter); \
+    (*d->writer) << data; \
+    return *this; \
+  }
+writer_sout_operator(vvHeader::FileType)
+writer_sout_operator(const vvTrack&)
+writer_sout_operator(const vvDescriptor&)
+writer_sout_operator(const vvQueryInstance&)
+writer_sout_operator(const vvRetrievalQuery&)
+writer_sout_operator(const vvSimilarityQuery&)
+writer_sout_operator(const vvQueryResult&)
+writer_sout_operator(const vgGeocodedPoly&)
+writer_sout_operator(const vvSpatialFilter&)
+writer_sout_operator(const vvEventSetInfo&)
diff --git a/Libraries/VvIO/vvWriter.h b/Libraries/VvIO/vvWriter.h
new file mode 100644
index 00000000..b75b73db
--- /dev/null
+++ b/Libraries/VvIO/vvWriter.h
@@ -0,0 +1,60 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvWriter_h
+#define __vvWriter_h
+
+#include <QFile>
+#include <QTextStream>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include "vvWriterData.h"
+
+class vvWriterPrivate;
+
+class VV_IO_EXPORT vvWriter
+{
+public:
+  enum Format
+    {
+    Kst,
+    Xml
+    };
+
+  explicit vvWriter(QFile&, Format format = Kst, bool pretty = true);
+  explicit vvWriter(QTextStream&, Format format = Kst, bool pretty = true);
+  virtual ~vvWriter();
+
+  virtual vvWriter& operator<<(vvHeader::FileType);
+
+  virtual vvWriter& operator<<(const vvTrack&);
+  virtual vvWriter& operator<<(const vvDescriptor&);
+  virtual vvWriter& operator<<(const vvQueryInstance&);
+  virtual vvWriter& operator<<(const vvRetrievalQuery&);
+  virtual vvWriter& operator<<(const vvSimilarityQuery&);
+  virtual vvWriter& operator<<(const vvQueryResult&);
+  virtual vvWriter& operator<<(const vgGeocodedPoly&);
+  virtual vvWriter& operator<<(const vvSpatialFilter&);
+  virtual vvWriter& operator<<(const vvEventSetInfo&);
+
+  template <typename T>
+  vvWriter& operator<<(const QList<T>& list)
+    { foreach (const T& item, list) *this << item; return *this; }
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvWriter)
+
+  vvWriter();
+
+private:
+  QTE_DECLARE_PRIVATE(vvWriter)
+  Q_DISABLE_COPY(vvWriter)
+};
+
+#endif
diff --git a/Libraries/VvIO/vvWriterData.h b/Libraries/VvIO/vvWriterData.h
new file mode 100644
index 00000000..aa253fdd
--- /dev/null
+++ b/Libraries/VvIO/vvWriterData.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvWriterData_h
+#define __vvWriterData_h
+
+#include <vvQueryResult.h>
+
+#include "vvEventSetInfo.h"
+#include "vvHeader.h"
+#include "vvQueryInstance.h"
+
+struct vvSpatialFilter
+{
+  vvSpatialFilter() : filter(0) {}
+  vvSpatialFilter(const vgGeocodedPoly& p) : poly(p), filter(0) {}
+  vvSpatialFilter(const vgGeocodedPoly& p,
+                  vvDatabaseQuery::IntersectionType f)
+    : poly(p), filter(new vvDatabaseQuery::IntersectionType(f)) {}
+  ~vvSpatialFilter() { delete filter; }
+
+  vgGeocodedPoly poly;
+  vvDatabaseQuery::IntersectionType* filter;
+};
+
+#endif
diff --git a/Libraries/VvIO/vvXmlReader.cxx b/Libraries/VvIO/vvXmlReader.cxx
new file mode 100644
index 00000000..1cf582d5
--- /dev/null
+++ b/Libraries/VvIO/vvXmlReader.cxx
@@ -0,0 +1,395 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvXmlReader.h"
+
+#include <QDomElement>
+#include <QDebug>
+
+#include <vvQueryResult.h>
+
+#include "vvHeader.h"
+#include "vvXmlUtil.h"
+
+#define die(_msg) return this->abort(_msg)
+
+#define test_or_fail(_cond) if (!(_cond)) return false
+#define test_or_die(_cond, _msg) if (!(_cond)) die(_msg)
+
+#define BEGIN_MAP_FROM_STRING(_type, _str, _val) \
+  do { const QString _mfs_in = _str; _type &_mfs_out = _val; if (0)
+#define MAP_FROM_STRING(_str, _val) \
+  else if (_mfs_in == _str) _mfs_out = _val
+#define END_MAP_FROM_STRING(_expr) \
+  else { _expr; } } while (0)
+
+QTE_IMPLEMENT_D_FUNC(vvXmlReader)
+
+//BEGIN vvXmlReaderPrivate
+
+//-----------------------------------------------------------------------------
+class vvXmlReaderPrivate
+{
+public:
+  QDomDocument document;
+  QDomNode currentNode;
+
+  QString lastError;
+
+  bool abort(const QString&);
+
+  template <typename T>
+  bool read(T& result, vvXmlReader& q,
+            bool (vvXmlReader::*method)(QDomNode&, T&));
+  template <typename L, typename T>
+  bool read(L& list, QDomNode& node, vvXmlReader& q,
+            bool (vvXmlReader::*method)(QDomNode&, T&));
+  template <typename T>
+  bool read(QDomNode& node, T& out, const char* type);
+
+  bool firstElement(QDomElement& elem, QDomNode node, const char* type);
+};
+
+//-----------------------------------------------------------------------------
+bool vvXmlReaderPrivate::abort(const QString& error)
+{
+  qDebug() << "vvXmlReader:" << qPrintable(error);
+  this->lastError = error;
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+bool vvXmlReaderPrivate::read(
+  T& result, vvXmlReader& q, bool (vvXmlReader::*method)(QDomNode&, T&))
+{
+  test_or_die(!this->document.isNull(), "No data is available");
+  return (q.*method)(this->currentNode, result);
+}
+
+//-----------------------------------------------------------------------------
+template <typename L, typename T>
+bool vvXmlReaderPrivate::read(
+  L& list, QDomNode& node, vvXmlReader& q,
+  bool (vvXmlReader::*method)(QDomNode&, T&))
+{
+  test_or_die(!this->document.isNull(), "No data is available");
+  test_or_die(!node.isNull(), "Read position is at end of data");
+
+  list.clear();
+  while (!node.isNull())
+    {
+    // Read item
+    T item;
+    test_or_fail((q.*method)(node, item));
+    list.push_back(item);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+template <typename T>
+bool vvXmlReaderPrivate::read(QDomNode& node, T& out, const char* type)
+{
+  // Read data
+  QDomElement elem;
+  test_or_fail(this->firstElement(elem, node, type));
+  test_or_fail(vvXmlUtil::readNode(elem, out, &this->lastError));
+
+  // Advance read position to next node
+  node = elem.nextSibling();
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReaderPrivate::firstElement(
+  QDomElement& elem, QDomNode node, const char* type)
+{
+  test_or_die(!node.isNull(),
+              "No data available or read position at end of data");
+  if (!node.isElement())
+    {
+    node = node.nextSiblingElement();
+    test_or_die(!node.isNull(),
+                QString("End of data while looking for %1").arg(type));
+    }
+
+  elem = node.toElement();
+  return true;
+}
+
+//END vvXmlReaderPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvXmlReader general
+
+//-----------------------------------------------------------------------------
+vvXmlReader::vvXmlReader() : d_ptr(new vvXmlReaderPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvXmlReader::~vvXmlReader()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::abort(const QString& error)
+{
+  QTE_D(vvXmlReader);
+  return d->abort(error);
+}
+
+//-----------------------------------------------------------------------------
+QString vvXmlReader::error()
+{
+  QTE_D(vvXmlReader);
+  return d->lastError;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::open(const QUrl& uri, vvReader::Format format)
+{
+  test_or_die(format == Auto || format == Xml,
+              "Requested format not supported");
+
+  QString error;
+  test_or_die(this->open(uri, error), error);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::setInput(const QString& data, vvReader::Format format)
+{
+  test_or_die(format == Auto || format == Xml,
+              "Requested format not supported");
+
+  QTE_D(vvXmlReader);
+
+  d->document = QDomDocument();
+  d->currentNode = QDomNode();
+
+  QString em;
+  int el, ec;
+
+  if (!d->document.setContent(data, &em, &el, &ec))
+    {
+    d->document = QDomDocument();
+    const QString format("Unable to parse XML: at %1:%2: %3");
+    die(format.arg(el).arg(ec).arg(em));
+    }
+
+  return this->rewind();
+}
+
+//-----------------------------------------------------------------------------
+void vvXmlReader::setHeader(const vvHeader&)
+{
+  // XML reader doesn't care about headers
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::rewind()
+{
+  QTE_D(vvXmlReader);
+
+  QDomElement root = d->document.firstChildElement();
+  if (root.isNull() || root.tagName() != "xml")
+    {
+    d->document = QDomDocument();
+    die("Invalid or missing XML root node");
+    }
+
+  d->currentNode = root.firstChildElement();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::advance()
+{
+  test_or_die(!this->atEnd(), "Already at EOF");
+
+  QTE_D(vvXmlReader);
+
+  QDomElement next;
+  while (!d->currentNode.isNull())
+    {
+    // See if we have a next sibling
+    next = d->currentNode.nextSiblingElement();
+    if (!next.isNull())
+      {
+      // If yes, move to that node
+      d->currentNode = next;
+      return true;
+      }
+
+    // If not, move up to parent and keep looking
+    d->currentNode = d->currentNode.parentNode();
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::atEnd() const
+{
+  QTE_D_CONST(vvXmlReader);
+  return d->currentNode.isNull();
+}
+
+//END vvKstReader general
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvKstReader struct readers
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::readHeader(QDomNode& node, vvHeader& header)
+{
+  QTE_D(vvXmlReader);
+
+  QDomElement elem;
+  test_or_fail(d->firstElement(elem, node, "header"));
+
+  const QString type = elem.tagName();
+
+  BEGIN_MAP_FROM_STRING(vvHeader::FileType, type, header.type);
+  MAP_FROM_STRING("track",          vvHeader::Tracks);
+  MAP_FROM_STRING("descriptor",     vvHeader::Descriptors);
+  MAP_FROM_STRING("query",          vvHeader::QueryPlan);
+  MAP_FROM_STRING("query_result",   vvHeader::QueryResults);
+  MAP_FROM_STRING("event_meta",     vvHeader::EventSetInfo);
+  END_MAP_FROM_STRING(die("Unrecognized file format " + type));
+
+  header.version = 0;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::readQueryPlan(QDomNode& node, vvRetrievalQuery& query)
+{
+  // Read generic query
+  vvQueryInstance qi;
+  test_or_fail(this->readQueryPlan(node, qi));
+
+  // Verify query type
+  test_or_die(qi.isRetrievalQuery(), "Node is not a retrieval query");
+
+  // Done
+  query = *qi.constRetrievalQuery();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::readQueryPlan(QDomNode& node, vvSimilarityQuery& query)
+{
+  // Read generic query
+  vvQueryInstance qi;
+  test_or_fail(this->readQueryPlan(node, qi));
+
+  // Verify query type
+  test_or_die(qi.isSimilarityQuery(), "Node is not a similarity query");
+
+  // Done
+  query = *qi.constSimilarityQuery();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::readGeoPoly(QDomNode& node, vgGeocodedPoly& poly,
+                              vvDatabaseQuery::IntersectionType* filterMode)
+{
+  QTE_D(vvXmlReader);
+
+  // Read data
+  QDomElement elem;
+  test_or_fail(d->firstElement(elem, node, "geo_poly"));
+  test_or_fail(vvXmlUtil::readNode(elem, poly, filterMode, &d->lastError));
+
+  // Advance read position to next node
+  node = elem.nextSibling();
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+#define vvXmlReader_Implement_Read(_name, _type, _tag) \
+  bool vvXmlReader::read##_name(QDomNode& node, _type& data) \
+  { \
+    QTE_D(vvXmlReader); \
+    return d->read(node, data, _tag); \
+  }
+
+vvXmlReader_Implement_Read(Track,         vvTrack,          "track")
+vvXmlReader_Implement_Read(Descriptor,    vvDescriptor,     "descriptor")
+vvXmlReader_Implement_Read(QueryPlan,     vvQueryInstance,  "query")
+vvXmlReader_Implement_Read(QueryResult,   vvQueryResult,    "query_result")
+vvXmlReader_Implement_Read(EventSetInfo,  vvEventSetInfo,   "event_meta")
+
+//END vvXmlReader struct readers
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvXmlReader bound data readers
+#define vvXmlReader_Implement_BoundRead(_name, _type) \
+  bool vvXmlReader::read##_name(_type& data) \
+  { \
+    QTE_D(vvXmlReader); \
+    bool (vvXmlReader::*method)(QDomNode&, _type&) = \
+      &vvXmlReader::read##_name; \
+    return d->read(data, *this, method); \
+  }
+
+vvXmlReader_Implement_BoundRead(Header,       vvHeader)
+vvXmlReader_Implement_BoundRead(Track,        vvTrack)
+vvXmlReader_Implement_BoundRead(Descriptor,   vvDescriptor)
+vvXmlReader_Implement_BoundRead(QueryPlan,    vvQueryInstance)
+vvXmlReader_Implement_BoundRead(QueryPlan,    vvRetrievalQuery)
+vvXmlReader_Implement_BoundRead(QueryPlan,    vvSimilarityQuery)
+vvXmlReader_Implement_BoundRead(QueryResult,  vvQueryResult)
+vvXmlReader_Implement_BoundRead(EventSetInfo, vvEventSetInfo)
+
+//-----------------------------------------------------------------------------
+bool vvXmlReader::readGeoPoly(
+  vgGeocodedPoly& poly, vvDatabaseQuery::IntersectionType* filterMode)
+{
+  QTE_D(vvXmlReader);
+
+  test_or_die(!d->document.isNull(), "No data is available");
+  return this->readGeoPoly(d->currentNode, poly, filterMode);
+}
+
+//END vvKstReader bound data readers
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvKstReader array helpers
+
+#define vvXmlReader_Implement_ReadTypedArray(_name, _type, _list) \
+  bool vvXmlReader::read##_name##s(QDomNode& node, _list<_type>& list) \
+  { \
+    QTE_D(vvXmlReader); \
+    bool (vvXmlReader::*method)(QDomNode&, _type&) = \
+      &vvXmlReader::read##_name; \
+    return d->read(list, node, *this, method); \
+  }
+
+#define vvXmlReader_Implement_ReadArray(_name, _type) \
+  vvXmlReader_Implement_BoundRead(_name##s, QList<_type>) \
+  vvXmlReader_Implement_BoundRead(_name##s, std::vector<_type>) \
+  vvXmlReader_Implement_ReadTypedArray(_name, _type, std::vector) \
+  vvXmlReader_Implement_ReadTypedArray(_name, _type, QList)
+
+vvXmlReader_Implement_ReadArray(Track, vvTrack)
+vvXmlReader_Implement_ReadArray(Descriptor, vvDescriptor)
+vvXmlReader_Implement_ReadArray(QueryResult, vvQueryResult)
+
+//END vvXmlReader array helpers
diff --git a/Libraries/VvIO/vvXmlReader.h b/Libraries/VvIO/vvXmlReader.h
new file mode 100644
index 00000000..d9566594
--- /dev/null
+++ b/Libraries/VvIO/vvXmlReader.h
@@ -0,0 +1,96 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvXmlReader_h
+#define __vvXmlReader_h
+
+#include <vgExport.h>
+
+#include "vvReader.h"
+
+class QDomNode;
+
+class vvXmlReaderPrivate;
+
+class VV_IO_EXPORT vvXmlReader : public vvReader
+{
+public:
+  vvXmlReader();
+  virtual ~vvXmlReader();
+
+  virtual QString error();
+
+  // Data binding
+  virtual bool open(const QUrl&, Format format = Xml);
+  virtual bool setInput(const QString&, Format format = Xml);
+
+  virtual void setHeader(const vvHeader&);
+
+  // Random access
+  virtual bool rewind();
+  virtual bool advance();
+  virtual bool atEnd() const;
+
+  // Bound data readers
+  virtual bool readHeader(vvHeader& header);
+
+  virtual bool readTrack(vvTrack& track);
+  virtual bool readDescriptor(vvDescriptor& descriptor);
+
+  virtual bool readQueryPlan(vvQueryInstance& query);
+  virtual bool readQueryPlan(vvRetrievalQuery& query);
+  virtual bool readQueryPlan(vvSimilarityQuery& query);
+
+  virtual bool readQueryResult(vvQueryResult& result);
+
+  virtual bool readGeoPoly(vgGeocodedPoly& poly,
+                           vvDatabaseQuery::IntersectionType* filterMode = 0);
+
+  virtual bool readEventSetInfo(vvEventSetInfo& info);
+
+  // External data readers
+  bool readHeader(QDomNode& node, vvHeader& header);
+
+  bool readTrack(QDomNode& node, vvTrack& track);
+  bool readDescriptor(QDomNode& node, vvDescriptor& descriptor);
+
+  bool readQueryPlan(QDomNode& node, vvQueryInstance& query);
+  bool readQueryPlan(QDomNode& node, vvRetrievalQuery& query);
+  bool readQueryPlan(QDomNode& node, vvSimilarityQuery& query);
+
+  bool readQueryResult(QDomNode& node, vvQueryResult& result);
+
+  bool readGeoPoly(QDomNode& node, vgGeocodedPoly& poly,
+                   vvDatabaseQuery::IntersectionType* filterMode = 0);
+
+  bool readEventSetInfo(QDomNode& node, vvEventSetInfo& info);
+
+  // Array helpers
+#define vvXmlReader_ReadArray(_name, _type) \
+  virtual bool read##_name(std::vector<_type>& list); \
+  virtual bool read##_name(QList<_type>& list); \
+  bool read##_name(QDomNode& node, std::vector<_type>& list); \
+  bool read##_name(QDomNode& node, QList<_type>& list)
+
+  vvXmlReader_ReadArray(Tracks, vvTrack);
+  vvXmlReader_ReadArray(Descriptors, vvDescriptor);
+  vvXmlReader_ReadArray(QueryResults, vvQueryResult);
+
+#undef vvXmlReader_ReadArray
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvXmlReader)
+
+  using vvReader::open;
+
+  bool abort(const QString&);
+
+private:
+  QTE_DECLARE_PRIVATE(vvXmlReader)
+  Q_DISABLE_COPY(vvXmlReader)
+};
+
+#endif
diff --git a/Libraries/VvIO/vvXmlUtil.cxx b/Libraries/VvIO/vvXmlUtil.cxx
new file mode 100644
index 00000000..462222a7
--- /dev/null
+++ b/Libraries/VvIO/vvXmlUtil.cxx
@@ -0,0 +1,1159 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvXmlUtil.h"
+
+#include <QDomDocument>
+#include <QStringList>
+
+#include <qtStlUtil.h>
+
+//BEGIN reader private helper functions
+
+namespace // anonymous
+{
+
+#define die(_msg) do { if (error) *error = _msg; return false; } while (0)
+
+#define test_or_fail(_cond) if (!(_cond)) return false
+#define test_or_die(_cond, _msg) if (!(_cond)) die(_msg)
+
+#define init_elem(_e, _n, _tag, _msg) \
+  test_or_die(_n.isElement(), "Node is not an XML element"); \
+  const QDomElement _e = _n.toElement(); \
+  test_or_die(elem.tagName() == _tag, _msg)
+
+#define read_attr(_v, _e, _a, _n) \
+  test_or_fail(readAttribute(_v, _e, _a, _n, error))
+
+#define read_attr_opt(_v, _e, _a, _n) \
+  if (_e.hasAttribute(_a)) \
+    test_or_fail(readAttribute(_v, _e, _a, _n, error))
+
+#define foreach_child_element(_i, _p, _tn) \
+  for(QDomElement _i = _p.firstChildElement(_tn); \
+      !_i.isNull(); _i = _i.nextSiblingElement(_tn))
+
+#define BEGIN_MAP_FROM_STRING(_type, _str, _val) \
+  do { const QString _mfs_in = _str; _type &_mfs_out = _val; if (0)
+#define MAP_FROM_STRING(_str, _val) \
+  else if (_mfs_in == _str) _mfs_out = _val
+#define END_MAP_FROM_STRING(_msg) \
+  else { die(_msg); } } while (0)
+
+//-----------------------------------------------------------------------------
+bool readColorComponent(qreal& out, const QString& value)
+{
+  bool okay;
+  if (value.endsWith('%'))
+    {
+    int n = value.left(value.length() - 1).toInt(&okay);
+    out = qBound(0.0, n * 0.01, 1.0);
+    }
+  else
+    {
+    int n = value.toInt(&okay);
+    out = qBound(0, n, 255) / 255.0;
+    }
+
+  return okay;
+}
+
+//-----------------------------------------------------------------------------
+bool readColor(
+  QColor& out, QString value, bool allowAlpha,
+  void (QColor::*setColor)(qreal, qreal, qreal, qreal))
+{
+  // Extract components
+  const int s = value.indexOf('(') + 1, e = value.indexOf(')');
+  value = value.mid(s, e - s);
+
+  QStringList values = value.split(',');
+  test_or_fail(values.count() == (allowAlpha ? 4 : 3));
+
+  // Parse main components
+  qreal component[4];
+  test_or_fail(readColorComponent(component[0], values[0]));
+  test_or_fail(readColorComponent(component[1], values[1]));
+  test_or_fail(readColorComponent(component[2], values[2]));
+
+  // Parse alpha component, if applicable
+  if (allowAlpha)
+    {
+    bool okay;
+    component[3] = values[3].toDouble(&okay);
+    test_or_fail(okay);
+    }
+  else
+    {
+    component[3] = 1.0;
+    }
+
+  // Set color
+  (out.*setColor)(component[0], component[1], component[2], component[3]);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+#define vvXmlUtil_Implement_ReadAttribute(_t, _c) \
+  bool readAttribute(_t& out, const QDomElement& elem, const QString& tagName, \
+                     const QString& name, QString* error) \
+  { \
+    test_or_die(elem.hasAttribute(tagName), \
+                QString("Error reading %1: no such attribute").arg(name)); \
+    bool okay; \
+    out = elem.attribute(tagName).to##_c(&okay); \
+    test_or_die(okay, QString("Error reading %1: bad value").arg(name)); \
+    return true; \
+  }
+
+vvXmlUtil_Implement_ReadAttribute(int, Int)
+vvXmlUtil_Implement_ReadAttribute(uint, UInt)
+vvXmlUtil_Implement_ReadAttribute(long long, LongLong)
+vvXmlUtil_Implement_ReadAttribute(float, Float)
+vvXmlUtil_Implement_ReadAttribute(double, Double)
+
+//-----------------------------------------------------------------------------
+bool readAttribute(
+  QString& out, const QDomElement& elem, const QString& tagName,
+  const QString& name, QString* error)
+{
+  test_or_die(elem.hasAttribute(tagName),
+              QString("Error reading %1: no such attribute").arg(name));
+  out = elem.attribute(tagName);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readAttribute(
+  std::string& out, const QDomElement& elem, const QString& tagName,
+  const QString& name, QString* error)
+{
+  test_or_die(elem.hasAttribute(tagName),
+              QString("Error reading %1: no such attribute").arg(name));
+  out = stdString(elem.attribute(tagName));
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readAttribute(
+  QColor& out, const QDomElement& elem, const QString& tagName,
+  const QString& name, QString* error)
+{
+
+  test_or_die(elem.hasAttribute(tagName),
+              QString("Error reading %1: no such attribute").arg(name));
+
+  bool result = false;
+  const QString value = elem.attribute(tagName);
+  if (value.startsWith("rgb("))
+    {
+    result = readColor(out, value, false, &QColor::setRgbF);
+    }
+  else if (value.startsWith("rgba("))
+    {
+    result = readColor(out, value, true, &QColor::setRgbF);
+    }
+  else if (value.startsWith("hsl("))
+    {
+    result = readColor(out, value, false, &QColor::setHslF);
+    }
+  else if (value.startsWith("hsla("))
+    {
+    result = readColor(out, value, true, &QColor::setHslF);
+    }
+  else
+    {
+    result = QColor::isValidColor(value);
+    out.setNamedColor(value);
+    }
+
+  static const char* badColorMsg =
+    "Error reading %1: '%2' is not a valid color specification";
+  test_or_die(result, QString(badColorMsg).arg(name, value));
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readAttribute(
+  vvDatabaseQuery::IntersectionType& out, const QDomElement& elem,
+  const QString& tagName, const QString& name, QString* error)
+{
+  test_or_die(elem.hasAttribute(tagName),
+              QString("Error reading %1 filter mode: no such attribute").arg(name));
+
+  const QString value = elem.attribute(tagName);
+  test_or_die(!value.isEmpty(),
+              QString("Error reading %1 filter mode: missing value").arg(name));
+
+  BEGIN_MAP_FROM_STRING(vvDatabaseQuery::IntersectionType, value, out);
+  MAP_FROM_STRING("contains_wholly",     vvDatabaseQuery::ContainsWholly);
+  MAP_FROM_STRING("contains_any",        vvDatabaseQuery::ContainsAny);
+  MAP_FROM_STRING("intersects",          vvDatabaseQuery::Intersects);
+  MAP_FROM_STRING("intersects_inbound",  vvDatabaseQuery::IntersectsInbound);
+  MAP_FROM_STRING("intersects_outbound", vvDatabaseQuery::IntersectsOutbound);
+  MAP_FROM_STRING("does_not_contain",    vvDatabaseQuery::DoesNotContain);
+  MAP_FROM_STRING("ignore",              vvDatabaseQuery::Ignore);
+  END_MAP_FROM_STRING(
+    QString("Error reading %1 filter mode:"
+            " '%2' is not a valid filter mode").arg(name, value));
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readTime(vgTimeStamp& ts, const QDomElement& elem,
+              const QString& name, QString* error)
+{
+  read_attr(ts.Time, elem, "time", name + " time");
+  read_attr(ts.FrameNumber, elem, "frame_number", name + " frame number");
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readCoord(vgGeoRawCoordinate& coord, const QDomElement& elem,
+               const QString& name, QString* error)
+{
+  if (elem.hasAttribute("latitude") && elem.hasAttribute("longitude"))
+    {
+    read_attr(coord.Latitude, elem, "latitude",
+              name + " coordinate latitude");
+    read_attr(coord.Longitude, elem, "longitude",
+              name + " coordinate longitude");
+    }
+  else if (elem.hasAttribute("easting") && elem.hasAttribute("northing"))
+    {
+    read_attr(coord.Easting, elem, "easting",
+              name + " coordinate easting");
+    read_attr(coord.Northing, elem, "northing",
+              name + " coordinate northing");
+    }
+  else
+    {
+    const QString msg =
+      "Error reading %1: location specification missing or invalid";
+    die(msg.arg(name));
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readNode(const QDomElement& elem, vvTrackId& id, QString* error)
+{
+  read_attr(id.Source, elem, "source", "track source");
+  read_attr(id.SerialNumber, elem, "serial_number", "serial number");
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readNode(
+  const QDomElement& elem, vvDescriptorRegionEntry& re, QString* error)
+{
+  test_or_fail(readTime(re.TimeStamp, elem,
+                        "descriptor region entry", error));
+  read_attr(re.ImageRegion.TopLeft.Y, elem, "top",
+            "descriptor region entry image region top");
+  read_attr(re.ImageRegion.TopLeft.X, elem, "left",
+            "descriptor region entry image region left");
+  read_attr(re.ImageRegion.BottomRight.Y, elem, "bottom",
+            "descriptor region entry image region bottom");
+  read_attr(re.ImageRegion.BottomRight.X, elem, "right",
+            "descriptor region entry image region right");
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readNode(
+  const QDomElement& elem, vgGeocodedPoly& poly,
+  vvDatabaseQuery::IntersectionType* filterMode,
+  const QString& name, QString* error)
+{
+  poly = vgGeocodedPoly();
+  filterMode && (*filterMode = vvDatabaseQuery::Ignore);
+
+  // Read GCS
+  read_attr(poly.GCS, elem, "gcs", name + " GCS");
+
+  // Read coordinates
+  foreach_child_element (pce, elem, "coordinate")
+    {
+    vgGeoRawCoordinate coord;
+    test_or_fail(readCoord(coord, pce, name + " coordinate", error));
+    poly.Coordinate.push_back(coord);
+    }
+
+  // Read filter mode, if requested
+  if (filterMode)
+    {
+    *filterMode = vvDatabaseQuery::ContainsAny;
+    read_attr_opt(*filterMode, elem, "mode", name);
+    }
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readNode(
+  const QDomElement& elem, vvDatabaseQuery& query, QString* error)
+{
+  // Read query ID
+  read_attr(query.QueryId, elem, "id", "query ID");
+
+  // Read stream ID limit, if present
+  const QDomElement silElem = elem.firstChildElement("stream_limit");
+  if (!silElem.isNull())
+    {
+    read_attr(query.StreamIdLimit, silElem, "value",
+              "query stream ID limit");
+    }
+
+  // Read temporal limit, if present
+  const QDomElement tlElem = elem.firstChildElement("temporal_limit");
+  if (!tlElem.isNull())
+    {
+    read_attr(query.TemporalLowerLimit, tlElem, "lower",
+              "query temporal lower limit");
+    read_attr(query.TemporalUpperLimit, tlElem, "upper",
+              "query temporal upper limit");
+
+    query.TemporalFilter = vvDatabaseQuery::ContainsAny;
+    read_attr_opt(query.TemporalFilter, tlElem, "mode", "query temporal");
+    }
+  else
+    {
+    query.TemporalFilter = vvDatabaseQuery::Ignore;
+    }
+
+  // Read spatial limit, if present
+  const QDomElement slElem = elem.firstChildElement("spatial_limit");
+  if (!slElem.isNull())
+    {
+    test_or_fail(readNode(slElem, query.SpatialLimit, &query.SpatialFilter,
+                          "query geospatial limit", error));
+    }
+  else
+    {
+    query.SpatialFilter = vvDatabaseQuery::Ignore;
+    }
+
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readNode(
+  const QDomElement& elem, vvRetrievalQuery& query, QString* error)
+{
+  vvDatabaseQuery& abstractQuery = query;
+  test_or_fail(readNode(elem, abstractQuery, error));
+
+  // Read requested entities
+  const QString etype = elem.attribute("requested_entities");
+  test_or_die(!etype.isEmpty(),
+              "Error reading retrieval query entity type: missing value");
+
+  BEGIN_MAP_FROM_STRING(vvRetrievalQuery::EntityType, etype,
+                        query.RequestedEntities);
+  MAP_FROM_STRING("tracks",             vvRetrievalQuery::Tracks);
+  MAP_FROM_STRING("descriptors",        vvRetrievalQuery::Descriptors);
+  MAP_FROM_STRING("all",                vvRetrievalQuery::TracksAndDescriptors);
+  MAP_FROM_STRING("tracks,descriptors", vvRetrievalQuery::TracksAndDescriptors);
+  MAP_FROM_STRING("descriptors,tracks", vvRetrievalQuery::TracksAndDescriptors);
+  END_MAP_FROM_STRING(
+    QString("Error reading retrieval query entity type:"
+            " '%1' is not a valid retrieval type").arg(etype));
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool readNode(
+  const QDomElement& elem, vvSimilarityQuery& query, QString* error)
+{
+  vvDatabaseQuery& abstractQuery = query;
+  test_or_fail(readNode(elem, abstractQuery, error));
+
+  // Read threshold
+  query.SimilarityThreshold = 0.0;
+  read_attr_opt(query.SimilarityThreshold, elem, "threshold",
+                "query similarity threshold");
+
+  // Read tracks and descriptors
+  foreach_child_element (qte, elem, "track")
+    {
+    vvTrack track;
+    test_or_fail(vvXmlUtil::readNode(qte, track, error));
+    query.Tracks.push_back(track);
+    }
+  foreach_child_element (qde, elem, "descriptor")
+    {
+    vvDescriptor descriptor;
+    test_or_fail(vvXmlUtil::readNode(qde, descriptor, error));
+    query.Descriptors.push_back(descriptor);
+    }
+
+  // Read IQR model, if present
+  const QDomElement iqrElem = elem.firstChildElement("iqr_model");
+  if (!iqrElem.isNull())
+    {
+    QString encodedModel;
+    read_attr(encodedModel, iqrElem, "data", "query IQR model");
+    QByteArray model = QByteArray::fromBase64(encodedModel.toAscii());
+
+    // Convert to std::vector<uchar>... oh, the pain...
+    const uchar* rawModel =
+      reinterpret_cast<const uchar*>(model.constData());
+    int n = model.size();
+    query.IqrModel.resize(n);
+    while (n--)
+      {
+      query.IqrModel[n] = rawModel[n];
+      }
+    }
+
+  // Done
+  return true;
+}
+
+}
+
+//END reader private helper functions
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN writer private helper functions
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+long long getTime(const vgTimeStamp& ts)
+{
+  return static_cast<long long>(ts.Time);
+}
+
+//-----------------------------------------------------------------------------
+void testFlag(vvUserData::Flags flags, vvUserData::Flag flag,
+              QStringList& list, const QString& name)
+{
+  if (flags.testFlag(flag))
+    {
+    list.append(name);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QDomElement makeNode(QDomDocument& doc, const vvTrackId& trackId)
+{
+  // Create track node with ID
+  QDomElement elem = doc.createElement("track");
+  elem.setAttribute("source", trackId.Source);
+  elem.setAttribute("serial_number", trackId.SerialNumber);
+
+  return elem;
+}
+
+//-----------------------------------------------------------------------------
+QDomElement makeNode(
+  QDomDocument& doc, const vgGeocodedPoly& poly, const QString& tagName)
+{
+  // Create node with GCS
+  QDomElement gpElem = doc.createElement(tagName);
+  gpElem.setAttribute("gcs", poly.GCS);
+
+  // Add coordinate list
+  for (size_t n = 0, k = poly.Coordinate.size(); n < k; ++n)
+    {
+    const vgGeoRawCoordinate& coord = poly.Coordinate[n];
+    QDomElement ptElem = doc.createElement("coordinate");
+    ptElem.setAttribute("easting", coord.Easting);
+    ptElem.setAttribute("northing", coord.Northing);
+    gpElem.appendChild(ptElem);
+    }
+
+  // Done
+  return gpElem;
+}
+
+//-----------------------------------------------------------------------------
+void setFilterAttribute(
+  QDomElement& elem, vvDatabaseQuery::IntersectionType value)
+{
+  switch (value)
+    {
+    case vvDatabaseQuery::ContainsWholly:
+      elem.setAttribute("mode", "contains_wholly");
+      break;
+    case vvDatabaseQuery::ContainsAny:
+      elem.setAttribute("mode", "contains_any");
+      break;
+    case vvDatabaseQuery::Intersects:
+      elem.setAttribute("mode", "intersects");
+      break;
+    case vvDatabaseQuery::IntersectsInbound:
+      elem.setAttribute("mode", "intersects_inbound");
+      break;
+    case vvDatabaseQuery::IntersectsOutbound:
+      elem.setAttribute("mode", "intersects_outbound");
+      break;
+    case vvDatabaseQuery::DoesNotContain:
+      elem.setAttribute("mode", "does_not_contain");
+      break;
+    default:
+      elem.setAttribute("mode", "ignore");
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+QDomElement makeNode(QDomDocument& doc, const vvDatabaseQuery& query)
+{
+  // Create query node with ID and type
+  QDomElement qpElem = doc.createElement("query");
+  qpElem.setAttribute("type", "abstract");
+  qpElem.setAttribute("id", qtString(query.QueryId));
+
+  // Add stream ID limit, if set
+  if (!query.StreamIdLimit.empty())
+    {
+    QDomElement siLimit = doc.createElement("stream_limit");
+    siLimit.setAttribute("value", qtString(query.StreamIdLimit));
+    qpElem.appendChild(siLimit);
+    }
+
+  // Add temporal limit, if set
+  if (query.TemporalLowerLimit != -1 || query.TemporalUpperLimit != -1)
+    {
+    QDomElement tLimit = doc.createElement("temporal_limit");
+    setFilterAttribute(tLimit, query.TemporalFilter);
+    tLimit.setAttribute("lower", query.TemporalLowerLimit);
+    tLimit.setAttribute("upper", query.TemporalUpperLimit);
+    qpElem.appendChild(tLimit);
+    }
+
+  // Add spatial limit, if present
+  if (!query.SpatialLimit.Coordinate.empty())
+    {
+    QDomElement sLimit = makeNode(doc, query.SpatialLimit, "spatial_limit");
+    setFilterAttribute(sLimit, query.SpatialFilter);
+    qpElem.appendChild(sLimit);
+    }
+
+  // Done
+  return qpElem;
+}
+
+//-----------------------------------------------------------------------------
+void setScore(QDomElement& elem, const QString& name, long long score)
+{ if (score >= 0) elem.setAttribute(name, score); }
+void setScore(QDomElement& elem, const QString& name, double score)
+{ if (score >= 0.0) elem.setAttribute(name, score); }
+
+//-----------------------------------------------------------------------------
+void setColor(QDomElement& elem, const QString& name, const QColor& color)
+{
+  if (color.alphaF() != 1.0)
+    {
+    // If color has alpha component, must use 'rgba(...)' notation
+    const QString value =
+      QString("rgba(%1,%2,%3,%4)").arg(color.red()).arg(color.green())
+                                  .arg(color.blue()).arg(color.alphaF());
+    elem.setAttribute(name, value);
+    }
+  else
+    {
+    // If color has no alpha component, use hex notation
+    elem.setAttribute(name, color.name());
+    }
+}
+
+}
+
+//END writer private helper functions
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvXmlUtil public reader functions
+
+//-----------------------------------------------------------------------------
+bool vvXmlUtil::readNode(
+  const QDomNode& node, vvTrack& track, QString* error)
+{
+  init_elem(elem, node, "track", "Node is not a track");
+
+  track = vvTrack();
+
+  // Read track ID
+  test_or_fail(::readNode(elem, track.Id, error));
+
+  // Read track classification
+  foreach_child_element (tce, elem, "classification")
+    {
+    QString type;
+    double value;
+    read_attr(type, tce, "type", "track classification entry type");
+    read_attr(value, tce, "value", "track classification entry probability");
+    track.Classification.insert(std::make_pair(stdString(type), value));
+    }
+
+  // Read track states
+  foreach_child_element (tte, elem, "trajectory_state")
+    {
+    vvTrackState ts;
+
+    // Read time stamp and image point
+    test_or_fail(::readTime(ts.TimeStamp, tte, "track trajectory", error));
+    read_attr(ts.ImagePoint.X, tte, "x", "track trajectory image point X");
+    read_attr(ts.ImagePoint.Y, tte, "y", "track trajectory image point Y");
+
+    // Read image box
+    read_attr(ts.ImageBox.TopLeft.Y, tte, "bbox_top",
+              "track trajectory image box top");
+    read_attr(ts.ImageBox.TopLeft.X, tte, "bbox_left",
+              "track trajectory image box left");
+    read_attr(ts.ImageBox.BottomRight.Y, tte, "bbox_bottom",
+              "track trajectory image box bottom");
+    read_attr(ts.ImageBox.BottomRight.X, tte, "bbox_right",
+              "track trajectory image box right");
+
+    // Read world location, if set
+    QDomElement wle = tte.firstChildElement("world_location");
+    if (!wle.isNull())
+      {
+      read_attr(ts.WorldLocation.GCS, wle, "gcs",
+                "track trajectory world location GCS");
+      test_or_fail(readCoord(ts.WorldLocation, wle,
+                             "track trajectory world location", error));
+      }
+
+    // Read image object
+    foreach_child_element (ioe, tte, "image_object_point")
+      {
+      vvImagePointF ip;
+      read_attr(ip.X, ioe, "x", "track trajectory image object point X");
+      read_attr(ip.Y, ioe, "y", "track trajectory image object point Y");
+      ts.ImageObject.push_back(ip);
+      }
+
+    // Add state to track
+    track.Trajectory.insert(ts);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlUtil::readNode(
+  const QDomNode& node, vvDescriptor& descriptor, QString* error)
+{
+  init_elem(elem, node, "descriptor", "Node is not a descriptor");
+
+  descriptor = vvDescriptor();
+
+  // Read basic descriptor attributes
+  read_attr(descriptor.DescriptorName, elem, "name",
+            "descriptor name");
+  read_attr(descriptor.ModuleName, elem, "module",
+            "descriptor module name");
+  read_attr(descriptor.InstanceId, elem, "instance_id",
+            "descriptor instance ID");
+  read_attr(descriptor.Confidence, elem, "confidence",
+            "descriptor confidence");
+
+  // Read values
+  foreach_child_element (dve, elem, "value_vector")
+    {
+    std::vector<float> values;
+    foreach_child_element (vve, dve, "value")
+      {
+      float value;
+      read_attr(value, vve, "data", "descriptor values");
+      values.push_back(value);
+      }
+    descriptor.Values.push_back(values);
+    }
+
+  // Read regions
+  foreach_child_element (dre, elem, "region")
+    {
+    vvDescriptorRegionEntry region;
+    test_or_fail(::readNode(dre, region, error));
+    descriptor.Region.insert(region);
+    }
+
+  // Read track references
+  foreach_child_element (dte, elem, "track")
+    {
+    vvTrackId tid;
+    test_or_fail(::readNode(dte, tid, error));
+    descriptor.TrackIds.push_back(tid);
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlUtil::readNode(
+  const QDomNode& node, vvQueryInstance& query, QString* error)
+{
+  init_elem(elem, node, "query", "Node is not a query plan");
+
+  // Get query type
+  const QString type = elem.attribute("type");
+  if (type == "abstract")
+    {
+    // Read abstract query
+    query = vvQueryInstance(vvDatabaseQuery::Abstract);
+    test_or_fail(::readNode(elem, *query.abstractQuery(), error));
+    }
+  else if (type == "retrieval")
+    {
+    // Read retrieval query
+    query = vvQueryInstance(vvDatabaseQuery::Retrieval);
+    test_or_fail(::readNode(elem, *query.retrievalQuery(), error));
+    }
+  else if (type == "similarity")
+    {
+    // Read similarity query
+    query = vvQueryInstance(vvDatabaseQuery::Similarity);
+    test_or_fail(::readNode(elem, *query.similarityQuery(), error));
+    }
+  else if (type.isEmpty())
+    {
+    die("Error reading query plan: query type not specified");
+    }
+  else
+    {
+    const QString msg =
+      "Error reading query plan: '%1' is not a recognized query type";
+    die(msg.arg(type));
+    }
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+#define accept_flag(_str, _val) \
+  if (flag == _str) { result.UserData.Flags |= _val; continue; }
+bool vvXmlUtil::readNode(
+  const QDomNode& node, vvQueryResult& result, QString* error)
+{
+  init_elem(elem, node, "query_result", "Node is not a query result");
+
+  result = vvQueryResult();
+
+  // Read basic result attributes
+  read_attr(result.QueryId, elem, "query", "result query ID");
+  read_attr(result.StreamId, elem, "stream", "result stream ID");
+  read_attr(result.MissionId, elem, "mission", "result mission ID");
+  read_attr(result.InstanceId, elem, "instance_id", "result instance ID");
+
+  // Read temporal location, if present
+  QDomElement tlElem = elem.firstChildElement("temporal_location");
+  if (!tlElem.isNull())
+    {
+    read_attr(result.StartTime, tlElem, "start", "result start time");
+    read_attr(result.EndTime, tlElem, "end", "result end time");
+    }
+
+  // Read spatial location, if present
+  QDomElement slElem = elem.firstChildElement("spatial_location");
+  if (!slElem.isNull())
+    {
+    read_attr(result.Location.GCS, slElem, "gcs", "result location GCS");
+    test_or_fail(readCoord(result.Location, slElem,
+                           "result location", error));
+    }
+
+  // Get score element
+  QDomElement rsElem = elem.firstChildElement("score");
+  if (!rsElem.isNull())
+    {
+    // Read basic score attributes
+    read_attr_opt(result.Rank, rsElem, "rank", "result rank");
+    read_attr_opt(result.RelevancyScore, rsElem, "relevancy",
+                  "result relevancy");
+
+    // Read user classification
+    const QString rating = rsElem.attribute("rating");
+    if (!rating.isEmpty())
+      {
+      BEGIN_MAP_FROM_STRING(vvIqr::Classification, rating, result.UserScore);
+      MAP_FROM_STRING("positive",     vvIqr::PositiveExample);
+      MAP_FROM_STRING("negative",     vvIqr::NegativeExample);
+      MAP_FROM_STRING("unclassified", vvIqr::UnclassifiedExample);
+      END_MAP_FROM_STRING(
+        QString("Error reading result user classification:"
+                " '%1' is not a valid classification").arg(rating));
+      }
+
+    // Read user flags
+    const QStringList flags =
+      rsElem.attribute("flags").split(',', QString::SkipEmptyParts);
+    foreach (const QString& flag, flags)
+      {
+      // Test for known flags
+      accept_flag("starred", vvUserData::Starred)
+      // If we get here, the flag is not recognized
+      const QString msg =
+        "Error reading result user flags: unknown flag '%1'";
+      die(msg.arg(flag));
+      }
+    }
+
+  // Read user notes
+  read_attr_opt(result.UserData.Notes, elem, "notes", "result user notes");
+
+  // Read tracks and descriptors
+  foreach_child_element (rte, elem, "track")
+    {
+    vvTrack track;
+    test_or_fail(readNode(rte, track, error));
+    result.Tracks.push_back(track);
+    }
+  foreach_child_element (rde, elem, "descriptor")
+    {
+    vvDescriptor descriptor;
+    test_or_fail(readNode(rde, descriptor, error));
+    result.Descriptors.push_back(descriptor);
+    }
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlUtil::readNode(
+  const QDomNode& node, vvEventSetInfo& info, QString* error)
+{
+  init_elem(elem, node, "event_meta", "Node is not event set information");
+
+  info = vvEventSetInfo();
+
+  // Read attributes
+  read_attr(info.Name, elem, "name",
+            "event set name");
+  read_attr(info.DisplayThreshold, elem, "display_threshold",
+            "event set display threshold");
+  read_attr(info.PenColor, elem, "pen_color",
+            "event set pen color");
+  read_attr(info.BackgroundColor, elem, "background_color",
+            "event set background color");
+  read_attr(info.ForegroundColor, elem, "foreground_color",
+            "event set foreground color");
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvXmlUtil::readNode(
+  const QDomNode& node, vgGeocodedPoly& poly,
+  vvDatabaseQuery::IntersectionType* filterMode, QString* error)
+{
+  init_elem(elem, node, "geo_poly", "Node is not a geocoded polygon");
+  return ::readNode(elem, poly, filterMode, "geocoded polygon", error);
+}
+
+//END vvXmlUtil public reader functions
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvXmlUtil public writer functions
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(QDomDocument& doc, const vvTrack& track)
+{
+  // Create node from ID
+  QDomElement tElem = ::makeNode(doc, track.Id);
+
+  // Add track classification
+  foreach_iter (vvTrackObjectClassification::const_iterator,
+                tcIter, track.Classification)
+    {
+    QDomElement tcElem = doc.createElement("classification");
+    tcElem.setAttribute("type", qtString(tcIter->first));
+    tcElem.setAttribute("value", tcIter->second);
+    tElem.appendChild(tcElem);
+    }
+
+  // Add track states
+  foreach_iter (vvTrackTrajectory::const_iterator, ttIter, track.Trajectory)
+    {
+    QDomElement ttElem = doc.createElement("trajectory_state");
+    ttElem.setAttribute("time", getTime(ttIter->TimeStamp));
+    ttElem.setAttribute("frame_number", ttIter->TimeStamp.FrameNumber);
+    ttElem.setAttribute("x", ttIter->ImagePoint.X);
+    ttElem.setAttribute("y", ttIter->ImagePoint.Y);
+    ttElem.setAttribute("bbox_top", ttIter->ImageBox.TopLeft.Y);
+    ttElem.setAttribute("bbox_left", ttIter->ImageBox.TopLeft.X);
+    ttElem.setAttribute("bbox_bottom", ttIter->ImageBox.BottomRight.Y);
+    ttElem.setAttribute("bbox_right", ttIter->ImageBox.BottomRight.X);
+
+    // Add world location, if set
+    if (ttIter->WorldLocation.GCS != -1)
+      {
+      QDomElement wlElem = doc.createElement("world_location");
+      wlElem.setAttribute("gcs", ttIter->WorldLocation.GCS);
+      wlElem.setAttribute("easting", ttIter->WorldLocation.Easting);
+      wlElem.setAttribute("northing", ttIter->WorldLocation.Northing);
+      ttElem.appendChild(wlElem);
+      }
+
+    // Add object polygon
+    foreach_iter (vvImagePolygonF::const_iterator, ioIter, ttIter->ImageObject)
+      {
+      QDomElement ioElem = doc.createElement("image_object_point");
+      ioElem.setAttribute("x", ioIter->X);
+      ioElem.setAttribute("y", ioIter->Y);
+      ttElem.appendChild(ioElem);
+      }
+
+    tElem.appendChild(ttElem);
+    }
+
+  // Done
+  return tElem;
+}
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(
+  QDomDocument& doc, const vvDescriptor& descriptor)
+{
+  // Create descriptor node and add basic information
+  QDomElement dElem = doc.createElement("descriptor");
+  dElem.setAttribute("name", qtString(descriptor.DescriptorName));
+  dElem.setAttribute("module", qtString(descriptor.ModuleName));
+  dElem.setAttribute("instance_id", descriptor.InstanceId);
+  dElem.setAttribute("confidence", descriptor.Confidence);
+
+  // Add values
+  size_t k, i;
+  for (i = 0, k = descriptor.Values.size(); i < k; ++i)
+    {
+    QDomElement vvElem = doc.createElement("value_vector");
+    for (size_t j = 0, s = descriptor.Values[i].size(); j < s; ++j)
+      {
+      QDomElement vdElem = doc.createElement("value");
+      vdElem.setAttribute("data", descriptor.Values[i][j]);
+      vvElem.appendChild(vdElem);
+      }
+    dElem.appendChild(vvElem);
+    }
+
+  // Add regions
+  foreach_iter (vvDescriptorRegionMap::const_iterator,
+                drIter, descriptor.Region)
+    {
+    QDomElement drElem = doc.createElement("region");
+    drElem.setAttribute("time", getTime(drIter->TimeStamp));
+    drElem.setAttribute("frame_number", drIter->TimeStamp.FrameNumber);
+    drElem.setAttribute("top", drIter->ImageRegion.TopLeft.Y);
+    drElem.setAttribute("left", drIter->ImageRegion.TopLeft.X);
+    drElem.setAttribute("bottom", drIter->ImageRegion.BottomRight.Y);
+    drElem.setAttribute("right", drIter->ImageRegion.BottomRight.X);
+    dElem.appendChild(drElem);
+    }
+
+  // Add track references
+  for (i = 0, k = descriptor.TrackIds.size(); i < k; ++i)
+    {
+    dElem.appendChild(::makeNode(doc, descriptor.TrackIds[i]));
+    }
+
+  // Done
+  return dElem;
+}
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(QDomDocument& doc, const vvDatabaseQuery& query)
+{
+  return ::makeNode(doc, query);
+}
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(
+  QDomDocument& doc, const vvRetrievalQuery& query)
+{
+  // Create abstract query node and change type
+  QDomElement qpElem = ::makeNode(doc, query);
+  qpElem.setAttribute("type", "retrieval");
+
+  // Add requested entity information
+  switch (query.RequestedEntities)
+    {
+    case vvRetrievalQuery::Tracks:
+      qpElem.setAttribute("requested_entities", "tracks");
+      break;
+    case vvRetrievalQuery::Descriptors:
+      qpElem.setAttribute("requested_entities", "descriptors");
+      break;
+    default:
+      qpElem.setAttribute("requested_entities", "tracks,descriptors");
+      break;
+    }
+
+  // Done
+  return qpElem;
+}
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(
+  QDomDocument& doc, const vvSimilarityQuery& query)
+{
+  // Create abstract query node, change type, and add threshold
+  QDomElement qpElem = ::makeNode(doc, query);
+  qpElem.setAttribute("type", "similarity");
+  qpElem.setAttribute("threshold", query.SimilarityThreshold);
+
+  // Add tracks and descriptors
+  size_t k, n;
+  for (n = 0, k = query.Tracks.size(); n < k; ++n)
+    {
+    qpElem.appendChild(makeNode(doc, query.Tracks[n]));
+    }
+  for (n = 0, k = query.Descriptors.size(); n < k; ++n)
+    {
+    qpElem.appendChild(makeNode(doc, query.Descriptors[n]));
+    }
+
+  // Add IQR model, if present
+  const int iqrModelSize = static_cast<int>(query.IqrModel.size());
+  if (iqrModelSize)
+    {
+    QDomElement iqrElem = doc.createElement("iqr_model");
+
+    const char* rawModel =
+      reinterpret_cast<const char*>(&query.IqrModel[0]);
+    const QByteArray encodedModel =
+      QByteArray::fromRawData(rawModel, iqrModelSize).toBase64();
+
+    iqrElem.setAttribute("data", QString::fromAscii(encodedModel));
+    qpElem.appendChild(iqrElem);
+    }
+
+  // Done
+  return qpElem;
+}
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(QDomDocument& doc, const vvQueryResult& result)
+{
+  // Create query result node with ID and type
+  QDomElement qrElem = doc.createElement("query_result");
+  qrElem.setAttribute("query", qtString(result.QueryId));
+  qrElem.setAttribute("stream", qtString(result.StreamId));
+  qrElem.setAttribute("mission", qtString(result.MissionId));
+  qrElem.setAttribute("instance_id", result.InstanceId);
+
+  // Add temporal location, if set
+  if (result.StartTime != -1 && result.EndTime != -1)
+    {
+    QDomElement tlElem = doc.createElement("temporal_location");
+    tlElem.setAttribute("start", result.StartTime);
+    tlElem.setAttribute("end", result.EndTime);
+    qrElem.appendChild(tlElem);
+    }
+
+  // Add spatial location, if set
+  if (result.Location.GCS != -1)
+    {
+    QDomElement slElem = doc.createElement("spatial_location");
+    slElem.setAttribute("gcs", result.Location.GCS);
+    slElem.setAttribute("easting", result.Location.Easting);
+    slElem.setAttribute("northing", result.Location.Northing);
+    qrElem.appendChild(slElem);
+    }
+
+  // Add score
+  QDomElement rsElem = doc.createElement("score");
+  setScore(rsElem, "rank", result.Rank);
+  setScore(rsElem, "relevancy", result.RelevancyScore);
+  switch (result.UserScore)
+    {
+    case vvIqr::PositiveExample:
+      rsElem.setAttribute("rating", "positive");
+      break;
+    case vvIqr::NegativeExample:
+      rsElem.setAttribute("rating", "negative");
+      break;
+    default:
+      break;
+    }
+
+  // Add user flags
+  QStringList flags;
+  testFlag(result.UserData.Flags, vvUserData::Starred, flags, "starred");
+  if (!flags.isEmpty())
+    {
+    rsElem.setAttribute("flags", flags.join(","));
+    }
+
+  // Add score node to parent
+  if (rsElem.hasAttributes())
+    {
+    qrElem.appendChild(rsElem);
+    }
+
+  // Add user notes
+  if (!result.UserData.Notes.empty())
+    {
+    qrElem.setAttribute("notes", qtString(result.UserData.Notes));
+    }
+
+  // Add tracks and descriptors
+  size_t k, n;
+  for (n = 0, k = result.Tracks.size(); n < k; ++n)
+    {
+    qrElem.appendChild(makeNode(doc, result.Tracks[n]));
+    }
+  for (n = 0, k = result.Descriptors.size(); n < k; ++n)
+    {
+    qrElem.appendChild(makeNode(doc, result.Descriptors[n]));
+    }
+
+  // Done
+  return qrElem;
+}
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(QDomDocument& doc, const vgGeocodedPoly& poly)
+{
+  return ::makeNode(doc, poly, "geo_poly");
+}
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(QDomDocument& doc, const vvSpatialFilter& filter)
+{
+  QDomElement sfElem = ::makeNode(doc, filter.poly, "spatial_limit");
+  if (filter.filter)
+    {
+    setFilterAttribute(sfElem, *filter.filter);
+    }
+  return sfElem;
+}
+
+//-----------------------------------------------------------------------------
+QDomNode vvXmlUtil::makeNode(QDomDocument& doc, const vvEventSetInfo& info)
+{
+  QDomElement esiElem = doc.createElement("event_meta");
+
+  esiElem.setAttribute("name", info.Name);
+  esiElem.setAttribute("display_threshold", info.DisplayThreshold);
+  setColor(esiElem, "pen_color", info.PenColor);
+  setColor(esiElem, "background_color", info.BackgroundColor);
+  setColor(esiElem, "foreground_color", info.ForegroundColor);
+
+  return esiElem;
+}
+
+//END vvXmlUtil public writer functions
diff --git a/Libraries/VvIO/vvXmlUtil.h b/Libraries/VvIO/vvXmlUtil.h
new file mode 100644
index 00000000..3e5d7167
--- /dev/null
+++ b/Libraries/VvIO/vvXmlUtil.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvXmlUtil_h
+#define __vvXmlUtil_h
+
+#include <vgExport.h>
+
+#include "vvWriterData.h"
+
+class QDomDocument;
+class QDomNode;
+
+#define OUT_ERROR QString* error = 0
+
+namespace vvXmlUtil
+{
+  VV_IO_EXPORT bool readNode(const QDomNode&, vvTrack&, OUT_ERROR);
+  VV_IO_EXPORT bool readNode(const QDomNode&, vvDescriptor&, OUT_ERROR);
+  VV_IO_EXPORT bool readNode(const QDomNode&, vvQueryInstance&, OUT_ERROR);
+  VV_IO_EXPORT bool readNode(const QDomNode&, vvQueryResult&, OUT_ERROR);
+  VV_IO_EXPORT bool readNode(const QDomNode&, vvEventSetInfo&, OUT_ERROR);
+  VV_IO_EXPORT bool readNode(const QDomNode&, vgGeocodedPoly&,
+                             vvDatabaseQuery::IntersectionType*, OUT_ERROR);
+
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vvTrack&);
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vvDescriptor&);
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vvDatabaseQuery&);
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vvRetrievalQuery&);
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vvSimilarityQuery&);
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vvQueryResult&);
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vgGeocodedPoly&);
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vvSpatialFilter&);
+  VV_IO_EXPORT QDomNode makeNode(QDomDocument&, const vvEventSetInfo&);
+}
+
+#undef OUT_ERROR
+
+#endif
diff --git a/Libraries/VvIO/vvXmlWriter.cxx b/Libraries/VvIO/vvXmlWriter.cxx
new file mode 100644
index 00000000..f377932f
--- /dev/null
+++ b/Libraries/VvIO/vvXmlWriter.cxx
@@ -0,0 +1,164 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvXmlWriter.h"
+
+#include <QDomDocument>
+
+#include <qtUtil.h>
+
+#include "vvXmlUtil.h"
+
+QTE_IMPLEMENT_D_FUNC(vvXmlWriter)
+
+//-----------------------------------------------------------------------------
+class vvXmlWriterPrivate
+{
+public:
+  vvXmlWriterPrivate(QTextStream*, int indent, bool free);
+  ~vvXmlWriterPrivate() { if (this->freeStream) delete this->stream; }
+
+  QDomDocument document;
+  QDomElement rootNode;
+
+  QTextStream* stream;
+  bool freeStream;
+
+  int indent;
+};
+
+//-----------------------------------------------------------------------------
+vvXmlWriterPrivate::vvXmlWriterPrivate(
+  QTextStream* stream, int indent, bool free)
+  : document("VVXML"), stream(stream), freeStream(free), indent(indent)
+{
+  // \TODO set document DTD?
+
+  // Create root node
+  this->rootNode = document.createElement("xml");
+  this->document.appendChild(this->rootNode);
+}
+
+//-----------------------------------------------------------------------------
+vvXmlWriter::vvXmlWriter(QFile& file, int indent)
+  : d_ptr(new vvXmlWriterPrivate(new QTextStream(&file), indent, true))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvXmlWriter::vvXmlWriter(QTextStream& stream, int indent)
+  : d_ptr(new vvXmlWriterPrivate(&stream, indent, false))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvXmlWriter::~vvXmlWriter()
+{
+  QTE_D(vvXmlWriter);
+
+  // Serialize the document into the stream
+  (*d->stream) << d->document.toString(d->indent);
+}
+
+//-----------------------------------------------------------------------------
+QDomDocument vvXmlWriter::document() const
+{
+  QTE_D_CONST(vvXmlWriter);
+  return d->document;
+}
+
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(vvHeader::FileType)
+{
+  // Header is not needed for XML
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vvTrack& track)
+{
+  QTE_D(vvXmlWriter);
+  d->rootNode.appendChild(vvXmlUtil::makeNode(d->document, track));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vvDescriptor& descriptor)
+{
+  QTE_D(vvXmlWriter);
+  d->rootNode.appendChild(vvXmlUtil::makeNode(d->document, descriptor));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vvQueryInstance& query)
+{
+  if (query.isSimilarityQuery())
+    {
+    return *this << *query.constSimilarityQuery();
+    }
+  else if (query.isRetrievalQuery())
+    {
+    return *this << *query.constRetrievalQuery();
+    }
+  else if (query.isValid())
+    {
+    QTE_D(vvXmlWriter);
+    const vvDatabaseQuery& abstractQuery = *query.constAbstractQuery();
+    QDomNode node = vvXmlUtil::makeNode(d->document, abstractQuery);
+    d->rootNode.appendChild(node);
+    }
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vvRetrievalQuery& query)
+{
+  QTE_D(vvXmlWriter);
+  d->rootNode.appendChild(vvXmlUtil::makeNode(d->document, query));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vvSimilarityQuery& query)
+{
+  QTE_D(vvXmlWriter);
+  d->rootNode.appendChild(vvXmlUtil::makeNode(d->document, query));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vvQueryResult& result)
+{
+  QTE_D(vvXmlWriter);
+  d->rootNode.appendChild(vvXmlUtil::makeNode(d->document, result));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vgGeocodedPoly& poly)
+{
+  QTE_D(vvXmlWriter);
+  d->rootNode.appendChild(vvXmlUtil::makeNode(d->document, poly));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vvSpatialFilter& filter)
+{
+  QTE_D(vvXmlWriter);
+  d->rootNode.appendChild(vvXmlUtil::makeNode(d->document, filter));
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+vvWriter& vvXmlWriter::operator<<(const vvEventSetInfo& info)
+{
+  QTE_D(vvXmlWriter);
+  d->rootNode.appendChild(vvXmlUtil::makeNode(d->document, info));
+  return *this;
+}
diff --git a/Libraries/VvIO/vvXmlWriter.h b/Libraries/VvIO/vvXmlWriter.h
new file mode 100644
index 00000000..99be9189
--- /dev/null
+++ b/Libraries/VvIO/vvXmlWriter.h
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvXmlWriter_h
+#define __vvXmlWriter_h
+
+#include <vgExport.h>
+
+#include "vvWriter.h"
+
+class QDomDocument;
+
+class vvXmlWriterPrivate;
+
+class VV_IO_EXPORT vvXmlWriter : public vvWriter
+{
+public:
+  explicit vvXmlWriter(QFile&, int indent = 2);
+  explicit vvXmlWriter(QTextStream&, int indent = 2);
+  virtual ~vvXmlWriter();
+
+  QDomDocument document() const;
+
+  virtual vvWriter& operator<<(vvHeader::FileType);
+
+  virtual vvWriter& operator<<(const vvTrack&);
+  virtual vvWriter& operator<<(const vvDescriptor&);
+  virtual vvWriter& operator<<(const vvQueryInstance&);
+  virtual vvWriter& operator<<(const vvRetrievalQuery&);
+  virtual vvWriter& operator<<(const vvSimilarityQuery&);
+  virtual vvWriter& operator<<(const vvQueryResult&);
+  virtual vvWriter& operator<<(const vgGeocodedPoly&);
+  virtual vvWriter& operator<<(const vvSpatialFilter&);
+  virtual vvWriter& operator<<(const vvEventSetInfo&);
+
+  using vvWriter::operator<<; // Copy template overload
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvXmlWriter)
+
+private:
+  QTE_DECLARE_PRIVATE(vvXmlWriter)
+  Q_DISABLE_COPY(vvXmlWriter)
+};
+
+#endif
diff --git a/Libraries/VvVidtk/CMakeLists.txt b/Libraries/VvVidtk/CMakeLists.txt
new file mode 100644
index 00000000..ecbbd73f
--- /dev/null
+++ b/Libraries/VvVidtk/CMakeLists.txt
@@ -0,0 +1,22 @@
+project(vvVidtk)
+
+include_directories(
+  ${Boost_INCLUDE_DIRS}
+  ${VIDTK_INCLUDE_DIRS}
+)
+
+vg_include_library_sdk_directories(
+  TARGET ${PROJECT_NAME} INTERFACE vvData
+)
+
+set(vvVidtkInstallHeaders
+  vvAdaptVidtk.h
+)
+
+add_library(${PROJECT_NAME} vvAdaptVidtk.cxx)
+
+target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} vidtk_tracking)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vvVidtkInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VvVidtk)
diff --git a/Libraries/VvVidtk/vvAdaptVidtk.cxx b/Libraries/VvVidtk/vvAdaptVidtk.cxx
new file mode 100644
index 00000000..88697ea9
--- /dev/null
+++ b/Libraries/VvVidtk/vvAdaptVidtk.cxx
@@ -0,0 +1,105 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvAdaptVidtk.h"
+
+#include <QList>
+
+#include <tracking_data/image_object.h>
+#include <tracking_data/track_state.h>
+#include <tracking_data/tracking_keys.h>
+
+#include <vvTrack.h>
+
+//-----------------------------------------------------------------------------
+QList<vvTrackState> vvAdapt(const vidtk::track_state& vs)
+{
+  QList<vvTrackState> stateList;
+  vcl_vector<vidtk::image_object_sptr> objs;
+  if (vs.data_.get(vidtk::tracking_keys::img_objs, objs))
+    {
+    for (size_t i = 0; i < objs.size(); ++i)
+      {
+      const vidtk::image_object& obj = *objs[i];
+
+      vvTrackState state;
+
+      // Set time
+      if (vs.time_.has_time())
+        {
+        state.TimeStamp.Time = vs.time_.time();
+        }
+      if (vs.time_.has_frame_number())
+        {
+        state.TimeStamp.FrameNumber = vs.time_.frame_number();
+        }
+
+      // Set image point and box
+      state.ImagePoint.X = objs[i]->img_loc_[0];
+      state.ImagePoint.Y = objs[i]->img_loc_[1];
+      state.ImageBox.TopLeft.X = objs[i]->bbox_.min_x();
+      state.ImageBox.TopLeft.Y = objs[i]->bbox_.min_y();
+      state.ImageBox.BottomRight.X = objs[i]->bbox_.max_x();
+      state.ImageBox.BottomRight.Y = objs[i]->bbox_.max_y();
+
+      // Set world location, if available
+      double wlLat, wlLong;
+      if (vs.latitude_longitude(wlLat, wlLong))
+        {
+        state.WorldLocation.GCS = 4269;
+        state.WorldLocation.Latitude = wlLat;
+        state.WorldLocation.Longitude = wlLong;
+        }
+
+      // Set image object, if available
+      if (obj.boundary_.num_sheets())
+        {
+        // Oh, dear... vgl_polygon uses int in its operator[], unsigned int for
+        // the return value of num_sheets(), all to access a std::vector where
+        // both of the above should be size_t!
+        //
+        // ...hence this silly cast, and silly use of int for the index counter
+        // type, to avoid compiler warnings (it is safe from overflow, since an
+        // overflow will make it < 0 and the loop will not execute)
+        int numSheets = static_cast<int>(obj.boundary_.num_sheets());
+
+        for (int j = 0; j < numSheets; ++j)
+          {
+          vvTrackState stateWithObject = state;
+          typedef vgl_polygon<vidtk::image_object::float_type>::sheet_t Sheet;
+          const Sheet& sheet = obj.boundary_[j];
+
+          // Set image object
+          for (size_t n = 0; n < sheet.size(); ++n)
+            {
+            vvImagePointF ipf(sheet[n].x(), sheet[n].y());
+            stateWithObject.ImageObject.push_back(ipf);
+            }
+
+          // Append state
+          stateList.append(stateWithObject);
+          }
+        }
+      else
+        {
+        // Fall back on image box
+        vvImageBoundingBox& box = state.ImageBox;
+        state.ImageObject.push_back(
+          vvImagePointF(box.TopLeft.X, box.TopLeft.Y));
+        state.ImageObject.push_back(
+          vvImagePointF(box.BottomRight.X, box.TopLeft.Y));
+        state.ImageObject.push_back(
+          vvImagePointF(box.BottomRight.X, box.BottomRight.Y));
+        state.ImageObject.push_back(
+          vvImagePointF(box.TopLeft.X, box.BottomRight.Y));
+
+        // Append state
+        stateList.append(state);
+        }
+      }
+    }
+  return stateList;
+}
diff --git a/Libraries/VvVidtk/vvAdaptVidtk.h b/Libraries/VvVidtk/vvAdaptVidtk.h
new file mode 100644
index 00000000..192e55db
--- /dev/null
+++ b/Libraries/VvVidtk/vvAdaptVidtk.h
@@ -0,0 +1,19 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvAdaptVidtk_h
+#define __vvAdaptVidtk_h
+
+#include <vgExport.h>
+
+namespace vidtk { struct track_state; }
+template <typename T> class QList;
+struct vvTrackState;
+
+extern VV_VIDTK_EXPORT QList<vvTrackState>
+vvAdapt(const vidtk::track_state&);
+
+#endif
diff --git a/Libraries/VvVtkWidgets/CMakeLists.txt b/Libraries/VvVtkWidgets/CMakeLists.txt
new file mode 100644
index 00000000..239e296a
--- /dev/null
+++ b/Libraries/VvVtkWidgets/CMakeLists.txt
@@ -0,0 +1,91 @@
+project(vvVtkWidgets)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(vgVtkSharedMocHeaders
+  vvAbstractSimilarityQueryDialog.h
+  vvClipVideoRepresentation.h
+  vvGenerateReportDialog.h
+  vvQueryVideoPlayer.h
+  vvReportWriter.h
+  vvVideoPlayer.h
+  vvVideoPlayerModel.h
+  vvVideoQueryDialog.h
+)
+
+set(vgVtkSharedSources
+  vvAbstractSimilarityQueryDialog.cxx
+  vvClipVideoRepresentation.cxx
+  vvEventInfo.cxx
+  vvGenerateReportDialog.cxx
+  vvQueryVideoPlayer.cxx
+  vvReportWriter.cxx
+  vvTrackInfo.cxx
+  vvVideoPlayer.cxx
+  vvVideoPlayerModel.cxx
+  vvVideoQueryDialog.cxx
+  vvVideoQueryDialogPrivate.cxx
+)
+
+set(vgVtkSharedUiFiles
+  generateReport.ui
+  videoQuery.ui
+  videoView.ui
+)
+
+set(vvVtkWidgetsInstallHeaders
+  vvAbstractSimilarityQueryDialog.h
+  vvClipVideoRepresentation.h
+  vvEventInfo.h
+  vvGenerateReportDialog.h
+  vvQueryVideoPlayer.h
+  vvQueryVideoPlayerPrivate.h
+  vvReportWriter.h
+  vvTrackInfo.h
+  vvVideoPlayer.h
+  vvVideoPlayerModel.h
+  vvVideoPlayerPrivate.h
+  vvVideoQueryDialog.h
+  vvVideoQueryDialogPrivate.h
+  ${CMAKE_CURRENT_BINARY_DIR}/ui_videoQuery.h
+  ${CMAKE_CURRENT_BINARY_DIR}/ui_videoView.h
+)
+
+qt4_wrap_cpp(mocSources ${vgVtkSharedMocHeaders})
+qt4_wrap_ui(uiSources ${vgVtkSharedUiFiles})
+
+add_library(${PROJECT_NAME}
+  ${vgVtkSharedSources}
+  ${mocSources}
+  ${uiSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vvWidgets
+  qtVgWidgets
+  qtVgCommon
+  qtExtensions
+  vtkVgQtWidgets
+  PRIVATE_INTERFACE_TARGETS
+  vtkVgModelView
+  vtkVgSceneGraph
+  vtkVgQtUtil
+  LINK_LIBRARIES
+  LINK_PRIVATE
+  vtkGUISupportQt
+  vtkRenderingFreeTypeOpenGL
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+)
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vvVtkWidgetsInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VvVtkWidgets)
diff --git a/Libraries/VvVtkWidgets/generateReport.ui b/Libraries/VvVtkWidgets/generateReport.ui
new file mode 100644
index 00000000..c90221cd
--- /dev/null
+++ b/Libraries/VvVtkWidgets/generateReport.ui
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>GenerateReportDialog</class>
+ <widget class="QDialog" name="GenerateReportDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>356</width>
+    <height>94</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Generate Report</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::ExpandingFieldsGrow</enum>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="pathLabel">
+     <property name="text">
+      <string>Output Path:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>2</number>
+     </property>
+     <item>
+      <widget class="QLineEdit" name="path"/>
+     </item>
+     <item>
+      <widget class="QToolButton" name="pathBrowse">
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../Icons/vvwidgets.qrc">
+         <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QCheckBox" name="generateVideo">
+     <property name="text">
+      <string>Generate Video</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../Icons/vvwidgets.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>GenerateReportDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>325</x>
+     <y>84</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>93</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>GenerateReportDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>169</x>
+     <y>79</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>177</x>
+     <y>91</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Libraries/VvVtkWidgets/videoQuery.ui b/Libraries/VvVtkWidgets/videoQuery.ui
new file mode 100644
index 00000000..6a7f4d23
--- /dev/null
+++ b/Libraries/VvVtkWidgets/videoQuery.ui
@@ -0,0 +1,594 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VideoQueryDialog</class>
+ <widget class="QDialog" name="VideoQueryDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>936</width>
+    <height>572</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Video Query</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_5">
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QVBoxLayout" name="widgetLayout">
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QSplitter" name="splitter">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <widget class="QGroupBox" name="videoPlayerGroup">
+         <property name="title">
+          <string>Query Video</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout">
+          <item>
+           <widget class="QWidget" name="videoPlayerWidget" native="true">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>200</width>
+              <height>150</height>
+             </size>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <property name="spacing">
+             <number>2</number>
+            </property>
+            <item>
+             <widget class="QLineEdit" name="videoLocation">
+              <property name="readOnly">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="chooseVideo">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="toolTip">
+               <string>Choose exemplar video...</string>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/vgvideo.qrc">
+                <normaloff>:/icons/16x16/load-video</normaloff>:/icons/16x16/load-video</iconset>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="reprocessVideo">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="toolTip">
+               <string>Reprocess exemplar video</string>
+              </property>
+              <property name="text">
+               <string>...</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/vgvideo.qrc">
+                <normaloff>:/icons/16x16/refresh</normaloff>:/icons/16x16/refresh</iconset>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+        <widget class="QWidget" name="infoWidget" native="true">
+         <layout class="QGridLayout" name="gridLayout_2" rowstretch="2,0,0,0">
+          <property name="margin">
+           <number>0</number>
+          </property>
+          <item row="0" column="0" colspan="3">
+           <widget class="QTabWidget" name="selectionTabs">
+            <property name="currentIndex">
+             <number>0</number>
+            </property>
+            <widget class="QWidget" name="trackTab">
+             <attribute name="title">
+              <string>Track Interval</string>
+             </attribute>
+             <layout class="QGridLayout" name="gridLayout">
+              <item row="0" column="0" colspan="3">
+               <widget class="vvDescriptorInfoTree" name="trackDescriptors">
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
+                </property>
+                <property name="selectionMode">
+                 <enum>QAbstractItemView::ExtendedSelection</enum>
+                </property>
+                <property name="uniformRowHeights">
+                 <bool>true</bool>
+                </property>
+                <property name="sortingEnabled">
+                 <bool>true</bool>
+                </property>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
+                </property>
+                <property name="expandsOnDoubleClick">
+                 <bool>false</bool>
+                </property>
+                <property name="groupByStyle" stdset="0">
+                 <bool>true</bool>
+                </property>
+                <column>
+                 <property name="text">
+                  <string notr="true">1</string>
+                 </property>
+                </column>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QPushButton" name="showAll">
+                <property name="toolTip">
+                 <string>Turn on the visibility state of all tracks and descriptors</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Show All</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QPushButton" name="hideAll">
+                <property name="toolTip">
+                 <string>Turn off the visibility state of all tracks and descriptors</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Hide All</string>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="2">
+               <widget class="QPushButton" name="hideAllDescriptors">
+                <property name="toolTip">
+                 <string>Turn off the visibility state of all descriptors</string>
+                </property>
+                <property name="text">
+                 <string>Hide All &amp;Descriptors</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="0">
+               <widget class="QPushButton" name="setStartTimeToCurrentFrame">
+                <property name="toolTip">
+                 <string>Set the start time constraint of the selected track(s) to the time of the currently displayed video frame</string>
+                </property>
+                <property name="text">
+                 <string>Set Start &amp;Time Constraint</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="1">
+               <widget class="QPushButton" name="setEndTimeToCurrentFrame">
+                <property name="toolTip">
+                 <string>Set the end time constraint of the selected track(s) to the time of the currently displayed video frame</string>
+                </property>
+                <property name="text">
+                 <string>Set &amp;End Time Constraint</string>
+                </property>
+               </widget>
+              </item>
+              <item row="2" column="2">
+               <widget class="QPushButton" name="clearTimeConstraints">
+                <property name="toolTip">
+                 <string>Remove time constraint(s) from the selected track(s)</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Clear Time Constraints</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="videoRegionTab">
+             <attribute name="title">
+              <string>Video Region</string>
+             </attribute>
+             <layout class="QGridLayout" name="gridLayout_3">
+              <item row="0" column="0" colspan="4">
+               <widget class="vvDescriptorInfoTree" name="regionDescriptors">
+                <property name="editTriggers">
+                 <set>QAbstractItemView::NoEditTriggers</set>
+                </property>
+                <property name="selectionMode">
+                 <enum>QAbstractItemView::ExtendedSelection</enum>
+                </property>
+                <property name="sortingEnabled">
+                 <bool>true</bool>
+                </property>
+                <property name="allColumnsShowFocus">
+                 <bool>true</bool>
+                </property>
+                <property name="expandsOnDoubleClick">
+                 <bool>false</bool>
+                </property>
+                <property name="groupByStyle" stdset="0">
+                 <bool>true</bool>
+                </property>
+                <column>
+                 <property name="text">
+                  <string>Name</string>
+                 </property>
+                </column>
+                <column>
+                 <property name="text">
+                  <string notr="true">Region</string>
+                 </property>
+                </column>
+                <column>
+                 <property name="text">
+                  <string>Time</string>
+                 </property>
+                </column>
+               </widget>
+              </item>
+              <item row="1" column="0">
+               <widget class="QPushButton" name="addKeyframe">
+                <property name="toolTip">
+                 <string>Create a new keyframe for the currently displayed video frame</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Add</string>
+                </property>
+                <property name="icon">
+                 <iconset resource="../../Icons/vgvideo.qrc">
+                  <normaloff>:/icons/16x16/add</normaloff>:/icons/16x16/add</iconset>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="1">
+               <widget class="QPushButton" name="removeKeyframes">
+                <property name="toolTip">
+                 <string>Remove selected keyframe(s)</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Remove</string>
+                </property>
+                <property name="icon">
+                 <iconset resource="../../Icons/vgvideo.qrc">
+                  <normaloff>:/icons/16x16/remove</normaloff>:/icons/16x16/remove</iconset>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="2">
+               <widget class="QPushButton" name="loadKeyframes">
+                <property name="toolTip">
+                 <string>Load keyframes from a file, replacing current keyframes</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Load</string>
+                </property>
+                <property name="icon">
+                 <iconset resource="../../Icons/vgvideo.qrc">
+                  <normaloff>:/icons/16x16/load</normaloff>:/icons/16x16/load</iconset>
+                </property>
+               </widget>
+              </item>
+              <item row="1" column="3">
+               <widget class="QPushButton" name="saveKeyframes">
+                <property name="toolTip">
+                 <string>Save keyframes to a file</string>
+                </property>
+                <property name="text">
+                 <string>&amp;Save</string>
+                </property>
+                <property name="icon">
+                 <iconset resource="../../Icons/vgvideo.qrc">
+                  <normaloff>:/icons/16x16/save</normaloff>:/icons/16x16/save</iconset>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="3">
+           <layout class="QHBoxLayout" name="horizontalLayout">
+            <item>
+             <spacer name="horizontalSpacer">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QToolButton" name="moveToSelected">
+              <property name="toolTip">
+               <string>Add highlighted descriptors to selection</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/vgvideo.qrc">
+                <normaloff>:/icons/22x22/arrow-down</normaloff>:/icons/22x22/arrow-down</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>22</width>
+                <height>22</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QToolButton" name="moveToAvailable">
+              <property name="toolTip">
+               <string>Remove highlighted descriptors from selection</string>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/vgvideo.qrc">
+                <normaloff>:/icons/22x22/arrow-up</normaloff>:/icons/22x22/arrow-up</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>22</width>
+                <height>22</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeType">
+               <enum>QSizePolicy::Fixed</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>16</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QToolButton" name="clearSelected">
+              <property name="toolTip">
+               <string>Clear selected descriptors</string>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="icon">
+               <iconset resource="../../Icons/vgvideo.qrc">
+                <normaloff>:/icons/22x22/clear</normaloff>:/icons/22x22/clear</iconset>
+              </property>
+              <property name="iconSize">
+               <size>
+                <width>22</width>
+                <height>22</height>
+               </size>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_2">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0" colspan="3">
+           <widget class="QGroupBox" name="selectedGroup">
+            <property name="title">
+             <string>Selected</string>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_2">
+             <item>
+              <widget class="vvDescriptorInfoTree" name="selectedDescriptors">
+               <property name="selectionMode">
+                <enum>QAbstractItemView::ExtendedSelection</enum>
+               </property>
+               <property name="groupByStyle" stdset="0">
+                <bool>true</bool>
+               </property>
+               <column>
+                <property name="text">
+                 <string notr="true">1</string>
+                </property>
+               </column>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="groupByStyle">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;If checked, descriptor lists will group descriptors by descriptor style. Descriptors with multiple styles will appear in each applicable group.&lt;/p&gt;
+&lt;p&gt;If unchecked, no grouping will be done.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>&amp;Group descriptors by style</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="2">
+           <widget class="QDialogButtonBox" name="buttonBox">
+            <property name="standardButtons">
+             <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="QCheckBox" name="useMetadata">
+            <property name="toolTip">
+             <string>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;If checked, metadata descriptors associated with the selected descriptors will be automatically included in the query.&lt;/p&gt;
+&lt;p&gt;If unchecked, no metadata descriptors will be included in the query.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+            </property>
+            <property name="text">
+             <string>Use &amp;metadata in query</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QStatusBar" name="statusbar"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>vvDescriptorInfoTree</class>
+   <extends>QTreeWidget</extends>
+   <header>vvDescriptorInfoTree.h</header>
+   <slots>
+    <slot>setGroupByStyle(bool)</slot>
+   </slots>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vgvideo.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>VideoQueryDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>794</x>
+     <y>578</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>456</x>
+     <y>664</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>VideoQueryDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>875</x>
+     <y>577</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>874</x>
+     <y>643</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>groupByStyle</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>trackDescriptors</receiver>
+   <slot>setGroupByStyle(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>364</x>
+     <y>536</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>597</x>
+     <y>142</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>groupByStyle</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>regionDescriptors</receiver>
+   <slot>setGroupByStyle(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>364</x>
+     <y>536</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>597</x>
+     <y>157</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>groupByStyle</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>selectedDescriptors</receiver>
+   <slot>setGroupByStyle(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>364</x>
+     <y>536</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>597</x>
+     <y>447</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Libraries/VvVtkWidgets/videoView.ui b/Libraries/VvVtkWidgets/videoView.ui
new file mode 100644
index 00000000..d4b0602d
--- /dev/null
+++ b/Libraries/VvVtkWidgets/videoView.ui
@@ -0,0 +1,293 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>videoView</class>
+ <widget class="QWidget" name="videoView">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>432</width>
+    <height>356</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QToolBar" name="toolBar">
+     <addaction name="actionPlay"/>
+     <addaction name="actionPause"/>
+     <addaction name="actionStop"/>
+     <addaction name="separator"/>
+     <addaction name="actionFramePrevious"/>
+     <addaction name="actionFrameNext"/>
+     <addaction name="separator"/>
+     <addaction name="actionDecreaseSpeed"/>
+     <addaction name="actionIncreaseSpeed"/>
+     <addaction name="separator"/>
+     <addaction name="actionResetView"/>
+     <addaction name="actionFollowEvent"/>
+     <addaction name="separator"/>
+     <addaction name="actionShowRegion"/>
+    </widget>
+   </item>
+   <item>
+    <widget class="QVTKWidget" name="renderWidget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>100</width>
+       <height>60</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <item>
+      <widget class="vgFrameScrubber" name="frameScrubber" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="playbackSpeedLabel">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Playback speed of the current video clip</string>
+       </property>
+       <property name="text">
+        <string>1x</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="frameNumber">
+       <property name="toolTip">
+        <string>Frame number of the currently displayed frame</string>
+       </property>
+       <property name="text">
+        <string>( 0 )</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="elapsedTime">
+       <property name="text">
+        <string>00:00:00.000</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+  <action name="actionPlay">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/playback-play</normaloff>:/icons/22x22/playback-play</iconset>
+   </property>
+   <property name="text">
+    <string>Play</string>
+   </property>
+   <property name="toolTip">
+    <string>Play video</string>
+   </property>
+  </action>
+  <action name="actionPause">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/playback-pause</normaloff>:/icons/22x22/playback-pause</iconset>
+   </property>
+   <property name="text">
+    <string>Pause</string>
+   </property>
+   <property name="toolTip">
+    <string>Pause video playback</string>
+   </property>
+  </action>
+  <action name="actionStop">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/playback-stop</normaloff>:/icons/22x22/playback-stop</iconset>
+   </property>
+   <property name="text">
+    <string>Stop</string>
+   </property>
+   <property name="toolTip">
+    <string>Stop (and rewind) video</string>
+   </property>
+  </action>
+  <action name="actionFramePrevious">
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/playback-frame-backward</normaloff>:/icons/22x22/playback-frame-backward</iconset>
+   </property>
+   <property name="text">
+    <string>Previous Frame</string>
+   </property>
+   <property name="toolTip">
+    <string>Step video one frame backward</string>
+   </property>
+  </action>
+  <action name="actionFrameNext">
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/playback-frame-forward</normaloff>:/icons/22x22/playback-frame-forward</iconset>
+   </property>
+   <property name="text">
+    <string>Next Frame</string>
+   </property>
+   <property name="toolTip">
+    <string>Step video one frame forward</string>
+   </property>
+  </action>
+  <action name="actionFollowEvent">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/view-track</normaloff>:/icons/22x22/view-track</iconset>
+   </property>
+   <property name="text">
+    <string>Follow Event</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle automatic tracking (zoom and pan) of the event</string>
+   </property>
+  </action>
+  <action name="actionShowRegion">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="checked">
+    <bool>true</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/show-boxes</normaloff>:/icons/22x22/show-boxes</iconset>
+   </property>
+   <property name="text">
+    <string>Show Region</string>
+   </property>
+   <property name="toolTip">
+    <string>Toggle visibility of the event region outline</string>
+   </property>
+  </action>
+  <action name="actionResetView">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/view-reset</normaloff>:/icons/22x22/view-reset</iconset>
+   </property>
+   <property name="text">
+    <string>Reset View</string>
+   </property>
+   <property name="toolTip">
+    <string>Reset view to show the entire frame</string>
+   </property>
+  </action>
+  <action name="actionIncreaseSpeed">
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/playback-speed-increase</normaloff>:/icons/22x22/playback-speed-increase</iconset>
+   </property>
+   <property name="text">
+    <string>Increase Speed</string>
+   </property>
+   <property name="toolTip">
+    <string>Increase playback speed</string>
+   </property>
+  </action>
+  <action name="actionDecreaseSpeed">
+   <property name="icon">
+    <iconset resource="../../Icons/vgvideo.qrc">
+     <normaloff>:/icons/22x22/playback-speed-decrease</normaloff>:/icons/22x22/playback-speed-decrease</iconset>
+   </property>
+   <property name="text">
+    <string>Decrease Speed</string>
+   </property>
+   <property name="toolTip">
+    <string>Decrease playback speed</string>
+   </property>
+  </action>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QVTKWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">QVTKWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vgFrameScrubber</class>
+   <extends>QWidget</extends>
+   <header location="global">vgFrameScrubber.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vgvideo.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>actionFollowEvent</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>actionResetView</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Libraries/VvVtkWidgets/vvAbstractSimilarityQueryDialog.cxx b/Libraries/VvVtkWidgets/vvAbstractSimilarityQueryDialog.cxx
new file mode 100644
index 00000000..099cda61
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvAbstractSimilarityQueryDialog.cxx
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvAbstractSimilarityQueryDialog.h"
+
+#include <vvTrack.h>
+
+//-----------------------------------------------------------------------------
+vvAbstractSimilarityQueryDialog::vvAbstractSimilarityQueryDialog(
+  QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvAbstractSimilarityQueryDialog::~vvAbstractSimilarityQueryDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vvTrack> vvAbstractSimilarityQueryDialog::selectedTracks() const
+{
+  return std::vector<vvTrack>();
+}
+
+//-----------------------------------------------------------------------------
+int vvAbstractSimilarityQueryDialog::exec()
+{
+  return QDialog::exec();
+}
diff --git a/Libraries/VvVtkWidgets/vvAbstractSimilarityQueryDialog.h b/Libraries/VvVtkWidgets/vvAbstractSimilarityQueryDialog.h
new file mode 100644
index 00000000..8a4c2a3c
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvAbstractSimilarityQueryDialog.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvAbstractSimilarityQueryDialog_h
+#define __vvAbstractSimilarityQueryDialog_h
+
+#include <QDialog>
+
+#include <vgExport.h>
+
+struct vvDescriptor;
+struct vvTrack;
+
+class VV_VTKWIDGETS_EXPORT vvAbstractSimilarityQueryDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vvAbstractSimilarityQueryDialog(QWidget* parent = 0,
+                                  Qt::WindowFlags flags = 0);
+  virtual ~vvAbstractSimilarityQueryDialog();
+
+  virtual std::vector<vvTrack> selectedTracks() const;
+  virtual std::vector<vvDescriptor> selectedDescriptors() const = 0;
+
+  virtual void setSelectedDescriptors(const std::vector<vvDescriptor>&) = 0;
+
+public slots:
+  virtual int exec();
+
+private:
+  Q_DISABLE_COPY(vvAbstractSimilarityQueryDialog)
+};
+
+#endif
diff --git a/Libraries/VvVtkWidgets/vvClipVideoRepresentation.cxx b/Libraries/VvVtkWidgets/vvClipVideoRepresentation.cxx
new file mode 100644
index 00000000..c62e6d9d
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvClipVideoRepresentation.cxx
@@ -0,0 +1,184 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvClipVideoRepresentation.h"
+
+// VG includes.
+#include "vtkVgAdapt.h"
+#include "vtkVgEvent.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgEventRegionRepresentation.h"
+#include "vtkVgEventRepresentationBase.h"
+#include "vtkVgTrackRepresentationBase.h"
+#include "vtkVgVideoMetadata.h"
+#include "vtkVgVideoModel0.h"
+#include "vtkVgVideoProviderBase.h"
+
+// VTK includes.
+#include <vtkImageActor.h>
+#include <vtkImageData.h>
+#include <vtkMatrix4x4.h>
+#include <vtkObjectFactory.h>
+#include <vtkPoints.h>
+
+vtkStandardNewMacro(vvClipVideoRepresentation);
+
+//-----------------------------------------------------------------------------
+vvClipVideoRepresentation::vvClipVideoRepresentation() : QObject(),
+  vtkVgVideoRepresentation0()
+{
+  this->AutoCenter    = 0;
+
+  this->RegionsMaxWidth  = 0.0;
+  this->RegionsMaxHeight = 0.0;
+
+  this->VGEventCached = 0;
+}
+
+//-----------------------------------------------------------------------------
+vvClipVideoRepresentation::~vvClipVideoRepresentation()
+{
+  // Do nothing.
+}
+
+//-----------------------------------------------------------------------------
+void vvClipVideoRepresentation::PrintSelf(ostream& os, vtkIndent indent)
+{
+  this->Superclass::PrintSelf(os, indent);
+}
+
+//-----------------------------------------------------------------------------
+void vvClipVideoRepresentation::Update()
+{
+  if (this->VideoModel->GetUpdateDataRequestTime() > this->UpdateTime.GetMTime() ||
+      this->GetUpdateRequest())
+    {
+    const vtkVgVideoFrameData* frameData = this->VideoModel->GetFrameData();
+
+    if (frameData)
+      {
+      // \NOTE: For this see notes above in the constructor.
+      this->VideoActor->SetUseBounds(1);
+
+      this->VideoActor->SetInputData(frameData->VideoImage);
+
+      // Calculate the render matrix.
+      this->RenderMatrix->Identity();
+
+      if (frameData->VideoMatrix)
+        {
+        this->RenderMatrix->DeepCopy(frameData->VideoMatrix);
+        }
+
+      // HACK - This is needed to make picking work correctly.
+      this->MakeLinear(this->RenderMatrix);
+
+      if (this->EventRepresentation)
+        {
+        if (this->AutoCenter)
+          {
+          this->AutoCenterUpate(frameData);
+          } // if (this->AutoCenter)
+        this->EventRepresentation->Update();
+        }
+
+      if (this->TrackRepresentation)
+        {
+        vtkVgVideoProviderBase* videoSource = this->VideoModel->GetVideoSource();
+
+        if (videoSource)
+          {
+          vtkVgVideoMetadata metadata;
+
+          if (videoSource->GetCurrentMetadata(&metadata) == VTK_OK)
+            {
+            double ib[6];
+            this->VideoActor->GetBounds(ib);
+
+            vtkSmartPointer<vtkMatrix4x4> hi(vtkSmartPointer<vtkMatrix4x4>::New());
+            vtkSmartPointer<vtkMatrix4x4> fy(vtkSmartPointer<vtkMatrix4x4>::New());
+            vtkSmartPointer<vtkMatrix4x4> xf(vtkSmartPointer<vtkMatrix4x4>::New());
+
+            hi->DeepCopy(metadata.Homography);
+            hi->Invert();
+            fy->Identity();
+            fy->SetElement(1, 1, -1);
+            fy->SetElement(1, 3, ib[3] - ib[2]);
+            vtkMatrix4x4::Multiply4x4(fy, hi, xf);
+
+            // HACK - This is needed to make picking work correctly.
+            this->MakeLinear(xf);
+
+            this->TrackRepresentation->SetRepresentationMatrix(xf.GetPointer());
+            } // if (videoFrame)
+          } // if (videoSource)
+        this->TrackRepresentation->Update();
+        } // if (this->TrackRepresentation)
+
+
+      this->UpdateTime.Modified();
+      } // if (frameData)
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvClipVideoRepresentation::AutoCenterUpate(const vtkVgVideoFrameData* frameData)
+{
+  // If this is the first time.
+  if (!this->VGEventCached)
+    {
+    vtkVgEventModel* eventModel = this->EventRepresentation->GetEventModel();
+    if (eventModel)
+      {
+      eventModel->InitEventTraversal();
+
+      // \NOTE: There should be only one event (which is true for now).
+      this->VGEventCached = eventModel->GetNextEvent().GetEvent();
+      }
+
+    // Now find the biggest event region.
+    if (this->VGEventCached)
+      {
+      this->VGEventCached->InitRegionTraversal();
+
+      vtkVgTimeStamp timestamp;
+      vtkIdType numIds;
+      vtkIdType* ids;
+      vtkPoints* points = this->VGEventCached->GetRegionPoints();
+
+      // first pass - figure out the biggest region in the event
+      this->VGEventCached->InitRegionTraversal();
+      while (this->VGEventCached->GetNextRegion(timestamp, numIds, ids))
+        {
+        double ul[3], lr[3];
+        points->GetPoint(ids[0], ul);
+        points->GetPoint(ids[2], lr);
+
+        this->RegionsMaxWidth  = std::max(this->RegionsMaxWidth, lr[0] - ul[0]);
+        this->RegionsMaxHeight = std::max(this->RegionsMaxHeight, ul[1] - lr[1]);
+        }
+      }
+    } // if (!this->VGEventCached)
+
+  if (this->VGEventCached)
+    {
+    double center[3];
+    this->VGEventCached->GetRegionCenter(frameData->TimeStamp,
+                                         center, true);
+
+    emit this->areaOfInterest(center, this->RegionsMaxWidth, this->RegionsMaxHeight);
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+void vvClipVideoRepresentation::HandleAnimationCueTickEvent()
+{
+  this->SetEventVisible(1);
+}
+
+
+
diff --git a/Libraries/VvVtkWidgets/vvClipVideoRepresentation.h b/Libraries/VvVtkWidgets/vvClipVideoRepresentation.h
new file mode 100644
index 00000000..1accb955
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvClipVideoRepresentation.h
@@ -0,0 +1,70 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvClipVideoRepresentation_h
+#define __vvClipVideoRepresentation_h
+
+// Qt includes.
+#include <QObject>
+
+#include <vgExport.h>
+
+// VG includes.
+#include "vtkVgVideoRepresentation0.h"
+
+// Forward declarations.
+class vtkVgEvent;
+struct vtkVgVideoFrameData;
+
+class VV_VTKWIDGETS_EXPORT vvClipVideoRepresentation
+  : public QObject, public vtkVgVideoRepresentation0
+{
+  Q_OBJECT
+
+public:
+  // Description:
+  // Define easy to use types.
+  vtkVgClassMacro(vvClipVideoRepresentation);
+
+  vtkTypeMacro(vvClipVideoRepresentation, vtkVgVideoRepresentation0);
+
+  static vvClipVideoRepresentation* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  vtkSetMacro(AutoCenter, int);
+  vtkGetMacro(AutoCenter, int);
+
+  virtual void Update();
+
+  virtual void AutoCenterUpate(const vtkVgVideoFrameData* frameData);
+
+signals:
+  void areaOfInterest(double*, double, double);
+
+protected:
+  int AutoCenter;
+
+  double RegionsMaxWidth;
+  double RegionsMaxHeight;
+
+  vtkVgEvent* VGEventCached;
+
+protected:
+  vvClipVideoRepresentation();
+  virtual ~vvClipVideoRepresentation();
+
+  virtual void HandleModelError() {}
+  virtual void HandleAnimationCueTickEvent();
+private:
+  // Not implemented.
+  vvClipVideoRepresentation(const vvClipVideoRepresentation&);
+  void operator= (const vvClipVideoRepresentation&);
+};
+
+
+
+#endif // __vvClipVideoRepresentation_h
diff --git a/Libraries/VvVtkWidgets/vvEventInfo.cxx b/Libraries/VvVtkWidgets/vvEventInfo.cxx
new file mode 100644
index 00000000..ebe21294
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvEventInfo.cxx
@@ -0,0 +1,76 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvEventInfo.h"
+
+#include <QSettings>
+
+#include <qtScopedSettingGroup.h>
+#include <QColor>
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+vvEventInfo eventFromSettings(QSettings& settings, int type)
+{
+  qtScopedSettingGroup sg(settings, QString::number(type));
+
+  vvEventInfo ei;
+  ei.Type = type;
+
+  const QString defaultName = QString("Unknown type %1").arg(type);
+  ei.Name = settings.value("Name", QString(defaultName)).toString();
+
+  // Set default colors
+  ei.PenColor = QColor::fromRgb(240, 240, 240);
+  ei.BackgroundColor = QColor::fromRgb(112, 112, 112);
+  ei.ForegroundColor = Qt::white;
+
+  // Load colors from settings
+  ei.PenColor.read(settings, "PenColor");
+  ei.BackgroundColor.read(settings, "BackgroundColor");
+  ei.ForegroundColor.read(settings, "ForegroundColor");
+
+  return ei;
+}
+
+//-----------------------------------------------------------------------------
+QList<vvEventInfo> eventsFromGroup(
+  QSettings& settings, const QString& settingsGroup)
+{
+  qtScopedSettingGroup sg(settings, settingsGroup);
+
+  // Get list of user defined event types
+  QList<int> types;
+  foreach (QVariant v, settings.value("Types").toList())
+    types.append(v.toInt());
+
+  // Load each event type
+  QList<vvEventInfo> events;
+  foreach (int type, types)
+    events.append(eventFromSettings(settings, type));
+
+  return events;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+QList<vvEventInfo> vvEventInfo::eventTypes(vvEventInfo::Groups groups)
+{
+  QSettings settings;
+  settings.beginGroup("EventTypes");
+
+  QList<vvEventInfo> events;
+
+  if (groups.testFlag(vvEventInfo::Person))
+    events += eventsFromGroup(settings, "Person");
+  if (groups.testFlag(vvEventInfo::Vehicle))
+    events += eventsFromGroup(settings, "Vehicle");
+
+  return events;
+}
diff --git a/Libraries/VvVtkWidgets/vvEventInfo.h b/Libraries/VvVtkWidgets/vvEventInfo.h
new file mode 100644
index 00000000..5e1459a1
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvEventInfo.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvEventInfo_h
+#define __vvEventInfo_h
+
+#include <QString>
+#include <QList>
+
+#include <vgExport.h>
+
+#include <vgColor.h>
+
+struct VV_VTKWIDGETS_EXPORT vvEventInfo
+{
+  int Type;
+  QString Name;
+  vgColor PenColor;
+  vgColor ForegroundColor;
+  vgColor BackgroundColor;
+
+  enum Group
+    {
+    Person      = 0x1,
+    Vehicle     = 0x2,
+    All         = 0xff
+    };
+  Q_DECLARE_FLAGS(Groups, Group)
+
+public:
+  static QList<vvEventInfo> eventTypes(vvEventInfo::Groups);
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vvEventInfo::Groups)
+
+#endif
diff --git a/Libraries/VvVtkWidgets/vvGenerateReportDialog.cxx b/Libraries/VvVtkWidgets/vvGenerateReportDialog.cxx
new file mode 100644
index 00000000..2566bd0b
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvGenerateReportDialog.cxx
@@ -0,0 +1,124 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvGenerateReportDialog.h"
+
+#include "ui_generateReport.h"
+
+#include <QDir>
+#include <QMessageBox>
+#include <QSettings>
+
+#include <qtUiState.h>
+#include <qtUtil.h>
+
+#include <vgFileDialog.h>
+
+QTE_IMPLEMENT_D_FUNC(vvGenerateReportDialog)
+
+//-----------------------------------------------------------------------------
+class vvGenerateReportDialogPrivate
+{
+public:
+  Ui::GenerateReportDialog UI;
+  qtUiState UiState;
+};
+
+//-----------------------------------------------------------------------------
+vvGenerateReportDialog::vvGenerateReportDialog(QWidget* parent,
+                                               Qt::WindowFlags f)
+  : QDialog(parent, f), d_ptr(new vvGenerateReportDialogPrivate)
+{
+  QTE_D(vvGenerateReportDialog);
+
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  connect(d->UI.pathBrowse, SIGNAL(clicked()),
+          this, SLOT(browseForOutputPath()));
+
+  d->UiState.setCurrentGroup("ReportGeneration");
+  d->UiState.mapChecked("GenerateVideo", d->UI.generateVideo);
+  d->UiState.mapText("OutputPath", d->UI.path);
+  d->UiState.restore();
+
+  // Force absolute path
+  QDir dir(d->UI.path->text());
+  d->UI.path->setText(dir.absolutePath());
+}
+
+//-----------------------------------------------------------------------------
+vvGenerateReportDialog::~vvGenerateReportDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vvGenerateReportDialog::generateVideo()
+{
+  QTE_D(vvGenerateReportDialog);
+
+  return d->UI.generateVideo->isChecked();
+}
+
+//-----------------------------------------------------------------------------
+QString vvGenerateReportDialog::outputPath()
+{
+  QTE_D(vvGenerateReportDialog);
+
+  return d->UI.path->text();
+}
+
+//-----------------------------------------------------------------------------
+void vvGenerateReportDialog::browseForOutputPath()
+{
+  QTE_D(vvGenerateReportDialog);
+
+  QString path =
+    vgFileDialog::getExistingDirectory(this, "Output Path", d->UI.path->text());
+
+  if (!path.isEmpty())
+    {
+    d->UI.path->setText(path);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvGenerateReportDialog::accept()
+{
+  QTE_D(vvGenerateReportDialog);
+
+  QDir dir(d->UI.path->text());
+  if (!dir.isAbsolute())
+    {
+    QMessageBox::warning(this, QString(),
+                         "The output path is not a valid absolute path.");
+    return;
+    }
+  if (!dir.exists())
+    {
+    dir.makeAbsolute();
+    d->UI.path->setText(dir.path());
+    if (QMessageBox::warning(this, QString(),
+                             "The requested output directory does not exist. "
+                             "Do you wish to create it?",
+                             QMessageBox::Ok | QMessageBox::Cancel) ==
+        QMessageBox::Ok)
+      {
+      if (!dir.mkpath(dir.path()))
+        {
+        QMessageBox::warning(this, QString(), "Unable to create directory.");
+        return;
+        }
+      }
+    else
+      {
+      return;
+      }
+    }
+
+  d->UiState.save();
+  QDialog::accept();
+}
diff --git a/Libraries/VvVtkWidgets/vvGenerateReportDialog.h b/Libraries/VvVtkWidgets/vvGenerateReportDialog.h
new file mode 100644
index 00000000..26a9c3dd
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvGenerateReportDialog.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvGenerateReportDialog_h
+#define __vvGenerateReportDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class vvGenerateReportDialogPrivate;
+
+class VV_VTKWIDGETS_EXPORT vvGenerateReportDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit vvGenerateReportDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
+  ~vvGenerateReportDialog();
+
+  bool generateVideo();
+  QString outputPath();
+
+public slots:
+  virtual void accept();
+
+protected slots:
+  void browseForOutputPath();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvGenerateReportDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vvGenerateReportDialog)
+};
+
+#endif // __vvGenerateReportDialog_h
diff --git a/Libraries/VvVtkWidgets/vvQueryVideoPlayer.cxx b/Libraries/VvVtkWidgets/vvQueryVideoPlayer.cxx
new file mode 100644
index 00000000..83e01004
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvQueryVideoPlayer.cxx
@@ -0,0 +1,1181 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvQueryVideoPlayer.h"
+#include "vvQueryVideoPlayerPrivate.h"
+
+#include "vvClipVideoRepresentation.h"
+
+// Qt includes
+#include <QDebug>
+#include <QFileInfo>
+#include <QHash>
+#include <QMap>
+#include <QMultiHash>
+#include <QScopedPointer>
+
+// QtExtensions includes
+#include <qtMap.h>
+#include <qtUtil.h>
+
+// visgui includes
+#include <vtkVgAdapt.h>
+#include <vtkVgCompositeEventRepresentation.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgTimeStamp.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+#include <vtkVgUtil.h>
+#include <vtkVgVideoMetadata.h>
+#include <vtkVgVideoModel0.h>
+#include <vtkVgVideoNode.h>
+#include <vtkVgVideoProviderBase.h>
+#include <vtkVgVideoViewer.h>
+
+// VTK includes
+#include <vtkIdList.h>
+#include <vtkPoints.h>
+#include <vgColor.h>
+
+namespace
+{
+
+enum EventMagicID
+{
+  EID_TweeningRegions = -3,
+  EID_KeyframeRegions = -2,
+  EID_FirstDescriptor = 0
+};
+
+//-----------------------------------------------------------------------------
+double interpolate(double t, double p0, double p1, double p2, double p3)
+{
+  const double t2 = t * t;
+  const double t3 = t2 * t;
+
+  const double m0 = (p2 - p0) * 0.5;
+  const double m1 = (p3 - p1) * 0.5;
+  const double a0 =  2 * t3  +  -3 * t2  + 1;
+  const double a1 =  1 * t3  +  -2 * t2  + t;
+  const double a2 =  1 * t3  +  -1 * t2;
+  const double a3 = -2 * t3  +   3 * t2;
+
+  return (a0 * p1) + (a1 * m0) + (a2 * m1) + (a3 * p2);
+}
+
+//-----------------------------------------------------------------------------
+#define interpolate_coords(_c_) \
+  interpolate(t, r0._c_(), r1._c_(), r2._c_(), r3._c_())
+
+QRect interpolate(
+  double t, const QRect& r0, const QRect& r1, const QRect& r2, const QRect& r3)
+{
+  QRect rr;
+  rr.setTop(floor(interpolate_coords(top)));
+  rr.setLeft(floor(interpolate_coords(left)));
+  rr.setRight(ceil(interpolate_coords(right)));
+  rr.setBottom(ceil(interpolate_coords(bottom)));
+
+  return rr;
+}
+
+} // end anonymous namespace
+
+//-----------------------------------------------------------------------------
+static inline bool operator==(const vvDescriptor& a, const vvDescriptor& b)
+{
+  return vvDescriptor::compare(a, b, vvDescriptor::CompareDetection);
+}
+
+//-----------------------------------------------------------------------------
+vvQueryVideoPlayer::vvQueryVideoPlayer(QWidget* parent)
+  : vvVideoPlayer(new vvQueryVideoPlayerPrivate, parent)
+{
+  // HACK: should properly use QTE_D instead
+  this->Internal =
+    static_cast<vvQueryVideoPlayerPrivate*>(this->d_ptr.data());
+
+  this->Internal->UpdatePending = false;
+  this->Internal->ColorTracksByPVO = false;
+  this->Internal->JumpToTrackId = -1;
+  connect(this, SIGNAL(pickedEvent(vtkIdType)),
+          this, SLOT(eventSelected(vtkIdType)));
+}
+
+//-----------------------------------------------------------------------------
+vvQueryVideoPlayer::~vvQueryVideoPlayer()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::loadVideo()
+{
+  this->loadExternal(*this->Internal->VideoNode);
+
+  // \NOTE:Workaround for reset view zooming in
+  // little too much first time.
+  this->Internal->ResetView = 1;
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::buildRegionMap()
+{
+  // Clear existing map
+  this->Internal->QueryRegions.clear();
+
+  // Remove existing region "events"
+  this->Internal->EventModel->RemoveEvent(EID_TweeningRegions);
+  this->Internal->EventModel->RemoveEvent(EID_KeyframeRegions);
+
+  // Anything to do?
+  if (!this->Internal->Keyframes.count())
+    return;
+
+  // Insert keyframes
+  vvQueryVideoPlayerPrivate::KeyframeIter kfIter, kfEnd;
+  kfEnd = this->Internal->Keyframes.end();
+  for (kfIter = this->Internal->Keyframes.begin(); kfIter != kfEnd; ++kfIter)
+    {
+    vvQueryVideoPlayerPrivate::RegionInfo r;
+    r.IsKeyframe = true;
+    r.KeyframeId = kfIter.key();
+    r.Region = kfIter.value().Region;
+    this->Internal->QueryRegions.insert(kfIter.value().Time, r);
+    }
+
+  // Prepare iteration
+  vvQueryVideoPlayerPrivate::QueryRegionIter kf[4], qrEnd = this->Internal->QueryRegions.end();
+  kf[0] = kf[1] = this->Internal->QueryRegions.begin();
+  kf[2] = kf[3] = kf[1] + 1;
+  if (kf[2] != qrEnd && kf[2] + 1 != qrEnd)
+    ++kf[3];
+
+  vvQueryVideoPlayerPrivate::VideoMetaDataIter iter =
+    this->Internal->VideoMetaData.upper_bound(kf[1].key());
+
+  // Iterate over video metadata looking for frames with no existing region
+  while (iter != this->Internal->VideoMetaData.end() && kf[2] != qrEnd)
+    {
+    vtkVgTimeStamp frameTimeStamp = iter->first;
+
+    // Check if we need to advance to the next keyframe interval
+    if (frameTimeStamp > kf[2].key())
+      {
+      kf[0] = kf[1];
+      kf[1] = kf[2];
+      ++kf[2];
+      if (kf[3] + 1 != qrEnd) ++kf[3];
+      continue;
+      }
+
+    // See if we have a region for this frame
+    if (!this->Internal->QueryRegions.contains(frameTimeStamp))
+      {
+      // Insert new interpolated ("tweening") region
+      double t = (frameTimeStamp.GetTime() - kf[1].key().GetTime())
+                 / (kf[2].key().GetTime() - kf[1].key().GetTime());
+      vvQueryVideoPlayerPrivate::RegionInfo r;
+      r.IsKeyframe = false;
+      r.KeyframeId = kf[1].value().KeyframeId;
+      r.Region = interpolate(t, kf[0].value().Region, kf[1].value().Region,
+                                kf[2].value().Region, kf[3].value().Region);
+      this->Internal->QueryRegions.insert(frameTimeStamp, r);
+      }
+
+    // Continue to next video frame
+    ++iter;
+    }
+
+  // Construct region "events"
+  vtkSmartPointer<vtkVgEventBase> kfEventBase =
+    this->buildRegionEvent(true);
+  vtkSmartPointer<vtkVgEventBase> trEventBase =
+    this->buildRegionEvent(false);
+
+  kfEventBase->SetId(EID_KeyframeRegions);
+  trEventBase->SetId(EID_TweeningRegions);
+
+  // Add region "events"
+  vtkVgEvent* kfEvent = this->Internal->EventModel->AddEvent(kfEventBase);
+  vtkVgEvent* trEvent = this->Internal->EventModel->AddEvent(trEventBase);
+
+  // Set "event" colors
+  kfEvent->SetDisplayFlags(KeyframeFlag);
+  kfEvent->SetCustomColor(0.0, 1.0, 1.0);
+  kfEvent->UseCustomColorOn();
+  trEvent->SetDisplayFlags(KeyframeFlag);
+  trEvent->SetCustomColor(0.0, 0.7, 0.7);
+  trEvent->UseCustomColorOn();
+}
+
+//-----------------------------------------------------------------------------
+vtkSmartPointer<vtkVgEventBase> vvQueryVideoPlayer::buildRegionEvent(
+  bool matchKeyframes)
+{
+  vtkSmartPointer<vtkVgEventBase> eventBase =
+    vtkSmartPointer<vtkVgEventBase>::New();
+
+  double yDim = this->videoHeight();
+
+  vtkVgTimeStamp startFrame(true);      // initialize to MaxTime
+  vtkVgTimeStamp endFrame(false);       // initialize to MinTime
+
+  vvQueryVideoPlayerPrivate::QueryRegionIter iter, end = this->Internal->QueryRegions.end();
+  for (iter = this->Internal->QueryRegions.begin(); iter != end; ++iter)
+    {
+    if (iter.value().IsKeyframe != matchKeyframes)
+      continue;
+
+    if (iter.key() < startFrame)
+      startFrame = iter.key();
+    if (endFrame < iter.key())
+      endFrame = iter.key();
+
+    // clockwise from top left
+    double region[8];
+    region[0] = iter.value().Region.left();
+    region[1] = yDim - iter.value().Region.top() - 1;
+    region[2] = iter.value().Region.right();
+    region[3] = region[1];
+    region[4] = region[2];
+    region[5] = yDim - iter.value().Region.bottom() - 1;
+    region[6] = region[0];
+    region[7] = region[5];
+
+    eventBase->AddRegion(iter.key(), 4, region);
+    }
+
+  eventBase->SetStartFrame(startFrame);
+  eventBase->SetEndFrame(endFrame);
+
+  return eventBase;
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::eventSelected(vtkIdType id)
+{
+  if (id < EID_FirstDescriptor)
+    {
+    // Get current timestamp
+    vtkVgTimeStamp vtkTime = this->Internal->EventModel->GetCurrentTimeStamp();
+
+    // Get keyframe ID
+    vgTimeStamp time(vtkTime.GetTime(), vtkTime.GetFrameNumber());
+    if (!this->Internal->QueryRegions.contains(time))
+      return;
+    id = this->Internal->QueryRegions[time].KeyframeId;
+
+    emit this->pickedKeyframe(id);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::setTracks(QList<vvTrack> tracks)
+{
+  // Load the video; do so first as we need the homographies later
+  this->buildVideoModel();
+
+  this->Internal->VideoMetaData =
+    this->Internal->VideoModel->GetVideoSource()->GetMetadata();
+
+  this->Internal->ColorTracksByPVO = true;
+  if (this->Internal->TrackRepresentation)
+    {
+    this->Internal->TrackRepresentation->SetColorModeToPVO();
+    }
+
+  // Create the track id map and then fill track model
+  this->Internal->TrackIdMap.clear();
+  this->Internal->Tracks.clear();
+  QList<vvTrack>::const_iterator trackIter, end = tracks.end();
+  vtkIdType trackId = 0, numPoints = 0;
+  for (trackIter = tracks.begin(); trackIter != end; trackIter++, trackId++)
+    {
+    this->Internal->Tracks[trackId].Id = trackIter->Id;
+    this->Internal->TrackIdMap.insert(trackIter->Id, trackId);
+    numPoints += static_cast<vtkIdType>(trackIter->Trajectory.size());
+    }
+
+  // Now create the track model and necessary allocate memory for vtkPoints
+  this->Internal->TrackModel = vtkSmartPointer<vtkVgTrackModel>::New();
+  this->Internal->TrackModel->GetPoints()->Allocate(numPoints);
+
+  // Loop the tracks again, create vtkVgTracks, and add to model
+  for (trackIter = tracks.begin(); trackIter != end; trackIter++)
+    {
+    // Create track and add to the internal track map
+    vtkVgTrack* track = vtkVgTrack::New();
+    vtkIdType trackId = this->Internal->TrackIdMap[trackIter->Id];
+    track->SetId(trackId);
+    track->SetPoints(this->Internal->TrackModel->GetPoints());
+    this->Internal->TrackModel->AddTrack(track);
+    track->FastDelete();
+    this->Internal->Tracks[trackId].Track = track;
+
+    // Identify track classifications
+    // \TODO first, vtkVgTrack should be taking the full map; second, we need
+    //       a better way to mangle the ill-defined names from back-ends into
+    //       something that vtkVgTrack understands
+    const char* keyPerson = "TTPerson", *keyVehicle = "TTVehicle";
+    QMap<std::string, double> toc(trackIter->Classification);
+    // Alternate accepted form of the triples
+    if (toc.count() == 3 && toc.contains("Person")
+        && toc.contains("Vehicle") && toc.contains("Other"))
+      {
+      keyPerson = "Person";
+      keyVehicle = "Vehicle";
+      }
+
+    // Set track classifications
+    const double pp = toc.value(keyPerson,  0.0);
+    const double pv = toc.value(keyVehicle, 0.0);
+    track->SetPVO(pp, pv, 1.0 - (pp + pv));
+
+    // Add the points to the track; for now don't need (use) the head, so
+    // not adding it to the track
+    vvTrackTrajectory::const_iterator ptsIter,
+                                      ptsEnd = trackIter->Trajectory.end();
+    for (ptsIter = trackIter->Trajectory.begin(); ptsIter != ptsEnd; ptsIter++)
+      {
+      double t1, t2;
+      this->Internal->VideoModel->GetVideoSource()->GetTimeRange(t1, t2);
+
+      // Clip the track to the time extents of the video
+      if (ptsIter->TimeStamp.Time < t1 || ptsIter->TimeStamp.Time > t2)
+        {
+        continue;
+        }
+
+      vvQueryVideoPlayerPrivate::VideoMetaDataIter hi =
+        this->Internal->VideoMetaData.find(ptsIter->TimeStamp);
+
+      if (hi != this->Internal->VideoMetaData.end())
+        {
+        double outputPt[2];
+        vtkVgApplyHomography(ptsIter->ImagePoint.X, ptsIter->ImagePoint.Y,
+                             hi->second.Homography, outputPt);
+        track->InsertNextPoint(ptsIter->TimeStamp, outputPt, vtkVgGeoCoord());
+        }
+      else
+        {
+        std::cerr.flags(ios::fixed);
+        std::cerr << "Meta data for corresponding timestamp not found."
+                     " Point skipped. Search Time: " << ptsIter->TimeStamp.Time
+                  << std::endl;
+        }
+      }
+
+    // Close the track
+    track->Close();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::setDescriptors(QList<vvDescriptor> descriptors,
+                                        bool haveTracks/*=false*/)
+{
+  this->Internal->Descriptors = descriptors;
+
+  // If we have 'real' tracks, they should have been given to us already, and
+  // the video model will already be set up; otherwise, clear any stale tracks
+  // and set up the video model now
+  if (!haveTracks)
+    {
+    this->Internal->Tracks.clear();
+    this->Internal->TrackIdMap.clear();
+
+    // Load the video; do so first as we need the homographies later
+    this->buildVideoModel();
+    }
+
+  // Build the track model, which will generate any missing tracks from
+  // descriptors using them; must be done before events so that TrackIdMap is
+  // populated when we look for the vtkVgTrack to which the event should be
+  // added
+  this->buildTrackModel(haveTracks);
+
+  this->buildEventModel();
+
+  // Now set up the scene and video player UI
+  this->buildScene();
+  this->loadVideo();
+
+  // (Re)generate image regions per video frame
+  this->buildRegionMap();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::setKeyframes(
+  QHash<vtkIdType, vgRegionKeyframe> keyframes)
+{
+  this->Internal->Keyframes = keyframes;
+  this->buildRegionMap();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::buildScene()
+{
+  this->Internal->VideoNode = vtkSmartPointer<vtkVgVideoNode>::New();
+
+  this->Internal->EventRepresentation =
+    vtkSmartPointer<vtkVgCompositeEventRepresentation>::New();
+
+  this->Internal->DefaultEventRepresentation =
+    vtkSmartPointer<vtkVgEventRegionRepresentation>::New();
+
+  if (this->Internal->DefaultEventColor.isValid())
+    {
+    this->Internal->DefaultEventRepresentation->SetColor(
+      this->Internal->DefaultEventColor.redF(),
+      this->Internal->DefaultEventColor.greenF(),
+      this->Internal->DefaultEventColor.blueF());
+    }
+
+  this->Internal->KeyframeRepresentation =
+    vtkSmartPointer<vtkVgEventRegionRepresentation>::New();
+
+  this->Internal->TrackRepresentation =
+    vtkSmartPointer<vtkVgTrackRepresentation>::New();
+
+  if (this->Internal->ColorTracksByPVO)
+    {
+    this->Internal->TrackRepresentation->SetColorModeToPVO();
+
+    double pcolor[] =
+      {
+      this->Internal->PersonTrackColor.redF(),
+      this->Internal->PersonTrackColor.greenF(),
+      this->Internal->PersonTrackColor.blueF()
+      };
+    double vcolor[] =
+      {
+      this->Internal->VehicleTrackColor.redF(),
+      this->Internal->VehicleTrackColor.greenF(),
+      this->Internal->VehicleTrackColor.blueF()
+      };
+    double ocolor[] =
+      {
+      this->Internal->OtherTrackColor.redF(),
+      this->Internal->OtherTrackColor.greenF(),
+      this->Internal->OtherTrackColor.blueF()
+      };
+    double ucolor[] =
+      {
+      this->Internal->UnclassifiedTrackColor.redF(),
+      this->Internal->UnclassifiedTrackColor.greenF(),
+      this->Internal->UnclassifiedTrackColor.blueF()
+      };
+
+    this->Internal->TrackRepresentation->SetColor(vtkVgTrack::Person,
+                                                  pcolor);
+    this->Internal->TrackRepresentation->SetColor(vtkVgTrack::Vehicle,
+                                                  vcolor);
+    this->Internal->TrackRepresentation->SetColor(vtkVgTrack::Other,
+                                                  ocolor);
+    this->Internal->TrackRepresentation->SetColor(vtkVgTrack::Unclassified,
+                                                  ucolor);
+    }
+
+  this->Internal->VideoRepresentation =
+    vtkSmartPointer<vvClipVideoRepresentation>::New();
+
+  this->Internal->EventRepresentation->AddEventRepresentation(
+    this->Internal->DefaultEventRepresentation);
+  this->Internal->EventRepresentation->AddEventRepresentation(
+    this->Internal->KeyframeRepresentation);
+
+  this->Internal->EventRepresentation->SetEventModel(
+    this->Internal->EventModel);
+  this->Internal->TrackRepresentation->SetTrackModel(
+    this->Internal->TrackModel);
+  this->Internal->VideoModel->SetTrackModel(
+    this->Internal->TrackModel);
+  this->Internal->VideoModel->SetEventModel(
+    this->Internal->EventModel);
+  this->Internal->VideoRepresentation->SetVideoModel(
+    this->Internal->VideoModel);
+  this->Internal->VideoRepresentation->SetTrackRepresentation(
+    this->Internal->TrackRepresentation);
+
+  // selected events should occlude unselected ones
+  this->Internal->DefaultEventRepresentation->SetRegionZOffset(1.0);
+  this->Internal->DefaultEventRepresentation->SetDisplayMask(EventFlag);
+
+  this->Internal->KeyframeRepresentation->SetRegionZOffset(2.0);
+  this->Internal->KeyframeRepresentation->SetDisplayMask(KeyframeFlag);
+
+  this->Internal->VideoRepresentation->SetEventRepresentation(
+    this->Internal->EventRepresentation);
+
+  this->Internal->VideoRepresentation->SetUseModelMatrix(0);
+
+  // make sure tracks are in front of video, and behind event regions
+  this->Internal->TrackRepresentation->SetZOffset(0.5);
+
+  this->Internal->VideoNode->SetVideoRepresentation(
+    this->Internal->VideoRepresentation);
+  this->Internal->VideoNode->SetNodeReferenceFrame(vtkVgNodeBase::RELATIVE);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::buildEventModel()
+{
+  this->Internal->EventModel = vtkSmartPointer<vtkVgEventModel>::New();
+
+  // Note: This code is stolen shamelessly from vqCore::addResultNode...
+  int count = 0;
+  foreach (vvDescriptor descriptor, this->Internal->Descriptors)
+    {
+    vtkSmartPointer<vtkVgEventBase> eventBase =
+      vtkSmartPointer<vtkVgEventBase>::New();
+
+    double yDim = this->videoHeight();
+
+    vtkVgTimeStamp startFrame(true);    // initialize to MaxTime
+    vtkVgTimeStamp endFrame(false);     // initialize to MinTime
+
+    vvDescriptorRegionMap::const_iterator regionIter;
+    for (regionIter = descriptor.Region.begin();
+         regionIter != descriptor.Region.end(); ++regionIter)
+      {
+      if (regionIter->TimeStamp < startFrame)
+        startFrame = regionIter->TimeStamp;
+      if (endFrame < regionIter->TimeStamp)
+        endFrame = regionIter->TimeStamp;
+
+      // clockwise from top left
+      double region[8];
+      region[0] = regionIter->ImageRegion.TopLeft.X;
+      region[1] = yDim - regionIter->ImageRegion.TopLeft.Y - 1;
+      region[2] = regionIter->ImageRegion.BottomRight.X;
+      region[3] = region[1];
+      region[4] = region[2];
+      region[5] = yDim - regionIter->ImageRegion.BottomRight.Y - 1;
+      region[6] = region[0];
+      region[7] = region[5];
+
+      eventBase->AddRegion(regionIter->TimeStamp, 4, region);
+      }
+
+    eventBase->SetId(count++);
+    eventBase->SetStartFrame(startFrame);
+    eventBase->SetEndFrame(endFrame);
+    eventBase->SetDisplayFlags(EventFlag);
+    this->Internal->EventModel->AddEvent(eventBase);
+
+    // add event to track map
+    for (size_t i = 0, size = descriptor.TrackIds.size(); i < size; ++i)
+      {
+      vtkIdType trackId = this->Internal->TrackIdMap[descriptor.TrackIds[i]];
+      this->Internal->Tracks[trackId].Events.append(eventBase->GetId());
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+struct TrackPoint
+{
+  double x, y;
+};
+
+typedef QMap<vgTimeStamp, TrackPoint> TrackPointMap;
+
+//-----------------------------------------------------------------------------
+void FillTrack(QHash<vtkIdType, TrackPointMap>& tracks, vtkIdType trackId,
+               const vvDescriptor* descriptor)
+{
+  TrackPointMap& track = tracks[trackId];
+
+  vvDescriptorRegionMap::const_iterator regionIter;
+  for (regionIter = descriptor->Region.begin();
+       regionIter != descriptor->Region.end(); regionIter++)
+    {
+    // Skip points that are already in the track
+    if (track.contains(regionIter->TimeStamp))
+      continue;
+
+    // Place track points at bottom center of bounding box
+    TrackPoint tp;
+    const double left = regionIter->ImageRegion.TopLeft.X,
+                 right = regionIter->ImageRegion.BottomRight.X;
+    tp.x = 0.5 * (left + right);
+    tp.y = regionIter->ImageRegion.BottomRight.Y;
+
+    // Add the point
+    track.insert(regionIter->TimeStamp, tp);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::buildTrackModel(bool incremental)
+{
+  if (!incremental)
+    {
+    // Create the track model
+    this->Internal->TrackModel = vtkSmartPointer<vtkVgTrackModel>::New();
+    }
+
+  // If we have no video, there is nothing to do
+  if (!this->Internal->VideoModel)
+    return;
+
+  this->Internal->VideoMetaData =
+    this->Internal->VideoModel->GetVideoSource()->GetMetadata();
+
+  // Before starting, remember what tracks existed before
+  QSet<vvTrackId> existingTracks;
+  qtUtil::mapBound(this->Internal->TrackIdMap.keys(),
+                   existingTracks, &QSet<vvTrackId>::insert);
+
+  // Divvy up descriptors by their track sources
+  QMultiHash<vtkIdType, const vvDescriptor*> trackDescriptors;
+  QList<vvDescriptor>::const_iterator
+    iter, end = this->Internal->Descriptors.end();
+  for (iter = this->Internal->Descriptors.begin(); iter != end; ++iter)
+    {
+    for (size_t i = 0, count = iter->TrackIds.size(); i < count; ++i)
+      {
+      // Ignore tracks that existed previously
+      if (existingTracks.contains(iter->TrackIds[i]))
+        continue;
+
+      // Get internal track ID
+      vtkIdType trackId;
+      if (this->Internal->TrackIdMap.contains(iter->TrackIds[i]))
+        {
+        trackId = this->Internal->TrackIdMap[iter->TrackIds[i]];
+        }
+      else
+        {
+        const vvTrackId& vtid = iter->TrackIds[i];
+        if (incremental)
+          {
+          const QString idString =
+            QString("%1:%2").arg(vtid.Source).arg(vtid.SerialNumber);
+          qWarning() << "vvQueryVideoPlayer::buildTrackModel: warning: "
+                        "one or more descriptors refer to track"
+                     << qPrintable(idString)
+                     << "which does not exist in our track set";
+          }
+        trackId = this->Internal->TrackIdMap.count();
+        this->Internal->TrackIdMap.insert(vtid, trackId);
+        this->Internal->Tracks[trackId].Id = vtid;
+        }
+      // Add descriptor to track descriptors list
+      trackDescriptors.insert(trackId, &(*iter));
+      }
+    }
+
+  // Reconstruct tracks
+  QHash<vtkIdType, TrackPointMap> tracks;
+  foreach (vtkIdType trackId, this->Internal->TrackIdMap)
+    {
+    // Create track from all available descriptors, dropping them as they become
+    // no longer useful, until none are left. We will prefer ones starting
+    // before desiredStartTime (the last end time) above those that don't,
+    // otherwise we will prefer those that start earliest. Out of those sets, we
+    // will pick the one with the latest end time.
+    //
+    // We will fill in any holes (i.e. if a descriptor skips some frames) using
+    // any descriptor available. This is less optimal, but ideally no such gaps
+    // will exist.
+    vtkVgTimeStamp desiredStartTime(false);
+    while (trackDescriptors.contains(trackId))
+      {
+      // Select the "best" descriptor to use next
+      const vvDescriptor* bestDescriptor = 0;
+      vtkVgTimeStamp bestStartTime(true), bestEndTime(false);
+      foreach (const vvDescriptor* d, trackDescriptors.values(trackId))
+        {
+        vtkVgTimeStamp start = d->Region.begin()->TimeStamp,
+                       end = d->Region.rbegin()->TimeStamp;
+        // If the descriptor ends before (or at) the current end of the track,
+        // it is only useful for gap filling. Add its points, if any (points we
+        // already have are skipped) and remove it from further consideration.
+        if (end <= desiredStartTime)
+          {
+          FillTrack(tracks, trackId, d);
+          trackDescriptors.remove(trackId, d);
+          continue;
+          }
+
+        // Does it start before our desired start time?
+        if (start <= desiredStartTime)
+          {
+          // If our previous best started later, use this one
+          if (desiredStartTime < bestStartTime)
+            {
+            bestDescriptor = d;
+            bestStartTime = desiredStartTime;
+            }
+          // Else, if this one ends later, use it
+          else if (bestEndTime < end)
+            {
+            bestDescriptor = d;
+            }
+          }
+        // Does it start before our previous best start?
+        else if (start < bestStartTime)
+          {
+          bestDescriptor = d;
+          bestStartTime = start;
+          bestEndTime = end;
+          }
+        // Is it starting at the same time, but longer than our previous best?
+        else if (start == bestStartTime && bestEndTime < end)
+          {
+          bestDescriptor = d;
+          bestEndTime = end;
+          }
+        }
+      // If we found a descriptor to add, add its points, then remove it from
+      // our list and update the track end time
+      if (bestDescriptor)
+        {
+        FillTrack(tracks, trackId, bestDescriptor);
+        desiredStartTime = bestDescriptor->Region.rbegin()->TimeStamp;
+        trackDescriptors.remove(trackId, bestDescriptor);
+        }
+      }
+    }
+
+  if (!incremental)
+    {
+    // Figure out how many points we'll need in the track model
+    vtkIdType numPoints = 0;
+    foreach (const TrackPointMap& track, tracks)
+      numPoints += track.count();
+
+    this->Internal->TrackModel->GetPoints()->Allocate(numPoints);
+    }
+
+  // Loop through the track points we accumulated and create tracks in the model
+  foreach (vtkIdType trackId, tracks.keys())
+    {
+    // Create track and add to the internal track map
+    vtkVgTrack* track = vtkVgTrack::New();
+    track->SetId(trackId);
+    this->Internal->TrackModel->AddTrack(track);
+    track->FastDelete();
+    track->SetPoints(this->Internal->TrackModel->GetPoints());
+    this->Internal->Tracks[trackId].Track = track;
+
+    const TrackPointMap& points = tracks[trackId];
+    TrackPointMap::const_iterator iter, end = points.end();
+    for (iter = points.begin(); iter != end; ++iter)
+      {
+      vvQueryVideoPlayerPrivate::VideoMetaDataIter hi =
+        this->Internal->VideoMetaData.find(iter.key());
+
+      if (hi != this->Internal->VideoMetaData.end())
+        {
+        double outputPt[2];
+        vtkVgApplyHomography(iter.value().x, iter.value().y,
+                             hi->second.Homography, outputPt);
+        track->InsertNextPoint(iter.key(), outputPt, vtkVgGeoCoord());
+        }
+      else
+        {
+        std::cerr.flags(ios::fixed);
+        std::cerr << "Meta data for corresponding timestamp not found."
+                     " Point skipped. Search Time: " << iter.key().Time
+                  << std::endl;
+        }
+      }
+
+    // Close the tracks
+    track->Close();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::addEventRepresentation(
+  vtkSmartPointer<vtkVgEventRepresentationBase> rep)
+{
+  this->Internal->EventRepresentation->AddEventRepresentation(rep);
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::setDefaultEventColor(const QColor& color)
+{
+  this->Internal->DefaultEventColor = color;
+  if (this->Internal->DefaultEventRepresentation)
+    {
+    if (color.isValid())
+      {
+      this->Internal->DefaultEventRepresentation->SetColor(
+        this->Internal->DefaultEventColor.redF(),
+        this->Internal->DefaultEventColor.greenF(),
+        this->Internal->DefaultEventColor.blueF());
+      }
+    else
+      {
+      // \TODO how to clear set color?
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::setTrackTypeColor(
+  vtkVgTrack::enumTrackPVOType type, const QColor& color)
+{
+  switch (type)
+    {
+    case vtkVgTrack::Person:
+      this->Internal->PersonTrackColor = color;
+      break;
+    case vtkVgTrack::Vehicle:
+      this->Internal->VehicleTrackColor = color;
+      break;
+    case vtkVgTrack::Other:
+      this->Internal->OtherTrackColor = color;
+      break;
+    case vtkVgTrack::Unclassified:
+      this->Internal->UnclassifiedTrackColor = color;
+      break;
+    }
+
+  if (this->Internal->TrackRepresentation)
+    {
+    if (color.isValid())
+      {
+      this->Internal->TrackRepresentation->SetColor(
+        type, vgColor(color).data().array);
+      }
+    else
+      {
+      // \TODO how to clear set color?
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vvQueryVideoPlayer::timeFromFrameNumber(vgTimeStamp& timeStamp)
+{
+  // Check that we have a frame number
+  if (!timeStamp.HasFrameNumber())
+    return false;
+
+  // Search video archive metadata
+  // \TODO search video metadata once KWA has frame numbers
+
+  // If that failed (or if we don't have frame numbers in the video archive),
+  // search descriptors
+  foreach (const vvDescriptor& d, this->Internal->Descriptors)
+    {
+    vvDescriptorRegionMap::const_iterator iter, end = d.Region.end();
+    for (iter = d.Region.begin(); iter != end; ++iter)
+      {
+      // Skip entries with no time; they aren't useful
+      if (!iter->TimeStamp.HasTime())
+        continue;
+      // Check for a frame number match... if the entry has no frame number,
+      // this will fail, so don't need to check it explicitly
+      if (iter->TimeStamp.FrameNumber == timeStamp.FrameNumber)
+        {
+        // Found a match
+        timeStamp.Time = iter->TimeStamp.Time;
+        return true;
+        }
+      }
+    }
+
+  // No match found
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::update()
+{
+  if (!this->Internal->UpdatePending)
+    {
+    this->Internal->UpdatePending = true;
+    QMetaObject::invokeMethod(this, "updateScene", Qt::QueuedConnection);
+    }
+  // vvVideoPlayer::update() is deferred to updateScene()
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::reset()
+{
+  this->Internal->Descriptors.clear();
+  this->Internal->Keyframes.clear();
+
+  this->Internal->Tracks.clear();
+  this->Internal->TrackIdMap.clear();
+  this->Internal->QueryRegions.clear();
+  this->Internal->VideoMetaData.clear();
+
+  this->Internal->EventRepresentation = 0;
+  this->Internal->DefaultEventRepresentation = 0;
+  this->Internal->TrackRepresentation = 0;
+  this->Internal->VideoRepresentation = 0;
+
+  this->Internal->EventModel = 0;
+  this->Internal->TrackModel = 0;
+  this->Internal->VideoModel = 0;
+  this->Internal->VideoNode = 0;
+
+  vvVideoPlayer::reset();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::updateScene()
+{
+  this->Internal->UpdatePending = false;
+  if (this->Internal->EventRepresentation)
+    {
+    this->Internal->EventRepresentation->Update();
+    }
+  if (this->Internal->TrackRepresentation)
+    {
+    this->Internal->TrackRepresentation->Update();
+    }
+  vvVideoPlayer::update();
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkIdType> vvQueryVideoPlayer::trackIds()
+{
+  return this->Internal->Tracks.keys();
+}
+
+//-----------------------------------------------------------------------------
+vvTrackId vvQueryVideoPlayer::trackId(vtkIdType vtkId)
+{
+  Q_ASSERT(this->Internal->Tracks.contains(vtkId));
+  return this->Internal->Tracks[vtkId].Id;
+}
+
+//-----------------------------------------------------------------------------
+QList<vtkIdType> vvQueryVideoPlayer::trackEvents(vtkIdType trackId)
+{
+  Q_ASSERT(this->Internal->Tracks.contains(trackId));
+  return this->Internal->Tracks[trackId].Events;
+}
+
+//-----------------------------------------------------------------------------
+vtkVgEvent* vvQueryVideoPlayer::event(vtkIdType eventId)
+{
+  return this->Internal->EventModel->GetEvent(eventId);
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptor vvQueryVideoPlayer::descriptor(vtkIdType eventId)
+{
+  Q_ASSERT(eventId >= 0 && eventId < this->Internal->Descriptors.count());
+  return this->Internal->Descriptors[eventId];
+}
+
+//-----------------------------------------------------------------------------
+vtkIdType vvQueryVideoPlayer::descriptorEventId(
+  const vvDescriptor& descriptor)
+{
+  return this->Internal->Descriptors.indexOf(descriptor);
+}
+
+//-----------------------------------------------------------------------------
+QHash<vtkIdType, QSet<vtkIdType> > vvQueryVideoPlayer::regionEvents()
+{
+  QHash<vtkIdType, QSet<vtkIdType> > matchingEvents;
+
+  // Loop over region boxes looking for matching descriptors
+  vvQueryVideoPlayerPrivate::QueryRegionIter qrIter, qrEnd;
+  qrEnd = this->Internal->QueryRegions.end();
+  for (qrIter = this->Internal->QueryRegions.begin();
+       qrIter != qrEnd; ++qrIter)
+    {
+    vvDescriptorRegionEntry re;
+    re.TimeStamp = qrIter.key().GetRawTimeStamp();
+
+    // Find matching descriptors
+    for (int i = 0; i < this->Internal->Descriptors.count(); ++i)
+      {
+      const vvDescriptorRegionMap& drMap =
+        this->Internal->Descriptors[i].Region;
+      // Look for temporal intersection
+      vvDescriptorRegionMap::const_iterator drIter = drMap.find(re);
+      if (drIter != drMap.end())
+        {
+        // Check for spatial intersection
+        QRect r(QPoint(drIter->ImageRegion.TopLeft.X,
+                       drIter->ImageRegion.TopLeft.Y),
+                QPoint(drIter->ImageRegion.BottomRight.X,
+                       drIter->ImageRegion.BottomRight.Y));
+        if (r.intersects(qrIter->Region))
+          {
+          // We have a match; add to match map (will be a no-op if this match
+          // is already recorded)
+          matchingEvents[qrIter->KeyframeId].insert(i);
+          }
+        }
+      }
+    }
+
+  return matchingEvents;
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::jumpToTrack(
+  vtkIdType trackId, vvQueryVideoPlayer::JumpDirection direction)
+{
+  vtkVgTrack* track = this->Internal->TrackModel->GetTrack(trackId);
+  if (!track)
+    return;
+
+  vtkVgTimeStamp time =
+    (direction == JumpToEnd ? track->GetEndFrame() : track->GetStartFrame());
+  this->jumpToTrack(trackId, time);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::jumpToTrack(vtkIdType trackId,
+                                     const vtkVgTimeStamp& time)
+{
+  vtkVgTrack* track = this->Internal->TrackModel->GetTrack(trackId);
+  if (!track)
+    return;
+
+  this->seekTo(time.GetTime());
+
+  this->Internal->JumpToTrackId = trackId;
+  this->Internal->JumpToTrackTime = time;
+  if (!this->Internal->Seeking)
+    {
+    this->finishJumpToTrack();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::jumpToEvent(
+  vtkIdType eventId, vvQueryVideoPlayer::JumpDirection direction)
+{
+  vtkVgEvent* event = this->Internal->EventModel->GetEvent(eventId);
+  if (!event)
+    return;
+
+  vtkVgTimeStamp time =
+    (direction == JumpToEnd ? event->GetEndFrame() : event->GetStartFrame());
+  this->jumpToEvent(eventId, time);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::jumpToEvent(vtkIdType eventId,
+                                     const vtkVgTimeStamp& time)
+{
+  this->seekTo(time.GetTime());
+
+  vtkVgEvent* event = this->Internal->EventModel->GetEvent(eventId);
+  if (!event)
+    return;
+
+  double goToPoint[2];
+
+  vtkIdType npts;
+  vtkIdType* pts;
+  event->GetRegion(time, npts, pts);
+
+  if (npts != 0)
+    {
+    vtkPoints* regionPts = event->GetRegionPoints();
+
+    double upperLeft[3], lowerRight[3];
+    regionPts->GetPoint(pts[0], upperLeft);
+    regionPts->GetPoint(pts[2], lowerRight);
+
+    // center the camera at the middle of the region
+    goToPoint[0] = 0.5 * (upperLeft[0] + lowerRight[0]);
+    goToPoint[1] = 0.5 * (upperLeft[1] + lowerRight[1]);
+    this->moveCameraTo(goToPoint);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::jumpToKeyframe(vtkIdType keyframeId)
+{
+  vtkVgTimeStamp time = this->Internal->Keyframes[keyframeId].Time;
+  this->jumpToEvent(EID_KeyframeRegions, time);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::setTrackVisibility(vtkIdType trackId,
+                                            bool visibility)
+{
+  this->Internal->TrackModel->SetTrackDisplayState(trackId, visibility);
+}
+
+//-----------------------------------------------------------------------------
+bool vvQueryVideoPlayer::eventVisibility(vtkIdType eventId)
+{
+  return this->Internal->EventModel->GetEventInfo(eventId).GetDisplayEvent();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::setEventVisibility(vtkIdType eventId,
+                                            bool visibility)
+{
+  this->Internal->EventModel->SetEventDisplayState(eventId, visibility);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::setKeyframeVisibility(bool visibility)
+{
+  if (this->Internal->KeyframeRepresentation)
+    {
+    this->Internal->KeyframeRepresentation->SetVisible(visibility);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::refreshEvents()
+{
+  this->Internal->EventRepresentation->Update();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgTimeStamp vvQueryVideoPlayer::currentTimeStamp()
+{
+  return this->Internal->EventModel->GetCurrentTimeStamp();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::updateFrame()
+{
+  this->vvVideoPlayer::updateFrame();
+
+  if (this->Internal->JumpToTrackId != -1)
+    {
+    this->finishJumpToTrack();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryVideoPlayer::finishJumpToTrack()
+{
+  vtkVgTrack* track = this->Internal->TrackModel->GetTrack(
+                        this->Internal->JumpToTrackId);
+
+  this->Internal->JumpToTrackId = -1;
+  if (!track)
+    return;
+
+  double goToPoint[2];
+  track->GetClosestFramePt(this->Internal->JumpToTrackTime, goToPoint);
+
+  const vtkMatrix4x4* mat =
+    this->Internal->TrackRepresentation->GetRepresentationMatrix();
+  vtkVgApplyHomography(goToPoint, mat, goToPoint);
+
+  this->moveCameraTo(goToPoint);
+
+  // The initial seek may not have triggered a render (such as when seeking to
+  // the same frame already being displayed), so we must force an update here.
+  this->Internal->Viewer->ForceRender();
+}
diff --git a/Libraries/VvVtkWidgets/vvQueryVideoPlayer.h b/Libraries/VvVtkWidgets/vvQueryVideoPlayer.h
new file mode 100644
index 00000000..ac381fb4
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvQueryVideoPlayer.h
@@ -0,0 +1,129 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryVideoPlayer_h
+#define __vvQueryVideoPlayer_h
+
+#include "vvVideoPlayer.h"
+
+#include <QHash>
+#include <QList>
+#include <QSet>
+#include <QSharedPointer>
+#include <QUrl>
+
+#include <vtkType.h>
+
+#include <vgExport.h>
+
+#include <vtkVgTrack.h>
+
+#include <vvQuery.h>
+
+#include "vgRegionKeyframe.h"
+
+class vtkIdList;
+class vtkVgEvent;
+class vtkVgEventBase;
+class vtkVgEventRepresentationBase;
+
+class vvQueryVideoPlayerPrivate;
+
+class VV_VTKWIDGETS_EXPORT vvQueryVideoPlayer : public vvVideoPlayer
+{
+  Q_OBJECT
+
+public:
+  enum DisplayFlag
+    {
+    EventFlag       = 0x00001,
+    KeyframeFlag    = 0x00002,
+    UserFlag        = 0x10000
+    };
+
+  enum JumpDirection
+    {
+    JumpToStart,
+    JumpToEnd
+    };
+
+  vvQueryVideoPlayer(QWidget* parent = 0);
+  ~vvQueryVideoPlayer();
+
+  void addEventRepresentation(
+    vtkSmartPointer<vtkVgEventRepresentationBase>);
+
+  void setDefaultEventColor(const QColor&);
+  void setTrackTypeColor(vtkVgTrack::enumTrackPVOType type, const QColor&);
+
+  QList<vtkIdType> trackIds();
+  vvTrackId trackId(vtkIdType vtkId);
+
+  QList<vtkIdType> trackEvents(vtkIdType trackId);
+  QHash<vtkIdType, QSet<vtkIdType> > regionEvents();
+
+  vtkVgEvent* event(vtkIdType eventId);
+  vvDescriptor descriptor(vtkIdType eventId);
+
+  vtkIdType descriptorEventId(const vvDescriptor& descriptor);
+
+  bool eventVisibility(vtkIdType eventId);
+
+  vtkVgTimeStamp currentTimeStamp();
+
+  bool timeFromFrameNumber(vgTimeStamp& timeStamp);
+
+  void jumpToTrack(vtkIdType trackId, JumpDirection direction);
+  void jumpToEvent(vtkIdType eventId, JumpDirection direction);
+  void jumpToTrack(vtkIdType trackId, const vtkVgTimeStamp& time);
+  void jumpToEvent(vtkIdType eventId, const vtkVgTimeStamp& time);
+  void jumpToKeyframe(vtkIdType keyframeId);
+
+  virtual int videoHeight() = 0;
+
+signals:
+  void pickedKeyframe(vtkIdType keyframeId);
+
+public slots:
+  void setTracks(QList<vvTrack> tracks);
+  void setDescriptors(QList<vvDescriptor> descriptors, bool haveTracks);
+  void setKeyframes(QHash<vtkIdType, vgRegionKeyframe> keyframes);
+
+  void refreshEvents();
+
+  void setTrackVisibility(vtkIdType trackId, bool visibility);
+  void setEventVisibility(vtkIdType eventId, bool visibility);
+  void setKeyframeVisibility(bool visibility);
+
+  void update();
+  virtual void reset();
+
+protected slots:
+  void eventSelected(vtkIdType id);
+
+  void updateScene();
+
+protected:
+  using QWidget::event; // don't shadow this with event(vtkIdType), above
+
+  virtual void buildVideoModel() = 0;
+  virtual void buildEventModel();
+  virtual void buildTrackModel(bool incremental);
+  virtual void buildScene();
+
+  virtual void updateFrame();
+  void finishJumpToTrack();
+
+  void buildRegionMap();
+  vtkSmartPointer<vtkVgEventBase> buildRegionEvent(bool matchKeyframes);
+
+  void loadVideo();
+
+protected:
+  vvQueryVideoPlayerPrivate* Internal;
+};
+
+#endif
diff --git a/Libraries/VvVtkWidgets/vvQueryVideoPlayerPrivate.h b/Libraries/VvVtkWidgets/vvQueryVideoPlayerPrivate.h
new file mode 100644
index 00000000..b5f44342
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvQueryVideoPlayerPrivate.h
@@ -0,0 +1,100 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// Qt includes
+#include <QFileInfo>
+#include <QHash>
+#include <QMap>
+#include <QMultiHash>
+
+// QtExtensions includes
+#include <qtUtil.h>
+
+// visgui includes
+#include <vtkVgAdapt.h>
+#include <vtkVgCompositeEventRepresentation.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgTimeStamp.h>
+#include <vtkVgTrack.h>
+#include <vtkVgTrackModel.h>
+#include <vtkVgTrackRepresentation.h>
+#include <vtkVgVideoMetadata.h>
+#include <vtkVgVideoModel0.h>
+#include <vtkVgVideoNode.h>
+
+// VTK includes
+#include <vtkIdList.h>
+#include <vtkPoints.h>
+
+#include "vvVideoPlayerPrivate.h"
+
+class vvClipVideoRepresentation;
+
+//-----------------------------------------------------------------------------
+class vvQueryVideoPlayerPrivate : public vvVideoPlayerPrivate
+{
+public:
+  struct TrackInfo
+    {
+    vvTrackId Id;
+    vtkVgTrack* Track;
+    QList<vtkIdType> Events;
+    };
+
+  struct RegionInfo
+    {
+    bool IsKeyframe;
+    vtkIdType KeyframeId;
+    QRect Region;
+    };
+
+  typedef QHash<vtkIdType, TrackInfo> TrackMap;
+  typedef QHash<vtkIdType, vgRegionKeyframe> KeyframeMap;
+  typedef QMap<vtkVgTimeStamp, RegionInfo> QueryRegionMap;
+
+  typedef std::map<vtkVgTimeStamp, vtkVgVideoMetadata> VideoMetaDataMap;
+
+  typedef TrackMap::const_iterator Trackiter;
+  typedef KeyframeMap::const_iterator KeyframeIter;
+  typedef QueryRegionMap::const_iterator QueryRegionIter;
+
+  typedef VideoMetaDataMap::iterator VideoMetaDataIter;
+
+  TrackMap Tracks;
+  KeyframeMap Keyframes;
+  QueryRegionMap QueryRegions;
+
+  VideoMetaDataMap VideoMetaData;
+
+  vtkSmartPointer<vtkVgVideoNode> VideoNode;
+  vtkSmartPointer<vtkVgVideoModel0> VideoModel;
+  vtkSmartPointer<vtkVgEventModel> EventModel;
+  vtkSmartPointer<vtkVgTrackModel> TrackModel;
+
+  vtkSmartPointer<vtkVgCompositeEventRepresentation> EventRepresentation;
+  vtkSmartPointer<vtkVgEventRegionRepresentation> DefaultEventRepresentation;
+  vtkSmartPointer<vtkVgEventRegionRepresentation> KeyframeRepresentation;
+  vtkSmartPointer<vtkVgTrackRepresentation> TrackRepresentation;
+  vtkSmartPointer<vvClipVideoRepresentation> VideoRepresentation;
+
+  QColor DefaultEventColor;
+
+  QColor PersonTrackColor;
+  QColor VehicleTrackColor;
+  QColor OtherTrackColor;
+  QColor UnclassifiedTrackColor;
+  bool ColorTracksByPVO;
+
+  QList<vvDescriptor> Descriptors;
+  QHash<vvTrackId, vtkIdType> TrackIdMap;
+
+  bool UpdatePending;
+
+  vtkIdType JumpToTrackId;
+  vtkVgTimeStamp JumpToTrackTime;
+};
diff --git a/Libraries/VvVtkWidgets/vvReportWriter.cxx b/Libraries/VvVtkWidgets/vvReportWriter.cxx
new file mode 100644
index 00000000..9ce547e5
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvReportWriter.cxx
@@ -0,0 +1,975 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvReportWriter.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QDomDocument>
+#include <QEventLoop>
+#include <QFile>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QProcess>
+#include <QTextStream>
+#include <QVector>
+
+#include <vtkBoundingBox.h>
+#include <vtkCamera.h>
+#include <vtkImageActor.h>
+#include <vtkImageData.h>
+#include <vtkMatrix4x4.h>
+#include <vtkPNGWriter.h>
+#include <vtkPNMWriter.h>
+#include <vtkPoints.h>
+#include <vtkPropCollection.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkSmartPointer.h>
+#include <vtkWindowToImageFilter.h>
+
+#include <vtkVgDataSourceBase.h>
+#include <vtkVgEvent.h>
+#include <vtkVgEventModel.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgEventTypeRegistry.h>
+#include <vtkVgRendererUtils.h>
+#include <vtkVgTerrain.h>
+#include <vtkVgTrack.h>
+#include <vtkVgUtil.h>
+
+#include <vgUnixTime.h>
+
+QTE_IMPLEMENT_D_FUNC(vvReportWriter)
+
+enum
+{
+  ContextImageWidth = 1280,
+  ContextImageHeight = 1024
+};
+
+struct GeoCoord
+{
+  double Latitude;
+  double Longitude;
+};
+
+struct ImageCoord
+{
+  int X, Y;
+};
+
+struct EventOverviewInfo
+{
+  int EventId;
+  int TrackPointsEnd;
+  GeoCoord Location;
+};
+
+//-----------------------------------------------------------------------------
+class vvReportWriterPrivate
+{
+public:
+  vvReportWriterPrivate(QFile& file)
+    : File(file), TextStream(&file), Document(),
+      OverviewElement(Document.createElement("Overview")),
+      EventsElement(Document.createElement("ReportedEvents")),
+      PngWriter(vtkSmartPointer<vtkPNGWriter>::New()),
+      PnmWriter(vtkSmartPointer<vtkPNMWriter>::New()),
+      Event(0), EventTypeRegistry(0), Rank(-1), RelevancyScore(-1.0),
+      Track(0), Context(0), ImageData(0), CurrentId(-1)
+    {
+    QDomElement root = Document.createElement("xml");
+    root.appendChild(this->OverviewElement);
+    root.appendChild(this->EventsElement);
+    this->Document.appendChild(root);
+    }
+
+  ImageCoord latLonToContextImage(GeoCoord gc, double worldBounds[4])
+    {
+    Q_ASSERT(this->LatLonToWorld);
+    Q_ASSERT(worldBounds);
+
+    const vgPoint2d point =
+      vtkVgApplyHomography(gc.Longitude, gc.Latitude, this->LatLonToWorld);
+
+    double xnorm = (point.X - worldBounds[0]) /
+                   (worldBounds[1] - worldBounds[0]);
+
+    double ynorm = 1.0 - (point.Y - worldBounds[2]) /
+                   (worldBounds[3] - worldBounds[2]);
+
+    ImageCoord ic;
+    ic.X = qRound(xnorm * (ContextImageWidth - 1));
+    ic.Y = qRound(ynorm * (ContextImageHeight - 1));
+    return ic;
+    }
+
+public:
+  QFile& File;
+  QTextStream TextStream;
+  QDomDocument Document;
+
+  QDomElement OverviewElement;
+  QDomElement EventsElement;
+  QDomElement CurrentEventElement;
+
+  vtkSmartPointer<vtkPNGWriter> PngWriter;
+  vtkSmartPointer<vtkPNMWriter> PnmWriter;
+
+  vtkVgEvent* Event;
+  vtkVgEventTypeRegistry* EventTypeRegistry;
+  QString EventNote;
+  QString MissionId;
+  QString Source;
+  int Rank;
+  double RelevancyScore;
+
+  vtkVgTrack* Track;
+  vtkMatrix4x4* TrackModelToImage;
+  vtkVgTimeStamp TrackStartFrame;
+  vtkVgTimeStamp TrackEndFrame;
+
+  vtkVgTerrain* Context;
+  vtkVgDataSourceBase* ContextSource;
+  vtkMatrix4x4* LatLonToWorld;
+
+  vtkImageData* ImageData;
+  vtkVgTimeStamp ImageTimeStamp;
+  vtkMatrix4x4* ModelToImage;
+  vtkMatrix4x4* ImageToLatLon;
+
+  vtkBoundingBox ContextOverviewBounds;
+  QVector<EventOverviewInfo> EventInfos;
+  QVector<GeoCoord> TrackPoints;
+
+  int CurrentId;
+
+  QEventLoop EventLoop;
+  QProcess EncodeProcess;
+};
+
+//-----------------------------------------------------------------------------
+vvReportWriter::vvReportWriter(QFile& file)
+  : d_ptr(new vvReportWriterPrivate(file))
+{
+  QTE_D(vvReportWriter);
+
+  connect(&d->EncodeProcess, SIGNAL(error(QProcess::ProcessError)),
+          this, SLOT(videoCreateError()));
+
+  connect(&d->EncodeProcess, SIGNAL(finished(int, QProcess::ExitStatus)),
+          this, SLOT(videoCreateFinished()));
+}
+
+//-----------------------------------------------------------------------------
+vvReportWriter::~vvReportWriter()
+{
+  QTE_D(vvReportWriter);
+
+  d->TextStream << d->Document.toString();
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::setEvent(vtkVgEvent* event,
+                              int outputId,
+                              const QString& eventNote,
+                              vtkVgEventTypeRegistry* typeRegistry,
+                              int rank,
+                              double relevancyScore,
+                              const QString& missionId,
+                              const QString& source)
+{
+  QTE_D(vvReportWriter);
+
+  d->Event = event;
+  d->CurrentId = outputId;
+  d->EventNote = eventNote;
+  d->EventTypeRegistry = typeRegistry;
+  d->Rank = rank;
+  d->RelevancyScore = relevancyScore;
+  d->MissionId = missionId;
+  d->Source = source;
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::setTrack(vtkVgTrack* track, vtkMatrix4x4* modelToImage,
+                              const vtkVgTimeStamp& startFrame,
+                              const vtkVgTimeStamp& endFrame)
+{
+  QTE_D(vvReportWriter);
+
+  d->Track = track;
+  d->TrackModelToImage = modelToImage;
+  d->TrackStartFrame = startFrame;
+  d->TrackEndFrame = endFrame;
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::setContext(vtkVgTerrain* context,
+                                vtkVgDataSourceBase* contextSource,
+                                vtkMatrix4x4* latLonToWorld)
+{
+  QTE_D(vvReportWriter);
+
+  d->Context = context;
+  d->ContextSource = contextSource;
+  d->LatLonToWorld = latLonToWorld;
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::setImageData(vtkImageData* imageData,
+                                  const vtkVgTimeStamp& imageTimeStamp,
+                                  vtkMatrix4x4* modelToImage,
+                                  vtkMatrix4x4* imageToLatLon)
+{
+  QTE_D(vvReportWriter);
+
+  d->ImageData = imageData;
+  d->ImageTimeStamp = imageTimeStamp;
+  d->ModelToImage = modelToImage;
+  d->ImageToLatLon = imageToLatLon;
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::writeOverview()
+{
+  QTE_D(vvReportWriter);
+
+  if (!d->Context || !d->LatLonToWorld || d->EventInfos.isEmpty())
+    {
+    return;
+    }
+
+  // Setup context overview rendering
+  vtkSmartPointer<vtkRenderer> renderer =
+    vtkSmartPointer<vtkRenderer>::New();
+
+  vtkSmartPointer<vtkRenderWindow> renderWindow =
+    vtkSmartPointer<vtkRenderWindow>::New();
+
+  // TODO: Make this resolution configurable
+  renderWindow->SetSize(ContextImageWidth, ContextImageHeight);
+  renderWindow->SetOffScreenRendering(1);
+  renderWindow->AddRenderer(renderer);
+  renderer->GetActiveCamera()->ParallelProjectionOn();
+
+  // Add context actors
+  vtkPropCollection* props = d->Context->GetActiveDrawables();
+  props->InitTraversal();
+  while (vtkProp* prop = props->GetNextProp())
+    {
+    renderer->AddViewProp(prop);
+    prop->SetVisibility(1);
+    }
+
+  double bounds[6];
+  if (d->ContextOverviewBounds.IsValid())
+    {
+    d->ContextOverviewBounds.GetBounds(bounds);
+    }
+  else
+    {
+    // If there were no events with valid corner points, just show the whole
+    // context.
+    d->Context->ComputeBounds();
+    d->Context->GetBounds(bounds);
+    }
+
+  double viewBounds[4];
+  vtkVgRendererUtils::ZoomToExtents2D(renderer, bounds);
+  vtkVgRendererUtils::GetBounds(renderer, viewBounds);
+
+  int extents[4] =
+    {
+    static_cast<int>(floor(viewBounds[0])),
+    static_cast<int>(ceil(viewBounds[1])),
+    static_cast<int>(floor(viewBounds[2])),
+    static_cast<int>(ceil(viewBounds[3]))
+    };
+
+  d->ContextSource->SetVisibleExtents(extents);
+  d->ContextSource->SetImageLevel(-1);
+  d->ContextSource->Update();
+
+  renderWindow->Render();
+
+  vtkSmartPointer<vtkWindowToImageFilter> windowToImageFilter =
+    vtkSmartPointer<vtkWindowToImageFilter>::New();
+  windowToImageFilter->SetInput(renderWindow);
+  windowToImageFilter->SetInputBufferTypeToRGBA();
+  windowToImageFilter->Update();
+
+  QString path = QFileInfo(d->File).path();
+
+  const QString filename = "overview.png";
+  const QString filePath = QString("%1/%2").arg(path, filename);
+
+  d->PngWriter->SetFileName(qPrintable(filePath));
+  d->PngWriter->SetInputConnection(windowToImageFilter->GetOutputPort());
+  d->PngWriter->Write();
+
+  // Create overview info
+  QDomElement overviewElem = d->Document.createElement("OverviewImage");
+  overviewElem.setAttribute("file", filename);
+  overviewElem.setAttribute("width", ContextImageWidth);
+  overviewElem.setAttribute("height", ContextImageHeight);
+
+  // Translate event lat longs to overview image coordinates
+  int trackPointsBegin = 0;
+  foreach (EventOverviewInfo info, d->EventInfos)
+    {
+    QDomElement eventLocElem = d->Document.createElement("Event");
+    eventLocElem.setAttribute("id", info.EventId);
+
+    ImageCoord ic = d->latLonToContextImage(info.Location, viewBounds);
+
+    eventLocElem.setAttribute("x", ic.X);
+    eventLocElem.setAttribute("y", ic.Y);
+
+    // Translate track points
+    if (info.TrackPointsEnd != 0 && info.TrackPointsEnd > trackPointsBegin)
+      {
+      QDomElement trackPtsElem = d->Document.createElement("TrackPoints");
+      for (int i = trackPointsBegin; i < info.TrackPointsEnd; ++i)
+        {
+        ImageCoord img = d->latLonToContextImage(d->TrackPoints[i],
+                                                 viewBounds);
+        QDomElement trackPtElem = d->Document.createElement("Point");
+        trackPtElem.setAttribute("x", img.X);
+        trackPtElem.setAttribute("y", img.Y);
+        trackPtsElem.appendChild(trackPtElem);
+        }
+      trackPointsBegin = info.TrackPointsEnd;
+      eventLocElem.appendChild(trackPtsElem);
+      }
+
+    overviewElem.appendChild(eventLocElem);
+    }
+
+  d->OverviewElement.appendChild(overviewElem);
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::writeEventSummary()
+{
+  QTE_D(vvReportWriter);
+
+  Q_ASSERT(d->Event);
+  Q_ASSERT(d->ImageData);
+
+  QString path = QFileInfo(d->File).path();
+
+  QString filePath = "%1/%2.png";
+  filePath = filePath.arg(path).arg(d->CurrentId);
+
+  QString contextFilePath = "%1/%2.context.png";
+  contextFilePath = contextFilePath.arg(path).arg(d->CurrentId);
+
+  QString warpedFilePath = "%1/%2.warped.png";
+  warpedFilePath = warpedFilePath.arg(path).arg(d->CurrentId);
+
+  d->PngWriter->SetFileName(qPrintable(filePath));
+  d->PngWriter->SetInputData(d->ImageData);
+  d->PngWriter->Write();
+
+  vtkSmartPointer<vtkMatrix4x4> imageToWorld;
+  double viewBounds[4];
+
+  // Render the context
+  if (d->Context && d->ImageToLatLon && d->LatLonToWorld)
+    {
+    vtkSmartPointer<vtkRenderer> renderer =
+      vtkSmartPointer<vtkRenderer>::New();
+
+    vtkSmartPointer<vtkRenderWindow> renderWindow =
+      vtkSmartPointer<vtkRenderWindow>::New();
+
+    // TODO: Make this resolution configurable
+    renderWindow->SetSize(ContextImageWidth, ContextImageHeight);
+    renderWindow->SetOffScreenRendering(1);
+    renderWindow->AddRenderer(renderer);
+
+    // Add context actors
+    vtkPropCollection* props = d->Context->GetActiveDrawables();
+    props->InitTraversal();
+    while (vtkProp* prop = props->GetNextProp())
+      {
+      renderer->AddViewProp(prop);
+      prop->SetVisibility(1);
+      }
+
+    vtkSmartPointer<vtkImageActor> imageProp =
+      vtkSmartPointer<vtkImageActor>::New();
+
+    imageToWorld = vtkSmartPointer<vtkMatrix4x4>::New();
+    vtkMatrix4x4::Multiply4x4(d->LatLonToWorld, d->ImageToLatLon,
+                              imageToWorld);
+
+    // Make sure homogeneous component is non-negative or it won't render
+    if (imageToWorld->Element[3][3] < 0.0)
+      {
+      for (int i = 0; i < 4; ++i)
+        {
+        for (int j = 0; j < 4; ++j)
+          {
+          imageToWorld->Element[i][j] *= -1.0;
+          }
+        }
+      }
+
+    // Offset image slightly in front of context
+    imageToWorld->Element[2][3] = 0.1 * imageToWorld->Element[3][3];
+
+    // Add warped image actor
+    imageProp->SetInputData(d->ImageData);
+    imageProp->SetUserMatrix(imageToWorld);
+    renderer->AddViewProp(imageProp);
+
+    renderer->GetActiveCamera()->ParallelProjectionOn();
+
+    double bounds[6];
+    imageProp->GetBounds(bounds);
+    double width = bounds[1] - bounds[0];
+    double height = bounds[3] - bounds[2];
+
+    // Expand the bounds of the overview
+    d->ContextOverviewBounds.AddBounds(bounds);
+
+    // Make warped image occupy roughly 1/3 of the screen width
+    double extbounds[6];
+    extbounds[0] = bounds[0] - width;
+    extbounds[1] = bounds[1] + width;
+    extbounds[2] = bounds[2] - height;
+    extbounds[3] = bounds[3] + height;
+    extbounds[4] = bounds[4];
+    extbounds[5] = bounds[5];
+
+    double cbounds[6];
+    d->Context->ComputeBounds();
+    d->Context->GetBounds(cbounds);
+
+    // Try not to have any empty space outside of rendered actors
+    double minx = std::min(bounds[0], cbounds[0]);
+    if (extbounds[0] < minx)
+      {
+      double diff = minx - extbounds[0];
+      extbounds[0] += diff;
+      extbounds[1] += diff;
+      }
+
+    double maxy = std::max(bounds[3], cbounds[3]);
+    if (extbounds[3] > maxy)
+      {
+      double diff = maxy - extbounds[3];
+      extbounds[2] += diff;
+      extbounds[3] += diff;
+      }
+
+    vtkVgRendererUtils::ZoomToExtents2D(renderer, extbounds);
+    vtkVgRendererUtils::GetBounds(renderer, viewBounds);
+
+    int extents[4] =
+      {
+      static_cast<int>(floor(viewBounds[0])),
+      static_cast<int>(ceil(viewBounds[1])),
+      static_cast<int>(floor(viewBounds[2])),
+      static_cast<int>(ceil(viewBounds[3]))
+      };
+
+    // Force context to highest LOD
+    d->ContextSource->SetVisibleExtents(extents);
+    d->ContextSource->SetImageLevel(0);
+    d->ContextSource->Update();
+
+    imageProp->SetVisibility(0);
+
+    // Render context by itself
+    renderWindow->Render();
+
+    vtkSmartPointer<vtkWindowToImageFilter> windowToImageFilter =
+      vtkSmartPointer<vtkWindowToImageFilter>::New();
+    windowToImageFilter->SetInput(renderWindow);
+    windowToImageFilter->SetInputBufferTypeToRGBA();
+    windowToImageFilter->Update();
+
+    d->PngWriter->SetFileName(qPrintable(contextFilePath));
+    d->PngWriter->SetInputConnection(windowToImageFilter->GetOutputPort());
+    d->PngWriter->Write();
+
+    // Hide context and show image
+    props->InitTraversal();
+    while (vtkProp* prop = props->GetNextProp())
+      {
+      prop->SetVisibility(0);
+      }
+    imageProp->SetVisibility(1);
+
+    // Render warped image in same coordinates as context
+    renderWindow->Render();
+    windowToImageFilter->Modified();
+
+    d->PngWriter->SetFileName(qPrintable(warpedFilePath));
+    d->PngWriter->Write();
+    }
+
+  QDomElement eventElem = d->Document.createElement("Event");
+  d->CurrentEventElement = eventElem;
+
+  eventElem.setAttribute("id", d->CurrentId);
+
+  QDomElement noteElem = d->Document.createElement("Note");
+  noteElem.setAttribute("value", d->EventNote);
+  eventElem.appendChild(noteElem);
+
+  vgUnixTime startTime(d->Event->GetStartFrame().GetTime());
+  QDomElement startTimeElem = d->Document.createElement("StartTimeStamp");
+  startTimeElem.setAttribute("time",
+                             startTime.dateString() + " " +
+                             startTime.timeString());
+  eventElem.appendChild(startTimeElem);
+
+  vgUnixTime endTime(d->Event->GetEndFrame().GetTime());
+  QDomElement endTimeElem = d->Document.createElement("EndTimeStamp");
+  endTimeElem.setAttribute("time",
+                           endTime.dateString() + " " +
+                           endTime.timeString());
+  eventElem.appendChild(endTimeElem);
+
+  if (d->EventTypeRegistry)
+    {
+    QDomElement classifiersElem = d->Document.createElement("Classifiers");
+
+    d->Event->InitClassifierTraversal();
+    for (bool valid = d->Event->InitClassifierTraversal(); valid;
+         valid = d->Event->NextClassifier())
+      {
+      int type = d->Event->GetClassifierType();
+      double prob = d->Event->GetClassifierProbability();
+
+      QDomElement classifierElem = d->Document.createElement("Classifier");
+      QString name = d->EventTypeRegistry->GetTypeById(type).GetName();
+      classifierElem.setAttribute("name", name);
+      classifierElem.setAttribute("probability", prob);
+
+      classifiersElem.appendChild(classifierElem);
+      }
+    eventElem.appendChild(classifiersElem);
+    }
+
+  if (d->RelevancyScore != -1.0)
+    {
+    QDomElement scoreElem = d->Document.createElement("RelevancyScore");
+    scoreElem.setAttribute("value", d->RelevancyScore);
+    eventElem.appendChild(scoreElem);
+    }
+
+  if (d->Rank != -1)
+    {
+    QDomElement rankElem = d->Document.createElement("Rank");
+    rankElem.setAttribute("value", d->Rank);
+    eventElem.appendChild(rankElem);
+    }
+
+  if (!d->MissionId.isNull())
+    {
+    QDomElement missionElem = d->Document.createElement("MissionId");
+    missionElem.setAttribute("value", d->MissionId);
+    eventElem.appendChild(missionElem);
+    }
+
+  if (!d->Source.isNull())
+    {
+    QDomElement srcElem = d->Document.createElement("VideoSource");
+    srcElem.setAttribute("value", QFileInfo(d->Source).fileName());
+    eventElem.appendChild(srcElem);
+    }
+
+  QDomElement imageElem = d->Document.createElement("SampleImage");
+  imageElem.setAttribute("file", QFileInfo(filePath).fileName());
+  imageElem.setAttribute("width", d->ImageData->GetDimensions()[0]);
+  imageElem.setAttribute("height", d->ImageData->GetDimensions()[1]);
+
+  QDomElement timeStampElem = d->Document.createElement("TimeStamp");
+
+  vgUnixTime timestamp(d->ImageTimeStamp.GetTime());
+  timeStampElem.setAttribute("time",
+                             timestamp.dateString() + " " +
+                             timestamp.timeString());
+
+  if (d->ImageTimeStamp.HasFrameNumber())
+    {
+    timeStampElem.setAttribute("frame", d->ImageTimeStamp.GetFrameNumber());
+    }
+
+  imageElem.appendChild(timeStampElem);
+
+  vtkIdType npts = 0;
+  vtkIdType* ids;
+  d->Event->GetRegion(d->ImageTimeStamp, npts, ids);
+  if (npts == 0)
+    {
+    qDebug() << "Failed to get event region.";
+    return;
+    }
+
+  vtkPoints* regionPts = d->Event->GetRegionPoints();
+
+  QDomElement regionElem = d->Document.createElement("EventRegion");
+
+  // Compute region minimum and maximum corners in image space, and emit
+  // individual region points.
+  vtkBoundingBox bbox;
+  for (int i = 0; i < npts - 1; ++i)
+    {
+    double p[3];
+    regionPts->GetPoint(ids[i], p);
+
+    if (d->ModelToImage)
+      {
+      vtkVgApplyHomography(p, d->ModelToImage, p);
+      }
+
+    p[1] = d->ImageData->GetDimensions()[1] - p[1] - 1;
+    bbox.AddPoint(p);
+
+    QDomElement regionPtElem = d->Document.createElement("Point");
+    regionPtElem.setAttribute("x", p[0]);
+    regionPtElem.setAttribute("y", p[1]);
+    regionElem.appendChild(regionPtElem);
+    }
+
+  double ul[] =
+    {
+    bbox.GetMinPoint()[0],
+    bbox.GetMinPoint()[1],
+    };
+
+  double lr[] =
+    {
+    bbox.GetMaxPoint()[0],
+    bbox.GetMaxPoint()[1],
+    };
+
+  // Round to nearest pixel center
+  int iul[2] = { qRound(ul[0]), qRound(ul[1]) };
+  int ilr[2] = { qRound(lr[0]), qRound(lr[1]) };
+
+  // Event box
+  regionElem.setAttribute("ulx", iul[0]);
+  regionElem.setAttribute("uly", iul[1]);
+  regionElem.setAttribute("lrx", ilr[0]);
+  regionElem.setAttribute("lry", ilr[1]);
+  imageElem.appendChild(regionElem);
+
+  EventOverviewInfo info;
+  info.EventId = -1;
+  info.Location.Latitude = 0.0;
+  info.Location.Longitude = 0.0;
+  info.TrackPointsEnd = 0;
+
+  // Get region center in latitude / longitude
+  if (d->ImageToLatLon)
+    {
+    double geocenter[3];
+    bbox.GetCenter(geocenter);
+    vtkVgApplyHomography(geocenter, d->ImageToLatLon, geocenter);
+
+    // Remember location for positioning on the overview
+    info.EventId = d->CurrentId;
+    info.Location.Latitude = geocenter[1];
+    info.Location.Longitude = geocenter[0];
+
+    QDomElement geoElem = d->Document.createElement("EventLocation");
+    geoElem.setAttribute("latitude", QString::number(geocenter[1], 'f', 6));
+    geoElem.setAttribute("longitude", QString::number(geocenter[0], 'f', 6));
+    imageElem.appendChild(geoElem);
+    }
+
+  // Output image coordinates of all track points for this event
+  if (d->Track)
+    {
+    QDomElement trackElem = d->Document.createElement("TrackPoints");
+
+    vtkVgTimeStamp timeStamp;
+    vtkPoints* points = d->Track->GetPoints();
+
+    // Create track-model-to-lat-lon matrix for later use
+    vtkSmartPointer<vtkMatrix4x4> trackToLatLon;
+    if (d->ImageToLatLon && d->TrackModelToImage)
+      {
+      trackToLatLon = vtkSmartPointer<vtkMatrix4x4>::New();
+      vtkMatrix4x4::Multiply4x4(d->ImageToLatLon,
+                                d->TrackModelToImage,
+                                trackToLatLon);
+      }
+
+    d->Track->InitPathTraversal();
+    vtkIdType id;
+    while ((id = d->Track->GetNextPathPt(timeStamp)) != -1)
+      {
+      if (d->TrackStartFrame.IsValid() && d->TrackStartFrame > timeStamp)
+        {
+        continue;
+        }
+      if (d->TrackEndFrame.IsValid() && timeStamp > d->TrackEndFrame)
+        {
+        break;
+        }
+
+      double point[4];
+      points->GetPoint(id, point);
+      point[3] = 1.0;
+
+      vgPoint2d point2;
+      if (d->TrackModelToImage)
+        {
+        point2 = vtkVgApplyHomography(point, d->TrackModelToImage);
+        }
+      else
+        {
+        point2.X = point[0];
+        point2.Y = point[1];
+        }
+
+      point2.Y = d->ImageData->GetDimensions()[1] - point2.Y - 1;
+
+      int ipoint[] = { qRound(point2.X), qRound(point2.Y) };
+
+      QDomElement elem = d->Document.createElement("Point");
+      elem.setAttribute("x", ipoint[0]);
+      elem.setAttribute("y", ipoint[1]);
+      trackElem.appendChild(elem);
+
+      // Compute and save geocoordinates of track points
+      if (trackToLatLon)
+        {
+        GeoCoord gc;
+        vtkVgApplyHomography(point, trackToLatLon, gc.Longitude, gc.Latitude);
+        d->TrackPoints.append(gc);
+        }
+      }
+
+    info.EventId = d->CurrentId;
+    info.TrackPointsEnd = d->TrackPoints.size();
+    imageElem.appendChild(trackElem);
+    }
+
+  if (info.EventId != -1)
+    {
+    d->EventInfos.append(info);
+    }
+  eventElem.appendChild(imageElem);
+
+  if (d->Context && imageToWorld)
+    {
+    QDomElement contextElem = d->Document.createElement("ContextData");
+    QDomElement contextImgElem = d->Document.createElement("ContextImage");
+    QDomElement contextOverlayElem =
+      d->Document.createElement("ContextImageOverlay");
+
+    contextImgElem.setAttribute("file",
+                                QFileInfo(contextFilePath).fileName());
+    contextImgElem.setAttribute("width", ContextImageWidth);
+    contextImgElem.setAttribute("height", ContextImageHeight);
+
+    contextOverlayElem.setAttribute("file",
+                                    QFileInfo(warpedFilePath).fileName());
+    contextOverlayElem.setAttribute("width", ContextImageWidth);
+    contextOverlayElem.setAttribute("height", ContextImageHeight);
+
+    contextElem.appendChild(contextImgElem);
+    contextElem.appendChild(contextOverlayElem);
+
+    // Get region center in context (world) coords
+    double center[3];
+    bbox.GetCenter(center);
+    vtkVgApplyHomography(center, imageToWorld, center);
+
+    // Convert to pixel coords
+    double normalized[] =
+      {
+      (center[0] - viewBounds[0]) / (viewBounds[1] - viewBounds[0]),
+      (center[1] - viewBounds[2]) / (viewBounds[3] - viewBounds[2])
+      };
+
+    int imgx = qRound(normalized[0] * (ContextImageWidth - 1));
+    int imgy = qRound(normalized[1] * (ContextImageHeight - 1));
+
+    imgx = qBound(0, imgx, ContextImageWidth - 1);
+    imgy = qBound(0, imgy, ContextImageHeight - 1);
+    imgy = ContextImageHeight - 1 - imgy;
+
+    QDomElement imgPos = d->Document.createElement("EventCenter");
+    imgPos.setAttribute("x", imgx);
+    imgPos.setAttribute("y", imgy);
+    contextElem.appendChild(imgPos);
+
+    eventElem.appendChild(contextElem);
+    }
+
+  d->EventsElement.appendChild(eventElem);
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::writeEventVideoImage(int number)
+{
+  QTE_D(vvReportWriter);
+
+  Q_ASSERT(d->Event);
+  Q_ASSERT(d->ImageData);
+
+  int dim[] = { d->ImageData->GetDimensions()[0],
+                d->ImageData->GetDimensions()[1]
+              };
+
+  vtkSmartPointer<vtkRenderer> renderer =
+    vtkSmartPointer<vtkRenderer>::New();
+
+  vtkSmartPointer<vtkRenderWindow> renderWindow =
+    vtkSmartPointer<vtkRenderWindow>::New();
+
+  renderWindow->SetSize(dim[0], dim[1]);
+  renderWindow->SetOffScreenRendering(1);
+  renderWindow->AddRenderer(renderer);
+  renderer->GetActiveCamera()->ParallelProjectionOn();
+
+  vtkSmartPointer<vtkImageActor> imageProp =
+    vtkSmartPointer<vtkImageActor>::New();
+
+  // Add image actor
+  imageProp->SetInputData(d->ImageData);
+  renderer->AddViewProp(imageProp);
+
+  double bounds[6];
+  imageProp->GetBounds(bounds);
+  vtkVgRendererUtils::ZoomToExtents2D(renderer, bounds);
+
+  // Add event representation
+  vtkSmartPointer<vtkVgEventModel> eventModel =
+    vtkSmartPointer<vtkVgEventModel>::New();
+
+  vtkSmartPointer<vtkVgEventRegionRepresentation> eventRep =
+    vtkSmartPointer<vtkVgEventRegionRepresentation>::New();
+
+  vtkSmartPointer<vtkVgEventBase> eventCopy =
+    vtkSmartPointer<vtkVgEventBase>::New();
+
+  // Need to make a copy of the event so that it points to the right points
+  eventCopy->SetRegionPoints(eventModel->GetSharedRegionPoints());
+  eventCopy->DeepCopy(d->Event);
+
+  eventModel->AddEvent(eventCopy);
+  eventRep->SetEventModel(eventModel);
+  eventRep->SetEventTypeRegistry(d->EventTypeRegistry);
+  eventRep->SetRegionZOffset(0.1);
+
+  if (d->ModelToImage)
+    {
+    eventRep->SetRepresentationMatrix(d->ModelToImage);
+    }
+
+  eventModel->Update(d->ImageTimeStamp);
+  eventRep->Update();
+
+  vtkPropCollection* props = eventRep->GetActiveRenderObjects();
+  props->InitTraversal();
+  while (vtkProp* prop = props->GetNextProp())
+    {
+    renderer->AddViewProp(prop);
+    }
+
+  // Render to image
+  renderWindow->Render();
+
+  vtkSmartPointer<vtkWindowToImageFilter> windowToImageFilter =
+    vtkSmartPointer<vtkWindowToImageFilter>::New();
+  windowToImageFilter->SetInput(renderWindow);
+  windowToImageFilter->Update();
+
+  QString path = "%1/%2";
+  path = path.arg(QFileInfo(d->File).path()).arg(d->CurrentId);
+  QDir dir(path);
+  if (!dir.exists())
+    {
+    dir.mkpath(path);
+    }
+
+  // Write as PNM/PPM file as it's much faster than generating a PNG
+  QString filepath = "%1/%2.pnm";
+  filepath = filepath.arg(path)
+                     .arg(number, 6, 10, QChar('0'));
+  d->PnmWriter->SetFileName(qPrintable(filepath));
+  d->PnmWriter->SetInputConnection(windowToImageFilter->GetOutputPort());
+  d->PnmWriter->Write();
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::writeEventVideo()
+{
+  QTE_D(vvReportWriter);
+
+  QString imagePath = "%1/%2";
+  imagePath = imagePath.arg(QFileInfo(d->File.fileName()).path())
+                       .arg(d->CurrentId);
+
+  QString filePath = imagePath + ".wmv";
+
+  QStringList args;
+  args << "-y"; // overwrite existing
+  args << "-r";
+  args << "10"; // assuming 10 fps
+  args << "-i";
+  args << QString("%1/%06d.pnm").arg(imagePath);
+  args << "-b";
+  args << "5M";
+  args << filePath;
+
+  qDebug() << "starting ffmpeg";
+  d->EncodeProcess.start("ffmpeg", args);
+
+  if (!d->EncodeProcess.waitForStarted())
+    {
+    qDebug() << "ffmpeg failed to start:" << d->EncodeProcess.errorString();
+    return;
+    }
+
+  if (d->EventLoop.exec() != 0)
+    {
+    qDebug() << d->EncodeProcess.errorString();
+    }
+  else
+    {
+    int exitCode = d->EncodeProcess.exitCode();
+    if (exitCode != EXIT_SUCCESS)
+      {
+      qDebug() << d->EncodeProcess.readAllStandardError();
+      }
+    else
+      {
+      QDomElement vidElem = d->Document.createElement("Video");
+      vidElem.setAttribute("file", QFileInfo(filePath).fileName());
+      d->CurrentEventElement.appendChild(vidElem);
+      }
+    qDebug() << "ffmpeg returned with exit code:" << exitCode;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::videoCreateError()
+{
+  QTE_D(vvReportWriter);
+
+  d->EventLoop.exit(1);
+}
+
+//-----------------------------------------------------------------------------
+void vvReportWriter::videoCreateFinished()
+{
+  QTE_D(vvReportWriter);
+
+  d->EventLoop.exit(0);
+}
diff --git a/Libraries/VvVtkWidgets/vvReportWriter.h b/Libraries/VvVtkWidgets/vvReportWriter.h
new file mode 100644
index 00000000..6d7e9d08
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvReportWriter.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvReportWriter_h
+#define __vvReportWriter_h
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QString>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vtkVgTimeStamp.h>
+
+class QFile;
+class QString;
+
+class vtkImageData;
+class vtkMatrix4x4;
+
+class vtkVgDataSourceBase;
+class vtkVgEvent;
+class vtkVgEventTypeRegistry;
+class vtkVgTerrain;
+class vtkVgTrack;
+
+class vvReportWriterPrivate;
+
+class VV_VTKWIDGETS_EXPORT vvReportWriter : public QObject
+{
+  Q_OBJECT
+
+public:
+  explicit vvReportWriter(QFile& file);
+  ~vvReportWriter();
+
+  void setContext(vtkVgTerrain* context,
+                  vtkVgDataSourceBase* contextSource,
+                  vtkMatrix4x4* latLonToWorld);
+
+  void setEvent(vtkVgEvent* event,
+                int outputId,
+                const QString& eventNote,
+                vtkVgEventTypeRegistry* typeRegistry = 0,
+                int rank = -1,
+                double relevancyScore = -1.0,
+                const QString& missionId = QString(),
+                const QString& source = QString());
+
+  void setTrack(vtkVgTrack* track,
+                vtkMatrix4x4* modelToImage = 0,
+                const vtkVgTimeStamp& startFrame = vtkVgTimeStamp(),
+                const vtkVgTimeStamp& endFrame = vtkVgTimeStamp());
+
+  void setImageData(vtkImageData* imageData,
+                    const vtkVgTimeStamp& imageTimeStamp,
+                    vtkMatrix4x4* modelToImage = 0,
+                    vtkMatrix4x4* imageToLatLon = 0);
+
+  void writeOverview();
+  void writeEventSummary();
+  void writeEventVideoImage(int number);
+  void writeEventVideo();
+
+protected slots:
+  void videoCreateError();
+  void videoCreateFinished();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvReportWriter)
+
+private:
+  QTE_DECLARE_PRIVATE(vvReportWriter)
+  Q_DISABLE_COPY(vvReportWriter)
+};
+
+#endif
diff --git a/Libraries/VvVtkWidgets/vvTrackInfo.cxx b/Libraries/VvVtkWidgets/vvTrackInfo.cxx
new file mode 100644
index 00000000..87631c1b
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvTrackInfo.cxx
@@ -0,0 +1,229 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvTrackInfo.h"
+
+#include <QColor>
+#include <QSettings>
+
+#include <vgColor.h>
+
+namespace // anonymous
+{
+
+const char* const settingsTypeRoot = "TrackTypes";
+const char* const settingsSourceRoot = "TrackSources";
+
+//-----------------------------------------------------------------------------
+struct TrackInfoTemplate
+{
+  int type;
+  const char* group;
+  unsigned char color[6];
+};
+
+//-----------------------------------------------------------------------------
+static const TrackInfoTemplate defaultTrackTemplate =
+{
+  vtkVgTrack::Unclassified,   "Unclassified",
+  { 208, 208, 208, 144, 144, 144 }
+};
+
+//-----------------------------------------------------------------------------
+static const TrackInfoTemplate nullTrackTemplate =
+{
+  0, 0, { 0, 0, 0, 0, 0, 0 }
+};
+
+//-----------------------------------------------------------------------------
+static const TrackInfoTemplate trackTemplates[] =
+{
+  { vtkVgTrack::Person,         "Person",
+    {  64,  64, 224,  48,  48, 192 } },
+  { vtkVgTrack::Vehicle,        "Vehicle",
+    { 208, 208,  48, 160, 160,  32 } },
+  { vtkVgTrack::Other,          "Other",
+    { 112, 112, 112,  64,  64,  64 } },
+  defaultTrackTemplate,
+  nullTrackTemplate
+};
+
+//-----------------------------------------------------------------------------
+vgColor color(unsigned char* p, int o)
+{
+  return QColor::fromRgb(p[o + 0], p[o + 1], p[o + 2]);
+}
+
+//-----------------------------------------------------------------------------
+vvTrackInfo trackFromSettings(
+  QSettings& settings, const QString& group, TrackInfoTemplate tpl)
+{
+  vvTrackInfo ti;
+
+  ti.Type = static_cast<vtkVgTrack::enumTrackPVOType>(tpl.type);
+
+  settings.beginGroup(group);
+
+  ti.Name = settings.value("Name", tpl.group).toString();
+
+  ti.PenColor =
+    vgColor::read(settings, "PenColor", color(tpl.color, 0));
+  ti.BackgroundColor =
+    vgColor::read(settings, "BackgroundColor", color(tpl.color, 3));
+  ti.ForegroundColor =
+    vgColor::read(settings, "ForegroundColor", vgColor(Qt::white));
+
+  settings.endGroup();
+
+  return ti;
+}
+
+//-----------------------------------------------------------------------------
+vvTrackInfo trackFromSettings(QSettings& settings, TrackInfoTemplate tpl)
+{
+  return trackFromSettings(settings, tpl.group, tpl);
+}
+
+//-----------------------------------------------------------------------------
+QList<vvTrackInfo> tracksFromTemplate(QSettings& settings,
+                                      const TrackInfoTemplate* t)
+{
+  QList<vvTrackInfo> tracks;
+  while (t->group)
+    {
+    tracks.append(trackFromSettings(settings, *t));
+    ++t;
+    }
+  return tracks;
+}
+
+//-----------------------------------------------------------------------------
+const char* settingsGroup(vtkVgTrack::enumTrackPVOType type)
+{
+  TrackInfoTemplate const* t = trackTemplates;
+  while (t->group)
+    {
+    if (t->type == type)
+      {
+      return t->group;
+      }
+    ++t;
+    }
+  return 0;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vvTrackInfo::vvTrackInfo() : Source(-1), Type(vtkVgTrack::Unclassified)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvTrackInfo::vvTrackInfo(vtkVgTrack::enumTrackPVOType type) :
+  Source(-1), Type(type)
+{
+  vvTrackInfo::getTrackType(*this, type);
+}
+
+//-----------------------------------------------------------------------------
+bool vvTrackInfo::write() const
+{
+  QSettings settings;
+  if (this->Source >= 0)
+    {
+    settings.beginGroup(settingsSourceRoot);
+    settings.beginGroup(QString::number(this->Source));
+    }
+  else
+    {
+    settings.beginGroup(settingsTypeRoot);
+    settings.beginGroup(settingsGroup(this->Type));
+
+    settings.setValue("Name", this->Name);
+    }
+
+  this->PenColor.write(settings, "PenColor");
+  this->BackgroundColor.write(settings, "BackgroundColor");
+  this->ForegroundColor.write(settings, "ForegroundColor");
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvTrackInfo::getTrackType(
+  vvTrackInfo& ti, vtkVgTrack::enumTrackPVOType type)
+{
+  QSettings settings;
+  settings.beginGroup(settingsTypeRoot);
+
+  TrackInfoTemplate const* t = trackTemplates;
+  while (t->group)
+    {
+    if (t->type == type)
+      {
+      ti = trackFromSettings(settings, *t);
+      return true;
+      }
+    ++t;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vvTrackInfo::getTrackSource(vvTrackInfo& ti, int source)
+{
+  QSettings settings;
+  settings.beginGroup(settingsSourceRoot);
+
+  const QString sourceKey = QString::number(source);
+  if (settings.contains(sourceKey))
+    {
+    ti = trackFromSettings(settings, sourceKey, defaultTrackTemplate);
+    ti.Source = source;
+    return true;
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+QList<vvTrackInfo> vvTrackInfo::trackTypes()
+{
+  QSettings settings;
+  settings.beginGroup(settingsTypeRoot);
+
+  return tracksFromTemplate(settings, trackTemplates);
+}
+
+//-----------------------------------------------------------------------------
+QList<vvTrackInfo> vvTrackInfo::trackSources()
+{
+  QList<vvTrackInfo> tracks;
+
+  QSettings settings;
+  settings.beginGroup(settingsSourceRoot);
+
+  foreach (const QString& group, settings.childGroups())
+    {
+    bool isInt;
+    int source = group.toInt(&isInt);
+    if (isInt)
+      {
+      vvTrackInfo ti = trackFromSettings(settings, group, defaultTrackTemplate);
+      ti.Source = source;
+      tracks.append(ti);
+      }
+    }
+  return tracks;
+}
+
+//-----------------------------------------------------------------------------
+void vvTrackInfo::eraseTrackSource(int source)
+{
+  QSettings settings;
+  settings.beginGroup(settingsSourceRoot);
+  settings.remove(QString::number(source));
+}
diff --git a/Libraries/VvVtkWidgets/vvTrackInfo.h b/Libraries/VvVtkWidgets/vvTrackInfo.h
new file mode 100644
index 00000000..595a6e29
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvTrackInfo.h
@@ -0,0 +1,63 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvTrackInfo_h
+#define __vvTrackInfo_h
+
+#include <QString>
+#include <QList>
+
+#include <vgExport.h>
+
+#include <vtkVgTrack.h>
+
+#include <vgColor.h>
+
+struct VV_VTKWIDGETS_EXPORT vvTrackInfo
+{
+  vvTrackInfo();
+  explicit vvTrackInfo(vtkVgTrack::enumTrackPVOType);
+
+  /// Save track information to settings.
+  ///
+  /// This saves the track information held by this structure to the user's
+  /// configuration.
+  bool write() const;
+
+  int Source;
+  vtkVgTrack::enumTrackPVOType Type;
+  QString Name;
+  vgColor PenColor;
+  vgColor ForegroundColor;
+  vgColor BackgroundColor;
+
+public:
+  static bool getTrackType(vvTrackInfo& ti, vtkVgTrack::enumTrackPVOType type);
+  static bool getTrackSource(vvTrackInfo& ti, int source);
+
+  /// Read per-type track information from settings.
+  ///
+  /// This returns a list of vvTrackInfo structures describing possible track
+  /// classifications. The information is read from the user's configuration,
+  /// using a set of 'canned' default values.
+  static QList<vvTrackInfo> trackTypes();
+
+  /// Read per-source track information from settings.
+  ///
+  /// This returns a list of vvTrackInfo structures describing possible track
+  /// sources. The information is read from the user's configuration. There are
+  /// no default track sources; if the user has not configured any track
+  /// sources, this list will be empty.
+  static QList<vvTrackInfo> trackSources();
+
+  /// Remove a track source from settings.
+  ///
+  /// This erases the user configuration keys for the specified track source,
+  /// so that it is no longer returned by trackSources().
+  static void eraseTrackSource(int source);
+};
+
+#endif
diff --git a/Libraries/VvVtkWidgets/vvVideoPlayer.cxx b/Libraries/VvVtkWidgets/vvVideoPlayer.cxx
new file mode 100644
index 00000000..0191fb06
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoPlayer.cxx
@@ -0,0 +1,1303 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvVideoPlayer.h"
+#include "vvVideoPlayerPrivate.h"
+
+#include "ui_videoView.h"
+
+// C++ includes
+#include <limits>
+
+// Qt includes
+#include <QActionGroup>
+#include <QList>
+#include <QSettings>
+#include <QTimer>
+
+// Qt Extensions includes
+#include <qtDoubleInputDialog.h>
+#include <qtScopedValueChange.h>
+#include <qtUiState.h>
+#include <qtUtil.h>
+
+// visgui includes
+#include <vgCheckArg.h>
+
+#include <vgUnixTime.h>
+
+#include <vtkVgQtUtil.h>
+
+#include <vtkVgRendererUtils.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgGroupNode.h>
+#include <vtkVgInteractorStyleRubberBand2D.h>
+#include <vtkVgTrackRepresentationBase.h>
+#include <vtkVgVideoMetadata.h>
+#include <vtkVgVideoModel0.h>
+#include <vtkVgVideoNode.h>
+#include <vtkVgVideoRepresentation0.h>
+#include <vtkVgVideoProviderBase.h>
+#include <vtkVgVideoViewer.h>
+
+#include "vvVideoPlayerModel.h"
+
+// VTK includes
+#include <vtkActor.h>
+#include <vtkBoundingBox.h>
+#include <vtkCamera.h>
+#include <vtkLine.h>
+#include <vtkProperty.h>
+#include <vtkImageData.h>
+#include <vtkRenderer.h>
+#include <vtkRenderWindow.h>
+#include <vtkTimerLog.h>
+
+QTE_IMPLEMENT_D_FUNC(vvVideoPlayer)
+
+//-----------------------------------------------------------------------------
+vvVideoPlayerPrivate::vvVideoPlayerPrivate()
+  : IsExternal(false), AutoZoomEnabled(false), AllowPicking(false),
+    ResetView(1), HasUpdated(false), UpdatingFrameScrubber(false),
+    Seeking(false), UpdateIntervalMSec(100), PlaybackSpeed(1.0)
+{
+  this->TimeStamp.SetTime(1.0);
+  this->CurrentTime = 0.0;
+
+  this->FrameExtents[0] = this->FrameExtents[1] = 0.0;
+  this->FrameExtents[2] = this->FrameExtents[3] = 0.0;
+
+  this->CurrentExtents[0] = this->CurrentExtents[1] = 0.0;
+  this->CurrentExtents[2] = this->CurrentExtents[3] = 0.0;
+
+  this->CurrentCenter[0] = 0.0;
+  this->CurrentCenter[1] = 0.0;
+  this->CurrentCenter[2] = 0.0;
+
+  this->TimerLog = vtkSmartPointer<vtkTimerLog>::New();
+  this->PlayerInitTime = this->TimerLog->GetUniversalTime();
+}
+
+//-----------------------------------------------------------------------------
+vvVideoPlayerPrivate::~vvVideoPlayerPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvVideoPlayer::vvVideoPlayer(QWidget* parent, Qt::WindowFlags f)
+  : QWidget(parent, f), d_ptr(new vvVideoPlayerPrivate)
+{
+  this->construct();
+}
+
+//-----------------------------------------------------------------------------
+vvVideoPlayer::vvVideoPlayer(
+  vvVideoPlayerPrivate* d, QWidget* parent, Qt::WindowFlags f)
+  : QWidget(parent, f), d_ptr(d)
+{
+  this->construct();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::construct()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->Viewer = vtkSmartPointer<vtkVgVideoViewer>::New();
+
+  d->UI.setupUi(this);
+
+  QLabel* label = new QLabel(this);
+  label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+  d->UI.toolBar->insertWidget(d->UI.actionResetView, label);
+
+  // Disable everything and clear playback controls state until we have a video
+  this->setEnabled(false);
+  d->UI.actionPlay->setChecked(false);
+  d->UI.actionPause->setChecked(false);
+  d->UI.actionStop->setChecked(false);
+
+  QActionGroup* playbackGroup = new QActionGroup(this);
+  playbackGroup->addAction(d->UI.actionPlay);
+  playbackGroup->addAction(d->UI.actionPause);
+  playbackGroup->addAction(d->UI.actionStop);
+
+  connect(this, SIGNAL(videoPlaying(vtkVgNodeBase&)),
+          this, SLOT(onVideoPlaying()));
+  connect(this, SIGNAL(videoPaused(vtkVgNodeBase&)),
+          this, SLOT(onVideoPaused()));
+  connect(this, SIGNAL(videoStopped(vtkVgNodeBase&)),
+          this, SLOT(onVideoStopped()));
+
+  d->UiState.reset(new qtUiState);
+  d->UiState->setCurrentGroup("VideoPlayer");
+  d->UiState->mapChecked("ShowEventRegion", d->UI.actionShowRegion);
+  d->UiState->mapChecked("FollowEvent", d->UI.actionFollowEvent);
+  d->UiState->restore();
+
+  connect(d->UI.actionShowRegion, SIGNAL(toggled(bool)),
+          this, SLOT(setEventRegionVisible(bool)));
+
+  connect(d->UI.actionFollowEvent, SIGNAL(toggled(bool)),
+          this, SLOT(setEventFollowingEnabled(bool)));
+
+  connect(d->UI.actionIncreaseSpeed, SIGNAL(triggered(bool)) ,
+          this, SLOT(doubleThePlaybackSpeed()));
+  connect(d->UI.actionDecreaseSpeed, SIGNAL(triggered(bool)) ,
+          this, SLOT(reducePlaybackSpeedByHalf()));
+
+  this->updatePlaybackSpeedDisplay();
+}
+
+//-----------------------------------------------------------------------------
+vvVideoPlayer::~vvVideoPlayer()
+{
+  QTE_D(vvVideoPlayer);
+
+  if (!d->IsExternal)
+    {
+    d->UiState->save();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onExternalPlay(vtkVgVideoNode& videoNode, bool usingSelection)
+{
+  QTE_D(vvVideoPlayer);
+
+  if (&videoNode != d->CurrentVideoPicked)
+    {
+    // Stop the last video.
+    this->onActionStop();
+
+    // Create a video node and share video sources.
+    d->CurrentVideo = vtkVgVideoNode::SmartPtr::New();
+    d->CurrentVideoPicked = &videoNode;
+
+    if (d->UI.actionFollowEvent->isChecked())
+      {
+      // Block automatic update until we are done setting up the video; prevents
+      // flicker of video zoomed to extents rather than follow mode.
+      qtScopedBlockUpdates bu(this);
+      // Request zoom on next update, and disable panning.
+      d->AutoZoomEnabled = true;
+      this->setEventFollowingEnabled(true);
+      }
+
+    vtkVgVideoRepresentationBase0* videoRep =
+      this->buildVideoRepresentation(videoNode);
+
+    // Set current playback speed to the newly created model
+    if (vtkVgVideoModel0* newVideoModel = videoRep->GetVideoModel())
+      {
+      newVideoModel->SetPlaybackSpeed(d->PlaybackSpeed);
+      }
+
+    // Show events - reuse the original event model but create a new representation.
+    vtkVgEventModel* eventModel =
+      videoNode.GetVideoRepresentation()->GetVideoModel()->GetEventModel();
+
+    vtkVgEventRegionRepresentation* eventRep =
+      vtkVgEventRegionRepresentation::New();
+    eventRep->SetLineWidth(2.0f);
+
+    videoRep->GetVideoModel()->SetEventModel(eventModel);
+    eventRep->SetEventModel(eventModel);
+
+    videoRep->SetEventRepresentation(eventRep);
+
+    this->updateState(eventRep);
+
+    eventRep->FastDelete();
+
+    d->CurrentVideo->SetVideoRepresentation(videoRep);
+    videoRep->FastDelete();
+
+    d->Viewer->SetSceneRoot(d->CurrentVideo);
+
+    vtkVgVideoProviderBase* vs = videoRep->GetVideoModel()->GetVideoSource();
+    this->setupFrameScrubber(vs);
+
+    vtkVgVideoFrameData frameData;
+    vs->GetCurrentFrame(&frameData);
+    int* dim = frameData.VideoImage->GetDimensions();
+
+    d->FrameExtents[0] = 0.0;
+    d->FrameExtents[1] = dim[0] - 1.0;
+    d->FrameExtents[2] = 0.0;
+    d->FrameExtents[3] = dim[1] - 1.0;
+
+    this->updateCurrentTime();
+
+    d->ResetView = 1;
+    this->update();
+
+    // FIXME: Why do we need this?
+    if (usingSelection)
+      {
+      this->forceUpdateVideoRepresentation();
+      }
+    }
+
+  // Enable UI
+  this->setEnabled(true);
+  d->UI.actionPause->setEnabled(true);
+
+  // Synchronize state.
+  vtkVgVideoModel0* videoModel = this->currentPickedVideoModel();
+  videoModel->SetPlaybackSpeed(d->PlaybackSpeed);
+  if (videoModel->IsPlaying())
+    {
+    d->UI.actionPlay->setChecked(true);
+    emit this->videoPlaying(videoNode);
+    }
+  else if (videoModel->IsPaused())
+    {
+    d->UI.actionPause->setChecked(true);
+    emit this->videoPaused(videoNode);
+    }
+  else if (videoModel->IsStopped())
+    {
+    d->UI.actionStop->setChecked(true);
+    emit this->videoStopped(videoNode);
+    }
+
+  emit this->currentVideoChanged(d->CurrentVideoPicked);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onExternalPlay(vtkVgNodeBase& node)
+{
+  QTE_D(vvVideoPlayer);
+
+  vtkVgVideoNode* videoNode = vtkVgVideoNode::SafeDownCast(&node);
+  if (videoNode && videoNode != d->CurrentVideoPicked)
+    {
+    this->onExternalPlay(*videoNode, true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onExternalStop(vtkVgVideoNode& videoNode)
+{
+  QTE_D(vvVideoPlayer);
+
+  if (d->CurrentVideoPicked == &videoNode)
+    {
+    d->UI.actionStop->setChecked(true);
+    d->UI.actionPause->setEnabled(false);
+
+    if (d->CurrentVideoPicked->GetVideoRepresentation()
+        ->GetVideoModel()->IsStopped())
+      {
+      emit this->videoStopped(videoNode);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onExternalPause(vtkVgVideoNode& videoNode)
+{
+  QTE_D(vvVideoPlayer);
+
+  if (d->CurrentVideoPicked == &videoNode)
+    {
+    d->UI.actionPause->setChecked(true);
+
+    if (d->CurrentVideoPicked->GetVideoRepresentation()
+        ->GetVideoModel()->IsPaused())
+      {
+      emit this->videoPaused(videoNode);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onExternalSelect(const QList<vtkVgNodeBase*>& nodes)
+{
+  // Do nothing if the selection is empty or is multiple selection.
+  CHECK_ARG(nodes.count() == 1);
+
+  if (vtkVgVideoModel0* videoModel = this->currentPickedVideoModel())
+    {
+    if (videoModel->IsPlaying())
+      {
+      return;
+      }
+    }
+
+  QTE_D(vvVideoPlayer);
+
+  // Select only the last one.
+  vtkVgVideoNode* videoNode = vtkVgVideoNode::SafeDownCast(nodes[0]);
+  if (!videoNode)
+    {
+    return;
+    }
+
+  if (!videoNode->GetHasVideoData())
+    {
+    this->reset();
+    }
+  else if (videoNode != d->CurrentVideoPicked)
+    {
+    this->onExternalPlay(*videoNode, true);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onFrameAvailable()
+{
+  QTE_D(vvVideoPlayer);
+
+  CHECK_ARG(d->CurrentVideoPicked);
+  CHECK_ARG(d->CurrentVideo);
+
+  if (d->Seeking)
+    {
+    d->Seeking = false;
+    this->updateCurrentTime();
+    }
+
+  vtkVgVideoModel0* model =
+    d->CurrentVideoPicked->GetVideoRepresentation()->GetVideoModel();
+
+  (model->IsPlaying() ? emit this->videoPlaying(*d->CurrentVideoPicked) :
+   model->IsPaused() ? emit this->videoPaused(*d->CurrentVideo) :
+   qt_noop());
+
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoModel0* vvVideoPlayer::currentPickedVideoModel()
+{
+  QTE_D(vvVideoPlayer);
+
+  vtkVgVideoNode* node = d->CurrentVideoPicked;
+  return (node ? node->GetVideoRepresentation()->GetVideoModel() : 0);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onActionPlay()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->UI.actionPlay->setChecked(true);
+  d->UI.actionPause->setEnabled(true);
+
+  if (d->CurrentVideoPicked && !this->currentPickedVideoModel()->IsPlaying())
+    {
+    this->renderLoopOn();
+
+    this->currentPickedVideoModel()->PlayFromBeginningOff();
+    this->currentPickedVideoModel()->SetPlaybackSpeed(d->PlaybackSpeed);
+    this->currentPickedVideoModel()->Play();
+    emit this->videoPlaying(*d->CurrentVideoPicked);
+    emit this->played(*d->CurrentVideoPicked);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onActionPause()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->UI.actionPause->setChecked(true);
+
+  if (d->CurrentVideoPicked && !this->currentPickedVideoModel()->IsPaused())
+    {
+    this->currentPickedVideoModel()->Pause();
+    emit this->videoPaused(*d->CurrentVideoPicked);
+    }
+
+  this->renderLoopOff();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onActionStop()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->UI.actionStop->setChecked(true);
+  d->UI.actionPause->setEnabled(false);
+
+  if (d->CurrentVideoPicked && !this->currentPickedVideoModel()->IsStopped())
+    {
+    this->currentPickedVideoModel()->Stop();
+    this->seekTo(this->currentPickedVideoModel()->GetCurrentSeekTime());
+    emit this->stopped(*d->CurrentVideoPicked);
+    emit this->videoStopped(*d->CurrentVideoPicked);
+    }
+
+  if (d->CurrentVideo)
+    {
+    d->CurrentVideo->GetVideoRepresentation()->GetVideoModel()->Stop();
+    }
+
+  this->renderLoopOff();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onActionNext()
+{
+  QTE_D(vvVideoPlayer);
+
+  vtkVgVideoModel0::SmartPtr videoModel = this->currentPickedVideoModel();
+
+  if (videoModel)
+    {
+    if (videoModel->IsPlaying())
+      {
+      d->UI.actionPause->setChecked(true);
+      videoModel->Pause();
+      }
+
+    if (videoModel->IsPaused())
+      {
+      emit this->videoPaused(*d->CurrentVideoPicked);
+      }
+
+    videoModel->Next();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onActionPrev()
+{
+  QTE_D(vvVideoPlayer);
+
+  vtkVgVideoModel0::SmartPtr videoModel = this->currentPickedVideoModel();
+
+  if (videoModel)
+    {
+    if (videoModel->IsPlaying())
+      {
+      d->UI.actionPause->setChecked(true);
+      videoModel->Pause();
+      }
+
+    if (videoModel->IsPaused())
+      {
+      emit this->videoPaused(*d->CurrentVideoPicked);
+      }
+
+    videoModel->Previous();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::calculateExtentsScale(double* center, double maxX, double maxY,
+                                          double& scaleX, double& scaleY)
+{
+  // Default is fast path, meaning calculate extents based on a fast algorithm
+  // that mostly (99% times) going to perform well in all situations. This algorithm
+  // calculates the area overlap assuming that region should mostly be on the video
+  // clip.
+  bool fastPath = true;
+
+  // Default is 4.0
+  scaleX = 4.0;
+  scaleY = 4.0;
+
+  if (!center)
+    {
+    return;
+    }
+
+  int* extents;
+  extents = this->currentPickedVideoModel()->GetFrameData()->VideoImage->GetExtent();
+  double imageExtents[4] =
+    {
+    static_cast<double>(extents[0]),
+    static_cast<double>(extents[1]),
+    static_cast<double>(extents[2]),
+    static_cast<double>(extents[3])
+    };
+  double imageArea =
+    (imageExtents[1] - imageExtents[0]) * (imageExtents[3] - imageExtents[2]);
+
+  // Area of the region
+  double area = maxX * maxY;
+
+  if (!fastPath)
+    {
+    double aoiExtents[4];
+    aoiExtents[0] = center[0] - (maxX / 2.0);
+    aoiExtents[1] = center[0] + (maxX / 2.0) - 1.0;
+    aoiExtents[2] = center[1] - (maxY / 2.0);
+    aoiExtents[3] = center[1] + (maxY / 2.0) - 1.0;
+
+    double imageLines[4][6] =
+      {
+        { imageExtents[0], imageExtents[2], 0.0, imageExtents[1], imageExtents[2], 0.0 },
+        { imageExtents[0], imageExtents[2], 0.0, imageExtents[0], imageExtents[3], 0.0 },
+        { imageExtents[0], imageExtents[3], 0.0, imageExtents[1], imageExtents[3], 0.0 },
+        { imageExtents[1], imageExtents[2], 0.0, imageExtents[1], imageExtents[3], 0.0 }
+      };
+
+    double aoiLines[4][6] =
+      {
+        { aoiExtents[0], aoiExtents[2], 0.0, aoiExtents[1], aoiExtents[2], 0.0 },
+        { aoiExtents[0], aoiExtents[2], 0.0, aoiExtents[0], aoiExtents[3], 0.0 },
+        { aoiExtents[0], aoiExtents[3], 0.0, aoiExtents[1], aoiExtents[3], 0.0 },
+        { aoiExtents[1], aoiExtents[2], 0.0, aoiExtents[1], aoiExtents[3], 0.0 }
+      };
+
+    std::vector<std::pair<double, double> > intersectedPoints;
+
+    // First find all intersected points
+    for (int i = 0; i < 4; ++i)
+      {
+      for (int j = 0; j < 4; ++j)
+        {
+        double u, v;
+        if (vtkLine::Intersection(&imageLines[i][0], &imageLines[i][3],
+                                  &aoiLines[j][0], &aoiLines[j][3], u, v) == 2)
+          {
+          double point[2] =
+            {
+            imageLines[i][0] + (imageLines[i][3] - imageLines[i][0])* u,
+            imageLines[i][1] + (imageLines[i][4] - imageLines[i][1])* u
+            };
+
+          intersectedPoints.push_back(std::pair<double, double>(point[0], point[1]));
+          }
+        }
+      }
+
+    // Now check if points are contained within eacth other
+    vtkBoundingBox imageBB;
+    imageBB.SetBounds(imageExtents[0], imageExtents[1],
+                      imageExtents[2], imageExtents[3], 0.0, 0.0);
+
+    vtkBoundingBox aoiBB;
+    aoiBB.SetBounds(aoiExtents[0], aoiExtents[1], aoiExtents[2],
+                    aoiExtents[3], 0.0, 0.0);
+
+    // Points
+    double aoiPoints[4][3] =
+      {
+        { aoiExtents[0], aoiExtents[2], 0.0 },
+        { aoiExtents[1], aoiExtents[2], 0.0 },
+        { aoiExtents[1], aoiExtents[3], 0.0 },
+        { aoiExtents[0], aoiExtents[3], 0.0 },
+      };
+
+    double imagePoints[4][3] =
+      {
+        { imageExtents[0], imageExtents[2], 0.0 },
+        { imageExtents[1], imageExtents[2], 0.0 },
+        { imageExtents[1], imageExtents[3], 0.0 },
+        { imageExtents[0], imageExtents[3], 0.0 },
+      };
+
+    for (int i = 0; i < 4; ++i)
+      {
+      if (imageBB.ContainsPoint(&aoiPoints[i][0]))
+        {
+        intersectedPoints.push_back(
+          std::pair<double, double>(aoiPoints[i][0], aoiPoints[i][1]));
+        }
+      if (aoiBB.ContainsPoint(&imagePoints[i][0]))
+        {
+        intersectedPoints.push_back(
+          std::pair<double, double>(imagePoints[i][0], imagePoints[i][1]));
+        }
+      }
+
+    if (intersectedPoints.size() > 2)
+      {
+      // Find min and max points.
+      double min[2], max[2];
+      min[0] = max[0] = intersectedPoints[0].first;
+      min[1] = max[1] = intersectedPoints[0].second;
+
+      for (size_t i = 1; i < intersectedPoints.size(); ++i)
+        {
+        if (intersectedPoints[i].first < min[0])
+          {
+          min[0] = intersectedPoints[i].first;
+          }
+        if (intersectedPoints[i].second < min[1])
+          {
+          min[1] = intersectedPoints[i].second;
+          }
+        if (intersectedPoints[i].first > max[0])
+          {
+          max[0] = intersectedPoints[i].first;
+          }
+        if (intersectedPoints[i].second > max[1])
+          {
+          max[1] = intersectedPoints[i].second;
+          }
+        }
+
+      // Calculate overlapped area
+      area = (max[0] - min[0]) * (max[1] - min[1]);
+      }
+    }
+
+  double ratio = std::numeric_limits<double>::max();
+  if (area > 0.0 && imageArea > 0.0)
+    {
+    ratio = area / imageArea;
+    }
+
+  // Higher the ratio, lesser the zoom we desire.
+  if (ratio > 1.0)
+    {
+    scaleX = 1.0;
+    scaleY = scaleX;
+    }
+  else if (ratio > 0.1 && ratio <= 1.0)
+    {
+    double initialValue = 1.0;
+    double range = 1.0;
+
+    scaleX = initialValue + range * (1.0 - ratio);
+    scaleY = scaleX;
+    }
+  else
+    {
+    scaleX = 4.0;
+    scaleY = scaleX;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::renderLoopOn()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->UpdateTimer->start(d->UpdateIntervalMSec);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::renderLoopOff()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->UpdateTimer->stop();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onAreaOfInterest(double* center, double maxX, double maxY)
+{
+  QTE_D(vvVideoPlayer);
+
+  // Check if the incoming the region formed by center, maxX and maxY covers
+  // encloses most of the video space (hence mostly overlaps) if yes then do
+  // not scale region of interest.
+
+  double scaleX, scaleY;
+  this->calculateExtentsScale(center, maxX, maxY, scaleX, scaleY);
+
+  maxX *= scaleX;
+  maxY *= scaleY;
+
+  d->CurrentExtents[0] = center[0] - (maxX / 2.0);
+  d->CurrentExtents[1] = center[0] + (maxX / 2.0) - 1.0;
+  d->CurrentExtents[2] = center[1] - (maxY / 2.0);
+  d->CurrentExtents[3] = center[1] + (maxY / 2.0) - 1.0;
+
+  d->CurrentCenter[0] = center[0];
+  d->CurrentCenter[1] = center[1];
+  d->CurrentCenter[2] = center[2];
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::seekTo(double value)
+{
+  QTE_D(vvVideoPlayer);
+
+  if (d->UpdatingFrameScrubber || value == d->CurrentTime)
+    {
+    return;
+    }
+
+  vtkVgVideoModel0::SmartPtr videoModel = this->currentPickedVideoModel();
+
+  if (videoModel)
+    {
+    if (videoModel->IsPlaying())
+      {
+      videoModel->Pause();
+      emit this->videoPaused(*d->CurrentVideoPicked);
+      }
+
+    d->Seeking = true;
+    if (videoModel->SeekTo(value) == VTK_OK)
+      {
+      // The seek completed synchronously.
+      d->Seeking = false;
+      this->updateCurrentTime();
+      this->update();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::setEventRegionVisible(bool state)
+{
+  QTE_D(vvVideoPlayer);
+
+  if (d->CurrentVideo)
+    {
+    vtkVgVideoRepresentationBase0* videoRep =
+      d->CurrentVideo->GetVideoRepresentation();
+    if (videoRep)
+      {
+      vtkVgEventRepresentationBase* eventRep
+        = videoRep->GetEventRepresentation();
+      if (eventRep)
+        {
+        eventRep->SetVisible(state);
+        eventRep->Update();
+        this->update();
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::setEventFollowingEnabled(bool state)
+{
+  QTE_D(vvVideoPlayer);
+
+  vtkVgInteractorStyleRubberBand2D* style =
+    vtkVgInteractorStyleRubberBand2D::SafeDownCast(
+      d->UI.renderWidget->GetInteractor()->GetInteractorStyle());
+
+  if (!style)
+    {
+    return;
+    }
+
+  // Enable panning iff we are not following an event.
+  style->SetAllowPanning(!state);
+  d->AutoZoomEnabled = true;
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::initialize(bool allowPicking)
+{
+  QTE_D(vvVideoPlayer);
+
+  vtkVgInteractorStyleRubberBand2D* style = vtkVgInteractorStyleRubberBand2D::New();
+  d->UI.renderWidget->GetInteractor()->SetInteractorStyle(style);
+  style->SetRenderer(d->Viewer->GetSceneRenderer());
+  style->FastDelete();
+
+  d->Viewer->SetRenderWindowInteractor(
+    d->UI.renderWidget->GetInteractor());
+
+  d->UI.renderWidget->SetRenderWindow(d->Viewer->GetRenderWindow());
+
+  if (!d->UpdateTimer)
+    {
+    d->UpdateTimer.reset(new QTimer());
+    connect(d->UpdateTimer.data(), SIGNAL(timeout()),
+            this, SLOT(update()));
+    }
+
+  d->AllowPicking = allowPicking;
+
+  // rubberband zoom... and/or maybe picking (depending on AllowPicking flag)
+  vtkConnect(
+    d->UI.renderWidget->GetInteractor()->GetInteractorStyle(),
+    vtkVgInteractorStyleRubberBand2D::LeftClickEvent,
+    this, SLOT(onLeftButtonClicked()));
+
+  d->Viewer->Run();
+
+  connect(d->UI.actionPlay, SIGNAL(triggered()),
+          this, SLOT(onActionPlay()));
+  connect(d->UI.actionPause, SIGNAL(triggered()),
+          this, SLOT(onActionPause()));
+  connect(d->UI.actionStop, SIGNAL(triggered()),
+          this, SLOT(onActionStop()));
+  connect(d->UI.actionFramePrevious, SIGNAL(triggered()),
+          this, SLOT(onActionPrev()));
+  connect(d->UI.actionFrameNext, SIGNAL(triggered()),
+          this, SLOT(onActionNext()));
+
+  connect(this, SIGNAL(timeChanged(double)),
+          d->UI.frameScrubber, SLOT(setTime(double)));
+  connect(d->UI.frameScrubber, SIGNAL(timeChanged(double)),
+          this, SLOT(seekTo(double)));
+
+  // reset view
+  vtkConnect(style, vtkVgInteractorStyleRubberBand2D::KeyPressEvent_R,
+             this, SLOT(resetView()));
+  connect(d->UI.actionResetView, SIGNAL(triggered()),
+          this, SLOT(resetView()));
+
+  d->FrameExtents[0] = d->FrameExtents[1] =
+                         d->FrameExtents[2] = d->FrameExtents[3] = 0.0;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::reset()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->Viewer->SetSceneRoot(vtkVgGroupNode::SmartPtr::New());
+  d->UI.renderWidget->update();
+
+  d->CurrentVideoPicked = 0;
+  d->CurrentVideo = 0;
+  d->HasUpdated = false;
+
+  // Disable everything and clear playback controls state until we have a video
+  this->setEnabled(false);
+  d->UI.actionPlay->setChecked(false);
+  d->UI.actionPause->setChecked(false);
+  d->UI.actionStop->setChecked(false);
+  d->UI.frameScrubber->setTimeRange(0.0, 0.0);
+
+  emit this->currentVideoChanged(0);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::setPlaybackEnabled(bool state)
+{
+  QTE_D(vvVideoPlayer);
+
+  bool isStopped = d->UI.actionStop->isChecked();
+  d->UI.actionPlay->setEnabled(state);
+  d->UI.actionPause->setEnabled(state && !isStopped);
+  d->UI.actionStop->setEnabled(state);
+  d->UI.actionFramePrevious->setEnabled(state);
+  d->UI.actionFrameNext->setEnabled(state);
+  d->UI.frameScrubber->setEnabled(state);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::doubleThePlaybackSpeed()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->PlaybackSpeed *= 2.0;
+
+  d->PlaybackSpeed = (d->PlaybackSpeed > 4.0) ? 4.0 : d->PlaybackSpeed;
+
+  this->currentPickedVideoModel()->SetPlaybackSpeed(d->PlaybackSpeed);
+
+  this->updatePlaybackSpeedDisplay();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::reducePlaybackSpeedByHalf()
+{
+  QTE_D(vvVideoPlayer);
+
+  d->PlaybackSpeed *= 0.5;
+
+  d->PlaybackSpeed = (d->PlaybackSpeed < 0.25) ? 0.25 : d->PlaybackSpeed;
+
+  this->currentPickedVideoModel()->SetPlaybackSpeed(d->PlaybackSpeed);
+
+  this->updatePlaybackSpeedDisplay();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::resetView()
+{
+  QTE_D(vvVideoPlayer);
+
+  if (d->FrameExtents[0] == 0.0 && d->FrameExtents[1] == 0.0)
+    {
+    vtkVgVideoProviderBase* videoSource =
+      d->CurrentVideoPicked->GetVideoRepresentation()
+        ->GetVideoModel()->GetVideoSource();
+
+    vtkVgVideoFrameData frameData;
+    videoSource->GetCurrentFrame(&frameData);
+    int* dim = frameData.VideoImage->GetDimensions();
+
+    // Don't reset bounds if we haven't received a valid frame yet.
+    if (dim[0] == 0)
+      {
+      return;
+      }
+
+    d->FrameExtents[0] = 0.0;
+    d->FrameExtents[1] = dim[0] - 1.0;
+    d->FrameExtents[2] = 0.0;
+    d->FrameExtents[3] = dim[1] - 1.0;
+    }
+
+  vtkVgRendererUtils::ZoomToExtents2D(d->Viewer->GetSceneRenderer(),
+                                      d->FrameExtents);
+  this->update();
+  d->ResetView = 0;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::update()
+{
+  QTE_D(vvVideoPlayer);
+
+  if (this->updatesEnabled() && d->CurrentVideoPicked)
+    {
+    qtScopedBlockUpdates bu(this); // prevent recursively updates
+    this->updateFrame();
+    if (d->ResetView)
+      {
+      d->Viewer->ResetView();
+      this->resetView();
+      }
+    else
+      {
+      if (d->UI.actionFollowEvent->isChecked())
+        {
+        this->autoCenterUpdate();
+        }
+
+      d->Viewer->ForceRender(false);
+      }
+    this->onUpdate();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::updateFrame()
+{
+  QTE_D(vvVideoPlayer);
+
+  // Microseconds is what we are using
+  d->TimeStamp.SetTime(
+    1e6 * (d->TimerLog->GetUniversalTime() - d->PlayerInitTime));
+
+  d->Viewer->Frame(d->TimeStamp);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onVideoPlaying()
+{
+  QTE_D(vvVideoPlayer);
+  d->UI.actionPlay->setChecked(true);
+  d->UI.actionPause->setEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onVideoPaused()
+{
+  QTE_D(vvVideoPlayer);
+  d->UI.actionPause->setChecked(true);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onVideoStopped()
+{
+  QTE_D(vvVideoPlayer);
+  d->UI.actionStop->setChecked(true);
+  d->UI.actionPause->setEnabled(false);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onLeftButtonClicked()
+{
+  QTE_D(vvVideoPlayer);
+
+  CHECK_ARG(d->AllowPicking);
+  CHECK_ARG(d->CurrentVideo);
+
+  vtkRenderWindowInteractor* interactor =
+    d->Viewer->GetRenderWindow()->GetInteractor();
+
+  int x, y;
+  interactor->GetEventPosition(x, y);
+
+  // check for event pick
+  vtkVgEventRepresentationBase* eventRep =
+    d->CurrentVideo->GetVideoRepresentation()->GetEventRepresentation();
+
+  vtkIdType pickType;
+  const vtkIdType eventId =
+    eventRep->Pick(x, y, d->Viewer->GetSceneRenderer(), pickType);
+  if (eventId != -1)
+    {
+    emit this->pickedEvent(eventId);
+    return;
+    }
+
+  // check for track pick
+  vtkVgTrackRepresentationBase* trackRep =
+    d->CurrentVideo->GetVideoRepresentation()->GetTrackRepresentation();
+
+  const vtkIdType trackId =
+    trackRep->Pick(x, y, d->Viewer->GetSceneRenderer(), pickType);
+  if (trackId != -1)
+    {
+    emit this->pickedTrack(trackId);
+    return;
+    }
+}
+
+//-----------------------------------------------------------------------------
+// 99% copied from vqCore... which not in love with, but will do for now
+bool vvVideoPlayer::doRubberBandZoom()
+{
+  QTE_D(vvVideoPlayer);
+
+  vtkVgInteractorStyleRubberBand2D* style =
+    vtkVgInteractorStyleRubberBand2D::SafeDownCast(
+      d->UI.renderWidget->GetInteractor()->GetInteractorStyle());
+
+  int minRubberBand = 5;
+
+  int* startPosition = style->GetStartPosition();
+  int* endPosition =  style->GetEndPosition();
+  if (abs(startPosition[0] - endPosition[0]) < minRubberBand ||
+      abs(startPosition[1] - endPosition[1]) < minRubberBand)
+    {
+    return false;  // too small... assume NOT a rubberband zoom
+    }
+
+  vtkRenderer* renderer = d->Viewer->GetSceneRenderer();
+
+  int* size = renderer->GetSize();
+  double halfWidth = size[0] / 2.0;
+  double halfHeight = size[1] / 2.0;
+
+  double startWorldPosition[4], endWorldPosition[4];
+  renderer->SetViewPoint(
+    (startPosition[0] - halfWidth) / halfWidth,
+    (startPosition[1] - halfHeight) / halfHeight,
+    1);
+  renderer->ViewToWorld();
+  renderer->GetWorldPoint(startWorldPosition);
+
+  renderer->SetViewPoint(
+    (endPosition[0] - halfWidth) / halfWidth,
+    (endPosition[1] - halfHeight) / halfHeight,
+    1);
+  renderer->ViewToWorld();
+  renderer->GetWorldPoint(endWorldPosition);
+
+  double targetExtents[4] =
+    {
+    startWorldPosition[0] < endWorldPosition[0] ? startWorldPosition[0] : endWorldPosition[0],
+    startWorldPosition[0] > endWorldPosition[0] ? startWorldPosition[0] : endWorldPosition[0],
+    startWorldPosition[1] < endWorldPosition[1] ? startWorldPosition[1] : endWorldPosition[1],
+    startWorldPosition[1] > endWorldPosition[1] ? startWorldPosition[1] : endWorldPosition[1]
+    };
+
+  vtkVgRendererUtils::ZoomToExtents2D(renderer, targetExtents);
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::loadExternal(vtkVgVideoNode& videoNode)
+{
+  QTE_D(vvVideoPlayer);
+
+  d->IsExternal = true;
+
+  // When loading an external video do not give option to auto center
+  // and disable it if it is on and hide it.
+  d->UI.actionFollowEvent->setChecked(false);
+  d->UI.toolBar->removeAction(d->UI.actionFollowEvent);
+
+  // When loading an external video do not give option to enable / disable
+  // event region from the video player.
+  d->UI.actionShowRegion->setChecked(false);
+  d->UI.toolBar->removeAction(d->UI.actionShowRegion);
+  foreach (QAction* a, d->UI.toolBar->actions())
+    {
+    if (a->isSeparator())
+      {
+      d->UI.toolBar->removeAction(a);
+      delete a;
+      }
+    }
+  d->UI.toolBar->insertSeparator(d->UI.actionFramePrevious);
+
+  // Enable UI
+  this->setEnabled(true);
+  d->UI.actionStop->setChecked(true);
+  d->UI.actionPause->setEnabled(false);
+
+  d->CurrentVideo = &videoNode;
+  d->CurrentVideoPicked = d->CurrentVideo;
+
+  d->Viewer->SetSceneRoot(d->CurrentVideo);
+  d->Viewer->Frame(d->TimeStamp);
+
+  vtkVgVideoProviderBase* videoSource =
+    videoNode.GetVideoRepresentation()->GetVideoModel()->GetVideoSource();
+
+  this->setupFrameScrubber(videoSource);
+
+  this->updateCurrentTime();
+
+  // Render the first frame.
+  d->ResetView = 1;
+
+  vvVideoPlayerModel* vpm =
+    vvVideoPlayerModel::SafeDownCast(
+      videoNode.GetVideoRepresentation()->GetVideoModel());
+
+  // If the video source is asynchronous, post an initial update to it and wait
+  // for the first frame to become available before updating the player.
+  if (vpm && vpm->GetSharingSource())
+    {
+    d->UpdateTimer->stop();
+    vpm->GetVideoSource()->Update();
+    }
+  else
+    {
+    this->update();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::onUpdate()
+{
+  this->updateCurrentTime();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::setupFrameScrubber(vtkVgVideoProviderBase* vs)
+{
+  QTE_D(vvVideoPlayer);
+
+  double timeRange[2];
+  vs->GetTimeRange(timeRange);
+
+  qtScopedValueChange<bool> x(d->UpdatingFrameScrubber, true);
+  d->UI.frameScrubber->setTimeRange(timeRange[0], timeRange[1]);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::updateState(vtkVgEventRepresentationBase* eventRep)
+{
+  QTE_D(vvVideoPlayer);
+  if (eventRep)
+    {
+    eventRep->SetVisible(d->UI.actionShowRegion->isChecked());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::updatePlaybackSpeedDisplay()
+{
+  QTE_D(vvVideoPlayer);
+
+  QString speedStr;
+
+  if (!qFuzzyIsNull(d->PlaybackSpeed) && fabs(d->PlaybackSpeed) < 0.9)
+    {
+    const int frac = qRound(1.0 / fabs(d->PlaybackSpeed));
+    const char* sc = (d->PlaybackSpeed < 0.0 ? "-" : "");
+    speedStr = QString("%1<sup>1</sup>/<sub>%2</sub>x").arg(sc).arg(frac);
+    }
+  else
+    {
+    speedStr = QString("%1x").arg(d->PlaybackSpeed);
+    }
+
+  d->UI.playbackSpeedLabel->setText(speedStr);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::moveCameraTo(double pos[2])
+{
+  QTE_D(vvVideoPlayer);
+  vtkCamera* camera = d->Viewer->GetSceneRenderer()->GetActiveCamera();
+
+  double lastFocalPt[3], lastPos[3];
+  camera->GetFocalPoint(lastFocalPt);
+  camera->GetPosition(lastPos);
+
+  camera->SetFocalPoint(pos[0], pos[1], lastFocalPt[2]);
+  camera->SetPosition(pos[0], pos[1], lastPos[2]);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::autoCenterUpdate()
+{
+  QTE_D(vvVideoPlayer);
+
+  if (d->AutoZoomEnabled)
+    {
+    vtkVgRendererUtils::ZoomToExtents2D(d->Viewer->GetSceneRenderer(),
+                                        d->CurrentExtents);
+    d->AutoZoomEnabled = false;
+    }
+  else
+    {
+    vtkCamera* camera = d->Viewer->GetSceneRenderer()->GetActiveCamera();
+    double cameraCurrentPosition[3];
+    double cameraCurrentFocalPoint[3];
+    camera->GetPosition(cameraCurrentPosition);
+    camera->GetFocalPoint(cameraCurrentFocalPoint);
+    camera->SetFocalPoint(d->CurrentCenter[0], d->CurrentCenter[1],
+                          cameraCurrentFocalPoint[2]);
+    camera->SetPosition(d->CurrentCenter[0], d->CurrentCenter[1],
+                        cameraCurrentPosition[2]);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::updateCurrentTime()
+{
+  QTE_D(vvVideoPlayer);
+
+  vtkVgVideoModel0* videoModel =
+    d->CurrentVideoPicked->GetVideoRepresentation()->GetVideoModel();
+  vtkVgVideoProviderBase* videoSource = videoModel->GetVideoSource();
+
+  vtkVgVideoMetadata metadata;
+  const vtkVgVideoFrameData* frameData = videoModel->GetFrameData();
+
+  double prevTime = d->CurrentTime;
+  double currTime = frameData->TimeStamp.GetTime();
+
+  // update time display if necessary
+  if (!d->HasUpdated || currTime != prevTime)
+    {
+    d->HasUpdated = true;
+    d->CurrentTime = currTime;
+
+    d->UI.elapsedTime->setText(vgUnixTime(d->CurrentTime).timeString());
+
+    // Update frame number
+    if (videoSource &&
+        videoSource->GetCurrentMetadata(&metadata) == VTK_OK)
+      {
+      const QString frameNumberStr
+        = QString("( %1 )").arg(metadata.Time.GetFrameNumber());
+      d->UI.frameNumber->setText(frameNumberStr);
+      }
+
+    // update the frame scrubber
+    qtScopedValueChange<bool> x(d->UpdatingFrameScrubber, true);
+    emit this->timeChanged(d->CurrentTime);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vtkRenderWindowInteractor* vvVideoPlayer::interactor()
+{
+  QTE_D(vvVideoPlayer);
+  return d->UI.renderWidget->GetInteractor();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgVideoRepresentationBase0* vvVideoPlayer::buildVideoRepresentation(
+  vtkVgVideoNode& vtkNotUsed(videoNode))
+{
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayer::forceUpdateVideoRepresentation()
+{
+}
diff --git a/Libraries/VvVtkWidgets/vvVideoPlayer.h b/Libraries/VvVtkWidgets/vvVideoPlayer.h
new file mode 100644
index 00000000..bc293349
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoPlayer.h
@@ -0,0 +1,150 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvVideoPlayer_h
+#define __vvVideoPlayer_h
+
+#include <QWidget>
+
+#include <qtGlobal.h>
+
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+#include <vvQueryFormulation.h>
+
+#include "vtkVgTimeStamp.h"
+
+// Forward declarations.
+class QTimer;
+class QVTKWidget;
+
+class vtkRenderer;
+class vtkRenderWindowInteractor;
+
+class vtkVgEventRepresentationBase;
+class vtkVgNodeBase;
+class vtkVgVideoModel0;
+class vtkVgVideoNode;
+class vtkVgVideoRepresentationBase0;
+class vtkVgVideoProviderBase;
+
+class vtkVgVideoViewer;
+
+class vvVideoPlayerPrivate;
+
+class VV_VTKWIDGETS_EXPORT vvVideoPlayer : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit vvVideoPlayer(QWidget* parent = 0, Qt::WindowFlags f = 0);
+  virtual ~vvVideoPlayer();
+
+signals:
+  void videoPlaying(vtkVgNodeBase& videoNode);
+  void videoPaused(vtkVgNodeBase& videoNode);
+  void videoStopped(vtkVgNodeBase& videoNode);
+
+  void played(vtkVgVideoNode& videoNode);
+  void paused(vtkVgVideoNode& videoNode);
+  void stopped(vtkVgVideoNode& videoNode);
+
+  void pickedEvent(vtkIdType id);
+  void pickedTrack(vtkIdType id);
+
+  void timeChanged(double value);
+
+  void currentVideoChanged(vtkVgVideoNode* videoNode);
+
+public slots:
+  void onExternalPlay(vtkVgVideoNode& videoNode, bool usingSelection = false);
+  void onExternalPlay(vtkVgNodeBase& node);
+  void onExternalStop(vtkVgVideoNode& videoNode);
+  void onExternalPause(vtkVgVideoNode& videoNode);
+  void onExternalSelect(const QList<vtkVgNodeBase*>& nodes);
+
+  void onFrameAvailable();
+
+  void onActionPlay();
+  void onActionPause();
+  void onActionStop();
+  void onActionNext();
+  void onActionPrev();
+
+  void onAreaOfInterest(double* center, double maxX, double maxY);
+
+  void onVideoPlaying();
+  void onVideoPaused();
+  void onVideoStopped();
+
+  void onLeftButtonClicked();
+
+  void reset();
+
+  void resetView();
+
+  void seekTo(double value);
+
+  void setEventRegionVisible(bool);
+  void setEventFollowingEnabled(bool);
+  void setPlaybackEnabled(bool);
+
+  void doubleThePlaybackSpeed();
+  void reducePlaybackSpeedByHalf();
+
+public:
+  void initialize(bool allowPicking = false);
+  void update();
+
+  void loadExternal(vtkVgVideoNode& videoNode);
+
+  void moveCameraTo(double pos[2]);
+
+  void autoCenterUpdate();
+
+  vtkRenderWindowInteractor* interactor();
+
+protected:
+  virtual vtkVgVideoRepresentationBase0* buildVideoRepresentation(
+    vtkVgVideoNode& videoNode);
+
+  virtual void forceUpdateVideoRepresentation();
+  void calculateExtentsScale(double* center, double maxX, double maxY,
+                             double& scaleX, double& scaleY);
+
+  void renderLoopOn();
+  void renderLoopOff();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvVideoPlayer)
+
+  explicit vvVideoPlayer(vvVideoPlayerPrivate*,
+                         QWidget* parent = 0, Qt::WindowFlags f = 0);
+
+  void construct();
+
+  vtkVgVideoModel0* currentPickedVideoModel();
+
+  bool doRubberBandZoom();
+
+  void onUpdate();
+  void updateCurrentTime();
+
+  virtual void updateFrame();
+
+  void setupFrameScrubber(vtkVgVideoProviderBase* vs);
+
+  void updateState(vtkVgEventRepresentationBase* eventRep);
+
+  void updatePlaybackSpeedDisplay();
+
+private:
+  QTE_DECLARE_PRIVATE(vvVideoPlayer)
+};
+
+#endif // __vvVideoPlayer_h
diff --git a/Libraries/VvVtkWidgets/vvVideoPlayerModel.cxx b/Libraries/VvVtkWidgets/vvVideoPlayerModel.cxx
new file mode 100644
index 00000000..496f6714
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoPlayerModel.cxx
@@ -0,0 +1,80 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvVideoPlayerModel.h"
+
+// VG includes.
+#include "vtkVgTrackModel.h"
+#include "vtkVgEventModel.h"
+#include "vtkVgVideoProviderBase.h"
+
+// VTK includes.
+#include <vtkCommand.h>
+#include <vtkObjectFactory.h>
+#include <vtkMatrix4x4.h>
+
+vtkStandardNewMacro(vvVideoPlayerModel);
+
+//-----------------------------------------------------------------------------
+vvVideoPlayerModel::vvVideoPlayerModel() : QObject(), vtkVgVideoModel0(),
+  SharingSource(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvVideoPlayerModel::~vvVideoPlayerModel()
+{
+}
+
+//-----------------------------------------------------------------------------
+int vvVideoPlayerModel::Update(const vtkVgTimeStamp& timeStamp,
+                               const vtkVgTimeStamp* referenceFrameTimeStamp/*=0*/)
+{
+  int retVal = VTK_ERROR;
+
+  if (!this->SharingSource)
+    {
+    retVal = this->Superclass::Update(timeStamp, referenceFrameTimeStamp);
+    }
+  return retVal;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayerModel::OnFrameAvailable()
+{
+  this->UseSourceTimeStamp = true;
+
+  int retVal = this->VideoSource->GetCurrentFrame(this->VideoFrameData);
+
+  // Ignore the matrix.
+  this->VideoFrameData->VideoMatrix = 0;
+
+  if (retVal == VTK_OK)
+    {
+    this->UpdateDataRequestTime.Modified();
+
+    this->InvokeEvent(vtkCommand::UpdateDataEvent);
+
+    if (this->TrackModel)
+      {
+      this->TrackModel->Update(this->VideoFrameData->TimeStamp);
+      }
+
+    if (this->EventModel)
+      {
+      this->EventModel->Update(this->VideoFrameData->TimeStamp);
+      }
+
+    emit this->FrameAvailable();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoPlayerModel::PrintSelf(ostream& vtkNotUsed(os),
+                                   vtkIndent vtkNotUsed(indent))
+{
+  // \TODO: Implement this.
+}
diff --git a/Libraries/VvVtkWidgets/vvVideoPlayerModel.h b/Libraries/VvVtkWidgets/vvVideoPlayerModel.h
new file mode 100644
index 00000000..ea341e89
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoPlayerModel.h
@@ -0,0 +1,71 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvVideoPlayerModel_h
+#define __vvVideoPlayerModel_h
+
+// QT includes.
+#include <QObject>
+
+// VG includes.
+#include <vtkVgVideoModel0.h>
+
+// VTK includes.
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+class VV_VTKWIDGETS_EXPORT vvVideoPlayerModel
+  : public QObject, public vtkVgVideoModel0
+{
+  Q_OBJECT
+
+public:
+  vtkVgClassMacro(vvVideoPlayerModel);
+
+  // Description:
+  // Usual VTK functions.
+  vtkTypeMacro(vvVideoPlayerModel, vtkVgVideoModel0);
+
+  static vvVideoPlayerModel* New();
+
+  virtual void PrintSelf(ostream& os, vtkIndent indent);
+
+  // Description:
+  // Set/Get if this model is sharing a video source with other
+  // model. If yes how the data get fed to the model is different
+  // than when its not sharing.
+  vtkSetMacro(SharingSource, int);
+  vtkGetMacro(SharingSource, int);
+
+  // Description:
+  // Overridden functions.
+  virtual int Update(const vtkVgTimeStamp& timeStamp,
+                     const vtkVgTimeStamp* referenceFrameTimeStamp);
+  using Superclass::Update;
+
+signals:
+
+  void FrameAvailable();
+
+
+public slots:
+  void OnFrameAvailable();
+
+
+protected:
+  vvVideoPlayerModel();
+  virtual  ~vvVideoPlayerModel();
+
+  int       SharingSource;
+
+private:
+
+  vvVideoPlayerModel(const vvVideoPlayerModel&);
+  void operator=(const vvVideoPlayerModel&);
+};
+
+#endif // __vvVideoPlayerModel_h
diff --git a/Libraries/VvVtkWidgets/vvVideoPlayerPrivate.h b/Libraries/VvVtkWidgets/vvVideoPlayerPrivate.h
new file mode 100644
index 00000000..3ffde705
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoPlayerPrivate.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvVideoPlayerPrivate_h
+#define __vvVideoPlayerPrivate_h
+
+#include <QScopedPointer>
+
+#include <vtkSmartPointer.h>
+
+#include <vgExport.h>
+
+#include <vtkVgTimeStamp.h>
+
+#include "ui_videoView.h"
+
+class QTimer;
+
+class qtUiState;
+
+class vtkVgVideoNode;
+class vtkVgVideoViewer;
+
+class vtkTimerLog;
+
+class VV_VTKWIDGETS_EXPORT vvVideoPlayerPrivate
+{
+public:
+  vvVideoPlayerPrivate();
+  virtual ~vvVideoPlayerPrivate();
+
+  Ui::videoView UI;
+  QScopedPointer<qtUiState> UiState;
+
+  vtkSmartPointer<vtkVgVideoViewer> Viewer;
+  vtkSmartPointer<vtkVgVideoNode> CurrentVideo;
+  bool IsExternal;
+
+  vtkVgTimeStamp TimeStamp;
+  double CurrentTime;
+
+  bool AutoZoomEnabled;
+  bool AllowPicking;
+  int ResetView;
+
+  vtkSmartPointer<vtkVgVideoNode> CurrentVideoPicked;
+
+  double FrameExtents[4];
+  double CurrentExtents[4];
+  double CurrentCenter[3];
+
+  bool HasUpdated;
+  bool UpdatingFrameScrubber;
+  bool Seeking;
+
+  QScopedPointer<QTimer> UpdateTimer;
+  int UpdateIntervalMSec;
+
+  double PlaybackSpeed;
+
+  vtkSmartPointer<vtkTimerLog> TimerLog;
+  double PlayerInitTime;
+};
+
+#endif // __vvVideoPlayer_h
diff --git a/Libraries/VvVtkWidgets/vvVideoQueryDialog.cxx b/Libraries/VvVtkWidgets/vvVideoQueryDialog.cxx
new file mode 100644
index 00000000..d00e9127
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoQueryDialog.cxx
@@ -0,0 +1,1366 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvVideoQueryDialog.h"
+#include "vvVideoQueryDialogPrivate.h"
+#include "ui_videoQuery.h"
+
+#include <QDebug>
+#include <QLabel>
+#include <QMessageBox>
+#include <QProgressBar>
+#include <QSettings>
+
+// Qt Extensions includes
+#include <qtScopedValueChange.h>
+#include <qtStatusManager.h>
+#include <qtUtil.h>
+
+// visgui includes
+#include <vgFileDialog.h>
+#include <vgUnixTime.h>
+
+// VTK Extensions includes
+#include <vtkVgEvent.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgRegionWidget.h>
+
+#include "vvQueryVideoPlayer.h"
+#include "vvTrackInfo.h"
+
+QTE_IMPLEMENT_D_FUNC(vvVideoQueryDialog)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vtkVgQtVideoQueryDialogItemFactory
+
+//-----------------------------------------------------------------------------
+class vtkVgQtVideoQueryDialogItemFactory : public vvDescriptorInfoTreeItemFactory
+{
+protected:
+  QTE_DECLARE_PRIVATE_PTR(vvVideoQueryDialog)
+  friend class vvVideoQueryDialog;
+
+  vtkVgQtVideoQueryDialogItemFactory(vvVideoQueryDialogPrivate* d,
+                                     vvDescriptorInfoTree* tree);
+
+  virtual QTreeWidgetItem* createItem(qint64 id, const vvDescriptor&);
+  virtual QTreeWidgetItem* createGroupItem(int style);
+
+private:
+  QTE_DECLARE_PRIVATE(vvVideoQueryDialog)
+  QTE_DECLARE_PUBLIC(vvDescriptorInfoTree)
+};
+
+QTE_IMPLEMENT_ALIASED_D_FUNC(vtkVgQtVideoQueryDialogItemFactory,
+                             vvVideoQueryDialogPrivate)
+
+//-----------------------------------------------------------------------------
+vtkVgQtVideoQueryDialogItemFactory::vtkVgQtVideoQueryDialogItemFactory(
+  vvVideoQueryDialogPrivate* d, vvDescriptorInfoTree* tree)
+  : vvDescriptorInfoTreeItemFactory(tree), d_ptr(d)
+{
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vtkVgQtVideoQueryDialogItemFactory::createItem(
+  qint64 id, const vvDescriptor& descriptor)
+{
+  QTE_D(vvVideoQueryDialog);
+  QTE_Q(vvDescriptorInfoTree);
+
+  // Start with item created by base implementation
+  QTreeWidgetItem* item =
+    vvDescriptorInfoTreeItemFactory::createItem(id, descriptor);
+
+  // Add ID to name
+  item->setText(0, QString("%2 (D%1)").arg(id).arg(item->text(0)));
+
+  // Make checkable, if in an 'available' tree
+  if (d)
+    {
+    const bool visible =
+      d->Player->eventVisibility(static_cast<vtkIdType>(id));
+    const Qt::CheckState checkState = (visible ? Qt::Checked : Qt::Unchecked);
+    item->setCheckState(0, checkState);
+    item->setData(0, VisibilityRole, checkState);
+    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+
+    // Queue an event (so it runs after the item is added to the tree) to check
+    // if we must update the parent check state
+    d->scheduleParentVisibilityUpdate(item, checkState);
+    }
+
+  // Set availability state
+  if (d && d->SelectedDescriptors.contains(id))
+    vvVideoQueryDialogPrivate::setItemEnabled(item, false, q);
+
+  // Done
+  return item;
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vtkVgQtVideoQueryDialogItemFactory::createGroupItem(int style)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  // Start with item created by base implementation
+  QTreeWidgetItem* item =
+    vvDescriptorInfoTreeItemFactory::createGroupItem(style);
+
+  // Make checkable, if in an 'available' tree
+  if (d)
+    {
+    item->setCheckState(0, Qt::Checked);
+    item->setData(0, VisibilityRole, Qt::Checked);
+    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+    }
+
+  // Done
+  return item;
+}
+
+//END vtkVgQtVideoQueryDialogItemFactory
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvVideoQueryDialog public interface
+
+
+//-----------------------------------------------------------------------------
+vvVideoQueryDialog::vvVideoQueryDialog(
+  vvVideoQueryDialogPrivate* d, bool useAdvancedUi,
+  QWidget* parent, Qt::WindowFlags flags)
+  : vvAbstractSimilarityQueryDialog(parent, flags),
+    d_ptr(d)
+{
+  d->NewKeyframeId = 0;
+  d->UseAdvancedUi = useAdvancedUi;
+
+  // Set up UI
+  d->UI.setupUi(this);
+
+  // Add the video player to the dialog (must be created by a derived class)
+  QVBoxLayout* layout = new QVBoxLayout(d->UI.videoPlayerWidget);
+  layout->addWidget(d->Player);
+  layout->setMargin(0);
+
+  d->UI.trackDescriptors->setColumns(vvDescriptorInfoTree::All);
+  d->UI.regionDescriptors->setColumns(vvDescriptorInfoTree::Name, false);
+
+  // TODO: Figure out why we need to do this to get correct column headers
+  d->UI.selectedDescriptors->setColumns(vvDescriptorInfoTree::All, false);
+  d->UI.selectedDescriptors->setColumns(vvDescriptorInfoTree::Name |
+                                        vvDescriptorInfoTree::Source);
+
+  d->UI.trackDescriptors->header()->setSortIndicator(
+    NameColumn, Qt::AscendingOrder);
+  d->UI.regionDescriptors->header()->setSortIndicator(
+    TimeColumn, Qt::AscendingOrder);
+
+  d->UI.trackDescriptors->setItemFactory(
+    new vtkVgQtVideoQueryDialogItemFactory(d, d->UI.trackDescriptors));
+  d->UI.regionDescriptors->setItemFactory(
+    new vtkVgQtVideoQueryDialogItemFactory(d, d->UI.regionDescriptors));
+  d->UI.selectedDescriptors->setItemFactory(
+    new vtkVgQtVideoQueryDialogItemFactory(0, d->UI.selectedDescriptors));
+
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  // Set up status bar
+  d->StatusLabel = new QLabel;
+  d->StatusProgress = new QProgressBar;
+  d->StatusProgress->setMinimumWidth(170);
+  d->UI.statusbar->addWidget(d->StatusLabel, 1);
+  d->UI.statusbar->addWidget(d->StatusProgress);
+  d->StatusManager.addStatusLabel(d->StatusLabel);
+  d->StatusManager.addProgressBar(d->StatusProgress);
+
+  QSettings settings;
+
+  // Restore user options
+  if (useAdvancedUi)
+    {
+    QVariant group =
+      settings.value("GroupDescriptors", d->UI.groupByStyle->isChecked());
+    d->UI.groupByStyle->setChecked(group.toBool());
+    }
+  else
+    {
+    d->UI.groupByStyle->setVisible(false);
+    d->UI.useMetadata->setVisible(false);
+    d->UI.trackDescriptors->setHideGroupedItems(true);
+    d->UI.regionDescriptors->setHideGroupedItems(true);
+    d->UI.selectedDescriptors->setHideGroupedItems(true);
+    }
+
+  // Restore geometry
+  settings.beginGroup("Window/VideoQueryDialog");
+  this->restoreGeometry(settings.value("geometry").toByteArray());
+  d->UI.splitter->restoreState(settings.value("state").toByteArray());
+
+  // Connect query video selection controls
+  connect(d->UI.chooseVideo, SIGNAL(clicked()),
+          this, SLOT(chooseQueryVideo()));
+  connect(d->UI.reprocessVideo, SIGNAL(clicked()),
+          this, SLOT(reprocessQueryVideo()));
+
+  // Connect descriptor selection controls
+  connect(d->UI.moveToSelected, SIGNAL(clicked()),
+          this, SLOT(moveToSelected()));
+  connect(d->UI.moveToAvailable, SIGNAL(clicked()),
+          this, SLOT(moveToAvailable()));
+  connect(d->UI.clearSelected, SIGNAL(clicked()),
+          this, SLOT(clearSelected()));
+  connect(d->UI.selectedDescriptors, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateSelectionControlsState()));
+  connect(d->UI.selectionTabs, SIGNAL(currentChanged(int)),
+          this, SLOT(updateSelectionControlsState()));
+
+  // Connect entity visibility controls
+  connect(d->UI.showAll, SIGNAL(clicked()), this, SLOT(showAll()));
+  connect(d->UI.hideAll, SIGNAL(clicked()), this, SLOT(hideAll()));
+  connect(d->UI.hideAllDescriptors, SIGNAL(clicked()),
+          this, SLOT(hideAllDescriptors()));
+  connect(d->UI.trackDescriptors,
+          SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(itemVisibilityChanged(QTreeWidgetItem*, int)));
+  connect(d->UI.regionDescriptors,
+          SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(itemVisibilityChanged(QTreeWidgetItem*, int)));
+
+  // Connect track interval tab controls
+  connect(d->UI.trackDescriptors, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateSelectionControlsState()));
+  connect(d->UI.trackDescriptors, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateTrackConstraintControlsState()));
+  connect(d->UI.setStartTimeToCurrentFrame, SIGNAL(clicked()),
+          this, SLOT(setStartTimeConstraintToCurrentFrame()));
+  connect(d->UI.setEndTimeToCurrentFrame, SIGNAL(clicked()),
+          this, SLOT(setEndTimeConstraintToCurrentFrame()));
+  connect(d->UI.clearTimeConstraints, SIGNAL(clicked()),
+          this, SLOT(clearTimeConstraints()));
+
+  // Connect video region tab controls
+  connect(d->UI.regionDescriptors, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateSelectionControlsState()));
+  connect(d->UI.regionDescriptors, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateKeyframeControlsState()));
+  connect(d->UI.addKeyframe, SIGNAL(clicked()),
+          this, SLOT(addKeyframe()));
+  connect(d->UI.removeKeyframes, SIGNAL(clicked()),
+          this, SLOT(removeSelectedKeyframes()));
+  connect(d->UI.loadKeyframes, SIGNAL(clicked()),
+          this, SLOT(loadKeyframes()));
+  d->UI.saveKeyframes->setEnabled(false); // \TODO not implemented yet
+
+  // Connect to video player pick signals
+  connect(d->Player, SIGNAL(pickedEvent(vtkIdType)),
+          this, SLOT(selectDescriptor(vtkIdType)));
+  connect(d->Player, SIGNAL(pickedTrack(vtkIdType)),
+          this, SLOT(selectTrack(vtkIdType)));
+  connect(d->Player, SIGNAL(pickedKeyframe(vtkIdType)),
+          this, SLOT(selectKeyframe(vtkIdType)));
+
+  // Connect to descriptor tree pick (item double-clicked) signals
+  connect(d->UI.trackDescriptors,
+          SIGNAL(itemActivated(QTreeWidgetItem*, int)),
+          this, SLOT(selectItem(QTreeWidgetItem*, int)));
+  connect(d->UI.regionDescriptors,
+          SIGNAL(itemActivated(QTreeWidgetItem*, int)),
+          this, SLOT(selectItem(QTreeWidgetItem*, int)));
+  connect(d->UI.selectedDescriptors,
+          SIGNAL(itemActivated(QTreeWidgetItem*, int)),
+          this, SLOT(selectItem(QTreeWidgetItem*, int)));
+
+  // Disable controls until initialized
+  this->setSelectionControlsEnabled(false);
+
+  // Disallow accept with nothing selected
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+}
+
+//-----------------------------------------------------------------------------
+vvVideoQueryDialog::~vvVideoQueryDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::initialize(vgTimeStamp initialTime)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  foreach (vvTrackInfo ti, vvTrackInfo::trackTypes())
+    {
+    d->Player->setTrackTypeColor(ti.Type, ti.PenColor.toQColor());
+    }
+
+  d->Player->initialize(true);
+  d->InitialTime = initialTime;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vvDescriptor> vvVideoQueryDialog::selectedDescriptors() const
+{
+  QTE_D_CONST(vvVideoQueryDialog);
+
+  std::vector<vvDescriptor> selected;
+  QSet<vvTrackId> selectedTracks;
+
+  // Add selected descriptors and build list of tracks for which descriptors
+  // are selected
+  foreach (qint64 id, d->SelectedDescriptors)
+    {
+    const vvDescriptor& descriptor = d->Descriptors[id];
+    selected.push_back(descriptor);
+    size_t k = descriptor.TrackIds.size();
+    while (k--)
+      {
+      selectedTracks.insert(descriptor.TrackIds[k]);
+      }
+    }
+
+  if (d->UI.useMetadata->isChecked())
+    {
+    // Add matching metadata descriptors
+    foreach (const vvDescriptor& mdd, d->MetadataDescriptors)
+      {
+      if (mdd.TrackIds.empty())
+        {
+        // Trackless metadata descriptors are always considered matching
+        selected.push_back(mdd);
+        // Continue with next metadata descriptor
+        continue;
+        }
+      size_t k = mdd.TrackIds.size();
+      while (k--)
+        {
+        if (selectedTracks.contains(mdd.TrackIds[k]))
+          {
+          // Descriptor matches at least one track for which other descriptors
+          // were selected
+          selected.push_back(mdd);
+          // Continue with next metadata descriptor
+          break;
+          }
+        }
+      }
+    }
+
+  return selected;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::setSelectedDescriptors(
+  const std::vector<vvDescriptor>& descriptors)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  d->DeferredSelectedDescriptors = descriptors;
+}
+
+//-----------------------------------------------------------------------------
+std::vector<vvTrack> vvVideoQueryDialog::selectedTracks() const
+{
+  QTE_D_CONST(vvVideoQueryDialog);
+
+  std::vector<vvTrack> relevantTracks;
+  if (d->Tracks.empty())
+    {
+    return relevantTracks;
+    }
+
+  // build list of tracks for which descriptors are selected
+  QSet<vvTrackId> selectedTracks;
+  foreach (qint64 id, d->SelectedDescriptors)
+    {
+    const vvDescriptor& descriptor = d->Descriptors[id];
+    size_t k = descriptor.TrackIds.size();
+    while (k--)
+      {
+      selectedTracks.insert(descriptor.TrackIds[k]);
+      }
+    }
+
+  foreach (const vvTrack& track, d->Tracks)
+    {
+    if (selectedTracks.contains(track.Id))
+      {
+      relevantTracks.push_back(track);
+      }
+    }
+
+  return relevantTracks;
+}
+
+//-----------------------------------------------------------------------------
+int vvVideoQueryDialog::exec()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  // Wait for user to accept or cancel
+  int result = vvAbstractSimilarityQueryDialog::exec();
+
+  // Save user options
+  QSettings settings;
+
+  if (d->UseAdvancedUi)
+    {
+    settings.setValue("GroupDescriptors", d->UI.groupByStyle->isChecked());
+    }
+
+  // Save geometry
+  settings.beginGroup("Window/VideoQueryDialog");
+  settings.setValue("geometry", this->saveGeometry());
+  settings.setValue("state", d->UI.splitter->saveState());
+
+  // Done
+  return result;
+}
+
+//END vvVideoQueryDialog public interface
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvVideoQueryDialog query formulation handling
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::setQueryTracksAndDescriptors(
+  QList<vvDescriptor> descriptors, QList<vvTrack> tracks)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  // Extract metadata descriptors
+  d->MetadataDescriptors.clear();
+  QList<vvDescriptor>::iterator iter = descriptors.begin();
+  while (iter != descriptors.end())
+    {
+    if (vvVideoQueryDialogPrivate::isMetadataDescriptor(*iter))
+      {
+      d->MetadataDescriptors.append(*iter);
+      iter = descriptors.erase(iter);
+      continue;
+      }
+    ++iter;
+    }
+
+  d->Tracks = tracks;
+
+  // Update video player (only set tracks if non-empty)
+  if (!tracks.isEmpty())
+    {
+    d->Player->setTracks(tracks);
+    }
+  d->Player->setDescriptors(descriptors, !tracks.isEmpty());
+
+  // Create representation for selected events
+  d->SelectedEventRepresentation =
+    vtkSmartPointer<vtkVgEventRegionRepresentation>::New();
+
+  d->SelectedEventRepresentation->SetRegionZOffset(1.5);
+  d->SelectedEventRepresentation->SetDisplayMask(SelectedFlag);
+
+  d->Player->addEventRepresentation(d->SelectedEventRepresentation);
+
+  // Update internal descriptor map and assign to trees
+  // NOTE: For translating between these and the events in the video player,
+  //       we are basically relying on the video player to assign the events
+  //       ID's equal to their list index
+  d->Descriptors.clear();
+  for (int i = 0, k = descriptors.count(); i < k; ++i)
+    d->Descriptors.insert(i, descriptors[i]);
+  d->UI.trackDescriptors->setDescriptors(d->Descriptors);
+  d->UI.regionDescriptors->setDescriptors(d->Descriptors);
+  d->UI.selectedDescriptors->setDescriptors(d->Descriptors);
+
+  // Fill 'available' descriptor trees
+  this->fillTrackDescriptors();
+  this->fillRegionDescriptors();
+
+  // If we have deferred-selected descriptors, try to select them now
+  QList<qint64> selectIds;
+  size_t n = d->DeferredSelectedDescriptors.size();
+  while (n--)
+    {
+    const vvDescriptor& dd = d->DeferredSelectedDescriptors[n];
+    const vtkIdType id = d->Player->descriptorEventId(dd);
+    if (d->Descriptors.contains(id))
+      selectIds.append(id);
+    }
+  this->moveToSelected(selectIds);
+  d->DeferredSelectedDescriptors.clear();
+
+  // Now that the player's video has loaded (which doesn't happen until we
+  // provide it descriptors, which we did above), apply an initial seek, if one
+  // was requested
+  if (d->InitialTime.IsValid())
+    {
+    d->Player->seekTo(d->InitialTime.Time);
+
+    // Reset so we don't seek again if descriptors change
+    d->InitialTime = vgTimeStamp();
+    }
+
+  // Done; we now have descriptors, so let the user select them
+  this->setSelectionControlsEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::clearQueryDescriptors()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  d->Tracks.clear();
+  d->Player->setDescriptors(QList<vvDescriptor>(), false);
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+  this->setSelectionControlsEnabled(false);
+}
+
+
+//END vvVideoQueryDialog query formulation handling
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvVideoQueryDialog entity visibility
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::showAll()
+{
+  QTE_D(vvVideoQueryDialog);
+  d->setEntityVisibility(true);
+  d->Player->update();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::hideAll()
+{
+  QTE_D(vvVideoQueryDialog);
+  d->setEntityVisibility(false);
+  d->Player->update();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::hideAllDescriptors()
+{
+  QTE_D(vvVideoQueryDialog);
+  d->setEntityVisibility(false, TrackItem);
+  d->Player->update();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::updateItemParentVisibilities()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  typedef QHash<QTreeWidgetItem*, Qt::CheckState>::const_iterator Iterator;
+
+  QHash<QTreeWidgetItem*, Qt::CheckState> groupUpdates;
+
+  // Identify descriptor group items that need to be updates
+  foreach_iter (Iterator, iter, d->PendingVisibilityUpdates)
+    {
+    QTreeWidgetItem* parent = iter.key()->parent();
+    Q_ASSERT(parent);
+    if (vvDescriptorInfoTree::itemType(parent) == DescriptorStyleGroup)
+      groupUpdates.insert(parent, iter.value());
+    }
+  d->PendingVisibilityUpdates.clear();
+
+  // Update groups
+  foreach_iter (Iterator, iter, groupUpdates)
+    {
+    QTreeWidgetItem* group = iter.key();
+    qtScopedBlockSignals bs(group->treeWidget());
+
+    // Identify correct new check state
+    Qt::CheckState newCheckState = iter.value();
+    foreach_child (QTreeWidgetItem* child, group)
+      {
+      const Qt::CheckState ccs = child->checkState(0);
+      if (ccs != newCheckState)
+        {
+        newCheckState = Qt::PartiallyChecked;
+        break;
+        }
+      }
+
+    // Apply new check state
+    group->setCheckState(0, newCheckState);
+    group->setData(0, VisibilityRole, newCheckState);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::itemVisibilityChanged(
+  QTreeWidgetItem* item, int column)
+{
+  if (column != 0)
+    return;
+
+  // Check if the check state has changed, and bail otherwise
+  const Qt::CheckState checkState = item->checkState(0);
+  const QVariant visibilityData = item->data(0, VisibilityRole);
+  if (visibilityData.isValid() && visibilityData.toInt() == checkState)
+    return;
+
+  // Get ID, type and new visibility state
+  const vtkIdType id =
+    static_cast<vtkIdType>(vvDescriptorInfoTree::itemId(item));
+  const int type = vvDescriptorInfoTree::itemType(item);
+  const bool visibility = (checkState == Qt::Checked);
+
+  // Ignore keyframe items (they are not checkable)
+  if (type == KeyframeItem)
+    return;
+
+  QTE_D(vvVideoQueryDialog);
+
+  // If we got this far, the check state has been changed; update the
+  // visibility data...
+  item->setData(0, VisibilityRole, checkState);
+
+  // ...and entity visibility
+  if (type == TrackItem)
+    {
+    // Update track visibility
+    d->Player->setTrackVisibility(id, visibility);
+    }
+  else if (type == DescriptorItem)
+    {
+    // Update descriptor visibility
+    d->Player->setEventVisibility(id, visibility);
+
+    // Update parent check state (if parent is a style group)
+    d->scheduleParentVisibilityUpdate(item, checkState);
+
+    // Find other instances of this descriptor item and update them
+    qtScopedBlockSignals bst(d->UI.trackDescriptors);
+    qtScopedBlockSignals bsr(d->UI.regionDescriptors);
+    QList<QTreeWidgetItem*> peers;
+    peers.append(d->UI.trackDescriptors->descriptorItems(id));
+    peers.append(d->UI.regionDescriptors->descriptorItems(id));
+    foreach (QTreeWidgetItem* peer, peers)
+      {
+      peer->setCheckState(0, checkState);
+      peer->setData(0, VisibilityRole, checkState);
+      d->scheduleParentVisibilityUpdate(peer, checkState);
+      }
+    }
+
+  // Update check state of children
+  foreach_child (QTreeWidgetItem* child, item)
+    child->setCheckState(0, checkState);
+
+  d->Player->update();
+}
+
+//END vvVideoQueryDialog entity visibility
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvVideoQueryDialog user interface
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::setSelectionControlsEnabled(bool state)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  d->Player->setEnabled(state);
+  d->UI.selectionTabs->setEnabled(state);
+  d->UI.selectedGroup->setEnabled(state);
+  d->UI.chooseVideo->setEnabled(state);
+  d->UI.reprocessVideo->setEnabled(state);
+  this->updateSelectionControlsState();
+  this->updateTrackConstraintControlsState();
+  this->updateKeyframeControlsState();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::moveToSelected(QList<qint64> ids)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  if (ids.isEmpty())
+    return;
+
+  QTreeWidgetItem* item;
+  QList<qint64> newSelectedIds;
+  foreach (qint64 id, ids)
+    {
+    if (d->SelectedDescriptors.contains(id))
+      continue;
+
+    // Add newly selected descriptor
+    d->SelectedDescriptors.insert(id);
+    newSelectedIds.append(id);
+
+    // Show as selected in video player
+    d->setEventSelectionState(static_cast<vtkIdType>(id), true);
+
+    // Mark items in 'available' trees as selected
+    d->setDescriptorEnabled(id, false);
+    }
+
+  if (!newSelectedIds.isEmpty())
+    {
+    // Add newly selected descriptors to selected tree
+    d->UI.selectedDescriptors->addDescriptorItems(newSelectedIds);
+
+    // Resize columns to new contents
+    qtUtil::resizeColumnsToContents(d->UI.selectedDescriptors);
+    }
+
+  // Generate list of the newly added items
+  QList<QTreeWidgetItem*> newSelectedItems;
+  foreach (qint64 id, ids)
+    {
+    newSelectedItems.append(
+      d->UI.selectedDescriptors->descriptorItems(id));
+    }
+
+  // Update the item selection states so exactly the new items are selected
+  d->UI.selectedDescriptors->clearSelection();
+  foreach (item, newSelectedItems)
+    item->setSelected(true);
+
+  // Something is selected; allow accepting now
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::moveToSelected()
+{
+  QTE_D(vvVideoQueryDialog);
+  this->moveToSelected(d->selectedDescriptorIds());
+  d->Player->update();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::moveToAvailable()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  QList<qint64> selectedIds =
+    d->selectedDescriptorIds(d->UI.selectedDescriptors);
+
+  if (selectedIds.isEmpty())
+    return;
+
+  foreach (qint64 id, selectedIds)
+    {
+    // Remove from internal set and reset display in video player
+    d->SelectedDescriptors.remove(id);
+    d->setEventSelectionState(static_cast<vtkIdType>(id), false);
+
+    // Mark items as available for selection
+    d->setDescriptorEnabled(id, true);
+    }
+
+  // Update 'selected' tree
+  d->UI.selectedDescriptors->setDescriptorItems(
+    d->SelectedDescriptors.toList());
+
+  this->updateSelectionControlsState();
+
+  // Disallow selected unless something still selected
+  bool allowAccept = !d->SelectedDescriptors.isEmpty();
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(allowAccept);
+
+  d->Player->update();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::clearSelected()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  foreach (qint64 id, d->SelectedDescriptors)
+    {
+    // Reset display in video player and mark items as available for selection
+    d->setEventSelectionState(static_cast<vtkIdType>(id), false);
+    d->setDescriptorEnabled(id, true);
+    }
+
+  // Clear internal set and 'selected' tree
+  d->SelectedDescriptors.clear();
+  d->UI.selectedDescriptors->clear();
+
+  this->updateSelectionControlsState();
+
+  // Disallow accept with nothing selected
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+  d->Player->update();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::updateSelectionControlsState()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  QList<qint64> idsToSelect = d->selectedDescriptorIds();
+  QList<qint64>::iterator iter = idsToSelect.begin();
+  while (iter != idsToSelect.end())
+    {
+    if (d->SelectedDescriptors.contains(*iter))
+      iter = idsToSelect.erase(iter);
+    else
+      ++iter;
+    }
+
+  bool enableMoveToSelected = !idsToSelect.isEmpty();
+  bool enableMoveToAvailable =
+    !d->selectedDescriptorIds(d->UI.selectedDescriptors).isEmpty();
+  bool enableClearSelected = !d->SelectedDescriptors.isEmpty();
+
+  d->UI.moveToSelected->setEnabled(enableMoveToSelected);
+  d->UI.moveToAvailable->setEnabled(enableMoveToAvailable);
+  d->UI.clearSelected->setEnabled(enableClearSelected);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::updateTrackConstraintControlsState()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  QList<QTreeWidgetItem*> selectedItems =
+    d->UI.trackDescriptors->selectedItems();
+
+  bool enable = !selectedItems.isEmpty();
+  foreach (QTreeWidgetItem* item, selectedItems)
+    enable = enable && (vvDescriptorInfoTree::itemType(item) == TrackItem);
+
+  d->UI.setStartTimeToCurrentFrame->setEnabled(enable);
+  d->UI.setEndTimeToCurrentFrame->setEnabled(enable);
+  d->UI.clearTimeConstraints->setEnabled(enable);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::updateKeyframeControlsState()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  QList<QTreeWidgetItem*> selectedItems =
+    d->UI.regionDescriptors->selectedItems();
+
+  bool enableRemove = false;
+  foreach (QTreeWidgetItem* item, selectedItems)
+    {
+    const int type = vvDescriptorInfoTree::itemType(item);
+    enableRemove = enableRemove || (type == KeyframeItem);
+    }
+
+  d->UI.removeKeyframes->setEnabled(enableRemove);
+  // \TODO not implemented yet
+  // d->UI.saveKeyframes->setEnabled(!d->Keyframes.isEmpty());
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::setStartTimeConstraintToCurrentFrame()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  if (d->setTimeConstraint(StartTimeConstraintRole))
+    this->updateTrackMatchingDescriptors();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::setEndTimeConstraintToCurrentFrame()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  if (d->setTimeConstraint(EndTimeConstraintRole))
+    this->updateTrackMatchingDescriptors();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::clearTimeConstraints()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  bool rsc = d->setTimeConstraint(StartTimeConstraintRole, vgTimeStamp());
+  bool rec = d->setTimeConstraint(EndTimeConstraintRole, vgTimeStamp());
+  if (rsc || rec)
+    this->updateTrackMatchingDescriptors();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::addKeyframe()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  d->EditKeyframeId = d->NewKeyframeId;
+  d->EditKeyframeTime = d->Player->currentTimeStamp().GetRawTimeStamp();
+
+  // Check if we are replacing an existing keyframe
+  typedef QHash<vtkIdType, vgRegionKeyframe>::const_iterator Iterator;
+  foreach_iter (Iterator, iter, d->Keyframes)
+    {
+    // Compare time only; loaded keyframes might have frame number, but the
+    // timestamp we get from the video player doesn't, so we can't rely on
+    // vgTimeStamp::operator==
+    if (qFuzzyCompare(iter.value().Time.Time, d->EditKeyframeTime.Time))
+      {
+      d->EditKeyframeId = iter.key();
+      d->Player->setKeyframeVisibility(false);
+      break;
+      }
+    }
+
+  d->Player->setPlaybackEnabled(false);
+  d->Player->setCursor(Qt::CrossCursor);
+  d->createRegionWidget();
+  d->RegionWidget->begin();
+  connect(d->RegionWidget.data(), SIGNAL(beginningManipulation()),
+          this, SLOT(unsetKeyframeEditCursor()));
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::unsetKeyframeEditCursor()
+{
+  QTE_D(vvVideoQueryDialog);
+  d->Player->unsetCursor();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::finalizeKeyframeEdit()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  const vtkIdType kfid = d->EditKeyframeId;
+  bool isNewKeyframe = !d->Keyframes.contains(kfid);
+
+  // Add or update keyframe
+  QTreeWidgetItem* item;
+  vgRegionKeyframe& kf = d->Keyframes[kfid];
+  kf.Region = d->RegionWidget->rect();
+
+  // Convert from VTK coords
+  int vidHeight = d->Player->videoHeight();
+  int bottom = kf.Region.bottom();
+  kf.Region.setBottom(vidHeight - kf.Region.top() - 1);
+  kf.Region.setTop(vidHeight - bottom - 1);
+
+  if (isNewKeyframe)
+    {
+    kf.Time = d->EditKeyframeTime;
+    ++d->NewKeyframeId;
+    item = d->createKeyframeItem(kfid);
+    d->UI.regionDescriptors->addTopLevelItem(item);
+    }
+  else
+    {
+    item = d->UI.regionDescriptors->findItem(KeyframeItem, kfid);
+    Q_ASSERT(item);
+    vvVideoQueryDialogPrivate::updateKeyframeItem(item, kfid, kf);
+    }
+
+  // Update trees and video player, and recompute matches
+  d->Player->setKeyframes(d->Keyframes);
+  this->updateKeyframeMatchingDescriptors();
+  this->updateKeyframeControlsState();
+
+  // Turn off editing
+  this->cancelKeyframeEdit();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::cancelKeyframeEdit()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  d->RegionWidget.reset();
+  d->Player->unsetCursor();
+  d->Player->setKeyframeVisibility(true);
+  d->Player->setPlaybackEnabled(true);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::removeSelectedKeyframes()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  bool mustUpdate = false;
+
+  // Consider selected tree items
+  foreach (QTreeWidgetItem* item, d->UI.regionDescriptors->selectedItems())
+    {
+    // Is it a keyframe?
+    const int type = vvDescriptorInfoTree::itemType(item);
+    if (type == KeyframeItem)
+      {
+      const vtkIdType id =
+        static_cast<vtkIdType>(vvDescriptorInfoTree::itemId(item));
+      if (d->Keyframes.contains(id))
+        {
+        // Remove from tree and internal map
+        mustUpdate = true;
+        d->Keyframes.remove(id);
+        delete item;
+        }
+      }
+    }
+
+  // If removals were made, update video player and recompute matches
+  if (mustUpdate)
+    {
+    d->Keyframes.isEmpty() && (d->NewKeyframeId = 0);
+    d->Player->setKeyframes(d->Keyframes);
+    this->updateKeyframeMatchingDescriptors();
+    this->updateKeyframeControlsState();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::loadKeyframes()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  QString fileName = vgFileDialog::getOpenFileName(
+                       this, "Load keyframes...", QString(),
+                       "All Keyframe Files (*.vvk *.xml);;"
+                       "VisGUI Video region Keyframes (*.vvk);;"
+                       "Test Harness Query XML (*.xml);;"
+                       "All Files (*)");
+  if (fileName.isEmpty())
+    return;
+
+  QList<vgRegionKeyframe> newKeyframes =
+    vgRegionKeyframe::readFromFile(fileName);
+
+  // Resolve frame numbers to times, if we were given only frame numbers
+  int matchErrors = 0;
+  QList<vgRegionKeyframe>::iterator iter = newKeyframes.begin();
+  while (iter != newKeyframes.end())
+    {
+    if (!iter->Time.HasTime())
+      {
+      if (!d->Player->timeFromFrameNumber(iter->Time))
+        {
+        qDebug() << "Failed to find time for frame number"
+                 << iter->Time.FrameNumber;
+        ++matchErrors;
+        iter = newKeyframes.erase(iter);
+        continue;
+        }
+      }
+    ++iter;
+    }
+
+  if (matchErrors)
+    {
+    QString msg = (matchErrors > 1
+                   ? "%1 keyframes could not be matched to a video time"
+                     " and have been discarded."
+                   : "%1 keyframe could not be matched to a video time"
+                     " and has been discarded.");
+    QMessageBox::warning(this, "Errors occurred", msg.arg(matchErrors));
+    }
+
+  // Did we read anything successfully? (Check after dropping any frame numbers
+  // that could not be converted!)
+  if (newKeyframes.isEmpty())
+    return;
+
+  // Update keyframes
+  d->Keyframes.clear();
+  for (int i = 0, k = newKeyframes.count(); i < k; ++i)
+    d->Keyframes.insert(i, newKeyframes[i]);
+  d->Player->setKeyframes(d->Keyframes);
+  d->NewKeyframeId = d->Keyframes.count();
+
+  // Update tree
+  this->fillRegionDescriptors();
+}
+
+//END vvVideoQueryDialog user interface
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvVideoQueryDialog tree filling
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::fillTrackDescriptors()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  qtDelayTreeSorting ds(d->UI.trackDescriptors);
+
+  // Clear tree
+  d->UI.trackDescriptors->clear();
+
+  // Populate new tracks
+  QHash<vvTrackId, qint64> trackIdMap;
+  QHash<vvTrackId, QTreeWidgetItem*> trackItems;
+  foreach (vtkIdType tid, d->Player->trackIds())
+    {
+    const vvTrackId t = d->Player->trackId(tid);
+    const QString name("Track %1:%2");
+
+    QTreeWidgetItem* item = new QTreeWidgetItem;
+    item->setText(NameColumn, name.arg(t.Source).arg(t.SerialNumber));
+    item->setCheckState(0, Qt::Checked);
+    item->setData(0, VisibilityRole, Qt::Checked);
+    item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
+    vvDescriptorInfoTree::setItemType(item, TrackItem);
+    vvDescriptorInfoTree::setItemId(item, tid);
+
+    trackItems.insert(t, item);
+    trackIdMap.insert(t, tid);
+    }
+  d->UI.trackDescriptors->addTopLevelItems(trackItems.values());
+
+  // Check if we have descriptors with no associated track(s)
+  bool haveTracklessDescriptors = false;
+  foreach (const vvDescriptor& descriptor, d->Descriptors)
+    {
+    if (descriptor.TrackIds.size() == 0)
+      {
+      haveTracklessDescriptors = true;
+      break;
+      }
+    }
+
+  // Create parent for descriptors with no associated track(s), if needed
+  if (haveTracklessDescriptors)
+    {
+    QTreeWidgetItem* item = new QTreeWidgetItem;
+    item->setText(NameColumn, "(no track)");
+    vvDescriptorInfoTree::setItemType(item, TrackItem);
+    vvDescriptorInfoTree::setItemId(item, TracklessId);
+    d->UI.trackDescriptors->addTopLevelItem(item);
+    }
+
+  // Populate descriptors-by-track lists (don't apply time constraints yet)
+  d->DescriptorsByTrackId.clear();
+  typedef QHash<qint64, vvDescriptor>::const_iterator DescriptorIterator;
+  foreach_iter (DescriptorIterator, iter, d->Descriptors)
+    {
+    const std::vector<vvTrackId>& tracks = iter.value().TrackIds;
+    size_t n = tracks.size();
+    if (n)
+      {
+      while (n--)
+        {
+        qint64 id = trackIdMap.value(tracks[n], -1);
+        Q_ASSERT(id != -1);
+        d->DescriptorsByTrackId[id].insert(iter.key());
+        }
+      }
+    else
+      {
+      d->DescriptorsByTrackId[TracklessId].insert(iter.key());
+      }
+    }
+
+  // Fill matching descriptors
+  this->updateTrackMatchingDescriptors();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::fillRegionDescriptors()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  qtDelayTreeSorting ds(d->UI.regionDescriptors);
+
+  // Clear tree
+  d->UI.regionDescriptors->clear();
+
+  // Populate new keyframes
+  QList<QTreeWidgetItem*> newItems;
+  foreach (vtkIdType id, d->Keyframes.keys())
+    newItems.append(d->createKeyframeItem(id));
+  d->UI.regionDescriptors->addTopLevelItems(newItems);
+
+  // Fill matching descriptors
+  this->updateKeyframeMatchingDescriptors();
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::updateTrackMatchingDescriptors()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  // Populate track items, taking into account time constraints if set
+  typedef QHash<qint64, QSet<qint64> >::const_iterator Iterator;
+  foreach_iter (Iterator, titer, d->DescriptorsByTrackId)
+    {
+    // Get track item
+    QTreeWidgetItem* item =
+      d->UI.trackDescriptors->findItem(TrackItem, titer.key());
+    if (!item)
+      continue;
+
+    // Get associated descriptor list
+    QList<qint64> descriptorsForTrack = titer.value().toList();
+
+    // Get time constraints for track
+    vgTimeStamp sc = vvVideoQueryDialogPrivate::timeConstraint(
+                       item, StartTimeConstraintRole,
+                       vtkVgTimeStamp(false).GetRawTimeStamp());
+    vgTimeStamp ec = vvVideoQueryDialogPrivate::timeConstraint(
+                       item, EndTimeConstraintRole,
+                       vtkVgTimeStamp(true).GetRawTimeStamp());
+
+    // Remove items outside of any applied time constraints
+    QList<qint64>::iterator diter = descriptorsForTrack.begin();
+    while (diter != descriptorsForTrack.end())
+      {
+      const vvDescriptor& descriptor = d->Descriptors[*diter];
+      if (descriptor.Region.size())
+        {
+        const vgTimeStamp& st = descriptor.Region.begin()->TimeStamp;
+        const vgTimeStamp& et = descriptor.Region.rbegin()->TimeStamp;
+        if (et < sc || ec < st)
+          {
+          diter = descriptorsForTrack.erase(diter);
+          continue;
+          }
+        }
+      ++diter;
+      }
+
+    // Update descriptors for track
+    d->UI.trackDescriptors->setDescriptorItems(descriptorsForTrack, item);
+    }
+
+  // Resize columns to new contents
+  qtUtil::resizeColumnsToContents(d->UI.trackDescriptors);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::updateKeyframeMatchingDescriptors()
+{
+  QTE_D(vvVideoQueryDialog);
+
+  qtDelayTreeSorting ds(d->UI.regionDescriptors);
+  QTreeWidgetItem* item;
+
+  // Get matching descriptors
+  typedef QHash<vtkIdType, QSet<vtkIdType> > MatchMap;
+  MatchMap matchingDescriptorsByKeyframe = d->Player->regionEvents();
+
+  // Update keyframes
+  foreach (vtkIdType kfid, d->Keyframes.keys())
+    {
+    item = d->UI.regionDescriptors->findItem(KeyframeItem, kfid);
+
+    if (item)
+      {
+      QList<qint64> kfmd;
+      foreach (vtkIdType did, matchingDescriptorsByKeyframe.value(kfid))
+        kfmd.append(did);
+
+      d->UI.regionDescriptors->setDescriptorItems(kfmd, item);
+      item->setExpanded(!kfmd.isEmpty());
+      }
+    }
+
+  // Resize columns to new contents
+  qtUtil::resizeColumnsToContents(d->UI.regionDescriptors);
+}
+
+//END vvVideoQueryDialog tree filling
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvVideoQueryDialog selection helpers
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::selectTrack(vtkIdType id)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  if (d->currentAvailableTree() != d->UI.trackDescriptors)
+    return;
+
+  this->selectItem(d->UI.trackDescriptors, id, TrackItem);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::selectDescriptor(vtkIdType id)
+{
+  QTE_D(vvVideoQueryDialog);
+  this->selectItem(d->currentAvailableTree(), id, DescriptorItem);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::selectKeyframe(vtkIdType id)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  if (d->currentAvailableTree() != d->UI.regionDescriptors)
+    return;
+
+  this->selectItem(d->UI.regionDescriptors, id, KeyframeItem);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::selectItem(
+  vvDescriptorInfoTree* tree, vtkIdType id, int type)
+{
+  // Find the requested item
+  QTreeWidgetItem* item = tree->findItem(type, id);
+
+  // If we are in simplified UI mode, the item might be hidden, so...
+  while (item && item->isHidden())
+    {
+    // ...find the first ancestor that is not hidden
+    item = item->parent();
+    }
+
+  // Select the resulting item
+  item && (tree->setCurrentItem(item), false);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialog::selectItem(QTreeWidgetItem* item, int column)
+{
+  QTE_D(vvVideoQueryDialog);
+
+  // Abort keyframe editing before jumping
+  this->cancelKeyframeEdit();
+
+  // Determine jump direction
+  bool toEnd = (column == EndTimeColumn);
+  vvQueryVideoPlayer::JumpDirection direction =
+    (toEnd ? vvQueryVideoPlayer::JumpToEnd : vvQueryVideoPlayer::JumpToStart);
+
+  // Get ID of the item to which we will jump
+  const vtkIdType id =
+    static_cast<vtkIdType>(vvDescriptorInfoTree::itemId(item));
+
+  // Perform the jump, based on the item type
+  switch (vvDescriptorInfoTree::itemType(item))
+    {
+    case KeyframeItem:
+      d->Player->jumpToKeyframe(id);
+      (column == 1) && (d->editKeyframe(id), false);
+      break;
+    case TrackItem:
+      if (column == NameColumn || column == SourceColumn)
+        {
+        d->Player->jumpToTrack(id, direction);
+        }
+      else
+        {
+        int role = (toEnd ? EndTimeConstraintRole : StartTimeConstraintRole);
+        vgTimeStamp tc =
+          vvVideoQueryDialogPrivate::timeConstraint(item, role);
+        if (tc.IsValid())
+          d->Player->jumpToTrack(id, tc);
+        else
+          d->Player->jumpToTrack(id, direction);
+        }
+      break;
+    default:
+      d->Player->jumpToEvent(id, direction);
+      break;
+    }
+}
+
+//END vvVideoQueryDialog selection helpers
diff --git a/Libraries/VvVtkWidgets/vvVideoQueryDialog.h b/Libraries/VvVtkWidgets/vvVideoQueryDialog.h
new file mode 100644
index 00000000..49b36c1e
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoQueryDialog.h
@@ -0,0 +1,110 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvVideoQueryDialog_h
+#define __vvVideoQueryDialog_h
+
+#include <qtGlobal.h>
+
+#include <vtkType.h>
+
+#include <vgExport.h>
+
+#include <vvDescriptor.h>
+
+#include "vvAbstractSimilarityQueryDialog.h"
+
+class QTreeWidget;
+class QTreeWidgetItem;
+
+class qtStatusManager;
+
+class vvDescriptorInfoTree;
+
+class vtkVgTimeStamp;
+
+class vvQueryVideoPlayer;
+class vvVideoQueryDialogPrivate;
+
+class VV_VTKWIDGETS_EXPORT vvVideoQueryDialog
+  : public vvAbstractSimilarityQueryDialog
+{
+  Q_OBJECT
+
+public:
+  ~vvVideoQueryDialog();
+
+  void initialize(vgTimeStamp initialTime = vgTimeStamp());
+
+  virtual std::vector<vvTrack> selectedTracks() const;
+  virtual std::vector<vvDescriptor> selectedDescriptors() const;
+
+  virtual void setSelectedDescriptors(const std::vector<vvDescriptor>&);
+
+public slots:
+  virtual int exec();
+
+protected slots:
+  void setSelectionControlsEnabled(bool state);
+
+  virtual void chooseQueryVideo() {}
+  virtual void reprocessQueryVideo() {}
+
+  virtual void setQueryTracksAndDescriptors(
+    QList<vvDescriptor> descriptors, QList<vvTrack> tracks);
+  virtual void clearQueryDescriptors();
+
+  void moveToSelected();
+  void moveToAvailable();
+  void clearSelected();
+
+  void setStartTimeConstraintToCurrentFrame();
+  void setEndTimeConstraintToCurrentFrame();
+  void clearTimeConstraints();
+
+  void addKeyframe();
+  void removeSelectedKeyframes();
+  void loadKeyframes();
+  void unsetKeyframeEditCursor();
+  void finalizeKeyframeEdit();
+  void cancelKeyframeEdit();
+
+  void selectDescriptor(vtkIdType id);
+  void selectKeyframe(vtkIdType id);
+  void selectTrack(vtkIdType id);
+  void selectItem(vvDescriptorInfoTree* tree, vtkIdType id, int type);
+
+  void selectItem(QTreeWidgetItem* item, int column);
+
+  void showAll();
+  void hideAll();
+  void hideAllDescriptors();
+  void itemVisibilityChanged(QTreeWidgetItem* item, int column);
+  void updateItemParentVisibilities();
+
+  void updateSelectionControlsState();
+  void updateTrackConstraintControlsState();
+  void updateKeyframeControlsState();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvVideoQueryDialog)
+
+  vvVideoQueryDialog(vvVideoQueryDialogPrivate*, bool useAdvancedUi,
+                     QWidget* parent = 0, Qt::WindowFlags flags = 0);
+
+  void moveToSelected(QList<qint64> ids);
+
+  void fillTrackDescriptors();
+  void fillRegionDescriptors();
+
+  void updateTrackMatchingDescriptors();
+  void updateKeyframeMatchingDescriptors();
+
+private:
+  QTE_DECLARE_PRIVATE(vvVideoQueryDialog)
+};
+
+#endif
diff --git a/Libraries/VvVtkWidgets/vvVideoQueryDialogPrivate.cxx b/Libraries/VvVtkWidgets/vvVideoQueryDialogPrivate.cxx
new file mode 100644
index 00000000..a64b9cea
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoQueryDialogPrivate.cxx
@@ -0,0 +1,319 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvVideoQueryDialogPrivate.h"
+
+#include <vgUnixTime.h>
+
+Q_DECLARE_METATYPE(vgTimeStamp)
+
+//-----------------------------------------------------------------------------
+vvVideoQueryDialogPrivate::vvVideoQueryDialogPrivate(
+  vvVideoQueryDialog* q, vvQueryVideoPlayer* player)
+  : Player(player), q_ptr(q)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvVideoQueryDialogPrivate::~vvVideoQueryDialogPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoTree* vvVideoQueryDialogPrivate::currentAvailableTree() const
+{
+  switch (this->UI.selectionTabs->currentIndex())
+    {
+    case 1:
+      return this->UI.regionDescriptors;
+    default:
+      return this->UI.trackDescriptors;
+    }
+}
+
+//-----------------------------------------------------------------------------
+QList<qint64> vvVideoQueryDialogPrivate::selectedDescriptorIds(
+  vvDescriptorInfoTree* tree) const
+{
+  tree || (tree = this->currentAvailableTree());
+  return tree->descriptorIds(tree->selectedItems(), true);
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vvVideoQueryDialogPrivate::createKeyframeItem(
+  vtkIdType id) const
+{
+  if (!this->Keyframes.contains(id))
+    return 0;
+
+  QTreeWidgetItem* item = new QTreeWidgetItem;
+  vvDescriptorInfoTree::setItemId(item, id);
+  vvDescriptorInfoTree::setItemType(item, KeyframeItem);
+
+  this->updateKeyframeItem(item, id, this->Keyframes[id]);
+  return item;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::setEventSelectionState(
+  vtkIdType id, bool state)
+{
+  vtkVgEvent* event = this->Player->event(id);
+  if (event)
+    {
+    if (state)
+      {
+      event->SetDisplayFlags(SelectedFlag);
+      event->SetCustomColor(0.0, 1.0, 0.0);
+      event->UseCustomColorOn();
+      }
+    else
+      {
+      event->SetDisplayFlags(UnselectedFlag);
+      event->UseCustomColorOff();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::setDescriptorEnabled(qint64 id, bool state)
+{
+  QTreeWidgetItem* item;
+  foreach (item, this->UI.trackDescriptors->descriptorItems(id))
+    vvVideoQueryDialogPrivate::setItemEnabled(item, state);
+  foreach (item, this->UI.regionDescriptors->descriptorItems(id))
+    vvVideoQueryDialogPrivate::setItemEnabled(item, state);
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::setEntityVisibility(
+  bool visibility, int excludeType)
+{
+  QSet<vtkIdType> updatedEvents;
+
+  // Block signals while we change check states, so we aren't updating style
+  // group parents multiple times
+  qtScopedBlockSignals bs(this->UI.trackDescriptors);
+
+  // Loop over all tree items in both trees
+  this->setEntityVisibility(this->UI.trackDescriptors, visibility,
+                            excludeType, updatedEvents);
+  this->setEntityVisibility(this->UI.regionDescriptors, visibility,
+                            excludeType, updatedEvents);
+
+  // Obviously, not all descriptors will be in the region tree, but track time
+  // constraints mean they may not all be in the track tree either, so we must
+  // now also update all descriptors that aren't in either tree
+  foreach (qint64 did, this->Descriptors.keys())
+    {
+    vtkIdType id = static_cast<vtkIdType>(did);
+    if (!updatedEvents.contains(id))
+      this->Player->setEventVisibility(id, visibility);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::setEntityVisibility(
+  QTreeWidget* tree, bool visibility, int excludeType,
+  QSet<vtkIdType>& updatedEvents)
+{
+  const Qt::CheckState checkState =
+    (visibility ? Qt::Checked : Qt::Unchecked);
+
+  QTreeWidgetItemIterator iter(tree);
+  while (*iter)
+    {
+    if ((*iter)->checkState(0) != checkState)
+      {
+      // Get item ID and type
+      const vtkIdType id =
+        static_cast<vtkIdType>(vvDescriptorInfoTree::itemId(*iter));
+      const int type = vvDescriptorInfoTree::itemType(*iter);
+
+      if (type != excludeType)
+        {
+        // Update entity visibility
+        if (type == DescriptorItem)
+          {
+          // No need to do anything if we already updated this event
+          if (!updatedEvents.contains(id))
+            {
+            this->Player->setEventVisibility(id, visibility);
+            updatedEvents.insert(id);
+            }
+          }
+        else if (type == TrackItem)
+          {
+          this->Player->setTrackVisibility(id, visibility);
+          }
+
+        // Set item check state
+        (*iter)->setCheckState(0, checkState);
+        (*iter)->setData(0, VisibilityRole, checkState);
+        }
+      }
+
+    ++iter;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::scheduleParentVisibilityUpdate(
+  QTreeWidgetItem* item, Qt::CheckState hint)
+{
+  // Queue an event to handle delayed updates, if we haven't already done so
+  if (PendingVisibilityUpdates.isEmpty())
+    {
+    QTE_Q(vvVideoQueryDialog);
+    QMetaObject::invokeMethod(q, "updateItemParentVisibilities",
+                              Qt::QueuedConnection);
+    }
+
+  // Add update to pending updates list
+  this->PendingVisibilityUpdates.insert(item, hint);
+}
+
+//-----------------------------------------------------------------------------
+bool vvVideoQueryDialogPrivate::setTimeConstraint(int role)
+{
+  vgTimeStamp now = this->Player->currentTimeStamp().GetRawTimeStamp();
+  return this->setTimeConstraint(role, now);
+}
+
+//-----------------------------------------------------------------------------
+bool vvVideoQueryDialogPrivate::setTimeConstraint(
+  int role, vgTimeStamp newValue)
+{
+  bool result = false;
+  foreach (QTreeWidgetItem* item, this->UI.trackDescriptors->selectedItems())
+    {
+    if (vvDescriptorInfoTree::itemType(item) == TrackItem)
+      {
+      const vgTimeStamp oldValue =
+        vvVideoQueryDialogPrivate::timeConstraint(item, role);
+      if (oldValue != newValue)
+        {
+        result = true;
+        vvVideoQueryDialogPrivate::setTimeConstraint(item, role, newValue);
+        }
+      }
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::createRegionWidget()
+{
+  QTE_Q(vvVideoQueryDialog);
+
+  this->RegionWidget.reset(
+    new vtkVgRegionWidget(this->Player->interactor(), q));
+
+  q->connect(this->RegionWidget.data(), SIGNAL(completed()),
+             q, SLOT(finalizeKeyframeEdit()));
+  q->connect(this->RegionWidget.data(), SIGNAL(canceled()),
+             q, SLOT(cancelKeyframeEdit()));
+  q->connect(this->RegionWidget.data(),
+             SIGNAL(statusMessageAvailable(qtStatusSource, QString)),
+             &this->StatusManager,
+             SLOT(setStatusText(qtStatusSource, QString)));
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::editKeyframe(vtkIdType id)
+{
+  if (this->Keyframes.contains(id))
+    {
+    const vgRegionKeyframe& kf = this->Keyframes[id];
+    this->EditKeyframeId = id;
+
+    this->createRegionWidget();
+    this->Player->setKeyframeVisibility(false);
+    this->Player->setPlaybackEnabled(false);
+
+    // Convert to VTK coords
+    QRect r = kf.Region;
+    int vidHeight = this->Player->videoHeight();
+    int bottom = r.bottom();
+    r.setBottom(vidHeight - r.top() - 1);
+    r.setTop(vidHeight - bottom - 1);
+
+    this->RegionWidget->setRect(r);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::setItemEnabled(
+  QTreeWidgetItem* item, bool state, QTreeWidget* tree)
+{
+  QVariant brush;
+  if (!state)
+    {
+    tree || (tree = item->treeWidget());
+    QPalette palette(tree->palette());
+    brush = palette.brush(QPalette::Disabled, QPalette::WindowText);
+    }
+
+  for (int i = 0, k = item->columnCount(); i < k; ++i)
+    item->setData(i, Qt::ForegroundRole, brush);
+}
+
+//-----------------------------------------------------------------------------
+vgTimeStamp vvVideoQueryDialogPrivate::timeConstraint(
+  QTreeWidgetItem* item, int role, vgTimeStamp defaultValue)
+{
+  const QVariant data = item->data(0, role);
+  if (data.isValid() && data.canConvert<vgTimeStamp> ())
+    return data.value<vgTimeStamp>();
+  return defaultValue;
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::setTimeConstraint(
+  QTreeWidgetItem* item, int role, vgTimeStamp value)
+{
+  int column =
+    (role == StartTimeConstraintRole ? StartTimeColumn : EndTimeColumn);
+  if (value.IsValid())
+    {
+    item->setText(column, vgUnixTime(value.Time).timeString());
+    item->setData(0, role, QVariant::fromValue<vgTimeStamp>(value));
+    }
+  else
+    {
+    item->setText(column, QString());
+    item->setData(0, role, QVariant());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvVideoQueryDialogPrivate::updateKeyframeItem(
+  QTreeWidgetItem* item, vtkIdType id, const vgRegionKeyframe& keyframe)
+{
+  QString name = QString::fromUtf8("%1,%2 %3\xc3\x97%4");
+  QRect r = keyframe.Region;
+  item->setText(NameColumn, "keyframe-" + QString::number(id));
+  item->setText(RegionColumn, name.arg(r.left()).arg(r.top())
+                                  .arg(r.width()).arg(r.height()));
+  vgUnixTime time(keyframe.Time.Time);
+  item->setText(TimeColumn, time.timeString());
+}
+
+//-----------------------------------------------------------------------------
+bool vvVideoQueryDialogPrivate::isMetadataDescriptor(
+  const vvDescriptor& descriptor)
+{
+  const vvDescriptorStyle::Styles descriptorStyles =
+    vvDescriptorStyle::styles(descriptor);
+
+  // Check against descriptor style map, and also against name (in case style
+  // map is missing/wrong)
+  bool result =
+    descriptorStyles.testFlag(vvDescriptorStyle::Metadata) ||
+    descriptor.DescriptorName == "metadata";
+  return result;
+}
diff --git a/Libraries/VvVtkWidgets/vvVideoQueryDialogPrivate.h b/Libraries/VvVtkWidgets/vvVideoQueryDialogPrivate.h
new file mode 100644
index 00000000..5b374104
--- /dev/null
+++ b/Libraries/VvVtkWidgets/vvVideoQueryDialogPrivate.h
@@ -0,0 +1,159 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvVideoQueryDialog.h"
+#include "ui_videoQuery.h"
+
+#include <QDebug>
+#include <QLabel>
+#include <QMessageBox>
+#include <QProgressBar>
+#include <QSettings>
+
+// Qt Extensions includes
+#include <qtScopedValueChange.h>
+#include <qtStatusManager.h>
+#include <qtUtil.h>
+
+#include <vgExport.h>
+
+// visgui includes
+#include <vgFileDialog.h>
+
+// VTK Extensions includes
+#include <vtkVgEvent.h>
+#include <vtkVgEventRegionRepresentation.h>
+#include <vtkVgRegionWidget.h>
+
+#include <vvDescriptorInfoTree.h>
+
+#include "vvQueryVideoPlayer.h"
+
+namespace // anonymous
+{
+
+enum DisplayFlag
+{
+  UnselectedFlag = vvQueryVideoPlayer::EventFlag,
+  SelectedFlag = vvQueryVideoPlayer::UserFlag
+};
+
+enum ItemType
+{
+  DescriptorItem = vvDescriptorInfoTree::DescriptorItem,
+  DescriptorStyleGroup = vvDescriptorInfoTree::DescriptorStyleGroup,
+  TrackItem = vvDescriptorInfoTree::UserType,
+  KeyframeItem
+};
+
+enum DataRole
+{
+  StartTimeConstraintRole = vvDescriptorInfoTree::UserRole,
+  EndTimeConstraintRole,
+  VisibilityRole
+};
+
+enum TreeColumns
+{
+  // Common
+  NameColumn = 0,
+  // Descriptors by Track
+  SourceColumn = 1,
+  StartTimeColumn = 2,
+  EndTimeColumn = 3,
+  // Descriptors by Region
+  RegionColumn = 1,
+  TimeColumn = 2
+};
+
+enum
+{
+  TracklessId = -2  // avoiding -1 because it is reserved for don't match by id
+};
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class VV_VTKWIDGETS_EXPORT vvVideoQueryDialogPrivate
+{
+public:
+  vvVideoQueryDialogPrivate(vvVideoQueryDialog* q,
+                            vvQueryVideoPlayer* player);
+  ~vvVideoQueryDialogPrivate();
+
+  vvDescriptorInfoTree* currentAvailableTree() const;
+  QList<qint64> selectedDescriptorIds(vvDescriptorInfoTree* tree = 0) const;
+
+  QTreeWidgetItem* createKeyframeItem(vtkIdType id) const;
+
+  void setEventSelectionState(vtkIdType id, bool state);
+  void setDescriptorEnabled(qint64 id, bool state);
+
+  void setEntityVisibility(bool visibility, int excludeType = -1);
+
+  void scheduleParentVisibilityUpdate(QTreeWidgetItem* item,
+                                      Qt::CheckState hint);
+
+  bool setTimeConstraint(int role);
+  bool setTimeConstraint(int role, vgTimeStamp value);
+
+  void createRegionWidget();
+  void editKeyframe(vtkIdType id);
+
+  static void setItemEnabled(QTreeWidgetItem*, bool state,
+                             QTreeWidget* tree = 0);
+
+  static vgTimeStamp timeConstraint(QTreeWidgetItem*, int role,
+                                    vgTimeStamp defaultValue = vgTimeStamp());
+  static void setTimeConstraint(QTreeWidgetItem*, int role,
+                                vgTimeStamp value);
+
+  static void updateKeyframeItem(QTreeWidgetItem* item, vtkIdType id,
+                                 const vgRegionKeyframe& keyframe);
+
+  static bool isMetadataDescriptor(const vvDescriptor&);
+
+  Ui::VideoQueryDialog UI;
+
+  vvQueryVideoPlayer* Player;
+  vgTimeStamp InitialTime;
+
+  QLabel* StatusLabel;
+  QProgressBar* StatusProgress;
+  qtStatusSource StatusSource;
+  qtStatusManager StatusManager;
+
+  QScopedPointer<vtkVgRegionWidget> RegionWidget;
+  vtkIdType NewKeyframeId;
+  vtkIdType EditKeyframeId;
+  vgTimeStamp EditKeyframeTime;
+
+  QList<vvTrack> Tracks;
+
+  vtkSmartPointer<vtkVgEventRegionRepresentation> SelectedEventRepresentation;
+  QHash<qint64, vvDescriptor> Descriptors;
+  QList<vvDescriptor> MetadataDescriptors;
+
+  QHash<qint64, QSet<qint64> > DescriptorsByTrackId;
+  QHash<vtkIdType, vgRegionKeyframe> Keyframes;
+  QSet<qint64> SelectedDescriptors;
+
+  std::vector<vvDescriptor> DeferredSelectedDescriptors;
+
+  QHash<QTreeWidgetItem*, Qt::CheckState> PendingVisibilityUpdates;
+
+
+  bool UseAdvancedUi;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vvVideoQueryDialog)
+
+  void setEntityVisibility(QTreeWidget* tree, bool visibility, int excludeType,
+                           QSet<vtkIdType>& updatedEvents);
+
+private:
+  QTE_DECLARE_PUBLIC(vvVideoQueryDialog)
+};
diff --git a/Libraries/VvWidgets/CMakeLists.txt b/Libraries/VvWidgets/CMakeLists.txt
new file mode 100644
index 00000000..326a72d7
--- /dev/null
+++ b/Libraries/VvWidgets/CMakeLists.txt
@@ -0,0 +1,92 @@
+project(vvWidgets)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(vvWidgets_Sources
+  vvCustomQueryServerChooser.cxx
+  vvDescriptorInfoDialog.cxx
+  vvDescriptorInfoTree.cxx
+  vvDescriptorInfoWidget.cxx
+  vvDescriptorStyle.cxx
+  vvDescriptorStyleDelegate.cxx
+  vvDescriptorStyleDelegateBase.cxx
+  vvDescriptorStyleSetting.cxx
+  vvQueryInfoLabel.cxx
+  vvQueryServerDialog.cxx
+  vvScoreGradient.cxx
+  vvScoreGradientSetting.cxx
+  vvScoreGradientStopTree.cxx
+  vvScoreGradientWidget.cxx
+  vvTrackInfoDialog.cxx
+  vvTrackInfoWidget.cxx
+)
+
+set(vvWidgets_MocHeaders
+  vvAbstractQueryServerChooser.h
+  vvCustomQueryServerChooser.h
+  vvDescriptorInfoDialog.h
+  vvDescriptorInfoTree.h
+  vvDescriptorInfoWidget.h
+  vvDescriptorStyleDelegate.h
+  vvQueryInfoLabel.h
+  vvQueryServerDialog.h
+  vvScoreGradientStopTree.h
+  vvScoreGradientWidget.h
+  vvTrackInfoDialog.h
+  vvTrackInfoWidget.h
+)
+
+set(vvWidgets_UiFiles
+  vvCustomQueryServerChooser.ui
+  vvDescriptorInfoDialog.ui
+  vvDescriptorInfoWidget.ui
+  vvQueryServerDialog.ui
+  vvScoreGradientWidget.ui
+  vvTrackInfoDialog.ui
+  vvTrackInfoWidget.ui
+)
+
+set(vvWidgetsInstallHeaders
+  vvAbstractQueryServerChooser.h
+  vvDescriptorInfoDialog.h
+  vvDescriptorInfoTree.h
+  vvDescriptorInfoWidget.h
+  vvDescriptorStyleDelegate.h
+  vvDescriptorStyle.h
+  vvDescriptorStyleSetting.h
+  vvQueryInfoLabel.h
+  vvQueryServerDialog.h
+  vvScoreGradient.h
+  vvScoreGradientSetting.h
+  vvScoreGradientWidget.h
+  vvTrackInfoDialog.h
+  vvTrackInfoWidget.h
+)
+
+qt4_wrap_cpp(vvWidgets_MocSources ${vvWidgets_MocHeaders})
+qt4_wrap_ui(vvWidgets_UiSources ${vvWidgets_UiFiles})
+
+add_library(${PROJECT_NAME}
+  ${vvWidgets_Sources}
+  ${vvWidgets_MocSources}
+  ${vvWidgets_UiSources}
+)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vvIO
+  qtVgCommon
+  qtExtensions
+  LINK_LIBRARIES
+  LINK_PUBLIC
+  ${QT_LIBRARIES}
+)
+
+vg_add_test_subdirectory()
+
+install_library_targets(${PROJECT_NAME})
+install_headers(${vvWidgetsInstallHeaders} TARGET ${PROJECT_NAME}
+                DESTINATION include/VvWidgets)
diff --git a/Libraries/VvWidgets/Testing/CMakeLists.txt b/Libraries/VvWidgets/Testing/CMakeLists.txt
new file mode 100644
index 00000000..1f6f9f6c
--- /dev/null
+++ b/Libraries/VvWidgets/Testing/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(VGTEST_LINK_LIBRARIES vvWidgets vvIO qtExtensions ${QT_LIBRARIES})
+
+vg_add_test(testQueryInfoLabel INTERACTIVE
+  SOURCES TestQueryInfoLabel.cxx
+  RESOURCES ${CMAKE_SOURCE_DIR}/Icons/stdbutton.qrc
+)
+
+vg_add_test(testScoreGradientWidget INTERACTIVE
+  SOURCES TestScoreGradientWidget.cxx
+  RESOURCES ${CMAKE_SOURCE_DIR}/Icons/vvwidgets.qrc
+)
diff --git a/Libraries/VvWidgets/Testing/TestQueryInfoLabel.cxx b/Libraries/VvWidgets/Testing/TestQueryInfoLabel.cxx
new file mode 100644
index 00000000..6376d9f7
--- /dev/null
+++ b/Libraries/VvWidgets/Testing/TestQueryInfoLabel.cxx
@@ -0,0 +1,75 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QApplication>
+#include <QFileInfo>
+#include <QUrl>
+
+#include <vvHeader.h>
+#include <vvReader.h>
+
+#include "../vvQueryInfoLabel.h"
+
+//-----------------------------------------------------------------------------
+QString loadQuery(QString fileName, vvQueryInfoLabel& label)
+{
+  if (fileName.isEmpty())
+    {
+    return "No query file specified";
+    }
+
+  if (!QFileInfo(fileName).exists())
+    {
+    return "File not found";
+    }
+
+  vvReader reader;
+  if (!reader.open(QUrl::fromLocalFile(fileName)))
+    {
+    return reader.error();
+    }
+
+  vvHeader header;
+  if (!reader.readHeader(header))
+    {
+    return reader.error();
+    }
+
+  if (header.type != vvHeader::QueryPlan)
+    {
+    return "File does not contain a query plan";
+    }
+
+  vvQueryInstance query;
+  if (!reader.readQueryPlan(query))
+    {
+    return reader.error();
+    }
+
+  if (query.isSimilarityQuery())
+    {
+    label.setDescriptors(query.constSimilarityQuery()->Descriptors);
+    return "No descriptors";
+    }
+  return "File is a retrieval query";
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  // Set organization, so we can find the user's descriptor style map
+  app.setOrganizationName("Kitware");
+
+  vvQueryInfoLabel label;
+
+  QString error = loadQuery(app.arguments().value(1), label);
+  label.setErrorText(QString("(%1)").arg(error));
+
+  label.show();
+  return app.exec();
+}
diff --git a/Libraries/VvWidgets/Testing/TestScoreGradientWidget.cxx b/Libraries/VvWidgets/Testing/TestScoreGradientWidget.cxx
new file mode 100644
index 00000000..a7f5f619
--- /dev/null
+++ b/Libraries/VvWidgets/Testing/TestScoreGradientWidget.cxx
@@ -0,0 +1,20 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QApplication>
+
+#include "../vvScoreGradientWidget.h"
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  vvScoreGradientWidget widget;
+
+  widget.show();
+  return app.exec();
+}
diff --git a/Libraries/VvWidgets/vvAbstractQueryServerChooser.h b/Libraries/VvWidgets/vvAbstractQueryServerChooser.h
new file mode 100644
index 00000000..9d77c364
--- /dev/null
+++ b/Libraries/VvWidgets/vvAbstractQueryServerChooser.h
@@ -0,0 +1,35 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvAbstractQueryServerChooser_h
+#define __vvAbstractQueryServerChooser_h
+
+#include <QUrl>
+#include <QWidget>
+
+#include <vgExport.h>
+
+class VV_WIDGETS_EXPORT vvAbstractQueryServerChooser : public QWidget
+{
+  Q_OBJECT
+
+public:
+  vvAbstractQueryServerChooser(QWidget* parent = 0) : QWidget(parent) {}
+  virtual ~vvAbstractQueryServerChooser() {}
+
+  virtual QUrl uri() const = 0;
+
+signals:
+  void uriChanged(QUrl);
+
+public slots:
+  virtual void setUri(QUrl) = 0;
+
+private:
+  Q_DISABLE_COPY(vvAbstractQueryServerChooser)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvCustomQueryServerChooser.cxx b/Libraries/VvWidgets/vvCustomQueryServerChooser.cxx
new file mode 100644
index 00000000..5496c073
--- /dev/null
+++ b/Libraries/VvWidgets/vvCustomQueryServerChooser.cxx
@@ -0,0 +1,251 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvCustomQueryServerChooser.h"
+#include "ui_vvCustomQueryServerChooser.h"
+
+#include <qtScopedValueChange.h>
+#include <qtUtil.h>
+
+QTE_IMPLEMENT_D_FUNC(vvCustomQueryServerChooser)
+
+namespace { typedef QPair<QString, QString> QueryItem; }
+
+//-----------------------------------------------------------------------------
+class vvCustomQueryServerChooserPrivate
+{
+public:
+  vvCustomQueryServerChooserPrivate() : blockUpdates(false) {}
+
+  Ui::vvCustomQueryServerChooser UI;
+  bool blockUpdates;
+  QUrl uri;
+};
+
+//-----------------------------------------------------------------------------
+vvCustomQueryServerChooser::vvCustomQueryServerChooser(QWidget* parent)
+  : vvAbstractQueryServerChooser(parent),
+    d_ptr(new vvCustomQueryServerChooserPrivate)
+{
+  QTE_D(vvCustomQueryServerChooser);
+  d->UI.setupUi(this);
+
+  connect(d->UI.scheme, SIGNAL(editingFinished()),
+          this, SLOT(updateUri()));
+  connect(d->UI.authority, SIGNAL(editingFinished()),
+          this, SLOT(updateUri()));
+  connect(d->UI.path, SIGNAL(editingFinished()),
+          this, SLOT(updateUri()));
+
+  connect(d->UI.arguments, SIGNAL(itemSelectionChanged()),
+          this, SLOT(updateArgumentButtons()));
+  connect(d->UI.arguments, SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(updateUri()));
+
+  connect(d->UI.argumentsAdd, SIGNAL(clicked()),
+          this, SLOT(addArgument()));
+  connect(d->UI.argumentsRemove, SIGNAL(clicked()),
+          this, SLOT(removeArgument()));
+  connect(d->UI.argumentsMoveUp, SIGNAL(clicked()),
+          this, SLOT(moveArgumentUp()));
+  connect(d->UI.argumentsMoveDown, SIGNAL(clicked()),
+          this, SLOT(moveArgumentDown()));
+}
+
+//-----------------------------------------------------------------------------
+vvCustomQueryServerChooser::~vvCustomQueryServerChooser()
+{
+}
+
+//-----------------------------------------------------------------------------
+QUrl vvCustomQueryServerChooser::uri() const
+{
+  QTE_D_CONST(vvCustomQueryServerChooser);
+  return d->uri;
+}
+
+//-----------------------------------------------------------------------------
+void vvCustomQueryServerChooser::setUri(QUrl newUri)
+{
+  QTE_D(vvCustomQueryServerChooser);
+
+  // Block calls to updateUri() while we make changes to the UI
+  d->blockUpdates = true;
+
+  // Fill in UI fields
+  d->UI.scheme->setText(newUri.scheme());
+  d->UI.authority->setText(newUri.authority());
+  d->UI.path->setText(newUri.path());
+  d->UI.arguments->clear();
+  foreach (QueryItem qi, newUri.queryItems())
+    {
+    this->addArgument(qi.first, qi.second);
+    }
+
+  // Recalculate URI from UI fields
+  d->blockUpdates = false;
+  this->updateUri();
+}
+
+//-----------------------------------------------------------------------------
+void vvCustomQueryServerChooser::updateUri()
+{
+  QTE_D(vvCustomQueryServerChooser);
+
+  if (d->blockUpdates)
+    {
+    return;
+    }
+
+  qtScopedValueChange<bool> blockUpdates(d->blockUpdates, true);
+  QUrl newUri = d->uri;
+
+  // Validate and set scheme
+  QString newScheme = d->UI.scheme->text();
+  bool schemeIsValid = true;
+  for (int i = 0, k = newScheme.size(); i < k; ++i)
+    {
+    QChar c = newScheme[i];
+    if (c.unicode() > 127 || !c.isLetterOrNumber())
+      {
+      schemeIsValid = false;
+      break;
+      }
+    }
+  if (schemeIsValid)
+    {
+    newUri.setScheme(newScheme);
+    }
+  d->UI.scheme->setText(newUri.scheme());
+
+  // Validate and set authority
+  QString newAuthority = d->UI.authority->text();
+  newUri.setAuthority(newAuthority);
+  if (newUri.authority().isEmpty() && !newAuthority.isEmpty())
+    {
+    newUri.setAuthority(d->uri.authority());
+    }
+  d->UI.authority->setText(newUri.authority());
+
+  // Set path
+  QByteArray newPath = QUrl::toPercentEncoding(d->UI.path->text(), "/", "?");
+  newUri.setEncodedPath(newPath);
+  d->UI.path->setText(newUri.path());
+
+  // Set query items
+  QList<QueryItem> queryItems;
+  foreach_child (QTreeWidgetItem* item, d->UI.arguments->invisibleRootItem())
+    {
+    queryItems.append(QueryItem(item->text(0), item->text(1)));
+    }
+  newUri.setQueryItems(queryItems);
+
+  // Done
+  d->uri = newUri;
+  emit this->uriChanged(newUri);
+}
+
+//-----------------------------------------------------------------------------
+void vvCustomQueryServerChooser::setSelectedArgument(QTreeWidgetItem* item)
+{
+  QTE_D(vvCustomQueryServerChooser);
+  foreach (QTreeWidgetItem* sitem, d->UI.arguments->selectedItems())
+    {
+    sitem->setSelected(sitem == item);
+    }
+  item->setSelected(true);
+}
+
+//-----------------------------------------------------------------------------
+void vvCustomQueryServerChooser::addArgument(QString name, QString value)
+{
+  QTE_D(vvCustomQueryServerChooser);
+  QTreeWidgetItem* item = new QTreeWidgetItem;
+  item->setFlags(item->flags() | Qt::ItemIsEditable);
+  item->setText(1, value);
+  d->UI.arguments->addTopLevelItem(item);
+  if (name.isEmpty())
+    {
+    item->setText(0, "arg");
+    this->setSelectedArgument(item);
+    d->UI.arguments->editItem(item, 0);
+    }
+  else
+    {
+    item->setText(0, name);
+    }
+  this->updateArgumentButtons();
+}
+
+//-----------------------------------------------------------------------------
+void vvCustomQueryServerChooser::removeArgument()
+{
+  QTE_D(vvCustomQueryServerChooser);
+  foreach (QTreeWidgetItem* item, d->UI.arguments->selectedItems())
+    {
+    d->UI.arguments->invisibleRootItem()->removeChild(item);
+    }
+  this->updateUri();
+  this->updateArgumentButtons();
+}
+
+//-----------------------------------------------------------------------------
+void vvCustomQueryServerChooser::moveArgumentUp()
+{
+  QTE_D(vvCustomQueryServerChooser);
+  QTreeWidgetItem* item = d->UI.arguments->selectedItems().value(0, 0);
+  QTreeWidgetItem* root = d->UI.arguments->invisibleRootItem();
+
+  int i = root->indexOfChild(item);
+  if (item && i > 0)
+    {
+    item = root->takeChild(i);
+    root->insertChild(i - 1, item);
+    this->updateUri();
+    this->setSelectedArgument(item);
+    this->updateArgumentButtons();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvCustomQueryServerChooser::moveArgumentDown()
+{
+  QTE_D(vvCustomQueryServerChooser);
+  QTreeWidgetItem* item = d->UI.arguments->selectedItems().value(0, 0);
+  QTreeWidgetItem* root = d->UI.arguments->invisibleRootItem();
+
+  int i = root->indexOfChild(item);
+  if (item && i >= 0)
+    {
+    item = root->takeChild(i);
+    root->insertChild(i + 1, item);
+    this->updateUri();
+    this->setSelectedArgument(item);
+    this->updateArgumentButtons();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvCustomQueryServerChooser::updateArgumentButtons()
+{
+  QTE_D(vvCustomQueryServerChooser);
+  QTreeWidget* tree = d->UI.arguments;
+  QList<QTreeWidgetItem*> selection = tree->selectedItems();
+
+  bool enableRemove = !selection.isEmpty();
+  bool enableMoveUp = !selection.isEmpty();
+  bool enableMoveDown = !selection.isEmpty();
+  if (!selection.isEmpty())
+    {
+    int k = tree->topLevelItemCount() - 1;
+    enableMoveUp = !tree->isItemSelected(tree->topLevelItem(0));
+    enableMoveDown = !tree->isItemSelected(tree->topLevelItem(k));
+    }
+
+  d->UI.argumentsRemove->setEnabled(enableRemove);
+  d->UI.argumentsMoveUp->setEnabled(enableMoveUp);
+  d->UI.argumentsMoveDown->setEnabled(enableMoveDown);
+}
diff --git a/Libraries/VvWidgets/vvCustomQueryServerChooser.h b/Libraries/VvWidgets/vvCustomQueryServerChooser.h
new file mode 100644
index 00000000..3564e6fc
--- /dev/null
+++ b/Libraries/VvWidgets/vvCustomQueryServerChooser.h
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvCustomQueryServerChooser_h
+#define __vvCustomQueryServerChooser_h
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include "vvAbstractQueryServerChooser.h"
+
+class QTreeWidgetItem;
+
+class vvCustomQueryServerChooserPrivate;
+
+class VV_WIDGETS_EXPORT vvCustomQueryServerChooser
+  : public vvAbstractQueryServerChooser
+{
+  Q_OBJECT
+
+public:
+  vvCustomQueryServerChooser(QWidget* parent = 0);
+  virtual ~vvCustomQueryServerChooser();
+
+  virtual QUrl uri() const;
+  virtual void setUri(QUrl);
+
+protected slots:
+  void updateUri();
+  void addArgument(QString name = QString(), QString value = QString());
+  void removeArgument();
+  void moveArgumentUp();
+  void moveArgumentDown();
+  void updateArgumentButtons();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvCustomQueryServerChooser)
+
+  void setSelectedArgument(QTreeWidgetItem*);
+
+private:
+  QTE_DECLARE_PRIVATE(vvCustomQueryServerChooser)
+  Q_DISABLE_COPY(vvCustomQueryServerChooser)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvCustomQueryServerChooser.ui b/Libraries/VvWidgets/vvCustomQueryServerChooser.ui
new file mode 100644
index 00000000..fff5bbf9
--- /dev/null
+++ b/Libraries/VvWidgets/vvCustomQueryServerChooser.ui
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vvCustomQueryServerChooser</class>
+ <widget class="QWidget" name="vvCustomQueryServerChooser">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>194</height>
+   </rect>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="schemeLabel">
+     <property name="text">
+      <string>Scheme:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <layout class="QHBoxLayout" name="serverLayout">
+     <item>
+      <widget class="QLineEdit" name="scheme">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>1</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="authorityLabel">
+       <property name="text">
+        <string>Authority:</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="authority">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>3</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="pathLabel">
+     <property name="text">
+      <string>Path:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLineEdit" name="path"/>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="argumentsLabel">
+     <property name="text">
+      <string>Arguments:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <layout class="QGridLayout" name="argumentsLayout">
+     <item row="0" column="0" rowspan="5">
+      <widget class="QTreeWidget" name="arguments">
+       <property name="alternatingRowColors">
+        <bool>true</bool>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="uniformRowHeights">
+        <bool>true</bool>
+       </property>
+       <property name="allColumnsShowFocus">
+        <bool>true</bool>
+       </property>
+       <column>
+        <property name="text">
+         <string>Name</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Value</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QToolButton" name="argumentsMoveUp">
+       <property name="icon">
+        <iconset resource="../../Icons/vvwidgets.qrc">
+         <normaloff>:/icons/16x16/arrow-up</normaloff>:/icons/16x16/arrow-up</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QToolButton" name="argumentsMoveDown">
+       <property name="icon">
+        <iconset resource="../../Icons/vvwidgets.qrc">
+         <normaloff>:/icons/16x16/arrow-down</normaloff>:/icons/16x16/arrow-down</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <spacer name="argumentsSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="3" column="1">
+      <widget class="QToolButton" name="argumentsAdd">
+       <property name="icon">
+        <iconset resource="../../Icons/vvwidgets.qrc">
+         <normaloff>:/icons/16x16/add</normaloff>:/icons/16x16/add</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <widget class="QToolButton" name="argumentsRemove">
+       <property name="icon">
+        <iconset resource="../../Icons/vvwidgets.qrc">
+         <normaloff>:/icons/16x16/delete</normaloff>:/icons/16x16/delete</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../Icons/vvwidgets.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Libraries/VvWidgets/vvDescriptorInfoDialog.cxx b/Libraries/VvWidgets/vvDescriptorInfoDialog.cxx
new file mode 100644
index 00000000..bd66c14f
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorInfoDialog.cxx
@@ -0,0 +1,133 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvDescriptorInfoDialog.h"
+#include "ui_vvDescriptorInfoDialog.h"
+
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vgCheckArg.h>
+
+QTE_IMPLEMENT_D_FUNC(vvDescriptorInfoDialog)
+
+//-----------------------------------------------------------------------------
+class vvDescriptorInfoDialogPrivate
+{
+public:
+  Ui::vvDescriptorInfoDialog UI;
+  QHash<qint64, vvDescriptor> descriptors;
+};
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoDialog::vvDescriptorInfoDialog(
+  QWidget* parent, Qt::WindowFlags f) :
+  QDialog(parent, f),
+  d_ptr(new vvDescriptorInfoDialogPrivate)
+{
+  QTE_D(vvDescriptorInfoDialog);
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  connect(d->UI.toggleDetails, SIGNAL(toggled(bool)),
+          this, SLOT(toggleDetails(bool)));
+  connect(d->UI.descriptorTree,
+          SIGNAL(descriptorSelectionChanged(QList<vvDescriptor>)),
+          this, SLOT(showDetails(QList<vvDescriptor>)));
+
+  d->UI.detailsPane->setVisible(d->UI.toggleDetails->isChecked());
+  this->showDetails(QList<vvDescriptor>());
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoDialog::~vvDescriptorInfoDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+QList<vvDescriptor> vvDescriptorInfoDialog::descriptors() const
+{
+  QTE_D_CONST(vvDescriptorInfoDialog);
+  return d->descriptors.values();
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoDialog::setDescriptors(
+  QList<vvDescriptor> newDescriptors)
+{
+  QTE_D(vvDescriptorInfoDialog);
+
+  d->descriptors.clear();
+
+  QList<qint64> ids;
+  qint64 n = 0;
+  for (int i = 0, k = newDescriptors.count(); i < k; ++i)
+    {
+    d->descriptors.insert(n, newDescriptors[i]);
+    ids.append(n);
+    ++n;
+    }
+
+  d->UI.descriptorTree->clear();
+  d->UI.descriptorTree->setDescriptors(d->descriptors);
+  d->UI.descriptorTree->addDescriptorItems(ids);
+  qtUtil::resizeColumnsToContents(d->UI.descriptorTree);
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoDialog::setDescriptors(std::vector<vvDescriptor> v)
+{
+  this->setDescriptors(qtList(v));
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoDialog::clearDescriptors()
+{
+  this->setDescriptors(QList<vvDescriptor>());
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoDialog::showDetails(QList<vvDescriptor> descriptors)
+{
+  QTE_D(vvDescriptorInfoDialog);
+
+  if (descriptors.isEmpty())
+    {
+    d->UI.detailsPane->setCurrentWidget(d->UI.detailsMessage);
+    d->UI.detailsSummary->setText("No descriptor selected");
+    }
+  else if (descriptors.count() > 1)
+    {
+    d->UI.detailsPane->setCurrentWidget(d->UI.detailsMessage);
+    d->UI.detailsSummary->setText("Multiple descriptors selected");
+    }
+  else
+    {
+    d->UI.detailsPane->setCurrentWidget(d->UI.descriptorDetails);
+    d->UI.descriptorDetails->setDescriptor(descriptors.first());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoDialog::toggleDetails(bool detailsVisible)
+{
+  QTE_D(vvDescriptorInfoDialog);
+  CHECK_ARG(d->UI.detailsPane->isVisible() != detailsVisible);
+
+  QSize newSize = this->size();
+  QSize detailsSize = d->UI.descriptorDetails->size();
+  if (detailsVisible)
+    {
+    d->UI.detailsPane->setVisible(true);
+    newSize.setHeight(newSize.height() + detailsSize.height());
+    }
+  else
+    {
+    newSize.setHeight(newSize.height() - detailsSize.height());
+    d->UI.detailsPane->setVisible(false);
+    }
+  this->resize(newSize);
+}
diff --git a/Libraries/VvWidgets/vvDescriptorInfoDialog.h b/Libraries/VvWidgets/vvDescriptorInfoDialog.h
new file mode 100644
index 00000000..0c330e35
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorInfoDialog.h
@@ -0,0 +1,47 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvDescriptorInfoDialog_h
+#define __vvDescriptorInfoDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvDescriptor.h>
+
+class vvDescriptorInfoDialogPrivate;
+
+class VV_WIDGETS_EXPORT vvDescriptorInfoDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit vvDescriptorInfoDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
+  virtual ~vvDescriptorInfoDialog();
+
+  QList<vvDescriptor> descriptors() const;
+
+public slots:
+  void setDescriptors(QList<vvDescriptor>);
+  void setDescriptors(std::vector<vvDescriptor>);
+  void clearDescriptors();
+
+protected slots:
+  void toggleDetails(bool);
+  void showDetails(QList<vvDescriptor>);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvDescriptorInfoDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vvDescriptorInfoDialog)
+  Q_DISABLE_COPY(vvDescriptorInfoDialog)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvDescriptorInfoDialog.ui b/Libraries/VvWidgets/vvDescriptorInfoDialog.ui
new file mode 100644
index 00000000..5d308884
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorInfoDialog.ui
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vvDescriptorInfoDialog</class>
+ <widget class="QDialog" name="vvDescriptorInfoDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>273</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Descriptors</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="vvDescriptorInfoTree" name="descriptorTree">
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="qtExpander" name="toggleDetails">
+     <property name="text">
+      <string>Details</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QStackedWidget" name="detailsPane">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="vvDescriptorInfoWidget" name="descriptorDetails">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+     <widget class="QWidget" name="detailsMessage">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="detailsSummary">
+         <property name="text">
+          <string>Notice</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="detailsNote">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="text">
+          <string>Select a descriptor to view detailed descriptor information.</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtExpander</class>
+   <extends>QToolButton</extends>
+   <header location="global">qtExpander.h</header>
+  </customwidget>
+  <customwidget>
+   <class>vvDescriptorInfoWidget</class>
+   <extends>QTabWidget</extends>
+   <header>vvDescriptorInfoWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vvDescriptorInfoTree</class>
+   <extends>QTreeWidget</extends>
+   <header>vvDescriptorInfoTree.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>clicked(QAbstractButton*)</signal>
+   <receiver>vvDescriptorInfoDialog</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>
+ </connections>
+</ui>
diff --git a/Libraries/VvWidgets/vvDescriptorInfoTree.cxx b/Libraries/VvWidgets/vvDescriptorInfoTree.cxx
new file mode 100644
index 00000000..629a2dc1
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorInfoTree.cxx
@@ -0,0 +1,736 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvDescriptorInfoTree.h"
+
+#include <QRegExp>
+
+#include <qtScopedValueChange.h>
+#include <qtStlUtil.h>
+
+#include <vgUnixTime.h>
+
+Q_DECLARE_METATYPE(QList<qint64>)
+
+QTE_IMPLEMENT_D_FUNC(vvDescriptorInfoTree)
+
+//BEGIN vvDescriptorInfoTreePrivate
+
+//-----------------------------------------------------------------------------
+class vvDescriptorInfoTreePrivate
+{
+public:
+  vvDescriptorInfoTreePrivate(vvDescriptorInfoTree* q);
+
+  static void reapChildren(QTreeWidgetItem* item,
+                           QTreeWidgetItem* parent = 0);
+
+  static QList<qint64> childDescriptors(const QTreeWidgetItem* item);
+  static void setChildDescriptors(QTreeWidgetItem* item,
+                                  const QVariant& newData);
+
+  void setHeaderLabels();
+
+  void repopulateDescriptors(QTreeWidgetItem* root = 0);
+  void addDescriptorItems(QList<qint64>, QTreeWidgetItem* parent);
+
+  QScopedPointer<vvDescriptorInfoTreeItemFactory> itemFactory;
+
+  vvDescriptorInfoTree::Columns columns;
+  QHash<qint64, vvDescriptor> descriptors;
+
+  bool groupByStyle;
+  vvDescriptorStyle::Map styleMap;
+
+  bool hideGroupedItems;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vvDescriptorInfoTree)
+
+  void addGroupedDescriptorItems(QList<qint64>, QTreeWidgetItem* parent);
+
+  static bool isValidStyle(int);
+  static void reapChildren(QTreeWidgetItem* item,
+                           QTreeWidgetItem* parent,
+                           QList<QTreeWidgetItem*>& reaped);
+
+private:
+  QTE_DECLARE_PUBLIC(vvDescriptorInfoTree)
+};
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoTreePrivate::vvDescriptorInfoTreePrivate(
+  vvDescriptorInfoTree* q) :
+  itemFactory(new vvDescriptorInfoTreeItemFactory(q)),
+  columns(vvDescriptorInfoTree::Name | vvDescriptorInfoTree::Source),
+  groupByStyle(false),
+  hideGroupedItems(false),
+  q_ptr(q)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vvDescriptorInfoTreePrivate::isValidStyle(int s)
+{
+  // Test that s is non-zero and is a: exactly a power of two, or b: -1
+  uint u = static_cast<uint>(s);
+  return (u && !(u & (u - 1))) || (s == -1);
+}
+
+//-----------------------------------------------------------------------------
+QList<qint64> vvDescriptorInfoTreePrivate::childDescriptors(
+  const QTreeWidgetItem* item)
+{
+  QVariant data = item->data(0, vvDescriptorInfoTree::ChildDescriptorsRole);
+  if (data.isValid() && data.canConvert<QList<qint64> >())
+    {
+    return data.value<QList<qint64> >();
+    }
+  return QList<qint64>();
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTreePrivate::setChildDescriptors(
+  QTreeWidgetItem* item, const QVariant& newData)
+{
+  item->setData(0, vvDescriptorInfoTree::ChildDescriptorsRole, newData);
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTreePrivate::setHeaderLabels()
+{
+  QTE_Q(vvDescriptorInfoTree);
+
+  // Clear any existing headers
+  q->setHeaderItem(new QTreeWidgetItem);
+
+  // Determine new labels
+  QStringList headerLabels;
+  if (this->columns.testFlag(vvDescriptorInfoTree::Name))
+    {
+    headerLabels << "Name (Type)";
+    }
+  if (this->columns.testFlag(vvDescriptorInfoTree::Source))
+    {
+    headerLabels << "Source";
+    }
+  if (this->columns.testFlag(vvDescriptorInfoTree::TimeRange))
+    {
+    headerLabels << "Start Time" << "End Time";
+    }
+
+  // Set new labels
+  q->setHeaderLabels(headerLabels);
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTreePrivate::reapChildren(
+  QTreeWidgetItem* item, QTreeWidgetItem* parent)
+{
+  QList<QTreeWidgetItem*> reaped;
+  vvDescriptorInfoTreePrivate::reapChildren(item, parent, reaped);
+  qDeleteAll(reaped);
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTreePrivate::reapChildren(
+  QTreeWidgetItem* item, QTreeWidgetItem* parent,
+  QList<QTreeWidgetItem*>& reaped)
+{
+  if (parent)
+    {
+    const int type = vvDescriptorInfoTree::itemType(item);
+    if (type == vvDescriptorInfoTree::DescriptorItem ||
+        type == vvDescriptorInfoTree::DescriptorStyleGroup)
+      {
+      reaped.append(item);
+      return;
+      }
+    }
+
+  foreach_child (QTreeWidgetItem* child, item)
+    {
+    vvDescriptorInfoTreePrivate::reapChildren(child, item, reaped);
+    }
+
+  vvDescriptorInfoTreePrivate::setChildDescriptors(item, QVariant());
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTreePrivate::repopulateDescriptors(QTreeWidgetItem* root)
+{
+  if (!root)
+    {
+    QTE_Q(vvDescriptorInfoTree);
+    root = q->invisibleRootItem();
+    }
+
+  QList<qint64> descriptors =
+    vvDescriptorInfoTreePrivate::childDescriptors(root);
+
+  if (!descriptors.isEmpty())
+    {
+    // Clear and re-add descriptors
+    vvDescriptorInfoTreePrivate::reapChildren(root);
+    this->addDescriptorItems(descriptors, root);
+    vvDescriptorInfoTreePrivate::setChildDescriptors(
+      root, QVariant::fromValue(descriptors));
+    return;
+    }
+
+  // Iterate over children
+  foreach_child (QTreeWidgetItem* child, root)
+    {
+    this->repopulateDescriptors(child);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTreePrivate::addDescriptorItems(
+  QList<qint64> newDescriptors, QTreeWidgetItem* parent)
+{
+  if (this->groupByStyle)
+    {
+    // Find existing group parents
+    QHash<int, QTreeWidgetItem*> groupParents;
+    foreach_child (QTreeWidgetItem* child, parent)
+      {
+      const int type = vvDescriptorInfoTree::itemType(child);
+      if (type == vvDescriptorInfoTree::DescriptorStyleGroup)
+        {
+        int style = child->data(0, vvDescriptorInfoTree::StyleRole).toInt();
+        if (vvDescriptorInfoTreePrivate::isValidStyle(style))
+          {
+          groupParents.insert(style, child);
+          }
+        }
+      }
+
+    // Sort descriptors by style
+    QHash<int, QList<qint64> > groupedDescriptors;
+    foreach (qint64 id, newDescriptors)
+      {
+      if (!this->descriptors.contains(id))
+        {
+        continue;
+        }
+
+      bool known = false;
+      int styles = vvDescriptorStyle::styles(this->descriptors[id],
+                                             this->styleMap, &known);
+      if (known)
+        {
+        for (int g = 1; styles; g <<= 1)
+          {
+          if (styles & g)
+            {
+            groupedDescriptors[g].append(id);
+            styles ^= g;
+            }
+          }
+        }
+      else
+        {
+        groupedDescriptors[-1].append(id);
+        }
+      }
+
+    // Add descriptors to group parents
+    foreach (int s, groupedDescriptors.keys())
+      {
+      // Get group parent, creating it if it does not exist
+      QTreeWidgetItem* group = groupParents.value(s, 0);
+      if (!group)
+        {
+        group = this->itemFactory->createGroupItem(s);
+
+        vvDescriptorInfoTree::setItemType(
+          group, vvDescriptorInfoTree::DescriptorStyleGroup);
+        group->setData(0, vvDescriptorInfoTree::StyleRole, s);
+
+        parent->addChild(group);
+        }
+
+      // Add descriptors to group
+      this->addGroupedDescriptorItems(groupedDescriptors[s], group);
+
+      // Update group count
+      QRegExp ocre("\\s*\\(\\d+\\)$");
+      group->setText(0, group->text(0).replace(ocre, "") +
+                        QString(" (%1)").arg(group->childCount()));
+      }
+    }
+  else
+    {
+    addGroupedDescriptorItems(newDescriptors, parent);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTreePrivate::addGroupedDescriptorItems(
+  QList<qint64> newDescriptors, QTreeWidgetItem* parent)
+{
+  foreach (qint64 id, newDescriptors)
+    {
+    if (!this->descriptors.contains(id))
+      {
+      continue;
+      }
+
+    // Create item
+    QTreeWidgetItem* item =
+      this->itemFactory->createItem(id, this->descriptors[id]);
+
+    // Set item data
+    vvDescriptorInfoTree::setItemId(item, id);
+    vvDescriptorInfoTree::setItemType(
+      item, vvDescriptorInfoTree::DescriptorItem);
+
+    // Add new item to parent
+    parent->addChild(item);
+
+    // Hide grouped items?
+    if (this->hideGroupedItems)
+      {
+      item->setHidden(true);
+      }
+    }
+}
+
+//END vvDescriptorInfoTreePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvDescriptorInfoTreeItemFactory
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoTreeItemFactory::vvDescriptorInfoTreeItemFactory(
+  vvDescriptorInfoTree* tree) : q_ptr(tree)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoTreeItemFactory::~vvDescriptorInfoTreeItemFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vvDescriptorInfoTreeItemFactory::createItem(
+  qint64, const vvDescriptor& descriptor)
+{
+  QTE_Q(vvDescriptorInfoTree);
+  vvDescriptorInfoTreePrivate* d = q->d_func();
+
+  QTreeWidgetItem* item = new QTreeWidgetItem;
+
+  int ci = 0;
+  if (d->columns.testFlag(vvDescriptorInfoTree::Name))
+    {
+    item->setText(ci++, qtString(descriptor.DescriptorName));
+    }
+  if (d->columns.testFlag(vvDescriptorInfoTree::Source))
+    {
+    item->setText(ci++, qtString(descriptor.ModuleName));
+    }
+
+  if (d->columns.testFlag(vvDescriptorInfoTree::TimeRange))
+    {
+    vgUnixTime ts(descriptor.Region.begin()->TimeStamp.Time);
+    vgUnixTime te(descriptor.Region.rbegin()->TimeStamp.Time);
+    item->setText(ci++, ts.timeString());
+    item->setText(ci++, te.timeString());
+    }
+
+  return item;
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vvDescriptorInfoTreeItemFactory::createGroupItem(int style)
+{
+  QTreeWidgetItem* item = new QTreeWidgetItem;
+
+  if (style != -1)
+    {
+    vvDescriptorStyle::StyleFlag sf =
+      static_cast<vvDescriptorStyle::StyleFlag>(style);
+    item->setText(0, vvDescriptorStyle::string(sf));
+    }
+  else
+    {
+    item->setText(0, "(unrecognized)");
+    }
+
+  return item;
+}
+
+//END vvDescriptorInfoTreeItemFactory
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvDescriptorInfoTree static helpers
+
+//-----------------------------------------------------------------------------
+qint64 vvDescriptorInfoTree::itemId(
+  const QTreeWidgetItem* item, bool* isValid)
+{
+  QVariant data = item->data(0, vvDescriptorInfoTree::IdRole);
+  if (data.isNull() || data.type() != QVariant::LongLong)
+    {
+    if (isValid)
+      {
+      *isValid = false;
+      }
+    return -1;
+    }
+  return data.toLongLong();
+}
+
+//-----------------------------------------------------------------------------
+int vvDescriptorInfoTree::itemType(const QTreeWidgetItem* item)
+{
+  return item->data(0, vvDescriptorInfoTree::TypeRole).toInt();
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setItemId(QTreeWidgetItem* item, qint64 newId)
+{
+  item->setData(0, IdRole, newId);
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setItemType(QTreeWidgetItem* item, int newType)
+{
+  item->setData(0, TypeRole, newType);
+}
+
+//END vvDescriptorInfoTree static helpers
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvDescriptorInfoTree
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoTree::vvDescriptorInfoTree(QWidget* parent)
+  : QTreeWidget(parent), d_ptr(new vvDescriptorInfoTreePrivate(this))
+{
+  QTE_D(vvDescriptorInfoTree);
+  d->setHeaderLabels();
+  d->styleMap = vvDescriptorStyle::map();
+
+  connect(this, SIGNAL(itemSelectionChanged()),
+          this, SLOT(emitSelectionChanges()));
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoTree::~vvDescriptorInfoTree()
+{
+}
+
+//-----------------------------------------------------------------------------
+QHash<qint64, vvDescriptor> vvDescriptorInfoTree::descriptors() const
+{
+  QTE_D_CONST(vvDescriptorInfoTree);
+  return d->descriptors;
+}
+
+//-----------------------------------------------------------------------------
+QList<vvDescriptor> vvDescriptorInfoTree::descriptors(
+  QList<qint64> ids) const
+{
+  QTE_D_CONST(vvDescriptorInfoTree);
+
+  QList<vvDescriptor> result;
+  foreach (qint64 id, ids)
+    {
+    if (d->descriptors.contains(id))
+      {
+      result.append(d->descriptors[id]);
+      }
+    }
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+QList<vvDescriptor> vvDescriptorInfoTree::descriptors(
+  QList<QTreeWidgetItem*> items, bool includeChildren) const
+{
+  return this->descriptors(this->descriptorIds(items, includeChildren));
+}
+
+//-----------------------------------------------------------------------------
+QList<qint64> vvDescriptorInfoTree::descriptorIds(
+  QList<QTreeWidgetItem*> items, bool includeChildren) const
+{
+  QSet<qint64> results;
+  if (includeChildren)
+    {
+    QSet<QTreeWidgetItem*> visitedItems;
+
+    // Iterate over all items requested
+    while (!items.isEmpty())
+      {
+      QTreeWidgetItem* item = items.takeFirst();
+
+      // Skip items that have been visited already
+      if (visitedItems.contains(item))
+        {
+        continue;
+        }
+
+      // Add result for this item, if it is a descriptor
+      if (itemType(item) == DescriptorItem)
+        {
+        results.insert(itemId(item));
+        }
+      visitedItems.insert(item);
+
+      // Add children to list for later consideration
+      foreach_child (QTreeWidgetItem* child, item)
+        {
+        items.append(child);
+        }
+      }
+    }
+  else
+    {
+    // Iterate (non-recursively) over all items requested
+    foreach (QTreeWidgetItem* item, items)
+      {
+      if (itemType(item) == DescriptorItem)
+        {
+        results.insert(itemId(item));
+        }
+      }
+    }
+  return results.toList();
+}
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* vvDescriptorInfoTree::findItem(
+  int type, qint64 id, QTreeWidgetItem* from)
+{
+  QTreeWidgetItemIterator iter(this);
+  if (from)
+    {
+    QTreeWidgetItemIterator fiter(from);
+    iter = ++fiter;
+    }
+
+  while (*iter)
+    {
+    if (itemType(*iter) == type)
+      {
+      if (id == -1 || itemId(*iter) == id)
+        {
+        return *iter;
+        }
+      }
+    ++iter;
+    }
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+QList<QTreeWidgetItem*> vvDescriptorInfoTree::findItems(int type, qint64 id)
+{
+  QList<QTreeWidgetItem*> items;
+
+  QTreeWidgetItemIterator iter(this);
+  while (*iter)
+    {
+    if (itemType(*iter) == type)
+      {
+      if (id == -1 || itemId(*iter) == id)
+        {
+        items.append(*iter);
+        }
+      }
+    ++iter;
+    }
+
+  return items;
+}
+
+//-----------------------------------------------------------------------------
+QList<QTreeWidgetItem*> vvDescriptorInfoTree::descriptorItems(qint64 id)
+{
+  return this->findItems(DescriptorItem, id);
+}
+
+//-----------------------------------------------------------------------------
+bool vvDescriptorInfoTree::groupByStyle() const
+{
+  QTE_D_CONST(vvDescriptorInfoTree);
+  return d->groupByStyle;
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setGroupByStyle(bool newState)
+{
+  QTE_D(vvDescriptorInfoTree);
+
+  if (d->groupByStyle != newState)
+    {
+    d->groupByStyle = newState;
+    d->repopulateDescriptors();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setHideGroupedItems(bool newState)
+{
+  QTE_D(vvDescriptorInfoTree);
+
+  if (d->hideGroupedItems != newState)
+    {
+    d->hideGroupedItems = newState;
+    d->repopulateDescriptors();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setColumns(
+  vvDescriptorInfoTree::Columns newColumns, bool setHeaders)
+{
+  QTE_D(vvDescriptorInfoTree);
+
+  if (d->columns != newColumns)
+    {
+    d->columns = newColumns;
+    setHeaders && (d->setHeaderLabels(), false);
+    d->repopulateDescriptors();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setStyleMap(vvDescriptorStyle::Map newMap)
+{
+  QTE_D(vvDescriptorInfoTree);
+
+  if (d->styleMap != newMap)
+    {
+    d->styleMap = newMap;
+    d->repopulateDescriptors();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setItemFactory(
+  vvDescriptorInfoTreeItemFactory* newFactory)
+{
+  QTE_D(vvDescriptorInfoTree);
+  d->itemFactory.reset(newFactory);
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setDescriptors(
+  QHash<qint64, vvDescriptor> newDescriptors)
+{
+  QTE_D(vvDescriptorInfoTree);
+
+  // Remove items associated with any previous descriptor set
+  vvDescriptorInfoTreePrivate::reapChildren(this->invisibleRootItem());
+
+  // Set new descriptor set
+  d->descriptors = newDescriptors;
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::addDescriptorItems(
+  QList<qint64> descriptors, QTreeWidgetItem* parent)
+{
+  QTE_D(vvDescriptorInfoTree);
+
+  parent || (parent = this->invisibleRootItem());
+
+  // Add descriptors
+  qtDelayTreeSorting ds(this);
+  d->addDescriptorItems(descriptors, parent);
+
+  // Update parent's list of descriptors
+  QList<qint64> combinedDescriptors =
+    vvDescriptorInfoTreePrivate::childDescriptors(parent);
+  combinedDescriptors.append(descriptors);
+  vvDescriptorInfoTreePrivate::setChildDescriptors(
+    parent, QVariant::fromValue(combinedDescriptors));
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::setDescriptorItems(
+  QList<qint64> newDescriptors, QTreeWidgetItem* parent)
+{
+  QTE_D(vvDescriptorInfoTree);
+
+  parent || (parent = this->invisibleRootItem());
+
+  // Get parent's list of descriptors
+  QList<qint64> oldDescriptors =
+    vvDescriptorInfoTreePrivate::childDescriptors(parent);
+
+  // Do nothing if the list would not change
+  if (oldDescriptors == newDescriptors)
+    {
+    return;
+    }
+
+  // Get expanded group parents, if relevant
+  QSet<int> expandedStyles;
+  if (d->groupByStyle)
+    {
+    foreach_child (QTreeWidgetItem* group, parent)
+      {
+      if (group->isExpanded())
+        {
+        int type = vvDescriptorInfoTree::itemType(group);
+        if (type == DescriptorStyleGroup)
+          {
+          int style = group->data(0, vvDescriptorInfoTree::StyleRole).toInt();
+          expandedStyles.insert(style);
+          }
+        }
+      }
+    }
+
+  // Clear existing descriptors
+  vvDescriptorInfoTreePrivate::reapChildren(parent);
+
+  // Add descriptors in new set
+  this->addDescriptorItems(newDescriptors, parent);
+
+  // Re-expand group parents
+  if (d->groupByStyle)
+    {
+    foreach_child (QTreeWidgetItem* group, parent)
+      {
+      int type = vvDescriptorInfoTree::itemType(group);
+      if (type == DescriptorStyleGroup)
+        {
+        int style = group->data(0, vvDescriptorInfoTree::StyleRole).toInt();
+        group->setExpanded(expandedStyles.contains(style));
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::clear()
+{
+  QTreeWidget::clear();
+  vvDescriptorInfoTreePrivate::setChildDescriptors(
+    this->invisibleRootItem(), QVariant());
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoTree::emitSelectionChanges()
+{
+  QList<qint64> selectedIds = this->descriptorIds(this->selectedItems());
+  emit this->descriptorSelectionChanged(selectedIds);
+  emit this->descriptorSelectionChanged(this->descriptors(selectedIds));
+}
+
+//END vvDescriptorInfoTree
diff --git a/Libraries/VvWidgets/vvDescriptorInfoTree.h b/Libraries/VvWidgets/vvDescriptorInfoTree.h
new file mode 100644
index 00000000..16f0b6fc
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorInfoTree.h
@@ -0,0 +1,130 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvDescriptorInfoTree_h
+#define __vvDescriptorInfoTree_h
+
+#include <QTreeWidget>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvDescriptor.h>
+
+#include "vvDescriptorStyle.h"
+
+class vvDescriptorInfoTree;
+class vvDescriptorInfoTreePrivate;
+
+//-----------------------------------------------------------------------------
+class VV_WIDGETS_EXPORT vvDescriptorInfoTreeItemFactory
+{
+public:
+  virtual ~vvDescriptorInfoTreeItemFactory();
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vvDescriptorInfoTree)
+  friend class vvDescriptorInfoTreePrivate;
+
+  vvDescriptorInfoTreeItemFactory(vvDescriptorInfoTree* tree);
+
+  virtual QTreeWidgetItem* createItem(qint64 id, const vvDescriptor&);
+  virtual QTreeWidgetItem* createGroupItem(int style);
+
+private:
+  QTE_DECLARE_PUBLIC(vvDescriptorInfoTree)
+};
+
+//-----------------------------------------------------------------------------
+class VV_WIDGETS_EXPORT vvDescriptorInfoTree : public QTreeWidget
+{
+  Q_OBJECT
+
+  Q_PROPERTY(bool groupByStyle READ groupByStyle WRITE setGroupByStyle)
+
+public:
+  enum DataRole
+    {
+    IdRole = Qt::UserRole,
+    TypeRole,
+    ChildDescriptorsRole,
+    StyleRole,
+    UserRole = Qt::UserRole + 32
+    };
+
+  enum ItemType
+    {
+    Unknown = 0,
+    DescriptorItem,
+    DescriptorStyleGroup,
+    UserType = 32
+    };
+
+  enum Column
+    {
+    Name        = 0x1,
+    Source      = 0x2,
+    TimeRange   = 0x4,
+    All         = 0xf
+    };
+  Q_DECLARE_FLAGS(Columns, Column)
+
+  explicit vvDescriptorInfoTree(QWidget* parent = 0);
+  virtual ~vvDescriptorInfoTree();
+
+  void setItemFactory(vvDescriptorInfoTreeItemFactory*);
+
+  QHash<qint64, vvDescriptor> descriptors() const;
+  QList<vvDescriptor> descriptors(QList<qint64>) const;
+  QList<vvDescriptor> descriptors(QList<QTreeWidgetItem*>,
+                                  bool includeChildren = false) const;
+  QList<qint64> descriptorIds(QList<QTreeWidgetItem*>,
+                              bool includeChildren = false) const;
+
+  QTreeWidgetItem* findItem(int type, qint64 id, QTreeWidgetItem* from = 0);
+  QList<QTreeWidgetItem*> findItems(int type, qint64 id = -1);
+
+  QList<QTreeWidgetItem*> descriptorItems(qint64 id = -1);
+
+  bool groupByStyle() const;
+  void setStyleMap(vvDescriptorStyle::Map);
+  void setColumns(Columns columns, bool setHeaders = true);
+
+  static qint64 itemId(const QTreeWidgetItem*, bool* isValid = 0);
+  static int itemType(const QTreeWidgetItem*);
+  static void setItemId(QTreeWidgetItem*, qint64);
+  static void setItemType(QTreeWidgetItem*, int);
+
+signals:
+  void descriptorSelectionChanged(QList<qint64>);
+  void descriptorSelectionChanged(QList<vvDescriptor>);
+
+public slots:
+  void setDescriptors(QHash<qint64, vvDescriptor>);
+  void addDescriptorItems(QList<qint64>, QTreeWidgetItem* parentItem = 0);
+  void setDescriptorItems(QList<qint64>, QTreeWidgetItem* parentItem = 0);
+  void clear();
+
+  void setGroupByStyle(bool);
+  void setHideGroupedItems(bool);
+
+protected slots:
+  void emitSelectionChanges();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvDescriptorInfoTree)
+
+private:
+  QTE_DECLARE_PRIVATE(vvDescriptorInfoTree)
+  Q_DISABLE_COPY(vvDescriptorInfoTree)
+
+  friend class vvDescriptorInfoTreeItemFactory;
+};
+
+Q_DECLARE_OPERATORS_FOR_FLAGS(vvDescriptorInfoTree::Columns)
+
+#endif
diff --git a/Libraries/VvWidgets/vvDescriptorInfoWidget.cxx b/Libraries/VvWidgets/vvDescriptorInfoWidget.cxx
new file mode 100644
index 00000000..0ce4db67
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorInfoWidget.cxx
@@ -0,0 +1,163 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvDescriptorInfoWidget.h"
+#include "ui_vvDescriptorInfoWidget.h"
+
+#include <QDateTime>
+
+#include <qtNumericTreeWidgetItem.h>
+#include <qtScopedValueChange.h>
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vgUnixTime.h>
+
+#include "vvDescriptorStyle.h"
+
+QTE_IMPLEMENT_D_FUNC(vvDescriptorInfoWidget)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void makeTransparent(QLineEdit* widget)
+{
+  widget->setForegroundRole(QPalette::WindowText);
+  qtUtil::makeTransparent(widget);
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vvDescriptorInfoWidgetPrivate
+{
+public:
+  Ui::vvDescriptorInfoWidget UI;
+};
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoWidget::vvDescriptorInfoWidget(QWidget* parent)
+  : QTabWidget(parent), d_ptr(new vvDescriptorInfoWidgetPrivate)
+{
+  QTE_D(vvDescriptorInfoWidget);
+  d->UI.setupUi(this);
+
+  makeTransparent(d->UI.name);
+  makeTransparent(d->UI.name);
+  makeTransparent(d->UI.style);
+  makeTransparent(d->UI.source);
+  makeTransparent(d->UI.timeStart);
+  makeTransparent(d->UI.timeEnd);
+  makeTransparent(d->UI.timeDuration);
+  makeTransparent(d->UI.valueCount);
+  makeTransparent(d->UI.regionCount);
+  makeTransparent(d->UI.trackCount);
+
+  d->UI.values->sortByColumn(0, Qt::AscendingOrder);
+  d->UI.regions->sortByColumn(0, Qt::AscendingOrder);
+  d->UI.tracks->sortByColumn(0, Qt::AscendingOrder);
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptorInfoWidget::~vvDescriptorInfoWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vvDescriptorInfoWidget::setDescriptor(vvDescriptor newDescriptor)
+{
+  QTE_D(vvDescriptorInfoWidget);
+
+  // Summary
+  d->UI.name->setText(qtString(newDescriptor.DescriptorName));
+  d->UI.style->setText(vvDescriptorStyle::styleString(newDescriptor));
+  d->UI.source->setText(qtString(newDescriptor.ModuleName));
+
+  // Time
+  if (newDescriptor.Region.size())
+    {
+    vgUnixTime ts(newDescriptor.Region.begin()->TimeStamp.Time);
+    vgUnixTime te(newDescriptor.Region.rbegin()->TimeStamp.Time);
+    vgUnixTime td(te.toInt64() - ts.toInt64());
+    d->UI.timeStart->setText(ts.timeString());
+    d->UI.timeEnd->setText(te.timeString());
+    d->UI.timeDuration->setText(td.timeString());
+    }
+  else
+    {
+    d->UI.timeStart->setText("(n/a)");
+    d->UI.timeEnd->setText("(n/a)");
+    d->UI.timeDuration->setText("(n/a)");
+    }
+
+  // Data overview
+  size_t valueCount = 0;
+  for (size_t n = 0, k = newDescriptor.Values.size(); n < k; ++n)
+    {
+    valueCount += newDescriptor.Values[n].size();
+    }
+  d->UI.valueCount->setText(QString::number(valueCount));
+  d->UI.regionCount->setText(QString::number(newDescriptor.Region.size()));
+  d->UI.trackCount->setText(QString::number(newDescriptor.TrackIds.size()));
+
+  // Values
+  qtDelayTreeSorting vds(d->UI.values);
+  d->UI.values->clear();
+  for (size_t i = 0, ki = newDescriptor.Values.size(); i < ki; ++i)
+    {
+    const std::vector<float>& v = newDescriptor.Values[i];
+
+    // Create first-level entry
+    qtNumericTreeWidgetItem* iitem = new qtNumericTreeWidgetItem;
+    iitem->setValue(0, i);
+    iitem->setText(1, QString("(%1 values)").arg(v.size()));
+
+    // Add sub-values
+    for (size_t j = 0, kj = v.size(); j < kj; ++j)
+      {
+      // Create second-level entry
+      qtNumericTreeWidgetItem* jitem = new qtNumericTreeWidgetItem;
+      jitem->setValue(0, j);
+      jitem->setValue(1, v[j]);
+      iitem->addChild(jitem);
+      }
+
+    // Add first-level entry
+    d->UI.values->addTopLevelItem(iitem);
+    }
+  qtUtil::resizeColumnsToContents(d->UI.values);
+
+  // Regions
+  qtDelayTreeSorting rds(d->UI.regions);
+  d->UI.regions->clear();
+  const QString rf = QString::fromUtf8("%1,%2 %3\xc3\x97%4");
+  foreach_iter (vvDescriptorRegionMap::const_iterator, iter,
+                newDescriptor.Region)
+    {
+    const vvImagePoint& tl = iter->ImageRegion.TopLeft;
+    const vvImagePoint& br = iter->ImageRegion.BottomRight;
+    QTreeWidgetItem* item = new QTreeWidgetItem;
+    item->setText(0, vgUnixTime(iter->TimeStamp.Time).timeString());
+    item->setText(1, rf.arg(tl.X).arg(tl.Y)
+                       .arg(1 + br.X - tl.X).arg(1 + br.Y - tl.Y));
+    d->UI.regions->addTopLevelItem(item);
+    }
+  qtUtil::resizeColumnsToContents(d->UI.regions);
+
+  // Tracks
+  qtDelayTreeSorting tds(d->UI.tracks);
+  d->UI.tracks->clear();
+  for (size_t n = 0, k = newDescriptor.TrackIds.size(); n < k; ++n)
+    {
+    const vvTrackId& tid = newDescriptor.TrackIds[n];
+    qtNumericTreeWidgetItem* item = new qtNumericTreeWidgetItem;
+    item->setValue(0, tid.Source);
+    item->setValue(1, tid.SerialNumber);
+    d->UI.tracks->addTopLevelItem(item);
+    }
+  qtUtil::resizeColumnsToContents(d->UI.tracks);
+}
diff --git a/Libraries/VvWidgets/vvDescriptorInfoWidget.h b/Libraries/VvWidgets/vvDescriptorInfoWidget.h
new file mode 100644
index 00000000..3399929f
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorInfoWidget.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvDescriptorInfoWidget_h
+#define __vvDescriptorInfoWidget_h
+
+#include <QTabWidget>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvDescriptor.h>
+
+class vvDescriptorInfoWidgetPrivate;
+
+class VV_WIDGETS_EXPORT vvDescriptorInfoWidget : public QTabWidget
+{
+  Q_OBJECT
+
+public:
+  explicit vvDescriptorInfoWidget(QWidget* parent = 0);
+  virtual ~vvDescriptorInfoWidget();
+
+public slots:
+  void setDescriptor(vvDescriptor);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvDescriptorInfoWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(vvDescriptorInfoWidget)
+  Q_DISABLE_COPY(vvDescriptorInfoWidget)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvDescriptorInfoWidget.ui b/Libraries/VvWidgets/vvDescriptorInfoWidget.ui
new file mode 100644
index 00000000..511cfa77
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorInfoWidget.ui
@@ -0,0 +1,334 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vvDescriptorInfoWidget</class>
+ <widget class="QTabWidget" name="vvDescriptorInfoWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>462</width>
+    <height>232</height>
+   </rect>
+  </property>
+  <property name="currentIndex">
+   <number>0</number>
+  </property>
+  <widget class="QWidget" name="summaryTab">
+   <attribute name="title">
+    <string>Summary</string>
+   </attribute>
+   <layout class="QGridLayout" name="summaryLayout">
+    <item row="0" column="0" colspan="2">
+     <layout class="QFormLayout" name="nameLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="nameLabel">
+        <property name="text">
+         <string>Name (Type):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="name">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="styleLabel">
+        <property name="text">
+         <string>Style:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="style">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="sourceLabel">
+        <property name="text">
+         <string>Source:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="source">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="2" column="0">
+     <layout class="QFormLayout" name="timeLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="timeStartLabel">
+        <property name="text">
+         <string>Time (Start):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="timeStart">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="timeEndLabel">
+        <property name="text">
+         <string>Time (End):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="timeEnd">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="timeDurationLabel">
+        <property name="text">
+         <string>Duration:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="timeDuration">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="2" column="1">
+     <layout class="QFormLayout" name="dataLayout">
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="valueCount">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="valueCountLabel">
+        <property name="text">
+         <string>Values:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="regionCountLabel">
+        <property name="text">
+         <string>Regions:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="regionCount">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="trackCountLabel">
+        <property name="text">
+         <string>Tracks:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="trackCount">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="3" column="0" colspan="2">
+     <spacer name="verticalSpacer">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>40</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="Line" name="line">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="valueTab">
+   <attribute name="title">
+    <string>Values</string>
+   </attribute>
+   <layout class="QVBoxLayout" name="valueLayout">
+    <item>
+     <widget class="QTreeWidget" name="values">
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::ExtendedSelection</enum>
+      </property>
+      <property name="uniformRowHeights">
+       <bool>true</bool>
+      </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
+      </property>
+      <property name="allColumnsShowFocus">
+       <bool>true</bool>
+      </property>
+      <column>
+       <property name="text">
+        <string notr="true">Index</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Value</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="regionTab">
+   <attribute name="title">
+    <string>Regions</string>
+   </attribute>
+   <layout class="QVBoxLayout" name="regionLayout">
+    <item>
+     <widget class="QTreeWidget" name="regions">
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::ExtendedSelection</enum>
+      </property>
+      <property name="rootIsDecorated">
+       <bool>false</bool>
+      </property>
+      <property name="uniformRowHeights">
+       <bool>true</bool>
+      </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
+      </property>
+      <property name="allColumnsShowFocus">
+       <bool>true</bool>
+      </property>
+      <column>
+       <property name="text">
+        <string>Time</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Region</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="trackTab">
+   <attribute name="title">
+    <string>Tracks</string>
+   </attribute>
+   <layout class="QVBoxLayout" name="trackLayout">
+    <item>
+     <widget class="QTreeWidget" name="tracks">
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::ExtendedSelection</enum>
+      </property>
+      <property name="rootIsDecorated">
+       <bool>false</bool>
+      </property>
+      <property name="uniformRowHeights">
+       <bool>true</bool>
+      </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
+      </property>
+      <property name="allColumnsShowFocus">
+       <bool>true</bool>
+      </property>
+      <column>
+       <property name="text">
+        <string>Source</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Serial Number</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Libraries/VvWidgets/vvDescriptorStyle.cxx b/Libraries/VvWidgets/vvDescriptorStyle.cxx
new file mode 100644
index 00000000..9f31bda0
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorStyle.cxx
@@ -0,0 +1,280 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvDescriptorStyle.h"
+
+#include <QApplication>
+#include <QStringList>
+
+#include <qtDebugHelper.h>
+#include <qtGlobal.h>
+#include <qtSettings.h>
+#include <qtStlUtil.h>
+
+#include <vvDescriptor.h>
+
+#include "vvDescriptorStyleSetting.h"
+
+Q_DECLARE_METATYPE(vvDescriptorStyle::Map)
+
+namespace vvDescriptorStyle
+{
+
+//BEGIN vvDescriptorStyle data members
+
+const char* const settingKey   = "Settings";
+const char* const propertyKey  = "DescriptorStyleMap";
+
+//END vvDescriptorStyle data members
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvDescriptorStyle::SettingWrapper
+
+//-----------------------------------------------------------------------------
+class SettingWrapper : public qtSettings
+{
+public:
+  SettingWrapper();
+  qtSettings_declare(QVariant, map, setMap);
+};
+
+//-----------------------------------------------------------------------------
+SettingWrapper::SettingWrapper()
+{
+  this->declareSetting(settingKey, new vvDescriptorStyle::Setting);
+}
+
+//-----------------------------------------------------------------------------
+QVariant SettingWrapper::map() const
+{
+  return this->value(settingKey);
+}
+
+//-----------------------------------------------------------------------------
+void SettingWrapper::setMap(QVariant value)
+{
+  this->setValue(settingKey, value);
+}
+
+//END vvDescriptorStyle::Settings
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvDescriptorStyle::Map
+
+//-----------------------------------------------------------------------------
+Map::Map()
+{
+}
+
+//-----------------------------------------------------------------------------
+Map::Map(const vvDescriptorStyle::Map& other) :
+  QHash<QString, vvDescriptorStyle::Styles>(other)
+{
+}
+
+//-----------------------------------------------------------------------------
+Map::Map(QHash<QString, Styles> const& other) :
+  QHash<QString, vvDescriptorStyle::Styles>(other)
+{
+}
+
+//-----------------------------------------------------------------------------
+Map::Map(const QVariantHash& other)
+{
+  *this = other;
+}
+
+//-----------------------------------------------------------------------------
+Map& Map::operator=(const vvDescriptorStyle::Map& other)
+{
+  this->QHash<QString, Styles>::operator=(other);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+Map& Map::operator=(QHash<QString, Styles> const& other)
+{
+  this->QHash<QString, Styles>::operator=(other);
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+Map& Map::operator=(const QVariantHash& other)
+{
+  foreach_iter (QVariantHash::const_iterator, iter, other)
+    {
+    vvDescriptorStyle::Styles s = vvDescriptorStyle::None;
+    if (iter->canConvert<vvDescriptorStyle::Styles>())
+      {
+      s = iter->value<vvDescriptorStyle::Styles>();
+      }
+    else if (iter->canConvert<int>())
+      {
+      s = static_cast<vvDescriptorStyle::Styles>(iter->toInt());
+      }
+    this->insert(iter.key(), s);
+    }
+
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+QVariantHash Map::serializable() const
+{
+  QVariantHash out;
+
+  foreach_iter (Map::const_iterator, iter, *this)
+    {
+    out.insert(iter.key(), QVariant::fromValue<int>(iter.value()));
+    }
+  return out;
+}
+
+//END vvDescriptorStyle::Map
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvDescriptorStyle member functions
+
+//-----------------------------------------------------------------------------
+QString string(StyleFlag style)
+{
+  switch (style)
+    {
+    case None:
+      return "(None)";
+    case Articulation:
+      return "Articulation";
+    case Trajectory:
+      return "Trajectory";
+    case Appearance:
+      return "Appearance";
+    case Color:
+      return "Color";
+    case Metadata:
+      return "Metadata";
+    default:
+      return QString("<Unknown (%1)>").arg(style);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString string(Styles styles)
+{
+  QStringList flagTexts;
+
+  int flag = 1;
+  int s = styles;
+  while (s)
+    {
+    if (s & 1)
+      {
+      StyleFlag style = static_cast<StyleFlag>(flag);
+      flagTexts.append(string(style));
+      }
+    s >>= 1;
+    flag <<= 1;
+    }
+
+  return (flagTexts.isEmpty() ? "(None)" : flagTexts.join(", "));
+}
+
+//-----------------------------------------------------------------------------
+Styles styles(const vvDescriptor& descriptor, bool* known)
+{
+  return styles(descriptor, map(), known);
+}
+
+//-----------------------------------------------------------------------------
+Styles styles(const vvDescriptor& descriptor, const Map& map, bool* known)
+{
+  QString key = qtString(descriptor.ModuleName);
+  if (map.contains(key))
+    {
+    known && (*known = true);
+    return map[key];
+    }
+
+  known && (*known = false);
+  return None;
+}
+
+//-----------------------------------------------------------------------------
+QString styleString(const vvDescriptor& descriptor)
+{
+  return styleString(descriptor, map());
+}
+
+//-----------------------------------------------------------------------------
+QString styleString(const vvDescriptor& descriptor, const Map& map)
+{
+  bool known = false;
+  Styles s = styles(descriptor, map, &known);
+  return (known ? string(s) : "(Unknown)");
+}
+
+//-----------------------------------------------------------------------------
+Map map(Scope scope)
+{
+  // Get value from process scope (QApplication property)
+  if (scope.testFlag(Process))
+    {
+    QVariant data = qApp->property(propertyKey);
+    if (!data.isNull() && data.canConvert<Map>())
+      {
+      return data.value<Map>();
+      }
+    }
+
+  // Get value from settings scope (qtSettings)
+  if (scope.testFlag(Settings))
+    {
+    SettingWrapper settings;
+    QVariant data = settings.map();
+    if (!data.isNull() && data.canConvert(QVariant::Hash))
+      {
+      return Map(data.toHash());
+      }
+    }
+
+  return Map();
+}
+
+//-----------------------------------------------------------------------------
+QDEBUG_ENUM_HANDLER_BEGIN(vvDescriptorStyle::ScopeItem)
+QDEBUG_HANDLE_ENUM(Process)
+QDEBUG_HANDLE_ENUM(Settings)
+QDEBUG_HANDLE_ENUM(Any)
+QDEBUG_ENUM_HANDLER_END(vvDescriptorStyle)
+
+//-----------------------------------------------------------------------------
+void setMap(const vvDescriptorStyle::Map& newMap, ScopeItem where)
+{
+  switch (where)
+    {
+    case Process:
+      qApp->setProperty(propertyKey, QVariant::fromValue<Map>(newMap));
+      break;
+
+    case Settings:
+      {
+      SettingWrapper settings;
+      settings.setMap(newMap.serializable());
+      settings.commit();
+      break;
+      }
+
+    default:
+      qWarning() << "vvDescriptorStyle::setMap: invalid operation:"
+                 << "cannot set map on scope" << where;
+    }
+}
+
+//END vvDescriptorStyle member functions
+
+} // namespace vvDescriptorStyle
diff --git a/Libraries/VvWidgets/vvDescriptorStyle.h b/Libraries/VvWidgets/vvDescriptorStyle.h
new file mode 100644
index 00000000..766284f8
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorStyle.h
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvDescriptorStyle_h
+#define __vvDescriptorStyle_h
+
+#include <QMetaType>
+#include <QVariantHash>
+
+#include <vgExport.h>
+
+struct vvDescriptor;
+
+//-----------------------------------------------------------------------------
+namespace vvDescriptorStyle
+{
+  enum StyleFlag
+    {
+    None          = 0,
+    Articulation  = 0x01,
+    Trajectory    = 0x02,
+    Appearance    = 0x04,
+    Color         = 0x08,
+    Metadata      = 0x80,
+    All           = 0xff
+    };
+  Q_DECLARE_FLAGS(Styles, StyleFlag);
+
+  enum ScopeItem
+    {
+    Process       = 0x1,
+    Settings      = 0x2,
+    Any           = 0xf
+    };
+  Q_DECLARE_FLAGS(Scope, ScopeItem)
+
+  class Map;
+
+  VV_WIDGETS_EXPORT QString string(StyleFlag);
+  VV_WIDGETS_EXPORT QString string(Styles);
+
+  VV_WIDGETS_EXPORT Styles styles(const vvDescriptor&, bool* known = 0);
+  VV_WIDGETS_EXPORT Styles styles(const vvDescriptor&, const Map&,
+                                  bool* known = 0);
+  VV_WIDGETS_EXPORT QString styleString(const vvDescriptor&);
+  VV_WIDGETS_EXPORT QString styleString(const vvDescriptor&, const Map&);
+
+  // Get the global descriptor style mappings
+  VV_WIDGETS_EXPORT Map map(Scope scope = Any);
+
+  // Set the global descriptor style mappings
+  VV_WIDGETS_EXPORT void setMap(const Map&, ScopeItem where = Process);
+}
+
+//-----------------------------------------------------------------------------
+class VV_WIDGETS_EXPORT vvDescriptorStyle::Map
+  : public QHash<QString, vvDescriptorStyle::Styles>
+{
+public:
+  Map();
+  Map(const Map&);
+  Map(QHash<QString, Styles> const&);
+  Map(const QVariantHash&);
+
+  Map& operator=(const Map& other);
+  Map& operator=(QHash<QString, Styles> const& other);
+  Map& operator=(const QVariantHash& other);
+
+  QVariantHash serializable() const;
+};
+
+//-----------------------------------------------------------------------------
+Q_DECLARE_OPERATORS_FOR_FLAGS(vvDescriptorStyle::Styles)
+Q_DECLARE_OPERATORS_FOR_FLAGS(vvDescriptorStyle::Scope)
+
+Q_DECLARE_METATYPE(vvDescriptorStyle::StyleFlag)
+Q_DECLARE_METATYPE(vvDescriptorStyle::Styles)
+
+#endif
diff --git a/Libraries/VvWidgets/vvDescriptorStyleDelegate.cxx b/Libraries/VvWidgets/vvDescriptorStyleDelegate.cxx
new file mode 100644
index 00000000..6180a365
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorStyleDelegate.cxx
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvDescriptorStyleDelegate.h"
+
+namespace
+{
+
+static const vvDescriptorStyle::StyleFlag styles[] =
+{
+  vvDescriptorStyle::Articulation,
+  vvDescriptorStyle::Trajectory,
+  vvDescriptorStyle::Appearance,
+  vvDescriptorStyle::Color,
+  vvDescriptorStyle::Metadata,
+  vvDescriptorStyle::None
+};
+
+}
+
+//-----------------------------------------------------------------------------
+vvDescriptorStyleDelegate::vvDescriptorStyleDelegate(QObject* parent) :
+  qtFlagListDelegate <vvDescriptorStyle::StyleFlag,
+                      vvDescriptorStyle::Styles> (parent)
+{
+  QStringList names;
+  QVariantList values;
+  for (int i = 0; styles[i] != vvDescriptorStyle::None; ++i)
+    {
+    QVariant value =
+      QVariant::fromValue<vvDescriptorStyle::StyleFlag>(styles[i]);
+    names.append(vvDescriptorStyle::string(styles[i]));
+    values.append(value);
+    }
+  this->setMapping(names, values);
+}
diff --git a/Libraries/VvWidgets/vvDescriptorStyleDelegate.h b/Libraries/VvWidgets/vvDescriptorStyleDelegate.h
new file mode 100644
index 00000000..7857b71d
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorStyleDelegate.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvDescriptorStyleDelegate_h
+#define __vvDescriptorStyleDelegate_h
+
+#include <qtFlagListDelegate.h>
+
+#include <vgExport.h>
+
+#include "vvDescriptorStyle.h"
+
+VV_WIDGETS_EXPORT_TEMPLATE template class VV_WIDGETS_EXPORT
+qtFlagListDelegate <vvDescriptorStyle::StyleFlag, vvDescriptorStyle::Styles>;
+
+class VV_WIDGETS_EXPORT vvDescriptorStyleDelegate :
+  public qtFlagListDelegate <vvDescriptorStyle::StyleFlag,
+                             vvDescriptorStyle::Styles>
+{
+  Q_OBJECT
+
+public:
+  vvDescriptorStyleDelegate(QObject* parent = 0);
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvDescriptorStyleDelegateBase.cxx b/Libraries/VvWidgets/vvDescriptorStyleDelegateBase.cxx
new file mode 100644
index 00000000..7b3dd62c
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorStyleDelegateBase.cxx
@@ -0,0 +1,18 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <vgExport.h>
+
+#include <qtFlagListDelegate.h>
+
+#include "vvDescriptorStyle.h"
+
+// The instantiation must be in a separate translation unit for MSVC, which for
+// some reason does not allow a template instantiation to follow a template
+// declaration (i.e. an 'extern template' of the same specialization).
+
+template class VV_WIDGETS_EXPORT
+qtFlagListDelegate <vvDescriptorStyle::StyleFlag, vvDescriptorStyle::Styles>;
diff --git a/Libraries/VvWidgets/vvDescriptorStyleSetting.cxx b/Libraries/VvWidgets/vvDescriptorStyleSetting.cxx
new file mode 100644
index 00000000..545fe926
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorStyleSetting.cxx
@@ -0,0 +1,83 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvDescriptorStyleSetting.h"
+
+#include <QSettings>
+#include <QStringList>
+
+#include <qtScopedSettingGroup.h>
+
+#include "vvDescriptorStyle.h"
+
+namespace vvDescriptorStyle
+{
+
+//-----------------------------------------------------------------------------
+qtSettings::Scope Setting::scope() const
+{
+  return qtSettings::UserScope | qtSettings::OrganizationScope;
+}
+
+//-----------------------------------------------------------------------------
+QString Setting::key() const
+{
+  return "DescriptorStyles";
+}
+
+//-----------------------------------------------------------------------------
+void Setting::initialize(const QSettings& store)
+{
+  vvDescriptorStyle::Map map;
+
+  // Find entries in our group (can't use beginGroup on const QSettings)
+  const QString tag = this->key() + '/';
+  const int tagSize = tag.size() - 1;
+  foreach (QString key, store.allKeys())
+    {
+    // Test for membership in our group
+    if (key.startsWith(tag) && key.lastIndexOf('/') == tagSize)
+      {
+      // Get raw data
+      QVariant data = store.value(key);
+
+      // Convert to styles
+      vvDescriptorStyle::Styles styles = vvDescriptorStyle::None;
+      if (data.canConvert<vvDescriptorStyle::Styles>())
+        {
+        styles = data.value<vvDescriptorStyle::Styles>();
+        }
+      else if (data.canConvert<int>())
+        {
+        styles = static_cast<vvDescriptorStyle::Styles>(data.toInt());
+        }
+
+      // Add entry
+      map.insert(key.mid(tagSize + 1), styles);
+      }
+    }
+
+  // Finish initialization
+  this->originalValue = map.serializable();
+  qtAbstractSetting::initialize(store);
+}
+
+//-----------------------------------------------------------------------------
+void Setting::commit(QSettings& store)
+{
+  QVariantHash map = this->currentValue.toHash();
+
+  qtScopedSettingGroup g(store, this->key());
+  foreach_iter (QVariantHash::iterator, iter, map)
+    {
+    store.setValue(iter.key(), iter.value());
+    }
+
+  this->originalValue = this->currentValue;
+  this->modified = false;
+}
+
+} // namespace vvDescriptorStyle
diff --git a/Libraries/VvWidgets/vvDescriptorStyleSetting.h b/Libraries/VvWidgets/vvDescriptorStyleSetting.h
new file mode 100644
index 00000000..33c22ec8
--- /dev/null
+++ b/Libraries/VvWidgets/vvDescriptorStyleSetting.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvDescriptorStyleSetting_h
+#define __vvDescriptorStyleSetting_h
+
+#include <qtAbstractSetting.h>
+
+#include <vgExport.h>
+
+namespace vvDescriptorStyle
+{
+
+class VV_WIDGETS_EXPORT Setting : public ::qtAbstractSetting
+{
+public:
+  virtual qtSettings::Scope scope() const;
+
+  virtual void commit(QSettings& store);
+
+protected:
+  virtual void initialize(const QSettings& store);
+  virtual QString key() const;
+};
+
+} // namespace vvDescriptorStyle
+
+#endif
diff --git a/Libraries/VvWidgets/vvQueryInfoLabel.cxx b/Libraries/VvWidgets/vvQueryInfoLabel.cxx
new file mode 100644
index 00000000..55de11f6
--- /dev/null
+++ b/Libraries/VvWidgets/vvQueryInfoLabel.cxx
@@ -0,0 +1,238 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvQueryInfoLabel.h"
+
+#include <QEvent>
+
+#include <qtScopedValueChange.h>
+#include <qtStlUtil.h>
+
+#include "vvDescriptorInfoDialog.h"
+#include "vvTrackInfoDialog.h"
+
+QTE_IMPLEMENT_D_FUNC(vvQueryInfoLabel)
+
+//-----------------------------------------------------------------------------
+class vvQueryInfoLabelPrivate
+{
+public:
+  vvQueryInfoLabelPrivate() : retrievalType(-1) {}
+
+  QString errorText;
+  QList<vvTrack> tracks;
+  QList<vvDescriptor> descriptors;
+  int retrievalType;
+};
+
+//-----------------------------------------------------------------------------
+vvQueryInfoLabel::vvQueryInfoLabel(QWidget* parent) :
+  QLabel(parent),
+  d_ptr(new vvQueryInfoLabelPrivate)
+{
+  connect(this, SIGNAL(linkActivated(QString)),
+          this, SLOT(showInfoDialog(QString)));
+}
+
+//-----------------------------------------------------------------------------
+vvQueryInfoLabel::~vvQueryInfoLabel()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vvQueryInfoLabel::errorText() const
+{
+  QTE_D_CONST(vvQueryInfoLabel);
+  return d->errorText;
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::setErrorText(QString newText)
+{
+  QTE_D(vvQueryInfoLabel);
+  if (d->errorText != newText)
+    {
+    d->errorText = newText;
+    this->updateText();
+    }
+}
+
+//-----------------------------------------------------------------------------
+QList<vvTrack> vvQueryInfoLabel::tracks() const
+{
+  QTE_D_CONST(vvQueryInfoLabel);
+  return d->tracks;
+}
+
+//-----------------------------------------------------------------------------
+QList<vvDescriptor> vvQueryInfoLabel::descriptors() const
+{
+  QTE_D_CONST(vvQueryInfoLabel);
+  return d->descriptors;
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::setQuery(vvSimilarityQuery query)
+{
+  qtScopedBlockUpdates bu(this);
+  this->setTracks(query.Tracks);
+  this->setDescriptors(query.Descriptors);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::setQuery(vvQueryInstance query)
+{
+  QTE_D(vvQueryInfoLabel);
+
+  if (query.isSimilarityQuery())
+    {
+    this->setQuery(*query.constSimilarityQuery());
+    }
+  else
+    {
+    d->retrievalType = -1;
+    d->tracks.clear();
+    d->descriptors.clear();
+
+    if (query.isRetrievalQuery())
+      {
+      d->retrievalType = query.retrievalQuery()->RequestedEntities;
+      }
+
+    this->updateText();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::setResult(vvQueryResult result)
+{
+  qtScopedBlockUpdates bu(this);
+  this->setTracks(result.Tracks);
+  this->setDescriptors(result.Descriptors);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::setTracks(QList<vvTrack> newTracks)
+{
+  QTE_D(vvQueryInfoLabel);
+
+  d->retrievalType = -1;
+  d->tracks = newTracks;
+
+  this->updateText();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::setTracks(std::vector<vvTrack> v)
+{
+  this->setTracks(qtList(v));
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::setDescriptors(QList<vvDescriptor> newDescriptors)
+{
+  QTE_D(vvQueryInfoLabel);
+
+  d->retrievalType = -1;
+  d->descriptors = newDescriptors;
+
+  this->updateText();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::setDescriptors(std::vector<vvDescriptor> v)
+{
+  this->setDescriptors(qtList(v));
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::clearData()
+{
+  qtScopedBlockUpdates bu(this);
+  this->setTracks(QList<vvTrack>());
+  this->setDescriptors(QList<vvDescriptor>());
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::showTrackInfoDialog()
+{
+  vvTrackInfoDialog dialog;
+  dialog.setTracks(this->tracks());
+  dialog.exec();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::showDescriptorInfoDialog()
+{
+  vvDescriptorInfoDialog dialog;
+  dialog.setDescriptors(this->descriptors());
+  dialog.exec();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::showInfoDialog(QString uri)
+{
+  if (uri == "t")
+    {
+    this->showTrackInfoDialog();
+    }
+  else if (uri == "d")
+    {
+    this->showDescriptorInfoDialog();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::updateText()
+{
+  QTE_D(vvQueryInfoLabel);
+
+  QString t;
+
+  int count = d->descriptors.count();
+  if (count)
+    {
+    const int tcount = d->tracks.count();
+    const QString l("<a href=\"%3\">%1 %2</a>");
+    QString tl, dl;
+
+    if (tcount)
+      {
+      tl = l.arg(tcount).arg(tcount > 1 ? "tracks" : "track", "t") + ", ";
+      }
+    dl = l.arg(count).arg(count > 1 ? "descriptors" : "descriptor", "d");
+
+    t = QString("<html><body>Using %1%2</body></html>").arg(tl, dl);
+    }
+  else if (d->retrievalType == vvRetrievalQuery::Tracks)
+    {
+    t = "Track retrieval request";
+    }
+  else if (d->retrievalType == vvRetrievalQuery::Descriptors)
+    {
+    t = "Descriptor retrieval request";
+    }
+  else
+    {
+    t = "<html><body style=\"color: %1;\">%2</body></html>";
+    const QColor color =
+      this->palette().color(QPalette::Disabled, this->foregroundRole());
+    t = t.arg(color.name(), d->errorText);
+    }
+
+  this->setText(t);
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryInfoLabel::changeEvent(QEvent* e)
+{
+  QLabel::changeEvent(e);
+
+  if (e->type() == QEvent::PaletteChange)
+    {
+    this->updateText();
+    }
+}
diff --git a/Libraries/VvWidgets/vvQueryInfoLabel.h b/Libraries/VvWidgets/vvQueryInfoLabel.h
new file mode 100644
index 00000000..aeca22f2
--- /dev/null
+++ b/Libraries/VvWidgets/vvQueryInfoLabel.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryInfoLabel_h
+#define __vvQueryInfoLabel_h
+
+#include <QLabel>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvQueryResult.h>
+
+#include <vvQueryInstance.h>
+
+class vvQueryInfoLabelPrivate;
+
+class VV_WIDGETS_EXPORT vvQueryInfoLabel : public QLabel
+{
+  Q_OBJECT
+  Q_PROPERTY(QString errorText READ errorText WRITE setErrorText)
+
+public:
+  explicit vvQueryInfoLabel(QWidget* parent = 0);
+  virtual ~vvQueryInfoLabel();
+
+  QString errorText() const;
+  QList<vvTrack> tracks() const;
+  QList<vvDescriptor> descriptors() const;
+
+public slots:
+  void setErrorText(QString);
+
+  void setQuery(vvSimilarityQuery);
+  void setQuery(vvQueryInstance);
+
+  void setResult(vvQueryResult);
+
+  void setTracks(QList<vvTrack>);
+  void setTracks(std::vector<vvTrack>);
+
+  void setDescriptors(QList<vvDescriptor>);
+  void setDescriptors(std::vector<vvDescriptor>);
+
+  void clearData();
+
+  virtual void showTrackInfoDialog();
+  virtual void showDescriptorInfoDialog();
+
+protected slots:
+  virtual void showInfoDialog(QString uri);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvQueryInfoLabel)
+
+  void updateText();
+  virtual void changeEvent(QEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(vvQueryInfoLabel)
+  Q_DISABLE_COPY(vvQueryInfoLabel)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvQueryServerDialog.cxx b/Libraries/VvWidgets/vvQueryServerDialog.cxx
new file mode 100644
index 00000000..8d9f6f2e
--- /dev/null
+++ b/Libraries/VvWidgets/vvQueryServerDialog.cxx
@@ -0,0 +1,142 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvQueryServerDialog.h"
+#include "ui_vvQueryServerDialog.h"
+
+#include <QPushButton>
+
+#include <qtScopedValueChange.h>
+#include <qtUtil.h>
+
+#include "vvCustomQueryServerChooser.h"
+
+QTE_IMPLEMENT_D_FUNC(vvQueryServerDialog)
+
+namespace // anonymous
+{
+
+struct ChooserInfo
+{
+  QString displayName;
+  QRegExp schemes;
+  vvAbstractQueryServerChooser* chooser;
+};
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vvQueryServerDialogPrivate
+{
+public:
+  Ui::vvQueryServerDialog UI;
+  QList<ChooserInfo> choosers;
+  QUrl uri;
+};
+
+//-----------------------------------------------------------------------------
+vvQueryServerDialog::vvQueryServerDialog(QWidget* parent, Qt::WindowFlags f) :
+  QDialog(parent, f),
+  d_ptr(new vvQueryServerDialogPrivate)
+{
+  QTE_D(vvQueryServerDialog);
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  // Disable accepting with no valid URI
+  d->UI.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+  connect(d->UI.protocol, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(serverTypeChanged(int)));
+}
+
+//-----------------------------------------------------------------------------
+vvQueryServerDialog::~vvQueryServerDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+QUrl vvQueryServerDialog::uri() const
+{
+  QTE_D_CONST(vvQueryServerDialog);
+  return d->uri;
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryServerDialog::registerServerType(
+  const QString& displayName,
+  const QRegExp& supportedSchemes,
+  vvAbstractQueryServerChooser* chooser)
+{
+  QTE_D(vvQueryServerDialog);
+
+  ChooserInfo ci;
+  ci.displayName = displayName;
+  ci.schemes = supportedSchemes;
+  ci.chooser = chooser;
+  d->choosers.append(ci);
+
+  qtScopedBlockSignals b(d->UI.protocol);
+  d->UI.protocol->addItem(displayName);
+  d->UI.configurationStack->addWidget(chooser);
+
+  connect(chooser, SIGNAL(uriChanged(QUrl)),
+          this, SLOT(setUri(QUrl)));
+}
+
+//-----------------------------------------------------------------------------
+int vvQueryServerDialog::exec(const QUrl& initialUri)
+{
+  QTE_D(vvQueryServerDialog);
+
+  // Register 'custom' chooser
+  if (d->choosers.isEmpty() || d->choosers.last().schemes != QRegExp(".*"))
+    {
+    this->registerServerType("(custom)", QRegExp(".*"),
+                             new vvCustomQueryServerChooser);
+    }
+
+  // Select chooser based on initial URI
+  int k = d->choosers.count();
+  while (k--)
+    {
+    const ChooserInfo& ci = d->choosers[k];
+    ci.chooser->setUri(initialUri);
+    if (ci.schemes.exactMatch(initialUri.scheme()))
+      {
+      qtScopedBlockSignals b(d->UI.protocol);
+      d->UI.protocol->setCurrentIndex(k);
+      }
+    }
+  this->serverTypeChanged(d->UI.protocol->currentIndex());
+
+  return QDialog::exec();
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryServerDialog::serverTypeChanged(int newIndex)
+{
+  QTE_D(vvQueryServerDialog);
+
+  if (newIndex < 0 || newIndex > d->choosers.count())
+    {
+    return;
+    }
+
+  d->UI.configurationStack->setCurrentIndex(newIndex);
+  this->setUri(d->choosers[newIndex].chooser->uri());
+}
+
+//-----------------------------------------------------------------------------
+void vvQueryServerDialog::setUri(QUrl newUri)
+{
+  QTE_D(vvQueryServerDialog);
+  d->uri = newUri;
+
+  // Allow accepting if(f) URI is valid
+  QPushButton* okayButton = d->UI.buttonBox->button(QDialogButtonBox::Ok);
+  okayButton->setEnabled(newUri.isValid() && !newUri.isRelative());
+}
diff --git a/Libraries/VvWidgets/vvQueryServerDialog.h b/Libraries/VvWidgets/vvQueryServerDialog.h
new file mode 100644
index 00000000..778a7aa9
--- /dev/null
+++ b/Libraries/VvWidgets/vvQueryServerDialog.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvQueryServerDialog_h
+#define __vvQueryServerDialog_h
+
+#include <QDialog>
+#include <QUrl>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+class vvAbstractQueryServerChooser;
+
+class vvQueryServerDialogPrivate;
+
+class VV_WIDGETS_EXPORT vvQueryServerDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vvQueryServerDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
+  ~vvQueryServerDialog();
+
+  QUrl uri() const;
+
+  void registerServerType(const QString& displayName,
+                          const QRegExp& supportedSchemes,
+                          vvAbstractQueryServerChooser* chooser);
+
+  int exec(const QUrl& initialUri);
+
+protected slots:
+  void serverTypeChanged(int);
+  void setUri(QUrl);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvQueryServerDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vvQueryServerDialog)
+  Q_DISABLE_COPY(vvQueryServerDialog)
+
+  using QDialog::exec;
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvQueryServerDialog.ui b/Libraries/VvWidgets/vvQueryServerDialog.ui
new file mode 100644
index 00000000..48859c90
--- /dev/null
+++ b/Libraries/VvWidgets/vvQueryServerDialog.ui
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vvQueryServerDialog</class>
+ <widget class="QDialog" name="vvQueryServerDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>438</width>
+    <height>115</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Choose Query Server URI...</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QFormLayout" name="protocolLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="protocolLabel">
+       <property name="text">
+        <string>Server Type:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="protocol"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QStackedWidget" name="configurationStack">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="currentIndex">
+      <number>-1</number>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../Icons/vvwidgets.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vvQueryServerDialog</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>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vvQueryServerDialog</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>
diff --git a/Libraries/VvWidgets/vvScoreGradient.cxx b/Libraries/VvWidgets/vvScoreGradient.cxx
new file mode 100644
index 00000000..36fb57a4
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradient.cxx
@@ -0,0 +1,193 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvScoreGradient.h"
+
+#include <qtGradient.h>
+
+QTE_IMPLEMENT_D_FUNC(vvScoreGradient)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+qreal position(qreal previousThreshold, qreal currentThreshold, bool terminal)
+{
+  if (terminal)
+    {
+    return 1.0 - currentThreshold;
+    }
+  return 0.5 * ((1.0 - previousThreshold) + (1.0 - currentThreshold));
+}
+
+//-----------------------------------------------------------------------------
+qreal weight(qreal currentPosition, qreal nextPosition, qreal threshold)
+{
+  const qreal range = (nextPosition - currentPosition);
+  return ((1.0 - threshold) - currentPosition) / range;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+bool operator==(
+  const vvScoreGradient::Stop& a, const vvScoreGradient::Stop& b)
+{
+  return (a.threshold == b.threshold) &&
+         (a.color == b.color) &&
+         (a.text == b.text);
+}
+
+//-----------------------------------------------------------------------------
+bool operator<(
+  const vvScoreGradient::Stop& a, const vvScoreGradient::Stop& b)
+{
+  if (a.threshold > b.threshold)
+    {
+    return true;
+    }
+  if (a.threshold < b.threshold)
+    {
+    return false;
+    }
+  if (a.color.rgba() > b.color.rgba())
+    {
+    return true;
+    }
+  if (a.color.rgba() < b.color.rgba())
+    {
+    return false;
+    }
+  return QString::localeAwareCompare(a.text, b.text);
+}
+
+//-----------------------------------------------------------------------------
+class vvScoreGradientPrivate
+{
+public:
+  QList<vvScoreGradient::Stop> stops;
+};
+
+//-----------------------------------------------------------------------------
+vvScoreGradient::Stop::Stop() : threshold(0.0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradient::Stop::Stop(
+  const QString& text, const QColor& color, qreal threshold) :
+  text(text),
+  color(color),
+  threshold(threshold)
+{
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradient::vvScoreGradient() :
+  d_ptr(new vvScoreGradientPrivate)
+{
+  QTE_D(vvScoreGradient);
+  d->stops.append(Stop("Confirmed", Qt::green, 0.97));
+  d->stops.append(Stop("Probable", Qt::yellow, 0.34));
+  d->stops.append(Stop("Possible", Qt::red, 0.0));
+  qSort(d->stops);
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradient::~vvScoreGradient()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradient::vvScoreGradient(const QList<vvScoreGradient::Stop>& stops) :
+  d_ptr(new vvScoreGradientPrivate)
+{
+  QTE_D(vvScoreGradient);
+  d->stops = stops;
+  qSort(d->stops);
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradient::vvScoreGradient(const vvScoreGradient& other) :
+  d_ptr(new vvScoreGradientPrivate)
+{
+  QTE_D(vvScoreGradient);
+  d->stops = other.d_func()->stops;
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradient& vvScoreGradient::operator=(const vvScoreGradient& other)
+{
+  QTE_D(vvScoreGradient);
+  d->stops = other.d_func()->stops;
+  return *this;
+}
+
+//-----------------------------------------------------------------------------
+bool vvScoreGradient::operator==(const vvScoreGradient& other) const
+{
+  return this->stops() == other.stops();
+}
+
+//-----------------------------------------------------------------------------
+bool vvScoreGradient::operator!=(const vvScoreGradient& other) const
+{
+  return this->stops() != other.stops();
+}
+
+//-----------------------------------------------------------------------------
+qtGradient vvScoreGradient::gradient(qtGradient::InterpolationMode im) const
+{
+  QTE_D_CONST(vvScoreGradient);
+  const QList<Stop>& stops = d->stops;
+
+  qtGradient result;
+  result.setInterpolationMode(im);
+
+  // Handle edge cases (no stops, only one stop)
+  if (stops.empty())
+    {
+    return result;
+    }
+  else if (stops.count() == 1)
+    {
+    const QColor c = stops[0].color;
+    result.insertStop(0.0, c);
+    result.insertStop(1.0, c);
+    return result;
+    }
+
+  // Insert first stop
+  qreal t = stops[0].threshold, nt = stops[1].threshold;
+  qreal p = 0.0, np = position(t, nt, stops.count() == 2);
+  result.insertStop(p, stops[0].color, weight(p, np, t));
+
+  // Insert intermediary stops
+  for (int i = 1, k = stops.count() - 1; i < k; ++i)
+    {
+    t = stops[i].threshold; nt = stops[i + 1].threshold;
+    p = np; np = position(t, nt, i + 1 >= k);
+    result.insertStop(p, stops[i].color, weight(p, np, t));
+    }
+
+  // Insert final stop
+  result.insertStop(1.0, stops.last().color);
+
+  return result;
+}
+
+//-----------------------------------------------------------------------------
+QList<vvScoreGradient::Stop> vvScoreGradient::stops() const
+{
+  QTE_D_CONST(vvScoreGradient);
+  return d->stops;
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradient::setStops(const QList<vvScoreGradient::Stop>& stops)
+{
+  *this = vvScoreGradient(stops);
+}
diff --git a/Libraries/VvWidgets/vvScoreGradient.h b/Libraries/VvWidgets/vvScoreGradient.h
new file mode 100644
index 00000000..dbad7d22
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradient.h
@@ -0,0 +1,59 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvScoreGradient_h
+#define __vvScoreGradient_h
+
+#include <QColor>
+#include <QString>
+#include <QList>
+#include <QMetaType>
+
+#include <qtGlobal.h>
+#include <qtGradient.h>
+
+#include <vgExport.h>
+
+class vvScoreGradientPrivate;
+
+class VV_WIDGETS_EXPORT vvScoreGradient
+{
+public:
+  struct Stop
+    {
+    Stop();
+    Stop(const QString& text, const QColor& color, qreal threshold);
+
+    QString text;
+    QColor color;
+    qreal threshold;
+    };
+
+  explicit vvScoreGradient();
+  virtual ~vvScoreGradient();
+
+  vvScoreGradient(const QList<Stop>&);
+  vvScoreGradient(const vvScoreGradient&);
+  vvScoreGradient& operator=(const vvScoreGradient&);
+
+  bool operator==(const vvScoreGradient&) const;
+  bool operator!=(const vvScoreGradient&) const;
+
+  qtGradient gradient(qtGradient::InterpolationMode = 0) const;
+
+  QList<Stop> stops() const;
+  void setStops(const QList<Stop>&);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvScoreGradient)
+
+private:
+  QTE_DECLARE_PRIVATE(vvScoreGradient)
+};
+
+Q_DECLARE_METATYPE(vvScoreGradient)
+
+#endif
diff --git a/Libraries/VvWidgets/vvScoreGradientSetting.cxx b/Libraries/VvWidgets/vvScoreGradientSetting.cxx
new file mode 100644
index 00000000..95c14526
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradientSetting.cxx
@@ -0,0 +1,124 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvScoreGradientSetting.h"
+
+#include <QSet>
+#include <QSettings>
+#include <QStringList>
+
+#include <qtMath.h>
+#include <qtScopedSettingGroup.h>
+
+#include <vgColor.h>
+
+#include "vvScoreGradient.h"
+
+//-----------------------------------------------------------------------------
+qtSettings::Scope vvScoreGradientSetting::scope() const
+{
+  return qtSettings::UserScope | qtSettings::ApplicationScope;
+}
+
+//-----------------------------------------------------------------------------
+QString vvScoreGradientSetting::key() const
+{
+  return "ScoreColors";
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientSetting::initialize(const QSettings& store)
+{
+  QSet<QString> stopIds;
+  QList<vvScoreGradient::Stop> stops;
+
+  // Find entries in our group (can't use beginGroup on const QSettings)
+  const QString tag = this->key() + '/';
+  foreach (QString key, store.allKeys())
+    {
+    // Test for membership in our group
+    if (key.startsWith(tag) && key.count('/') == 2)
+      {
+      // Extract stop key
+      const QString sid = key.left(key.lastIndexOf('/') + 1);
+
+      // Read stop
+      if (!stopIds.contains(sid))
+        {
+        vvScoreGradient::Stop stop;
+
+        stop.text = store.value(sid + "Name").toString();
+        stop.threshold = store.value(sid + "Threshold", -1).toReal();
+        const vgColor noColor(Qt::transparent);
+        stop.color = vgColor::read(store, sid + "Color", noColor).toQColor();
+
+        // Check if stop is valid
+        if (!stop.text.isEmpty() && stop.color != Qt::transparent &&
+            qIsFinite(stop.threshold) && stop.threshold >= 0.0)
+          {
+          // Stop is valid; add to list
+          stops.append(stop);
+          }
+
+        // Don't try to read this stop again
+        stopIds.insert(sid);
+        }
+      }
+    }
+
+  // Generate gradient (initialized to default in case we didn't read anything)
+  vvScoreGradient gradient;
+  if (!stops.empty())
+    {
+    // At least one valid stop was read from the store; replace default
+    // gradient with one generated from the read stops
+    gradient.setStops(stops);
+    }
+
+  // Finish initialization
+  this->originalValue = QVariant::fromValue(gradient);
+  qtAbstractSetting::initialize(store);
+}
+
+//-----------------------------------------------------------------------------
+bool vvScoreGradientSetting::isModified()
+{
+  if (this->currentValue.canConvert<vvScoreGradient>() &&
+      this->originalValue.canConvert<vvScoreGradient>())
+    {
+    const vvScoreGradient original =
+      this->originalValue.value<vvScoreGradient>();
+    const vvScoreGradient current =
+      this->currentValue.value<vvScoreGradient>();
+    return original != current;
+    }
+
+  return qtAbstractSetting::isModified();
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientSetting::commit(QSettings& store)
+{
+  vvScoreGradient gradient = this->currentValue.value<vvScoreGradient>();
+
+  // Erase old value
+  store.remove(this->key());
+  qtScopedSettingGroup g(store, this->key());
+
+  // Write new stops
+  int counter = 0;
+  foreach (const vvScoreGradient::Stop& stop, gradient.stops())
+    {
+    qtScopedSettingGroup sg(store, QString::number(++counter));
+    store.setValue("Name", stop.text);
+    store.setValue("Threshold", stop.threshold);
+    vgColor(stop.color).write(store, "Color");
+    }
+
+  // Mark as committed
+  this->originalValue = this->currentValue;
+  this->modified = false;
+}
diff --git a/Libraries/VvWidgets/vvScoreGradientSetting.h b/Libraries/VvWidgets/vvScoreGradientSetting.h
new file mode 100644
index 00000000..e0cb5245
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradientSetting.h
@@ -0,0 +1,27 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvScoreGradientSetting_h
+#define __vvScoreGradientSetting_h
+
+#include <qtAbstractSetting.h>
+
+#include <vgExport.h>
+
+class VV_WIDGETS_EXPORT vvScoreGradientSetting : public qtAbstractSetting
+{
+public:
+  virtual qtSettings::Scope scope() const;
+
+  virtual bool isModified();
+  virtual void commit(QSettings& store);
+
+protected:
+  virtual void initialize(const QSettings& store);
+  virtual QString key() const;
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvScoreGradientStopTree.cxx b/Libraries/VvWidgets/vvScoreGradientStopTree.cxx
new file mode 100644
index 00000000..1b057111
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradientStopTree.cxx
@@ -0,0 +1,161 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvScoreGradientStopTree.h"
+
+#include <QColorDialog>
+
+#include <qtDoubleSpinBoxDelegate.h>
+#include <qtScopedValueChange.h>
+
+#include <vgCheckArg.h>
+
+#include <vgSwatchCache.h>
+
+QTE_IMPLEMENT_D_FUNC(vvScoreGradientStopTree)
+
+//-----------------------------------------------------------------------------
+class vvScoreGradientStopTreePrivate
+{
+public:
+  void buildTree(vvScoreGradientStopTree* q) const;
+
+  vgSwatchCache swatches;
+  vvScoreGradient stops;
+};
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientStopTreePrivate::buildTree(
+  vvScoreGradientStopTree* q) const
+{
+  qtScopedBlockSignals bs(q);
+  qtDelayTreeSorting ds(q);
+
+  q->clear();
+
+  foreach (vvScoreGradient::Stop stop, this->stops.stops())
+    {
+    QTreeWidgetItem* item = new QTreeWidgetItem;
+    item->setText(0, stop.text);
+    item->setIcon(1, this->swatches.swatch(stop.color));
+    item->setText(2, QString::number(stop.threshold, 'f', 2));
+    item->setData(1, Qt::UserRole, stop.color);
+    item->setData(2, Qt::UserRole, stop.threshold);
+    item->setFlags(item->flags() | Qt::ItemIsEditable);
+    q->addTopLevelItem(item);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradientStopTree::vvScoreGradientStopTree(QWidget* parent) :
+  QTreeWidget(parent),
+  d_ptr(new vvScoreGradientStopTreePrivate)
+{
+  QTE_D(vvScoreGradientStopTree);
+
+  QStringList headers;
+  headers << "Text" << "Color" << "Threshold";
+  this->setHeaderLabels(headers);
+  this->sortByColumn(2, Qt::DescendingOrder);
+
+  d->buildTree(this);
+
+  qtDoubleSpinBoxDelegate* delegate = new qtDoubleSpinBoxDelegate(this);
+  this->setItemDelegateForColumn(2, delegate);
+  delegate->setRange(0.0, 1.0);
+  delegate->setPrecision(2);
+  delegate->setDataRole(Qt::UserRole);
+
+  connect(this, SIGNAL(itemChanged(QTreeWidgetItem*, int)),
+          this, SLOT(recomputeStops()));
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradientStopTree::~vvScoreGradientStopTree()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradient vvScoreGradientStopTree::stops() const
+{
+  QTE_D_CONST(vvScoreGradientStopTree);
+  return d->stops;
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientStopTree::setStops(vvScoreGradient newStops)
+{
+  QTE_D(vvScoreGradientStopTree);
+
+  CHECK_ARG(newStops != d->stops);
+
+  d->stops = newStops;
+  d->buildTree(this);
+
+  emit this->stopsChanged(d->stops);
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientStopTree::addStop()
+{
+  // \TODO
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientStopTree::removeSelectedStops()
+{
+  // \TODO
+}
+
+//-----------------------------------------------------------------------------
+bool vvScoreGradientStopTree::edit(
+  const QModelIndex& index, QAbstractItemView::EditTrigger trigger, QEvent* e)
+{
+  if (index.column() == 1 &&
+      (trigger == QAbstractItemView::DoubleClicked ||
+       trigger == QAbstractItemView::EditKeyPressed))
+    {
+    QColorDialog chooser(this);
+    chooser.setCurrentColor(index.data(Qt::UserRole).value<QColor>());
+    if (chooser.exec() == QDialog::Accepted)
+      {
+      QTE_D(vvScoreGradientStopTree);
+
+      QTreeWidgetItem* item = this->itemFromIndex(index);
+      const QColor color = chooser.currentColor();
+
+      item->setIcon(1, d->swatches.swatch(color));
+      item->setData(1, Qt::UserRole, color);
+
+      this->recomputeStops();
+      }
+    return false;
+    }
+
+  return QTreeWidget::edit(index, trigger, e);
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientStopTree::recomputeStops()
+{
+  QTE_D(vvScoreGradientStopTree);
+
+  QList<vvScoreGradient::Stop> newStops;
+  foreach_child (QTreeWidgetItem* item, this->invisibleRootItem())
+    {
+    vvScoreGradient::Stop stop;
+    stop.text = item->text(0);
+    stop.color = item->data(1, Qt::UserRole).value<QColor>();
+    stop.threshold = item->data(2, Qt::UserRole).toReal();
+    newStops.append(stop);
+    }
+
+  if (d->stops != newStops)
+    {
+    d->stops = newStops;
+    emit this->stopsChanged(newStops);
+    }
+}
diff --git a/Libraries/VvWidgets/vvScoreGradientStopTree.h b/Libraries/VvWidgets/vvScoreGradientStopTree.h
new file mode 100644
index 00000000..30af6f45
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradientStopTree.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvScoreGradientStopTree_h
+#define __vvScoreGradientStopTree_h
+
+#include <QTreeWidget>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include "vvScoreGradient.h"
+
+class vvScoreGradientStopTreePrivate;
+
+//-----------------------------------------------------------------------------
+class VV_WIDGETS_EXPORT vvScoreGradientStopTree : public QTreeWidget
+{
+  Q_OBJECT
+
+public:
+  explicit vvScoreGradientStopTree(QWidget* parent = 0);
+  virtual ~vvScoreGradientStopTree();
+
+  vvScoreGradient stops() const;
+
+signals:
+  void stopsChanged(vvScoreGradient);
+
+public slots:
+  void setStops(vvScoreGradient);
+
+  void addStop();
+  void removeSelectedStops();
+
+protected slots:
+  void recomputeStops();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvScoreGradientStopTree)
+
+  virtual bool edit(const QModelIndex&, EditTrigger, QEvent*);
+
+private:
+  QTE_DECLARE_PRIVATE(vvScoreGradientStopTree)
+  Q_DISABLE_COPY(vvScoreGradientStopTree)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvScoreGradientWidget.cxx b/Libraries/VvWidgets/vvScoreGradientWidget.cxx
new file mode 100644
index 00000000..c352d3de
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradientWidget.cxx
@@ -0,0 +1,113 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvScoreGradientWidget.h"
+#include "ui_vvScoreGradientWidget.h"
+
+QTE_IMPLEMENT_D_FUNC(vvScoreGradientWidget)
+
+//-----------------------------------------------------------------------------
+class vvScoreGradientWidgetPrivate
+{
+public:
+  Ui::vvScoreGradientWidget UI;
+  vvScoreGradient gradient;
+};
+
+//-----------------------------------------------------------------------------
+vvScoreGradientWidget::vvScoreGradientWidget(QWidget* parent) :
+  QWidget(parent),
+  d_ptr(new vvScoreGradientWidgetPrivate)
+{
+  QTE_REGISTER_METATYPE(vvScoreGradient);
+
+  QTE_D(vvScoreGradientWidget);
+  d->UI.setupUi(this);
+
+  d->UI.stops->setStops(this->stops());
+  d->UI.gradient->setGradient(this->gradient());
+
+  connect(d->UI.interpolationMode, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(updatePreview()));
+  connect(d->UI.stops, SIGNAL(stopsChanged(vvScoreGradient)),
+          this, SLOT(setStops(vvScoreGradient)));
+
+  // FIXME: adding/removing stops not implemented yet
+  d->UI.addStop->setEnabled(false);
+  d->UI.removeStop->setEnabled(false);
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradientWidget::~vvScoreGradientWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+qtGradient vvScoreGradientWidget::gradient() const
+{
+  return this->stops().gradient(this->interpolationMode());
+}
+
+//-----------------------------------------------------------------------------
+vvScoreGradient vvScoreGradientWidget::stops() const
+{
+  QTE_D_CONST(vvScoreGradientWidget);
+  return d->gradient;
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientWidget::setStops(vvScoreGradient newStops)
+{
+  QTE_D(vvScoreGradientWidget);
+  if (d->gradient != newStops)
+    {
+    d->gradient = newStops;
+    d->UI.stops->setStops(newStops);
+    d->UI.gradient->setGradient(this->gradient());
+    emit this->stopsChanged(newStops);
+    }
+}
+
+//-----------------------------------------------------------------------------
+qtGradient::InterpolationMode vvScoreGradientWidget::interpolationMode() const
+{
+  QTE_D_CONST(vvScoreGradientWidget);
+  switch (d->UI.interpolationMode->currentIndex())
+    {
+    case 1:
+      return qtGradient::InterpolateLinear;
+    case 2:
+      return qtGradient::InterpolateCubic;
+    default:
+      return qtGradient::InterpolateDiscrete;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientWidget::setInterpolationMode(
+  qtGradient::InterpolationMode mode)
+{
+  QTE_D(vvScoreGradientWidget);
+  switch (mode & qtGradient::InterpolateFunctionMask)
+    {
+    case qtGradient::InterpolateLinear:
+      d->UI.interpolationMode->setCurrentIndex(1);
+      break;
+    case qtGradient::InterpolateCubic:
+      d->UI.interpolationMode->setCurrentIndex(2);
+      break;
+    default:
+      d->UI.interpolationMode->setCurrentIndex(0);
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvScoreGradientWidget::updatePreview()
+{
+  QTE_D(vvScoreGradientWidget);
+  d->UI.gradient->setGradient(this->gradient());
+}
diff --git a/Libraries/VvWidgets/vvScoreGradientWidget.h b/Libraries/VvWidgets/vvScoreGradientWidget.h
new file mode 100644
index 00000000..48f2a8f9
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradientWidget.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvScoreGradientWidget_h
+#define __vvScoreGradientWidget_h
+
+#include <QWidget>
+
+#include <qtGlobal.h>
+#include <qtGradient.h>
+
+#include <vgExport.h>
+
+#include "vvScoreGradient.h"
+
+class vvScoreGradientWidgetPrivate;
+
+class VV_WIDGETS_EXPORT vvScoreGradientWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit vvScoreGradientWidget(QWidget* parent = 0);
+  virtual ~vvScoreGradientWidget();
+
+  qtGradient gradient() const;
+
+  vvScoreGradient stops() const;
+
+  qtGradient::InterpolationMode interpolationMode() const;
+  void setInterpolationMode(qtGradient::InterpolationMode);
+
+signals:
+  void stopsChanged(vvScoreGradient);
+
+public slots:
+  void setStops(vvScoreGradient);
+
+protected slots:
+  void updatePreview();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvScoreGradientWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(vvScoreGradientWidget)
+  Q_DISABLE_COPY(vvScoreGradientWidget)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvScoreGradientWidget.ui b/Libraries/VvWidgets/vvScoreGradientWidget.ui
new file mode 100644
index 00000000..50677ff9
--- /dev/null
+++ b/Libraries/VvWidgets/vvScoreGradientWidget.ui
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vvScoreGradientWidget</class>
+ <widget class="QWidget" name="vvScoreGradientWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>209</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="4">
+    <widget class="qtGradientWidget" name="gradient" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>24</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QComboBox" name="interpolationMode">
+     <item>
+      <property name="text">
+       <string>Discrete</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Smooth (Linear)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Smooth (Cubic)</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>47</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="2">
+    <widget class="QPushButton" name="addStop">
+     <property name="text">
+      <string>Add Stop</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../Icons/vvwidgets.qrc">
+       <normaloff>:/icons/16x16/add</normaloff>:/icons/16x16/add</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3">
+    <widget class="QPushButton" name="removeStop">
+     <property name="text">
+      <string>Remove Stop</string>
+     </property>
+     <property name="icon">
+      <iconset resource="../../Icons/vvwidgets.qrc">
+       <normaloff>:/icons/16x16/delete</normaloff>:/icons/16x16/delete</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="4">
+    <widget class="vvScoreGradientStopTree" name="stops">
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtGradientWidget</class>
+   <extends>QWidget</extends>
+   <header location="global">qtGradientWidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>vvScoreGradientStopTree</class>
+   <extends>QTreeWidget</extends>
+   <header>vvScoreGradientStopTree.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="../../Icons/vvwidgets.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Libraries/VvWidgets/vvTrackInfoDialog.cxx b/Libraries/VvWidgets/vvTrackInfoDialog.cxx
new file mode 100644
index 00000000..3c44f941
--- /dev/null
+++ b/Libraries/VvWidgets/vvTrackInfoDialog.cxx
@@ -0,0 +1,174 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvTrackInfoDialog.h"
+#include "ui_vvTrackInfoDialog.h"
+
+#include <qtScopedValueChange.h>
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vgCheckArg.h>
+
+QTE_IMPLEMENT_D_FUNC(vvTrackInfoDialog)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+QTreeWidgetItem* createTrackItem(const vvTrack& track)
+{
+  QTreeWidgetItem* item = new QTreeWidgetItem;
+  item->setText(0, QString::number(track.Id.Source));
+  item->setText(1, QString::number(track.Id.SerialNumber));
+
+  QString bestClassification;
+  double bestScore = -1.0;
+  foreach_iter (vvTrackObjectClassification::const_iterator,
+                iter, track.Classification)
+    {
+    if (iter->second > bestScore)
+      {
+      bestClassification = qtString(iter->first);
+      bestScore = iter->second;
+      }
+    else if (iter->second == bestScore)
+      {
+      bestClassification += " / " + qtString(iter->first);
+      }
+    }
+  item->setText(2, bestClassification);
+
+  return item;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vvTrackInfoDialogPrivate
+{
+public:
+  Ui::vvTrackInfoDialog UI;
+  QHash<qint64, vvTrack> tracks;
+};
+
+//-----------------------------------------------------------------------------
+vvTrackInfoDialog::vvTrackInfoDialog(QWidget* parent, Qt::WindowFlags f)
+  : QDialog(parent, f), d_ptr(new vvTrackInfoDialogPrivate)
+{
+  QTE_D(vvTrackInfoDialog);
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  connect(d->UI.toggleDetails, SIGNAL(toggled(bool)),
+          this, SLOT(toggleDetails(bool)));
+  connect(d->UI.trackTree, SIGNAL(itemSelectionChanged()),
+          this, SLOT(showDetails()));
+
+  d->UI.detailsPane->setVisible(d->UI.toggleDetails->isChecked());
+  this->showDetails();
+}
+
+//-----------------------------------------------------------------------------
+vvTrackInfoDialog::~vvTrackInfoDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+QList<vvTrack> vvTrackInfoDialog::tracks() const
+{
+  QTE_D_CONST(vvTrackInfoDialog);
+  return d->tracks.values();
+}
+
+//-----------------------------------------------------------------------------
+void vvTrackInfoDialog::setTracks(QList<vvTrack> newTracks)
+{
+  QTE_D(vvTrackInfoDialog);
+
+  d->tracks.clear();
+  d->UI.trackTree->clear();
+  qtDelayTreeSorting dts(d->UI.trackTree);
+
+  QList<qint64> ids;
+  qint64 n = 0;
+  foreach (const vvTrack& track, newTracks)
+    {
+    QTreeWidgetItem* item = createTrackItem(track);
+    item->setData(0, Qt::UserRole, n);
+    d->UI.trackTree->addTopLevelItem(item);
+
+    d->tracks.insert(n, track);
+    ids.append(n++);
+    }
+
+  qtUtil::resizeColumnsToContents(d->UI.trackTree);
+}
+
+//-----------------------------------------------------------------------------
+void vvTrackInfoDialog::setTracks(std::vector<vvTrack> v)
+{
+  this->setTracks(qtList(v));
+}
+
+//-----------------------------------------------------------------------------
+void vvTrackInfoDialog::clearTracks()
+{
+  this->setTracks(QList<vvTrack>());
+}
+
+//-----------------------------------------------------------------------------
+void vvTrackInfoDialog::showDetails()
+{
+  QTE_D(vvTrackInfoDialog);
+
+  QList<vvTrack> tracks;
+  foreach (QTreeWidgetItem* item, d->UI.trackTree->selectedItems())
+    {
+    qint64 id = item->data(0, Qt::UserRole).toLongLong();
+    if (d->tracks.contains(id))
+      {
+      tracks.append(d->tracks[id]);
+      }
+    }
+
+  if (tracks.isEmpty())
+    {
+    d->UI.detailsPane->setCurrentWidget(d->UI.detailsMessage);
+    d->UI.detailsSummary->setText("No track selected");
+    }
+  else if (tracks.count() > 1)
+    {
+    d->UI.detailsPane->setCurrentWidget(d->UI.detailsMessage);
+    d->UI.detailsSummary->setText("Multiple tracks selected");
+    }
+  else
+    {
+    d->UI.detailsPane->setCurrentWidget(d->UI.trackDetails);
+    d->UI.trackDetails->setTrack(tracks.first());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vvTrackInfoDialog::toggleDetails(bool detailsVisible)
+{
+  QTE_D(vvTrackInfoDialog);
+  CHECK_ARG(d->UI.detailsPane->isVisible() != detailsVisible);
+
+  QSize newSize = this->size();
+  QSize detailsSize = d->UI.trackDetails->size();
+  if (detailsVisible)
+    {
+    d->UI.detailsPane->setVisible(true);
+    newSize.setHeight(newSize.height() + detailsSize.height());
+    }
+  else
+    {
+    newSize.setHeight(newSize.height() - detailsSize.height());
+    d->UI.detailsPane->setVisible(false);
+    }
+  this->resize(newSize);
+}
diff --git a/Libraries/VvWidgets/vvTrackInfoDialog.h b/Libraries/VvWidgets/vvTrackInfoDialog.h
new file mode 100644
index 00000000..c4d23ebd
--- /dev/null
+++ b/Libraries/VvWidgets/vvTrackInfoDialog.h
@@ -0,0 +1,47 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvTrackInfoDialog_h
+#define __vvTrackInfoDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvTrack.h>
+
+class vvTrackInfoDialogPrivate;
+
+class VV_WIDGETS_EXPORT vvTrackInfoDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit vvTrackInfoDialog(QWidget* parent = 0, Qt::WindowFlags f = 0);
+  virtual ~vvTrackInfoDialog();
+
+  QList<vvTrack> tracks() const;
+
+public slots:
+  void setTracks(QList<vvTrack>);
+  void setTracks(std::vector<vvTrack>);
+  void clearTracks();
+
+protected slots:
+  void toggleDetails(bool);
+  void showDetails();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvTrackInfoDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vvTrackInfoDialog)
+  Q_DISABLE_COPY(vvTrackInfoDialog)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvTrackInfoDialog.ui b/Libraries/VvWidgets/vvTrackInfoDialog.ui
new file mode 100644
index 00000000..3319360a
--- /dev/null
+++ b/Libraries/VvWidgets/vvTrackInfoDialog.ui
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vvTrackInfoDialog</class>
+ <widget class="QDialog" name="vvTrackInfoDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>273</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Tracks</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QTreeWidget" name="trackTree">
+     <property name="editTriggers">
+      <set>QAbstractItemView::NoEditTriggers</set>
+     </property>
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <property name="uniformRowHeights">
+      <bool>true</bool>
+     </property>
+     <property name="allColumnsShowFocus">
+      <bool>true</bool>
+     </property>
+     <column>
+      <property name="text">
+       <string>Source</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Serial Number</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Classification</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="qtExpander" name="toggleDetails">
+     <property name="text">
+      <string>Details</string>
+     </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QStackedWidget" name="detailsPane">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="vvTrackInfoWidget" name="trackDetails">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+     <widget class="QWidget" name="detailsMessage">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <widget class="QLabel" name="detailsSummary">
+         <property name="text">
+          <string>Notice</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignBottom|Qt::AlignHCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="detailsNote">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="text">
+          <string>Select a track to view detailed track information.</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>qtExpander</class>
+   <extends>QToolButton</extends>
+   <header location="global">qtExpander.h</header>
+  </customwidget>
+  <customwidget>
+   <class>vvTrackInfoWidget</class>
+   <extends>QTabWidget</extends>
+   <header>vvTrackInfoWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>clicked(QAbstractButton*)</signal>
+   <receiver>vvTrackInfoDialog</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>
+ </connections>
+</ui>
diff --git a/Libraries/VvWidgets/vvTrackInfoWidget.cxx b/Libraries/VvWidgets/vvTrackInfoWidget.cxx
new file mode 100644
index 00000000..ef4506d5
--- /dev/null
+++ b/Libraries/VvWidgets/vvTrackInfoWidget.cxx
@@ -0,0 +1,153 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvTrackInfoWidget.h"
+#include "ui_vvTrackInfoWidget.h"
+
+#include <QDateTime>
+
+#include <qtNumericTreeWidgetItem.h>
+#include <qtScopedValueChange.h>
+#include <qtStlUtil.h>
+#include <qtUtil.h>
+
+#include <vgUnixTime.h>
+
+QTE_IMPLEMENT_D_FUNC(vvTrackInfoWidget)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+void makeTransparent(QLineEdit* widget)
+{
+  widget->setForegroundRole(QPalette::WindowText);
+  qtUtil::makeTransparent(widget);
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vvTrackInfoWidgetPrivate
+{
+public:
+  Ui::vvTrackInfoWidget UI;
+};
+
+//-----------------------------------------------------------------------------
+vvTrackInfoWidget::vvTrackInfoWidget(QWidget* parent) :
+  QTabWidget(parent),
+  d_ptr(new vvTrackInfoWidgetPrivate)
+{
+  QTE_D(vvTrackInfoWidget);
+  d->UI.setupUi(this);
+
+  makeTransparent(d->UI.source);
+  makeTransparent(d->UI.serial);
+  makeTransparent(d->UI.tocCount);
+  makeTransparent(d->UI.statesCount);
+  makeTransparent(d->UI.timeStart);
+  makeTransparent(d->UI.timeEnd);
+  makeTransparent(d->UI.timeDuration);
+
+  d->UI.tocEntries->sortByColumn(1, Qt::DescendingOrder);
+  d->UI.trajectoryStates->sortByColumn(0, Qt::AscendingOrder);
+}
+
+//-----------------------------------------------------------------------------
+vvTrackInfoWidget::~vvTrackInfoWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vvTrackInfoWidget::setTrack(vvTrack newTrack)
+{
+  QTE_D(vvTrackInfoWidget);
+
+  // Summary
+  d->UI.source->setText(QString::number(newTrack.Id.Source));
+  d->UI.serial->setText(QString::number(newTrack.Id.SerialNumber));
+
+  // Time
+  if (newTrack.Trajectory.size())
+    {
+    vgUnixTime ts(newTrack.Trajectory.begin()->TimeStamp.Time);
+    vgUnixTime te(newTrack.Trajectory.rbegin()->TimeStamp.Time);
+    vgUnixTime td(te.toInt64() - ts.toInt64());
+    d->UI.timeStart->setText(ts.timeString());
+    d->UI.timeEnd->setText(te.timeString());
+    d->UI.timeDuration->setText(td.timeString());
+    }
+  else
+    {
+    d->UI.timeStart->setText("(n/a)");
+    d->UI.timeEnd->setText("(n/a)");
+    d->UI.timeDuration->setText("(n/a)");
+    }
+
+  // Data overview
+  d->UI.tocCount->setText(QString::number(newTrack.Classification.size()));
+  d->UI.statesCount->setText(QString::number(newTrack.Trajectory.size()));
+
+  // Classification
+  qtDelayTreeSorting cds(d->UI.tocEntries);
+  d->UI.tocEntries->clear();
+  foreach_iter (vvTrackObjectClassification::const_iterator,
+                iter, newTrack.Classification)
+    {
+    qtNumericTreeWidgetItem* item = new qtNumericTreeWidgetItem;
+    item->setText(0, qtString(iter->first));
+    item->setValue(1, iter->second);
+    d->UI.tocEntries->addTopLevelItem(item);
+    }
+  qtUtil::resizeColumnsToContents(d->UI.tocEntries);
+
+  // Trajectory states
+  qtDelayTreeSorting tds(d->UI.trajectoryStates);
+  d->UI.trajectoryStates->clear();
+  const QString rf = QString::fromUtf8("%1,%2 %3\xc3\x97%4");
+  const QString pf = "%1, %2";
+  const QString wf = "%1:%2E,%3N";
+  foreach_iter (vvTrackTrajectory::const_iterator, iter, newTrack.Trajectory)
+    {
+    QTreeWidgetItem* item = new QTreeWidgetItem;
+    item->setText(0, vgUnixTime(iter->TimeStamp.Time).timeString());
+
+    const vvImagePointF& ip = iter->ImagePoint;
+    const vvImagePoint& tl = iter->ImageBox.TopLeft;
+    const vvImagePoint& br = iter->ImageBox.BottomRight;
+    item->setText(1, pf.arg(ip.X).arg(ip.Y));
+    item->setText(2, rf.arg(tl.X).arg(tl.Y)
+                       .arg(1 + br.X - tl.X).arg(1 + br.Y - tl.Y));
+
+    // Add image object
+    for (size_t n = 0, k = iter->ImageObject.size(); n < k; ++n)
+      {
+      QTreeWidgetItem* pitem = new QTreeWidgetItem;
+      pitem->setText(0, QString("Image Object Point %1").arg(n));
+
+      const vvImagePointF& op = iter->ImageObject[n];
+      pitem->setText(1, pf.arg(op.X).arg(op.Y));
+
+      item->addChild(pitem);
+      }
+
+    // Add world location
+    if (iter->WorldLocation.GCS != -1)
+      {
+      QTreeWidgetItem* pitem = new QTreeWidgetItem;
+      pitem->setText(0, "World Location");
+
+      const vgGeocodedCoordinate& w = iter->WorldLocation;
+      pitem->setText(1, wf.arg(w.GCS).arg(w.Easting).arg(w.Northing));
+
+      item->addChild(pitem);
+      }
+
+    d->UI.trajectoryStates->addTopLevelItem(item);
+    }
+  qtUtil::resizeColumnsToContents(d->UI.trajectoryStates);
+}
diff --git a/Libraries/VvWidgets/vvTrackInfoWidget.h b/Libraries/VvWidgets/vvTrackInfoWidget.h
new file mode 100644
index 00000000..59d99ce8
--- /dev/null
+++ b/Libraries/VvWidgets/vvTrackInfoWidget.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvTrackInfoWidget_h
+#define __vvTrackInfoWidget_h
+
+#include <QTabWidget>
+
+#include <qtGlobal.h>
+
+#include <vgExport.h>
+
+#include <vvTrack.h>
+
+class vvTrackInfoWidgetPrivate;
+
+class VV_WIDGETS_EXPORT vvTrackInfoWidget : public QTabWidget
+{
+  Q_OBJECT
+
+public:
+  explicit vvTrackInfoWidget(QWidget* parent = 0);
+  virtual ~vvTrackInfoWidget();
+
+public slots:
+  void setTrack(vvTrack);
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvTrackInfoWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(vvTrackInfoWidget)
+  Q_DISABLE_COPY(vvTrackInfoWidget)
+};
+
+#endif
diff --git a/Libraries/VvWidgets/vvTrackInfoWidget.ui b/Libraries/VvWidgets/vvTrackInfoWidget.ui
new file mode 100644
index 00000000..a9b3ca85
--- /dev/null
+++ b/Libraries/VvWidgets/vvTrackInfoWidget.ui
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vvTrackInfoWidget</class>
+ <widget class="QTabWidget" name="vvTrackInfoWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>462</width>
+    <height>232</height>
+   </rect>
+  </property>
+  <property name="currentIndex">
+   <number>0</number>
+  </property>
+  <widget class="QWidget" name="summaryTab">
+   <attribute name="title">
+    <string>Summary</string>
+   </attribute>
+   <layout class="QGridLayout" name="summaryLayout">
+    <item row="0" column="0">
+     <layout class="QFormLayout" name="nameLayout">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::ExpandingFieldsGrow</enum>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="sourceLabel">
+        <property name="text">
+         <string>Source:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="source">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="serialLabel">
+        <property name="text">
+         <string>Serial Number:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="serial">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="3" column="0" colspan="2">
+     <spacer name="verticalSpacer">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>40</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="1" column="0" colspan="2">
+     <widget class="Line" name="line">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item row="2" column="0" colspan="2">
+     <layout class="QFormLayout" name="timeLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="timeStartLabel">
+        <property name="text">
+         <string>Time (Start):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="timeStart">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="timeEndLabel">
+        <property name="text">
+         <string>Time (End):</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="timeEnd">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="timeDurationLabel">
+        <property name="text">
+         <string>Duration:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLineEdit" name="timeDuration">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item row="0" column="1">
+     <layout class="QFormLayout" name="dataLayout">
+      <property name="fieldGrowthPolicy">
+       <enum>QFormLayout::ExpandingFieldsGrow</enum>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="tocCountLabel">
+        <property name="text">
+         <string>Classification Entries:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="tocCount">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="statesCountLabel">
+        <property name="text">
+         <string>Trajectory States:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QLineEdit" name="statesCount">
+        <property name="frame">
+         <bool>false</bool>
+        </property>
+        <property name="readOnly">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="tocTab">
+   <attribute name="title">
+    <string>Classification</string>
+   </attribute>
+   <layout class="QVBoxLayout" name="valueLayout">
+    <item>
+     <widget class="QTreeWidget" name="tocEntries">
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::ExtendedSelection</enum>
+      </property>
+      <property name="uniformRowHeights">
+       <bool>true</bool>
+      </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
+      </property>
+      <property name="allColumnsShowFocus">
+       <bool>true</bool>
+      </property>
+      <column>
+       <property name="text">
+        <string notr="true">Identifier</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Probability</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="trajectoryTab">
+   <attribute name="title">
+    <string>Trajectory</string>
+   </attribute>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QTreeWidget" name="trajectoryStates">
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
+      <property name="selectionMode">
+       <enum>QAbstractItemView::ExtendedSelection</enum>
+      </property>
+      <property name="uniformRowHeights">
+       <bool>true</bool>
+      </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
+      </property>
+      <property name="allColumnsShowFocus">
+       <bool>true</bool>
+      </property>
+      <column>
+       <property name="text">
+        <string>Time</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Location</string>
+       </property>
+      </column>
+      <column>
+       <property name="text">
+        <string>Region</string>
+       </property>
+      </column>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Modules/CMakeLists.txt b/Modules/CMakeLists.txt
new file mode 100644
index 00000000..cb2113d6
--- /dev/null
+++ b/Modules/CMakeLists.txt
@@ -0,0 +1,12 @@
+vg_install_files_with_prefix(
+  visgui/__init__.py
+  visgui/core/__init__.py
+  visgui/core/QueryService.py
+  visgui/core/VideoPlayer.py
+  visgui/testing/__init__.py
+  visgui/testing/VtkTest.py
+  visgui/web/__init__.py
+  visgui/web/ParaViewServer.py
+  TARGET PythonModules
+  DESTINATION lib/${PYTHON_SHORT}/site-packages
+)
diff --git a/Modules/visgui/__init__.py b/Modules/visgui/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/Modules/visgui/core/QueryService.py b/Modules/visgui/core/QueryService.py
new file mode 100644
index 00000000..3990a2db
--- /dev/null
+++ b/Modules/visgui/core/QueryService.py
@@ -0,0 +1,123 @@
+#ckwg +4
+# Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+# KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+# Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+
+from vgDataFrameworkPython import *
+from vvIOPython import *
+
+#==============================================================================
+class QueryService:
+  #----------------------------------------------------------------------------
+  def __init__(self):
+    self._completed = False
+    self._node = None
+    self._message = ''
+
+  #----------------------------------------------------------------------------
+  def ExecuteQuery(self, service, plan, workingSetSize):
+    if type(plan) is str or type(plan) is unicode:
+      reader = vvReader()
+      header = vvHeader()
+
+      if not reader.setInput(plan):
+        self.SetStatus('Failed to parse query plan: KST syntax error')
+        return False
+
+      if not reader.readHeader(header):
+        self.SetStatus('Failed to parse query plan: error reading header')
+        return False
+
+      if not header.isValid():
+        self.SetStatus('Failed to parse query plan: invalid header')
+        return False
+
+      if not header.type == vvHeader.QueryPlan:
+        self.SetStatus('Failed to parse query plan: header mismatch')
+        return False
+
+      plan = vvQueryInstance()
+      if not reader.readQueryPlan(plan):
+        self.SetStatus('Failed to parse query plan')
+        return False
+
+    self._node = vdfQuerySessionNode(service)
+    self._node.resultSetComplete.connect(self.Complete)
+    self._node.error.connect(self.SetStatus)
+
+    sn = self._node.statusNotifier()
+    sn.statusMessageAvailable.connect(self.SetStatus)
+
+    if not self._node.canExecute:
+      self.SetStatus('Failed to create query session')
+      return False
+
+    return self._node.execute(plan, workingSetSize)
+
+  #----------------------------------------------------------------------------
+  def Refine(self):
+    self._completed = False
+    return False if self._node is None else self._node.refine()
+
+  #----------------------------------------------------------------------------
+  def ShutDown(self):
+    self._node = None
+
+  #----------------------------------------------------------------------------
+  def IsExecuting(self):
+    return self._node is not None and self._node.isBusy()
+
+  #----------------------------------------------------------------------------
+  def IsCompleted(self):
+    return self._completed
+
+  #----------------------------------------------------------------------------
+  def GetResultCount(self):
+    return 0 if self._node is None else self._node.resultCount()
+
+  #----------------------------------------------------------------------------
+  def GetResultsAndFeedbackRequests(self, *args):
+    if self._node is None:
+      return {'results': {}, 'feedbackIds': []}
+
+    results = {}
+    order = vdfAbstractQueryResultSetNode.SortByRank
+    result_ids = self._node.results(order, *args)
+    feedback_ids = self._node.feedbackRequests()
+
+    for iid in result_ids:
+      results[iid] = vvJson.serialize(self._node.result(iid))
+
+    for iid in feedback_ids:
+      if iid not in result_ids:
+        results[iid] = vvJson.serialize(self._node.result(iid))
+
+    return {
+      'results': results,
+      'resultIds': result_ids,
+      'feedbackIds': feedback_ids
+    }
+
+  #----------------------------------------------------------------------------
+  def GetSerializedResult(self, iid):
+    if self._node is None:
+      return None
+    return vvJson.serialize(self._node.result(iid))
+
+  #----------------------------------------------------------------------------
+  def SetResultFeedback(self, iid, score):
+    if self._node is None:
+      return False
+    return self._node.setResultFeedback(iid, vvIqr.Classification(score))
+
+  #----------------------------------------------------------------------------
+  def GetStatus(self):
+    return self._message
+
+  #----------------------------------------------------------------------------
+  def SetStatus(self, *args):
+    self._message = args[-1]
+
+  #----------------------------------------------------------------------------
+  def Complete(self, feedbackRequests):
+    self._completed = feedbackRequests
diff --git a/Modules/visgui/core/VideoPlayer.py b/Modules/visgui/core/VideoPlayer.py
new file mode 100644
index 00000000..a3a30e26
--- /dev/null
+++ b/Modules/visgui/core/VideoPlayer.py
@@ -0,0 +1,177 @@
+#ckwg +4
+# Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+# KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+# Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+
+from vtkVgCorePython import *
+from vtkVgModelViewPython import *
+from vtkVgVideoPython import *
+
+import vtkRenderingCorePython
+
+import sys
+import time
+from datetime import datetime
+
+#==============================================================================
+class VideoPlayer:
+  #----------------------------------------------------------------------------
+  def __init__(self, renderer):
+    self._streamId = None
+    self._renderer = renderer
+    self._actor = vtkRenderingCorePython.vtkImageActor()
+    self._videoSource = None
+    self._videoModel = vtkVgVideoModel()
+    self._trackModel = vtkVgTrackModel()
+    self._trackModel.SetDisplayAllTracks(True)
+    self._trackModel.SetTrackExpirationOffset(vtkVgTimeStamp(1.5e6, 15))
+    self._trackModel.Initialize()
+    self._videoModel.AddChildModel(self._trackModel)
+    self._trackRepresentation = vtkVgTrackRepresentation()
+    self._trackRepresentation.SetTrackModel(self._trackModel)
+    self._trackRepresentation.SetVisible(True)
+    self._trackRepresentation.SetZOffset(0.1)
+    self._trackRepresentation.UseAutoUpdateOff()
+    self._trackHeadRepresentation = vtkVgTrackHeadRepresentation()
+    self._trackHeadRepresentation.SetTrackModel(self._trackModel)
+    self._trackHeadRepresentation.SetVisible(True)
+    self._trackHeadRepresentation.SetZOffset(0.2)
+    self._trackHeadRepresentation.UseAutoUpdateOff()
+    self._beginTime = None
+    self._endTime = None
+    self._lastFrameTimestamp = None
+    self._currTimestamp = vtkVgTimeStamp()
+    self._firstTime = None
+    self._prevTime = None
+    self._currTime = None
+    self._frameData = None
+
+  #----------------------------------------------------------------------------
+  def Init(self, streamId):
+    self._streamId = streamId
+    self._videoSource = vtkVgKwaVideoSource()
+    self._videoModel.SetVideoSource(self._videoSource)
+
+    if not self._videoSource.Open(streamId):
+      raise IOError(0, 'Unable to open video stream %s' % streamId)
+
+    self._beginTime = self._videoSource.GetMinTime()
+    self._endTime = self._videoSource.GetMaxTime()
+
+    self._renderer.AddActor(self._actor)
+    self._currTimestamp = self._beginTime
+    self.Update()
+
+    # Zoom to video frame extents
+    frameImage = self._frameData.GetImageData()
+    vtkVgRendererUtils().ZoomToImageExtents2D(self._renderer, frameImage)
+    self.Update()
+
+    # Remove any tracks that may exist from a previous video
+    oldTracks = []
+    self._trackModel.InitTrackTraversal()
+    ti = self._trackModel.GetNextTrack()
+    while ti.GetTrack():
+      oldTracks.append(ti.GetTrack().GetId())
+      ti = self._trackModel.GetNextTrack()
+
+    for track in oldTracks:
+      self._trackModel.RemoveTrack(track)
+
+    return 1
+
+  #----------------------------------------------------------------------------
+  def UpdateRepresentation(self, rep):
+    rep.Update()
+
+    # Add new props
+    props = rep.GetNewRenderObjects()
+    props.InitTraversal()
+    prop = props.GetNextProp()
+    while prop is not None:
+      self._renderer.AddViewProp(prop)
+      prop = props.GetNextProp()
+
+    # Remove expired props
+    props = rep.GetExpiredRenderObjects();
+    props.InitTraversal()
+    prop = props.GetNextProp()
+    while prop is not None:
+      self._renderer.RemoveViewProp(prop)
+      prop = props.GetNextProp()
+
+    rep.ResetTemporaryRenderObjects();
+
+  #----------------------------------------------------------------------------
+  def Step(self, timestamp):
+    self._videoModel.Update(timestamp)
+
+    # Update track representations
+    self.UpdateRepresentation(self._trackRepresentation)
+    self.UpdateRepresentation(self._trackHeadRepresentation)
+
+    # Update video 'representation'
+    self._frameData = self._videoModel.GetCurrentVideoFrame()
+    self._actor.SetInputData(self._frameData.GetImageData())
+    self._actor.Update()
+
+  #----------------------------------------------------------------------------
+  def Play(self):
+    if self._firstTime is None:
+      self._firstTime = datetime.now()
+
+    delta = (datetime.now() - self._firstTime)
+    delta = (delta.days * 24 * 60 * 60 + delta.seconds) * 1e6 + delta.microseconds
+    self._currTime =  self._beginTime.GetTime() + delta
+    self._currTimestamp = vtkVgTimeStamp(self._currTime)
+    self.Step(self._currTimestamp)
+    return self._currTime
+
+  #----------------------------------------------------------------------------
+  def Seek(self, timestamp):
+    # TODO handle in-play condition by checking self._firstTime
+    self._currTime = float(timestamp)
+    self._currTimestamp = vtkVgTimeStamp(self._currTime)
+    self.Step(self._currTimestamp)
+    return self._currTime
+
+  #----------------------------------------------------------------------------
+  def Stop(self):
+    self._firstTime = None
+
+  #----------------------------------------------------------------------------
+  def SetTrailsVisible(self, state):
+    self._trackRepresentation.SetVisible(state)
+
+  #----------------------------------------------------------------------------
+  def AddTrack(self, track):
+    self._trackModel.AddTrack(track)
+
+  #----------------------------------------------------------------------------
+  def InitializeTrack(self, track):
+    track.SetPoints(self._trackModel.GetPoints())
+
+  #----------------------------------------------------------------------------
+  def Update(self):
+    self.Step(self._currTimestamp)
+
+#==============================================================================
+if __name__ == '__main__':
+  if len(sys.argv) != 2:
+    sys.exit("Usage: VideoPlayer filename_uri")
+
+  ren = vtkRenderingCorePython.vtkRenderer()
+
+  renWin = vtkRenderingCorePython.vtkRenderWindow()
+  renWin.AddRenderer(ren)
+
+  viewer = vtkRenderingCorePython.vtkRenderWindowInteractor()
+  viewer.SetRenderWindow(renWin)
+  cam = ren.GetActiveCamera()
+  cam.ParallelProjectionOn()
+
+  player = VideoPlayer(ren)
+  player.Init(sys.argv[1])
+
+  renWin.Render()
+  viewer.Start()
diff --git a/Modules/visgui/core/__init__.py b/Modules/visgui/core/__init__.py
new file mode 100644
index 00000000..c5e7a418
--- /dev/null
+++ b/Modules/visgui/core/__init__.py
@@ -0,0 +1,2 @@
+from .QueryService import QueryService
+from .VideoPlayer import VideoPlayer
diff --git a/Modules/visgui/testing/VtkTest.py b/Modules/visgui/testing/VtkTest.py
new file mode 100644
index 00000000..c4ed8718
--- /dev/null
+++ b/Modules/visgui/testing/VtkTest.py
@@ -0,0 +1,114 @@
+import argparse
+import os
+import sys
+import unittest
+
+from vtkImagingCorePython import *
+from vtkIOImagePython import *
+from vtkRenderingCorePython import *
+import vtkRenderingOpenGLPython
+
+#------------------------------------------------------------------------------
+def className(obj):
+  name = str(obj.__class__)
+  if name[0] == '<':
+    name = name[name.find('\'')+1:-2]
+  return name[name.rfind('.')+1:]
+
+#==============================================================================
+class RenderContext(object):
+  pass
+
+#==============================================================================
+class VtkTest(unittest.TestCase):
+  #------------------------------------------------------------------------------
+  @staticmethod
+  def main():
+    mainModule = sys.modules['__main__']
+    tests = unittest.defaultTestLoader.loadTestsFromModule(mainModule)
+    suite = unittest.TestSuite()
+    suite.addTests(tests)
+
+    result = unittest.TextTestRunner().run(suite)
+    sys.exit(0 if result.wasSuccessful() else 1)
+
+  #----------------------------------------------------------------------------
+  def __init__(self, *args):
+    unittest.TestCase.__init__(self, *args)
+
+    parser = self.createArgParser()
+    self.setupArgs(parser)
+    self.parseArgs(parser.parse_args())
+
+  #----------------------------------------------------------------------------
+  def createArgParser(self):
+    return argparse.ArgumentParser(description="VisGUI VTK test")
+
+  #----------------------------------------------------------------------------
+  def setupArgs(self, parser):
+    parser.add_argument("-D", "--test-data-root", dest='dataDir', default=None,
+      help="base directory for test data files")
+    parser.add_argument("-B", "--test-baseline", dest='baseline', default=None,
+      help="baseline image for the test")
+    parser.add_argument("-T", "--test-temp-root", dest='tempDir', default=None,
+      help="location in which to store temporary files related to testing")
+
+  #----------------------------------------------------------------------------
+  def parseArgs(self, args):
+    self._dataDir = args.dataDir
+    self._tempDir = args.tempDir
+    self._baseline = args.baseline
+
+  #----------------------------------------------------------------------------
+  def getDataPath(self, template):
+    if self._dataDir is None:
+      raise Exception('data directory was not specified')
+    return template.replace('$VISGUI_DATA_ROOT', self._dataDir)
+
+  #----------------------------------------------------------------------------
+  def createRenderContext(self):
+    renderer = vtkRenderer()
+
+    renderWindow = vtkRenderWindow()
+    renderWindow.AddRenderer(renderer)
+
+    interactor = self.createInteractor()
+    interactor.SetRenderWindow(renderWindow)
+
+    context = RenderContext()
+    context.renderer = renderer
+    context.interactor = interactor
+    return context
+
+  #----------------------------------------------------------------------------
+  def createInteractor(self):
+    return vtkRenderWindowInteractor()
+
+  #----------------------------------------------------------------------------
+  def compareToBaseline(self, context, threshold=50.0):
+    renderWindow = context.interactor.GetRenderWindow()
+    renderWindow.SetSize(300, 300)
+    renderWindow.Render()
+
+    tmp = self._tempDir if self._tempDir is not None else '.'
+    outPath = os.path.join(tmp, className(self) + '-actual.png')
+
+    windowToImageFilter = vtkWindowToImageFilter()
+    windowToImageFilter.SetInput(renderWindow)
+
+    if not os.path.isfile(outPath):
+      pngWriter = vtkPNGWriter()
+      pngWriter.SetFileName(outPath)
+      pngWriter.SetInputConnection(windowToImageFilter.GetOutputPort())
+      pngWriter.Write()
+      pngWriter = None
+
+    pngReader = vtkPNGReader()
+    pngReader.SetFileName(self._baseline)
+
+    diff = vtkImageDifference()
+    diff.SetInputConnection(windowToImageFilter.GetOutputPort())
+    diff.SetImageConnection(pngReader.GetOutputPort())
+    diff.Update()
+
+    self.assertLessEqual(diff.GetThresholdedError(), threshold)
diff --git a/Modules/visgui/testing/__init__.py b/Modules/visgui/testing/__init__.py
new file mode 100644
index 00000000..d4e5377e
--- /dev/null
+++ b/Modules/visgui/testing/__init__.py
@@ -0,0 +1 @@
+from .VtkTest import VtkTest
diff --git a/Modules/visgui/web/ParaViewServer.py b/Modules/visgui/web/ParaViewServer.py
new file mode 100644
index 00000000..6b03d02c
--- /dev/null
+++ b/Modules/visgui/web/ParaViewServer.py
@@ -0,0 +1,364 @@
+#ckwg +4
+# Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+# KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+# Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+
+# Import python core libraries
+import sys
+import os
+import types
+
+import argparse
+import json
+
+from PySide.QtCore import QCoreApplication, QUrl
+
+import qt4reactor
+
+QCoreApplication.setOrganizationName("Kitware")
+QCoreApplication.setOrganizationDomain("kitware.com")
+
+app = QCoreApplication(sys.argv)
+qt4reactor.install()
+
+# Import annotations
+from autobahn.wamp import exportRpc
+
+# Import paraview modules
+from paraview import simple, paraviewweb_wamp, paraviewweb_protocols
+
+# Currently ParaView does not load these modules
+from vtkCommonCorePython import *
+from vtkRenderingCorePython import *
+
+# Import visgui
+from vgVideoPython import *
+from vtkVgCorePython import *
+from vtkVwCorePython import *
+
+from visgui.core import QueryService
+from visgui.core import VideoPlayer
+
+#==============================================================================
+class WebProtocol(paraviewweb_wamp.ServerProtocol):
+  authKey = "paraviewweb-secret"
+
+  #----------------------------------------------------------------------------
+  def initialize(self):
+    """
+    Called by the default server and serves as a demonstration purpose. This
+    should be overridden by application protocols to set up the application
+    specific pipeline.
+    """
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebMouseHandler())
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebViewPort())
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebViewPortImageDelivery())
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebViewPortGeometryDelivery())
+    self.registerParaViewWebProtocol(paraviewweb_protocols.ParaViewWebTimeHandler())
+
+    # Update authentication key to use
+    self.updateSecret(WebProtocol.authKey)
+
+    # RPC objects
+    self._queryService = None
+
+    # RPC object collections
+    self._videos = {}
+    self._nextVideo = 0
+
+    self._videoPlayers = {}
+    self._nextVideoPlayer = 0
+
+    # Other member variables
+    self._view = None
+    self._renWin = None
+    self._view = simple.GetRenderView()
+    self._view.OrientationAxesVisibility = False
+    self._view.CenterAxesVisibility = False
+    self._view.CameraParallelProjection = True
+    self._view.InteractionMode = '2D'
+
+    # !!!This ugly bit should go away if ParaView adds in sensible
+    # default 2D interactor manipulators.
+    pxm = simple.servermanager.ProxyManager()
+    manipulator1 = pxm.NewProxy('cameramanipulators', 'TrackballPan1')
+    manipulator1.GetProperty('Button').SetElement(0, 1) # left click
+    manipulator1.UpdateVTKObjects()
+    manipulator2 = pxm.NewProxy('cameramanipulators', 'TrackballZoom')
+    manipulator2.GetProperty('Button').SetElement(0, 3) # right click
+    manipulator2.UpdateVTKObjects()
+    self._view.GetProperty('Camera2DManipulators').SetData([manipulator1, manipulator2])
+
+    simple.Render()
+    self._view.ViewSize = [800,800]
+    self._renWin = self._view.GetRenderWindow()
+
+    self._videoProvider = vgKwaArchive()
+    providers = os.environ.get('VISGUI_VIDEO_PROVIDERS', None)
+    if providers is not None:
+      for provider in providers.split(';'):
+        print 'add provider ' + provider
+        self._videoProvider.addSource(provider)
+
+  #----------------------------------------------------------------------------
+  @exportRpc
+  def getQueryUrl(self):
+    return os.environ.get('VISGUI_QUERY_URL', '')
+
+  #----------------------------------------------------------------------------
+  @exportRpc
+  def executeQuery(self, queryServiceUri, queryPlanData, workingSetSize):
+    self._queryService = QueryService()
+    return self._queryService.ExecuteQuery(QUrl(queryServiceUri),
+                                           queryPlanData, workingSetSize)
+
+  #----------------------------------------------------------------------------
+  @exportRpc("query:getAllResults")
+  def getAllResults(self, *args):
+    return self._queryService.GetResultsAndFeedbackRequests(*args)
+
+  #----------------------------------------------------------------------------
+  @exportRpc
+  def createVideo(self, videoUri):
+    video = vtkVwVideo()
+    if video.Open(videoUri):
+      self._nextVideo += 1
+      i = self._nextVideo
+      self._videos[i] = video
+      return i
+
+  #----------------------------------------------------------------------------
+  @exportRpc
+  def createVideoPlayer(self):
+    ren = self._view.GetRenderer()
+    self._nextVideoPlayer += 1
+    i = self._nextVideoPlayer
+    self._videoPlayers[i] = VideoPlayer(ren)
+    return i
+
+  #----------------------------------------------------------------------------
+  @exportRpc
+  def setVideoStream(self, playerId, streamId):
+    # For now use the same video stream
+    # @todo Remove this code
+    streamId = os.environ.get('VISGUI_STREAM_ID', None)
+    if streamId is None:
+      raise EnvironmentError(0, 'VISGUI_STREAM_ID is not set')
+    if playerId in self._videoPlayers:
+      retval = self._videoPlayers[playerId].Init(streamId)
+    else:
+      retval = -1
+    return retval
+
+  #----------------------------------------------------------------------------
+  @exportRpc
+  def setVideoData(self, playerId, resultId):
+    if not playerId in self._videoPlayers:
+      return 'Video player %s not found' % playerId
+
+    videoPlayer = self._videoPlayers[playerId]
+    result = self._queryService.GetSerializedResult(resultId)
+
+    try:
+      if 'streamId' in result:
+        request = vgKwaArchiveRequest()
+        request.StreamId = result['streamId']
+        if 'missionId' in result and not result['missionId'] == '-undefined-':
+          request.MissionId = result['missionId']
+        request.StartTime = result['startTime']
+        request.EndTime = result['endTime']
+        # TODO padding
+
+        uri = self._videoProvider.getUri(request).toString()
+        self._view.ResetCamera()
+        videoPlayer.Init(uri)
+
+      if 'descriptors' in result:
+        descriptors = result['descriptors']
+        tid = 0
+        for descriptor in descriptors:
+          if 'regions' in descriptor:
+            track = vtkVgTrack()
+            videoPlayer.Stop()
+            videoPlayer.InitializeTrack(track)
+            tid += 1
+            track.SetId(tid)
+
+            for region in descriptor['regions']:
+              ts = vtkVgTimeStamp()
+              jsts = region['timeStamp']
+              if 'frame' in jsts:
+                ts.SetFrameNumber(jsts['frame'])
+              if 'time' in jsts:
+                ts.SetTime(jsts['time'])
+              ir = region['imageRegion']
+              left = ir['left']
+              right = ir['right']
+              # TODO Assuming video is height==480 for now... We really should
+              #      be using the actual video meta data for both the height
+              #      and to use the homographies for stabilization, but not
+              #      sure that is going to be done in the Python layer.
+              top = 480 - ir['top']
+              bottom = 480 - ir['bottom']
+
+              shell = vtkDenseArray[float]()
+              shell.Resize(12)
+
+              def setShellPoint(i, x, y):
+                i *= 3
+                shell.SetValue(i + 0, x)
+                shell.SetValue(i + 1, y)
+                shell.SetValue(i + 2, 0.0)
+
+              setShellPoint(0, left, top)
+              setShellPoint(1, right, top)
+              setShellPoint(2, right, bottom)
+              setShellPoint(3, left, bottom)
+
+              track.InsertNextPoint(ts, [0.5 * (left + right), bottom],
+                                    vtkVgGeoCoord(), shell)
+
+          videoPlayer.AddTrack(track)
+
+        videoPlayer.Update()
+
+    except:
+      print 'error ', sys.exc_info()[1]
+
+  #----------------------------------------------------------------------------
+  @exportRpc
+  def render(self):
+    simple.Render()
+
+#==============================================================================
+def bindRpc(cls, ns, name, mctor):
+  fullName = name
+  rpcName = name
+
+  if ns is not None:
+    rpcName = ns + ':' + name
+    fullName = '__' + ns + '_' + name
+
+  rpc = types.MethodType(exportRpc(rpcName)(mctor(fullName)), None, cls)
+  setattr(cls, fullName, rpc)
+
+#==============================================================================
+def addRpc(cls, obj, ns, call):
+  call_uc = call[0].upper() + call[1:]
+
+  def createRpc(call):
+    def dispatchRpc(self, *args, **kwargs):
+      return getattr(getattr(self, obj), call_uc)(*args, **kwargs)
+    return dispatchRpc
+
+  bindRpc(cls, ns, call, createRpc)
+
+#==============================================================================
+def addMappedRpc(cls, objs, ns, call):
+  call_uc = call[0].upper() + call[1:]
+
+  def createRpc(call):
+    def dispatchRpc(self, i, *args, **kwargs):
+      c = getattr(self, objs)
+      if i in c:
+        return getattr(c[i], call_uc)(*args, **kwargs)
+    return dispatchRpc
+
+  bindRpc(cls, ns, call, createRpc)
+
+#==============================================================================
+def addArguments(parser):
+  """
+  Add arguments processed know to this module. parser must be
+  argparse.ArgumentParser instance.
+  """
+  parser.add_argument("-d", "--debug",
+    help="log debugging messages to stdout",
+    action="store_true")
+  parser.add_argument("-p", "--port", type=int, default=8080,
+    help="port number on which the server will listen (default: 8080)")
+  parser.add_argument("-t", "--timeout", type=int, default=300,
+    help="timeout for reaping process on idle in seconds (default: 300s)")
+  parser.add_argument("-c", "--content", default=None,
+    help="root path of common web content to serve")
+  parser.add_argument("-a", "--app-content", default=None, dest='app_content',
+    help="root path of application-specific web content to serve")
+  parser.add_argument("-k", "--authKey", default=WebProtocol.authKey,
+    help="authentication key for clients to connect to the web socket")
+
+  return parser
+
+#==============================================================================
+def startServer(options, disableLogging=False):
+  """
+  Starts the web server. Options must be an object with the following members:
+    options.port : port number on which the server will listen
+    options.timeout : timeout (seconds) for reaping process on idle
+    options.content : root path of common content to serve
+    options.app_content : root path of application-specific content to serve
+  """
+  from twisted.python import log
+  from twisted.internet import reactor
+  from twisted.web.server import Site
+  from twisted.web.static import File
+
+  from autobahn.resource import WebSocketResource
+  from paraview.webgl import WebGLResource
+
+  if options.content is None and options.app_content is None:
+    raise EnvironmentError(0, 'No content specified')
+
+  if not disableLogging:
+    log.startLogging(sys.stdout)
+
+  # Set up the server factory
+  wampFactory = paraviewweb_wamp.ReapingWampServerFactory(
+    "ws://localhost:%d" % options.port, options.debug, options.timeout)
+  wampFactory.protocol = WebProtocol
+
+  # Set up the site
+  root = None
+  if options.app_content is None:
+    root = File(options.content)
+  elif options.content is None:
+    root = File(options.app_content)
+  else:
+    root = File(options.content)
+    root.putChild("app", File(options.app_content))
+
+  root.putChild("ws", WebSocketResource(wampFactory))
+  root.putChild("WebGL", WebGLResource());
+
+  # Start factory and reactor
+  wampFactory.startFactory()
+  reactor.listenTCP(options.port, Site(root))
+  reactor.run()
+  wampFactory.stopFactory()
+
+#==============================================================================
+def run():
+  # Parse arguments
+  parser = argparse.ArgumentParser(
+    description="ParaView/Web file loader web-application")
+  addArguments(parser)
+  args = parser.parse_args()
+
+  # Add dynamically-created RPC's
+  for rpc in ("shutDown", "isExecuting", "isCompleted", "getResultCount",
+              "getStatus", "setResultFeedback", "refine"):
+    addRpc(WebProtocol, "_queryService", "query", rpc)
+
+  for rpc in ("getFrame", "getFirstTime", "getLastTime", "getFrameCount"):
+    addMappedRpc(WebProtocol, "_videos", "video", rpc)
+
+  for rpc in ("play", "stop", "seek", "setTrailsVisible"):
+    addMappedRpc(WebProtocol, "_videoPlayers", "videoPlayer", rpc)
+
+  # Set up an start the web server
+  # Commented out for now since we don't need to do rendering
+  WebProtocol.authKey = args.authKey
+  startServer(options=args)
+
+#==============================================================================
+if __name__ == '__main__':
+  run()
diff --git a/Modules/visgui/web/__init__.py b/Modules/visgui/web/__init__.py
new file mode 100644
index 00000000..55db99e1
--- /dev/null
+++ b/Modules/visgui/web/__init__.py
@@ -0,0 +1 @@
+from . import ParaViewServer
diff --git a/Plugins/CMakeLists.txt b/Plugins/CMakeLists.txt
new file mode 100644
index 00000000..e161a0f3
--- /dev/null
+++ b/Plugins/CMakeLists.txt
@@ -0,0 +1,9 @@
+# NOTE: We descend into all directories in order to allow them to define
+# service- or plugin-specific options alongside the affected components (as
+# opposed to having to define the options here, where they would be less
+# closely located to the code they effect). However, no other processing shall
+# be done unless the condition(s) noted after the directory are met.
+
+add_subdirectory(VspSourceService)  # if(VISGUI_ENABLE_VSPLAY)
+add_subdirectory(VspUiExtensions)   # if(VISGUI_ENABLE_VSPLAY)
+add_subdirectory(VvQueryService)    # if(VISGUI_ENABLE_VVIO)
diff --git a/Plugins/VspSourceService/CMakeLists.txt b/Plugins/VspSourceService/CMakeLists.txt
new file mode 100644
index 00000000..5112937d
--- /dev/null
+++ b/Plugins/VspSourceService/CMakeLists.txt
@@ -0,0 +1,46 @@
+# Options for optional plugins
+vg_option(VSPSS_ENABLE_FAKE_STREAM_SOURCE ON
+  "Enable building of VSPSS fake stream source"
+  "VISGUI_ENABLE_VSPLAY"
+)
+vg_option(VSPSS_ENABLE_RANDOM_ALERT_DESCRIPTOR OFF
+  "Enable building of VSPSS random alert source"
+  "VISGUI_ENABLE_VSPLAY"
+)
+
+if(NOT VISGUI_ENABLE_VSPLAY)
+  # If vsPlay is are disabled, we are only here to declare our options, so
+  # leave now
+  return()
+endif()
+
+###############################################################################
+
+# Video source
+add_subdirectory(KwaArchiveSource)
+
+# Track source
+if(TARGET track_oracle)
+  add_subdirectory(TrackOracleArchiveSource)
+elseif(vidtk_FOUND)
+  add_subdirectory(Kw18ArchiveSource)
+endif()
+
+# Descriptor sources
+add_subdirectory(PvoArchiveSource)
+
+# Mixed-type sources
+add_subdirectory(KstArchiveSource)
+if(TARGET track_xgtf)
+  add_subdirectory(ViperArchiveSource)
+endif()
+
+# Stream sources
+if(VSPSS_ENABLE_FAKE_STREAM_SOURCE)
+  add_subdirectory(FakeStreamSourceFactory)
+endif()
+
+# Live descriptors
+if(VSPSS_ENABLE_RANDOM_ALERT_DESCRIPTOR)
+  add_subdirectory(RandomAlertDescriptor)
+endif()
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/CMakeLists.txt b/Plugins/VspSourceService/FakeStreamSourceFactory/CMakeLists.txt
new file mode 100644
index 00000000..3dc37a69
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/CMakeLists.txt
@@ -0,0 +1,44 @@
+project(vsFakeStreamSourceFactory)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+vg_include_library_sdk_directories(vspSourceUtil)
+
+set(vsFakeStreamSourceFactory_Sources
+  vsFakeStreamControl.cxx
+  vsFakeStreamFactory.cxx
+  vsFakeStreamSourceFactoryPlugin.cxx
+  vsFakeStreamSource.cxx
+)
+
+set(vsFakeStreamSourceFactory_MocHeaders
+  vsFakeStreamControl.h
+  vsFakeStreamSourceFactoryPlugin.h
+  vsFakeStreamSource.h
+  vsFakeStreamSourcePrivate.h
+)
+
+set(vsFakeStreamSourceFactory_UI
+  fakeStreamControl.ui
+)
+
+qt4_wrap_cpp(vsFakeStreamSourceFactory_MocSources
+             ${vsFakeStreamSourceFactory_MocHeaders})
+
+qt4_wrap_ui(vsFakeStreamSourceFactory_UiSources
+            ${vsFakeStreamSourceFactory_UI})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsFakeStreamSourceFactory_Sources}
+  ${vsFakeStreamSourceFactory_MocSources}
+  ${vsFakeStreamSourceFactory_UiSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  vspSourceUtil
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/fakeStreamControl.ui b/Plugins/VspSourceService/FakeStreamSourceFactory/fakeStreamControl.ui
new file mode 100644
index 00000000..309a99a5
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/fakeStreamControl.ui
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vsFakeStreamControl</class>
+ <widget class="QDialog" name="vsFakeStreamControl">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>207</width>
+    <height>124</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Stream Rate Control</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout_2">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="rateLabel">
+     <property name="text">
+      <string>Rate (Log&lt;sub&gt;2&lt;/sub&gt;):</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QDoubleSpinBox" name="rate">
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="prefix">
+      <string>2e</string>
+     </property>
+     <property name="minimum">
+      <double>-5.000000000000000</double>
+     </property>
+     <property name="maximum">
+      <double>5.000000000000000</double>
+     </property>
+     <property name="singleStep">
+      <double>0.250000000000000</double>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="jitterLabel">
+     <property name="text">
+      <string>Jitter:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QSpinBox" name="jitter">
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="suffix">
+      <string>%</string>
+     </property>
+     <property name="value">
+      <number>25</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="maxBurstTimeLabel">
+     <property name="text">
+      <string>Max Burst Size:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QPushButton" name="flush">
+     <property name="text">
+      <string>&amp;Flush Stream</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QDoubleSpinBox" name="maxBurstTime">
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+     </property>
+     <property name="suffix">
+      <string> sec</string>
+     </property>
+     <property name="decimals">
+      <number>1</number>
+     </property>
+     <property name="maximum">
+      <double>60.000000000000000</double>
+     </property>
+     <property name="value">
+      <double>5.000000000000000</double>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamControl.cxx b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamControl.cxx
new file mode 100644
index 00000000..5fc6187b
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamControl.cxx
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsFakeStreamControl.h"
+
+//-----------------------------------------------------------------------------
+vsFakeStreamControl::vsFakeStreamControl(QWidget* parent) : QDialog(parent)
+{
+  this->UI.setupUi(this);
+
+  connect(this->UI.rate, SIGNAL(valueChanged(double)),
+          this, SIGNAL(rateChanged(double)));
+  connect(this->UI.jitter, SIGNAL(valueChanged(int)),
+          this, SLOT(jitterChanged(int)));
+  connect(this->UI.maxBurstTime, SIGNAL(valueChanged(double)),
+          this, SIGNAL(maxBurstTimeChanged(double)));
+  connect(this->UI.flush, SIGNAL(clicked()),
+          this, SIGNAL(flushRequested()));
+}
+
+//-----------------------------------------------------------------------------
+vsFakeStreamControl::~vsFakeStreamControl()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamControl::jitterChanged(int newValue)
+{
+  emit this->jitterChanged(newValue * 0.01);
+}
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamControl.h b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamControl.h
new file mode 100644
index 00000000..70fac5cc
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamControl.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsFakeStreamControl_h
+#define __vsFakeStreamControl_h
+
+#include <qtGlobal.h>
+
+#include "ui_fakeStreamControl.h"
+
+class vsFakeStreamControl : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vsFakeStreamControl(QWidget* parent = 0);
+  ~vsFakeStreamControl();
+
+signals:
+  void rateChanged(double newRate);
+  void jitterChanged(double newJitter);
+  void maxBurstTimeChanged(double newSize);
+  void flushRequested();
+
+protected slots:
+  void jitterChanged(int);
+
+protected:
+  Ui::vsFakeStreamControl UI;
+
+private:
+  QTE_DISABLE_COPY(vsFakeStreamControl)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamFactory.cxx b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamFactory.cxx
new file mode 100644
index 00000000..b58c70af
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamFactory.cxx
@@ -0,0 +1,70 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsFakeStreamFactory.h"
+
+#include <QDebug>
+#include <QFileInfo>
+#include <QUrl>
+
+#include <vgFileDialog.h>
+
+#include "vsFakeStreamSource.h"
+
+//-----------------------------------------------------------------------------
+vsFakeStreamFactory::vsFakeStreamFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsFakeStreamFactory::~vsFakeStreamFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsFakeStreamFactory::initialize(QWidget* dialogParent)
+{
+  QString fileName = vgFileDialog::getOpenFileName(
+                       dialogParent, "Load fake stream project...", QString(),
+                       "vsPlay projects (*.prj);;"
+                       "All files (*)");
+
+  if (fileName.isEmpty())
+    {
+    return false;
+    }
+
+  return this->initialize(QUrl::fromLocalFile(fileName), dialogParent);
+}
+
+//-----------------------------------------------------------------------------
+bool vsFakeStreamFactory::initialize(const QUrl& uri)
+{
+  return this->initialize(uri, 0);
+}
+
+//-----------------------------------------------------------------------------
+bool vsFakeStreamFactory::initialize(const QUrl& uri, QWidget* dialogParent)
+{
+  if (uri.scheme() != "file")
+    {
+    const QString message =
+     "Error creating stream from URI \"" + uri.toString() +
+     "\": the scheme " + uri.scheme() + " is not supported.";
+    this->warn(dialogParent, "Not supported", message);
+    return false;
+    }
+
+  QFileInfo fi(uri.toLocalFile());
+  if (!fi.exists())
+    {
+    return false;
+    }
+  QUrl canonicalUri = QUrl::fromLocalFile(fi.canonicalFilePath());
+
+  this->setSource(new vsFakeStreamSource(canonicalUri));
+  return true;
+}
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamFactory.h b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamFactory.h
new file mode 100644
index 00000000..71d220d7
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamFactory.h
@@ -0,0 +1,28 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsFakeStreamFactory_h
+#define __vsFakeStreamFactory_h
+
+#include <vsStreamFactory.h>
+
+class vsFakeStreamFactory : public vsStreamFactory
+{
+public:
+  vsFakeStreamFactory();
+  virtual ~vsFakeStreamFactory();
+
+  virtual bool initialize(QWidget* dialogParent) QTE_OVERRIDE;
+  virtual bool initialize(const QUrl& uri) QTE_OVERRIDE;
+
+protected:
+  bool initialize(const QUrl& uri, QWidget* dialogParent);
+
+private:
+  QTE_DISABLE_COPY(vsFakeStreamFactory)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSource.cxx b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSource.cxx
new file mode 100644
index 00000000..70fb7aa8
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSource.cxx
@@ -0,0 +1,540 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsFakeStreamSource.h"
+#include "vsFakeStreamSourcePrivate.h"
+
+#include <QDebug>
+#include <QDir>
+#include <QFileInfo>
+#include <QTimer>
+
+#include <qtRand.h>
+
+#include <vsDescriptorSource.h>
+#include <vsSourceService.h>
+#include <vsTrackSource.h>
+
+#include <vsAdapt.h>
+#include <vsVideoArchive.h>
+
+#include "vsFakeStreamControl.h"
+
+QTE_IMPLEMENT_D_FUNC(vsFakeStreamSource)
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsFakeStreamSourcePrivate
+
+//-----------------------------------------------------------------------------
+vsFakeStreamSourcePrivate::vsFakeStreamSourcePrivate(
+  vsFakeStreamSource* q, const QUrl& streamUri)
+  : vsStreamSourcePrivate(q, streamUri),
+    Project(streamUri, QRegExp(" "), QRegExp("\n")), NextEventId(0),
+    StreamRate(0.0), StreamJitter(0.25), StreamMaxBurstTime(5.0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsFakeStreamSourcePrivate::~vsFakeStreamSourcePrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::run()
+{
+  this->updateStatus(vsDataSource::StreamingPending);
+
+  QTE_Q(vsFakeStreamSource);
+  connect(this, SIGNAL(trackUpdated(vvTrackId, vvTrackState)),
+          q->trackSource().data(),
+          SIGNAL(trackUpdated(vvTrackId, vvTrackState)));
+  connect(this, SIGNAL(trackClosed(vvTrackId)),
+          q->trackSource().data(),
+          SIGNAL(trackClosed(vvTrackId)));
+  connect(this, SIGNAL(tocAvailable(vvTrackId, vsTrackObjectClassifier)),
+          q->descriptorSource().data(),
+          SIGNAL(tocAvailable(vvTrackId, vsTrackObjectClassifier)));
+  connect(this, SIGNAL(eventAvailable(vsEvent)),
+          q->descriptorSource().data(),
+          SLOT(emitEvent(vsEvent)));
+  connect(this, SIGNAL(eventRevoked(vtkIdType)),
+          q->descriptorSource().data(),
+          SLOT(revokeEvent(vtkIdType)));
+
+  // Start processing first line of project
+  if (this->Project.isValid())
+    {
+    this->processProjectLine();
+    }
+  else
+    {
+    qWarning() << "error reading project file" << this->StreamUri;
+    }
+
+  // Hand off to event loop
+  vsStreamSourcePrivate::run();
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::findTime(
+  vtkVgTimeStamp* result, unsigned int frameNumber, vg::SeekMode roundMode)
+{
+  if (this->VideoArchive)
+    {
+    *result = this->VideoArchive->findTime(frameNumber, roundMode);
+    }
+  else
+    {
+    *result = vtkVgTimeStamp();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::requestFrame(
+  const vgVideoSeekRequest& request)
+{
+  if (this->VideoArchive)
+    {
+    // Hand request off to internal archive
+    this->VideoArchive->requestFrame(request);
+    }
+  else
+    {
+    // If we have no archive, all we can do is discard the request...
+    vgVtkVideoFramePtr noFrame;
+    request.sendReply(noFrame);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::clearLastRequest(
+  vgVideoSourceRequestor* requestor)
+{
+  this->VideoArchive->clearLastRequest(requestor);
+}
+
+//-----------------------------------------------------------------------------
+QUrl vsFakeStreamSourcePrivate::relativeUri(QString path) const
+{
+  QFileInfo fi(this->StreamUri.toLocalFile());
+  fi = QFileInfo(QDir(fi.canonicalPath()), path);
+  return QUrl::fromLocalFile(fi.canonicalFilePath());
+}
+
+//-----------------------------------------------------------------------------
+#define METADATA(_type_, _name_) \
+  _type_(_name_(QList<vtkVgVideoFrameMetaData>))
+void vsFakeStreamSourcePrivate::processProjectLine()
+{
+  if (Project.isEndOfFile())
+    {
+    // Done processing project
+    if (this->CurrentDataSources.isEmpty())
+      {
+      // Not waiting on any data to queue; begin emitting frames
+      this->updateStatus(vsDataSource::StreamingActive);
+      this->releaseFrame();
+      }
+    return;
+    }
+
+  // Read next line of project file
+  QString type;
+  QString file;
+  if (this->Project.readString(type, 0) &&
+      this->Project.readString(file, 1))
+    {
+    QUrl uri = this->relativeUri(file);
+    QRegExp vre("v(ideo)?", Qt::CaseInsensitive);
+    QRegExp tre("t(racks?)?", Qt::CaseInsensitive);
+    QRegExp dre("d(escriptors?)?", Qt::CaseInsensitive);
+
+    // What type of data is being requested?
+    if (vre.exactMatch(type))
+      {
+      // Video archive... do we have one already?
+      if (this->VideoArchive)
+        {
+        // Ignore all but first one to load successfully
+        qWarning() << "project requested video from" << file
+                   << "but video is already loaded from"
+                   << this->VideoArchive->uri().toLocalFile();
+        qWarning() << "the previously loaded video will be used";
+        }
+      else
+        {
+        // No video archive, try to load it
+        this->VideoArchive.reset(new vsVideoArchive(uri));
+        if (this->VideoArchive->okay())
+          {
+          // Load okay, connect the archive and initialize it
+          connect(this->VideoArchive.data(),
+                  METADATA(SIGNAL, metadataAvailable),
+                  this, METADATA(SLOT, setAvailableFrames));
+          this->VideoArchive->initialize();
+          }
+        else
+          {
+          // Load failed; reset so we will try again if we see another
+          qWarning() << "failed to load video archive from" << file;
+          this->VideoArchive.reset();
+          }
+        }
+      }
+    else if (tre.exactMatch(type))
+      {
+      // Track archive
+      vsSimpleSourceFactoryPtr factory =
+        vsSourceService::createArchiveSource(vs::ArchiveTrackSource, uri);
+      this->addArchiveSourceFactory(factory);
+      }
+    else if (dre.exactMatch(type))
+      {
+      // Descriptor archive
+      vsSimpleSourceFactoryPtr factory =
+        vsSourceService::createArchiveSource(vs::ArchiveDescriptorSource, uri);
+      this->addArchiveSourceFactory(factory);
+      }
+    else
+      {
+      qWarning() << "unknown resource type," << type;
+      }
+    }
+  else
+    {
+    qWarning() << "error reading project file at line"
+               << this->Project.currentRecord();
+    }
+
+  // Continue to the next line of the project
+  this->Project.nextRecord();
+  this->processProjectLine();
+}
+
+//-----------------------------------------------------------------------------
+#define REDIRECT(_src, _signal, _slot, _params) \
+  connect(_src.data(), SIGNAL(_signal _params), \
+          this, SLOT(_slot _params))
+void vsFakeStreamSourcePrivate::addArchiveSourceFactory(
+  vsSimpleSourceFactoryPtr& factory)
+{
+  if (factory)
+    {
+    foreach (vsTrackSourcePtr ts, factory->trackSources())
+      {
+      REDIRECT(ts, trackUpdated, queueTrackUpdate,
+               (vvTrackId, vvTrackState));
+      REDIRECT(ts, trackUpdated, queueTrackUpdate,
+               (vvTrackId, QList<vvTrackState>));
+      connect(ts.data(), SIGNAL(statusChanged(vsDataSource::Status)),
+              this, SLOT(sourceStatusChanged()));
+      this->CurrentDataSources.append(ts);
+      ts->start();
+      }
+    foreach (vsDescriptorSourcePtr ds, factory->descriptorSources())
+      {
+      REDIRECT(ds, tocAvailable, queueTrackClassifier,
+               (vvTrackId, vsTrackObjectClassifier));
+      REDIRECT(ds, eventAvailable, queueEvent,
+               (vsDescriptorSource*, vsEvent));
+      connect(ds.data(), SIGNAL(statusChanged(vsDataSource::Status)),
+              this, SLOT(sourceStatusChanged()));
+      this->CurrentDataSources.append(ds);
+      ds->start();
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::sourceStatusChanged()
+{
+  QList<QSharedPointer<vsDataSource> >::iterator iter =
+    this->CurrentDataSources.begin();
+  while (iter != this->CurrentDataSources.end())
+    {
+    // If source is done providing data...
+    if ((*iter)->status() == vsDataSource::ArchivedIdle)
+      {
+      // ...then release it
+      iter = this->CurrentDataSources.erase(iter);
+      continue;
+      }
+    ++iter;
+    }
+
+  // When all sources are done, begin emitting frames
+  if (this->CurrentDataSources.isEmpty())
+    {
+    this->updateStatus(vsDataSource::StreamingActive);
+    this->releaseFrame();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::queueTrackUpdate(
+  vvTrackId id, vvTrackState state)
+{
+  this->TrackUpdates[id].insert(state.TimeStamp, state);
+  this->flushData(this->LastFrameReleased);
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::queueTrackUpdate(
+  vvTrackId id, QList<vvTrackState> states)
+{
+  foreach (const vvTrackState& state, states)
+    {
+    this->TrackUpdates[id].insert(state.TimeStamp, state);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::queueTrackClassifier(
+  vvTrackId id, vsTrackObjectClassifier toc)
+{
+  this->Tocs.insert(id, toc);
+  this->flushData(this->LastFrameReleased);
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::queueEvent(
+  vsDescriptorSource* source, vsEvent event)
+{
+  this->notifyClassifiersAvailable(this->Events.isEmpty());
+
+  Q_UNUSED(source);
+  event->SetId(this->NextEventId++);
+  this->Events.insert(event->GetEndFrame(), event);
+
+  this->flushData(this->LastFrameReleased);
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::releaseFrame()
+{
+  // Determine what frame we will release
+  QMap<vtkVgTimeStamp, vtkVgVideoFrameMetaData>::const_iterator iter;
+  if (!this->LastFrameReleased.IsValid())
+    {
+    // Not started yet; use first frame
+    iter = this->VideoFrames.begin();
+    this->NextFrame = iter.key();
+    }
+  else if (this->NextFrame.IsValid())
+    {
+    // Find next frame
+    iter = this->VideoFrames.lowerBound(this->NextFrame);
+    }
+  else
+    {
+    // No valid next frame; don't release anything... this can happen when the
+    // user requests a flush to end
+    return;
+    }
+
+  if ((iter + 1) == this->VideoFrames.end())
+    {
+    // Next frame is the end; make sure everything is flushed, and we are done
+    this->flush();
+    return;
+    }
+
+  // Emit next frame set
+  this->flush(this->NextFrame);
+
+  // Determine the next time we will release
+  const double skew = 2.0 * this->StreamJitter * (qtRandD() - 0.5);
+  const double rate = pow(2.0, skew - this->StreamRate);
+  double burst = 0.0;
+  if (qtRandD() < this->StreamJitter)
+    {
+    burst = pow(qtRandD(), 1.7) * this->StreamMaxBurstTime;
+    burst *= 1e6; // s -> ns
+    }
+
+
+  const double nextTime = this->NextFrame.GetTime() + burst;
+
+  // Find next frame
+  QMap<vtkVgTimeStamp, vtkVgVideoFrameMetaData>::const_iterator next = ++iter;
+  do
+    {
+    iter = next;
+    ++next;
+    }
+  while (next != this->VideoFrames.end() && next.key().GetTime() <= nextTime);
+
+  // Get time until next frame
+  const double delta = iter.key().GetTime() - this->NextFrame.GetTime();
+  const double delay = 1e-3 * delta * rate; // convert ns -> ms
+
+  // Schedule next frame for release
+  this->NextFrame = iter.key();
+  QTimer::singleShot(qRound(delay), this, SLOT(releaseFrame()));
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::setAvailableFrames(
+  QList<vtkVgVideoFrameMetaData> md)
+{
+  foreach (const vtkVgVideoFrameMetaData& i, md)
+    {
+    this->VideoFrames.insert(i.Time, i);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::flush(vtkVgTimeStamp next)
+{
+  if (!next.IsValid())
+    {
+    // Flush everything
+    this->NextFrame.Reset();
+    this->flush(vtkVgTimeStamp(true));
+    this->updateStatus(vsDataSource::StreamingStopped);
+    emit this->streamingFinished(); // close control dialog
+    return;
+    }
+
+  // Build list of new metadata to be released
+  QList<vtkVgVideoFrameMetaData> metadata;
+  QMap<vtkVgTimeStamp, vtkVgVideoFrameMetaData>::const_iterator mditer;
+  if (this->LastFrameReleased.IsValid())
+    {
+    // Start after last released metadata
+    mditer = this->VideoFrames.upperBound(this->LastFrameReleased);
+    }
+  else
+    {
+    // Haven't released anything yet; start at beginning
+    mditer = this->VideoFrames.begin();
+    }
+
+  while (mditer != this->VideoFrames.end() && mditer.key() <= next)
+    {
+    metadata.append(mditer.value());
+    ++mditer;
+    }
+
+  if (metadata.count())
+    {
+    // Emit new metadata
+    this->emitMetadata(metadata);
+    }
+
+  // If asked to flush everything, cap claimed available range to actual range
+  vtkVgTimeStamp last = next;
+  if (this->VideoFrames.upperBound(next) == this->VideoFrames.end())
+    {
+    last = (--this->VideoFrames.end()).key();
+    }
+
+  // Emit frame availability
+  vtkVgTimeStamp first = this->VideoFrames.begin().key();
+  this->updateFrameRange(first, last);
+  this->LastFrameReleased = last;
+
+  // Emit track updates and events
+  this->flushData(last);
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::flushData(vtkVgTimeStamp next)
+{
+  // Emit track updates
+  foreach (vvTrackId tid, this->TrackUpdates.keys())
+    {
+    TrackStateMap& map = this->TrackUpdates[tid];
+    TrackStateMap::iterator iter = map.begin();
+    while (iter != map.end() && iter.key() <= next)
+      {
+      emit this->trackUpdated(tid, iter.value());
+      iter = map.erase(iter);
+      if (this->Tocs.contains(tid))
+        {
+        emit this->tocAvailable(tid, this->Tocs[tid]);
+        this->Tocs.remove(tid);
+        }
+      }
+
+    // If there are no remaining states...
+    if (map.isEmpty())
+      {
+      // ...emit closure and remove from the updates hash
+      emit this->trackClosed(tid);
+      this->TrackUpdates.remove(tid);
+      }
+    }
+
+  // Emit events
+  QMap<vtkVgTimeStamp, vsEvent>::iterator eiter = this->Events.begin();
+  while (eiter != this->Events.end() && eiter.key() <= next)
+    {
+    emit this->eventAvailable(eiter.value());
+    eiter = this->Events.erase(eiter);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::setStreamRate(double newRate)
+{
+  this->StreamRate = newRate;
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::setStreamJitter(double newJitter)
+{
+  this->StreamJitter = newJitter;
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourcePrivate::setStreamMaxBurstTime(double newTime)
+{
+  this->StreamMaxBurstTime = newTime;
+}
+
+//-----------------------------------------------------------------------------
+QString vsFakeStreamSourcePrivate::text(QString format) const
+{
+  QFileInfo fi(this->StreamUri.toLocalFile());
+  return format.arg(fi.completeBaseName());
+}
+
+//END vsFakeStreamSourcePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsFakeStreamSource
+
+//-----------------------------------------------------------------------------
+vsFakeStreamSource::vsFakeStreamSource(const QUrl& streamUri) :
+  vsStreamSource(new vsFakeStreamSourcePrivate(this, streamUri))
+{
+  QTE_D(vsFakeStreamSource);
+
+  vsFakeStreamControl* c = new vsFakeStreamControl;
+  connect(c, SIGNAL(rateChanged(double)),
+          d, SLOT(setStreamRate(double)));
+  connect(c, SIGNAL(jitterChanged(double)),
+          d, SLOT(setStreamJitter(double)));
+  connect(c, SIGNAL(maxBurstTimeChanged(double)),
+          d, SLOT(setStreamMaxBurstTime(double)));
+  connect(c, SIGNAL(flushRequested()), d, SLOT(flush()));
+  connect(c, SIGNAL(flushRequested()), d, SLOT(flush()));
+  connect(c, SIGNAL(flushRequested()), d, SLOT(flush()));
+  connect(d, SIGNAL(streamingFinished()), c, SLOT(close()));
+  connect(qApp, SIGNAL(lastViewClosed()), c, SLOT(close()));
+  connect(this, SIGNAL(destroyed()), c, SLOT(deleteLater()));
+  c->show();
+}
+
+//-----------------------------------------------------------------------------
+vsFakeStreamSource::~vsFakeStreamSource()
+{
+}
+
+//END vsFakeStreamSource
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSource.h b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSource.h
new file mode 100644
index 00000000..ba8dabcb
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSource.h
@@ -0,0 +1,29 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsFakeStreamSource_h
+#define __vsFakeStreamSource_h
+
+#include <vsStreamSource.h>
+
+class QUrl;
+
+class vsFakeStreamSourcePrivate;
+
+class vsFakeStreamSource : public vsStreamSource
+{
+  Q_OBJECT
+
+public:
+  vsFakeStreamSource(const QUrl& streamUri);
+  virtual ~vsFakeStreamSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsFakeStreamSource)
+  QTE_DISABLE_COPY(vsFakeStreamSource)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourceFactoryPlugin.cxx b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourceFactoryPlugin.cxx
new file mode 100644
index 00000000..bb7a7bbe
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourceFactoryPlugin.cxx
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsFakeStreamSourceFactoryPlugin.h"
+
+#include <QtPlugin>
+
+#include "vsFakeStreamFactory.h"
+
+Q_EXPORT_PLUGIN2(vsFakeStreamSourceFactory, vsFakeStreamSourceFactoryPlugin)
+
+namespace { static const int keyCreateAction = 0; }
+
+//-----------------------------------------------------------------------------
+vsFakeStreamSourceFactoryPlugin::vsFakeStreamSourceFactoryPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsFakeStreamSourceFactoryPlugin::~vsFakeStreamSourceFactoryPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsFakeStreamSourceFactoryPlugin::identifier() const
+{
+  return "FakeStream";
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourceFactoryPlugin::registerActions()
+{
+  this->registerAction(
+    keyCreateAction, "Create Fa&ke Stream", QString(), "Ctrl+O, K",
+    "Create a fake stream");
+}
+
+//-----------------------------------------------------------------------------
+void vsFakeStreamSourceFactoryPlugin::insertActions(
+  qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  videoMenu.insertAction(this->action(keyCreateAction), 100);
+  Q_UNUSED(trackMenu);
+  Q_UNUSED(descriptorMenu);
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactory* vsFakeStreamSourceFactoryPlugin::createFactory()
+{
+  return new vsFakeStreamFactory;
+}
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourceFactoryPlugin.h b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourceFactoryPlugin.h
new file mode 100644
index 00000000..e8f7a57c
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourceFactoryPlugin.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsFakeStreamSourceFactoryPlugin_h
+#define __vsFakeStreamSourceFactoryPlugin_h
+
+#include <QObject>
+
+#include <vsSourceFactoryPlugin.h>
+
+class vsFakeStreamSourceFactoryPlugin : public QObject,
+                                        public vsSourceFactoryPlugin
+{
+  Q_OBJECT
+  Q_INTERFACES(vsSourceFactoryInterface)
+
+public:
+  vsFakeStreamSourceFactoryPlugin();
+  virtual ~vsFakeStreamSourceFactoryPlugin();
+
+  virtual QString identifier() const QTE_OVERRIDE;
+
+  virtual void registerActions() QTE_OVERRIDE;
+
+  virtual vsSourceFactory* createFactory() QTE_OVERRIDE;
+
+protected:
+  virtual void insertActions(
+    qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsFakeStreamSourceFactoryPlugin)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourcePrivate.h b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourcePrivate.h
new file mode 100644
index 00000000..1081b6fd
--- /dev/null
+++ b/Plugins/VspSourceService/FakeStreamSourceFactory/vsFakeStreamSourcePrivate.h
@@ -0,0 +1,95 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsFakeStreamSourcePrivate_h
+#define __vsFakeStreamSourcePrivate_h
+
+#include <QHash>
+#include <QMap>
+
+#include <qtKstReader.h>
+
+#include <vvTrack.h>
+
+#include <vsTrackClassifier.h>
+
+#include <vsSimpleSourceFactory.h>
+#include <vsStreamSourcePrivate.h>
+
+#include "vsFakeStreamSource.h"
+
+class vsVideoArchive;
+
+class vsFakeStreamSourcePrivate : public vsStreamSourcePrivate
+{
+  Q_OBJECT
+
+protected:
+  QTE_DECLARE_PUBLIC(vsFakeStreamSource)
+
+  vsFakeStreamSourcePrivate(vsFakeStreamSource* q, const QUrl& streamUri);
+  virtual ~vsFakeStreamSourcePrivate();
+
+  virtual void run() QTE_OVERRIDE;
+  virtual void findTime(vtkVgTimeStamp* result, unsigned int frameNumber,
+                        vg::SeekMode) QTE_OVERRIDE;
+  virtual void requestFrame(const vgVideoSeekRequest&) QTE_OVERRIDE;
+  virtual void clearLastRequest(vgVideoSourceRequestor*) QTE_OVERRIDE;
+
+  QUrl relativeUri(QString path) const;
+  void processProjectLine();
+  void addArchiveSourceFactory(vsSimpleSourceFactoryPtr& factory);
+
+  using vsStreamSourcePrivate::text;
+  virtual QString text(QString format) const QTE_OVERRIDE;
+
+signals:
+  void streamingFinished();
+
+  void trackUpdated(vvTrackId trackId, vvTrackState state);
+  void trackClosed(vvTrackId trackId);
+
+  void tocAvailable(vvTrackId trackId, vsTrackObjectClassifier toc);
+
+protected slots:
+  void releaseFrame();
+  void sourceStatusChanged();
+  void setAvailableFrames(QList<vtkVgVideoFrameMetaData>);
+  void queueTrackUpdate(vvTrackId, vvTrackState);
+  void queueTrackUpdate(vvTrackId, QList<vvTrackState>);
+  void queueTrackClassifier(vvTrackId, vsTrackObjectClassifier);
+  void queueEvent(vsDescriptorSource* source, vsEvent event);
+
+  void flush(vtkVgTimeStamp = vtkVgTimeStamp());
+  void flushData(vtkVgTimeStamp);
+
+  void setStreamRate(double);
+  void setStreamJitter(double);
+  void setStreamMaxBurstTime(double);
+
+protected:
+  qtKstReader Project;
+
+  QScopedPointer<vsVideoArchive> VideoArchive;
+  QList<QSharedPointer<vsDataSource> > CurrentDataSources;
+
+  QMap<vtkVgTimeStamp, vtkVgVideoFrameMetaData> VideoFrames;
+  vtkVgTimeStamp LastFrameReleased;
+  vtkVgTimeStamp NextFrame;
+
+  typedef QMap<vtkVgTimeStamp, vvTrackState> TrackStateMap;
+  QHash<vvTrackId, TrackStateMap> TrackUpdates;
+  QHash<vvTrackId, vsTrackObjectClassifier> Tocs;
+  QMap<vtkVgTimeStamp, vsEvent> Events;
+  vtkIdType NextEventId;
+
+  double StreamRate, StreamJitter, StreamMaxBurstTime;
+
+private:
+  QTE_DISABLE_COPY(vsFakeStreamSourcePrivate)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/KstArchiveSource/CMakeLists.txt b/Plugins/VspSourceService/KstArchiveSource/CMakeLists.txt
new file mode 100644
index 00000000..0630159b
--- /dev/null
+++ b/Plugins/VspSourceService/KstArchiveSource/CMakeLists.txt
@@ -0,0 +1,32 @@
+project(vsKstArchiveSource)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+vg_include_library_sdk_directories(vspSourceUtil)
+
+set(vsKstArchiveSource_Sources
+  vsKstArchiveSourcePlugin.cxx
+  vsKstDescriptorArchiveSource.cxx
+)
+
+set(vsKstArchiveSource_MocHeaders
+  vsKstArchiveSourcePlugin.h
+  vsKstDescriptorArchiveSource.h
+)
+
+qt4_wrap_cpp(vsKstArchiveSource_MocSources ${vsKstArchiveSource_MocHeaders})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsKstArchiveSource_Sources}
+  ${vsKstArchiveSource_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  vspSourceUtil
+  vvIO
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspSourceService/KstArchiveSource/vsKstArchiveSourcePlugin.cxx b/Plugins/VspSourceService/KstArchiveSource/vsKstArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..1b89504f
--- /dev/null
+++ b/Plugins/VspSourceService/KstArchiveSource/vsKstArchiveSourcePlugin.cxx
@@ -0,0 +1,119 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsKstArchiveSourcePlugin.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QRegExp>
+#include <QStringList>
+#include <QUrl>
+#include <QtPlugin>
+
+#include <vgCheckArg.h>
+
+#include <vsStaticSourceFactory.h>
+
+#include "vsKstDescriptorArchiveSource.h"
+
+Q_EXPORT_PLUGIN2(vsKstArchiveSource, vsKstArchiveSourcePlugin)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+bool regexMatch(const QRegExp& re, const QString& str)
+{
+  return re.indexIn(str) >= 0;
+}
+
+//-----------------------------------------------------------------------------
+bool regexMatch(const QString& re, const QString& str)
+{
+  return regexMatch(QRegExp(re), str);
+}
+
+//-----------------------------------------------------------------------------
+bool regexMatchHeader(const QString& reHeader, const QString& str)
+{
+  return regexMatch(QRegExp(reHeader + "\\s*[,;]"), str);
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vsKstArchiveSourcePlugin::vsKstArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsKstArchiveSourcePlugin::~vsKstArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceTypes vsKstArchiveSourcePlugin::archiveTypes() const
+{
+  // TODO: support tracks
+  return vs::ArchiveDescriptorSource;
+}
+
+//-----------------------------------------------------------------------------
+vsArchivePluginInfo vsKstArchiveSourcePlugin::archivePluginInfo(
+  vsArchiveSourceType type) const
+{
+  // TODO: support tracks, raw descriptors
+  vsArchivePluginInfo info;
+  if (type == vs::ArchiveDescriptorSource)
+    {
+    vsArchiveFileType fileType;
+    fileType.Description = "Kitware saved result sets";
+    fileType.Patterns.append("*.vsr");
+    fileType.Patterns.append("*.vsrx");
+    fileType.Patterns.append("*.vsr.xml");
+    info.SupportedFileTypes.append(fileType);
+    }
+  return info;
+}
+
+//-----------------------------------------------------------------------------
+vsSimpleSourceFactory* vsKstArchiveSourcePlugin::createArchiveSource(
+  vsArchiveSourceType type, const QUrl& uri, SourceCreateMode mode)
+{
+  // Quick test for acceptable archive
+  if (mode == vsArchiveSourceInterface::QuickTest)
+    {
+    CHECK_ARG(type == vs::ArchiveDescriptorSource, 0);
+    CHECK_ARG(uri.scheme() == "file", 0);
+    CHECK_ARG(regexMatch(uri.toLocalFile(), "\\.vsr(x|\\..xml)?$"), 0);
+    }
+
+  // Verify that file exists and is readable
+  const QString fileName = uri.toLocalFile();
+  CHECK_ARG(QFileInfo(fileName).exists(), 0);
+  QFile file(fileName);
+  CHECK_ARG(file.open(QIODevice::ReadOnly | QIODevice::Text), 0);
+
+  // Try to verify file contents
+  forever
+    {
+    CHECK_ARG(!file.atEnd(), 0);
+    const QString line = QString::fromLocal8Bit(file.readLine()).trimmed();
+    if (!line.startsWith("#"))
+      {
+      // Not a comment; check for valid header
+      // TODO: support tracks, raw descriptors
+      CHECK_ARG(regexMatchHeader("EVENT_META", line), 0);
+
+      // If we get this far, accept the file
+      break;
+      }
+    }
+
+  vsStaticSourceFactory* factory = new vsStaticSourceFactory;
+  factory->addDescriptorSource(new vsKstDescriptorArchiveSource(uri));
+  return factory;
+}
diff --git a/Plugins/VspSourceService/KstArchiveSource/vsKstArchiveSourcePlugin.h b/Plugins/VspSourceService/KstArchiveSource/vsKstArchiveSourcePlugin.h
new file mode 100644
index 00000000..c4c11da9
--- /dev/null
+++ b/Plugins/VspSourceService/KstArchiveSource/vsKstArchiveSourcePlugin.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsKstArchiveSourcePlugin_h
+#define __vsKstArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsArchiveSourceInterface.h>
+
+class vsKstArchiveSourcePlugin : public QObject,
+                                 public vsArchiveSourceInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsArchiveSourceInterface)
+
+public:
+  vsKstArchiveSourcePlugin();
+  virtual ~vsKstArchiveSourcePlugin();
+
+  virtual vsArchiveSourceTypes archiveTypes() const QTE_OVERRIDE;
+  virtual vsArchivePluginInfo archivePluginInfo(
+    vsArchiveSourceType) const QTE_OVERRIDE;
+  virtual vsSimpleSourceFactory* createArchiveSource(
+    vsArchiveSourceType, const QUrl&, SourceCreateMode) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsKstArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/KstArchiveSource/vsKstDescriptorArchiveSource.cxx b/Plugins/VspSourceService/KstArchiveSource/vsKstDescriptorArchiveSource.cxx
new file mode 100644
index 00000000..a60d8aea
--- /dev/null
+++ b/Plugins/VspSourceService/KstArchiveSource/vsKstDescriptorArchiveSource.cxx
@@ -0,0 +1,142 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsKstDescriptorArchiveSource.h"
+
+#include <QDebug>
+
+#include <qtKstReader.h>
+
+#include <vvQueryResult.h>
+
+#include <vvEventSetInfo.h>
+#include <vvHeader.h>
+#include <vvKstReader.h>
+
+#include <vsTrackClassifier.h>
+
+#include <vsAdapt.h>
+#include <vsArchiveSourcePrivate.h>
+
+#define die(_msg) return this->abort(uri, _msg);
+#define test_or_die(_cond, _msg) if (!(_cond)) die(_msg)
+
+//-----------------------------------------------------------------------------
+class vsKstDescriptorArchiveSourcePrivate : public vsArchiveSourcePrivate
+{
+public:
+  vsKstDescriptorArchiveSourcePrivate(vsKstDescriptorArchiveSource* q,
+                                      const QUrl& uri);
+
+protected:
+  QTE_DECLARE_PUBLIC(vsKstDescriptorArchiveSource)
+
+  virtual bool processArchive(const QUrl& uri) QTE_OVERRIDE;
+
+  void processResults(const vvEventSetInfo& info,
+                      const QList<vvQueryResult>& results);
+
+  bool abort(const QUrl& uri, const QString& message);
+  bool abort(const QUrl& uri, const char* message);
+};
+
+QTE_IMPLEMENT_D_FUNC(vsKstDescriptorArchiveSource)
+
+//-----------------------------------------------------------------------------
+vsKstDescriptorArchiveSourcePrivate::vsKstDescriptorArchiveSourcePrivate(
+  vsKstDescriptorArchiveSource* q, const QUrl& uri)
+  : vsArchiveSourcePrivate(q, "descriptors", uri)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsKstDescriptorArchiveSourcePrivate::processArchive(const QUrl& uri)
+{
+  // Read file and header
+  qtKstReader kst(uri);
+  vvHeader header;
+  vvKstReader reader;
+  test_or_die(kst.isValid(), "the archive is not a valid KST");
+  test_or_die(reader.readHeader(kst, header), "unable to read header");
+
+  // What type of data are we dealing with?
+  if (header.type == vvHeader::EventSetInfo)
+    {
+    vvEventSetInfo info;
+    test_or_die(reader.readEventSetInfo(kst, info, header.version),
+                "unable to read result set meta-information");
+    test_or_die(reader.readHeader(kst, header), "unable to read header");
+
+    // Check that we have results (fall through to 'unsupported data type'
+    // otherwise)
+    if (header.type == vvHeader::QueryResults)
+      {
+      QList<vvQueryResult> results;
+      test_or_die(reader.readQueryResults(kst, results, header.version),
+                  "unable to read result set results");
+      test_or_die(!results.isEmpty(), "result set is empty");
+
+      // Hand off to helper
+      this->processResults(info, results);
+
+      // Done
+      return true;
+      }
+    }
+  // TODO: support raw descriptors
+
+  // If we get here, the archive contains something that we don't support
+  die("the archive does not contain a supported data type");
+}
+
+//-----------------------------------------------------------------------------
+void vsKstDescriptorArchiveSourcePrivate::processResults(
+  const vvEventSetInfo& info, const QList<vvQueryResult>& results)
+{
+  QTE_Q(vsKstDescriptorArchiveSource);
+
+  // Generate and emit event type
+  const int eventType = vsEventInfo::UserType;
+  q->emitEventType(vsEventInfo::fromEventSetInfo(info, eventType),
+                   info.DisplayThreshold);
+
+  // Emit events
+  vtkIdType id = 0;
+  foreach (const vvQueryResult& result, results)
+    {
+    vsEvent event = vsAdapt(result);
+    event->SetId(++id);
+    event->AddClassifier(eventType, result.RelevancyScore);
+    q->emitEvent(event);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vsKstDescriptorArchiveSourcePrivate::abort(
+  const QUrl& uri, const QString& message)
+{
+  return this->abort(uri, qPrintable(message));
+}
+
+//-----------------------------------------------------------------------------
+bool vsKstDescriptorArchiveSourcePrivate::abort(
+  const QUrl& uri, const char* message)
+{
+  const QString errorPrefix("Error reading archive \"%1\":");
+  qWarning() << qPrintable(errorPrefix.arg(uri.toString())) << message;
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+vsKstDescriptorArchiveSource::vsKstDescriptorArchiveSource(const QUrl& uri) :
+  super(new vsKstDescriptorArchiveSourcePrivate(this, uri))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsKstDescriptorArchiveSource::~vsKstDescriptorArchiveSource()
+{
+}
diff --git a/Plugins/VspSourceService/KstArchiveSource/vsKstDescriptorArchiveSource.h b/Plugins/VspSourceService/KstArchiveSource/vsKstDescriptorArchiveSource.h
new file mode 100644
index 00000000..400c2a6b
--- /dev/null
+++ b/Plugins/VspSourceService/KstArchiveSource/vsKstDescriptorArchiveSource.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsKstDescriptorArchiveSource_h
+#define __vsKstDescriptorArchiveSource_h
+
+#include <vsDescriptorSource.h>
+
+#include <vsArchiveSource.h>
+
+class vsKstDescriptorArchiveSourcePrivate;
+
+class vsKstDescriptorArchiveSource :
+  public vsArchiveSource<vsDescriptorSource>
+{
+  Q_OBJECT
+
+public:
+  vsKstDescriptorArchiveSource(const QUrl& uri);
+  virtual ~vsKstDescriptorArchiveSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsKstDescriptorArchiveSource)
+  QTE_DISABLE_COPY(vsKstDescriptorArchiveSource)
+
+  typedef vsArchiveSource<vsDescriptorSource> super;
+};
+
+#endif
diff --git a/Plugins/VspSourceService/Kw18ArchiveSource/CMakeLists.txt b/Plugins/VspSourceService/Kw18ArchiveSource/CMakeLists.txt
new file mode 100644
index 00000000..e4748f1c
--- /dev/null
+++ b/Plugins/VspSourceService/Kw18ArchiveSource/CMakeLists.txt
@@ -0,0 +1,39 @@
+project(vsKw18ArchiveSource)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+vg_include_library_sdk_directories(
+  vvVidtk
+  vspSourceUtil
+)
+include_directories(SYSTEM
+  ${Boost_INCLUDE_DIRS}
+  ${VIDTK_INCLUDE_DIRS}
+)
+
+set(vsKw18ArchiveSource_Sources
+  vsKw18ArchiveSourcePlugin.cxx
+  vsKw18TrackArchiveSource.cxx
+)
+
+set(vsKw18ArchiveSource_MocHeaders
+  vsKw18ArchiveSourcePlugin.h
+  vsKw18TrackArchiveSource.h
+)
+
+qt4_wrap_cpp(vsKw18ArchiveSource_MocSources ${vsKw18ArchiveSource_MocHeaders})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsKw18ArchiveSource_Sources}
+  ${vsKw18ArchiveSource_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  vvVidtk
+  vspSourceUtil
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18ArchiveSourcePlugin.cxx b/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18ArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..33b85642
--- /dev/null
+++ b/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18ArchiveSourcePlugin.cxx
@@ -0,0 +1,99 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsKw18ArchiveSourcePlugin.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QStringList>
+#include <QUrl>
+#include <QtPlugin>
+
+#include <vgCheckArg.h>
+
+#include <vsStaticSourceFactory.h>
+
+#include "vsKw18TrackArchiveSource.h"
+
+Q_EXPORT_PLUGIN2(vsKw18ArchiveSource, vsKw18ArchiveSourcePlugin)
+
+//-----------------------------------------------------------------------------
+vsKw18ArchiveSourcePlugin::vsKw18ArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsKw18ArchiveSourcePlugin::~vsKw18ArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceTypes vsKw18ArchiveSourcePlugin::archiveTypes() const
+{
+  return vs::ArchiveTrackSource;
+}
+
+//-----------------------------------------------------------------------------
+vsArchivePluginInfo vsKw18ArchiveSourcePlugin::archivePluginInfo(
+  vsArchiveSourceType type) const
+{
+  vsArchivePluginInfo info;
+  if (type == vs::ArchiveTrackSource)
+    {
+    vsArchiveFileType fileType;
+    fileType.Description = "Kitware CSV tracks";
+    fileType.Patterns.append("*.kw18");
+    info.SupportedFileTypes.append(fileType);
+    }
+  return info;
+}
+
+//-----------------------------------------------------------------------------
+vsSimpleSourceFactory* vsKw18ArchiveSourcePlugin::createArchiveSource(
+  vsArchiveSourceType type, const QUrl& uri, SourceCreateMode mode)
+{
+  // Quick test for acceptable archive
+  if (mode == vsArchiveSourceInterface::QuickTest)
+    {
+    CHECK_ARG(type == vs::ArchiveTrackSource, 0);
+    CHECK_ARG(uri.scheme() == "file", 0);
+    CHECK_ARG(uri.toLocalFile().endsWith(".kw18"), 0);
+    }
+
+  // Verify that file exists and is readable
+  const QString fileName = uri.toLocalFile();
+  CHECK_ARG(QFileInfo(fileName).exists(), 0);
+  QFile file(fileName);
+  CHECK_ARG(file.open(QIODevice::ReadOnly | QIODevice::Text), 0);
+
+  // Try to verify file contents
+  forever
+    {
+    CHECK_ARG(!file.atEnd(), 0);
+    const QString line = QString::fromAscii(file.readLine());
+    if (line.startsWith("# 1:Track-id"))
+      {
+      // This looks like a valid header; accept the file
+      break;
+      }
+    if (!line.startsWith("#"))
+      {
+      // Not a comment; test if it looks like a valid record
+      const QStringList fields = line.split(" ", QString::SkipEmptyParts);
+      CHECK_ARG(fields.count() >= 18, 0); // Do we have enough fields?
+      bool isIdOkay;
+      fields[0].toInt(&isIdOkay);
+      CHECK_ARG(isIdOkay, 0); // Does the first field look like an integer?
+
+      // If we get this far, accept the file
+      break;
+      }
+    }
+
+  vsStaticSourceFactory* factory = new vsStaticSourceFactory;
+  factory->addTrackSource(new vsKw18TrackArchiveSource(uri));
+  return factory;
+}
diff --git a/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18ArchiveSourcePlugin.h b/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18ArchiveSourcePlugin.h
new file mode 100644
index 00000000..902334c8
--- /dev/null
+++ b/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18ArchiveSourcePlugin.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsKw18ArchiveSourcePlugin_h
+#define __vsKw18ArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsArchiveSourceInterface.h>
+
+class vsKw18ArchiveSourcePlugin : public QObject,
+                                  public vsArchiveSourceInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsArchiveSourceInterface)
+
+public:
+  vsKw18ArchiveSourcePlugin();
+  virtual ~vsKw18ArchiveSourcePlugin();
+
+  virtual vsArchiveSourceTypes archiveTypes() const QTE_OVERRIDE;
+  virtual vsArchivePluginInfo archivePluginInfo(
+    vsArchiveSourceType) const QTE_OVERRIDE;
+  virtual vsSimpleSourceFactory* createArchiveSource(
+    vsArchiveSourceType, const QUrl&, SourceCreateMode) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsKw18ArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18TrackArchiveSource.cxx b/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18TrackArchiveSource.cxx
new file mode 100644
index 00000000..036ba68a
--- /dev/null
+++ b/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18TrackArchiveSource.cxx
@@ -0,0 +1,82 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsKw18TrackArchiveSource.h"
+
+#include <qtThread.h>
+
+#include <tracking/kw18_reader.h>
+
+#include <vsAdapt.h>
+#include <vsArchiveSourcePrivate.h>
+
+#include <vvAdaptVidtk.h>
+
+//-----------------------------------------------------------------------------
+class vsKw18TrackArchiveSourcePrivate : public vsArchiveSourcePrivate
+{
+public:
+  vsKw18TrackArchiveSourcePrivate(vsKw18TrackArchiveSource* q, const QUrl& uri);
+
+protected:
+  QTE_DECLARE_PUBLIC(vsKw18TrackArchiveSource)
+
+  virtual bool processArchive(const QUrl& uri) QTE_OVERRIDE;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsKw18TrackArchiveSource)
+
+//-----------------------------------------------------------------------------
+vsKw18TrackArchiveSourcePrivate::vsKw18TrackArchiveSourcePrivate(
+  vsKw18TrackArchiveSource* q, const QUrl& uri)
+  : vsArchiveSourcePrivate(q, "tracks", uri)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsKw18TrackArchiveSourcePrivate::processArchive(const QUrl& uri)
+{
+  QTE_Q(vsKw18TrackArchiveSource);
+
+  QString fileName = uri.toLocalFile();
+  vidtk::kw18_reader trackReader(qPrintable(fileName));
+
+  // Read tracks
+  vcl_vector<vidtk::track_sptr> tracks;
+  if (!trackReader.read(tracks))
+    {
+    return false;
+    }
+
+  // Process the tracks
+  for (size_t n = 0; n < tracks.size(); ++n)
+    {
+    QList<vvTrackState> states;
+    vvTrackId id = vsAdaptTrackId(tracks[n]->id());
+    const vcl_vector<vidtk::track_state_sptr>& h = tracks[n]->history();
+    for (size_t j = 0; j < h.size(); ++j)
+      {
+      vidtk::track_state_sptr s = h[j];
+      states.append(vvAdapt(*s));
+      }
+    emit q->trackUpdated(id, states);
+    emit q->trackClosed(id);
+    }
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vsKw18TrackArchiveSource::vsKw18TrackArchiveSource(const QUrl& uri) :
+  super(new vsKw18TrackArchiveSourcePrivate(this, uri))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsKw18TrackArchiveSource::~vsKw18TrackArchiveSource()
+{
+}
diff --git a/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18TrackArchiveSource.h b/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18TrackArchiveSource.h
new file mode 100644
index 00000000..469d099e
--- /dev/null
+++ b/Plugins/VspSourceService/Kw18ArchiveSource/vsKw18TrackArchiveSource.h
@@ -0,0 +1,33 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsKw18TrackArchiveSource_h
+#define __vsKw18TrackArchiveSource_h
+
+#include <QUrl>
+
+#include <vsTrackSource.h>
+
+#include <vsArchiveSource.h>
+
+class vsKw18TrackArchiveSourcePrivate;
+
+class vsKw18TrackArchiveSource : public vsArchiveSource<vsTrackSource>
+{
+  Q_OBJECT
+
+public:
+  vsKw18TrackArchiveSource(const QUrl& archiveUri);
+  virtual ~vsKw18TrackArchiveSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsKw18TrackArchiveSource)
+  QTE_DISABLE_COPY(vsKw18TrackArchiveSource)
+
+  typedef vsArchiveSource<vsTrackSource> super;
+};
+
+#endif
diff --git a/Plugins/VspSourceService/KwaArchiveSource/CMakeLists.txt b/Plugins/VspSourceService/KwaArchiveSource/CMakeLists.txt
new file mode 100644
index 00000000..f1665d6d
--- /dev/null
+++ b/Plugins/VspSourceService/KwaArchiveSource/CMakeLists.txt
@@ -0,0 +1,31 @@
+project(vsKwaArchiveSource)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+vg_include_library_sdk_directories(vspSourceUtil)
+
+set(vsKwaArchiveSource_Sources
+  vsKwaArchiveSourcePlugin.cxx
+  vsKwaVideoArchiveSource.cxx
+)
+
+set(vsKwaArchiveSource_MocHeaders
+  vsKwaArchiveSourcePlugin.h
+  vsKwaVideoArchiveSource.h
+)
+
+qt4_wrap_cpp(vsKwaArchiveSource_MocSources ${vsKwaArchiveSource_MocHeaders})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsKwaArchiveSource_Sources}
+  ${vsKwaArchiveSource_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  vspSourceUtil
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspSourceService/KwaArchiveSource/vsKwaArchiveSourcePlugin.cxx b/Plugins/VspSourceService/KwaArchiveSource/vsKwaArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..dbf373c2
--- /dev/null
+++ b/Plugins/VspSourceService/KwaArchiveSource/vsKwaArchiveSourcePlugin.cxx
@@ -0,0 +1,83 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsKwaArchiveSourcePlugin.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QStringList>
+#include <QUrl>
+#include <QtPlugin>
+
+#include <vgCheckArg.h>
+
+#include <vsStaticSourceFactory.h>
+
+#include "vsKwaVideoArchiveSource.h"
+
+Q_EXPORT_PLUGIN2(vsKwaArchiveSource, vsKwaArchiveSourcePlugin)
+
+//-----------------------------------------------------------------------------
+vsKwaArchiveSourcePlugin::vsKwaArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsKwaArchiveSourcePlugin::~vsKwaArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceTypes vsKwaArchiveSourcePlugin::archiveTypes() const
+{
+  return vs::ArchiveVideoSource;
+}
+
+//-----------------------------------------------------------------------------
+vsArchivePluginInfo vsKwaArchiveSourcePlugin::archivePluginInfo(
+  vsArchiveSourceType type) const
+{
+  vsArchivePluginInfo info;
+  if (type == vs::ArchiveVideoSource)
+    {
+    vsArchiveFileType fileType;
+    fileType.Description = "Kitware video archive";
+    fileType.Patterns.append("*.index");
+    info.SupportedFileTypes.append(fileType);
+    }
+  return info;
+}
+
+//-----------------------------------------------------------------------------
+vsSimpleSourceFactory* vsKwaArchiveSourcePlugin::createArchiveSource(
+  vsArchiveSourceType type, const QUrl& uri, SourceCreateMode mode)
+{
+  // Quick test for acceptable archive
+  if (mode == vsArchiveSourceInterface::QuickTest)
+    {
+    CHECK_ARG(type == vs::ArchiveVideoSource, 0);
+    CHECK_ARG(uri.scheme() == "file", 0);
+    CHECK_ARG(uri.toLocalFile().endsWith(".index"), 0);
+    }
+
+  // Verify that file exists and is readable
+  const QString fileName = uri.toLocalFile();
+  CHECK_ARG(QFileInfo(fileName).exists(), 0);
+  QFile file(fileName);
+  CHECK_ARG(file.open(QIODevice::ReadOnly | QIODevice::Text), 0);
+
+  // Try to verify file contents (this is a REALLY loose test)
+  CHECK_ARG(!file.atEnd(), 0);
+  const QByteArray line = file.readLine().trimmed();
+  bool isVersionOkay;
+  line.toInt(&isVersionOkay);
+  CHECK_ARG(isVersionOkay, 0); // Does the first line look like an integer?
+
+  // If we get this far, accept the file
+  vsStaticSourceFactory* factory = new vsStaticSourceFactory;
+  factory->setVideoSource(new vsKwaVideoArchiveSource(uri));
+  return factory;
+}
diff --git a/Plugins/VspSourceService/KwaArchiveSource/vsKwaArchiveSourcePlugin.h b/Plugins/VspSourceService/KwaArchiveSource/vsKwaArchiveSourcePlugin.h
new file mode 100644
index 00000000..d02857a2
--- /dev/null
+++ b/Plugins/VspSourceService/KwaArchiveSource/vsKwaArchiveSourcePlugin.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsKwaArchiveSourcePlugin_h
+#define __vsKwaArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsArchiveSourceInterface.h>
+
+class vsKwaArchiveSourcePlugin : public QObject,
+                                 public vsArchiveSourceInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsArchiveSourceInterface)
+
+public:
+  vsKwaArchiveSourcePlugin();
+  virtual ~vsKwaArchiveSourcePlugin();
+
+  virtual vsArchiveSourceTypes archiveTypes() const QTE_OVERRIDE;
+  virtual vsArchivePluginInfo archivePluginInfo(
+    vsArchiveSourceType) const QTE_OVERRIDE;
+  virtual vsSimpleSourceFactory* createArchiveSource(
+    vsArchiveSourceType, const QUrl&, SourceCreateMode) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsKwaArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSource.cxx b/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSource.cxx
new file mode 100644
index 00000000..b45a8487
--- /dev/null
+++ b/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSource.cxx
@@ -0,0 +1,166 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsKwaVideoArchiveSource.h"
+#include "vsKwaVideoArchiveSourcePrivate.h"
+
+#include <QTimerEvent>
+
+#include <qtUtil.h>
+
+QTE_IMPLEMENT_D_FUNC(vsKwaVideoArchiveSource)
+
+//-----------------------------------------------------------------------------
+void vsKwaVideoArchiveSourcePrivate::requestFrame(
+  const vgVideoSeekRequest& request)
+{
+  this->Archive.requestFrame(request);
+}
+
+//-----------------------------------------------------------------------------
+void vsKwaVideoArchiveSourcePrivate::clearLastRequest(
+  vgVideoSourceRequestor* requestor)
+{
+  this->Archive.clearLastRequest(requestor);
+}
+
+//-----------------------------------------------------------------------------
+void vsKwaVideoArchiveSourcePrivate::findTime(
+  vtkVgTimeStamp* result, unsigned int frameNumber, vg::SeekMode roundMode)
+{
+  *result = this->Archive.findTime(frameNumber, roundMode);
+}
+
+//-----------------------------------------------------------------------------
+vsKwaVideoArchiveSourcePrivate::vsKwaVideoArchiveSourcePrivate(
+  vsVideoSource* q, QUrl archiveUri) :
+  vsVideoSourcePrivate(q), Archive(archiveUri),
+  StatusTimerId(0), StatusTtl(0)
+{
+  if (this->Archive.okay())
+    {
+    this->Status = vsDataSource::ArchivedIdle;
+    this->Archive.moveToThread(this->thread());
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsKwaVideoArchiveSourcePrivate::~vsKwaVideoArchiveSourcePrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsKwaVideoArchiveSourcePrivate::run()
+{
+  // Connect archive signals
+  connect(&this->Archive,
+          SIGNAL(frameRangeAvailable(vtkVgTimeStamp, vtkVgTimeStamp)),
+          this, SLOT(updateFrameRange(vtkVgTimeStamp, vtkVgTimeStamp)));
+  connect(&this->Archive,
+          SIGNAL(metadataAvailable(QList<vtkVgVideoFrameMetaData>)),
+          this, SLOT(emitMetadata(QList<vtkVgVideoFrameMetaData>)));
+
+  // Get homographies for the whole clip; needed to load tracks/events correctly
+  this->Archive.initialize();
+
+  // Hand off to event loop
+  vsVideoSourcePrivate::run();
+}
+
+//-----------------------------------------------------------------------------
+vsKwaVideoArchiveSource::vsKwaVideoArchiveSource(QUrl archiveUri) :
+  vsVideoSource(new vsKwaVideoArchiveSourcePrivate(this, archiveUri))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsKwaVideoArchiveSource::~vsKwaVideoArchiveSource()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsKwaVideoArchiveSource::text() const
+{
+  QTE_D_CONST(vsKwaVideoArchiveSource);
+
+  switch (d->Status)
+    {
+    case vsDataSource::ArchivedActive:
+      return "A Archived";
+    case vsDataSource::ArchivedIdle:
+      return "(I Archived)";
+    default:
+      return "(none)";
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vsKwaVideoArchiveSource::toolTip() const
+{
+  QTE_D_CONST(vsKwaVideoArchiveSource);
+
+  QString uriStr = d->Archive.uri().toString();
+  switch (d->Status)
+    {
+    case vsDataSource::ArchivedActive:
+      return "Playing archived video from " + uriStr;
+    case vsDataSource::ArchivedIdle:
+      return "Using archived video (idle) from " + uriStr;
+    default:
+      return "(no video source)";
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsKwaVideoArchiveSource::requestFrame(vgVideoSeekRequest request)
+{
+  if (QThread::currentThread() != this->thread())
+    {
+    QMetaObject::invokeMethod(this, "requestFrame",
+                              Q_ARG(vgVideoSeekRequest, request));
+    return;
+    }
+
+  QTE_D(vsKwaVideoArchiveSource);
+
+  if (d->Status != vsDataSource::ArchivedActive)
+    {
+    // If not already active, change status to active
+    this->updateStatus(vsDataSource::ArchivedActive);
+    }
+
+  if (d->StatusTimerId == 0)
+    {
+    // If not already running, start a timer to 'clear' the active status after
+    // a short interval
+    d->StatusTimerId = this->startTimer(150);
+    }
+
+  // Persist status for a short interval
+  d->StatusTtl = 2;
+
+  // Pass the actual request along to the superclass
+  vsVideoSource::requestFrame(request);
+}
+
+//-----------------------------------------------------------------------------
+void vsKwaVideoArchiveSource::timerEvent(QTimerEvent* e)
+{
+  QTE_D(vsKwaVideoArchiveSource);
+  if (e->timerId() == d->StatusTimerId)
+    {
+    if ((--d->StatusTtl) <= 0)
+      {
+      // If our interval for active status has expired, drop back to idle and
+      // kill the timer
+      this->updateStatus(vsDataSource::ArchivedIdle);
+      this->killTimer(e->timerId());
+      d->StatusTimerId = 0;
+      }
+    return;
+    }
+  vsVideoSource::timerEvent(e);
+}
diff --git a/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSource.h b/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSource.h
new file mode 100644
index 00000000..7655a547
--- /dev/null
+++ b/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSource.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsKwaVideoArchiveSource_h
+#define __vsKwaVideoArchiveSource_h
+
+#include <QUrl>
+
+#include <vsVideoSource.h>
+
+class vsKwaVideoArchiveSourcePrivate;
+
+class vsKwaVideoArchiveSource : public vsVideoSource
+{
+  Q_OBJECT
+
+public:
+  vsKwaVideoArchiveSource(QUrl archiveUri);
+  virtual ~vsKwaVideoArchiveSource();
+
+  virtual QString text() const QTE_OVERRIDE;
+  virtual QString toolTip() const QTE_OVERRIDE;
+
+protected slots:
+  virtual void requestFrame(vgVideoSeekRequest) QTE_OVERRIDE;
+
+protected:
+  virtual void timerEvent(QTimerEvent*) QTE_OVERRIDE;
+
+private:
+  QTE_DECLARE_PRIVATE(vsKwaVideoArchiveSource)
+  QTE_DISABLE_COPY(vsKwaVideoArchiveSource)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSourcePrivate.h b/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSourcePrivate.h
new file mode 100644
index 00000000..5ef004cf
--- /dev/null
+++ b/Plugins/VspSourceService/KwaArchiveSource/vsKwaVideoArchiveSourcePrivate.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsKwaVideoArchiveSourcePrivate_h
+#define __vsKwaVideoArchiveSourcePrivate_h
+
+#include <vsVideoSourcePrivate.h>
+
+#include <vsVideoArchive.h>
+
+class vsKwaVideoArchiveSourcePrivate : public vsVideoSourcePrivate
+{
+public:
+  vsKwaVideoArchiveSourcePrivate(vsVideoSource* q, QUrl archiveUri);
+  virtual ~vsKwaVideoArchiveSourcePrivate();
+
+protected:
+  friend class vsKwaVideoArchiveSource;
+
+  virtual void run() QTE_OVERRIDE;
+  virtual void findTime(vtkVgTimeStamp*, unsigned int,
+                        vg::SeekMode) QTE_OVERRIDE;
+  virtual void requestFrame(const vgVideoSeekRequest&) QTE_OVERRIDE;
+  virtual void clearLastRequest(vgVideoSourceRequestor*) QTE_OVERRIDE;
+
+  vsVideoArchive Archive;
+  int StatusTimerId;
+  int StatusTtl;
+
+private:
+  QTE_DISABLE_COPY(vsKwaVideoArchiveSourcePrivate)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/PvoArchiveSource/CMakeLists.txt b/Plugins/VspSourceService/PvoArchiveSource/CMakeLists.txt
new file mode 100644
index 00000000..b44495a2
--- /dev/null
+++ b/Plugins/VspSourceService/PvoArchiveSource/CMakeLists.txt
@@ -0,0 +1,31 @@
+project(vsPvoArchiveSource)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+vg_include_library_sdk_directories(vspSourceUtil)
+
+set(vsPvoArchiveSource_Sources
+  vsPvoArchiveSourcePlugin.cxx
+  vsPvoDescriptorArchiveSource.cxx
+)
+
+set(vsPvoArchiveSource_MocHeaders
+  vsPvoArchiveSourcePlugin.h
+  vsPvoDescriptorArchiveSource.h
+)
+
+qt4_wrap_cpp(vsPvoArchiveSource_MocSources ${vsPvoArchiveSource_MocHeaders})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsPvoArchiveSource_Sources}
+  ${vsPvoArchiveSource_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  vspSourceUtil
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspSourceService/PvoArchiveSource/vsPvoArchiveSourcePlugin.cxx b/Plugins/VspSourceService/PvoArchiveSource/vsPvoArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..236a2989
--- /dev/null
+++ b/Plugins/VspSourceService/PvoArchiveSource/vsPvoArchiveSourcePlugin.cxx
@@ -0,0 +1,85 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsPvoArchiveSourcePlugin.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QStringList>
+#include <QUrl>
+#include <QtPlugin>
+
+#include <vgCheckArg.h>
+
+#include <vsStaticSourceFactory.h>
+
+#include "vsPvoDescriptorArchiveSource.h"
+
+Q_EXPORT_PLUGIN2(vsPvoArchiveSource, vsPvoArchiveSourcePlugin)
+
+//-----------------------------------------------------------------------------
+vsPvoArchiveSourcePlugin::vsPvoArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsPvoArchiveSourcePlugin::~vsPvoArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceTypes vsPvoArchiveSourcePlugin::archiveTypes() const
+{
+  return vs::ArchiveDescriptorSource;
+}
+
+//-----------------------------------------------------------------------------
+vsArchivePluginInfo vsPvoArchiveSourcePlugin::archivePluginInfo(
+  vsArchiveSourceType type) const
+{
+  vsArchivePluginInfo info;
+  if (type == vs::ArchiveDescriptorSource)
+    {
+    vsArchiveFileType fileType;
+    fileType.Description = "Kitware collected P/V/O's";
+    fileType.Patterns.append("*.pvo.txt");
+    info.SupportedFileTypes.append(fileType);
+    }
+  return info;
+}
+
+//-----------------------------------------------------------------------------
+vsSimpleSourceFactory* vsPvoArchiveSourcePlugin::createArchiveSource(
+  vsArchiveSourceType type, const QUrl& uri, SourceCreateMode mode)
+{
+  // Quick test for acceptable archive
+  if (mode == vsArchiveSourceInterface::QuickTest)
+    {
+    CHECK_ARG(type == vs::ArchiveDescriptorSource, 0);
+    CHECK_ARG(uri.scheme() == "file", 0);
+    CHECK_ARG(uri.toLocalFile().endsWith(".pvo.txt"), 0);
+    }
+
+  // Verify that file exists and is readable
+  const QString fileName = uri.toLocalFile();
+  CHECK_ARG(QFileInfo(fileName).exists(), 0);
+  QFile file(fileName);
+  CHECK_ARG(file.open(QIODevice::ReadOnly | QIODevice::Text), 0);
+
+  // Try to verify file contents
+  CHECK_ARG(!file.atEnd(), 0);
+  const QString line = QString::fromAscii(file.readLine());
+  const QStringList fields = line.split(" ", QString::SkipEmptyParts);
+  CHECK_ARG(fields.count() >= 4, 0); // Do we have enough fields?
+  bool isIdOkay;
+  fields[0].toInt(&isIdOkay);
+  CHECK_ARG(isIdOkay, 0); // Does the first field look like an integer?
+
+  // If we get this far, accept the file
+  vsStaticSourceFactory* factory = new vsStaticSourceFactory;
+  factory->addDescriptorSource(new vsPvoDescriptorArchiveSource(uri));
+  return factory;
+}
diff --git a/Plugins/VspSourceService/PvoArchiveSource/vsPvoArchiveSourcePlugin.h b/Plugins/VspSourceService/PvoArchiveSource/vsPvoArchiveSourcePlugin.h
new file mode 100644
index 00000000..7cbac54d
--- /dev/null
+++ b/Plugins/VspSourceService/PvoArchiveSource/vsPvoArchiveSourcePlugin.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsPvoArchiveSourcePlugin_h
+#define __vsPvoArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsArchiveSourceInterface.h>
+
+class vsPvoArchiveSourcePlugin : public QObject,
+                                 public vsArchiveSourceInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsArchiveSourceInterface)
+
+public:
+  vsPvoArchiveSourcePlugin();
+  virtual ~vsPvoArchiveSourcePlugin();
+
+  virtual vsArchiveSourceTypes archiveTypes() const QTE_OVERRIDE;
+  virtual vsArchivePluginInfo archivePluginInfo(
+    vsArchiveSourceType) const QTE_OVERRIDE;
+  virtual vsSimpleSourceFactory* createArchiveSource(
+    vsArchiveSourceType, const QUrl&, SourceCreateMode) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsPvoArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/PvoArchiveSource/vsPvoDescriptorArchiveSource.cxx b/Plugins/VspSourceService/PvoArchiveSource/vsPvoDescriptorArchiveSource.cxx
new file mode 100644
index 00000000..35659f79
--- /dev/null
+++ b/Plugins/VspSourceService/PvoArchiveSource/vsPvoDescriptorArchiveSource.cxx
@@ -0,0 +1,78 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsPvoDescriptorArchiveSource.h"
+
+#include <qtKstReader.h>
+
+#include <vsTrackClassifier.h>
+
+#include <vsAdapt.h>
+#include <vsArchiveSourcePrivate.h>
+
+//-----------------------------------------------------------------------------
+class vsPvoDescriptorArchiveSourcePrivate : public vsArchiveSourcePrivate
+{
+public:
+  vsPvoDescriptorArchiveSourcePrivate(vsPvoDescriptorArchiveSource* q,
+                                      const QUrl& uri);
+
+protected:
+  QTE_DECLARE_PUBLIC(vsPvoDescriptorArchiveSource)
+
+  virtual bool processArchive(const QUrl& uri) QTE_OVERRIDE;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsPvoDescriptorArchiveSource)
+
+//-----------------------------------------------------------------------------
+vsPvoDescriptorArchiveSourcePrivate::vsPvoDescriptorArchiveSourcePrivate(
+  vsPvoDescriptorArchiveSource* q, const QUrl& uri) :
+  vsArchiveSourcePrivate(q, "descriptors", uri)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsPvoDescriptorArchiveSourcePrivate::processArchive(const QUrl& uri)
+{
+  QTE_Q(vsPvoDescriptorArchiveSource);
+
+  // Read P/V/O's
+  qtKstReader reader(uri, QRegExp("\\s+"), QRegExp("\n"));
+  if (!reader.isValid())
+    {
+    return false;
+    }
+
+  // Process the P/V/O's
+  while (!reader.isEndOfFile())
+    {
+    int trackId;
+    vsTrackObjectClassifier toc;
+    if (reader.readInt(trackId, 0) &&
+        reader.readReal(toc.probabilityPerson, 1) &&
+        reader.readReal(toc.probabilityVehicle, 2) &&
+        reader.readReal(toc.probabilityOther, 3))
+      {
+      emit q->tocAvailable(vsAdaptTrackId(trackId), toc);
+      }
+    reader.nextRecord();
+    }
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vsPvoDescriptorArchiveSource::vsPvoDescriptorArchiveSource(const QUrl& uri) :
+  super(new vsPvoDescriptorArchiveSourcePrivate(this, uri))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsPvoDescriptorArchiveSource::~vsPvoDescriptorArchiveSource()
+{
+}
diff --git a/Plugins/VspSourceService/PvoArchiveSource/vsPvoDescriptorArchiveSource.h b/Plugins/VspSourceService/PvoArchiveSource/vsPvoDescriptorArchiveSource.h
new file mode 100644
index 00000000..848b28ff
--- /dev/null
+++ b/Plugins/VspSourceService/PvoArchiveSource/vsPvoDescriptorArchiveSource.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsPvoDescriptorArchiveSource_h
+#define __vsPvoDescriptorArchiveSource_h
+
+#include <vsDescriptorSource.h>
+
+#include <vsArchiveSource.h>
+
+class vsPvoDescriptorArchiveSourcePrivate;
+
+class vsPvoDescriptorArchiveSource :
+  public vsArchiveSource<vsDescriptorSource>
+{
+  Q_OBJECT
+
+public:
+  vsPvoDescriptorArchiveSource(const QUrl& uri);
+  virtual ~vsPvoDescriptorArchiveSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsPvoDescriptorArchiveSource)
+  QTE_DISABLE_COPY(vsPvoDescriptorArchiveSource)
+
+  typedef vsArchiveSource<vsDescriptorSource> super;
+};
+
+#endif
diff --git a/Plugins/VspSourceService/RandomAlertDescriptor/CMakeLists.txt b/Plugins/VspSourceService/RandomAlertDescriptor/CMakeLists.txt
new file mode 100644
index 00000000..b585b84d
--- /dev/null
+++ b/Plugins/VspSourceService/RandomAlertDescriptor/CMakeLists.txt
@@ -0,0 +1,33 @@
+project(vsRandomAlertDescriptor)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+vg_include_library_sdk_directories(vspSourceUtil)
+
+set(vsRandomAlertDescriptor_Sources
+  vsRandomAlertDescriptor.cxx
+  vsRandomAlertDescriptorPlugin.cxx
+  vsRandomAlertFactory.cxx
+)
+
+set(vsRandomAlertDescriptor_MocHeaders
+  vsRandomAlertDescriptor.h
+  vsRandomAlertDescriptorPlugin.h
+)
+
+qt4_wrap_cpp(vsRandomAlertDescriptor_MocSources
+             ${vsRandomAlertDescriptor_MocHeaders})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsRandomAlertDescriptor_Sources}
+  ${vsRandomAlertDescriptor_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  vspSourceUtil
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptor.cxx b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptor.cxx
new file mode 100644
index 00000000..5724746c
--- /dev/null
+++ b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptor.cxx
@@ -0,0 +1,216 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsRandomAlertDescriptor.h"
+
+#include <QHash>
+#include <QList>
+
+#include <qtRand.h>
+
+#include <vsTrackState.h>
+#include <vtkVsTrackInfo.h>
+
+#include <vsLiveDescriptorPrivate.h>
+
+//BEGIN vsRandomAlertDescriptorPrivate
+
+//-----------------------------------------------------------------------------
+class vsRandomAlertDescriptorPrivate : public vsLiveDescriptorPrivate
+{
+public:
+  vsRandomAlertDescriptorPrivate(vsRandomAlertDescriptor*);
+  virtual ~vsRandomAlertDescriptorPrivate();
+
+protected:
+  virtual void run() QTE_OVERRIDE;
+
+  virtual void injectInput(qint64 id, vsDescriptorInputPtr input) QTE_OVERRIDE;
+  virtual void revokeInput(qint64 id, bool revokeEvents) QTE_OVERRIDE;
+  virtual void revokeAllInput(bool revokeEvents) QTE_OVERRIDE;
+
+  typedef QHash<vvTrackId, vtkVgTimeStamp> PendingAlertList;
+  typedef QHash<qint64, PendingAlertList> PendingAlertMap;
+
+  QHash<qint64, int> Queries;
+  QHash<qint64, QList<vtkIdType> > Events;
+  PendingAlertMap PendingAlerts;
+  vtkIdType NextEventId;
+
+private:
+  QTE_DECLARE_PUBLIC(vsRandomAlertDescriptor)
+};
+
+//-----------------------------------------------------------------------------
+vsRandomAlertDescriptorPrivate::vsRandomAlertDescriptorPrivate(
+  vsRandomAlertDescriptor* q)
+  : vsLiveDescriptorPrivate(q), NextEventId(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsRandomAlertDescriptorPrivate::~vsRandomAlertDescriptorPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsRandomAlertDescriptorPrivate::run()
+{
+  QTE_Q(vsRandomAlertDescriptor);
+  emit q->readyForInput(q);
+  vsLiveDescriptorPrivate::run();
+}
+
+//-----------------------------------------------------------------------------
+void vsRandomAlertDescriptorPrivate::injectInput(
+  qint64 id, vsDescriptorInputPtr input)
+{
+  // New query?
+  if (input->type() == vsDescriptorInput::Query)
+    {
+    // If the input is valid...
+    const int* qi = input->queryId();
+    if (qi)
+      {
+      // ...then add the query to our map and abort pending suicide (if set)
+      this->Queries.insert(id, *qi);
+      this->cancelSuicideTimer();
+      }
+    }
+  // If not, check first if we have any queries, since it is pointless to do
+  // anything otherwise
+  else if (this->Queries.count())
+    {
+    // Track update? Random threshold exceeded?
+    if (input->type() == vsDescriptorInput::TrackUpdate && qtRandD() < 0.05)
+      {
+      // Check if input is valid
+      const vvTrackId* trackId = input->trackId();
+      const vsTrackState* state = input->trackState();
+      if (trackId && state)
+        {
+        // Pick a query at random
+        int queryCount = this->Queries.keys().count();
+        int queryIdIndex = static_cast<int>(qtRandD() * queryCount);
+        qint64 queryId = this->Queries.keys().at(queryIdIndex);
+        // Do we have a pending alert?
+        if (this->PendingAlerts.contains(queryId) &&
+            this->PendingAlerts[queryId].contains(*trackId))
+          {
+          // Yes; generate an event
+          int classifier = this->Queries.value(queryId);
+          QList<vtkIdType>& queryEvents = this->Events[queryId];
+          PendingAlertList& pal = this->PendingAlerts[queryId];
+          vsEvent eventBase = vsEvent(QUuid::createUuid());
+          vtkIdType eventId = this->NextEventId++;
+          eventBase->SetId(eventId);
+          eventBase->AddClassifier(classifier, qtRandD(), 0.0);
+          vtkVsTrackInfo* ti =
+            new vtkVsTrackInfo(*trackId, pal.value(*trackId), state->time);
+          eventBase->AddTrack(ti);
+          queryEvents.append(eventId);
+          emit this->eventAvailable(eventBase);
+          }
+        else
+          {
+          // No; add a pending alert
+          PendingAlertList& pal = this->PendingAlerts[queryId];
+          pal.insert(*trackId, state->time);
+          }
+        }
+      }
+    // Track closure?
+    else if (input->type() == vsDescriptorInput::TrackClosure)
+      {
+      // Check if input is valid
+      const vvTrackId* trackId = input->trackId();
+      const vsTrackState* state = input->trackState();
+      if (trackId && state)
+        {
+        // Cancel any pending alerts for the track
+        foreach_iter (PendingAlertMap::iterator, iter, this->PendingAlerts)
+          {
+          iter->remove(*trackId);
+          }
+        }
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRandomAlertDescriptorPrivate::revokeInput(qint64 id, bool revokeEvents)
+{
+  this->Queries.remove(id);
+  this->PendingAlerts.remove(id);
+
+  if (revokeEvents && this->Events.contains(id))
+    {
+    QList<vtkIdType> queryEvents = this->Events.take(id);
+    foreach (vtkIdType eventId, queryEvents)
+      {
+      emit this->eventRevoked(eventId);
+      }
+    }
+
+  if (this->Queries.isEmpty() && this->Events.isEmpty())
+    {
+    // If we have no registered queries left, set a timer to suicide rather
+    // than hang around inactive forever
+    this->setSuicideTimer();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRandomAlertDescriptorPrivate::revokeAllInput(bool revokeEvents)
+{
+  if (revokeEvents)
+    {
+    foreach (const QList<vtkIdType>& queryEvents, this->Events)
+      {
+      foreach (vtkIdType eventId, queryEvents)
+        {
+        emit this->eventRevoked(eventId);
+        }
+      }
+    this->Events.clear();
+    this->setSuicideTimer();
+    }
+  this->Queries.clear();
+  this->PendingAlerts.clear();
+}
+
+//END vsRandomAlertDescriptorPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsRandomAlertDescriptor
+
+//-----------------------------------------------------------------------------
+vsRandomAlertDescriptor::vsRandomAlertDescriptor() :
+  vsLiveDescriptor(new vsRandomAlertDescriptorPrivate(this))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsRandomAlertDescriptor::~vsRandomAlertDescriptor()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::Types vsRandomAlertDescriptor::inputAccepted() const
+{
+  return vsDescriptorInput::TrackUpdate | vsDescriptorInput::TrackClosure |
+         vsDescriptorInput::Query |
+         vsLiveDescriptor::inputAccepted();
+}
+
+//-----------------------------------------------------------------------------
+QString vsRandomAlertDescriptor::name() const
+{
+  return "random alert";
+}
+
+//END vsRandomAlertDescriptor
diff --git a/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptor.h b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptor.h
new file mode 100644
index 00000000..ac2997c5
--- /dev/null
+++ b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptor.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsRandomAlertDescriptor_h
+#define __vsRandomAlertDescriptor_h
+
+#include <vsLiveDescriptor.h>
+
+class vsRandomAlertDescriptorPrivate;
+
+class vsRandomAlertDescriptor : public vsLiveDescriptor
+{
+  Q_OBJECT
+
+public:
+  vsRandomAlertDescriptor();
+  virtual ~vsRandomAlertDescriptor();
+
+  virtual vsDescriptorInput::Types inputAccepted() const QTE_OVERRIDE;
+
+protected:
+  virtual QString name() const QTE_OVERRIDE;
+
+private:
+  QTE_DECLARE_PRIVATE(vsRandomAlertDescriptor)
+  QTE_DISABLE_COPY(vsRandomAlertDescriptor)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptorPlugin.cxx b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptorPlugin.cxx
new file mode 100644
index 00000000..3611c5d5
--- /dev/null
+++ b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptorPlugin.cxx
@@ -0,0 +1,55 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsRandomAlertDescriptorPlugin.h"
+
+#include <QtPlugin>
+
+#include "vsRandomAlertFactory.h"
+
+Q_EXPORT_PLUGIN2(vsRandomAlertDescriptor, vsRandomAlertDescriptorPlugin)
+
+namespace { static const int keyCreateAction = 0; }
+
+//-----------------------------------------------------------------------------
+vsRandomAlertDescriptorPlugin::vsRandomAlertDescriptorPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsRandomAlertDescriptorPlugin::~vsRandomAlertDescriptorPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsRandomAlertDescriptorPlugin::identifier() const
+{
+  return "RandomAlert";
+}
+
+//-----------------------------------------------------------------------------
+void vsRandomAlertDescriptorPlugin::registerActions()
+{
+  this->registerAction(
+    keyCreateAction, "&Create Random Alert Descriptor", QString(), QString(),
+    "Create a live descriptor that will generate random alerts");
+}
+
+//-----------------------------------------------------------------------------
+void vsRandomAlertDescriptorPlugin::insertActions(
+  qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+  qtPrioritizedMenuProxy& descriptorMenu)
+{
+  Q_UNUSED(videoMenu);
+  Q_UNUSED(trackMenu);
+  descriptorMenu.insertAction(this->action(keyCreateAction), 1000);
+}
+
+//-----------------------------------------------------------------------------
+vsSourceFactory* vsRandomAlertDescriptorPlugin::createFactory()
+{
+  return new vsRandomAlertFactory;
+}
diff --git a/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptorPlugin.h b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptorPlugin.h
new file mode 100644
index 00000000..e4cc0c1c
--- /dev/null
+++ b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertDescriptorPlugin.h
@@ -0,0 +1,39 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsRandomAlertDescriptorPlugin_h
+#define __vsRandomAlertDescriptorPlugin_h
+
+#include <QObject>
+
+#include <vsSourceFactoryPlugin.h>
+
+class vsRandomAlertDescriptorPlugin : public QObject,
+                                      public vsSourceFactoryPlugin
+{
+  Q_OBJECT
+  Q_INTERFACES(vsSourceFactoryInterface)
+
+public:
+  vsRandomAlertDescriptorPlugin();
+  virtual ~vsRandomAlertDescriptorPlugin();
+
+  virtual QString identifier() const QTE_OVERRIDE;
+
+  virtual void registerActions() QTE_OVERRIDE;
+
+  virtual vsSourceFactory* createFactory() QTE_OVERRIDE;
+
+protected:
+  virtual void insertActions(
+    qtPrioritizedMenuProxy& videoMenu, qtPrioritizedMenuProxy& trackMenu,
+    qtPrioritizedMenuProxy& descriptorMenu) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsRandomAlertDescriptorPlugin)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertFactory.cxx b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertFactory.cxx
new file mode 100644
index 00000000..7bd25de0
--- /dev/null
+++ b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertFactory.cxx
@@ -0,0 +1,64 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsRandomAlertFactory.h"
+
+#include "vsRandomAlertDescriptor.h"
+
+QTE_IMPLEMENT_D_FUNC(vsRandomAlertFactory)
+
+//-----------------------------------------------------------------------------
+class vsRandomAlertFactoryPrivate
+{
+public:
+  vsDescriptorSourcePtr descriptor;
+};
+
+//-----------------------------------------------------------------------------
+vsRandomAlertFactory::vsRandomAlertFactory() :
+  d_ptr(new vsRandomAlertFactoryPrivate)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsRandomAlertFactory::~vsRandomAlertFactory()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsRandomAlertFactory::initialize(QWidget*)
+{
+  return this->initialize();
+}
+
+//-----------------------------------------------------------------------------
+bool vsRandomAlertFactory::initialize(const QUrl&)
+{
+  return this->initialize();
+}
+
+//-----------------------------------------------------------------------------
+bool vsRandomAlertFactory::initialize()
+{
+  QTE_D(vsRandomAlertFactory);
+  d->descriptor = vsDescriptorSourcePtr(new vsRandomAlertDescriptor());
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+QList<vsDescriptorSourcePtr> vsRandomAlertFactory::descriptorSources() const
+{
+  QTE_D_CONST(vsRandomAlertFactory);
+
+  if (!d->descriptor)
+    {
+    return vsSourceFactory::descriptorSources();
+    }
+
+  QList<vsDescriptorSourcePtr> list;
+  list.append(d->descriptor);
+  return list;
+}
diff --git a/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertFactory.h b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertFactory.h
new file mode 100644
index 00000000..0c413612
--- /dev/null
+++ b/Plugins/VspSourceService/RandomAlertDescriptor/vsRandomAlertFactory.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsRandomAlertFactory_h
+#define __vsRandomAlertFactory_h
+
+#include <qtGlobal.h>
+
+#include <vsSourceFactory.h>
+
+class vsRandomAlertFactoryPrivate;
+
+class vsRandomAlertFactory : public vsSourceFactory
+{
+public:
+  vsRandomAlertFactory();
+  virtual ~vsRandomAlertFactory();
+
+  virtual bool initialize(QWidget* dialogParent) QTE_OVERRIDE;
+  virtual bool initialize(const QUrl& uri) QTE_OVERRIDE;
+  virtual QList<vsDescriptorSourcePtr> descriptorSources() const QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsRandomAlertFactory)
+
+  bool initialize();
+
+private:
+  QTE_DECLARE_PRIVATE(vsRandomAlertFactory)
+  QTE_DISABLE_COPY(vsRandomAlertFactory)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/CMakeLists.txt b/Plugins/VspSourceService/TrackOracleArchiveSource/CMakeLists.txt
new file mode 100644
index 00000000..fd6a7c51
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/CMakeLists.txt
@@ -0,0 +1,39 @@
+project(vsTrackOracleArchiveSource)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+vg_include_library_sdk_directories(vspSourceUtil)
+include_directories(SYSTEM
+  ${VIDTK_INCLUDE_DIRS}
+)
+
+set(vsTrackOracleArchiveSource_Sources
+  vsTrackOracleArchiveSourcePlugin.cxx
+  vsTrackOracleDescriptorArchiveSource.cxx
+  vsTrackOracleTrackArchiveSource.cxx
+)
+
+set(vsTrackOracleArchiveSource_MocHeaders
+  vsTrackOracleArchiveSourcePlugin.h
+  vsTrackOracleDescriptorArchiveSource.h
+  vsTrackOracleTrackArchiveSource.h
+)
+
+qt4_wrap_cpp(vsTrackOracleArchiveSource_MocSources
+             ${vsTrackOracleArchiveSource_MocHeaders})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsTrackOracleArchiveSource_Sources}
+  ${vsTrackOracleArchiveSource_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  track_oracle
+  track_oracle_file_formats
+  vspSourceUtil
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/visgui_descriptor_type.h b/Plugins/VspSourceService/TrackOracleArchiveSource/visgui_descriptor_type.h
new file mode 100644
index 00000000..c59c2288
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/visgui_descriptor_type.h
@@ -0,0 +1,51 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __visgui_descriptor_type_h
+#define __visgui_descriptor_type_h
+
+#include <track_oracle/track_base.h>
+#include <track_oracle/track_field.h>
+#include <vgl/vgl_box_2d.h>
+
+//-----------------------------------------------------------------------------
+struct visgui_classifier_descriptor_type :
+  public vidtk::track_base<visgui_classifier_descriptor_type>
+{
+  vidtk::track_field<unsigned int>& external_id;
+  vidtk::track_field<vcl_vector<unsigned int> >& source_track_ids;
+  vidtk::track_field<vcl_vector<double> >& descriptor_classifier;
+
+  vidtk::track_field<unsigned int>& frame_number;
+  vidtk::track_field<unsigned long long>& timestamp_usecs;
+  vidtk::track_field<vgl_box_2d<double> >& bounding_box;
+
+  visgui_classifier_descriptor_type() :
+    external_id(Track.add_field<unsigned int>("external_id")),
+    source_track_ids(Track.add_field<vcl_vector<unsigned int> >("source_track_ids")),
+    descriptor_classifier(Track.add_field<vcl_vector<double> >("descriptor_classifier")),
+    frame_number(Frame.add_field<unsigned int>("frame_number")),
+    timestamp_usecs(Frame.add_field< unsigned long long>("timestamp_usecs")),
+    bounding_box(Frame.add_field< vgl_box_2d<double> >("bounding_box"))
+    {
+    }
+};
+
+//-----------------------------------------------------------------------------
+struct visgui_pvo_descriptor_type :
+  public vidtk::track_base<visgui_pvo_descriptor_type>
+{
+  vidtk::track_field<vcl_vector<unsigned int> >& source_track_ids;
+  vidtk::track_field<vcl_vector<double> >& descriptor_pvo_raw_scores;
+
+  visgui_pvo_descriptor_type() :
+    source_track_ids(Track.add_field<vcl_vector<unsigned int> >("source_track_ids")),
+    descriptor_pvo_raw_scores(Track.add_field<vcl_vector<double> >("descriptor_pvo_raw_scores"))
+    {
+    }
+};
+
+#endif
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/visgui_track_type.h b/Plugins/VspSourceService/TrackOracleArchiveSource/visgui_track_type.h
new file mode 100644
index 00000000..fc43ef86
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/visgui_track_type.h
@@ -0,0 +1,69 @@
+/*ckwg +5
+ * Copyright 2012 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __visgui_track_type_h
+#define __visgui_track_type_h
+
+#include <track_oracle/track_base.h>
+#include <track_oracle/track_field.h>
+#include <vgl/vgl_box_2d.h>
+#include <vgl/vgl_point_2d.h>
+
+//-----------------------------------------------------------------------------
+struct visgui_base_track_type :
+  public vidtk::track_base<visgui_base_track_type>
+{
+  vidtk::track_field<unsigned int>& external_id;
+  vidtk::track_field<vgl_point_2d<double> >& obj_location;
+  vidtk::track_field<vgl_box_2d<double> >& bounding_box;
+
+  visgui_base_track_type() :
+    external_id(Track.add_field<unsigned int>("external_id")),
+    obj_location(Frame.add_field<vgl_point_2d<double> >("obj_location")),
+    bounding_box(Frame.add_field<vgl_box_2d<double> >("bounding_box"))
+    {
+    }
+};
+
+//-----------------------------------------------------------------------------
+struct visgui_fn_track_type :
+  public vidtk::track_base<visgui_fn_track_type, visgui_base_track_type>
+{
+  vidtk::track_field<unsigned>& frame_number;
+
+  visgui_fn_track_type() :
+    frame_number(Frame.add_field<unsigned>("frame_number"))
+    {
+    }
+};
+
+//-----------------------------------------------------------------------------
+struct visgui_ts_track_type :
+  public vidtk::track_base<visgui_ts_track_type, visgui_base_track_type>
+{
+  vidtk::track_field<unsigned long long>& timestamp_usecs;
+
+  visgui_ts_track_type() :
+    timestamp_usecs(Frame.add_field<unsigned long long>("timestamp_usecs"))
+    {
+    }
+};
+
+//-----------------------------------------------------------------------------
+struct visgui_track_type :
+  public vidtk::track_base<visgui_track_type, visgui_base_track_type>
+{
+  vidtk::track_field<unsigned long long>& timestamp_usecs;
+  vidtk::track_field<unsigned>& frame_number;
+
+  visgui_track_type() :
+    timestamp_usecs(Frame.add_field<unsigned long long>("timestamp_usecs")),
+    frame_number(Frame.add_field<unsigned>("frame_number"))
+    {
+    }
+};
+
+#endif
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleArchiveSourcePlugin.cxx b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..1af0a44d
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleArchiveSourcePlugin.cxx
@@ -0,0 +1,208 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackOracleArchiveSourcePlugin.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QMap>
+#include <QStringList>
+#include <QUrl>
+#include <QtPlugin>
+
+#include <qtStlUtil.h>
+
+#include <vgCheckArg.h>
+
+#include <vsStaticSourceFactory.h>
+
+#include <track_oracle/file_format_base.h>
+#include <track_oracle/file_format_manager.h>
+
+#include "visgui_descriptor_type.h"
+#include "visgui_track_type.h"
+#include "vsTrackOracleTrackArchiveSource.h"
+#include "vsTrackOracleDescriptorArchiveSource.h"
+
+Q_EXPORT_PLUGIN2(vsTrackOracleArchiveSource, vsTrackOracleArchiveSourcePlugin)
+
+QTE_IMPLEMENT_D_FUNC(vsTrackOracleArchiveSourcePlugin)
+
+namespace // anonymous
+{
+typedef QMap<vidtk::file_format_enum, vidtk::file_format_base*> FileFormatMap;
+}
+
+//-----------------------------------------------------------------------------
+class vsTrackOracleArchiveSourcePluginPrivate
+{
+public:
+  vsTrackOracleArchiveSourcePluginPrivate() : EmptyFormatSet() {}
+
+  void addSchemas(FileFormatMap& map, const vidtk::track_base_impl& schema);
+  const FileFormatMap& formatMap(vsArchiveSourceType type) const;
+
+  bool quickTest(const std::string& fileName, vsArchiveSourceType type) const;
+  vidtk::file_format_base* inspect(const std::string& fileName,
+                                   vsArchiveSourceType type) const;
+
+  FileFormatMap TrackFormats;
+  FileFormatMap DescriptorFormats;
+  const FileFormatMap EmptyFormatSet;
+};
+
+//-----------------------------------------------------------------------------
+void vsTrackOracleArchiveSourcePluginPrivate::addSchemas(
+  FileFormatMap& map, const vidtk::track_base_impl& schema)
+{
+  vcl_vector<vidtk::file_format_enum> formats =
+    vidtk::file_format_manager::format_matches_schema(schema);
+  for (size_t n = 0, k = formats.size(); n < k; ++n)
+    {
+    vidtk::file_format_enum format = formats[n];
+    vidtk::file_format_base* format_instance =
+      vidtk::file_format_manager::get_format(format);
+    if (format_instance)
+      {
+      map.insert(format, format_instance);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+const FileFormatMap& vsTrackOracleArchiveSourcePluginPrivate::formatMap(
+  vsArchiveSourceType type) const
+{
+  switch (type)
+    {
+    case vs::ArchiveTrackSource:
+      return this->TrackFormats;
+    case vs::ArchiveDescriptorSource:
+      return this->DescriptorFormats;
+    default:
+      return this->EmptyFormatSet;
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vsTrackOracleArchiveSourcePluginPrivate::quickTest(
+  const std::string& fileName, vsArchiveSourceType type) const
+{
+  const FileFormatMap& formats = this->formatMap(type);
+  foreach (vidtk::file_format_base* format, formats)
+    {
+    if (format->filename_matches_globs(fileName))
+      {
+      return true;
+      }
+    }
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+vidtk::file_format_base* vsTrackOracleArchiveSourcePluginPrivate::inspect(
+  const std::string& fileName, vsArchiveSourceType type) const
+{
+  const FileFormatMap& formats = this->formatMap(type);
+  foreach (vidtk::file_format_base* format, formats)
+    {
+    if (format->inspect_file(fileName))
+      {
+      return format;
+      }
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+vsTrackOracleArchiveSourcePlugin::vsTrackOracleArchiveSourcePlugin() :
+  d_ptr(new vsTrackOracleArchiveSourcePluginPrivate)
+{
+  QTE_D(vsTrackOracleArchiveSourcePlugin);
+
+  d->addSchemas(d->TrackFormats, visgui_ts_track_type());
+  // TODO Once core gets time mapping, also accept tracks with only frame number
+  // d->addSchemas(d->TrackFormats, visgui_fn_track_type());
+
+  d->addSchemas(d->DescriptorFormats, visgui_pvo_descriptor_type());
+  d->addSchemas(d->DescriptorFormats, visgui_classifier_descriptor_type());
+}
+
+//-----------------------------------------------------------------------------
+vsTrackOracleArchiveSourcePlugin::~vsTrackOracleArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceTypes vsTrackOracleArchiveSourcePlugin::archiveTypes() const
+{
+  return vs::ArchiveTrackSource | vs::ArchiveDescriptorSource;
+}
+
+//-----------------------------------------------------------------------------
+vsArchivePluginInfo vsTrackOracleArchiveSourcePlugin::archivePluginInfo(
+  vsArchiveSourceType type) const
+{
+  QTE_D_CONST(vsTrackOracleArchiveSourcePlugin);
+
+  vsArchivePluginInfo info;
+  const FileFormatMap& formats = d->formatMap(type);
+
+  foreach (vidtk::file_format_base* format, formats)
+    {
+    vsArchiveFileType fileType;
+    fileType.Description = qtString(format->format_description());
+    vcl_vector<vcl_string> globs = format->format_globs();
+    for (size_t n = 0, k = globs.size(); n < k; ++n)
+      {
+      fileType.Patterns.append(qtString(globs[n]));
+      }
+    info.SupportedFileTypes.append(fileType);
+    }
+  return info;
+}
+
+//-----------------------------------------------------------------------------
+vsSimpleSourceFactory* vsTrackOracleArchiveSourcePlugin::createArchiveSource(
+  vsArchiveSourceType type, const QUrl& uri, SourceCreateMode mode)
+{
+  QTE_D_CONST(vsTrackOracleArchiveSourcePlugin);
+
+  // Quick test for acceptable archive
+  if (mode == vsArchiveSourceInterface::QuickTest)
+    {
+    CHECK_ARG(uri.scheme() == "file", 0);
+    CHECK_ARG(d->quickTest(stdString(uri.toLocalFile()), type), 0);
+    }
+
+  // Verify that file exists and is readable
+  const QString fileName = uri.toLocalFile();
+  CHECK_ARG(QFileInfo(fileName).exists(), 0);
+  QFile file(fileName);
+  CHECK_ARG(file.open(QIODevice::ReadOnly | QIODevice::Text), 0);
+
+  vidtk::file_format_base* format_instance =
+    d->inspect(stdString(fileName), type);
+
+  if (type == vs::ArchiveTrackSource)
+    {
+    vsStaticSourceFactory* factory = new vsStaticSourceFactory;
+    vsTrackSource* source =
+      new vsTrackOracleTrackArchiveSource(uri, format_instance);
+    factory->addTrackSource(source);
+    return factory;
+    }
+  else if (type == vs::ArchiveDescriptorSource)
+    {
+    vsStaticSourceFactory* factory = new vsStaticSourceFactory;
+    vsDescriptorSource* source =
+      new vsTrackOracleDescriptorArchiveSource(uri, format_instance);
+    factory->addDescriptorSource(source);
+    return factory;
+    }
+
+  return 0;
+}
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleArchiveSourcePlugin.h b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleArchiveSourcePlugin.h
new file mode 100644
index 00000000..02051ee5
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleArchiveSourcePlugin.h
@@ -0,0 +1,42 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackOracleArchiveSourcePlugin_h
+#define __vsTrackOracleArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsArchiveSourceInterface.h>
+
+class vsTrackOracleArchiveSourcePluginPrivate;
+
+class vsTrackOracleArchiveSourcePlugin : public QObject,
+                                         public vsArchiveSourceInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsArchiveSourceInterface)
+
+public:
+  vsTrackOracleArchiveSourcePlugin();
+  virtual ~vsTrackOracleArchiveSourcePlugin();
+
+  virtual vsArchiveSourceTypes archiveTypes() const QTE_OVERRIDE;
+  virtual vsArchivePluginInfo archivePluginInfo(
+    vsArchiveSourceType) const QTE_OVERRIDE;
+  virtual vsSimpleSourceFactory* createArchiveSource(
+    vsArchiveSourceType, const QUrl&, SourceCreateMode) QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsTrackOracleArchiveSourcePlugin)
+
+private:
+  QTE_DECLARE_PRIVATE(vsTrackOracleArchiveSourcePlugin)
+  QTE_DISABLE_COPY(vsTrackOracleArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleDescriptorArchiveSource.cxx b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleDescriptorArchiveSource.cxx
new file mode 100644
index 00000000..241c9d5d
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleDescriptorArchiveSource.cxx
@@ -0,0 +1,269 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackOracleDescriptorArchiveSource.h"
+
+#include <QDebug>
+#include <QSet>
+
+#include <qtThread.h>
+#include <qtStlUtil.h>
+
+#include <vgGeodesy.h>
+
+#include <track_oracle/file_format_base.h>
+
+#include <vtkVsTrackInfo.h>
+
+#include <vsAdapt.h>
+#include <vsArchiveSourcePrivate.h>
+
+#include "visgui_descriptor_type.h"
+
+//-----------------------------------------------------------------------------
+class vsTrackOracleDescriptorArchiveSourcePrivate :
+  public vsArchiveSourcePrivate
+{
+public:
+  typedef vidtk::file_format_base FileFormat;
+
+  vsTrackOracleDescriptorArchiveSourcePrivate(
+    vsTrackOracleDescriptorArchiveSource* q, const QUrl& uri,
+    FileFormat* format);
+
+  bool extractPvo(const vidtk::track_handle_type&);
+  bool extractClassifier(const vidtk::track_handle_type&);
+
+protected:
+  QTE_DECLARE_PUBLIC(vsTrackOracleDescriptorArchiveSource)
+
+  virtual bool processArchive(const QUrl& uri) QTE_OVERRIDE;
+
+  FileFormat* Format;
+  vtkIdType LastEventId;
+  bool UsingInternalIds;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsTrackOracleDescriptorArchiveSource)
+
+//-----------------------------------------------------------------------------
+vsTrackOracleDescriptorArchiveSourcePrivate::
+vsTrackOracleDescriptorArchiveSourcePrivate(
+  vsTrackOracleDescriptorArchiveSource* q,
+  const QUrl& uri, FileFormat* format) :
+  vsArchiveSourcePrivate(q, "descriptors", uri), Format(format),
+  LastEventId(0), UsingInternalIds(false)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsTrackOracleDescriptorArchiveSourcePrivate::extractPvo(
+  const vidtk::track_handle_type& trackHandle)
+{
+  // Attempt to extract P/V/O track object classifier
+  visgui_pvo_descriptor_type pvo;
+  pvo(trackHandle);
+  if (pvo.source_track_ids.exists() &&
+      pvo.descriptor_pvo_raw_scores.exists() &&
+      pvo.descriptor_pvo_raw_scores().size() >= 3)
+    {
+    QTE_Q(vsTrackOracleDescriptorArchiveSource);
+
+    const vcl_vector<unsigned int>& tracks = pvo.source_track_ids();
+    for (size_t n = 0, k = tracks.size(); n < k; ++n)
+      {
+      vsTrackObjectClassifier toc;
+      toc.probabilityPerson  = pvo.descriptor_pvo_raw_scores()[0];
+      toc.probabilityVehicle = pvo.descriptor_pvo_raw_scores()[1];
+      toc.probabilityOther   = pvo.descriptor_pvo_raw_scores()[2];
+
+      emit q->tocAvailable(vsAdaptTrackId(tracks[n]), toc);
+      return true;
+      }
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vsTrackOracleDescriptorArchiveSourcePrivate::extractClassifier(
+  const vidtk::track_handle_type& trackHandle)
+{
+  // Attempt to extract classifier event
+  visgui_classifier_descriptor_type classifier;
+  classifier(trackHandle);
+  if (classifier.source_track_ids.exists() &&
+      classifier.descriptor_classifier.exists())
+    {
+    vsEvent event = vsEvent(QUuid() /* FIXME: get from vidtk object */);
+    const vcl_vector<unsigned int> tracks = classifier.source_track_ids();
+
+    // Determine event ID (not guaranteed to provide one)
+    if (this->UsingInternalIds)
+      {
+      const vtkIdType id = ++this->LastEventId;
+      if(classifier.external_id.exists())
+        {
+        qDebug() << "assigning generated ID" << id
+                 << "to descriptor with external ID"
+                 << classifier.external_id();
+        }
+      event->SetId(id);
+      }
+    else if(classifier.external_id.exists())
+      {
+      const vtkIdType id = static_cast<vtkIdType>(classifier.external_id());
+      this->LastEventId = qMax(id, this->LastEventId);
+      event->SetId(id);
+      }
+    else
+      {
+      if (this->LastEventId)
+        {
+        // Oh, dear... some descriptors have ID's, and some don't...
+        qWarning() << "descriptor ID missing after previous descriptors"
+                   << "using external ID";
+        qWarning() << "forcing remaining descriptor(s)"
+                   << "to use generated ID's";
+        }
+      this->UsingInternalIds = true;
+      event->SetId(++this->LastEventId);
+      }
+
+    // Extract classifiers
+    const vcl_vector<double>& classifierValues =
+      classifier.descriptor_classifier();
+    for (size_t n = 0, k = classifierValues.size(); n < k; ++n)
+      {
+      const double p = classifierValues[n];
+      if (p > 0.0)
+        {
+        event->AddClassifier(static_cast<int>(n), p, 0.0);
+        }
+      }
+
+    // Extract descriptor regions
+    bool eventIsValid = false;
+    vtkVgTimeStamp eventStart;
+    vtkVgTimeStamp eventEnd;
+    vidtk::frame_handle_list_type frameHandles =
+      vidtk::track_oracle::get_frames(trackHandle);
+    for (size_t n = 0, k = frameHandles.size(); n < k; ++n)
+      {
+      const vidtk::frame_handle_type& frameHandle = frameHandles[n];
+      if (frameHandle.is_valid())
+        {
+        // Set oracle object to frame instance referenced by handle
+        classifier[frameHandle];
+
+        // Extract timestamp
+        vtkVgTimeStamp ts;
+        if (classifier.timestamp_usecs.exists())
+          {
+          ts.SetTime(classifier.timestamp_usecs());
+          }
+        if (classifier.frame_number.exists())
+          {
+          ts.SetFrameNumber(classifier.frame_number());
+          }
+
+        // Don't add region if timestamp is not valid, or box is missing
+        if (!ts.IsValid() || !classifier.bounding_box.exists())
+          {
+          continue;
+          }
+
+        // Update event temporal bounds
+        eventStart = (eventIsValid && ts >= eventStart ? eventStart : ts);
+        eventEnd   = (eventIsValid && ts <= eventEnd   ? eventEnd   : ts);
+
+        // Extract bounding box
+        const vgl_box_2d<double>& box = classifier.bounding_box();
+
+        double points[8] =
+          {
+          box.min_x(), box.min_y(),
+          box.max_x(), box.min_y(),
+          box.max_x(), box.max_y(),
+          box.min_x(), box.max_y()
+          };
+
+        event->AddRegion(ts, 4, points);
+        eventIsValid = true;
+        }
+      }
+
+    if (!eventIsValid)
+      {
+      qWarning() << "ignoring classifier descriptor with empty region list";
+      return false;
+      }
+
+    // Add track(s)
+    classifier(trackHandle);
+    for (size_t n = 0, k = tracks.size(); n < k; ++n)
+      {
+      vtkVsTrackInfo* ti = new vtkVsTrackInfo(vsAdaptTrackId(tracks[n]),
+                                              eventStart, eventEnd);
+      event->AddTrack(ti);
+      }
+
+    // Emit the event
+    QTE_Q(vsTrackOracleDescriptorArchiveSource);
+    q->emitEvent(event);
+    return true;
+    }
+
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vsTrackOracleDescriptorArchiveSourcePrivate::processArchive(
+  const QUrl& uri)
+{
+  const std::string fileName = stdString(uri.toLocalFile());
+
+  // Read descriptors
+  vidtk::track_handle_list_type descriptors;
+  if (!this->Format->read(fileName, descriptors))
+    {
+    qWarning() << "error reading descriptors from" << uri;
+    return false;
+    }
+
+  // Process the descriptors
+  bool dataFound = false;
+  for (size_t n = 0, k = descriptors.size(); n < k; ++n)
+    {
+    const vidtk::track_handle_type& trackHandle = descriptors[n];
+    if (trackHandle.is_valid())
+      {
+      dataFound = this->extractPvo(trackHandle) || dataFound;
+      dataFound = this->extractClassifier(trackHandle) || dataFound;
+      }
+    }
+
+  if (!dataFound)
+    {
+    qWarning() << "no usable descriptors found from" << uri;
+    return false;
+    }
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vsTrackOracleDescriptorArchiveSource::vsTrackOracleDescriptorArchiveSource(
+  const QUrl& uri, vidtk::file_format_base* format) :
+  super(new vsTrackOracleDescriptorArchiveSourcePrivate(this, uri, format))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsTrackOracleDescriptorArchiveSource::~vsTrackOracleDescriptorArchiveSource()
+{
+}
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleDescriptorArchiveSource.h b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleDescriptorArchiveSource.h
new file mode 100644
index 00000000..00bf7768
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleDescriptorArchiveSource.h
@@ -0,0 +1,38 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackOracleDescriptorArchiveSource_h
+#define __vsTrackOracleDescriptorArchiveSource_h
+
+#include <vsDescriptorSource.h>
+
+#include <vsArchiveSource.h>
+
+namespace vidtk
+{
+  class file_format_base;
+}
+
+class vsTrackOracleDescriptorArchiveSourcePrivate;
+
+class vsTrackOracleDescriptorArchiveSource :
+  public vsArchiveSource<vsDescriptorSource>
+{
+  Q_OBJECT
+
+public:
+  vsTrackOracleDescriptorArchiveSource(const QUrl& archiveUri,
+                                       vidtk::file_format_base* format);
+  virtual ~vsTrackOracleDescriptorArchiveSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsTrackOracleDescriptorArchiveSource)
+  QTE_DISABLE_COPY(vsTrackOracleDescriptorArchiveSource)
+
+  typedef vsArchiveSource<vsDescriptorSource> super;
+};
+
+#endif
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleTrackArchiveSource.cxx b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleTrackArchiveSource.cxx
new file mode 100644
index 00000000..ab79ccfd
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleTrackArchiveSource.cxx
@@ -0,0 +1,187 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsTrackOracleTrackArchiveSource.h"
+
+#include <QDebug>
+#include <QSet>
+
+#include <qtThread.h>
+#include <qtStlUtil.h>
+
+#include <vgGeodesy.h>
+
+#include <track_oracle/file_format_base.h>
+
+#include <vsTrackData.h>
+
+#include <vsAdapt.h>
+#include <vsArchiveSourcePrivate.h>
+
+#include "visgui_track_type.h"
+
+//-----------------------------------------------------------------------------
+class vsTrackOracleTrackArchiveSourcePrivate : public vsArchiveSourcePrivate
+{
+public:
+  typedef vidtk::file_format_base FileFormat;
+
+  vsTrackOracleTrackArchiveSourcePrivate(
+    vsTrackOracleTrackArchiveSource* q, const QUrl& uri, FileFormat* format);
+
+protected:
+  QTE_DECLARE_PUBLIC(vsTrackOracleTrackArchiveSource)
+
+  virtual bool processArchive(const QUrl& uri) QTE_OVERRIDE;
+
+  FileFormat* Format;
+};
+
+QTE_IMPLEMENT_D_FUNC(vsTrackOracleTrackArchiveSource)
+
+//-----------------------------------------------------------------------------
+vsTrackOracleTrackArchiveSourcePrivate::vsTrackOracleTrackArchiveSourcePrivate(
+  vsTrackOracleTrackArchiveSource* q, const QUrl& uri, FileFormat* format)
+  : vsArchiveSourcePrivate(q, "tracks", uri), Format(format)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsTrackOracleTrackArchiveSourcePrivate::processArchive(const QUrl& uri)
+{
+  QTE_Q(vsTrackOracleTrackArchiveSource);
+
+  const std::string fileName = stdString(uri.toLocalFile());
+
+  // Read tracks
+  const visgui_track_type schema;
+  vidtk::track_handle_list_type tracks;
+  vcl_vector<vidtk::element_descriptor> missingFieldDescriptors;
+
+  if (!this->Format->read(fileName, tracks, schema, missingFieldDescriptors))
+    {
+    qWarning() << "error reading tracks from" << uri;
+    return false;
+    }
+
+  // Are we missing any fields?
+  if (missingFieldDescriptors.size() > 0)
+    {
+    // Build set of missing fields
+    QSet<QString> missingFields;
+    for (size_t n = 0, k = missingFieldDescriptors.size(); n < k; ++n)
+      {
+      missingFields.insert(qtString(missingFieldDescriptors[n].name));
+      }
+
+    // Check if missing field(s) is/are mandatory; we are okay without frame
+    // number
+    // TODO Allow missing time value once core supports time mapping
+    if (missingFields.count() > 1 ||
+        *missingFields.begin() != "frame_number")
+      {
+      qWarning() << "unable to load tracks from" << uri
+                 << "due to missing fields" << missingFields;
+      return false;
+      }
+    }
+
+  // Process the tracks
+  visgui_track_type oracle;
+  for (size_t n = 0, k = tracks.size(); n < k; ++n)
+    {
+    const vidtk::track_handle_type& trackHandle = tracks[n];
+    if (trackHandle.is_valid())
+      {
+      // Set oracle object to track instance referenced by handle
+      oracle(trackHandle);
+
+      // Get track ID
+      vvTrackId id = vsAdaptTrackId(oracle.external_id());
+
+      // Convert track states
+      QList<vvTrackState> states;
+      vsTrackData data;
+      vidtk::frame_handle_list_type frameHandles =
+        vidtk::track_oracle::get_frames(trackHandle);
+      for (size_t n = 0, k = frameHandles.size(); n < k; ++n)
+        {
+        const vidtk::frame_handle_type& frameHandle = frameHandles[n];
+        if (frameHandle.is_valid())
+          {
+          vvTrackState state;
+
+          // Set oracle object to frame instance referenced by handle
+          oracle[frameHandle];
+
+          // Extract timestamp
+          if (oracle.timestamp_usecs.exists())
+            {
+            state.TimeStamp.Time = oracle.timestamp_usecs();
+            }
+          if (oracle.frame_number.exists())
+            {
+            state.TimeStamp.FrameNumber = oracle.frame_number();
+            }
+          if (!state.TimeStamp.IsValid())
+            {
+            // Don't add state if timestamp is not valid
+            continue;
+            }
+
+          // Extract bounding box
+          const vgl_box_2d<double>& vglBox = oracle.bounding_box();
+          vvImageBoundingBox& box = state.ImageBox;
+          box.TopLeft.X = vglBox.min_x();
+          box.TopLeft.Y = vglBox.min_y();
+          box.BottomRight.X = vglBox.max_x();
+          box.BottomRight.Y = vglBox.max_y();
+
+          // Copy bounding box to object
+          state.ImageObject.push_back(
+            vvImagePointF(box.TopLeft.X, box.TopLeft.Y));
+          state.ImageObject.push_back(
+            vvImagePointF(box.BottomRight.X, box.TopLeft.Y));
+          state.ImageObject.push_back(
+            vvImagePointF(box.BottomRight.X, box.BottomRight.Y));
+          state.ImageObject.push_back(
+            vvImagePointF(box.TopLeft.X, box.BottomRight.Y));
+
+          // Extract image location
+          const vgl_point_2d<double>& vglPoint = oracle.obj_location();
+          state.ImagePoint.X = vglPoint.x();
+          state.ImagePoint.Y = vglPoint.y();
+
+          // Add state
+          states.append(state);
+          }
+        }
+
+      // Emit track (but skip empty tracks)
+      if (!states.isEmpty())
+        {
+        emit q->trackUpdated(id, states);
+        emit q->trackDataUpdated(id, data);
+        emit q->trackClosed(id);
+        }
+      }
+    }
+
+  // Done
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+vsTrackOracleTrackArchiveSource::vsTrackOracleTrackArchiveSource(
+  const QUrl& uri, vidtk::file_format_base* format) :
+  super(new vsTrackOracleTrackArchiveSourcePrivate(this, uri, format))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsTrackOracleTrackArchiveSource::~vsTrackOracleTrackArchiveSource()
+{
+}
diff --git a/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleTrackArchiveSource.h b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleTrackArchiveSource.h
new file mode 100644
index 00000000..5edb6791
--- /dev/null
+++ b/Plugins/VspSourceService/TrackOracleArchiveSource/vsTrackOracleTrackArchiveSource.h
@@ -0,0 +1,37 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsTrackOracleTrackArchiveSource_h
+#define __vsTrackOracleTrackArchiveSource_h
+
+#include <vsTrackSource.h>
+
+#include <vsArchiveSource.h>
+
+namespace vidtk
+{
+  class file_format_base;
+}
+
+class vsTrackOracleTrackArchiveSourcePrivate;
+
+class vsTrackOracleTrackArchiveSource : public vsArchiveSource<vsTrackSource>
+{
+  Q_OBJECT
+
+public:
+  vsTrackOracleTrackArchiveSource(const QUrl& archiveUri,
+                                  vidtk::file_format_base* format);
+  virtual ~vsTrackOracleTrackArchiveSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsTrackOracleTrackArchiveSource)
+  QTE_DISABLE_COPY(vsTrackOracleTrackArchiveSource)
+
+  typedef vsArchiveSource<vsTrackSource> super;
+};
+
+#endif
diff --git a/Plugins/VspSourceService/ViperArchiveSource/CMakeLists.txt b/Plugins/VspSourceService/ViperArchiveSource/CMakeLists.txt
new file mode 100644
index 00000000..52b78ef5
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/CMakeLists.txt
@@ -0,0 +1,47 @@
+project(vsViperArchiveSource)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+vg_include_library_sdk_directories(vspSourceUtil)
+include_directories(SYSTEM
+  ${VIDTK_INCLUDE_DIRS}
+)
+
+set(vsViperArchiveSource_Sources
+  vsViperArchiveImportOptionsDialog.cxx
+  vsViperArchiveSourcePlugin.cxx
+  vsViperArchiveSource.cxx
+  vsViperDebug.cxx
+)
+
+set(vsViperArchiveSource_MocHeaders
+  vsViperArchiveImportOptionsDialog.h
+  vsViperArchiveSourcePlugin.h
+  vsViperArchiveSource.h
+  vsViperArchiveSourcePrivate.h
+)
+
+set(vsViperArchiveSource_UI
+  viperOptions.ui
+)
+
+qt4_wrap_cpp(vsViperArchiveSource_MocSources
+             ${vsViperArchiveSource_MocHeaders})
+
+qt4_wrap_ui(vsViperArchiveSource_UiSources ${vsViperArchiveSource_UI})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsViperArchiveSource_Sources}
+  ${vsViperArchiveSource_MocSources}
+  ${vsViperArchiveSource_UiSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  track_xgtf
+  vspSourceUtil
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspSourceService/ViperArchiveSource/viperOptions.ui b/Plugins/VspSourceService/ViperArchiveSource/viperOptions.ui
new file mode 100644
index 00000000..e314c17f
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/viperOptions.ui
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vsViperArchiveImportOptionsDialog</class>
+ <widget class="QDialog" name="vsViperArchiveImportOptionsDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>311</width>
+    <height>257</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Import Options</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="timeGroup">
+     <property name="title">
+      <string>Time Source</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout">
+      <item row="0" column="0" colspan="2">
+       <widget class="QRadioButton" name="timeCurrent">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;body&gt;&lt;p&gt;Use the current video source (or wait for a source to be connected) for time information. Tracks and events will be imported as timing information becomes available.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>&amp;Current Video</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <layout class="QHBoxLayout" name="videoLayout">
+        <property name="spacing">
+         <number>2</number>
+        </property>
+        <item>
+         <widget class="QLineEdit" name="videoFile">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="videoBrowse">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="toolTip">
+           <string>Click to browse for a video archive.</string>
+          </property>
+          <property name="text">
+           <string>...</string>
+          </property>
+          <property name="icon">
+           <iconset resource="../../../Icons/vsp.qrc">
+            <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item row="1" column="0">
+       <widget class="QRadioButton" name="timeArchive">
+        <property name="toolTip">
+         <string>Use timing information from an external video archive.</string>
+        </property>
+        <property name="text">
+         <string>&amp;Archive</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="optionsGroup">
+     <property name="title">
+      <string>Conversion Options</string>
+     </property>
+     <layout class="QFormLayout" name="formLayout_2">
+      <item row="1" column="0">
+       <widget class="QLabel" name="frameRateLabel">
+        <property name="toolTip">
+         <string>Frame rate of the XGTF file relative to that of the time source.</string>
+        </property>
+        <property name="text">
+         <string>Frame Rate:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="frameOffsetLabel">
+        <property name="toolTip">
+         <string>Offset by which to adjust the input XGTF frame numbers prior to time mapping.</string>
+        </property>
+        <property name="text">
+         <string>Frame Offset:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="frameOffset">
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="minimum">
+         <number>-500</number>
+        </property>
+        <property name="maximum">
+         <number>500</number>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" colspan="2">
+       <widget class="QCheckBox" name="importEvents">
+        <property name="toolTip">
+         <string>&lt;html&gt;&lt;body&gt;
+&lt;p&gt;If checked, events will be imported from the XGTF.&lt;/p&gt;
+&lt;p&gt;If unchecked, only track information will be imported.&lt;/p&gt;
+&lt;/body&gt;&lt;/html&gt;</string>
+        </property>
+        <property name="text">
+         <string>&amp;Import Events</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <layout class="QHBoxLayout" name="frameRateLayout">
+        <item>
+         <widget class="QDoubleSpinBox" name="frameRateIn">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="prefix">
+           <string/>
+          </property>
+          <property name="suffix">
+           <string/>
+          </property>
+          <property name="minimum">
+           <double>1.000000000000000</double>
+          </property>
+          <property name="maximum">
+           <double>100.000000000000000</double>
+          </property>
+          <property name="value">
+           <double>3.000000000000000</double>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label">
+          <property name="text">
+           <string>:</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QDoubleSpinBox" name="frameRateOut">
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          </property>
+          <property name="prefix">
+           <string/>
+          </property>
+          <property name="suffix">
+           <string/>
+          </property>
+          <property name="minimum">
+           <double>1.000000000000000</double>
+          </property>
+          <property name="maximum">
+           <double>100.000000000000000</double>
+          </property>
+          <property name="value">
+           <double>1.000000000000000</double>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../../Icons/vsp.qrc"/>
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>vsViperArchiveImportOptionsDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>224</x>
+     <y>180</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>198</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>vsViperArchiveImportOptionsDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>292</x>
+     <y>186</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>198</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>timeArchive</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>videoFile</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>54</x>
+     <y>69</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>100</x>
+     <y>68</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>timeArchive</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>videoBrowse</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>34</x>
+     <y>69</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>283</x>
+     <y>70</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveImportOptionsDialog.cxx b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveImportOptionsDialog.cxx
new file mode 100644
index 00000000..b9d85b9a
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveImportOptionsDialog.cxx
@@ -0,0 +1,135 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsViperArchiveImportOptionsDialog.h"
+#include "ui_viperOptions.h"
+
+#include <QFileInfo>
+#include <QPushButton>
+#include <QSettings>
+#include <QUrl>
+
+#include <qtUiState.h>
+#include <qtUtil.h>
+
+#include <vgFileDialog.h>
+
+QTE_IMPLEMENT_D_FUNC(vsViperArchiveImportOptionsDialog)
+
+//-----------------------------------------------------------------------------
+class vsViperArchiveImportOptionsDialogPrivate
+{
+public:
+  Ui::vsViperArchiveImportOptionsDialog UI;
+  qtUiState UiState;
+};
+
+//-----------------------------------------------------------------------------
+vsViperArchiveImportOptionsDialog::vsViperArchiveImportOptionsDialog(
+  QWidget* parent, Qt::WindowFlags flags)
+  : QDialog(parent, flags),
+    d_ptr(new vsViperArchiveImportOptionsDialogPrivate)
+{
+  QTE_D(vsViperArchiveImportOptionsDialog);
+  d->UI.setupUi(this);
+  qtUtil::setStandardIcons(d->UI.buttonBox);
+
+  connect(d->UI.videoBrowse, SIGNAL(clicked(bool)),
+          this, SLOT(browseForVideo()));
+  connect(d->UI.timeArchive, SIGNAL(toggled(bool)),
+          this, SLOT(checkVideo()));
+  connect(d->UI.videoFile, SIGNAL(textChanged(QString)),
+          this, SLOT(checkVideo()));
+
+  // Restore last-used options
+  d->UiState.setCurrentGroup("ViPER");
+  d->UiState.mapValue("FrameOffset", d->UI.frameOffset);
+  d->UiState.mapValue("FrameRateIn", d->UI.frameRateIn);
+  d->UiState.mapValue("FrameRateOut", d->UI.frameRateOut);
+  d->UiState.mapChecked("ImportEvents", d->UI.importEvents);
+  d->UiState.restore();
+}
+
+//-----------------------------------------------------------------------------
+vsViperArchiveImportOptionsDialog::~vsViperArchiveImportOptionsDialog()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveImportOptionsDialog::accept()
+{
+  QTE_D_CONST(vsViperArchiveImportOptionsDialog);
+
+  // Save options
+  d->UiState.save();
+
+  QDialog::accept();
+}
+
+//-----------------------------------------------------------------------------
+QUrl vsViperArchiveImportOptionsDialog::metaDataSource() const
+{
+  QTE_D_CONST(vsViperArchiveImportOptionsDialog);
+  return (d->UI.timeArchive->isChecked()
+          ? QUrl::fromLocalFile(d->UI.videoFile->text())
+          : QUrl());
+}
+
+//-----------------------------------------------------------------------------
+int vsViperArchiveImportOptionsDialog::frameOffset() const
+{
+  QTE_D_CONST(vsViperArchiveImportOptionsDialog);
+  return d->UI.frameOffset->value();
+}
+
+//-----------------------------------------------------------------------------
+double vsViperArchiveImportOptionsDialog::frameRate() const
+{
+  QTE_D_CONST(vsViperArchiveImportOptionsDialog);
+  return d->UI.frameRateOut->value() / d->UI.frameRateIn->value();
+}
+
+//-----------------------------------------------------------------------------
+bool vsViperArchiveImportOptionsDialog::importEvents() const
+{
+  QTE_D_CONST(vsViperArchiveImportOptionsDialog);
+  return d->UI.importEvents->isChecked();
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveImportOptionsDialog::browseForVideo()
+{
+  QTE_D(vsViperArchiveImportOptionsDialog);
+
+  QString fileName = vgFileDialog::getOpenFileName(
+                       this, "Choose video archive...", QString(),
+                       "KWA video archive (*.index);;"
+                       "All files (*)");
+
+  if (!fileName.isEmpty())
+    {
+    d->UI.videoFile->setText(fileName);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveImportOptionsDialog::checkVideo()
+{
+  QTE_D(vsViperArchiveImportOptionsDialog);
+
+  QPushButton* acceptButton =
+    d->UI.buttonBox->button(QDialogButtonBox::Ok);
+
+  if (d->UI.timeArchive->isChecked())
+    {
+    QFileInfo fi(d->UI.videoFile->text());
+    acceptButton->setEnabled(fi.exists());
+    }
+  else
+    {
+    acceptButton->setEnabled(true);
+    }
+}
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveImportOptionsDialog.h b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveImportOptionsDialog.h
new file mode 100644
index 00000000..3adaf4e7
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveImportOptionsDialog.h
@@ -0,0 +1,46 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsViperArchiveImportOptionsDialog_h
+#define __vsViperArchiveImportOptionsDialog_h
+
+#include <QDialog>
+
+#include <qtGlobal.h>
+
+class QUrl;
+
+class vsViperArchiveImportOptionsDialogPrivate;
+
+class vsViperArchiveImportOptionsDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  vsViperArchiveImportOptionsDialog(QWidget* parent = 0,
+                                    Qt::WindowFlags flags = 0);
+  ~vsViperArchiveImportOptionsDialog();
+
+  QUrl metaDataSource() const;
+  int frameOffset() const;
+  double frameRate() const;
+  bool importEvents() const;
+
+  virtual void accept() QTE_OVERRIDE;
+
+protected slots:
+  void browseForVideo();
+  void checkVideo();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsViperArchiveImportOptionsDialog)
+
+private:
+  QTE_DECLARE_PRIVATE(vsViperArchiveImportOptionsDialog)
+  QTE_DISABLE_COPY(vsViperArchiveImportOptionsDialog)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSource.cxx b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSource.cxx
new file mode 100644
index 00000000..cfd778e7
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSource.cxx
@@ -0,0 +1,856 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsViperArchiveSourcePrivate.h"
+
+#include <QApplication>
+#include <QTimerEvent>
+
+#include <qtMap.h>
+#include <qtScopedValueChange.h>
+#include <qtStlUtil.h>
+
+#include <vgCheckArg.h>
+
+#include <track_oracle/track_xgtf/file_format_xgtf.h>
+
+#include <vgKwaFrameMetadata.h>
+#include <vgKwaVideoClip.h>
+
+#include <vtkVgVideoFrameMetaData.h>
+
+#include <vsTrackInfo.h>
+#include <vsTrackSource.h>
+#include <vtkVsTrackInfo.h>
+
+#include "vsViperArchiveImportOptionsDialog.h"
+#include "vsViperDebug.h"
+
+QTE_IMPLEMENT_D_FUNC(vsViperArchiveSource)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+vvTrackState buildState(const QRectF& head, const vtkVgTimeStamp& time)
+{
+  vvTrackState state;
+  state.TimeStamp = time.GetRawTimeStamp();
+
+  // Fill state image point (assume bottom center for location)
+  state.ImagePoint.X = head.center().x();
+  state.ImagePoint.Y = head.bottom();
+
+  // Fill state image box
+  const QRect box = head.toRect();
+  state.ImageBox.TopLeft.Y = box.top();
+  state.ImageBox.TopLeft.X = box.left();
+  state.ImageBox.BottomRight.Y = box.bottom();
+  state.ImageBox.BottomRight.X = box.right();
+
+  // Fill state image object
+  state.ImageObject.push_back(vvImagePointF(head.left(), head.top()));
+  state.ImageObject.push_back(vvImagePointF(head.right(), head.top()));
+  state.ImageObject.push_back(vvImagePointF(head.right(), head.bottom()));
+  state.ImageObject.push_back(vvImagePointF(head.left(), head.bottom()));
+
+  return state;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+vsViperArchiveSourcePrivate::Event::Event() : Object(QUuid() /* FIXME? */)
+{
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsViperArchiveTrackSource
+
+//-----------------------------------------------------------------------------
+class vsViperArchiveTrackSource : public vsTrackSource
+{
+public:
+  virtual ~vsViperArchiveTrackSource() {}
+
+  virtual Status status() const QTE_OVERRIDE;
+  virtual QString text() const QTE_OVERRIDE;
+  virtual QString toolTip() const QTE_OVERRIDE;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsViperArchiveSourcePrivate)
+  friend class vsViperArchiveSource;
+
+  vsViperArchiveTrackSource(vsViperArchiveSourcePrivate* q) : q_ptr(q) {}
+
+private:
+  QTE_DECLARE_PUBLIC(vsViperArchiveSourcePrivate)
+};
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsViperArchiveTrackSource::status() const
+{
+  QTE_Q_CONST(vsViperArchiveSourcePrivate);
+  return (q->Status == vsDataSource::InProcessActive
+          ? vsDataSource::ArchivedActive : q->Status);
+}
+
+//-----------------------------------------------------------------------------
+QString vsViperArchiveTrackSource::text() const
+{
+  QTE_Q_CONST(vsViperArchiveSourcePrivate);
+  return q->text();
+}
+
+//-----------------------------------------------------------------------------
+QString vsViperArchiveTrackSource::toolTip() const
+{
+  QTE_Q_CONST(vsViperArchiveSourcePrivate);
+  return q->toolTip("track", "tracks");
+}
+
+//END vsViperArchiveTrackSource
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsViperArchiveSourcePrivate
+
+//-----------------------------------------------------------------------------
+vsViperArchiveSourcePrivate::vsViperArchiveSourcePrivate(
+  vsViperArchiveSource* q, QUrl archiveUri)
+  : q_ptr(q), ArchiveUri(archiveUri),
+    StatusTimerId(0), StatusTtl(0), StatusResetNeeded(false),
+    TrackSource(new vsViperArchiveTrackSource(this)), ClosureTimerId(0)
+{
+  this->TrackSource->moveToThread(this->thread());
+}
+
+//-----------------------------------------------------------------------------
+vsViperArchiveSourcePrivate::~vsViperArchiveSourcePrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvTrackId vsViperArchiveSourcePrivate::mapTrackId(
+  uint externalId, const QString& type, vvTrackId& newId)
+{
+  QHash<uint, vvTrackId>& map = this->ViperTrackIdMap[type];
+  if (!map.contains(externalId))
+    {
+    ViperTrack newTrack;
+
+    // Extract track P/V/O classification
+    vsTrackObjectClassifier& toc = newTrack.Type;
+    toc.probabilityPerson =
+      (type.compare("Person", Qt::CaseInsensitive) ? 0.0 : 1.0);
+    toc.probabilityVehicle =
+      (type.compare("Vehicle", Qt::CaseInsensitive) ? 0.0 : 1.0);
+    toc.probabilityOther =
+      (1.0 - (toc.probabilityPerson + toc.probabilityVehicle));
+
+    // Add new track to internal set
+    ++newId.SerialNumber;
+    this->ViperTracks.insert(newId, newTrack);
+    map.insert(externalId, newId);
+    }
+  return map[externalId];
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::run()
+{
+  this->updateStatus(vsDataSource::ArchivedActive);
+
+  vidtk::file_format_xgtf format;
+  vidtk::track_handle_list_type xgtfTracks;
+  const QString archiveFileName = this->ArchiveUri.toLocalFile();
+
+  // Read the XGTF archive
+  format.options().promote_pvmoving = false;
+  bool result = format.read(stdString(archiveFileName), xgtfTracks);
+
+  // If we are unable to read the tracks, commit suicide
+  if (!result)
+    {
+    this->suicide();
+    return;
+    }
+
+  // Extract track information and copy to internal storage in a useful form
+  vvTrackId nextTrackId(vsTrackInfo::GroundTruthSource, 0);
+  vidtk::track_xgtf_type oracle;
+  for (size_t n = 0, k = xgtfTracks.size(); n < k; ++n)
+    {
+    const vidtk::track_handle_type& trackHandle = xgtfTracks[n];
+    if (trackHandle.is_valid())
+      {
+      // Set oracle object to track instance referenced by handle
+      oracle(trackHandle);
+
+      // Look up corresponding internal track
+      const uint externalId = oracle.external_id();
+      const QString type = qtString(oracle.type());
+      vvTrackId tid = this->mapTrackId(externalId, type, nextTrackId);
+      ViperTrack& track = this->ViperTracks[tid];
+
+      // Extract event and add to internal track
+      ViperEvent event;
+      event.Type = oracle.activity();
+      event.Probability = oracle.activity_probability();
+      event.StartFrame = oracle.frame_span().first;
+      event.EndFrame = oracle.frame_span().second;
+      track.Events.append(event);
+
+      // Extract track bounding boxes
+      vidtk::frame_handle_list_type frameHandles =
+        vidtk::track_oracle::get_frames(trackHandle);
+      for (size_t n = 0, k = frameHandles.size(); n < k; ++n)
+        {
+        const vidtk::frame_handle_type& frameHandle = frameHandles[n];
+        if (frameHandle.is_valid())
+          {
+          // Set oracle object to frame instance referenced by handle
+          oracle[frameHandle];
+
+          // Extract bounding box
+          const vgl_box_2d<double>& vglBox = oracle.bounding_box();
+          const QRectF box(vglBox.min_x(), vglBox.min_y(),
+                           vglBox.width(), vglBox.height());
+
+          // Add box to track
+          track.Region.insert(oracle.frame_number(), box);
+          }
+        }
+      }
+    }
+
+  // Done reading tracks; signal parent (in UI thread) to show conversion
+  // options dialog
+  QTE_Q(vsViperArchiveSource);
+  this->updateStatus(vsDataSource::ArchivedIdle);
+  QMetaObject::invokeMethod(q, "getImportOptions");
+
+  qtThread::run();
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::dispatch(
+  QUrl metaDataSource, int frameOffset, double frameRate, bool importEvents)
+{
+  this->updateStatus(vsDataSource::InProcessActive);
+
+  if (importEvents)
+    {
+    QTE_Q(vsViperArchiveSource);
+    emit q->eventGroupExpected(vsEventInfo::Classifier);
+    }
+
+  vtkIdType nextEventId = 0;
+
+  // Recreate track and event information with adjusted frame numbers, and in
+  // a data structure more conducive to how we will be processing them next
+  TrackIterator tIter = this->ViperTracks.begin();
+  while (tIter != this->ViperTracks.end())
+    {
+    vvTrackId tid = tIter.key();
+    ViperTrack inTrack = tIter.value(), outTrack;
+    outTrack.Type = inTrack.Type;
+
+    // Iterate over track regions
+    typedef QMap<uint, QRectF>::const_iterator RegionIterator;
+    foreach_iter (RegionIterator, rIter, inTrack.Region)
+      {
+      // Get and check mapped frame number
+      double approxFrame = (rIter.key() - frameOffset) * frameRate;
+      qint64 frame = qRound64(approxFrame);
+      if (approxFrame >= 0 && fabs(frame - approxFrame) < 0.1)
+        {
+        // Add frame to output track
+        uint fnum = static_cast<uint>(approxFrame);
+        outTrack.Region.insert(fnum, rIter.value());
+        this->PendingTrackFrames[fnum].append(tid);
+        }
+      }
+
+    if (!outTrack.Region.isEmpty())
+      {
+      if (importEvents)
+        {
+        // Iterate over events
+        foreach (ViperEvent viperEvent, inTrack.Events)
+          {
+          Event event;
+          event.Track = tid;
+          vtkIdType eventId = ++nextEventId;
+
+          // Compute mapped frame numbers
+          for (uint f = viperEvent.StartFrame; f < viperEvent.EndFrame; ++f)
+            {
+            // Get and check mapped frame number
+            double approxFrame = (f - frameOffset) * frameRate;
+            qint64 frame = qRound64(approxFrame);
+            if (approxFrame >= 0 && fabs(frame - approxFrame) < 0.1)
+              {
+              uint fnum = static_cast<uint>(approxFrame);
+              if (outTrack.Region.contains(fnum))
+                {
+                // Add corresponding box to output event
+                const QRectF& box = outTrack.Region[fnum];
+                event.OutstandingFrames.insert(fnum, box);
+                this->PendingEventFrames[fnum].append(eventId);
+                }
+              }
+            }
+
+          if (event.OutstandingFrames.empty())
+            {
+            // Throw out event if it has no frames
+            --nextEventId;
+            continue;
+            }
+
+          // Create event object and fill in what parts we have available
+          vtkVgEventBase* eventObject = event.Object.GetVolatilePointer();
+          event.Emitted = false;
+          eventObject->SetId(eventId);
+          eventObject->AddClassifier(viperEvent.Type,
+                                     viperEvent.Probability, 0.0);
+
+          // Add event to internal map
+          this->Events.insert(eventId, event);
+          }
+        }
+
+      // Replace track
+      this->OpenTracks.insert(tid);
+      tIter = this->ViperTracks.insert(tid, outTrack);
+      ++tIter;
+
+      // Go ahead and emit track's classification
+      emit this->tocAvailable(tid, inTrack.Type);
+      }
+    else
+      {
+      // If frame number adjustment produced an empty track, remove it now
+      tIter = this->ViperTracks.erase(tIter);
+      }
+    }
+
+  if (!metaDataSource.isEmpty())
+    {
+    // If provided an archive meta data source, open it now and use it to get
+    // time information for our data
+    this->processExternalTimingInfo(metaDataSource);
+    }
+  else
+    {
+    QTE_Q(vsViperArchiveSource);
+
+    // Otherwise, we are done until we receive frame meta data
+    this->updateStatus(vsDataSource::InProcessIdle);
+
+    // Begin accepting frame meta data
+    emit q->readyForInput(q);
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vsViperArchiveSourcePrivate::text() const
+{
+  // Get appropriate format
+  switch (this->Status)
+    {
+    case vsDataSource::InProcessActive:
+    case vsDataSource::ArchivedActive:
+      return "A Archived";
+    case vsDataSource::ArchivedIdle:
+      return "(I Archived)";
+    default:
+      return "(none)";
+    }
+}
+
+//-----------------------------------------------------------------------------
+QString vsViperArchiveSourcePrivate::toolTip(
+  const QString& sourceTypeSingular, const QString& sourceTypePlural) const
+{
+  // Get appropriate format
+  QString format;
+  switch (this->Status)
+    {
+    case vsDataSource::InProcessActive:
+      format = "Converting %1 from %2";
+      break;
+    case vsDataSource::ArchivedActive:
+      format = "Reading %1 from %2";
+      break;
+    case vsDataSource::ArchivedIdle:
+      format = "Using archived %1 from %2";
+      break;
+    default:
+      return QString("(no %1 source)").arg(sourceTypeSingular);
+    }
+
+  // Return formatted text
+  return format.arg(sourceTypePlural).arg(this->ArchiveUri.toString());
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::updateStatus(
+  vsDataSource::Status newStatus)
+{
+  if (newStatus == vsDataSource::InProcessIdle)
+    {
+    // Persist status for a short interval
+    newStatus = vsDataSource::InProcessActive;
+    this->StatusTtl = 2;
+    this->StatusResetNeeded = true;
+    if (!this->StatusTimerId)
+      {
+      // If not already running, start a timer to 'clear' the active status
+      // after a short interval
+      this->StatusTimerId = this->startTimer(150);
+      }
+    }
+
+  // Report status to parent
+  QTE_Q(vsViperArchiveSource);
+  QMetaObject::invokeMethod(q, "updateStatus",
+                            Q_ARG(vsDataSource::Status, newStatus));
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::timerEvent(QTimerEvent* e)
+{
+  if (e->timerId() == this->StatusTimerId)
+    {
+    if ((--this->StatusTtl) <= 0)
+      {
+      // If our interval for active status has freshly expired, drop back to
+      // idle
+      if (this->StatusResetNeeded)
+        {
+        this->updateStatus(vsDataSource::ArchivedIdle);
+        this->StatusResetNeeded = false;
+        }
+
+      // If nothing has happened for a while, kill the status timer
+      if (this->StatusTtl < -10)
+        {
+        this->killTimer(this->StatusTimerId);
+        this->StatusTimerId = 0;
+        }
+      }
+    return;
+    }
+  else if (e->timerId() == this->ClosureTimerId)
+    {
+    this->checkClosures();
+    return;
+    }
+  qtThread::timerEvent(e);
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::suicide()
+{
+  QTE_Q(vsViperArchiveSource);
+
+  // Stop our thread
+  this->quit();
+
+  // Notify core we are done
+  this->TrackSource->suicide();
+  q->suicide(); // CAUTION: we may be deleted when this returns!
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::processExternalTimingInfo(
+  const QUrl& source)
+{
+  this->updateStatus(vsDataSource::InProcessActive);
+
+  // Attempt to open video archive
+  // \TODO support other formats?
+  vgKwaVideoClip clip(source);
+
+  // Check if that succeeded; if not, die
+  vgKwaVideoClip::MetadataMap metaData = clip.metadata();
+  if (metaData.isEmpty())
+    {
+    this->suicide();
+    return;
+    }
+
+  // Run resolution for each time stamp in the meta data map
+  qtUtil::mapBound(metaData.keys(), this,
+                   &vsViperArchiveSourcePrivate::resolve);
+
+  // Run closure timer one to clean up anything we were not able to fully
+  // resolve
+  this->LastTime = (metaData.end() - 1).key();
+  this->activateClosureTimer();
+
+  this->updateStatus(vsDataSource::InProcessIdle);
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::injectInput(
+  qint64 id, vsDescriptorInputPtr input)
+{
+  Q_UNUSED(id);
+
+  const vtkVgVideoFrameMetaData* fmd = input->frameMetaData();
+  CHECK_ARG(fmd);
+
+  const bool active = this->resolve(fmd->Time);
+
+  // Activate closure timer, if time has advanced
+  if (!this->LastTime.IsValid() || this->LastTime < fmd->Time)
+    {
+    this->LastTime = fmd->Time;
+    this->activateClosureTimer();
+    }
+
+  if (active)
+    {
+    // If we did something, reset status to idle
+    this->updateStatus(vsDataSource::InProcessIdle);
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool vsViperArchiveSourcePrivate::resolve(vtkVgTimeStamp fmdTimeStamp)
+{
+  const uint fmdFrame = fmdTimeStamp.GetFrameNumber();
+  bool active = false;
+
+  // Check for resolved track states
+  if (this->PendingTrackFrames.contains(fmdFrame))
+    {
+    active = true;
+    this->updateStatus(vsDataSource::InProcessActive);
+
+    // Update all tracks that use this frame
+    foreach (vvTrackId tid, this->PendingTrackFrames[fmdFrame])
+      {
+      Q_ASSERT(this->ViperTracks.contains(tid));
+      const ViperTrack& track = this->ViperTracks[tid];
+      const QRectF& head = track.Region[fmdFrame];
+
+      // Emit track state
+      const vvTrackState state = buildState(head, fmdTimeStamp);
+      emit this->TrackSource->trackUpdated(tid, state);
+
+      // Check for track closure on this frame
+      if ((track.Region.end() - 1).key() == fmdFrame)
+        {
+        this->OpenTracks.remove(tid);
+        emit this->TrackSource->trackClosed(tid);
+        }
+      }
+    this->PendingTrackFrames.remove(fmdFrame);
+    }
+
+  // Check for resolved event regions
+  if (this->PendingEventFrames.contains(fmdFrame))
+    {
+    active = true;
+    this->updateStatus(vsDataSource::InProcessActive);
+
+    // Update all events that use this frame
+    qtUtil::mapBound(this->PendingEventFrames[fmdFrame], this,
+                     &vsViperArchiveSourcePrivate::updateEvent, fmdTimeStamp);
+
+    this->PendingEventFrames.remove(fmdFrame);
+    }
+
+  return active;
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::updateEvent(
+  vtkIdType eventId, vtkVgTimeStamp fmdTimeStamp)
+{
+  // Sanity check #1: event must exist
+  CHECK_ARG(this->Events.contains(eventId));
+
+  Event& event = this->Events[eventId];
+  const uint fmdFrame = fmdTimeStamp.GetFrameNumber();
+
+  // Sanity check #2: event has outstanding region at this frame
+  CHECK_ARG(event.OutstandingFrames.contains(fmdFrame));
+
+  // Get box at this frame and add to event
+  QRectF box = event.OutstandingFrames.take(fmdFrame);
+  double points[8] =
+    {
+    box.left(), box.top(),
+    box.right(), box.top(),
+    box.right(), box.bottom(),
+    box.left(), box.bottom()
+    };
+  vtkVgEventBase* eventObject = event.Object.GetVolatilePointer();
+  eventObject->AddRegion(fmdTimeStamp, 4, points);
+
+  // Create or update track info
+  vtkVsTrackInfo* trackInfo;
+  if (eventObject->GetNumberOfTracks())
+    {
+    trackInfo = vtkVsTrackInfo::SafeDownCast(eventObject->GetTrackInfo(0));
+    Q_ASSERT(trackInfo);
+    trackInfo->StartFrame = qMin(trackInfo->StartFrame, fmdTimeStamp);
+    trackInfo->EndFrame = qMax(trackInfo->EndFrame, fmdTimeStamp);
+    }
+  else
+    {
+    trackInfo = new vtkVsTrackInfo(event.Track, fmdTimeStamp, fmdTimeStamp);
+    eventObject->AddTrack(trackInfo);
+    }
+
+  // Update event time range
+  eventObject->SetStartFrame(trackInfo->StartFrame);
+  eventObject->SetEndFrame(trackInfo->EndFrame);
+
+  // Check if event should be emitted (or re-emitted)
+  if (event.OutstandingFrames.isEmpty())
+    {
+    // All regions have now been resolved; emit event immediately and remove
+    // from overdue queue, if present
+    event.Emitted = true;
+    this->OverdueEvents.remove(eventId);
+    emit this->eventAvailable(event.Object);
+    }
+  else if (event.Emitted)
+    {
+    qtDebug(vsdViperOverdueEvents)
+      << "scheduling event" << eventId << "for re-emission";
+    // We have already emitted the event, so should update it with the new
+    // information, but wait a while to see if additional new regions are
+    // resolved, so that we aren't re-emitting many times in quick succession
+    this->OverdueEvents.insert(eventId, 2);
+    this->activateClosureTimer();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::checkClosures()
+{
+  const uint lastFrame = this->LastTime.GetFrameNumber();
+
+  // Check for track closures
+  foreach (const vvTrackId& tid, this->OpenTracks)
+    {
+    Q_ASSERT(this->ViperTracks.contains(tid));
+    ViperTrack& track = this->ViperTracks[tid];
+
+    if ((track.Region.end() - 1).key() <= lastFrame)
+      {
+      // If we've seen past the end of the track, close it
+      this->OpenTracks.remove(tid);
+      emit this->TrackSource->trackClosed(tid);
+      }
+    }
+
+  // Check for "expired" overdue events
+  foreach (vtkIdType eventId, this->OverdueEvents.keys())
+    {
+    if (--this->OverdueEvents[eventId] <= 0)
+      {
+      Q_ASSERT(this->Events.contains(eventId));
+      Event& event = this->Events[eventId];
+      qtDebug(vsdViperOverdueEvents)
+        << "event" << eventId << "overdue TTL expired; (re-)emitting";
+
+      // Overdue TTL has expired; remove it from the queue and emit the event
+      // in whatever is its current state
+      event.Emitted = true;
+      this->OverdueEvents.remove(eventId);
+      emit this->eventAvailable(event.Object);
+      }
+    }
+
+  // Check for newly overdue events
+  typedef QHash<vtkIdType, Event>::const_iterator EventIterator;
+  foreach_iter (EventIterator, iter, this->Events)
+    {
+    const Event& event = iter.value();
+    if (!event.Emitted && !this->OverdueEvents.contains(iter.key()))
+      {
+      Q_ASSERT(event.OutstandingFrames.count());
+      // Check if event is "overdue" to be emitted, i.e. we have seen past its
+      // last frame
+      if (lastFrame > (event.OutstandingFrames.end() - 1).key())
+        {
+        // Yes; add to overdue list to emit after a little while if the
+        // remaining frames remain unresolved
+        qtDebug(vsdViperOverdueEvents)
+          << "event" << iter.key() << "has outstanding frame(s)"
+          << event.OutstandingFrames.keys() << "and is now overdue";
+        this->OverdueEvents.insert(iter.key(), 4);
+        }
+      }
+    }
+
+  // Check if timer should be killed
+  if (this->OpenTracks.isEmpty() && this->OverdueEvents.isEmpty())
+    {
+    qtDebug(vsdViperOverdueEvents) << "killing closure timer";
+    this->killTimer(this->ClosureTimerId);
+    this->ClosureTimerId = 0;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSourcePrivate::activateClosureTimer()
+{
+  if (!this->ClosureTimerId)
+    {
+    // Check if we have anything to do; if there are no unresolved frames, and
+    // no events waiting to be re-emitted, then there is no reason to run the
+    // closure timer
+    if (!this->PendingTrackFrames.isEmpty() ||
+        !this->PendingEventFrames.isEmpty() ||
+        !this->OverdueEvents.isEmpty())
+      {
+      // Start timer to check for track closures and overdue events, i.e.
+      // things that depend on the most recent time we have seen that we don't
+      // need (or necessarily want) to do every frame
+      qtDebug(vsdViperOverdueEvents) << "starting closure timer";
+      this->ClosureTimerId = this->startTimer(150);
+      }
+    }
+}
+
+//END vsViperArchiveSourcePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsViperArchiveSource
+
+//-----------------------------------------------------------------------------
+vsViperArchiveSource::vsViperArchiveSource(const QUrl& archiveUri) :
+  d_ptr(new vsViperArchiveSourcePrivate(this, archiveUri))
+{
+  QTE_D(vsViperArchiveSource);
+
+  connect(d, SIGNAL(eventAvailable(vsEvent)),
+          this, SLOT(emitEvent(vsEvent)));
+  connect(d, SIGNAL(eventRevoked(vtkIdType)),
+          this, SLOT(revokeEvent(vtkIdType)));
+  connect(d, SIGNAL(tocAvailable(vvTrackId, vsTrackObjectClassifier)),
+          this, SIGNAL(tocAvailable(vvTrackId, vsTrackObjectClassifier)));
+
+  d->Status = vsDataSource::ArchivedIdle;
+}
+
+//-----------------------------------------------------------------------------
+vsViperArchiveSource::~vsViperArchiveSource()
+{
+  QTE_D(vsViperArchiveSource);
+
+  // Don't emit our own destroyed() when we are going away anyway
+  qtScopedBlockSignals bs(this);
+
+  // Shut down thread and track source
+  d->suicide();
+  d->wait();
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSource::start()
+{
+  QTE_D(vsViperArchiveSource);
+
+  d->start();
+  vsDataSource::start();
+}
+
+//-----------------------------------------------------------------------------
+vsDescriptorInput::Types vsViperArchiveSource::inputAccepted() const
+{
+  return vsDescriptorInput::FrameMetaData | vsDescriptorSource::inputAccepted();
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSource::injectInput(qint64 id, vsDescriptorInputPtr input)
+{
+  QTE_D(vsViperArchiveSource);
+
+  QMetaObject::invokeMethod(d, "injectInput",
+                            Q_ARG(qint64, id),
+                            Q_ARG(vsDescriptorInputPtr, input));
+
+  vsDescriptorSource::injectInput(id, input);
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSource::updateStatus(vsDataSource::Status newStatus)
+{
+  QTE_D(vsViperArchiveSource);
+
+  if (newStatus != d->Status)
+    {
+    d->Status = newStatus;
+    emit this->statusChanged(newStatus);
+    emit d->TrackSource->statusChanged(newStatus);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsViperArchiveSource::getImportOptions()
+{
+  QTE_D(vsViperArchiveSource);
+
+  // Create and set up dialog
+  vsViperArchiveImportOptionsDialog dlg(qApp->activeWindow());
+
+  // Get options from user
+  if (dlg.exec() != QDialog::Accepted)
+    {
+    d->suicide();
+    return;
+    }
+
+  // Signal thread to continue processing
+  QMetaObject::invokeMethod(d, "dispatch",
+                            Q_ARG(QUrl, dlg.metaDataSource()),
+                            Q_ARG(int, dlg.frameOffset()),
+                            Q_ARG(double, dlg.frameRate()),
+                            Q_ARG(bool, dlg.importEvents()));
+}
+
+//-----------------------------------------------------------------------------
+vsDataSource::Status vsViperArchiveSource::status() const
+{
+  QTE_D_CONST(vsViperArchiveSource);
+  return (d->Status == vsDataSource::InProcessActive
+          ? vsDataSource::ArchivedActive : d->Status);
+}
+
+//-----------------------------------------------------------------------------
+QString vsViperArchiveSource::text() const
+{
+  QTE_D_CONST(vsViperArchiveSource);
+  return d->text();
+}
+
+//-----------------------------------------------------------------------------
+QString vsViperArchiveSource::toolTip() const
+{
+  QTE_D_CONST(vsViperArchiveSource);
+  return d->toolTip("descriptor", "descriptors");
+}
+
+//-----------------------------------------------------------------------------
+vsTrackSourcePtr vsViperArchiveSource::trackSource()
+{
+  QTE_D(vsViperArchiveSource);
+  return d->TrackSource;
+}
+
+//END vsViperArchiveSource
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSource.h b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSource.h
new file mode 100644
index 00000000..90f6a668
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSource.h
@@ -0,0 +1,50 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsViperArchiveSource_h
+#define __vsViperArchiveSource_h
+
+#include <QUrl>
+
+#include <vsSourceFactory.h>
+#include <vsDescriptorSource.h>
+
+class vsViperArchiveSourcePrivate;
+
+class vsViperArchiveSource : public vsDescriptorSource
+{
+  Q_OBJECT
+
+public:
+  explicit vsViperArchiveSource(const QUrl& archiveUri);
+  virtual ~vsViperArchiveSource();
+
+  virtual void start();
+
+  virtual vsDescriptorInput::Types inputAccepted() const;
+  virtual void injectInput(qint64 id, vsDescriptorInputPtr input);
+
+  virtual Status status() const;
+  virtual QString text() const;
+  virtual QString toolTip() const;
+
+protected slots:
+  void updateStatus(vsDataSource::Status);
+
+  void getImportOptions();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsViperArchiveSource)
+
+  virtual vsTrackSourcePtr trackSource();
+
+private:
+  QTE_DECLARE_PRIVATE(vsViperArchiveSource)
+  QTE_DISABLE_COPY(vsViperArchiveSource)
+  friend class vsViperArchiveSourcePlugin;
+};
+
+#endif
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePlugin.cxx b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePlugin.cxx
new file mode 100644
index 00000000..0369eab5
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePlugin.cxx
@@ -0,0 +1,97 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsViperArchiveSourcePlugin.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QStringList>
+#include <QUrl>
+#include <QXmlStreamReader>
+#include <QtPlugin>
+
+#include <vgCheckArg.h>
+
+#include <vsStaticSourceFactory.h>
+
+// Need this so that QSharedPointer can find the dtor
+#include <vsTrackSource.h>
+
+#include "vsViperArchiveSource.h"
+
+Q_EXPORT_PLUGIN2(vsViperArchiveSource, vsViperArchiveSourcePlugin)
+
+//-----------------------------------------------------------------------------
+vsViperArchiveSourcePlugin::vsViperArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsViperArchiveSourcePlugin::~vsViperArchiveSourcePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsArchiveSourceTypes vsViperArchiveSourcePlugin::archiveTypes() const
+{
+  return vs::ArchiveTrackSource;
+}
+
+//-----------------------------------------------------------------------------
+vsArchivePluginInfo vsViperArchiveSourcePlugin::archivePluginInfo(
+  vsArchiveSourceType type) const
+{
+  vsArchivePluginInfo info;
+  if (type == vs::ArchiveTrackSource)
+    {
+    vsArchiveFileType fileType;
+    fileType.Description = "ViPER ground truth";
+    fileType.Patterns.append("*.xgtf");
+    info.SupportedFileTypes.append(fileType);
+    }
+  return info;
+}
+
+//-----------------------------------------------------------------------------
+#include <QDebug>
+vsSimpleSourceFactory* vsViperArchiveSourcePlugin::createArchiveSource(
+  vsArchiveSourceType type, const QUrl& uri, SourceCreateMode mode)
+{
+  // Quick test for acceptable archive
+  if (mode == vsArchiveSourceInterface::QuickTest)
+    {
+    CHECK_ARG(type == vs::ArchiveTrackSource, 0);
+    CHECK_ARG(uri.scheme() == "file", 0);
+    CHECK_ARG(uri.toLocalFile().endsWith(".xgtf"), 0);
+    }
+
+  // Verify that file exists and is readable
+  const QString fileName = uri.toLocalFile();
+  CHECK_ARG(QFileInfo(fileName).exists(), 0);
+  QFile file(fileName);
+  CHECK_ARG(file.open(QIODevice::ReadOnly | QIODevice::Text), 0);
+  QXmlStreamReader stream(&file);
+
+  // Try to verify file contents
+  forever
+    {
+    CHECK_ARG(!stream.atEnd(), 0);
+    CHECK_ARG(stream.readNextStartElement(), 0);
+    qDebug() << stream.name();
+
+    if (stream.name() == "viper")
+      {
+      // This looks like a valid header; accept the file
+      break;
+      }
+    }
+
+  vsStaticSourceFactory* factory = new vsStaticSourceFactory;
+  vsViperArchiveSource* source = new vsViperArchiveSource(uri);
+  factory->addTrackSource(source->trackSource());
+  factory->addDescriptorSource(source);
+  return factory;
+}
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePlugin.h b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePlugin.h
new file mode 100644
index 00000000..5c0d31c5
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePlugin.h
@@ -0,0 +1,36 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsViperArchiveSourcePlugin_h
+#define __vsViperArchiveSourcePlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsArchiveSourceInterface.h>
+
+class vsViperArchiveSourcePlugin : public QObject,
+                                   public vsArchiveSourceInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsArchiveSourceInterface)
+
+public:
+  vsViperArchiveSourcePlugin();
+  virtual ~vsViperArchiveSourcePlugin();
+
+  virtual vsArchiveSourceTypes archiveTypes() const QTE_OVERRIDE;
+  virtual vsArchivePluginInfo archivePluginInfo(
+    vsArchiveSourceType) const QTE_OVERRIDE;
+  virtual vsSimpleSourceFactory* createArchiveSource(
+    vsArchiveSourceType, const QUrl&, SourceCreateMode) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsViperArchiveSourcePlugin)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePrivate.h b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePrivate.h
new file mode 100644
index 00000000..6dc6d28b
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperArchiveSourcePrivate.h
@@ -0,0 +1,131 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsViperArchiveSourcePrivate_h
+#define __vsViperArchiveSourcePrivate_h
+
+#include "vsViperArchiveSource.h"
+
+#include <QMap>
+#include <QSet>
+#include <QUrl>
+
+#include <qtThread.h>
+
+#include <vvDescriptor.h>
+
+#include <track_oracle/track_oracle.h>
+
+#include <vsDescriptorInput.h>
+#include <vsEvent.h>
+
+class QRectF;
+
+class vsViperArchiveTrackSource;
+
+class vsViperArchiveSourcePrivate : public qtThread
+{
+  Q_OBJECT
+
+public:
+  vsViperArchiveSourcePrivate(vsViperArchiveSource* q, QUrl archiveUri);
+  virtual ~vsViperArchiveSourcePrivate();
+
+  QString text() const;
+  QString toolTip(const QString& sourceTypeSingular,
+                  const QString& sourceTypePlural) const;
+
+signals:
+  void eventAvailable(vsEvent);
+  void eventRevoked(vtkIdType);
+
+  void tocAvailable(vvTrackId trackId, vsTrackObjectClassifier toc);
+
+public slots:
+  void dispatch(QUrl metaDataSource, int frameOffset, double frameRate,
+                bool importEvents);
+
+protected slots:
+  void injectInput(qint64 id, vsDescriptorInputPtr input);
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsViperArchiveSource)
+  friend class vsViperArchiveTrackSource;
+
+  struct ViperEvent
+    {
+    int Type;
+    double Probability;
+    uint StartFrame;
+    uint EndFrame;
+    };
+
+  struct ViperTrack
+    {
+    vsTrackObjectClassifier Type;
+    QMap<uint, QRectF> Region;
+    QList<ViperEvent> Events;
+    };
+
+  struct Event
+    {
+    Event();
+
+    QMap<uint, QRectF> OutstandingFrames;
+    vvTrackId Track;
+    vsEvent Object;
+    bool Emitted;
+    };
+
+  typedef QHash<vvTrackId, ViperTrack> TrackMap;
+  typedef TrackMap::iterator TrackIterator;
+
+  vvTrackId mapTrackId(uint externalId, const QString& type,
+                       vvTrackId& newId);
+
+  virtual void run() QTE_OVERRIDE;
+
+  void processExternalTimingInfo(const QUrl& source);
+
+  bool resolve(vtkVgTimeStamp fmdTimeStamp);
+  void updateEvent(vtkIdType eventId, vtkVgTimeStamp fmdTimeStamp);
+  void checkClosures();
+  void activateClosureTimer();
+
+  void updateStatus(vsDataSource::Status);
+  void suicide();
+
+  virtual void timerEvent(QTimerEvent*) QTE_OVERRIDE;
+
+  const QUrl ArchiveUri;
+
+  vsDataSource::Status Status;
+
+  int StatusTimerId;
+  int StatusTtl;
+  bool StatusResetNeeded;
+
+  QSharedPointer<vsViperArchiveTrackSource> TrackSource;
+
+  TrackMap ViperTracks;
+  QHash<QString, QHash<uint, vvTrackId> > ViperTrackIdMap;
+
+  QHash<vtkIdType, Event> Events;
+
+  vtkVgTimeStamp LastTime;
+  int ClosureTimerId;
+  QSet<vvTrackId> OpenTracks;
+  QHash<vtkIdType, int> OverdueEvents;
+
+  QHash<uint, QList<vvTrackId> > PendingTrackFrames;
+  QHash<uint, QList<vtkIdType> > PendingEventFrames;
+
+private:
+  QTE_DECLARE_PUBLIC(vsViperArchiveSource)
+  QTE_DISABLE_COPY(vsViperArchiveSourcePrivate)
+};
+
+#endif
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperDebug.cxx b/Plugins/VspSourceService/ViperArchiveSource/vsViperDebug.cxx
new file mode 100644
index 00000000..27e89e61
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperDebug.cxx
@@ -0,0 +1,9 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <qtDebugImpl.h>
+
+#include "vsViperDebug.h"
diff --git a/Plugins/VspSourceService/ViperArchiveSource/vsViperDebug.h b/Plugins/VspSourceService/ViperArchiveSource/vsViperDebug.h
new file mode 100644
index 00000000..dd5314b3
--- /dev/null
+++ b/Plugins/VspSourceService/ViperArchiveSource/vsViperDebug.h
@@ -0,0 +1,14 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsViperDebug_h
+#define __vsViperDebug_h
+
+#include <qtDebug.h>
+
+QTE_DEBUG_AREA(vsd, ViperOverdueEvents, false);
+
+#endif
diff --git a/Plugins/VspUiExtensions/CMakeLists.txt b/Plugins/VspUiExtensions/CMakeLists.txt
new file mode 100644
index 00000000..eb13b908
--- /dev/null
+++ b/Plugins/VspUiExtensions/CMakeLists.txt
@@ -0,0 +1,26 @@
+# Options for optional plugins
+vg_option(VSPUI_ENABLE_REPORT_GENERATOR ON
+  "Enable building of VSPUI report generator extension"
+  "VISGUI_ENABLE_VSPLAY"
+)
+vg_option(VSPUI_ENABLE_EVENT_CREATION_TOOLS ON
+  "Enable building of VSPUI event creation tools extension"
+  "VISGUI_ENABLE_VSPLAY"
+)
+
+if(NOT VISGUI_ENABLE_VSPLAY)
+  # If vsPlay is are disabled, we are only here to declare our options, so
+  # leave now
+  return()
+endif()
+
+###############################################################################
+
+add_subdirectory(Ruler)
+
+if(VSPUI_ENABLE_REPORT_GENERATOR)
+  add_subdirectory(ReportGenerator)
+endif()
+if(VSPUI_ENABLE_EVENT_CREATION_TOOLS)
+  add_subdirectory(EventCreationTools)
+endif()
diff --git a/Plugins/VspUiExtensions/EventCreationTools/CMakeLists.txt b/Plugins/VspUiExtensions/EventCreationTools/CMakeLists.txt
new file mode 100644
index 00000000..9d7940ef
--- /dev/null
+++ b/Plugins/VspUiExtensions/EventCreationTools/CMakeLists.txt
@@ -0,0 +1,47 @@
+project(vsEventCreationTools)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+vg_include_library_sdk_directories(vspUserInterface)
+
+set(vsEventCreationTools_Sources
+  vsEventCreationToolsInterface.cxx
+  vsEventCreationToolsPlugin.cxx
+)
+
+set(vsEventCreationTools_MocHeaders
+  vsEventCreationToolsInterface.h
+  vsEventCreationToolsPlugin.h
+)
+
+set(vsEventCreationTools_Resources
+  icons.qrc
+)
+
+qt4_wrap_cpp(vsEventCreationTools_MocSources
+  ${vsEventCreationTools_MocHeaders}
+)
+qt4_add_resources(vsEventCreationTools_ResSources
+  ${vsEventCreationTools_Resources}
+)
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsEventCreationTools_Sources}
+  ${vsEventCreationTools_MocSources}
+  ${vsEventCreationTools_ResSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  vspUserInterface
+  ${QT_LIBRARIES}
+  vtkGUISupportQt
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-create-box.png b/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-create-box.png
new file mode 100644
index 00000000..88960857
Binary files /dev/null and b/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-create-box.png differ
diff --git a/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-create-quick.png b/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-create-quick.png
new file mode 100644
index 00000000..f21d3dac
Binary files /dev/null and b/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-create-quick.png differ
diff --git a/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-draw.png b/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-draw.png
new file mode 100644
index 00000000..077b13c2
Binary files /dev/null and b/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-draw.png differ
diff --git a/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-create-box.png b/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-create-box.png
new file mode 100644
index 00000000..8d5d746e
Binary files /dev/null and b/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-create-box.png differ
diff --git a/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-create-quick.png b/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-create-quick.png
new file mode 100644
index 00000000..c34667a8
Binary files /dev/null and b/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-create-quick.png differ
diff --git a/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-draw.png b/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-draw.png
new file mode 100644
index 00000000..b9178b39
Binary files /dev/null and b/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-draw.png differ
diff --git a/Plugins/VspUiExtensions/EventCreationTools/Icons/icons.svg b/Plugins/VspUiExtensions/EventCreationTools/Icons/icons.svg
new file mode 100644
index 00000000..d0df227f
--- /dev/null
+++ b/Plugins/VspUiExtensions/EventCreationTools/Icons/icons.svg
@@ -0,0 +1,1165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="72"
+   height="40"
+   id="svg15655"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icons.svg">
+  <metadata
+     id="metadata440">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview438"
+     showgrid="false"
+     inkscape:zoom="16"
+     inkscape:cx="36"
+     inkscape:cy="20"
+     inkscape:window-x="1918"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg15655"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="true"
+     showborder="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3248"
+       empspacing="8"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5px"
+       spacingy="0.5px" />
+  </sodipodi:namedview>
+  <defs
+     id="defs15657">
+    <linearGradient
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127"
+       id="linearGradient11954"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop11956"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         offset="0" />
+      <stop
+         offset="0.25445721"
+         style="stop-color:#ffe581;stop-opacity:0.87843138;"
+         id="stop11958" />
+      <stop
+         offset="0.39923459"
+         style="stop-color:#ffd429;stop-opacity:0.50196081;"
+         id="stop11960" />
+      <stop
+         id="stop11962"
+         style="stop-color:#ffcc00;stop-opacity:0.75294119;"
+         offset="0.56616175" />
+      <stop
+         offset="0.71395278"
+         style="stop-color:#d4aa00;stop-opacity:0.25098041;"
+         id="stop11964" />
+      <stop
+         id="stop11966"
+         style="stop-color:#aa8800;stop-opacity:0.1254902;"
+         offset="0.78939378" />
+      <stop
+         id="stop11968"
+         style="stop-color:#806600;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="SG_GOLD_1"
+       y2="124.8127"
+       x2="23.477301"
+       y1="136.9731"
+       x1="26.1304">
+      <stop
+         offset="0"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         id="stop6510-5-0" />
+      <stop
+         id="stop6515-9-7"
+         style="stop-color:#ffd42a;stop-opacity:1"
+         offset="0.60644233" />
+      <stop
+         offset="0.72660697"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop6517-62-7" />
+      <stop
+         id="stop6519-17-4"
+         style="stop-color:#d4aa00;stop-opacity:1"
+         offset="0.84601015" />
+      <stop
+         offset="1"
+         style="stop-color:#806600;stop-opacity:1"
+         id="stop6512-8-5" />
+    </linearGradient>
+    <linearGradient
+       x1="258.14651"
+       y1="120.6782"
+       x2="269.3223"
+       y2="134.90199"
+       id="SG_RED_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6415-6-8-3"
+         style="stop-color:#ffc2b2;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6417-4-9-4"
+         style="stop-color:#ffb8a6;stop-opacity:1"
+         offset="0.068" />
+      <stop
+         id="stop6419-2-3-0"
+         style="stop-color:#ff3300;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="359.05081"
+       y1="122.8501"
+       x2="346.7869"
+       y2="108.6055"
+       id="SG_GRAY_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6630-5-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6632-5"
+         style="stop-color:#f8f8f7;stop-opacity:1"
+         offset="0.0425" />
+      <stop
+         id="stop6634-2-5"
+         style="stop-color:#afafa2;stop-opacity:1"
+         offset="0.51010001" />
+      <stop
+         id="stop6636-90"
+         style="stop-color:#81816d;stop-opacity:1"
+         offset="0.83999997" />
+      <stop
+         id="stop6638-2-8"
+         style="stop-color:#6f6f58;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="29.4517"
+       y1="125.7783"
+       x2="26.100401"
+       y2="137.3954"
+       id="SG_BEIGE_1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop6282-5"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop6284-5"
+         style="stop-color:#ffdc8f;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="26.1304"
+       y1="136.9731"
+       x2="23.477301"
+       y2="124.8127"
+       id="linearGradient11182"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         id="stop11184"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         offset="0" />
+      <stop
+         offset="0.60644233"
+         style="stop-color:#ffd429;stop-opacity:0.87843138;"
+         id="stop11186" />
+      <stop
+         id="stop11188"
+         style="stop-color:#ffcc00;stop-opacity:0.75294119;"
+         offset="0.72660697" />
+      <stop
+         offset="0.84601015"
+         style="stop-color:#d4aa00;stop-opacity:0.3764706;"
+         id="stop11190" />
+      <stop
+         id="stop11192"
+         style="stop-color:#806600;stop-opacity:0;"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient7159"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688672e-6,4.5688561e-6,1.5436241,-568.17867,-28.914334)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient7162"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688672e-6,4.5688561e-6,1.5436241,-568.17867,-33.914334)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient7170"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69230752,0,0,0.69230769,4.7692332,7.5384616)"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient7181"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53037482,0.53028407,-0.5303297,0.53032983,8.9257,19.606971)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient7184"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.3639272,6.3639633,-6.3639435,6.3639606,54.53636,-269.52255)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient7187"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.74999909,-6.417072e-5,9.3211965e-8,0.74999955,27.39137,33.973102)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient7190"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.9999777,2.5479791e-5,1.2081937e-5,8.9999873,-144.80247,-202.72395)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient7232"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11954"
+       id="radialGradient7238"
+       gradientUnits="userSpaceOnUse"
+       cx="15.5"
+       cy="24.5"
+       fx="15.5"
+       fy="24.5"
+       r="6.5" />
+    <radialGradient
+       r="1.045"
+       cy="0.13600001"
+       cx="0.227"
+       id="SG_EVENT_CIRCLE_SMALL"
+       xlink:href="#SG_GOLD_1"
+       inkscape:collect="always"
+       gradientUnits="objectBoundingBox" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient7308"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666766,0,0,1.0666683,5.9999902,-24.066713)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient7311"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666766,0,0,1.0666683,5.3333219,-22.733378)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient7314"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666766,0,0,1.0666683,0.99998028,-14.066698)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient7318"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.66666766,0,0,1.0666683,0.99998028,-14.066698)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient7325"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-5.5000739,-15.500004)"
+       x1="1.4999989"
+       y1="15"
+       x2="12.999999"
+       y2="22.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient7344"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="radialGradient7354"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,7.5,-19.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient7357"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,6.5,-17.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GRAY_1"
+       id="radialGradient7360"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,0,-4.6)"
+       cx="11"
+       cy="25.0625"
+       fx="11"
+       fy="25.0625"
+       r="6.25" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_BEIGE_1"
+       id="radialGradient7364"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6,0,-4.6)"
+       cx="14.5"
+       cy="16.9375"
+       fx="14.5"
+       fy="16.9375"
+       r="6.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#SG_RED_1"
+       id="linearGradient7371"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-2,8)"
+       x1="0"
+       y1="12"
+       x2="12"
+       y2="20" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5597"
+       gradientUnits="userSpaceOnUse"
+       cx="6.5"
+       cy="10.5"
+       r="11.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5600"
+       gradientUnits="userSpaceOnUse"
+       cx="6.5"
+       cy="5.5"
+       r="11.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5609"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-588.17862,-10.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5612"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-588.17862,-16.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5621"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-566.17862,-5.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient5624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-566.17862,-11.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient5633"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.76616909,0.76589569,-0.76603217,0.76603247,1.11412,46.321959)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient5636"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(9.1923771,9.192378,-9.192305,9.1924642,66.99489,-371.31187)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient5639"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0833334,-1.9332332e-4,2.1121831e-7,1.0833333,27.78754,67.07337)"
+       cx="10.811514"
+       cy="-39.29657"
+       fx="10.811514"
+       fy="-39.29657"
+       r="6" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11182"
+       id="radialGradient5642"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(12.999985,6.4764499e-7,1.1255326e-4,12.999995,-220.93943,-274.82308)"
+       cx="20.033627"
+       cy="23.024858"
+       fx="20.033627"
+       fy="23.024858"
+       r="0.5" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient3237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688672e-6,4.5688561e-6,1.5436241,-544.17867,-28.914334)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient3240"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688672e-6,4.5688561e-6,1.5436241,-544.17867,-33.914334)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient3250"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436253,-4.5688595e-6,4.568856e-6,1.5436241,-210.67762,-11.414331)"
+       cx="387.83865"
+       cy="20.999998"
+       fx="387.83865"
+       fy="20.999998"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient3257"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-543.17862,-4.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient3260"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688671e-6,4.568856e-6,1.5436241,-543.17862,-10.914331)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="SG_GOLD_1-2"
+       y2="124.8127"
+       x2="23.477301"
+       y1="136.9731"
+       x1="26.1304">
+      <stop
+         offset="0"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         id="stop6510-5-0-2" />
+      <stop
+         id="stop6515-9-7-1"
+         style="stop-color:#ffd42a;stop-opacity:1"
+         offset="0.60644233" />
+      <stop
+         offset="0.72660697"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop6517-62-7-2" />
+      <stop
+         id="stop6519-17-4-4"
+         style="stop-color:#d4aa00;stop-opacity:1"
+         offset="0.84601015" />
+      <stop
+         offset="1"
+         style="stop-color:#806600;stop-opacity:1"
+         id="stop6512-8-5-0" />
+    </linearGradient>
+    <linearGradient
+       y2="47.657894"
+       x2="59.000004"
+       y1="49.63158"
+       x1="53.955227"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4158"
+       xlink:href="#SG_GOLD_1-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(1.2884615,0,0,1.2666667,-8.019231,-36.866668)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="SG_GOLD_1-2-7"
+       y2="124.8127"
+       x2="23.477301"
+       y1="136.9731"
+       x1="26.1304">
+      <stop
+         offset="0"
+         style="stop-color:#fff6d5;stop-opacity:1"
+         id="stop6510-5-0-2-0" />
+      <stop
+         id="stop6515-9-7-1-6"
+         style="stop-color:#ffd42a;stop-opacity:1"
+         offset="0.60644233" />
+      <stop
+         offset="0.72660697"
+         style="stop-color:#ffcc00;stop-opacity:1"
+         id="stop6517-62-7-2-8" />
+      <stop
+         id="stop6519-17-4-4-0"
+         style="stop-color:#d4aa00;stop-opacity:1"
+         offset="0.84601015" />
+      <stop
+         offset="1"
+         style="stop-color:#806600;stop-opacity:1"
+         id="stop6512-8-5-0-9" />
+    </linearGradient>
+    <linearGradient
+       y2="47.5"
+       x2="59"
+       y1="49.5"
+       x1="54"
+       gradientTransform="translate(4,-44)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4201"
+       xlink:href="#SG_GOLD_1-2-7"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4226"
+       gradientUnits="userSpaceOnUse"
+       cx="52.497"
+       cy="4.4960001"
+       r="11.495"
+       fx="52.497"
+       fy="4.4960001" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4229"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688672e-6,4.5688561e-6,1.5436241,-545.17867,-27.914334)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#SG_GOLD_1"
+       id="radialGradient4232"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5436279,-4.5688672e-6,4.5688561e-6,1.5436241,-545.17867,-32.914334)"
+       cx="387.83862"
+       cy="26.182608"
+       fx="387.83862"
+       fy="26.182608"
+       r="7.4499998" />
+  </defs>
+  <g
+     id="22_event-draw"
+     inkscape:label="#event-draw"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-draw.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5730"
+       y="18"
+       x="0"
+       height="22"
+       width="22" />
+    <path
+       sodipodi:nodetypes="csc"
+       id="path5732"
+       d="M 4,19.5 C 9.5,22 9.5,26 6.5,29 3,32.5 4,37 11,38.5"
+       style="fill:none;stroke:url(#linearGradient7371);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g5615">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient7344);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6497"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 a 6,6 0 1 1 -12,0 6,6 0 1 1 12,0 z"
+         transform="translate(-379.5,0.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient5612);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         width="2"
+         height="6"
+         x="10.5"
+         y="21.5"
+         id="rect6521" />
+      <rect
+         y="27.5"
+         x="10.5"
+         height="2"
+         width="2"
+         id="rect6578"
+         style="color:#000000;fill:url(#radialGradient5609);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccccc"
+       id="path5754"
+       d="m 14,36.5 5.5,-11 -4,-2 -5.5,11 1.5,2 2.5,0 z"
+       style="fill:url(#radialGradient7364);fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6f6f58;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12,35.5 5.5,-11"
+       id="path5752"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient7360);fill-opacity:1;stroke:none"
+       d="m 14,36.5 -4,-2 0.5,4 3.5,-2 z"
+       id="path5766"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path5770"
+       d="m 20.5,23.5 -4,-2 -1,2 4,2 1,-2 z"
+       style="fill:url(#radialGradient7357);fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient7354);fill-opacity:1;stroke:none"
+       d="m 21.5,21.5 -4,-2 -1,2 4,2 1,-2 z"
+       id="path5778"
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path5901"
+       d="m 20.5,23.5 1,-2 -4,-2 -1,2"
+       style="fill:none;stroke:#603b31;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4c4c3d;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       d="m 20.5,23.5 -4,-2 -6.5,13 0.5,4 3.5,-2 6.5,-13 z"
+       id="path5764"
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4c4c3d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 15.5,23.5 4,2"
+       id="path5774"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="16_event-draw"
+     inkscape:label="#event-draw"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-draw.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5738"
+       y="0"
+       x="0"
+       height="16"
+       width="16" />
+    <path
+       style="fill:none;stroke:url(#linearGradient7325);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4,1.5 c 4.5,2.5 2,5 0.5,7 -1.5,2 -2,5 3.5,6"
+       id="path6459-7"
+       sodipodi:nodetypes="csc"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g5603">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#SG_EVENT_CIRCLE_SMALL);fill-opacity:1.0;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6497-1"
+         sodipodi:cx="7.5"
+         sodipodi:cy="7.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5"
+         d="m 12.5,7.5 a 5,5 0 1 1 -10,0 5,5 0 1 1 10,0 z" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient5600);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6521-0"
+         width="2"
+         height="4"
+         x="6.5"
+         y="4.5" />
+      <rect
+         y="8.5"
+         x="6.5"
+         height="2"
+         width="2"
+         id="rect6578-0"
+         style="color:#000000;fill:url(#radialGradient5597);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       sodipodi:nodetypes="cccccc"
+       id="path5754-7"
+       d="M 10.333327,13.333342 14,5.9999977 11.333326,4.6666621 7.6666586,12.000006 l 0.9999995,1.333336 1.6666689,0 z"
+       style="fill:url(#radialGradient7318);fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#6f6f58;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 9,12.499998 3.5,-7"
+       id="path5752-5"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient7314);fill-opacity:1;stroke:none"
+       d="m 10.5,13.499998 -3,-1.5 0.4999998,2.5 2.5000002,-1 z"
+       id="path5766-1"
+       sodipodi:nodetypes="cccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       id="path5770-5"
+       d="m 15,4.4999977 -3,-1.5 -1,2.0000005 3,1.5 1,-2.0000005 z"
+       style="fill:url(#radialGradient7311);fill-opacity:1;stroke:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:url(#radialGradient7308);fill-opacity:1;stroke:none"
+       d="m 15.5,3.4999982 -3,-1.5 -0.75,1.4999993 3,1.5000007 0.75,-1.5 z"
+       id="path5778-0"
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="cccc"
+       id="path5903"
+       d="m 14.5,5.499998 1,-1.9999998 -3,-1.5 -1,1.9999998"
+       style="fill:none;stroke:#603b31;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4c4c3d;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:1.79999995;stroke-opacity:1;stroke-dasharray:none"
+       d="m 10.5,13.499998 4.25,-8.4999998 -3,-1.5 -4.25,8.4999998 0.4999998,2.5 2.5000002,-1 z"
+       id="path5764-7"
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#4c4c3d;stroke-width:0.89999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 11,4.9999982 3,1.5"
+       id="path5774-4"
+       sodipodi:nodetypes="cc"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="22_event-create-box"
+     inkscape:label="#event-create-box"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-create-box.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="22"
+       height="22"
+       x="24"
+       y="18"
+       id="rect6290"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g5627">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient7232);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6497-6"
+         sodipodi:cx="391"
+         sodipodi:cy="25"
+         sodipodi:rx="6"
+         sodipodi:ry="6"
+         d="m 397,25 a 6,6 0 1 1 -12,0 6,6 0 1 1 12,0 z"
+         transform="translate(-357.5,5.5)" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient5624);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6521-7"
+         width="2"
+         height="6"
+         x="32.5"
+         y="26.5" />
+      <rect
+         y="32.5"
+         x="32.5"
+         height="2"
+         width="2"
+         id="rect6578-8"
+         style="color:#000000;fill:url(#radialGradient5621);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <rect
+       style="opacity:0.8;color:#000000;fill:none;stroke:#c02400;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4161"
+       width="16"
+       height="16"
+       x="25.5"
+       y="22.5" />
+    <g
+       id="g5645">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient7238);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5617"
+         sodipodi:cx="15.5"
+         sodipodi:cy="24.5"
+         sodipodi:rx="6.5"
+         sodipodi:ry="6.5"
+         d="m 22,24.5 a 6.5,6.5 0 1 1 -13,0 6.5,6.5 0 1 1 13,0 z"
+         transform="translate(24,0)" />
+      <path
+         style="fill:none;stroke:url(#radialGradient5642);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 39.5,18.5 0,12"
+         id="path4172"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4176"
+         d="m 45.5,24.5 -12,0"
+         style="fill:none;stroke:url(#radialGradient5639);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path12005"
+         d="m 43.74264,20.257359 -8.48528,8.485282"
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient5636);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient5633);stroke-width:1px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 43.74264,28.742641 35.25736,20.257359"
+         id="path12007"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+  <g
+     id="16_event-create-box"
+     inkscape:label="#event-create-box"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-create-box.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect12027"
+       y="0"
+       x="24"
+       height="16"
+       width="16" />
+    <g
+       id="g7165">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#SG_EVENT_CIRCLE_SMALL);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path6426"
+         sodipodi:cx="31.5"
+         sodipodi:cy="8.5"
+         sodipodi:rx="5"
+         sodipodi:ry="5"
+         d="m 36.5,8.5 a 5,5 0 1 1 -10,0 5,5 0 1 1 10,0 z" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient7162);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect6521-0-2"
+         width="2"
+         height="4"
+         x="30.5"
+         y="5.5" />
+      <rect
+         y="9.5"
+         x="30.5"
+         height="2"
+         width="2"
+         id="rect6578-0-2"
+         style="color:#000000;fill:url(#radialGradient7159);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <rect
+       style="opacity:0.8;color:#000000;fill:none;stroke:#c02400;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4161-3"
+       width="14"
+       height="14"
+       x="24.5"
+       y="1.5" />
+    <g
+       id="g7193">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:url(#radialGradient7170);fill-opacity:1;stroke:none;stroke-width:0.69999999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5617-5"
+         sodipodi:cx="15.5"
+         sodipodi:cy="24.5"
+         sodipodi:rx="4.500001"
+         sodipodi:ry="4.5"
+         d="m 20.000001,24.5 a 4.500001,4.5 0 1 1 -9.000002,0 4.500001,4.5 0 1 1 9.000002,0 z"
+         transform="translate(19.99999,-19.999998)" />
+      <path
+         style="fill:none;stroke:url(#radialGradient7190);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 35.49999,0.500002 0,8"
+         id="path4172-3"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path4176-4"
+         d="m 39.49999,4.500002 -8,0"
+         style="fill:none;stroke:url(#radialGradient7187);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path12298"
+         d="M 38.32842,1.671575 32.67156,7.328429"
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient7184);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         style="opacity:0.8;fill:none;stroke:url(#radialGradient7181);stroke-width:0.89999998;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 38.32842,7.328429 32.67156,1.671575"
+         id="path12300"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+  </g>
+  <g
+     id="22_event-create-quick"
+     inkscape:label="#event-create-quick"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Plugins/VspUiExtensions/EventCreationTools/Icons/22x22/event-create-quick.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3118"
+       y="18"
+       x="48"
+       height="22"
+       width="22" />
+    <g
+       id="g3263">
+      <path
+         transform="translate(-334.5,6.5)"
+         d="m 397,25 a 6,6 0 1 1 -12,0 6,6 0 1 1 12,0 z"
+         sodipodi:ry="6"
+         sodipodi:rx="6"
+         sodipodi:cy="25"
+         sodipodi:cx="391"
+         id="path3122"
+         style="color:#000000;fill:url(#radialGradient3250);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="27.5"
+         x="55.5"
+         height="6"
+         width="2"
+         id="rect3124"
+         style="color:#000000;fill:url(#radialGradient3260);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient3257);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3126"
+         width="2"
+         height="2"
+         x="55.5"
+         y="33.5" />
+    </g>
+    <path
+       style="fill:url(#linearGradient4158);fill-opacity:1;stroke:#5f5428;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 59.5,39 3.5,-10 -3.5,-1 2,-8.5 5,0 -2.5,6.5 4,1 z"
+       id="path4130"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+  <g
+     id="16_event-create-quick"
+     inkscape:label="#event-create-quick"
+     inkscape:export-filename="/usr/local/src/matthew/work/visgui/Plugins/VspUiExtensions/EventCreationTools/Icons/16x16/event-create-quick.png"
+     inkscape:export-xdpi="90"
+     inkscape:export-ydpi="90">
+    <rect
+       width="16"
+       height="16"
+       x="48"
+       y="0"
+       id="rect3144"
+       style="color:#000000;fill:none;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g4235">
+      <path
+         d="m 59.5,9.5 a 5,5 0 1 1 -10,0 5,5 0 1 1 10,0 z"
+         sodipodi:ry="5"
+         sodipodi:rx="5"
+         sodipodi:cy="9.5"
+         sodipodi:cx="54.5"
+         id="path3148"
+         style="color:#000000;fill:url(#SG_EVENT_CIRCLE_SMALL);fill-opacity:1;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <rect
+         y="6.5"
+         x="53.5"
+         height="4"
+         width="2"
+         id="rect3150"
+         style="color:#000000;fill:url(#radialGradient4232);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         style="color:#000000;fill:url(#radialGradient4229);fill-opacity:1;fill-rule:nonzero;stroke:#5f5428;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3152"
+         width="2"
+         height="2"
+         x="53.5"
+         y="10.5" />
+    </g>
+    <path
+       style="fill:url(#linearGradient4201);fill-opacity:1;stroke:#5f5428;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 56.5,15.5 59,8 56.5,7 58,0.5 l 4,0 -2,5 3,1 z"
+       id="path4130-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+  </g>
+</svg>
diff --git a/Plugins/VspUiExtensions/EventCreationTools/icons.qrc b/Plugins/VspUiExtensions/EventCreationTools/icons.qrc
new file mode 100644
index 00000000..bde01f5e
--- /dev/null
+++ b/Plugins/VspUiExtensions/EventCreationTools/icons.qrc
@@ -0,0 +1,12 @@
+<RCC>
+  <qresource prefix="icons/16x16">
+    <file alias="event-create-box">Icons/16x16/event-create-box.png</file>
+    <file alias="event-create-quick">Icons/16x16/event-create-quick.png</file>
+    <file alias="event-draw">Icons/16x16/event-draw.png</file>
+  </qresource>
+  <qresource prefix="icons/22x22">
+    <file alias="event-create-box">Icons/22x22/event-create-box.png</file>
+    <file alias="event-create-quick">Icons/22x22/event-create-quick.png</file>
+    <file alias="event-draw">Icons/22x22/event-draw.png</file>
+  </qresource>
+</RCC>
diff --git a/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsInterface.cxx b/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsInterface.cxx
new file mode 100644
index 00000000..0e88e1a1
--- /dev/null
+++ b/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsInterface.cxx
@@ -0,0 +1,586 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventCreationToolsInterface.h"
+
+#include <QComboBox>
+#include <QMenu>
+#include <QSignalMapper>
+#include <QToolBar>
+#include <QToolButton>
+
+#include <vtkRenderWindow.h>
+
+#include <QVTKWidget.h>
+
+#include <qtPrioritizedMenuProxy.h>
+#include <qtPrioritizedToolBarProxy.h>
+#include <qtScopedValueChange.h>
+#include <qtUtil.h>
+
+#include <vtkVgRegionWidget.h>
+
+#include <vsCore.h>
+#include <vsMainWindow.h>
+#include <vsScene.h>
+
+QTE_IMPLEMENT_D_FUNC(vsEventCreationToolsInterface)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+QAction* createAction(QWidget* parent, const char* text, const char* icon = 0)
+{
+  QAction* action = new QAction(parent);
+  action->setText(text);
+
+  if (icon)
+    {
+    action->setIcon(qtUtil::standardActionIcon(icon));
+    }
+
+  return action;
+}
+
+} // namespace <anonymous>
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsEventCreationToolsInterfacePrivate
+
+//-----------------------------------------------------------------------------
+class vsEventCreationToolsInterfacePrivate
+{
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vsEventCreationToolsInterface)
+
+private:
+  QTE_DECLARE_PUBLIC(vsEventCreationToolsInterface)
+
+public:
+  explicit vsEventCreationToolsInterfacePrivate(
+    vsEventCreationToolsInterface* q,
+    vsMainWindow* window, vsScene* scene, vsCore* core);
+
+  // Helper methods
+  void cancelInteraction();
+
+  void pauseVideoPlayback();
+  void resumeVideoPlayback();
+
+  void beginCreation(QAction* action, bool pause);
+  void endCreation(QAction* action);
+
+  vtkVgRegionWidget* createRegionWidget();
+
+  QPolygonF viewToStab(QPolygonF) const;
+
+  // Member variables
+  vsCore* const Core;
+  vsScene* const Scene;
+  vsMainWindow* const Window;
+
+  QToolButton* EventToolButton;
+  QComboBox* EventTypeDropdown;
+  QAction* ActionDraw;
+  QAction* ActionBox;
+  QAction* ActionQuick;
+  QAction* ActionFullFrame;
+
+  QMenu* CreateEventMenu;
+  QActionGroup* TypeGroup;
+  QSignalMapper* TypeMapper;
+  QList<QAction*> EventTypeActions;
+
+  QScopedPointer<vtkVgRegionWidget> RegionWidget;
+  QSize LastBoxSize;
+
+  bool SuppressCancelInteraction;
+  bool IgnoreDrawingCanceled;
+  bool VideoPausedByUs;
+  bool IgnorePlaybackStatusChanged;
+};
+
+//-----------------------------------------------------------------------------
+vsEventCreationToolsInterfacePrivate::vsEventCreationToolsInterfacePrivate(
+  vsEventCreationToolsInterface* q, vsMainWindow* window,
+  vsScene* scene, vsCore* core) :
+  q_ptr(q),
+  Core(core),
+  Scene(scene),
+  Window(window),
+  LastBoxSize(30, 30),
+  SuppressCancelInteraction(false),
+  IgnoreDrawingCanceled(false),
+  IgnorePlaybackStatusChanged(false)
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterfacePrivate::cancelInteraction()
+{
+  if (!this->SuppressCancelInteraction)
+    {
+    this->Scene->cancelInteraction();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterfacePrivate::pauseVideoPlayback()
+{
+  // Pause video, if not already paused
+  this->VideoPausedByUs = false;
+  const vgVideoPlayer::PlaybackMode ps = this->Scene->videoPlaybackStatus();
+  if (ps == vgVideoPlayer::Playing ||
+      ps == vgVideoPlayer::Buffering ||
+      ps == vgVideoPlayer::Live)
+    {
+    this->IgnorePlaybackStatusChanged = true;
+    this->Window->setVideoPlaybackPaused();
+    this->VideoPausedByUs = true;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterfacePrivate::resumeVideoPlayback()
+{
+  if (this->VideoPausedByUs)
+    {
+    this->Window->setVideoPlaybackResumed();
+    this->VideoPausedByUs = false;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterfacePrivate::beginCreation(
+  QAction* action, bool pause)
+{
+  qtScopedValueChange<bool> ic(this->IgnoreDrawingCanceled, true);
+  this->cancelInteraction();
+
+  if (pause)
+    {
+    this->pauseVideoPlayback();
+    }
+
+  this->Window->pushViewCursor(Qt::CrossCursor, action);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterfacePrivate::endCreation(QAction* action)
+{
+  this->cancelInteraction();
+  this->Window->popViewCursor(action);
+  this->resumeVideoPlayback(); // no-op if we didn't pause
+  this->Scene->postUpdate();
+}
+
+//-----------------------------------------------------------------------------
+vtkVgRegionWidget* vsEventCreationToolsInterfacePrivate::createRegionWidget()
+{
+  QTE_Q(vsEventCreationToolsInterface);
+
+  vtkRenderWindowInteractor* const interactor =
+    this->Window->view()->GetRenderWindow()->GetInteractor();
+  vtkVgRegionWidget* rw = new vtkVgRegionWidget(interactor, q);
+
+  q->connect(rw, SIGNAL(completed()), q, SLOT(createEventFromRegion()));
+  q->connect(rw, SIGNAL(canceled()), q, SLOT(endEventCreation()));
+  q->connect(rw, SIGNAL(beginningManipulation()), q, SLOT(popBoxCursor()));
+  q->connect(rw, SIGNAL(statusMessageAvailable(QString)),
+             this->Window, SLOT(setStatusText(QString)));
+
+  rw->setStyle(Qt::red, 1.0);
+
+  this->RegionWidget.reset(rw);
+  return rw;
+}
+
+//-----------------------------------------------------------------------------
+QPolygonF vsEventCreationToolsInterfacePrivate::viewToStab(QPolygonF r) const
+{
+  const QMatrix4x4 xf = this->Scene->currentTransform().inverted();
+  for (int i = 0; i < r.count(); ++i)
+    {
+    r[i] = xf * r[i];
+    }
+  return r;
+}
+
+//END vsEventCreationToolsInterfacePrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vsEventCreationToolsInterface
+
+//-----------------------------------------------------------------------------
+vsEventCreationToolsInterface::vsEventCreationToolsInterface(
+  vsMainWindow* window, vsScene* scene, vsCore* core) :
+  QObject(window),
+  d_ptr(new vsEventCreationToolsInterfacePrivate(this, window, scene, core))
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  // Create tool actions
+  d->ActionDraw = createAction(window, "&Draw Event", "event-draw");
+  d->ActionDraw->setCheckable(true);
+  connect(d->ActionDraw, SIGNAL(toggled(bool)),
+          this, SLOT(toggleEventDrawing(bool)));
+  d->ActionBox = createAction(window, "Create &Boxed Event",
+                              "event-create-box");
+  d->ActionBox->setCheckable(true);
+  connect(d->ActionBox, SIGNAL(toggled(bool)),
+          this, SLOT(toggleEventBoxing(bool)));
+  d->ActionQuick = createAction(window, "&Create Event (&Quick)",
+                                "event-create-quick");
+  d->ActionQuick->setCheckable(true);
+  connect(d->ActionQuick, SIGNAL(toggled(bool)),
+          this, SLOT(toggleEventQuickCreation(bool)));
+  d->ActionFullFrame = createAction(window, "Create &Full Frame Event");
+  connect(d->ActionFullFrame, SIGNAL(triggered()),
+          this, SLOT(createEventFullFrame()));
+
+  // Add tool actions to menu
+  d->CreateEventMenu = new QMenu("&Create Event", window);
+  d->CreateEventMenu->addAction(d->ActionDraw);
+  d->CreateEventMenu->addAction(d->ActionBox);
+  d->CreateEventMenu->addAction(d->ActionQuick);
+  d->CreateEventMenu->addAction(d->ActionFullFrame);
+  d->CreateEventMenu->addSeparator();
+  window->toolsMenu()->insertSeparator(300);
+  window->toolsMenu()->insertMenu(d->CreateEventMenu, 300);
+  window->toolsMenu()->insertSeparator(300);
+
+  // Create helper objects for event type actions
+  d->TypeGroup = new QActionGroup(d->CreateEventMenu);
+  d->TypeMapper = new QSignalMapper(d->CreateEventMenu);
+
+  // Create tools button
+  d->EventToolButton = new QToolButton(window);
+  QMenu* tools = new QMenu(d->EventToolButton);
+  tools->addAction(d->ActionDraw);
+  tools->addAction(d->ActionBox);
+  tools->addAction(d->ActionQuick);
+  tools->addAction(d->ActionFullFrame);
+  d->EventToolButton->setMenu(tools);
+  d->EventToolButton->setPopupMode(QToolButton::MenuButtonPopup);
+  this->setActiveTool(d->ActionDraw);
+  connect(tools, SIGNAL(triggered(QAction*)),
+          this, SLOT(setActiveTool(QAction*)));
+
+  // Add widgets to tool bar
+  qtPrioritizedToolBarProxy* const toolBar = window->toolsToolBar();
+  d->EventToolButton->setToolButtonStyle(toolBar->toolBar()->toolButtonStyle());
+  toolBar->insertSeparator(300);
+  d->EventTypeDropdown = new QComboBox(window);
+  toolBar->insertWidget(d->EventTypeDropdown, 300);
+  toolBar->insertWidget(d->EventToolButton, 300);
+  toolBar->insertSeparator(300);
+
+  connect(d->TypeMapper, SIGNAL(mapped(int)),
+          d->EventTypeDropdown, SLOT(setCurrentIndex(int)));
+  connect(d->EventTypeDropdown, SIGNAL(currentIndexChanged(int)),
+          this, SLOT(setCurrentEventType(int)));
+
+  connect(scene, SIGNAL(interactionCanceled()),
+          this, SLOT(endEventCreation()));
+  connect(scene, SIGNAL(playbackStatusChanged(vgVideoPlayer::PlaybackMode,
+                                              qreal)),
+          this, SLOT(cancelVideoPlaybackModeRestoration()));
+
+  connect(core, SIGNAL(manualEventTypesUpdated(QList<vsEventInfo>)),
+          this, SLOT(repopulateEventTypes(QList<vsEventInfo>)));
+  connect(core, SIGNAL(videoSourceStatusChanged(vsDataSource::Status)),
+          this, SLOT(setVideoSourceStatus(vsDataSource::Status)));
+  this->repopulateEventTypes(core->manualEventTypes());
+  this->setVideoSourceStatus(core->videoSourceStatus());
+}
+
+//-----------------------------------------------------------------------------
+vsEventCreationToolsInterface::~vsEventCreationToolsInterface()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::setVideoSourceStatus(
+  vsDataSource::Status status)
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  bool eventCreationAllowed;
+  switch (status)
+    {
+    case vsDataSource::StreamingActive:
+    case vsDataSource::StreamingIdle:
+    case vsDataSource::StreamingStopped:
+    case vsDataSource::ArchivedActive:
+    case vsDataSource::ArchivedSuspended:
+    case vsDataSource::ArchivedIdle:
+      eventCreationAllowed = true;
+      break;
+    default:
+      eventCreationAllowed = false;
+      break;
+    }
+
+  d->ActionDraw->setEnabled(eventCreationAllowed);
+  d->ActionBox->setEnabled(eventCreationAllowed);
+  d->ActionQuick->setEnabled(eventCreationAllowed);
+  d->ActionFullFrame->setEnabled(eventCreationAllowed);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::setActiveTool(QAction* tool)
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  QAction* const oldTool = d->EventToolButton->defaultAction();
+  if (oldTool)
+    {
+    // Remove shortcut from previous tool
+    oldTool->setShortcut(QKeySequence());
+    }
+
+  // Set shortcut on new tool
+  tool->setShortcut(QKeySequence("E"));
+  tool->setShortcutContext(Qt::WindowShortcut);
+
+  // Set new tool on button
+  d->EventToolButton->setDefaultAction(tool);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::setCurrentEventType(int index)
+{
+  QTE_D(vsEventCreationToolsInterface);
+  d->EventTypeActions[index]->setChecked(true);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::toggleEventDrawing(bool state)
+{
+  QTE_D(vsEventCreationToolsInterface);
+  if (state)
+    {
+    // Begin event drawing
+    qtScopedValueChange<bool> ic(d->IgnoreDrawingCanceled, true);
+    d->beginCreation(d->ActionDraw, true);
+    d->Scene->beginDrawing(vsContour::Annotation);
+    connect(d->Scene, SIGNAL(drawingEnded()), this, SLOT(endEventCreation()));
+
+    // When the contour is done, convert it to an event; use queued connection
+    // so that vsCore has a chance to process the contour first
+    connect(d->Scene, SIGNAL(contourCompleted(vsContour)),
+            this, SLOT(convertContour(vsContour)), Qt::QueuedConnection);
+    }
+  else
+    {
+    d->endCreation(d->ActionDraw);
+    disconnect(d->Scene, SIGNAL(contourCompleted(vsContour)), this, 0);
+    disconnect(d->Scene, SIGNAL(drawingEnded()), this, 0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::toggleEventBoxing(bool state)
+{
+  QTE_D(vsEventCreationToolsInterface);
+  if (state)
+    {
+    d->beginCreation(d->ActionBox, true);
+    d->createRegionWidget()->begin();
+    }
+  else
+    {
+    d->endCreation(d->ActionBox);
+    d->RegionWidget.reset();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::toggleEventQuickCreation(bool state)
+{
+  QTE_D(vsEventCreationToolsInterface);
+  if (state)
+    {
+    d->beginCreation(d->ActionBox, false);
+    vtkVgRegionWidget* rw =  d->createRegionWidget();
+    connect(rw, SIGNAL(dropDrawStarted()), this, SLOT(pauseVideoPlayback()));
+    connect(rw, SIGNAL(dropDrawCanceled()), this, SLOT(resumeVideoPlayback()));
+    rw->beginQuick(d->LastBoxSize);
+    }
+  else
+    {
+    d->endCreation(d->ActionBox);
+    d->RegionWidget.reset();
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::createEventFullFrame()
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  const int i = d->EventTypeDropdown->currentIndex();
+  if (i < 0)
+    {
+    // Should never happen...
+    qWarning() << "Failed to convert region to event;"
+               << " index of currently selected event type is not valid";
+    return;
+    }
+
+  const int eventType = d->EventTypeDropdown->itemData(i).toInt();
+  const vtkVgTimeStamp ts = d->Scene->currentVideoTime();
+  QPoint topLeft(0,0);
+  QPoint bottomRight(d->Scene->currentFrameMetaData().Width - 1.0,
+                     d->Scene->currentFrameMetaData().Height - 1.0);
+  const QPolygonF region = d->viewToStab(QRectF(topLeft, bottomRight));
+  d->Core->createManualEvent(eventType, region, ts);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::endEventCreation()
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  if (!d->IgnoreDrawingCanceled)
+    {
+    qtScopedValueChange<bool> sci(d->SuppressCancelInteraction, true);
+
+    d->ActionDraw->setChecked(false);
+    d->ActionBox->setChecked(false);
+    d->ActionQuick->setChecked(false);
+    d->ActionFullFrame->setChecked(false);
+
+    d->Window->setStatusText(QString());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::pauseVideoPlayback()
+{
+  QTE_D(vsEventCreationToolsInterface);
+  d->pauseVideoPlayback();
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::resumeVideoPlayback()
+{
+  QTE_D(vsEventCreationToolsInterface);
+  d->resumeVideoPlayback();
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::cancelVideoPlaybackModeRestoration()
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  if (d->IgnorePlaybackStatusChanged)
+    {
+    d->IgnorePlaybackStatusChanged = false;
+    return;
+    }
+
+  d->VideoPausedByUs = false;
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::popBoxCursor()
+{
+  QTE_D(vsEventCreationToolsInterface);
+  d->Window->popViewCursor(d->ActionBox);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::convertContour(vsContour c)
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  const int i = d->EventTypeDropdown->currentIndex();
+  if (i < 0)
+    {
+    // Should never happen...
+    qWarning() << "Failed to convert region to event;"
+               << " index of currently selected event type is not valid";
+    return;
+    }
+
+  const int eventType = d->EventTypeDropdown->itemData(i).toInt();
+  const vtkVgTimeStamp ts = d->Scene->currentVideoTime();
+  d->Core->convertContourToEvent(c.id(), eventType, ts);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::createEventFromRegion()
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  const int i = d->EventTypeDropdown->currentIndex();
+  if (i < 0)
+    {
+    // Should never happen...
+    qWarning() << "Failed to convert region to event;"
+               << " index of currently selected event type is not valid";
+    return;
+    }
+
+  const int eventType = d->EventTypeDropdown->itemData(i).toInt();
+  const vtkVgTimeStamp ts = d->Scene->currentVideoTime();
+  QRect const box = d->RegionWidget->rect();
+  d->LastBoxSize = d->RegionWidget->displaySize();
+  QPolygonF const region = d->viewToStab(QRectF(box));
+  d->Core->createManualEvent(eventType, region, ts);
+
+  d->ActionBox->setChecked(false);
+  d->ActionQuick->setChecked(false);
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsInterface::repopulateEventTypes(
+  QList<vsEventInfo> eventTypes)
+{
+  QTE_D(vsEventCreationToolsInterface);
+
+  int currentIndex = d->EventTypeDropdown->currentIndex();
+  int currentType = 0;
+  if (currentIndex >= 0)
+    {
+    // Get type value of currently selected event type
+    currentType = d->EventTypeDropdown->itemData(currentIndex).toInt();
+    }
+
+  currentIndex = -1;
+  qDeleteAll(d->EventTypeActions);
+  d->EventTypeActions.clear();
+  d->EventTypeDropdown->clear();
+
+  foreach (const vsEventInfo& ei, eventTypes)
+    {
+    QAction* action = new QAction(ei.name, d->CreateEventMenu);
+    action->setCheckable(true);
+    d->CreateEventMenu->addAction(action);
+    d->TypeGroup->addAction(action);
+    d->TypeMapper->setMapping(action, d->EventTypeDropdown->count());
+    connect(action, SIGNAL(triggered(bool)), d->TypeMapper, SLOT(map()));
+    d->EventTypeActions.append(action);
+
+    d->EventTypeDropdown->addItem(ei.name, ei.type);
+    if (ei.type == currentType)
+      {
+      // If the type we just added is the previously selected type, remember
+      // its index so we can reselect it later
+      currentIndex = d->EventTypeDropdown->count() - 1;
+      }
+    }
+
+  // Reselect the previously selected type, or the first available type if
+  // there was no previous type or the previous type is no longer available
+  d->EventTypeDropdown->setCurrentIndex(qMax(currentIndex, 0));
+}
+
+//END vsEventCreationToolsInterface
diff --git a/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsInterface.h b/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsInterface.h
new file mode 100644
index 00000000..55b7f4af
--- /dev/null
+++ b/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsInterface.h
@@ -0,0 +1,68 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventCreationToolsInterface_h
+#define __vsEventCreationToolsInterface_h
+
+#include <QObject>
+#include <QSharedPointer>
+
+#include <qtGlobal.h>
+
+#include <vsContour.h>
+#include <vsDataSource.h>
+#include <vsEventInfo.h>
+
+class QAction;
+
+class vsCore;
+class vsMainWindow;
+class vsScene;
+class vsVideoSource;
+
+class vsEventCreationToolsInterfacePrivate;
+
+class vsEventCreationToolsInterface : public QObject
+{
+  Q_OBJECT
+
+public:
+  vsEventCreationToolsInterface(vsMainWindow*, vsScene*, vsCore*);
+  virtual ~vsEventCreationToolsInterface();
+
+protected slots:
+  void setVideoSourceStatus(vsDataSource::Status);
+
+  void toggleEventDrawing(bool);
+  void toggleEventBoxing(bool);
+  void toggleEventQuickCreation(bool);
+  void createEventFullFrame();
+
+  void endEventCreation();
+
+  void setActiveTool(QAction*);
+  void setCurrentEventType(int);
+
+  void pauseVideoPlayback();
+  void resumeVideoPlayback();
+
+  void cancelVideoPlaybackModeRestoration();
+  void popBoxCursor();
+
+  void convertContour(vsContour);
+  void createEventFromRegion();
+
+  void repopulateEventTypes(QList<vsEventInfo>);
+
+protected:
+  QTE_DECLARE_PRIVATE_SPTR(vsEventCreationToolsInterface)
+
+private:
+  QTE_DECLARE_PRIVATE(vsEventCreationToolsInterface)
+  Q_DISABLE_COPY(vsEventCreationToolsInterface)
+};
+
+#endif
diff --git a/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsPlugin.cxx b/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsPlugin.cxx
new file mode 100644
index 00000000..c53f4adb
--- /dev/null
+++ b/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsPlugin.cxx
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsEventCreationToolsPlugin.h"
+
+#include <QtPlugin>
+
+#include "vsEventCreationToolsInterface.h"
+
+Q_EXPORT_PLUGIN2(vsEventCreationToolsExtension, vsEventCreationToolsPlugin)
+
+//-----------------------------------------------------------------------------
+vsEventCreationToolsPlugin::vsEventCreationToolsPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsEventCreationToolsPlugin::~vsEventCreationToolsPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsEventCreationToolsPlugin::createInterface(
+  vsMainWindow* window, vsScene* scene)
+{
+  new vsEventCreationToolsInterface(window, scene, this->core());
+}
diff --git a/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsPlugin.h b/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsPlugin.h
new file mode 100644
index 00000000..6ae62708
--- /dev/null
+++ b/Plugins/VspUiExtensions/EventCreationTools/vsEventCreationToolsPlugin.h
@@ -0,0 +1,32 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsEventCreationToolsPlugin_h
+#define __vsEventCreationToolsPlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsUiExtensionInterface.h>
+
+class vsEventCreationToolsPlugin : public QObject,
+                                   public vsUiExtensionInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsUiExtensionInterface)
+
+public:
+  vsEventCreationToolsPlugin();
+  virtual ~vsEventCreationToolsPlugin();
+
+  virtual void createInterface(vsMainWindow*, vsScene*) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsEventCreationToolsPlugin)
+};
+
+#endif
diff --git a/Plugins/VspUiExtensions/ReportGenerator/CMakeLists.txt b/Plugins/VspUiExtensions/ReportGenerator/CMakeLists.txt
new file mode 100644
index 00000000..c6251a88
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/CMakeLists.txt
@@ -0,0 +1,40 @@
+project(vsReportGeneratorExtension)
+
+include_directories(SYSTEM
+  ${KML_INCLUDE_DIRS}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+vg_include_library_sdk_directories(vspUserInterface)
+
+set(vsReportGeneratorExtension_Sources
+  vsKmlWriter.cxx
+  vsReportGenerator.cxx
+  vsReportGeneratorInterface.cxx
+  vsReportGeneratorPlugin.cxx
+  vsVideoRequestor.cxx
+)
+
+set(vsReportGeneratorExtension_MocHeaders
+  vsReportGeneratorInterface.h
+  vsReportGeneratorPlugin.h
+)
+
+qt4_wrap_cpp(vsReportGeneratorExtension_MocSources
+             ${vsReportGeneratorExtension_MocHeaders})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsReportGeneratorExtension_Sources}
+  ${vsReportGeneratorExtension_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  vspUserInterface
+  ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsKmlWriter.cxx b/Plugins/VspUiExtensions/ReportGenerator/vsKmlWriter.cxx
new file mode 100644
index 00000000..c72c15d4
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsKmlWriter.cxx
@@ -0,0 +1,295 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsKmlWriter.h"
+
+#include <QDebug>
+#include <QFile>
+#include <QFileInfo>
+#include <QList>
+#include <QMessageBox>
+
+#include <vtkIdList.h>
+#include <vtkPoints.h>
+
+#include <vtkVgEvent.h>
+#include <vtkVgTrack.h>
+#include <vtkVgUtil.h>
+
+#include <vvKmlLine.h>
+#include <vvKmlWriter.h>
+
+#include <vsVideoSource.h>
+
+#include "vsEventUserInfo.h"
+#include "vsVideoRequestor.h"
+
+QTE_IMPLEMENT_D_FUNC(vsKmlWriter)
+
+//-----------------------------------------------------------------------------
+static void convertHomography(
+  vtkMatrix4x4* in, vtkMatrix4x4* out, int height)
+{
+  vtkVgInstance<vtkMatrix4x4> hi;
+  vtkVgInstance<vtkMatrix4x4> fy;
+  hi->DeepCopy(in);
+  hi->Invert();
+  fy->Identity();
+  fy->SetElement(1, 1, -1);
+  fy->SetElement(1, 3, height - 1);
+  vtkMatrix4x4::Multiply4x4(fy, hi, out);
+}
+
+//-----------------------------------------------------------------------------
+class vsKmlWriterPrivate
+{
+public:
+  vsKmlWriterPrivate(vsVideoSource* source) : VideoRequestor(source) {}
+
+  void addTrack(vtkIdType eventId, const vtkVgTimeStamp& startTime,
+                const vtkVgTimeStamp& endTime, vtkVgTrack* track,
+                const QString& note, vtkMatrix4x4* refToImage,
+                vtkMatrix4x4* imageToLatLon);
+
+
+  QString OutputPath;
+  QList<vsEventUserInfo> Events;
+  vtkVgEventTypeRegistry* Registry;
+
+  vsVideoRequestor VideoRequestor;
+  vtkVgVideoFrame Frame;
+
+  vvKmlWriter KmlWriter;
+
+  // Do we need to process based on input parameters set?
+  bool Process;
+};
+
+//-----------------------------------------------------------------------------
+void vsKmlWriterPrivate::addTrack(
+  vtkIdType eventId, const vtkVgTimeStamp& startTime,
+  const vtkVgTimeStamp& endTime, vtkVgTrack* track,
+  const QString& note, vtkMatrix4x4* refToImage,
+  vtkMatrix4x4* imageToLatLon)
+{
+  if (!track)
+    {
+    qDebug() << "Invalid track. Unable to add track to KML.";
+    return;
+    }
+  if (!refToImage)
+    {
+    qDebug() << "Invalid ref to image matrix. Unable to add track to KML.";
+    return;
+    }
+  if (!imageToLatLon)
+    {
+    qDebug() << "Invalid image to latlon matrix. Unable to add track to KML";
+    return;
+    }
+
+  vtkPoints* points = track->GetPoints();
+
+  if (!points)
+    {
+    qDebug() << "Invalid track data. Unable to add track to KML";
+    return;
+    }
+
+  double trackColor[3];
+  track->GetColor(trackColor);
+
+  vvKmlLine* line = this->KmlWriter.createLine();
+  line->setId(QString("Event_%1").arg(eventId));
+  line->setDescription(note);
+  line->setColor(trackColor[0], trackColor[1], trackColor[2], 1.0);
+
+  vtkSmartPointer<vtkMatrix4x4> refToLatLon
+    = vtkSmartPointer<vtkMatrix4x4>::New();
+
+  vtkMatrix4x4::Multiply4x4(imageToLatLon, refToImage, refToLatLon);
+
+  vtkVgTimeStamp timeStamp;
+  track->InitPathTraversal();
+  vtkIdType id;
+  double lat, lon;
+
+  while ((id = track->GetNextPathPt(timeStamp)) != -1)
+    {
+    if (startTime.IsValid() && startTime > timeStamp)
+      {
+      continue;
+      }
+    if (endTime.IsValid() && timeStamp > endTime)
+      {
+      break;
+      }
+
+    double point[3];
+    points->GetPoint(id, point);
+    vtkVgApplyHomography(point, refToLatLon, lon, lat);
+
+    // Ignoring altitude for now
+    line->addPoint(lat, lon, 0.0);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsKmlWriter::vsKmlWriter() : d_ptr(new vsKmlWriterPrivate(0))
+{
+  QTE_D(vsKmlWriter);
+  d->Process = false;
+}
+
+//-----------------------------------------------------------------------------
+vsKmlWriter::vsKmlWriter(QList<vsEventUserInfo> events,
+                         vtkVgEventTypeRegistry* registry,
+                         vsVideoSource* videoSource)
+  : d_ptr(new vsKmlWriterPrivate(videoSource))
+{
+  Q_ASSERT(videoSource);
+
+  QTE_D(vsKmlWriter);
+  d->Events = events;
+  d->Registry = registry;
+  d->Process = true;
+}
+
+//-----------------------------------------------------------------------------
+vsKmlWriter::~vsKmlWriter()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsKmlWriter::setOutputPath(const QString& path)
+{
+  QTE_D(vsKmlWriter);
+
+  d->OutputPath = path;
+}
+
+//-----------------------------------------------------------------------------
+void vsKmlWriter::addTrack(
+  vtkIdType eventId, const vtkVgTimeStamp& startTime,
+  const vtkVgTimeStamp& endTime, vtkVgTrack* track, const QString& note,
+  vtkMatrix4x4* refToImage, vtkMatrix4x4* imageToLatLon)
+{
+  QTE_D(vsKmlWriter);
+
+  d->addTrack(eventId, startTime, endTime, track, note, refToImage,
+              imageToLatLon);
+}
+
+//-----------------------------------------------------------------------------
+static bool eventEarlierThan(const vsEventUserInfo& a,
+                             const vsEventUserInfo& b)
+{
+  return a.Event->GetStartFrame() < b.Event->GetStartFrame();
+}
+
+//-----------------------------------------------------------------------------
+void vsKmlWriter::process()
+{
+  QTE_D(vsKmlWriter);
+
+  // Sort by event start time
+  qSort(d->Events.begin(), d->Events.end(), eventEarlierThan);
+
+  vtkVgInstance<vtkMatrix4x4> refToImage;
+
+  foreach (vsEventUserInfo info, d->Events)
+    {
+    if (!info.Event->IsStarred())
+      {
+      continue;
+      }
+
+    vtkVgTimeStamp start = info.Event->GetStartFrame();
+    vtkVgTimeStamp end = info.Event->GetEndFrame();
+
+    // Compute timestamp halfway through the event
+    vtkVgTimeStamp mid(0.5 * (start.GetTime() + end.GetTime()));
+    if (start.HasFrameNumber() && end.HasFrameNumber())
+      {
+      const unsigned int frame =
+        (start.GetFrameNumber() + end.GetFrameNumber()) / 2;
+      mid.SetFrameNumber(frame);
+      }
+
+    // Set timestamp to the next closest frame with a valid region
+    vtkIdType npts;
+    vtkIdType* ids;
+    vtkVgTimeStamp prev = mid;
+    if (!info.Event->GetRegionAtOrAfter(mid, npts, ids) && prev == mid)
+      {
+      qDebug() << "Failed to get event midpoint region.";
+      continue;
+      }
+
+    if (!d->VideoRequestor.requestFrame(d->Frame, mid, vg::SeekNearest))
+      {
+      qDebug() << "Frame request failed: KML frame discarded.";
+      continue;
+      }
+
+    vtkImageData* image = d->Frame.Image.GetVolatilePointer();
+    convertHomography(d->Frame.MetaData.Homography, refToImage,
+                      image->GetDimensions()[1]);
+
+    vtkSmartPointer<vtkMatrix4x4> imageToLatLon;
+    if (d->Frame.MetaData.WorldLocation.GCS != -1)
+      {
+      imageToLatLon = d->Frame.MetaData.MakeImageToLatLonMatrix();
+      }
+
+    if (info.Event->GetNumberOfTracks() > 0)
+      {
+      vtkVgTrack* track;
+      vtkVgTimeStamp startTime;
+      vtkVgTimeStamp endTime;
+      info.Event->GetTrack(0, track, startTime, endTime);
+      const QString note = QString::fromLocal8Bit(info.Event->GetNote());
+      d->addTrack(info.Event->GetId(), startTime, endTime,
+                  info.Event->GetTrack(0), note, refToImage, imageToLatLon);
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsKmlWriter::write()
+{
+  QTE_D(vsKmlWriter);
+
+  Q_ASSERT(!d->OutputPath.isEmpty());
+
+  QString filePath;
+  QFileInfo fileInfo(d->OutputPath);
+  if (fileInfo.isDir())
+    {
+    filePath = QString(fileInfo.canonicalFilePath() + '/' + "vsplay.kml");
+    }
+  else
+    {
+    filePath = fileInfo.absoluteFilePath();
+    }
+
+  QFile file(filePath);
+  if (!file.open(QIODevice::WriteOnly |
+                 QIODevice::Text |
+                 QIODevice::Truncate))
+    {
+    qDebug() << file.errorString();
+    QMessageBox::warning(0, QString(), "Unable to write KML file.");
+    return;
+    }
+
+  if (d->Process)
+    {
+    this->process();
+    }
+
+  d->KmlWriter.write(file);
+}
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsKmlWriter.h b/Plugins/VspUiExtensions/ReportGenerator/vsKmlWriter.h
new file mode 100644
index 00000000..15f99b36
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsKmlWriter.h
@@ -0,0 +1,54 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsKmlWriter_h
+#define __vsKmlWriter_h
+
+#include <QSharedPointer>
+
+#include <qtGlobal.h>
+
+#include <vgVtkVideoFrame.h>
+
+template <typename T> class QList;
+
+class vsEventUserInfo;
+class vsVideoSource;
+
+class vsKmlWriterPrivate;
+
+class vtkVgEventTypeRegistry;
+class vtkVgTrack;
+
+class vsKmlWriter
+{
+public:
+  vsKmlWriter();
+  vsKmlWriter(QList<vsEventUserInfo> events,
+              vtkVgEventTypeRegistry* registry,
+              vsVideoSource* videoSource);
+  virtual ~vsKmlWriter();
+
+  void setOutputPath(const QString& path);
+
+  void addTrack(vtkIdType eventId, const vtkVgTimeStamp& startTime,
+                const vtkVgTimeStamp& endTime, vtkVgTrack* track,
+                const QString& note, vtkMatrix4x4* refToImage,
+                vtkMatrix4x4* imageToLatLon);
+
+  void write();
+
+protected:
+  void process();
+
+  QTE_DECLARE_PRIVATE_SPTR(vsKmlWriter)
+
+private:
+  QTE_DECLARE_PRIVATE(vsKmlWriter)
+  Q_DISABLE_COPY(vsKmlWriter)
+};
+
+#endif
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsReportGenerator.cxx b/Plugins/VspUiExtensions/ReportGenerator/vsReportGenerator.cxx
new file mode 100644
index 00000000..5a84634a
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsReportGenerator.cxx
@@ -0,0 +1,261 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsReportGenerator.h"
+
+#include <QDebug>
+#include <QFile>
+#include <QList>
+#include <QMessageBox>
+#include <QProgressDialog>
+
+#include <vtkVgEvent.h>
+
+#include <vvReportWriter.h>
+
+#include <vsVideoSource.h>
+
+#include "vsEventUserInfo.h"
+#include "vsKmlWriter.h"
+#include "vsVideoRequestor.h"
+
+QTE_IMPLEMENT_D_FUNC(vsReportGenerator)
+
+//-----------------------------------------------------------------------------
+static void convertHomography(
+  vtkMatrix4x4* in, vtkMatrix4x4* out, int height)
+{
+  vtkVgInstance<vtkMatrix4x4> hi;
+  vtkVgInstance<vtkMatrix4x4> fy;
+  hi->DeepCopy(in);
+  hi->Invert();
+  fy->Identity();
+  fy->SetElement(1, 1, -1);
+  fy->SetElement(1, 3, height - 1);
+  vtkMatrix4x4::Multiply4x4(fy, hi, out);
+}
+
+//-----------------------------------------------------------------------------
+class vsReportGeneratorPrivate
+{
+public:
+  vsReportGeneratorPrivate(vsVideoSource* source)
+    : VideoRequestor(source) {}
+
+  QString OutputPath;
+  QList<vsEventUserInfo> Events;
+  vtkVgEventTypeRegistry* Registry;
+
+  vsVideoRequestor VideoRequestor;
+  vtkVgVideoFrame Frame;
+};
+
+//-----------------------------------------------------------------------------
+vsReportGenerator::vsReportGenerator(QList<vsEventUserInfo> events,
+                                     vtkVgEventTypeRegistry* registry,
+                                     vsVideoSource* videoSource)
+  : d_ptr(new vsReportGeneratorPrivate(videoSource))
+{
+  Q_ASSERT(videoSource);
+
+  QTE_D(vsReportGenerator);
+  d->Events = events;
+  d->Registry = registry;
+}
+
+//-----------------------------------------------------------------------------
+vsReportGenerator::~vsReportGenerator()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsReportGenerator::setOutputPath(const QString& path)
+{
+  QTE_D(vsReportGenerator);
+
+  d->OutputPath = path;
+}
+
+//-----------------------------------------------------------------------------
+static bool eventEarlierThan(const vsEventUserInfo& a,
+                             const vsEventUserInfo& b)
+{
+  return a.Event->GetStartFrame() < b.Event->GetStartFrame();
+}
+
+//-----------------------------------------------------------------------------
+void vsReportGenerator::generateReport(bool generateVideo)
+{
+  QTE_D(vsReportGenerator);
+
+  Q_ASSERT(!d->OutputPath.isEmpty());
+
+  QFile file(d->OutputPath + '/' + "report.xml");
+  if (!file.open(QIODevice::WriteOnly |
+                 QIODevice::Text |
+                 QIODevice::Truncate))
+    {
+    qDebug() << file.errorString();
+    QMessageBox::warning(0, QString(), "Unable to write report file.");
+    return;
+    }
+
+  vvReportWriter writer(file);
+
+  vsKmlWriter kmlWriter;
+  kmlWriter.setOutputPath(d->OutputPath);
+
+  // Sort by event start time
+  qSort(d->Events.begin(), d->Events.end(), eventEarlierThan);
+
+  // Count the total number of work items
+  int total = 0;
+  foreach (vsEventUserInfo info, d->Events)
+    {
+    if (info.Event->IsStarred())
+      {
+      if (!generateVideo)
+        {
+        ++total;
+        }
+      else if (info.Event->GetStartFrame().HasFrameNumber() &&
+               info.Event->GetEndFrame().HasFrameNumber())
+        {
+        total += info.Event->GetEndFrame().GetFrameNumber() -
+                 info.Event->GetStartFrame().GetFrameNumber() + 1;
+        }
+      else
+        {
+        total += 100;
+        }
+      }
+    }
+
+  // Pop up progress bar
+  QProgressDialog progress("Generating report...", "Cancel", 0, total);
+  progress.setWindowModality(Qt::ApplicationModal);
+  progress.setMinimumDuration(0);
+  progress.setAutoClose(false);
+  progress.setAutoReset(false);
+  progress.setValue(0);
+
+  vtkVgInstance<vtkMatrix4x4> transform;
+
+  int count = 0;
+  int currId = 1;
+  foreach (vsEventUserInfo info, d->Events)
+    {
+    if (!info.Event->IsStarred())
+      {
+      continue;
+      }
+
+    const QString note = QString::fromLocal8Bit(info.Event->GetNote());
+    writer.setEvent(info.Event, currId++, note, d->Registry);
+
+    vtkVgTimeStamp start = info.Event->GetStartFrame();
+    vtkVgTimeStamp end = info.Event->GetEndFrame();
+
+    // Compute timestamp halfway through the event
+    vtkVgTimeStamp mid(0.5 * (start.GetTime() + end.GetTime()));
+    if (start.HasFrameNumber() && end.HasFrameNumber())
+      {
+      const unsigned int frame =
+        (start.GetFrameNumber() + end.GetFrameNumber()) / 2;
+      mid.SetFrameNumber(frame);
+      }
+
+    // Set timestamp to the next closest frame with a valid region
+    vtkIdType npts;
+    vtkIdType* ids;
+    if (!info.Event->GetClosestDisplayRegion(mid, npts, ids) && npts == 0)
+      {
+      qDebug() << "Failed to get event midpoint region.";
+      continue;
+      }
+
+    if (!d->VideoRequestor.requestFrame(d->Frame, mid, vg::SeekNearest))
+      {
+      qDebug() << "Frame request failed: report frame discarded.";
+      continue;
+      }
+
+    vtkImageData* image = d->Frame.Image.GetVolatilePointer();
+    convertHomography(d->Frame.MetaData.Homography, transform,
+                      image->GetDimensions()[1]);
+
+    vtkSmartPointer<vtkMatrix4x4> imageToLatLon;
+    if (d->Frame.MetaData.WorldLocation.GCS != -1)
+      {
+      imageToLatLon = d->Frame.MetaData.MakeImageToLatLonMatrix();
+      }
+
+    if (info.Event->GetNumberOfTracks() > 0)
+      {
+      vtkVgTrack* track;
+      vtkVgTimeStamp trackStart;
+      vtkVgTimeStamp trackEnd;
+      info.Event->GetTrack(0, track, trackStart, trackEnd);
+      const QString note = QString::fromLocal8Bit(info.Event->GetNote());
+      kmlWriter.addTrack(info.Event->GetId(), trackStart, trackEnd, track,
+                         note, transform, imageToLatLon);
+      writer.setTrack(track, transform, trackStart, trackEnd);
+      }
+    else
+      {
+      writer.setTrack(0);
+      }
+
+    writer.setImageData(image, d->Frame.MetaData.Time, transform,
+                        imageToLatLon);
+    writer.writeEventSummary();
+
+    // Done with this event if we're not writing video images
+    if (!generateVideo)
+      {
+      progress.setValue(++count);
+      continue;
+      }
+
+    int framenum = 0;
+    vtkVgTimeStamp seekTime = start;
+    vg::SeekMode seekDirection = vg::SeekNearest;
+
+    do
+      {
+      if (!d->VideoRequestor.requestFrame(d->Frame, seekTime, seekDirection))
+        {
+        // If request fails, we must have stepped outside the bounds of the
+        // video?
+        break;
+        }
+
+      vtkImageData* image = d->Frame.Image.GetVolatilePointer();
+      convertHomography(d->Frame.MetaData.Homography, transform,
+                        image->GetDimensions()[1]);
+
+      writer.setImageData(image, d->Frame.MetaData.Time, transform);
+      writer.writeEventVideoImage(++framenum);
+
+      // Set up the seek to give the next frame
+      seekTime = d->Frame.MetaData.Time;
+      seekDirection = vg::SeekNext;
+
+      if (progress.wasCanceled())
+        {
+        break;
+        }
+
+      progress.setValue(++count);
+
+      } while (seekTime < end);
+
+    writer.writeEventVideo();
+    }
+
+  // Assuming that KML write should be quick
+  kmlWriter.write();
+}
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsReportGenerator.h b/Plugins/VspUiExtensions/ReportGenerator/vsReportGenerator.h
new file mode 100644
index 00000000..c3541326
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsReportGenerator.h
@@ -0,0 +1,45 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsReportGenerator_h
+#define __vsReportGenerator_h
+
+#include <QSharedPointer>
+
+#include <qtGlobal.h>
+
+#include <vgVtkVideoFrame.h>
+
+template <typename T> class QList;
+
+class vsEventUserInfo;
+class vsVideoSource;
+
+class vsReportGeneratorPrivate;
+
+class vtkVgEventTypeRegistry;
+
+class vsReportGenerator
+{
+public:
+  vsReportGenerator(QList<vsEventUserInfo> events,
+                    vtkVgEventTypeRegistry* registry,
+                    vsVideoSource* videoSource);
+  virtual ~vsReportGenerator();
+
+  void setOutputPath(const QString& path);
+
+  void generateReport(bool generateVideo);
+
+protected:
+  QTE_DECLARE_PRIVATE_SPTR(vsReportGenerator)
+
+private:
+  QTE_DECLARE_PRIVATE(vsReportGenerator)
+  Q_DISABLE_COPY(vsReportGenerator)
+};
+
+#endif
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorInterface.cxx b/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorInterface.cxx
new file mode 100644
index 00000000..07408ebd
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorInterface.cxx
@@ -0,0 +1,148 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsReportGeneratorInterface.h"
+
+#include <QMenu>
+#include <QMessageBox>
+
+#include <qtPrioritizedMenuProxy.h>
+
+#include <vgFileDialog.h>
+
+#include <vvGenerateReportDialog.h>
+
+#include <vsCore.h>
+#include <vsEventUserInfo.h>
+#include <vsMainWindow.h>
+#include <vsScene.h>
+
+#include "vsKmlWriter.h"
+#include "vsReportGenerator.h"
+
+QTE_IMPLEMENT_D_FUNC(vsReportGeneratorInterface)
+
+//-----------------------------------------------------------------------------
+class vsReportGeneratorInterfacePrivate
+{
+public:
+  explicit vsReportGeneratorInterfacePrivate(vsMainWindow* window,
+                                             vsScene* scene, vsCore* core);
+
+  vsCore* const Core;
+  vsScene* const Scene;
+  vsMainWindow* const Window;
+  vsVideoSource* VideoSource;
+};
+
+//-----------------------------------------------------------------------------
+vsReportGeneratorInterfacePrivate::vsReportGeneratorInterfacePrivate(
+  vsMainWindow* window, vsScene* scene, vsCore* core) :
+  Core(core),
+  Scene(scene),
+  Window(window),
+  VideoSource(0)
+{
+}
+
+//-----------------------------------------------------------------------------
+vsReportGeneratorInterface::vsReportGeneratorInterface(
+  vsMainWindow* window, vsScene* scene, vsCore* core) :
+  QObject(window),
+  d_ptr(new vsReportGeneratorInterfacePrivate(window, scene, core))
+{
+  QAction* const actionGenerateReport = new QAction("Generate Report", this);
+  QAction* const actionExportKml = new QAction("Export KML", this);
+
+  qtPrioritizedMenuProxy* menu = window->toolsMenu();
+  menu->insertAction(actionExportKml, 600);
+  menu->insertAction(actionGenerateReport, 600);
+
+  connect(actionGenerateReport, SIGNAL(triggered()),
+          this, SLOT(generateReport()));
+  connect(actionExportKml, SIGNAL(triggered()),
+          this, SLOT(exportKml()));
+
+  connect(core, SIGNAL(videoSourceChanged(vsVideoSource*)),
+          this, SLOT(setVideoSource(vsVideoSource*)));
+  this->setVideoSource(core->videoSource());
+}
+
+//-----------------------------------------------------------------------------
+vsReportGeneratorInterface::~vsReportGeneratorInterface()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsReportGeneratorInterface::setVideoSource(vsVideoSource* vs)
+{
+  QTE_D(vsReportGeneratorInterface);
+  d->VideoSource = vs;
+}
+
+//-----------------------------------------------------------------------------
+void vsReportGeneratorInterface::generateReport()
+{
+  QTE_D(vsReportGeneratorInterface);
+
+  if (!d->VideoSource)
+    {
+    QMessageBox::warning(d->Window, QString(), "No video loaded.");
+    return;
+    }
+
+  vvGenerateReportDialog dlg(d->Window);
+  if (dlg.exec() == QDialog::Accepted)
+    {
+    this->generateReport(dlg.outputPath(), dlg.generateVideo());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsReportGeneratorInterface::exportKml()
+{
+  QTE_D(vsReportGeneratorInterface);
+
+  if (!d->VideoSource)
+    {
+    QMessageBox::warning(d->Window, QString(), "No video loaded.");
+    return;
+    }
+
+  QString path = vgFileDialog::getSaveFileName(
+                   d->Window, "KML export location", QString(),
+                   "KML File (*.kml);;");
+
+  if (!path.isEmpty())
+    {
+    this->exportKml(path);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsReportGeneratorInterface::generateReport(
+  const QString& path, bool generateVideo)
+{
+  QTE_D(vsReportGeneratorInterface);
+
+  vsReportGenerator rg(d->Scene->eventList(),
+                       d->Core->eventTypeRegistry(),
+                       d->VideoSource);
+  rg.setOutputPath(path);
+  rg.generateReport(generateVideo);
+}
+
+//-----------------------------------------------------------------------------
+void vsReportGeneratorInterface::exportKml(const QString& path)
+{
+  QTE_D(vsReportGeneratorInterface);
+
+  vsKmlWriter kmlWriter(d->Scene->eventList(),
+                        d->Core->eventTypeRegistry(),
+                        d->VideoSource);
+  kmlWriter.setOutputPath(path);
+  kmlWriter.write();
+}
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorInterface.h b/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorInterface.h
new file mode 100644
index 00000000..698704e1
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorInterface.h
@@ -0,0 +1,48 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsReportGeneratorInterface_h
+#define __vsReportGeneratorInterface_h
+
+#include <QObject>
+#include <QSharedPointer>
+
+#include <qtGlobal.h>
+
+class vsCore;
+class vsMainWindow;
+class vsScene;
+class vsVideoSource;
+
+class vsReportGeneratorInterfacePrivate;
+
+class vsReportGeneratorInterface : public QObject
+{
+  Q_OBJECT
+
+public:
+  vsReportGeneratorInterface(vsMainWindow*, vsScene*, vsCore*);
+  virtual ~vsReportGeneratorInterface();
+
+protected:
+  void generateReport(const QString& path, bool generateVideo);
+  void exportKml(const QString& path);
+
+protected slots:
+  void setVideoSource(vsVideoSource*);
+
+  void generateReport();
+  void exportKml();
+
+protected:
+  QTE_DECLARE_PRIVATE_SPTR(vsReportGeneratorInterface)
+
+private:
+  QTE_DECLARE_PRIVATE(vsReportGeneratorInterface)
+  Q_DISABLE_COPY(vsReportGeneratorInterface)
+};
+
+#endif
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorPlugin.cxx b/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorPlugin.cxx
new file mode 100644
index 00000000..bb99b9db
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorPlugin.cxx
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsReportGeneratorPlugin.h"
+
+#include <QtPlugin>
+
+#include "vsReportGeneratorInterface.h"
+
+Q_EXPORT_PLUGIN2(vsReportGeneratorExtension, vsReportGeneratorPlugin)
+
+//-----------------------------------------------------------------------------
+vsReportGeneratorPlugin::vsReportGeneratorPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsReportGeneratorPlugin::~vsReportGeneratorPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsReportGeneratorPlugin::createInterface(
+  vsMainWindow* window, vsScene* scene)
+{
+  new vsReportGeneratorInterface(window, scene, this->core());
+}
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorPlugin.h b/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorPlugin.h
new file mode 100644
index 00000000..2a7d2ee1
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsReportGeneratorPlugin.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsReportGeneratorPlugin_h
+#define __vsReportGeneratorPlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsUiExtensionInterface.h>
+
+class vsReportGeneratorPlugin : public QObject, public vsUiExtensionInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsUiExtensionInterface)
+
+public:
+  vsReportGeneratorPlugin();
+  virtual ~vsReportGeneratorPlugin();
+
+  virtual void createInterface(vsMainWindow*, vsScene*) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsReportGeneratorPlugin)
+};
+
+#endif
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsVideoRequestor.cxx b/Plugins/VspUiExtensions/ReportGenerator/vsVideoRequestor.cxx
new file mode 100644
index 00000000..e5e7456b
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsVideoRequestor.cxx
@@ -0,0 +1,93 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsVideoRequestor.h"
+
+#include <QEventLoop>
+
+#include <vgVideoSourceRequestor.h>
+#include <vgVideoSource.h>
+
+enum { SeekId = 1 };
+
+class vsVideoRequestorPrivate : public vgVideoSource {};
+
+//-----------------------------------------------------------------------------
+class vsVideoRequestorObject : public vgVideoSourceRequestor
+{
+public:
+  vsVideoRequestorObject(vtkVgVideoFrame& out) : Frame(out) {}
+
+  virtual void update(vgVideoSeekRequest, vgVtkVideoFramePtr);
+
+  vgVideoSource* VideoSource;
+  vtkVgVideoFrame& Frame;
+
+  QEventLoop EventLoop;
+  bool Finished;
+};
+
+typedef QSharedPointer<vsVideoRequestorObject> vsVideoRequestorPtr;
+
+//-----------------------------------------------------------------------------
+void vsVideoRequestorObject::update(
+  vgVideoSeekRequest seekRequest, vgVtkVideoFramePtr frame)
+{
+  Q_ASSERT(seekRequest.RequestId == SeekId);
+  Q_UNUSED(seekRequest);
+
+  this->Finished = true;
+  if (frame)
+    {
+    this->Frame = *frame;
+    this->EventLoop.exit(0);
+    }
+  else
+    {
+    this->EventLoop.exit(1);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsVideoRequestor::vsVideoRequestor(vgVideoSource* source)
+  : d_ptr(static_cast<vsVideoRequestorPrivate*>(source))
+{
+}
+
+//-----------------------------------------------------------------------------
+vsVideoRequestor::~vsVideoRequestor()
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vsVideoRequestor::requestFrame(
+  vtkVgVideoFrame& out, vtkVgTimeStamp time, vg::SeekMode direction)
+{
+  return vsVideoRequestor::requestFrame(out, this->d_ptr, time, direction);
+}
+
+//-----------------------------------------------------------------------------
+bool vsVideoRequestor::requestFrame(
+  vtkVgVideoFrame& out, vgVideoSource* source,
+  vtkVgTimeStamp time, vg::SeekMode direction)
+{
+  vsVideoRequestorPtr requestorPtr(new vsVideoRequestorObject(out));
+  vsVideoRequestorObject& requestor = *requestorPtr.data();
+
+  // Build request
+  vgVideoSeekRequest request;
+  request.Requestor = requestorPtr;
+  request.RequestId = SeekId;
+  request.TimeStamp = time;
+  request.Direction = direction;
+
+  // Issue request
+  requestor.Finished = false;
+  source->requestFrame(request);
+
+  // Wait for reply
+  return (requestor.Finished || (requestor.EventLoop.exec() == 0));
+}
diff --git a/Plugins/VspUiExtensions/ReportGenerator/vsVideoRequestor.h b/Plugins/VspUiExtensions/ReportGenerator/vsVideoRequestor.h
new file mode 100644
index 00000000..7fa57d49
--- /dev/null
+++ b/Plugins/VspUiExtensions/ReportGenerator/vsVideoRequestor.h
@@ -0,0 +1,40 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsVideoRequestor_h
+#define __vsVideoRequestor_h
+
+#include <qtGlobal.h>
+
+#include <vgNamespace.h>
+
+#include <vgVideoSourceRequestor.h>
+
+class vgVideoSource;
+
+class vsVideoRequestorPrivate;
+
+class vsVideoRequestor
+{
+public:
+  explicit vsVideoRequestor(vgVideoSource* source);
+  ~vsVideoRequestor();
+
+  bool requestFrame(vtkVgVideoFrame& out,
+                    vtkVgTimeStamp time, vg::SeekMode direction);
+
+  static bool requestFrame(vtkVgVideoFrame& out, vgVideoSource* source,
+                           vtkVgTimeStamp time, vg::SeekMode direction);
+
+protected:
+  QTE_DECLARE_PRIVATE_PTR(vsVideoRequestor)
+
+private:
+  Q_DISABLE_COPY(vsVideoRequestor)
+};
+
+
+#endif
diff --git a/Plugins/VspUiExtensions/Ruler/CMakeLists.txt b/Plugins/VspUiExtensions/Ruler/CMakeLists.txt
new file mode 100644
index 00000000..cc0e4a7a
--- /dev/null
+++ b/Plugins/VspUiExtensions/Ruler/CMakeLists.txt
@@ -0,0 +1,48 @@
+project(vsRulerTool)
+
+include_directories(SYSTEM
+  ${VTK_INCLUDE_DIRS}
+)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(vsRuler_SdkTargets
+  vspUserInterface
+  vtkVgQtUtil
+)
+
+vg_include_library_sdk_directories(${vsRuler_SdkTargets})
+
+set(vsRuler_Sources
+  vsLineWidget.cxx
+  vsRulerInterface.cxx
+  vsRulerPlugin.cxx
+)
+
+set(vsRuler_MocHeaders
+  vsLineWidget.h
+  vsRulerInterface.h
+  vsRulerPlugin.h
+)
+
+qt4_wrap_cpp(vsRuler_MocSources
+  ${vsRuler_MocHeaders}
+)
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vsRuler_Sources}
+  ${vsRuler_MocSources}
+)
+
+target_link_libraries(${PROJECT_NAME}
+  ${vsRuler_SdkTargets}
+  ${QT_LIBRARIES}
+  vtkGUISupportQt
+  vtkRenderingFreeTypeOpenGL
+  vtkRenderingVolumeOpenGL
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VspUiExtensions/Ruler/vsLineWidget.cxx b/Plugins/VspUiExtensions/Ruler/vsLineWidget.cxx
new file mode 100644
index 00000000..53e75b79
--- /dev/null
+++ b/Plugins/VspUiExtensions/Ruler/vsLineWidget.cxx
@@ -0,0 +1,130 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsLineWidget.h"
+
+#include <vtkCommand.h>
+#include <vtkLineWidget2.h>
+#include <vtkMatrix4x4.h>
+#include <vtkRendererCollection.h>
+#include <vtkRenderWindow.h>
+#include <vtkRenderWindowInteractor.h>
+
+#include <vtkVgInstance.h>
+#include <vtkVgLineRepresentation.h>
+#include <vtkVgRendererUtils.h>
+
+#include <vtkVgQtAdapt.h>
+#include <vtkVgQtUtil.h>
+
+QTE_IMPLEMENT_D_FUNC(vsLineWidget)
+
+//-----------------------------------------------------------------------------
+class vsLineWidgetPrivate
+{
+public:
+  void init(vtkRenderWindowInteractor* rwi);
+
+  vtkVgInstance<vtkLineWidget2> Widget;
+  vtkVgInstance<vtkVgLineRepresentation> Representation;
+};
+
+//-----------------------------------------------------------------------------
+void vsLineWidgetPrivate::init(vtkRenderWindowInteractor* rwi)
+{
+  this->Widget->SetRepresentation(this->Representation);
+  this->Widget->SetInteractor(rwi);
+}
+
+//-----------------------------------------------------------------------------
+vsLineWidget::vsLineWidget(vtkRenderWindowInteractor* rwi)
+  : d_ptr(new vsLineWidgetPrivate())
+{
+  QTE_D(vsLineWidget);
+  d->init(rwi);
+}
+
+//-----------------------------------------------------------------------------
+vsLineWidget::~vsLineWidget()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsLineWidget::setMatrix(vtkMatrix4x4* matrix)
+{
+  QTE_D(vsLineWidget);
+  d->Representation->SetTransformMatrix(matrix);
+  this->updateLineLength();
+}
+
+//-----------------------------------------------------------------------------
+void vsLineWidget::setMatrix(const QMatrix4x4& matrix)
+{
+  vtkVgInstance<vtkMatrix4x4> vtkMatrix;
+  qtAdapt(matrix, vtkMatrix);
+  this->setMatrix(vtkMatrix);
+}
+
+//-----------------------------------------------------------------------------
+double vsLineWidget::lineLength()
+{
+  QTE_D(vsLineWidget);
+
+  return d->Representation->GetDistance();
+}
+
+//-----------------------------------------------------------------------------
+void vsLineWidget::setVisible(bool visible)
+{
+  QTE_D(vsLineWidget);
+  d->Representation->SetVisibility(visible);
+}
+
+//-----------------------------------------------------------------------------
+void vsLineWidget::begin()
+{
+  QTE_D(vsLineWidget);
+
+  d->Widget->On();
+
+  double bounds[6];
+  vtkVgRendererUtils::GetBounds(d->Representation->GetRenderer(), bounds);
+  bounds[4] = 0.5;
+  bounds[5] = 0.5;
+
+  double pos1[3] = { 0.0, 0.0, 0.0 };
+  double pos2[3] = { 1.0, 0.0, 0.0 };
+  d->Representation->SetPoint1WorldPosition(pos1);
+  d->Representation->SetPoint2WorldPosition(pos2);
+
+  double padding = 0.4 * (bounds[1] - bounds[0]);
+  bounds[0] += padding;
+  bounds[1] -= padding;
+
+  // Initially place the widget in the center of the view
+  d->Representation->PlaceWidget(bounds);
+
+  d->Widget->Render();
+
+  vtkConnect(d->Widget, vtkCommand::InteractionEvent,
+             this, SLOT(updateLineLength()));
+}
+
+//-----------------------------------------------------------------------------
+void vsLineWidget::end()
+{
+  QTE_D(vsLineWidget);
+
+  d->Widget->ProcessEventsOff();
+}
+
+//-----------------------------------------------------------------------------
+void vsLineWidget::updateLineLength()
+{
+  QTE_D(vsLineWidget);
+
+  emit this->lineLengthChanged(d->Representation->GetDistance());
+}
diff --git a/Plugins/VspUiExtensions/Ruler/vsLineWidget.h b/Plugins/VspUiExtensions/Ruler/vsLineWidget.h
new file mode 100644
index 00000000..2c44f9f4
--- /dev/null
+++ b/Plugins/VspUiExtensions/Ruler/vsLineWidget.h
@@ -0,0 +1,53 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsLineWidget_h
+#define __vsLineWidget_h
+
+#include <QMatrix4x4>
+#include <QObject>
+
+#include <qtGlobal.h>
+
+class vtkMatrix4x4;
+class vtkPoints;
+class vtkRenderWindowInteractor;
+
+class vsLineWidgetPrivate;
+
+class vsLineWidget : public QObject
+{
+  Q_OBJECT
+
+public:
+  vsLineWidget(vtkRenderWindowInteractor*);
+  ~vsLineWidget();
+
+  void setMatrix(vtkMatrix4x4* matrix);
+  double lineLength();
+
+signals:
+  void lineLengthChanged(double length);
+
+public slots:
+  void begin();
+  void end();
+
+  void setVisible(bool);
+  void setMatrix(const QMatrix4x4& matrix);
+
+protected slots:
+  void updateLineLength();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vsLineWidget)
+
+private:
+  QTE_DECLARE_PRIVATE(vsLineWidget)
+  Q_DISABLE_COPY(vsLineWidget)
+};
+
+#endif
diff --git a/Plugins/VspUiExtensions/Ruler/vsRulerInterface.cxx b/Plugins/VspUiExtensions/Ruler/vsRulerInterface.cxx
new file mode 100644
index 00000000..a07e7341
--- /dev/null
+++ b/Plugins/VspUiExtensions/Ruler/vsRulerInterface.cxx
@@ -0,0 +1,217 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsRulerInterface.h"
+
+#include <QMenu>
+#include <QToolBar>
+
+#include <QVTKWidget.h>
+#include <vtkRenderWindow.h>
+
+#include <qtActionManager.h>
+#include <qtPrioritizedMenuProxy.h>
+#include <qtPrioritizedToolBarProxy.h>
+#include <qtScopedValueChange.h>
+
+#include <vsCore.h>
+#include <vsMainWindow.h>
+#include <vsScene.h>
+
+#include "vsLineWidget.h"
+
+QTE_IMPLEMENT_D_FUNC(vsRulerInterface)
+
+namespace // anonymous
+{
+
+//-----------------------------------------------------------------------------
+QAction* createAction(QWidget* parent, const char* name,
+                      const char* text, const char* icon = 0)
+{
+  const QString key("MainWindow/%1");
+  QSettings settings;
+
+  QAction* action = new QAction(parent);
+  action->setObjectName(name);
+  action->setText(text);
+  qtAm->setupAction(settings, action, key.arg(name), icon);
+
+  return action;
+}
+
+} // namespace <anonymous>
+
+//-----------------------------------------------------------------------------
+class vsRulerInterfacePrivate
+{
+public:
+  explicit vsRulerInterfacePrivate(
+    vsMainWindow* window, vsScene* scene, vsCore* core);
+
+  QString buildRulerText();
+
+  vsCore* const Core;
+  vsScene* const Scene;
+  vsMainWindow* const Window;
+
+  QAction* ActionShowRuler;
+
+  QScopedPointer<vsLineWidget> Ruler;
+  double CurrentGsd;
+
+  bool IgnoreHideRuler;
+};
+
+//-----------------------------------------------------------------------------
+vsRulerInterfacePrivate::vsRulerInterfacePrivate(
+  vsMainWindow* window, vsScene* scene, vsCore* core) :
+  Core(core),
+  Scene(scene),
+  Window(window),
+  IgnoreHideRuler(false)
+{
+}
+
+//-----------------------------------------------------------------------------
+QString vsRulerInterfacePrivate::buildRulerText()
+{
+  double px = this->Ruler->lineLength();
+
+  if (this->CurrentGsd > 0.0)
+    {
+    const QString f = "Ruler: %1 m (%2 px)";
+    return f.arg(px * this->CurrentGsd, 0, 'f', 2)
+           .arg(px, 0, 'f', 2);
+    }
+  else
+    {
+    return QString("Ruler: %2 px").arg(px, 0, 'f', 2);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vsRulerInterface::vsRulerInterface(
+  vsMainWindow* window, vsScene* scene, vsCore* core) :
+  QObject(window),
+  d_ptr(new vsRulerInterfacePrivate(window, scene, core))
+{
+  QTE_D(vsRulerInterface);
+
+  QSettings settings;
+
+  // Create tool action
+  d->ActionShowRuler = new QAction(window);
+  d->ActionShowRuler->setObjectName("actionShowRuler");
+  d->ActionShowRuler->setText("Show Ruler");
+  d->ActionShowRuler->setIconText("Ruler");
+  d->ActionShowRuler->setToolTip("Show or hide the ruler tool, used to measure"
+                                 " the distance between two points");
+  d->ActionShowRuler->setCheckable(true);
+  qtAm->setupAction(settings, d->ActionShowRuler,
+                    "MainWindow/actionShowRuler", "measure");
+  connect(d->ActionShowRuler, SIGNAL(toggled(bool)),
+          this, SLOT(toggleRuler(bool)));
+
+  // Add tool action to menu and tool bar
+  window->toolsMenu()->insertAction(d->ActionShowRuler, 100);
+  window->toolsToolBar()->insertAction(d->ActionShowRuler, 100);
+
+  connect(scene, SIGNAL(interactionCanceled()), this, SLOT(hideRuler()));
+  connect(scene, SIGNAL(videoMetadataUpdated(vtkVgVideoFrameMetaData, qint64)),
+          this, SLOT(setGsdFromMetadata(vtkVgVideoFrameMetaData)));
+  connect(core, SIGNAL(videoSourceStatusChanged(vsDataSource::Status)),
+          this, SLOT(setVideoSourceStatus(vsDataSource::Status)));
+  connect(this, SIGNAL(statusMessageAvailable(QString)),
+          window, SLOT(setStatusText(QString)));
+}
+
+//-----------------------------------------------------------------------------
+vsRulerInterface::~vsRulerInterface()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsRulerInterface::setVideoSourceStatus(
+  vsDataSource::Status status)
+{
+  QTE_D(vsRulerInterface);
+
+  switch (status)
+    {
+    case vsDataSource::StreamingActive:
+    case vsDataSource::StreamingIdle:
+    case vsDataSource::StreamingStopped:
+    case vsDataSource::ArchivedActive:
+    case vsDataSource::ArchivedSuspended:
+    case vsDataSource::ArchivedIdle:
+      d->ActionShowRuler->setEnabled(true);
+      break;
+    default:
+      d->ActionShowRuler->setChecked(false);
+      d->ActionShowRuler->setEnabled(false);
+      break;
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRulerInterface::setGsdFromMetadata(vtkVgVideoFrameMetaData md)
+{
+  QTE_D(vsRulerInterface);
+  d->CurrentGsd = md.Gsd;
+  this->rulerLengthChanged();
+}
+
+//-----------------------------------------------------------------------------
+void vsRulerInterface::toggleRuler(bool state)
+{
+  QTE_D(vsRulerInterface);
+  if (state)
+    {
+    qtScopedValueChange<bool> ic(d->IgnoreHideRuler, true);
+    d->Scene->cancelInteraction();
+
+    vtkRenderWindowInteractor* const interactor =
+      d->Window->view()->GetRenderWindow()->GetInteractor();
+    d->Ruler.reset(new vsLineWidget(interactor));
+    d->Ruler->setMatrix(d->Scene->currentTransform());
+    d->Ruler->begin();
+
+    connect(d->Scene, SIGNAL(transformChanged(QMatrix4x4)),
+            d->Ruler.data(), SLOT(setMatrix(QMatrix4x4)));
+    connect(d->Ruler.data(), SIGNAL(lineLengthChanged(double)),
+            this, SLOT(rulerLengthChanged()));
+
+    this->rulerLengthChanged();
+    d->Scene->postUpdate();
+    }
+  else
+    {
+    d->Ruler.reset();
+    d->Scene->postUpdate();
+    emit this->statusMessageAvailable(QString());
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRulerInterface::hideRuler()
+{
+  QTE_D(vsRulerInterface);
+  if (!d->IgnoreHideRuler)
+    {
+    d->ActionShowRuler->setChecked(false);
+    }
+}
+
+//-----------------------------------------------------------------------------
+void vsRulerInterface::rulerLengthChanged()
+{
+  QTE_D(vsRulerInterface);
+  if (d->Ruler)
+    {
+    emit this->statusMessageAvailable(d->buildRulerText());
+    }
+}
diff --git a/Plugins/VspUiExtensions/Ruler/vsRulerInterface.h b/Plugins/VspUiExtensions/Ruler/vsRulerInterface.h
new file mode 100644
index 00000000..b7b3fa20
--- /dev/null
+++ b/Plugins/VspUiExtensions/Ruler/vsRulerInterface.h
@@ -0,0 +1,58 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsRulerInterface_h
+#define __vsRulerInterface_h
+
+#include <QObject>
+#include <QSharedPointer>
+
+#include <qtGlobal.h>
+
+#include <vtkVgVideoFrameMetaData.h>
+
+#include <vsContour.h>
+#include <vsDataSource.h>
+#include <vsEventInfo.h>
+
+class QAction;
+
+class vsCore;
+class vsMainWindow;
+class vsScene;
+class vsVideoSource;
+
+class vsRulerInterfacePrivate;
+
+class vsRulerInterface : public QObject
+{
+  Q_OBJECT
+
+public:
+  vsRulerInterface(vsMainWindow*, vsScene*, vsCore*);
+  virtual ~vsRulerInterface();
+
+signals:
+  void statusMessageAvailable(QString message);
+
+protected slots:
+  void setVideoSourceStatus(vsDataSource::Status);
+  void setGsdFromMetadata(vtkVgVideoFrameMetaData);
+
+  void toggleRuler(bool);
+  void hideRuler();
+
+  void rulerLengthChanged();
+
+protected:
+  QTE_DECLARE_PRIVATE_SPTR(vsRulerInterface)
+
+private:
+  QTE_DECLARE_PRIVATE(vsRulerInterface)
+  Q_DISABLE_COPY(vsRulerInterface)
+};
+
+#endif
diff --git a/Plugins/VspUiExtensions/Ruler/vsRulerPlugin.cxx b/Plugins/VspUiExtensions/Ruler/vsRulerPlugin.cxx
new file mode 100644
index 00000000..0a71eb2a
--- /dev/null
+++ b/Plugins/VspUiExtensions/Ruler/vsRulerPlugin.cxx
@@ -0,0 +1,30 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vsRulerPlugin.h"
+
+#include <QtPlugin>
+
+#include "vsRulerInterface.h"
+
+Q_EXPORT_PLUGIN2(vsRulerExtension, vsRulerPlugin)
+
+//-----------------------------------------------------------------------------
+vsRulerPlugin::vsRulerPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vsRulerPlugin::~vsRulerPlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+void vsRulerPlugin::createInterface(
+  vsMainWindow* window, vsScene* scene)
+{
+  new vsRulerInterface(window, scene, this->core());
+}
diff --git a/Plugins/VspUiExtensions/Ruler/vsRulerPlugin.h b/Plugins/VspUiExtensions/Ruler/vsRulerPlugin.h
new file mode 100644
index 00000000..264cb4ca
--- /dev/null
+++ b/Plugins/VspUiExtensions/Ruler/vsRulerPlugin.h
@@ -0,0 +1,31 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vsRulerPlugin_h
+#define __vsRulerPlugin_h
+
+#include <QObject>
+
+#include <qtGlobal.h>
+
+#include <vsUiExtensionInterface.h>
+
+class vsRulerPlugin : public QObject, public vsUiExtensionInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vsUiExtensionInterface)
+
+public:
+  vsRulerPlugin();
+  virtual ~vsRulerPlugin();
+
+  virtual void createInterface(vsMainWindow*, vsScene*) QTE_OVERRIDE;
+
+private:
+  QTE_DISABLE_COPY(vsRulerPlugin)
+};
+
+#endif
diff --git a/Plugins/VvQueryService/CMakeLists.txt b/Plugins/VvQueryService/CMakeLists.txt
new file mode 100644
index 00000000..6ce5dd30
--- /dev/null
+++ b/Plugins/VvQueryService/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Options for optional plugins
+vg_option(VVQS_ENABLE_FAKE_BACKEND ON
+  "Enable building of VVQS fake back-end"
+  "VISGUI_ENABLE_VVIO"
+)
+
+if(NOT VISGUI_ENABLE_VVIO)
+  # If the vvIO framework is disabled, we are only here to declare our options,
+  # so leave now
+  return()
+endif()
+
+###############################################################################
+
+if(VVQS_ENABLE_FAKE_BACKEND)
+  add_subdirectory(FakeQueryService)
+endif()
diff --git a/Plugins/VvQueryService/FakeQueryService/CMakeLists.txt b/Plugins/VvQueryService/FakeQueryService/CMakeLists.txt
new file mode 100644
index 00000000..04ef8988
--- /dev/null
+++ b/Plugins/VvQueryService/FakeQueryService/CMakeLists.txt
@@ -0,0 +1,46 @@
+project(vvFakeQueryService)
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+set(vvFakeQueryService_SdkTargets
+  vvIO
+  vvWidgets
+  qtVgCommon
+  qtExtensions
+)
+
+vg_include_library_sdk_directories(${vvFakeQueryService_SdkTargets})
+
+set(vvFakeQueryService_Sources
+  vvFakeQueryServerChooser.cxx
+  vvFakeQueryServicePlugin.cxx
+  vvFakeQuerySession.cxx
+)
+
+set(vvFakeQueryService_MocHeaders
+  vvFakeQueryServerChooser.h
+  vvFakeQueryServicePlugin.h
+  vvFakeQuerySession.h
+)
+
+set(vvFakeQueryService_UiFiles
+  vvFakeQueryServerChooser.ui
+)
+
+qt4_wrap_cpp(vvFakeQueryService_MocSources ${vvFakeQueryService_MocHeaders})
+qt4_wrap_ui(vvFakeQueryService_UiSources ${vvFakeQueryService_UiFiles})
+
+vg_add_qt_plugin(${PROJECT_NAME}
+  ${vvFakeQueryService_Sources}
+  ${vvFakeQueryService_MocSources}
+  ${vvFakeQueryService_UiSources}
+)
+
+target_link_libraries(${PROJECT_NAME} LINK_PRIVATE
+  ${vvFakeQueryService_SdkTargets} ${QT_LIBRARIES}
+)
+
+install_plugin_targets(${PROJECT_NAME})
diff --git a/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.cxx b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.cxx
new file mode 100644
index 00000000..bd168e56
--- /dev/null
+++ b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.cxx
@@ -0,0 +1,79 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvFakeQueryServerChooser.h"
+#include "ui_vvFakeQueryServerChooser.h"
+
+#include <vgFileDialog.h>
+
+QTE_IMPLEMENT_D_FUNC(vvFakeQueryServerChooser)
+
+//-----------------------------------------------------------------------------
+class vvFakeQueryServerChooserPrivate
+{
+public:
+  Ui::vvFakeQueryServerChooser UI;
+  QUrl uri;
+};
+
+//-----------------------------------------------------------------------------
+vvFakeQueryServerChooser::vvFakeQueryServerChooser(QWidget* parent) :
+  vvAbstractQueryServerChooser(parent),
+  d_ptr(new vvFakeQueryServerChooserPrivate)
+{
+  QTE_D(vvFakeQueryServerChooser);
+  d->UI.setupUi(this);
+
+  connect(d->UI.archive, SIGNAL(textChanged(QString)),
+          this, SLOT(updateUri()));
+  connect(d->UI.archiveBrowse, SIGNAL(clicked()),
+          this, SLOT(browseForArchive()));
+}
+
+//-----------------------------------------------------------------------------
+vvFakeQueryServerChooser::~vvFakeQueryServerChooser()
+{
+}
+
+//-----------------------------------------------------------------------------
+QUrl vvFakeQueryServerChooser::uri() const
+{
+  QTE_D_CONST(vvFakeQueryServerChooser);
+  return d->uri;
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQueryServerChooser::setUri(QUrl newUri)
+{
+  QTE_D(vvFakeQueryServerChooser);
+
+  d->UI.archive->setText(newUri.queryItemValue("Archive"));
+  this->updateUri();
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQueryServerChooser::updateUri()
+{
+  QTE_D(vvFakeQueryServerChooser);
+
+  d->uri = QUrl("fake:");
+  d->uri.addQueryItem("Archive", d->UI.archive->text());
+
+  emit this->uriChanged(d->uri);
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQueryServerChooser::browseForArchive()
+{
+  QTE_D(vvFakeQueryServerChooser);
+
+  QString newPath = vgFileDialog::getExistingDirectory(
+                      this, "Archive Directory...", d->UI.archive->text());
+  if (!newPath.isEmpty())
+    {
+    d->UI.archive->setText(newPath);
+    }
+}
diff --git a/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.h b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.h
new file mode 100644
index 00000000..7dddb8cd
--- /dev/null
+++ b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.h
@@ -0,0 +1,41 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvFakeQueryServerChooser_h
+#define __vvFakeQueryServerChooser_h
+
+#include <qtGlobal.h>
+
+#include "vvAbstractQueryServerChooser.h"
+
+class QTreeWidgetItem;
+
+class vvFakeQueryServerChooserPrivate;
+
+class vvFakeQueryServerChooser : public vvAbstractQueryServerChooser
+{
+  Q_OBJECT
+
+public:
+  vvFakeQueryServerChooser(QWidget* parent = 0);
+  virtual ~vvFakeQueryServerChooser();
+
+  virtual QUrl uri() const;
+  virtual void setUri(QUrl);
+
+protected slots:
+  void updateUri();
+  void browseForArchive();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvFakeQueryServerChooser)
+
+private:
+  QTE_DECLARE_PRIVATE(vvFakeQueryServerChooser)
+  Q_DISABLE_COPY(vvFakeQueryServerChooser)
+};
+
+#endif
diff --git a/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.ui b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.ui
new file mode 100644
index 00000000..230e62e9
--- /dev/null
+++ b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServerChooser.ui
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>vvFakeQueryServerChooser</class>
+ <widget class="QWidget" name="vvFakeQueryServerChooser">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>44</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="archiveLabel">
+     <property name="text">
+      <string>Archive Location:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <layout class="QHBoxLayout" name="archiveLayout">
+     <property name="spacing">
+      <number>2</number>
+     </property>
+     <item>
+      <widget class="QLineEdit" name="archive"/>
+     </item>
+     <item>
+      <widget class="QToolButton" name="archiveBrowse">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../../Icons/vvwidgets.qrc">
+         <normaloff>:/icons/16x16/browse</normaloff>:/icons/16x16/browse</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../../Icons/vvwidgets.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServicePlugin.cxx b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServicePlugin.cxx
new file mode 100644
index 00000000..222d2bbf
--- /dev/null
+++ b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServicePlugin.cxx
@@ -0,0 +1,49 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include "vvFakeQueryServicePlugin.h"
+
+#include <QStringList>
+#include <QUrl>
+#include <QtPlugin>
+
+#include <vvQueryServerDialog.h>
+
+#include "vvFakeQueryServerChooser.h"
+#include "vvFakeQuerySession.h"
+
+Q_EXPORT_PLUGIN2(vvFakeQueryService, vvFakeQueryServicePlugin)
+
+//-----------------------------------------------------------------------------
+vvFakeQueryServicePlugin::vvFakeQueryServicePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+vvFakeQueryServicePlugin::~vvFakeQueryServicePlugin()
+{
+}
+
+//-----------------------------------------------------------------------------
+QStringList vvFakeQueryServicePlugin::supportedSchemes() const
+{
+  QStringList schemes;
+  schemes.append("fake");
+  return schemes;
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQueryServicePlugin::registerChoosers(vvQueryServerDialog* dialog)
+{
+  dialog->registerServerType("Fake", QRegExp("fake", Qt::CaseInsensitive),
+                             new vvFakeQueryServerChooser);
+}
+
+//-----------------------------------------------------------------------------
+vvQuerySession* vvFakeQueryServicePlugin::createSession(const QUrl& server)
+{
+  return new vvFakeQuerySession(server);
+}
diff --git a/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServicePlugin.h b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServicePlugin.h
new file mode 100644
index 00000000..4d2e93ff
--- /dev/null
+++ b/Plugins/VvQueryService/FakeQueryService/vvFakeQueryServicePlugin.h
@@ -0,0 +1,26 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvFakeQueryServicePlugin_h
+#define __vvFakeQueryServicePlugin_h
+
+#include <vvQueryServiceInterface.h>
+
+class vvFakeQueryServicePlugin : public QObject, public vvQueryServiceInterface
+{
+  Q_OBJECT
+  Q_INTERFACES(vvQueryServiceInterface)
+
+public:
+  vvFakeQueryServicePlugin();
+  ~vvFakeQueryServicePlugin();
+
+  virtual QStringList supportedSchemes() const;
+  virtual void registerChoosers(vvQueryServerDialog*);
+  virtual vvQuerySession* createSession(const QUrl&);
+};
+
+#endif
diff --git a/Plugins/VvQueryService/FakeQueryService/vvFakeQuerySession.cxx b/Plugins/VvQueryService/FakeQueryService/vvFakeQuerySession.cxx
new file mode 100644
index 00000000..9f296f3d
--- /dev/null
+++ b/Plugins/VvQueryService/FakeQueryService/vvFakeQuerySession.cxx
@@ -0,0 +1,864 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QApplication>
+#include <QDataStream>
+#include <QList>
+#include <QMap>
+#include <QSet>
+#include <QDir>
+#include <QFileInfo>
+
+#include <qtKstReader.h>
+#include <qtMath.h>
+#include <qtRand.h>
+#include <qtStlUtil.h>
+
+#include <vgCheckArg.h>
+
+#include <limits>
+
+#include "vvChecksum.h"
+#include "vvHeader.h"
+#include "vvReader.h"
+
+#include "vvFakeQuerySession.h"
+#include "vvQueryInstance.h"
+
+QTE_IMPLEMENT_D_FUNC(vvFakeQuerySession)
+
+//BEGIN vvFakeQuerySessionPrivate
+
+//-----------------------------------------------------------------------------
+class vvFakeQuerySessionPrivate
+{
+public:
+  vvFakeQuerySessionPrivate(vvFakeQuerySession* q, QUrl s);
+
+  bool stWait();
+
+  bool stQueryFormulate();
+  bool stQueryExecute();
+
+  void acceptInitialResult(vvQueryResult);
+  void mergeResults();
+  vvQueryResult mergeResults(const QList<vvQueryResult>&);
+
+  void emitResultSet(const QString& message);
+
+  static bool testOverlap(const vvQueryResult&,
+                          const QList<vvQueryResult>&);
+  static bool testOverlap(const vvDescriptor&, const vvDescriptor&);
+  static long long convertTime(const vgTimeStamp&);
+
+  static bool resultScoreGreaterThan(const vvQueryResult&,
+                                     const vvQueryResult&);
+
+  enum
+    {
+    Shutdown = 0,
+    QueryFormulate,
+    QueryExecute,
+    Wait
+    } op;
+
+  QEventLoop* eventLoop;
+
+  const QUrl server;
+
+  vvProcessingRequest qfRequest;
+  vvQueryInstance query;
+
+  QList<QString> archiveFiles;
+
+  double progress;
+  double progressIncrement;
+
+  QMap<long long, vvQueryResult> rawResults;
+  QList<vvQueryResult> mergedResults;
+
+  quint16 seed;
+  quint16 lastFeedbackChecksum;
+
+protected:
+  QTE_DECLARE_PUBLIC_PTR(vvFakeQuerySession)
+
+private:
+  QTE_DECLARE_PUBLIC(vvFakeQuerySession)
+};
+
+//-----------------------------------------------------------------------------
+vvFakeQuerySessionPrivate::vvFakeQuerySessionPrivate(
+  vvFakeQuerySession* q, QUrl s)
+  : op(Wait), server(s), lastFeedbackChecksum(0), q_ptr(q)
+{
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySessionPrivate::stWait()
+{
+  bool activeTask = (this->op != Wait);
+  this->eventLoop->exec();
+
+  if (this->op == Shutdown)
+    {
+    if (activeTask)
+      {
+      QTE_Q(vvFakeQuerySession);
+      q->postStatus("Aborted", true);
+      }
+    return false;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySessionPrivate::stQueryFormulate()
+{
+  QTE_Q(vvFakeQuerySession);
+
+  // Get the path where we will expect to find descriptors
+  QUrl uri = qtUrl(this->qfRequest.VideoUri);
+  uri.setEncodedPath(uri.encodedPath() + ".vsd");
+
+  vvReader reader;
+  vvHeader header;
+
+  // Open file with video descriptors
+  if (!(reader.open(uri) && reader.readHeader(header)
+        && header.type == vvHeader::Descriptors))
+    {
+    q->postError("Unable to read file " + uri.toString());
+    return false;
+    }
+
+  // Read descriptors
+  QList<vvDescriptor> descriptors;
+  if (!reader.readDescriptors(descriptors))
+    {
+    q->postError("Error reading descriptors from file " + uri.toString());
+    return false;
+    }
+
+  // Success; emit descriptors
+  emit q->formulationComplete(descriptors);
+  q->postStatus("Query video processing complete", true);
+
+  // Return to wait state
+  this->op = Wait;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySessionPrivate::stQueryExecute()
+{
+  QTE_Q(vvFakeQuerySession);
+
+  // \TODO add support for retrieval queries (filtered tracks)
+
+  // If no archives remain, we are done gathering results
+  if (this->archiveFiles.isEmpty())
+    {
+    this->mergedResults.clear();
+    this->mergeResults();
+    this->emitResultSet("Query completed");
+    this->op = Wait;
+    return true;
+    }
+
+  // Set up to process results from the next archive in the list
+  q->postStatus("Executing query...", this->progress);
+  QString archiveFile = this->archiveFiles.takeFirst();
+  qtKstReader kst(QUrl::fromLocalFile(archiveFile));
+  vvReader reader;
+  vvHeader header;
+
+  // Open archive file
+  if (!(reader.open(QUrl::fromLocalFile(archiveFile))
+        && reader.readHeader(header)
+        && header.type == vvHeader::QueryResults))
+    {
+    q->postError("Unable to read file " + archiveFile);
+    return false;
+    }
+
+  // Read results
+  QList<vvQueryResult> kstResults;
+  if (!reader.readQueryResults(kstResults))
+    {
+    q->postError("Error reading results from archive " + archiveFile);
+    return false;
+    }
+
+  // Process results
+  foreach (const vvQueryResult& result, kstResults)
+    {
+    this->acceptInitialResult(result);
+    }
+
+  this->progress += this->progressIncrement;
+  q->postStatus("Executing query...", this->progress);
+
+  // Continue with next archive
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQuerySessionPrivate::acceptInitialResult(vvQueryResult result)
+{
+  // Split (legacy) results containing multiple descriptors and process each
+  // descriptor separately
+  if (result.Descriptors.size() != 1)
+    {
+    typedef std::vector<vvDescriptor> List;
+    List descriptors = result.Descriptors;
+    foreach_iter (List::const_iterator, iter, descriptors)
+      {
+      result.Descriptors.clear();
+      result.Descriptors.push_back(*iter);
+      this->acceptInitialResult(result);
+      }
+    return;
+    }
+
+  // \TODO filter by geospatial and temporal bounds, stream ID
+
+  // \TODO remove 'if' when retrieval mode is implemented; will always be true
+  if (this->query.isSimilarityQuery())
+    {
+    // Compute 'fake' relevancy score
+    const double t = this->query.constSimilarityQuery()->SimilarityThreshold;
+    quint16 rseed = this->seed ^ vvChecksum(result.Descriptors);
+    qsrand(rseed);
+    result.RelevancyScore = pow(qtRandD(), 2.0);
+    if (result.RelevancyScore < t)
+      {
+      return;
+      }
+    }
+
+  // This result passed the filters, so (re)set start/end times and accept it
+  const vvDescriptorRegionMap& rmap = result.Descriptors[0].Region;
+  if (rmap.size())
+    {
+    result.StartTime =
+      vvFakeQuerySessionPrivate::convertTime(rmap.begin()->TimeStamp);
+    result.EndTime =
+      vvFakeQuerySessionPrivate::convertTime(rmap.rbegin()->TimeStamp);
+    }
+  else
+    {
+    result.StartTime = -1;
+    result.EndTime = -1;
+    }
+  this->rawResults.insert(result.StartTime, result);
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQuerySessionPrivate::mergeResults()
+{
+  QTE_Q(vvFakeQuerySession);
+
+  this->progress = 0.7;
+  this->progressIncrement = 0.3 / (1.0 + this->rawResults.count());
+  q->postStatus("Executing query...", this->progress);
+
+  while (!this->rawResults.isEmpty())
+    {
+    QList<vvQueryResult> results;
+    long long end = std::numeric_limits<long long>::min();
+    QMap<long long, vvQueryResult>::iterator iter = this->rawResults.begin();
+
+    // Generate merge set
+    while (iter != this->rawResults.end())
+      {
+      // Always take at least one
+      if (!results.isEmpty())
+        {
+        // Stop if we've gone past any results that might overlap
+        if (iter.key() > end)
+          {
+          break;
+          }
+
+        // Skip results with no overlapping track segments
+        if (!vvFakeQuerySessionPrivate::testOverlap(iter.value(), results))
+          {
+          ++iter;
+          continue;
+          }
+        }
+
+      // Update merged result end time
+      long long start = iter.key();
+      end = qMax(end, iter.value().EndTime);
+
+      // Append result to merge set
+      results.append(iter.value());
+      this->rawResults.erase(iter);
+      this->progress += this->progressIncrement;
+
+      // Restart from front of list (because a, b may not have overlapped, but
+      // if we just added c overlapping a, c might also overlap b, and so we
+      // must re-test)
+      iter = this->rawResults.begin();
+
+      // Don't merge results that are missing start/end times
+      if (start == -1 && end == -1)
+        {
+        break;
+        }
+      }
+
+    // Create merged result and add to merged result set
+    this->mergedResults.append(this->mergeResults(results));
+    q->postStatus("Executing query...", this->progress);
+    }
+}
+
+//-----------------------------------------------------------------------------
+vvQueryResult vvFakeQuerySessionPrivate::mergeResults(
+  const QList<vvQueryResult>& results)
+{
+  // Initialize merged result to first result and set fields that don't (or
+  // shouldn't) come from the archive data
+  vvQueryResult mr = results.first();
+  mr.QueryId = this->query.constAbstractQuery()->QueryId;
+  mr.InstanceId = this->mergedResults.count();
+  mr.UserScore = vvIqr::UnclassifiedExample;
+  int validLocations = (mr.Location.GCS != -1 ? 1 : 0);
+
+  // Merge other results
+  for (int i = 1; i < results.count(); ++i)
+    {
+    const vvQueryResult& r = results[i];
+
+    // Append descriptor
+    mr.Descriptors.push_back(r.Descriptors.front());
+
+    // Merge Mission ID and Stream ID
+    if (mr.MissionId != r.MissionId)
+      {
+      mr.MissionId.clear();
+      }
+    if (mr.StreamId  != r.StreamId)
+      {
+      mr.StreamId.clear();
+      }
+
+    // Sum relevancy scores (we'll divide by number later to get average)
+    mr.RelevancyScore += r.RelevancyScore;
+
+    // Merge location, if available
+    if (validLocations >= 0 && r.Location.GCS != -1)
+      {
+      ++validLocations;
+      if (r.Location.GCS == mr.Location.GCS)
+        {
+        // Add location coordinates (will compute average later)
+        mr.Location.Northing += r.Location.Northing;
+        mr.Location.Easting += r.Location.Easting;
+        }
+      else if (mr.Location.GCS == -1)
+        {
+        // So far had no valid location, but this result has one, so use it
+        mr.Location = r.Location;
+        }
+      else
+        {
+        // Incompatible GCS's; invalidate location in merged result
+        mr.Location = vgGeocodedCoordinate();
+        validLocations = -1;
+        }
+      }
+
+    // Grow start/end times
+    mr.StartTime = qMin(mr.StartTime, r.StartTime);
+    mr.EndTime = qMax(mr.EndTime, r.EndTime);
+    }
+
+  // Calculate average relevancy
+  mr.RelevancyScore /= results.count();
+
+  // Calculate average location
+  if (validLocations > 0 && mr.Location.GCS != -1)
+    {
+    const double k = 1.0 / validLocations;
+    mr.Location.Northing *= k;
+    mr.Location.Easting *= k;
+    }
+
+  // Return merged result
+  return mr;
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQuerySessionPrivate::emitResultSet(const QString& message)
+{
+  QTE_Q(vvFakeQuerySession);
+
+  // Sort results by score
+  qSort(this->mergedResults.begin(), this->mergedResults.end(),
+        &vvFakeQuerySessionPrivate::resultScoreGreaterThan);
+
+  // (Re)assign rank and emit results
+  for (int i = 0, k = this->mergedResults.count(); i < k; ++i)
+    {
+    vvQueryResult& r = this->mergedResults[i];
+    r.Rank = i;
+    emit q->resultAvailable(r);
+    }
+
+  QString fullMessage("%2; %1 results received");
+  q->postStatus(
+    fullMessage.arg(this->mergedResults.count()).arg(message), true);
+  emit q->resultSetComplete();
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySessionPrivate::testOverlap(
+  const vvQueryResult& result, const QList<vvQueryResult>& list)
+{
+  foreach (const vvQueryResult& other, list)
+    {
+    // Only consider results from the same stream
+    if (other.StreamId != result.StreamId)
+      {
+      continue;
+      }
+
+    // Loop over all descriptor combinations
+    size_t i = result.Descriptors.size();
+    while (i--)
+      {
+      const vvDescriptor& di = result.Descriptors[i];
+      size_t j = other.Descriptors.size();
+      while (j--)
+        {
+        const vvDescriptor& dj = other.Descriptors[j];
+        // If a descriptor pair overlaps, the result overlaps the list
+        if (vvFakeQuerySessionPrivate::testOverlap(di, dj))
+          {
+          return true;
+          }
+        }
+      }
+    }
+
+  // No overlap was found
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySessionPrivate::testOverlap(
+  const vvDescriptor& a, const vvDescriptor& b)
+{
+  // Test temporal overlap
+  if (a.Region.empty() || b.Region.empty())
+    {
+    return false; // No overlap if regions are empty
+    }
+  if (a.Region.begin()->TimeStamp > b.Region.rbegin()->TimeStamp)
+    {
+    return false; // start(a) > end(b)
+    }
+  if (b.Region.begin()->TimeStamp > a.Region.rbegin()->TimeStamp)
+    {
+    return false; // start(b) > end(a)
+    }
+
+  // Test if descriptors were computed for disjoint track sets
+  bool tracksOverlap = true;
+  if (a.TrackIds.size() && b.TrackIds.size())
+    {
+    tracksOverlap = false;
+    size_t i = a.TrackIds.size();
+    while (i-- && !tracksOverlap)
+      {
+      const vvTrackId& at = a.TrackIds[i];
+      size_t j = b.TrackIds.size();
+      while (j--)
+        {
+        if (at == b.TrackIds[j])
+          {
+          // Overlap found
+          tracksOverlap = true;
+          break;
+          }
+        }
+      }
+    }
+
+  // If descriptors were computed for disjoint track sets, we don't consider
+  // that an overlap, even if the tracks happened to cross
+  if (!tracksOverlap)
+    {
+    return false;
+    }
+
+  // Test if any descriptor regions overlap
+  typedef vvDescriptorRegionMap::const_iterator Iterator;
+  foreach_iter (Iterator, iiter, a.Region)
+    {
+    Iterator jiter = b.Region.find(*iiter);
+    if (jiter != b.Region.end())
+      {
+      // Test regions at same time for spatial overlap
+      const vvImageBoundingBox& ir = iiter->ImageRegion;
+      const vvImageBoundingBox& jr = jiter->ImageRegion;
+      if (ir.TopLeft.X > jr.BottomRight.X)
+        {
+        continue; // left(a) > right(b)
+        }
+      if (jr.TopLeft.X > ir.BottomRight.X)
+        {
+        continue; // left(b) > right(a)
+        }
+      if (ir.TopLeft.Y > jr.BottomRight.Y)
+        {
+        continue; // top(a) > bottom(b)
+        }
+      if (jr.TopLeft.Y > ir.BottomRight.Y)
+        {
+        continue; // top(b) > bottom(a)
+        }
+      // If none of the above tests failed, the region intersection is
+      // non-empty, and we have an overlap
+      return true;
+      }
+    }
+
+  // Didn't find an intersection
+  return false;
+}
+
+//-----------------------------------------------------------------------------
+long long vvFakeQuerySessionPrivate::convertTime(const vgTimeStamp& ts)
+{
+  return (ts.HasTime() ? static_cast<long long>(ts.Time) : -1);
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySessionPrivate::resultScoreGreaterThan(
+  const vvQueryResult& a, const vvQueryResult& b)
+{
+  return a.RelevancyScore > b.RelevancyScore;
+}
+
+//END vvFakeQuerySessionPrivate
+
+///////////////////////////////////////////////////////////////////////////////
+
+//BEGIN vvFakeQuerySession
+
+//-----------------------------------------------------------------------------
+vvFakeQuerySession::vvFakeQuerySession(QUrl server)
+  : d_ptr(new vvFakeQuerySessionPrivate(this, server))
+{
+}
+
+//-----------------------------------------------------------------------------
+vvFakeQuerySession::~vvFakeQuerySession()
+{
+  this->shutdown();
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQuerySession::run()
+{
+  QTE_D(vvFakeQuerySession);
+
+  d->eventLoop = new QEventLoop(this);
+
+  // State machine loop
+  bool alive = true;
+  while (alive)
+    {
+    switch (d->op)
+      {
+      case vvFakeQuerySessionPrivate::Shutdown:
+        alive = false;
+        break;
+      case vvFakeQuerySessionPrivate::QueryFormulate:
+        alive = d->stQueryFormulate();
+        break;
+      case vvFakeQuerySessionPrivate::QueryExecute:
+        alive = d->stQueryExecute();
+        break;
+      default:
+        alive = d->stWait();
+        break;
+      }
+    }
+
+  // Clean up
+  delete d->eventLoop;
+  d->eventLoop = 0;
+  emit this->finished();
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQuerySession::notify()
+{
+  if (QThread::currentThread() != this->thread())
+    {
+    QMetaObject::invokeMethod(this, "notify");
+    return;
+    }
+
+  QTE_D(vvFakeQuerySession);
+  d->eventLoop->quit();
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQuerySession::shutdown()
+{
+  CHECK_ARG(this->thread()->isRunning());
+
+  if (QThread::currentThread() != this->thread())
+    {
+    QMetaObject::invokeMethod(this, "shutdown", Qt::QueuedConnection);
+    this->wait();
+    return;
+    }
+
+  QTE_D(vvFakeQuerySession);
+
+  d->op = vvFakeQuerySessionPrivate::Shutdown;
+  this->notify();
+}
+
+//-----------------------------------------------------------------------------
+void vvFakeQuerySession::endQuery()
+{
+  CHECK_ARG(this->thread()->isRunning());
+
+  if (QThread::currentThread() != this->thread())
+    {
+    QMetaObject::invokeMethod(this, "endQuery");
+    return;
+    }
+
+  QTE_D(vvFakeQuerySession);
+
+  // Check if we need to abort a currently-running query
+  if (d->op == vvFakeQuerySessionPrivate::QueryExecute)
+    {
+    d->rawResults.clear();
+    d->mergedResults.clear();
+    d->emitResultSet("Query terminated");
+    }
+
+  d->op = vvFakeQuerySessionPrivate::Wait;
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySession::formulateQuery(vvProcessingRequest request)
+{
+  if (QThread::currentThread() != this->thread())
+    {
+    this->start();
+    QMetaObject::invokeMethod(this, "formulateQuery",
+                              Q_ARG(vvProcessingRequest, request));
+    return true;
+    }
+
+  QTE_D(vvFakeQuerySession);
+
+  d->qfRequest = request;
+  d->op = vvFakeQuerySessionPrivate::QueryFormulate;
+  this->notify();
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySession::processQuery(
+  vvQueryInstance query, int workingSetSize)
+{
+  if (QThread::currentThread() != this->thread())
+    {
+    this->start();
+    QMetaObject::invokeMethod(this, "processQuery",
+                              Q_ARG(vvQueryInstance, query),
+                              Q_ARG(int, workingSetSize));
+    return true;
+    }
+
+  QTE_D(vvFakeQuerySession);
+
+  // Reset internal state (shouldn't be necessary, but just in case...)
+  d->rawResults.clear();
+  d->mergedResults.clear();
+  d->archiveFiles.clear();
+
+  // Locate archive
+  QDir archiveDir(d->server.queryItemValue("Archive"));
+  if (archiveDir.exists())
+    {
+    QStringList filter;
+
+    // Get list of files to process
+    filter.append("*.vqr");
+    foreach (QString archiveFile, archiveDir.entryList(filter))
+      {
+      QFileInfo afi(archiveDir, archiveFile);
+      d->archiveFiles.append(afi.absoluteFilePath());
+      }
+
+    // Store query and reset seed (if applicable) and progress counters
+    d->query = query;
+    if (query.isSimilarityQuery())
+      {
+      d->seed = vvChecksum(query.constSimilarityQuery()->Descriptors);
+      }
+    d->progress = 0.0;
+    d->progressIncrement = 0.7 / (1.0 + d->archiveFiles.count());
+
+    // Begin query execution
+    d->op = vvFakeQuerySessionPrivate::QueryExecute;
+    this->notify();
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySession::requestRefinement(int resultsToScore)
+{
+  if (QThread::currentThread() != this->thread())
+    {
+    this->start();
+    QMetaObject::invokeMethod(this, "requestRefinement",
+                              Q_ARG(int, resultsToScore));
+    return true;
+    }
+
+  QTE_D(vvFakeQuerySession);
+
+  this->postStatus("Requesting scoring results for refinement...", -1.0);
+
+  const int k = d->mergedResults.count();
+  QList<vvQueryResult> srResults;
+
+  if (k <= resultsToScore)
+    {
+    srResults = d->mergedResults;
+    }
+  else
+    {
+    // Pick a subset of the total results at random
+    qsrand(1);
+    QSet<int> picks;
+    while (resultsToScore)
+      {
+      int i = qrand() % k;
+      while (picks.contains(i))
+        {
+        i = (i + 1) % k;
+        }
+      picks.insert(i);
+      --resultsToScore;
+      }
+    foreach (int i, picks)
+      {
+      srResults.append(d->mergedResults[i]);
+      }
+    }
+
+  // Send the results
+  foreach (vvQueryResult result, srResults)
+    {
+    result.Rank = -1;
+    result.PreferenceScore = qtRandD();
+    emit this->resultAvailable(result, true);
+    }
+  emit this->resultSetComplete(true);
+  this->clearStatus();
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+bool vvFakeQuerySession::refineQuery(vvIqr::ScoringClassifiers feedback)
+{
+  if (QThread::currentThread() != this->thread())
+    {
+    this->start();
+    QMetaObject::invokeMethod(this, "refineQuery",
+                              Q_ARG(vvIqr::ScoringClassifiers, feedback));
+    return true;
+    }
+
+  QTE_D(vvFakeQuerySession);
+
+  this->postStatus("Refining query...", -1.0);
+
+  vvIqr::ScoringClassifiers::Iterator fbi = feedback.begin();
+  while (fbi != feedback.end())
+    {
+    (fbi.value() == vvIqr::UnclassifiedExample
+     ? fbi = feedback.erase(fbi)
+     : ++fbi);
+    }
+
+  if (feedback.count())
+    {
+    // Compute hash from feedback to use to rescore results; this will give us
+    // rescoring that is consistent, but also changes based on the feedback
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+    foreach (long long iid, feedback.keys())
+      {
+      stream << iid << feedback[iid];
+      }
+
+    quint16 checksum = qChecksum(data.constData(), data.size());
+    if (checksum != d->lastFeedbackChecksum)
+      {
+      d->seed ^= checksum;
+      d->lastFeedbackChecksum = checksum;
+      }
+    }
+
+  // Rescore the results
+  const double t = d->query.constSimilarityQuery()->SimilarityThreshold;
+  QList<vvQueryResult>::iterator iter = d->mergedResults.begin();
+  while (iter != d->mergedResults.end())
+    {
+    double newScore = 0.0;
+    size_t numDescriptors = iter->Descriptors.size();
+    for (size_t n = 0; n < numDescriptors; ++n)
+      {
+      // Set random seed based on the accumulated feedback (this prevents us
+      // changing scores when no feedback has been provided)
+      quint16 seed = d->seed ^ vvChecksum(iter->Descriptors[n]);
+      qsrand(seed);
+      // Add new score for this descriptor to accumulator
+      // \TODO it would be better if this took the feedback into account in a
+      //       less arbitrary fashion
+      newScore += pow(qtRandD(), 2.0);
+      }
+    newScore /= numDescriptors;
+
+    // Update score, and drop some results
+    if (newScore < t)
+      {
+      iter = d->mergedResults.erase(iter);
+      }
+    else
+      {
+      iter->RelevancyScore = newScore;
+      ++iter;
+      }
+    }
+
+  // Emit remaining result set
+  d->emitResultSet("Refinement completed");
+  return true;
+}
+
+//END vvFakeQuerySession
diff --git a/Plugins/VvQueryService/FakeQueryService/vvFakeQuerySession.h b/Plugins/VvQueryService/FakeQueryService/vvFakeQuerySession.h
new file mode 100644
index 00000000..48d5071a
--- /dev/null
+++ b/Plugins/VvQueryService/FakeQueryService/vvFakeQuerySession.h
@@ -0,0 +1,44 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#ifndef __vvFakeQuerySession_h
+#define __vvFakeQuerySession_h
+
+#include "vvQuerySession.h"
+
+class vvFakeQuerySessionPrivate;
+
+class vvFakeQuerySession : public vvQuerySession
+{
+  Q_OBJECT
+
+public:
+  vvFakeQuerySession(QUrl server);
+  ~vvFakeQuerySession();
+
+public slots:
+  virtual bool formulateQuery(vvProcessingRequest request);
+  virtual bool processQuery(vvQueryInstance query, int workingSetSize);
+  virtual bool requestRefinement(int resultsToScore);
+  virtual bool refineQuery(vvIqr::ScoringClassifiers feedback);
+
+  virtual void endQuery();
+  virtual void shutdown();
+
+protected slots:
+  virtual void notify();
+
+protected:
+  QTE_DECLARE_PRIVATE_RPTR(vvFakeQuerySession)
+
+  virtual void run();
+
+private:
+  QTE_DECLARE_PRIVATE(vvFakeQuerySession)
+};
+
+
+#endif
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..d9424e9a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,18 @@
+#                VIVIA                    #
+VIsion Visualization and ANalysis
+
+--------------------------------------------
+
+VIVIA is an open source C++/Qt project for visualizing video analytics.  It consists 
+of applications designed to allow a user to intereact with surveillance video from a 
+variety of surveillance video sources (Full Motion Video, Wide Area Motion Imagery etc.)
+The VIVIA applications provide User Interfaces for reviewing the results of automated analysis
+of such videos.  These results might include the tracks of moving persons or vehicles or
+the results analyzing the behavior of such tracks.
+
+VIVIA is provided as part of [Kitware's](http://www.kitware.com) [KWIVER Toolkit](http://www.kwiver.org).
+
+For the present, this repository is provided for informational and references purposes only.  In the
+coming months, Kitware will be updating this repository with build instructions, example code and other
+documentation.  Please subscribe to this repository on Github so that you'll be sure to find out about
+updates as soon as they occur.
diff --git a/Tools/CMakeLists.txt b/Tools/CMakeLists.txt
new file mode 100644
index 00000000..1654f548
--- /dev/null
+++ b/Tools/CMakeLists.txt
@@ -0,0 +1,14 @@
+include(${qtExtensions_SOURCE_DIR}/CMake/Modules/UseQtExtensions.cmake)
+
+if(VISGUI_ENABLE_VVIO AND VISGUI_ENABLE_VIDTK)
+  add_subdirectory(ConvertTracks)
+endif()
+
+add_subdirectory(FixHeaderGuards)
+add_subdirectory(MrjTranslator)
+add_subdirectory(QSettingsTool)
+
+option(VISGUI_ENABLE_KML_WRITER "Build kml writer utility" OFF)
+if(KML_WRITER)
+  add_subdirectory(KmlWriter)
+endif()
diff --git a/Tools/ConvertTracks/CMakeLists.txt b/Tools/ConvertTracks/CMakeLists.txt
new file mode 100644
index 00000000..f903527c
--- /dev/null
+++ b/Tools/ConvertTracks/CMakeLists.txt
@@ -0,0 +1,22 @@
+project(convertTracks)
+
+include_directories(SYSTEM
+  ${VIDTK_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
+)
+
+vg_include_library_sdk_directories(qtExtensions)
+
+add_executable(${PROJECT_NAME} convertTracks.cxx)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PRIVATE_INTERFACE_TARGETS
+  vvVidtk
+  vvIO
+  LINK_LIBRARIES LINK_PRIVATE
+  vidtk_tracking
+  vul
+  ${QT_LIBRARIES}
+)
+
+install_executable_target(${PROJECT_NAME} Tools)
diff --git a/Tools/ConvertTracks/convertTracks.cxx b/Tools/ConvertTracks/convertTracks.cxx
new file mode 100644
index 00000000..72acb7cd
--- /dev/null
+++ b/Tools/ConvertTracks/convertTracks.cxx
@@ -0,0 +1,150 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <vcl_string.h>
+
+#include <vul/vul_arg.h>
+
+#include <tracking_data/io/kw18_reader.h>
+
+#include <qtKstReader.h>
+#include <qtStlUtil.h>
+
+#include <vvAdaptVidtk.h>
+
+#include <vvTrack.h>
+#include <vvHeader.h>
+#include <vvWriter.h>
+
+#include <QFile>
+#include <QMap>
+
+//-----------------------------------------------------------------------------
+int
+main(int argc, char** argv)
+{
+  vul_arg<vcl_string> argOutputFileName(
+    "-o", "(REQUIRED) Path to output file");
+  vul_arg<vcl_string> argInputTracksFileName(
+    "-t", "(REQUIRED) Path to input .kw18 file");
+  vul_arg<vcl_string> argInputTocFileName(
+    "-p", "Path to input .pvo.txt file");
+  vul_arg<int> argTrackSource(
+    "--source", "Track source ID (default = 1)");
+
+  vul_arg_parse(argc, argv);
+
+  if (argOutputFileName() == "")
+    {
+    vcl_cerr << "Output file name is required\n";
+    argOutputFileName.display_usage_and_exit();
+    }
+  if (argInputTracksFileName() == "")
+    {
+    vcl_cerr << "Input file name is required\n";
+    argOutputFileName.display_usage_and_exit();
+    }
+
+  QMap<vvTrackId, vvTrack> tracks;
+
+  // Open track input file and read tracks
+  vcl_cout << "Reading tracks from " << argInputTracksFileName() << "... ";
+  vcl_cout.flush();
+  vidtk::kw18_reader trackReader(argInputTracksFileName().c_str());
+  vcl_vector<vidtk::track_sptr> vidtkTracks;
+  if (!trackReader.read(vidtkTracks))
+    {
+    vcl_cerr << "FAILED\n";
+    return EXIT_FAILURE;
+    }
+  vcl_cout << "OK (read " << vidtkTracks.size() << " tracks)\n";
+  if (vidtkTracks.size() == 0)
+    {
+    vcl_cerr << "Exiting without writing to output file"
+                " because no tracks were read!\n";
+    return EXIT_SUCCESS;
+    }
+
+  // Convert tracks to VisGUI format (i.e. vvTrack)
+  for (size_t i = 0; i < vidtkTracks.size(); ++i)
+    {
+    vidtk::track& vt = *vidtkTracks[i];
+
+    vvTrack track;
+    track.Id = vvTrackId(argTrackSource(), vt.id());
+
+    const vcl_vector<vidtk::track_state_sptr>& h = vt.history();
+    for (size_t j = 0; j < h.size(); ++j)
+      {
+      // vvTrack can't store multiple states per time, so just take the first
+      // state (we only expect one under normal circumstances, anyway)
+      track.Trajectory.insert(vvAdapt(*h[j]).first());
+      }
+
+    tracks.insert(track.Id, track);
+    }
+
+  // Open P/V/O input file (if given) and read TOC's
+  if (argInputTocFileName.set())
+    {
+    vcl_cout << "Reading TOC's from " << argInputTocFileName() << "... ";
+    vcl_cout.flush();
+    QUrl uri = QUrl::fromLocalFile(qtString(argInputTocFileName()));
+    qtKstReader tocReader(uri, QRegExp("\\s+"), QRegExp("\n"));
+    if (!tocReader.isValid())
+      {
+      vcl_cerr << "FAILED\n";
+      return EXIT_FAILURE;
+      }
+    vcl_cout << "OK (read " << tocReader.recordCount() << " TOC's)\n";
+
+    while (!tocReader.isEndOfFile())
+      {
+      long long trackSerialNumber;
+      double pPerson, pVehicle, pOther;
+      if (tocReader.readLong(trackSerialNumber, 0) &&
+          tocReader.readReal(pPerson, 1) &&
+          tocReader.readReal(pVehicle, 2) &&
+          tocReader.readReal(pOther, 3))
+        {
+        vvTrackId tid(argTrackSource(), trackSerialNumber);
+        if (tracks.contains(tid))
+          {
+          vvTrack& track = tracks[tid];
+          track.Classification.insert(
+            std::make_pair(std::string("Person"), pPerson));
+          track.Classification.insert(
+            std::make_pair(std::string("Vehicle"), pVehicle));
+          track.Classification.insert(
+            std::make_pair(std::string("Other"), pOther));
+          }
+        else
+          {
+          vcl_cerr << "WARNING: no match for track " << trackSerialNumber
+                   << " while mapping TOC's to tracks\n";
+          }
+        }
+      tocReader.nextRecord();
+      }
+    }
+
+  // Open output file
+  vcl_cout << "Writing tracks to " << argOutputFileName() << "... ";
+  vcl_cout.flush();
+  QFile of(argOutputFileName().c_str());
+  if (!of.open(QIODevice::WriteOnly | QIODevice::Text))
+    {
+    vcl_cerr << "FAILED\n";
+    return EXIT_FAILURE;
+    }
+  vvWriter writer(of);
+
+  // Write output file
+  writer << vvHeader::Descriptors << tracks.values();
+  vcl_cout << "OK\n";
+
+  return EXIT_SUCCESS;
+}
diff --git a/Tools/FixHeaderGuards/CMakeLists.txt b/Tools/FixHeaderGuards/CMakeLists.txt
new file mode 100644
index 00000000..66a5e4ef
--- /dev/null
+++ b/Tools/FixHeaderGuards/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(fixHeaderGuards)
+
+add_executable(${PROJECT_NAME} fixHeaderGuards.cxx)
+
+target_link_libraries(${PROJECT_NAME}
+  ${QT_LIBRARIES}
+)
diff --git a/Tools/FixHeaderGuards/fixHeaderGuards.cxx b/Tools/FixHeaderGuards/fixHeaderGuards.cxx
new file mode 100644
index 00000000..f9c6397a
--- /dev/null
+++ b/Tools/FixHeaderGuards/fixHeaderGuards.cxx
@@ -0,0 +1,177 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <cstdio>
+
+#include <QApplication>
+#include <QFile>
+#include <QFileInfo>
+#include <QRegExp>
+#include <QString>
+#include <QStringList>
+#include <QTextStream>
+
+QTextStream* qerr;
+
+enum
+{
+  ERR_NONE = 0,
+  ERR_BAD_ARGS,
+  ERR_DOES_NOT_EXIST,
+  ERR_IO
+};
+
+//-----------------------------------------------------------------------------
+QString formatGuard(QString format, QString fileName)
+{
+  fileName.replace(QRegExp("[^A-Za-z0-9_]"), "_");
+
+  // Find and replace placeholders
+  QRegExp re("%[^%]*%");
+  int n;
+  while ((n = re.indexIn(format)) >= 0)
+    {
+    // Extract placeholder format
+    bool uc = false, lc = false;
+    QString f = re.cap(0);
+    f = f.mid(1, f.length() - 2);
+    if (f.startsWith('l', Qt::CaseInsensitive))
+      {
+      f = f.mid(1);
+      lc = true;
+      }
+    else if (f.startsWith('u', Qt::CaseInsensitive))
+      {
+      f = f.mid(1);
+      uc = true;
+      }
+
+    int start = 0;
+    int length = -1;
+
+    QString ns = f.left(f.indexOf(':'));
+    if (!ns.isEmpty() || f.startsWith(':'))
+      {
+      start = ns.toInt();
+      (start < 0) && (start = fileName.length() + start);
+      ns = f.mid(ns.length() + 1);
+      if (!ns.isEmpty())
+        {
+        length = ns.toInt();
+        (length < 0) && (length = fileName.length() + length - start);
+        }
+      }
+
+    // Replace placeholder
+    QString rp = fileName.mid(start, length);
+    lc && (rp = rp.toLower(), true);
+    uc && (rp = rp.toUpper(), true);
+    format.replace(n, re.matchedLength(), rp);
+    }
+
+  return format;
+}
+
+//-----------------------------------------------------------------------------
+int fixHeaderGuards(const QString& format, const QString& fileName)
+{
+  QFile file(fileName);
+  if (!file.exists())
+    {
+    *qerr << "Error: File \"" << fileName << "\" not found.\n";
+    return ERR_DOES_NOT_EXIST;
+    }
+  if (!file.open(QIODevice::ReadWrite | QIODevice::Text))
+    {
+    *qerr << "Error: Unable to open file \"" << fileName << "\": "
+          << file.errorString() << '\n';
+    return ERR_IO;
+    }
+
+  QString guard = formatGuard(format, QFileInfo(file).fileName());
+
+  bool c = false, d = false, e = false;
+  QRegExp cre("^(\\s*#ifndef\\s+)([A-Za-z0-9_]+)(\\s+.*)?$");
+  QRegExp dre("^(\\s*#define\\s+)([A-Za-z0-9_]+)(\\s+.*)?$");
+  QRegExp ere;
+
+  QStringList lines;
+  while (!file.atEnd())
+    {
+    QString line = QString::fromUtf8(file.readLine());
+    // Replace 'ifndef' of guard
+    if (!c && cre.exactMatch(line))
+      {
+      line = cre.cap(1) + guard + cre.cap(3);
+      ere = QRegExp("^(\\s*#endif\\s*//\\s*)" + cre.cap(2) + "(.*)$");
+      e = true;
+      c = true;
+      }
+    // Replace 'define' of guard
+    if (!d && dre.exactMatch(line))
+      {
+      line = dre.cap(1) + guard + dre.cap(3);
+      d = true;
+      }
+    // Replace 'endif' of guard
+    if (e && ere.exactMatch(line))
+      {
+      line = ere.cap(1) + guard + ere.cap(3);
+      }
+    lines << line;
+    }
+
+  file.seek(0);
+  file.resize(0);
+  file.write(lines.join(QString()).toUtf8());
+
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  QApplication app(argc, argv);
+
+  // Set up QTextStream to stderr
+  QFile ferr;
+  ferr.open(stderr, QIODevice::WriteOnly | QIODevice::Text);
+  QScopedPointer<QTextStream> qerrPtr(new QTextStream(&ferr));
+  qerr = qerrPtr.data();
+
+  // Check arguments
+  QStringList files = app.arguments();
+  if (files.count() < 3)
+    {
+    *qerr << "Usage: " << QFileInfo(files[0]).fileName()
+          << " <format> <file> [<file>...]\n";
+    return ERR_BAD_ARGS;
+    }
+
+  // Get format and list of files
+  files.removeFirst();
+  QString format = files.takeFirst();
+
+  // Check format is valid
+  if (!format.contains(QRegExp("%[^%]*%")))
+    {
+    *qerr << "Invalid format \"" << format << "\".\n"
+          << "Format must contain at least one placeholder sequence.\n";
+    return ERR_BAD_ARGS;
+    }
+
+  // Adjust files
+  foreach (QString fname, files)
+    {
+    int result = fixHeaderGuards(format, fname);
+    if (result)
+      {
+      return result;
+      }
+    }
+
+  return 0;
+}
diff --git a/Tools/KmlWriter/CMakeLists.txt b/Tools/KmlWriter/CMakeLists.txt
new file mode 100644
index 00000000..cfb7958b
--- /dev/null
+++ b/Tools/KmlWriter/CMakeLists.txt
@@ -0,0 +1,16 @@
+project(KmlWriter)
+
+set(SRCS KmlWriter.cxx)
+
+# KML is required.
+find_package(KML REQUIRED)
+
+include_directories(SYSTEM
+  ${KML_INCLUDE_DIRS}
+)
+
+add_executable(${PROJECT_NAME} ${SRCS})
+
+target_link_libraries(${PROJECT_NAME} ${KML_LIBRARY})
+
+install_executable_target(${PROJECT_NAME} Tools)
diff --git a/Tools/KmlWriter/KmlWriter.cxx b/Tools/KmlWriter/KmlWriter.cxx
new file mode 100644
index 00000000..4864f599
--- /dev/null
+++ b/Tools/KmlWriter/KmlWriter.cxx
@@ -0,0 +1,246 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <iostream>
+#include <fstream>
+#include <string>
+#include <vector>
+#include <sstream>
+
+// KML includes.
+#include "kml/dom.h"
+#include "kml/dom/kml22.h"
+#include "kml/base/color32.h"
+#include "kml/engine/kmz_file.h"
+#include "kml/engine/kml_file.h"
+
+using std::stringstream;
+using kmldom::ColorStylePtr;
+using kmldom::CoordinatesPtr;
+using kmldom::DocumentPtr;
+using kmldom::FolderPtr;
+using kmldom::GroundOverlayPtr;
+using kmldom::IconPtr;
+using kmldom::InnerBoundaryIsPtr;
+using kmldom::KmlPtr;
+using kmldom::KmlFactory;
+using kmldom::LatLonBoxPtr;
+using kmldom::LinearRingPtr;
+using kmldom::LineStringPtr;
+using kmldom::LineStylePtr;
+using kmldom::LodPtr;
+using kmldom::MultiGeometryPtr;
+using kmldom::OuterBoundaryIsPtr;
+using kmldom::OverlayXYPtr;
+using kmldom::PlacemarkPtr;
+using kmldom::PointPtr;
+using kmldom::PolygonPtr;
+using kmldom::PolyStylePtr;
+using kmldom::RegionPtr;
+using kmldom::ScreenOverlayPtr;
+using kmldom::ScreenXYPtr;
+using kmldom::SizePtr;
+using kmldom::StylePtr;
+using kmldom::NetworkLinkPtr;
+using kmldom::LinkPtr;
+using kmldom::TimeSpanPtr;
+
+// Meta data file needs be a CSV with four columns as described below:
+// "title", "movie file", "lat", "lon"
+// The title is the tag that will be shown on maps or google earth,
+// movie file is the one thats going to be played inside the baloon
+// at location given by lat, lon.
+
+//-----------------------------------------------------------------------------
+void PrintHelp()
+{
+  std::cout << "Usage: KmlWriter [metadata file] [output file]\n";
+}
+
+//-----------------------------------------------------------------------------
+void Split(const std::string& line, char c, std::vector<std::string>& rowData)
+{
+  int i = 0;
+  int j = line.find(c);
+
+  while (j >= 0)
+    {
+    if (j == 0)
+      {
+      rowData.push_back("");
+      }
+    else
+      {
+      rowData.push_back(line.substr(i, j - i));
+      }
+
+    i = ++j;
+
+    j = line.find(c, i);
+
+
+    if (j < 0)
+      {
+      rowData.push_back(line.substr(i, line.length()));
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+int LoadCSV(std::vector<std::vector<std::string>*>& data,
+            const char* metaDataFileName)
+{
+  std::ifstream in(metaDataFileName);
+
+  if (!in)
+    {
+    return EXIT_FAILURE;
+    }
+
+  std::vector<std::string>* p = NULL;
+  std::string tmp;
+
+  while (!in.eof())
+    {
+    std::getline(in, tmp, '\n');
+
+    if (tmp.empty())
+      {
+      continue;
+      }
+
+    p = new std::vector<std::string>();
+
+    Split(tmp, ',', *p);
+
+    data.push_back(p);
+
+    tmp.clear();
+    }
+
+  return EXIT_SUCCESS;
+}
+
+// Description:
+//-----------------------------------------------------------------------------
+std::string CreateVideoDescription(const std::string& videoFileName)
+{
+  std::string returnString =
+    std::string(" <div style=\"width:350px\", id=\"clock\"></div>\n\
+			<EMBED id=\"vlc\" type=\"application/x-vlc-plugin\" ") +
+    std::string("SRC=\"") + videoFileName +
+    std::string("\" width=320 height=310 name=\"video2\" autoplay=\"yes\" loop=\"no\">\n\
+			</EMBED>\n\
+					<br />\n\
+						<script type=\"text/javascript\">\n\
+							function mute()\n\
+							{\n\
+								vlc.audio.toggleMute();\n\
+							}\n\
+							function play()\n\
+							{\n\
+								vlc.playlist.play();\n\
+							}\n\
+							function stop()\n\
+							{\n\
+								vlc.playlist.stop();\n\
+							}\n\
+							function pause()\n\
+							{\n\
+								vlc.playlist.togglePause();\n\
+							}\n\
+						</script>\n\
+					<br />\n\
+			</div>\n\
+			<div id=\"controls\">\n\
+				<input type=\"button\" onclick=\"play()\" value=\"Play\" />\n\
+				<input type=\"button\" onclick=\"pause()\" value=\"Pause\" />\n\
+				<input type=\"button\" onclick=\"stop()\" value=\"Stop\" />\n\
+				<input type=\"button\" onclick=\"mute()\" value=\"Mute\" />\n\
+			</div>\n");
+
+  return returnString;
+}
+
+// Description:
+// Takes meta data file and output file name to generate KML.
+//-----------------------------------------------------------------------------
+int WriteKML(const char* metaDataFileName, const char* outKMLFileName)
+{
+  // First create the factory.
+  KmlFactory* factory = KmlFactory::GetFactory();
+
+  // Create KML.
+  KmlPtr kml = factory->CreateKml();
+
+  // Create document.
+  DocumentPtr doc = factory->CreateDocument();
+
+  // Now set document as feature.
+  kml->set_feature(doc);
+
+  //
+  std::vector<std::vector<std::string>*> Data;
+
+  // Load CSV.
+  LoadCSV(Data, metaDataFileName);
+
+  for (size_t i = 0; i < Data.size(); ++i)
+    {
+
+    std::vector<std::string>* rowData = Data[i];
+
+    // Crate a new place mark.
+    PointPtr          point        = factory->CreatePoint();
+    PlacemarkPtr      placemark    = factory->CreatePlacemark();
+    CoordinatesPtr    coordinates  = factory->CreateCoordinates();
+
+    double xy[2];
+    std::istringstream iss1(rowData->at(2));
+    std::istringstream iss2(rowData->at(3));
+
+    iss1 >> xy[0];
+    iss2 >> xy[1];
+
+    coordinates->add_latlngalt(xy[0], xy[1], 0.0);
+    point->set_coordinates(coordinates);
+
+    placemark->set_geometry(point);
+    placemark->set_name(rowData->at(0));
+    placemark->set_description(CreateVideoDescription(rowData->at(1)));
+
+    doc->add_feature(placemark);
+    }
+
+  std::ofstream out(outKMLFileName);
+  if (out.good())
+    {
+    doc->set_name(outKMLFileName);
+    out << kmldom::SerializePretty(kml);
+    out.flush();
+    out.close();
+
+    return EXIT_SUCCESS;
+    }
+  else
+    {
+    out.close();
+    std::cerr << "Error writing data to output stream." << std::endl;
+    return EXIT_FAILURE;
+    }
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  if (argc < 3)
+    {
+    PrintHelp();
+    return EXIT_FAILURE;
+    }
+
+  return WriteKML(argv[1], argv[2]);
+}
diff --git a/Tools/Mrj2Png/CMakeLists.txt b/Tools/Mrj2Png/CMakeLists.txt
new file mode 100644
index 00000000..e6a56ba4
--- /dev/null
+++ b/Tools/Mrj2Png/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(mrj2png)
+
+include_directories(
+  ${vtkVgCore_SOURCE_DIR}
+)
+
+add_executable(${PROJECT_NAME} main.cxx)
+
+target_link_libraries(${PROJECT_NAME}
+  vtkVgCore
+  vtkCommon
+  vtkFiltering
+  vtkIO
+  vtkImaging
+)
+
+install_executable_target(${PROJECT_NAME} Tools)
diff --git a/Tools/Mrj2Png/main.cxx b/Tools/Mrj2Png/main.cxx
new file mode 100644
index 00000000..6bfa9d6f
--- /dev/null
+++ b/Tools/Mrj2Png/main.cxx
@@ -0,0 +1,112 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <vtkstd/string>
+#include <vtksys/CommandLineArguments.hxx>
+#include <vtksys/Directory.hxx>
+#include <vtksys/Glob.hxx>
+#include <vtksys/Process.h>
+#include <vtksys/SystemTools.hxx>
+
+#include <vtkImageData.h>
+#include <vtkPNGWriter.h>
+#include <vtkSmartPointer.h>
+#include <vtkSortFileNames.h>
+#include <vtkStringArray.h>
+
+#include <vtkVgImageSource.h>
+#include <vtkVgMultiResJpgImageReader2.h>
+
+#ifdef _WIN32
+  #define strcasecmp _stricmp
+#endif
+
+#include <cstdlib>
+
+//----------------------------------------------------------------------------
+void ConvertToPNG(const char* inFile, const char* outFile, int level)
+{
+  vtkSmartPointer<vtkPNGWriter> writer = vtkSmartPointer<vtkPNGWriter>::New();
+  writer->SetFileName(outFile);
+
+  vtkStdString ext = vtksys::SystemTools::GetFilenameLastExtension(inFile);
+
+  if (strcasecmp(ext.c_str(), ".mrj") == 0)
+    {
+    vtkSmartPointer<vtkVgMultiResJpgImageReader2> reader =
+      vtkSmartPointer<vtkVgMultiResJpgImageReader2>::New();
+    reader->SetFileName(inFile);
+    reader->SetLevel(level);
+    writer->SetInput(reader->GetOutput());
+    }
+  else
+    {
+    std::cerr << "Files of type " << ext << " are not handled as of now."
+              << std::endl;
+    exit(1);
+    }
+
+  writer->Write();
+}
+
+//----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  vtksys::CommandLineArguments args;
+  args.Initialize(argc, argv);
+  args.StoreUnusedArguments(1);
+
+  int level = 0;
+  vtkStdString outDir;
+
+  args.AddArgument("-l", vtksys::CommandLineArguments::SPACE_ARGUMENT,
+                   &level, "Level of Detail (0-5; default 0 (highest))");
+  args.AddArgument("-o", vtksys::CommandLineArguments::SPACE_ARGUMENT,
+                   &outDir, "Output directory");
+
+  if (!args.Parse() || (args.GetUnusedArguments(&argc, &argv), argc < 2))
+    {
+    cout << "Usage: " << vtksys::SystemTools::GetFilenameName(args.GetArgv0())
+         << " [options] <file> [<file> ...]"
+         << endl << args.GetHelp() << endl;
+    return 1;
+    }
+
+  if (outDir.length() && outDir[outDir.length() - 1] != '/')
+    {
+    outDir += '/';
+    }
+
+  // Process files
+  for (int i = 1; i < argc; i++)
+    {
+    const char* inputFile = argv[i];
+    vtkStdString outputFilePath =
+      vtksys::SystemTools::GetFilenameWithoutLastExtension(inputFile) + ".png";
+    if (outDir.size())
+      {
+      outputFilePath = outDir + outputFilePath;
+      }
+    else
+      {
+      vtkStdString inputFileDir =
+        vtksys::SystemTools::GetFilenamePath(inputFile);
+      if (inputFileDir.size())
+        {
+        if (inputFileDir != "/")
+          {
+          inputFileDir += '/';
+          }
+        outputFilePath = inputFileDir + outputFilePath;
+        }
+      }
+
+    // Last argument is the compression quality.
+    ConvertToPNG(inputFile, outputFilePath.c_str(), level);
+    }
+
+  return 0;
+}
diff --git a/Tools/MrjTranslator/CMakeLists.txt b/Tools/MrjTranslator/CMakeLists.txt
new file mode 100644
index 00000000..d624f856
--- /dev/null
+++ b/Tools/MrjTranslator/CMakeLists.txt
@@ -0,0 +1,22 @@
+cmake_minimum_required(VERSION 2.8)
+
+project(mrjTranslator)
+
+set(srcs MrjTranslator.cxx
+)
+
+add_executable(${PROJECT_NAME} ${srcs})
+
+vg_add_dependencies(${PROJECT_NAME}
+  PUBLIC_INTERFACE_TARGETS
+  vtkVgCore
+  LINK_LIBRARIES LINK_PRIVATE
+  vtkVgCore
+  vtkCommonCore
+  vtkFiltersGeneral
+  vtkIOCore
+  vtkIOImage
+  vtkImagingCore
+)
+
+install_executable_target(${PROJECT_NAME} Tools)
diff --git a/Tools/MrjTranslator/MrjTranslator.cxx b/Tools/MrjTranslator/MrjTranslator.cxx
new file mode 100644
index 00000000..f57c6a06
--- /dev/null
+++ b/Tools/MrjTranslator/MrjTranslator.cxx
@@ -0,0 +1,146 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+// VTK includes.
+#include <vtksys/CommandLineArguments.hxx>
+#include <vtksys/Directory.hxx>
+#include <vtksys/SystemTools.hxx>
+#include <vtksys/Glob.hxx>
+#include <vtksys/Process.h>
+
+#include <vtkImageShrink3D.h>
+#include <vtkImageReader2.h>
+#include <vtkImageWriter.h>
+#include <vtkImageData.h>
+#include <vtkVgMultiResJpgImageWriter2.h>
+#include <vtkPNGReader.h>
+#include <vtkSmartPointer.h>
+#include <vtkSortFileNames.h>
+#include <vtkStringArray.h>
+#include <vtkTIFFReader.h>
+#include <vtkTimerLog.h>
+#include <vtkVgImageSource.h>
+
+// STL includes.
+#include <stdlib.h>
+#include <cstdlib>
+#include <algorithm>
+#include <sstream>
+#include <string>
+
+#ifdef _WIN32
+#define strcasecmp _stricmp
+#endif
+
+//----------------------------------------------------------------------------
+void ConvertToMultiResJpg(const char* inFile, const char* outFile,
+                          int compressionQuality)
+{
+  vtkSmartPointer<vtkVgMultiResJpgImageWriter2>
+  writer = vtkSmartPointer<vtkVgMultiResJpgImageWriter2>::New();
+  writer->SetFileName(outFile);
+
+  if (compressionQuality > 0)
+    {
+    writer->SetCompressionQuality(compressionQuality);
+    }
+
+  std::string ext = vtksys::SystemTools::GetFilenameLastExtension(inFile);
+
+  if (strcasecmp(ext.c_str(), ".png") == 0)
+    {
+    vtkSmartPointer<vtkPNGReader> reader = vtkSmartPointer<vtkPNGReader>::New();
+    reader->SetFileName(inFile);
+    reader->Update();
+    writer->SetInputData(reader->GetOutputDataObject(0));
+    }
+  else if (strcasecmp(ext.c_str(), ".tif") == 0 ||
+           strcasecmp(ext.c_str(), ".tiff") == 0)
+    {
+    vtkSmartPointer<vtkTIFFReader> reader =
+      vtkSmartPointer<vtkTIFFReader>::New();
+    reader->SetFileName(inFile);
+    writer->SetInputConnection(reader->GetOutputPort());
+    }
+  else if (strcasecmp(ext.c_str(), ".jp2") == 0)
+    {
+    vtkSmartPointer<vtkVgImageSource> reader =
+      vtkSmartPointer<vtkVgImageSource>::New();
+    reader->SetFileName(inFile);
+    reader->Update();
+    writer->SetInputData(reader->GetOutputDataObject(0));
+    }
+  else
+    {
+    std::cerr << "Files of type " << ext << " are not handled as of now."
+              << std::endl;
+    std::exit(1);
+    }
+
+  writer->Write();
+}
+
+int main(int argc, char** argv)
+{
+  vtksys::CommandLineArguments args;
+  args.Initialize(argc, argv);
+  args.StoreUnusedArguments(1);
+
+  int quality = 75;
+  std::string outDir;
+
+  args.AddArgument("-q", vtksys::CommandLineArguments::SPACE_ARGUMENT,
+                   &quality, "Quality (0-100; default 75)");
+  args.AddArgument("-o", vtksys::CommandLineArguments::SPACE_ARGUMENT,
+                   &outDir, "Output directory");
+
+  if (!args.Parse() || (args.GetUnusedArguments(&argc, &argv), argc < 2))
+    {
+    cout << "Usage: " << vtksys::SystemTools::GetFilenameName(args.GetArgv0())
+         << " [options] <file> [<file> ...]"
+         << endl << args.GetHelp() << endl;
+    return 1;
+    }
+
+  if (outDir.length() && outDir[outDir.length() - 1] != '/')
+    {
+    outDir += '/';
+    }
+
+  // Process files
+  vtkSmartPointer<vtkTimerLog> log = vtkSmartPointer<vtkTimerLog>::New();
+  for (int i = 1; i < argc; i++)
+    {
+    const char* inputFile = argv[i];
+    std::string outputFilePath =
+      vtksys::SystemTools::GetFilenameWithoutLastExtension(inputFile) + ".mrj";
+    if (outDir.size())
+      {
+      outputFilePath = outDir + outputFilePath;
+      }
+    else
+      {
+      std::string inputFileDir =
+        vtksys::SystemTools::GetFilenamePath(inputFile);
+      if (inputFileDir.size())
+        {
+        if (inputFileDir != "/")
+          {
+          inputFileDir += '/';
+          }
+        outputFilePath = inputFileDir + outputFilePath;
+        }
+      }
+    log->StartTimer();
+
+    // Last argument is the compression quality.
+    ConvertToMultiResJpg(inputFile, outputFilePath.c_str(), quality);
+    log->StopTimer();
+    cerr << i << ", " << log->GetElapsedTime() << endl;
+    }
+
+  return 0;
+}
diff --git a/Tools/QSettingsTool/CMakeLists.txt b/Tools/QSettingsTool/CMakeLists.txt
new file mode 100644
index 00000000..6f554cc9
--- /dev/null
+++ b/Tools/QSettingsTool/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(qsettings-tool)
+
+add_executable(${PROJECT_NAME} qsettingsTool.cxx)
+
+vg_add_dependencies(${PROJECT_NAME}
+  PRIVATE_INTERFACE_TARGETS
+  qtExtensions
+  LINK_LIBRARIES LINK_PRIVATE
+  ${QT_LIBRARIES}
+)
+
+install_executable_target(${PROJECT_NAME} Tools)
diff --git a/Tools/QSettingsTool/qsettingsTool.cxx b/Tools/QSettingsTool/qsettingsTool.cxx
new file mode 100644
index 00000000..e56bc4f0
--- /dev/null
+++ b/Tools/QSettingsTool/qsettingsTool.cxx
@@ -0,0 +1,287 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QFileInfo>
+#include <QScopedPointer>
+#include <QSettings>
+#include <QStringList>
+
+#include <qtCliArgs.h>
+#include <qtCliOptions.h>
+#include <qtMap.h>
+
+#define CHECK_FILE_ARG(_n) \
+  if (!checkFileArg(_n, args)) return 1
+
+#define qOut() QTextStream(stdout, QIODevice::WriteOnly)
+
+typedef int (*Command)(QSettings&, const QStringList&);
+
+static qtCliArgs* gArgs = 0;
+
+//-----------------------------------------------------------------------------
+class QDebugWithNewline : public QDebug
+{
+public:
+  inline QDebugWithNewline(const QDebug& other) : QDebug(other) {}
+  inline ~QDebugWithNewline() { this->nospace() << '\n'; }
+};
+
+//-----------------------------------------------------------------------------
+static QDebugWithNewline error()
+{
+  static QFile err;
+  err.isOpen() || err.open(stderr, QIODevice::WriteOnly);
+
+  static const QString prefix = QString("%1:").arg(gArgs->executableName());
+  return QDebugWithNewline(QDebug(&err) << qPrintable(prefix));
+}
+
+//-----------------------------------------------------------------------------
+static QString joinSorted(QStringList list, const QString& sep)
+{
+  qSort(list);
+  return list.join(sep);
+}
+
+//-----------------------------------------------------------------------------
+void copyValue(const QString& key, QSettings* dst, const QSettings* src)
+{
+  dst->setValue(key, src->value(key));
+}
+
+//-----------------------------------------------------------------------------
+void ignoreArgs(const char* command, const QStringList& args, int required)
+{
+  const int given = args.count();
+  if (given > required)
+    {
+    const QString prefix = QString("%1: warning:").arg(command);
+    const int extra = given - required;
+    qWarning() << qPrintable(prefix) << "was passed" << given
+               << "arguments, but only" << required << "required";
+    qWarning() << qPrintable(prefix) << "ignoring" << extra
+               << (extra > 1 ? "extra arguments" : "extra argument");
+    }
+}
+
+//-----------------------------------------------------------------------------
+bool checkFileArg(const char* command, const QStringList& args)
+{
+  ignoreArgs(command, args, 1);
+
+  QFileInfo fi(args.first());
+  if (!fi.exists())
+    {
+    qWarning() << qPrintable(QString("%1: error:").arg(command))
+               << "input file" << args.first() << "not found";
+    return false;
+    }
+
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+static void showValue(QSettings& store, const QString& key, QString prefix)
+{
+  if (!prefix.isEmpty())
+    {
+    prefix = prefix.mid(1) + key + '=';
+    }
+
+  QVariant data = store.value(key);
+  if (!data.isNull())
+    {
+    if (data.canConvert(QVariant::String))
+      {
+      qOut() << prefix << data.toString() << '\n';
+      }
+    else
+      {
+      qOut() << prefix << "<value cannot be represented textually>\n";
+      }
+    }
+}
+
+//-----------------------------------------------------------------------------
+static void showGroup(QSettings& store, const QString& key, QString prefix)
+{
+  if (!key.isEmpty())
+    {
+    store.beginGroup(key);
+    prefix += key + '/';
+    }
+
+  foreach (const QString& ckey, store.childKeys())
+    showValue(store, ckey, prefix);
+  foreach (const QString& group, store.childGroups())
+    showGroup(store, group, prefix);
+
+  if (!key.isEmpty())
+    {
+    store.endGroup();
+    }
+}
+
+//-----------------------------------------------------------------------------
+static void showKey(
+  QSettings& store, const QString& key, const QString& prefix)
+{
+  if (key.isEmpty() || store.childGroups().contains(key))
+    {
+    showGroup(store, key, prefix + '/');
+    }
+  else
+    {
+    showValue(store, key, QString());
+    }
+}
+
+//-----------------------------------------------------------------------------
+static int commandImport(QSettings& store, const QStringList& args)
+{
+  CHECK_FILE_ARG("import");
+
+  QSettings overlay(args.first(), QSettings::IniFormat);
+  qtUtil::map(overlay.allKeys(), &copyValue, &store, &overlay);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+static int commandReplace(QSettings& store, const QStringList& args)
+{
+  CHECK_FILE_ARG("replace");
+
+  QSettings overlay(args.first(), QSettings::IniFormat);
+  store.clear();
+  qtUtil::map(overlay.allKeys(), &copyValue, &store, &overlay);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+static int commandSet(QSettings& store, const QStringList& args)
+{
+  if (args.count() < 2)
+    {
+    error() << "set: insufficient arguments";
+    error() << "Usage: set <key> <value>";
+    return 1;
+    }
+  ignoreArgs("set", args, 2);
+
+  store.setValue(args[0], args[1]);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+static int commandUnset(QSettings& store, const QStringList& args)
+{
+  if (args.count() < 1)
+    {
+    error() << "unset: insufficient arguments";
+    error() << "Usage: unset <key>";
+    return 1;
+    }
+  ignoreArgs("unset", args, 1);
+
+  store.remove(args[0]);
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+static int commandShow(QSettings& store, const QStringList& args)
+{
+  ignoreArgs("show", args, 1);
+
+  // Enter specified group
+  QString key = args.value(0, QString()), prefix;
+  int gs;
+  while ((gs = key.indexOf('/')) >= 0)
+    {
+    if (gs + 1 < key.length())
+      {
+      prefix += '/' + key.left(gs);
+      }
+    key = key.mid(gs + 1);
+    }
+
+  // Show requested key or group
+  if (!prefix.isEmpty())
+    {
+    store.beginGroup(prefix.mid(1));
+    showKey(store, key, prefix);
+    store.endGroup();
+    }
+  else
+    {
+    showKey(store, key, QString());
+    }
+  return 0;
+}
+
+//-----------------------------------------------------------------------------
+int main(int argc, char** argv)
+{
+  // Set up About information
+  QCoreApplication::setApplicationName("QSettings Tool");
+  QCoreApplication::setOrganizationName("Kitware");
+  QCoreApplication::setOrganizationDomain("kitware.com");
+  QCoreApplication::setApplicationVersion("1.0");
+
+  // Register commands
+  QHash<QString, Command> commands;
+  commands.insert("import",    &commandImport);
+  commands.insert("replace",   &commandReplace);
+  commands.insert("set",       &commandSet);
+  commands.insert("unset",     &commandUnset);
+  commands.insert("show",      &commandShow);
+
+  // Set up command line options
+  qtCliArgs args(argc, argv);
+  qtCliOptions options;
+  options.add("o").add("organization <name>",
+                       "Organization name of the settings to manipulate",
+                       qtCliOption::Required);
+  options.add("a").add("application <name>",
+                       "Application name of the settings to manipulate");
+  options.add("s").add("system", "Operate in the System scope,"
+                       " rather than User scope");
+
+  const QString joinedCommandNames = joinSorted(commands.keys(), ", ");
+
+  qtCliOptions namedArgs;
+  namedArgs.add("command", "Command to execute; one of " + joinedCommandNames,
+                qtCliOption::Required);
+  namedArgs.add("<args>", "Additional arguments to the command");
+
+  args.addOptions(options);
+  args.addNamedArguments(namedArgs);
+
+  // Parse arguments
+  args.parseOrDie();
+  gArgs = &args;
+
+  // Create the application instance
+  QCoreApplication app(args.qtArgc(), args.qtArgv());
+
+  const QString cname = args.value("command");
+  Command command = commands.value(cname, 0);
+  if (command)
+    {
+    QSettings store(args.isSet("system") ? QSettings::SystemScope
+                                         : QSettings::UserScope,
+                    args.value("organization"),
+                    args.value("application"));
+    return (*command)(store, args.args().mid(1));
+    }
+  else
+    {
+    error() << "error: command" << cname << "not known";
+    return 1;
+    }
+}
diff --git a/Tools/Scripts/allsources.sh b/Tools/Scripts/allsources.sh
new file mode 100755
index 00000000..46318eab
--- /dev/null
+++ b/Tools/Scripts/allsources.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+#kate: indent normal;
+
+# Note: contrary to the name, this script doesn't find "all" sources, but
+# rather tries to find all files that should have Kitware copyright statements.
+# It isn't perfect (and doesn't need to be), but should have a fairly low false
+# positive rate.
+
+cd $(dirname "$0")
+if ! [ "$(git rev-parse --is-inside-work-tree)" = "true" ]; then
+    echo "couldn't find repository root" >&2
+    exit 1
+fi
+rel="$(git rev-parse --show-cdup)"
+cd "${rel-.}"
+
+find . \
+    -type d \( -name QtTestingSupport -o -name '.kde*' -o -name .git \) \
+        -prune -false \
+    -o \! \( -type d -o -name '*.ui' -o -name '*.qrc' -o -name '*.xml' \
+             -o -name 'CMakeLists.txt' -o -name '*.cmake' \
+             -o -name '*.png' -o -name '*.svg' -o -name '*.dot' \
+             -o -name '*.prj'  -o -name '*.prj.in' \
+             -o -name 'jmem_src.c' -o -name 'testdata.kst' \
+             -o -name '*.kdev*' -o -name .gitignore -o -name .gitattributes \) \
+    -print | cut -c3-
diff --git a/Tools/Scripts/checkHeaderGuards.sh b/Tools/Scripts/checkHeaderGuards.sh
new file mode 100755
index 00000000..3378a0f9
--- /dev/null
+++ b/Tools/Scripts/checkHeaderGuards.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+color=
+names=
+if [ "$1" = '--color' ]; then
+    color=1
+    shift 1
+elif [ "$1" = '--names' ]; then
+    names=1
+    shift 1
+fi
+
+if [ -z "$1" ]; then
+    if [ "$(git rev-parse --is-inside-work-tree 2>&-)" != "true" ]; then
+        echo "Must either specify a directory or run from within the git" >&2
+        echo "work tree!" >&2
+        exit 1
+    fi
+    cd "./$(git rev-parse --show-cdup)"
+    root=.
+elif ! [ -d "$1" ]; then
+    echo "Error: \"$1\" does not seem to be a valid directory." >&2
+    exit 1
+else
+    root="$1"
+fi
+
+function format {
+    e=p
+    if [ -n "$color" ]; then
+        e='s/^\(.*\):\(\s*#.*ifndef\s\+\)\([A-Za-z0-9_]\+\)\(\s\+.*\)\?/'
+        e="$e"$'\e[35m\\1\e[32m:\e[0m\\2\e[1;31m\\3\e[0m\\4/;p'
+    elif [ -n "$names" ]; then
+        e='s/:\s*#.*//;p'
+    fi
+    sed -n "$e"
+}
+
+find "$root" -name '*.h' -print0 | \
+xargs -0 grep -Em1 '#\s*ifndef' | \
+grep -vE '(.*)\.h.*__\1_h' | \
+format
diff --git a/Tools/Scripts/fix-style.sh b/Tools/Scripts/fix-style.sh
new file mode 100755
index 00000000..c35e8674
--- /dev/null
+++ b/Tools/Scripts/fix-style.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Check for list of files
+if [ -z "$*" ]; then
+  echo "Usage: ${0##*/} <files or directories>" >&2
+  exit 1
+fi
+
+# Find astyle options
+self="$(readlink -f "$0")"
+optfile="$(
+  cd "${self%/*}" >/dev/null;
+  cd "./$(git rev-parse --show-cdup)" >/dev/null
+  readlink -f .astyle
+)"
+if ! [ -f "$optfile" ]; then
+  echo "Unable to locate astyle options file." >&2
+  exit 2
+fi
+
+# Create file list
+filelist="$(mktemp)"
+if ! [ -r "$filelist" ]; then
+  echo "Unable to create temporary file for file list." >&2
+  exit 2
+fi
+
+# Populate file list, finding source files in any directories given
+for f in "$@"; do
+  if [ -d "$f" ]; then
+    find "$f" \( -name '*.cxx' -o -name '*.h' \) -print0 >> "$filelist"
+  else
+    printf "%s\0" "$f" >> "$filelist"
+  fi
+done
+
+# Fix the files
+xargs -0 sed -i \
+  -e 's/\[ /[/g' \
+  -e 's/ \]/]/g' \
+  -e 's/> >/>!__template__!>/g' \
+  -e 's/< /</g' \
+  -e 's/ >/>/g' \
+  -e 's/>!__template__!>/> >/g' \
+  -e 's/template</template </g' \
+  < "$filelist"
+xargs -0 astyle --suffix=none --options="$optfile" < "$filelist"
+xargs -0 sed -ri \
+  -e 's/\b(return|emit)\(/\1 (/g' \
+  -e 's/\b((for(each[a-z_]*)?|Q(TE)?_FOREACH[A-Z_]*) *\([^*&;,]*) ([*&])/\1\5/g' \
+  -e 's/([^ ])(\(&[a-zA-Z0-9_]*\)\[)/\1 \2/g' \
+  -e 's/operator *([^A-Za-z0-9_])/operator\1/g' \
+  < "$filelist"
+rm -f "$filelist"
diff --git a/Tools/Scripts/gen-kst.py b/Tools/Scripts/gen-kst.py
new file mode 100755
index 00000000..741dc696
--- /dev/null
+++ b/Tools/Scripts/gen-kst.py
@@ -0,0 +1,200 @@
+#!/bin/env python
+
+import argparse
+import ast
+import glob
+import json
+import os
+import re
+import subprocess
+import sys
+
+import pyproj
+from osgeo import gdal
+
+#==============================================================================
+def parse_wkt(text):
+  parts = None
+  n = 0
+  result = {}
+  final = False
+
+  while len(text):
+    # Determine if next field is a named object or a value
+    xbb = text.find('[')
+    xeb = text.find(']')
+    xc = text.find(',')
+    if xc == 0:
+      # End of object
+      text = text[1:]
+    elif xeb == 0:
+      # End of parent object
+      return (result, text[1:])
+    elif xbb > 0 and (xc < 0 or xbb < xc) and xbb < xeb:
+      # Named object; extract value
+      parts = text.partition('[')
+      data = parse_wkt(parts[2])
+      result[parts[0]] = data[0]
+      text = data[1]
+    else:
+      # Value
+      if xc > 0 and xc < xeb:
+        parts = text.partition(',')
+      else:
+        parts = text.partition(']')
+        final = True
+
+      result[n] = ast.literal_eval(parts[0])
+      n += 1
+      text = parts[2]
+
+    if final:
+      return (result, text)
+
+  return (result, '')
+
+#==============================================================================
+def transform_point(x, y, xf, scale):
+  return (scale * (xf[0] + (xf[1] * x) + (xf[2] * y)),
+          scale * (xf[3] + (xf[4] * x) + (xf[5] * y)))
+
+#==============================================================================
+def make_pair(pair_string):
+  pair = pair_string.split('=')
+  if len(pair) == 1:
+    pair += [None]
+  return pair
+
+#==============================================================================
+def units_for_unit(gcs, meters_per_unit):
+  gcs = '<%i>' % gcs
+
+  # Find proj.4 init string for GCS
+  init_info_file = file(os.path.join(pyproj.datadir.pyproj_datadir, 'epsg'))
+  for line in init_info_file:
+    if line.startswith(gcs):
+      # Get init key/value pairs
+      init_info = dict([make_pair(pair) for pair in line.split(' ')[1:]])
+
+      # Check if init info specifies units
+      if '+units' in init_info:
+        # Get units for GCS
+        units = init_info['+units']
+
+        # Determine GCS units per input unit
+        if units == 'm':
+          return meters_per_unit
+        elif units == 'us-ft':
+          return meters_per_unit / 0.3048006096012192
+
+  return 1.0 # Don't know :-(
+
+#==============================================================================
+def parse_file(path, out, args):
+  # Get short name of input file, without extension
+  in_name = os.path.splitext(os.path.basename(path))[0]
+  print in_name, ':'
+
+  # Open file with GDAL
+  gf = gdal.Open(path)
+
+  # Get projection for file
+  proj = parse_wkt(gf.GetProjection())[0]['PROJCS']
+  gcs = int(proj['AUTHORITY'][1])
+  meters_per_unit = proj['UNIT'][1]
+  print '  gcs = %i' % gcs
+
+  # Get geotransform for file
+  gsd = -1.0
+  xf = gf.GetGeoTransform()
+  if xf[2] == 0 and xf[4] == 0:
+    gsd = abs(xf[1]) * meters_per_unit * 100.0
+    print '  gsd = %.2f cm/px' % gsd
+
+  # Get corner points for file
+  w = gf.RasterXSize
+  h = gf.RasterYSize
+  units_per_unit = units_for_unit(gcs, meters_per_unit)
+  ul = transform_point(0, 0, xf, units_per_unit)
+  ur = transform_point(w, 0, xf, units_per_unit)
+  ll = transform_point(0, h, xf, units_per_unit)
+  lr = transform_point(w, h, xf, units_per_unit)
+
+  print '  upper left  = (%16.7f, %16.7f)' % ul
+  print '  upper right = (%16.7f, %16.7f)' % ur
+  print '  lower left  = (%16.7f, %16.7f)' % ll
+  print '  lower right = (%16.7f, %16.7f)' % lr
+
+  # Write tile to output KST
+  out.write('"%s/%s.mrj", %.2f, %i,\n' % (args.name, in_name, gsd, gcs))
+  out.write('  %.7f, %.7f,\n' % ul)
+  out.write('  %.7f, %.7f,\n' % ur)
+  out.write('  %.7f, %.7f,\n' % ll)
+  out.write('  %.7f, %.7f;\n' % lr)
+
+#==============================================================================
+def parse_input(file_or_dir, out, args):
+  if os.path.isdir(file_or_dir):
+    for pat in ('[tT][iI][fF]', '[tT][iI][fF][fF]', '[jJ][pP]2'):
+      for x in glob.glob(os.path.join(file_or_dir, '*.%s' % pat)):
+        parse_file(x, out, args)
+  else:
+    parse_file(file_or_dir, out, args)
+
+#==============================================================================
+if __name__ == '__main__':
+  # Parse arguments
+  parser = argparse.ArgumentParser(description='Context KST generator')
+  parser.add_argument('name', metavar='output-name',
+                      help='short name of context set')
+  parser.add_argument('inputs', metavar='in', nargs='+',
+                      help='input image, or directory containing input images')
+  args = parser.parse_args()
+
+  out = open('context-%s.kst' % args.name, 'w')
+  out.write('# file, GSD, GCS, { easting, northing } ( ul, ur, ll, lr )\n')
+
+  for i in args.inputs:
+    parse_input(i, out, args)
+
+## Get options
+#name=$1
+#gsd=$2
+#out="context-$name.kst"
+#shift 2
+
+## Get file list
+#if [ -d "$1" ]; then
+    #oldifs="$IFS"
+    #IFS=$'\n'
+    #files=( $( find "$1" -iname '*.tif' -o -iname '*.tiff' ) )
+    #IFS="$oldifs"
+#else
+    #files=( "$@" )
+#fi
+
+## Write header
+#echo '# file, GSD, GCS, { lat, lon } ( ul, ur, ll, lr )' > "$out"
+
+#for f in "${files[@]}"; do
+    ## Get listgeo information
+    #oldifs="$IFS"
+    #IFS=$'\n'
+    #info=( $( listgeo "$f" | \
+           #sed -n -e '/^PCS/s,^[^=]*= *,,p' \
+                  #-e '/^\(Upper\|Lower\)/s,^.*[(] *\([^)]*\)[)],\1,p' ) )
+    #IFS="$oldifs"
+
+    ## Parse listgeo information
+    #gcs=${info[0]%% (*}
+
+    ## Write tile info
+    #b="$(basename "$f" | sed 's,\.tiff\?$,,I')"
+    #cat >> "$out" << EOF
+#"$name/$b.mrj", $gsd, $gcs,
+    #${info[1]%)},
+    #${info[3]%)},
+    #${info[2]%)},
+    #${info[4]%)};
+#EOF
+#done
diff --git a/Tools/Scripts/insert-copyright.pl b/Tools/Scripts/insert-copyright.pl
new file mode 100755
index 00000000..e429c1b0
--- /dev/null
+++ b/Tools/Scripts/insert-copyright.pl
@@ -0,0 +1,58 @@
+#!/usr/bin/perl -w
+
+my @td = localtime(time);
+my $year = 1900 + $td[5];
+
+my $c_statement = "/*ckwg +5
+ * Copyright $year by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+";
+
+my $sh_statement = "#ckwg +4
+# Copyright $year by Kitware, Inc. All Rights Reserved. Please refer to
+# KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+# Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+";
+
+my $bat_statement = "::ckwg +4
+:: Copyright $year by Kitware, Inc. All Rights Reserved. Please refer to
+:: KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+:: Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+";
+
+
+foreach my $filename ( @ARGV )
+{
+    print STDERR "Processing $filename\n";
+    if( open( my $fd, $filename ) )
+    {
+        my $file = join("",<$fd>);
+        close( $fd );
+
+        my $statement;
+        if( $filename =~ /.*\.bat(\.in)?$/i ) {
+            $statement = $bat_statement
+        } elsif( $filename =~ /.*\.(py|pl|sh)(\.in)?$/i ) {
+            $statement = $sh_statement
+        } else {
+            $statement = $c_statement
+        }
+
+        if( $file =~ m:(^|.*\n)((//|/\*|#|\:\:) *ckwg *(\*/)?)(.*):s ) {
+            $file = $1.$statement.$5;
+        } else {
+            print STDERR "$filename does not have a marker\n";
+        }
+        if( open( $fd, ">$filename" ) ) {
+            print $fd $file;
+            close( $fd );
+        } else {
+            print STDERR "Couldn't open $filename for writing\n";
+        }
+
+    } else {
+        warn( "Couldn't open $filename" );
+    }
+}
diff --git a/Tools/Scripts/vpTestWizard.sh b/Tools/Scripts/vpTestWizard.sh
new file mode 100755
index 00000000..0f789682
--- /dev/null
+++ b/Tools/Scripts/vpTestWizard.sh
@@ -0,0 +1,188 @@
+#!/bin/bash
+# Purpose: Automatize workflow for adding tests, generating baselines, and including them in the build
+
+## Specify where you would like to save all the tests you've made.
+## This provides a scratch area to decide what you'd like to include.
+PROJECT_TEST_DIRECTORY=$HOME/Testing
+
+if [ -z "$VISGUI_DATA_ROOT" ] || [ ! -d "$VISGUI_DATA_ROOT" ]; then
+  export VISGUI_DATA_ROOT=$HOME/Projects/visgui/data
+fi
+if [ -z "$VISGUI_BASELINE_ROOT" ] || [ ! -d "$VISGUI_BASELINE_ROOT" ]; then
+  export VISGUI_BASELINE_ROOT=$VISGUI_DATA_ROOT/Baseline
+fi
+
+if [ ! -d "$PROJECT_TEST_DIRECTORY" ]; then
+  echo "Creating directory to store all tests ($PROJECT_TEST_DIRECTORY)"
+  mkdir -p "$PROJECT_TEST_DIRECTORY" || exit 1
+fi
+if [ ! -d "$VISGUI_DATA_ROOT" ] || [ ! -d "$VISGUI_BASELINE_ROOT" ]; then
+  echo "Cannot find VISGUI_DATA_ROOT and/or VISGUI_BASELINE_ROOT."
+  echo "Please set these environment variables properly."
+  exit 1
+fi
+
+## Change the following to match your setup.
+
+VISGUI_SOURCE_DIRECTORY=$HOME/Projects/visgui/source
+VISGUI_BINARY_DIRECTORY=$HOME/Projects/visgui/build
+# These don't need to change unless the project's internal structure changes.
+VISGUI_TEMP_DIRECTORY=$VISGUI_BINARY_DIRECTORY/Testing/Temporary
+VPVIEW_TESTING_DIRECTORY=$VISGUI_SOURCE_DIRECTORY/Applications/VpView/Testing
+VPVIEW_BASELINE_DIRECTORY=$VISGUI_BASELINE_ROOT/vpView
+VPVIEW_EXECUTABLE=$VISGUI_BINARY_DIRECTORY/bin/vpView
+
+## Change the following to use alternate versions of these programs
+
+GIT_COMMAND=$(type -P git)
+CMAKE_COMMAND=$(type -P cmake)
+MAKE_COMMAND=$(type -P make)
+CTEST_COMMAND=$(type -P ctest)
+
+###############################################################################
+
+## Query information from the environment; these shouldn't need to change.
+
+MAKE_JOBS=$(( $(grep -c 'model name' /proc/cpuinfo) + 1 ))
+
+if [ -f "$VISGUI_SOURCE_DIRECTORY/.git/HEAD" ]; then
+  GIT_BRANCH=$(cat "$VISGUI_SOURCE_DIRECTORY/.git/HEAD")
+  GIT_BRANCH=${GIT_BRANCH##ref:\ refs/heads/}
+  GIT_BRANCH=${GIT_BRANCH:-HEAD}
+fi
+
+BOLD="`tput bold`"
+UNBOLD="`tput sgr0`"
+
+###############################################################################
+
+function update {
+  WORKING_BRANCH=${1:-${GIT_BRANCH:-master}}
+  if [ ! -d "$VISGUI_SOURCE_DIRECTORY" ]; then
+    $GIT_COMMAND clone -b $WORKING_BRANCH "$VISGUI_SOURCE_DIRECTORY"
+  fi
+  pushd $VISGUI_SOURCE_DIRECTORY
+  echo "${BOLD}[update] Updating project (fetch origin --prune, reset --keep origin/$WORKING_BRANCH)${UNBOLD}"
+  $GIT_COMMAND fetch origin --prune && $GIT_COMMAND reset --keep origin/$WORKING_BRANCH
+  UPDATE_SUCCESS=$?
+  popd
+  return $UPDATE_SUCCESS
+}
+
+function build {
+  BUILD_DIRECTORY=${1:-$VISGUI_BINARY_DIRECTORY}
+  pushd "$BUILD_DIRECTORY"
+  echo "${BOLD}[build] Building project ($MAKE_COMMAND -j$MAKE_JOBS)${UNBOLD}"
+  $CMAKE_COMMAND $VISGUI_SOURCE_DIRECTORY && $MAKE_COMMAND -j$MAKE_JOBS
+  BUILD_SUCCESS=$?
+  popd
+  return $BUILD_SUCCESS
+}
+
+function record {
+  if [ -n "$1" ]; then touch "$PROJECT_TEST_DIRECTORY/$1.xml"; fi
+  echo "${BOLD}[record] Starting executable ($VPVIEW_EXECUTABLE)${UNBOLD}"
+  if [ -x "$VPVIEW_EXECUTABLE" ]; then
+    "$VPVIEW_EXECUTABLE"
+  else
+    echo "${BOLD}[record] Failure to start executable ($VPVIEW_EXECUTABLE)${UNBOLD}"
+    exit 1
+  fi
+  if [ -n "$1" ] && [ -f "$PROJECT_TEST_DIRECTORY/$1.xml" ]; then
+    echo "${BOLD}[record] Recorded test file ($PROJECT_TEST_DIRECTORY/$1.xml)${UNBOLD}"
+  fi
+  return $?
+}
+
+function insert {
+  if [ -n "$1" ] && [ -f "$PROJECT_TEST_DIRECTORY/$1.xml" ]; then
+    echo "${BOLD}[insert] Found test file ($PROJECT_TEST_DIRECTORY/$1.xml)${UNBOLD}"
+    if cp -iv "$PROJECT_TEST_DIRECTORY/$1.xml" "$VPVIEW_TESTING_DIRECTORY"; then
+      sed -e "s%$VISGUI_DATA_ROOT%\$VISGUI_DATA_ROOT/%g" -i "$VPVIEW_TESTING_DIRECTORY/$1.xml"
+      if grep -qs "$1" "$VPVIEW_TESTING_DIRECTORY/CMakeLists.txt"; then
+        echo "${BOLD}[insert] $VPVIEW_TESTING_DIRECTORY/CMakeLists.txt already contains '$1'${UNBOLD}"
+      else
+        echo -n "${BOLD}[insert] Adding test file ($1.xml) to ($VPVIEW_TESTING_DIRECTORY/CMakeLists.txt)... "
+        if sed -e "/^SET (TESTS_WITH_BASELINES/a \ \ $1.xml" -i "$VPVIEW_TESTING_DIRECTORY/CMakeLists.txt"; then
+          echo "SUCCESS${UNBOLD}"
+        else
+          echo "FAILURE${UNBOLD}"
+        fi
+      fi
+    fi
+  else
+    echo "${BOLD}[insert] Missing test file ($PROJECT_TEST_DIRECTORY/$1.xml${UNBOLD}"
+  fi
+  return $?
+}
+
+function generate {
+  if [ -n "$1" ]; then build && run "$1"
+    if [ -f "$VISGUI_TEMP_DIRECTORY/$1.png" ]; then
+      echo "${BOLD}[generate] Copying baseline ($VISGUI_TEMP_DIRECTORY/$1.png)${UNBOLD}"
+      cp -iv "$VISGUI_TEMP_DIRECTORY/$1.png" "$VPVIEW_BASELINE_DIRECTORY"
+    else
+      echo "${BOLD}[generate] $1 baseline not found ($VISGUI_TEMP_DIRECTORY)${UNBOLD}"
+    fi
+  fi
+  return $?
+}
+
+function run {
+  pushd "$VISGUI_BINARY_DIRECTORY"
+  echo "${BOLD}[run] Running test ($CTEST_COMMAND -R $1)${UNBOLD}"
+  "$CTEST_COMMAND" -R $1
+  popd
+  return $?
+}
+
+function commit {
+  pushd "$VISGUI_SOURCE_DIRECTORY"
+  echo "${BOLD}[commit] Commiting test${UNBOLD}"
+  "$GIT_COMMAND" add "$VPVIEW_TESTING_DIRECTORY/$1.xml"
+  "$GIT_COMMAND" commit -m "Added test: $1"
+  popd
+}
+
+# Decide which subset of the above subroutines to run in what sequence.
+SCRIPT_ROOT=$(readlink -f $(dirname $0))
+SCRIPT_FILE=$(basename $0)
+SCRIPT_OPTIONS=( update build record insert generate run commit clean list refresh all some less )
+COMMAND=$1
+if [ -n "$COMMAND" ]; then
+  shift
+  case $COMMAND in
+    refresh)
+      update && build
+      ;;
+    all)
+      record $@ && insert $@ && generate $@ && run $@
+      ;;
+    some)
+      record $@ && generate $@ && run $@
+      ;;
+    less)
+      generate $@ && run $@
+      ;;
+    clean)
+      pushd "$VISGUI_SOURCE_DIRECTORY"
+      "$GIT_COMMAND" reset --hard ${*:-${GIT_BRANCH:-origin/master}}
+      rm "$HOME/.config/Kitware/VisGUI\ View.*" -iv
+      popd
+      rm -iv "$VISGUI_TESTING_DIRECTORY"/*
+      ;;
+    list)
+      pushd "$VISGUI_BINARY_DIRECTORY"
+      "$CTEST_COMMAND" -N
+      popd
+      ;;
+    *)
+      if [ "$(type -t $COMMAND)" == "function" ]; then $COMMAND $@; exit $?
+      else echo "$COMMAND isn't one of: ${SCRIPT_OPTIONS[@]}"; fi
+      ;;
+  esac
+else
+  SCRIPT_OPTION_STRING=${SCRIPT_OPTIONS[*]}
+  echo "USAGE: $SCRIPT_FILE (${SCRIPT_OPTION_STRING// /|}) test_name..."
+fi
+
diff --git a/Web/CMakeLists.txt b/Web/CMakeLists.txt
new file mode 100644
index 00000000..861a1e6d
--- /dev/null
+++ b/Web/CMakeLists.txt
@@ -0,0 +1,129 @@
+project(VisGUI-Web)
+
+###############################################################################
+
+# BEGIN user configurable build options
+
+vg_option(VISGUI_ENABLE_WEB ON
+  "Enable VisGUI Web"
+  "VISGUI_ENABLE_PYTHON"
+)
+if(NOT VISGUI_ENABLE_WEB)
+  # If the web GUI's are disabled, we are only here to declare our options, so
+  # leave now
+  return()
+endif()
+
+# END user configurable build options
+
+###############################################################################
+
+#BEGIN web helper functions
+
+set(VGWEB_RUN_SERVER_SCRIPT_TEMPLATE
+  "${CMAKE_CURRENT_SOURCE_DIR}/vgweb.sh.in" CACHE INTERNAL ""
+)
+
+# Function to create and install a script to run an application's web server
+function(vg_web_server NAME)
+  set(_configure_file_script
+    "${visGUI_SOURCE_DIR}/CMake/configure-file-script.cmake"
+  )
+  set(_out "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${NAME}-server")
+  add_custom_command(
+    OUTPUT "${_out}"
+    DEPENDS "${VGWEB_RUN_SERVER_SCRIPT_TEMPLATE}" "${_configure_file_script}"
+    COMMAND "${CMAKE_COMMAND}"
+      "-DINPUT_FILE=${VGWEB_RUN_SERVER_SCRIPT_TEMPLATE}"
+      "-DOUTPUT_FILE=${_out}"
+      "-DLIB_SUFFIX=${LIB_SUFFIX}"
+      "-DPYTHON_SHORT=${PYTHON_SHORT}"
+      "-DAPPLICATION=${NAME}"
+      "-DSERVER_PYTHON_SCRIPT=${NAME}.py"
+      "-DCONFIGURE_ARGS=ESCAPE_QUOTES @ONLY"
+      -P "${_configure_file_script}"
+  )
+  add_custom_target(${NAME}-server ALL DEPENDS "${_out}")
+  install(PROGRAMS "${_out}" DESTINATION bin COMPONENT Web)
+endfunction()
+
+#END web helper functions
+
+###############################################################################
+
+#BEGIN build and install rules
+
+# Install ParaView third-party redistributables
+vg_install_files_with_prefix(
+  ext/js-core/autobahn.js
+  ext/js-core/autobahn.min.js
+  ext/js-core/gl-matrix.js
+  ext/js-core/gl-matrix-min.js
+  ext/js-core/hammer.js
+  ext/js-core/hammer.min.js
+  ext/js-core/jquery-1.8.2.min.js
+  ext/js-core/jquery.hammer.js
+  ext/js-core/jquery.hammer.min.js
+  ext/widgets/jquery-ui/jquery-ui-1.10.0.min.js
+  SOURCE "${PARAVIEW_WWW_DIR}"
+  TARGET webThirdPartyJsContentFiles
+  DESTINATION share/VisGUI/www/content/js
+  STRIP_PATH
+)
+
+vg_install_files_with_prefix(
+  ext/widgets/jquery-ui/jquery-ui-1.10.0.css
+  SOURCE "${PARAVIEW_WWW_DIR}"
+  TARGET webThirdPartyCssContentFiles
+  DESTINATION share/VisGUI/www/content/css
+  STRIP_PATH
+)
+
+# Install ParaView redistributables
+vg_install_files_with_prefix(
+  css/paraview.ui.pipeline.css
+  css/paraview.ui.toolbar.css
+  css/paraview.ui.toolbar.vcr.css
+  css/paraview.ui.toolbar.viewport.css
+  js/paraview-all.js
+  js/paraview-all.min.js
+  js/paraview.ui.pipeline.js
+  js/paraview.ui.toolbar.vcr.js
+  js/paraview.ui.toolbar.viewport.js
+  SOURCE "${PARAVIEW_WWW_DIR}/lib"
+  TARGET webParaViewContentFiles
+  DESTINATION share/VisGUI/www/content
+)
+
+# Install our own content files
+vg_install_files_with_prefix(
+  content/index.html
+  content/css/bootstrap.css
+  content/css/bootstrap.min.css
+  content/css/bootstrap-responsive.css
+  content/css/bootstrap-responsive.min.css
+  content/css/visgui.css
+  content/js/bootstrap.js
+  content/js/bootstrap.min.js
+  content/js/bootstrap-contextmenu.js
+  content/js/visgui.js
+  content/js/OpenLayers.js
+  content/images/icons/loading.gif
+  content/images/icons/marker-blue.png
+  content/images/icons/marker-gold.png
+  content/images/icons/playback-play.png
+  content/images/icons/playback-stop.png
+  content/images/icons/show-trails.png
+  content/images/icons/okay.png
+  content/images/icons/cancel.png
+  TARGET webContentFiles
+  DESTINATION share/VisGUI/www
+)
+
+add_dependencies(webContentFiles
+  webThirdPartyJsContentFiles
+  webThirdPartyCssContentFiles
+  webParaViewContentFiles
+)
+
+# END build and install rules
diff --git a/Web/content/css/bootstrap-responsive.css b/Web/content/css/bootstrap-responsive.css
new file mode 100644
index 00000000..fcd72f7a
--- /dev/null
+++ b/Web/content/css/bootstrap-responsive.css
@@ -0,0 +1,1109 @@
+/*!
+ * Bootstrap Responsive v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+
+.clearfix {
+  *zoom: 1;
+}
+
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  line-height: 0;
+  content: "";
+}
+
+.clearfix:after {
+  clear: both;
+}
+
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+     -moz-box-sizing: border-box;
+          box-sizing: border-box;
+}
+
+@-ms-viewport {
+  width: device-width;
+}
+
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+
+.visible-phone {
+  display: none !important;
+}
+
+.visible-tablet {
+  display: none !important;
+}
+
+.hidden-desktop {
+  display: none !important;
+}
+
+.visible-desktop {
+  display: inherit !important;
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+
+.visible-print {
+  display: none !important;
+}
+
+@media print {
+  .visible-print {
+    display: inherit !important;
+  }
+  .hidden-print {
+    display: none !important;
+  }
+}
+
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.5109110747408616%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39979996362975%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.8527914166212%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30578286961266%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75877432260411%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.21176577559556%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.664757228587014%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.11774868157847%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.570740134569924%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.023731587561375%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.476723040552828%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.929714493544281%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.02182214948171%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45771958537915%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.47481360247316%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.91071103837061%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92780505546462%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.36370249136206%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.38079650845607%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81669394435352%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.83378796144753%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.26968539734497%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28677941443899%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.72267685033642%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.739770867430444%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.175668303327875%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1927623204219%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62865975631933%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.645753773413354%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.081651209310785%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.0987452264048%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.53464266230224%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.551736679396257%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98763411529369%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 11.004728132387708%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.440625568285142%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    line-height: 0;
+    content: "";
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    float: left;
+    width: 100%;
+    min-height: 30px;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.709239449864817%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94680851063829%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.38327259903608%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81973668743387%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25620077583166%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.69266486422946%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.12912895262725%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.56559304102504%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 40.00205712942283%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43852121782062%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87498530621841%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.311449394616199%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.747913483013988%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41847889972962%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.6560479605031%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.8549429881274%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.09251204890089%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.2914070765252%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52897613729868%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72787116492299%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.96544022569647%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.16433525332079%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.40190431409427%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.600799341718584%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.838368402492065%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.037263430116376%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.27483249088986%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.47372751851417%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.71129657928765%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.91019160691196%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14776066768544%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.346655695309746%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.584224756083227%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.783119783707537%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.02068884448102%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.219583872105325%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.457152932878806%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+
+@media (max-width: 767px) {
+  body {
+    padding-right: 20px;
+    padding-left: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-right: -20px;
+    margin-left: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    width: auto;
+    clear: none;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .uneditable-input[class*="span"],
+  .row-fluid [class*="span"] {
+    display: block;
+    float: none;
+    width: 100%;
+    margin-left: 0;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+       -moz-box-sizing: border-box;
+            box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+  .modal {
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    left: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade {
+    top: -100px;
+  }
+  .modal.fade.in {
+    top: 20px;
+  }
+}
+
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+  .media .pull-left,
+  .media .pull-right {
+    display: block;
+    float: none;
+    margin-bottom: 10px;
+  }
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+  .modal {
+    top: 10px;
+    right: 10px;
+    left: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-right: 10px;
+    padding-left: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #777777;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #777777;
+    -webkit-border-radius: 3px;
+       -moz-border-radius: 3px;
+            border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+       -moz-border-radius: 4px;
+            border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: #999999;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    padding: 0;
+    margin-top: 5px;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    display: none;
+    float: none;
+    max-width: none;
+    padding: 0;
+    margin: 0 15px;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+       -moz-border-radius: 0;
+            border-radius: 0;
+    -webkit-box-shadow: none;
+       -moz-box-shadow: none;
+            box-shadow: none;
+  }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu:before,
+  .nav-collapse .nav > li > .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+       -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: #111111;
+    border-bottom-color: #111111;
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    height: 0;
+    overflow: hidden;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-right: 10px;
+    padding-left: 10px;
+  }
+}
+
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/Web/content/css/bootstrap-responsive.min.css b/Web/content/css/bootstrap-responsive.min.css
new file mode 100644
index 00000000..d1b7f4b0
--- /dev/null
+++ b/Web/content/css/bootstrap-responsive.min.css
@@ -0,0 +1,9 @@
+/*!
+ * Bootstrap Responsive v2.3.1
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;line-height:0;content:""}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@-ms-viewport{width:device-width}.hidden{display:none;visibility:hidden}.visible-phone{display:none!important}.visible-tablet{display:none!important}.hidden-desktop{display:none!important}.visible-desktop{display:inherit!important}@media(min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-tablet{display:inherit!important}.hidden-tablet{display:none!important}}@media(max-width:767px){.hidden-desktop{display:inherit!important}.visible-desktop{display:none!important}.visible-phone{display:inherit!important}.hidden-phone{display:none!important}}.visible-print{display:none!important}@media print{.visible-print{display:inherit!important}.hidden-print{display:none!important}}@media(min-width:1200px){.row{margin-left:-30px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:30px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px}.span12{width:1170px}.span11{width:1070px}.span10{width:970px}.span9{width:870px}.span8{width:770px}.span7{width:670px}.span6{width:570px}.span5{width:470px}.span4{width:370px}.span3{width:270px}.span2{width:170px}.span1{width:70px}.offset12{margin-left:1230px}.offset11{margin-left:1130px}.offset10{margin-left:1030px}.offset9{margin-left:930px}.offset8{margin-left:830px}.offset7{margin-left:730px}.offset6{margin-left:630px}.offset5{margin-left:530px}.offset4{margin-left:430px}.offset3{margin-left:330px}.offset2{margin-left:230px}.offset1{margin-left:130px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.564102564102564%;*margin-left:2.5109110747408616%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.45299145299145%;*width:91.39979996362975%}.row-fluid .span10{width:82.90598290598291%;*width:82.8527914166212%}.row-fluid .span9{width:74.35897435897436%;*width:74.30578286961266%}.row-fluid .span8{width:65.81196581196582%;*width:65.75877432260411%}.row-fluid .span7{width:57.26495726495726%;*width:57.21176577559556%}.row-fluid .span6{width:48.717948717948715%;*width:48.664757228587014%}.row-fluid .span5{width:40.17094017094017%;*width:40.11774868157847%}.row-fluid .span4{width:31.623931623931625%;*width:31.570740134569924%}.row-fluid .span3{width:23.076923076923077%;*width:23.023731587561375%}.row-fluid .span2{width:14.52991452991453%;*width:14.476723040552828%}.row-fluid .span1{width:5.982905982905983%;*width:5.929714493544281%}.row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.02182214948171%}.row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45771958537915%}.row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.47481360247316%}.row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.91071103837061%}.row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92780505546462%}.row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.36370249136206%}.row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.38079650845607%}.row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81669394435352%}.row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.83378796144753%}.row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.26968539734497%}.row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28677941443899%}.row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.72267685033642%}.row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.739770867430444%}.row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.175668303327875%}.row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1927623204219%}.row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62865975631933%}.row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.645753773413354%}.row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.081651209310785%}.row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.0987452264048%}.row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.53464266230224%}.row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.551736679396257%}.row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98763411529369%}.row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:11.004728132387708%}.row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.440625568285142%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:30px}input.span12,textarea.span12,.uneditable-input.span12{width:1156px}input.span11,textarea.span11,.uneditable-input.span11{width:1056px}input.span10,textarea.span10,.uneditable-input.span10{width:956px}input.span9,textarea.span9,.uneditable-input.span9{width:856px}input.span8,textarea.span8,.uneditable-input.span8{width:756px}input.span7,textarea.span7,.uneditable-input.span7{width:656px}input.span6,textarea.span6,.uneditable-input.span6{width:556px}input.span5,textarea.span5,.uneditable-input.span5{width:456px}input.span4,textarea.span4,.uneditable-input.span4{width:356px}input.span3,textarea.span3,.uneditable-input.span3{width:256px}input.span2,textarea.span2,.uneditable-input.span2{width:156px}input.span1,textarea.span1,.uneditable-input.span1{width:56px}.thumbnails{margin-left:-30px}.thumbnails>li{margin-left:30px}.row-fluid .thumbnails{margin-left:0}}@media(min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1}.row:before,.row:after{display:table;line-height:0;content:""}.row:after{clear:both}[class*="span"]{float:left;min-height:1px;margin-left:20px}.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px}.span12{width:724px}.span11{width:662px}.span10{width:600px}.span9{width:538px}.span8{width:476px}.span7{width:414px}.span6{width:352px}.span5{width:290px}.span4{width:228px}.span3{width:166px}.span2{width:104px}.span1{width:42px}.offset12{margin-left:764px}.offset11{margin-left:702px}.offset10{margin-left:640px}.offset9{margin-left:578px}.offset8{margin-left:516px}.offset7{margin-left:454px}.offset6{margin-left:392px}.offset5{margin-left:330px}.offset4{margin-left:268px}.offset3{margin-left:206px}.offset2{margin-left:144px}.offset1{margin-left:82px}.row-fluid{width:100%;*zoom:1}.row-fluid:before,.row-fluid:after{display:table;line-height:0;content:""}.row-fluid:after{clear:both}.row-fluid [class*="span"]{display:block;float:left;width:100%;min-height:30px;margin-left:2.7624309392265194%;*margin-left:2.709239449864817%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="span"]:first-child{margin-left:0}.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%}.row-fluid .span12{width:100%;*width:99.94680851063829%}.row-fluid .span11{width:91.43646408839778%;*width:91.38327259903608%}.row-fluid .span10{width:82.87292817679558%;*width:82.81973668743387%}.row-fluid .span9{width:74.30939226519337%;*width:74.25620077583166%}.row-fluid .span8{width:65.74585635359117%;*width:65.69266486422946%}.row-fluid .span7{width:57.18232044198895%;*width:57.12912895262725%}.row-fluid .span6{width:48.61878453038674%;*width:48.56559304102504%}.row-fluid .span5{width:40.05524861878453%;*width:40.00205712942283%}.row-fluid .span4{width:31.491712707182323%;*width:31.43852121782062%}.row-fluid .span3{width:22.92817679558011%;*width:22.87498530621841%}.row-fluid .span2{width:14.3646408839779%;*width:14.311449394616199%}.row-fluid .span1{width:5.801104972375691%;*width:5.747913483013988%}.row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41847889972962%}.row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.6560479605031%}.row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.8549429881274%}.row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.09251204890089%}.row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.2914070765252%}.row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52897613729868%}.row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72787116492299%}.row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.96544022569647%}.row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.16433525332079%}.row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.40190431409427%}.row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.600799341718584%}.row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.838368402492065%}.row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.037263430116376%}.row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.27483249088986%}.row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.47372751851417%}.row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.71129657928765%}.row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.91019160691196%}.row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14776066768544%}.row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.346655695309746%}.row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.584224756083227%}.row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.783119783707537%}.row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.02068884448102%}.row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.219583872105325%}.row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.457152932878806%}input,textarea,.uneditable-input{margin-left:0}.controls-row [class*="span"]+[class*="span"]{margin-left:20px}input.span12,textarea.span12,.uneditable-input.span12{width:710px}input.span11,textarea.span11,.uneditable-input.span11{width:648px}input.span10,textarea.span10,.uneditable-input.span10{width:586px}input.span9,textarea.span9,.uneditable-input.span9{width:524px}input.span8,textarea.span8,.uneditable-input.span8{width:462px}input.span7,textarea.span7,.uneditable-input.span7{width:400px}input.span6,textarea.span6,.uneditable-input.span6{width:338px}input.span5,textarea.span5,.uneditable-input.span5{width:276px}input.span4,textarea.span4,.uneditable-input.span4{width:214px}input.span3,textarea.span3,.uneditable-input.span3{width:152px}input.span2,textarea.span2,.uneditable-input.span2{width:90px}input.span1,textarea.span1,.uneditable-input.span1{width:28px}}@media(max-width:767px){body{padding-right:20px;padding-left:20px}.navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-right:-20px;margin-left:-20px}.container-fluid{padding:0}.dl-horizontal dt{float:none;width:auto;clear:none;text-align:left}.dl-horizontal dd{margin-left:0}.container{width:auto}.row-fluid{width:100%}.row,.thumbnails{margin-left:0}.thumbnails>li{float:none;margin-left:0}[class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{display:block;float:none;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.row-fluid [class*="offset"]:first-child{margin-left:0}.input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto}.controls-row [class*="span"]+[class*="span"]{margin-left:0}.modal{position:fixed;top:20px;right:20px;left:20px;width:auto;margin:0}.modal.fade{top:-100px}.modal.fade.in{top:20px}}@media(max-width:480px){.nav-collapse{-webkit-transform:translate3d(0,0,0)}.page-header h1 small{display:block;line-height:20px}input[type="checkbox"],input[type="radio"]{border:1px solid #ccc}.form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left}.form-horizontal .controls{margin-left:0}.form-horizontal .control-list{padding-top:0}.form-horizontal .form-actions{padding-right:10px;padding-left:10px}.media .pull-left,.media .pull-right{display:block;float:none;margin-bottom:10px}.media-object{margin-right:0;margin-left:0}.modal{top:10px;right:10px;left:10px}.modal-header .close{padding:10px;margin:-10px}.carousel-caption{position:static}}@media(max-width:979px){body{padding-top:0}.navbar-fixed-top,.navbar-fixed-bottom{position:static}.navbar-fixed-top{margin-bottom:20px}.navbar-fixed-bottom{margin-top:20px}.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px}.navbar .container{width:auto;padding:0}.navbar .brand{padding-right:10px;padding-left:10px;margin:0 0 0 -5px}.nav-collapse{clear:both}.nav-collapse .nav{float:none;margin:0 0 10px}.nav-collapse .nav>li{float:none}.nav-collapse .nav>li>a{margin-bottom:2px}.nav-collapse .nav>.divider-vertical{display:none}.nav-collapse .nav .nav-header{color:#777;text-shadow:none}.nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.nav-collapse .dropdown-menu li+li a{margin-bottom:2px}.nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2}.navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999}.navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111}.nav-collapse.in .btn-group{padding:0;margin-top:5px}.nav-collapse .dropdown-menu{position:static;top:auto;left:auto;display:none;float:none;max-width:none;padding:0;margin:0 15px;background-color:transparent;border:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none}.nav-collapse .open>.dropdown-menu{display:block}.nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none}.nav-collapse .dropdown-menu .divider{display:none}.nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none}.nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1);box-shadow:inset 0 1px 0 rgba(255,255,255,0.1),0 1px 0 rgba(255,255,255,0.1)}.navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111;border-bottom-color:#111}.navbar .nav-collapse .nav.pull-right{float:none;margin-left:0}.nav-collapse,.nav-collapse.collapse{height:0;overflow:hidden}.navbar .btn-navbar{display:block}.navbar-static .navbar-inner{padding-right:10px;padding-left:10px}}@media(min-width:980px){.nav-collapse.collapse{height:auto!important;overflow:visible!important}}
diff --git a/Web/content/css/bootstrap.css b/Web/content/css/bootstrap.css
new file mode 100644
index 00000000..10a81dac
--- /dev/null
+++ b/Web/content/css/bootstrap.css
@@ -0,0 +1,6315 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+.clearfix {
+  *zoom: 1;
+}
+.clearfix:before,
+.clearfix:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.clearfix:after {
+  clear: both;
+}
+.hide-text {
+  font: 0/0 a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+.input-block-level {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+audio,
+canvas,
+video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+audio:not([controls]) {
+  display: none;
+}
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+a:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+a:hover,
+a:active {
+  outline: 0;
+}
+sub,
+sup {
+  position: relative;
+  font-size: 75%;
+  line-height: 0;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+img {
+  /* Responsive images (ensure images don't scale beyond their parents) */
+
+  max-width: 100%;
+  /* Part 1: Set a maxium relative to the parent */
+
+  width: auto\9;
+  /* IE7-8 need help adjusting responsive images */
+
+  height: auto;
+  /* Part 2: Scale the height according to the width, otherwise you get stretching */
+
+  vertical-align: middle;
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+#map_canvas img,
+.google-maps img {
+  max-width: none;
+}
+button,
+input,
+select,
+textarea {
+  margin: 0;
+  font-size: 100%;
+  vertical-align: middle;
+}
+button,
+input {
+  *overflow: visible;
+  line-height: normal;
+}
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+button,
+html input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button;
+  cursor: pointer;
+}
+label,
+select,
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"],
+input[type="radio"],
+input[type="checkbox"] {
+  cursor: pointer;
+}
+input[type="search"] {
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  -webkit-appearance: textfield;
+}
+input[type="search"]::-webkit-search-decoration,
+input[type="search"]::-webkit-search-cancel-button {
+  -webkit-appearance: none;
+}
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+@media print {
+  * {
+    text-shadow: none !important;
+    color: #000 !important;
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+  .ir a:after,
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+  thead {
+    display: table-header-group;
+  }
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+  img {
+    max-width: 100% !important;
+  }
+  @page  {
+    margin: 0.5cm;
+  }
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+}
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 14px;
+  line-height: 20px;
+  color: #333333;
+  background-color: #ffffff;
+}
+a {
+  color: #0088cc;
+  text-decoration: none;
+}
+a:hover,
+a:focus {
+  color: #005580;
+  text-decoration: underline;
+}
+.img-rounded {
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.img-polaroid {
+  padding: 4px;
+  background-color: #fff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+.img-circle {
+  -webkit-border-radius: 500px;
+  -moz-border-radius: 500px;
+  border-radius: 500px;
+}
+.row {
+  margin-left: -15px;
+  *zoom: 1;
+}
+.row:before,
+.row:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.row:after {
+  clear: both;
+}
+[class*="span"] {
+  float: left;
+  min-height: 1px;
+  margin-left: 15px;
+}
+.container,
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 885px;
+}
+.span12 {
+  width: 885px;
+}
+.span11 {
+  width: 810px;
+}
+.span10 {
+  width: 735px;
+}
+.span9 {
+  width: 660px;
+}
+.span8 {
+  width: 585px;
+}
+.span7 {
+  width: 510px;
+}
+.span6 {
+  width: 435px;
+}
+.span5 {
+  width: 360px;
+}
+.span4 {
+  width: 285px;
+}
+.span3 {
+  width: 210px;
+}
+.span2 {
+  width: 135px;
+}
+.span1 {
+  width: 60px;
+}
+.offset12 {
+  margin-left: 915px;
+}
+.offset11 {
+  margin-left: 840px;
+}
+.offset10 {
+  margin-left: 765px;
+}
+.offset9 {
+  margin-left: 690px;
+}
+.offset8 {
+  margin-left: 615px;
+}
+.offset7 {
+  margin-left: 540px;
+}
+.offset6 {
+  margin-left: 465px;
+}
+.offset5 {
+  margin-left: 390px;
+}
+.offset4 {
+  margin-left: 315px;
+}
+.offset3 {
+  margin-left: 240px;
+}
+.offset2 {
+  margin-left: 165px;
+}
+.offset1 {
+  margin-left: 90px;
+}
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
+}
+.row-fluid:before,
+.row-fluid:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.row-fluid:after {
+  clear: both;
+}
+.row-fluid [class*="span"] {
+  display: block;
+  width: 100%;
+  min-height: 30px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  float: left;
+  margin-left: 1.694915254237288%;
+  *margin-left: 1.6384180790960452%;
+}
+.row-fluid [class*="span"]:first-child {
+  margin-left: 0;
+}
+.row-fluid .controls-row [class*="span"] + [class*="span"] {
+  margin-left: 1.694915254237288%;
+}
+.row-fluid .span12 {
+  width: 100%;
+  *width: 99.94350282485875%;
+}
+.row-fluid .span11 {
+  width: 91.52542372881356%;
+  *width: 91.46892655367232%;
+}
+.row-fluid .span10 {
+  width: 83.0508474576271%;
+  *width: 82.99435028248585%;
+}
+.row-fluid .span9 {
+  width: 74.57627118644066%;
+  *width: 74.51977401129942%;
+}
+.row-fluid .span8 {
+  width: 66.10169491525423%;
+  *width: 66.04519774011298%;
+}
+.row-fluid .span7 {
+  width: 57.6271186440678%;
+  *width: 57.570621468926554%;
+}
+.row-fluid .span6 {
+  width: 49.152542372881356%;
+  *width: 49.09604519774011%;
+}
+.row-fluid .span5 {
+  width: 40.677966101694906%;
+  *width: 40.62146892655366%;
+}
+.row-fluid .span4 {
+  width: 32.20338983050847%;
+  *width: 32.146892655367225%;
+}
+.row-fluid .span3 {
+  width: 23.728813559322035%;
+  *width: 23.672316384180792%;
+}
+.row-fluid .span2 {
+  width: 15.254237288135592%;
+  *width: 15.19774011299435%;
+}
+.row-fluid .span1 {
+  width: 6.779661016949152%;
+  *width: 6.723163841807909%;
+}
+.row-fluid .offset12 {
+  margin-left: 103.38983050847457%;
+  *margin-left: 103.27683615819208%;
+}
+.row-fluid .offset12:first-child {
+  margin-left: 101.69491525423729%;
+  *margin-left: 101.5819209039548%;
+}
+.row-fluid .offset11 {
+  margin-left: 94.91525423728814%;
+  *margin-left: 94.80225988700565%;
+}
+.row-fluid .offset11:first-child {
+  margin-left: 93.22033898305085%;
+  *margin-left: 93.10734463276836%;
+}
+.row-fluid .offset10 {
+  margin-left: 86.44067796610167%;
+  *margin-left: 86.32768361581918%;
+}
+.row-fluid .offset10:first-child {
+  margin-left: 84.74576271186439%;
+  *margin-left: 84.6327683615819%;
+}
+.row-fluid .offset9 {
+  margin-left: 77.96610169491524%;
+  *margin-left: 77.85310734463275%;
+}
+.row-fluid .offset9:first-child {
+  margin-left: 76.27118644067795%;
+  *margin-left: 76.15819209039546%;
+}
+.row-fluid .offset8 {
+  margin-left: 69.4915254237288%;
+  *margin-left: 69.37853107344631%;
+}
+.row-fluid .offset8:first-child {
+  margin-left: 67.79661016949152%;
+  *margin-left: 67.68361581920902%;
+}
+.row-fluid .offset7 {
+  margin-left: 61.016949152542374%;
+  *margin-left: 60.90395480225988%;
+}
+.row-fluid .offset7:first-child {
+  margin-left: 59.32203389830509%;
+  *margin-left: 59.209039548022595%;
+}
+.row-fluid .offset6 {
+  margin-left: 52.54237288135593%;
+  *margin-left: 52.42937853107344%;
+}
+.row-fluid .offset6:first-child {
+  margin-left: 50.847457627118644%;
+  *margin-left: 50.73446327683615%;
+}
+.row-fluid .offset5 {
+  margin-left: 44.06779661016948%;
+  *margin-left: 43.95480225988699%;
+}
+.row-fluid .offset5:first-child {
+  margin-left: 42.37288135593219%;
+  *margin-left: 42.2598870056497%;
+}
+.row-fluid .offset4 {
+  margin-left: 35.593220338983045%;
+  *margin-left: 35.48022598870055%;
+}
+.row-fluid .offset4:first-child {
+  margin-left: 33.89830508474576%;
+  *margin-left: 33.785310734463266%;
+}
+.row-fluid .offset3 {
+  margin-left: 27.11864406779661%;
+  *margin-left: 27.005649717514128%;
+}
+.row-fluid .offset3:first-child {
+  margin-left: 25.423728813559322%;
+  *margin-left: 25.310734463276837%;
+}
+.row-fluid .offset2 {
+  margin-left: 18.644067796610166%;
+  *margin-left: 18.531073446327685%;
+}
+.row-fluid .offset2:first-child {
+  margin-left: 16.94915254237288%;
+  *margin-left: 16.836158192090394%;
+}
+.row-fluid .offset1 {
+  margin-left: 10.169491525423728%;
+  *margin-left: 10.056497175141242%;
+}
+.row-fluid .offset1:first-child {
+  margin-left: 8.47457627118644%;
+  *margin-left: 8.361581920903955%;
+}
+[class*="span"].hide,
+.row-fluid [class*="span"].hide {
+  display: none;
+}
+[class*="span"].pull-right,
+.row-fluid [class*="span"].pull-right {
+  float: right;
+}
+.container {
+  margin-right: auto;
+  margin-left: auto;
+  *zoom: 1;
+}
+.container:before,
+.container:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.container:after {
+  clear: both;
+}
+.container-fluid {
+  padding-right: 15px;
+  padding-left: 15px;
+  *zoom: 1;
+}
+.container-fluid:before,
+.container-fluid:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.container-fluid:after {
+  clear: both;
+}
+p {
+  margin: 0 0 10px;
+}
+.lead {
+  margin-bottom: 20px;
+  font-size: 21px;
+  font-weight: 200;
+  line-height: 30px;
+}
+small {
+  font-size: 85%;
+}
+strong {
+  font-weight: bold;
+}
+em {
+  font-style: italic;
+}
+cite {
+  font-style: normal;
+}
+.muted {
+  color: #999999;
+}
+a.muted:hover,
+a.muted:focus {
+  color: #808080;
+}
+.text-warning {
+  color: #c09853;
+}
+a.text-warning:hover,
+a.text-warning:focus {
+  color: #a47e3c;
+}
+.text-error {
+  color: #b94a48;
+}
+a.text-error:hover,
+a.text-error:focus {
+  color: #953b39;
+}
+.text-info {
+  color: #3a87ad;
+}
+a.text-info:hover,
+a.text-info:focus {
+  color: #2d6987;
+}
+.text-success {
+  color: #468847;
+}
+a.text-success:hover,
+a.text-success:focus {
+  color: #356635;
+}
+.text-left {
+  text-align: left;
+}
+.text-right {
+  text-align: right;
+}
+.text-center {
+  text-align: center;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 10px 0;
+  font-family: inherit;
+  font-weight: bold;
+  line-height: 20px;
+  color: inherit;
+  text-rendering: optimizelegibility;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  font-weight: normal;
+  line-height: 1;
+  color: #999999;
+}
+h1,
+h2,
+h3 {
+  line-height: 40px;
+}
+h1 {
+  font-size: 38.5px;
+}
+h2 {
+  font-size: 31.5px;
+}
+h3 {
+  font-size: 24.5px;
+}
+h4 {
+  font-size: 17.5px;
+}
+h5 {
+  font-size: 14px;
+}
+h6 {
+  font-size: 11.9px;
+}
+h1 small {
+  font-size: 24.5px;
+}
+h2 small {
+  font-size: 17.5px;
+}
+h3 small {
+  font-size: 14px;
+}
+h4 small {
+  font-size: 14px;
+}
+.page-header {
+  padding-bottom: 9px;
+  margin: 20px 0 30px;
+  border-bottom: 1px solid #eeeeee;
+}
+ul,
+ol {
+  padding: 0;
+  margin: 0 0 10px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+li {
+  line-height: 20px;
+}
+ul.unstyled,
+ol.unstyled {
+  margin-left: 0;
+  list-style: none;
+}
+ul.inline,
+ol.inline {
+  margin-left: 0;
+  list-style: none;
+}
+ul.inline > li,
+ol.inline > li {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+dl {
+  margin-bottom: 20px;
+}
+dt,
+dd {
+  line-height: 20px;
+}
+dt {
+  font-weight: bold;
+}
+dd {
+  margin-left: 10px;
+}
+.dl-horizontal {
+  *zoom: 1;
+}
+.dl-horizontal:before,
+.dl-horizontal:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.dl-horizontal:after {
+  clear: both;
+}
+.dl-horizontal dt {
+  float: left;
+  width: 160px;
+  clear: left;
+  text-align: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.dl-horizontal dd {
+  margin-left: 180px;
+}
+hr {
+  margin: 20px 0;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+  border-bottom: 1px solid #ffffff;
+}
+abbr[title],
+abbr[data-original-title] {
+  cursor: help;
+  border-bottom: 1px dotted #999999;
+}
+abbr.initialism {
+  font-size: 90%;
+  text-transform: uppercase;
+}
+blockquote {
+  padding: 0 0 0 15px;
+  margin: 0 0 20px;
+  border-left: 5px solid #eeeeee;
+}
+blockquote p {
+  margin-bottom: 0;
+  font-size: 17.5px;
+  font-weight: 300;
+  line-height: 1.25;
+}
+blockquote small {
+  display: block;
+  line-height: 20px;
+  color: #999999;
+}
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+blockquote.pull-right {
+  float: right;
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid #eeeeee;
+  border-left: 0;
+}
+blockquote.pull-right p,
+blockquote.pull-right small {
+  text-align: right;
+}
+blockquote.pull-right small:before {
+  content: '';
+}
+blockquote.pull-right small:after {
+  content: '\00A0 \2014';
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+address {
+  display: block;
+  margin-bottom: 20px;
+  font-style: normal;
+  line-height: 20px;
+}
+code,
+pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
+  font-size: 12px;
+  color: #333333;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+code {
+  padding: 2px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
+  white-space: nowrap;
+}
+pre {
+  display: block;
+  padding: 9.5px;
+  margin: 0 0 10px;
+  font-size: 13px;
+  line-height: 20px;
+  word-break: break-all;
+  word-wrap: break-word;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+pre.prettyprint {
+  margin-bottom: 20px;
+}
+pre code {
+  padding: 0;
+  color: inherit;
+  white-space: pre;
+  white-space: pre-wrap;
+  background-color: transparent;
+  border: 0;
+}
+.pre-scrollable {
+  max-height: 340px;
+  overflow-y: scroll;
+}
+.label,
+.badge {
+  display: inline-block;
+  padding: 2px 4px;
+  font-size: 11.844px;
+  font-weight: bold;
+  line-height: 14px;
+  color: #ffffff;
+  vertical-align: baseline;
+  white-space: nowrap;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #999999;
+}
+.label {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.badge {
+  padding-left: 9px;
+  padding-right: 9px;
+  -webkit-border-radius: 9px;
+  -moz-border-radius: 9px;
+  border-radius: 9px;
+}
+.label:empty,
+.badge:empty {
+  display: none;
+}
+a.label:hover,
+a.label:focus,
+a.badge:hover,
+a.badge:focus {
+  color: #ffffff;
+  text-decoration: none;
+  cursor: pointer;
+}
+.label-important,
+.badge-important {
+  background-color: #b94a48;
+}
+.label-important[href],
+.badge-important[href] {
+  background-color: #953b39;
+}
+.label-warning,
+.badge-warning {
+  background-color: #f89406;
+}
+.label-warning[href],
+.badge-warning[href] {
+  background-color: #c67605;
+}
+.label-success,
+.badge-success {
+  background-color: #468847;
+}
+.label-success[href],
+.badge-success[href] {
+  background-color: #356635;
+}
+.label-info,
+.badge-info {
+  background-color: #3a87ad;
+}
+.label-info[href],
+.badge-info[href] {
+  background-color: #2d6987;
+}
+.label-inverse,
+.badge-inverse {
+  background-color: #333333;
+}
+.label-inverse[href],
+.badge-inverse[href] {
+  background-color: #1a1a1a;
+}
+.btn .label,
+.btn .badge {
+  position: relative;
+  top: -1px;
+}
+.btn-mini .label,
+.btn-mini .badge {
+  top: 0;
+}
+table {
+  max-width: 100%;
+  background-color: transparent;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+.table {
+  width: 100%;
+  margin-bottom: 20px;
+}
+.table th,
+.table td {
+  padding: 8px;
+  line-height: 20px;
+  text-align: left;
+  vertical-align: top;
+  border-top: 1px solid #dddddd;
+}
+.table th {
+  font-weight: bold;
+}
+.table thead th {
+  vertical-align: bottom;
+}
+.table caption + thead tr:first-child th,
+.table caption + thead tr:first-child td,
+.table colgroup + thead tr:first-child th,
+.table colgroup + thead tr:first-child td,
+.table thead:first-child tr:first-child th,
+.table thead:first-child tr:first-child td {
+  border-top: 0;
+}
+.table tbody + tbody {
+  border-top: 2px solid #dddddd;
+}
+.table .table {
+  background-color: #ffffff;
+}
+.table-condensed th,
+.table-condensed td {
+  padding: 4px 5px;
+}
+.table-bordered {
+  border: 1px solid #dddddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  border-left: 0;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.table-bordered th,
+.table-bordered td {
+  border-left: 1px solid #dddddd;
+}
+.table-bordered caption + thead tr:first-child th,
+.table-bordered caption + tbody tr:first-child th,
+.table-bordered caption + tbody tr:first-child td,
+.table-bordered colgroup + thead tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child th,
+.table-bordered colgroup + tbody tr:first-child td,
+.table-bordered thead:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child th,
+.table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+.table-bordered thead:first-child tr:first-child > th:first-child,
+.table-bordered tbody:first-child tr:first-child > td:first-child,
+.table-bordered tbody:first-child tr:first-child > th:first-child {
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+}
+.table-bordered thead:first-child tr:first-child > th:last-child,
+.table-bordered tbody:first-child tr:first-child > td:last-child,
+.table-bordered tbody:first-child tr:first-child > th:last-child {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+}
+.table-bordered thead:last-child tr:last-child > th:first-child,
+.table-bordered tbody:last-child tr:last-child > td:first-child,
+.table-bordered tbody:last-child tr:last-child > th:first-child,
+.table-bordered tfoot:last-child tr:last-child > td:first-child,
+.table-bordered tfoot:last-child tr:last-child > th:first-child {
+  -webkit-border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  border-bottom-left-radius: 4px;
+}
+.table-bordered thead:last-child tr:last-child > th:last-child,
+.table-bordered tbody:last-child tr:last-child > td:last-child,
+.table-bordered tbody:last-child tr:last-child > th:last-child,
+.table-bordered tfoot:last-child tr:last-child > td:last-child,
+.table-bordered tfoot:last-child tr:last-child > th:last-child {
+  -webkit-border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  border-bottom-right-radius: 4px;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:first-child {
+  -webkit-border-bottom-left-radius: 0;
+  -moz-border-radius-bottomleft: 0;
+  border-bottom-left-radius: 0;
+}
+.table-bordered tfoot + tbody:last-child tr:last-child td:last-child {
+  -webkit-border-bottom-right-radius: 0;
+  -moz-border-radius-bottomright: 0;
+  border-bottom-right-radius: 0;
+}
+.table-bordered caption + thead tr:first-child th:first-child,
+.table-bordered caption + tbody tr:first-child td:first-child,
+.table-bordered colgroup + thead tr:first-child th:first-child,
+.table-bordered colgroup + tbody tr:first-child td:first-child {
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+}
+.table-bordered caption + thead tr:first-child th:last-child,
+.table-bordered caption + tbody tr:first-child td:last-child,
+.table-bordered colgroup + thead tr:first-child th:last-child,
+.table-bordered colgroup + tbody tr:first-child td:last-child {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+}
+.table-striped tbody > tr:nth-child(odd) > td,
+.table-striped tbody > tr:nth-child(odd) > th {
+  background-color: #f9f9f9;
+}
+.table-hover tbody tr:hover > td,
+.table-hover tbody tr:hover > th {
+  background-color: #f5f5f5;
+}
+table td[class*="span"],
+table th[class*="span"],
+.row-fluid table td[class*="span"],
+.row-fluid table th[class*="span"] {
+  display: table-cell;
+  float: none;
+  margin-left: 0;
+}
+.table td.span1,
+.table th.span1 {
+  float: none;
+  width: 44px;
+  margin-left: 0;
+}
+.table td.span2,
+.table th.span2 {
+  float: none;
+  width: 119px;
+  margin-left: 0;
+}
+.table td.span3,
+.table th.span3 {
+  float: none;
+  width: 194px;
+  margin-left: 0;
+}
+.table td.span4,
+.table th.span4 {
+  float: none;
+  width: 269px;
+  margin-left: 0;
+}
+.table td.span5,
+.table th.span5 {
+  float: none;
+  width: 344px;
+  margin-left: 0;
+}
+.table td.span6,
+.table th.span6 {
+  float: none;
+  width: 419px;
+  margin-left: 0;
+}
+.table td.span7,
+.table th.span7 {
+  float: none;
+  width: 494px;
+  margin-left: 0;
+}
+.table td.span8,
+.table th.span8 {
+  float: none;
+  width: 569px;
+  margin-left: 0;
+}
+.table td.span9,
+.table th.span9 {
+  float: none;
+  width: 644px;
+  margin-left: 0;
+}
+.table td.span10,
+.table th.span10 {
+  float: none;
+  width: 719px;
+  margin-left: 0;
+}
+.table td.span11,
+.table th.span11 {
+  float: none;
+  width: 794px;
+  margin-left: 0;
+}
+.table td.span12,
+.table th.span12 {
+  float: none;
+  width: 869px;
+  margin-left: 0;
+}
+.table tbody tr.success > td {
+  background-color: #dff0d8;
+}
+.table tbody tr.error > td {
+  background-color: #f2dede;
+}
+.table tbody tr.warning > td {
+  background-color: #fcf8e3;
+}
+.table tbody tr.info > td {
+  background-color: #d9edf7;
+}
+.table-hover tbody tr.success:hover > td {
+  background-color: #d0e9c6;
+}
+.table-hover tbody tr.error:hover > td {
+  background-color: #ebcccc;
+}
+.table-hover tbody tr.warning:hover > td {
+  background-color: #faf2cc;
+}
+.table-hover tbody tr.info:hover > td {
+  background-color: #c4e3f3;
+}
+form {
+  margin: 0 0 20px;
+}
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
+}
+legend {
+  display: block;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 20px;
+  font-size: 21px;
+  line-height: 40px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #e5e5e5;
+}
+legend small {
+  font-size: 15px;
+  color: #999999;
+}
+label,
+input,
+button,
+select,
+textarea {
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+}
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+label {
+  display: block;
+  margin-bottom: 5px;
+}
+select,
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  display: inline-block;
+  height: 20px;
+  padding: 4px 6px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  line-height: 20px;
+  color: #555555;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  vertical-align: middle;
+}
+input,
+textarea,
+.uneditable-input {
+  width: 206px;
+}
+textarea {
+  height: auto;
+}
+textarea,
+input[type="text"],
+input[type="password"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="date"],
+input[type="month"],
+input[type="time"],
+input[type="week"],
+input[type="number"],
+input[type="email"],
+input[type="url"],
+input[type="search"],
+input[type="tel"],
+input[type="color"],
+.uneditable-input {
+  background-color: #ffffff;
+  border: 1px solid #cccccc;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border linear .2s, box-shadow linear .2s;
+  -moz-transition: border linear .2s, box-shadow linear .2s;
+  -o-transition: border linear .2s, box-shadow linear .2s;
+  transition: border linear .2s, box-shadow linear .2s;
+}
+textarea:focus,
+input[type="text"]:focus,
+input[type="password"]:focus,
+input[type="datetime"]:focus,
+input[type="datetime-local"]:focus,
+input[type="date"]:focus,
+input[type="month"]:focus,
+input[type="time"]:focus,
+input[type="week"]:focus,
+input[type="number"]:focus,
+input[type="email"]:focus,
+input[type="url"]:focus,
+input[type="search"]:focus,
+input[type="tel"]:focus,
+input[type="color"]:focus,
+.uneditable-input:focus {
+  border-color: rgba(82, 168, 236, 0.8);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-9 */
+
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
+}
+input[type="radio"],
+input[type="checkbox"] {
+  margin: 4px 0 0;
+  *margin-top: 0;
+  /* IE7 */
+
+  margin-top: 1px \9;
+  /* IE8-9 */
+
+  line-height: normal;
+}
+input[type="file"],
+input[type="image"],
+input[type="submit"],
+input[type="reset"],
+input[type="button"],
+input[type="radio"],
+input[type="checkbox"] {
+  width: auto;
+}
+select,
+input[type="file"] {
+  height: 30px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+  line-height: 30px;
+}
+select {
+  width: 220px;
+  border: 1px solid #cccccc;
+  background-color: #ffffff;
+}
+select[multiple],
+select[size] {
+  height: auto;
+}
+select:focus,
+input[type="file"]:focus,
+input[type="radio"]:focus,
+input[type="checkbox"]:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.uneditable-input,
+.uneditable-textarea {
+  color: #999999;
+  background-color: #fcfcfc;
+  border-color: #cccccc;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  cursor: not-allowed;
+}
+.uneditable-input {
+  overflow: hidden;
+  white-space: nowrap;
+}
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+input:-moz-placeholder,
+textarea:-moz-placeholder {
+  color: #999999;
+}
+input:-ms-input-placeholder,
+textarea:-ms-input-placeholder {
+  color: #999999;
+}
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+  color: #999999;
+}
+.radio,
+.checkbox {
+  min-height: 20px;
+  padding-left: 20px;
+}
+.radio input[type="radio"],
+.checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -20px;
+}
+.controls > .radio:first-child,
+.controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+.radio.inline,
+.checkbox.inline {
+  display: inline-block;
+  padding-top: 5px;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.radio.inline + .radio.inline,
+.checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+.input-mini {
+  width: 60px;
+}
+.input-small {
+  width: 90px;
+}
+.input-medium {
+  width: 150px;
+}
+.input-large {
+  width: 210px;
+}
+.input-xlarge {
+  width: 270px;
+}
+.input-xxlarge {
+  width: 530px;
+}
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"] {
+  float: none;
+  margin-left: 0;
+}
+.input-append input[class*="span"],
+.input-append .uneditable-input[class*="span"],
+.input-prepend input[class*="span"],
+.input-prepend .uneditable-input[class*="span"],
+.row-fluid input[class*="span"],
+.row-fluid select[class*="span"],
+.row-fluid textarea[class*="span"],
+.row-fluid .uneditable-input[class*="span"],
+.row-fluid .input-prepend [class*="span"],
+.row-fluid .input-append [class*="span"] {
+  display: inline-block;
+}
+input,
+textarea,
+.uneditable-input {
+  margin-left: 0;
+}
+.controls-row [class*="span"] + [class*="span"] {
+  margin-left: 15px;
+}
+input.span12,
+textarea.span12,
+.uneditable-input.span12 {
+  width: 871px;
+}
+input.span11,
+textarea.span11,
+.uneditable-input.span11 {
+  width: 796px;
+}
+input.span10,
+textarea.span10,
+.uneditable-input.span10 {
+  width: 721px;
+}
+input.span9,
+textarea.span9,
+.uneditable-input.span9 {
+  width: 646px;
+}
+input.span8,
+textarea.span8,
+.uneditable-input.span8 {
+  width: 571px;
+}
+input.span7,
+textarea.span7,
+.uneditable-input.span7 {
+  width: 496px;
+}
+input.span6,
+textarea.span6,
+.uneditable-input.span6 {
+  width: 421px;
+}
+input.span5,
+textarea.span5,
+.uneditable-input.span5 {
+  width: 346px;
+}
+input.span4,
+textarea.span4,
+.uneditable-input.span4 {
+  width: 271px;
+}
+input.span3,
+textarea.span3,
+.uneditable-input.span3 {
+  width: 196px;
+}
+input.span2,
+textarea.span2,
+.uneditable-input.span2 {
+  width: 121px;
+}
+input.span1,
+textarea.span1,
+.uneditable-input.span1 {
+  width: 46px;
+}
+.controls-row {
+  *zoom: 1;
+}
+.controls-row:before,
+.controls-row:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.controls-row:after {
+  clear: both;
+}
+.controls-row [class*="span"],
+.row-fluid .controls-row [class*="span"] {
+  float: left;
+}
+.controls-row .checkbox[class*="span"],
+.controls-row .radio[class*="span"] {
+  padding-top: 5px;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  cursor: not-allowed;
+  background-color: #eeeeee;
+}
+input[type="radio"][disabled],
+input[type="checkbox"][disabled],
+input[type="radio"][readonly],
+input[type="checkbox"][readonly] {
+  background-color: transparent;
+}
+.control-group.warning .control-label,
+.control-group.warning .help-block,
+.control-group.warning .help-inline {
+  color: #c09853;
+}
+.control-group.warning .checkbox,
+.control-group.warning .radio,
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  color: #c09853;
+}
+.control-group.warning input,
+.control-group.warning select,
+.control-group.warning textarea {
+  border-color: #c09853;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.control-group.warning input:focus,
+.control-group.warning select:focus,
+.control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #dbc59e;
+}
+.control-group.warning .input-prepend .add-on,
+.control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+.control-group.error .control-label,
+.control-group.error .help-block,
+.control-group.error .help-inline {
+  color: #b94a48;
+}
+.control-group.error .checkbox,
+.control-group.error .radio,
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  color: #b94a48;
+}
+.control-group.error input,
+.control-group.error select,
+.control-group.error textarea {
+  border-color: #b94a48;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.control-group.error input:focus,
+.control-group.error select:focus,
+.control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+}
+.control-group.error .input-prepend .add-on,
+.control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+.control-group.success .control-label,
+.control-group.success .help-block,
+.control-group.success .help-inline {
+  color: #468847;
+}
+.control-group.success .checkbox,
+.control-group.success .radio,
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  color: #468847;
+}
+.control-group.success input,
+.control-group.success select,
+.control-group.success textarea {
+  border-color: #468847;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.control-group.success input:focus,
+.control-group.success select:focus,
+.control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+}
+.control-group.success .input-prepend .add-on,
+.control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+.control-group.info .control-label,
+.control-group.info .help-block,
+.control-group.info .help-inline {
+  color: #3a87ad;
+}
+.control-group.info .checkbox,
+.control-group.info .radio,
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  color: #3a87ad;
+}
+.control-group.info input,
+.control-group.info select,
+.control-group.info textarea {
+  border-color: #3a87ad;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.control-group.info input:focus,
+.control-group.info select:focus,
+.control-group.info textarea:focus {
+  border-color: #2d6987;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7ab5d3;
+}
+.control-group.info .input-prepend .add-on,
+.control-group.info .input-append .add-on {
+  color: #3a87ad;
+  background-color: #d9edf7;
+  border-color: #3a87ad;
+}
+input:focus:invalid,
+textarea:focus:invalid,
+select:focus:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+input:focus:invalid:focus,
+textarea:focus:invalid:focus,
+select:focus:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+  -moz-box-shadow: 0 0 6px #f8b9b7;
+  box-shadow: 0 0 6px #f8b9b7;
+}
+.form-actions {
+  padding: 19px 20px 20px;
+  margin-top: 20px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border-top: 1px solid #e5e5e5;
+  *zoom: 1;
+}
+.form-actions:before,
+.form-actions:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.form-actions:after {
+  clear: both;
+}
+.help-block,
+.help-inline {
+  color: #595959;
+}
+.help-block {
+  display: block;
+  margin-bottom: 10px;
+}
+.help-inline {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  vertical-align: middle;
+  padding-left: 5px;
+}
+.input-append,
+.input-prepend {
+  display: inline-block;
+  margin-bottom: 10px;
+  vertical-align: middle;
+  font-size: 0;
+  white-space: nowrap;
+}
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input,
+.input-append .dropdown-menu,
+.input-prepend .dropdown-menu,
+.input-append .popover,
+.input-prepend .popover {
+  font-size: 14px;
+}
+.input-append input,
+.input-prepend input,
+.input-append select,
+.input-prepend select,
+.input-append .uneditable-input,
+.input-prepend .uneditable-input {
+  position: relative;
+  margin-bottom: 0;
+  *margin-left: 0;
+  vertical-align: top;
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.input-append input:focus,
+.input-prepend input:focus,
+.input-append select:focus,
+.input-prepend select:focus,
+.input-append .uneditable-input:focus,
+.input-prepend .uneditable-input:focus {
+  z-index: 2;
+}
+.input-append .add-on,
+.input-prepend .add-on {
+  display: inline-block;
+  width: auto;
+  height: 20px;
+  min-width: 16px;
+  padding: 4px 5px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 20px;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #eeeeee;
+  border: 1px solid #ccc;
+}
+.input-append .add-on,
+.input-prepend .add-on,
+.input-append .btn,
+.input-prepend .btn,
+.input-append .btn-group > .dropdown-toggle,
+.input-prepend .btn-group > .dropdown-toggle {
+  vertical-align: top;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.input-append .active,
+.input-prepend .active {
+  background-color: #a9dba9;
+  border-color: #46a546;
+}
+.input-prepend .add-on,
+.input-prepend .btn {
+  margin-right: -1px;
+}
+.input-prepend .add-on:first-child,
+.input-prepend .btn:first-child {
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+.input-append input,
+.input-append select,
+.input-append .uneditable-input {
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+.input-append input + .btn-group .btn:last-child,
+.input-append select + .btn-group .btn:last-child,
+.input-append .uneditable-input + .btn-group .btn:last-child {
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.input-append .add-on,
+.input-append .btn,
+.input-append .btn-group {
+  margin-left: -1px;
+}
+.input-append .add-on:last-child,
+.input-append .btn:last-child,
+.input-append .btn-group:last-child > .dropdown-toggle {
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.input-prepend.input-append input,
+.input-prepend.input-append select,
+.input-prepend.input-append .uneditable-input {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.input-prepend.input-append input + .btn-group .btn,
+.input-prepend.input-append select + .btn-group .btn,
+.input-prepend.input-append .uneditable-input + .btn-group .btn {
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.input-prepend.input-append .add-on:first-child,
+.input-prepend.input-append .btn:first-child {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+.input-prepend.input-append .add-on:last-child,
+.input-prepend.input-append .btn:last-child {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.input-prepend.input-append .btn-group:first-child {
+  margin-left: 0;
+}
+input.search-query {
+  padding-right: 14px;
+  padding-right: 4px \9;
+  padding-left: 14px;
+  padding-left: 4px \9;
+  /* IE7-8 doesn't have border-radius, so don't indent the padding */
+
+  margin-bottom: 0;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+/* Allow for input prepend/append in search forms */
+.form-search .input-append .search-query,
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.form-search .input-append .search-query {
+  -webkit-border-radius: 14px 0 0 14px;
+  -moz-border-radius: 14px 0 0 14px;
+  border-radius: 14px 0 0 14px;
+}
+.form-search .input-append .btn {
+  -webkit-border-radius: 0 14px 14px 0;
+  -moz-border-radius: 0 14px 14px 0;
+  border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .search-query {
+  -webkit-border-radius: 0 14px 14px 0;
+  -moz-border-radius: 0 14px 14px 0;
+  border-radius: 0 14px 14px 0;
+}
+.form-search .input-prepend .btn {
+  -webkit-border-radius: 14px 0 0 14px;
+  -moz-border-radius: 14px 0 0 14px;
+  border-radius: 14px 0 0 14px;
+}
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input,
+.form-search .input-prepend,
+.form-inline .input-prepend,
+.form-horizontal .input-prepend,
+.form-search .input-append,
+.form-inline .input-append,
+.form-horizontal .input-append {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.form-search .hide,
+.form-inline .hide,
+.form-horizontal .hide {
+  display: none;
+}
+.form-search label,
+.form-inline label,
+.form-search .btn-group,
+.form-inline .btn-group {
+  display: inline-block;
+}
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  margin-bottom: 0;
+}
+.form-search .radio,
+.form-search .checkbox,
+.form-inline .radio,
+.form-inline .checkbox {
+  padding-left: 0;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.form-search .radio input[type="radio"],
+.form-search .checkbox input[type="checkbox"],
+.form-inline .radio input[type="radio"],
+.form-inline .checkbox input[type="checkbox"] {
+  float: left;
+  margin-right: 3px;
+  margin-left: 0;
+}
+.control-group {
+  margin-bottom: 10px;
+}
+legend + .control-group {
+  margin-top: 20px;
+  -webkit-margin-top-collapse: separate;
+}
+.form-horizontal .control-group {
+  margin-bottom: 20px;
+  *zoom: 1;
+}
+.form-horizontal .control-group:before,
+.form-horizontal .control-group:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.form-horizontal .control-group:after {
+  clear: both;
+}
+.form-horizontal .control-label {
+  float: left;
+  width: 160px;
+  padding-top: 5px;
+  text-align: right;
+}
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 180px;
+  *margin-left: 0;
+}
+.form-horizontal .controls:first-child {
+  *padding-left: 180px;
+}
+.form-horizontal .help-block {
+  margin-bottom: 0;
+}
+.form-horizontal input + .help-block,
+.form-horizontal select + .help-block,
+.form-horizontal textarea + .help-block,
+.form-horizontal .uneditable-input + .help-block,
+.form-horizontal .input-prepend + .help-block,
+.form-horizontal .input-append + .help-block {
+  margin-top: 10px;
+}
+.form-horizontal .form-actions {
+  padding-left: 180px;
+}
+.btn {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  padding: 4px 12px;
+  margin-bottom: 0;
+  font-size: 14px;
+  line-height: 20px;
+  text-align: center;
+  vertical-align: middle;
+  cursor: pointer;
+  color: #333333;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  background-color: #f5f5f5;
+  background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+  background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+  border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #e6e6e6;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  border: 1px solid #cccccc;
+  *border: 0;
+  border-bottom-color: #b3b3b3;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  *margin-left: .3em;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn:hover,
+.btn:focus,
+.btn:active,
+.btn.active,
+.btn.disabled,
+.btn[disabled] {
+  color: #333333;
+  background-color: #e6e6e6;
+  *background-color: #d9d9d9;
+}
+.btn:active,
+.btn.active {
+  background-color: #cccccc \9;
+}
+.btn:first-child {
+  *margin-left: 0;
+}
+.btn:hover,
+.btn:focus {
+  color: #333333;
+  text-decoration: none;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
+}
+.btn:focus {
+  outline: thin dotted #333;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.btn.active,
+.btn:active {
+  background-image: none;
+  outline: 0;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn.disabled,
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn-large {
+  padding: 11px 19px;
+  font-size: 17.5px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.btn-large [class^="icon-"],
+.btn-large [class*=" icon-"] {
+  margin-top: 4px;
+}
+.btn-small {
+  padding: 2px 10px;
+  font-size: 11.9px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.btn-small [class^="icon-"],
+.btn-small [class*=" icon-"] {
+  margin-top: 0;
+}
+.btn-mini [class^="icon-"],
+.btn-mini [class*=" icon-"] {
+  margin-top: -1px;
+}
+.btn-mini {
+  padding: 0 6px;
+  font-size: 10.5px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.btn-block {
+  display: block;
+  width: 100%;
+  padding-left: 0;
+  padding-right: 0;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+.btn-block + .btn-block {
+  margin-top: 5px;
+}
+input[type="submit"].btn-block,
+input[type="reset"].btn-block,
+input[type="button"].btn-block {
+  width: 100%;
+}
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active,
+.btn-inverse.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+.btn-primary {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #0044cc;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-primary:hover,
+.btn-primary:focus,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  color: #ffffff;
+  background-color: #0044cc;
+  *background-color: #003bb3;
+}
+.btn-primary:active,
+.btn-primary.active {
+  background-color: #003399 \9;
+}
+.btn-warning {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #f89406;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-warning:hover,
+.btn-warning:focus,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  color: #ffffff;
+  background-color: #f89406;
+  *background-color: #df8505;
+}
+.btn-warning:active,
+.btn-warning.active {
+  background-color: #c67605 \9;
+}
+.btn-danger {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #da4f49;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(to bottom, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #bd362f;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-danger:hover,
+.btn-danger:focus,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  color: #ffffff;
+  background-color: #bd362f;
+  *background-color: #a9302a;
+}
+.btn-danger:active,
+.btn-danger.active {
+  background-color: #942a25 \9;
+}
+.btn-success {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #5bb75b;
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(to bottom, #62c462, #51a351);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #51a351;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-success:hover,
+.btn-success:focus,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  color: #ffffff;
+  background-color: #51a351;
+  *background-color: #499249;
+}
+.btn-success:active,
+.btn-success.active {
+  background-color: #408140 \9;
+}
+.btn-info {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #49afcd;
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(to bottom, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #2f96b4;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-info:hover,
+.btn-info:focus,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  color: #ffffff;
+  background-color: #2f96b4;
+  *background-color: #2a85a0;
+}
+.btn-info:active,
+.btn-info.active {
+  background-color: #24748c \9;
+}
+.btn-inverse {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #363636;
+  background-image: -moz-linear-gradient(top, #444444, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));
+  background-image: -webkit-linear-gradient(top, #444444, #222222);
+  background-image: -o-linear-gradient(top, #444444, #222222);
+  background-image: linear-gradient(to bottom, #444444, #222222);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #222222;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-inverse:hover,
+.btn-inverse:focus,
+.btn-inverse:active,
+.btn-inverse.active,
+.btn-inverse.disabled,
+.btn-inverse[disabled] {
+  color: #ffffff;
+  background-color: #222222;
+  *background-color: #151515;
+}
+.btn-inverse:active,
+.btn-inverse.active {
+  background-color: #080808 \9;
+}
+button.btn,
+input[type="submit"].btn {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+button.btn::-moz-focus-inner,
+input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+button.btn.btn-large,
+input[type="submit"].btn.btn-large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+button.btn.btn-small,
+input[type="submit"].btn.btn-small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+button.btn.btn-mini,
+input[type="submit"].btn.btn-mini {
+  *padding-top: 1px;
+  *padding-bottom: 1px;
+}
+.btn-link,
+.btn-link:active,
+.btn-link[disabled] {
+  background-color: transparent;
+  background-image: none;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn-link {
+  border-color: transparent;
+  cursor: pointer;
+  color: #0088cc;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.btn-link:hover,
+.btn-link:focus {
+  color: #005580;
+  text-decoration: underline;
+  background-color: transparent;
+}
+.btn-link[disabled]:hover,
+.btn-link[disabled]:focus {
+  color: #333333;
+  text-decoration: none;
+}
+[class^="icon-"],
+[class*=" icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  *margin-right: .3em;
+  line-height: 14px;
+  vertical-align: text-top;
+  background-image: url("../img/glyphicons-halflings.png");
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+  margin-top: 1px;
+}
+/* White icons with optional class, or on hover/focus/active states of certain elements */
+.icon-white,
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:focus > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > li > a:focus > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:focus > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"],
+.dropdown-submenu:focus > a > [class*=" icon-"] {
+  background-image: url("../img/glyphicons-halflings-white.png");
+}
+.icon-glass {
+  background-position: 0      0;
+}
+.icon-music {
+  background-position: -24px 0;
+}
+.icon-search {
+  background-position: -48px 0;
+}
+.icon-envelope {
+  background-position: -72px 0;
+}
+.icon-heart {
+  background-position: -96px 0;
+}
+.icon-star {
+  background-position: -120px 0;
+}
+.icon-star-empty {
+  background-position: -144px 0;
+}
+.icon-user {
+  background-position: -168px 0;
+}
+.icon-film {
+  background-position: -192px 0;
+}
+.icon-th-large {
+  background-position: -216px 0;
+}
+.icon-th {
+  background-position: -240px 0;
+}
+.icon-th-list {
+  background-position: -264px 0;
+}
+.icon-ok {
+  background-position: -288px 0;
+}
+.icon-remove {
+  background-position: -312px 0;
+}
+.icon-zoom-in {
+  background-position: -336px 0;
+}
+.icon-zoom-out {
+  background-position: -360px 0;
+}
+.icon-off {
+  background-position: -384px 0;
+}
+.icon-signal {
+  background-position: -408px 0;
+}
+.icon-cog {
+  background-position: -432px 0;
+}
+.icon-trash {
+  background-position: -456px 0;
+}
+.icon-home {
+  background-position: 0 -24px;
+}
+.icon-file {
+  background-position: -24px -24px;
+}
+.icon-time {
+  background-position: -48px -24px;
+}
+.icon-road {
+  background-position: -72px -24px;
+}
+.icon-download-alt {
+  background-position: -96px -24px;
+}
+.icon-download {
+  background-position: -120px -24px;
+}
+.icon-upload {
+  background-position: -144px -24px;
+}
+.icon-inbox {
+  background-position: -168px -24px;
+}
+.icon-play-circle {
+  background-position: -192px -24px;
+}
+.icon-repeat {
+  background-position: -216px -24px;
+}
+.icon-refresh {
+  background-position: -240px -24px;
+}
+.icon-list-alt {
+  background-position: -264px -24px;
+}
+.icon-lock {
+  background-position: -287px -24px;
+}
+.icon-flag {
+  background-position: -312px -24px;
+}
+.icon-headphones {
+  background-position: -336px -24px;
+}
+.icon-volume-off {
+  background-position: -360px -24px;
+}
+.icon-volume-down {
+  background-position: -384px -24px;
+}
+.icon-volume-up {
+  background-position: -408px -24px;
+}
+.icon-qrcode {
+  background-position: -432px -24px;
+}
+.icon-barcode {
+  background-position: -456px -24px;
+}
+.icon-tag {
+  background-position: 0 -48px;
+}
+.icon-tags {
+  background-position: -25px -48px;
+}
+.icon-book {
+  background-position: -48px -48px;
+}
+.icon-bookmark {
+  background-position: -72px -48px;
+}
+.icon-print {
+  background-position: -96px -48px;
+}
+.icon-camera {
+  background-position: -120px -48px;
+}
+.icon-font {
+  background-position: -144px -48px;
+}
+.icon-bold {
+  background-position: -167px -48px;
+}
+.icon-italic {
+  background-position: -192px -48px;
+}
+.icon-text-height {
+  background-position: -216px -48px;
+}
+.icon-text-width {
+  background-position: -240px -48px;
+}
+.icon-align-left {
+  background-position: -264px -48px;
+}
+.icon-align-center {
+  background-position: -288px -48px;
+}
+.icon-align-right {
+  background-position: -312px -48px;
+}
+.icon-align-justify {
+  background-position: -336px -48px;
+}
+.icon-list {
+  background-position: -360px -48px;
+}
+.icon-indent-left {
+  background-position: -384px -48px;
+}
+.icon-indent-right {
+  background-position: -408px -48px;
+}
+.icon-facetime-video {
+  background-position: -432px -48px;
+}
+.icon-picture {
+  background-position: -456px -48px;
+}
+.icon-pencil {
+  background-position: 0 -72px;
+}
+.icon-map-marker {
+  background-position: -24px -72px;
+}
+.icon-adjust {
+  background-position: -48px -72px;
+}
+.icon-tint {
+  background-position: -72px -72px;
+}
+.icon-edit {
+  background-position: -96px -72px;
+}
+.icon-share {
+  background-position: -120px -72px;
+}
+.icon-check {
+  background-position: -144px -72px;
+}
+.icon-move {
+  background-position: -168px -72px;
+}
+.icon-step-backward {
+  background-position: -192px -72px;
+}
+.icon-fast-backward {
+  background-position: -216px -72px;
+}
+.icon-backward {
+  background-position: -240px -72px;
+}
+.icon-play {
+  background-position: -264px -72px;
+}
+.icon-pause {
+  background-position: -288px -72px;
+}
+.icon-stop {
+  background-position: -312px -72px;
+}
+.icon-forward {
+  background-position: -336px -72px;
+}
+.icon-fast-forward {
+  background-position: -360px -72px;
+}
+.icon-step-forward {
+  background-position: -384px -72px;
+}
+.icon-eject {
+  background-position: -408px -72px;
+}
+.icon-chevron-left {
+  background-position: -432px -72px;
+}
+.icon-chevron-right {
+  background-position: -456px -72px;
+}
+.icon-plus-sign {
+  background-position: 0 -96px;
+}
+.icon-minus-sign {
+  background-position: -24px -96px;
+}
+.icon-remove-sign {
+  background-position: -48px -96px;
+}
+.icon-ok-sign {
+  background-position: -72px -96px;
+}
+.icon-question-sign {
+  background-position: -96px -96px;
+}
+.icon-info-sign {
+  background-position: -120px -96px;
+}
+.icon-screenshot {
+  background-position: -144px -96px;
+}
+.icon-remove-circle {
+  background-position: -168px -96px;
+}
+.icon-ok-circle {
+  background-position: -192px -96px;
+}
+.icon-ban-circle {
+  background-position: -216px -96px;
+}
+.icon-arrow-left {
+  background-position: -240px -96px;
+}
+.icon-arrow-right {
+  background-position: -264px -96px;
+}
+.icon-arrow-up {
+  background-position: -289px -96px;
+}
+.icon-arrow-down {
+  background-position: -312px -96px;
+}
+.icon-share-alt {
+  background-position: -336px -96px;
+}
+.icon-resize-full {
+  background-position: -360px -96px;
+}
+.icon-resize-small {
+  background-position: -384px -96px;
+}
+.icon-plus {
+  background-position: -408px -96px;
+}
+.icon-minus {
+  background-position: -433px -96px;
+}
+.icon-asterisk {
+  background-position: -456px -96px;
+}
+.icon-exclamation-sign {
+  background-position: 0 -120px;
+}
+.icon-gift {
+  background-position: -24px -120px;
+}
+.icon-leaf {
+  background-position: -48px -120px;
+}
+.icon-fire {
+  background-position: -72px -120px;
+}
+.icon-eye-open {
+  background-position: -96px -120px;
+}
+.icon-eye-close {
+  background-position: -120px -120px;
+}
+.icon-warning-sign {
+  background-position: -144px -120px;
+}
+.icon-plane {
+  background-position: -168px -120px;
+}
+.icon-calendar {
+  background-position: -192px -120px;
+}
+.icon-random {
+  background-position: -216px -120px;
+  width: 16px;
+}
+.icon-comment {
+  background-position: -240px -120px;
+}
+.icon-magnet {
+  background-position: -264px -120px;
+}
+.icon-chevron-up {
+  background-position: -288px -120px;
+}
+.icon-chevron-down {
+  background-position: -313px -119px;
+}
+.icon-retweet {
+  background-position: -336px -120px;
+}
+.icon-shopping-cart {
+  background-position: -360px -120px;
+}
+.icon-folder-close {
+  background-position: -384px -120px;
+  width: 16px;
+}
+.icon-folder-open {
+  background-position: -408px -120px;
+  width: 16px;
+}
+.icon-resize-vertical {
+  background-position: -432px -119px;
+}
+.icon-resize-horizontal {
+  background-position: -456px -118px;
+}
+.icon-hdd {
+  background-position: 0 -144px;
+}
+.icon-bullhorn {
+  background-position: -24px -144px;
+}
+.icon-bell {
+  background-position: -48px -144px;
+}
+.icon-certificate {
+  background-position: -72px -144px;
+}
+.icon-thumbs-up {
+  background-position: -96px -144px;
+}
+.icon-thumbs-down {
+  background-position: -120px -144px;
+}
+.icon-hand-right {
+  background-position: -144px -144px;
+}
+.icon-hand-left {
+  background-position: -168px -144px;
+}
+.icon-hand-up {
+  background-position: -192px -144px;
+}
+.icon-hand-down {
+  background-position: -216px -144px;
+}
+.icon-circle-arrow-right {
+  background-position: -240px -144px;
+}
+.icon-circle-arrow-left {
+  background-position: -264px -144px;
+}
+.icon-circle-arrow-up {
+  background-position: -288px -144px;
+}
+.icon-circle-arrow-down {
+  background-position: -312px -144px;
+}
+.icon-globe {
+  background-position: -336px -144px;
+}
+.icon-wrench {
+  background-position: -360px -144px;
+}
+.icon-tasks {
+  background-position: -384px -144px;
+}
+.icon-filter {
+  background-position: -408px -144px;
+}
+.icon-briefcase {
+  background-position: -432px -144px;
+}
+.icon-fullscreen {
+  background-position: -456px -144px;
+}
+.btn-group {
+  position: relative;
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  font-size: 0;
+  vertical-align: middle;
+  white-space: nowrap;
+  *margin-left: .3em;
+}
+.btn-group:first-child {
+  *margin-left: 0;
+}
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+.btn-toolbar {
+  font-size: 0;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+.btn-toolbar > .btn + .btn,
+.btn-toolbar > .btn-group + .btn,
+.btn-toolbar > .btn + .btn-group {
+  margin-left: 5px;
+}
+.btn-group > .btn {
+  position: relative;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.btn-group > .btn + .btn {
+  margin-left: -1px;
+}
+.btn-group > .btn,
+.btn-group > .dropdown-menu,
+.btn-group > .popover {
+  font-size: 14px;
+}
+.btn-group > .btn-mini {
+  font-size: 10.5px;
+}
+.btn-group > .btn-small {
+  font-size: 11.9px;
+}
+.btn-group > .btn-large {
+  font-size: 17.5px;
+}
+.btn-group > .btn:first-child {
+  margin-left: 0;
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  border-bottom-left-radius: 4px;
+}
+.btn-group > .btn:last-child,
+.btn-group > .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  border-bottom-right-radius: 4px;
+}
+.btn-group > .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-top-left-radius: 6px;
+  -moz-border-radius-topleft: 6px;
+  border-top-left-radius: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  border-bottom-left-radius: 6px;
+}
+.btn-group > .btn.large:last-child,
+.btn-group > .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+  -moz-border-radius-bottomright: 6px;
+  border-bottom-right-radius: 6px;
+}
+.btn-group > .btn:hover,
+.btn-group > .btn:focus,
+.btn-group > .btn:active,
+.btn-group > .btn.active {
+  z-index: 2;
+}
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+.btn-group > .btn + .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
+  *padding-top: 5px;
+  *padding-bottom: 5px;
+}
+.btn-group > .btn-mini + .dropdown-toggle {
+  padding-left: 5px;
+  padding-right: 5px;
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+}
+.btn-group > .btn-small + .dropdown-toggle {
+  *padding-top: 5px;
+  *padding-bottom: 4px;
+}
+.btn-group > .btn-large + .dropdown-toggle {
+  padding-left: 12px;
+  padding-right: 12px;
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+  box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
+}
+.btn-group.open .btn.dropdown-toggle {
+  background-color: #e6e6e6;
+}
+.btn-group.open .btn-primary.dropdown-toggle {
+  background-color: #0044cc;
+}
+.btn-group.open .btn-warning.dropdown-toggle {
+  background-color: #f89406;
+}
+.btn-group.open .btn-danger.dropdown-toggle {
+  background-color: #bd362f;
+}
+.btn-group.open .btn-success.dropdown-toggle {
+  background-color: #51a351;
+}
+.btn-group.open .btn-info.dropdown-toggle {
+  background-color: #2f96b4;
+}
+.btn-group.open .btn-inverse.dropdown-toggle {
+  background-color: #222222;
+}
+.btn .caret {
+  margin-top: 8px;
+  margin-left: 0;
+}
+.btn-large .caret {
+  margin-top: 6px;
+}
+.btn-large .caret {
+  border-left-width: 5px;
+  border-right-width: 5px;
+  border-top-width: 5px;
+}
+.btn-mini .caret,
+.btn-small .caret {
+  margin-top: 8px;
+}
+.dropup .btn-large .caret {
+  border-bottom-width: 5px;
+}
+.btn-primary .caret,
+.btn-warning .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret,
+.btn-inverse .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+.btn-group-vertical {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+.btn-group-vertical > .btn {
+  display: block;
+  float: none;
+  max-width: 100%;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.btn-group-vertical > .btn + .btn {
+  margin-left: 0;
+  margin-top: -1px;
+}
+.btn-group-vertical > .btn:first-child {
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.btn-group-vertical > .btn:last-child {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.btn-group-vertical > .btn-large:first-child {
+  -webkit-border-radius: 6px 6px 0 0;
+  -moz-border-radius: 6px 6px 0 0;
+  border-radius: 6px 6px 0 0;
+}
+.btn-group-vertical > .btn-large:last-child {
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+}
+.nav {
+  margin-left: 0;
+  margin-bottom: 20px;
+  list-style: none;
+}
+.nav > li > a {
+  display: block;
+}
+.nav > li > a:hover,
+.nav > li > a:focus {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+.nav > li > a > img {
+  max-width: none;
+}
+.nav > .pull-right {
+  float: right;
+}
+.nav-header {
+  display: block;
+  padding: 3px 15px;
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #999999;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  text-transform: uppercase;
+}
+.nav li + .nav-header {
+  margin-top: 9px;
+}
+.nav-list {
+  padding-left: 15px;
+  padding-right: 15px;
+  margin-bottom: 0;
+}
+.nav-list > li > a,
+.nav-list .nav-header {
+  margin-left: -15px;
+  margin-right: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.nav-list > li > a {
+  padding: 3px 15px;
+}
+.nav-list > .active > a,
+.nav-list > .active > a:hover,
+.nav-list > .active > a:focus {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+.nav-list [class^="icon-"],
+.nav-list [class*=" icon-"] {
+  margin-right: 2px;
+}
+.nav-list .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+.nav-tabs,
+.nav-pills {
+  *zoom: 1;
+}
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.nav-tabs:after,
+.nav-pills:after {
+  clear: both;
+}
+.nav-tabs > li,
+.nav-pills > li {
+  float: left;
+}
+.nav-tabs > li > a,
+.nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  line-height: 20px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.nav-tabs > li > a:hover,
+.nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+.nav-tabs > .active > a,
+.nav-tabs > .active > a:hover,
+.nav-tabs > .active > a:focus {
+  color: #555555;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.nav-pills > .active > a,
+.nav-pills > .active > a:hover,
+.nav-pills > .active > a:focus {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+.nav-stacked > li {
+  float: none;
+}
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  border-bottom-right-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  border-bottom-left-radius: 4px;
+}
+.nav-tabs.nav-stacked > li > a:hover,
+.nav-tabs.nav-stacked > li > a:focus {
+  border-color: #ddd;
+  z-index: 2;
+}
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+.nav-tabs .dropdown-menu {
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+}
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.nav .dropdown-toggle .caret {
+  border-top-color: #0088cc;
+  border-bottom-color: #0088cc;
+  margin-top: 6px;
+}
+.nav .dropdown-toggle:hover .caret,
+.nav .dropdown-toggle:focus .caret {
+  border-top-color: #005580;
+  border-bottom-color: #005580;
+}
+/* move down carets for tabs */
+.nav-tabs .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+.nav .active .dropdown-toggle .caret {
+  border-top-color: #fff;
+  border-bottom-color: #fff;
+}
+.nav-tabs .active .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+.nav > .dropdown.active > a:hover,
+.nav > .dropdown.active > a:focus {
+  cursor: pointer;
+}
+.nav-tabs .open .dropdown-toggle,
+.nav-pills .open .dropdown-toggle,
+.nav > li.dropdown.open.active > a:hover,
+.nav > li.dropdown.open.active > a:focus {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+.nav li.dropdown.open .caret,
+.nav li.dropdown.open.active .caret,
+.nav li.dropdown.open a:hover .caret,
+.nav li.dropdown.open a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.tabs-stacked .open > a:hover,
+.tabs-stacked .open > a:focus {
+  border-color: #999999;
+}
+.tabbable {
+  *zoom: 1;
+}
+.tabbable:before,
+.tabbable:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.tabbable:after {
+  clear: both;
+}
+.tab-content {
+  overflow: auto;
+}
+.tabs-below > .nav-tabs,
+.tabs-right > .nav-tabs,
+.tabs-left > .nav-tabs {
+  border-bottom: 0;
+}
+.tab-content > .tab-pane,
+.pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active,
+.pill-content > .active {
+  display: block;
+}
+.tabs-below > .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+.tabs-below > .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+.tabs-below > .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.tabs-below > .nav-tabs > li > a:hover,
+.tabs-below > .nav-tabs > li > a:focus {
+  border-bottom-color: transparent;
+  border-top-color: #ddd;
+}
+.tabs-below > .nav-tabs > .active > a,
+.tabs-below > .nav-tabs > .active > a:hover,
+.tabs-below > .nav-tabs > .active > a:focus {
+  border-color: transparent #ddd #ddd #ddd;
+}
+.tabs-left > .nav-tabs > li,
+.tabs-right > .nav-tabs > li {
+  float: none;
+}
+.tabs-left > .nav-tabs > li > a,
+.tabs-right > .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+.tabs-left > .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+.tabs-left > .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+.tabs-left > .nav-tabs > li > a:hover,
+.tabs-left > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+.tabs-left > .nav-tabs .active > a,
+.tabs-left > .nav-tabs .active > a:hover,
+.tabs-left > .nav-tabs .active > a:focus {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+.tabs-right > .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+.tabs-right > .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.tabs-right > .nav-tabs > li > a:hover,
+.tabs-right > .nav-tabs > li > a:focus {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+.tabs-right > .nav-tabs .active > a,
+.tabs-right > .nav-tabs .active > a:hover,
+.tabs-right > .nav-tabs .active > a:focus {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+.nav > .disabled > a {
+  color: #999999;
+}
+.nav > .disabled > a:hover,
+.nav > .disabled > a:focus {
+  text-decoration: none;
+  background-color: transparent;
+  cursor: default;
+}
+.navbar {
+  overflow: visible;
+  margin-bottom: 20px;
+  *position: relative;
+  *z-index: 2;
+}
+.navbar-inner {
+  min-height: 40px;
+  padding-left: 20px;
+  padding-right: 20px;
+  background-color: #fafafa;
+  background-image: -moz-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: -o-linear-gradient(top, #ffffff, #f2f2f2);
+  background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
+  border: 1px solid #d4d4d4;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+  -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
+  *zoom: 1;
+}
+.navbar-inner:before,
+.navbar-inner:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.navbar-inner:after {
+  clear: both;
+}
+.navbar .container {
+  width: auto;
+}
+.nav-collapse.collapse {
+  height: auto;
+  overflow: visible;
+}
+.navbar .brand {
+  float: left;
+  display: block;
+  padding: 10px 20px 10px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  color: #777777;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .brand:hover,
+.navbar .brand:focus {
+  text-decoration: none;
+}
+.navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+  color: #777777;
+}
+.navbar-link {
+  color: #777777;
+}
+.navbar-link:hover,
+.navbar-link:focus {
+  color: #333333;
+}
+.navbar .divider-vertical {
+  height: 40px;
+  margin: 0 9px;
+  border-left: 1px solid #f2f2f2;
+  border-right: 1px solid #ffffff;
+}
+.navbar .btn,
+.navbar .btn-group {
+  margin-top: 5px;
+}
+.navbar .btn-group .btn,
+.navbar .input-prepend .btn,
+.navbar .input-append .btn,
+.navbar .input-prepend .btn-group,
+.navbar .input-append .btn-group {
+  margin-top: 0;
+}
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+.navbar-form:before,
+.navbar-form:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.navbar-form:after {
+  clear: both;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .radio,
+.navbar-form .checkbox {
+  margin-top: 5px;
+}
+.navbar-form input,
+.navbar-form select,
+.navbar-form .btn {
+  display: inline-block;
+  margin-bottom: 0;
+}
+.navbar-form input[type="image"],
+.navbar-form input[type="checkbox"],
+.navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+.navbar-form .input-append,
+.navbar-form .input-prepend {
+  margin-top: 5px;
+  white-space: nowrap;
+}
+.navbar-form .input-append input,
+.navbar-form .input-prepend input {
+  margin-top: 0;
+}
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+.navbar-search .search-query {
+  margin-bottom: 0;
+  padding: 4px 14px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.navbar-static-top {
+  position: static;
+  margin-bottom: 0;
+}
+.navbar-static-top .navbar-inner {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  position: fixed;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+  margin-bottom: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  border-width: 0 0 1px;
+}
+.navbar-fixed-bottom .navbar-inner {
+  border-width: 1px 0 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-fixed-bottom .navbar-inner {
+  padding-left: 0;
+  padding-right: 0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.navbar-static-top .container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
+  width: 885px;
+}
+.navbar-fixed-top {
+  top: 0;
+}
+.navbar-fixed-top .navbar-inner,
+.navbar-static-top .navbar-inner {
+  -webkit-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  -moz-box-shadow: 0 1px 10px rgba(0,0,0,.1);
+  box-shadow: 0 1px 10px rgba(0,0,0,.1);
+}
+.navbar-fixed-bottom {
+  bottom: 0;
+}
+.navbar-fixed-bottom .navbar-inner {
+  -webkit-box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+  -moz-box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+  box-shadow: 0 -1px 10px rgba(0,0,0,.1);
+}
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+  float: right;
+  margin-right: 0;
+}
+.navbar .nav > li {
+  float: left;
+}
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 15px 10px;
+  color: #777777;
+  text-decoration: none;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.navbar .nav .dropdown-toggle .caret {
+  margin-top: 8px;
+}
+.navbar .nav > li > a:focus,
+.navbar .nav > li > a:hover {
+  background-color: transparent;
+  color: #333333;
+  text-decoration: none;
+}
+.navbar .nav > .active > a,
+.navbar .nav > .active > a:hover,
+.navbar .nav > .active > a:focus {
+  color: #555555;
+  text-decoration: none;
+  background-color: #e5e5e5;
+  -webkit-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+  -moz-box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+  box-shadow: inset 0 3px 8px rgba(0, 0, 0, 0.125);
+}
+.navbar .btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-left: 5px;
+  margin-right: 5px;
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #ededed;
+  background-image: -moz-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));
+  background-image: -webkit-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: -o-linear-gradient(top, #f2f2f2, #e5e5e5);
+  background-image: linear-gradient(to bottom, #f2f2f2, #e5e5e5);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+  border-color: #e5e5e5 #e5e5e5 #bfbfbf;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #e5e5e5;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+  -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
+}
+.navbar .btn-navbar:hover,
+.navbar .btn-navbar:focus,
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active,
+.navbar .btn-navbar.disabled,
+.navbar .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #e5e5e5;
+  *background-color: #d9d9d9;
+}
+.navbar .btn-navbar:active,
+.navbar .btn-navbar.active {
+  background-color: #cccccc \9;
+}
+.navbar .btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+.navbar .nav > li > .dropdown-menu:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 9px;
+}
+.navbar .nav > li > .dropdown-menu:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 10px;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:before {
+  border-top: 7px solid #ccc;
+  border-top-color: rgba(0, 0, 0, 0.2);
+  border-bottom: 0;
+  bottom: -7px;
+  top: auto;
+}
+.navbar-fixed-bottom .nav > li > .dropdown-menu:after {
+  border-top: 6px solid #ffffff;
+  border-bottom: 0;
+  bottom: -6px;
+  top: auto;
+}
+.navbar .nav li.dropdown > a:hover .caret,
+.navbar .nav li.dropdown > a:focus .caret {
+  border-top-color: #333333;
+  border-bottom-color: #333333;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle,
+.navbar .nav li.dropdown.active > .dropdown-toggle,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle {
+  background-color: #e5e5e5;
+  color: #555555;
+}
+.navbar .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #777777;
+  border-bottom-color: #777777;
+}
+.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #555555;
+  border-bottom-color: #555555;
+}
+.navbar .pull-right > li > .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right {
+  left: auto;
+  right: 0;
+}
+.navbar .pull-right > li > .dropdown-menu:before,
+.navbar .nav > li > .dropdown-menu.pull-right:before {
+  left: auto;
+  right: 12px;
+}
+.navbar .pull-right > li > .dropdown-menu:after,
+.navbar .nav > li > .dropdown-menu.pull-right:after {
+  left: auto;
+  right: 13px;
+}
+.navbar .pull-right > li > .dropdown-menu .dropdown-menu,
+.navbar .nav > li > .dropdown-menu.pull-right .dropdown-menu {
+  left: auto;
+  right: 100%;
+  margin-left: 0;
+  margin-right: -1px;
+  -webkit-border-radius: 6px 0 6px 6px;
+  -moz-border-radius: 6px 0 6px 6px;
+  border-radius: 6px 0 6px 6px;
+}
+.navbar-inverse .navbar-inner {
+  background-color: #1b1b1b;
+  background-image: -moz-linear-gradient(top, #222222, #111111);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));
+  background-image: -webkit-linear-gradient(top, #222222, #111111);
+  background-image: -o-linear-gradient(top, #222222, #111111);
+  background-image: linear-gradient(to bottom, #222222, #111111);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);
+  border-color: #252525;
+}
+.navbar-inverse .brand,
+.navbar-inverse .nav > li > a {
+  color: #999999;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.navbar-inverse .brand:hover,
+.navbar-inverse .nav > li > a:hover,
+.navbar-inverse .brand:focus,
+.navbar-inverse .nav > li > a:focus {
+  color: #ffffff;
+}
+.navbar-inverse .brand {
+  color: #999999;
+}
+.navbar-inverse .navbar-text {
+  color: #999999;
+}
+.navbar-inverse .nav > li > a:focus,
+.navbar-inverse .nav > li > a:hover {
+  background-color: transparent;
+  color: #ffffff;
+}
+.navbar-inverse .nav .active > a,
+.navbar-inverse .nav .active > a:hover,
+.navbar-inverse .nav .active > a:focus {
+  color: #ffffff;
+  background-color: #111111;
+}
+.navbar-inverse .navbar-link {
+  color: #999999;
+}
+.navbar-inverse .navbar-link:hover,
+.navbar-inverse .navbar-link:focus {
+  color: #ffffff;
+}
+.navbar-inverse .divider-vertical {
+  border-left-color: #111111;
+  border-right-color: #222222;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
+  background-color: #111111;
+  color: #ffffff;
+}
+.navbar-inverse .nav li.dropdown > a:hover .caret,
+.navbar-inverse .nav li.dropdown > a:focus .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+.navbar-inverse .nav li.dropdown > .dropdown-toggle .caret {
+  border-top-color: #999999;
+  border-bottom-color: #999999;
+}
+.navbar-inverse .nav li.dropdown.open > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.active > .dropdown-toggle .caret,
+.navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle .caret {
+  border-top-color: #ffffff;
+  border-bottom-color: #ffffff;
+}
+.navbar-inverse .navbar-search .search-query {
+  color: #ffffff;
+  background-color: #515151;
+  border-color: #111111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+  -moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+  box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);
+  -webkit-transition: none;
+  -moz-transition: none;
+  -o-transition: none;
+  transition: none;
+}
+.navbar-inverse .navbar-search .search-query:-moz-placeholder {
+  color: #cccccc;
+}
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder {
+  color: #cccccc;
+}
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder {
+  color: #cccccc;
+}
+.navbar-inverse .navbar-search .search-query:focus,
+.navbar-inverse .navbar-search .search-query.focused {
+  padding: 5px 15px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  outline: 0;
+}
+.navbar-inverse .btn-navbar {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e0e0e;
+  background-image: -moz-linear-gradient(top, #151515, #040404);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));
+  background-image: -webkit-linear-gradient(top, #151515, #040404);
+  background-image: -o-linear-gradient(top, #151515, #040404);
+  background-image: linear-gradient(to bottom, #151515, #040404);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);
+  border-color: #040404 #040404 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  *background-color: #040404;
+  /* Darken IE7 buttons by default so they stand out more given they won't have borders */
+
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.navbar-inverse .btn-navbar:hover,
+.navbar-inverse .btn-navbar:focus,
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active,
+.navbar-inverse .btn-navbar.disabled,
+.navbar-inverse .btn-navbar[disabled] {
+  color: #ffffff;
+  background-color: #040404;
+  *background-color: #000000;
+}
+.navbar-inverse .btn-navbar:active,
+.navbar-inverse .btn-navbar.active {
+  background-color: #000000 \9;
+}
+.breadcrumb {
+  padding: 8px 15px;
+  margin: 0 0 20px;
+  list-style: none;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.breadcrumb > li {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.breadcrumb > li > .divider {
+  padding: 0 5px;
+  color: #ccc;
+}
+.breadcrumb > .active {
+  color: #999999;
+}
+.pagination {
+  margin: 20px 0;
+}
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  margin-left: 0;
+  margin-bottom: 0;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.pagination ul > li {
+  display: inline;
+}
+.pagination ul > li > a,
+.pagination ul > li > span {
+  float: left;
+  padding: 4px 12px;
+  line-height: 20px;
+  text-decoration: none;
+  background-color: #ffffff;
+  border: 1px solid #dddddd;
+  border-left-width: 0;
+}
+.pagination ul > li > a:hover,
+.pagination ul > li > a:focus,
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  background-color: #f5f5f5;
+}
+.pagination ul > .active > a,
+.pagination ul > .active > span {
+  color: #999999;
+  cursor: default;
+}
+.pagination ul > .disabled > span,
+.pagination ul > .disabled > a,
+.pagination ul > .disabled > a:hover,
+.pagination ul > .disabled > a:focus {
+  color: #999999;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination ul > li:first-child > a,
+.pagination ul > li:first-child > span {
+  border-left-width: 1px;
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  border-bottom-left-radius: 4px;
+}
+.pagination ul > li:last-child > a,
+.pagination ul > li:last-child > span {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  border-bottom-right-radius: 4px;
+}
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
+.pagination-large ul > li > a,
+.pagination-large ul > li > span {
+  padding: 11px 19px;
+  font-size: 17.5px;
+}
+.pagination-large ul > li:first-child > a,
+.pagination-large ul > li:first-child > span {
+  -webkit-border-top-left-radius: 6px;
+  -moz-border-radius-topleft: 6px;
+  border-top-left-radius: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  border-bottom-left-radius: 6px;
+}
+.pagination-large ul > li:last-child > a,
+.pagination-large ul > li:last-child > span {
+  -webkit-border-top-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+  -moz-border-radius-bottomright: 6px;
+  border-bottom-right-radius: 6px;
+}
+.pagination-mini ul > li:first-child > a,
+.pagination-small ul > li:first-child > a,
+.pagination-mini ul > li:first-child > span,
+.pagination-small ul > li:first-child > span {
+  -webkit-border-top-left-radius: 3px;
+  -moz-border-radius-topleft: 3px;
+  border-top-left-radius: 3px;
+  -webkit-border-bottom-left-radius: 3px;
+  -moz-border-radius-bottomleft: 3px;
+  border-bottom-left-radius: 3px;
+}
+.pagination-mini ul > li:last-child > a,
+.pagination-small ul > li:last-child > a,
+.pagination-mini ul > li:last-child > span,
+.pagination-small ul > li:last-child > span {
+  -webkit-border-top-right-radius: 3px;
+  -moz-border-radius-topright: 3px;
+  border-top-right-radius: 3px;
+  -webkit-border-bottom-right-radius: 3px;
+  -moz-border-radius-bottomright: 3px;
+  border-bottom-right-radius: 3px;
+}
+.pagination-small ul > li > a,
+.pagination-small ul > li > span {
+  padding: 2px 10px;
+  font-size: 11.9px;
+}
+.pagination-mini ul > li > a,
+.pagination-mini ul > li > span {
+  padding: 0 6px;
+  font-size: 10.5px;
+}
+.pager {
+  margin: 20px 0;
+  list-style: none;
+  text-align: center;
+  *zoom: 1;
+}
+.pager:before,
+.pager:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.pager:after {
+  clear: both;
+}
+.pager li {
+  display: inline;
+}
+.pager li > a,
+.pager li > span {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.pager li > a:hover,
+.pager li > a:focus {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+.pager .next > a,
+.pager .next > span {
+  float: right;
+}
+.pager .previous > a,
+.pager .previous > span {
+  float: left;
+}
+.pager .disabled > a,
+.pager .disabled > a:hover,
+.pager .disabled > a:focus,
+.pager .disabled > span {
+  color: #999999;
+  background-color: #fff;
+  cursor: default;
+}
+.thumbnails {
+  margin-left: -15px;
+  list-style: none;
+  *zoom: 1;
+}
+.thumbnails:before,
+.thumbnails:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.thumbnails:after {
+  clear: both;
+}
+.row-fluid .thumbnails {
+  margin-left: 0;
+}
+.thumbnails > li {
+  float: left;
+  margin-bottom: 20px;
+  margin-left: 15px;
+}
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 20px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+a.thumbnail:hover,
+a.thumbnail:focus {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-left: auto;
+  margin-right: auto;
+}
+.thumbnail .caption {
+  padding: 9px;
+  color: #555555;
+}
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 20px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.alert,
+.alert h4 {
+  color: #c09853;
+}
+.alert h4 {
+  margin: 0;
+}
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 20px;
+}
+.alert-success {
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+  color: #468847;
+}
+.alert-success h4 {
+  color: #468847;
+}
+.alert-danger,
+.alert-error {
+  background-color: #f2dede;
+  border-color: #eed3d7;
+  color: #b94a48;
+}
+.alert-danger h4,
+.alert-error h4 {
+  color: #b94a48;
+}
+.alert-info {
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+  color: #3a87ad;
+}
+.alert-info h4 {
+  color: #3a87ad;
+}
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+.alert-block > p,
+.alert-block > ul {
+  margin-bottom: 0;
+}
+.alert-block p + p {
+  margin-top: 5px;
+}
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+@-ms-keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+@-o-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 40px 0;
+  }
+  to {
+    background-position: 0 0;
+  }
+}
+.progress {
+  overflow: hidden;
+  height: 20px;
+  margin-bottom: 20px;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.progress .bar {
+  width: 0%;
+  height: 100%;
+  color: #ffffff;
+  float: left;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(to bottom, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+  -moz-transition: width 0.6s ease;
+  -o-transition: width 0.6s ease;
+  transition: width 0.6s ease;
+}
+.progress .bar + .bar {
+  -webkit-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+  -moz-box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+  box-shadow: inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);
+}
+.progress-striped .bar {
+  background-color: #149bdf;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+  -moz-background-size: 40px 40px;
+  -o-background-size: 40px 40px;
+  background-size: 40px 40px;
+}
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+  -moz-animation: progress-bar-stripes 2s linear infinite;
+  -ms-animation: progress-bar-stripes 2s linear infinite;
+  -o-animation: progress-bar-stripes 2s linear infinite;
+  animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-danger .bar,
+.progress .bar-danger {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(to bottom, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);
+}
+.progress-danger.progress-striped .bar,
+.progress-striped .bar-danger {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-success .bar,
+.progress .bar-success {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(to bottom, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);
+}
+.progress-success.progress-striped .bar,
+.progress-striped .bar-success {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-info .bar,
+.progress .bar-info {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);
+}
+.progress-info.progress-striped .bar,
+.progress-striped .bar-info {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-warning .bar,
+.progress .bar-warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(to bottom, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);
+}
+.progress-warning.progress-striped .bar,
+.progress-striped .bar-warning {
+  background-color: #fbb450;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 30px;
+  color: inherit;
+  background-color: #eeeeee;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  color: inherit;
+  letter-spacing: -1px;
+}
+.hero-unit li {
+  line-height: 30px;
+}
+.media,
+.media-body {
+  overflow: hidden;
+  *overflow: visible;
+  zoom: 1;
+}
+.media,
+.media .media {
+  margin-top: 15px;
+}
+.media:first-child {
+  margin-top: 0;
+}
+.media-object {
+  display: block;
+}
+.media-heading {
+  margin: 0 0 5px;
+}
+.media > .pull-left {
+  margin-right: 10px;
+}
+.media > .pull-right {
+  margin-left: 10px;
+}
+.media-list {
+  margin-left: 0;
+  list-style: none;
+}
+.tooltip {
+  position: absolute;
+  z-index: 1030;
+  display: block;
+  visibility: visible;
+  font-size: 11px;
+  line-height: 1.4;
+  opacity: 0;
+  filter: alpha(opacity=0);
+}
+.tooltip.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.tooltip.top {
+  margin-top: -3px;
+  padding: 5px 0;
+}
+.tooltip.right {
+  margin-left: 3px;
+  padding: 0 5px;
+}
+.tooltip.bottom {
+  margin-top: 3px;
+  padding: 5px 0;
+}
+.tooltip.left {
+  margin-left: -3px;
+  padding: 0 5px;
+}
+.tooltip-inner {
+  max-width: 200px;
+  padding: 8px;
+  color: #ffffff;
+  text-align: center;
+  text-decoration: none;
+  background-color: #000000;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.tooltip-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.tooltip.top .tooltip-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 5px 5px 0;
+  border-top-color: #000000;
+}
+.tooltip.right .tooltip-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-width: 5px 5px 5px 0;
+  border-right-color: #000000;
+}
+.tooltip.left .tooltip-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-width: 5px 0 5px 5px;
+  border-left-color: #000000;
+}
+.tooltip.bottom .tooltip-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-width: 0 5px 5px;
+  border-bottom-color: #000000;
+}
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1010;
+  display: none;
+  max-width: 276px;
+  padding: 1px;
+  text-align: left;
+  background-color: #ffffff;
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  white-space: normal;
+}
+.popover.top {
+  margin-top: -10px;
+}
+.popover.right {
+  margin-left: 10px;
+}
+.popover.bottom {
+  margin-top: 10px;
+}
+.popover.left {
+  margin-left: -10px;
+}
+.popover-title {
+  margin: 0;
+  padding: 8px 14px;
+  font-size: 14px;
+  font-weight: normal;
+  line-height: 18px;
+  background-color: #f7f7f7;
+  border-bottom: 1px solid #ebebeb;
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+.popover-title:empty {
+  display: none;
+}
+.popover-content {
+  padding: 9px 14px;
+}
+.popover .arrow,
+.popover .arrow:after {
+  position: absolute;
+  display: block;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+}
+.popover .arrow {
+  border-width: 11px;
+}
+.popover .arrow:after {
+  border-width: 10px;
+  content: "";
+}
+.popover.top .arrow {
+  left: 50%;
+  margin-left: -11px;
+  border-bottom-width: 0;
+  border-top-color: #999;
+  border-top-color: rgba(0, 0, 0, 0.25);
+  bottom: -11px;
+}
+.popover.top .arrow:after {
+  bottom: 1px;
+  margin-left: -10px;
+  border-bottom-width: 0;
+  border-top-color: #ffffff;
+}
+.popover.right .arrow {
+  top: 50%;
+  left: -11px;
+  margin-top: -11px;
+  border-left-width: 0;
+  border-right-color: #999;
+  border-right-color: rgba(0, 0, 0, 0.25);
+}
+.popover.right .arrow:after {
+  left: 1px;
+  bottom: -10px;
+  border-left-width: 0;
+  border-right-color: #ffffff;
+}
+.popover.bottom .arrow {
+  left: 50%;
+  margin-left: -11px;
+  border-top-width: 0;
+  border-bottom-color: #999;
+  border-bottom-color: rgba(0, 0, 0, 0.25);
+  top: -11px;
+}
+.popover.bottom .arrow:after {
+  top: 1px;
+  margin-left: -10px;
+  border-top-width: 0;
+  border-bottom-color: #ffffff;
+}
+.popover.left .arrow {
+  top: 50%;
+  right: -11px;
+  margin-top: -11px;
+  border-right-width: 0;
+  border-left-color: #999;
+  border-left-color: rgba(0, 0, 0, 0.25);
+}
+.popover.left .arrow:after {
+  right: 1px;
+  border-right-width: 0;
+  border-left-color: #ffffff;
+  bottom: -10px;
+}
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
+}
+.modal-backdrop.fade {
+  opacity: 0;
+}
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.modal {
+  position: fixed;
+  top: 10%;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  /* IE6-7 */
+
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+  outline: none;
+}
+.modal.fade {
+  -webkit-transition: opacity .3s linear, top .3s ease-out;
+  -moz-transition: opacity .3s linear, top .3s ease-out;
+  -o-transition: opacity .3s linear, top .3s ease-out;
+  transition: opacity .3s linear, top .3s ease-out;
+  top: -25%;
+}
+.modal.fade.in {
+  top: 10%;
+}
+.modal-header {
+  padding: 9px 15px;
+  border-bottom: 1px solid #eee;
+}
+.modal-header .close {
+  margin-top: 2px;
+}
+.modal-header h3 {
+  margin: 0;
+  line-height: 30px;
+}
+.modal-body {
+  position: relative;
+  overflow-y: auto;
+  max-height: 400px;
+  padding: 15px;
+}
+.modal-form {
+  margin-bottom: 0;
+}
+.modal-footer {
+  padding: 14px 15px 15px;
+  margin-bottom: 0;
+  text-align: right;
+  background-color: #f5f5f5;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+  *zoom: 1;
+}
+.modal-footer:before,
+.modal-footer:after {
+  display: table;
+  content: "";
+  line-height: 0;
+}
+.modal-footer:after {
+  clear: both;
+}
+.modal-footer .btn + .btn {
+  margin-left: 5px;
+  margin-bottom: 0;
+}
+.modal-footer .btn-group .btn + .btn {
+  margin-left: -1px;
+}
+.modal-footer .btn-block + .btn-block {
+  margin-left: 0;
+}
+.dropup,
+.dropdown {
+  position: relative;
+}
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 2px 0 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.2);
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+}
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 20px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  text-decoration: none;
+  color: #ffffff;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  outline: 0;
+  background-color: #0081c2;
+  background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
+  background-image: -o-linear-gradient(top, #0088cc, #0077b3);
+  background-image: linear-gradient(to bottom, #0088cc, #0077b3);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);
+}
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  background-color: transparent;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  cursor: default;
+}
+.open {
+  *z-index: 1000;
+}
+.open > .dropdown-menu {
+  display: block;
+}
+.dropdown-backdrop {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+  z-index: 990;
+}
+.pull-right > .dropdown-menu {
+  right: 0;
+  left: auto;
+}
+.dropup .caret,
+.navbar-fixed-bottom .dropdown .caret {
+  border-top: 0;
+  border-bottom: 4px solid #000000;
+  content: "";
+}
+.dropup .dropdown-menu,
+.navbar-fixed-bottom .dropdown .dropdown-menu {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 1px;
+}
+.dropdown-submenu {
+  position: relative;
+}
+.dropdown-submenu > .dropdown-menu {
+  top: 0;
+  left: 100%;
+  margin-top: -6px;
+  margin-left: -1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+  -moz-border-radius: 0 6px 6px 6px;
+  border-radius: 0 6px 6px 6px;
+}
+.dropdown-submenu:hover > .dropdown-menu {
+  display: block;
+}
+.dropup .dropdown-submenu > .dropdown-menu {
+  top: auto;
+  bottom: 0;
+  margin-top: 0;
+  margin-bottom: -2px;
+  -webkit-border-radius: 5px 5px 5px 0;
+  -moz-border-radius: 5px 5px 5px 0;
+  border-radius: 5px 5px 5px 0;
+}
+.dropdown-submenu > a:after {
+  display: block;
+  content: " ";
+  float: right;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
+  border-width: 5px 0 5px 5px;
+  border-left-color: #cccccc;
+  margin-top: 5px;
+  margin-right: -10px;
+}
+.dropdown-submenu:hover > a:after {
+  border-left-color: #ffffff;
+}
+.dropdown-submenu.pull-left {
+  float: none;
+}
+.dropdown-submenu.pull-left > .dropdown-menu {
+  left: -100%;
+  margin-left: 10px;
+  -webkit-border-radius: 6px 0 6px 6px;
+  -moz-border-radius: 6px 0 6px 6px;
+  border-radius: 6px 0 6px 6px;
+}
+.dropdown .dropdown-menu .nav-header {
+  padding-left: 20px;
+  padding-right: 20px;
+}
+.typeahead {
+  z-index: 1051;
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.accordion {
+  margin-bottom: 20px;
+}
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.accordion-heading {
+  border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
+.accordion-toggle {
+  cursor: pointer;
+}
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+.carousel {
+  position: relative;
+  margin-bottom: 20px;
+  line-height: 1;
+}
+.carousel-inner {
+  overflow: hidden;
+  width: 100%;
+  position: relative;
+}
+.carousel-inner > .item {
+  display: none;
+  position: relative;
+  -webkit-transition: 0.6s ease-in-out left;
+  -moz-transition: 0.6s ease-in-out left;
+  -o-transition: 0.6s ease-in-out left;
+  transition: 0.6s ease-in-out left;
+}
+.carousel-inner > .item > img,
+.carousel-inner > .item > a > img {
+  display: block;
+  line-height: 1;
+}
+.carousel-inner > .active,
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  display: block;
+}
+.carousel-inner > .active {
+  left: 0;
+}
+.carousel-inner > .next,
+.carousel-inner > .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.carousel-inner > .next {
+  left: 100%;
+}
+.carousel-inner > .prev {
+  left: -100%;
+}
+.carousel-inner > .next.left,
+.carousel-inner > .prev.right {
+  left: 0;
+}
+.carousel-inner > .active.left {
+  left: -100%;
+}
+.carousel-inner > .active.right {
+  left: 100%;
+}
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+  -moz-border-radius: 23px;
+  border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+.carousel-control.right {
+  left: auto;
+  right: 15px;
+}
+.carousel-control:hover,
+.carousel-control:focus {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+.carousel-indicators {
+  position: absolute;
+  top: 15px;
+  right: 15px;
+  z-index: 5;
+  margin: 0;
+  list-style: none;
+}
+.carousel-indicators li {
+  display: block;
+  float: left;
+  width: 10px;
+  height: 10px;
+  margin-left: 5px;
+  text-indent: -999px;
+  background-color: #ccc;
+  background-color: rgba(255, 255, 255, 0.25);
+  border-radius: 5px;
+}
+.carousel-indicators .active {
+  background-color: #fff;
+}
+.carousel-caption {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 15px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+.carousel-caption h4,
+.carousel-caption p {
+  color: #ffffff;
+  line-height: 20px;
+}
+.carousel-caption h4 {
+  margin: 0 0 5px;
+}
+.carousel-caption p {
+  margin-bottom: 0;
+}
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #e3e3e3;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+.well-large {
+  padding: 24px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.well-small {
+  padding: 9px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 20px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+.close:hover,
+.close:focus {
+  color: #000000;
+  text-decoration: none;
+  cursor: pointer;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+}
+button.close {
+  padding: 0;
+  cursor: pointer;
+  background: transparent;
+  border: 0;
+  -webkit-appearance: none;
+}
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.invisible {
+  visibility: hidden;
+}
+.affix {
+  position: fixed;
+}
+.fade {
+  opacity: 0;
+  -webkit-transition: opacity 0.15s linear;
+  -moz-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+}
+.fade.in {
+  opacity: 1;
+}
+.collapse {
+  position: relative;
+  height: 0;
+  overflow: hidden;
+  -webkit-transition: height 0.35s ease;
+  -moz-transition: height 0.35s ease;
+  -o-transition: height 0.35s ease;
+  transition: height 0.35s ease;
+}
+.collapse.in {
+  height: auto;
+}
+@-ms-viewport {
+  width: device-width;
+}
+.hidden {
+  display: none;
+  visibility: hidden;
+}
+.visible-phone {
+  display: none !important;
+}
+.visible-tablet {
+  display: none !important;
+}
+.hidden-desktop {
+  display: none !important;
+}
+.visible-desktop {
+  display: inherit !important;
+}
+@media (min-width: 768px) and (max-width: 979px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important ;
+  }
+  .visible-tablet {
+    display: inherit !important;
+  }
+  .hidden-tablet {
+    display: none !important;
+  }
+}
+@media (max-width: 767px) {
+  .hidden-desktop {
+    display: inherit !important;
+  }
+  .visible-desktop {
+    display: none !important;
+  }
+  .visible-phone {
+    display: inherit !important;
+  }
+  .hidden-phone {
+    display: none !important;
+  }
+}
+.visible-print {
+  display: none !important;
+}
+@media print {
+  .visible-print {
+    display: inherit !important;
+  }
+  .hidden-print {
+    display: none !important;
+  }
+}
+@media (max-width: 767px) {
+  body {
+    padding-left: 20px;
+    padding-right: 20px;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom,
+  .navbar-static-top {
+    margin-left: -20px;
+    margin-right: -20px;
+  }
+  .container-fluid {
+    padding: 0;
+  }
+  .dl-horizontal dt {
+    float: none;
+    clear: none;
+    width: auto;
+    text-align: left;
+  }
+  .dl-horizontal dd {
+    margin-left: 0;
+  }
+  .container {
+    width: auto;
+  }
+  .row-fluid {
+    width: 100%;
+  }
+  .row,
+  .thumbnails {
+    margin-left: 0;
+  }
+  .thumbnails > li {
+    float: none;
+    margin-left: 0;
+  }
+  [class*="span"],
+  .uneditable-input[class*="span"],
+  .row-fluid [class*="span"] {
+    float: none;
+    display: block;
+    width: 100%;
+    margin-left: 0;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  .span12,
+  .row-fluid .span12 {
+    width: 100%;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  .row-fluid [class*="offset"]:first-child {
+    margin-left: 0;
+  }
+  .input-large,
+  .input-xlarge,
+  .input-xxlarge,
+  input[class*="span"],
+  select[class*="span"],
+  textarea[class*="span"],
+  .uneditable-input {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  .input-prepend input,
+  .input-append input,
+  .input-prepend input[class*="span"],
+  .input-append input[class*="span"] {
+    display: inline-block;
+    width: auto;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 0;
+  }
+  .modal {
+    position: fixed;
+    top: 20px;
+    left: 20px;
+    right: 20px;
+    width: auto;
+    margin: 0;
+  }
+  .modal.fade {
+    top: -100px;
+  }
+  .modal.fade.in {
+    top: 20px;
+  }
+}
+@media (max-width: 480px) {
+  .nav-collapse {
+    -webkit-transform: translate3d(0, 0, 0);
+  }
+  .page-header h1 small {
+    display: block;
+    line-height: 20px;
+  }
+  input[type="checkbox"],
+  input[type="radio"] {
+    border: 1px solid #ccc;
+  }
+  .form-horizontal .control-label {
+    float: none;
+    width: auto;
+    padding-top: 0;
+    text-align: left;
+  }
+  .form-horizontal .controls {
+    margin-left: 0;
+  }
+  .form-horizontal .control-list {
+    padding-top: 0;
+  }
+  .form-horizontal .form-actions {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+  .media .pull-left,
+  .media .pull-right {
+    float: none;
+    display: block;
+    margin-bottom: 10px;
+  }
+  .media-object {
+    margin-right: 0;
+    margin-left: 0;
+  }
+  .modal {
+    top: 10px;
+    left: 10px;
+    right: 10px;
+  }
+  .modal-header .close {
+    padding: 10px;
+    margin: -10px;
+  }
+  .carousel-caption {
+    position: static;
+  }
+}
+@media (min-width: 768px) and (max-width: 979px) {
+  .row {
+    margin-left: -20px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    content: "";
+    line-height: 0;
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 20px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 724px;
+  }
+  .span12 {
+    width: 724px;
+  }
+  .span11 {
+    width: 662px;
+  }
+  .span10 {
+    width: 600px;
+  }
+  .span9 {
+    width: 538px;
+  }
+  .span8 {
+    width: 476px;
+  }
+  .span7 {
+    width: 414px;
+  }
+  .span6 {
+    width: 352px;
+  }
+  .span5 {
+    width: 290px;
+  }
+  .span4 {
+    width: 228px;
+  }
+  .span3 {
+    width: 166px;
+  }
+  .span2 {
+    width: 104px;
+  }
+  .span1 {
+    width: 42px;
+  }
+  .offset12 {
+    margin-left: 764px;
+  }
+  .offset11 {
+    margin-left: 702px;
+  }
+  .offset10 {
+    margin-left: 640px;
+  }
+  .offset9 {
+    margin-left: 578px;
+  }
+  .offset8 {
+    margin-left: 516px;
+  }
+  .offset7 {
+    margin-left: 454px;
+  }
+  .offset6 {
+    margin-left: 392px;
+  }
+  .offset5 {
+    margin-left: 330px;
+  }
+  .offset4 {
+    margin-left: 268px;
+  }
+  .offset3 {
+    margin-left: 206px;
+  }
+  .offset2 {
+    margin-left: 144px;
+  }
+  .offset1 {
+    margin-left: 82px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    content: "";
+    line-height: 0;
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    float: left;
+    margin-left: 2.7624309392265194%;
+    *margin-left: 2.7059337640852763%;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.7624309392265194%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94350282485875%;
+  }
+  .row-fluid .span11 {
+    width: 91.43646408839778%;
+    *width: 91.37996691325654%;
+  }
+  .row-fluid .span10 {
+    width: 82.87292817679558%;
+    *width: 82.81643100165434%;
+  }
+  .row-fluid .span9 {
+    width: 74.30939226519337%;
+    *width: 74.25289509005212%;
+  }
+  .row-fluid .span8 {
+    width: 65.74585635359117%;
+    *width: 65.68935917844992%;
+  }
+  .row-fluid .span7 {
+    width: 57.18232044198895%;
+    *width: 57.1258232668477%;
+  }
+  .row-fluid .span6 {
+    width: 48.61878453038674%;
+    *width: 48.562287355245495%;
+  }
+  .row-fluid .span5 {
+    width: 40.05524861878453%;
+    *width: 39.998751443643286%;
+  }
+  .row-fluid .span4 {
+    width: 31.491712707182323%;
+    *width: 31.43521553204108%;
+  }
+  .row-fluid .span3 {
+    width: 22.92817679558011%;
+    *width: 22.87167962043887%;
+  }
+  .row-fluid .span2 {
+    width: 14.3646408839779%;
+    *width: 14.308143708836658%;
+  }
+  .row-fluid .span1 {
+    width: 5.801104972375691%;
+    *width: 5.744607797234448%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.52486187845304%;
+    *margin-left: 105.41186752817055%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.76243093922652%;
+    *margin-left: 102.64943658894403%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.96132596685082%;
+    *margin-left: 96.84833161656833%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.1988950276243%;
+    *margin-left: 94.08590067734181%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.39779005524862%;
+    *margin-left: 88.28479570496613%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.6353591160221%;
+    *margin-left: 85.52236476573961%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.8342541436464%;
+    *margin-left: 79.72125979336391%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 77.07182320441989%;
+    *margin-left: 76.9588288541374%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 71.2707182320442%;
+    *margin-left: 71.15772388176171%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.50828729281768%;
+    *margin-left: 68.39529294253519%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.70718232044199%;
+    *margin-left: 62.594187970159496%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.94475138121547%;
+    *margin-left: 59.83175703093298%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 54.14364640883978%;
+    *margin-left: 54.03065205855729%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.38121546961326%;
+    *margin-left: 51.26822111933077%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.58011049723757%;
+    *margin-left: 45.46711614695508%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.81767955801105%;
+    *margin-left: 42.70468520772856%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 37.01657458563536%;
+    *margin-left: 36.90358023535288%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.25414364640884%;
+    *margin-left: 34.14114929612636%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.45303867403315%;
+    *margin-left: 28.340044323750664%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.69060773480663%;
+    *margin-left: 25.577613384524145%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.88950276243094%;
+    *margin-left: 19.776508412148456%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.12707182320442%;
+    *margin-left: 17.014077472921937%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.32596685082873%;
+    *margin-left: 11.212972500546243%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.56353591160221%;
+    *margin-left: 8.450541561319724%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 20px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 710px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 648px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 586px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 524px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 462px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 400px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 338px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 276px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 214px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 152px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 90px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 28px;
+  }
+}
+@media (min-width: 1200px) {
+  .row {
+    margin-left: -30px;
+    *zoom: 1;
+  }
+  .row:before,
+  .row:after {
+    display: table;
+    content: "";
+    line-height: 0;
+  }
+  .row:after {
+    clear: both;
+  }
+  [class*="span"] {
+    float: left;
+    min-height: 1px;
+    margin-left: 30px;
+  }
+  .container,
+  .navbar-static-top .container,
+  .navbar-fixed-top .container,
+  .navbar-fixed-bottom .container {
+    width: 1170px;
+  }
+  .span12 {
+    width: 1170px;
+  }
+  .span11 {
+    width: 1070px;
+  }
+  .span10 {
+    width: 970px;
+  }
+  .span9 {
+    width: 870px;
+  }
+  .span8 {
+    width: 770px;
+  }
+  .span7 {
+    width: 670px;
+  }
+  .span6 {
+    width: 570px;
+  }
+  .span5 {
+    width: 470px;
+  }
+  .span4 {
+    width: 370px;
+  }
+  .span3 {
+    width: 270px;
+  }
+  .span2 {
+    width: 170px;
+  }
+  .span1 {
+    width: 70px;
+  }
+  .offset12 {
+    margin-left: 1230px;
+  }
+  .offset11 {
+    margin-left: 1130px;
+  }
+  .offset10 {
+    margin-left: 1030px;
+  }
+  .offset9 {
+    margin-left: 930px;
+  }
+  .offset8 {
+    margin-left: 830px;
+  }
+  .offset7 {
+    margin-left: 730px;
+  }
+  .offset6 {
+    margin-left: 630px;
+  }
+  .offset5 {
+    margin-left: 530px;
+  }
+  .offset4 {
+    margin-left: 430px;
+  }
+  .offset3 {
+    margin-left: 330px;
+  }
+  .offset2 {
+    margin-left: 230px;
+  }
+  .offset1 {
+    margin-left: 130px;
+  }
+  .row-fluid {
+    width: 100%;
+    *zoom: 1;
+  }
+  .row-fluid:before,
+  .row-fluid:after {
+    display: table;
+    content: "";
+    line-height: 0;
+  }
+  .row-fluid:after {
+    clear: both;
+  }
+  .row-fluid [class*="span"] {
+    display: block;
+    width: 100%;
+    min-height: 30px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
+    float: left;
+    margin-left: 2.564102564102564%;
+    *margin-left: 2.507605388961321%;
+  }
+  .row-fluid [class*="span"]:first-child {
+    margin-left: 0;
+  }
+  .row-fluid .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 2.564102564102564%;
+  }
+  .row-fluid .span12 {
+    width: 100%;
+    *width: 99.94350282485875%;
+  }
+  .row-fluid .span11 {
+    width: 91.45299145299145%;
+    *width: 91.39649427785021%;
+  }
+  .row-fluid .span10 {
+    width: 82.90598290598291%;
+    *width: 82.84948573084166%;
+  }
+  .row-fluid .span9 {
+    width: 74.35897435897436%;
+    *width: 74.30247718383312%;
+  }
+  .row-fluid .span8 {
+    width: 65.81196581196582%;
+    *width: 65.75546863682457%;
+  }
+  .row-fluid .span7 {
+    width: 57.26495726495726%;
+    *width: 57.208460089816015%;
+  }
+  .row-fluid .span6 {
+    width: 48.717948717948715%;
+    *width: 48.66145154280747%;
+  }
+  .row-fluid .span5 {
+    width: 40.17094017094017%;
+    *width: 40.114442995798925%;
+  }
+  .row-fluid .span4 {
+    width: 31.623931623931625%;
+    *width: 31.567434448790383%;
+  }
+  .row-fluid .span3 {
+    width: 23.076923076923077%;
+    *width: 23.020425901781834%;
+  }
+  .row-fluid .span2 {
+    width: 14.52991452991453%;
+    *width: 14.473417354773288%;
+  }
+  .row-fluid .span1 {
+    width: 5.982905982905983%;
+    *width: 5.92640880776474%;
+  }
+  .row-fluid .offset12 {
+    margin-left: 105.12820512820512%;
+    *margin-left: 105.01521077792263%;
+  }
+  .row-fluid .offset12:first-child {
+    margin-left: 102.56410256410257%;
+    *margin-left: 102.45110821382008%;
+  }
+  .row-fluid .offset11 {
+    margin-left: 96.58119658119658%;
+    *margin-left: 96.46820223091409%;
+  }
+  .row-fluid .offset11:first-child {
+    margin-left: 94.01709401709402%;
+    *margin-left: 93.90409966681153%;
+  }
+  .row-fluid .offset10 {
+    margin-left: 88.03418803418803%;
+    *margin-left: 87.92119368390554%;
+  }
+  .row-fluid .offset10:first-child {
+    margin-left: 85.47008547008548%;
+    *margin-left: 85.35709111980299%;
+  }
+  .row-fluid .offset9 {
+    margin-left: 79.48717948717949%;
+    *margin-left: 79.374185136897%;
+  }
+  .row-fluid .offset9:first-child {
+    margin-left: 76.92307692307693%;
+    *margin-left: 76.81008257279444%;
+  }
+  .row-fluid .offset8 {
+    margin-left: 70.94017094017094%;
+    *margin-left: 70.82717658988845%;
+  }
+  .row-fluid .offset8:first-child {
+    margin-left: 68.37606837606839%;
+    *margin-left: 68.2630740257859%;
+  }
+  .row-fluid .offset7 {
+    margin-left: 62.393162393162385%;
+    *margin-left: 62.28016804287989%;
+  }
+  .row-fluid .offset7:first-child {
+    margin-left: 59.82905982905982%;
+    *margin-left: 59.71606547877733%;
+  }
+  .row-fluid .offset6 {
+    margin-left: 53.84615384615384%;
+    *margin-left: 53.73315949587135%;
+  }
+  .row-fluid .offset6:first-child {
+    margin-left: 51.28205128205128%;
+    *margin-left: 51.169056931768786%;
+  }
+  .row-fluid .offset5 {
+    margin-left: 45.299145299145295%;
+    *margin-left: 45.1861509488628%;
+  }
+  .row-fluid .offset5:first-child {
+    margin-left: 42.73504273504273%;
+    *margin-left: 42.62204838476024%;
+  }
+  .row-fluid .offset4 {
+    margin-left: 36.75213675213675%;
+    *margin-left: 36.639142401854265%;
+  }
+  .row-fluid .offset4:first-child {
+    margin-left: 34.18803418803419%;
+    *margin-left: 34.0750398377517%;
+  }
+  .row-fluid .offset3 {
+    margin-left: 28.205128205128204%;
+    *margin-left: 28.09213385484572%;
+  }
+  .row-fluid .offset3:first-child {
+    margin-left: 25.641025641025642%;
+    *margin-left: 25.528031290743154%;
+  }
+  .row-fluid .offset2 {
+    margin-left: 19.65811965811966%;
+    *margin-left: 19.54512530783717%;
+  }
+  .row-fluid .offset2:first-child {
+    margin-left: 17.094017094017094%;
+    *margin-left: 16.98102274373461%;
+  }
+  .row-fluid .offset1 {
+    margin-left: 11.11111111111111%;
+    *margin-left: 10.998116760828626%;
+  }
+  .row-fluid .offset1:first-child {
+    margin-left: 8.547008547008547%;
+    *margin-left: 8.43401419672606%;
+  }
+  input,
+  textarea,
+  .uneditable-input {
+    margin-left: 0;
+  }
+  .controls-row [class*="span"] + [class*="span"] {
+    margin-left: 30px;
+  }
+  input.span12,
+  textarea.span12,
+  .uneditable-input.span12 {
+    width: 1156px;
+  }
+  input.span11,
+  textarea.span11,
+  .uneditable-input.span11 {
+    width: 1056px;
+  }
+  input.span10,
+  textarea.span10,
+  .uneditable-input.span10 {
+    width: 956px;
+  }
+  input.span9,
+  textarea.span9,
+  .uneditable-input.span9 {
+    width: 856px;
+  }
+  input.span8,
+  textarea.span8,
+  .uneditable-input.span8 {
+    width: 756px;
+  }
+  input.span7,
+  textarea.span7,
+  .uneditable-input.span7 {
+    width: 656px;
+  }
+  input.span6,
+  textarea.span6,
+  .uneditable-input.span6 {
+    width: 556px;
+  }
+  input.span5,
+  textarea.span5,
+  .uneditable-input.span5 {
+    width: 456px;
+  }
+  input.span4,
+  textarea.span4,
+  .uneditable-input.span4 {
+    width: 356px;
+  }
+  input.span3,
+  textarea.span3,
+  .uneditable-input.span3 {
+    width: 256px;
+  }
+  input.span2,
+  textarea.span2,
+  .uneditable-input.span2 {
+    width: 156px;
+  }
+  input.span1,
+  textarea.span1,
+  .uneditable-input.span1 {
+    width: 56px;
+  }
+  .thumbnails {
+    margin-left: -30px;
+  }
+  .thumbnails > li {
+    margin-left: 30px;
+  }
+  .row-fluid .thumbnails {
+    margin-left: 0;
+  }
+}
+@media (max-width: 979px) {
+  body {
+    padding-top: 0;
+  }
+  .navbar-fixed-top,
+  .navbar-fixed-bottom {
+    position: static;
+  }
+  .navbar-fixed-top {
+    margin-bottom: 20px;
+  }
+  .navbar-fixed-bottom {
+    margin-top: 20px;
+  }
+  .navbar-fixed-top .navbar-inner,
+  .navbar-fixed-bottom .navbar-inner {
+    padding: 5px;
+  }
+  .navbar .container {
+    width: auto;
+    padding: 0;
+  }
+  .navbar .brand {
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0 0 0 -5px;
+  }
+  .nav-collapse {
+    clear: both;
+  }
+  .nav-collapse .nav {
+    float: none;
+    margin: 0 0 10px;
+  }
+  .nav-collapse .nav > li {
+    float: none;
+  }
+  .nav-collapse .nav > li > a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > .divider-vertical {
+    display: none;
+  }
+  .nav-collapse .nav .nav-header {
+    color: #777777;
+    text-shadow: none;
+  }
+  .nav-collapse .nav > li > a,
+  .nav-collapse .dropdown-menu a {
+    padding: 9px 15px;
+    font-weight: bold;
+    color: #777777;
+    -webkit-border-radius: 3px;
+    -moz-border-radius: 3px;
+    border-radius: 3px;
+  }
+  .nav-collapse .btn {
+    padding: 4px 10px 4px;
+    font-weight: normal;
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+  }
+  .nav-collapse .dropdown-menu li + li a {
+    margin-bottom: 2px;
+  }
+  .nav-collapse .nav > li > a:hover,
+  .nav-collapse .nav > li > a:focus,
+  .nav-collapse .dropdown-menu a:hover,
+  .nav-collapse .dropdown-menu a:focus {
+    background-color: #f2f2f2;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a,
+  .navbar-inverse .nav-collapse .dropdown-menu a {
+    color: #999999;
+  }
+  .navbar-inverse .nav-collapse .nav > li > a:hover,
+  .navbar-inverse .nav-collapse .nav > li > a:focus,
+  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
+  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
+    background-color: #111111;
+  }
+  .nav-collapse.in .btn-group {
+    margin-top: 5px;
+    padding: 0;
+  }
+  .nav-collapse .dropdown-menu {
+    position: static;
+    top: auto;
+    left: auto;
+    float: none;
+    display: none;
+    max-width: none;
+    margin: 0 15px;
+    padding: 0;
+    background-color: transparent;
+    border: none;
+    -webkit-border-radius: 0;
+    -moz-border-radius: 0;
+    border-radius: 0;
+    -webkit-box-shadow: none;
+    -moz-box-shadow: none;
+    box-shadow: none;
+  }
+  .nav-collapse .open > .dropdown-menu {
+    display: block;
+  }
+  .nav-collapse .dropdown-menu:before,
+  .nav-collapse .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .dropdown-menu .divider {
+    display: none;
+  }
+  .nav-collapse .nav > li > .dropdown-menu:before,
+  .nav-collapse .nav > li > .dropdown-menu:after {
+    display: none;
+  }
+  .nav-collapse .navbar-form,
+  .nav-collapse .navbar-search {
+    float: none;
+    padding: 10px 15px;
+    margin: 10px 0;
+    border-top: 1px solid #f2f2f2;
+    border-bottom: 1px solid #f2f2f2;
+    -webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+    -moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+  }
+  .navbar-inverse .nav-collapse .navbar-form,
+  .navbar-inverse .nav-collapse .navbar-search {
+    border-top-color: #111111;
+    border-bottom-color: #111111;
+  }
+  .navbar .nav-collapse .nav.pull-right {
+    float: none;
+    margin-left: 0;
+  }
+  .nav-collapse,
+  .nav-collapse.collapse {
+    overflow: hidden;
+    height: 0;
+  }
+  .navbar .btn-navbar {
+    display: block;
+  }
+  .navbar-static .navbar-inner {
+    padding-left: 10px;
+    padding-right: 10px;
+  }
+}
+@media (min-width: 980px) {
+  .nav-collapse.collapse {
+    height: auto !important;
+    overflow: visible !important;
+  }
+}
diff --git a/Web/content/css/bootstrap.min.css b/Web/content/css/bootstrap.min.css
new file mode 100644
index 00000000..88dec6ba
--- /dev/null
+++ b/Web/content/css/bootstrap.min.css
@@ -0,0 +1,874 @@
+/*!
+ * Bootstrap v2.3.2
+ *
+ * Copyright 2012 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ */
+.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";line-height:0;}
+.clearfix:after{clear:both;}
+.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0;}
+.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+a:hover,a:active{outline:0;}
+sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{max-width:100%;width:auto\9;height:auto;vertical-align:middle;border:0;-ms-interpolation-mode:bicubic;}
+#map_canvas img,.google-maps img{max-width:none;}
+button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
+button,input{*overflow:visible;line-height:normal;}
+button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
+button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;}
+label,select,button,input[type="button"],input[type="reset"],input[type="submit"],input[type="radio"],input[type="checkbox"]{cursor:pointer;}
+input[type="search"]{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;-webkit-appearance:textfield;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+@media print{*{text-shadow:none !important;color:#000 !important;background:transparent !important;box-shadow:none !important;} a,a:visited{text-decoration:underline;} a[href]:after{content:" (" attr(href) ")";} abbr[title]:after{content:" (" attr(title) ")";} .ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:"";} pre,blockquote{border:1px solid #999;page-break-inside:avoid;} thead{display:table-header-group;} tr,img{page-break-inside:avoid;} img{max-width:100% !important;} @page {margin:0.5cm;}p,h2,h3{orphans:3;widows:3;} h2,h3{page-break-after:avoid;}}body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:20px;color:#333333;background-color:#ffffff;}
+a{color:#0088cc;text-decoration:none;}
+a:hover,a:focus{color:#005580;text-decoration:underline;}
+.img-rounded{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.img-polaroid{padding:4px;background-color:#fff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.1);}
+.img-circle{-webkit-border-radius:500px;-moz-border-radius:500px;border-radius:500px;}
+.row{margin-left:-15px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;}
+.row:after{clear:both;}
+[class*="span"]{float:left;min-height:1px;margin-left:15px;}
+.container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:885px;}
+.span12{width:885px;}
+.span11{width:810px;}
+.span10{width:735px;}
+.span9{width:660px;}
+.span8{width:585px;}
+.span7{width:510px;}
+.span6{width:435px;}
+.span5{width:360px;}
+.span4{width:285px;}
+.span3{width:210px;}
+.span2{width:135px;}
+.span1{width:60px;}
+.offset12{margin-left:915px;}
+.offset11{margin-left:840px;}
+.offset10{margin-left:765px;}
+.offset9{margin-left:690px;}
+.offset8{margin-left:615px;}
+.offset7{margin-left:540px;}
+.offset6{margin-left:465px;}
+.offset5{margin-left:390px;}
+.offset4{margin-left:315px;}
+.offset3{margin-left:240px;}
+.offset2{margin-left:165px;}
+.offset1{margin-left:90px;}
+.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;}
+.row-fluid:after{clear:both;}
+.row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:1.694915254237288%;*margin-left:1.6384180790960452%;}
+.row-fluid [class*="span"]:first-child{margin-left:0;}
+.row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:1.694915254237288%;}
+.row-fluid .span12{width:100%;*width:99.94350282485875%;}
+.row-fluid .span11{width:91.52542372881356%;*width:91.46892655367232%;}
+.row-fluid .span10{width:83.0508474576271%;*width:82.99435028248585%;}
+.row-fluid .span9{width:74.57627118644066%;*width:74.51977401129942%;}
+.row-fluid .span8{width:66.10169491525423%;*width:66.04519774011298%;}
+.row-fluid .span7{width:57.6271186440678%;*width:57.570621468926554%;}
+.row-fluid .span6{width:49.152542372881356%;*width:49.09604519774011%;}
+.row-fluid .span5{width:40.677966101694906%;*width:40.62146892655366%;}
+.row-fluid .span4{width:32.20338983050847%;*width:32.146892655367225%;}
+.row-fluid .span3{width:23.728813559322035%;*width:23.672316384180792%;}
+.row-fluid .span2{width:15.254237288135592%;*width:15.19774011299435%;}
+.row-fluid .span1{width:6.779661016949152%;*width:6.723163841807909%;}
+.row-fluid .offset12{margin-left:103.38983050847457%;*margin-left:103.27683615819208%;}
+.row-fluid .offset12:first-child{margin-left:101.69491525423729%;*margin-left:101.5819209039548%;}
+.row-fluid .offset11{margin-left:94.91525423728814%;*margin-left:94.80225988700565%;}
+.row-fluid .offset11:first-child{margin-left:93.22033898305085%;*margin-left:93.10734463276836%;}
+.row-fluid .offset10{margin-left:86.44067796610167%;*margin-left:86.32768361581918%;}
+.row-fluid .offset10:first-child{margin-left:84.74576271186439%;*margin-left:84.6327683615819%;}
+.row-fluid .offset9{margin-left:77.96610169491524%;*margin-left:77.85310734463275%;}
+.row-fluid .offset9:first-child{margin-left:76.27118644067795%;*margin-left:76.15819209039546%;}
+.row-fluid .offset8{margin-left:69.4915254237288%;*margin-left:69.37853107344631%;}
+.row-fluid .offset8:first-child{margin-left:67.79661016949152%;*margin-left:67.68361581920902%;}
+.row-fluid .offset7{margin-left:61.016949152542374%;*margin-left:60.90395480225988%;}
+.row-fluid .offset7:first-child{margin-left:59.32203389830509%;*margin-left:59.209039548022595%;}
+.row-fluid .offset6{margin-left:52.54237288135593%;*margin-left:52.42937853107344%;}
+.row-fluid .offset6:first-child{margin-left:50.847457627118644%;*margin-left:50.73446327683615%;}
+.row-fluid .offset5{margin-left:44.06779661016948%;*margin-left:43.95480225988699%;}
+.row-fluid .offset5:first-child{margin-left:42.37288135593219%;*margin-left:42.2598870056497%;}
+.row-fluid .offset4{margin-left:35.593220338983045%;*margin-left:35.48022598870055%;}
+.row-fluid .offset4:first-child{margin-left:33.89830508474576%;*margin-left:33.785310734463266%;}
+.row-fluid .offset3{margin-left:27.11864406779661%;*margin-left:27.005649717514128%;}
+.row-fluid .offset3:first-child{margin-left:25.423728813559322%;*margin-left:25.310734463276837%;}
+.row-fluid .offset2{margin-left:18.644067796610166%;*margin-left:18.531073446327685%;}
+.row-fluid .offset2:first-child{margin-left:16.94915254237288%;*margin-left:16.836158192090394%;}
+.row-fluid .offset1{margin-left:10.169491525423728%;*margin-left:10.056497175141242%;}
+.row-fluid .offset1:first-child{margin-left:8.47457627118644%;*margin-left:8.361581920903955%;}
+[class*="span"].hide,.row-fluid [class*="span"].hide{display:none;}
+[class*="span"].pull-right,.row-fluid [class*="span"].pull-right{float:right;}
+.container{margin-right:auto;margin-left:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";line-height:0;}
+.container:after{clear:both;}
+.container-fluid{padding-right:15px;padding-left:15px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";line-height:0;}
+.container-fluid:after{clear:both;}
+p{margin:0 0 10px;}
+.lead{margin-bottom:20px;font-size:21px;font-weight:200;line-height:30px;}
+small{font-size:85%;}
+strong{font-weight:bold;}
+em{font-style:italic;}
+cite{font-style:normal;}
+.muted{color:#999999;}
+a.muted:hover,a.muted:focus{color:#808080;}
+.text-warning{color:#c09853;}
+a.text-warning:hover,a.text-warning:focus{color:#a47e3c;}
+.text-error{color:#b94a48;}
+a.text-error:hover,a.text-error:focus{color:#953b39;}
+.text-info{color:#3a87ad;}
+a.text-info:hover,a.text-info:focus{color:#2d6987;}
+.text-success{color:#468847;}
+a.text-success:hover,a.text-success:focus{color:#356635;}
+.text-left{text-align:left;}
+.text-right{text-align:right;}
+.text-center{text-align:center;}
+h1,h2,h3,h4,h5,h6{margin:10px 0;font-family:inherit;font-weight:bold;line-height:20px;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;line-height:1;color:#999999;}
+h1,h2,h3{line-height:40px;}
+h1{font-size:38.5px;}
+h2{font-size:31.5px;}
+h3{font-size:24.5px;}
+h4{font-size:17.5px;}
+h5{font-size:14px;}
+h6{font-size:11.9px;}
+h1 small{font-size:24.5px;}
+h2 small{font-size:17.5px;}
+h3 small{font-size:14px;}
+h4 small{font-size:14px;}
+.page-header{padding-bottom:9px;margin:20px 0 30px;border-bottom:1px solid #eeeeee;}
+ul,ol{padding:0;margin:0 0 10px 25px;}
+ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
+li{line-height:20px;}
+ul.unstyled,ol.unstyled{margin-left:0;list-style:none;}
+ul.inline,ol.inline{margin-left:0;list-style:none;}ul.inline>li,ol.inline>li{display:inline-block;*display:inline;*zoom:1;padding-left:5px;padding-right:5px;}
+dl{margin-bottom:20px;}
+dt,dd{line-height:20px;}
+dt{font-weight:bold;}
+dd{margin-left:10px;}
+.dl-horizontal{*zoom:1;}.dl-horizontal:before,.dl-horizontal:after{display:table;content:"";line-height:0;}
+.dl-horizontal:after{clear:both;}
+.dl-horizontal dt{float:left;width:160px;clear:left;text-align:right;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
+.dl-horizontal dd{margin-left:180px;}
+hr{margin:20px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;}
+abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #999999;}
+abbr.initialism{font-size:90%;text-transform:uppercase;}
+blockquote{padding:0 0 0 15px;margin:0 0 20px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:17.5px;font-weight:300;line-height:1.25;}
+blockquote small{display:block;line-height:20px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
+blockquote.pull-right{float:right;padding-right:15px;padding-left:0;border-right:5px solid #eeeeee;border-left:0;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
+blockquote.pull-right small:before{content:'';}
+blockquote.pull-right small:after{content:'\00A0 \2014';}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:20px;font-style:normal;line-height:20px;}
+code,pre{padding:0 3px 2px;font-family:Monaco,Menlo,Consolas,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;white-space:nowrap;}
+pre{display:block;padding:9.5px;margin:0 0 10px;font-size:13px;line-height:20px;word-break:break-all;word-wrap:break-word;white-space:pre;white-space:pre-wrap;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}pre.prettyprint{margin-bottom:20px;}
+pre code{padding:0;color:inherit;white-space:pre;white-space:pre-wrap;background-color:transparent;border:0;}
+.pre-scrollable{max-height:340px;overflow-y:scroll;}
+.label,.badge{display:inline-block;padding:2px 4px;font-size:11.844px;font-weight:bold;line-height:14px;color:#ffffff;vertical-align:baseline;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;}
+.label{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.badge{padding-left:9px;padding-right:9px;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;}
+.label:empty,.badge:empty{display:none;}
+a.label:hover,a.label:focus,a.badge:hover,a.badge:focus{color:#ffffff;text-decoration:none;cursor:pointer;}
+.label-important,.badge-important{background-color:#b94a48;}
+.label-important[href],.badge-important[href]{background-color:#953b39;}
+.label-warning,.badge-warning{background-color:#f89406;}
+.label-warning[href],.badge-warning[href]{background-color:#c67605;}
+.label-success,.badge-success{background-color:#468847;}
+.label-success[href],.badge-success[href]{background-color:#356635;}
+.label-info,.badge-info{background-color:#3a87ad;}
+.label-info[href],.badge-info[href]{background-color:#2d6987;}
+.label-inverse,.badge-inverse{background-color:#333333;}
+.label-inverse[href],.badge-inverse[href]{background-color:#1a1a1a;}
+.btn .label,.btn .badge{position:relative;top:-1px;}
+.btn-mini .label,.btn-mini .badge{top:0;}
+table{max-width:100%;background-color:transparent;border-collapse:collapse;border-spacing:0;}
+.table{width:100%;margin-bottom:20px;}.table th,.table td{padding:8px;line-height:20px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;}
+.table th{font-weight:bold;}
+.table thead th{vertical-align:bottom;}
+.table caption+thead tr:first-child th,.table caption+thead tr:first-child td,.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;}
+.table tbody+tbody{border-top:2px solid #dddddd;}
+.table .table{background-color:#ffffff;}
+.table-condensed th,.table-condensed td{padding:4px 5px;}
+.table-bordered{border:1px solid #dddddd;border-collapse:separate;*border-collapse:collapse;border-left:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;}
+.table-bordered caption+thead tr:first-child th,.table-bordered caption+tbody tr:first-child th,.table-bordered caption+tbody tr:first-child td,.table-bordered colgroup+thead tr:first-child th,.table-bordered colgroup+tbody tr:first-child th,.table-bordered colgroup+tbody tr:first-child td,.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
+.table-bordered thead:first-child tr:first-child>th:first-child,.table-bordered tbody:first-child tr:first-child>td:first-child,.table-bordered tbody:first-child tr:first-child>th:first-child{-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;}
+.table-bordered thead:first-child tr:first-child>th:last-child,.table-bordered tbody:first-child tr:first-child>td:last-child,.table-bordered tbody:first-child tr:first-child>th:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;}
+.table-bordered thead:last-child tr:last-child>th:first-child,.table-bordered tbody:last-child tr:last-child>td:first-child,.table-bordered tbody:last-child tr:last-child>th:first-child,.table-bordered tfoot:last-child tr:last-child>td:first-child,.table-bordered tfoot:last-child tr:last-child>th:first-child{-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.table-bordered thead:last-child tr:last-child>th:last-child,.table-bordered tbody:last-child tr:last-child>td:last-child,.table-bordered tbody:last-child tr:last-child>th:last-child,.table-bordered tfoot:last-child tr:last-child>td:last-child,.table-bordered tfoot:last-child tr:last-child>th:last-child{-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
+.table-bordered tfoot+tbody:last-child tr:last-child td:first-child{-webkit-border-bottom-left-radius:0;-moz-border-radius-bottomleft:0;border-bottom-left-radius:0;}
+.table-bordered tfoot+tbody:last-child tr:last-child td:last-child{-webkit-border-bottom-right-radius:0;-moz-border-radius-bottomright:0;border-bottom-right-radius:0;}
+.table-bordered caption+thead tr:first-child th:first-child,.table-bordered caption+tbody tr:first-child td:first-child,.table-bordered colgroup+thead tr:first-child th:first-child,.table-bordered colgroup+tbody tr:first-child td:first-child{-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;}
+.table-bordered caption+thead tr:first-child th:last-child,.table-bordered caption+tbody tr:first-child td:last-child,.table-bordered colgroup+thead tr:first-child th:last-child,.table-bordered colgroup+tbody tr:first-child td:last-child{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;}
+.table-striped tbody>tr:nth-child(odd)>td,.table-striped tbody>tr:nth-child(odd)>th{background-color:#f9f9f9;}
+.table-hover tbody tr:hover>td,.table-hover tbody tr:hover>th{background-color:#f5f5f5;}
+table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span"],.row-fluid table th[class*="span"]{display:table-cell;float:none;margin-left:0;}
+.table td.span1,.table th.span1{float:none;width:44px;margin-left:0;}
+.table td.span2,.table th.span2{float:none;width:119px;margin-left:0;}
+.table td.span3,.table th.span3{float:none;width:194px;margin-left:0;}
+.table td.span4,.table th.span4{float:none;width:269px;margin-left:0;}
+.table td.span5,.table th.span5{float:none;width:344px;margin-left:0;}
+.table td.span6,.table th.span6{float:none;width:419px;margin-left:0;}
+.table td.span7,.table th.span7{float:none;width:494px;margin-left:0;}
+.table td.span8,.table th.span8{float:none;width:569px;margin-left:0;}
+.table td.span9,.table th.span9{float:none;width:644px;margin-left:0;}
+.table td.span10,.table th.span10{float:none;width:719px;margin-left:0;}
+.table td.span11,.table th.span11{float:none;width:794px;margin-left:0;}
+.table td.span12,.table th.span12{float:none;width:869px;margin-left:0;}
+.table tbody tr.success>td{background-color:#dff0d8;}
+.table tbody tr.error>td{background-color:#f2dede;}
+.table tbody tr.warning>td{background-color:#fcf8e3;}
+.table tbody tr.info>td{background-color:#d9edf7;}
+.table-hover tbody tr.success:hover>td{background-color:#d0e9c6;}
+.table-hover tbody tr.error:hover>td{background-color:#ebcccc;}
+.table-hover tbody tr.warning:hover>td{background-color:#faf2cc;}
+.table-hover tbody tr.info:hover>td{background-color:#c4e3f3;}
+form{margin:0 0 20px;}
+fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:20px;font-size:21px;line-height:40px;color:#333333;border:0;border-bottom:1px solid #e5e5e5;}legend small{font-size:15px;color:#999999;}
+label,input,button,select,textarea{font-size:14px;font-weight:normal;line-height:20px;}
+input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
+label{display:block;margin-bottom:5px;}
+select,textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{display:inline-block;height:20px;padding:4px 6px;margin-bottom:10px;font-size:14px;line-height:20px;color:#555555;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;vertical-align:middle;}
+input,textarea,.uneditable-input{width:206px;}
+textarea{height:auto;}
+textarea,input[type="text"],input[type="password"],input[type="datetime"],input[type="datetime-local"],input[type="date"],input[type="month"],input[type="time"],input[type="week"],input[type="number"],input[type="email"],input[type="url"],input[type="search"],input[type="tel"],input[type="color"],.uneditable-input{background-color:#ffffff;border:1px solid #cccccc;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear .2s, box-shadow linear .2s;-moz-transition:border linear .2s, box-shadow linear .2s;-o-transition:border linear .2s, box-shadow linear .2s;transition:border linear .2s, box-shadow linear .2s;}textarea:focus,input[type="text"]:focus,input[type="password"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus,.uneditable-input:focus{border-color:rgba(82, 168, 236, 0.8);outline:0;outline:thin dotted \9;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);}
+input[type="radio"],input[type="checkbox"]{margin:4px 0 0;*margin-top:0;margin-top:1px \9;line-height:normal;}
+input[type="file"],input[type="image"],input[type="submit"],input[type="reset"],input[type="button"],input[type="radio"],input[type="checkbox"]{width:auto;}
+select,input[type="file"]{height:30px;*margin-top:4px;line-height:30px;}
+select{width:220px;border:1px solid #cccccc;background-color:#ffffff;}
+select[multiple],select[size]{height:auto;}
+select:focus,input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.uneditable-input,.uneditable-textarea{color:#999999;background-color:#fcfcfc;border-color:#cccccc;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
+.uneditable-input{overflow:hidden;white-space:nowrap;}
+.uneditable-textarea{width:auto;height:auto;}
+input:-moz-placeholder,textarea:-moz-placeholder{color:#999999;}
+input:-ms-input-placeholder,textarea:-ms-input-placeholder{color:#999999;}
+input::-webkit-input-placeholder,textarea::-webkit-input-placeholder{color:#999999;}
+.radio,.checkbox{min-height:20px;padding-left:20px;}
+.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-20px;}
+.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
+.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;}
+.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
+.input-mini{width:60px;}
+.input-small{width:90px;}
+.input-medium{width:150px;}
+.input-large{width:210px;}
+.input-xlarge{width:270px;}
+.input-xxlarge{width:530px;}
+input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"]{float:none;margin-left:0;}
+.input-append input[class*="span"],.input-append .uneditable-input[class*="span"],.input-prepend input[class*="span"],.input-prepend .uneditable-input[class*="span"],.row-fluid input[class*="span"],.row-fluid select[class*="span"],.row-fluid textarea[class*="span"],.row-fluid .uneditable-input[class*="span"],.row-fluid .input-prepend [class*="span"],.row-fluid .input-append [class*="span"]{display:inline-block;}
+input,textarea,.uneditable-input{margin-left:0;}
+.controls-row [class*="span"]+[class*="span"]{margin-left:15px;}
+input.span12,textarea.span12,.uneditable-input.span12{width:871px;}
+input.span11,textarea.span11,.uneditable-input.span11{width:796px;}
+input.span10,textarea.span10,.uneditable-input.span10{width:721px;}
+input.span9,textarea.span9,.uneditable-input.span9{width:646px;}
+input.span8,textarea.span8,.uneditable-input.span8{width:571px;}
+input.span7,textarea.span7,.uneditable-input.span7{width:496px;}
+input.span6,textarea.span6,.uneditable-input.span6{width:421px;}
+input.span5,textarea.span5,.uneditable-input.span5{width:346px;}
+input.span4,textarea.span4,.uneditable-input.span4{width:271px;}
+input.span3,textarea.span3,.uneditable-input.span3{width:196px;}
+input.span2,textarea.span2,.uneditable-input.span2{width:121px;}
+input.span1,textarea.span1,.uneditable-input.span1{width:46px;}
+.controls-row{*zoom:1;}.controls-row:before,.controls-row:after{display:table;content:"";line-height:0;}
+.controls-row:after{clear:both;}
+.controls-row [class*="span"],.row-fluid .controls-row [class*="span"]{float:left;}
+.controls-row .checkbox[class*="span"],.controls-row .radio[class*="span"]{padding-top:5px;}
+input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#eeeeee;}
+input[type="radio"][disabled],input[type="checkbox"][disabled],input[type="radio"][readonly],input[type="checkbox"][readonly]{background-color:transparent;}
+.control-group.warning .control-label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
+.control-group.warning .checkbox,.control-group.warning .radio,.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{border-color:#c09853;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #dbc59e;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #dbc59e;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #dbc59e;}
+.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
+.control-group.error .control-label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
+.control-group.error .checkbox,.control-group.error .radio,.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{border-color:#b94a48;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #d59392;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #d59392;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #d59392;}
+.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
+.control-group.success .control-label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
+.control-group.success .checkbox,.control-group.success .radio,.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{border-color:#468847;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7aba7b;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7aba7b;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7aba7b;}
+.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
+.control-group.info .control-label,.control-group.info .help-block,.control-group.info .help-inline{color:#3a87ad;}
+.control-group.info .checkbox,.control-group.info .radio,.control-group.info input,.control-group.info select,.control-group.info textarea{color:#3a87ad;}
+.control-group.info input,.control-group.info select,.control-group.info textarea{border-color:#3a87ad;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);}.control-group.info input:focus,.control-group.info select:focus,.control-group.info textarea:focus{border-color:#2d6987;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7ab5d3;-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7ab5d3;box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 6px #7ab5d3;}
+.control-group.info .input-prepend .add-on,.control-group.info .input-append .add-on{color:#3a87ad;background-color:#d9edf7;border-color:#3a87ad;}
+input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+.form-actions{padding:19px 20px 20px;margin-top:20px;margin-bottom:20px;background-color:#f5f5f5;border-top:1px solid #e5e5e5;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";line-height:0;}
+.form-actions:after{clear:both;}
+.help-block,.help-inline{color:#595959;}
+.help-block{display:block;margin-bottom:10px;}
+.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;}
+.input-append,.input-prepend{display:inline-block;margin-bottom:10px;vertical-align:middle;font-size:0;white-space:nowrap;}.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input,.input-append .dropdown-menu,.input-prepend .dropdown-menu,.input-append .popover,.input-prepend .popover{font-size:14px;}
+.input-append input,.input-prepend input,.input-append select,.input-prepend select,.input-append .uneditable-input,.input-prepend .uneditable-input{position:relative;margin-bottom:0;*margin-left:0;vertical-align:top;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}.input-append input:focus,.input-prepend input:focus,.input-append select:focus,.input-prepend select:focus,.input-append .uneditable-input:focus,.input-prepend .uneditable-input:focus{z-index:2;}
+.input-append .add-on,.input-prepend .add-on{display:inline-block;width:auto;height:20px;min-width:16px;padding:4px 5px;font-size:14px;font-weight:normal;line-height:20px;text-align:center;text-shadow:0 1px 0 #ffffff;background-color:#eeeeee;border:1px solid #ccc;}
+.input-append .add-on,.input-prepend .add-on,.input-append .btn,.input-prepend .btn,.input-append .btn-group>.dropdown-toggle,.input-prepend .btn-group>.dropdown-toggle{vertical-align:top;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.input-append .active,.input-prepend .active{background-color:#a9dba9;border-color:#46a546;}
+.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;}
+.input-prepend .add-on:first-child,.input-prepend .btn:first-child{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.input-append input,.input-append select,.input-append .uneditable-input{-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}.input-append input+.btn-group .btn:last-child,.input-append select+.btn-group .btn:last-child,.input-append .uneditable-input+.btn-group .btn:last-child{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.input-append .add-on,.input-append .btn,.input-append .btn-group{margin-left:-1px;}
+.input-append .add-on:last-child,.input-append .btn:last-child,.input-append .btn-group:last-child>.dropdown-toggle{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}.input-prepend.input-append input+.btn-group .btn,.input-prepend.input-append select+.btn-group .btn,.input-prepend.input-append .uneditable-input+.btn-group .btn{-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.input-prepend.input-append .btn-group:first-child{margin-left:0;}
+input.search-query{padding-right:14px;padding-right:4px \9;padding-left:14px;padding-left:4px \9;margin-bottom:0;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.form-search .input-append .search-query,.form-search .input-prepend .search-query{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.form-search .input-append .search-query{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px;}
+.form-search .input-append .btn{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0;}
+.form-search .input-prepend .search-query{-webkit-border-radius:0 14px 14px 0;-moz-border-radius:0 14px 14px 0;border-radius:0 14px 14px 0;}
+.form-search .input-prepend .btn{-webkit-border-radius:14px 0 0 14px;-moz-border-radius:14px 0 0 14px;border-radius:14px 0 0 14px;}
+.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;*display:inline;*zoom:1;margin-bottom:0;vertical-align:middle;}
+.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;}
+.form-search label,.form-inline label,.form-search .btn-group,.form-inline .btn-group{display:inline-block;}
+.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;}
+.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;}
+.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-right:3px;margin-left:0;}
+.control-group{margin-bottom:10px;}
+legend+.control-group{margin-top:20px;-webkit-margin-top-collapse:separate;}
+.form-horizontal .control-group{margin-bottom:20px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";line-height:0;}
+.form-horizontal .control-group:after{clear:both;}
+.form-horizontal .control-label{float:left;width:160px;padding-top:5px;text-align:right;}
+.form-horizontal .controls{*display:inline-block;*padding-left:20px;margin-left:180px;*margin-left:0;}.form-horizontal .controls:first-child{*padding-left:180px;}
+.form-horizontal .help-block{margin-bottom:0;}
+.form-horizontal input+.help-block,.form-horizontal select+.help-block,.form-horizontal textarea+.help-block,.form-horizontal .uneditable-input+.help-block,.form-horizontal .input-prepend+.help-block,.form-horizontal .input-append+.help-block{margin-top:10px;}
+.form-horizontal .form-actions{padding-left:180px;}
+.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 12px;margin-bottom:0;font-size:14px;line-height:20px;text-align:center;vertical-align:middle;cursor:pointer;color:#333333;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(to bottom, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);border:1px solid #cccccc;*border:0;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;*margin-left:.3em;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);}.btn:hover,.btn:focus,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{color:#333333;background-color:#e6e6e6;*background-color:#d9d9d9;}
+.btn:active,.btn.active{background-color:#cccccc \9;}
+.btn:first-child{*margin-left:0;}
+.btn:hover,.btn:focus{color:#333333;text-decoration:none;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
+.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.btn.active,.btn:active{background-image:none;outline:0;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);}
+.btn.disabled,.btn[disabled]{cursor:default;background-image:none;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn-large{padding:11px 19px;font-size:17.5px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.btn-large [class^="icon-"],.btn-large [class*=" icon-"]{margin-top:4px;}
+.btn-small{padding:2px 10px;font-size:11.9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.btn-small [class^="icon-"],.btn-small [class*=" icon-"]{margin-top:0;}
+.btn-mini [class^="icon-"],.btn-mini [class*=" icon-"]{margin-top:-1px;}
+.btn-mini{padding:0 6px;font-size:10.5px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.btn-block{display:block;width:100%;padding-left:0;padding-right:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}
+.btn-block+.btn-block{margin-top:5px;}
+input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%;}
+.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);}
+.btn-primary{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#006dcc;background-image:-moz-linear-gradient(top, #0088cc, #0044cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));background-image:-webkit-linear-gradient(top, #0088cc, #0044cc);background-image:-o-linear-gradient(top, #0088cc, #0044cc);background-image:linear-gradient(to bottom, #0088cc, #0044cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);border-color:#0044cc #0044cc #002a80;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#0044cc;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:focus,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{color:#ffffff;background-color:#0044cc;*background-color:#003bb3;}
+.btn-primary:active,.btn-primary.active{background-color:#003399 \9;}
+.btn-warning{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#f89406;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-warning:hover,.btn-warning:focus,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{color:#ffffff;background-color:#f89406;*background-color:#df8505;}
+.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;}
+.btn-danger{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(to bottom, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffbd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#bd362f;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-danger:hover,.btn-danger:focus,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{color:#ffffff;background-color:#bd362f;*background-color:#a9302a;}
+.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;}
+.btn-success{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(to bottom, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#51a351;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-success:hover,.btn-success:focus,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{color:#ffffff;background-color:#51a351;*background-color:#499249;}
+.btn-success:active,.btn-success.active{background-color:#408140 \9;}
+.btn-info{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(to bottom, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#2f96b4;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-info:hover,.btn-info:focus,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{color:#ffffff;background-color:#2f96b4;*background-color:#2a85a0;}
+.btn-info:active,.btn-info.active{background-color:#24748c \9;}
+.btn-inverse{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#363636;background-image:-moz-linear-gradient(top, #444444, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#444444), to(#222222));background-image:-webkit-linear-gradient(top, #444444, #222222);background-image:-o-linear-gradient(top, #444444, #222222);background-image:linear-gradient(to bottom, #444444, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff444444', endColorstr='#ff222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#222222;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{color:#ffffff;background-color:#222222;*background-color:#151515;}
+.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;}
+button.btn,input[type="submit"].btn{*padding-top:3px;*padding-bottom:3px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
+button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;}
+button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;}
+button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;}
+.btn-link,.btn-link:active,.btn-link[disabled]{background-color:transparent;background-image:none;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn-link{border-color:transparent;cursor:pointer;color:#0088cc;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-link:hover,.btn-link:focus{color:#005580;text-decoration:underline;background-color:transparent;}
+.btn-link[disabled]:hover,.btn-link[disabled]:focus{color:#333333;text-decoration:none;}
+[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;}
+.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:focus>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>li>a:focus>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:focus>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"],.dropdown-submenu:focus>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");}
+.icon-glass{background-position:0 0;}
+.icon-music{background-position:-24px 0;}
+.icon-search{background-position:-48px 0;}
+.icon-envelope{background-position:-72px 0;}
+.icon-heart{background-position:-96px 0;}
+.icon-star{background-position:-120px 0;}
+.icon-star-empty{background-position:-144px 0;}
+.icon-user{background-position:-168px 0;}
+.icon-film{background-position:-192px 0;}
+.icon-th-large{background-position:-216px 0;}
+.icon-th{background-position:-240px 0;}
+.icon-th-list{background-position:-264px 0;}
+.icon-ok{background-position:-288px 0;}
+.icon-remove{background-position:-312px 0;}
+.icon-zoom-in{background-position:-336px 0;}
+.icon-zoom-out{background-position:-360px 0;}
+.icon-off{background-position:-384px 0;}
+.icon-signal{background-position:-408px 0;}
+.icon-cog{background-position:-432px 0;}
+.icon-trash{background-position:-456px 0;}
+.icon-home{background-position:0 -24px;}
+.icon-file{background-position:-24px -24px;}
+.icon-time{background-position:-48px -24px;}
+.icon-road{background-position:-72px -24px;}
+.icon-download-alt{background-position:-96px -24px;}
+.icon-download{background-position:-120px -24px;}
+.icon-upload{background-position:-144px -24px;}
+.icon-inbox{background-position:-168px -24px;}
+.icon-play-circle{background-position:-192px -24px;}
+.icon-repeat{background-position:-216px -24px;}
+.icon-refresh{background-position:-240px -24px;}
+.icon-list-alt{background-position:-264px -24px;}
+.icon-lock{background-position:-287px -24px;}
+.icon-flag{background-position:-312px -24px;}
+.icon-headphones{background-position:-336px -24px;}
+.icon-volume-off{background-position:-360px -24px;}
+.icon-volume-down{background-position:-384px -24px;}
+.icon-volume-up{background-position:-408px -24px;}
+.icon-qrcode{background-position:-432px -24px;}
+.icon-barcode{background-position:-456px -24px;}
+.icon-tag{background-position:0 -48px;}
+.icon-tags{background-position:-25px -48px;}
+.icon-book{background-position:-48px -48px;}
+.icon-bookmark{background-position:-72px -48px;}
+.icon-print{background-position:-96px -48px;}
+.icon-camera{background-position:-120px -48px;}
+.icon-font{background-position:-144px -48px;}
+.icon-bold{background-position:-167px -48px;}
+.icon-italic{background-position:-192px -48px;}
+.icon-text-height{background-position:-216px -48px;}
+.icon-text-width{background-position:-240px -48px;}
+.icon-align-left{background-position:-264px -48px;}
+.icon-align-center{background-position:-288px -48px;}
+.icon-align-right{background-position:-312px -48px;}
+.icon-align-justify{background-position:-336px -48px;}
+.icon-list{background-position:-360px -48px;}
+.icon-indent-left{background-position:-384px -48px;}
+.icon-indent-right{background-position:-408px -48px;}
+.icon-facetime-video{background-position:-432px -48px;}
+.icon-picture{background-position:-456px -48px;}
+.icon-pencil{background-position:0 -72px;}
+.icon-map-marker{background-position:-24px -72px;}
+.icon-adjust{background-position:-48px -72px;}
+.icon-tint{background-position:-72px -72px;}
+.icon-edit{background-position:-96px -72px;}
+.icon-share{background-position:-120px -72px;}
+.icon-check{background-position:-144px -72px;}
+.icon-move{background-position:-168px -72px;}
+.icon-step-backward{background-position:-192px -72px;}
+.icon-fast-backward{background-position:-216px -72px;}
+.icon-backward{background-position:-240px -72px;}
+.icon-play{background-position:-264px -72px;}
+.icon-pause{background-position:-288px -72px;}
+.icon-stop{background-position:-312px -72px;}
+.icon-forward{background-position:-336px -72px;}
+.icon-fast-forward{background-position:-360px -72px;}
+.icon-step-forward{background-position:-384px -72px;}
+.icon-eject{background-position:-408px -72px;}
+.icon-chevron-left{background-position:-432px -72px;}
+.icon-chevron-right{background-position:-456px -72px;}
+.icon-plus-sign{background-position:0 -96px;}
+.icon-minus-sign{background-position:-24px -96px;}
+.icon-remove-sign{background-position:-48px -96px;}
+.icon-ok-sign{background-position:-72px -96px;}
+.icon-question-sign{background-position:-96px -96px;}
+.icon-info-sign{background-position:-120px -96px;}
+.icon-screenshot{background-position:-144px -96px;}
+.icon-remove-circle{background-position:-168px -96px;}
+.icon-ok-circle{background-position:-192px -96px;}
+.icon-ban-circle{background-position:-216px -96px;}
+.icon-arrow-left{background-position:-240px -96px;}
+.icon-arrow-right{background-position:-264px -96px;}
+.icon-arrow-up{background-position:-289px -96px;}
+.icon-arrow-down{background-position:-312px -96px;}
+.icon-share-alt{background-position:-336px -96px;}
+.icon-resize-full{background-position:-360px -96px;}
+.icon-resize-small{background-position:-384px -96px;}
+.icon-plus{background-position:-408px -96px;}
+.icon-minus{background-position:-433px -96px;}
+.icon-asterisk{background-position:-456px -96px;}
+.icon-exclamation-sign{background-position:0 -120px;}
+.icon-gift{background-position:-24px -120px;}
+.icon-leaf{background-position:-48px -120px;}
+.icon-fire{background-position:-72px -120px;}
+.icon-eye-open{background-position:-96px -120px;}
+.icon-eye-close{background-position:-120px -120px;}
+.icon-warning-sign{background-position:-144px -120px;}
+.icon-plane{background-position:-168px -120px;}
+.icon-calendar{background-position:-192px -120px;}
+.icon-random{background-position:-216px -120px;width:16px;}
+.icon-comment{background-position:-240px -120px;}
+.icon-magnet{background-position:-264px -120px;}
+.icon-chevron-up{background-position:-288px -120px;}
+.icon-chevron-down{background-position:-313px -119px;}
+.icon-retweet{background-position:-336px -120px;}
+.icon-shopping-cart{background-position:-360px -120px;}
+.icon-folder-close{background-position:-384px -120px;width:16px;}
+.icon-folder-open{background-position:-408px -120px;width:16px;}
+.icon-resize-vertical{background-position:-432px -119px;}
+.icon-resize-horizontal{background-position:-456px -118px;}
+.icon-hdd{background-position:0 -144px;}
+.icon-bullhorn{background-position:-24px -144px;}
+.icon-bell{background-position:-48px -144px;}
+.icon-certificate{background-position:-72px -144px;}
+.icon-thumbs-up{background-position:-96px -144px;}
+.icon-thumbs-down{background-position:-120px -144px;}
+.icon-hand-right{background-position:-144px -144px;}
+.icon-hand-left{background-position:-168px -144px;}
+.icon-hand-up{background-position:-192px -144px;}
+.icon-hand-down{background-position:-216px -144px;}
+.icon-circle-arrow-right{background-position:-240px -144px;}
+.icon-circle-arrow-left{background-position:-264px -144px;}
+.icon-circle-arrow-up{background-position:-288px -144px;}
+.icon-circle-arrow-down{background-position:-312px -144px;}
+.icon-globe{background-position:-336px -144px;}
+.icon-wrench{background-position:-360px -144px;}
+.icon-tasks{background-position:-384px -144px;}
+.icon-filter{background-position:-408px -144px;}
+.icon-briefcase{background-position:-432px -144px;}
+.icon-fullscreen{background-position:-456px -144px;}
+.btn-group{position:relative;display:inline-block;*display:inline;*zoom:1;font-size:0;vertical-align:middle;white-space:nowrap;*margin-left:.3em;}.btn-group:first-child{*margin-left:0;}
+.btn-group+.btn-group{margin-left:5px;}
+.btn-toolbar{font-size:0;margin-top:10px;margin-bottom:10px;}.btn-toolbar>.btn+.btn,.btn-toolbar>.btn-group+.btn,.btn-toolbar>.btn+.btn-group{margin-left:5px;}
+.btn-group>.btn{position:relative;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-group>.btn+.btn{margin-left:-1px;}
+.btn-group>.btn,.btn-group>.dropdown-menu,.btn-group>.popover{font-size:14px;}
+.btn-group>.btn-mini{font-size:10.5px;}
+.btn-group>.btn-small{font-size:11.9px;}
+.btn-group>.btn-large{font-size:17.5px;}
+.btn-group>.btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.btn-group>.btn:last-child,.btn-group>.dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
+.btn-group>.btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
+.btn-group>.btn.large:last-child,.btn-group>.large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
+.btn-group>.btn:hover,.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active{z-index:2;}
+.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;}
+.btn-group>.btn+.dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);*padding-top:5px;*padding-bottom:5px;}
+.btn-group>.btn-mini+.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:2px;*padding-bottom:2px;}
+.btn-group>.btn-small+.dropdown-toggle{*padding-top:5px;*padding-bottom:4px;}
+.btn-group>.btn-large+.dropdown-toggle{padding-left:12px;padding-right:12px;*padding-top:7px;*padding-bottom:7px;}
+.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);-moz-box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);}
+.btn-group.open .btn.dropdown-toggle{background-color:#e6e6e6;}
+.btn-group.open .btn-primary.dropdown-toggle{background-color:#0044cc;}
+.btn-group.open .btn-warning.dropdown-toggle{background-color:#f89406;}
+.btn-group.open .btn-danger.dropdown-toggle{background-color:#bd362f;}
+.btn-group.open .btn-success.dropdown-toggle{background-color:#51a351;}
+.btn-group.open .btn-info.dropdown-toggle{background-color:#2f96b4;}
+.btn-group.open .btn-inverse.dropdown-toggle{background-color:#222222;}
+.btn .caret{margin-top:8px;margin-left:0;}
+.btn-large .caret{margin-top:6px;}
+.btn-large .caret{border-left-width:5px;border-right-width:5px;border-top-width:5px;}
+.btn-mini .caret,.btn-small .caret{margin-top:8px;}
+.dropup .btn-large .caret{border-bottom-width:5px;}
+.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;}
+.btn-group-vertical{display:inline-block;*display:inline;*zoom:1;}
+.btn-group-vertical>.btn{display:block;float:none;max-width:100%;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-group-vertical>.btn+.btn{margin-left:0;margin-top:-1px;}
+.btn-group-vertical>.btn:first-child{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.btn-group-vertical>.btn:last-child{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.btn-group-vertical>.btn-large:first-child{-webkit-border-radius:6px 6px 0 0;-moz-border-radius:6px 6px 0 0;border-radius:6px 6px 0 0;}
+.btn-group-vertical>.btn-large:last-child{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;}
+.nav{margin-left:0;margin-bottom:20px;list-style:none;}
+.nav>li>a{display:block;}
+.nav>li>a:hover,.nav>li>a:focus{text-decoration:none;background-color:#eeeeee;}
+.nav>li>a>img{max-width:none;}
+.nav>.pull-right{float:right;}
+.nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:20px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;}
+.nav li+.nav-header{margin-top:9px;}
+.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;}
+.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.nav-list>li>a{padding:3px 15px;}
+.nav-list>.active>a,.nav-list>.active>a:hover,.nav-list>.active>a:focus{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
+.nav-list [class^="icon-"],.nav-list [class*=" icon-"]{margin-right:2px;}
+.nav-list .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
+.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";line-height:0;}
+.nav-tabs:after,.nav-pills:after{clear:both;}
+.nav-tabs>li,.nav-pills>li{float:left;}
+.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
+.nav-tabs{border-bottom:1px solid #ddd;}
+.nav-tabs>li{margin-bottom:-1px;}
+.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:20px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover,.nav-tabs>li>a:focus{border-color:#eeeeee #eeeeee #dddddd;}
+.nav-tabs>.active>a,.nav-tabs>.active>a:hover,.nav-tabs>.active>a:focus{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
+.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.nav-pills>.active>a,.nav-pills>.active>a:hover,.nav-pills>.active>a:focus{color:#ffffff;background-color:#0088cc;}
+.nav-stacked>li{float:none;}
+.nav-stacked>li>a{margin-right:0;}
+.nav-tabs.nav-stacked{border-bottom:0;}
+.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;}
+.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.nav-tabs.nav-stacked>li>a:hover,.nav-tabs.nav-stacked>li>a:focus{border-color:#ddd;z-index:2;}
+.nav-pills.nav-stacked>li>a{margin-bottom:3px;}
+.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;}
+.nav-tabs .dropdown-menu{-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;}
+.nav-pills .dropdown-menu{-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.nav .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;}
+.nav .dropdown-toggle:hover .caret,.nav .dropdown-toggle:focus .caret{border-top-color:#005580;border-bottom-color:#005580;}
+.nav-tabs .dropdown-toggle .caret{margin-top:8px;}
+.nav .active .dropdown-toggle .caret{border-top-color:#fff;border-bottom-color:#fff;}
+.nav-tabs .active .dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;}
+.nav>.dropdown.active>a:hover,.nav>.dropdown.active>a:focus{cursor:pointer;}
+.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>li.dropdown.open.active>a:hover,.nav>li.dropdown.open.active>a:focus{color:#ffffff;background-color:#999999;border-color:#999999;}
+.nav li.dropdown.open .caret,.nav li.dropdown.open.active .caret,.nav li.dropdown.open a:hover .caret,.nav li.dropdown.open a:focus .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
+.tabs-stacked .open>a:hover,.tabs-stacked .open>a:focus{border-color:#999999;}
+.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";line-height:0;}
+.tabbable:after{clear:both;}
+.tab-content{overflow:auto;}
+.tabs-below>.nav-tabs,.tabs-right>.nav-tabs,.tabs-left>.nav-tabs{border-bottom:0;}
+.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
+.tab-content>.active,.pill-content>.active{display:block;}
+.tabs-below>.nav-tabs{border-top:1px solid #ddd;}
+.tabs-below>.nav-tabs>li{margin-top:-1px;margin-bottom:0;}
+.tabs-below>.nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below>.nav-tabs>li>a:hover,.tabs-below>.nav-tabs>li>a:focus{border-bottom-color:transparent;border-top-color:#ddd;}
+.tabs-below>.nav-tabs>.active>a,.tabs-below>.nav-tabs>.active>a:hover,.tabs-below>.nav-tabs>.active>a:focus{border-color:transparent #ddd #ddd #ddd;}
+.tabs-left>.nav-tabs>li,.tabs-right>.nav-tabs>li{float:none;}
+.tabs-left>.nav-tabs>li>a,.tabs-right>.nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
+.tabs-left>.nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
+.tabs-left>.nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.tabs-left>.nav-tabs>li>a:hover,.tabs-left>.nav-tabs>li>a:focus{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
+.tabs-left>.nav-tabs .active>a,.tabs-left>.nav-tabs .active>a:hover,.tabs-left>.nav-tabs .active>a:focus{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;}
+.tabs-right>.nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
+.tabs-right>.nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.tabs-right>.nav-tabs>li>a:hover,.tabs-right>.nav-tabs>li>a:focus{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
+.tabs-right>.nav-tabs .active>a,.tabs-right>.nav-tabs .active>a:hover,.tabs-right>.nav-tabs .active>a:focus{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;}
+.nav>.disabled>a{color:#999999;}
+.nav>.disabled>a:hover,.nav>.disabled>a:focus{text-decoration:none;background-color:transparent;cursor:default;}
+.navbar{overflow:visible;margin-bottom:20px;*position:relative;*z-index:2;}
+.navbar-inner{min-height:40px;padding-left:20px;padding-right:20px;background-color:#fafafa;background-image:-moz-linear-gradient(top, #ffffff, #f2f2f2);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f2f2f2));background-image:-webkit-linear-gradient(top, #ffffff, #f2f2f2);background-image:-o-linear-gradient(top, #ffffff, #f2f2f2);background-image:linear-gradient(to bottom, #ffffff, #f2f2f2);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);border:1px solid #d4d4d4;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);-moz-box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);box-shadow:0 1px 4px rgba(0, 0, 0, 0.065);*zoom:1;}.navbar-inner:before,.navbar-inner:after{display:table;content:"";line-height:0;}
+.navbar-inner:after{clear:both;}
+.navbar .container{width:auto;}
+.nav-collapse.collapse{height:auto;overflow:visible;}
+.navbar .brand{float:left;display:block;padding:10px 20px 10px;margin-left:-20px;font-size:20px;font-weight:200;color:#777777;text-shadow:0 1px 0 #ffffff;}.navbar .brand:hover,.navbar .brand:focus{text-decoration:none;}
+.navbar-text{margin-bottom:0;line-height:40px;color:#777777;}
+.navbar-link{color:#777777;}.navbar-link:hover,.navbar-link:focus{color:#333333;}
+.navbar .divider-vertical{height:40px;margin:0 9px;border-left:1px solid #f2f2f2;border-right:1px solid #ffffff;}
+.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn-group .btn,.navbar .input-prepend .btn,.navbar .input-append .btn,.navbar .input-prepend .btn-group,.navbar .input-append .btn-group{margin-top:0;}
+.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";line-height:0;}
+.navbar-form:after{clear:both;}
+.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;}
+.navbar-form input,.navbar-form select,.navbar-form .btn{display:inline-block;margin-bottom:0;}
+.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
+.navbar-form .input-append,.navbar-form .input-prepend{margin-top:5px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;}
+.navbar-search{position:relative;float:left;margin-top:5px;margin-bottom:0;}.navbar-search .search-query{margin-bottom:0;padding:4px 14px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.navbar-static-top{position:static;margin-bottom:0;}.navbar-static-top .navbar-inner{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;}
+.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{border-width:0 0 1px;}
+.navbar-fixed-bottom .navbar-inner{border-width:1px 0 0;}
+.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:885px;}
+.navbar-fixed-top{top:0;}
+.navbar-fixed-top .navbar-inner,.navbar-static-top .navbar-inner{-webkit-box-shadow:0 1px 10px rgba(0,0,0,.1);-moz-box-shadow:0 1px 10px rgba(0,0,0,.1);box-shadow:0 1px 10px rgba(0,0,0,.1);}
+.navbar-fixed-bottom{bottom:0;}.navbar-fixed-bottom .navbar-inner{-webkit-box-shadow:0 -1px 10px rgba(0,0,0,.1);-moz-box-shadow:0 -1px 10px rgba(0,0,0,.1);box-shadow:0 -1px 10px rgba(0,0,0,.1);}
+.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
+.navbar .nav.pull-right{float:right;margin-right:0;}
+.navbar .nav>li{float:left;}
+.navbar .nav>li>a{float:none;padding:10px 15px 10px;color:#777777;text-decoration:none;text-shadow:0 1px 0 #ffffff;}
+.navbar .nav .dropdown-toggle .caret{margin-top:8px;}
+.navbar .nav>li>a:focus,.navbar .nav>li>a:hover{background-color:transparent;color:#333333;text-decoration:none;}
+.navbar .nav>.active>a,.navbar .nav>.active>a:hover,.navbar .nav>.active>a:focus{color:#555555;text-decoration:none;background-color:#e5e5e5;-webkit-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);-moz-box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);box-shadow:inset 0 3px 8px rgba(0, 0, 0, 0.125);}
+.navbar .btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#ededed;background-image:-moz-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f2f2f2), to(#e5e5e5));background-image:-webkit-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:-o-linear-gradient(top, #f2f2f2, #e5e5e5);background-image:linear-gradient(to bottom, #f2f2f2, #e5e5e5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);border-color:#e5e5e5 #e5e5e5 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#e5e5e5;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);}.navbar .btn-navbar:hover,.navbar .btn-navbar:focus,.navbar .btn-navbar:active,.navbar .btn-navbar.active,.navbar .btn-navbar.disabled,.navbar .btn-navbar[disabled]{color:#ffffff;background-color:#e5e5e5;*background-color:#d9d9d9;}
+.navbar .btn-navbar:active,.navbar .btn-navbar.active{background-color:#cccccc \9;}
+.navbar .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);}
+.btn-navbar .icon-bar+.icon-bar{margin-top:3px;}
+.navbar .nav>li>.dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .nav>li>.dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
+.navbar-fixed-bottom .nav>li>.dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;}
+.navbar-fixed-bottom .nav>li>.dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;}
+.navbar .nav li.dropdown>a:hover .caret,.navbar .nav li.dropdown>a:focus .caret{border-top-color:#333333;border-bottom-color:#333333;}
+.navbar .nav li.dropdown.open>.dropdown-toggle,.navbar .nav li.dropdown.active>.dropdown-toggle,.navbar .nav li.dropdown.open.active>.dropdown-toggle{background-color:#e5e5e5;color:#555555;}
+.navbar .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#777777;border-bottom-color:#777777;}
+.navbar .nav li.dropdown.open>.dropdown-toggle .caret,.navbar .nav li.dropdown.active>.dropdown-toggle .caret,.navbar .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#555555;border-bottom-color:#555555;}
+.navbar .pull-right>li>.dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right{left:auto;right:0;}.navbar .pull-right>li>.dropdown-menu:before,.navbar .nav>li>.dropdown-menu.pull-right:before{left:auto;right:12px;}
+.navbar .pull-right>li>.dropdown-menu:after,.navbar .nav>li>.dropdown-menu.pull-right:after{left:auto;right:13px;}
+.navbar .pull-right>li>.dropdown-menu .dropdown-menu,.navbar .nav>li>.dropdown-menu.pull-right .dropdown-menu{left:auto;right:100%;margin-left:0;margin-right:-1px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;}
+.navbar-inverse .navbar-inner{background-color:#1b1b1b;background-image:-moz-linear-gradient(top, #222222, #111111);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#222222), to(#111111));background-image:-webkit-linear-gradient(top, #222222, #111111);background-image:-o-linear-gradient(top, #222222, #111111);background-image:linear-gradient(to bottom, #222222, #111111);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222', endColorstr='#ff111111', GradientType=0);border-color:#252525;}
+.navbar-inverse .brand,.navbar-inverse .nav>li>a{color:#999999;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}.navbar-inverse .brand:hover,.navbar-inverse .nav>li>a:hover,.navbar-inverse .brand:focus,.navbar-inverse .nav>li>a:focus{color:#ffffff;}
+.navbar-inverse .brand{color:#999999;}
+.navbar-inverse .navbar-text{color:#999999;}
+.navbar-inverse .nav>li>a:focus,.navbar-inverse .nav>li>a:hover{background-color:transparent;color:#ffffff;}
+.navbar-inverse .nav .active>a,.navbar-inverse .nav .active>a:hover,.navbar-inverse .nav .active>a:focus{color:#ffffff;background-color:#111111;}
+.navbar-inverse .navbar-link{color:#999999;}.navbar-inverse .navbar-link:hover,.navbar-inverse .navbar-link:focus{color:#ffffff;}
+.navbar-inverse .divider-vertical{border-left-color:#111111;border-right-color:#222222;}
+.navbar-inverse .nav li.dropdown.open>.dropdown-toggle,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle{background-color:#111111;color:#ffffff;}
+.navbar-inverse .nav li.dropdown>a:hover .caret,.navbar-inverse .nav li.dropdown>a:focus .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;}
+.navbar-inverse .nav li.dropdown>.dropdown-toggle .caret{border-top-color:#999999;border-bottom-color:#999999;}
+.navbar-inverse .nav li.dropdown.open>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.active>.dropdown-toggle .caret,.navbar-inverse .nav li.dropdown.open.active>.dropdown-toggle .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;}
+.navbar-inverse .navbar-search .search-query{color:#ffffff;background-color:#515151;border-color:#111111;-webkit-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-moz-box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);box-shadow:inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15);-webkit-transition:none;-moz-transition:none;-o-transition:none;transition:none;}.navbar-inverse .navbar-search .search-query:-moz-placeholder{color:#cccccc;}
+.navbar-inverse .navbar-search .search-query:-ms-input-placeholder{color:#cccccc;}
+.navbar-inverse .navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;}
+.navbar-inverse .navbar-search .search-query:focus,.navbar-inverse .navbar-search .search-query.focused{padding:5px 15px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-inverse .btn-navbar{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e0e0e;background-image:-moz-linear-gradient(top, #151515, #040404);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#151515), to(#040404));background-image:-webkit-linear-gradient(top, #151515, #040404);background-image:-o-linear-gradient(top, #151515, #040404);background-image:linear-gradient(to bottom, #151515, #040404);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff151515', endColorstr='#ff040404', GradientType=0);border-color:#040404 #040404 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);*background-color:#040404;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.navbar-inverse .btn-navbar:hover,.navbar-inverse .btn-navbar:focus,.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active,.navbar-inverse .btn-navbar.disabled,.navbar-inverse .btn-navbar[disabled]{color:#ffffff;background-color:#040404;*background-color:#000000;}
+.navbar-inverse .btn-navbar:active,.navbar-inverse .btn-navbar.active{background-color:#000000 \9;}
+.breadcrumb{padding:8px 15px;margin:0 0 20px;list-style:none;background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.breadcrumb>li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;}.breadcrumb>li>.divider{padding:0 5px;color:#ccc;}
+.breadcrumb>.active{color:#999999;}
+.pagination{margin:20px 0;}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
+.pagination ul>li{display:inline;}
+.pagination ul>li>a,.pagination ul>li>span{float:left;padding:4px 12px;line-height:20px;text-decoration:none;background-color:#ffffff;border:1px solid #dddddd;border-left-width:0;}
+.pagination ul>li>a:hover,.pagination ul>li>a:focus,.pagination ul>.active>a,.pagination ul>.active>span{background-color:#f5f5f5;}
+.pagination ul>.active>a,.pagination ul>.active>span{color:#999999;cursor:default;}
+.pagination ul>.disabled>span,.pagination ul>.disabled>a,.pagination ul>.disabled>a:hover,.pagination ul>.disabled>a:focus{color:#999999;background-color:transparent;cursor:default;}
+.pagination ul>li:first-child>a,.pagination ul>li:first-child>span{border-left-width:1px;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.pagination ul>li:last-child>a,.pagination ul>li:last-child>span{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
+.pagination-centered{text-align:center;}
+.pagination-right{text-align:right;}
+.pagination-large ul>li>a,.pagination-large ul>li>span{padding:11px 19px;font-size:17.5px;}
+.pagination-large ul>li:first-child>a,.pagination-large ul>li:first-child>span{-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
+.pagination-large ul>li:last-child>a,.pagination-large ul>li:last-child>span{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
+.pagination-mini ul>li:first-child>a,.pagination-small ul>li:first-child>a,.pagination-mini ul>li:first-child>span,.pagination-small ul>li:first-child>span{-webkit-border-top-left-radius:3px;-moz-border-radius-topleft:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;-moz-border-radius-bottomleft:3px;border-bottom-left-radius:3px;}
+.pagination-mini ul>li:last-child>a,.pagination-small ul>li:last-child>a,.pagination-mini ul>li:last-child>span,.pagination-small ul>li:last-child>span{-webkit-border-top-right-radius:3px;-moz-border-radius-topright:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;-moz-border-radius-bottomright:3px;border-bottom-right-radius:3px;}
+.pagination-small ul>li>a,.pagination-small ul>li>span{padding:2px 10px;font-size:11.9px;}
+.pagination-mini ul>li>a,.pagination-mini ul>li>span{padding:0 6px;font-size:10.5px;}
+.pager{margin:20px 0;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";line-height:0;}
+.pager:after{clear:both;}
+.pager li{display:inline;}
+.pager li>a,.pager li>span{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.pager li>a:hover,.pager li>a:focus{text-decoration:none;background-color:#f5f5f5;}
+.pager .next>a,.pager .next>span{float:right;}
+.pager .previous>a,.pager .previous>span{float:left;}
+.pager .disabled>a,.pager .disabled>a:hover,.pager .disabled>a:focus,.pager .disabled>span{color:#999999;background-color:#fff;cursor:default;}
+.thumbnails{margin-left:-15px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";line-height:0;}
+.thumbnails:after{clear:both;}
+.row-fluid .thumbnails{margin-left:0;}
+.thumbnails>li{float:left;margin-bottom:20px;margin-left:15px;}
+.thumbnail{display:block;padding:4px;line-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);box-shadow:0 1px 3px rgba(0, 0, 0, 0.055);-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;-o-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out;}
+a.thumbnail:hover,a.thumbnail:focus{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;}
+.thumbnail .caption{padding:9px;color:#555555;}
+.alert{padding:8px 35px 8px 14px;margin-bottom:20px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.alert,.alert h4{color:#c09853;}
+.alert h4{margin:0;}
+.alert .close{position:relative;top:-2px;right:-21px;line-height:20px;}
+.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;}
+.alert-success h4{color:#468847;}
+.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
+.alert-danger h4,.alert-error h4{color:#b94a48;}
+.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;}
+.alert-info h4{color:#3a87ad;}
+.alert-block{padding-top:14px;padding-bottom:14px;}
+.alert-block>p,.alert-block>ul{margin-bottom:0;}
+.alert-block p+p{margin-top:5px;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}@-o-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:40px 0;} to{background-position:0 0;}}.progress{overflow:hidden;height:20px;margin-bottom:20px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(to bottom, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.progress .bar{width:0%;height:100%;color:#ffffff;float:left;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(to bottom, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress .bar+.bar{-webkit-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);-moz-box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);box-shadow:inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15);}
+.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
+.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;-ms-animation:progress-bar-stripes 2s linear infinite;-o-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
+.progress-danger .bar,.progress .bar-danger{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(to bottom, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0);}
+.progress-danger.progress-striped .bar,.progress-striped .bar-danger{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-success .bar,.progress .bar-success{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(to bottom, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0);}
+.progress-success.progress-striped .bar,.progress-striped .bar-success{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-info .bar,.progress .bar-info{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(to bottom, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0);}
+.progress-info.progress-striped .bar,.progress-striped .bar-info{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-warning .bar,.progress .bar-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(to bottom, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0);}
+.progress-warning.progress-striped .bar,.progress-striped .bar-warning{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.hero-unit{padding:60px;margin-bottom:30px;font-size:18px;font-weight:200;line-height:30px;color:inherit;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;}
+.hero-unit li{line-height:30px;}
+.media,.media-body{overflow:hidden;*overflow:visible;zoom:1;}
+.media,.media .media{margin-top:15px;}
+.media:first-child{margin-top:0;}
+.media-object{display:block;}
+.media-heading{margin:0 0 5px;}
+.media>.pull-left{margin-right:10px;}
+.media>.pull-right{margin-left:10px;}
+.media-list{margin-left:0;list-style:none;}
+.tooltip{position:absolute;z-index:1030;display:block;visibility:visible;font-size:11px;line-height:1.4;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
+.tooltip.top{margin-top:-3px;padding:5px 0;}
+.tooltip.right{margin-left:3px;padding:0 5px;}
+.tooltip.bottom{margin-top:3px;padding:5px 0;}
+.tooltip.left{margin-left:-3px;padding:0 5px;}
+.tooltip-inner{max-width:200px;padding:8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tooltip-arrow{position:absolute;width:0;height:0;border-color:transparent;border-style:solid;}
+.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-width:5px 5px 0;border-top-color:#000000;}
+.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-width:5px 5px 5px 0;border-right-color:#000000;}
+.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-width:5px 0 5px 5px;border-left-color:#000000;}
+.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-width:0 5px 5px;border-bottom-color:#000000;}
+.popover{position:absolute;top:0;left:0;z-index:1010;display:none;max-width:276px;padding:1px;text-align:left;background-color:#ffffff;-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);white-space:normal;}.popover.top{margin-top:-10px;}
+.popover.right{margin-left:10px;}
+.popover.bottom{margin-top:10px;}
+.popover.left{margin-left:-10px;}
+.popover-title{margin:0;padding:8px 14px;font-size:14px;font-weight:normal;line-height:18px;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;-webkit-border-radius:5px 5px 0 0;-moz-border-radius:5px 5px 0 0;border-radius:5px 5px 0 0;}.popover-title:empty{display:none;}
+.popover-content{padding:9px 14px;}
+.popover .arrow,.popover .arrow:after{position:absolute;display:block;width:0;height:0;border-color:transparent;border-style:solid;}
+.popover .arrow{border-width:11px;}
+.popover .arrow:after{border-width:10px;content:"";}
+.popover.top .arrow{left:50%;margin-left:-11px;border-bottom-width:0;border-top-color:#999;border-top-color:rgba(0, 0, 0, 0.25);bottom:-11px;}.popover.top .arrow:after{bottom:1px;margin-left:-10px;border-bottom-width:0;border-top-color:#ffffff;}
+.popover.right .arrow{top:50%;left:-11px;margin-top:-11px;border-left-width:0;border-right-color:#999;border-right-color:rgba(0, 0, 0, 0.25);}.popover.right .arrow:after{left:1px;bottom:-10px;border-left-width:0;border-right-color:#ffffff;}
+.popover.bottom .arrow{left:50%;margin-left:-11px;border-top-width:0;border-bottom-color:#999;border-bottom-color:rgba(0, 0, 0, 0.25);top:-11px;}.popover.bottom .arrow:after{top:1px;margin-left:-10px;border-top-width:0;border-bottom-color:#ffffff;}
+.popover.left .arrow{top:50%;right:-11px;margin-top:-11px;border-right-width:0;border-left-color:#999;border-left-color:rgba(0, 0, 0, 0.25);}.popover.left .arrow:after{right:1px;border-right-width:0;border-left-color:#ffffff;bottom:-10px;}
+.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
+.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
+.modal{position:fixed;top:10%;left:50%;z-index:1050;width:560px;margin-left:-280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;outline:none;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal.fade.in{top:10%;}
+.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
+.modal-header h3{margin:0;line-height:30px;}
+.modal-body{position:relative;overflow-y:auto;max-height:400px;padding:15px;}
+.modal-form{margin-bottom:0;}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";line-height:0;}
+.modal-footer:after{clear:both;}
+.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;}
+.modal-footer .btn-group .btn+.btn{margin-left:-1px;}
+.modal-footer .btn-block+.btn-block{margin-left:0;}
+.dropup,.dropdown{position:relative;}
+.dropdown-toggle{*margin-bottom:-3px;}
+.dropdown-toggle:active,.open .dropdown-toggle{outline:0;}
+.caret{display:inline-block;width:0;height:0;vertical-align:top;border-top:4px solid #000000;border-right:4px solid transparent;border-left:4px solid transparent;content:"";}
+.dropdown .caret{margin-top:8px;margin-left:2px;}
+.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:160px;padding:5px 0;margin:2px 0 0;list-style:none;background-color:#ffffff;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.2);*border-right-width:2px;*border-bottom-width:2px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;}.dropdown-menu.pull-right{right:0;left:auto;}
+.dropdown-menu .divider{*width:100%;height:1px;margin:9px 1px;*margin:-5px 0 5px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;}
+.dropdown-menu>li>a{display:block;padding:3px 20px;clear:both;font-weight:normal;line-height:20px;color:#333333;white-space:nowrap;}
+.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus,.dropdown-submenu:hover>a,.dropdown-submenu:focus>a{text-decoration:none;color:#ffffff;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);}
+.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{color:#ffffff;text-decoration:none;outline:0;background-color:#0081c2;background-image:-moz-linear-gradient(top, #0088cc, #0077b3);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));background-image:-webkit-linear-gradient(top, #0088cc, #0077b3);background-image:-o-linear-gradient(top, #0088cc, #0077b3);background-image:linear-gradient(to bottom, #0088cc, #0077b3);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0);}
+.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{color:#999999;}
+.dropdown-menu>.disabled>a:hover,.dropdown-menu>.disabled>a:focus{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);cursor:default;}
+.open{*z-index:1000;}.open>.dropdown-menu{display:block;}
+.dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990;}
+.pull-right>.dropdown-menu{right:0;left:auto;}
+.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"";}
+.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;}
+.dropdown-submenu{position:relative;}
+.dropdown-submenu>.dropdown-menu{top:0;left:100%;margin-top:-6px;margin-left:-1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
+.dropdown-submenu:hover>.dropdown-menu{display:block;}
+.dropup .dropdown-submenu>.dropdown-menu{top:auto;bottom:0;margin-top:0;margin-bottom:-2px;-webkit-border-radius:5px 5px 5px 0;-moz-border-radius:5px 5px 5px 0;border-radius:5px 5px 5px 0;}
+.dropdown-submenu>a:after{display:block;content:" ";float:right;width:0;height:0;border-color:transparent;border-style:solid;border-width:5px 0 5px 5px;border-left-color:#cccccc;margin-top:5px;margin-right:-10px;}
+.dropdown-submenu:hover>a:after{border-left-color:#ffffff;}
+.dropdown-submenu.pull-left{float:none;}.dropdown-submenu.pull-left>.dropdown-menu{left:-100%;margin-left:10px;-webkit-border-radius:6px 0 6px 6px;-moz-border-radius:6px 0 6px 6px;border-radius:6px 0 6px 6px;}
+.dropdown .dropdown-menu .nav-header{padding-left:20px;padding-right:20px;}
+.typeahead{z-index:1051;margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion{margin-bottom:20px;}
+.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-heading{border-bottom:0;}
+.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
+.accordion-toggle{cursor:pointer;}
+.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
+.carousel{position:relative;margin-bottom:20px;line-height:1;}
+.carousel-inner{overflow:hidden;width:100%;position:relative;}
+.carousel-inner>.item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}.carousel-inner>.item>img,.carousel-inner>.item>a>img{display:block;line-height:1;}
+.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{display:block;}
+.carousel-inner>.active{left:0;}
+.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%;}
+.carousel-inner>.next{left:100%;}
+.carousel-inner>.prev{left:-100%;}
+.carousel-inner>.next.left,.carousel-inner>.prev.right{left:0;}
+.carousel-inner>.active.left{left:-100%;}
+.carousel-inner>.active.right{left:100%;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover,.carousel-control:focus{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
+.carousel-indicators{position:absolute;top:15px;right:15px;z-index:5;margin:0;list-style:none;}.carousel-indicators li{display:block;float:left;width:10px;height:10px;margin-left:5px;text-indent:-999px;background-color:#ccc;background-color:rgba(255, 255, 255, 0.25);border-radius:5px;}
+.carousel-indicators .active{background-color:#fff;}
+.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:15px;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-caption h4,.carousel-caption p{color:#ffffff;line-height:20px;}
+.carousel-caption h4{margin:0 0 5px;}
+.carousel-caption p{margin-bottom:0;}
+.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #e3e3e3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
+.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:20px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover,.close:focus{color:#000000;text-decoration:none;cursor:pointer;opacity:0.4;filter:alpha(opacity=40);}
+button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}
+.affix{position:fixed;}
+.fade{opacity:0;-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;}.fade.in{opacity:1;}
+.collapse{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;}.collapse.in{height:auto;}
+@-ms-viewport{width:device-width;}.hidden{display:none;visibility:hidden;}
+.visible-phone{display:none !important;}
+.visible-tablet{display:none !important;}
+.hidden-desktop{display:none !important;}
+.visible-desktop{display:inherit !important;}
+@media (min-width:768px) and (max-width:979px){.hidden-desktop{display:inherit !important;} .visible-desktop{display:none !important ;} .visible-tablet{display:inherit !important;} .hidden-tablet{display:none !important;}}@media (max-width:767px){.hidden-desktop{display:inherit !important;} .visible-desktop{display:none !important;} .visible-phone{display:inherit !important;} .hidden-phone{display:none !important;}}.visible-print{display:none !important;}
+@media print{.visible-print{display:inherit !important;} .hidden-print{display:none !important;}}@media (max-width:767px){body{padding-left:20px;padding-right:20px;} .navbar-fixed-top,.navbar-fixed-bottom,.navbar-static-top{margin-left:-20px;margin-right:-20px;} .container-fluid{padding:0;} .dl-horizontal dt{float:none;clear:none;width:auto;text-align:left;} .dl-horizontal dd{margin-left:0;} .container{width:auto;} .row-fluid{width:100%;} .row,.thumbnails{margin-left:0;} .thumbnails>li{float:none;margin-left:0;} [class*="span"],.uneditable-input[class*="span"],.row-fluid [class*="span"]{float:none;display:block;width:100%;margin-left:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .span12,.row-fluid .span12{width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .row-fluid [class*="offset"]:first-child{margin-left:0;} .input-large,.input-xlarge,.input-xxlarge,input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;} .input-prepend input,.input-append input,.input-prepend input[class*="span"],.input-append input[class*="span"]{display:inline-block;width:auto;} .controls-row [class*="span"]+[class*="span"]{margin-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade{top:-100px;} .modal.fade.in{top:20px;}}@media (max-width:480px){.nav-collapse{-webkit-transform:translate3d(0, 0, 0);} .page-header h1 small{display:block;line-height:20px;} input[type="checkbox"],input[type="radio"]{border:1px solid #ccc;} .form-horizontal .control-label{float:none;width:auto;padding-top:0;text-align:left;} .form-horizontal .controls{margin-left:0;} .form-horizontal .control-list{padding-top:0;} .form-horizontal .form-actions{padding-left:10px;padding-right:10px;} .media .pull-left,.media .pull-right{float:none;display:block;margin-bottom:10px;} .media-object{margin-right:0;margin-left:0;} .modal{top:10px;left:10px;right:10px;} .modal-header .close{padding:10px;margin:-10px;} .carousel-caption{position:static;}}@media (min-width:768px) and (max-width:979px){.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} .row:after{clear:both;} [class*="span"]{float:left;min-height:1px;margin-left:20px;} .container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:724px;} .span12{width:724px;} .span11{width:662px;} .span10{width:600px;} .span9{width:538px;} .span8{width:476px;} .span7{width:414px;} .span6{width:352px;} .span5{width:290px;} .span4{width:228px;} .span3{width:166px;} .span2{width:104px;} .span1{width:42px;} .offset12{margin-left:764px;} .offset11{margin-left:702px;} .offset10{margin-left:640px;} .offset9{margin-left:578px;} .offset8{margin-left:516px;} .offset7{margin-left:454px;} .offset6{margin-left:392px;} .offset5{margin-left:330px;} .offset4{margin-left:268px;} .offset3{margin-left:206px;} .offset2{margin-left:144px;} .offset1{margin-left:82px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} .row-fluid:after{clear:both;} .row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.7624309392265194%;*margin-left:2.7059337640852763%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.7624309392265194%;} .row-fluid .span12{width:100%;*width:99.94350282485875%;} .row-fluid .span11{width:91.43646408839778%;*width:91.37996691325654%;} .row-fluid .span10{width:82.87292817679558%;*width:82.81643100165434%;} .row-fluid .span9{width:74.30939226519337%;*width:74.25289509005212%;} .row-fluid .span8{width:65.74585635359117%;*width:65.68935917844992%;} .row-fluid .span7{width:57.18232044198895%;*width:57.1258232668477%;} .row-fluid .span6{width:48.61878453038674%;*width:48.562287355245495%;} .row-fluid .span5{width:40.05524861878453%;*width:39.998751443643286%;} .row-fluid .span4{width:31.491712707182323%;*width:31.43521553204108%;} .row-fluid .span3{width:22.92817679558011%;*width:22.87167962043887%;} .row-fluid .span2{width:14.3646408839779%;*width:14.308143708836658%;} .row-fluid .span1{width:5.801104972375691%;*width:5.744607797234448%;} .row-fluid .offset12{margin-left:105.52486187845304%;*margin-left:105.41186752817055%;} .row-fluid .offset12:first-child{margin-left:102.76243093922652%;*margin-left:102.64943658894403%;} .row-fluid .offset11{margin-left:96.96132596685082%;*margin-left:96.84833161656833%;} .row-fluid .offset11:first-child{margin-left:94.1988950276243%;*margin-left:94.08590067734181%;} .row-fluid .offset10{margin-left:88.39779005524862%;*margin-left:88.28479570496613%;} .row-fluid .offset10:first-child{margin-left:85.6353591160221%;*margin-left:85.52236476573961%;} .row-fluid .offset9{margin-left:79.8342541436464%;*margin-left:79.72125979336391%;} .row-fluid .offset9:first-child{margin-left:77.07182320441989%;*margin-left:76.9588288541374%;} .row-fluid .offset8{margin-left:71.2707182320442%;*margin-left:71.15772388176171%;} .row-fluid .offset8:first-child{margin-left:68.50828729281768%;*margin-left:68.39529294253519%;} .row-fluid .offset7{margin-left:62.70718232044199%;*margin-left:62.594187970159496%;} .row-fluid .offset7:first-child{margin-left:59.94475138121547%;*margin-left:59.83175703093298%;} .row-fluid .offset6{margin-left:54.14364640883978%;*margin-left:54.03065205855729%;} .row-fluid .offset6:first-child{margin-left:51.38121546961326%;*margin-left:51.26822111933077%;} .row-fluid .offset5{margin-left:45.58011049723757%;*margin-left:45.46711614695508%;} .row-fluid .offset5:first-child{margin-left:42.81767955801105%;*margin-left:42.70468520772856%;} .row-fluid .offset4{margin-left:37.01657458563536%;*margin-left:36.90358023535288%;} .row-fluid .offset4:first-child{margin-left:34.25414364640884%;*margin-left:34.14114929612636%;} .row-fluid .offset3{margin-left:28.45303867403315%;*margin-left:28.340044323750664%;} .row-fluid .offset3:first-child{margin-left:25.69060773480663%;*margin-left:25.577613384524145%;} .row-fluid .offset2{margin-left:19.88950276243094%;*margin-left:19.776508412148456%;} .row-fluid .offset2:first-child{margin-left:17.12707182320442%;*margin-left:17.014077472921937%;} .row-fluid .offset1{margin-left:11.32596685082873%;*margin-left:11.212972500546243%;} .row-fluid .offset1:first-child{margin-left:8.56353591160221%;*margin-left:8.450541561319724%;} input,textarea,.uneditable-input{margin-left:0;} .controls-row [class*="span"]+[class*="span"]{margin-left:20px;} input.span12,textarea.span12,.uneditable-input.span12{width:710px;} input.span11,textarea.span11,.uneditable-input.span11{width:648px;} input.span10,textarea.span10,.uneditable-input.span10{width:586px;} input.span9,textarea.span9,.uneditable-input.span9{width:524px;} input.span8,textarea.span8,.uneditable-input.span8{width:462px;} input.span7,textarea.span7,.uneditable-input.span7{width:400px;} input.span6,textarea.span6,.uneditable-input.span6{width:338px;} input.span5,textarea.span5,.uneditable-input.span5{width:276px;} input.span4,textarea.span4,.uneditable-input.span4{width:214px;} input.span3,textarea.span3,.uneditable-input.span3{width:152px;} input.span2,textarea.span2,.uneditable-input.span2{width:90px;} input.span1,textarea.span1,.uneditable-input.span1{width:28px;}}@media (min-width:1200px){.row{margin-left:-30px;*zoom:1;}.row:before,.row:after{display:table;content:"";line-height:0;} .row:after{clear:both;} [class*="span"]{float:left;min-height:1px;margin-left:30px;} .container,.navbar-static-top .container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:1170px;} .span12{width:1170px;} .span11{width:1070px;} .span10{width:970px;} .span9{width:870px;} .span8{width:770px;} .span7{width:670px;} .span6{width:570px;} .span5{width:470px;} .span4{width:370px;} .span3{width:270px;} .span2{width:170px;} .span1{width:70px;} .offset12{margin-left:1230px;} .offset11{margin-left:1130px;} .offset10{margin-left:1030px;} .offset9{margin-left:930px;} .offset8{margin-left:830px;} .offset7{margin-left:730px;} .offset6{margin-left:630px;} .offset5{margin-left:530px;} .offset4{margin-left:430px;} .offset3{margin-left:330px;} .offset2{margin-left:230px;} .offset1{margin-left:130px;} .row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";line-height:0;} .row-fluid:after{clear:both;} .row-fluid [class*="span"]{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;float:left;margin-left:2.564102564102564%;*margin-left:2.507605388961321%;} .row-fluid [class*="span"]:first-child{margin-left:0;} .row-fluid .controls-row [class*="span"]+[class*="span"]{margin-left:2.564102564102564%;} .row-fluid .span12{width:100%;*width:99.94350282485875%;} .row-fluid .span11{width:91.45299145299145%;*width:91.39649427785021%;} .row-fluid .span10{width:82.90598290598291%;*width:82.84948573084166%;} .row-fluid .span9{width:74.35897435897436%;*width:74.30247718383312%;} .row-fluid .span8{width:65.81196581196582%;*width:65.75546863682457%;} .row-fluid .span7{width:57.26495726495726%;*width:57.208460089816015%;} .row-fluid .span6{width:48.717948717948715%;*width:48.66145154280747%;} .row-fluid .span5{width:40.17094017094017%;*width:40.114442995798925%;} .row-fluid .span4{width:31.623931623931625%;*width:31.567434448790383%;} .row-fluid .span3{width:23.076923076923077%;*width:23.020425901781834%;} .row-fluid .span2{width:14.52991452991453%;*width:14.473417354773288%;} .row-fluid .span1{width:5.982905982905983%;*width:5.92640880776474%;} .row-fluid .offset12{margin-left:105.12820512820512%;*margin-left:105.01521077792263%;} .row-fluid .offset12:first-child{margin-left:102.56410256410257%;*margin-left:102.45110821382008%;} .row-fluid .offset11{margin-left:96.58119658119658%;*margin-left:96.46820223091409%;} .row-fluid .offset11:first-child{margin-left:94.01709401709402%;*margin-left:93.90409966681153%;} .row-fluid .offset10{margin-left:88.03418803418803%;*margin-left:87.92119368390554%;} .row-fluid .offset10:first-child{margin-left:85.47008547008548%;*margin-left:85.35709111980299%;} .row-fluid .offset9{margin-left:79.48717948717949%;*margin-left:79.374185136897%;} .row-fluid .offset9:first-child{margin-left:76.92307692307693%;*margin-left:76.81008257279444%;} .row-fluid .offset8{margin-left:70.94017094017094%;*margin-left:70.82717658988845%;} .row-fluid .offset8:first-child{margin-left:68.37606837606839%;*margin-left:68.2630740257859%;} .row-fluid .offset7{margin-left:62.393162393162385%;*margin-left:62.28016804287989%;} .row-fluid .offset7:first-child{margin-left:59.82905982905982%;*margin-left:59.71606547877733%;} .row-fluid .offset6{margin-left:53.84615384615384%;*margin-left:53.73315949587135%;} .row-fluid .offset6:first-child{margin-left:51.28205128205128%;*margin-left:51.169056931768786%;} .row-fluid .offset5{margin-left:45.299145299145295%;*margin-left:45.1861509488628%;} .row-fluid .offset5:first-child{margin-left:42.73504273504273%;*margin-left:42.62204838476024%;} .row-fluid .offset4{margin-left:36.75213675213675%;*margin-left:36.639142401854265%;} .row-fluid .offset4:first-child{margin-left:34.18803418803419%;*margin-left:34.0750398377517%;} .row-fluid .offset3{margin-left:28.205128205128204%;*margin-left:28.09213385484572%;} .row-fluid .offset3:first-child{margin-left:25.641025641025642%;*margin-left:25.528031290743154%;} .row-fluid .offset2{margin-left:19.65811965811966%;*margin-left:19.54512530783717%;} .row-fluid .offset2:first-child{margin-left:17.094017094017094%;*margin-left:16.98102274373461%;} .row-fluid .offset1{margin-left:11.11111111111111%;*margin-left:10.998116760828626%;} .row-fluid .offset1:first-child{margin-left:8.547008547008547%;*margin-left:8.43401419672606%;} input,textarea,.uneditable-input{margin-left:0;} .controls-row [class*="span"]+[class*="span"]{margin-left:30px;} input.span12,textarea.span12,.uneditable-input.span12{width:1156px;} input.span11,textarea.span11,.uneditable-input.span11{width:1056px;} input.span10,textarea.span10,.uneditable-input.span10{width:956px;} input.span9,textarea.span9,.uneditable-input.span9{width:856px;} input.span8,textarea.span8,.uneditable-input.span8{width:756px;} input.span7,textarea.span7,.uneditable-input.span7{width:656px;} input.span6,textarea.span6,.uneditable-input.span6{width:556px;} input.span5,textarea.span5,.uneditable-input.span5{width:456px;} input.span4,textarea.span4,.uneditable-input.span4{width:356px;} input.span3,textarea.span3,.uneditable-input.span3{width:256px;} input.span2,textarea.span2,.uneditable-input.span2{width:156px;} input.span1,textarea.span1,.uneditable-input.span1{width:56px;} .thumbnails{margin-left:-30px;} .thumbnails>li{margin-left:30px;} .row-fluid .thumbnails{margin-left:0;}}@media (max-width:979px){body{padding-top:0;} .navbar-fixed-top,.navbar-fixed-bottom{position:static;} .navbar-fixed-top{margin-bottom:20px;} .navbar-fixed-bottom{margin-top:20px;} .navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding:5px;} .navbar .container{width:auto;padding:0;} .navbar .brand{padding-left:10px;padding-right:10px;margin:0 0 0 -5px;} .nav-collapse{clear:both;} .nav-collapse .nav{float:none;margin:0 0 10px;} .nav-collapse .nav>li{float:none;} .nav-collapse .nav>li>a{margin-bottom:2px;} .nav-collapse .nav>.divider-vertical{display:none;} .nav-collapse .nav .nav-header{color:#777777;text-shadow:none;} .nav-collapse .nav>li>a,.nav-collapse .dropdown-menu a{padding:9px 15px;font-weight:bold;color:#777777;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} .nav-collapse .btn{padding:4px 10px 4px;font-weight:normal;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;} .nav-collapse .dropdown-menu li+li a{margin-bottom:2px;} .nav-collapse .nav>li>a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .dropdown-menu a:focus{background-color:#f2f2f2;} .navbar-inverse .nav-collapse .nav>li>a,.navbar-inverse .nav-collapse .dropdown-menu a{color:#999999;} .navbar-inverse .nav-collapse .nav>li>a:hover,.navbar-inverse .nav-collapse .nav>li>a:focus,.navbar-inverse .nav-collapse .dropdown-menu a:hover,.navbar-inverse .nav-collapse .dropdown-menu a:focus{background-color:#111111;} .nav-collapse.in .btn-group{margin-top:5px;padding:0;} .nav-collapse .dropdown-menu{position:static;top:auto;left:auto;float:none;display:none;max-width:none;margin:0 15px;padding:0;background-color:transparent;border:none;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} .nav-collapse .open>.dropdown-menu{display:block;} .nav-collapse .dropdown-menu:before,.nav-collapse .dropdown-menu:after{display:none;} .nav-collapse .dropdown-menu .divider{display:none;} .nav-collapse .nav>li>.dropdown-menu:before,.nav-collapse .nav>li>.dropdown-menu:after{display:none;} .nav-collapse .navbar-form,.nav-collapse .navbar-search{float:none;padding:10px 15px;margin:10px 0;border-top:1px solid #f2f2f2;border-bottom:1px solid #f2f2f2;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);} .navbar-inverse .nav-collapse .navbar-form,.navbar-inverse .nav-collapse .navbar-search{border-top-color:#111111;border-bottom-color:#111111;} .navbar .nav-collapse .nav.pull-right{float:none;margin-left:0;} .nav-collapse,.nav-collapse.collapse{overflow:hidden;height:0;} .navbar .btn-navbar{display:block;} .navbar-static .navbar-inner{padding-left:10px;padding-right:10px;}}@media (min-width:980px){.nav-collapse.collapse{height:auto !important;overflow:visible !important;}}
diff --git a/Web/content/css/visgui.css b/Web/content/css/visgui.css
new file mode 100644
index 00000000..c26cb76f
--- /dev/null
+++ b/Web/content/css/visgui.css
@@ -0,0 +1,190 @@
+h3.well-header {
+  border-bottom: 1px solid #e0e0e0;
+  margin-top: 0;
+  padding-top: 0;
+}
+
+.sidebar-nav {
+  padding: 9px 0;
+}
+
+#map-canvas {
+  /* Default height */
+  height: 500px;
+}
+
+@media (max-width: 979px) {
+  /* Enable use of floated navbar text */
+  .navbar-text.pull-right {
+    float: none;
+    padding-left: 5px;
+    padding-right: 5px;
+  }
+
+  #map-canvas {
+    margin-bottom: 30px;
+  }
+
+  h3 {
+    padding-left: 10px;
+  }
+
+  .videoPlayerController {
+    padding-top: 6px;
+    padding-left: 6px;
+  }
+}
+
+@media (min-width: 980px) {
+  body {
+    padding-top: 60px;
+  }
+
+  .videoPlayerController {
+    margin-right: 0px;
+    margin-left: 0px;
+    padding-top: 6px;
+  }
+}
+
+@media (max-width: 767px) {
+  div.result-col {
+    width: 16% !important;
+    float: left !important;
+  }
+}
+
+#results .query-results  {
+  overflow-x: hidden;
+}
+
+#active-results,#active-feedback-requests {
+  overflow-x: auto;
+  overflow-y: auto;
+}
+
+.track-toggle {
+  margin-left: 10px;
+}
+
+.videoPlayer {
+  position: relative;
+  margin-right: 0px;
+  margin-left: 0px;
+  height: 270px;
+  width: 100%;
+}
+
+.videoContainer {
+  width: auto;
+}
+
+button#play,button#stop {
+  min-width: 22px;
+  min-height: 22px;
+}
+
+/* Must override bootstrap img max-width */
+#map-canvas img {
+  max-width: none;
+}
+
+label.visgui-query-name {
+  display: inline
+}
+
+button.visgui-query-execute {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+div.visgui-query-label {
+  display: inline;
+}
+
+div.visgui-query-actions {
+  float: right;
+  padding-right: 5px;
+}
+
+div.visgui-color-swatch {
+  height: 20px;
+  border: 1px solid black;
+  max-width: 40px;
+}
+
+div.visgui-result-row {
+  border-top: 1px solid #d7d7d7;
+  cursor: pointer;
+}
+
+div.visgui-result-row:hover {
+  background-color: #f0f0f0;
+}
+
+div.visgui-result-row.highlight,div.visgui-result-row.highlight:hover {
+  background-color: orange;
+}
+
+div.result-col {
+  overflow: hidden;
+  padding-top: 4px;
+  padding-left: 2px;
+}
+
+div.col-number {
+  padding-left: 23px;
+}
+
+div.result-col.relevant {
+  background: url('/images/icons/okay.png') no-repeat 1px 7px;
+}
+
+div.result-col.not-relevant {
+  background: url('/images/icons/cancel.png') no-repeat 1px 7px;
+}
+
+footer.kw-footer {
+  border-top: 1px solid #d7d7d7;
+  padding-top: 6px;
+}
+
+div.query-file-current {
+  display: none;
+  border-top: 1px solid #e3e3e3;
+  margin-top: 8px;
+  padding: 5px 0;
+}
+
+div#metadata-accordion {
+  margin-top: 8px;
+  margin-bottom: 3px;
+}
+
+div#video-scrubber {
+  width: 100%;
+  margin: 6px 0;
+}
+
+div.video-timestamp {
+  position: absolute;
+  bottom: 10px;
+  right: 10px;
+  z-index: 3;
+  background-color: rgba(255,255,255,0.8);
+  padding: 3px 6px;
+  border-radius: 3px;
+}
+
+div.video-control-separator {
+  width: 10px;
+  display: inline-block;
+}
+
+div.result-table-header {
+  border-bottom: 1px solid #aaa;
+}
+
+.results-tabs {
+  margin-bottom: 10px;
+}
diff --git a/Web/content/images/icons/cancel.png b/Web/content/images/icons/cancel.png
new file mode 100644
index 00000000..3166a70d
Binary files /dev/null and b/Web/content/images/icons/cancel.png differ
diff --git a/Web/content/images/icons/loading.gif b/Web/content/images/icons/loading.gif
new file mode 100644
index 00000000..d7e40226
Binary files /dev/null and b/Web/content/images/icons/loading.gif differ
diff --git a/Web/content/images/icons/marker-blue.png b/Web/content/images/icons/marker-blue.png
new file mode 100644
index 00000000..83a90b4c
Binary files /dev/null and b/Web/content/images/icons/marker-blue.png differ
diff --git a/Web/content/images/icons/marker-gold.png b/Web/content/images/icons/marker-gold.png
new file mode 100644
index 00000000..2ff9ec52
Binary files /dev/null and b/Web/content/images/icons/marker-gold.png differ
diff --git a/Web/content/images/icons/okay.png b/Web/content/images/icons/okay.png
new file mode 100644
index 00000000..2d7459c8
Binary files /dev/null and b/Web/content/images/icons/okay.png differ
diff --git a/Web/content/images/icons/playback-play.png b/Web/content/images/icons/playback-play.png
new file mode 100644
index 00000000..18f51f84
Binary files /dev/null and b/Web/content/images/icons/playback-play.png differ
diff --git a/Web/content/images/icons/playback-stop.png b/Web/content/images/icons/playback-stop.png
new file mode 100644
index 00000000..975e129a
Binary files /dev/null and b/Web/content/images/icons/playback-stop.png differ
diff --git a/Web/content/images/icons/show-trails.png b/Web/content/images/icons/show-trails.png
new file mode 100644
index 00000000..5224003e
Binary files /dev/null and b/Web/content/images/icons/show-trails.png differ
diff --git a/Web/content/index.html b/Web/content/index.html
new file mode 100644
index 00000000..c5d5eba2
--- /dev/null
+++ b/Web/content/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta http-equiv="refresh" content="1; url=/app/">
+    <script type="text/javascript">
+      window.location.href = "/app/";
+    </script>
+    <title>Page Redirection</title>
+  </head>
+  <body>
+    You should be automatically redirected to
+    <a href="/app/">the application</a>.
+  </body>
+</html>
diff --git a/Web/content/js/OpenLayers.js b/Web/content/js/OpenLayers.js
new file mode 100644
index 00000000..9181d2b4
--- /dev/null
+++ b/Web/content/js/OpenLayers.js
@@ -0,0 +1,1443 @@
+/*
+
+  OpenLayers.js -- OpenLayers Map Viewer Library
+
+  Copyright (c) 2006-2013 by OpenLayers Contributors
+  Published under the 2-clause BSD license.
+  See http://openlayers.org/dev/license.txt for the full text of the license, and http://openlayers.org/dev/authors.txt for full list of contributors.
+
+  Includes compressed code under the following licenses:
+
+  (For uncompressed versions of the code used, please see the
+  OpenLayers Github repository: <https://github.com/openlayers/openlayers>)
+
+*/
+
+/**
+ * Contains XMLHttpRequest.js <http://code.google.com/p/xmlhttprequest/>
+ * Copyright 2007 Sergey Ilinsky (http://www.ilinsky.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+
+/**
+ * OpenLayers.Util.pagePosition is based on Yahoo's getXY method, which is
+ * Copyright (c) 2006, Yahoo! Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use of this software in source and binary forms, with or
+ * without modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of Yahoo! Inc. nor the names of its contributors may be
+ *   used to endorse or promote products derived from this software without
+ *   specific prior written permission of Yahoo! Inc.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+var OpenLayers={VERSION_NUMBER:"Release 2.13",singleFile:!0,_getScriptLocation:function(){for(var a=/(^|(.*?\/))(OpenLayers[^\/]*?\.js)(\?|$)/,b=document.getElementsByTagName("script"),c,d="",e=0,f=b.length;e<f;e++)if(c=b[e].getAttribute("src"))if(c=c.match(a)){d=c[1];break}return function(){return d}}(),ImgPath:""};OpenLayers.Class=function(){var a=arguments.length,b=arguments[0],c=arguments[a-1],d="function"==typeof c.initialize?c.initialize:function(){b.prototype.initialize.apply(this,arguments)};1<a?(a=[d,b].concat(Array.prototype.slice.call(arguments).slice(1,a-1),c),OpenLayers.inherit.apply(null,a)):d.prototype=c;return d};
+OpenLayers.inherit=function(a,b){var c=function(){};c.prototype=b.prototype;a.prototype=new c;var d,e,c=2;for(d=arguments.length;c<d;c++)e=arguments[c],"function"===typeof e&&(e=e.prototype),OpenLayers.Util.extend(a.prototype,e)};OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.extend=function(a,b){a=a||{};if(b){for(var c in b){var d=b[c];void 0!==d&&(a[c]=d)}"function"==typeof window.Event&&b instanceof window.Event||(!b.hasOwnProperty||!b.hasOwnProperty("toString"))||(a.toString=b.toString)}return a};OpenLayers.String={startsWith:function(a,b){return 0==a.indexOf(b)},contains:function(a,b){return-1!=a.indexOf(b)},trim:function(a){return a.replace(/^\s\s*/,"").replace(/\s\s*$/,"")},camelize:function(a){a=a.split("-");for(var b=a[0],c=1,d=a.length;c<d;c++)var e=a[c],b=b+(e.charAt(0).toUpperCase()+e.substring(1));return b},format:function(a,b,c){b||(b=window);return a.replace(OpenLayers.String.tokenRegEx,function(a,e){for(var f,g=e.split(/\.+/),h=0;h<g.length;h++){0==h&&(f=b);if(void 0===f)break;
+f=f[g[h]]}"function"==typeof f&&(f=c?f.apply(null,c):f());return"undefined"==typeof f?"undefined":f})},tokenRegEx:/\$\{([\w.]+?)\}/g,numberRegEx:/^([+-]?)(?=\d|\.\d)\d*(\.\d*)?([Ee]([+-]?\d+))?$/,isNumeric:function(a){return OpenLayers.String.numberRegEx.test(a)},numericIf:function(a,b){var c=a;!0===b&&(null!=a&&a.replace)&&(a=a.replace(/^\s*|\s*$/g,""));return OpenLayers.String.isNumeric(a)?parseFloat(a):c}};
+OpenLayers.Number={decimalSeparator:".",thousandsSeparator:",",limitSigDigs:function(a,b){var c=0;0<b&&(c=parseFloat(a.toPrecision(b)));return c},format:function(a,b,c,d){b="undefined"!=typeof b?b:0;c="undefined"!=typeof c?c:OpenLayers.Number.thousandsSeparator;d="undefined"!=typeof d?d:OpenLayers.Number.decimalSeparator;null!=b&&(a=parseFloat(a.toFixed(b)));var e=a.toString().split(".");1==e.length&&null==b&&(b=0);a=e[0];if(c)for(var f=/(-?[0-9]+)([0-9]{3})/;f.test(a);)a=a.replace(f,"$1"+c+"$2");
+0==b?b=a:(c=1<e.length?e[1]:"0",null!=b&&(c+=Array(b-c.length+1).join("0")),b=a+d+c);return b},zeroPad:function(a,b,c){for(a=a.toString(c||10);a.length<b;)a="0"+a;return a}};
+OpenLayers.Function={bind:function(a,b){var c=Array.prototype.slice.apply(arguments,[2]);return function(){var d=c.concat(Array.prototype.slice.apply(arguments,[0]));return a.apply(b,d)}},bindAsEventListener:function(a,b){return function(c){return a.call(b,c||window.event)}},False:function(){return!1},True:function(){return!0},Void:function(){}};
+OpenLayers.Array={filter:function(a,b,c){var d=[];if(Array.prototype.filter)d=a.filter(b,c);else{var e=a.length;if("function"!=typeof b)throw new TypeError;for(var f=0;f<e;f++)if(f in a){var g=a[f];b.call(c,g,f,a)&&d.push(g)}}return d}};OpenLayers.Bounds=OpenLayers.Class({left:null,bottom:null,right:null,top:null,centerLonLat:null,initialize:function(a,b,c,d){OpenLayers.Util.isArray(a)&&(d=a[3],c=a[2],b=a[1],a=a[0]);null!=a&&(this.left=OpenLayers.Util.toFloat(a));null!=b&&(this.bottom=OpenLayers.Util.toFloat(b));null!=c&&(this.right=OpenLayers.Util.toFloat(c));null!=d&&(this.top=OpenLayers.Util.toFloat(d))},clone:function(){return new OpenLayers.Bounds(this.left,this.bottom,this.right,this.top)},equals:function(a){var b=!1;null!=
+a&&(b=this.left==a.left&&this.right==a.right&&this.top==a.top&&this.bottom==a.bottom);return b},toString:function(){return[this.left,this.bottom,this.right,this.top].join()},toArray:function(a){return!0===a?[this.bottom,this.left,this.top,this.right]:[this.left,this.bottom,this.right,this.top]},toBBOX:function(a,b){null==a&&(a=6);var c=Math.pow(10,a),d=Math.round(this.left*c)/c,e=Math.round(this.bottom*c)/c,f=Math.round(this.right*c)/c,c=Math.round(this.top*c)/c;return!0===b?e+","+d+","+c+","+f:d+
+","+e+","+f+","+c},toGeometry:function(){return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(this.left,this.bottom),new OpenLayers.Geometry.Point(this.right,this.bottom),new OpenLayers.Geometry.Point(this.right,this.top),new OpenLayers.Geometry.Point(this.left,this.top)])])},getWidth:function(){return this.right-this.left},getHeight:function(){return this.top-this.bottom},getSize:function(){return new OpenLayers.Size(this.getWidth(),this.getHeight())},
+getCenterPixel:function(){return new OpenLayers.Pixel((this.left+this.right)/2,(this.bottom+this.top)/2)},getCenterLonLat:function(){this.centerLonLat||(this.centerLonLat=new OpenLayers.LonLat((this.left+this.right)/2,(this.bottom+this.top)/2));return this.centerLonLat},scale:function(a,b){null==b&&(b=this.getCenterLonLat());var c,d;"OpenLayers.LonLat"==b.CLASS_NAME?(c=b.lon,d=b.lat):(c=b.x,d=b.y);return new OpenLayers.Bounds((this.left-c)*a+c,(this.bottom-d)*a+d,(this.right-c)*a+c,(this.top-d)*a+
+d)},add:function(a,b){if(null==a||null==b)throw new TypeError("Bounds.add cannot receive null values");return new OpenLayers.Bounds(this.left+a,this.bottom+b,this.right+a,this.top+b)},extend:function(a){if(a)switch(a.CLASS_NAME){case "OpenLayers.LonLat":this.extendXY(a.lon,a.lat);break;case "OpenLayers.Geometry.Point":this.extendXY(a.x,a.y);break;case "OpenLayers.Bounds":this.centerLonLat=null;if(null==this.left||a.left<this.left)this.left=a.left;if(null==this.bottom||a.bottom<this.bottom)this.bottom=
+a.bottom;if(null==this.right||a.right>this.right)this.right=a.right;if(null==this.top||a.top>this.top)this.top=a.top}},extendXY:function(a,b){this.centerLonLat=null;if(null==this.left||a<this.left)this.left=a;if(null==this.bottom||b<this.bottom)this.bottom=b;if(null==this.right||a>this.right)this.right=a;if(null==this.top||b>this.top)this.top=b},containsLonLat:function(a,b){"boolean"===typeof b&&(b={inclusive:b});b=b||{};var c=this.contains(a.lon,a.lat,b.inclusive),d=b.worldBounds;d&&!c&&(c=d.getWidth(),
+d=Math.round((a.lon-(d.left+d.right)/2)/c),c=this.containsLonLat({lon:a.lon-d*c,lat:a.lat},{inclusive:b.inclusive}));return c},containsPixel:function(a,b){return this.contains(a.x,a.y,b)},contains:function(a,b,c){null==c&&(c=!0);if(null==a||null==b)return!1;a=OpenLayers.Util.toFloat(a);b=OpenLayers.Util.toFloat(b);var d=!1;return d=c?a>=this.left&&a<=this.right&&b>=this.bottom&&b<=this.top:a>this.left&&a<this.right&&b>this.bottom&&b<this.top},intersectsBounds:function(a,b){"boolean"===typeof b&&(b=
+{inclusive:b});b=b||{};if(b.worldBounds){var c=this.wrapDateLine(b.worldBounds);a=a.wrapDateLine(b.worldBounds)}else c=this;null==b.inclusive&&(b.inclusive=!0);var d=!1,e=c.left==a.right||c.right==a.left||c.top==a.bottom||c.bottom==a.top;if(b.inclusive||!e)var d=a.top>=c.bottom&&a.top<=c.top||c.top>a.bottom&&c.top<a.top,e=a.left>=c.left&&a.left<=c.right||c.left>=a.left&&c.left<=a.right,f=a.right>=c.left&&a.right<=c.right||c.right>=a.left&&c.right<=a.right,d=(a.bottom>=c.bottom&&a.bottom<=c.top||c.bottom>=
+a.bottom&&c.bottom<=a.top||d)&&(e||f);if(b.worldBounds&&!d){var g=b.worldBounds,e=g.getWidth(),f=!g.containsBounds(c),g=!g.containsBounds(a);f&&!g?(a=a.add(-e,0),d=c.intersectsBounds(a,{inclusive:b.inclusive})):g&&!f&&(c=c.add(-e,0),d=a.intersectsBounds(c,{inclusive:b.inclusive}))}return d},containsBounds:function(a,b,c){null==b&&(b=!1);null==c&&(c=!0);var d=this.contains(a.left,a.bottom,c),e=this.contains(a.right,a.bottom,c),f=this.contains(a.left,a.top,c);a=this.contains(a.right,a.top,c);return b?
+d||e||f||a:d&&e&&f&&a},determineQuadrant:function(a){var b="",c=this.getCenterLonLat(),b=b+(a.lat<c.lat?"b":"t");return b+=a.lon<c.lon?"l":"r"},transform:function(a,b){this.centerLonLat=null;var c=OpenLayers.Projection.transform({x:this.left,y:this.bottom},a,b),d=OpenLayers.Projection.transform({x:this.right,y:this.bottom},a,b),e=OpenLayers.Projection.transform({x:this.left,y:this.top},a,b),f=OpenLayers.Projection.transform({x:this.right,y:this.top},a,b);this.left=Math.min(c.x,e.x);this.bottom=Math.min(c.y,
+d.y);this.right=Math.max(d.x,f.x);this.top=Math.max(e.y,f.y);return this},wrapDateLine:function(a,b){b=b||{};var c=b.leftTolerance||0,d=b.rightTolerance||0,e=this.clone();if(a){for(var f=a.getWidth();e.left<a.left&&e.right-d<=a.left;)e=e.add(f,0);for(;e.left+c>=a.right&&e.right>a.right;)e=e.add(-f,0);c=e.left+c;c<a.right&&(c>a.left&&e.right-d>a.right)&&(e=e.add(-f,0))}return e},CLASS_NAME:"OpenLayers.Bounds"});
+OpenLayers.Bounds.fromString=function(a,b){var c=a.split(",");return OpenLayers.Bounds.fromArray(c,b)};OpenLayers.Bounds.fromArray=function(a,b){return!0===b?new OpenLayers.Bounds(a[1],a[0],a[3],a[2]):new OpenLayers.Bounds(a[0],a[1],a[2],a[3])};OpenLayers.Bounds.fromSize=function(a){return new OpenLayers.Bounds(0,a.h,a.w,0)};OpenLayers.Bounds.oppositeQuadrant=function(a){var b;b=""+("t"==a.charAt(0)?"b":"t");return b+="l"==a.charAt(1)?"r":"l"};OpenLayers.Element={visible:function(a){return"none"!=OpenLayers.Util.getElement(a).style.display},toggle:function(){for(var a=0,b=arguments.length;a<b;a++){var c=OpenLayers.Util.getElement(arguments[a]),d=OpenLayers.Element.visible(c)?"none":"";c.style.display=d}},remove:function(a){a=OpenLayers.Util.getElement(a);a.parentNode.removeChild(a)},getHeight:function(a){a=OpenLayers.Util.getElement(a);return a.offsetHeight},hasClass:function(a,b){var c=a.className;return!!c&&RegExp("(^|\\s)"+b+"(\\s|$)").test(c)},
+addClass:function(a,b){OpenLayers.Element.hasClass(a,b)||(a.className+=(a.className?" ":"")+b);return a},removeClass:function(a,b){var c=a.className;c&&(a.className=OpenLayers.String.trim(c.replace(RegExp("(^|\\s+)"+b+"(\\s+|$)")," ")));return a},toggleClass:function(a,b){OpenLayers.Element.hasClass(a,b)?OpenLayers.Element.removeClass(a,b):OpenLayers.Element.addClass(a,b);return a},getStyle:function(a,b){a=OpenLayers.Util.getElement(a);var c=null;if(a&&a.style){c=a.style[OpenLayers.String.camelize(b)];
+c||(document.defaultView&&document.defaultView.getComputedStyle?c=(c=document.defaultView.getComputedStyle(a,null))?c.getPropertyValue(b):null:a.currentStyle&&(c=a.currentStyle[OpenLayers.String.camelize(b)]));var d=["left","top","right","bottom"];window.opera&&(-1!=OpenLayers.Util.indexOf(d,b)&&"static"==OpenLayers.Element.getStyle(a,"position"))&&(c="auto")}return"auto"==c?null:c}};OpenLayers.LonLat=OpenLayers.Class({lon:0,lat:0,initialize:function(a,b){OpenLayers.Util.isArray(a)&&(b=a[1],a=a[0]);this.lon=OpenLayers.Util.toFloat(a);this.lat=OpenLayers.Util.toFloat(b)},toString:function(){return"lon="+this.lon+",lat="+this.lat},toShortString:function(){return this.lon+", "+this.lat},clone:function(){return new OpenLayers.LonLat(this.lon,this.lat)},add:function(a,b){if(null==a||null==b)throw new TypeError("LonLat.add cannot receive null values");return new OpenLayers.LonLat(this.lon+
+OpenLayers.Util.toFloat(a),this.lat+OpenLayers.Util.toFloat(b))},equals:function(a){var b=!1;null!=a&&(b=this.lon==a.lon&&this.lat==a.lat||isNaN(this.lon)&&isNaN(this.lat)&&isNaN(a.lon)&&isNaN(a.lat));return b},transform:function(a,b){var c=OpenLayers.Projection.transform({x:this.lon,y:this.lat},a,b);this.lon=c.x;this.lat=c.y;return this},wrapDateLine:function(a){var b=this.clone();if(a){for(;b.lon<a.left;)b.lon+=a.getWidth();for(;b.lon>a.right;)b.lon-=a.getWidth()}return b},CLASS_NAME:"OpenLayers.LonLat"});
+OpenLayers.LonLat.fromString=function(a){a=a.split(",");return new OpenLayers.LonLat(a[0],a[1])};OpenLayers.LonLat.fromArray=function(a){var b=OpenLayers.Util.isArray(a);return new OpenLayers.LonLat(b&&a[0],b&&a[1])};OpenLayers.Pixel=OpenLayers.Class({x:0,y:0,initialize:function(a,b){this.x=parseFloat(a);this.y=parseFloat(b)},toString:function(){return"x="+this.x+",y="+this.y},clone:function(){return new OpenLayers.Pixel(this.x,this.y)},equals:function(a){var b=!1;null!=a&&(b=this.x==a.x&&this.y==a.y||isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y));return b},distanceTo:function(a){return Math.sqrt(Math.pow(this.x-a.x,2)+Math.pow(this.y-a.y,2))},add:function(a,b){if(null==a||null==b)throw new TypeError("Pixel.add cannot receive null values");
+return new OpenLayers.Pixel(this.x+a,this.y+b)},offset:function(a){var b=this.clone();a&&(b=this.add(a.x,a.y));return b},CLASS_NAME:"OpenLayers.Pixel"});OpenLayers.Size=OpenLayers.Class({w:0,h:0,initialize:function(a,b){this.w=parseFloat(a);this.h=parseFloat(b)},toString:function(){return"w="+this.w+",h="+this.h},clone:function(){return new OpenLayers.Size(this.w,this.h)},equals:function(a){var b=!1;null!=a&&(b=this.w==a.w&&this.h==a.h||isNaN(this.w)&&isNaN(this.h)&&isNaN(a.w)&&isNaN(a.h));return b},CLASS_NAME:"OpenLayers.Size"});OpenLayers.Console={log:function(){},debug:function(){},info:function(){},warn:function(){},error:function(){},userError:function(a){alert(a)},assert:function(){},dir:function(){},dirxml:function(){},trace:function(){},group:function(){},groupEnd:function(){},time:function(){},timeEnd:function(){},profile:function(){},profileEnd:function(){},count:function(){},CLASS_NAME:"OpenLayers.Console"};
+(function(){for(var a=document.getElementsByTagName("script"),b=0,c=a.length;b<c;++b)if(-1!=a[b].src.indexOf("firebug.js")&&console){OpenLayers.Util.extend(OpenLayers.Console,console);break}})();OpenLayers.Lang={code:null,defaultCode:"en",getCode:function(){OpenLayers.Lang.code||OpenLayers.Lang.setCode();return OpenLayers.Lang.code},setCode:function(a){var b;a||(a="msie"==OpenLayers.BROWSER_NAME?navigator.userLanguage:navigator.language);a=a.split("-");a[0]=a[0].toLowerCase();"object"==typeof OpenLayers.Lang[a[0]]&&(b=a[0]);if(a[1]){var c=a[0]+"-"+a[1].toUpperCase();"object"==typeof OpenLayers.Lang[c]&&(b=c)}b||(OpenLayers.Console.warn("Failed to find OpenLayers.Lang."+a.join("-")+" dictionary, falling back to default language"),
+b=OpenLayers.Lang.defaultCode);OpenLayers.Lang.code=b},translate:function(a,b){var c=OpenLayers.Lang[OpenLayers.Lang.getCode()];(c=c&&c[a])||(c=a);b&&(c=OpenLayers.String.format(c,b));return c}};OpenLayers.i18n=OpenLayers.Lang.translate;OpenLayers.Util=OpenLayers.Util||{};OpenLayers.Util.getElement=function(){for(var a=[],b=0,c=arguments.length;b<c;b++){var d=arguments[b];"string"==typeof d&&(d=document.getElementById(d));if(1==arguments.length)return d;a.push(d)}return a};OpenLayers.Util.isElement=function(a){return!(!a||1!==a.nodeType)};OpenLayers.Util.isArray=function(a){return"[object Array]"===Object.prototype.toString.call(a)};OpenLayers.Util.removeItem=function(a,b){for(var c=a.length-1;0<=c;c--)a[c]==b&&a.splice(c,1);return a};
+OpenLayers.Util.indexOf=function(a,b){if("function"==typeof a.indexOf)return a.indexOf(b);for(var c=0,d=a.length;c<d;c++)if(a[c]==b)return c;return-1};OpenLayers.Util.dotless=/\./g;
+OpenLayers.Util.modifyDOMElement=function(a,b,c,d,e,f,g,h){b&&(a.id=b.replace(OpenLayers.Util.dotless,"_"));c&&(a.style.left=c.x+"px",a.style.top=c.y+"px");d&&(a.style.width=d.w+"px",a.style.height=d.h+"px");e&&(a.style.position=e);f&&(a.style.border=f);g&&(a.style.overflow=g);0<=parseFloat(h)&&1>parseFloat(h)?(a.style.filter="alpha(opacity="+100*h+")",a.style.opacity=h):1==parseFloat(h)&&(a.style.filter="",a.style.opacity="")};
+OpenLayers.Util.createDiv=function(a,b,c,d,e,f,g,h){var k=document.createElement("div");d&&(k.style.backgroundImage="url("+d+")");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="absolute");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,g,h);return k};
+OpenLayers.Util.createImage=function(a,b,c,d,e,f,g,h){var k=document.createElement("img");a||(a=OpenLayers.Util.createUniqueID("OpenLayersDiv"));e||(e="relative");OpenLayers.Util.modifyDOMElement(k,a,b,c,e,f,null,g);h&&(k.style.display="none",b=function(){k.style.display="";OpenLayers.Event.stopObservingElement(k)},OpenLayers.Event.observe(k,"load",b),OpenLayers.Event.observe(k,"error",b));k.style.alt=a;k.galleryImg="no";d&&(k.src=d);return k};OpenLayers.IMAGE_RELOAD_ATTEMPTS=0;
+OpenLayers.Util.alphaHackNeeded=null;OpenLayers.Util.alphaHack=function(){if(null==OpenLayers.Util.alphaHackNeeded){var a=navigator.appVersion.split("MSIE"),a=parseFloat(a[1]),b=!1;try{b=!!document.body.filters}catch(c){}OpenLayers.Util.alphaHackNeeded=b&&5.5<=a&&7>a}return OpenLayers.Util.alphaHackNeeded};
+OpenLayers.Util.modifyAlphaImageDiv=function(a,b,c,d,e,f,g,h,k){OpenLayers.Util.modifyDOMElement(a,b,c,d,f,null,null,k);b=a.childNodes[0];e&&(b.src=e);OpenLayers.Util.modifyDOMElement(b,a.id+"_innerImage",null,d,"relative",g);OpenLayers.Util.alphaHack()&&("none"!=a.style.display&&(a.style.display="inline-block"),null==h&&(h="scale"),a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+b.src+"', sizingMethod='"+h+"')",0<=parseFloat(a.style.opacity)&&1>parseFloat(a.style.opacity)&&
+(a.style.filter+=" alpha(opacity="+100*a.style.opacity+")"),b.style.filter="alpha(opacity=0)")};OpenLayers.Util.createAlphaImageDiv=function(a,b,c,d,e,f,g,h,k){var l=OpenLayers.Util.createDiv();k=OpenLayers.Util.createImage(null,null,null,null,null,null,null,k);k.className="olAlphaImg";l.appendChild(k);OpenLayers.Util.modifyAlphaImageDiv(l,a,b,c,d,e,f,g,h);return l};OpenLayers.Util.upperCaseObject=function(a){var b={},c;for(c in a)b[c.toUpperCase()]=a[c];return b};
+OpenLayers.Util.applyDefaults=function(a,b){a=a||{};var c="function"==typeof window.Event&&b instanceof window.Event,d;for(d in b)if(void 0===a[d]||!c&&b.hasOwnProperty&&b.hasOwnProperty(d)&&!a.hasOwnProperty(d))a[d]=b[d];!c&&(b&&b.hasOwnProperty&&b.hasOwnProperty("toString")&&!a.hasOwnProperty("toString"))&&(a.toString=b.toString);return a};
+OpenLayers.Util.getParameterString=function(a){var b=[],c;for(c in a){var d=a[c];if(null!=d&&"function"!=typeof d){if("object"==typeof d&&d.constructor==Array){for(var e=[],f,g=0,h=d.length;g<h;g++)f=d[g],e.push(encodeURIComponent(null===f||void 0===f?"":f));d=e.join(",")}else d=encodeURIComponent(d);b.push(encodeURIComponent(c)+"="+d)}}return b.join("&")};OpenLayers.Util.urlAppend=function(a,b){var c=a;if(b)var d=(a+" ").split(/[?&]/),c=c+(" "===d.pop()?b:d.length?"&"+b:"?"+b);return c};
+OpenLayers.Util.getImagesLocation=function(){return OpenLayers.ImgPath||OpenLayers._getScriptLocation()+"img/"};OpenLayers.Util.getImageLocation=function(a){return OpenLayers.Util.getImagesLocation()+a};OpenLayers.Util.Try=function(){for(var a=null,b=0,c=arguments.length;b<c;b++){var d=arguments[b];try{a=d();break}catch(e){}}return a};
+OpenLayers.Util.getXmlNodeValue=function(a){var b=null;OpenLayers.Util.Try(function(){b=a.text;b||(b=a.textContent);b||(b=a.firstChild.nodeValue)},function(){b=a.textContent});return b};OpenLayers.Util.mouseLeft=function(a,b){for(var c=a.relatedTarget?a.relatedTarget:a.toElement;c!=b&&null!=c;)c=c.parentNode;return c!=b};OpenLayers.Util.DEFAULT_PRECISION=14;OpenLayers.Util.toFloat=function(a,b){null==b&&(b=OpenLayers.Util.DEFAULT_PRECISION);"number"!==typeof a&&(a=parseFloat(a));return 0===b?a:parseFloat(a.toPrecision(b))};
+OpenLayers.Util.rad=function(a){return a*Math.PI/180};OpenLayers.Util.deg=function(a){return 180*a/Math.PI};OpenLayers.Util.VincentyConstants={a:6378137,b:6356752.3142,f:1/298.257223563};
+OpenLayers.Util.distVincenty=function(a,b){for(var c=OpenLayers.Util.VincentyConstants,d=c.a,e=c.b,c=c.f,f=OpenLayers.Util.rad(b.lon-a.lon),g=Math.atan((1-c)*Math.tan(OpenLayers.Util.rad(a.lat))),h=Math.atan((1-c)*Math.tan(OpenLayers.Util.rad(b.lat))),k=Math.sin(g),g=Math.cos(g),l=Math.sin(h),h=Math.cos(h),m=f,n=2*Math.PI,p=20;1E-12<Math.abs(m-n)&&0<--p;){var q=Math.sin(m),r=Math.cos(m),s=Math.sqrt(h*q*h*q+(g*l-k*h*r)*(g*l-k*h*r));if(0==s)return 0;var r=k*l+g*h*r,t=Math.atan2(s,r),u=Math.asin(g*h*
+q/s),v=Math.cos(u)*Math.cos(u),q=r-2*k*l/v,w=c/16*v*(4+c*(4-3*v)),n=m,m=f+(1-w)*c*Math.sin(u)*(t+w*s*(q+w*r*(-1+2*q*q)))}if(0==p)return NaN;d=v*(d*d-e*e)/(e*e);c=d/1024*(256+d*(-128+d*(74-47*d)));return(e*(1+d/16384*(4096+d*(-768+d*(320-175*d))))*(t-c*s*(q+c/4*(r*(-1+2*q*q)-c/6*q*(-3+4*s*s)*(-3+4*q*q))))).toFixed(3)/1E3};
+OpenLayers.Util.destinationVincenty=function(a,b,c){var d=OpenLayers.Util,e=d.VincentyConstants,f=e.a,g=e.b,h=e.f,e=a.lon;a=a.lat;var k=d.rad(b);b=Math.sin(k);k=Math.cos(k);a=(1-h)*Math.tan(d.rad(a));var l=1/Math.sqrt(1+a*a),m=a*l,n=Math.atan2(a,k);a=l*b;for(var p=1-a*a,f=p*(f*f-g*g)/(g*g),q=1+f/16384*(4096+f*(-768+f*(320-175*f))),r=f/1024*(256+f*(-128+f*(74-47*f))),f=c/(g*q),s=2*Math.PI;1E-12<Math.abs(f-s);)var t=Math.cos(2*n+f),u=Math.sin(f),v=Math.cos(f),w=r*u*(t+r/4*(v*(-1+2*t*t)-r/6*t*(-3+4*
+u*u)*(-3+4*t*t))),s=f,f=c/(g*q)+w;c=m*u-l*v*k;g=Math.atan2(m*v+l*u*k,(1-h)*Math.sqrt(a*a+c*c));b=Math.atan2(u*b,l*v-m*u*k);k=h/16*p*(4+h*(4-3*p));t=b-(1-k)*h*a*(f+k*u*(t+k*v*(-1+2*t*t)));Math.atan2(a,-c);return new OpenLayers.LonLat(e+d.deg(t),d.deg(g))};
+OpenLayers.Util.getParameters=function(a,b){b=b||{};a=null===a||void 0===a?window.location.href:a;var c="";if(OpenLayers.String.contains(a,"?"))var d=a.indexOf("?")+1,c=OpenLayers.String.contains(a,"#")?a.indexOf("#"):a.length,c=a.substring(d,c);for(var d={},c=c.split(/[&;]/),e=0,f=c.length;e<f;++e){var g=c[e].split("=");if(g[0]){var h=g[0];try{h=decodeURIComponent(h)}catch(k){h=unescape(h)}g=(g[1]||"").replace(/\+/g," ");try{g=decodeURIComponent(g)}catch(l){g=unescape(g)}!1!==b.splitArgs&&(g=g.split(","));
+1==g.length&&(g=g[0]);d[h]=g}}return d};OpenLayers.Util.lastSeqID=0;OpenLayers.Util.createUniqueID=function(a){a=null==a?"id_":a.replace(OpenLayers.Util.dotless,"_");OpenLayers.Util.lastSeqID+=1;return a+OpenLayers.Util.lastSeqID};OpenLayers.INCHES_PER_UNIT={inches:1,ft:12,mi:63360,m:39.37,km:39370,dd:4374754,yd:36};OpenLayers.INCHES_PER_UNIT["in"]=OpenLayers.INCHES_PER_UNIT.inches;OpenLayers.INCHES_PER_UNIT.degrees=OpenLayers.INCHES_PER_UNIT.dd;OpenLayers.INCHES_PER_UNIT.nmi=1852*OpenLayers.INCHES_PER_UNIT.m;
+OpenLayers.METERS_PER_INCH=0.0254000508001016;
+OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{Inch:OpenLayers.INCHES_PER_UNIT.inches,Meter:1/OpenLayers.METERS_PER_INCH,Foot:0.3048006096012192/OpenLayers.METERS_PER_INCH,IFoot:0.3048/OpenLayers.METERS_PER_INCH,ClarkeFoot:0.3047972651151/OpenLayers.METERS_PER_INCH,SearsFoot:0.30479947153867626/OpenLayers.METERS_PER_INCH,GoldCoastFoot:0.3047997101815088/OpenLayers.METERS_PER_INCH,IInch:0.0254/OpenLayers.METERS_PER_INCH,MicroInch:2.54E-5/OpenLayers.METERS_PER_INCH,Mil:2.54E-8/OpenLayers.METERS_PER_INCH,
+Centimeter:0.01/OpenLayers.METERS_PER_INCH,Kilometer:1E3/OpenLayers.METERS_PER_INCH,Yard:0.9144018288036576/OpenLayers.METERS_PER_INCH,SearsYard:0.914398414616029/OpenLayers.METERS_PER_INCH,IndianYard:0.9143985307444408/OpenLayers.METERS_PER_INCH,IndianYd37:0.91439523/OpenLayers.METERS_PER_INCH,IndianYd62:0.9143988/OpenLayers.METERS_PER_INCH,IndianYd75:0.9143985/OpenLayers.METERS_PER_INCH,IndianFoot:0.30479951/OpenLayers.METERS_PER_INCH,IndianFt37:0.30479841/OpenLayers.METERS_PER_INCH,IndianFt62:0.3047996/
+OpenLayers.METERS_PER_INCH,IndianFt75:0.3047995/OpenLayers.METERS_PER_INCH,Mile:1609.3472186944373/OpenLayers.METERS_PER_INCH,IYard:0.9144/OpenLayers.METERS_PER_INCH,IMile:1609.344/OpenLayers.METERS_PER_INCH,NautM:1852/OpenLayers.METERS_PER_INCH,"Lat-66":110943.31648893273/OpenLayers.METERS_PER_INCH,"Lat-83":110946.25736872235/OpenLayers.METERS_PER_INCH,Decimeter:0.1/OpenLayers.METERS_PER_INCH,Millimeter:0.001/OpenLayers.METERS_PER_INCH,Dekameter:10/OpenLayers.METERS_PER_INCH,Decameter:10/OpenLayers.METERS_PER_INCH,
+Hectometer:100/OpenLayers.METERS_PER_INCH,GermanMeter:1.0000135965/OpenLayers.METERS_PER_INCH,CaGrid:0.999738/OpenLayers.METERS_PER_INCH,ClarkeChain:20.1166194976/OpenLayers.METERS_PER_INCH,GunterChain:20.11684023368047/OpenLayers.METERS_PER_INCH,BenoitChain:20.116782494375872/OpenLayers.METERS_PER_INCH,SearsChain:20.11676512155/OpenLayers.METERS_PER_INCH,ClarkeLink:0.201166194976/OpenLayers.METERS_PER_INCH,GunterLink:0.2011684023368047/OpenLayers.METERS_PER_INCH,BenoitLink:0.20116782494375873/OpenLayers.METERS_PER_INCH,
+SearsLink:0.2011676512155/OpenLayers.METERS_PER_INCH,Rod:5.02921005842012/OpenLayers.METERS_PER_INCH,IntnlChain:20.1168/OpenLayers.METERS_PER_INCH,IntnlLink:0.201168/OpenLayers.METERS_PER_INCH,Perch:5.02921005842012/OpenLayers.METERS_PER_INCH,Pole:5.02921005842012/OpenLayers.METERS_PER_INCH,Furlong:201.1684023368046/OpenLayers.METERS_PER_INCH,Rood:3.778266898/OpenLayers.METERS_PER_INCH,CapeFoot:0.3047972615/OpenLayers.METERS_PER_INCH,Brealey:375/OpenLayers.METERS_PER_INCH,ModAmFt:0.304812252984506/
+OpenLayers.METERS_PER_INCH,Fathom:1.8288/OpenLayers.METERS_PER_INCH,"NautM-UK":1853.184/OpenLayers.METERS_PER_INCH,"50kilometers":5E4/OpenLayers.METERS_PER_INCH,"150kilometers":15E4/OpenLayers.METERS_PER_INCH});
+OpenLayers.Util.extend(OpenLayers.INCHES_PER_UNIT,{mm:OpenLayers.INCHES_PER_UNIT.Meter/1E3,cm:OpenLayers.INCHES_PER_UNIT.Meter/100,dm:100*OpenLayers.INCHES_PER_UNIT.Meter,km:1E3*OpenLayers.INCHES_PER_UNIT.Meter,kmi:OpenLayers.INCHES_PER_UNIT.nmi,fath:OpenLayers.INCHES_PER_UNIT.Fathom,ch:OpenLayers.INCHES_PER_UNIT.IntnlChain,link:OpenLayers.INCHES_PER_UNIT.IntnlLink,"us-in":OpenLayers.INCHES_PER_UNIT.inches,"us-ft":OpenLayers.INCHES_PER_UNIT.Foot,"us-yd":OpenLayers.INCHES_PER_UNIT.Yard,"us-ch":OpenLayers.INCHES_PER_UNIT.GunterChain,
+"us-mi":OpenLayers.INCHES_PER_UNIT.Mile,"ind-yd":OpenLayers.INCHES_PER_UNIT.IndianYd37,"ind-ft":OpenLayers.INCHES_PER_UNIT.IndianFt37,"ind-ch":20.11669506/OpenLayers.METERS_PER_INCH});OpenLayers.DOTS_PER_INCH=72;OpenLayers.Util.normalizeScale=function(a){return 1<a?1/a:a};OpenLayers.Util.getResolutionFromScale=function(a,b){var c;a&&(null==b&&(b="degrees"),c=1/(OpenLayers.Util.normalizeScale(a)*OpenLayers.INCHES_PER_UNIT[b]*OpenLayers.DOTS_PER_INCH));return c};
+OpenLayers.Util.getScaleFromResolution=function(a,b){null==b&&(b="degrees");return a*OpenLayers.INCHES_PER_UNIT[b]*OpenLayers.DOTS_PER_INCH};
+OpenLayers.Util.pagePosition=function(a){var b=[0,0],c=OpenLayers.Util.getViewportElement();if(!a||a==window||a==c)return b;var d=OpenLayers.IS_GECKO&&document.getBoxObjectFor&&"absolute"==OpenLayers.Element.getStyle(a,"position")&&(""==a.style.top||""==a.style.left),e=null;if(a.getBoundingClientRect)a=a.getBoundingClientRect(),e=window.pageYOffset||c.scrollTop,b[0]=a.left+(window.pageXOffset||c.scrollLeft),b[1]=a.top+e;else if(document.getBoxObjectFor&&!d)a=document.getBoxObjectFor(a),c=document.getBoxObjectFor(c),
+b[0]=a.screenX-c.screenX,b[1]=a.screenY-c.screenY;else{b[0]=a.offsetLeft;b[1]=a.offsetTop;e=a.offsetParent;if(e!=a)for(;e;)b[0]+=e.offsetLeft,b[1]+=e.offsetTop,e=e.offsetParent;c=OpenLayers.BROWSER_NAME;if("opera"==c||"safari"==c&&"absolute"==OpenLayers.Element.getStyle(a,"position"))b[1]-=document.body.offsetTop;for(e=a.offsetParent;e&&e!=document.body;){b[0]-=e.scrollLeft;if("opera"!=c||"TR"!=e.tagName)b[1]-=e.scrollTop;e=e.offsetParent}}return b};
+OpenLayers.Util.getViewportElement=function(){var a=arguments.callee.viewportElement;void 0==a&&(a="msie"==OpenLayers.BROWSER_NAME&&"CSS1Compat"!=document.compatMode?document.body:document.documentElement,arguments.callee.viewportElement=a);return a};
+OpenLayers.Util.isEquivalentUrl=function(a,b,c){c=c||{};OpenLayers.Util.applyDefaults(c,{ignoreCase:!0,ignorePort80:!0,ignoreHash:!0,splitArgs:!1});a=OpenLayers.Util.createUrlObject(a,c);b=OpenLayers.Util.createUrlObject(b,c);for(var d in a)if("args"!==d&&a[d]!=b[d])return!1;for(d in a.args){if(a.args[d]!=b.args[d])return!1;delete b.args[d]}for(d in b.args)return!1;return!0};
+OpenLayers.Util.createUrlObject=function(a,b){b=b||{};if(!/^\w+:\/\//.test(a)){var c=window.location,d=c.port?":"+c.port:"",d=c.protocol+"//"+c.host.split(":").shift()+d;0===a.indexOf("/")?a=d+a:(c=c.pathname.split("/"),c.pop(),a=d+c.join("/")+"/"+a)}b.ignoreCase&&(a=a.toLowerCase());c=document.createElement("a");c.href=a;d={};d.host=c.host.split(":").shift();d.protocol=c.protocol;d.port=b.ignorePort80?"80"==c.port||"0"==c.port?"":c.port:""==c.port||"0"==c.port?"80":c.port;d.hash=b.ignoreHash||"#"===
+c.hash?"":c.hash;var e=c.search;e||(e=a.indexOf("?"),e=-1!=e?a.substr(e):"");d.args=OpenLayers.Util.getParameters(e,{splitArgs:b.splitArgs});d.pathname="/"==c.pathname.charAt(0)?c.pathname:"/"+c.pathname;return d};OpenLayers.Util.removeTail=function(a){var b=null,b=a.indexOf("?"),c=a.indexOf("#");return b=-1==b?-1!=c?a.substr(0,c):a:-1!=c?a.substr(0,Math.min(b,c)):a.substr(0,b)};OpenLayers.IS_GECKO=function(){var a=navigator.userAgent.toLowerCase();return-1==a.indexOf("webkit")&&-1!=a.indexOf("gecko")}();
+OpenLayers.CANVAS_SUPPORTED=function(){var a=document.createElement("canvas");return!(!a.getContext||!a.getContext("2d"))}();OpenLayers.BROWSER_NAME=function(){var a="",b=navigator.userAgent.toLowerCase();-1!=b.indexOf("opera")?a="opera":-1!=b.indexOf("msie")?a="msie":-1!=b.indexOf("safari")?a="safari":-1!=b.indexOf("mozilla")&&(a=-1!=b.indexOf("firefox")?"firefox":"mozilla");return a}();OpenLayers.Util.getBrowserName=function(){return OpenLayers.BROWSER_NAME};
+OpenLayers.Util.getRenderedDimensions=function(a,b,c){var d,e,f=document.createElement("div");f.style.visibility="hidden";for(var g=c&&c.containerElement?c.containerElement:document.body,h=!1,k=null,l=g;l&&"body"!=l.tagName.toLowerCase();){var m=OpenLayers.Element.getStyle(l,"position");if("absolute"==m){h=!0;break}else if(m&&"static"!=m)break;l=l.parentNode}!h||0!==g.clientHeight&&0!==g.clientWidth||(k=document.createElement("div"),k.style.visibility="hidden",k.style.position="absolute",k.style.overflow=
+"visible",k.style.width=document.body.clientWidth+"px",k.style.height=document.body.clientHeight+"px",k.appendChild(f));f.style.position="absolute";b&&(b.w?(d=b.w,f.style.width=d+"px"):b.h&&(e=b.h,f.style.height=e+"px"));c&&c.displayClass&&(f.className=c.displayClass);b=document.createElement("div");b.innerHTML=a;b.style.overflow="visible";if(b.childNodes)for(a=0,c=b.childNodes.length;a<c;a++)b.childNodes[a].style&&(b.childNodes[a].style.overflow="visible");f.appendChild(b);k?g.appendChild(k):g.appendChild(f);
+d||(d=parseInt(b.scrollWidth),f.style.width=d+"px");e||(e=parseInt(b.scrollHeight));f.removeChild(b);k?(k.removeChild(f),g.removeChild(k)):g.removeChild(f);return new OpenLayers.Size(d,e)};
+OpenLayers.Util.getScrollbarWidth=function(){var a=OpenLayers.Util._scrollbarWidth;if(null==a){var b=null,c=null,b=a=0,b=document.createElement("div");b.style.position="absolute";b.style.top="-1000px";b.style.left="-1000px";b.style.width="100px";b.style.height="50px";b.style.overflow="hidden";c=document.createElement("div");c.style.width="100%";c.style.height="200px";b.appendChild(c);document.body.appendChild(b);a=c.offsetWidth;b.style.overflow="scroll";b=c.offsetWidth;document.body.removeChild(document.body.lastChild);
+OpenLayers.Util._scrollbarWidth=a-b;a=OpenLayers.Util._scrollbarWidth}return a};
+OpenLayers.Util.getFormattedLonLat=function(a,b,c){c||(c="dms");a=(a+540)%360-180;var d=Math.abs(a),e=Math.floor(d),f=d=(d-e)/(1/60),d=Math.floor(d),f=Math.round(10*((f-d)/(1/60))),f=f/10;60<=f&&(f-=60,d+=1,60<=d&&(d-=60,e+=1));10>e&&(e="0"+e);e+="\u00b0";0<=c.indexOf("dm")&&(10>d&&(d="0"+d),e+=d+"'",0<=c.indexOf("dms")&&(10>f&&(f="0"+f),e+=f+'"'));return e="lon"==b?e+(0>a?OpenLayers.i18n("W"):OpenLayers.i18n("E")):e+(0>a?OpenLayers.i18n("S"):OpenLayers.i18n("N"))};OpenLayers.Format=OpenLayers.Class({options:null,externalProjection:null,internalProjection:null,data:null,keepData:!1,initialize:function(a){OpenLayers.Util.extend(this,a);this.options=a},destroy:function(){},read:function(a){throw Error("Read not implemented.");},write:function(a){throw Error("Write not implemented.");},CLASS_NAME:"OpenLayers.Format"});OpenLayers.Format.CSWGetRecords=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Format.CSWGetRecords.DEFAULTS);var b=OpenLayers.Format.CSWGetRecords["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported CSWGetRecords version: "+a.version;return new b(a)};OpenLayers.Format.CSWGetRecords.DEFAULTS={version:"2.0.2"};OpenLayers.Control=OpenLayers.Class({id:null,map:null,div:null,type:null,allowSelection:!1,displayClass:"",title:"",autoActivate:!1,active:null,handlerOptions:null,handler:null,eventListeners:null,events:null,initialize:function(a){this.displayClass=this.CLASS_NAME.replace("OpenLayers.","ol").replace(/\./g,"");OpenLayers.Util.extend(this,a);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object)this.events.on(this.eventListeners);null==this.id&&(this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+
+"_"))},destroy:function(){this.events&&(this.eventListeners&&this.events.un(this.eventListeners),this.events.destroy(),this.events=null);this.eventListeners=null;this.handler&&(this.handler.destroy(),this.handler=null);if(this.handlers){for(var a in this.handlers)this.handlers.hasOwnProperty(a)&&"function"==typeof this.handlers[a].destroy&&this.handlers[a].destroy();this.handlers=null}this.map&&(this.map.removeControl(this),this.map=null);this.div=null},setMap:function(a){this.map=a;this.handler&&
+this.handler.setMap(a)},draw:function(a){null==this.div&&(this.div=OpenLayers.Util.createDiv(this.id),this.div.className=this.displayClass,this.allowSelection||(this.div.className+=" olControlNoSelect",this.div.setAttribute("unselectable","on",0),this.div.onselectstart=OpenLayers.Function.False),""!=this.title&&(this.div.title=this.title));null!=a&&(this.position=a.clone());this.moveTo(this.position);return this.div},moveTo:function(a){null!=a&&null!=this.div&&(this.div.style.left=a.x+"px",this.div.style.top=
+a.y+"px")},activate:function(){if(this.active)return!1;this.handler&&this.handler.activate();this.active=!0;this.map&&OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active");this.events.triggerEvent("activate");return!0},deactivate:function(){return this.active?(this.handler&&this.handler.deactivate(),this.active=!1,this.map&&OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass.replace(/ /g,"")+"Active"),this.events.triggerEvent("deactivate"),
+!0):!1},CLASS_NAME:"OpenLayers.Control"});OpenLayers.Control.TYPE_BUTTON=1;OpenLayers.Control.TYPE_TOGGLE=2;OpenLayers.Control.TYPE_TOOL=3;OpenLayers.Event={observers:!1,KEY_SPACE:32,KEY_BACKSPACE:8,KEY_TAB:9,KEY_RETURN:13,KEY_ESC:27,KEY_LEFT:37,KEY_UP:38,KEY_RIGHT:39,KEY_DOWN:40,KEY_DELETE:46,element:function(a){return a.target||a.srcElement},isSingleTouch:function(a){return a.touches&&1==a.touches.length},isMultiTouch:function(a){return a.touches&&1<a.touches.length},isLeftClick:function(a){return a.which&&1==a.which||a.button&&1==a.button},isRightClick:function(a){return a.which&&3==a.which||a.button&&2==a.button},stop:function(a,
+b){b||OpenLayers.Event.preventDefault(a);a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},preventDefault:function(a){a.preventDefault?a.preventDefault():a.returnValue=!1},findElement:function(a,b){for(var c=OpenLayers.Event.element(a);c.parentNode&&(!c.tagName||c.tagName.toUpperCase()!=b.toUpperCase());)c=c.parentNode;return c},observe:function(a,b,c,d){a=OpenLayers.Util.getElement(a);d=d||!1;"keypress"==b&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||a.attachEvent)&&(b="keydown");
+this.observers||(this.observers={});if(!a._eventCacheID){var e="eventCacheID_";a.id&&(e=a.id+"_"+e);a._eventCacheID=OpenLayers.Util.createUniqueID(e)}e=a._eventCacheID;this.observers[e]||(this.observers[e]=[]);this.observers[e].push({element:a,name:b,observer:c,useCapture:d});a.addEventListener?a.addEventListener(b,c,d):a.attachEvent&&a.attachEvent("on"+b,c)},stopObservingElement:function(a){a=OpenLayers.Util.getElement(a)._eventCacheID;this._removeElementObservers(OpenLayers.Event.observers[a])},
+_removeElementObservers:function(a){if(a)for(var b=a.length-1;0<=b;b--){var c=a[b];OpenLayers.Event.stopObserving.apply(this,[c.element,c.name,c.observer,c.useCapture])}},stopObserving:function(a,b,c,d){d=d||!1;a=OpenLayers.Util.getElement(a);var e=a._eventCacheID;"keypress"==b&&(navigator.appVersion.match(/Konqueror|Safari|KHTML/)||a.detachEvent)&&(b="keydown");var f=!1,g=OpenLayers.Event.observers[e];if(g)for(var h=0;!f&&h<g.length;){var k=g[h];if(k.name==b&&k.observer==c&&k.useCapture==d){g.splice(h,
+1);0==g.length&&delete OpenLayers.Event.observers[e];f=!0;break}h++}f&&(a.removeEventListener?a.removeEventListener(b,c,d):a&&a.detachEvent&&a.detachEvent("on"+b,c));return f},unloadCache:function(){if(OpenLayers.Event&&OpenLayers.Event.observers){for(var a in OpenLayers.Event.observers)OpenLayers.Event._removeElementObservers.apply(this,[OpenLayers.Event.observers[a]]);OpenLayers.Event.observers=!1}},CLASS_NAME:"OpenLayers.Event"};
+OpenLayers.Event.observe(window,"unload",OpenLayers.Event.unloadCache,!1);
+OpenLayers.Events=OpenLayers.Class({BROWSER_EVENTS:"mouseover mouseout mousedown mouseup mousemove click dblclick rightclick dblrightclick resize focus blur touchstart touchmove touchend keydown".split(" "),listeners:null,object:null,element:null,eventHandler:null,fallThrough:null,includeXY:!1,extensions:null,extensionCount:null,clearMouseListener:null,initialize:function(a,b,c,d,e){OpenLayers.Util.extend(this,e);this.object=a;this.fallThrough=d;this.listeners={};this.extensions={};this.extensionCount=
+{};this._msTouches=[];null!=b&&this.attachToElement(b)},destroy:function(){for(var a in this.extensions)"boolean"!==typeof this.extensions[a]&&this.extensions[a].destroy();this.extensions=null;this.element&&(OpenLayers.Event.stopObservingElement(this.element),this.element.hasScrollEvent&&OpenLayers.Event.stopObserving(window,"scroll",this.clearMouseListener));this.eventHandler=this.fallThrough=this.object=this.listeners=this.element=null},addEventType:function(a){},attachToElement:function(a){this.element?
+OpenLayers.Event.stopObservingElement(this.element):(this.eventHandler=OpenLayers.Function.bindAsEventListener(this.handleBrowserEvent,this),this.clearMouseListener=OpenLayers.Function.bind(this.clearMouseCache,this));this.element=a;for(var b=!!window.navigator.msMaxTouchPoints,c,d=0,e=this.BROWSER_EVENTS.length;d<e;d++)c=this.BROWSER_EVENTS[d],OpenLayers.Event.observe(a,c,this.eventHandler),b&&0===c.indexOf("touch")&&this.addMsTouchListener(a,c,this.eventHandler);OpenLayers.Event.observe(a,"dragstart",
+OpenLayers.Event.stop)},on:function(a){for(var b in a)"scope"!=b&&a.hasOwnProperty(b)&&this.register(b,a.scope,a[b])},register:function(a,b,c,d){a in OpenLayers.Events&&!this.extensions[a]&&(this.extensions[a]=new OpenLayers.Events[a](this));if(null!=c){null==b&&(b=this.object);var e=this.listeners[a];e||(e=[],this.listeners[a]=e,this.extensionCount[a]=0);b={obj:b,func:c};d?(e.splice(this.extensionCount[a],0,b),"object"===typeof d&&d.extension&&this.extensionCount[a]++):e.push(b)}},registerPriority:function(a,
+b,c){this.register(a,b,c,!0)},un:function(a){for(var b in a)"scope"!=b&&a.hasOwnProperty(b)&&this.unregister(b,a.scope,a[b])},unregister:function(a,b,c){null==b&&(b=this.object);a=this.listeners[a];if(null!=a)for(var d=0,e=a.length;d<e;d++)if(a[d].obj==b&&a[d].func==c){a.splice(d,1);break}},remove:function(a){null!=this.listeners[a]&&(this.listeners[a]=[])},triggerEvent:function(a,b){var c=this.listeners[a];if(c&&0!=c.length){null==b&&(b={});b.object=this.object;b.element=this.element;b.type||(b.type=
+a);for(var c=c.slice(),d,e=0,f=c.length;e<f&&(d=c[e],d=d.func.apply(d.obj,[b]),void 0==d||!1!=d);e++);this.fallThrough||OpenLayers.Event.stop(b,!0);return d}},handleBrowserEvent:function(a){var b=a.type,c=this.listeners[b];if(c&&0!=c.length){if((c=a.touches)&&c[0]){for(var d=0,e=0,f=c.length,g,h=0;h<f;++h)g=this.getTouchClientXY(c[h]),d+=g.clientX,e+=g.clientY;a.clientX=d/f;a.clientY=e/f}this.includeXY&&(a.xy=this.getMousePosition(a));this.triggerEvent(b,a)}},getTouchClientXY:function(a){var b=window.olMockWin||
+window,c=b.pageXOffset,b=b.pageYOffset,d=a.clientX,e=a.clientY;if(0===a.pageY&&Math.floor(e)>Math.floor(a.pageY)||0===a.pageX&&Math.floor(d)>Math.floor(a.pageX))d-=c,e-=b;else if(e<a.pageY-b||d<a.pageX-c)d=a.pageX-c,e=a.pageY-b;a.olClientX=d;a.olClientY=e;return{clientX:d,clientY:e}},clearMouseCache:function(){this.element.scrolls=null;this.element.lefttop=null;this.element.offsets=null},getMousePosition:function(a){this.includeXY?this.element.hasScrollEvent||(OpenLayers.Event.observe(window,"scroll",
+this.clearMouseListener),this.element.hasScrollEvent=!0):this.clearMouseCache();if(!this.element.scrolls){var b=OpenLayers.Util.getViewportElement();this.element.scrolls=[window.pageXOffset||b.scrollLeft,window.pageYOffset||b.scrollTop]}this.element.lefttop||(this.element.lefttop=[document.documentElement.clientLeft||0,document.documentElement.clientTop||0]);this.element.offsets||(this.element.offsets=OpenLayers.Util.pagePosition(this.element));return new OpenLayers.Pixel(a.clientX+this.element.scrolls[0]-
+this.element.offsets[0]-this.element.lefttop[0],a.clientY+this.element.scrolls[1]-this.element.offsets[1]-this.element.lefttop[1])},addMsTouchListener:function(a,b,c){function d(a){c(OpenLayers.Util.applyDefaults({stopPropagation:function(){for(var a=e.length-1;0<=a;--a)e[a].stopPropagation()},preventDefault:function(){for(var a=e.length-1;0<=a;--a)e[a].preventDefault()},type:b},a))}var e=this._msTouches;switch(b){case "touchstart":return this.addMsTouchListenerStart(a,b,d);case "touchend":return this.addMsTouchListenerEnd(a,
+b,d);case "touchmove":return this.addMsTouchListenerMove(a,b,d);default:throw"Unknown touch event type";}},addMsTouchListenerStart:function(a,b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerDown",function(a){for(var b=!1,g=0,h=d.length;g<h;++g)if(d[g].pointerId==a.pointerId){b=!0;break}b||d.push(a);a.touches=d.slice();c(a)});OpenLayers.Event.observe(a,"MSPointerUp",function(a){for(var b=0,c=d.length;b<c;++b)if(d[b].pointerId==a.pointerId){d.splice(b,1);break}})},addMsTouchListenerMove:function(a,
+b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerMove",function(a){if(a.pointerType!=a.MSPOINTER_TYPE_MOUSE||0!=a.buttons)if(1!=d.length||d[0].pageX!=a.pageX||d[0].pageY!=a.pageY){for(var b=0,g=d.length;b<g;++b)if(d[b].pointerId==a.pointerId){d[b]=a;break}a.touches=d.slice();c(a)}})},addMsTouchListenerEnd:function(a,b,c){var d=this._msTouches;OpenLayers.Event.observe(a,"MSPointerUp",function(a){for(var b=0,g=d.length;b<g;++b)if(d[b].pointerId==a.pointerId){d.splice(b,1);break}a.touches=
+d.slice();c(a)})},CLASS_NAME:"OpenLayers.Events"});OpenLayers.Events.buttonclick=OpenLayers.Class({target:null,events:"mousedown mouseup click dblclick touchstart touchmove touchend keydown".split(" "),startRegEx:/^mousedown|touchstart$/,cancelRegEx:/^touchmove$/,completeRegEx:/^mouseup|touchend$/,initialize:function(a){this.target=a;for(a=this.events.length-1;0<=a;--a)this.target.register(this.events[a],this,this.buttonClick,{extension:!0})},destroy:function(){for(var a=this.events.length-1;0<=a;--a)this.target.unregister(this.events[a],this,this.buttonClick);
+delete this.target},getPressedButton:function(a){var b=3,c;do{if(OpenLayers.Element.hasClass(a,"olButton")){c=a;break}a=a.parentNode}while(0<--b&&a);return c},ignore:function(a){var b=3,c=!1;do{if("a"===a.nodeName.toLowerCase()){c=!0;break}a=a.parentNode}while(0<--b&&a);return c},buttonClick:function(a){var b=!0,c=OpenLayers.Event.element(a);if(c&&(OpenLayers.Event.isLeftClick(a)||!~a.type.indexOf("mouse")))if(c=this.getPressedButton(c)){if("keydown"===a.type)switch(a.keyCode){case OpenLayers.Event.KEY_RETURN:case OpenLayers.Event.KEY_SPACE:this.target.triggerEvent("buttonclick",
+{buttonElement:c}),OpenLayers.Event.stop(a),b=!1}else if(this.startEvt){if(this.completeRegEx.test(a.type)){var b=OpenLayers.Util.pagePosition(c),d=OpenLayers.Util.getViewportElement(),e=window.pageYOffset||d.scrollTop;b[0]-=window.pageXOffset||d.scrollLeft;b[1]-=e;this.target.triggerEvent("buttonclick",{buttonElement:c,buttonXY:{x:this.startEvt.clientX-b[0],y:this.startEvt.clientY-b[1]}})}this.cancelRegEx.test(a.type)&&delete this.startEvt;OpenLayers.Event.stop(a);b=!1}this.startRegEx.test(a.type)&&
+(this.startEvt=a,OpenLayers.Event.stop(a),b=!1)}else b=!this.ignore(OpenLayers.Event.element(a)),delete this.startEvt;return b}});OpenLayers.Util=OpenLayers.Util||{};
+OpenLayers.Util.vendorPrefix=function(){function a(a){return a?a.replace(/([A-Z])/g,function(a){return"-"+a.toLowerCase()}).replace(/^ms-/,"-ms-"):null}function b(a,b){if(void 0===g[b]){var c,e=0,f=d.length,p="undefined"!==typeof a.cssText;for(g[b]=null;e<f;e++)if((c=d[e])?(p||(c=c.toLowerCase()),c=c+b.charAt(0).toUpperCase()+b.slice(1)):c=b,void 0!==a[c]){g[b]=c;break}}return g[b]}function c(a){return b(e,a)}var d=["","O","ms","Moz","Webkit"],e=document.createElement("div").style,f={},g={};return{css:function(b){if(void 0===
+f[b]){var d=b.replace(/(-[\s\S])/g,function(a){return a.charAt(1).toUpperCase()}),d=c(d);f[b]=a(d)}return f[b]},js:b,style:c,cssCache:f,jsCache:g}}();OpenLayers.Animation=function(a){var b=OpenLayers.Util.vendorPrefix.js(a,"requestAnimationFrame"),c=!!b,d=function(){var c=a[b]||function(b,c){a.setTimeout(b,16)};return function(b,d){c.apply(a,[b,d])}}(),e=0,f={};return{isNative:c,requestFrame:d,start:function(a,b,c){b=0<b?b:Number.POSITIVE_INFINITY;var l=++e,m=+new Date;f[l]=function(){f[l]&&+new Date-m<=b?(a(),f[l]&&d(f[l],c)):delete f[l]};d(f[l],c);return l},stop:function(a){delete f[a]}}}(window);OpenLayers.Tween=OpenLayers.Class({easing:null,begin:null,finish:null,duration:null,callbacks:null,time:null,minFrameRate:null,startTime:null,animationId:null,playing:!1,initialize:function(a){this.easing=a?a:OpenLayers.Easing.Expo.easeOut},start:function(a,b,c,d){this.playing=!0;this.begin=a;this.finish=b;this.duration=c;this.callbacks=d.callbacks;this.minFrameRate=d.minFrameRate||30;this.time=0;this.startTime=(new Date).getTime();OpenLayers.Animation.stop(this.animationId);this.animationId=null;
+this.callbacks&&this.callbacks.start&&this.callbacks.start.call(this,this.begin);this.animationId=OpenLayers.Animation.start(OpenLayers.Function.bind(this.play,this))},stop:function(){this.playing&&(this.callbacks&&this.callbacks.done&&this.callbacks.done.call(this,this.finish),OpenLayers.Animation.stop(this.animationId),this.animationId=null,this.playing=!1)},play:function(){var a={},b;for(b in this.begin){var c=this.begin[b],d=this.finish[b];if(null==c||null==d||isNaN(c)||isNaN(d))throw new TypeError("invalid value for Tween");
+a[b]=this.easing.apply(this,[this.time,c,d-c,this.duration])}this.time++;this.callbacks&&this.callbacks.eachStep&&((new Date).getTime()-this.startTime)/this.time<=1E3/this.minFrameRate&&this.callbacks.eachStep.call(this,a);this.time>this.duration&&this.stop()},CLASS_NAME:"OpenLayers.Tween"});OpenLayers.Easing={CLASS_NAME:"OpenLayers.Easing"};OpenLayers.Easing.Linear={easeIn:function(a,b,c,d){return c*a/d+b},easeOut:function(a,b,c,d){return c*a/d+b},easeInOut:function(a,b,c,d){return c*a/d+b},CLASS_NAME:"OpenLayers.Easing.Linear"};
+OpenLayers.Easing.Expo={easeIn:function(a,b,c,d){return 0==a?b:c*Math.pow(2,10*(a/d-1))+b},easeOut:function(a,b,c,d){return a==d?b+c:c*(-Math.pow(2,-10*a/d)+1)+b},easeInOut:function(a,b,c,d){return 0==a?b:a==d?b+c:1>(a/=d/2)?c/2*Math.pow(2,10*(a-1))+b:c/2*(-Math.pow(2,-10*--a)+2)+b},CLASS_NAME:"OpenLayers.Easing.Expo"};
+OpenLayers.Easing.Quad={easeIn:function(a,b,c,d){return c*(a/=d)*a+b},easeOut:function(a,b,c,d){return-c*(a/=d)*(a-2)+b},easeInOut:function(a,b,c,d){return 1>(a/=d/2)?c/2*a*a+b:-c/2*(--a*(a-2)-1)+b},CLASS_NAME:"OpenLayers.Easing.Quad"};OpenLayers.Projection=OpenLayers.Class({proj:null,projCode:null,titleRegEx:/\+title=[^\+]*/,initialize:function(a,b){OpenLayers.Util.extend(this,b);this.projCode=a;"object"==typeof Proj4js&&(this.proj=new Proj4js.Proj(a))},getCode:function(){return this.proj?this.proj.srsCode:this.projCode},getUnits:function(){return this.proj?this.proj.units:null},toString:function(){return this.getCode()},equals:function(a){var b=!1;a&&(a instanceof OpenLayers.Projection||(a=new OpenLayers.Projection(a)),"object"==
+typeof Proj4js&&this.proj.defData&&a.proj.defData?b=this.proj.defData.replace(this.titleRegEx,"")==a.proj.defData.replace(this.titleRegEx,""):a.getCode&&(b=this.getCode(),a=a.getCode(),b=b==a||!!OpenLayers.Projection.transforms[b]&&OpenLayers.Projection.transforms[b][a]===OpenLayers.Projection.nullTransform));return b},destroy:function(){delete this.proj;delete this.projCode},CLASS_NAME:"OpenLayers.Projection"});OpenLayers.Projection.transforms={};
+OpenLayers.Projection.defaults={"EPSG:4326":{units:"degrees",maxExtent:[-180,-90,180,90],yx:!0},"CRS:84":{units:"degrees",maxExtent:[-180,-90,180,90]},"EPSG:900913":{units:"m",maxExtent:[-2.003750834E7,-2.003750834E7,2.003750834E7,2.003750834E7]}};
+OpenLayers.Projection.addTransform=function(a,b,c){if(c===OpenLayers.Projection.nullTransform){var d=OpenLayers.Projection.defaults[a];d&&!OpenLayers.Projection.defaults[b]&&(OpenLayers.Projection.defaults[b]=d)}OpenLayers.Projection.transforms[a]||(OpenLayers.Projection.transforms[a]={});OpenLayers.Projection.transforms[a][b]=c};
+OpenLayers.Projection.transform=function(a,b,c){if(b&&c)if(b instanceof OpenLayers.Projection||(b=new OpenLayers.Projection(b)),c instanceof OpenLayers.Projection||(c=new OpenLayers.Projection(c)),b.proj&&c.proj)a=Proj4js.transform(b.proj,c.proj,a);else{b=b.getCode();c=c.getCode();var d=OpenLayers.Projection.transforms;if(d[b]&&d[b][c])d[b][c](a)}return a};OpenLayers.Projection.nullTransform=function(a){return a};
+(function(){function a(a){a.x=180*a.x/d;a.y=180/Math.PI*(2*Math.atan(Math.exp(a.y/d*Math.PI))-Math.PI/2);return a}function b(a){a.x=a.x*d/180;var b=Math.log(Math.tan((90+a.y)*Math.PI/360))/Math.PI*d;a.y=Math.max(-2.003750834E7,Math.min(b,2.003750834E7));return a}function c(c,d){var e=OpenLayers.Projection.addTransform,f=OpenLayers.Projection.nullTransform,g,p,q,r,s;g=0;for(p=d.length;g<p;++g)for(q=d[g],e(c,q,b),e(q,c,a),s=g+1;s<p;++s)r=d[s],e(q,r,f),e(r,q,f)}var d=2.003750834E7,e=["EPSG:900913","EPSG:3857",
+"EPSG:102113","EPSG:102100"],f=["CRS:84","urn:ogc:def:crs:EPSG:6.6:4326","EPSG:4326"],g;for(g=e.length-1;0<=g;--g)c(e[g],f);for(g=f.length-1;0<=g;--g)c(f[g],e)})();OpenLayers.Map=OpenLayers.Class({Z_INDEX_BASE:{BaseLayer:100,Overlay:325,Feature:725,Popup:750,Control:1E3},id:null,fractionalZoom:!1,events:null,allOverlays:!1,div:null,dragging:!1,size:null,viewPortDiv:null,layerContainerOrigin:null,layerContainerDiv:null,layers:null,controls:null,popups:null,baseLayer:null,center:null,resolution:null,zoom:0,panRatio:1.5,options:null,tileSize:null,projection:"EPSG:4326",units:null,resolutions:null,maxResolution:null,minResolution:null,maxScale:null,minScale:null,
+maxExtent:null,minExtent:null,restrictedExtent:null,numZoomLevels:16,theme:null,displayProjection:null,fallThrough:!1,autoUpdateSize:!0,eventListeners:null,panTween:null,panMethod:OpenLayers.Easing.Expo.easeOut,panDuration:50,zoomTween:null,zoomMethod:OpenLayers.Easing.Quad.easeOut,zoomDuration:20,paddingForPopups:null,layerContainerOriginPx:null,minPx:null,maxPx:null,initialize:function(a,b){1===arguments.length&&"object"===typeof a&&(a=(b=a)&&b.div);this.tileSize=new OpenLayers.Size(OpenLayers.Map.TILE_WIDTH,
+OpenLayers.Map.TILE_HEIGHT);this.paddingForPopups=new OpenLayers.Bounds(15,15,15,15);this.theme=OpenLayers._getScriptLocation()+"theme/default/style.css";this.options=OpenLayers.Util.extend({},b);OpenLayers.Util.extend(this,b);OpenLayers.Util.applyDefaults(this,OpenLayers.Projection.defaults[this.projection instanceof OpenLayers.Projection?this.projection.projCode:this.projection]);!this.maxExtent||this.maxExtent instanceof OpenLayers.Bounds||(this.maxExtent=new OpenLayers.Bounds(this.maxExtent));
+!this.minExtent||this.minExtent instanceof OpenLayers.Bounds||(this.minExtent=new OpenLayers.Bounds(this.minExtent));!this.restrictedExtent||this.restrictedExtent instanceof OpenLayers.Bounds||(this.restrictedExtent=new OpenLayers.Bounds(this.restrictedExtent));!this.center||this.center instanceof OpenLayers.LonLat||(this.center=new OpenLayers.LonLat(this.center));this.layers=[];this.id=OpenLayers.Util.createUniqueID("OpenLayers.Map_");this.div=OpenLayers.Util.getElement(a);this.div||(this.div=document.createElement("div"),
+this.div.style.height="1px",this.div.style.width="1px");OpenLayers.Element.addClass(this.div,"olMap");var c=this.id+"_OpenLayers_ViewPort";this.viewPortDiv=OpenLayers.Util.createDiv(c,null,null,null,"relative",null,"hidden");this.viewPortDiv.style.width="100%";this.viewPortDiv.style.height="100%";this.viewPortDiv.className="olMapViewport";this.div.appendChild(this.viewPortDiv);this.events=new OpenLayers.Events(this,this.viewPortDiv,null,this.fallThrough,{includeXY:!0});OpenLayers.TileManager&&null!==
+this.tileManager&&(this.tileManager instanceof OpenLayers.TileManager||(this.tileManager=new OpenLayers.TileManager(this.tileManager)),this.tileManager.addMap(this));c=this.id+"_OpenLayers_Container";this.layerContainerDiv=OpenLayers.Util.createDiv(c);this.layerContainerDiv.style.zIndex=this.Z_INDEX_BASE.Popup-1;this.layerContainerOriginPx={x:0,y:0};this.applyTransform();this.viewPortDiv.appendChild(this.layerContainerDiv);this.updateSize();if(this.eventListeners instanceof Object)this.events.on(this.eventListeners);
+!0===this.autoUpdateSize&&(this.updateSizeDestroy=OpenLayers.Function.bind(this.updateSize,this),OpenLayers.Event.observe(window,"resize",this.updateSizeDestroy));if(this.theme){for(var c=!0,d=document.getElementsByTagName("link"),e=0,f=d.length;e<f;++e)if(OpenLayers.Util.isEquivalentUrl(d.item(e).href,this.theme)){c=!1;break}c&&(c=document.createElement("link"),c.setAttribute("rel","stylesheet"),c.setAttribute("type","text/css"),c.setAttribute("href",this.theme),document.getElementsByTagName("head")[0].appendChild(c))}null==
+this.controls&&(this.controls=[],null!=OpenLayers.Control&&(OpenLayers.Control.Navigation?this.controls.push(new OpenLayers.Control.Navigation):OpenLayers.Control.TouchNavigation&&this.controls.push(new OpenLayers.Control.TouchNavigation),OpenLayers.Control.Zoom?this.controls.push(new OpenLayers.Control.Zoom):OpenLayers.Control.PanZoom&&this.controls.push(new OpenLayers.Control.PanZoom),OpenLayers.Control.ArgParser&&this.controls.push(new OpenLayers.Control.ArgParser),OpenLayers.Control.Attribution&&
+this.controls.push(new OpenLayers.Control.Attribution)));e=0;for(f=this.controls.length;e<f;e++)this.addControlToMap(this.controls[e]);this.popups=[];this.unloadDestroy=OpenLayers.Function.bind(this.destroy,this);OpenLayers.Event.observe(window,"unload",this.unloadDestroy);b&&b.layers&&(delete this.center,delete this.zoom,this.addLayers(b.layers),b.center&&!this.getCenter()&&this.setCenter(b.center,b.zoom));this.panMethod&&(this.panTween=new OpenLayers.Tween(this.panMethod));this.zoomMethod&&this.applyTransform.transform&&
+(this.zoomTween=new OpenLayers.Tween(this.zoomMethod))},getViewport:function(){return this.viewPortDiv},render:function(a){this.div=OpenLayers.Util.getElement(a);OpenLayers.Element.addClass(this.div,"olMap");this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);this.div.appendChild(this.viewPortDiv);this.updateSize()},unloadDestroy:null,updateSizeDestroy:null,destroy:function(){if(!this.unloadDestroy)return!1;this.panTween&&(this.panTween.stop(),this.panTween=null);this.zoomTween&&(this.zoomTween.stop(),
+this.zoomTween=null);OpenLayers.Event.stopObserving(window,"unload",this.unloadDestroy);this.unloadDestroy=null;this.updateSizeDestroy&&OpenLayers.Event.stopObserving(window,"resize",this.updateSizeDestroy);this.paddingForPopups=null;if(null!=this.controls){for(var a=this.controls.length-1;0<=a;--a)this.controls[a].destroy();this.controls=null}if(null!=this.layers){for(a=this.layers.length-1;0<=a;--a)this.layers[a].destroy(!1);this.layers=null}this.viewPortDiv&&this.viewPortDiv.parentNode&&this.viewPortDiv.parentNode.removeChild(this.viewPortDiv);
+this.viewPortDiv=null;this.tileManager&&(this.tileManager.removeMap(this),this.tileManager=null);this.eventListeners&&(this.events.un(this.eventListeners),this.eventListeners=null);this.events.destroy();this.options=this.events=null},setOptions:function(a){var b=this.minPx&&a.restrictedExtent!=this.restrictedExtent;OpenLayers.Util.extend(this,a);b&&this.moveTo(this.getCachedCenter(),this.zoom,{forceZoomChange:!0})},getTileSize:function(){return this.tileSize},getBy:function(a,b,c){var d="function"==
+typeof c.test;return OpenLayers.Array.filter(this[a],function(a){return a[b]==c||d&&c.test(a[b])})},getLayersBy:function(a,b){return this.getBy("layers",a,b)},getLayersByName:function(a){return this.getLayersBy("name",a)},getLayersByClass:function(a){return this.getLayersBy("CLASS_NAME",a)},getControlsBy:function(a,b){return this.getBy("controls",a,b)},getControlsByClass:function(a){return this.getControlsBy("CLASS_NAME",a)},getLayer:function(a){for(var b=null,c=0,d=this.layers.length;c<d;c++){var e=
+this.layers[c];if(e.id==a){b=e;break}}return b},setLayerZIndex:function(a,b){a.setZIndex(this.Z_INDEX_BASE[a.isBaseLayer?"BaseLayer":"Overlay"]+5*b)},resetLayersZIndex:function(){for(var a=0,b=this.layers.length;a<b;a++)this.setLayerZIndex(this.layers[a],a)},addLayer:function(a){for(var b=0,c=this.layers.length;b<c;b++)if(this.layers[b]==a)return!1;if(!1===this.events.triggerEvent("preaddlayer",{layer:a}))return!1;this.allOverlays&&(a.isBaseLayer=!1);a.div.className="olLayerDiv";a.div.style.overflow=
+"";this.setLayerZIndex(a,this.layers.length);a.isFixed?this.viewPortDiv.appendChild(a.div):this.layerContainerDiv.appendChild(a.div);this.layers.push(a);a.setMap(this);a.isBaseLayer||this.allOverlays&&!this.baseLayer?null==this.baseLayer?this.setBaseLayer(a):a.setVisibility(!1):a.redraw();this.events.triggerEvent("addlayer",{layer:a});a.events.triggerEvent("added",{map:this,layer:a});a.afterAdd();return!0},addLayers:function(a){for(var b=0,c=a.length;b<c;b++)this.addLayer(a[b])},removeLayer:function(a,
+b){if(!1!==this.events.triggerEvent("preremovelayer",{layer:a})){null==b&&(b=!0);a.isFixed?this.viewPortDiv.removeChild(a.div):this.layerContainerDiv.removeChild(a.div);OpenLayers.Util.removeItem(this.layers,a);a.removeMap(this);a.map=null;if(this.baseLayer==a&&(this.baseLayer=null,b))for(var c=0,d=this.layers.length;c<d;c++){var e=this.layers[c];if(e.isBaseLayer||this.allOverlays){this.setBaseLayer(e);break}}this.resetLayersZIndex();this.events.triggerEvent("removelayer",{layer:a});a.events.triggerEvent("removed",
+{map:this,layer:a})}},getNumLayers:function(){return this.layers.length},getLayerIndex:function(a){return OpenLayers.Util.indexOf(this.layers,a)},setLayerIndex:function(a,b){var c=this.getLayerIndex(a);0>b?b=0:b>this.layers.length&&(b=this.layers.length);if(c!=b){this.layers.splice(c,1);this.layers.splice(b,0,a);for(var c=0,d=this.layers.length;c<d;c++)this.setLayerZIndex(this.layers[c],c);this.events.triggerEvent("changelayer",{layer:a,property:"order"});this.allOverlays&&(0===b?this.setBaseLayer(a):
+this.baseLayer!==this.layers[0]&&this.setBaseLayer(this.layers[0]))}},raiseLayer:function(a,b){var c=this.getLayerIndex(a)+b;this.setLayerIndex(a,c)},setBaseLayer:function(a){if(a!=this.baseLayer&&-1!=OpenLayers.Util.indexOf(this.layers,a)){var b=this.getCachedCenter(),c=OpenLayers.Util.getResolutionFromScale(this.getScale(),a.units);null==this.baseLayer||this.allOverlays||this.baseLayer.setVisibility(!1);this.baseLayer=a;if(!this.allOverlays||this.baseLayer.visibility)this.baseLayer.setVisibility(!0),
+!1===this.baseLayer.inRange&&this.baseLayer.redraw();null!=b&&(a=this.getZoomForResolution(c||this.resolution,!0),this.setCenter(b,a,!1,!0));this.events.triggerEvent("changebaselayer",{layer:this.baseLayer})}},addControl:function(a,b){this.controls.push(a);this.addControlToMap(a,b)},addControls:function(a,b){for(var c=1===arguments.length?[]:b,d=0,e=a.length;d<e;d++)this.addControl(a[d],c[d]?c[d]:null)},addControlToMap:function(a,b){a.outsideViewport=null!=a.div;this.displayProjection&&!a.displayProjection&&
+(a.displayProjection=this.displayProjection);a.setMap(this);var c=a.draw(b);c&&!a.outsideViewport&&(c.style.zIndex=this.Z_INDEX_BASE.Control+this.controls.length,this.viewPortDiv.appendChild(c));a.autoActivate&&a.activate()},getControl:function(a){for(var b=null,c=0,d=this.controls.length;c<d;c++){var e=this.controls[c];if(e.id==a){b=e;break}}return b},removeControl:function(a){a&&a==this.getControl(a.id)&&(a.div&&a.div.parentNode==this.viewPortDiv&&this.viewPortDiv.removeChild(a.div),OpenLayers.Util.removeItem(this.controls,
+a))},addPopup:function(a,b){if(b)for(var c=this.popups.length-1;0<=c;--c)this.removePopup(this.popups[c]);a.map=this;this.popups.push(a);if(c=a.draw())c.style.zIndex=this.Z_INDEX_BASE.Popup+this.popups.length,this.layerContainerDiv.appendChild(c)},removePopup:function(a){OpenLayers.Util.removeItem(this.popups,a);if(a.div)try{this.layerContainerDiv.removeChild(a.div)}catch(b){}a.map=null},getSize:function(){var a=null;null!=this.size&&(a=this.size.clone());return a},updateSize:function(){var a=this.getCurrentSize();
+if(a&&!isNaN(a.h)&&!isNaN(a.w)){this.events.clearMouseCache();var b=this.getSize();null==b&&(this.size=b=a);if(!a.equals(b)){this.size=a;a=0;for(b=this.layers.length;a<b;a++)this.layers[a].onMapResize();a=this.getCachedCenter();null!=this.baseLayer&&null!=a&&(b=this.getZoom(),this.zoom=null,this.setCenter(a,b))}}this.events.triggerEvent("updatesize")},getCurrentSize:function(){var a=new OpenLayers.Size(this.div.clientWidth,this.div.clientHeight);if(0==a.w&&0==a.h||isNaN(a.w)&&isNaN(a.h))a.w=this.div.offsetWidth,
+a.h=this.div.offsetHeight;if(0==a.w&&0==a.h||isNaN(a.w)&&isNaN(a.h))a.w=parseInt(this.div.style.width),a.h=parseInt(this.div.style.height);return a},calculateBounds:function(a,b){var c=null;null==a&&(a=this.getCachedCenter());null==b&&(b=this.getResolution());if(null!=a&&null!=b)var c=this.size.w*b/2,d=this.size.h*b/2,c=new OpenLayers.Bounds(a.lon-c,a.lat-d,a.lon+c,a.lat+d);return c},getCenter:function(){var a=null,b=this.getCachedCenter();b&&(a=b.clone());return a},getCachedCenter:function(){!this.center&&
+this.size&&(this.center=this.getLonLatFromViewPortPx({x:this.size.w/2,y:this.size.h/2}));return this.center},getZoom:function(){return this.zoom},pan:function(a,b,c){c=OpenLayers.Util.applyDefaults(c,{animate:!0,dragging:!1});if(c.dragging)0==a&&0==b||this.moveByPx(a,b);else{var d=this.getViewPortPxFromLonLat(this.getCachedCenter());a=d.add(a,b);if(this.dragging||!a.equals(d))d=this.getLonLatFromViewPortPx(a),c.animate?this.panTo(d):(this.moveTo(d),this.dragging&&(this.dragging=!1,this.events.triggerEvent("moveend")))}},
+panTo:function(a){if(this.panTween&&this.getExtent().scale(this.panRatio).containsLonLat(a)){var b=this.getCachedCenter();if(!a.equals(b)){var b=this.getPixelFromLonLat(b),c=this.getPixelFromLonLat(a),d=0,e=0;this.panTween.start({x:0,y:0},{x:c.x-b.x,y:c.y-b.y},this.panDuration,{callbacks:{eachStep:OpenLayers.Function.bind(function(a){this.moveByPx(a.x-d,a.y-e);d=Math.round(a.x);e=Math.round(a.y)},this),done:OpenLayers.Function.bind(function(b){this.moveTo(a);this.dragging=!1;this.events.triggerEvent("moveend")},
+this)}})}}else this.setCenter(a)},setCenter:function(a,b,c,d){this.panTween&&this.panTween.stop();this.zoomTween&&this.zoomTween.stop();this.moveTo(a,b,{dragging:c,forceZoomChange:d})},moveByPx:function(a,b){var c=this.size.w/2,d=this.size.h/2,e=c+a,f=d+b,g=this.baseLayer.wrapDateLine,h=0,k=0;this.restrictedExtent&&(h=c,k=d,g=!1);a=g||e<=this.maxPx.x-h&&e>=this.minPx.x+h?Math.round(a):0;b=f<=this.maxPx.y-k&&f>=this.minPx.y+k?Math.round(b):0;if(a||b){this.dragging||(this.dragging=!0,this.events.triggerEvent("movestart"));
+this.center=null;a&&(this.layerContainerOriginPx.x-=a,this.minPx.x-=a,this.maxPx.x-=a);b&&(this.layerContainerOriginPx.y-=b,this.minPx.y-=b,this.maxPx.y-=b);this.applyTransform();d=0;for(e=this.layers.length;d<e;++d)c=this.layers[d],c.visibility&&(c===this.baseLayer||c.inRange)&&(c.moveByPx(a,b),c.events.triggerEvent("move"));this.events.triggerEvent("move")}},adjustZoom:function(a){if(this.baseLayer&&this.baseLayer.wrapDateLine){var b=this.baseLayer.resolutions,c=this.getMaxExtent().getWidth()/this.size.w;
+if(this.getResolutionForZoom(a)>c)if(this.fractionalZoom)a=this.getZoomForResolution(c);else for(var d=a|0,e=b.length;d<e;++d)if(b[d]<=c){a=d;break}}return a},getMinZoom:function(){return this.adjustZoom(0)},moveTo:function(a,b,c){null==a||a instanceof OpenLayers.LonLat||(a=new OpenLayers.LonLat(a));c||(c={});null!=b&&(b=parseFloat(b),this.fractionalZoom||(b=Math.round(b)));var d=b;b=this.adjustZoom(b);b!==d&&(a=this.getCenter());var d=c.dragging||this.dragging,e=c.forceZoomChange;this.getCachedCenter()||
+this.isValidLonLat(a)||(a=this.maxExtent.getCenterLonLat(),this.center=a.clone());if(null!=this.restrictedExtent){null==a&&(a=this.center);null==b&&(b=this.getZoom());var f=this.getResolutionForZoom(b),f=this.calculateBounds(a,f);if(!this.restrictedExtent.containsBounds(f)){var g=this.restrictedExtent.getCenterLonLat();f.getWidth()>this.restrictedExtent.getWidth()?a=new OpenLayers.LonLat(g.lon,a.lat):f.left<this.restrictedExtent.left?a=a.add(this.restrictedExtent.left-f.left,0):f.right>this.restrictedExtent.right&&
+(a=a.add(this.restrictedExtent.right-f.right,0));f.getHeight()>this.restrictedExtent.getHeight()?a=new OpenLayers.LonLat(a.lon,g.lat):f.bottom<this.restrictedExtent.bottom?a=a.add(0,this.restrictedExtent.bottom-f.bottom):f.top>this.restrictedExtent.top&&(a=a.add(0,this.restrictedExtent.top-f.top))}}e=e||this.isValidZoomLevel(b)&&b!=this.getZoom();f=this.isValidLonLat(a)&&!a.equals(this.center);if(e||f||d){d||this.events.triggerEvent("movestart",{zoomChanged:e});f&&(!e&&this.center&&this.centerLayerContainer(a),
+this.center=a.clone());a=e?this.getResolutionForZoom(b):this.getResolution();if(e||null==this.layerContainerOrigin){this.layerContainerOrigin=this.getCachedCenter();this.layerContainerOriginPx.x=0;this.layerContainerOriginPx.y=0;this.applyTransform();var f=this.getMaxExtent({restricted:!0}),h=f.getCenterLonLat(),g=this.center.lon-h.lon,h=h.lat-this.center.lat,k=Math.round(f.getWidth()/a),l=Math.round(f.getHeight()/a);this.minPx={x:(this.size.w-k)/2-g/a,y:(this.size.h-l)/2-h/a};this.maxPx={x:this.minPx.x+
+Math.round(f.getWidth()/a),y:this.minPx.y+Math.round(f.getHeight()/a)}}e&&(this.zoom=b,this.resolution=a);a=this.getExtent();this.baseLayer.visibility&&(this.baseLayer.moveTo(a,e,c.dragging),c.dragging||this.baseLayer.events.triggerEvent("moveend",{zoomChanged:e}));a=this.baseLayer.getExtent();for(b=this.layers.length-1;0<=b;--b)f=this.layers[b],f===this.baseLayer||f.isBaseLayer||(g=f.calculateInRange(),f.inRange!=g&&((f.inRange=g)||f.display(!1),this.events.triggerEvent("changelayer",{layer:f,property:"visibility"})),
+g&&f.visibility&&(f.moveTo(a,e,c.dragging),c.dragging||f.events.triggerEvent("moveend",{zoomChanged:e})));this.events.triggerEvent("move");d||this.events.triggerEvent("moveend");if(e){b=0;for(c=this.popups.length;b<c;b++)this.popups[b].updatePosition();this.events.triggerEvent("zoomend")}}},centerLayerContainer:function(a){var b=this.getViewPortPxFromLonLat(this.layerContainerOrigin),c=this.getViewPortPxFromLonLat(a);if(null!=b&&null!=c){var d=this.layerContainerOriginPx.x;a=this.layerContainerOriginPx.y;
+var e=Math.round(b.x-c.x),b=Math.round(b.y-c.y);this.applyTransform(this.layerContainerOriginPx.x=e,this.layerContainerOriginPx.y=b);d-=e;a-=b;this.minPx.x-=d;this.maxPx.x-=d;this.minPx.y-=a;this.maxPx.y-=a}},isValidZoomLevel:function(a){return null!=a&&0<=a&&a<this.getNumZoomLevels()},isValidLonLat:function(a){var b=!1;null!=a&&(b=this.getMaxExtent(),b=b.containsLonLat(a,{worldBounds:this.baseLayer.wrapDateLine&&b}));return b},getProjection:function(){var a=this.getProjectionObject();return a?a.getCode():
+null},getProjectionObject:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.projection);return a},getMaxResolution:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.maxResolution);return a},getMaxExtent:function(a){var b=null;a&&a.restricted&&this.restrictedExtent?b=this.restrictedExtent:null!=this.baseLayer&&(b=this.baseLayer.maxExtent);return b},getNumZoomLevels:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.numZoomLevels);return a},getExtent:function(){var a=
+null;null!=this.baseLayer&&(a=this.baseLayer.getExtent());return a},getResolution:function(){var a=null;null!=this.baseLayer?a=this.baseLayer.getResolution():!0===this.allOverlays&&0<this.layers.length&&(a=this.layers[0].getResolution());return a},getUnits:function(){var a=null;null!=this.baseLayer&&(a=this.baseLayer.units);return a},getScale:function(){var a=null;null!=this.baseLayer&&(a=this.getResolution(),a=OpenLayers.Util.getScaleFromResolution(a,this.baseLayer.units));return a},getZoomForExtent:function(a,
+b){var c=null;null!=this.baseLayer&&(c=this.baseLayer.getZoomForExtent(a,b));return c},getResolutionForZoom:function(a){var b=null;this.baseLayer&&(b=this.baseLayer.getResolutionForZoom(a));return b},getZoomForResolution:function(a,b){var c=null;null!=this.baseLayer&&(c=this.baseLayer.getZoomForResolution(a,b));return c},zoomTo:function(a,b){var c=this;if(c.isValidZoomLevel(a))if(c.baseLayer.wrapDateLine&&(a=c.adjustZoom(a)),c.zoomTween){var d=c.getResolution(),e=c.getResolutionForZoom(a),f={scale:1},
+d={scale:d/e};c.zoomTween.playing&&c.zoomTween.duration<3*c.zoomDuration?c.zoomTween.finish={scale:c.zoomTween.finish.scale*d.scale}:(b||(e=c.getSize(),b={x:e.w/2,y:e.h/2}),c.zoomTween.start(f,d,c.zoomDuration,{minFrameRate:50,callbacks:{eachStep:function(a){var d=c.layerContainerOriginPx;a=a.scale;c.applyTransform(d.x+((a-1)*(d.x-b.x)|0),d.y+((a-1)*(d.y-b.y)|0),a)},done:function(a){c.applyTransform();a=c.getResolution()/a.scale;var d=c.getZoomForResolution(a,!0);c.moveTo(c.getZoomTargetCenter(b,
+a),d,!0)}}}))}else f=b?c.getZoomTargetCenter(b,c.getResolutionForZoom(a)):null,c.setCenter(f,a)},zoomIn:function(){this.zoomTo(this.getZoom()+1)},zoomOut:function(){this.zoomTo(this.getZoom()-1)},zoomToExtent:function(a,b){a instanceof OpenLayers.Bounds||(a=new OpenLayers.Bounds(a));var c=a.getCenterLonLat();if(this.baseLayer.wrapDateLine){c=this.getMaxExtent();for(a=a.clone();a.right<a.left;)a.right+=c.getWidth();c=a.getCenterLonLat().wrapDateLine(c)}this.setCenter(c,this.getZoomForExtent(a,b))},
+zoomToMaxExtent:function(a){a=this.getMaxExtent({restricted:a?a.restricted:!0});this.zoomToExtent(a)},zoomToScale:function(a,b){var c=OpenLayers.Util.getResolutionFromScale(a,this.baseLayer.units),d=this.size.w*c/2,c=this.size.h*c/2,e=this.getCachedCenter(),d=new OpenLayers.Bounds(e.lon-d,e.lat-c,e.lon+d,e.lat+c);this.zoomToExtent(d,b)},getLonLatFromViewPortPx:function(a){var b=null;null!=this.baseLayer&&(b=this.baseLayer.getLonLatFromViewPortPx(a));return b},getViewPortPxFromLonLat:function(a){var b=
+null;null!=this.baseLayer&&(b=this.baseLayer.getViewPortPxFromLonLat(a));return b},getZoomTargetCenter:function(a,b){var c=null,d=this.getSize(),e=d.w/2-a.x,d=a.y-d.h/2,f=this.getLonLatFromPixel(a);f&&(c=new OpenLayers.LonLat(f.lon+e*b,f.lat+d*b));return c},getLonLatFromPixel:function(a){return this.getLonLatFromViewPortPx(a)},getPixelFromLonLat:function(a){a=this.getViewPortPxFromLonLat(a);a.x=Math.round(a.x);a.y=Math.round(a.y);return a},getGeodesicPixelSize:function(a){var b=a?this.getLonLatFromPixel(a):
+this.getCachedCenter()||new OpenLayers.LonLat(0,0),c=this.getResolution();a=b.add(-c/2,0);var d=b.add(c/2,0),e=b.add(0,-c/2),b=b.add(0,c/2),c=new OpenLayers.Projection("EPSG:4326"),f=this.getProjectionObject()||c;f.equals(c)||(a.transform(f,c),d.transform(f,c),e.transform(f,c),b.transform(f,c));return new OpenLayers.Size(OpenLayers.Util.distVincenty(a,d),OpenLayers.Util.distVincenty(e,b))},getViewPortPxFromLayerPx:function(a){var b=null;null!=a&&(b=a.add(this.layerContainerOriginPx.x,this.layerContainerOriginPx.y));
+return b},getLayerPxFromViewPortPx:function(a){var b=null;null!=a&&(b=a.add(-this.layerContainerOriginPx.x,-this.layerContainerOriginPx.y),isNaN(b.x)||isNaN(b.y))&&(b=null);return b},getLonLatFromLayerPx:function(a){a=this.getViewPortPxFromLayerPx(a);return this.getLonLatFromViewPortPx(a)},getLayerPxFromLonLat:function(a){a=this.getPixelFromLonLat(a);return this.getLayerPxFromViewPortPx(a)},applyTransform:function(a,b,c){c=c||1;var d=this.layerContainerOriginPx,e=1!==c;a=a||d.x;b=b||d.y;var f=this.layerContainerDiv.style,
+g=this.applyTransform.transform,h=this.applyTransform.template;if(void 0===g&&(g=OpenLayers.Util.vendorPrefix.style("transform"),this.applyTransform.transform=g)){var k=OpenLayers.Element.getStyle(this.viewPortDiv,OpenLayers.Util.vendorPrefix.css("transform"));k&&"none"===k||(h=["translate3d(",",0) ","scale3d(",",1)"],f[g]=[h[0],"0,0",h[1]].join(""));h&&~f[g].indexOf(h[0])||(h=["translate(",") ","scale(",")"]);this.applyTransform.template=h}null===g||"translate3d("!==h[0]&&!0!==e?(f.left=a+"px",f.top=
+b+"px",null!==g&&(f[g]="")):(!0===e&&"translate("===h[0]&&(a-=d.x,b-=d.y,f.left=d.x+"px",f.top=d.y+"px"),f[g]=[h[0],a,"px,",b,"px",h[1],h[2],c,",",c,h[3]].join(""))},CLASS_NAME:"OpenLayers.Map"});OpenLayers.Map.TILE_WIDTH=256;OpenLayers.Map.TILE_HEIGHT=256;OpenLayers.Handler=OpenLayers.Class({id:null,control:null,map:null,keyMask:null,active:!1,evt:null,touch:!1,initialize:function(a,b,c){OpenLayers.Util.extend(this,c);this.control=a;this.callbacks=b;(a=this.map||a.map)&&this.setMap(a);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},setMap:function(a){this.map=a},checkModifiers:function(a){return null==this.keyMask?!0:((a.shiftKey?OpenLayers.Handler.MOD_SHIFT:0)|(a.ctrlKey?OpenLayers.Handler.MOD_CTRL:0)|(a.altKey?OpenLayers.Handler.MOD_ALT:
+0)|(a.metaKey?OpenLayers.Handler.MOD_META:0))==this.keyMask},activate:function(){if(this.active)return!1;for(var a=OpenLayers.Events.prototype.BROWSER_EVENTS,b=0,c=a.length;b<c;b++)this[a[b]]&&this.register(a[b],this[a[b]]);return this.active=!0},deactivate:function(){if(!this.active)return!1;for(var a=OpenLayers.Events.prototype.BROWSER_EVENTS,b=0,c=a.length;b<c;b++)this[a[b]]&&this.unregister(a[b],this[a[b]]);this.active=this.touch=!1;return!0},startTouch:function(){if(!this.touch){this.touch=!0;
+for(var a="mousedown mouseup mousemove click dblclick mouseout".split(" "),b=0,c=a.length;b<c;b++)this[a[b]]&&this.unregister(a[b],this[a[b]])}},callback:function(a,b){a&&this.callbacks[a]&&this.callbacks[a].apply(this.control,b)},register:function(a,b){this.map.events.registerPriority(a,this,b);this.map.events.registerPriority(a,this,this.setEvent)},unregister:function(a,b){this.map.events.unregister(a,this,b);this.map.events.unregister(a,this,this.setEvent)},setEvent:function(a){this.evt=a;return!0},
+destroy:function(){this.deactivate();this.control=this.map=null},CLASS_NAME:"OpenLayers.Handler"});OpenLayers.Handler.MOD_NONE=0;OpenLayers.Handler.MOD_SHIFT=1;OpenLayers.Handler.MOD_CTRL=2;OpenLayers.Handler.MOD_ALT=4;OpenLayers.Handler.MOD_META=8;OpenLayers.Handler.Click=OpenLayers.Class(OpenLayers.Handler,{delay:300,single:!0,"double":!1,pixelTolerance:0,dblclickTolerance:13,stopSingle:!1,stopDouble:!1,timerId:null,down:null,last:null,first:null,rightclickTimerId:null,touchstart:function(a){this.startTouch();this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},touchmove:function(a){this.last=this.getEventInfo(a);return!0},touchend:function(a){this.down&&(a.xy=this.last.xy,a.lastTouches=this.last.touches,this.handleSingle(a),
+this.down=null);return!0},mousedown:function(a){this.down=this.getEventInfo(a);this.last=this.getEventInfo(a);return!0},mouseup:function(a){var b=!0;this.checkModifiers(a)&&(this.control.handleRightClicks&&OpenLayers.Event.isRightClick(a))&&(b=this.rightclick(a));return b},rightclick:function(a){if(this.passesTolerance(a)){if(null!=this.rightclickTimerId)return this.clearTimer(),this.callback("dblrightclick",[a]),!this.stopDouble;a=this["double"]?OpenLayers.Util.extend({},a):this.callback("rightclick",
+[a]);a=OpenLayers.Function.bind(this.delayedRightCall,this,a);this.rightclickTimerId=window.setTimeout(a,this.delay)}return!this.stopSingle},delayedRightCall:function(a){this.rightclickTimerId=null;a&&this.callback("rightclick",[a])},click:function(a){this.last||(this.last=this.getEventInfo(a));this.handleSingle(a);return!this.stopSingle},dblclick:function(a){this.handleDouble(a);return!this.stopDouble},handleDouble:function(a){this.passesDblclickTolerance(a)&&(this["double"]&&this.callback("dblclick",
+[a]),this.clearTimer())},handleSingle:function(a){this.passesTolerance(a)&&(null!=this.timerId?(this.last.touches&&1===this.last.touches.length&&(this["double"]&&OpenLayers.Event.preventDefault(a),this.handleDouble(a)),this.last.touches&&2===this.last.touches.length||this.clearTimer()):(this.first=this.getEventInfo(a),a=this.single?OpenLayers.Util.extend({},a):null,this.queuePotentialClick(a)))},queuePotentialClick:function(a){this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,
+this,a),this.delay)},passesTolerance:function(a){var b=!0;if(null!=this.pixelTolerance&&this.down&&this.down.xy&&(b=this.pixelTolerance>=this.down.xy.distanceTo(a.xy))&&this.touch&&this.down.touches.length===this.last.touches.length){a=0;for(var c=this.down.touches.length;a<c;++a)if(this.getTouchDistance(this.down.touches[a],this.last.touches[a])>this.pixelTolerance){b=!1;break}}return b},getTouchDistance:function(a,b){return Math.sqrt(Math.pow(a.clientX-b.clientX,2)+Math.pow(a.clientY-b.clientY,
+2))},passesDblclickTolerance:function(a){a=!0;this.down&&this.first&&(a=this.down.xy.distanceTo(this.first.xy)<=this.dblclickTolerance);return a},clearTimer:function(){null!=this.timerId&&(window.clearTimeout(this.timerId),this.timerId=null);null!=this.rightclickTimerId&&(window.clearTimeout(this.rightclickTimerId),this.rightclickTimerId=null)},delayedCall:function(a){this.timerId=null;a&&this.callback("click",[a])},getEventInfo:function(a){var b;if(a.touches){var c=a.touches.length;b=Array(c);for(var d,
+e=0;e<c;e++)d=a.touches[e],b[e]={clientX:d.olClientX,clientY:d.olClientY}}return{xy:a.xy,touches:b}},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.clearTimer(),this.last=this.first=this.down=null,a=!0);return a},CLASS_NAME:"OpenLayers.Handler.Click"});OpenLayers.Handler.Drag=OpenLayers.Class(OpenLayers.Handler,{started:!1,stopDown:!0,dragging:!1,last:null,start:null,lastMoveEvt:null,oldOnselectstart:null,interval:0,timeoutId:null,documentDrag:!1,documentEvents:null,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);if(!0===this.documentDrag){var d=this;this._docMove=function(a){d.mousemove({xy:{x:a.clientX,y:a.clientY},element:document})};this._docUp=function(a){d.mouseup({xy:{x:a.clientX,y:a.clientY}})}}},
+dragstart:function(a){var b=!0;this.dragging=!1;this.checkModifiers(a)&&(OpenLayers.Event.isLeftClick(a)||OpenLayers.Event.isSingleTouch(a))?(this.started=!0,this.last=this.start=a.xy,OpenLayers.Element.addClass(this.map.viewPortDiv,"olDragDown"),this.down(a),this.callback("down",[a.xy]),OpenLayers.Event.preventDefault(a),this.oldOnselectstart||(this.oldOnselectstart=document.onselectstart?document.onselectstart:OpenLayers.Function.True),document.onselectstart=OpenLayers.Function.False,b=!this.stopDown):
+(this.started=!1,this.last=this.start=null);return b},dragmove:function(a){this.lastMoveEvt=a;!this.started||(this.timeoutId||a.xy.x==this.last.x&&a.xy.y==this.last.y)||(!0===this.documentDrag&&this.documentEvents&&(a.element===document?(this.adjustXY(a),this.setEvent(a)):this.removeDocumentEvents()),0<this.interval&&(this.timeoutId=setTimeout(OpenLayers.Function.bind(this.removeTimeout,this),this.interval)),this.dragging=!0,this.move(a),this.callback("move",[a.xy]),this.oldOnselectstart||(this.oldOnselectstart=
+document.onselectstart,document.onselectstart=OpenLayers.Function.False),this.last=a.xy);return!0},dragend:function(a){if(this.started){!0===this.documentDrag&&this.documentEvents&&(this.adjustXY(a),this.removeDocumentEvents());var b=this.start!=this.last;this.dragging=this.started=!1;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.up(a);this.callback("up",[a.xy]);b&&this.callback("done",[a.xy]);document.onselectstart=this.oldOnselectstart}return!0},down:function(a){},move:function(a){},
+up:function(a){},out:function(a){},mousedown:function(a){return this.dragstart(a)},touchstart:function(a){this.startTouch();return this.dragstart(a)},mousemove:function(a){return this.dragmove(a)},touchmove:function(a){return this.dragmove(a)},removeTimeout:function(){this.timeoutId=null;this.dragging&&this.mousemove(this.lastMoveEvt)},mouseup:function(a){return this.dragend(a)},touchend:function(a){a.xy=this.last;return this.dragend(a)},mouseout:function(a){if(this.started&&OpenLayers.Util.mouseLeft(a,
+this.map.viewPortDiv))if(!0===this.documentDrag)this.addDocumentEvents();else{var b=this.start!=this.last;this.dragging=this.started=!1;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown");this.out(a);this.callback("out",[]);b&&this.callback("done",[a.xy]);document.onselectstart&&(document.onselectstart=this.oldOnselectstart)}return!0},click:function(a){return this.start==this.last},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.dragging=
+!1,a=!0);return a},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.dragging=this.started=!1,this.last=this.start=null,a=!0,OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDragDown"));return a},adjustXY:function(a){var b=OpenLayers.Util.pagePosition(this.map.viewPortDiv);a.xy.x-=b[0];a.xy.y-=b[1]},addDocumentEvents:function(){OpenLayers.Element.addClass(document.body,"olDragDown");this.documentEvents=!0;OpenLayers.Event.observe(document,"mousemove",
+this._docMove);OpenLayers.Event.observe(document,"mouseup",this._docUp)},removeDocumentEvents:function(){OpenLayers.Element.removeClass(document.body,"olDragDown");this.documentEvents=!1;OpenLayers.Event.stopObserving(document,"mousemove",this._docMove);OpenLayers.Event.stopObserving(document,"mouseup",this._docUp)},CLASS_NAME:"OpenLayers.Handler.Drag"});OpenLayers.Control.OverviewMap=OpenLayers.Class(OpenLayers.Control,{element:null,ovmap:null,size:{w:180,h:90},layers:null,minRectSize:15,minRectDisplayClass:"RectReplacement",minRatio:8,maxRatio:32,mapOptions:null,autoPan:!1,handlers:null,resolutionFactor:1,maximized:!1,maximizeTitle:"",minimizeTitle:"",initialize:function(a){this.layers=[];this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,[a])},destroy:function(){this.mapDiv&&(this.handlers.click&&this.handlers.click.destroy(),
+this.handlers.drag&&this.handlers.drag.destroy(),this.ovmap&&this.ovmap.viewPortDiv.removeChild(this.extentRectangle),this.extentRectangle=null,this.rectEvents&&(this.rectEvents.destroy(),this.rectEvents=null),this.ovmap&&(this.ovmap.destroy(),this.ovmap=null),this.element.removeChild(this.mapDiv),this.mapDiv=null,this.div.removeChild(this.element),this.element=null,this.maximizeDiv&&(this.div.removeChild(this.maximizeDiv),this.maximizeDiv=null),this.minimizeDiv&&(this.div.removeChild(this.minimizeDiv),
+this.minimizeDiv=null),this.map.events.un({buttonclick:this.onButtonClick,moveend:this.update,changebaselayer:this.baseLayerDraw,scope:this}),OpenLayers.Control.prototype.destroy.apply(this,arguments))},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(0===this.layers.length)if(this.map.baseLayer)this.layers=[this.map.baseLayer.clone()];else return this.map.events.register("changebaselayer",this,this.baseLayerDraw),this.div;this.element=document.createElement("div");this.element.className=
+this.displayClass+"Element";this.element.style.display="none";this.mapDiv=document.createElement("div");this.mapDiv.style.width=this.size.w+"px";this.mapDiv.style.height=this.size.h+"px";this.mapDiv.style.position="relative";this.mapDiv.style.overflow="hidden";this.mapDiv.id=OpenLayers.Util.createUniqueID("overviewMap");this.extentRectangle=document.createElement("div");this.extentRectangle.style.position="absolute";this.extentRectangle.style.zIndex=1E3;this.extentRectangle.className=this.displayClass+
+"ExtentRectangle";this.element.appendChild(this.mapDiv);this.div.appendChild(this.element);if(this.outsideViewport)this.element.style.display="";else{this.div.className+=" "+this.displayClass+"Container";var a=OpenLayers.Util.getImageLocation("layer-switcher-maximize.png");this.maximizeDiv=OpenLayers.Util.createAlphaImageDiv(this.displayClass+"MaximizeButton",null,null,a,"absolute");this.maximizeDiv.style.display="none";this.maximizeDiv.className=this.displayClass+"MaximizeButton olButton";this.maximizeTitle&&
+(this.maximizeDiv.title=this.maximizeTitle);this.div.appendChild(this.maximizeDiv);a=OpenLayers.Util.getImageLocation("layer-switcher-minimize.png");this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_minimizeDiv",null,null,a,"absolute");this.minimizeDiv.style.display="none";this.minimizeDiv.className=this.displayClass+"MinimizeButton olButton";this.minimizeTitle&&(this.minimizeDiv.title=this.minimizeTitle);this.div.appendChild(this.minimizeDiv);this.minimizeControl()}this.map.getExtent()&&
+this.update();this.map.events.on({buttonclick:this.onButtonClick,moveend:this.update,scope:this});this.maximized&&this.maximizeControl();return this.div},baseLayerDraw:function(){this.draw();this.map.events.unregister("changebaselayer",this,this.baseLayerDraw)},rectDrag:function(a){var b=this.handlers.drag.last.x-a.x,c=this.handlers.drag.last.y-a.y;if(0!=b||0!=c){var d=this.rectPxBounds.top,e=this.rectPxBounds.left;a=Math.abs(this.rectPxBounds.getHeight());var f=this.rectPxBounds.getWidth(),c=Math.max(0,
+d-c),c=Math.min(c,this.ovmap.size.h-this.hComp-a),b=Math.max(0,e-b),b=Math.min(b,this.ovmap.size.w-this.wComp-f);this.setRectPxBounds(new OpenLayers.Bounds(b,c+a,b+f,c))}},mapDivClick:function(a){var b=this.rectPxBounds.getCenterPixel(),c=a.xy.x-b.x,d=a.xy.y-b.y,e=this.rectPxBounds.top,f=this.rectPxBounds.left;a=Math.abs(this.rectPxBounds.getHeight());b=this.rectPxBounds.getWidth();d=Math.max(0,e+d);d=Math.min(d,this.ovmap.size.h-a);c=Math.max(0,f+c);c=Math.min(c,this.ovmap.size.w-b);this.setRectPxBounds(new OpenLayers.Bounds(c,
+d+a,c+b,d));this.updateMapToRect()},onButtonClick:function(a){a.buttonElement===this.minimizeDiv?this.minimizeControl():a.buttonElement===this.maximizeDiv&&this.maximizeControl()},maximizeControl:function(a){this.element.style.display="";this.showToggle(!1);null!=a&&OpenLayers.Event.stop(a)},minimizeControl:function(a){this.element.style.display="none";this.showToggle(!0);null!=a&&OpenLayers.Event.stop(a)},showToggle:function(a){this.maximizeDiv&&(this.maximizeDiv.style.display=a?"":"none");this.minimizeDiv&&
+(this.minimizeDiv.style.display=a?"none":"")},update:function(){null==this.ovmap&&this.createMap();!this.autoPan&&this.isSuitableOverview()||this.updateOverview();this.updateRectToMap()},isSuitableOverview:function(){var a=this.map.getExtent(),b=this.map.getMaxExtent(),a=new OpenLayers.Bounds(Math.max(a.left,b.left),Math.max(a.bottom,b.bottom),Math.min(a.right,b.right),Math.min(a.top,b.top));this.ovmap.getProjection()!=this.map.getProjection()&&(a=a.transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject()));
+b=this.ovmap.getResolution()/this.map.getResolution();return b>this.minRatio&&b<=this.maxRatio&&this.ovmap.getExtent().containsBounds(a)},updateOverview:function(){var a=this.map.getResolution(),b=this.ovmap.getResolution(),c=b/a;c>this.maxRatio?b=this.minRatio*a:c<=this.minRatio&&(b=this.maxRatio*a);this.ovmap.getProjection()!=this.map.getProjection()?(a=this.map.center.clone(),a.transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject())):a=this.map.center;this.ovmap.setCenter(a,
+this.ovmap.getZoomForResolution(b*this.resolutionFactor));this.updateRectToMap()},createMap:function(){var a=OpenLayers.Util.extend({controls:[],maxResolution:"auto",fallThrough:!1},this.mapOptions);this.ovmap=new OpenLayers.Map(this.mapDiv,a);this.ovmap.viewPortDiv.appendChild(this.extentRectangle);OpenLayers.Event.stopObserving(window,"unload",this.ovmap.unloadDestroy);this.ovmap.addLayers(this.layers);this.ovmap.zoomToMaxExtent();this.wComp=(this.wComp=parseInt(OpenLayers.Element.getStyle(this.extentRectangle,
+"border-left-width"))+parseInt(OpenLayers.Element.getStyle(this.extentRectangle,"border-right-width")))?this.wComp:2;this.hComp=(this.hComp=parseInt(OpenLayers.Element.getStyle(this.extentRectangle,"border-top-width"))+parseInt(OpenLayers.Element.getStyle(this.extentRectangle,"border-bottom-width")))?this.hComp:2;this.handlers.drag=new OpenLayers.Handler.Drag(this,{move:this.rectDrag,done:this.updateMapToRect},{map:this.ovmap});this.handlers.click=new OpenLayers.Handler.Click(this,{click:this.mapDivClick},
+{single:!0,"double":!1,stopSingle:!0,stopDouble:!0,pixelTolerance:1,map:this.ovmap});this.handlers.click.activate();this.rectEvents=new OpenLayers.Events(this,this.extentRectangle,null,!0);this.rectEvents.register("mouseover",this,function(a){this.handlers.drag.active||this.map.dragging||this.handlers.drag.activate()});this.rectEvents.register("mouseout",this,function(a){this.handlers.drag.dragging||this.handlers.drag.deactivate()});if(this.ovmap.getProjection()!=this.map.getProjection()){var a=this.map.getProjectionObject().getUnits()||
+this.map.units||this.map.baseLayer.units,b=this.ovmap.getProjectionObject().getUnits()||this.ovmap.units||this.ovmap.baseLayer.units;this.resolutionFactor=a&&b?OpenLayers.INCHES_PER_UNIT[a]/OpenLayers.INCHES_PER_UNIT[b]:1}},updateRectToMap:function(){var a;a=this.ovmap.getProjection()!=this.map.getProjection()?this.map.getExtent().transform(this.map.getProjectionObject(),this.ovmap.getProjectionObject()):this.map.getExtent();(a=this.getRectBoundsFromMapBounds(a))&&this.setRectPxBounds(a)},updateMapToRect:function(){var a=
+this.getMapBoundsFromRectBounds(this.rectPxBounds);this.ovmap.getProjection()!=this.map.getProjection()&&(a=a.transform(this.ovmap.getProjectionObject(),this.map.getProjectionObject()));this.map.panTo(a.getCenterLonLat())},setRectPxBounds:function(a){var b=Math.max(a.top,0),c=Math.max(a.left,0),d=Math.min(a.top+Math.abs(a.getHeight()),this.ovmap.size.h-this.hComp);a=Math.min(a.left+a.getWidth(),this.ovmap.size.w-this.wComp);var e=Math.max(a-c,0),f=Math.max(d-b,0);e<this.minRectSize||f<this.minRectSize?
+(this.extentRectangle.className=this.displayClass+this.minRectDisplayClass,e=c+e/2-this.minRectSize/2,this.extentRectangle.style.top=Math.round(b+f/2-this.minRectSize/2)+"px",this.extentRectangle.style.left=Math.round(e)+"px",this.extentRectangle.style.height=this.minRectSize+"px",this.extentRectangle.style.width=this.minRectSize+"px"):(this.extentRectangle.className=this.displayClass+"ExtentRectangle",this.extentRectangle.style.top=Math.round(b)+"px",this.extentRectangle.style.left=Math.round(c)+
+"px",this.extentRectangle.style.height=Math.round(f)+"px",this.extentRectangle.style.width=Math.round(e)+"px");this.rectPxBounds=new OpenLayers.Bounds(Math.round(c),Math.round(d),Math.round(a),Math.round(b))},getRectBoundsFromMapBounds:function(a){var b=this.getOverviewPxFromLonLat({lon:a.left,lat:a.bottom});a=this.getOverviewPxFromLonLat({lon:a.right,lat:a.top});var c=null;b&&a&&(c=new OpenLayers.Bounds(b.x,b.y,a.x,a.y));return c},getMapBoundsFromRectBounds:function(a){var b=this.getLonLatFromOverviewPx({x:a.left,
+y:a.bottom});a=this.getLonLatFromOverviewPx({x:a.right,y:a.top});return new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat)},getLonLatFromOverviewPx:function(a){var b=this.ovmap.size,c=this.ovmap.getResolution(),d=this.ovmap.getExtent().getCenterLonLat();return{lon:d.lon+(a.x-b.w/2)*c,lat:d.lat-(a.y-b.h/2)*c}},getOverviewPxFromLonLat:function(a){var b=this.ovmap.getResolution(),c=this.ovmap.getExtent();if(c)return{x:Math.round(1/b*(a.lon-c.left)),y:Math.round(1/b*(c.top-a.lat))}},CLASS_NAME:"OpenLayers.Control.OverviewMap"});OpenLayers.Layer=OpenLayers.Class({id:null,name:null,div:null,opacity:1,alwaysInRange:null,RESOLUTION_PROPERTIES:"scales resolutions maxScale minScale maxResolution minResolution numZoomLevels maxZoomLevel".split(" "),events:null,map:null,isBaseLayer:!1,alpha:!1,displayInLayerSwitcher:!0,visibility:!0,attribution:null,inRange:!1,imageSize:null,options:null,eventListeners:null,gutter:0,projection:null,units:null,scales:null,resolutions:null,maxExtent:null,minExtent:null,maxResolution:null,minResolution:null,
+numZoomLevels:null,minScale:null,maxScale:null,displayOutsideMaxExtent:!1,wrapDateLine:!1,metadata:null,initialize:function(a,b){this.metadata={};b=OpenLayers.Util.extend({},b);null!=this.alwaysInRange&&(b.alwaysInRange=this.alwaysInRange);this.addOptions(b);this.name=a;if(null==this.id&&(this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_"),this.div=OpenLayers.Util.createDiv(this.id),this.div.style.width="100%",this.div.style.height="100%",this.div.dir="ltr",this.events=new OpenLayers.Events(this,
+this.div),this.eventListeners instanceof Object))this.events.on(this.eventListeners)},destroy:function(a){null==a&&(a=!0);null!=this.map&&this.map.removeLayer(this,a);this.options=this.div=this.name=this.map=this.projection=null;this.events&&(this.eventListeners&&this.events.un(this.eventListeners),this.events.destroy());this.events=this.eventListeners=null},clone:function(a){null==a&&(a=new OpenLayers.Layer(this.name,this.getOptions()));OpenLayers.Util.applyDefaults(a,this);a.map=null;return a},
+getOptions:function(){var a={},b;for(b in this.options)a[b]=this[b];return a},setName:function(a){a!=this.name&&(this.name=a,null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"name"}))},addOptions:function(a,b){null==this.options&&(this.options={});a&&("string"==typeof a.projection&&(a.projection=new OpenLayers.Projection(a.projection)),a.projection&&OpenLayers.Util.applyDefaults(a,OpenLayers.Projection.defaults[a.projection.getCode()]),!a.maxExtent||a.maxExtent instanceof
+OpenLayers.Bounds||(a.maxExtent=new OpenLayers.Bounds(a.maxExtent)),!a.minExtent||a.minExtent instanceof OpenLayers.Bounds||(a.minExtent=new OpenLayers.Bounds(a.minExtent)));OpenLayers.Util.extend(this.options,a);OpenLayers.Util.extend(this,a);this.projection&&this.projection.getUnits()&&(this.units=this.projection.getUnits());if(this.map){var c=this.map.getResolution(),d=this.RESOLUTION_PROPERTIES.concat(["projection","units","minExtent","maxExtent"]),e;for(e in a)if(a.hasOwnProperty(e)&&0<=OpenLayers.Util.indexOf(d,
+e)){this.initResolutions();b&&this.map.baseLayer===this&&(this.map.setCenter(this.map.getCenter(),this.map.getZoomForResolution(c),!1,!0),this.map.events.triggerEvent("changebaselayer",{layer:this}));break}}},onMapResize:function(){},redraw:function(){var a=!1;if(this.map){this.inRange=this.calculateInRange();var b=this.getExtent();b&&(this.inRange&&this.visibility)&&(this.moveTo(b,!0,!1),this.events.triggerEvent("moveend",{zoomChanged:!0}),a=!0)}return a},moveTo:function(a,b,c){a=this.visibility;
+this.isBaseLayer||(a=a&&this.inRange);this.display(a)},moveByPx:function(a,b){},setMap:function(a){null==this.map&&(this.map=a,this.maxExtent=this.maxExtent||this.map.maxExtent,this.minExtent=this.minExtent||this.map.minExtent,this.projection=this.projection||this.map.projection,"string"==typeof this.projection&&(this.projection=new OpenLayers.Projection(this.projection)),this.units=this.projection.getUnits()||this.units||this.map.units,this.initResolutions(),this.isBaseLayer||(this.inRange=this.calculateInRange(),
+this.div.style.display=this.visibility&&this.inRange?"":"none"),this.setTileSize())},afterAdd:function(){},removeMap:function(a){},getImageSize:function(a){return this.imageSize||this.tileSize},setTileSize:function(a){this.tileSize=a=a?a:this.tileSize?this.tileSize:this.map.getTileSize();this.gutter&&(this.imageSize=new OpenLayers.Size(a.w+2*this.gutter,a.h+2*this.gutter))},getVisibility:function(){return this.visibility},setVisibility:function(a){a!=this.visibility&&(this.visibility=a,this.display(a),
+this.redraw(),null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"visibility"}),this.events.triggerEvent("visibilitychanged"))},display:function(a){a!=("none"!=this.div.style.display)&&(this.div.style.display=a&&this.calculateInRange()?"block":"none")},calculateInRange:function(){var a=!1;this.alwaysInRange?a=!0:this.map&&(a=this.map.getResolution(),a=a>=this.minResolution&&a<=this.maxResolution);return a},setIsBaseLayer:function(a){a!=this.isBaseLayer&&(this.isBaseLayer=
+a,null!=this.map&&this.map.events.triggerEvent("changebaselayer",{layer:this}))},initResolutions:function(){var a,b,c,d={},e=!0;a=0;for(b=this.RESOLUTION_PROPERTIES.length;a<b;a++)c=this.RESOLUTION_PROPERTIES[a],d[c]=this.options[c],e&&this.options[c]&&(e=!1);null==this.options.alwaysInRange&&(this.alwaysInRange=e);null==d.resolutions&&(d.resolutions=this.resolutionsFromScales(d.scales));null==d.resolutions&&(d.resolutions=this.calculateResolutions(d));if(null==d.resolutions){a=0;for(b=this.RESOLUTION_PROPERTIES.length;a<
+b;a++)c=this.RESOLUTION_PROPERTIES[a],d[c]=null!=this.options[c]?this.options[c]:this.map[c];null==d.resolutions&&(d.resolutions=this.resolutionsFromScales(d.scales));null==d.resolutions&&(d.resolutions=this.calculateResolutions(d))}var f;this.options.maxResolution&&"auto"!==this.options.maxResolution&&(f=this.options.maxResolution);this.options.minScale&&(f=OpenLayers.Util.getResolutionFromScale(this.options.minScale,this.units));var g;this.options.minResolution&&"auto"!==this.options.minResolution&&
+(g=this.options.minResolution);this.options.maxScale&&(g=OpenLayers.Util.getResolutionFromScale(this.options.maxScale,this.units));d.resolutions&&(d.resolutions.sort(function(a,b){return b-a}),f||(f=d.resolutions[0]),g||(g=d.resolutions[d.resolutions.length-1]));if(this.resolutions=d.resolutions){b=this.resolutions.length;this.scales=Array(b);for(a=0;a<b;a++)this.scales[a]=OpenLayers.Util.getScaleFromResolution(this.resolutions[a],this.units);this.numZoomLevels=b}if(this.minResolution=g)this.maxScale=
+OpenLayers.Util.getScaleFromResolution(g,this.units);if(this.maxResolution=f)this.minScale=OpenLayers.Util.getScaleFromResolution(f,this.units)},resolutionsFromScales:function(a){if(null!=a){var b,c,d;d=a.length;b=Array(d);for(c=0;c<d;c++)b[c]=OpenLayers.Util.getResolutionFromScale(a[c],this.units);return b}},calculateResolutions:function(a){var b,c,d=a.maxResolution;null!=a.minScale?d=OpenLayers.Util.getResolutionFromScale(a.minScale,this.units):"auto"==d&&null!=this.maxExtent&&(b=this.map.getSize(),
+c=this.maxExtent.getWidth()/b.w,b=this.maxExtent.getHeight()/b.h,d=Math.max(c,b));c=a.minResolution;null!=a.maxScale?c=OpenLayers.Util.getResolutionFromScale(a.maxScale,this.units):"auto"==a.minResolution&&null!=this.minExtent&&(b=this.map.getSize(),c=this.minExtent.getWidth()/b.w,b=this.minExtent.getHeight()/b.h,c=Math.max(c,b));"number"!==typeof d&&("number"!==typeof c&&null!=this.maxExtent)&&(d=this.map.getTileSize(),d=Math.max(this.maxExtent.getWidth()/d.w,this.maxExtent.getHeight()/d.h));b=a.maxZoomLevel;
+a=a.numZoomLevels;"number"===typeof c&&"number"===typeof d&&void 0===a?a=Math.floor(Math.log(d/c)/Math.log(2))+1:void 0===a&&null!=b&&(a=b+1);if(!("number"!==typeof a||0>=a||"number"!==typeof d&&"number"!==typeof c)){b=Array(a);var e=2;"number"==typeof c&&"number"==typeof d&&(e=Math.pow(d/c,1/(a-1)));var f;if("number"===typeof d)for(f=0;f<a;f++)b[f]=d/Math.pow(e,f);else for(f=0;f<a;f++)b[a-1-f]=c*Math.pow(e,f);return b}},getResolution:function(){var a=this.map.getZoom();return this.getResolutionForZoom(a)},
+getExtent:function(){return this.map.calculateBounds()},getZoomForExtent:function(a,b){var c=this.map.getSize(),c=Math.max(a.getWidth()/c.w,a.getHeight()/c.h);return this.getZoomForResolution(c,b)},getDataExtent:function(){},getResolutionForZoom:function(a){a=Math.max(0,Math.min(a,this.resolutions.length-1));if(this.map.fractionalZoom){var b=Math.floor(a),c=Math.ceil(a);a=this.resolutions[b]-(a-b)*(this.resolutions[b]-this.resolutions[c])}else a=this.resolutions[Math.round(a)];return a},getZoomForResolution:function(a,
+b){var c,d;if(this.map.fractionalZoom){var e=0,f=this.resolutions[e],g=this.resolutions[this.resolutions.length-1],h;c=0;for(d=this.resolutions.length;c<d;++c)if(h=this.resolutions[c],h>=a&&(f=h,e=c),h<=a){g=h;break}c=f-g;c=0<c?e+(f-a)/c:e}else{f=Number.POSITIVE_INFINITY;c=0;for(d=this.resolutions.length;c<d;c++)if(b){e=Math.abs(this.resolutions[c]-a);if(e>f)break;f=e}else if(this.resolutions[c]<a)break;c=Math.max(0,c-1)}return c},getLonLatFromViewPortPx:function(a){var b=null,c=this.map;if(null!=
+a&&c.minPx){var b=c.getResolution(),d=c.getMaxExtent({restricted:!0}),b=new OpenLayers.LonLat((a.x-c.minPx.x)*b+d.left,(c.minPx.y-a.y)*b+d.top);this.wrapDateLine&&(b=b.wrapDateLine(this.maxExtent))}return b},getViewPortPxFromLonLat:function(a,b){var c=null;null!=a&&(b=b||this.map.getResolution(),c=this.map.calculateBounds(null,b),c=new OpenLayers.Pixel(1/b*(a.lon-c.left),1/b*(c.top-a.lat)));return c},setOpacity:function(a){if(a!=this.opacity){this.opacity=a;for(var b=this.div.childNodes,c=0,d=b.length;c<
+d;++c){var e=b[c].firstChild||b[c],f=b[c].lastChild;f&&"iframe"===f.nodeName.toLowerCase()&&(e=f.parentNode);OpenLayers.Util.modifyDOMElement(e,null,null,null,null,null,null,a)}null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"})}},getZIndex:function(){return this.div.style.zIndex},setZIndex:function(a){this.div.style.zIndex=a},adjustBounds:function(a){if(this.gutter){var b=this.gutter*this.map.getResolution();a=new OpenLayers.Bounds(a.left-b,a.bottom-b,a.right+
+b,a.top+b)}this.wrapDateLine&&(b={rightTolerance:this.getResolution(),leftTolerance:this.getResolution()},a=a.wrapDateLine(this.maxExtent,b));return a},CLASS_NAME:"OpenLayers.Layer"});OpenLayers.Layer.SphericalMercator={getExtent:function(){var a=null;return a=this.sphericalMercator?this.map.calculateBounds():OpenLayers.Layer.FixedZoomLevels.prototype.getExtent.apply(this)},getLonLatFromViewPortPx:function(a){return OpenLayers.Layer.prototype.getLonLatFromViewPortPx.apply(this,arguments)},getViewPortPxFromLonLat:function(a){return OpenLayers.Layer.prototype.getViewPortPxFromLonLat.apply(this,arguments)},initMercatorParameters:function(){this.RESOLUTIONS=[];for(var a=0;a<=this.MAX_ZOOM_LEVEL;++a)this.RESOLUTIONS[a]=
+156543.03390625/Math.pow(2,a);this.units="m";this.projection=this.projection||"EPSG:900913"},forwardMercator:function(){var a=new OpenLayers.Projection("EPSG:4326"),b=new OpenLayers.Projection("EPSG:900913");return function(c,d){var e=OpenLayers.Projection.transform({x:c,y:d},a,b);return new OpenLayers.LonLat(e.x,e.y)}}(),inverseMercator:function(){var a=new OpenLayers.Projection("EPSG:4326"),b=new OpenLayers.Projection("EPSG:900913");return function(c,d){var e=OpenLayers.Projection.transform({x:c,
+y:d},b,a);return new OpenLayers.LonLat(e.x,e.y)}}()};OpenLayers.Layer.EventPane=OpenLayers.Class(OpenLayers.Layer,{smoothDragPan:!0,isBaseLayer:!0,isFixed:!0,pane:null,mapObject:null,initialize:function(a,b){OpenLayers.Layer.prototype.initialize.apply(this,arguments);null==this.pane&&(this.pane=OpenLayers.Util.createDiv(this.div.id+"_EventPane"))},destroy:function(){this.pane=this.mapObject=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},setMap:function(a){OpenLayers.Layer.prototype.setMap.apply(this,arguments);this.pane.style.zIndex=
+parseInt(this.div.style.zIndex)+1;this.pane.style.display=this.div.style.display;this.pane.style.width="100%";this.pane.style.height="100%";"msie"==OpenLayers.BROWSER_NAME&&(this.pane.style.background="url("+OpenLayers.Util.getImageLocation("blank.gif")+")");this.isFixed?this.map.viewPortDiv.appendChild(this.pane):this.map.layerContainerDiv.appendChild(this.pane);this.loadMapObject();null==this.mapObject&&this.loadWarningMessage()},removeMap:function(a){this.pane&&this.pane.parentNode&&this.pane.parentNode.removeChild(this.pane);
+OpenLayers.Layer.prototype.removeMap.apply(this,arguments)},loadWarningMessage:function(){this.div.style.backgroundColor="darkblue";var a=this.map.getSize(),b=Math.min(a.w,300),c=Math.min(a.h,200),b=new OpenLayers.Size(b,c),a=(new OpenLayers.Pixel(a.w/2,a.h/2)).add(-b.w/2,-b.h/2),a=OpenLayers.Util.createDiv(this.name+"_warning",a,b,null,null,null,"auto");a.style.padding="7px";a.style.backgroundColor="yellow";a.innerHTML=this.getWarningHTML();this.div.appendChild(a)},getWarningHTML:function(){return""},
+display:function(a){OpenLayers.Layer.prototype.display.apply(this,arguments);this.pane.style.display=this.div.style.display},setZIndex:function(a){OpenLayers.Layer.prototype.setZIndex.apply(this,arguments);this.pane.style.zIndex=parseInt(this.div.style.zIndex)+1},moveByPx:function(a,b){OpenLayers.Layer.prototype.moveByPx.apply(this,arguments);this.dragPanMapObject?this.dragPanMapObject(a,-b):this.moveTo(this.map.getCachedCenter())},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,
+arguments);if(null!=this.mapObject){var d=this.map.getCenter(),e=this.map.getZoom();if(null!=d){var f=this.getMapObjectCenter(),f=this.getOLLonLatFromMapObjectLonLat(f),g=this.getMapObjectZoom(),g=this.getOLZoomFromMapObjectZoom(g);d.equals(f)&&e==g||(!b&&f&&this.dragPanMapObject&&this.smoothDragPan?(e=this.map.getViewPortPxFromLonLat(f),d=this.map.getViewPortPxFromLonLat(d),this.dragPanMapObject(d.x-e.x,e.y-d.y)):(d=this.getMapObjectLonLatFromOLLonLat(d),e=this.getMapObjectZoomFromOLZoom(e),this.setMapObjectCenter(d,
+e,c)))}}},getLonLatFromViewPortPx:function(a){var b=null;null!=this.mapObject&&null!=this.getMapObjectCenter()&&(a=this.getMapObjectPixelFromOLPixel(a),a=this.getMapObjectLonLatFromMapObjectPixel(a),b=this.getOLLonLatFromMapObjectLonLat(a));return b},getViewPortPxFromLonLat:function(a){var b=null;null!=this.mapObject&&null!=this.getMapObjectCenter()&&(a=this.getMapObjectLonLatFromOLLonLat(a),a=this.getMapObjectPixelFromMapObjectLonLat(a),b=this.getOLPixelFromMapObjectPixel(a));return b},getOLLonLatFromMapObjectLonLat:function(a){var b=
+null;null!=a&&(b=this.getLongitudeFromMapObjectLonLat(a),a=this.getLatitudeFromMapObjectLonLat(a),b=new OpenLayers.LonLat(b,a));return b},getMapObjectLonLatFromOLLonLat:function(a){var b=null;null!=a&&(b=this.getMapObjectLonLatFromLonLat(a.lon,a.lat));return b},getOLPixelFromMapObjectPixel:function(a){var b=null;null!=a&&(b=this.getXFromMapObjectPixel(a),a=this.getYFromMapObjectPixel(a),b=new OpenLayers.Pixel(b,a));return b},getMapObjectPixelFromOLPixel:function(a){var b=null;null!=a&&(b=this.getMapObjectPixelFromXY(a.x,
+a.y));return b},CLASS_NAME:"OpenLayers.Layer.EventPane"});OpenLayers.Layer.FixedZoomLevels=OpenLayers.Class({initialize:function(){},initResolutions:function(){for(var a=["minZoomLevel","maxZoomLevel","numZoomLevels"],b=0,c=a.length;b<c;b++){var d=a[b];this[d]=null!=this.options[d]?this.options[d]:this.map[d]}if(null==this.minZoomLevel||this.minZoomLevel<this.MIN_ZOOM_LEVEL)this.minZoomLevel=this.MIN_ZOOM_LEVEL;a=this.MAX_ZOOM_LEVEL-this.minZoomLevel+1;b=null==this.options.numZoomLevels&&null!=this.options.maxZoomLevel||null==this.numZoomLevels&&null!=this.maxZoomLevel?
+this.maxZoomLevel-this.minZoomLevel+1:this.numZoomLevels;this.numZoomLevels=null!=b?Math.min(b,a):a;this.maxZoomLevel=this.minZoomLevel+this.numZoomLevels-1;if(null!=this.RESOLUTIONS){a=0;this.resolutions=[];for(b=this.minZoomLevel;b<=this.maxZoomLevel;b++)this.resolutions[a++]=this.RESOLUTIONS[b];this.maxResolution=this.resolutions[0];this.minResolution=this.resolutions[this.resolutions.length-1]}},getResolution:function(){if(null!=this.resolutions)return OpenLayers.Layer.prototype.getResolution.apply(this,
+arguments);var a=null,b=this.map.getSize(),c=this.getExtent();null!=b&&null!=c&&(a=Math.max(c.getWidth()/b.w,c.getHeight()/b.h));return a},getExtent:function(){var a=this.map.getSize(),b=this.getLonLatFromViewPortPx({x:0,y:0}),a=this.getLonLatFromViewPortPx({x:a.w,y:a.h});return null!=b&&null!=a?new OpenLayers.Bounds(b.lon,a.lat,a.lon,b.lat):null},getZoomForResolution:function(a){if(null!=this.resolutions)return OpenLayers.Layer.prototype.getZoomForResolution.apply(this,arguments);var b=OpenLayers.Layer.prototype.getExtent.apply(this,
+[]);return this.getZoomForExtent(b)},getOLZoomFromMapObjectZoom:function(a){var b=null;null!=a&&(b=a-this.minZoomLevel,this.map.baseLayer!==this&&(b=this.map.baseLayer.getZoomForResolution(this.getResolutionForZoom(b))));return b},getMapObjectZoomFromOLZoom:function(a){var b=null;null!=a&&(b=a+this.minZoomLevel,this.map.baseLayer!==this&&(b=this.getZoomForResolution(this.map.baseLayer.getResolutionForZoom(b))));return b},CLASS_NAME:"OpenLayers.Layer.FixedZoomLevels"});OpenLayers.Layer.Google=OpenLayers.Class(OpenLayers.Layer.EventPane,OpenLayers.Layer.FixedZoomLevels,{MIN_ZOOM_LEVEL:0,MAX_ZOOM_LEVEL:21,RESOLUTIONS:[1.40625,0.703125,0.3515625,0.17578125,0.087890625,0.0439453125,0.02197265625,0.010986328125,0.0054931640625,0.00274658203125,0.001373291015625,6.866455078125E-4,3.4332275390625E-4,1.71661376953125E-4,8.58306884765625E-5,4.291534423828125E-5,2.145767211914062E-5,1.072883605957031E-5,5.36441802978515E-6,2.68220901489257E-6,1.341104507446289E-6,6.705522537231445E-7],
+type:null,wrapDateLine:!0,sphericalMercator:!1,version:null,initialize:function(a,b){b=b||{};b.version||(b.version="function"===typeof GMap2?"2":"3");var c=OpenLayers.Layer.Google["v"+b.version.replace(/\./g,"_")];if(c)OpenLayers.Util.applyDefaults(b,c);else throw"Unsupported Google Maps API version: "+b.version;OpenLayers.Util.applyDefaults(b,c.DEFAULTS);b.maxExtent&&(b.maxExtent=b.maxExtent.clone());OpenLayers.Layer.EventPane.prototype.initialize.apply(this,[a,b]);OpenLayers.Layer.FixedZoomLevels.prototype.initialize.apply(this,
+[a,b]);this.sphericalMercator&&(OpenLayers.Util.extend(this,OpenLayers.Layer.SphericalMercator),this.initMercatorParameters())},clone:function(){return new OpenLayers.Layer.Google(this.name,this.getOptions())},setVisibility:function(a){var b=null==this.opacity?1:this.opacity;OpenLayers.Layer.EventPane.prototype.setVisibility.apply(this,arguments);this.setOpacity(b)},display:function(a){this._dragging||this.setGMapVisibility(a);OpenLayers.Layer.EventPane.prototype.display.apply(this,arguments)},moveTo:function(a,
+b,c){this._dragging=c;OpenLayers.Layer.EventPane.prototype.moveTo.apply(this,arguments);delete this._dragging},setOpacity:function(a){a!==this.opacity&&(null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"opacity"}),this.opacity=a);if(this.getVisibility()){var b=this.getMapContainer();OpenLayers.Util.modifyDOMElement(b,null,null,null,null,null,null,a)}},destroy:function(){if(this.map){this.setGMapVisibility(!1);var a=OpenLayers.Layer.Google.cache[this.map.id];a&&1>=a.count&&
+this.removeGMapElements()}OpenLayers.Layer.EventPane.prototype.destroy.apply(this,arguments)},removeGMapElements:function(){var a=OpenLayers.Layer.Google.cache[this.map.id];if(a){var b=this.mapObject&&this.getMapContainer();b&&b.parentNode&&b.parentNode.removeChild(b);(b=a.termsOfUse)&&b.parentNode&&b.parentNode.removeChild(b);(a=a.poweredBy)&&a.parentNode&&a.parentNode.removeChild(a);this.mapObject&&(window.google&&google.maps&&google.maps.event&&google.maps.event.clearListeners)&&google.maps.event.clearListeners(this.mapObject,
+"tilesloaded")}},removeMap:function(a){this.visibility&&this.mapObject&&this.setGMapVisibility(!1);var b=OpenLayers.Layer.Google.cache[a.id];b&&(1>=b.count?(this.removeGMapElements(),delete OpenLayers.Layer.Google.cache[a.id]):--b.count);delete this.termsOfUse;delete this.poweredBy;delete this.mapObject;delete this.dragObject;OpenLayers.Layer.EventPane.prototype.removeMap.apply(this,arguments)},getOLBoundsFromMapObjectBounds:function(a){var b=null;null!=a&&(b=a.getSouthWest(),a=a.getNorthEast(),this.sphericalMercator?
+(b=this.forwardMercator(b.lng(),b.lat()),a=this.forwardMercator(a.lng(),a.lat())):(b=new OpenLayers.LonLat(b.lng(),b.lat()),a=new OpenLayers.LonLat(a.lng(),a.lat())),b=new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat));return b},getWarningHTML:function(){return OpenLayers.i18n("googleWarning")},getMapObjectCenter:function(){return this.mapObject.getCenter()},getMapObjectZoom:function(){return this.mapObject.getZoom()},getLongitudeFromMapObjectLonLat:function(a){return this.sphericalMercator?this.forwardMercator(a.lng(),
+a.lat()).lon:a.lng()},getLatitudeFromMapObjectLonLat:function(a){return this.sphericalMercator?this.forwardMercator(a.lng(),a.lat()).lat:a.lat()},getXFromMapObjectPixel:function(a){return a.x},getYFromMapObjectPixel:function(a){return a.y},CLASS_NAME:"OpenLayers.Layer.Google"});OpenLayers.Layer.Google.cache={};
+OpenLayers.Layer.Google.v2={termsOfUse:null,poweredBy:null,dragObject:null,loadMapObject:function(){this.type||(this.type=G_NORMAL_MAP);var a,b,c,d=OpenLayers.Layer.Google.cache[this.map.id];if(d)a=d.mapObject,b=d.termsOfUse,c=d.poweredBy,++d.count;else{var d=this.map.viewPortDiv,e=document.createElement("div");e.id=this.map.id+"_GMap2Container";e.style.position="absolute";e.style.width="100%";e.style.height="100%";d.appendChild(e);try{a=new GMap2(e),b=e.lastChild,d.appendChild(b),b.style.zIndex=
+"1100",b.style.right="",b.style.bottom="",b.className="olLayerGoogleCopyright",c=e.lastChild,d.appendChild(c),c.style.zIndex="1100",c.style.right="",c.style.bottom="",c.className="olLayerGooglePoweredBy gmnoprint"}catch(f){throw f;}OpenLayers.Layer.Google.cache[this.map.id]={mapObject:a,termsOfUse:b,poweredBy:c,count:1}}this.mapObject=a;this.termsOfUse=b;this.poweredBy=c;-1===OpenLayers.Util.indexOf(this.mapObject.getMapTypes(),this.type)&&this.mapObject.addMapType(this.type);"function"==typeof a.getDragObject?
+this.dragObject=a.getDragObject():this.dragPanMapObject=null;!1===this.isBaseLayer&&this.setGMapVisibility("none"!==this.div.style.display)},onMapResize:function(){if(this.visibility&&this.mapObject.isLoaded())this.mapObject.checkResize();else{if(!this._resized)var a=this,b=GEvent.addListener(this.mapObject,"load",function(){GEvent.removeListener(b);delete a._resized;a.mapObject.checkResize();a.moveTo(a.map.getCenter(),a.map.getZoom())});this._resized=!0}},setGMapVisibility:function(a){var b=OpenLayers.Layer.Google.cache[this.map.id];
+if(b){var c=this.mapObject.getContainer();!0===a?(this.mapObject.setMapType(this.type),c.style.display="",this.termsOfUse.style.left="",this.termsOfUse.style.display="",this.poweredBy.style.display="",b.displayed=this.id):(b.displayed===this.id&&delete b.displayed,b.displayed||(c.style.display="none",this.termsOfUse.style.display="none",this.termsOfUse.style.left="-9999px",this.poweredBy.style.display="none"))}},getMapContainer:function(){return this.mapObject.getContainer()},getMapObjectBoundsFromOLBounds:function(a){var b=
+null;null!=a&&(b=this.sphericalMercator?this.inverseMercator(a.bottom,a.left):new OpenLayers.LonLat(a.bottom,a.left),a=this.sphericalMercator?this.inverseMercator(a.top,a.right):new OpenLayers.LonLat(a.top,a.right),b=new GLatLngBounds(new GLatLng(b.lat,b.lon),new GLatLng(a.lat,a.lon)));return b},setMapObjectCenter:function(a,b){this.mapObject.setCenter(a,b)},dragPanMapObject:function(a,b){this.dragObject.moveBy(new GSize(-a,b))},getMapObjectLonLatFromMapObjectPixel:function(a){return this.mapObject.fromContainerPixelToLatLng(a)},
+getMapObjectPixelFromMapObjectLonLat:function(a){return this.mapObject.fromLatLngToContainerPixel(a)},getMapObjectZoomFromMapObjectBounds:function(a){return this.mapObject.getBoundsZoomLevel(a)},getMapObjectLonLatFromLonLat:function(a,b){var c;this.sphericalMercator?(c=this.inverseMercator(a,b),c=new GLatLng(c.lat,c.lon)):c=new GLatLng(b,a);return c},getMapObjectPixelFromXY:function(a,b){return new GPoint(a,b)}};OpenLayers.Format.XML=OpenLayers.Class(OpenLayers.Format,{namespaces:null,namespaceAlias:null,defaultPrefix:null,readers:{},writers:{},xmldom:null,initialize:function(a){window.ActiveXObject&&(this.xmldom=new ActiveXObject("Microsoft.XMLDOM"));OpenLayers.Format.prototype.initialize.apply(this,[a]);this.namespaces=OpenLayers.Util.extend({},this.namespaces);this.namespaceAlias={};for(var b in this.namespaces)this.namespaceAlias[this.namespaces[b]]=b},destroy:function(){this.xmldom=null;OpenLayers.Format.prototype.destroy.apply(this,
+arguments)},setNamespace:function(a,b){this.namespaces[a]=b;this.namespaceAlias[b]=a},read:function(a){var b=a.indexOf("<");0<b&&(a=a.substring(b));b=OpenLayers.Util.Try(OpenLayers.Function.bind(function(){var b;b=window.ActiveXObject&&!this.xmldom?new ActiveXObject("Microsoft.XMLDOM"):this.xmldom;b.loadXML(a);return b},this),function(){return(new DOMParser).parseFromString(a,"text/xml")},function(){var b=new XMLHttpRequest;b.open("GET","data:text/xml;charset=utf-8,"+encodeURIComponent(a),!1);b.overrideMimeType&&
+b.overrideMimeType("text/xml");b.send(null);return b.responseXML});this.keepData&&(this.data=b);return b},write:function(a){if(this.xmldom)a=a.xml;else{var b=new XMLSerializer;if(1==a.nodeType){var c=document.implementation.createDocument("","",null);c.importNode&&(a=c.importNode(a,!0));c.appendChild(a);a=b.serializeToString(c)}else a=b.serializeToString(a)}return a},createElementNS:function(a,b){return this.xmldom?"string"==typeof a?this.xmldom.createNode(1,b,a):this.xmldom.createNode(1,b,""):document.createElementNS(a,
+b)},createDocumentFragment:function(){return this.xmldom?this.xmldom.createDocumentFragment():document.createDocumentFragment()},createTextNode:function(a){"string"!==typeof a&&(a=String(a));return this.xmldom?this.xmldom.createTextNode(a):document.createTextNode(a)},getElementsByTagNameNS:function(a,b,c){var d=[];if(a.getElementsByTagNameNS)d=a.getElementsByTagNameNS(b,c);else{a=a.getElementsByTagName("*");for(var e,f,g=0,h=a.length;g<h;++g)if(e=a[g],f=e.prefix?e.prefix+":"+c:c,"*"==c||f==e.nodeName)"*"!=
+b&&b!=e.namespaceURI||d.push(e)}return d},getAttributeNodeNS:function(a,b,c){var d=null;if(a.getAttributeNodeNS)d=a.getAttributeNodeNS(b,c);else{a=a.attributes;for(var e,f,g=0,h=a.length;g<h;++g)if(e=a[g],e.namespaceURI==b&&(f=e.prefix?e.prefix+":"+c:c,f==e.nodeName)){d=e;break}}return d},getAttributeNS:function(a,b,c){var d="";if(a.getAttributeNS)d=a.getAttributeNS(b,c)||"";else if(a=this.getAttributeNodeNS(a,b,c))d=a.nodeValue;return d},getChildValue:function(a,b){var c=b||"";if(a)for(var d=a.firstChild;d;d=
+d.nextSibling)switch(d.nodeType){case 3:case 4:c+=d.nodeValue}return c},isSimpleContent:function(a){var b=!0;for(a=a.firstChild;a;a=a.nextSibling)if(1===a.nodeType){b=!1;break}return b},contentType:function(a){var b=!1,c=!1,d=OpenLayers.Format.XML.CONTENT_TYPE.EMPTY;for(a=a.firstChild;a;a=a.nextSibling){switch(a.nodeType){case 1:c=!0;break;case 8:break;default:b=!0}if(c&&b)break}if(c&&b)d=OpenLayers.Format.XML.CONTENT_TYPE.MIXED;else{if(c)return OpenLayers.Format.XML.CONTENT_TYPE.COMPLEX;if(b)return OpenLayers.Format.XML.CONTENT_TYPE.SIMPLE}return d},
+hasAttributeNS:function(a,b,c){var d=!1;return d=a.hasAttributeNS?a.hasAttributeNS(b,c):!!this.getAttributeNodeNS(a,b,c)},setAttributeNS:function(a,b,c,d){if(a.setAttributeNS)a.setAttributeNS(b,c,d);else if(this.xmldom)b?(b=a.ownerDocument.createNode(2,c,b),b.nodeValue=d,a.setAttributeNode(b)):a.setAttribute(c,d);else throw"setAttributeNS not implemented";},createElementNSPlus:function(a,b){b=b||{};var c=b.uri||this.namespaces[b.prefix];c||(c=a.indexOf(":"),c=this.namespaces[a.substring(0,c)]);c||
+(c=this.namespaces[this.defaultPrefix]);c=this.createElementNS(c,a);b.attributes&&this.setAttributes(c,b.attributes);var d=b.value;null!=d&&c.appendChild(this.createTextNode(d));return c},setAttributes:function(a,b){var c,d,e;for(e in b)null!=b[e]&&b[e].toString&&(c=b[e].toString(),d=this.namespaces[e.substring(0,e.indexOf(":"))]||null,this.setAttributeNS(a,d,e,c))},readNode:function(a,b){b||(b={});var c=this.readers[a.namespaceURI?this.namespaceAlias[a.namespaceURI]:this.defaultPrefix];if(c){var d=
+a.localName||a.nodeName.split(":").pop();(c=c[d]||c["*"])&&c.apply(this,[a,b])}return b},readChildNodes:function(a,b){b||(b={});for(var c=a.childNodes,d,e=0,f=c.length;e<f;++e)d=c[e],1==d.nodeType&&this.readNode(d,b);return b},writeNode:function(a,b,c){var d,e=a.indexOf(":");0<e?(d=a.substring(0,e),a=a.substring(e+1)):d=c?this.namespaceAlias[c.namespaceURI]:this.defaultPrefix;b=this.writers[d][a].apply(this,[b]);c&&c.appendChild(b);return b},getChildEl:function(a,b,c){return a&&this.getThisOrNextEl(a.firstChild,
+b,c)},getNextEl:function(a,b,c){return a&&this.getThisOrNextEl(a.nextSibling,b,c)},getThisOrNextEl:function(a,b,c){a:for(;a;a=a.nextSibling)switch(a.nodeType){case 1:if(!(b&&b!==(a.localName||a.nodeName.split(":").pop())||c&&c!==a.namespaceURI))break a;a=null;break a;case 3:if(/^\s*$/.test(a.nodeValue))break;case 4:case 6:case 12:case 10:case 11:a=null;break a}return a||null},lookupNamespaceURI:function(a,b){var c=null;if(a)if(a.lookupNamespaceURI)c=a.lookupNamespaceURI(b);else a:switch(a.nodeType){case 1:if(null!==
+a.namespaceURI&&a.prefix===b){c=a.namespaceURI;break a}if(c=a.attributes.length)for(var d,e=0;e<c;++e)if(d=a.attributes[e],"xmlns"===d.prefix&&d.name==="xmlns:"+b){c=d.value||null;break a}else if("xmlns"===d.name&&null===b){c=d.value||null;break a}c=this.lookupNamespaceURI(a.parentNode,b);break a;case 2:c=this.lookupNamespaceURI(a.ownerElement,b);break a;case 9:c=this.lookupNamespaceURI(a.documentElement,b);break a;case 6:case 12:case 10:case 11:break a;default:c=this.lookupNamespaceURI(a.parentNode,
+b)}return c},getXMLDoc:function(){OpenLayers.Format.XML.document||this.xmldom||(document.implementation&&document.implementation.createDocument?OpenLayers.Format.XML.document=document.implementation.createDocument("","",null):!this.xmldom&&window.ActiveXObject&&(this.xmldom=new ActiveXObject("Microsoft.XMLDOM")));return OpenLayers.Format.XML.document||this.xmldom},CLASS_NAME:"OpenLayers.Format.XML"});OpenLayers.Format.XML.CONTENT_TYPE={EMPTY:0,SIMPLE:1,COMPLEX:2,MIXED:3};
+OpenLayers.Format.XML.lookupNamespaceURI=OpenLayers.Function.bind(OpenLayers.Format.XML.prototype.lookupNamespaceURI,OpenLayers.Format.XML.prototype);OpenLayers.Format.XML.document=null;OpenLayers.Format.WFST=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Format.WFST.DEFAULTS);var b=OpenLayers.Format.WFST["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported WFST version: "+a.version;return new b(a)};OpenLayers.Format.WFST.DEFAULTS={version:"1.0.0"};OpenLayers.Feature=OpenLayers.Class({layer:null,id:null,lonlat:null,data:null,marker:null,popupClass:null,popup:null,initialize:function(a,b,c){this.layer=a;this.lonlat=b;this.data=null!=c?c:{};this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){null!=this.layer&&null!=this.layer.map&&null!=this.popup&&this.layer.map.removePopup(this.popup);null!=this.layer&&null!=this.marker&&this.layer.removeMarker(this.marker);this.data=this.lonlat=this.id=this.layer=null;null!=this.marker&&
+(this.destroyMarker(this.marker),this.marker=null);null!=this.popup&&(this.destroyPopup(this.popup),this.popup=null)},onScreen:function(){var a=!1;null!=this.layer&&null!=this.layer.map&&(a=this.layer.map.getExtent().containsLonLat(this.lonlat));return a},createMarker:function(){null!=this.lonlat&&(this.marker=new OpenLayers.Marker(this.lonlat,this.data.icon));return this.marker},destroyMarker:function(){this.marker.destroy()},createPopup:function(a){null!=this.lonlat&&(this.popup||(this.popup=new (this.popupClass?
+this.popupClass:OpenLayers.Popup.Anchored)(this.id+"_popup",this.lonlat,this.data.popupSize,this.data.popupContentHTML,this.marker?this.marker.icon:null,a)),null!=this.data.overflow&&(this.popup.contentDiv.style.overflow=this.data.overflow),this.popup.feature=this);return this.popup},destroyPopup:function(){this.popup&&(this.popup.feature=null,this.popup.destroy(),this.popup=null)},CLASS_NAME:"OpenLayers.Feature"});OpenLayers.State={UNKNOWN:"Unknown",INSERT:"Insert",UPDATE:"Update",DELETE:"Delete"};
+OpenLayers.Feature.Vector=OpenLayers.Class(OpenLayers.Feature,{fid:null,geometry:null,attributes:null,bounds:null,state:null,style:null,url:null,renderIntent:"default",modified:null,initialize:function(a,b,c){OpenLayers.Feature.prototype.initialize.apply(this,[null,null,b]);this.lonlat=null;this.geometry=a?a:null;this.state=null;this.attributes={};b&&(this.attributes=OpenLayers.Util.extend(this.attributes,b));this.style=c?c:null},destroy:function(){this.layer&&(this.layer.removeFeatures(this),this.layer=
+null);this.modified=this.geometry=null;OpenLayers.Feature.prototype.destroy.apply(this,arguments)},clone:function(){return new OpenLayers.Feature.Vector(this.geometry?this.geometry.clone():null,this.attributes,this.style)},onScreen:function(a){var b=!1;this.layer&&this.layer.map&&(b=this.layer.map.getExtent(),a?(a=this.geometry.getBounds(),b=b.intersectsBounds(a)):b=b.toGeometry().intersects(this.geometry));return b},getVisibility:function(){return!(this.style&&"none"==this.style.display||!this.layer||
+this.layer&&this.layer.styleMap&&"none"==this.layer.styleMap.createSymbolizer(this,this.renderIntent).display||this.layer&&!this.layer.getVisibility())},createMarker:function(){return null},destroyMarker:function(){},createPopup:function(){return null},atPoint:function(a,b,c){var d=!1;this.geometry&&(d=this.geometry.atPoint(a,b,c));return d},destroyPopup:function(){},move:function(a){if(this.layer&&this.geometry.move){a="OpenLayers.LonLat"==a.CLASS_NAME?this.layer.getViewPortPxFromLonLat(a):a;var b=
+this.layer.getViewPortPxFromLonLat(this.geometry.getBounds().getCenterLonLat()),c=this.layer.map.getResolution();this.geometry.move(c*(a.x-b.x),c*(b.y-a.y));this.layer.drawFeature(this);return b}},toState:function(a){if(a==OpenLayers.State.UPDATE)switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.DELETE:this.state=a}else if(a==OpenLayers.State.INSERT)switch(this.state){case OpenLayers.State.UNKNOWN:break;default:this.state=a}else if(a==OpenLayers.State.DELETE)switch(this.state){case OpenLayers.State.UNKNOWN:case OpenLayers.State.UPDATE:this.state=
+a}else a==OpenLayers.State.UNKNOWN&&(this.state=a)},CLASS_NAME:"OpenLayers.Feature.Vector"});
+OpenLayers.Feature.Vector.style={"default":{fillColor:"#ee9900",fillOpacity:0.4,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#ee9900",strokeOpacity:1,strokeWidth:1,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},select:{fillColor:"blue",fillOpacity:0.4,
+hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"blue",strokeOpacity:1,strokeWidth:2,strokeLinecap:"round",strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"pointer",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},temporary:{fillColor:"#66cccc",fillOpacity:0.2,hoverFillColor:"white",hoverFillOpacity:0.8,strokeColor:"#66cccc",strokeOpacity:1,
+strokeLinecap:"round",strokeWidth:2,strokeDashstyle:"solid",hoverStrokeColor:"red",hoverStrokeOpacity:1,hoverStrokeWidth:0.2,pointRadius:6,hoverPointRadius:1,hoverPointUnit:"%",pointerEvents:"visiblePainted",cursor:"inherit",fontColor:"#000000",labelAlign:"cm",labelOutlineColor:"white",labelOutlineWidth:3},"delete":{display:"none"}};OpenLayers.Style=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:!1,rules:null,context:null,defaultStyle:null,defaultsPerSymbolizer:!1,propertyStyles:null,initialize:function(a,b){OpenLayers.Util.extend(this,b);this.rules=[];b&&b.rules&&this.addRules(b.rules);this.setDefaultStyle(a||OpenLayers.Feature.Vector.style["default"]);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){for(var a=0,b=this.rules.length;a<b;a++)this.rules[a].destroy(),
+this.rules[a]=null;this.defaultStyle=this.rules=null},createSymbolizer:function(a){for(var b=this.defaultsPerSymbolizer?{}:this.createLiterals(OpenLayers.Util.extend({},this.defaultStyle),a),c=this.rules,d,e=[],f=!1,g=0,h=c.length;g<h;g++)d=c[g],d.evaluate(a)&&(d instanceof OpenLayers.Rule&&d.elseFilter?e.push(d):(f=!0,this.applySymbolizer(d,b,a)));if(!1==f&&0<e.length)for(f=!0,g=0,h=e.length;g<h;g++)this.applySymbolizer(e[g],b,a);0<c.length&&!1==f&&(b.display="none");null!=b.label&&"string"!==typeof b.label&&
+(b.label=String(b.label));return b},applySymbolizer:function(a,b,c){var d=c.geometry?this.getSymbolizerPrefix(c.geometry):OpenLayers.Style.SYMBOLIZER_PREFIXES[0];a=a.symbolizer[d]||a.symbolizer;!0===this.defaultsPerSymbolizer&&(d=this.defaultStyle,OpenLayers.Util.applyDefaults(a,{pointRadius:d.pointRadius}),!0!==a.stroke&&!0!==a.graphic||OpenLayers.Util.applyDefaults(a,{strokeWidth:d.strokeWidth,strokeColor:d.strokeColor,strokeOpacity:d.strokeOpacity,strokeDashstyle:d.strokeDashstyle,strokeLinecap:d.strokeLinecap}),
+!0!==a.fill&&!0!==a.graphic||OpenLayers.Util.applyDefaults(a,{fillColor:d.fillColor,fillOpacity:d.fillOpacity}),!0===a.graphic&&OpenLayers.Util.applyDefaults(a,{pointRadius:this.defaultStyle.pointRadius,externalGraphic:this.defaultStyle.externalGraphic,graphicName:this.defaultStyle.graphicName,graphicOpacity:this.defaultStyle.graphicOpacity,graphicWidth:this.defaultStyle.graphicWidth,graphicHeight:this.defaultStyle.graphicHeight,graphicXOffset:this.defaultStyle.graphicXOffset,graphicYOffset:this.defaultStyle.graphicYOffset}));
+return this.createLiterals(OpenLayers.Util.extend(b,a),c)},createLiterals:function(a,b){var c=OpenLayers.Util.extend({},b.attributes||b.data);OpenLayers.Util.extend(c,this.context);for(var d in this.propertyStyles)a[d]=OpenLayers.Style.createLiteral(a[d],c,b,d);return a},findPropertyStyles:function(){var a={};this.addPropertyStyles(a,this.defaultStyle);for(var b=this.rules,c,d,e=0,f=b.length;e<f;e++){c=b[e].symbolizer;for(var g in c)if(d=c[g],"object"==typeof d)this.addPropertyStyles(a,d);else{this.addPropertyStyles(a,
+c);break}}return a},addPropertyStyles:function(a,b){var c,d;for(d in b)c=b[d],"string"==typeof c&&c.match(/\$\{\w+\}/)&&(a[d]=!0);return a},addRules:function(a){Array.prototype.push.apply(this.rules,a);this.propertyStyles=this.findPropertyStyles()},setDefaultStyle:function(a){this.defaultStyle=a;this.propertyStyles=this.findPropertyStyles()},getSymbolizerPrefix:function(a){for(var b=OpenLayers.Style.SYMBOLIZER_PREFIXES,c=0,d=b.length;c<d;c++)if(-1!=a.CLASS_NAME.indexOf(b[c]))return b[c]},clone:function(){var a=
+OpenLayers.Util.extend({},this);if(this.rules){a.rules=[];for(var b=0,c=this.rules.length;b<c;++b)a.rules.push(this.rules[b].clone())}a.context=this.context&&OpenLayers.Util.extend({},this.context);b=OpenLayers.Util.extend({},this.defaultStyle);return new OpenLayers.Style(b,a)},CLASS_NAME:"OpenLayers.Style"});OpenLayers.Style.createLiteral=function(a,b,c,d){"string"==typeof a&&-1!=a.indexOf("${")&&(a=OpenLayers.String.format(a,b,[c,d]),a=isNaN(a)||!a?a:parseFloat(a));return a};
+OpenLayers.Style.SYMBOLIZER_PREFIXES=["Point","Line","Polygon","Text","Raster"];OpenLayers.Filter=OpenLayers.Class({initialize:function(a){OpenLayers.Util.extend(this,a)},destroy:function(){},evaluate:function(a){return!0},clone:function(){return null},toString:function(){return OpenLayers.Format&&OpenLayers.Format.CQL?OpenLayers.Format.CQL.prototype.write(this):Object.prototype.toString.call(this)},CLASS_NAME:"OpenLayers.Filter"});OpenLayers.Filter.Spatial=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,distance:null,distanceUnits:null,evaluate:function(a){var b=!1;switch(this.type){case OpenLayers.Filter.Spatial.BBOX:case OpenLayers.Filter.Spatial.INTERSECTS:if(a.geometry){var c=this.value;"OpenLayers.Bounds"==this.value.CLASS_NAME&&(c=this.value.toGeometry());a.geometry.intersects(c)&&(b=!0)}break;default:throw Error("evaluate is not implemented for this filter type.");}return b},clone:function(){var a=
+OpenLayers.Util.applyDefaults({value:this.value&&this.value.clone&&this.value.clone()},this);return new OpenLayers.Filter.Spatial(a)},CLASS_NAME:"OpenLayers.Filter.Spatial"});OpenLayers.Filter.Spatial.BBOX="BBOX";OpenLayers.Filter.Spatial.INTERSECTS="INTERSECTS";OpenLayers.Filter.Spatial.DWITHIN="DWITHIN";OpenLayers.Filter.Spatial.WITHIN="WITHIN";OpenLayers.Filter.Spatial.CONTAINS="CONTAINS";OpenLayers.Filter.FeatureId=OpenLayers.Class(OpenLayers.Filter,{fids:null,type:"FID",initialize:function(a){this.fids=[];OpenLayers.Filter.prototype.initialize.apply(this,[a])},evaluate:function(a){for(var b=0,c=this.fids.length;b<c;b++)if((a.fid||a.id)==this.fids[b])return!0;return!1},clone:function(){var a=new OpenLayers.Filter.FeatureId;OpenLayers.Util.extend(a,this);a.fids=this.fids.slice();return a},CLASS_NAME:"OpenLayers.Filter.FeatureId"});OpenLayers.Format.WFST.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",wfs:"http://www.opengis.net/wfs",gml:"http://www.opengis.net/gml",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows"},defaultPrefix:"wfs",version:null,schemaLocations:null,srsName:null,extractAttributes:!0,xy:!0,stateName:null,initialize:function(a){this.stateName={};this.stateName[OpenLayers.State.INSERT]="wfs:Insert";this.stateName[OpenLayers.State.UPDATE]=
+"wfs:Update";this.stateName[OpenLayers.State.DELETE]="wfs:Delete";OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},getSrsName:function(a,b){var c=b&&b.srsName;c||(c=a&&a.layer?a.layer.projection.getCode():this.srsName);return c},read:function(a,b){b=b||{};OpenLayers.Util.applyDefaults(b,{output:"features"});"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var c={};a&&this.readNode(a,c,!0);c.features&&"features"===b.output&&
+(c=c.features);return c},readers:{wfs:{FeatureCollection:function(a,b){b.features=[];this.readChildNodes(a,b)}}},write:function(a,b){var c=this.writeNode("wfs:Transaction",{features:a,options:b}),d=this.schemaLocationAttr();d&&this.setAttributeNS(c,this.namespaces.xsi,"xsi:schemaLocation",d);return OpenLayers.Format.XML.prototype.write.apply(this,[c])},writers:{wfs:{GetFeature:function(a){var b=this.createElementNSPlus("wfs:GetFeature",{attributes:{service:"WFS",version:this.version,handle:a&&a.handle,
+outputFormat:a&&a.outputFormat,maxFeatures:a&&a.maxFeatures,"xsi:schemaLocation":this.schemaLocationAttr(a)}});if("string"==typeof this.featureType)this.writeNode("Query",a,b);else for(var c=0,d=this.featureType.length;c<d;c++)a.featureType=this.featureType[c],this.writeNode("Query",a,b);return b},Transaction:function(a){a=a||{};var b=a.options||{},c=this.createElementNSPlus("wfs:Transaction",{attributes:{service:"WFS",version:this.version,handle:b.handle}}),d,e=a.features;if(e){!0===b.multi&&OpenLayers.Util.extend(this.geometryTypes,
+{"OpenLayers.Geometry.Point":"MultiPoint","OpenLayers.Geometry.LineString":!0===this.multiCurve?"MultiCurve":"MultiLineString","OpenLayers.Geometry.Polygon":!0===this.multiSurface?"MultiSurface":"MultiPolygon"});var f,g;a=0;for(d=e.length;a<d;++a)g=e[a],(f=this.stateName[g.state])&&this.writeNode(f,{feature:g,options:b},c);!0===b.multi&&this.setGeometryTypes()}if(b.nativeElements)for(a=0,d=b.nativeElements.length;a<d;++a)this.writeNode("wfs:Native",b.nativeElements[a],c);return c},Native:function(a){return this.createElementNSPlus("wfs:Native",
+{attributes:{vendorId:a.vendorId,safeToIgnore:a.safeToIgnore},value:a.value})},Insert:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Insert",{attributes:{handle:a&&a.handle}});this.srsName=this.getSrsName(b);this.writeNode("feature:_typeName",b,a);return a},Update:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Update",{attributes:{handle:a&&a.handle,typeName:(this.featureNS?this.featurePrefix+":":"")+this.featureType}});this.featureNS&&a.setAttribute("xmlns:"+
+this.featurePrefix,this.featureNS);var c=b.modified;null===this.geometryName||c&&void 0===c.geometry||(this.srsName=this.getSrsName(b),this.writeNode("Property",{name:this.geometryName,value:b.geometry},a));for(var d in b.attributes)void 0===b.attributes[d]||c&&c.attributes&&(!c.attributes||void 0===c.attributes[d])||this.writeNode("Property",{name:d,value:b.attributes[d]},a);this.writeNode("ogc:Filter",new OpenLayers.Filter.FeatureId({fids:[b.fid]}),a);return a},Property:function(a){var b=this.createElementNSPlus("wfs:Property");
+this.writeNode("Name",a.name,b);null!==a.value&&this.writeNode("Value",a.value,b);return b},Name:function(a){return this.createElementNSPlus("wfs:Name",{value:a})},Value:function(a){var b;a instanceof OpenLayers.Geometry?(b=this.createElementNSPlus("wfs:Value"),a=this.writeNode("feature:_geometry",a).firstChild,b.appendChild(a)):b=this.createElementNSPlus("wfs:Value",{value:a});return b},Delete:function(a){var b=a.feature;a=a.options;a=this.createElementNSPlus("wfs:Delete",{attributes:{handle:a&&
+a.handle,typeName:(this.featureNS?this.featurePrefix+":":"")+this.featureType}});this.featureNS&&a.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);this.writeNode("ogc:Filter",new OpenLayers.Filter.FeatureId({fids:[b.fid]}),a);return a}}},schemaLocationAttr:function(a){a=OpenLayers.Util.extend({featurePrefix:this.featurePrefix,schema:this.schema},a);var b=OpenLayers.Util.extend({},this.schemaLocations);a.schema&&(b[a.featurePrefix]=a.schema);a=[];var c,d;for(d in b)(c=this.namespaces[d])&&
+a.push(c+" "+b[d]);return a.join(" ")||void 0},setFilterProperty:function(a){if(a.filters)for(var b=0,c=a.filters.length;b<c;++b)OpenLayers.Format.WFST.v1.prototype.setFilterProperty.call(this,a.filters[b]);else a instanceof OpenLayers.Filter.Spatial&&!a.property&&(a.property=this.geometryName)},CLASS_NAME:"OpenLayers.Format.WFST.v1"});OpenLayers.Format.OGCExceptionReport=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},defaultPrefix:"ogc",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b={exceptionReport:null};a.documentElement&&(this.readChildNodes(a,b),null===b.exceptionReport&&(b=(new OpenLayers.Format.OWSCommon).read(a)));return b},readers:{ogc:{ServiceExceptionReport:function(a,
+b){b.exceptionReport={exceptions:[]};this.readChildNodes(a,b.exceptionReport)},ServiceException:function(a,b){var c={code:a.getAttribute("code"),locator:a.getAttribute("locator"),text:this.getChildValue(a)};b.exceptions.push(c)}}},CLASS_NAME:"OpenLayers.Format.OGCExceptionReport"});OpenLayers.Format.XML.VersionedOGC=OpenLayers.Class(OpenLayers.Format.XML,{defaultVersion:null,version:null,profile:null,allowFallback:!1,name:null,stringifyOutput:!1,parser:null,initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);a=this.CLASS_NAME;this.name=a.substring(a.lastIndexOf(".")+1)},getVersion:function(a,b){var c;a?(c=this.version,c||(c=a.getAttribute("version"),c||(c=this.defaultVersion))):c=b&&b.version||this.version||this.defaultVersion;return c},getParser:function(a){a=
+a||this.defaultVersion;var b=this.profile?"_"+this.profile:"";if(!this.parser||this.parser.VERSION!=a){var c=OpenLayers.Format[this.name]["v"+a.replace(/\./g,"_")+b];if(!c&&(""!==b&&this.allowFallback&&(b="",c=OpenLayers.Format[this.name]["v"+a.replace(/\./g,"_")]),!c))throw"Can't find a "+this.name+" parser for version "+a+b;this.parser=new c(this.options)}return this.parser},write:function(a,b){var c=this.getVersion(null,b);this.parser=this.getParser(c);c=this.parser.write(a,b);return!1===this.stringifyOutput?
+c:OpenLayers.Format.XML.prototype.write.apply(this,[c])},read:function(a,b){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var c=this.getVersion(a.documentElement);this.parser=this.getParser(c);var d=this.parser.read(a,b),e=this.parser.errorProperty||null;null!==e&&void 0===d[e]&&(e=new OpenLayers.Format.OGCExceptionReport,d.error=e.read(a));d.version=c;return d},CLASS_NAME:"OpenLayers.Format.XML.VersionedOGC"});OpenLayers.Filter.Logical=OpenLayers.Class(OpenLayers.Filter,{filters:null,type:null,initialize:function(a){this.filters=[];OpenLayers.Filter.prototype.initialize.apply(this,[a])},destroy:function(){this.filters=null;OpenLayers.Filter.prototype.destroy.apply(this)},evaluate:function(a){var b,c;switch(this.type){case OpenLayers.Filter.Logical.AND:b=0;for(c=this.filters.length;b<c;b++)if(!1==this.filters[b].evaluate(a))return!1;return!0;case OpenLayers.Filter.Logical.OR:b=0;for(c=this.filters.length;b<
+c;b++)if(!0==this.filters[b].evaluate(a))return!0;return!1;case OpenLayers.Filter.Logical.NOT:return!this.filters[0].evaluate(a)}},clone:function(){for(var a=[],b=0,c=this.filters.length;b<c;++b)a.push(this.filters[b].clone());return new OpenLayers.Filter.Logical({type:this.type,filters:a})},CLASS_NAME:"OpenLayers.Filter.Logical"});OpenLayers.Filter.Logical.AND="&&";OpenLayers.Filter.Logical.OR="||";OpenLayers.Filter.Logical.NOT="!";OpenLayers.Filter.Comparison=OpenLayers.Class(OpenLayers.Filter,{type:null,property:null,value:null,matchCase:!0,lowerBoundary:null,upperBoundary:null,initialize:function(a){OpenLayers.Filter.prototype.initialize.apply(this,[a]);this.type===OpenLayers.Filter.Comparison.LIKE&&void 0===a.matchCase&&(this.matchCase=null)},evaluate:function(a){a instanceof OpenLayers.Feature.Vector&&(a=a.attributes);var b=!1;a=a[this.property];switch(this.type){case OpenLayers.Filter.Comparison.EQUAL_TO:b=this.value;
+b=this.matchCase||"string"!=typeof a||"string"!=typeof b?a==b:a.toUpperCase()==b.toUpperCase();break;case OpenLayers.Filter.Comparison.NOT_EQUAL_TO:b=this.value;b=this.matchCase||"string"!=typeof a||"string"!=typeof b?a!=b:a.toUpperCase()!=b.toUpperCase();break;case OpenLayers.Filter.Comparison.LESS_THAN:b=a<this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN:b=a>this.value;break;case OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO:b=a<=this.value;break;case OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO:b=
+a>=this.value;break;case OpenLayers.Filter.Comparison.BETWEEN:b=a>=this.lowerBoundary&&a<=this.upperBoundary;break;case OpenLayers.Filter.Comparison.LIKE:b=RegExp(this.value,"gi").test(a);break;case OpenLayers.Filter.Comparison.IS_NULL:b=null===a}return b},value2regex:function(a,b,c){if("."==a)throw Error("'.' is an unsupported wildCard character for OpenLayers.Filter.Comparison");a=a?a:"*";b=b?b:".";this.value=this.value.replace(RegExp("\\"+(c?c:"!")+"(.|$)","g"),"\\$1");this.value=this.value.replace(RegExp("\\"+
+b,"g"),".");this.value=this.value.replace(RegExp("\\"+a,"g"),".*");this.value=this.value.replace(RegExp("\\\\.\\*","g"),"\\"+a);return this.value=this.value.replace(RegExp("\\\\\\.","g"),"\\"+b)},regex2value:function(){var a=this.value,a=a.replace(/!/g,"!!"),a=a.replace(/(\\)?\\\./g,function(a,c){return c?a:"!."}),a=a.replace(/(\\)?\\\*/g,function(a,c){return c?a:"!*"}),a=a.replace(/\\\\/g,"\\");return a=a.replace(/\.\*/g,"*")},clone:function(){return OpenLayers.Util.extend(new OpenLayers.Filter.Comparison,
+this)},CLASS_NAME:"OpenLayers.Filter.Comparison"});OpenLayers.Filter.Comparison.EQUAL_TO="==";OpenLayers.Filter.Comparison.NOT_EQUAL_TO="!=";OpenLayers.Filter.Comparison.LESS_THAN="<";OpenLayers.Filter.Comparison.GREATER_THAN=">";OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO="<=";OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO=">=";OpenLayers.Filter.Comparison.BETWEEN="..";OpenLayers.Filter.Comparison.LIKE="~";OpenLayers.Filter.Comparison.IS_NULL="NULL";OpenLayers.Format.Filter=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.Filter"});OpenLayers.Filter.Function=OpenLayers.Class(OpenLayers.Filter,{name:null,params:null,CLASS_NAME:"OpenLayers.Filter.Function"});OpenLayers.Date={dateRegEx:/^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:(?:T(\d{1,2}):(\d{2}):(\d{2}(?:\.\d+)?)(Z|(?:[+-]\d{1,2}(?::(\d{2}))?)))|Z)?$/,toISOString:function(){return"toISOString"in Date.prototype?function(a){return a.toISOString()}:function(a){return isNaN(a.getTime())?"Invalid Date":a.getUTCFullYear()+"-"+OpenLayers.Number.zeroPad(a.getUTCMonth()+1,2)+"-"+OpenLayers.Number.zeroPad(a.getUTCDate(),2)+"T"+OpenLayers.Number.zeroPad(a.getUTCHours(),2)+":"+OpenLayers.Number.zeroPad(a.getUTCMinutes(),
+2)+":"+OpenLayers.Number.zeroPad(a.getUTCSeconds(),2)+"."+OpenLayers.Number.zeroPad(a.getUTCMilliseconds(),3)+"Z"}}(),parse:function(a){var b;if((a=a.match(this.dateRegEx))&&(a[1]||a[7])){b=parseInt(a[1],10)||0;var c=parseInt(a[2],10)-1||0,d=parseInt(a[3],10)||1;b=new Date(Date.UTC(b,c,d));if(c=a[7]){var d=parseInt(a[4],10),e=parseInt(a[5],10),f=parseFloat(a[6]),g=f|0,f=Math.round(1E3*(f-g));b.setUTCHours(d,e,g,f);"Z"!==c&&(c=parseInt(c,10),a=parseInt(a[8],10)||0,a=-1E3*(60*60*c+60*a),b=new Date(b.getTime()+
+a))}}else b=new Date("invalid");return b}};OpenLayers.Format.Filter.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ogc:"http://www.opengis.net/ogc",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"ogc",schemaLocation:null,initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){var b={};this.readers.ogc.Filter.apply(this,[a,b]);return b.filter},readers:{ogc:{_expression:function(a){for(var b="",c=a.firstChild;c;c=
+c.nextSibling)switch(c.nodeType){case 1:a=this.readNode(c);a.property?b+="${"+a.property+"}":void 0!==a.value&&(b+=a.value);break;case 3:case 4:b+=c.nodeValue}return b},Filter:function(a,b){var c={fids:[],filters:[]};this.readChildNodes(a,c);0<c.fids.length?b.filter=new OpenLayers.Filter.FeatureId({fids:c.fids}):0<c.filters.length&&(b.filter=c.filters[0])},FeatureId:function(a,b){var c=a.getAttribute("fid");c&&b.fids.push(c)},And:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND});
+this.readChildNodes(a,c);b.filters.push(c)},Or:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.OR});this.readChildNodes(a,c);b.filters.push(c)},Not:function(a,b){var c=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.NOT});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLessThan:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsGreaterThan:function(a,
+b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLessThanOrEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsGreaterThanOrEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},
+PropertyIsBetween:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.BETWEEN});this.readChildNodes(a,c);b.filters.push(c)},Literal:function(a,b){b.value=OpenLayers.String.numericIf(this.getChildValue(a),!0)},PropertyName:function(a,b){b.property=this.getChildValue(a)},LowerBoundary:function(a,b){b.lowerBoundary=OpenLayers.String.numericIf(this.readers.ogc._expression.call(this,a),!0)},UpperBoundary:function(a,b){b.upperBoundary=OpenLayers.String.numericIf(this.readers.ogc._expression.call(this,
+a),!0)},Intersects:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.INTERSECTS)},Within:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.WITHIN)},Contains:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.CONTAINS)},DWithin:function(a,b){this.readSpatial(a,b,OpenLayers.Filter.Spatial.DWITHIN)},Distance:function(a,b){b.distance=parseInt(this.getChildValue(a));b.distanceUnits=a.getAttribute("units")},Function:function(a,b){},PropertyIsNull:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.IS_NULL});
+this.readChildNodes(a,c);b.filters.push(c)}}},readSpatial:function(a,b,c){c=new OpenLayers.Filter.Spatial({type:c});this.readChildNodes(a,c);c.value=c.components[0];delete c.components;b.filters.push(c)},encodeLiteral:function(a){a instanceof Date&&(a=OpenLayers.Date.toISOString(a));return a},writeOgcExpression:function(a,b){a instanceof OpenLayers.Filter.Function?this.writeNode("Function",a,b):this.writeNode("Literal",a,b);return b},write:function(a){return this.writers.ogc.Filter.apply(this,[a])},
+writers:{ogc:{Filter:function(a){var b=this.createElementNSPlus("ogc:Filter");this.writeNode(this.getFilterType(a),a,b);return b},_featureIds:function(a){for(var b=this.createDocumentFragment(),c=0,d=a.fids.length;c<d;++c)this.writeNode("ogc:FeatureId",a.fids[c],b);return b},FeatureId:function(a){return this.createElementNSPlus("ogc:FeatureId",{attributes:{fid:a}})},And:function(a){for(var b=this.createElementNSPlus("ogc:And"),c,d=0,e=a.filters.length;d<e;++d)c=a.filters[d],this.writeNode(this.getFilterType(c),
+c,b);return b},Or:function(a){for(var b=this.createElementNSPlus("ogc:Or"),c,d=0,e=a.filters.length;d<e;++d)c=a.filters[d],this.writeNode(this.getFilterType(c),c,b);return b},Not:function(a){var b=this.createElementNSPlus("ogc:Not");a=a.filters[0];this.writeNode(this.getFilterType(a),a,b);return b},PropertyIsLessThan:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLessThan");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsGreaterThan:function(a){var b=
+this.createElementNSPlus("ogc:PropertyIsGreaterThan");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLessThanOrEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLessThanOrEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsGreaterThanOrEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsGreaterThanOrEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);
+return b},PropertyIsBetween:function(a){var b=this.createElementNSPlus("ogc:PropertyIsBetween");this.writeNode("PropertyName",a,b);this.writeNode("LowerBoundary",a,b);this.writeNode("UpperBoundary",a,b);return b},PropertyName:function(a){return this.createElementNSPlus("ogc:PropertyName",{value:a.property})},Literal:function(a){return this.createElementNSPlus("ogc:Literal",{value:(this.encodeLiteral||OpenLayers.Format.Filter.v1.prototype.encodeLiteral)(a)})},LowerBoundary:function(a){var b=this.createElementNSPlus("ogc:LowerBoundary");
+this.writeOgcExpression(a.lowerBoundary,b);return b},UpperBoundary:function(a){var b=this.createElementNSPlus("ogc:UpperBoundary");this.writeNode("Literal",a.upperBoundary,b);return b},INTERSECTS:function(a){return this.writeSpatial(a,"Intersects")},WITHIN:function(a){return this.writeSpatial(a,"Within")},CONTAINS:function(a){return this.writeSpatial(a,"Contains")},DWITHIN:function(a){var b=this.writeSpatial(a,"DWithin");this.writeNode("Distance",a,b);return b},Distance:function(a){return this.createElementNSPlus("ogc:Distance",
+{attributes:{units:a.distanceUnits},value:a.distance})},Function:function(a){var b=this.createElementNSPlus("ogc:Function",{attributes:{name:a.name}});a=a.params;for(var c=0,d=a.length;c<d;c++)this.writeOgcExpression(a[c],b);return b},PropertyIsNull:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNull");this.writeNode("PropertyName",a,b);return b}}},getFilterType:function(a){var b=this.filterMap[a.type];if(!b)throw"Filter writing not supported for rule type: "+a.type;return b},filterMap:{"&&":"And",
+"||":"Or","!":"Not","==":"PropertyIsEqualTo","!=":"PropertyIsNotEqualTo","<":"PropertyIsLessThan",">":"PropertyIsGreaterThan","<=":"PropertyIsLessThanOrEqualTo",">=":"PropertyIsGreaterThanOrEqualTo","..":"PropertyIsBetween","~":"PropertyIsLike",NULL:"PropertyIsNull",BBOX:"BBOX",DWITHIN:"DWITHIN",WITHIN:"WITHIN",CONTAINS:"CONTAINS",INTERSECTS:"INTERSECTS",FID:"_featureIds"},CLASS_NAME:"OpenLayers.Format.Filter.v1"});OpenLayers.Geometry=OpenLayers.Class({id:null,parent:null,bounds:null,initialize:function(){this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){this.bounds=this.id=null},clone:function(){return new OpenLayers.Geometry},setBounds:function(a){a&&(this.bounds=a.clone())},clearBounds:function(){this.bounds=null;this.parent&&this.parent.clearBounds()},extendBounds:function(a){this.getBounds()?this.bounds.extend(a):this.setBounds(a)},getBounds:function(){null==this.bounds&&this.calculateBounds();
+return this.bounds},calculateBounds:function(){},distanceTo:function(a,b){},getVertices:function(a){},atPoint:function(a,b,c){var d=!1;null!=this.getBounds()&&null!=a&&(b=null!=b?b:0,c=null!=c?c:0,d=(new OpenLayers.Bounds(this.bounds.left-b,this.bounds.bottom-c,this.bounds.right+b,this.bounds.top+c)).containsLonLat(a));return d},getLength:function(){return 0},getArea:function(){return 0},getCentroid:function(){return null},toString:function(){return OpenLayers.Format&&OpenLayers.Format.WKT?OpenLayers.Format.WKT.prototype.write(new OpenLayers.Feature.Vector(this)):
+Object.prototype.toString.call(this)},CLASS_NAME:"OpenLayers.Geometry"});OpenLayers.Geometry.fromWKT=function(a){var b;if(OpenLayers.Format&&OpenLayers.Format.WKT){var c=OpenLayers.Geometry.fromWKT.format;c||(c=new OpenLayers.Format.WKT,OpenLayers.Geometry.fromWKT.format=c);a=c.read(a);if(a instanceof OpenLayers.Feature.Vector)b=a.geometry;else if(OpenLayers.Util.isArray(a)){b=a.length;for(var c=Array(b),d=0;d<b;++d)c[d]=a[d].geometry;b=new OpenLayers.Geometry.Collection(c)}}return b};
+OpenLayers.Geometry.segmentsIntersect=function(a,b,c){var d=c&&c.point;c=c&&c.tolerance;var e=!1,f=a.x1-b.x1,g=a.y1-b.y1,h=a.x2-a.x1,k=a.y2-a.y1,l=b.y2-b.y1,m=b.x2-b.x1,n=l*h-m*k,l=m*g-l*f,g=h*g-k*f;0==n?0==l&&0==g&&(e=!0):(f=l/n,n=g/n,0<=f&&(1>=f&&0<=n&&1>=n)&&(d?(h=a.x1+f*h,n=a.y1+f*k,e=new OpenLayers.Geometry.Point(h,n)):e=!0));if(c)if(e){if(d)a:for(a=[a,b],b=0;2>b;++b)for(f=a[b],k=1;3>k;++k)if(h=f["x"+k],n=f["y"+k],d=Math.sqrt(Math.pow(h-e.x,2)+Math.pow(n-e.y,2)),d<c){e.x=h;e.y=n;break a}}else a:for(a=
+[a,b],b=0;2>b;++b)for(h=a[b],n=a[(b+1)%2],k=1;3>k;++k)if(f={x:h["x"+k],y:h["y"+k]},g=OpenLayers.Geometry.distanceToSegment(f,n),g.distance<c){e=d?new OpenLayers.Geometry.Point(f.x,f.y):!0;break a}return e};OpenLayers.Geometry.distanceToSegment=function(a,b){var c=OpenLayers.Geometry.distanceSquaredToSegment(a,b);c.distance=Math.sqrt(c.distance);return c};
+OpenLayers.Geometry.distanceSquaredToSegment=function(a,b){var c=a.x,d=a.y,e=b.x1,f=b.y1,g=b.x2,h=b.y2,k=g-e,l=h-f,m=(k*(c-e)+l*(d-f))/(Math.pow(k,2)+Math.pow(l,2));0>=m||(1<=m?(e=g,f=h):(e+=m*k,f+=m*l));return{distance:Math.pow(e-c,2)+Math.pow(f-d,2),x:e,y:f,along:m}};OpenLayers.Geometry.Point=OpenLayers.Class(OpenLayers.Geometry,{x:null,y:null,initialize:function(a,b){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.x=parseFloat(a);this.y=parseFloat(b)},clone:function(a){null==a&&(a=new OpenLayers.Geometry.Point(this.x,this.y));OpenLayers.Util.applyDefaults(a,this);return a},calculateBounds:function(){this.bounds=new OpenLayers.Bounds(this.x,this.y,this.x,this.y)},distanceTo:function(a,b){var c=!(b&&!1===b.edge)&&b&&b.details,d,e,f,g,h;a instanceof
+OpenLayers.Geometry.Point?(e=this.x,f=this.y,g=a.x,h=a.y,d=Math.sqrt(Math.pow(e-g,2)+Math.pow(f-h,2)),d=c?{x0:e,y0:f,x1:g,y1:h,distance:d}:d):(d=a.distanceTo(this,b),c&&(d={x0:d.x1,y0:d.y1,x1:d.x0,y1:d.y0,distance:d.distance}));return d},equals:function(a){var b=!1;null!=a&&(b=this.x==a.x&&this.y==a.y||isNaN(this.x)&&isNaN(this.y)&&isNaN(a.x)&&isNaN(a.y));return b},toShortString:function(){return this.x+", "+this.y},move:function(a,b){this.x+=a;this.y+=b;this.clearBounds()},rotate:function(a,b){a*=
+Math.PI/180;var c=this.distanceTo(b),d=a+Math.atan2(this.y-b.y,this.x-b.x);this.x=b.x+c*Math.cos(d);this.y=b.y+c*Math.sin(d);this.clearBounds()},getCentroid:function(){return new OpenLayers.Geometry.Point(this.x,this.y)},resize:function(a,b,c){this.x=b.x+a*(void 0==c?1:c)*(this.x-b.x);this.y=b.y+a*(this.y-b.y);this.clearBounds();return this},intersects:function(a){var b=!1;return b="OpenLayers.Geometry.Point"==a.CLASS_NAME?this.equals(a):a.intersects(this)},transform:function(a,b){a&&b&&(OpenLayers.Projection.transform(this,
+a,b),this.bounds=null);return this},getVertices:function(a){return[this]},CLASS_NAME:"OpenLayers.Geometry.Point"});OpenLayers.Geometry.Collection=OpenLayers.Class(OpenLayers.Geometry,{components:null,componentTypes:null,initialize:function(a){OpenLayers.Geometry.prototype.initialize.apply(this,arguments);this.components=[];null!=a&&this.addComponents(a)},destroy:function(){this.components.length=0;this.components=null;OpenLayers.Geometry.prototype.destroy.apply(this,arguments)},clone:function(){for(var a=eval("new "+this.CLASS_NAME+"()"),b=0,c=this.components.length;b<c;b++)a.addComponent(this.components[b].clone());
+OpenLayers.Util.applyDefaults(a,this);return a},getComponentsString:function(){for(var a=[],b=0,c=this.components.length;b<c;b++)a.push(this.components[b].toShortString());return a.join(",")},calculateBounds:function(){this.bounds=null;var a=new OpenLayers.Bounds,b=this.components;if(b)for(var c=0,d=b.length;c<d;c++)a.extend(b[c].getBounds());null!=a.left&&(null!=a.bottom&&null!=a.right&&null!=a.top)&&this.setBounds(a)},addComponents:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0,c=a.length;b<
+c;b++)this.addComponent(a[b])},addComponent:function(a,b){var c=!1;if(a&&(null==this.componentTypes||-1<OpenLayers.Util.indexOf(this.componentTypes,a.CLASS_NAME))){if(null!=b&&b<this.components.length){var c=this.components.slice(0,b),d=this.components.slice(b,this.components.length);c.push(a);this.components=c.concat(d)}else this.components.push(a);a.parent=this;this.clearBounds();c=!0}return c},removeComponents:function(a){var b=!1;OpenLayers.Util.isArray(a)||(a=[a]);for(var c=a.length-1;0<=c;--c)b=
+this.removeComponent(a[c])||b;return b},removeComponent:function(a){OpenLayers.Util.removeItem(this.components,a);this.clearBounds();return!0},getLength:function(){for(var a=0,b=0,c=this.components.length;b<c;b++)a+=this.components[b].getLength();return a},getArea:function(){for(var a=0,b=0,c=this.components.length;b<c;b++)a+=this.components[b].getArea();return a},getGeodesicArea:function(a){for(var b=0,c=0,d=this.components.length;c<d;c++)b+=this.components[c].getGeodesicArea(a);return b},getCentroid:function(a){if(!a)return this.components.length&&
+this.components[0].getCentroid();a=this.components.length;if(!a)return!1;for(var b=[],c=[],d=0,e=Number.MAX_VALUE,f,g=0;g<a;++g){f=this.components[g];var h=f.getArea();f=f.getCentroid(!0);isNaN(h)||(isNaN(f.x)||isNaN(f.y))||(b.push(h),d+=h,e=h<e&&0<h?h:e,c.push(f))}a=b.length;if(0===d){for(g=0;g<a;++g)b[g]=1;d=b.length}else{for(g=0;g<a;++g)b[g]/=e;d/=e}for(var k=e=0,g=0;g<a;++g)f=c[g],h=b[g],e+=f.x*h,k+=f.y*h;return new OpenLayers.Geometry.Point(e/d,k/d)},getGeodesicLength:function(a){for(var b=0,
+c=0,d=this.components.length;c<d;c++)b+=this.components[c].getGeodesicLength(a);return b},move:function(a,b){for(var c=0,d=this.components.length;c<d;c++)this.components[c].move(a,b)},rotate:function(a,b){for(var c=0,d=this.components.length;c<d;++c)this.components[c].rotate(a,b)},resize:function(a,b,c){for(var d=0;d<this.components.length;++d)this.components[d].resize(a,b,c);return this},distanceTo:function(a,b){for(var c=!(b&&!1===b.edge)&&b&&b.details,d,e,f,g=Number.POSITIVE_INFINITY,h=0,k=this.components.length;h<
+k&&!(d=this.components[h].distanceTo(a,b),f=c?d.distance:d,f<g&&(g=f,e=d,0==g));++h);return e},equals:function(a){var b=!0;if(a&&a.CLASS_NAME&&this.CLASS_NAME==a.CLASS_NAME)if(OpenLayers.Util.isArray(a.components)&&a.components.length==this.components.length)for(var c=0,d=this.components.length;c<d;++c){if(!this.components[c].equals(a.components[c])){b=!1;break}}else b=!1;else b=!1;return b},transform:function(a,b){if(a&&b){for(var c=0,d=this.components.length;c<d;c++)this.components[c].transform(a,
+b);this.bounds=null}return this},intersects:function(a){for(var b=!1,c=0,d=this.components.length;c<d&&!(b=a.intersects(this.components[c]));++c);return b},getVertices:function(a){for(var b=[],c=0,d=this.components.length;c<d;++c)Array.prototype.push.apply(b,this.components[c].getVertices(a));return b},CLASS_NAME:"OpenLayers.Geometry.Collection"});OpenLayers.Geometry.MultiPoint=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Point"],addPoint:function(a,b){this.addComponent(a,b)},removePoint:function(a){this.removeComponent(a)},CLASS_NAME:"OpenLayers.Geometry.MultiPoint"});OpenLayers.Geometry.Curve=OpenLayers.Class(OpenLayers.Geometry.MultiPoint,{componentTypes:["OpenLayers.Geometry.Point"],getLength:function(){var a=0;if(this.components&&1<this.components.length)for(var b=1,c=this.components.length;b<c;b++)a+=this.components[b-1].distanceTo(this.components[b]);return a},getGeodesicLength:function(a){var b=this;if(a){var c=new OpenLayers.Projection("EPSG:4326");c.equals(a)||(b=this.clone().transform(a,c))}a=0;if(b.components&&1<b.components.length)for(var d,e=1,f=b.components.length;e<
+f;e++)c=b.components[e-1],d=b.components[e],a+=OpenLayers.Util.distVincenty({lon:c.x,lat:c.y},{lon:d.x,lat:d.y});return 1E3*a},CLASS_NAME:"OpenLayers.Geometry.Curve"});OpenLayers.Geometry.LineString=OpenLayers.Class(OpenLayers.Geometry.Curve,{removeComponent:function(a){var b=this.components&&2<this.components.length;b&&OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,arguments);return b},intersects:function(a){var b=!1,c=a.CLASS_NAME;if("OpenLayers.Geometry.LineString"==c||"OpenLayers.Geometry.LinearRing"==c||"OpenLayers.Geometry.Point"==c){var d=this.getSortedSegments();a="OpenLayers.Geometry.Point"==c?[{x1:a.x,y1:a.y,x2:a.x,y2:a.y}]:a.getSortedSegments();
+var e,f,g,h,k,l,m,n=0,p=d.length;a:for(;n<p;++n){c=d[n];e=c.x1;f=c.x2;g=c.y1;h=c.y2;var q=0,r=a.length;for(;q<r;++q){k=a[q];if(k.x1>f)break;if(!(k.x2<e||(l=k.y1,m=k.y2,Math.min(l,m)>Math.max(g,h)||Math.max(l,m)<Math.min(g,h)||!OpenLayers.Geometry.segmentsIntersect(c,k)))){b=!0;break a}}}}else b=a.intersects(this);return b},getSortedSegments:function(){for(var a=this.components.length-1,b=Array(a),c,d,e=0;e<a;++e)c=this.components[e],d=this.components[e+1],b[e]=c.x<d.x?{x1:c.x,y1:c.y,x2:d.x,y2:d.y}:
+{x1:d.x,y1:d.y,x2:c.x,y2:c.y};return b.sort(function(a,b){return a.x1-b.x1})},splitWithSegment:function(a,b){for(var c=!(b&&!1===b.edge),d=b&&b.tolerance,e=[],f=this.getVertices(),g=[],h=[],k=!1,l,m,n,p={point:!0,tolerance:d},q=null,r=0,s=f.length-2;r<=s;++r)if(d=f[r],g.push(d.clone()),l=f[r+1],m={x1:d.x,y1:d.y,x2:l.x,y2:l.y},m=OpenLayers.Geometry.segmentsIntersect(a,m,p),m instanceof OpenLayers.Geometry.Point&&((n=m.x===a.x1&&m.y===a.y1||m.x===a.x2&&m.y===a.y2||m.equals(d)||m.equals(l)?!0:!1)||c))m.equals(h[h.length-
+1])||h.push(m.clone()),0===r&&m.equals(d)||m.equals(l)||(k=!0,m.equals(d)||g.push(m),e.push(new OpenLayers.Geometry.LineString(g)),g=[m.clone()]);k&&(g.push(l.clone()),e.push(new OpenLayers.Geometry.LineString(g)));if(0<h.length)var t=a.x1<a.x2?1:-1,u=a.y1<a.y2?1:-1,q={lines:e,points:h.sort(function(a,b){return t*a.x-t*b.x||u*a.y-u*b.y})};return q},split:function(a,b){var c=null,d=b&&b.mutual,e,f,g,h;if(a instanceof OpenLayers.Geometry.LineString){var k=this.getVertices(),l,m,n,p,q,r=[];g=[];for(var s=
+0,t=k.length-2;s<=t;++s){l=k[s];m=k[s+1];n={x1:l.x,y1:l.y,x2:m.x,y2:m.y};h=h||[a];d&&r.push(l.clone());for(var u=0;u<h.length;++u)if(p=h[u].splitWithSegment(n,b))if(q=p.lines,0<q.length&&(q.unshift(u,1),Array.prototype.splice.apply(h,q),u+=q.length-2),d)for(var v=0,w=p.points.length;v<w;++v)q=p.points[v],q.equals(l)||(r.push(q),g.push(new OpenLayers.Geometry.LineString(r)),r=q.equals(m)?[]:[q.clone()])}d&&(0<g.length&&0<r.length)&&(r.push(m.clone()),g.push(new OpenLayers.Geometry.LineString(r)))}else c=
+a.splitWith(this,b);h&&1<h.length?f=!0:h=[];g&&1<g.length?e=!0:g=[];if(f||e)c=d?[g,h]:h;return c},splitWith:function(a,b){return a.split(this,b)},getVertices:function(a){return!0===a?[this.components[0],this.components[this.components.length-1]]:!1===a?this.components.slice(1,this.components.length-1):this.components.slice()},distanceTo:function(a,b){var c=!(b&&!1===b.edge)&&b&&b.details,d,e={},f=Number.POSITIVE_INFINITY;if(a instanceof OpenLayers.Geometry.Point){for(var g=this.getSortedSegments(),
+h=a.x,k=a.y,l,m=0,n=g.length;m<n;++m)if(l=g[m],d=OpenLayers.Geometry.distanceToSegment(a,l),d.distance<f){if(f=d.distance,e=d,0===f)break}else if(l.x2>h&&(k>l.y1&&k<l.y2||k<l.y1&&k>l.y2))break;e=c?{distance:e.distance,x0:e.x,y0:e.y,x1:h,y1:k}:e.distance}else if(a instanceof OpenLayers.Geometry.LineString){var g=this.getSortedSegments(),h=a.getSortedSegments(),p,q,r=h.length,s={point:!0},m=0,n=g.length;a:for(;m<n;++m){k=g[m];l=k.x1;q=k.y1;for(var t=0;t<r;++t)if(d=h[t],p=OpenLayers.Geometry.segmentsIntersect(k,
+d,s)){f=0;e={distance:0,x0:p.x,y0:p.y,x1:p.x,y1:p.y};break a}else d=OpenLayers.Geometry.distanceToSegment({x:l,y:q},d),d.distance<f&&(f=d.distance,e={distance:f,x0:l,y0:q,x1:d.x,y1:d.y})}c||(e=e.distance);0!==f&&k&&(d=a.distanceTo(new OpenLayers.Geometry.Point(k.x2,k.y2),b),m=c?d.distance:d,m<f&&(e=c?{distance:f,x0:d.x1,y0:d.y1,x1:d.x0,y1:d.y0}:m))}else e=a.distanceTo(this,b),c&&(e={distance:e.distance,x0:e.x1,y0:e.y1,x1:e.x0,y1:e.y0});return e},simplify:function(a){if(this&&null!==this){var b=this.getVertices();
+if(3>b.length)return this;var c=function(a,b,d,k){for(var l=0,m=0,n=b,p;n<d;n++){p=a[b];var q=a[d],r=a[n],r=Math.abs(0.5*(p.x*q.y+q.x*r.y+r.x*p.y-q.x*p.y-r.x*q.y-p.x*r.y));p=Math.sqrt(Math.pow(p.x-q.x,2)+Math.pow(p.y-q.y,2));p=2*(r/p);p>l&&(l=p,m=n)}l>k&&m!=b&&(e.push(m),c(a,b,m,k),c(a,m,d,k))},d=b.length-1,e=[];e.push(0);for(e.push(d);b[0].equals(b[d]);)d--,e.push(d);c(b,0,d,a);a=[];e.sort(function(a,b){return a-b});for(d=0;d<e.length;d++)a.push(b[e[d]]);return new OpenLayers.Geometry.LineString(a)}return this},
+CLASS_NAME:"OpenLayers.Geometry.LineString"});OpenLayers.Geometry.MultiLineString=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LineString"],split:function(a,b){for(var c=null,d=b&&b.mutual,e,f,g,h,k=[],l=[a],m=0,n=this.components.length;m<n;++m){f=this.components[m];g=!1;for(var p=0;p<l.length;++p)if(e=f.split(l[p],b)){if(d){g=e[0];for(var q=0,r=g.length;q<r;++q)0===q&&k.length?k[k.length-1].addComponent(g[q]):k.push(new OpenLayers.Geometry.MultiLineString([g[q]]));g=!0;e=e[1]}if(e.length){e.unshift(p,
+1);Array.prototype.splice.apply(l,e);break}}g||(k.length?k[k.length-1].addComponent(f.clone()):k=[new OpenLayers.Geometry.MultiLineString(f.clone())])}k&&1<k.length?g=!0:k=[];l&&1<l.length?h=!0:l=[];if(g||h)c=d?[k,l]:l;return c},splitWith:function(a,b){var c=null,d=b&&b.mutual,e,f,g,h,k,l;if(a instanceof OpenLayers.Geometry.LineString){l=[];k=[a];for(var m=0,n=this.components.length;m<n;++m){g=!1;f=this.components[m];for(var p=0;p<k.length;++p)if(e=k[p].split(f,b)){d&&(g=e[0],g.length&&(g.unshift(p,
+1),Array.prototype.splice.apply(k,g),p+=g.length-2),e=e[1],0===e.length&&(e=[f.clone()]));g=0;for(var q=e.length;g<q;++g)0===g&&l.length?l[l.length-1].addComponent(e[g]):l.push(new OpenLayers.Geometry.MultiLineString([e[g]]));g=!0}g||(l.length?l[l.length-1].addComponent(f.clone()):l=[new OpenLayers.Geometry.MultiLineString([f.clone()])])}}else c=a.split(this);k&&1<k.length?h=!0:k=[];l&&1<l.length?g=!0:l=[];if(h||g)c=d?[k,l]:l;return c},CLASS_NAME:"OpenLayers.Geometry.MultiLineString"});OpenLayers.Geometry.LinearRing=OpenLayers.Class(OpenLayers.Geometry.LineString,{componentTypes:["OpenLayers.Geometry.Point"],addComponent:function(a,b){var c=!1,d=this.components.pop();null==b&&a.equals(d)||(c=OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,arguments));OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[this.components[0]]);return c},removeComponent:function(a){var b=this.components&&3<this.components.length;b&&(this.components.pop(),OpenLayers.Geometry.Collection.prototype.removeComponent.apply(this,
+arguments),OpenLayers.Geometry.Collection.prototype.addComponent.apply(this,[this.components[0]]));return b},move:function(a,b){for(var c=0,d=this.components.length;c<d-1;c++)this.components[c].move(a,b)},rotate:function(a,b){for(var c=0,d=this.components.length;c<d-1;++c)this.components[c].rotate(a,b)},resize:function(a,b,c){for(var d=0,e=this.components.length;d<e-1;++d)this.components[d].resize(a,b,c);return this},transform:function(a,b){if(a&&b){for(var c=0,d=this.components.length;c<d-1;c++)this.components[c].transform(a,
+b);this.bounds=null}return this},getCentroid:function(){if(this.components){var a=this.components.length;if(0<a&&2>=a)return this.components[0].clone();if(2<a){var b=0,c=0,d=this.components[0].x,e=this.components[0].y,f=-1*this.getArea();if(0!=f){for(var g=0;g<a-1;g++)var h=this.components[g],k=this.components[g+1],b=b+(h.x+k.x-2*d)*((h.x-d)*(k.y-e)-(k.x-d)*(h.y-e)),c=c+(h.y+k.y-2*e)*((h.x-d)*(k.y-e)-(k.x-d)*(h.y-e));b=d+b/(6*f);a=e+c/(6*f)}else{for(g=0;g<a-1;g++)b+=this.components[g].x,c+=this.components[g].y;
+b/=a-1;a=c/(a-1)}return new OpenLayers.Geometry.Point(b,a)}return null}},getArea:function(){var a=0;if(this.components&&2<this.components.length){for(var b=a=0,c=this.components.length;b<c-1;b++)var d=this.components[b],e=this.components[b+1],a=a+(d.x+e.x)*(e.y-d.y);a=-a/2}return a},getGeodesicArea:function(a){var b=this;if(a){var c=new OpenLayers.Projection("EPSG:4326");c.equals(a)||(b=this.clone().transform(a,c))}a=0;c=b.components&&b.components.length;if(2<c){for(var d,e,f=0;f<c-1;f++)d=b.components[f],
+e=b.components[f+1],a+=OpenLayers.Util.rad(e.x-d.x)*(2+Math.sin(OpenLayers.Util.rad(d.y))+Math.sin(OpenLayers.Util.rad(e.y)));a=40680631590769*a/2}return a},containsPoint:function(a){var b=OpenLayers.Number.limitSigDigs,c=b(a.x,14);a=b(a.y,14);for(var d=this.components.length-1,e,f,g,h,k,l=0,m=0;m<d;++m)if(e=this.components[m],g=b(e.x,14),e=b(e.y,14),f=this.components[m+1],h=b(f.x,14),f=b(f.y,14),e==f){if(a==e&&(g<=h&&c>=g&&c<=h||g>=h&&c<=g&&c>=h)){l=-1;break}}else{k=b((a-f)*((h-g)/(f-e))+h,14);if(k==
+c&&(e<f&&a>=e&&a<=f||e>f&&a<=e&&a>=f)){l=-1;break}k<=c||g!=h&&(k<Math.min(g,h)||k>Math.max(g,h))||(e<f&&a>=e&&a<f||e>f&&a<e&&a>=f)&&++l}return-1==l?1:!!(l&1)},intersects:function(a){var b=!1;if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.containsPoint(a);else if("OpenLayers.Geometry.LineString"==a.CLASS_NAME)b=a.intersects(this);else if("OpenLayers.Geometry.LinearRing"==a.CLASS_NAME)b=OpenLayers.Geometry.LineString.prototype.intersects.apply(this,[a]);else for(var c=0,d=a.components.length;c<
+d&&!(b=a.components[c].intersects(this));++c);return b},getVertices:function(a){return!0===a?[]:this.components.slice(0,this.components.length-1)},CLASS_NAME:"OpenLayers.Geometry.LinearRing"});OpenLayers.Geometry.Polygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.LinearRing"],getArea:function(){var a=0;if(this.components&&0<this.components.length)for(var a=a+Math.abs(this.components[0].getArea()),b=1,c=this.components.length;b<c;b++)a-=Math.abs(this.components[b].getArea());return a},getGeodesicArea:function(a){var b=0;if(this.components&&0<this.components.length)for(var b=b+Math.abs(this.components[0].getGeodesicArea(a)),c=1,d=this.components.length;c<
+d;c++)b-=Math.abs(this.components[c].getGeodesicArea(a));return b},containsPoint:function(a){var b=this.components.length,c=!1;if(0<b&&(c=this.components[0].containsPoint(a),1!==c&&c&&1<b))for(var d,e=1;e<b;++e)if(d=this.components[e].containsPoint(a)){c=1===d?1:!1;break}return c},intersects:function(a){var b=!1,c,d;if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.containsPoint(a);else if("OpenLayers.Geometry.LineString"==a.CLASS_NAME||"OpenLayers.Geometry.LinearRing"==a.CLASS_NAME){c=0;for(d=
+this.components.length;c<d&&!(b=a.intersects(this.components[c]));++c);if(!b)for(c=0,d=a.components.length;c<d&&!(b=this.containsPoint(a.components[c]));++c);}else for(c=0,d=a.components.length;c<d&&!(b=this.intersects(a.components[c]));++c);if(!b&&"OpenLayers.Geometry.Polygon"==a.CLASS_NAME){var e=this.components[0];c=0;for(d=e.components.length;c<d&&!(b=a.containsPoint(e.components[c]));++c);}return b},distanceTo:function(a,b){return b&&!1===b.edge&&this.intersects(a)?0:OpenLayers.Geometry.Collection.prototype.distanceTo.apply(this,
+[a,b])},CLASS_NAME:"OpenLayers.Geometry.Polygon"});OpenLayers.Geometry.Polygon.createRegularPolygon=function(a,b,c,d){var e=Math.PI*(1/c-0.5);d&&(e+=d/180*Math.PI);for(var f,g=[],h=0;h<c;++h)f=e+2*h*Math.PI/c,d=a.x+b*Math.cos(f),f=a.y+b*Math.sin(f),g.push(new OpenLayers.Geometry.Point(d,f));a=new OpenLayers.Geometry.LinearRing(g);return new OpenLayers.Geometry.Polygon([a])};OpenLayers.Geometry.MultiPolygon=OpenLayers.Class(OpenLayers.Geometry.Collection,{componentTypes:["OpenLayers.Geometry.Polygon"],CLASS_NAME:"OpenLayers.Geometry.MultiPolygon"});OpenLayers.Format.GML=OpenLayers.Class(OpenLayers.Format.XML,{featureNS:"http://mapserver.gis.umn.edu/mapserver",featurePrefix:"feature",featureName:"featureMember",layerName:"features",geometryName:"geometry",collectionName:"FeatureCollection",gmlns:"http://www.opengis.net/gml",extractAttributes:!0,xy:!0,initialize:function(a){this.regExes={trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g};OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"==
+typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a=this.getElementsByTagNameNS(a.documentElement,this.gmlns,this.featureName);for(var b=[],c=0;c<a.length;c++){var d=this.parseFeature(a[c]);d&&b.push(d)}return b},parseFeature:function(a){for(var b="MultiPolygon Polygon MultiLineString LineString MultiPoint Point Envelope".split(" "),c,d,e,f=0;f<b.length;++f)if(c=b[f],d=this.getElementsByTagNameNS(a,this.gmlns,c),0<d.length){if(e=this.parseGeometry[c.toLowerCase()])e=e.apply(this,
+[d[0]]),this.internalProjection&&this.externalProjection&&e.transform(this.externalProjection,this.internalProjection);else throw new TypeError("Unsupported geometry type: "+c);break}var g;c=this.getElementsByTagNameNS(a,this.gmlns,"Box");for(f=0;f<c.length;++f)b=c[f],d=this.parseGeometry.box.apply(this,[b]),b=b.parentNode,"boundedBy"===(b.localName||b.nodeName.split(":").pop())?g=d:e=d.toGeometry();var h;this.extractAttributes&&(h=this.parseAttributes(a));h=new OpenLayers.Feature.Vector(e,h);h.bounds=
+g;h.gml={featureType:a.firstChild.nodeName.split(":")[1],featureNS:a.firstChild.namespaceURI,featureNSPrefix:a.firstChild.prefix};a=a.firstChild;for(var k;a&&(1!=a.nodeType||!(k=a.getAttribute("fid")||a.getAttribute("id")));)a=a.nextSibling;h.fid=k;return h},parseGeometry:{point:function(a){var b,c;c=[];b=this.getElementsByTagNameNS(a,this.gmlns,"pos");0<b.length&&(c=b[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));0==c.length&&(b=this.getElementsByTagNameNS(a,
+this.gmlns,"coordinates"),0<b.length&&(c=b[0].firstChild.nodeValue,c=c.replace(this.regExes.removeSpace,""),c=c.split(",")));0==c.length&&(b=this.getElementsByTagNameNS(a,this.gmlns,"coord"),0<b.length&&(a=this.getElementsByTagNameNS(b[0],this.gmlns,"X"),b=this.getElementsByTagNameNS(b[0],this.gmlns,"Y"),0<a.length&&0<b.length&&(c=[a[0].firstChild.nodeValue,b[0].firstChild.nodeValue])));2==c.length&&(c[2]=null);return this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1],
+c[0],c[2])},multipoint:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"Point");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.point.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiPoint(b)},linestring:function(a,b){var c,d;d=[];var e=[];c=this.getElementsByTagNameNS(a,this.gmlns,"posList");if(0<c.length){d=this.getChildValue(c[0]);d=d.replace(this.regExes.trimSpace,"");d=d.split(this.regExes.splitSpace);var f=parseInt(c[0].getAttribute("dimension")),
+g,h,k;for(c=0;c<d.length/f;++c)g=c*f,h=d[g],k=d[g+1],g=2==f?null:d[g+2],this.xy?e.push(new OpenLayers.Geometry.Point(h,k,g)):e.push(new OpenLayers.Geometry.Point(k,h,g))}if(0==d.length&&(c=this.getElementsByTagNameNS(a,this.gmlns,"coordinates"),0<c.length))for(d=this.getChildValue(c[0]),d=d.replace(this.regExes.trimSpace,""),d=d.replace(this.regExes.trimComma,","),f=d.split(this.regExes.splitSpace),c=0;c<f.length;++c)d=f[c].split(","),2==d.length&&(d[2]=null),this.xy?e.push(new OpenLayers.Geometry.Point(d[0],
+d[1],d[2])):e.push(new OpenLayers.Geometry.Point(d[1],d[0],d[2]));d=null;0!=e.length&&(d=b?new OpenLayers.Geometry.LinearRing(e):new OpenLayers.Geometry.LineString(e));return d},multilinestring:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"LineString");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.linestring.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiLineString(b)},polygon:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"LinearRing");
+var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.linestring.apply(this,[a[d],!0]))&&b.push(c);return new OpenLayers.Geometry.Polygon(b)},multipolygon:function(a){a=this.getElementsByTagNameNS(a,this.gmlns,"Polygon");var b=[];if(0<a.length)for(var c,d=0;d<a.length;++d)(c=this.parseGeometry.polygon.apply(this,[a[d]]))&&b.push(c);return new OpenLayers.Geometry.MultiPolygon(b)},envelope:function(a){var b=[],c,d,e=this.getElementsByTagNameNS(a,this.gmlns,"lowerCorner");if(0<e.length){c=
+[];0<e.length&&(c=e[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));2==c.length&&(c[2]=null);var f=this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2])}a=this.getElementsByTagNameNS(a,this.gmlns,"upperCorner");if(0<a.length){c=[];0<a.length&&(c=a[0].firstChild.nodeValue,c=c.replace(this.regExes.trimSpace,""),c=c.split(this.regExes.splitSpace));2==c.length&&(c[2]=null);var g=this.xy?new OpenLayers.Geometry.Point(c[0],
+c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2])}f&&g&&(b.push(new OpenLayers.Geometry.Point(f.x,f.y)),b.push(new OpenLayers.Geometry.Point(g.x,f.y)),b.push(new OpenLayers.Geometry.Point(g.x,g.y)),b.push(new OpenLayers.Geometry.Point(f.x,g.y)),b.push(new OpenLayers.Geometry.Point(f.x,f.y)),b=new OpenLayers.Geometry.LinearRing(b),d=new OpenLayers.Geometry.Polygon([b]));return d},box:function(a){var b=this.getElementsByTagNameNS(a,this.gmlns,"coordinates"),c=a=null;0<b.length&&(b=b[0].firstChild.nodeValue,
+b=b.split(" "),2==b.length&&(a=b[0].split(","),c=b[1].split(",")));if(null!==a&&null!==c)return new OpenLayers.Bounds(parseFloat(a[0]),parseFloat(a[1]),parseFloat(c[0]),parseFloat(c[1]))}},parseAttributes:function(a){var b={};a=a.firstChild;for(var c,d,e;a;){if(1==a.nodeType){a=a.childNodes;for(c=0;c<a.length;++c)if(d=a[c],1==d.nodeType)if(e=d.childNodes,1==e.length){if(e=e[0],3==e.nodeType||4==e.nodeType)d=d.prefix?d.nodeName.split(":")[1]:d.nodeName,e=e.nodeValue.replace(this.regExes.trimSpace,
+""),b[d]=e}else b[d.nodeName.split(":").pop()]=null;break}a=a.nextSibling}return b},write:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=this.createElementNS("http://www.opengis.net/wfs","wfs:"+this.collectionName),c=0;c<a.length;c++)b.appendChild(this.createFeatureXML(a[c]));return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFeatureXML:function(a){var b=this.buildGeometryNode(a.geometry),c=this.createElementNS(this.featureNS,this.featurePrefix+":"+this.geometryName);c.appendChild(b);
+var b=this.createElementNS(this.gmlns,"gml:"+this.featureName),d=this.createElementNS(this.featureNS,this.featurePrefix+":"+this.layerName);d.setAttribute("fid",a.fid||a.id);d.appendChild(c);for(var e in a.attributes){var c=this.createTextNode(a.attributes[e]),f=e.substring(e.lastIndexOf(":")+1),f=this.createElementNS(this.featureNS,this.featurePrefix+":"+f);f.appendChild(c);d.appendChild(f)}b.appendChild(d);return b},buildGeometryNode:function(a){this.externalProjection&&this.internalProjection&&
+(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));var b=a.CLASS_NAME,b=b.substring(b.lastIndexOf(".")+1);return this.buildGeometry[b.toLowerCase()].apply(this,[a])},buildGeometry:{point:function(a){var b=this.createElementNS(this.gmlns,"gml:Point");b.appendChild(this.buildCoordinatesNode(a));return b},multipoint:function(a){var b=this.createElementNS(this.gmlns,"gml:MultiPoint");a=a.components;for(var c,d,e=0;e<a.length;e++)c=this.createElementNS(this.gmlns,"gml:pointMember"),
+d=this.buildGeometry.point.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},linestring:function(a){var b=this.createElementNS(this.gmlns,"gml:LineString");b.appendChild(this.buildCoordinatesNode(a));return b},multilinestring:function(a){var b=this.createElementNS(this.gmlns,"gml:MultiLineString");a=a.components;for(var c,d,e=0;e<a.length;++e)c=this.createElementNS(this.gmlns,"gml:lineStringMember"),d=this.buildGeometry.linestring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);
+return b},linearring:function(a){var b=this.createElementNS(this.gmlns,"gml:LinearRing");b.appendChild(this.buildCoordinatesNode(a));return b},polygon:function(a){var b=this.createElementNS(this.gmlns,"gml:Polygon");a=a.components;for(var c,d,e=0;e<a.length;++e)c=0==e?"outerBoundaryIs":"innerBoundaryIs",c=this.createElementNS(this.gmlns,"gml:"+c),d=this.buildGeometry.linearring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},multipolygon:function(a){var b=this.createElementNS(this.gmlns,
+"gml:MultiPolygon");a=a.components;for(var c,d,e=0;e<a.length;++e)c=this.createElementNS(this.gmlns,"gml:polygonMember"),d=this.buildGeometry.polygon.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},bounds:function(a){var b=this.createElementNS(this.gmlns,"gml:Box");b.appendChild(this.buildCoordinatesNode(a));return b}},buildCoordinatesNode:function(a){var b=this.createElementNS(this.gmlns,"gml:coordinates");b.setAttribute("decimal",".");b.setAttribute("cs",",");b.setAttribute("ts",
+" ");var c=[];if(a instanceof OpenLayers.Bounds)c.push(a.left+","+a.bottom),c.push(a.right+","+a.top);else{a=a.components?a.components:[a];for(var d=0;d<a.length;d++)c.push(a[d].x+","+a[d].y)}c=this.createTextNode(c.join(" "));b.appendChild(c);return b},CLASS_NAME:"OpenLayers.Format.GML"});OpenLayers.Format.GML||(OpenLayers.Format.GML={});
+OpenLayers.Format.GML.Base=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",wfs:"http://www.opengis.net/wfs"},defaultPrefix:"gml",schemaLocation:null,featureType:null,featureNS:null,geometryName:"geometry",extractAttributes:!0,srsName:null,xy:!0,geometryTypes:null,singleFeatureType:null,regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g,featureMember:/^(.*:)?featureMembers?$/},
+initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);this.setGeometryTypes();a&&a.featureNS&&this.setNamespace("feature",a.featureNS);this.singleFeatureType=!a||"string"===typeof a.featureType},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b=[];this.readNode(a,{features:b},!0);if(0==b.length){var c=this.getElementsByTagNameNS(a,this.namespaces.gml,"featureMember");if(c.length){a=
+0;for(var d=c.length;a<d;++a)this.readNode(c[a],{features:b},!0)}else c=this.getElementsByTagNameNS(a,this.namespaces.gml,"featureMembers"),c.length&&this.readNode(c[0],{features:b},!0)}return b},readNode:function(a,b,c){!0===c&&!0===this.autoConfig&&(this.featureType=null,delete this.namespaceAlias[this.featureNS],delete this.namespaces.feature,this.featureNS=null);this.featureNS||(a.prefix in this.namespaces||a.parentNode.namespaceURI!=this.namespaces.gml||!this.regExes.featureMember.test(a.parentNode.nodeName))||
+(this.featureType=a.nodeName.split(":").pop(),this.setNamespace("feature",a.namespaceURI),this.featureNS=a.namespaceURI,this.autoConfig=!0);return OpenLayers.Format.XML.prototype.readNode.apply(this,[a,b])},readers:{gml:{_inherit:function(a,b,c){},featureMember:function(a,b){this.readChildNodes(a,b)},featureMembers:function(a,b){this.readChildNodes(a,b)},name:function(a,b){b.name=this.getChildValue(a)},boundedBy:function(a,b){var c={};this.readChildNodes(a,c);c.components&&0<c.components.length&&
+(b.bounds=c.components[0])},Point:function(a,b){var c={points:[]};this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(c.points[0])},coordinates:function(a,b){for(var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace),d,e=c.length,f=Array(e),g=0;g<e;++g)d=c[g].split(","),f[g]=this.xy?new OpenLayers.Geometry.Point(d[0],d[1],d[2]):new OpenLayers.Geometry.Point(d[1],d[0],d[2]);b.points=f},coord:function(a,
+b){var c={};this.readChildNodes(a,c);b.points||(b.points=[]);b.points.push(new OpenLayers.Geometry.Point(c.x,c.y,c.z))},X:function(a,b){b.x=this.getChildValue(a)},Y:function(a,b){b.y=this.getChildValue(a)},Z:function(a,b){b.z=this.getChildValue(a)},MultiPoint:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiPoint(c.components)]},pointMember:function(a,b){this.readChildNodes(a,b)},LineString:function(a,
+b){var c={};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.LineString(c.points))},MultiLineString:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiLineString(c.components)]},lineStringMember:function(a,b){this.readChildNodes(a,b)},Polygon:function(a,b){var c={outer:null,inner:[]};this.readers.gml._inherit.apply(this,
+[a,c,b]);this.readChildNodes(a,c);c.inner.unshift(c.outer);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.Polygon(c.inner))},LinearRing:function(a,b){var c={};this.readers.gml._inherit.apply(this,[a,c]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.LinearRing(c.points)]},MultiPolygon:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.MultiPolygon(c.components)]},
+polygonMember:function(a,b){this.readChildNodes(a,b)},GeometryCollection:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components=[new OpenLayers.Geometry.Collection(c.components)]},geometryMember:function(a,b){this.readChildNodes(a,b)}},feature:{"*":function(a,b){var c,d=a.localName||a.nodeName.split(":").pop();b.features?this.singleFeatureType||-1===OpenLayers.Util.indexOf(this.featureType,d)?d===this.featureType&&(c="_typeName"):c=
+"_typeName":0==a.childNodes.length||1==a.childNodes.length&&3==a.firstChild.nodeType?this.extractAttributes&&(c="_attribute"):c="_geometry";c&&this.readers.feature[c].apply(this,[a,b])},_typeName:function(a,b){var c={components:[],attributes:{}};this.readChildNodes(a,c);c.name&&(c.attributes.name=c.name);var d=new OpenLayers.Feature.Vector(c.components[0],c.attributes);this.singleFeatureType||(d.type=a.nodeName.split(":").pop(),d.namespace=a.namespaceURI);var e=a.getAttribute("fid")||this.getAttributeNS(a,
+this.namespaces.gml,"id");e&&(d.fid=e);this.internalProjection&&(this.externalProjection&&d.geometry)&&d.geometry.transform(this.externalProjection,this.internalProjection);c.bounds&&(d.bounds=c.bounds);b.features.push(d)},_geometry:function(a,b){this.geometryName||(this.geometryName=a.nodeName.split(":").pop());this.readChildNodes(a,b)},_attribute:function(a,b){var c=a.localName||a.nodeName.split(":").pop(),d=this.getChildValue(a);b.attributes[c]=d}},wfs:{FeatureCollection:function(a,b){this.readChildNodes(a,
+b)}}},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"featureMembers":"featureMember";a=this.writeNode("gml:"+b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:{featureMember:function(a){var b=this.createElementNSPlus("gml:featureMember");this.writeNode("feature:_typeName",a,b);return b},MultiPoint:function(a){var b=this.createElementNSPlus("gml:MultiPoint");a=a.components||[a];
+for(var c=0,d=a.length;c<d;++c)this.writeNode("pointMember",a[c],b);return b},pointMember:function(a){var b=this.createElementNSPlus("gml:pointMember");this.writeNode("Point",a,b);return b},MultiLineString:function(a){var b=this.createElementNSPlus("gml:MultiLineString");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("lineStringMember",a[c],b);return b},lineStringMember:function(a){var b=this.createElementNSPlus("gml:lineStringMember");this.writeNode("LineString",a,b);return b},
+MultiPolygon:function(a){var b=this.createElementNSPlus("gml:MultiPolygon");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("polygonMember",a[c],b);return b},polygonMember:function(a){var b=this.createElementNSPlus("gml:polygonMember");this.writeNode("Polygon",a,b);return b},GeometryCollection:function(a){for(var b=this.createElementNSPlus("gml:GeometryCollection"),c=0,d=a.components.length;c<d;++c)this.writeNode("geometryMember",a.components[c],b);return b},geometryMember:function(a){var b=
+this.createElementNSPlus("gml:geometryMember");a=this.writeNode("feature:_geometry",a);b.appendChild(a.firstChild);return b}},feature:{_typeName:function(a){var b=this.createElementNSPlus("feature:"+this.featureType,{attributes:{fid:a.fid}});a.geometry&&this.writeNode("feature:_geometry",a.geometry,b);for(var c in a.attributes){var d=a.attributes[c];null!=d&&this.writeNode("feature:_attribute",{name:c,value:d},b)}return b},_geometry:function(a){this.externalProjection&&this.internalProjection&&(a=
+a.clone().transform(this.internalProjection,this.externalProjection));var b=this.createElementNSPlus("feature:"+this.geometryName);a=this.writeNode("gml:"+this.geometryTypes[a.CLASS_NAME],a,b);this.srsName&&a.setAttribute("srsName",this.srsName);return b},_attribute:function(a){return this.createElementNSPlus("feature:"+a.name,{value:a.value})}},wfs:{FeatureCollection:function(a){for(var b=this.createElementNSPlus("wfs:FeatureCollection"),c=0,d=a.length;c<d;++c)this.writeNode("gml:featureMember",
+a[c],b);return b}}},setGeometryTypes:function(){this.geometryTypes={"OpenLayers.Geometry.Point":"Point","OpenLayers.Geometry.MultiPoint":"MultiPoint","OpenLayers.Geometry.LineString":"LineString","OpenLayers.Geometry.MultiLineString":"MultiLineString","OpenLayers.Geometry.Polygon":"Polygon","OpenLayers.Geometry.MultiPolygon":"MultiPolygon","OpenLayers.Geometry.Collection":"GeometryCollection"}},CLASS_NAME:"OpenLayers.Format.GML.Base"});OpenLayers.Format.GML.v3=OpenLayers.Class(OpenLayers.Format.GML.Base,{schemaLocation:"http://www.opengis.net/gml http://schemas.opengis.net/gml/3.1.1/profiles/gmlsfProfile/1.0.0/gmlsf.xsd",curve:!1,multiCurve:!0,surface:!1,multiSurface:!0,initialize:function(a){OpenLayers.Format.GML.Base.prototype.initialize.apply(this,[a])},readers:{gml:OpenLayers.Util.applyDefaults({_inherit:function(a,b,c){if(a=parseInt(a.getAttribute("srsDimension"),10)||c&&c.srsDimension)b.srsDimension=a},featureMembers:function(a,
+b){this.readChildNodes(a,b)},Curve:function(a,b){var c={points:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);b.components||(b.components=[]);b.components.push(new OpenLayers.Geometry.LineString(c.points))},segments:function(a,b){this.readChildNodes(a,b)},LineStringSegment:function(a,b){var c={};this.readChildNodes(a,c);c.points&&Array.prototype.push.apply(b.points,c.points)},pos:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(this.regExes.splitSpace),
+c=this.xy?new OpenLayers.Geometry.Point(c[0],c[1],c[2]):new OpenLayers.Geometry.Point(c[1],c[0],c[2]);b.points=[c]},posList:function(a,b){for(var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(this.regExes.splitSpace),d=b.srsDimension||parseInt(a.getAttribute("srsDimension")||a.getAttribute("dimension"),10)||2,e,f,g,h=Array(c.length/d),k=0,l=c.length;k<l;k+=d)e=c[k],f=c[k+1],g=2==d?void 0:c[k+2],h[k/d]=this.xy?new OpenLayers.Geometry.Point(e,f,g):new OpenLayers.Geometry.Point(f,
+e,g);b.points=h},Surface:function(a,b){this.readChildNodes(a,b)},patches:function(a,b){this.readChildNodes(a,b)},PolygonPatch:function(a,b){this.readers.gml.Polygon.apply(this,[a,b])},exterior:function(a,b){var c={};this.readChildNodes(a,c);b.outer=c.components[0]},interior:function(a,b){var c={};this.readChildNodes(a,c);b.inner.push(c.components[0])},MultiCurve:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);0<c.components.length&&(b.components=
+[new OpenLayers.Geometry.MultiLineString(c.components)])},curveMember:function(a,b){this.readChildNodes(a,b)},MultiSurface:function(a,b){var c={components:[]};this.readers.gml._inherit.apply(this,[a,c,b]);this.readChildNodes(a,c);0<c.components.length&&(b.components=[new OpenLayers.Geometry.MultiPolygon(c.components)])},surfaceMember:function(a,b){this.readChildNodes(a,b)},surfaceMembers:function(a,b){this.readChildNodes(a,b)},pointMembers:function(a,b){this.readChildNodes(a,b)},lineStringMembers:function(a,
+b){this.readChildNodes(a,b)},polygonMembers:function(a,b){this.readChildNodes(a,b)},geometryMembers:function(a,b){this.readChildNodes(a,b)},Envelope:function(a,b){var c={points:Array(2)};this.readChildNodes(a,c);b.components||(b.components=[]);var d=c.points[0],c=c.points[1];b.components.push(new OpenLayers.Bounds(d.x,d.y,c.x,c.y))},lowerCorner:function(a,b){var c={};this.readers.gml.pos.apply(this,[a,c]);b.points[0]=c.points[0]},upperCorner:function(a,b){var c={};this.readers.gml.pos.apply(this,
+[a,c]);b.points[1]=c.points[0]}},OpenLayers.Format.GML.Base.prototype.readers.gml),feature:OpenLayers.Format.GML.Base.prototype.readers.feature,wfs:OpenLayers.Format.GML.Base.prototype.readers.wfs},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"featureMembers":"featureMember";a=this.writeNode("gml:"+b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:OpenLayers.Util.applyDefaults({featureMembers:function(a){for(var b=
+this.createElementNSPlus("gml:featureMembers"),c=0,d=a.length;c<d;++c)this.writeNode("feature:_typeName",a[c],b);return b},Point:function(a){var b=this.createElementNSPlus("gml:Point");this.writeNode("pos",a,b);return b},pos:function(a){return this.createElementNSPlus("gml:pos",{value:this.xy?a.x+" "+a.y:a.y+" "+a.x})},LineString:function(a){var b=this.createElementNSPlus("gml:LineString");this.writeNode("posList",a.components,b);return b},Curve:function(a){var b=this.createElementNSPlus("gml:Curve");
+this.writeNode("segments",a,b);return b},segments:function(a){var b=this.createElementNSPlus("gml:segments");this.writeNode("LineStringSegment",a,b);return b},LineStringSegment:function(a){var b=this.createElementNSPlus("gml:LineStringSegment");this.writeNode("posList",a.components,b);return b},posList:function(a){for(var b=a.length,c=Array(b),d,e=0;e<b;++e)d=a[e],c[e]=this.xy?d.x+" "+d.y:d.y+" "+d.x;return this.createElementNSPlus("gml:posList",{value:c.join(" ")})},Surface:function(a){var b=this.createElementNSPlus("gml:Surface");
+this.writeNode("patches",a,b);return b},patches:function(a){var b=this.createElementNSPlus("gml:patches");this.writeNode("PolygonPatch",a,b);return b},PolygonPatch:function(a){var b=this.createElementNSPlus("gml:PolygonPatch",{attributes:{interpolation:"planar"}});this.writeNode("exterior",a.components[0],b);for(var c=1,d=a.components.length;c<d;++c)this.writeNode("interior",a.components[c],b);return b},Polygon:function(a){var b=this.createElementNSPlus("gml:Polygon");this.writeNode("exterior",a.components[0],
+b);for(var c=1,d=a.components.length;c<d;++c)this.writeNode("interior",a.components[c],b);return b},exterior:function(a){var b=this.createElementNSPlus("gml:exterior");this.writeNode("LinearRing",a,b);return b},interior:function(a){var b=this.createElementNSPlus("gml:interior");this.writeNode("LinearRing",a,b);return b},LinearRing:function(a){var b=this.createElementNSPlus("gml:LinearRing");this.writeNode("posList",a.components,b);return b},MultiCurve:function(a){var b=this.createElementNSPlus("gml:MultiCurve");
+a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("curveMember",a[c],b);return b},curveMember:function(a){var b=this.createElementNSPlus("gml:curveMember");this.curve?this.writeNode("Curve",a,b):this.writeNode("LineString",a,b);return b},MultiSurface:function(a){var b=this.createElementNSPlus("gml:MultiSurface");a=a.components||[a];for(var c=0,d=a.length;c<d;++c)this.writeNode("surfaceMember",a[c],b);return b},surfaceMember:function(a){var b=this.createElementNSPlus("gml:surfaceMember");
+this.surface?this.writeNode("Surface",a,b):this.writeNode("Polygon",a,b);return b},Envelope:function(a){var b=this.createElementNSPlus("gml:Envelope");this.writeNode("lowerCorner",a,b);this.writeNode("upperCorner",a,b);this.srsName&&b.setAttribute("srsName",this.srsName);return b},lowerCorner:function(a){return this.createElementNSPlus("gml:lowerCorner",{value:this.xy?a.left+" "+a.bottom:a.bottom+" "+a.left})},upperCorner:function(a){return this.createElementNSPlus("gml:upperCorner",{value:this.xy?
+a.right+" "+a.top:a.top+" "+a.right})}},OpenLayers.Format.GML.Base.prototype.writers.gml),feature:OpenLayers.Format.GML.Base.prototype.writers.feature,wfs:OpenLayers.Format.GML.Base.prototype.writers.wfs},setGeometryTypes:function(){this.geometryTypes={"OpenLayers.Geometry.Point":"Point","OpenLayers.Geometry.MultiPoint":"MultiPoint","OpenLayers.Geometry.LineString":!0===this.curve?"Curve":"LineString","OpenLayers.Geometry.MultiLineString":!1===this.multiCurve?"MultiLineString":"MultiCurve","OpenLayers.Geometry.Polygon":!0===
+this.surface?"Surface":"Polygon","OpenLayers.Geometry.MultiPolygon":!1===this.multiSurface?"MultiPolygon":"MultiSurface","OpenLayers.Geometry.Collection":"GeometryCollection"}},CLASS_NAME:"OpenLayers.Format.GML.v3"});OpenLayers.Format.Filter.v1_1_0=OpenLayers.Class(OpenLayers.Format.GML.v3,OpenLayers.Format.Filter.v1,{VERSION:"1.1.0",schemaLocation:"http://www.opengis.net/ogc/filter/1.1.0/filter.xsd",initialize:function(a){OpenLayers.Format.GML.v3.prototype.initialize.apply(this,[a])},readers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a,b){var c=a.getAttribute("matchCase"),c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,matchCase:!("false"===c||"0"===c)});this.readChildNodes(a,
+c);b.filters.push(c)},PropertyIsNotEqualTo:function(a,b){var c=a.getAttribute("matchCase"),c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO,matchCase:!("false"===c||"0"===c)});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLike:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(a,c);var d=a.getAttribute("wildCard"),e=a.getAttribute("singleChar"),f=a.getAttribute("escapeChar");c.value2regex(d,e,
+f);b.filters.push(c)}},OpenLayers.Format.Filter.v1.prototype.readers.ogc),gml:OpenLayers.Format.GML.v3.prototype.readers.gml,feature:OpenLayers.Format.GML.v3.prototype.readers.feature},writers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsEqualTo",{attributes:{matchCase:a.matchCase}});this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsNotEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNotEqualTo",
+{attributes:{matchCase:a.matchCase}});this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLike:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLike",{attributes:{matchCase:a.matchCase,wildCard:"*",singleChar:".",escapeChar:"!"}});this.writeNode("PropertyName",a,b);this.writeNode("Literal",a.regex2value(),b);return b},BBOX:function(a){var b=this.createElementNSPlus("ogc:BBOX");a.property&&this.writeNode("PropertyName",a,b);var c=this.writeNode("gml:Envelope",
+a.value);a.projection&&c.setAttribute("srsName",a.projection);b.appendChild(c);return b},SortBy:function(a){for(var b=this.createElementNSPlus("ogc:SortBy"),c=0,d=a.length;c<d;c++)this.writeNode("ogc:SortProperty",a[c],b);return b},SortProperty:function(a){var b=this.createElementNSPlus("ogc:SortProperty");this.writeNode("ogc:PropertyName",a,b);this.writeNode("ogc:SortOrder","DESC"==a.order?"DESC":"ASC",b);return b},SortOrder:function(a){return this.createElementNSPlus("ogc:SortOrder",{value:a})}},
+OpenLayers.Format.Filter.v1.prototype.writers.ogc),gml:OpenLayers.Format.GML.v3.prototype.writers.gml,feature:OpenLayers.Format.GML.v3.prototype.writers.feature},writeSpatial:function(a,b){var c=this.createElementNSPlus("ogc:"+b);this.writeNode("PropertyName",a,c);if(a.value instanceof OpenLayers.Filter.Function)this.writeNode("Function",a.value,c);else{var d;d=a.value instanceof OpenLayers.Geometry?this.writeNode("feature:_geometry",a.value).firstChild:this.writeNode("gml:Envelope",a.value);a.projection&&
+d.setAttribute("srsName",a.projection);c.appendChild(d)}return c},CLASS_NAME:"OpenLayers.Format.Filter.v1_1_0"});OpenLayers.Format.OWSCommon=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",getVersion:function(a,b){var c=this.version;if(!c){var d=a.getAttribute("xmlns:ows");d&&"1.1"===d.substring(d.lastIndexOf("/")+1)&&(c="1.1.0");c||(c=this.defaultVersion)}return c},CLASS_NAME:"OpenLayers.Format.OWSCommon"});OpenLayers.Format.OWSCommon.v1=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},read:function(a,b){OpenLayers.Util.applyDefaults(b,this.options);var c={};this.readChildNodes(a,c);return c},readers:{ows:{Exception:function(a,b){var c={code:a.getAttribute("exceptionCode"),locator:a.getAttribute("locator"),texts:[]};b.exceptions.push(c);this.readChildNodes(a,c)},ExceptionText:function(a,b){var c=this.getChildValue(a);b.texts.push(c)},
+ServiceIdentification:function(a,b){b.serviceIdentification={};this.readChildNodes(a,b.serviceIdentification)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b["abstract"]=this.getChildValue(a)},Keywords:function(a,b){b.keywords={};this.readChildNodes(a,b.keywords)},Keyword:function(a,b){b[this.getChildValue(a)]=!0},ServiceType:function(a,b){b.serviceType={codeSpace:a.getAttribute("codeSpace"),value:this.getChildValue(a)}},ServiceTypeVersion:function(a,b){b.serviceTypeVersion=
+this.getChildValue(a)},Fees:function(a,b){b.fees=this.getChildValue(a)},AccessConstraints:function(a,b){b.accessConstraints=this.getChildValue(a)},ServiceProvider:function(a,b){b.serviceProvider={};this.readChildNodes(a,b.serviceProvider)},ProviderName:function(a,b){b.providerName=this.getChildValue(a)},ProviderSite:function(a,b){b.providerSite=this.getAttributeNS(a,this.namespaces.xlink,"href")},ServiceContact:function(a,b){b.serviceContact={};this.readChildNodes(a,b.serviceContact)},IndividualName:function(a,
+b){b.individualName=this.getChildValue(a)},PositionName:function(a,b){b.positionName=this.getChildValue(a)},ContactInfo:function(a,b){b.contactInfo={};this.readChildNodes(a,b.contactInfo)},Phone:function(a,b){b.phone={};this.readChildNodes(a,b.phone)},Voice:function(a,b){b.voice=this.getChildValue(a)},Address:function(a,b){b.address={};this.readChildNodes(a,b.address)},DeliveryPoint:function(a,b){b.deliveryPoint=this.getChildValue(a)},City:function(a,b){b.city=this.getChildValue(a)},AdministrativeArea:function(a,
+b){b.administrativeArea=this.getChildValue(a)},PostalCode:function(a,b){b.postalCode=this.getChildValue(a)},Country:function(a,b){b.country=this.getChildValue(a)},ElectronicMailAddress:function(a,b){b.electronicMailAddress=this.getChildValue(a)},Role:function(a,b){b.role=this.getChildValue(a)},OperationsMetadata:function(a,b){b.operationsMetadata={};this.readChildNodes(a,b.operationsMetadata)},Operation:function(a,b){var c=a.getAttribute("name");b[c]={};this.readChildNodes(a,b[c])},DCP:function(a,
+b){b.dcp={};this.readChildNodes(a,b.dcp)},HTTP:function(a,b){b.http={};this.readChildNodes(a,b.http)},Get:function(a,b){b.get||(b.get=[]);var c={url:this.getAttributeNS(a,this.namespaces.xlink,"href")};this.readChildNodes(a,c);b.get.push(c)},Post:function(a,b){b.post||(b.post=[]);var c={url:this.getAttributeNS(a,this.namespaces.xlink,"href")};this.readChildNodes(a,c);b.post.push(c)},Parameter:function(a,b){b.parameters||(b.parameters={});var c=a.getAttribute("name");b.parameters[c]={};this.readChildNodes(a,
+b.parameters[c])},Constraint:function(a,b){b.constraints||(b.constraints={});var c=a.getAttribute("name");b.constraints[c]={};this.readChildNodes(a,b.constraints[c])},Value:function(a,b){b[this.getChildValue(a)]=!0},OutputFormat:function(a,b){b.formats.push({value:this.getChildValue(a)});this.readChildNodes(a,b)},WGS84BoundingBox:function(a,b){var c={};c.crs=a.getAttribute("crs");b.BoundingBox?b.BoundingBox.push(c):(b.projection=c.crs,c=b);this.readChildNodes(a,c)},BoundingBox:function(a,b){this.readers.ows.WGS84BoundingBox.apply(this,
+[a,b])},LowerCorner:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace);b.left=c[0];b.bottom=c[1]},UpperCorner:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),c=c.split(this.regExes.splitSpace);b.right=c[0];b.top=c[1];b.bounds=new OpenLayers.Bounds(b.left,b.bottom,b.right,b.top);delete b.left;delete b.bottom;delete b.right;delete b.top},
+Language:function(a,b){b.language=this.getChildValue(a)}}},writers:{ows:{BoundingBox:function(a,b){var c=this.createElementNSPlus(b||"ows:BoundingBox",{attributes:{crs:a.projection}});this.writeNode("ows:LowerCorner",a,c);this.writeNode("ows:UpperCorner",a,c);return c},LowerCorner:function(a){return this.createElementNSPlus("ows:LowerCorner",{value:a.bounds.left+" "+a.bounds.bottom})},UpperCorner:function(a){return this.createElementNSPlus("ows:UpperCorner",{value:a.bounds.right+" "+a.bounds.top})},
+Identifier:function(a){return this.createElementNSPlus("ows:Identifier",{value:a})},Title:function(a){return this.createElementNSPlus("ows:Title",{value:a})},Abstract:function(a){return this.createElementNSPlus("ows:Abstract",{value:a})},OutputFormat:function(a){return this.createElementNSPlus("ows:OutputFormat",{value:a})}}},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1"});OpenLayers.Format.OWSCommon.v1_0_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1,{namespaces:{ows:"http://www.opengis.net/ows",xlink:"http://www.w3.org/1999/xlink"},readers:{ows:OpenLayers.Util.applyDefaults({ExceptionReport:function(a,b){b.success=!1;b.exceptionReport={version:a.getAttribute("version"),language:a.getAttribute("language"),exceptions:[]};this.readChildNodes(a,b.exceptionReport)}},OpenLayers.Format.OWSCommon.v1.prototype.readers.ows)},writers:{ows:OpenLayers.Format.OWSCommon.v1.prototype.writers.ows},
+CLASS_NAME:"OpenLayers.Format.OWSCommon.v1_0_0"});OpenLayers.Format.WFST.v1_1_0=OpenLayers.Class(OpenLayers.Format.Filter.v1_1_0,OpenLayers.Format.WFST.v1,{version:"1.1.0",schemaLocations:{wfs:"http://schemas.opengis.net/wfs/1.1.0/wfs.xsd"},initialize:function(a){OpenLayers.Format.Filter.v1_1_0.prototype.initialize.apply(this,[a]);OpenLayers.Format.WFST.v1.prototype.initialize.apply(this,[a])},readNode:function(a,b,c){return OpenLayers.Format.GML.v3.prototype.readNode.apply(this,arguments)},readers:{wfs:OpenLayers.Util.applyDefaults({FeatureCollection:function(a,
+b){b.numberOfFeatures=parseInt(a.getAttribute("numberOfFeatures"));OpenLayers.Format.WFST.v1.prototype.readers.wfs.FeatureCollection.apply(this,arguments)},TransactionResponse:function(a,b){b.insertIds=[];b.success=!1;this.readChildNodes(a,b)},TransactionSummary:function(a,b){b.success=!0},InsertResults:function(a,b){this.readChildNodes(a,b)},Feature:function(a,b){var c={fids:[]};this.readChildNodes(a,c);b.insertIds.push(c.fids[0])}},OpenLayers.Format.WFST.v1.prototype.readers.wfs),gml:OpenLayers.Format.GML.v3.prototype.readers.gml,
+feature:OpenLayers.Format.GML.v3.prototype.readers.feature,ogc:OpenLayers.Format.Filter.v1_1_0.prototype.readers.ogc,ows:OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows},writers:{wfs:OpenLayers.Util.applyDefaults({GetFeature:function(a){var b=OpenLayers.Format.WFST.v1.prototype.writers.wfs.GetFeature.apply(this,arguments);a&&this.setAttributes(b,{resultType:a.resultType,startIndex:a.startIndex,count:a.count});return b},Query:function(a){a=OpenLayers.Util.extend({featureNS:this.featureNS,
+featurePrefix:this.featurePrefix,featureType:this.featureType,srsName:this.srsName},a);var b=a.featurePrefix,c=this.createElementNSPlus("wfs:Query",{attributes:{typeName:(b?b+":":"")+a.featureType,srsName:a.srsName}});a.featureNS&&c.setAttribute("xmlns:"+b,a.featureNS);if(a.propertyNames)for(var b=0,d=a.propertyNames.length;b<d;b++)this.writeNode("wfs:PropertyName",{property:a.propertyNames[b]},c);a.filter&&(OpenLayers.Format.WFST.v1_1_0.prototype.setFilterProperty.call(this,a.filter),this.writeNode("ogc:Filter",
+a.filter,c));return c},PropertyName:function(a){return this.createElementNSPlus("wfs:PropertyName",{value:a.property})}},OpenLayers.Format.WFST.v1.prototype.writers.wfs),gml:OpenLayers.Format.GML.v3.prototype.writers.gml,feature:OpenLayers.Format.GML.v3.prototype.writers.feature,ogc:OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc},CLASS_NAME:"OpenLayers.Format.WFST.v1_1_0"});OpenLayers.Protocol=OpenLayers.Class({format:null,options:null,autoDestroy:!0,defaultFilter:null,initialize:function(a){a=a||{};OpenLayers.Util.extend(this,a);this.options=a},mergeWithDefaultFilter:function(a){return a&&this.defaultFilter?new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,filters:[this.defaultFilter,a]}):a||this.defaultFilter||void 0},destroy:function(){this.format=this.options=null},read:function(a){a=a||{};a.filter=this.mergeWithDefaultFilter(a.filter)},create:function(){},
+update:function(){},"delete":function(){},commit:function(){},abort:function(a){},createCallback:function(a,b,c){return OpenLayers.Function.bind(function(){a.apply(this,[b,c])},this)},CLASS_NAME:"OpenLayers.Protocol"});OpenLayers.Protocol.Response=OpenLayers.Class({code:null,requestType:null,last:!0,features:null,data:null,reqFeatures:null,priv:null,error:null,initialize:function(a){OpenLayers.Util.extend(this,a)},success:function(){return 0<this.code},CLASS_NAME:"OpenLayers.Protocol.Response"});
+OpenLayers.Protocol.Response.SUCCESS=1;OpenLayers.Protocol.Response.FAILURE=0;OpenLayers.Format.JSON=OpenLayers.Class(OpenLayers.Format,{indent:"    ",space:" ",newline:"\n",level:0,pretty:!1,nativeJSON:function(){return!(!window.JSON||"function"!=typeof JSON.parse||"function"!=typeof JSON.stringify)}(),read:function(a,b){var c;if(this.nativeJSON)c=JSON.parse(a,b);else try{if(/^[\],:{}\s]*$/.test(a.replace(/\\["\\\/bfnrtu]/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))&&(c=eval("("+a+")"),"function"===
+typeof b)){var d=function(a,c){if(c&&"object"===typeof c)for(var e in c)c.hasOwnProperty(e)&&(c[e]=d(e,c[e]));return b(a,c)};c=d("",c)}}catch(e){}this.keepData&&(this.data=c);return c},write:function(a,b){this.pretty=!!b;var c=null,d=typeof a;if(this.serialize[d])try{c=!this.pretty&&this.nativeJSON?JSON.stringify(a):this.serialize[d].apply(this,[a])}catch(e){OpenLayers.Console.error("Trouble serializing: "+e)}return c},writeIndent:function(){var a=[];if(this.pretty)for(var b=0;b<this.level;++b)a.push(this.indent);
+return a.join("")},writeNewline:function(){return this.pretty?this.newline:""},writeSpace:function(){return this.pretty?this.space:""},serialize:{object:function(a){if(null==a)return"null";if(a.constructor==Date)return this.serialize.date.apply(this,[a]);if(a.constructor==Array)return this.serialize.array.apply(this,[a]);var b=["{"];this.level+=1;var c,d,e,f=!1;for(c in a)a.hasOwnProperty(c)&&(d=OpenLayers.Format.JSON.prototype.write.apply(this,[c,this.pretty]),e=OpenLayers.Format.JSON.prototype.write.apply(this,
+[a[c],this.pretty]),null!=d&&null!=e&&(f&&b.push(","),b.push(this.writeNewline(),this.writeIndent(),d,":",this.writeSpace(),e),f=!0));this.level-=1;b.push(this.writeNewline(),this.writeIndent(),"}");return b.join("")},array:function(a){var b,c=["["];this.level+=1;for(var d=0,e=a.length;d<e;++d)b=OpenLayers.Format.JSON.prototype.write.apply(this,[a[d],this.pretty]),null!=b&&(0<d&&c.push(","),c.push(this.writeNewline(),this.writeIndent(),b));this.level-=1;c.push(this.writeNewline(),this.writeIndent(),
+"]");return c.join("")},string:function(a){var b={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"};return/["\\\x00-\x1f]/.test(a)?'"'+a.replace(/([\x00-\x1f\\"])/g,function(a,d){var e=b[d];if(e)return e;e=d.charCodeAt();return"\\u00"+Math.floor(e/16).toString(16)+(e%16).toString(16)})+'"':'"'+a+'"'},number:function(a){return isFinite(a)?String(a):"null"},"boolean":function(a){return String(a)},date:function(a){function b(a){return 10>a?"0"+a:a}return'"'+a.getFullYear()+
+"-"+b(a.getMonth()+1)+"-"+b(a.getDate())+"T"+b(a.getHours())+":"+b(a.getMinutes())+":"+b(a.getSeconds())+'"'}},CLASS_NAME:"OpenLayers.Format.JSON"});OpenLayers.Format.GeoJSON=OpenLayers.Class(OpenLayers.Format.JSON,{ignoreExtraDims:!1,read:function(a,b,c){b=b?b:"FeatureCollection";var d=null,e=null,e="string"==typeof a?OpenLayers.Format.JSON.prototype.read.apply(this,[a,c]):a;if(!e)OpenLayers.Console.error("Bad JSON: "+a);else if("string"!=typeof e.type)OpenLayers.Console.error("Bad GeoJSON - no type: "+a);else if(this.isValidType(e,b))switch(b){case "Geometry":try{d=this.parseGeometry(e)}catch(f){OpenLayers.Console.error(f)}break;case "Feature":try{d=
+this.parseFeature(e),d.type="Feature"}catch(g){OpenLayers.Console.error(g)}break;case "FeatureCollection":switch(d=[],e.type){case "Feature":try{d.push(this.parseFeature(e))}catch(h){d=null,OpenLayers.Console.error(h)}break;case "FeatureCollection":a=0;for(b=e.features.length;a<b;++a)try{d.push(this.parseFeature(e.features[a]))}catch(k){d=null,OpenLayers.Console.error(k)}break;default:try{var l=this.parseGeometry(e);d.push(new OpenLayers.Feature.Vector(l))}catch(m){d=null,OpenLayers.Console.error(m)}}}return d},
+isValidType:function(a,b){var c=!1;switch(b){case "Geometry":-1==OpenLayers.Util.indexOf("Point MultiPoint LineString MultiLineString Polygon MultiPolygon Box GeometryCollection".split(" "),a.type)?OpenLayers.Console.error("Unsupported geometry type: "+a.type):c=!0;break;case "FeatureCollection":c=!0;break;default:a.type==b?c=!0:OpenLayers.Console.error("Cannot convert types from "+a.type+" to "+b)}return c},parseFeature:function(a){var b,c,d;c=a.properties?a.properties:{};d=a.geometry&&a.geometry.bbox||
+a.bbox;try{b=this.parseGeometry(a.geometry)}catch(e){throw e;}b=new OpenLayers.Feature.Vector(b,c);d&&(b.bounds=OpenLayers.Bounds.fromArray(d));a.id&&(b.fid=a.id);return b},parseGeometry:function(a){if(null==a)return null;var b,c=!1;if("GeometryCollection"==a.type){if(!OpenLayers.Util.isArray(a.geometries))throw"GeometryCollection must have geometries array: "+a;b=a.geometries.length;for(var c=Array(b),d=0;d<b;++d)c[d]=this.parseGeometry.apply(this,[a.geometries[d]]);b=new OpenLayers.Geometry.Collection(c);
+c=!0}else{if(!OpenLayers.Util.isArray(a.coordinates))throw"Geometry must have coordinates array: "+a;if(!this.parseCoords[a.type.toLowerCase()])throw"Unsupported geometry type: "+a.type;try{b=this.parseCoords[a.type.toLowerCase()].apply(this,[a.coordinates])}catch(e){throw e;}}this.internalProjection&&(this.externalProjection&&!c)&&b.transform(this.externalProjection,this.internalProjection);return b},parseCoords:{point:function(a){if(!1==this.ignoreExtraDims&&2!=a.length)throw"Only 2D points are supported: "+
+a;return new OpenLayers.Geometry.Point(a[0],a[1])},multipoint:function(a){for(var b=[],c=null,d=0,e=a.length;d<e;++d){try{c=this.parseCoords.point.apply(this,[a[d]])}catch(f){throw f;}b.push(c)}return new OpenLayers.Geometry.MultiPoint(b)},linestring:function(a){for(var b=[],c=null,d=0,e=a.length;d<e;++d){try{c=this.parseCoords.point.apply(this,[a[d]])}catch(f){throw f;}b.push(c)}return new OpenLayers.Geometry.LineString(b)},multilinestring:function(a){for(var b=[],c=null,d=0,e=a.length;d<e;++d){try{c=
+this.parseCoords.linestring.apply(this,[a[d]])}catch(f){throw f;}b.push(c)}return new OpenLayers.Geometry.MultiLineString(b)},polygon:function(a){for(var b=[],c,d,e=0,f=a.length;e<f;++e){try{d=this.parseCoords.linestring.apply(this,[a[e]])}catch(g){throw g;}c=new OpenLayers.Geometry.LinearRing(d.components);b.push(c)}return new OpenLayers.Geometry.Polygon(b)},multipolygon:function(a){for(var b=[],c=null,d=0,e=a.length;d<e;++d){try{c=this.parseCoords.polygon.apply(this,[a[d]])}catch(f){throw f;}b.push(c)}return new OpenLayers.Geometry.MultiPolygon(b)},
+box:function(a){if(2!=a.length)throw"GeoJSON box coordinates must have 2 elements";return new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing([new OpenLayers.Geometry.Point(a[0][0],a[0][1]),new OpenLayers.Geometry.Point(a[1][0],a[0][1]),new OpenLayers.Geometry.Point(a[1][0],a[1][1]),new OpenLayers.Geometry.Point(a[0][0],a[1][1]),new OpenLayers.Geometry.Point(a[0][0],a[0][1])])])}},write:function(a,b){var c={type:null};if(OpenLayers.Util.isArray(a)){c.type="FeatureCollection";var d=
+a.length;c.features=Array(d);for(var e=0;e<d;++e){var f=a[e];if(!f instanceof OpenLayers.Feature.Vector)throw"FeatureCollection only supports collections of features: "+f;c.features[e]=this.extract.feature.apply(this,[f])}}else 0==a.CLASS_NAME.indexOf("OpenLayers.Geometry")?c=this.extract.geometry.apply(this,[a]):a instanceof OpenLayers.Feature.Vector&&(c=this.extract.feature.apply(this,[a]),a.layer&&a.layer.projection&&(c.crs=this.createCRSObject(a)));return OpenLayers.Format.JSON.prototype.write.apply(this,
+[c,b])},createCRSObject:function(a){a=a.layer.projection.toString();var b={};a.match(/epsg:/i)&&(a=parseInt(a.substring(a.indexOf(":")+1)),b=4326==a?{type:"name",properties:{name:"urn:ogc:def:crs:OGC:1.3:CRS84"}}:{type:"name",properties:{name:"EPSG:"+a}});return b},extract:{feature:function(a){var b=this.extract.geometry.apply(this,[a.geometry]),b={type:"Feature",properties:a.attributes,geometry:b};null!=a.fid&&(b.id=a.fid);return b},geometry:function(a){if(null==a)return null;this.internalProjection&&
+this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));var b=a.CLASS_NAME.split(".")[2];a=this.extract[b.toLowerCase()].apply(this,[a]);return"Collection"==b?{type:"GeometryCollection",geometries:a}:{type:b,coordinates:a}},point:function(a){return[a.x,a.y]},multipoint:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.point.apply(this,[a.components[c]]));return b},linestring:function(a){for(var b=[],c=0,d=a.components.length;c<
+d;++c)b.push(this.extract.point.apply(this,[a.components[c]]));return b},multilinestring:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.linestring.apply(this,[a.components[c]]));return b},polygon:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.linestring.apply(this,[a.components[c]]));return b},multipolygon:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.polygon.apply(this,[a.components[c]]));return b},collection:function(a){for(var b=
+a.components.length,c=Array(b),d=0;d<b;++d)c[d]=this.extract.geometry.apply(this,[a.components[d]]);return c}},CLASS_NAME:"OpenLayers.Format.GeoJSON"});OpenLayers.Protocol.Script=OpenLayers.Class(OpenLayers.Protocol,{url:null,params:null,callback:null,callbackTemplate:"OpenLayers.Protocol.Script.registry.${id}",callbackKey:"callback",callbackPrefix:"",scope:null,format:null,pendingRequests:null,srsInBBOX:!1,initialize:function(a){a=a||{};this.params={};this.pendingRequests={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);this.format||(this.format=new OpenLayers.Format.GeoJSON);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var b=
+new OpenLayers.Format.QueryStringFilter({srsInBBOX:this.srsInBBOX});this.filterToParams=function(a,d){return b.write(a,d)}}},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=OpenLayers.Util.applyDefaults(a,this.options);a.params=OpenLayers.Util.applyDefaults(a.params,this.options.params);a.filter&&this.filterToParams&&(a.params=this.filterToParams(a.filter,a.params));var b=new OpenLayers.Protocol.Response({requestType:"read"}),c=this.createRequest(a.url,a.params,OpenLayers.Function.bind(function(c){b.data=
+c;this.handleRead(b,a)},this));b.priv=c;return b},createRequest:function(a,b,c){c=OpenLayers.Protocol.Script.register(c);var d=OpenLayers.String.format(this.callbackTemplate,{id:c});b=OpenLayers.Util.extend({},b);b[this.callbackKey]=this.callbackPrefix+d;a=OpenLayers.Util.urlAppend(a,OpenLayers.Util.getParameterString(b));b=document.createElement("script");b.type="text/javascript";b.src=a;b.id="OpenLayers_Protocol_Script_"+c;this.pendingRequests[b.id]=b;document.getElementsByTagName("head")[0].appendChild(b);
+return b},destroyRequest:function(a){OpenLayers.Protocol.Script.unregister(a.id.split("_").pop());delete this.pendingRequests[a.id];a.parentNode&&a.parentNode.removeChild(a)},handleRead:function(a,b){this.handleResponse(a,b)},handleResponse:function(a,b){b.callback&&(a.data?(a.features=this.parseFeatures(a.data),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE,this.destroyRequest(a.priv),b.callback.call(b.scope,a))},parseFeatures:function(a){return this.format.read(a)},
+abort:function(a){if(a)this.destroyRequest(a.priv);else for(var b in this.pendingRequests)this.destroyRequest(this.pendingRequests[b])},destroy:function(){this.abort();delete this.params;delete this.format;OpenLayers.Protocol.prototype.destroy.apply(this)},CLASS_NAME:"OpenLayers.Protocol.Script"});(function(){var a=OpenLayers.Protocol.Script,b=0;a.registry={};a.register=function(c){var d="c"+ ++b;a.registry[d]=function(){c.apply(this,arguments)};return d};a.unregister=function(b){delete a.registry[b]}})();OpenLayers.Format.EncodedPolyline=OpenLayers.Class(OpenLayers.Format,{geometryType:"linestring",initialize:function(a){OpenLayers.Format.prototype.initialize.apply(this,[a])},read:function(a){var b;if("linestring"==this.geometryType)b=OpenLayers.Geometry.LineString;else if("linearring"==this.geometryType)b=OpenLayers.Geometry.LinearRing;else if("multipoint"==this.geometryType)b=OpenLayers.Geometry.MultiPoint;else if("point"!=this.geometryType&&"polygon"!=this.geometryType)return null;a=this.decodeDeltas(a,
+2);for(var c=a.length,d=[],e=0;e+1<c;){var f=a[e++],g=a[e++];d.push(new OpenLayers.Geometry.Point(g,f))}return"point"==this.geometryType?new OpenLayers.Feature.Vector(d[0]):"polygon"==this.geometryType?new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(d)])):new OpenLayers.Feature.Vector(new b(d))},decode:function(a,b,c){a=this.decodeDeltas(a,b,c||1E5);c=a.length;for(var d=[],e=0;e+(b-1)<c;){for(var f=[],g=0;g<b;++g)f.push(a[e++]);d.push(f)}return d},
+write:function(a){a=(a.constructor==Array?a[0]:a).geometry;var b=a.CLASS_NAME.split(".")[2].toLowerCase();if("point"==b)a=Array(a);else if("linestring"==b||"linearring"==b||"multipoint"==b)a=a.components;else if("polygon"==b)a=a.components[0].components;else return null;for(var b=[],c=a.length,d=0;d<c;++d){var e=a[d];b.push(e.y);b.push(e.x)}return this.encodeDeltas(b,2)},encode:function(a,b,c){c=c||1E5;for(var d=[],e=a.length,f=0;f<e;++f)for(var g=a[f],h=0;h<b;++h)d.push(g[h]);return this.encodeDeltas(d,
+b,c)},encodeDeltas:function(a,b,c){var d,e=Array(b);for(d=0;d<b;++d)e[d]=0;for(var f=a.length,g=0;g<f;)for(d=0;d<b;++d,++g){var h=a[g],k=h-e[d];e[d]=h;a[g]=k}return this.encodeFloats(a,c||1E5)},decodeDeltas:function(a,b,c){var d,e=Array(b);for(d=0;d<b;++d)e[d]=0;a=this.decodeFloats(a,c||1E5);c=a.length;for(var f=0;f<c;)for(d=0;d<b;++d,++f)e[d]+=a[f],a[f]=e[d];return a},encodeFloats:function(a,b){for(var c=b||1E5,d=a.length,e=0;e<d;++e)a[e]=Math.round(a[e]*c);return this.encodeSignedIntegers(a)},decodeFloats:function(a,
+b){for(var c=b||1E5,d=this.decodeSignedIntegers(a),e=d.length,f=0;f<e;++f)d[f]/=c;return d},encodeSignedIntegers:function(a){for(var b=a.length,c=0;c<b;++c){var d=a[c],e=d<<1;0>d&&(e=~e);a[c]=e}return this.encodeUnsignedIntegers(a)},decodeSignedIntegers:function(a){a=this.decodeUnsignedIntegers(a);for(var b=a.length,c=0;c<b;++c){var d=a[c];a[c]=d&1?~(d>>1):d>>1}return a},encodeUnsignedIntegers:function(a){for(var b="",c=a.length,d=0;d<c;++d)b+=this.encodeUnsignedInteger(a[d]);return b},decodeUnsignedIntegers:function(a){for(var b=
+[],c=0,d=0,e=a.length,f=0;f<e;++f){var g=a.charCodeAt(f)-63,c=c|(g&31)<<d;32>g?(b.push(c),d=c=0):d+=5}return b},encodeFloat:function(a,b){a=Math.round(a*(b||1E5));return this.encodeSignedInteger(a)},decodeFloat:function(a,b){return this.decodeSignedInteger(a)/(b||1E5)},encodeSignedInteger:function(a){var b=a<<1;0>a&&(b=~b);return this.encodeUnsignedInteger(b)},decodeSignedInteger:function(a){a=this.decodeUnsignedInteger(a);return a&1?~(a>>1):a>>1},encodeUnsignedInteger:function(a){for(var b,c="";32<=
+a;)b=(32|a&31)+63,c+=String.fromCharCode(b),a>>=5;return c+=String.fromCharCode(a+63)},decodeUnsignedInteger:function(a){for(var b=0,c=0,d=a.length,e=0;e<d;++e){var f=a.charCodeAt(e)-63,b=b|(f&31)<<c;if(32>f)break;c+=5}return b},CLASS_NAME:"OpenLayers.Format.EncodedPolyline"});OpenLayers.Control.Panel=OpenLayers.Class(OpenLayers.Control,{controls:null,autoActivate:!0,defaultControl:null,saveState:!1,allowDepress:!1,activeState:null,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,[a]);this.controls=[];this.activeState={}},destroy:function(){this.map&&this.map.events.unregister("buttonclick",this,this.onButtonClick);OpenLayers.Control.prototype.destroy.apply(this,arguments);for(var a,b=this.controls.length-1;0<=b;b--)a=this.controls[b],a.events&&
+a.events.un({activate:this.iconOn,deactivate:this.iconOff}),a.panel_div=null;this.activeState=null},activate:function(){if(OpenLayers.Control.prototype.activate.apply(this,arguments)){for(var a,b=0,c=this.controls.length;b<c;b++)a=this.controls[b],(a===this.defaultControl||this.saveState&&this.activeState[a.id])&&a.activate();!0===this.saveState&&(this.defaultControl=null);this.redraw();return!0}return!1},deactivate:function(){if(OpenLayers.Control.prototype.deactivate.apply(this,arguments)){for(var a,
+b=0,c=this.controls.length;b<c;b++)a=this.controls[b],this.activeState[a.id]=a.deactivate();this.redraw();return!0}return!1},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.outsideViewport?(this.events.attachToElement(this.div),this.events.register("buttonclick",this,this.onButtonClick)):this.map.events.register("buttonclick",this,this.onButtonClick);this.addControlsToMap(this.controls);return this.div},redraw:function(){for(var a=this.div.childNodes.length-1;0<=a;a--)this.div.removeChild(this.div.childNodes[a]);
+this.div.innerHTML="";if(this.active)for(var a=0,b=this.controls.length;a<b;a++)this.div.appendChild(this.controls[a].panel_div)},activateControl:function(a){if(!this.active)return!1;if(a.type==OpenLayers.Control.TYPE_BUTTON)a.trigger();else if(a.type==OpenLayers.Control.TYPE_TOGGLE)a.active?a.deactivate():a.activate();else if(this.allowDepress&&a.active)a.deactivate();else{for(var b,c=0,d=this.controls.length;c<d;c++)b=this.controls[c],b==a||b.type!==OpenLayers.Control.TYPE_TOOL&&null!=b.type||b.deactivate();
+a.activate()}},addControls:function(a){OpenLayers.Util.isArray(a)||(a=[a]);this.controls=this.controls.concat(a);for(var b=0,c=a.length;b<c;b++){var d=a[b],e=this.createControlMarkup(d);OpenLayers.Element.addClass(e,d.displayClass+"ItemInactive");OpenLayers.Element.addClass(e,"olButton");""==d.title||e.title||(e.title=d.title);d.panel_div=e}this.map&&(this.addControlsToMap(a),this.redraw())},createControlMarkup:function(a){return document.createElement("div")},addControlsToMap:function(a){for(var b,
+c=0,d=a.length;c<d;c++)b=a[c],!0===b.autoActivate?(b.autoActivate=!1,this.map.addControl(b),b.autoActivate=!0):(this.map.addControl(b),b.deactivate()),b.events.on({activate:this.iconOn,deactivate:this.iconOff})},iconOn:function(){var a=this.panel_div;a.className=a.className.replace(RegExp("\\b("+this.displayClass+"Item)Inactive\\b"),"$1Active")},iconOff:function(){var a=this.panel_div;a.className=a.className.replace(RegExp("\\b("+this.displayClass+"Item)Active\\b"),"$1Inactive")},onButtonClick:function(a){var b=
+this.controls;a=a.buttonElement;for(var c=b.length-1;0<=c;--c)if(b[c].panel_div===a){this.activateControl(b[c]);break}},getControlsBy:function(a,b){var c="function"==typeof b.test;return OpenLayers.Array.filter(this.controls,function(d){return d[a]==b||c&&b.test(d[a])})},getControlsByName:function(a){return this.getControlsBy("name",a)},getControlsByClass:function(a){return this.getControlsBy("CLASS_NAME",a)},CLASS_NAME:"OpenLayers.Control.Panel"});OpenLayers.Control.Button=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_BUTTON,trigger:function(){},CLASS_NAME:"OpenLayers.Control.Button"});OpenLayers.Control.ZoomIn=OpenLayers.Class(OpenLayers.Control.Button,{trigger:function(){this.map&&this.map.zoomIn()},CLASS_NAME:"OpenLayers.Control.ZoomIn"});OpenLayers.Control.ZoomOut=OpenLayers.Class(OpenLayers.Control.Button,{trigger:function(){this.map&&this.map.zoomOut()},CLASS_NAME:"OpenLayers.Control.ZoomOut"});OpenLayers.Control.ZoomToMaxExtent=OpenLayers.Class(OpenLayers.Control.Button,{trigger:function(){this.map&&this.map.zoomToMaxExtent()},CLASS_NAME:"OpenLayers.Control.ZoomToMaxExtent"});OpenLayers.Control.ZoomPanel=OpenLayers.Class(OpenLayers.Control.Panel,{initialize:function(a){OpenLayers.Control.Panel.prototype.initialize.apply(this,[a]);this.addControls([new OpenLayers.Control.ZoomIn,new OpenLayers.Control.ZoomToMaxExtent,new OpenLayers.Control.ZoomOut])},CLASS_NAME:"OpenLayers.Control.ZoomPanel"});OpenLayers.Layer.HTTPRequest=OpenLayers.Class(OpenLayers.Layer,{URL_HASH_FACTOR:(Math.sqrt(5)-1)/2,url:null,params:null,reproject:!1,initialize:function(a,b,c,d){OpenLayers.Layer.prototype.initialize.apply(this,[a,d]);this.url=b;this.params||(this.params=OpenLayers.Util.extend({},c))},destroy:function(){this.params=this.url=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.HTTPRequest(this.name,this.url,this.params,this.getOptions()));
+return a=OpenLayers.Layer.prototype.clone.apply(this,[a])},setUrl:function(a){this.url=a},mergeNewParams:function(a){this.params=OpenLayers.Util.extend(this.params,a);a=this.redraw();null!=this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"params"});return a},redraw:function(a){return a?this.mergeNewParams({_olSalt:Math.random()}):OpenLayers.Layer.prototype.redraw.apply(this,[])},selectUrl:function(a,b){for(var c=1,d=0,e=a.length;d<e;d++)c*=a.charCodeAt(d)*this.URL_HASH_FACTOR,
+c-=Math.floor(c);return b[Math.floor(c*b.length)]},getFullRequestString:function(a,b){var c=b||this.url,d=OpenLayers.Util.extend({},this.params),d=OpenLayers.Util.extend(d,a),e=OpenLayers.Util.getParameterString(d);OpenLayers.Util.isArray(c)&&(c=this.selectUrl(e,c));var e=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(c)),f;for(f in d)f.toUpperCase()in e&&delete d[f];e=OpenLayers.Util.getParameterString(d);return OpenLayers.Util.urlAppend(c,e)},CLASS_NAME:"OpenLayers.Layer.HTTPRequest"});OpenLayers.Tile=OpenLayers.Class({events:null,eventListeners:null,id:null,layer:null,url:null,bounds:null,size:null,position:null,isLoading:!1,initialize:function(a,b,c,d,e,f){this.layer=a;this.position=b.clone();this.setBounds(c);this.url=d;e&&(this.size=e.clone());this.id=OpenLayers.Util.createUniqueID("Tile_");OpenLayers.Util.extend(this,f);this.events=new OpenLayers.Events(this);if(this.eventListeners instanceof Object)this.events.on(this.eventListeners)},unload:function(){this.isLoading&&(this.isLoading=
+!1,this.events.triggerEvent("unload"))},destroy:function(){this.position=this.size=this.bounds=this.layer=null;this.eventListeners&&this.events.un(this.eventListeners);this.events.destroy();this.events=this.eventListeners=null},draw:function(a){a||this.clear();var b=this.shouldDraw();b&&(!a&&!1===this.events.triggerEvent("beforedraw"))&&(b=null);return b},shouldDraw:function(){var a=!1,b=this.layer.maxExtent;if(b){var c=this.layer.map,c=c.baseLayer.wrapDateLine&&c.getMaxExtent();this.bounds.intersectsBounds(b,
+{inclusive:!1,worldBounds:c})&&(a=!0)}return a||this.layer.displayOutsideMaxExtent},setBounds:function(a){a=a.clone();if(this.layer.map.baseLayer.wrapDateLine){var b=this.layer.map.getMaxExtent(),c=this.layer.map.getResolution();a=a.wrapDateLine(b,{leftTolerance:c,rightTolerance:c})}this.bounds=a},moveTo:function(a,b,c){null==c&&(c=!0);this.setBounds(a);this.position=b.clone();c&&this.draw()},clear:function(a){},CLASS_NAME:"OpenLayers.Tile"});OpenLayers.Tile.Image=OpenLayers.Class(OpenLayers.Tile,{url:null,imgDiv:null,frame:null,imageReloadAttempts:null,layerAlphaHack:null,asyncRequestId:null,maxGetUrlLength:null,canvasContext:null,crossOriginKeyword:null,initialize:function(a,b,c,d,e,f){OpenLayers.Tile.prototype.initialize.apply(this,arguments);this.url=d;this.layerAlphaHack=this.layer.alpha&&OpenLayers.Util.alphaHack();if(null!=this.maxGetUrlLength||this.layer.gutter||this.layerAlphaHack)this.frame=document.createElement("div"),this.frame.style.position=
+"absolute",this.frame.style.overflow="hidden";null!=this.maxGetUrlLength&&OpenLayers.Util.extend(this,OpenLayers.Tile.Image.IFrame)},destroy:function(){this.imgDiv&&(this.clear(),this.frame=this.imgDiv=null);this.asyncRequestId=null;OpenLayers.Tile.prototype.destroy.apply(this,arguments)},draw:function(){var a=OpenLayers.Tile.prototype.draw.apply(this,arguments);a?(this.layer!=this.layer.map.baseLayer&&this.layer.reproject&&(this.bounds=this.getBoundsFromBaseLayer(this.position)),this.isLoading?this._loadEvent=
+"reload":(this.isLoading=!0,this._loadEvent="loadstart"),this.renderTile(),this.positionTile()):!1===a&&this.unload();return a},renderTile:function(){if(this.layer.async){var a=this.asyncRequestId=(this.asyncRequestId||0)+1;this.layer.getURLasync(this.bounds,function(b){a==this.asyncRequestId&&(this.url=b,this.initImage())},this)}else this.url=this.layer.getURL(this.bounds),this.initImage()},positionTile:function(){var a=this.getTile().style,b=this.frame?this.size:this.layer.getImageSize(this.bounds),
+c=1;this.layer instanceof OpenLayers.Layer.Grid&&(c=this.layer.getServerResolution()/this.layer.map.getResolution());a.left=this.position.x+"px";a.top=this.position.y+"px";a.width=Math.round(c*b.w)+"px";a.height=Math.round(c*b.h)+"px"},clear:function(){OpenLayers.Tile.prototype.clear.apply(this,arguments);var a=this.imgDiv;if(a){var b=this.getTile();b.parentNode===this.layer.div&&this.layer.div.removeChild(b);this.setImgSrc();!0===this.layerAlphaHack&&(a.style.filter="");OpenLayers.Element.removeClass(a,
+"olImageLoadError")}this.canvasContext=null},getImage:function(){if(!this.imgDiv){this.imgDiv=OpenLayers.Tile.Image.IMAGE.cloneNode(!1);var a=this.imgDiv.style;if(this.frame){var b=0,c=0;this.layer.gutter&&(b=100*(this.layer.gutter/this.layer.tileSize.w),c=100*(this.layer.gutter/this.layer.tileSize.h));a.left=-b+"%";a.top=-c+"%";a.width=2*b+100+"%";a.height=2*c+100+"%"}a.visibility="hidden";a.opacity=0;1>this.layer.opacity&&(a.filter="alpha(opacity="+100*this.layer.opacity+")");a.position="absolute";
+this.layerAlphaHack&&(a.paddingTop=a.height,a.height="0",a.width="100%");this.frame&&this.frame.appendChild(this.imgDiv)}return this.imgDiv},setImage:function(a){this.imgDiv=a},initImage:function(){this.events.triggerEvent("beforeload");this.layer.div.appendChild(this.getTile());this.events.triggerEvent(this._loadEvent);var a=this.getImage();this.url&&OpenLayers.Util.isEquivalentUrl(a.src,this.url)?this._loadTimeout=window.setTimeout(OpenLayers.Function.bind(this.onImageLoad,this),0):(this.stopLoading(),
+this.crossOriginKeyword&&a.removeAttribute("crossorigin"),OpenLayers.Event.observe(a,"load",OpenLayers.Function.bind(this.onImageLoad,this)),OpenLayers.Event.observe(a,"error",OpenLayers.Function.bind(this.onImageError,this)),this.imageReloadAttempts=0,this.setImgSrc(this.url))},setImgSrc:function(a){var b=this.imgDiv;a?(b.style.visibility="hidden",b.style.opacity=0,this.crossOriginKeyword&&("data:"!==a.substr(0,5)?b.setAttribute("crossorigin",this.crossOriginKeyword):b.removeAttribute("crossorigin")),
+b.src=a):(this.stopLoading(),this.imgDiv=null,b.parentNode&&b.parentNode.removeChild(b))},getTile:function(){return this.frame?this.frame:this.getImage()},createBackBuffer:function(){if(this.imgDiv&&!this.isLoading){var a;this.frame?(a=this.frame.cloneNode(!1),a.appendChild(this.imgDiv)):a=this.imgDiv;this.imgDiv=null;return a}},onImageLoad:function(){var a=this.imgDiv;this.stopLoading();a.style.visibility="inherit";a.style.opacity=this.layer.opacity;this.isLoading=!1;this.canvasContext=null;this.events.triggerEvent("loadend");
+!0===this.layerAlphaHack&&(a.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+a.src+"', sizingMethod='scale')")},onImageError:function(){var a=this.imgDiv;null!=a.src&&(this.imageReloadAttempts++,this.imageReloadAttempts<=OpenLayers.IMAGE_RELOAD_ATTEMPTS?this.setImgSrc(this.layer.getURL(this.bounds)):(OpenLayers.Element.addClass(a,"olImageLoadError"),this.events.triggerEvent("loaderror"),this.onImageLoad()))},stopLoading:function(){OpenLayers.Event.stopObservingElement(this.imgDiv);
+window.clearTimeout(this._loadTimeout);delete this._loadTimeout},getCanvasContext:function(){if(OpenLayers.CANVAS_SUPPORTED&&this.imgDiv&&!this.isLoading){if(!this.canvasContext){var a=document.createElement("canvas");a.width=this.size.w;a.height=this.size.h;this.canvasContext=a.getContext("2d");this.canvasContext.drawImage(this.imgDiv,0,0)}return this.canvasContext}},CLASS_NAME:"OpenLayers.Tile.Image"});
+OpenLayers.Tile.Image.IMAGE=function(){var a=new Image;a.className="olTileImage";a.galleryImg="no";return a}();OpenLayers.Layer.Grid=OpenLayers.Class(OpenLayers.Layer.HTTPRequest,{tileSize:null,tileOriginCorner:"bl",tileOrigin:null,tileOptions:null,tileClass:OpenLayers.Tile.Image,grid:null,singleTile:!1,ratio:1.5,buffer:0,transitionEffect:"resize",numLoadingTiles:0,serverResolutions:null,loading:!1,backBuffer:null,gridResolution:null,backBufferResolution:null,backBufferLonLat:null,backBufferTimerId:null,removeBackBufferDelay:null,className:null,gridLayout:null,rowSign:null,transitionendEvents:["transitionend",
+"webkitTransitionEnd","otransitionend","oTransitionEnd"],initialize:function(a,b,c,d){OpenLayers.Layer.HTTPRequest.prototype.initialize.apply(this,arguments);this.grid=[];this._removeBackBuffer=OpenLayers.Function.bind(this.removeBackBuffer,this);this.initProperties();this.rowSign="t"===this.tileOriginCorner.substr(0,1)?1:-1},initProperties:function(){void 0===this.options.removeBackBufferDelay&&(this.removeBackBufferDelay=this.singleTile?0:2500);void 0===this.options.className&&(this.className=this.singleTile?
+"olLayerGridSingleTile":"olLayerGrid")},setMap:function(a){OpenLayers.Layer.HTTPRequest.prototype.setMap.call(this,a);OpenLayers.Element.addClass(this.div,this.className)},removeMap:function(a){this.removeBackBuffer()},destroy:function(){this.removeBackBuffer();this.clearGrid();this.tileSize=this.grid=null;OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this,arguments)},clearGrid:function(){if(this.grid){for(var a=0,b=this.grid.length;a<b;a++)for(var c=this.grid[a],d=0,e=c.length;d<e;d++)this.destroyTile(c[d]);
+this.grid=[];this.gridLayout=this.gridResolution=null}},addOptions:function(a,b){var c=void 0!==a.singleTile&&a.singleTile!==this.singleTile;OpenLayers.Layer.HTTPRequest.prototype.addOptions.apply(this,arguments);this.map&&c&&(this.initProperties(),this.clearGrid(),this.tileSize=this.options.tileSize,this.setTileSize(),this.moveTo(null,!0))},clone:function(a){null==a&&(a=new OpenLayers.Layer.Grid(this.name,this.url,this.params,this.getOptions()));a=OpenLayers.Layer.HTTPRequest.prototype.clone.apply(this,
+[a]);null!=this.tileSize&&(a.tileSize=this.tileSize.clone());a.grid=[];a.gridResolution=null;a.backBuffer=null;a.backBufferTimerId=null;a.loading=!1;a.numLoadingTiles=0;return a},moveTo:function(a,b,c){OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);a=a||this.map.getExtent();if(null!=a){var d=!this.grid.length||b,e=this.getTilesBounds(),f=this.map.getResolution();this.getServerResolution(f);if(this.singleTile){if(d||!c&&!e.containsBounds(a))b&&"resize"!==this.transitionEffect&&
+this.removeBackBuffer(),b&&"resize"!==this.transitionEffect||this.applyBackBuffer(f),this.initSingleTile(a)}else(d=d||!e.intersectsBounds(a,{worldBounds:this.map.baseLayer.wrapDateLine&&this.map.getMaxExtent()}))?(!b||"resize"!==this.transitionEffect&&this.gridResolution!==f||this.applyBackBuffer(f),this.initGriddedTiles(a)):this.moveGriddedTiles()}},getTileData:function(a){var b=null,c=a.lon,d=a.lat,e=this.grid.length;if(this.map&&e){var f=this.map.getResolution();a=this.tileSize.w;var g=this.tileSize.h,
+h=this.grid[0][0].bounds,k=h.left,h=h.top;if(c<k&&this.map.baseLayer.wrapDateLine)var l=this.map.getMaxExtent().getWidth(),m=Math.ceil((k-c)/l),c=c+l*m;c=(c-k)/(f*a);d=(h-d)/(f*g);f=Math.floor(c);k=Math.floor(d);0<=k&&k<e&&(e=this.grid[k][f])&&(b={tile:e,i:Math.floor((c-f)*a),j:Math.floor((d-k)*g)})}return b},destroyTile:function(a){this.removeTileMonitoringHooks(a);a.destroy()},getServerResolution:function(a){var b=Number.POSITIVE_INFINITY;a=a||this.map.getResolution();if(this.serverResolutions&&
+-1===OpenLayers.Util.indexOf(this.serverResolutions,a)){var c,d,e,f;for(c=this.serverResolutions.length-1;0<=c;c--){e=this.serverResolutions[c];d=Math.abs(e-a);if(d>b)break;b=d;f=e}a=f}return a},getServerZoom:function(){var a=this.getServerResolution();return this.serverResolutions?OpenLayers.Util.indexOf(this.serverResolutions,a):this.map.getZoomForResolution(a)+(this.zoomOffset||0)},applyBackBuffer:function(a){null!==this.backBufferTimerId&&this.removeBackBuffer();var b=this.backBuffer;if(!b){b=
+this.createBackBuffer();if(!b)return;a===this.gridResolution?this.div.insertBefore(b,this.div.firstChild):this.map.baseLayer.div.parentNode.insertBefore(b,this.map.baseLayer.div);this.backBuffer=b;var c=this.grid[0][0].bounds;this.backBufferLonLat={lon:c.left,lat:c.top};this.backBufferResolution=this.gridResolution}for(var c=this.backBufferResolution/a,d=b.childNodes,e,f=d.length-1;0<=f;--f)e=d[f],e.style.top=(c*e._i*e._h|0)+"px",e.style.left=(c*e._j*e._w|0)+"px",e.style.width=Math.round(c*e._w)+
+"px",e.style.height=Math.round(c*e._h)+"px";a=this.getViewPortPxFromLonLat(this.backBufferLonLat,a);c=this.map.layerContainerOriginPx.y;b.style.left=Math.round(a.x-this.map.layerContainerOriginPx.x)+"px";b.style.top=Math.round(a.y-c)+"px"},createBackBuffer:function(){var a;if(0<this.grid.length){a=document.createElement("div");a.id=this.div.id+"_bb";a.className="olBackBuffer";a.style.position="absolute";var b=this.map;a.style.zIndex="resize"===this.transitionEffect?this.getZIndex()-1:b.Z_INDEX_BASE.BaseLayer-
+(b.getNumLayers()-b.getLayerIndex(this));for(var b=0,c=this.grid.length;b<c;b++)for(var d=0,e=this.grid[b].length;d<e;d++){var f=this.grid[b][d],g=this.grid[b][d].createBackBuffer();g&&(g._i=b,g._j=d,g._w=f.size.w,g._h=f.size.h,g.id=f.id+"_bb",a.appendChild(g))}}return a},removeBackBuffer:function(){if(this._transitionElement){for(var a=this.transitionendEvents.length-1;0<=a;--a)OpenLayers.Event.stopObserving(this._transitionElement,this.transitionendEvents[a],this._removeBackBuffer);delete this._transitionElement}this.backBuffer&&
+(this.backBuffer.parentNode&&this.backBuffer.parentNode.removeChild(this.backBuffer),this.backBufferResolution=this.backBuffer=null,null!==this.backBufferTimerId&&(window.clearTimeout(this.backBufferTimerId),this.backBufferTimerId=null))},moveByPx:function(a,b){this.singleTile||this.moveGriddedTiles()},setTileSize:function(a){this.singleTile&&(a=this.map.getSize(),a.h=parseInt(a.h*this.ratio,10),a.w=parseInt(a.w*this.ratio,10));OpenLayers.Layer.HTTPRequest.prototype.setTileSize.apply(this,[a])},getTilesBounds:function(){var a=
+null,b=this.grid.length;if(b)var a=this.grid[b-1][0].bounds,b=this.grid[0].length*a.getWidth(),c=this.grid.length*a.getHeight(),a=new OpenLayers.Bounds(a.left,a.bottom,a.left+b,a.bottom+c);return a},initSingleTile:function(a){this.events.triggerEvent("retile");var b=a.getCenterLonLat(),c=a.getWidth()*this.ratio;a=a.getHeight()*this.ratio;b=new OpenLayers.Bounds(b.lon-c/2,b.lat-a/2,b.lon+c/2,b.lat+a/2);c=this.map.getLayerPxFromLonLat({lon:b.left,lat:b.top});this.grid.length||(this.grid[0]=[]);(a=this.grid[0][0])?
+a.moveTo(b,c):(a=this.addTile(b,c),this.addTileMonitoringHooks(a),a.draw(),this.grid[0][0]=a);this.removeExcessTiles(1,1);this.gridResolution=this.getServerResolution()},calculateGridLayout:function(a,b,c){var d=c*this.tileSize.w;c*=this.tileSize.h;var e=Math.floor((a.left-b.lon)/d)-this.buffer,f=this.rowSign;a=Math[~f?"floor":"ceil"](f*(b.lat-a.top+c)/c)-this.buffer*f;return{tilelon:d,tilelat:c,startcol:e,startrow:a}},getTileOrigin:function(){var a=this.tileOrigin;if(!a)var a=this.getMaxExtent(),
+b={tl:["left","top"],tr:["right","top"],bl:["left","bottom"],br:["right","bottom"]}[this.tileOriginCorner],a=new OpenLayers.LonLat(a[b[0]],a[b[1]]);return a},getTileBoundsForGridIndex:function(a,b){var c=this.getTileOrigin(),d=this.gridLayout,e=d.tilelon,f=d.tilelat,g=d.startcol,d=d.startrow,h=this.rowSign;return new OpenLayers.Bounds(c.lon+(g+b)*e,c.lat-(d+a*h)*f*h,c.lon+(g+b+1)*e,c.lat-(d+(a-1)*h)*f*h)},initGriddedTiles:function(a){this.events.triggerEvent("retile");var b=this.map.getSize(),c=this.getTileOrigin(),
+d=this.map.getResolution(),e=this.getServerResolution(),f=d/e,d=this.tileSize.w/f,f=this.tileSize.h/f,g=Math.ceil(b.h/f)+2*this.buffer+1,b=Math.ceil(b.w/d)+2*this.buffer+1;this.gridLayout=e=this.calculateGridLayout(a,c,e);var c=e.tilelon,h=e.tilelat,e=this.map.layerContainerOriginPx.x,k=this.map.layerContainerOriginPx.y,l=this.getTileBoundsForGridIndex(0,0),m=this.map.getViewPortPxFromLonLat(new OpenLayers.LonLat(l.left,l.top));m.x=Math.round(m.x)-e;m.y=Math.round(m.y)-k;var e=[],k=this.map.getCenter(),
+n=0;do{var p=this.grid[n];p||(p=[],this.grid.push(p));var q=0;do{var l=this.getTileBoundsForGridIndex(n,q),r=m.clone();r.x+=q*Math.round(d);r.y+=n*Math.round(f);var s=p[q];s?s.moveTo(l,r,!1):(s=this.addTile(l,r),this.addTileMonitoringHooks(s),p.push(s));r=l.getCenterLonLat();e.push({tile:s,distance:Math.pow(r.lon-k.lon,2)+Math.pow(r.lat-k.lat,2)});q+=1}while(l.right<=a.right+c*this.buffer||q<b);n+=1}while(l.bottom>=a.bottom-h*this.buffer||n<g);this.removeExcessTiles(n,q);this.gridResolution=d=this.getServerResolution();
+e.sort(function(a,b){return a.distance-b.distance});a=0;for(d=e.length;a<d;++a)e[a].tile.draw()},getMaxExtent:function(){return this.maxExtent},addTile:function(a,b){var c=new this.tileClass(this,b,a,null,this.tileSize,this.tileOptions);this.events.triggerEvent("addtile",{tile:c});return c},addTileMonitoringHooks:function(a){a.onLoadStart=function(){!1===this.loading&&(this.loading=!0,this.events.triggerEvent("loadstart"));this.events.triggerEvent("tileloadstart",{tile:a});this.numLoadingTiles++;
+!this.singleTile&&(this.backBuffer&&this.gridResolution===this.backBufferResolution)&&OpenLayers.Element.addClass(a.getTile(),"olTileReplacing")};a.onLoadEnd=function(b){this.numLoadingTiles--;b="unload"===b.type;this.events.triggerEvent("tileloaded",{tile:a,aborted:b});if(!this.singleTile&&!b&&this.backBuffer&&this.gridResolution===this.backBufferResolution){var c=a.getTile();if("none"===OpenLayers.Element.getStyle(c,"display")){var d=document.getElementById(a.id+"_bb");d&&d.parentNode.removeChild(d)}OpenLayers.Element.removeClass(c,
+"olTileReplacing")}if(0===this.numLoadingTiles){if(this.backBuffer)if(0===this.backBuffer.childNodes.length)this.removeBackBuffer();else{this._transitionElement=b?this.div.lastChild:a.imgDiv;b=this.transitionendEvents;for(c=b.length-1;0<=c;--c)OpenLayers.Event.observe(this._transitionElement,b[c],this._removeBackBuffer);this.backBufferTimerId=window.setTimeout(this._removeBackBuffer,this.removeBackBufferDelay)}this.loading=!1;this.events.triggerEvent("loadend")}};a.onLoadError=function(){this.events.triggerEvent("tileerror",
+{tile:a})};a.events.on({loadstart:a.onLoadStart,loadend:a.onLoadEnd,unload:a.onLoadEnd,loaderror:a.onLoadError,scope:this})},removeTileMonitoringHooks:function(a){a.unload();a.events.un({loadstart:a.onLoadStart,loadend:a.onLoadEnd,unload:a.onLoadEnd,loaderror:a.onLoadError,scope:this})},moveGriddedTiles:function(){for(var a=this.buffer+1;;){var b=this.grid[0][0],c=b.position.x+this.map.layerContainerOriginPx.x,b=b.position.y+this.map.layerContainerOriginPx.y,d=this.getServerResolution()/this.map.getResolution(),
+d={w:Math.round(this.tileSize.w*d),h:Math.round(this.tileSize.h*d)};if(c>-d.w*(a-1))this.shiftColumn(!0,d);else if(c<-d.w*a)this.shiftColumn(!1,d);else if(b>-d.h*(a-1))this.shiftRow(!0,d);else if(b<-d.h*a)this.shiftRow(!1,d);else break}},shiftRow:function(a,b){var c=this.grid,d=a?0:c.length-1,e=a?-1:1;this.gridLayout.startrow+=e*this.rowSign;for(var f=c[d],g=c[a?"pop":"shift"](),h=0,k=g.length;h<k;h++){var l=g[h],m=f[h].position.clone();m.y+=b.h*e;l.moveTo(this.getTileBoundsForGridIndex(d,h),m)}c[a?
+"unshift":"push"](g)},shiftColumn:function(a,b){var c=this.grid,d=a?0:c[0].length-1,e=a?-1:1;this.gridLayout.startcol+=e;for(var f=0,g=c.length;f<g;f++){var h=c[f],k=h[d].position.clone(),l=h[a?"pop":"shift"]();k.x+=b.w*e;l.moveTo(this.getTileBoundsForGridIndex(f,d),k);h[a?"unshift":"push"](l)}},removeExcessTiles:function(a,b){for(var c,d;this.grid.length>a;){var e=this.grid.pop();c=0;for(d=e.length;c<d;c++){var f=e[c];this.destroyTile(f)}}c=0;for(d=this.grid.length;c<d;c++)for(;this.grid[c].length>
+b;)e=this.grid[c],f=e.pop(),this.destroyTile(f)},onMapResize:function(){this.singleTile&&(this.clearGrid(),this.setTileSize())},getTileBounds:function(a){var b=this.maxExtent,c=this.getResolution(),d=c*this.tileSize.w,c=c*this.tileSize.h,e=this.getLonLatFromViewPortPx(a);a=b.left+d*Math.floor((e.lon-b.left)/d);b=b.bottom+c*Math.floor((e.lat-b.bottom)/c);return new OpenLayers.Bounds(a,b,a+d,b+c)},CLASS_NAME:"OpenLayers.Layer.Grid"});OpenLayers.Format.ArcXML=OpenLayers.Class(OpenLayers.Format.XML,{fontStyleKeys:"antialiasing blockout font fontcolor fontsize fontstyle glowing interval outline printmode shadow transparency".split(" "),request:null,response:null,initialize:function(a){this.request=new OpenLayers.Format.ArcXML.Request;this.response=new OpenLayers.Format.ArcXML.Response;if(a)if("feature"==a.requesttype){this.request.get_image=null;var b=this.request.get_feature.query;this.addCoordSys(b.featurecoordsys,a.featureCoordSys);
+this.addCoordSys(b.filtercoordsys,a.filterCoordSys);a.polygon?(b.isspatial=!0,b.spatialfilter.polygon=a.polygon):a.envelope&&(b.isspatial=!0,b.spatialfilter.envelope={minx:0,miny:0,maxx:0,maxy:0},this.parseEnvelope(b.spatialfilter.envelope,a.envelope))}else"image"==a.requesttype?(this.request.get_feature=null,b=this.request.get_image.properties,this.parseEnvelope(b.envelope,a.envelope),this.addLayers(b.layerlist,a.layers),this.addImageSize(b.imagesize,a.tileSize),this.addCoordSys(b.featurecoordsys,
+a.featureCoordSys),this.addCoordSys(b.filtercoordsys,a.filterCoordSys)):this.request=null;OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},parseEnvelope:function(a,b){b&&4==b.length&&(a.minx=b[0],a.miny=b[1],a.maxx=b[2],a.maxy=b[3])},addLayers:function(a,b){for(var c=0,d=b.length;c<d;c++)a.push(b[c])},addImageSize:function(a,b){null!==b&&(a.width=b.w,a.height=b.h,a.printwidth=b.w,a.printheight=b.h)},addCoordSys:function(a,b){"string"==typeof b?(a.id=parseInt(b),a.string=b):"object"==typeof b&&
+null!==b.proj&&(a.id=b.proj.srsProjNumber,a.string=b.proj.srsCode)},iserror:function(a){var b=null;a?(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]),a=a.documentElement.getElementsByTagName("ERROR"),b=null!==a&&0<a.length):b=""!==this.response.error;return b},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=null;a&&a.documentElement&&(b="ARCXML"==a.documentElement.nodeName?a.documentElement:a.documentElement.getElementsByTagName("ARCXML")[0]);
+if(!b||"parsererror"===b.firstChild.nodeName){var c,d;try{c=a.firstChild.nodeValue,d=a.firstChild.childNodes[1].firstChild.nodeValue}catch(e){}throw{message:"Error parsing the ArcXML request",error:c,source:d};}return this.parseResponse(b)},write:function(a){a||(a=this.request);var b=this.createElementNS("","ARCXML");b.setAttribute("version","1.1");var c=this.createElementNS("","REQUEST");if(null!=a.get_image){var d=this.createElementNS("","GET_IMAGE");c.appendChild(d);var e=this.createElementNS("",
+"PROPERTIES");d.appendChild(e);a=a.get_image.properties;null!=a.featurecoordsys&&(d=this.createElementNS("","FEATURECOORDSYS"),e.appendChild(d),0===a.featurecoordsys.id?d.setAttribute("string",a.featurecoordsys.string):d.setAttribute("id",a.featurecoordsys.id));null!=a.filtercoordsys&&(d=this.createElementNS("","FILTERCOORDSYS"),e.appendChild(d),0===a.filtercoordsys.id?d.setAttribute("string",a.filtercoordsys.string):d.setAttribute("id",a.filtercoordsys.id));null!=a.envelope&&(d=this.createElementNS("",
+"ENVELOPE"),e.appendChild(d),d.setAttribute("minx",a.envelope.minx),d.setAttribute("miny",a.envelope.miny),d.setAttribute("maxx",a.envelope.maxx),d.setAttribute("maxy",a.envelope.maxy));d=this.createElementNS("","IMAGESIZE");e.appendChild(d);d.setAttribute("height",a.imagesize.height);d.setAttribute("width",a.imagesize.width);if(a.imagesize.height!=a.imagesize.printheight||a.imagesize.width!=a.imagesize.printwidth)d.setAttribute("printheight",a.imagesize.printheight),d.setArrtibute("printwidth",a.imagesize.printwidth);
+null!=a.background&&(d=this.createElementNS("","BACKGROUND"),e.appendChild(d),d.setAttribute("color",a.background.color.r+","+a.background.color.g+","+a.background.color.b),null!==a.background.transcolor&&d.setAttribute("transcolor",a.background.transcolor.r+","+a.background.transcolor.g+","+a.background.transcolor.b));if(null!=a.layerlist&&0<a.layerlist.length)for(d=this.createElementNS("","LAYERLIST"),e.appendChild(d),e=0;e<a.layerlist.length;e++){var f=this.createElementNS("","LAYERDEF");d.appendChild(f);
+f.setAttribute("id",a.layerlist[e].id);f.setAttribute("visible",a.layerlist[e].visible);if("object"==typeof a.layerlist[e].query){var g=a.layerlist[e].query;if(0>g.where.length)continue;var h=null,h="boolean"==typeof g.spatialfilter&&g.spatialfilter?this.createElementNS("","SPATIALQUERY"):this.createElementNS("","QUERY");h.setAttribute("where",g.where);"number"==typeof g.accuracy&&0<g.accuracy&&h.setAttribute("accuracy",g.accuracy);"number"==typeof g.featurelimit&&2E3>g.featurelimit&&h.setAttribute("featurelimit",
+g.featurelimit);"string"==typeof g.subfields&&"#ALL#"!=g.subfields&&h.setAttribute("subfields",g.subfields);"string"==typeof g.joinexpression&&0<g.joinexpression.length&&h.setAttribute("joinexpression",g.joinexpression);"string"==typeof g.jointables&&0<g.jointables.length&&h.setAttribute("jointables",g.jointables);f.appendChild(h)}"object"==typeof a.layerlist[e].renderer&&this.addRenderer(f,a.layerlist[e].renderer)}}else null!=a.get_feature&&(d=this.createElementNS("","GET_FEATURES"),d.setAttribute("outputmode",
+"newxml"),d.setAttribute("checkesc","true"),a.get_feature.geometry?d.setAttribute("geometry",a.get_feature.geometry):d.setAttribute("geometry","false"),a.get_feature.compact&&d.setAttribute("compact",a.get_feature.compact),"number"==a.get_feature.featurelimit&&d.setAttribute("featurelimit",a.get_feature.featurelimit),d.setAttribute("globalenvelope","true"),c.appendChild(d),null!=a.get_feature.layer&&0<a.get_feature.layer.length&&(e=this.createElementNS("","LAYER"),e.setAttribute("id",a.get_feature.layer),
+d.appendChild(e)),a=a.get_feature.query,null!=a&&(e=null,e=a.isspatial?this.createElementNS("","SPATIALQUERY"):this.createElementNS("","QUERY"),d.appendChild(e),"number"==typeof a.accuracy&&e.setAttribute("accuracy",a.accuracy),null!=a.featurecoordsys&&(d=this.createElementNS("","FEATURECOORDSYS"),0==a.featurecoordsys.id?d.setAttribute("string",a.featurecoordsys.string):d.setAttribute("id",a.featurecoordsys.id),e.appendChild(d)),null!=a.filtercoordsys&&(d=this.createElementNS("","FILTERCOORDSYS"),
+0===a.filtercoordsys.id?d.setAttribute("string",a.filtercoordsys.string):d.setAttribute("id",a.filtercoordsys.id),e.appendChild(d)),0<a.buffer&&(d=this.createElementNS("","BUFFER"),d.setAttribute("distance",a.buffer),e.appendChild(d)),a.isspatial&&(d=this.createElementNS("","SPATIALFILTER"),d.setAttribute("relation",a.spatialfilter.relation),e.appendChild(d),a.spatialfilter.envelope?(f=this.createElementNS("","ENVELOPE"),f.setAttribute("minx",a.spatialfilter.envelope.minx),f.setAttribute("miny",a.spatialfilter.envelope.miny),
+f.setAttribute("maxx",a.spatialfilter.envelope.maxx),f.setAttribute("maxy",a.spatialfilter.envelope.maxy),d.appendChild(f)):"object"==typeof a.spatialfilter.polygon&&d.appendChild(this.writePolygonGeometry(a.spatialfilter.polygon))),null!=a.where&&0<a.where.length&&e.setAttribute("where",a.where)));b.appendChild(c);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},addGroupRenderer:function(a,b){var c=this.createElementNS("","GROUPRENDERER");a.appendChild(c);for(var d=0;d<b.length;d++)this.addRenderer(c,
+b[d])},addRenderer:function(a,b){if(OpenLayers.Util.isArray(b))this.addGroupRenderer(a,b);else{var c=this.createElementNS("",b.type.toUpperCase()+"RENDERER");a.appendChild(c);"VALUEMAPRENDERER"==c.tagName?this.addValueMapRenderer(c,b):"VALUEMAPLABELRENDERER"==c.tagName?this.addValueMapLabelRenderer(c,b):"SIMPLELABELRENDERER"==c.tagName?this.addSimpleLabelRenderer(c,b):"SCALEDEPENDENTRENDERER"==c.tagName&&this.addScaleDependentRenderer(c,b)}},addScaleDependentRenderer:function(a,b){"string"!=typeof b.lower&&
+"number"!=typeof b.lower||a.setAttribute("lower",b.lower);"string"!=typeof b.upper&&"number"!=typeof b.upper||a.setAttribute("upper",b.upper);this.addRenderer(a,b.renderer)},addValueMapLabelRenderer:function(a,b){a.setAttribute("lookupfield",b.lookupfield);a.setAttribute("labelfield",b.labelfield);if("object"==typeof b.exacts)for(var c=0,d=b.exacts.length;c<d;c++){var e=b.exacts[c],f=this.createElementNS("","EXACT");"string"==typeof e.value&&f.setAttribute("value",e.value);"string"==typeof e.label&&
+f.setAttribute("label",e.label);"string"==typeof e.method&&f.setAttribute("method",e.method);a.appendChild(f);if("object"==typeof e.symbol){var g=null;"text"==e.symbol.type&&(g=this.createElementNS("","TEXTSYMBOL"));if(null!=g){for(var h=this.fontStyleKeys,k=0,l=h.length;k<l;k++){var m=h[k];e.symbol[m]&&g.setAttribute(m,e.symbol[m])}f.appendChild(g)}}}},addValueMapRenderer:function(a,b){a.setAttribute("lookupfield",b.lookupfield);if("object"==typeof b.ranges)for(var c=0,d=b.ranges.length;c<d;c++){var e=
+b.ranges[c],f=this.createElementNS("","RANGE");f.setAttribute("lower",e.lower);f.setAttribute("upper",e.upper);a.appendChild(f);if("object"==typeof e.symbol){var g=null;"simplepolygon"==e.symbol.type&&(g=this.createElementNS("","SIMPLEPOLYGONSYMBOL"));null!=g&&("string"==typeof e.symbol.boundarycolor&&g.setAttribute("boundarycolor",e.symbol.boundarycolor),"string"==typeof e.symbol.fillcolor&&g.setAttribute("fillcolor",e.symbol.fillcolor),"number"==typeof e.symbol.filltransparency&&g.setAttribute("filltransparency",
+e.symbol.filltransparency),f.appendChild(g))}}else if("object"==typeof b.exacts)for(c=0,d=b.exacts.length;c<d;c++)e=b.exacts[c],f=this.createElementNS("","EXACT"),"string"==typeof e.value&&f.setAttribute("value",e.value),"string"==typeof e.label&&f.setAttribute("label",e.label),"string"==typeof e.method&&f.setAttribute("method",e.method),a.appendChild(f),"object"==typeof e.symbol&&(g=null,"simplemarker"==e.symbol.type&&(g=this.createElementNS("","SIMPLEMARKERSYMBOL")),null!=g&&("string"==typeof e.symbol.antialiasing&&
+g.setAttribute("antialiasing",e.symbol.antialiasing),"string"==typeof e.symbol.color&&g.setAttribute("color",e.symbol.color),"string"==typeof e.symbol.outline&&g.setAttribute("outline",e.symbol.outline),"string"==typeof e.symbol.overlap&&g.setAttribute("overlap",e.symbol.overlap),"string"==typeof e.symbol.shadow&&g.setAttribute("shadow",e.symbol.shadow),"number"==typeof e.symbol.transparency&&g.setAttribute("transparency",e.symbol.transparency),"string"==typeof e.symbol.usecentroid&&g.setAttribute("usecentroid",
+e.symbol.usecentroid),"number"==typeof e.symbol.width&&g.setAttribute("width",e.symbol.width),f.appendChild(g)))},addSimpleLabelRenderer:function(a,b){a.setAttribute("field",b.field);for(var c="featureweight howmanylabels labelbufferratio labelpriorities labelweight linelabelposition rotationalangles".split(" "),d=0,e=c.length;d<e;d++){var f=c[d];b[f]&&a.setAttribute(f,b[f])}if("text"==b.symbol.type){var g=b.symbol,h=this.createElementNS("","TEXTSYMBOL");a.appendChild(h);c=this.fontStyleKeys;d=0;
+for(e=c.length;d<e;d++)f=c[d],g[f]&&h.setAttribute(f,b[f])}},writePolygonGeometry:function(a){if(!(a instanceof OpenLayers.Geometry.Polygon))throw{message:"Cannot write polygon geometry to ArcXML with an "+a.CLASS_NAME+" object.",geometry:a};for(var b=this.createElementNS("","POLYGON"),c=0,d=a.components.length;c<d;c++){for(var e=a.components[c],f=this.createElementNS("","RING"),g=0,h=e.components.length;g<h;g++){var k=e.components[g],l=this.createElementNS("","POINT");l.setAttribute("x",k.x);l.setAttribute("y",
+k.y);f.appendChild(l)}b.appendChild(f)}return b},parseResponse:function(a){"string"==typeof a&&(a=(new OpenLayers.Format.XML).read(a));var b=new OpenLayers.Format.ArcXML.Response,c=a.getElementsByTagName("ERROR");if(null!=c&&0<c.length)b.error=this.getChildValue(c,"Unknown error.");else{c=a.getElementsByTagName("RESPONSE");if(null==c||0==c.length)return b.error="No RESPONSE tag found in ArcXML response.",b;var d=c[0].firstChild.nodeName;"#text"==d&&(d=c[0].firstChild.nextSibling.nodeName);if("IMAGE"==
+d)c=a.getElementsByTagName("ENVELOPE"),a=a.getElementsByTagName("OUTPUT"),null==c||0==c.length?b.error="No ENVELOPE tag found in ArcXML response.":null==a||0==a.length?b.error="No OUTPUT tag found in ArcXML response.":(c=this.parseAttributes(c[0]),d=this.parseAttributes(a[0]),b.image="string"==typeof d.type?{envelope:c,output:{type:d.type,data:this.getChildValue(a[0])}}:{envelope:c,output:d});else if("FEATURES"==d){if(a=c[0].getElementsByTagName("FEATURES"),c=a[0].getElementsByTagName("FEATURECOUNT"),
+b.features.featurecount=c[0].getAttribute("count"),0<b.features.featurecount)for(c=a[0].getElementsByTagName("ENVELOPE"),b.features.envelope=this.parseAttributes(c[0],"number"),a=a[0].getElementsByTagName("FEATURE"),c=0;c<a.length;c++){for(var d=new OpenLayers.Feature.Vector,e=a[c].getElementsByTagName("FIELD"),f=0;f<e.length;f++){var g=e[f].getAttribute("name"),h=e[f].getAttribute("value");d.attributes[g]=h}e=a[c].getElementsByTagName("POLYGON");if(0<e.length){e=e[0].getElementsByTagName("RING");
+f=[];for(g=0;g<e.length;g++){h=[];h.push(this.parsePointGeometry(e[g]));for(var k=e[g].getElementsByTagName("HOLE"),l=0;l<k.length;l++)h.push(this.parsePointGeometry(k[l]));f.push(new OpenLayers.Geometry.Polygon(h))}d.geometry=1==f.length?f[0]:new OpenLayers.Geometry.MultiPolygon(f)}b.features.feature.push(d)}}else b.error="Unidentified response type."}return b},parseAttributes:function(a,b){for(var c={},d=0;d<a.attributes.length;d++)c[a.attributes[d].nodeName]="number"==b?parseFloat(a.attributes[d].nodeValue):
+a.attributes[d].nodeValue;return c},parsePointGeometry:function(a){var b=[],c=a.getElementsByTagName("COORDS");if(0<c.length)for(a=this.getChildValue(c[0]),a=a.split(/;/),c=0;c<a.length;c++){var d=a[c].split(/ /);b.push(new OpenLayers.Geometry.Point(d[0],d[1]))}else if(a=a.getElementsByTagName("POINT"),0<a.length)for(c=0;c<a.length;c++)b.push(new OpenLayers.Geometry.Point(parseFloat(a[c].getAttribute("x")),parseFloat(a[c].getAttribute("y"))));return new OpenLayers.Geometry.LinearRing(b)},CLASS_NAME:"OpenLayers.Format.ArcXML"});
+OpenLayers.Format.ArcXML.Request=OpenLayers.Class({initialize:function(a){return OpenLayers.Util.extend(this,{get_image:{properties:{background:null,draw:!0,envelope:{minx:0,miny:0,maxx:0,maxy:0},featurecoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},filtercoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},imagesize:{height:0,width:0,dpi:96,printheight:0,printwidth:0,scalesymbols:!1},layerlist:[],output:{baseurl:"",legendbaseurl:"",legendname:"",legendpath:"",
+legendurl:"",name:"",path:"",type:"jpg",url:""}}},get_feature:{layer:"",query:{isspatial:!1,featurecoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},filtercoordsys:{id:0,string:"",datumtransformid:0,datumtransformstring:""},buffer:0,where:"",spatialfilter:{relation:"envelope_intersection",envelope:null}}},environment:{separators:{cs:" ",ts:";"}},layer:[],workspaces:[]})},CLASS_NAME:"OpenLayers.Format.ArcXML.Request"});
+OpenLayers.Format.ArcXML.Response=OpenLayers.Class({initialize:function(a){return OpenLayers.Util.extend(this,{image:{envelope:null,output:""},features:{featurecount:0,envelope:null,feature:[]},error:""})},CLASS_NAME:"OpenLayers.Format.ArcXML.Response"});(function(){function a(){this._object=f&&!k?new f:new window.ActiveXObject("Microsoft.XMLHTTP");this._listeners=[]}function b(){return new a}function c(a){b.onreadystatechange&&b.onreadystatechange.apply(a);a.dispatchEvent({type:"readystatechange",bubbles:!1,cancelable:!1,timeStamp:new Date+0})}function d(a){try{a.responseText=a._object.responseText}catch(b){}try{var c;var d=a._object,e=d.responseXML,f=d.responseText;h&&(f&&e&&!e.documentElement&&d.getResponseHeader("Content-Type").match(/[^\/]+\/[^\+]+\+xml/))&&
+(e=new window.ActiveXObject("Microsoft.XMLDOM"),e.async=!1,e.validateOnParse=!1,e.loadXML(f));c=e&&(h&&0!=e.parseError||!e.documentElement||e.documentElement&&"parsererror"==e.documentElement.tagName)?null:e;a.responseXML=c}catch(g){}try{a.status=a._object.status}catch(k){}try{a.statusText=a._object.statusText}catch(u){}}function e(a){a._object.onreadystatechange=new window.Function}var f=window.XMLHttpRequest,g=!!window.controllers,h=window.document.all&&!window.opera,k=h&&window.navigator.userAgent.match(/MSIE 7.0/);
+b.prototype=a.prototype;g&&f.wrapped&&(b.wrapped=f.wrapped);b.UNSENT=0;b.OPENED=1;b.HEADERS_RECEIVED=2;b.LOADING=3;b.DONE=4;b.prototype.readyState=b.UNSENT;b.prototype.responseText="";b.prototype.responseXML=null;b.prototype.status=0;b.prototype.statusText="";b.prototype.priority="NORMAL";b.prototype.onreadystatechange=null;b.onreadystatechange=null;b.onopen=null;b.onsend=null;b.onabort=null;b.prototype.open=function(a,f,k,p,q){delete this._headers;3>arguments.length&&(k=!0);this._async=k;var r=this,
+s=this.readyState,t;h&&k&&(t=function(){s!=b.DONE&&(e(r),r.abort())},window.attachEvent("onunload",t));b.onopen&&b.onopen.apply(this,arguments);4<arguments.length?this._object.open(a,f,k,p,q):3<arguments.length?this._object.open(a,f,k,p):this._object.open(a,f,k);this.readyState=b.OPENED;c(this);this._object.onreadystatechange=function(){if(!g||k)r.readyState=r._object.readyState,d(r),r._aborted?r.readyState=b.UNSENT:(r.readyState==b.DONE&&(delete r._data,e(r),h&&k&&window.detachEvent("onunload",t)),
+s!=r.readyState&&c(r),s=r.readyState)}};b.prototype.send=function(a){b.onsend&&b.onsend.apply(this,arguments);arguments.length||(a=null);a&&a.nodeType&&(a=window.XMLSerializer?(new window.XMLSerializer).serializeToString(a):a.xml,this._headers["Content-Type"]||this._object.setRequestHeader("Content-Type","application/xml"));this._data=a;a:if(this._object.send(this._data),g&&!this._async)for(this.readyState=b.OPENED,d(this);this.readyState<b.DONE;)if(this.readyState++,c(this),this._aborted)break a};
+b.prototype.abort=function(){b.onabort&&b.onabort.apply(this,arguments);this.readyState>b.UNSENT&&(this._aborted=!0);this._object.abort();e(this);this.readyState=b.UNSENT;delete this._data};b.prototype.getAllResponseHeaders=function(){return this._object.getAllResponseHeaders()};b.prototype.getResponseHeader=function(a){return this._object.getResponseHeader(a)};b.prototype.setRequestHeader=function(a,b){this._headers||(this._headers={});this._headers[a]=b;return this._object.setRequestHeader(a,b)};
+b.prototype.addEventListener=function(a,b,c){for(var d=0,e;e=this._listeners[d];d++)if(e[0]==a&&e[1]==b&&e[2]==c)return;this._listeners.push([a,b,c])};b.prototype.removeEventListener=function(a,b,c){for(var d=0,e;(e=this._listeners[d])&&(e[0]!=a||e[1]!=b||e[2]!=c);d++);e&&this._listeners.splice(d,1)};b.prototype.dispatchEvent=function(a){a={type:a.type,target:this,currentTarget:this,eventPhase:2,bubbles:a.bubbles,cancelable:a.cancelable,timeStamp:a.timeStamp,stopPropagation:function(){},preventDefault:function(){},
+initEvent:function(){}};"readystatechange"==a.type&&this.onreadystatechange&&(this.onreadystatechange.handleEvent||this.onreadystatechange).apply(this,[a]);for(var b=0,c;c=this._listeners[b];b++)c[0]!=a.type||c[2]||(c[1].handleEvent||c[1]).apply(this,[a])};b.prototype.toString=function(){return"[object XMLHttpRequest]"};b.toString=function(){return"[XMLHttpRequest]"};window.Function.prototype.apply||(window.Function.prototype.apply=function(a,b){b||(b=[]);a.__func=this;a.__func(b[0],b[1],b[2],b[3],
+b[4]);delete a.__func});OpenLayers.Request||(OpenLayers.Request={});OpenLayers.Request.XMLHttpRequest=b})();OpenLayers.ProxyHost="";OpenLayers.Request||(OpenLayers.Request={});
+OpenLayers.Util.extend(OpenLayers.Request,{DEFAULT_CONFIG:{method:"GET",url:window.location.href,async:!0,user:void 0,password:void 0,params:null,proxy:OpenLayers.ProxyHost,headers:{},data:null,callback:function(){},success:null,failure:null,scope:null},URL_SPLIT_REGEX:/([^:]*:)\/\/([^:]*:?[^@]*@)?([^:\/\?]*):?([^\/\?]*)/,events:new OpenLayers.Events(this),makeSameOrigin:function(a,b){var c=0!==a.indexOf("http"),d=!c&&a.match(this.URL_SPLIT_REGEX);if(d){var e=window.location,c=d[1]==e.protocol&&d[3]==
+e.hostname,d=d[4],e=e.port;if(80!=d&&""!=d||"80"!=e&&""!=e)c=c&&d==e}c||b&&(a="function"==typeof b?b(a):b+encodeURIComponent(a));return a},issue:function(a){var b=OpenLayers.Util.extend(this.DEFAULT_CONFIG,{proxy:OpenLayers.ProxyHost});a=a||{};a.headers=a.headers||{};a=OpenLayers.Util.applyDefaults(a,b);a.headers=OpenLayers.Util.applyDefaults(a.headers,b.headers);var b=!1,c;for(c in a.headers)a.headers.hasOwnProperty(c)&&"x-requested-with"===c.toLowerCase()&&(b=!0);!1===b&&(a.headers["X-Requested-With"]=
+"XMLHttpRequest");var d=new OpenLayers.Request.XMLHttpRequest,e=OpenLayers.Util.urlAppend(a.url,OpenLayers.Util.getParameterString(a.params||{})),e=OpenLayers.Request.makeSameOrigin(e,a.proxy);d.open(a.method,e,a.async,a.user,a.password);for(var f in a.headers)d.setRequestHeader(f,a.headers[f]);var g=this.events,h=this;d.onreadystatechange=function(){d.readyState==OpenLayers.Request.XMLHttpRequest.DONE&&!1!==g.triggerEvent("complete",{request:d,config:a,requestUrl:e})&&h.runCallbacks({request:d,config:a,
+requestUrl:e})};!1===a.async?d.send(a.data):window.setTimeout(function(){0!==d.readyState&&d.send(a.data)},0);return d},runCallbacks:function(a){var b=a.request,c=a.config,d=c.scope?OpenLayers.Function.bind(c.callback,c.scope):c.callback,e;c.success&&(e=c.scope?OpenLayers.Function.bind(c.success,c.scope):c.success);var f;c.failure&&(f=c.scope?OpenLayers.Function.bind(c.failure,c.scope):c.failure);"file:"==OpenLayers.Util.createUrlObject(c.url).protocol&&b.responseText&&(b.status=200);d(b);if(!b.status||
+200<=b.status&&300>b.status)this.events.triggerEvent("success",a),e&&e(b);b.status&&(200>b.status||300<=b.status)&&(this.events.triggerEvent("failure",a),f&&f(b))},GET:function(a){a=OpenLayers.Util.extend(a,{method:"GET"});return OpenLayers.Request.issue(a)},POST:function(a){a=OpenLayers.Util.extend(a,{method:"POST"});a.headers=a.headers?a.headers:{};"CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(a.headers)||(a.headers["Content-Type"]="application/xml");return OpenLayers.Request.issue(a)},PUT:function(a){a=
+OpenLayers.Util.extend(a,{method:"PUT"});a.headers=a.headers?a.headers:{};"CONTENT-TYPE"in OpenLayers.Util.upperCaseObject(a.headers)||(a.headers["Content-Type"]="application/xml");return OpenLayers.Request.issue(a)},DELETE:function(a){a=OpenLayers.Util.extend(a,{method:"DELETE"});return OpenLayers.Request.issue(a)},HEAD:function(a){a=OpenLayers.Util.extend(a,{method:"HEAD"});return OpenLayers.Request.issue(a)},OPTIONS:function(a){a=OpenLayers.Util.extend(a,{method:"OPTIONS"});return OpenLayers.Request.issue(a)}});OpenLayers.Layer.ArcIMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{ClientVersion:"9.2",ServiceName:""},featureCoordSys:"4326",filterCoordSys:"4326",layers:null,async:!0,name:"ArcIMS",isBaseLayer:!0,DEFAULT_OPTIONS:{tileSize:new OpenLayers.Size(512,512),featureCoordSys:"4326",filterCoordSys:"4326",layers:null,isBaseLayer:!0,async:!0,name:"ArcIMS"},initialize:function(a,b,c){this.tileSize=new OpenLayers.Size(512,512);this.params=OpenLayers.Util.applyDefaults({ServiceName:c.serviceName},
+this.DEFAULT_PARAMS);this.options=OpenLayers.Util.applyDefaults(c,this.DEFAULT_OPTIONS);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a,b,this.params,c]);this.transparent&&(this.isBaseLayer||(this.isBaseLayer=!1),"image/jpeg"==this.format&&(this.format=OpenLayers.Util.alphaHack()?"image/gif":"image/png"));null===this.options.layers&&(this.options.layers=[])},getURL:function(a){var b="";a=this.adjustBounds(a);a=new OpenLayers.Format.ArcXML(OpenLayers.Util.extend(this.options,{requesttype:"image",
+envelope:a.toArray(),tileSize:this.tileSize}));a=new OpenLayers.Request.POST({url:this.getFullRequestString(),data:a.write(),async:!1});null!=a&&(b=a.responseXML,b&&b.documentElement||(b=a.responseText),b=(new OpenLayers.Format.ArcXML).read(b),b=this.getUrlOrImage(b.image.output));return b},getURLasync:function(a,b,c){a=this.adjustBounds(a);a=new OpenLayers.Format.ArcXML(OpenLayers.Util.extend(this.options,{requesttype:"image",envelope:a.toArray(),tileSize:this.tileSize}));OpenLayers.Request.POST({url:this.getFullRequestString(),
+async:!0,data:a.write(),callback:function(a){var e=a.responseXML;e&&e.documentElement||(e=a.responseText);a=(new OpenLayers.Format.ArcXML).read(e);b.call(c,this.getUrlOrImage(a.image.output))},scope:this})},getUrlOrImage:function(a){var b="";a.url?b=a.url:a.data&&(b="data:image/"+a.type+";base64,"+a.data);return b},setLayerQuery:function(a,b){for(var c=0;c<this.options.layers.length;c++)if(a==this.options.layers[c].id){this.options.layers[c].query=b;return}this.options.layers.push({id:a,visible:!0,
+query:b})},getFeatureInfo:function(a,b,c){var d=c.buffer||1,e=c.callback||function(){},f=c.scope||window,g={};OpenLayers.Util.extend(g,this.options);g.requesttype="feature";a instanceof OpenLayers.LonLat?(g.polygon=null,g.envelope=[a.lon-d,a.lat-d,a.lon+d,a.lat+d]):a instanceof OpenLayers.Geometry.Polygon&&(g.envelope=null,g.polygon=a);var h=new OpenLayers.Format.ArcXML(g);OpenLayers.Util.extend(h.request.get_feature,c);h.request.get_feature.layer=b.id;"number"==typeof b.query.accuracy?h.request.get_feature.query.accuracy=
+b.query.accuracy:(a=this.map.getCenter(),c=this.map.getViewPortPxFromLonLat(a),c.x++,c=this.map.getLonLatFromPixel(c),h.request.get_feature.query.accuracy=c.lon-a.lon);h.request.get_feature.query.where=b.query.where;h.request.get_feature.query.spatialfilter.relation="area_intersection";OpenLayers.Request.POST({url:this.getFullRequestString({CustomService:"Query"}),data:h.write(),callback:function(a){a=h.parseResponse(a.responseText);h.iserror()?e.call(f,null):e.call(f,a.features)}})},clone:function(a){null==
+a&&(a=new OpenLayers.Layer.ArcIMS(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},CLASS_NAME:"OpenLayers.Layer.ArcIMS"});OpenLayers.Control.PanZoom=OpenLayers.Class(OpenLayers.Control,{slideFactor:50,slideRatio:null,buttons:null,position:null,initialize:function(a){this.position=new OpenLayers.Pixel(OpenLayers.Control.PanZoom.X,OpenLayers.Control.PanZoom.Y);OpenLayers.Control.prototype.initialize.apply(this,arguments)},destroy:function(){this.map&&this.map.events.unregister("buttonclick",this,this.onButtonClick);this.removeButtons();this.position=this.buttons=null;OpenLayers.Control.prototype.destroy.apply(this,arguments)},
+setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.register("buttonclick",this,this.onButtonClick)},draw:function(a){OpenLayers.Control.prototype.draw.apply(this,arguments);a=this.position;this.buttons=[];var b={w:18,h:18},c=new OpenLayers.Pixel(a.x+b.w/2,a.y);this._addButton("panup","north-mini.png",c,b);a.y=c.y+b.h;this._addButton("panleft","west-mini.png",a,b);this._addButton("panright","east-mini.png",a.add(b.w,0),b);this._addButton("pandown","south-mini.png",
+c.add(0,2*b.h),b);this._addButton("zoomin","zoom-plus-mini.png",c.add(0,3*b.h+5),b);this._addButton("zoomworld","zoom-world-mini.png",c.add(0,4*b.h+5),b);this._addButton("zoomout","zoom-minus-mini.png",c.add(0,5*b.h+5),b);return this.div},_addButton:function(a,b,c,d){b=OpenLayers.Util.getImageLocation(b);c=OpenLayers.Util.createAlphaImageDiv(this.id+"_"+a,c,d,b,"absolute");c.style.cursor="pointer";this.div.appendChild(c);c.action=a;c.className="olButton";this.buttons.push(c);return c},_removeButton:function(a){this.div.removeChild(a);
+OpenLayers.Util.removeItem(this.buttons,a)},removeButtons:function(){for(var a=this.buttons.length-1;0<=a;--a)this._removeButton(this.buttons[a])},onButtonClick:function(a){switch(a.buttonElement.action){case "panup":this.map.pan(0,-this.getSlideFactor("h"));break;case "pandown":this.map.pan(0,this.getSlideFactor("h"));break;case "panleft":this.map.pan(-this.getSlideFactor("w"),0);break;case "panright":this.map.pan(this.getSlideFactor("w"),0);break;case "zoomin":this.map.zoomIn();break;case "zoomout":this.map.zoomOut();
+break;case "zoomworld":this.map.zoomToMaxExtent()}},getSlideFactor:function(a){return this.slideRatio?this.map.getSize()[a]*this.slideRatio:this.slideFactor},CLASS_NAME:"OpenLayers.Control.PanZoom"});OpenLayers.Control.PanZoom.X=4;OpenLayers.Control.PanZoom.Y=4;OpenLayers.Control.PanZoomBar=OpenLayers.Class(OpenLayers.Control.PanZoom,{zoomStopWidth:18,zoomStopHeight:11,slider:null,sliderEvents:null,zoombarDiv:null,zoomWorldIcon:!1,panIcons:!0,forceFixedZoomLevel:!1,mouseDragStart:null,deltaY:null,zoomStart:null,destroy:function(){this._removeZoomBar();this.map.events.un({changebaselayer:this.redraw,updatesize:this.redraw,scope:this});OpenLayers.Control.PanZoom.prototype.destroy.apply(this,arguments);delete this.mouseDragStart;delete this.zoomStart},setMap:function(a){OpenLayers.Control.PanZoom.prototype.setMap.apply(this,
+arguments);this.map.events.on({changebaselayer:this.redraw,updatesize:this.redraw,scope:this})},redraw:function(){null!=this.div&&(this.removeButtons(),this._removeZoomBar());this.draw()},draw:function(a){OpenLayers.Control.prototype.draw.apply(this,arguments);a=this.position.clone();this.buttons=[];var b={w:18,h:18};if(this.panIcons){var c=new OpenLayers.Pixel(a.x+b.w/2,a.y),d=b.w;this.zoomWorldIcon&&(c=new OpenLayers.Pixel(a.x+b.w,a.y));this._addButton("panup","north-mini.png",c,b);a.y=c.y+b.h;
+this._addButton("panleft","west-mini.png",a,b);this.zoomWorldIcon&&(this._addButton("zoomworld","zoom-world-mini.png",a.add(b.w,0),b),d*=2);this._addButton("panright","east-mini.png",a.add(d,0),b);this._addButton("pandown","south-mini.png",c.add(0,2*b.h),b);this._addButton("zoomin","zoom-plus-mini.png",c.add(0,3*b.h+5),b);c=this._addZoomBar(c.add(0,4*b.h+5));this._addButton("zoomout","zoom-minus-mini.png",c,b)}else this._addButton("zoomin","zoom-plus-mini.png",a,b),c=this._addZoomBar(a.add(0,b.h)),
+this._addButton("zoomout","zoom-minus-mini.png",c,b),this.zoomWorldIcon&&(c=c.add(0,b.h+3),this._addButton("zoomworld","zoom-world-mini.png",c,b));return this.div},_addZoomBar:function(a){var b=OpenLayers.Util.getImageLocation("slider.png"),c=this.id+"_"+this.map.id,d=this.map.getMinZoom(),e=this.map.getNumZoomLevels()-1-this.map.getZoom(),e=OpenLayers.Util.createAlphaImageDiv(c,a.add(-1,e*this.zoomStopHeight),{w:20,h:9},b,"absolute");e.style.cursor="move";this.slider=e;this.sliderEvents=new OpenLayers.Events(this,
+e,null,!0,{includeXY:!0});this.sliderEvents.on({touchstart:this.zoomBarDown,touchmove:this.zoomBarDrag,touchend:this.zoomBarUp,mousedown:this.zoomBarDown,mousemove:this.zoomBarDrag,mouseup:this.zoomBarUp});var f={w:this.zoomStopWidth,h:this.zoomStopHeight*(this.map.getNumZoomLevels()-d)},b=OpenLayers.Util.getImageLocation("zoombar.png"),c=null;OpenLayers.Util.alphaHack()?(c=this.id+"_"+this.map.id,c=OpenLayers.Util.createAlphaImageDiv(c,a,{w:f.w,h:this.zoomStopHeight},b,"absolute",null,"crop"),c.style.height=
+f.h+"px"):c=OpenLayers.Util.createDiv("OpenLayers_Control_PanZoomBar_Zoombar"+this.map.id,a,f,b);c.style.cursor="pointer";c.className="olButton";this.zoombarDiv=c;this.div.appendChild(c);this.startTop=parseInt(c.style.top);this.div.appendChild(e);this.map.events.register("zoomend",this,this.moveZoomBar);return a=a.add(0,this.zoomStopHeight*(this.map.getNumZoomLevels()-d))},_removeZoomBar:function(){this.sliderEvents.un({touchstart:this.zoomBarDown,touchmove:this.zoomBarDrag,touchend:this.zoomBarUp,
+mousedown:this.zoomBarDown,mousemove:this.zoomBarDrag,mouseup:this.zoomBarUp});this.sliderEvents.destroy();this.div.removeChild(this.zoombarDiv);this.zoombarDiv=null;this.div.removeChild(this.slider);this.slider=null;this.map.events.unregister("zoomend",this,this.moveZoomBar)},onButtonClick:function(a){OpenLayers.Control.PanZoom.prototype.onButtonClick.apply(this,arguments);if(a.buttonElement===this.zoombarDiv){var b=a.buttonXY.y/this.zoomStopHeight;if(this.forceFixedZoomLevel||!this.map.fractionalZoom)b=
+Math.floor(b);b=this.map.getNumZoomLevels()-1-b;b=Math.min(Math.max(b,0),this.map.getNumZoomLevels()-1);this.map.zoomTo(b)}},passEventToSlider:function(a){this.sliderEvents.handleBrowserEvent(a)},zoomBarDown:function(a){if(OpenLayers.Event.isLeftClick(a)||OpenLayers.Event.isSingleTouch(a))this.map.events.on({touchmove:this.passEventToSlider,mousemove:this.passEventToSlider,mouseup:this.passEventToSlider,scope:this}),this.mouseDragStart=a.xy.clone(),this.zoomStart=a.xy.clone(),this.div.style.cursor=
+"move",this.zoombarDiv.offsets=null,OpenLayers.Event.stop(a)},zoomBarDrag:function(a){if(null!=this.mouseDragStart){var b=this.mouseDragStart.y-a.xy.y,c=OpenLayers.Util.pagePosition(this.zoombarDiv);0<a.clientY-c[1]&&a.clientY-c[1]<parseInt(this.zoombarDiv.style.height)-2&&(b=parseInt(this.slider.style.top)-b,this.slider.style.top=b+"px",this.mouseDragStart=a.xy.clone());this.deltaY=this.zoomStart.y-a.xy.y;OpenLayers.Event.stop(a)}},zoomBarUp:function(a){if((OpenLayers.Event.isLeftClick(a)||"touchend"===
+a.type)&&this.mouseDragStart){this.div.style.cursor="";this.map.events.un({touchmove:this.passEventToSlider,mouseup:this.passEventToSlider,mousemove:this.passEventToSlider,scope:this});var b=this.map.zoom;!this.forceFixedZoomLevel&&this.map.fractionalZoom?(b+=this.deltaY/this.zoomStopHeight,b=Math.min(Math.max(b,0),this.map.getNumZoomLevels()-1)):(b+=this.deltaY/this.zoomStopHeight,b=Math.max(Math.round(b),0));this.map.zoomTo(b);this.zoomStart=this.mouseDragStart=null;this.deltaY=0;OpenLayers.Event.stop(a)}},
+moveZoomBar:function(){var a=(this.map.getNumZoomLevels()-1-this.map.getZoom())*this.zoomStopHeight+this.startTop+1;this.slider.style.top=a+"px"},CLASS_NAME:"OpenLayers.Control.PanZoomBar"});OpenLayers.Format.WFSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",CLASS_NAME:"OpenLayers.Format.WFSCapabilities"});OpenLayers.Format.WFSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{wfs:"http://www.opengis.net/wfs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",ows:"http://www.opengis.net/ows"},errorProperty:"featureTypeList",defaultPrefix:"wfs",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{wfs:{WFS_Capabilities:function(a,
+b){this.readChildNodes(a,b)},FeatureTypeList:function(a,b){b.featureTypeList={featureTypes:[]};this.readChildNodes(a,b.featureTypeList)},FeatureType:function(a,b){var c={};this.readChildNodes(a,c);b.featureTypes.push(c)},Name:function(a,b){var c=this.getChildValue(a);c&&(c=c.split(":"),b.name=c.pop(),0<c.length&&(b.featureNS=this.lookupNamespaceURI(a,c[0])))},Title:function(a,b){var c=this.getChildValue(a);c&&(b.title=c)},Abstract:function(a,b){var c=this.getChildValue(a);c&&(b["abstract"]=c)}}},
+CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1"});OpenLayers.Format.WFSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WFSCapabilities.v1,{regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},readers:{wfs:OpenLayers.Util.applyDefaults({DefaultSRS:function(a,b){var c=this.getChildValue(a);c&&(b.srs=c)}},OpenLayers.Format.WFSCapabilities.v1.prototype.readers.wfs),ows:OpenLayers.Format.OWSCommon.v1.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1_1_0"});OpenLayers.Layer.Image=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:!0,url:null,extent:null,size:null,tile:null,aspectRatio:null,initialize:function(a,b,c,d,e){this.url=b;this.maxExtent=this.extent=c;this.size=d;OpenLayers.Layer.prototype.initialize.apply(this,[a,e]);this.aspectRatio=this.extent.getHeight()/this.size.h/(this.extent.getWidth()/this.size.w)},destroy:function(){this.tile&&(this.removeTileMonitoringHooks(this.tile),this.tile.destroy(),this.tile=null);OpenLayers.Layer.prototype.destroy.apply(this,
+arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.Image(this.name,this.url,this.extent,this.size,this.getOptions()));return a=OpenLayers.Layer.prototype.clone.apply(this,[a])},setMap:function(a){null==this.options.maxResolution&&(this.options.maxResolution=this.aspectRatio*this.extent.getWidth()/this.size.w);OpenLayers.Layer.prototype.setMap.apply(this,arguments)},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var d=null==this.tile;if(b||d){this.setTileSize();
+var e=this.map.getLayerPxFromLonLat({lon:this.extent.left,lat:this.extent.top});d?(this.tile=new OpenLayers.Tile.Image(this,e,this.extent,null,this.tileSize),this.addTileMonitoringHooks(this.tile)):(this.tile.size=this.tileSize.clone(),this.tile.position=e.clone());this.tile.draw()}},setTileSize:function(){var a=this.extent.getWidth()/this.map.getResolution(),b=this.extent.getHeight()/this.map.getResolution();this.tileSize=new OpenLayers.Size(a,b)},addTileMonitoringHooks:function(a){a.onLoadStart=
+function(){this.events.triggerEvent("loadstart")};a.events.register("loadstart",this,a.onLoadStart);a.onLoadEnd=function(){this.events.triggerEvent("loadend")};a.events.register("loadend",this,a.onLoadEnd);a.events.register("unload",this,a.onLoadEnd)},removeTileMonitoringHooks:function(a){a.unload();a.events.un({loadstart:a.onLoadStart,loadend:a.onLoadEnd,unload:a.onLoadEnd,scope:this})},setUrl:function(a){this.url=a;this.tile.draw()},getURL:function(a){return this.url},CLASS_NAME:"OpenLayers.Layer.Image"});OpenLayers.Strategy=OpenLayers.Class({layer:null,options:null,active:null,autoActivate:!0,autoDestroy:!0,initialize:function(a){OpenLayers.Util.extend(this,a);this.options=a;this.active=!1},destroy:function(){this.deactivate();this.options=this.layer=null},setLayer:function(a){this.layer=a},activate:function(){return this.active?!1:this.active=!0},deactivate:function(){return this.active?(this.active=!1,!0):!1},CLASS_NAME:"OpenLayers.Strategy"});OpenLayers.Strategy.Save=OpenLayers.Class(OpenLayers.Strategy,{events:null,auto:!1,timer:null,initialize:function(a){OpenLayers.Strategy.prototype.initialize.apply(this,[a]);this.events=new OpenLayers.Events(this)},activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);if(a&&this.auto)if("number"===typeof this.auto)this.timer=window.setInterval(OpenLayers.Function.bind(this.save,this),1E3*this.auto);else this.layer.events.on({featureadded:this.triggerSave,afterfeaturemodified:this.triggerSave,
+scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&this.auto&&("number"===typeof this.auto?window.clearInterval(this.timer):this.layer.events.un({featureadded:this.triggerSave,afterfeaturemodified:this.triggerSave,scope:this}));return a},triggerSave:function(a){var b=a.feature;b.state!==OpenLayers.State.INSERT&&b.state!==OpenLayers.State.UPDATE&&b.state!==OpenLayers.State.DELETE||this.save([a.feature])},save:function(a){a||(a=this.layer.features);
+this.events.triggerEvent("start",{features:a});var b=this.layer.projection,c=this.layer.map.getProjectionObject();if(!c.equals(b)){for(var d=a.length,e=Array(d),f,g,h=0;h<d;++h)f=a[h],g=f.clone(),g.fid=f.fid,g.state=f.state,f.url&&(g.url=f.url),g._original=f,g.geometry.transform(c,b),e[h]=g;a=e}this.layer.protocol.commit(a,{callback:this.onCommit,scope:this})},onCommit:function(a){var b={response:a};if(a.success()){for(var c=a.reqFeatures,d,e=[],f=a.insertIds||[],g=0,h=0,k=c.length;h<k;++h)if(d=c[h],
+d=d._original||d,a=d.state)a==OpenLayers.State.DELETE?e.push(d):a==OpenLayers.State.INSERT&&(d.fid=f[g],++g),d.state=null;0<e.length&&this.layer.destroyFeatures(e);this.events.triggerEvent("success",b)}else this.events.triggerEvent("fail",b)},CLASS_NAME:"OpenLayers.Strategy.Save"});OpenLayers.Events.featureclick=OpenLayers.Class({cache:null,map:null,provides:["featureclick","nofeatureclick","featureover","featureout"],initialize:function(a){this.target=a;if(a.object instanceof OpenLayers.Map)this.setMap(a.object);else if(a.object instanceof OpenLayers.Layer.Vector)a.object.map?this.setMap(a.object.map):a.object.events.register("added",this,function(b){this.setMap(a.object.map)});else throw"Listeners for '"+this.provides.join("', '")+"' events can only be registered for OpenLayers.Layer.Vector or OpenLayers.Map instances";
+for(var b=this.provides.length-1;0<=b;--b)a.extensions[this.provides[b]]=!0},setMap:function(a){this.map=a;this.cache={};a.events.register("mousedown",this,this.start,{extension:!0});a.events.register("mouseup",this,this.onClick,{extension:!0});a.events.register("touchstart",this,this.start,{extension:!0});a.events.register("touchmove",this,this.cancel,{extension:!0});a.events.register("touchend",this,this.onClick,{extension:!0});a.events.register("mousemove",this,this.onMousemove,{extension:!0})},
+start:function(a){this.startEvt=a},cancel:function(a){delete this.startEvt},onClick:function(a){if(this.startEvt&&("touchend"===a.type||OpenLayers.Event.isLeftClick(a))){a=this.getFeatures(this.startEvt);delete this.startEvt;for(var b,c,d={},e=0,f=a.length;e<f&&(b=a[e],c=b.layer,d[c.id]=!0,b=this.triggerEvent("featureclick",{feature:b}),!1!==b);++e);e=0;for(f=this.map.layers.length;e<f;++e)c=this.map.layers[e],c instanceof OpenLayers.Layer.Vector&&!d[c.id]&&this.triggerEvent("nofeatureclick",{layer:c})}},
+onMousemove:function(a){delete this.startEvt;var b=this.getFeatures(a),c={};a=[];for(var d,e=0,f=b.length;e<f;++e)d=b[e],c[d.id]=d,this.cache[d.id]||a.push(d);var b=[],g;for(g in this.cache)d=this.cache[g],d.layer&&d.layer.map?c[d.id]||b.push(d):delete this.cache[g];e=0;for(f=a.length;e<f&&(d=a[e],this.cache[d.id]=d,g=this.triggerEvent("featureover",{feature:d}),!1!==g);++e);e=0;for(f=b.length;e<f&&(d=b[e],delete this.cache[d.id],g=this.triggerEvent("featureout",{feature:d}),!1!==g);++e);},triggerEvent:function(a,
+b){var c=b.feature?b.feature.layer:b.layer,d=this.target.object;if(d instanceof OpenLayers.Map||d===c)return this.target.triggerEvent(a,b)},getFeatures:function(a){var b=a.clientX,c=a.clientY,d=[],e=[],f=[],g,h,k,l;for(l=this.map.layers.length-1;0<=l;--l)if(g=this.map.layers[l],"none"!==g.div.style.display)if(g.renderer instanceof OpenLayers.Renderer.Elements){if(g instanceof OpenLayers.Layer.Vector)for(h=document.elementFromPoint(b,c);h&&h._featureId;)(k=g.getFeatureById(h._featureId))?(d.push(k),
+h.style.display="none",e.push(h),h=document.elementFromPoint(b,c)):h=!1;f.push(g);g.div.style.display="none"}else g.renderer instanceof OpenLayers.Renderer.Canvas&&(k=g.renderer.getFeatureIdFromEvent(a))&&(d.push(k),f.push(g));l=0;for(a=e.length;l<a;++l)e[l].style.display="";for(l=f.length-1;0<=l;--l)f[l].div.style.display="block";return d},destroy:function(){for(var a=this.provides.length-1;0<=a;--a)delete this.target.extensions[this.provides[a]];this.map.events.un({mousemove:this.onMousemove,mousedown:this.start,
+mouseup:this.onClick,touchstart:this.start,touchmove:this.cancel,touchend:this.onClick,scope:this});delete this.cache;delete this.map;delete this.target}});OpenLayers.Events.nofeatureclick=OpenLayers.Events.featureclick;OpenLayers.Events.featureover=OpenLayers.Events.featureclick;OpenLayers.Events.featureout=OpenLayers.Events.featureclick;OpenLayers.Format.GPX=OpenLayers.Class(OpenLayers.Format.XML,{defaultDesc:"No description available",extractWaypoints:!0,extractTracks:!0,extractRoutes:!0,extractAttributes:!0,namespaces:{gpx:"http://www.topografix.com/GPX/1/1",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd",creator:"OpenLayers",initialize:function(a){this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,
+[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=[];if(this.extractTracks)for(var c=a.getElementsByTagName("trk"),d=0,e=c.length;d<e;d++){var f={};this.extractAttributes&&(f=this.parseAttributes(c[d]));for(var g=this.getElementsByTagNameNS(c[d],c[d].namespaceURI,"trkseg"),h=0,k=g.length;h<k;h++){var l=this.extractSegment(g[h],"trkpt");b.push(new OpenLayers.Feature.Vector(l,f))}}if(this.extractRoutes)for(e=a.getElementsByTagName("rte"),c=0,d=
+e.length;c<d;c++)f={},this.extractAttributes&&(f=this.parseAttributes(e[c])),g=this.extractSegment(e[c],"rtept"),b.push(new OpenLayers.Feature.Vector(g,f));if(this.extractWaypoints)for(a=a.getElementsByTagName("wpt"),c=0,e=a.length;c<e;c++)f={},this.extractAttributes&&(f=this.parseAttributes(a[c])),d=new OpenLayers.Geometry.Point(a[c].getAttribute("lon"),a[c].getAttribute("lat")),b.push(new OpenLayers.Feature.Vector(d,f));if(this.internalProjection&&this.externalProjection)for(f=0,a=b.length;f<a;f++)b[f].geometry.transform(this.externalProjection,
+this.internalProjection);return b},extractSegment:function(a,b){for(var c=this.getElementsByTagNameNS(a,a.namespaceURI,b),d=[],e=0,f=c.length;e<f;e++)d.push(new OpenLayers.Geometry.Point(c[e].getAttribute("lon"),c[e].getAttribute("lat")));return new OpenLayers.Geometry.LineString(d)},parseAttributes:function(a){var b={};a=a.firstChild;for(var c,d;a;)1==a.nodeType&&a.firstChild&&(c=a.firstChild,3==c.nodeType||4==c.nodeType)&&(d=a.prefix?a.nodeName.split(":")[1]:a.nodeName,"trkseg"!=d&&"rtept"!=d&&
+(b[d]=c.nodeValue)),a=a.nextSibling;return b},write:function(a,b){a=OpenLayers.Util.isArray(a)?a:[a];var c=this.createElementNS(this.namespaces.gpx,"gpx");c.setAttribute("version","1.1");c.setAttribute("creator",this.creator);this.setAttributes(c,{"xsi:schemaLocation":this.schemaLocation});b&&"object"==typeof b&&c.appendChild(this.buildMetadataNode(b));for(var d=0,e=a.length;d<e;d++)c.appendChild(this.buildFeatureNode(a[d]));return OpenLayers.Format.XML.prototype.write.apply(this,[c])},buildMetadataNode:function(a){for(var b=
+["name","desc","author"],c=this.createElementNS(this.namespaces.gpx,"metadata"),d=0;d<b.length;d++){var e=b[d];if(a[e]){var f=this.createElementNS(this.namespaces.gpx,e);f.appendChild(this.createTextNode(a[e]));c.appendChild(f)}}return c},buildFeatureNode:function(a){var b=a.geometry,b=b.clone();this.internalProjection&&this.externalProjection&&b.transform(this.internalProjection,this.externalProjection);if("OpenLayers.Geometry.Point"==b.CLASS_NAME){var c=this.buildWptNode(b);this.appendAttributesNode(c,
+a);return c}c=this.createElementNS(this.namespaces.gpx,"trk");this.appendAttributesNode(c,a);a=this.buildTrkSegNode(b);a=OpenLayers.Util.isArray(a)?a:[a];for(var b=0,d=a.length;b<d;b++)c.appendChild(a[b]);return c},buildTrkSegNode:function(a){var b,c,d,e;if("OpenLayers.Geometry.LineString"==a.CLASS_NAME||"OpenLayers.Geometry.LinearRing"==a.CLASS_NAME){b=this.createElementNS(this.namespaces.gpx,"trkseg");c=0;for(d=a.components.length;c<d;c++)e=a.components[c],b.appendChild(this.buildTrkPtNode(e));
+return b}b=[];c=0;for(d=a.components.length;c<d;c++)b.push(this.buildTrkSegNode(a.components[c]));return b},buildTrkPtNode:function(a){var b=this.createElementNS(this.namespaces.gpx,"trkpt");b.setAttribute("lon",a.x);b.setAttribute("lat",a.y);return b},buildWptNode:function(a){var b=this.createElementNS(this.namespaces.gpx,"wpt");b.setAttribute("lon",a.x);b.setAttribute("lat",a.y);return b},appendAttributesNode:function(a,b){var c=this.createElementNS(this.namespaces.gpx,"name");c.appendChild(this.createTextNode(b.attributes.name||
+b.id));a.appendChild(c);c=this.createElementNS(this.namespaces.gpx,"desc");c.appendChild(this.createTextNode(b.attributes.description||this.defaultDesc));a.appendChild(c)},CLASS_NAME:"OpenLayers.Format.GPX"});OpenLayers.Format.WMSDescribeLayer=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.1",CLASS_NAME:"OpenLayers.Format.WMSDescribeLayer"});OpenLayers.Format.WMSDescribeLayer.v1_1_1=OpenLayers.Class(OpenLayers.Format.WMSDescribeLayer,{initialize:function(a){OpenLayers.Format.WMSDescribeLayer.prototype.initialize.apply(this,[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));for(var b=a.documentElement.childNodes,c={layerDescriptions:[]},d,e,f=0;f<b.length;++f)if(d=b[f],e=d.nodeName,"LayerDescription"==e){e=d.getAttribute("name");var g="",h="",k="";d.getAttribute("owsType")?(g=d.getAttribute("owsType"),
+h=d.getAttribute("owsURL")):""!=d.getAttribute("wfs")?(g="WFS",h=d.getAttribute("wfs")):""!=d.getAttribute("wcs")&&(g="WCS",h=d.getAttribute("wcs"));d=d.getElementsByTagName("Query");0<d.length&&((k=d[0].getAttribute("typeName"))||(k=d[0].getAttribute("typename")));d={layerName:e,owsType:g,owsURL:h,typeName:k};c.layerDescriptions.push(d);c.length=c.layerDescriptions.length;c[c.length-1]=d}else if("ServiceException"==e)return{error:(new OpenLayers.Format.OGCExceptionReport).read(a)};return c},CLASS_NAME:"OpenLayers.Format.WMSDescribeLayer.v1_1_1"});
+OpenLayers.Format.WMSDescribeLayer.v1_1_0=OpenLayers.Format.WMSDescribeLayer.v1_1_1;OpenLayers.Layer.XYZ=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,sphericalMercator:!1,zoomOffset:0,serverResolutions:null,initialize:function(a,b,c){if(c&&c.sphericalMercator||this.sphericalMercator)c=OpenLayers.Util.extend({projection:"EPSG:900913",numZoomLevels:19},c);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a||this.name,b||this.url,{},c])},clone:function(a){null==a&&(a=new OpenLayers.Layer.XYZ(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,
+[a])},getURL:function(a){a=this.getXYZ(a);var b=this.url;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(""+a.x+a.y+a.z,b));return OpenLayers.String.format(b,a)},getXYZ:function(a){var b=this.getServerResolution(),c=Math.round((a.left-this.maxExtent.left)/(b*this.tileSize.w));a=Math.round((this.maxExtent.top-a.top)/(b*this.tileSize.h));b=this.getServerZoom();if(this.wrapDateLine)var d=Math.pow(2,b),c=(c%d+d)%d;return{x:c,y:a,z:b}},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this,
+arguments);this.tileOrigin||(this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.bottom))},CLASS_NAME:"OpenLayers.Layer.XYZ"});OpenLayers.Layer.OSM=OpenLayers.Class(OpenLayers.Layer.XYZ,{name:"OpenStreetMap",url:["http://a.tile.openstreetmap.org/${z}/${x}/${y}.png","http://b.tile.openstreetmap.org/${z}/${x}/${y}.png","http://c.tile.openstreetmap.org/${z}/${x}/${y}.png"],attribution:"&copy; <a href='http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors",sphericalMercator:!0,wrapDateLine:!0,tileOptions:null,initialize:function(a,b,c){OpenLayers.Layer.XYZ.prototype.initialize.apply(this,arguments);this.tileOptions=
+OpenLayers.Util.extend({crossOriginKeyword:"anonymous"},this.options&&this.options.tileOptions)},clone:function(a){null==a&&(a=new OpenLayers.Layer.OSM(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[a])},CLASS_NAME:"OpenLayers.Layer.OSM"});OpenLayers.Renderer=OpenLayers.Class({container:null,root:null,extent:null,locked:!1,size:null,resolution:null,map:null,featureDx:0,initialize:function(a,b){this.container=OpenLayers.Util.getElement(a);OpenLayers.Util.extend(this,b)},destroy:function(){this.map=this.resolution=this.size=this.extent=this.container=null},supported:function(){return!1},setExtent:function(a,b){this.extent=a.clone();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var c=a.getWidth()/this.map.getExtent().getWidth();
+a=a.scale(1/c);this.extent=a.wrapDateLine(this.map.getMaxExtent()).scale(c)}b&&(this.resolution=null);return!0},setSize:function(a){this.size=a.clone();this.resolution=null},getResolution:function(){return this.resolution=this.resolution||this.map.getResolution()},drawFeature:function(a,b){null==b&&(b=a.style);if(a.geometry){var c=a.geometry.getBounds();if(c){var d;this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&(d=this.map.getMaxExtent());c.intersectsBounds(this.extent,{worldBounds:d})?this.calculateFeatureDx(c,
+d):b={display:"none"};c=this.drawGeometry(a.geometry,b,a.id);if("none"!=b.display&&b.label&&!1!==c){d=a.geometry.getCentroid();if(b.labelXOffset||b.labelYOffset){var e=isNaN(b.labelXOffset)?0:b.labelXOffset,f=isNaN(b.labelYOffset)?0:b.labelYOffset,g=this.getResolution();d.move(e*g,f*g)}this.drawText(a.id,b,d)}else this.removeText(a.id);return c}}},calculateFeatureDx:function(a,b){this.featureDx=0;if(b){var c=b.getWidth();this.featureDx=Math.round(((a.left+a.right)/2-(this.extent.left+this.extent.right)/
+2)/c)*c}},drawGeometry:function(a,b,c){},drawText:function(a,b,c){},removeText:function(a){},clear:function(){},getFeatureIdFromEvent:function(a){},eraseFeatures:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0,c=a.length;b<c;++b){var d=a[b];this.eraseGeometry(d.geometry,d.id);this.removeText(d.id)}},eraseGeometry:function(a,b){},moveRoot:function(a){},getRenderLayerId:function(){return this.container.id},applyDefaultSymbolizer:function(a){var b=OpenLayers.Util.extend({},OpenLayers.Renderer.defaultSymbolizer);
+!1===a.stroke&&(delete b.strokeWidth,delete b.strokeColor);!1===a.fill&&delete b.fillColor;OpenLayers.Util.extend(b,a);return b},CLASS_NAME:"OpenLayers.Renderer"});OpenLayers.Renderer.defaultSymbolizer={fillColor:"#000000",strokeColor:"#000000",strokeWidth:2,fillOpacity:1,strokeOpacity:1,pointRadius:0,labelAlign:"cm"};
+OpenLayers.Renderer.symbol={star:[350,75,379,161,469,161,397,215,423,301,350,250,277,301,303,215,231,161,321,161,350,75],cross:[4,0,6,0,6,4,10,4,10,6,6,6,6,10,4,10,4,6,0,6,0,4,4,4,4,0],x:[0,0,25,0,50,35,75,0,100,0,65,50,100,100,75,100,50,65,25,100,0,100,35,50,0,0],square:[0,0,0,1,1,1,1,0,0,0],triangle:[0,10,10,10,5,0,0,10]};OpenLayers.Renderer.Canvas=OpenLayers.Class(OpenLayers.Renderer,{hitDetection:!0,hitOverflow:0,canvas:null,features:null,pendingRedraw:!1,cachedSymbolBounds:{},initialize:function(a,b){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.root=document.createElement("canvas");this.container.appendChild(this.root);this.canvas=this.root.getContext("2d");this.features={};this.hitDetection&&(this.hitCanvas=document.createElement("canvas"),this.hitContext=this.hitCanvas.getContext("2d"))},
+setExtent:function(){OpenLayers.Renderer.prototype.setExtent.apply(this,arguments);return!1},eraseGeometry:function(a,b){this.eraseFeatures(this.features[b][0])},supported:function(){return OpenLayers.CANVAS_SUPPORTED},setSize:function(a){this.size=a.clone();var b=this.root;b.style.width=a.w+"px";b.style.height=a.h+"px";b.width=a.w;b.height=a.h;this.resolution=null;this.hitDetection&&(b=this.hitCanvas,b.style.width=a.w+"px",b.style.height=a.h+"px",b.width=a.w,b.height=a.h)},drawFeature:function(a,
+b){var c;if(a.geometry){b=this.applyDefaultSymbolizer(b||a.style);c=a.geometry.getBounds();var d;this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&(d=this.map.getMaxExtent());d=c&&c.intersectsBounds(this.extent,{worldBounds:d});(c="none"!==b.display&&!!c&&d)?this.features[a.id]=[a,b]:delete this.features[a.id];this.pendingRedraw=!0}this.pendingRedraw&&!this.locked&&(this.redraw(),this.pendingRedraw=!1);return c},drawGeometry:function(a,b,c){var d=a.CLASS_NAME;if("OpenLayers.Geometry.Collection"==
+d||"OpenLayers.Geometry.MultiPoint"==d||"OpenLayers.Geometry.MultiLineString"==d||"OpenLayers.Geometry.MultiPolygon"==d)for(d=0;d<a.components.length;d++)this.drawGeometry(a.components[d],b,c);else switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":this.drawPoint(a,b,c);break;case "OpenLayers.Geometry.LineString":this.drawLineString(a,b,c);break;case "OpenLayers.Geometry.LinearRing":this.drawLinearRing(a,b,c);break;case "OpenLayers.Geometry.Polygon":this.drawPolygon(a,b,c)}},drawExternalGraphic:function(a,
+b,c){var d=new Image,e=b.title||b.graphicTitle;e&&(d.title=e);var f=b.graphicWidth||b.graphicHeight,g=b.graphicHeight||b.graphicWidth,f=f?f:2*b.pointRadius,g=g?g:2*b.pointRadius,h=void 0!=b.graphicXOffset?b.graphicXOffset:-(0.5*f),k=void 0!=b.graphicYOffset?b.graphicYOffset:-(0.5*g),l=b.graphicOpacity||b.fillOpacity;d.onload=OpenLayers.Function.bind(function(){if(this.features[c]){var b=this.getLocalXY(a),e=b[0],b=b[1];if(!isNaN(e)&&!isNaN(b)){var e=e+h|0,b=b+k|0,p=this.canvas;p.globalAlpha=l;var q=
+OpenLayers.Renderer.Canvas.drawImageScaleFactor||(OpenLayers.Renderer.Canvas.drawImageScaleFactor=/android 2.1/.test(navigator.userAgent.toLowerCase())?320/window.screen.width:1);p.drawImage(d,e*q,b*q,f*q,g*q);this.hitDetection&&(this.setHitContextStyle("fill",c),this.hitContext.fillRect(e,b,f,g))}}},this);d.src=b.externalGraphic},drawNamedSymbol:function(a,b,c){var d,e,f,g;f=Math.PI/180;var h=OpenLayers.Renderer.symbol[b.graphicName];if(!h)throw Error(b.graphicName+" is not a valid symbol name");
+if(!(!h.length||2>h.length||(a=this.getLocalXY(a),e=a[0],g=a[1],isNaN(e)||isNaN(g)))){this.canvas.lineCap="round";this.canvas.lineJoin="round";this.hitDetection&&(this.hitContext.lineCap="round",this.hitContext.lineJoin="round");if(b.graphicName in this.cachedSymbolBounds)d=this.cachedSymbolBounds[b.graphicName];else{d=new OpenLayers.Bounds;for(a=0;a<h.length;a+=2)d.extend(new OpenLayers.LonLat(h[a],h[a+1]));this.cachedSymbolBounds[b.graphicName]=d}this.canvas.save();this.hitDetection&&this.hitContext.save();
+this.canvas.translate(e,g);this.hitDetection&&this.hitContext.translate(e,g);a=f*b.rotation;isNaN(a)||(this.canvas.rotate(a),this.hitDetection&&this.hitContext.rotate(a));f=2*b.pointRadius/Math.max(d.getWidth(),d.getHeight());this.canvas.scale(f,f);this.hitDetection&&this.hitContext.scale(f,f);a=d.getCenterLonLat().lon;d=d.getCenterLonLat().lat;this.canvas.translate(-a,-d);this.hitDetection&&this.hitContext.translate(-a,-d);g=b.strokeWidth;b.strokeWidth=g/f;if(!1!==b.fill){this.setCanvasStyle("fill",
+b);this.canvas.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.canvas.lineTo(d,e);this.canvas.closePath();this.canvas.fill();if(this.hitDetection){this.setHitContextStyle("fill",c,b);this.hitContext.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.hitContext.lineTo(d,e);this.hitContext.closePath();this.hitContext.fill()}}if(!1!==b.stroke){this.setCanvasStyle("stroke",b);this.canvas.beginPath();for(a=0;a<h.length;a+=2)d=h[a],
+e=h[a+1],0==a&&this.canvas.moveTo(d,e),this.canvas.lineTo(d,e);this.canvas.closePath();this.canvas.stroke();if(this.hitDetection){this.setHitContextStyle("stroke",c,b,f);this.hitContext.beginPath();for(a=0;a<h.length;a+=2)d=h[a],e=h[a+1],0==a&&this.hitContext.moveTo(d,e),this.hitContext.lineTo(d,e);this.hitContext.closePath();this.hitContext.stroke()}}b.strokeWidth=g;this.canvas.restore();this.hitDetection&&this.hitContext.restore();this.setCanvasStyle("reset")}},setCanvasStyle:function(a,b){"fill"===
+a?(this.canvas.globalAlpha=b.fillOpacity,this.canvas.fillStyle=b.fillColor):"stroke"===a?(this.canvas.globalAlpha=b.strokeOpacity,this.canvas.strokeStyle=b.strokeColor,this.canvas.lineWidth=b.strokeWidth):(this.canvas.globalAlpha=0,this.canvas.lineWidth=1)},featureIdToHex:function(a){a=Number(a.split("_").pop())+1;16777216<=a&&(this.hitOverflow=a-16777215,a=a%16777216+1);a="000000"+a.toString(16);var b=a.length;return a="#"+a.substring(b-6,b)},setHitContextStyle:function(a,b,c,d){b=this.featureIdToHex(b);
+"fill"==a?(this.hitContext.globalAlpha=1,this.hitContext.fillStyle=b):"stroke"==a?(this.hitContext.globalAlpha=1,this.hitContext.strokeStyle=b,"undefined"===typeof d?this.hitContext.lineWidth=c.strokeWidth+2:isNaN(d)||(this.hitContext.lineWidth=c.strokeWidth+2/d)):(this.hitContext.globalAlpha=0,this.hitContext.lineWidth=1)},drawPoint:function(a,b,c){if(!1!==b.graphic)if(b.externalGraphic)this.drawExternalGraphic(a,b,c);else if(b.graphicName&&"circle"!=b.graphicName)this.drawNamedSymbol(a,b,c);else{var d=
+this.getLocalXY(a);a=d[0];d=d[1];if(!isNaN(a)&&!isNaN(d)){var e=2*Math.PI,f=b.pointRadius;!1!==b.fill&&(this.setCanvasStyle("fill",b),this.canvas.beginPath(),this.canvas.arc(a,d,f,0,e,!0),this.canvas.fill(),this.hitDetection&&(this.setHitContextStyle("fill",c,b),this.hitContext.beginPath(),this.hitContext.arc(a,d,f,0,e,!0),this.hitContext.fill()));!1!==b.stroke&&(this.setCanvasStyle("stroke",b),this.canvas.beginPath(),this.canvas.arc(a,d,f,0,e,!0),this.canvas.stroke(),this.hitDetection&&(this.setHitContextStyle("stroke",
+c,b),this.hitContext.beginPath(),this.hitContext.arc(a,d,f,0,e,!0),this.hitContext.stroke()),this.setCanvasStyle("reset"))}}},drawLineString:function(a,b,c){b=OpenLayers.Util.applyDefaults({fill:!1},b);this.drawLinearRing(a,b,c)},drawLinearRing:function(a,b,c){!1!==b.fill&&(this.setCanvasStyle("fill",b),this.renderPath(this.canvas,a,b,c,"fill"),this.hitDetection&&(this.setHitContextStyle("fill",c,b),this.renderPath(this.hitContext,a,b,c,"fill")));!1!==b.stroke&&(this.setCanvasStyle("stroke",b),this.renderPath(this.canvas,
+a,b,c,"stroke"),this.hitDetection&&(this.setHitContextStyle("stroke",c,b),this.renderPath(this.hitContext,a,b,c,"stroke")));this.setCanvasStyle("reset")},renderPath:function(a,b,c,d,e){b=b.components;c=b.length;a.beginPath();d=this.getLocalXY(b[0]);var f=d[1];if(!isNaN(d[0])&&!isNaN(f)){a.moveTo(d[0],d[1]);for(d=1;d<c;++d)f=this.getLocalXY(b[d]),a.lineTo(f[0],f[1]);"fill"===e?a.fill():a.stroke()}},drawPolygon:function(a,b,c){a=a.components;var d=a.length;this.drawLinearRing(a[0],b,c);for(var e=1;e<
+d;++e)this.canvas.globalCompositeOperation="destination-out",this.hitDetection&&(this.hitContext.globalCompositeOperation="destination-out"),this.drawLinearRing(a[e],OpenLayers.Util.applyDefaults({stroke:!1,fillOpacity:1},b),c),this.canvas.globalCompositeOperation="source-over",this.hitDetection&&(this.hitContext.globalCompositeOperation="source-over"),this.drawLinearRing(a[e],OpenLayers.Util.applyDefaults({fill:!1},b),c)},drawText:function(a,b){var c=this.getLocalXY(a);this.setCanvasStyle("reset");
+this.canvas.fillStyle=b.fontColor;this.canvas.globalAlpha=b.fontOpacity||1;var d=[b.fontStyle?b.fontStyle:"normal","normal",b.fontWeight?b.fontWeight:"normal",b.fontSize?b.fontSize:"1em",b.fontFamily?b.fontFamily:"sans-serif"].join(" "),e=b.label.split("\n"),f=e.length;if(this.canvas.fillText){this.canvas.font=d;this.canvas.textAlign=OpenLayers.Renderer.Canvas.LABEL_ALIGN[b.labelAlign[0]]||"center";this.canvas.textBaseline=OpenLayers.Renderer.Canvas.LABEL_ALIGN[b.labelAlign[1]]||"middle";var g=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[1]];
+null==g&&(g=-0.5);d=this.canvas.measureText("Mg").height||this.canvas.measureText("xx").width;c[1]+=d*g*(f-1);for(g=0;g<f;g++)b.labelOutlineWidth&&(this.canvas.save(),this.canvas.globalAlpha=b.labelOutlineOpacity||b.fontOpacity||1,this.canvas.strokeStyle=b.labelOutlineColor,this.canvas.lineWidth=b.labelOutlineWidth,this.canvas.strokeText(e[g],c[0],c[1]+d*g+1),this.canvas.restore()),this.canvas.fillText(e[g],c[0],c[1]+d*g)}else if(this.canvas.mozDrawText){this.canvas.mozTextStyle=d;var h=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[0]];
+null==h&&(h=-0.5);g=OpenLayers.Renderer.Canvas.LABEL_FACTOR[b.labelAlign[1]];null==g&&(g=-0.5);d=this.canvas.mozMeasureText("xx");c[1]+=d*(1+g*f);for(g=0;g<f;g++){var k=c[0]+h*this.canvas.mozMeasureText(e[g]),l=c[1]+g*d;this.canvas.translate(k,l);this.canvas.mozDrawText(e[g]);this.canvas.translate(-k,-l)}}this.setCanvasStyle("reset")},getLocalXY:function(a){var b=this.getResolution(),c=this.extent;return[(a.x-this.featureDx)/b+-c.left/b,c.top/b-a.y/b]},clear:function(){var a=this.root.height,b=this.root.width;
+this.canvas.clearRect(0,0,b,a);this.features={};this.hitDetection&&this.hitContext.clearRect(0,0,b,a)},getFeatureIdFromEvent:function(a){var b;if(this.hitDetection&&"none"!==this.root.style.display&&!this.map.dragging&&(a=a.xy,a=this.hitContext.getImageData(a.x|0,a.y|0,1,1).data,255===a[3]&&(a=a[2]+256*(a[1]+256*a[0])))){a="OpenLayers_Feature_Vector_"+(a-1+this.hitOverflow);try{b=this.features[a][0]}catch(c){}}return b},eraseFeatures:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=0;b<a.length;++b)delete this.features[a[b].id];
+this.redraw()},redraw:function(){if(!this.locked){var a=this.root.height,b=this.root.width;this.canvas.clearRect(0,0,b,a);this.hitDetection&&this.hitContext.clearRect(0,0,b,a);var a=[],c,d,e=this.map.baseLayer&&this.map.baseLayer.wrapDateLine&&this.map.getMaxExtent(),f;for(f in this.features)this.features.hasOwnProperty(f)&&(b=this.features[f][0],c=b.geometry,this.calculateFeatureDx(c.getBounds(),e),d=this.features[f][1],this.drawGeometry(c,d,b.id),d.label&&a.push([b,d]));b=0;for(c=a.length;b<c;++b)f=
+a[b],this.drawText(f[0].geometry.getCentroid(),f[1])}},CLASS_NAME:"OpenLayers.Renderer.Canvas"});OpenLayers.Renderer.Canvas.LABEL_ALIGN={l:"left",r:"right",t:"top",b:"bottom"};OpenLayers.Renderer.Canvas.LABEL_FACTOR={l:0,r:-1,t:0,b:-1};OpenLayers.Renderer.Canvas.drawImageScaleFactor=null;OpenLayers.Format.OSM=OpenLayers.Class(OpenLayers.Format.XML,{checkTags:!1,interestingTagsExclude:null,areaTags:null,initialize:function(a){var b={interestingTagsExclude:"source source_ref source:ref history attribution created_by".split(" "),areaTags:"area building leisure tourism ruins historic landuse military natural sport".split(" ")},b=OpenLayers.Util.extend(b,a),c={};for(a=0;a<b.interestingTagsExclude.length;a++)c[b.interestingTagsExclude[a]]=!0;b.interestingTagsExclude=c;c={};for(a=0;a<b.areaTags.length;a++)c[b.areaTags[a]]=
+!0;b.areaTags=c;this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[b])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=this.getNodes(a),c=this.getWays(a);a=Array(c.length);for(var d=0;d<c.length;d++){for(var e=Array(c[d].nodes.length),f=this.isWayArea(c[d])?1:0,g=0;g<c[d].nodes.length;g++){var h=b[c[d].nodes[g]],k=new OpenLayers.Geometry.Point(h.lon,h.lat);k.osm_id=parseInt(c[d].nodes[g]);
+e[g]=k;h.used=!0}h=null;h=f?new OpenLayers.Geometry.Polygon(new OpenLayers.Geometry.LinearRing(e)):new OpenLayers.Geometry.LineString(e);this.internalProjection&&this.externalProjection&&h.transform(this.externalProjection,this.internalProjection);e=new OpenLayers.Feature.Vector(h,c[d].tags);e.osm_id=parseInt(c[d].id);e.fid="way."+e.osm_id;a[d]=e}for(var l in b){h=b[l];if(!h.used||this.checkTags){c=null;if(this.checkTags){c=this.getTags(h.node,!0);if(h.used&&!c[1])continue;c=c[0]}else c=this.getTags(h.node);
+e=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(h.lon,h.lat),c);this.internalProjection&&this.externalProjection&&e.geometry.transform(this.externalProjection,this.internalProjection);e.osm_id=parseInt(l);e.fid="node."+e.osm_id;a.push(e)}h.node=null}return a},getNodes:function(a){a=a.getElementsByTagName("node");for(var b={},c=0;c<a.length;c++){var d=a[c],e=d.getAttribute("id");b[e]={lat:d.getAttribute("lat"),lon:d.getAttribute("lon"),node:d}}return b},getWays:function(a){a=a.getElementsByTagName("way");
+for(var b=[],c=0;c<a.length;c++){var d=a[c],e={id:d.getAttribute("id")};e.tags=this.getTags(d);d=d.getElementsByTagName("nd");e.nodes=Array(d.length);for(var f=0;f<d.length;f++)e.nodes[f]=d[f].getAttribute("ref");b.push(e)}return b},getTags:function(a,b){for(var c=a.getElementsByTagName("tag"),d={},e=!1,f=0;f<c.length;f++){var g=c[f].getAttribute("k");d[g]=c[f].getAttribute("v");b&&(this.interestingTagsExclude[g]||(e=!0))}return b?[d,e]:d},isWayArea:function(a){var b=!1,c=!1;a.nodes[0]==a.nodes[a.nodes.length-
+1]&&(b=!0);if(this.checkTags)for(var d in a.tags)if(this.areaTags[d]){c=!0;break}return b&&(this.checkTags?c:!0)},write:function(a){OpenLayers.Util.isArray(a)||(a=[a]);this.osm_id=1;this.created_nodes={};var b=this.createElementNS(null,"osm");b.setAttribute("version","0.5");b.setAttribute("generator","OpenLayers "+OpenLayers.VERSION_NUMBER);for(var c=a.length-1;0<=c;c--)for(var d=this.createFeatureNodes(a[c]),e=0;e<d.length;e++)b.appendChild(d[e]);return OpenLayers.Format.XML.prototype.write.apply(this,
+[b])},createFeatureNodes:function(a){var b=[],c=a.geometry.CLASS_NAME,c=c.substring(c.lastIndexOf(".")+1),c=c.toLowerCase();(c=this.createXML[c])&&(b=c.apply(this,[a]));return b},createXML:{point:function(a){var b=null,c=a.geometry?a.geometry:a;this.internalProjection&&this.externalProjection&&(c=c.clone(),c.transform(this.internalProjection,this.externalProjection));var d=!1;a.osm_id?(b=a.osm_id,this.created_nodes[b]&&(d=!0)):(b=-this.osm_id,this.osm_id++);var e=d?this.created_nodes[b]:this.createElementNS(null,
+"node");this.created_nodes[b]=e;e.setAttribute("id",b);e.setAttribute("lon",c.x);e.setAttribute("lat",c.y);a.attributes&&this.serializeTags(a,e);this.setState(a,e);return d?[]:[e]},linestring:function(a){var b,c=[],d=a.geometry;a.osm_id?b=a.osm_id:(b=-this.osm_id,this.osm_id++);var e=this.createElementNS(null,"way");e.setAttribute("id",b);for(b=0;b<d.components.length;b++){var f=this.createXML.point.apply(this,[d.components[b]]);if(f.length){var f=f[0],g=f.getAttribute("id");c.push(f)}else g=d.components[b].osm_id,
+f=this.created_nodes[g];this.setState(a,f);f=this.createElementNS(null,"nd");f.setAttribute("ref",g);e.appendChild(f)}this.serializeTags(a,e);c.push(e);return c},polygon:function(a){var b=OpenLayers.Util.extend({area:"yes"},a.attributes),b=new OpenLayers.Feature.Vector(a.geometry.components[0],b);b.osm_id=a.osm_id;return this.createXML.linestring.apply(this,[b])}},serializeTags:function(a,b){for(var c in a.attributes){var d=this.createElementNS(null,"tag");d.setAttribute("k",c);d.setAttribute("v",
+a.attributes[c]);b.appendChild(d)}},setState:function(a,b){if(a.state){var c=null;switch(a.state){case OpenLayers.State.UPDATE:case OpenLayers.State.DELETE:c="delete"}c&&b.setAttribute("action",c)}},CLASS_NAME:"OpenLayers.Format.OSM"});OpenLayers.Handler.Keyboard=OpenLayers.Class(OpenLayers.Handler,{KEY_EVENTS:["keydown","keyup"],eventListener:null,observeElement:null,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.eventListener=OpenLayers.Function.bindAsEventListener(this.handleKeyEvent,this)},destroy:function(){this.deactivate();this.eventListener=null;OpenLayers.Handler.prototype.destroy.apply(this,arguments)},activate:function(){if(OpenLayers.Handler.prototype.activate.apply(this,
+arguments)){this.observeElement=this.observeElement||document;for(var a=0,b=this.KEY_EVENTS.length;a<b;a++)OpenLayers.Event.observe(this.observeElement,this.KEY_EVENTS[a],this.eventListener);return!0}return!1},deactivate:function(){var a=!1;if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){for(var a=0,b=this.KEY_EVENTS.length;a<b;a++)OpenLayers.Event.stopObserving(this.observeElement,this.KEY_EVENTS[a],this.eventListener);a=!0}return a},handleKeyEvent:function(a){this.checkModifiers(a)&&
+this.callback(a.type,[a])},CLASS_NAME:"OpenLayers.Handler.Keyboard"});OpenLayers.Control.ModifyFeature=OpenLayers.Class(OpenLayers.Control,{documentDrag:!1,geometryTypes:null,clickout:!0,toggle:!0,standalone:!1,layer:null,feature:null,vertex:null,vertices:null,virtualVertices:null,handlers:null,deleteCodes:null,virtualStyle:null,vertexRenderIntent:null,mode:null,createVertices:!0,modified:!1,radiusHandle:null,dragHandle:null,onModificationStart:function(){},onModification:function(){},onModificationEnd:function(){},initialize:function(a,b){b=b||{};this.layer=a;this.vertices=
+[];this.virtualVertices=[];this.virtualStyle=OpenLayers.Util.extend({},this.layer.style||this.layer.styleMap.createSymbolizer(null,b.vertexRenderIntent));this.virtualStyle.fillOpacity=0.3;this.virtualStyle.strokeOpacity=0.3;this.deleteCodes=[46,68];this.mode=OpenLayers.Control.ModifyFeature.RESHAPE;OpenLayers.Control.prototype.initialize.apply(this,[b]);OpenLayers.Util.isArray(this.deleteCodes)||(this.deleteCodes=[this.deleteCodes]);var c={documentDrag:this.documentDrag,stopDown:!1};this.handlers=
+{keyboard:new OpenLayers.Handler.Keyboard(this,{keydown:this.handleKeypress}),drag:new OpenLayers.Handler.Drag(this,{down:function(a){this.vertex=null;(a=this.layer.getFeatureFromEvent(this.handlers.drag.evt))?this.dragStart(a):this.clickout&&(this._unselect=this.feature)},move:function(a){delete this._unselect;this.vertex&&this.dragVertex(this.vertex,a)},up:function(){this.handlers.drag.stopDown=!1;this._unselect&&(this.unselectFeature(this._unselect),delete this._unselect)},done:function(a){this.vertex&&
+this.dragComplete(this.vertex)}},c)}},destroy:function(){this.map&&this.map.events.un({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this});this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[])},activate:function(){this.moveLayerToTop();this.map.events.on({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this});return this.handlers.keyboard.activate()&&this.handlers.drag.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments)},
+deactivate:function(){var a=!1;OpenLayers.Control.prototype.deactivate.apply(this,arguments)&&(this.moveLayerBack(),this.map.events.un({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this}),this.layer.removeFeatures(this.vertices,{silent:!0}),this.layer.removeFeatures(this.virtualVertices,{silent:!0}),this.vertices=[],this.handlers.drag.deactivate(),this.handlers.keyboard.deactivate(),(a=this.feature)&&(a.geometry&&a.layer)&&this.unselectFeature(a),a=!0);return a},beforeSelectFeature:function(a){return this.layer.events.triggerEvent("beforefeaturemodified",
+{feature:a})},selectFeature:function(a){if(!(this.feature===a||this.geometryTypes&&-1==OpenLayers.Util.indexOf(this.geometryTypes,a.geometry.CLASS_NAME))){!1!==this.beforeSelectFeature(a)&&(this.feature&&this.unselectFeature(this.feature),this.feature=a,this.layer.selectedFeatures.push(a),this.layer.drawFeature(a,"select"),this.modified=!1,this.resetVertices(),this.onModificationStart(this.feature));var b=a.modified;!a.geometry||b&&b.geometry||(this._originalGeometry=a.geometry.clone())}},unselectFeature:function(a){this.layer.removeFeatures(this.vertices,
+{silent:!0});this.vertices=[];this.layer.destroyFeatures(this.virtualVertices,{silent:!0});this.virtualVertices=[];this.dragHandle&&(this.layer.destroyFeatures([this.dragHandle],{silent:!0}),delete this.dragHandle);this.radiusHandle&&(this.layer.destroyFeatures([this.radiusHandle],{silent:!0}),delete this.radiusHandle);this.layer.drawFeature(this.feature,"default");this.feature=null;OpenLayers.Util.removeItem(this.layer.selectedFeatures,a);this.onModificationEnd(a);this.layer.events.triggerEvent("afterfeaturemodified",
+{feature:a,modified:this.modified});this.modified=!1},dragStart:function(a){var b="OpenLayers.Geometry.Point"==a.geometry.CLASS_NAME;this.standalone||(a._sketch||!b)&&a._sketch||(this.toggle&&this.feature===a&&(this._unselect=a),this.selectFeature(a));if(a._sketch||b)this.vertex=a,this.handlers.drag.stopDown=!0},dragVertex:function(a,b){var c=this.map.getLonLatFromViewPortPx(b),d=a.geometry;d.move(c.lon-d.x,c.lat-d.y);this.modified=!0;"OpenLayers.Geometry.Point"==this.feature.geometry.CLASS_NAME?
+this.layer.events.triggerEvent("vertexmodified",{vertex:a.geometry,feature:this.feature,pixel:b}):(a._index?(a.geometry.parent.addComponent(a.geometry,a._index),delete a._index,OpenLayers.Util.removeItem(this.virtualVertices,a),this.vertices.push(a)):a==this.dragHandle?(this.layer.removeFeatures(this.vertices,{silent:!0}),this.vertices=[],this.radiusHandle&&(this.layer.destroyFeatures([this.radiusHandle],{silent:!0}),this.radiusHandle=null)):a!==this.radiusHandle&&this.layer.events.triggerEvent("vertexmodified",
+{vertex:a.geometry,feature:this.feature,pixel:b}),0<this.virtualVertices.length&&(this.layer.destroyFeatures(this.virtualVertices,{silent:!0}),this.virtualVertices=[]),this.layer.drawFeature(this.feature,this.standalone?void 0:"select"));this.layer.drawFeature(a)},dragComplete:function(a){this.resetVertices();this.setFeatureState();this.onModification(this.feature);this.layer.events.triggerEvent("featuremodified",{feature:this.feature})},setFeatureState:function(){if(this.feature.state!=OpenLayers.State.INSERT&&
+this.feature.state!=OpenLayers.State.DELETE&&(this.feature.state=OpenLayers.State.UPDATE,this.modified&&this._originalGeometry)){var a=this.feature;a.modified=OpenLayers.Util.extend(a.modified,{geometry:this._originalGeometry});delete this._originalGeometry}},resetVertices:function(){0<this.vertices.length&&(this.layer.removeFeatures(this.vertices,{silent:!0}),this.vertices=[]);0<this.virtualVertices.length&&(this.layer.removeFeatures(this.virtualVertices,{silent:!0}),this.virtualVertices=[]);this.dragHandle&&
+(this.layer.destroyFeatures([this.dragHandle],{silent:!0}),this.dragHandle=null);this.radiusHandle&&(this.layer.destroyFeatures([this.radiusHandle],{silent:!0}),this.radiusHandle=null);this.feature&&"OpenLayers.Geometry.Point"!=this.feature.geometry.CLASS_NAME&&(this.mode&OpenLayers.Control.ModifyFeature.DRAG&&this.collectDragHandle(),this.mode&(OpenLayers.Control.ModifyFeature.ROTATE|OpenLayers.Control.ModifyFeature.RESIZE)&&this.collectRadiusHandle(),this.mode&OpenLayers.Control.ModifyFeature.RESHAPE&&
+(this.mode&OpenLayers.Control.ModifyFeature.RESIZE||this.collectVertices()))},handleKeypress:function(a){var b=a.keyCode;this.feature&&-1!=OpenLayers.Util.indexOf(this.deleteCodes,b)&&(b=this.layer.getFeatureFromEvent(this.handlers.drag.evt))&&(-1!=OpenLayers.Util.indexOf(this.vertices,b)&&!this.handlers.drag.dragging&&b.geometry.parent)&&(b.geometry.parent.removeComponent(b.geometry),this.layer.events.triggerEvent("vertexremoved",{vertex:b.geometry,feature:this.feature,pixel:a.xy}),this.layer.drawFeature(this.feature,
+this.standalone?void 0:"select"),this.modified=!0,this.resetVertices(),this.setFeatureState(),this.onModification(this.feature),this.layer.events.triggerEvent("featuremodified",{feature:this.feature}))},collectVertices:function(){function a(c){var d,e,f;if("OpenLayers.Geometry.Point"==c.CLASS_NAME)e=new OpenLayers.Feature.Vector(c),e._sketch=!0,e.renderIntent=b.vertexRenderIntent,b.vertices.push(e);else{f=c.components.length;"OpenLayers.Geometry.LinearRing"==c.CLASS_NAME&&(f-=1);for(d=0;d<f;++d)e=
+c.components[d],"OpenLayers.Geometry.Point"==e.CLASS_NAME?(e=new OpenLayers.Feature.Vector(e),e._sketch=!0,e.renderIntent=b.vertexRenderIntent,b.vertices.push(e)):a(e);if(b.createVertices&&"OpenLayers.Geometry.MultiPoint"!=c.CLASS_NAME)for(d=0,f=c.components.length;d<f-1;++d){e=c.components[d];var g=c.components[d+1];"OpenLayers.Geometry.Point"==e.CLASS_NAME&&"OpenLayers.Geometry.Point"==g.CLASS_NAME&&(e=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point((e.x+g.x)/2,(e.y+g.y)/2),null,b.virtualStyle),
+e.geometry.parent=c,e._index=d+1,e._sketch=!0,b.virtualVertices.push(e))}}}this.vertices=[];this.virtualVertices=[];var b=this;a.call(this,this.feature.geometry);this.layer.addFeatures(this.virtualVertices,{silent:!0});this.layer.addFeatures(this.vertices,{silent:!0})},collectDragHandle:function(){var a=this.feature.geometry,b=a.getBounds().getCenterLonLat(),b=new OpenLayers.Geometry.Point(b.lon,b.lat),c=new OpenLayers.Feature.Vector(b);b.move=function(b,c){OpenLayers.Geometry.Point.prototype.move.call(this,
+b,c);a.move(b,c)};c._sketch=!0;this.dragHandle=c;this.dragHandle.renderIntent=this.vertexRenderIntent;this.layer.addFeatures([this.dragHandle],{silent:!0})},collectRadiusHandle:function(){var a=this.feature.geometry,b=a.getBounds(),c=b.getCenterLonLat(),d=new OpenLayers.Geometry.Point(c.lon,c.lat),b=new OpenLayers.Geometry.Point(b.right,b.bottom),c=new OpenLayers.Feature.Vector(b),e=this.mode&OpenLayers.Control.ModifyFeature.RESIZE,f=this.mode&OpenLayers.Control.ModifyFeature.RESHAPE,g=this.mode&
+OpenLayers.Control.ModifyFeature.ROTATE;b.move=function(b,c){OpenLayers.Geometry.Point.prototype.move.call(this,b,c);var l=this.x-d.x,m=this.y-d.y,n=l-b,p=m-c;if(g){var q=Math.atan2(p,n),q=Math.atan2(m,l)-q,q=q*(180/Math.PI);a.rotate(q,d)}if(e){var r;f?(m/=p,r=l/n/m):(n=Math.sqrt(n*n+p*p),m=Math.sqrt(l*l+m*m)/n);a.resize(m,d,r)}};c._sketch=!0;this.radiusHandle=c;this.radiusHandle.renderIntent=this.vertexRenderIntent;this.layer.addFeatures([this.radiusHandle],{silent:!0})},setMap:function(a){this.handlers.drag.setMap(a);
+OpenLayers.Control.prototype.setMap.apply(this,arguments)},handleMapEvents:function(a){"removelayer"!=a.type&&"order"!=a.property||this.moveLayerToTop()},moveLayerToTop:function(){var a=Math.max(this.map.Z_INDEX_BASE.Feature-1,this.layer.getZIndex())+1;this.layer.setZIndex(a)},moveLayerBack:function(){var a=this.layer.getZIndex()-1;a>=this.map.Z_INDEX_BASE.Feature?this.layer.setZIndex(a):this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer))},CLASS_NAME:"OpenLayers.Control.ModifyFeature"});
+OpenLayers.Control.ModifyFeature.RESHAPE=1;OpenLayers.Control.ModifyFeature.RESIZE=2;OpenLayers.Control.ModifyFeature.ROTATE=4;OpenLayers.Control.ModifyFeature.DRAG=8;OpenLayers.Layer.Bing=OpenLayers.Class(OpenLayers.Layer.XYZ,{key:null,serverResolutions:[156543.03390625,78271.516953125,39135.7584765625,19567.87923828125,9783.939619140625,4891.9698095703125,2445.9849047851562,1222.9924523925781,611.4962261962891,305.74811309814453,152.87405654907226,76.43702827453613,38.218514137268066,19.109257068634033,9.554628534317017,4.777314267158508,2.388657133579254,1.194328566789627,0.5971642833948135,0.29858214169740677,0.14929107084870338,0.07464553542435169],attributionTemplate:'<span class="olBingAttribution ${type}"><div><a target="_blank" href="http://www.bing.com/maps/"><img src="${logo}" /></a></div>${copyrights}<a style="white-space: nowrap" target="_blank" href="http://www.microsoft.com/maps/product/terms.html">Terms of Use</a></span>',
+metadata:null,protocolRegex:/^http:/i,type:"Road",culture:"en-US",metadataParams:null,tileOptions:null,protocol:~window.location.href.indexOf("http")?"":"http:",initialize:function(a){a=OpenLayers.Util.applyDefaults({sphericalMercator:!0},a);OpenLayers.Layer.XYZ.prototype.initialize.apply(this,[a.name||"Bing "+(a.type||this.type),null,a]);this.tileOptions=OpenLayers.Util.extend({crossOriginKeyword:"anonymous"},this.options.tileOptions);this.loadMetadata()},loadMetadata:function(){this._callbackId=
+"_callback_"+this.id.replace(/\./g,"_");window[this._callbackId]=OpenLayers.Function.bind(OpenLayers.Layer.Bing.processMetadata,this);var a=OpenLayers.Util.applyDefaults({key:this.key,jsonp:this._callbackId,include:"ImageryProviders"},this.metadataParams),a=this.protocol+"//dev.virtualearth.net/REST/v1/Imagery/Metadata/"+this.type+"?"+OpenLayers.Util.getParameterString(a),b=document.createElement("script");b.type="text/javascript";b.src=a;b.id=this._callbackId;document.getElementsByTagName("head")[0].appendChild(b)},
+initLayer:function(){var a=this.metadata.resourceSets[0].resources[0],b=a.imageUrl.replace("{quadkey}","${quadkey}"),b=b.replace("{culture}",this.culture),b=b.replace(this.protocolRegex,this.protocol);this.url=[];for(var c=0;c<a.imageUrlSubdomains.length;++c)this.url.push(b.replace("{subdomain}",a.imageUrlSubdomains[c]));this.addOptions({maxResolution:Math.min(this.serverResolutions[a.zoomMin],this.maxResolution||Number.POSITIVE_INFINITY),numZoomLevels:Math.min(a.zoomMax+1-a.zoomMin,this.numZoomLevels)},
+!0);this.isBaseLayer||this.redraw();this.updateAttribution()},getURL:function(a){if(this.url){var b=this.getXYZ(a);a=b.x;for(var c=b.y,b=b.z,d=[],e=b;0<e;--e){var f="0",g=1<<e-1;0!=(a&g)&&f++;0!=(c&g)&&(f++,f++);d.push(f)}d=d.join("");a=this.selectUrl(""+a+c+b,this.url);return OpenLayers.String.format(a,{quadkey:d})}},updateAttribution:function(){var a=this.metadata;if(a.resourceSets&&this.map&&this.map.center){var b=a.resourceSets[0].resources[0],c=this.map.getExtent().transform(this.map.getProjectionObject(),
+new OpenLayers.Projection("EPSG:4326")),d=b.imageryProviders||[],e=OpenLayers.Util.indexOf(this.serverResolutions,this.getServerResolution()),b="",f,g,h,k,l,m,n;g=0;for(h=d.length;g<h;++g)for(f=d[g],k=0,l=f.coverageAreas.length;k<l;++k)n=f.coverageAreas[k],m=OpenLayers.Bounds.fromArray(n.bbox,!0),c.intersectsBounds(m)&&(e<=n.zoomMax&&e>=n.zoomMin)&&(b+=f.attribution+" ");a=a.brandLogoUri.replace(this.protocolRegex,this.protocol);this.attribution=OpenLayers.String.format(this.attributionTemplate,{type:this.type.toLowerCase(),
+logo:a,copyrights:b});this.map&&this.map.events.triggerEvent("changelayer",{layer:this,property:"attribution"})}},setMap:function(){OpenLayers.Layer.XYZ.prototype.setMap.apply(this,arguments);this.map.events.register("moveend",this,this.updateAttribution)},clone:function(a){null==a&&(a=new OpenLayers.Layer.Bing(this.options));return a=OpenLayers.Layer.XYZ.prototype.clone.apply(this,[a])},destroy:function(){this.map&&this.map.events.unregister("moveend",this,this.updateAttribution);OpenLayers.Layer.XYZ.prototype.destroy.apply(this,
+arguments)},CLASS_NAME:"OpenLayers.Layer.Bing"});OpenLayers.Layer.Bing.processMetadata=function(a){this.metadata=a;this.initLayer();a=document.getElementById(this._callbackId);a.parentNode.removeChild(a);window[this._callbackId]=void 0;delete this._callbackId};OpenLayers.StyleMap=OpenLayers.Class({styles:null,extendDefault:!0,initialize:function(a,b){this.styles={"default":new OpenLayers.Style(OpenLayers.Feature.Vector.style["default"]),select:new OpenLayers.Style(OpenLayers.Feature.Vector.style.select),temporary:new OpenLayers.Style(OpenLayers.Feature.Vector.style.temporary),"delete":new OpenLayers.Style(OpenLayers.Feature.Vector.style["delete"])};if(a instanceof OpenLayers.Style)this.styles["default"]=a,this.styles.select=a,this.styles.temporary=a,this.styles["delete"]=
+a;else if("object"==typeof a)for(var c in a)if(a[c]instanceof OpenLayers.Style)this.styles[c]=a[c];else if("object"==typeof a[c])this.styles[c]=new OpenLayers.Style(a[c]);else{this.styles["default"]=new OpenLayers.Style(a);this.styles.select=new OpenLayers.Style(a);this.styles.temporary=new OpenLayers.Style(a);this.styles["delete"]=new OpenLayers.Style(a);break}OpenLayers.Util.extend(this,b)},destroy:function(){for(var a in this.styles)this.styles[a].destroy();this.styles=null},createSymbolizer:function(a,
+b){a||(a=new OpenLayers.Feature.Vector);this.styles[b]||(b="default");a.renderIntent=b;var c={};this.extendDefault&&"default"!=b&&(c=this.styles["default"].createSymbolizer(a));return OpenLayers.Util.extend(c,this.styles[b].createSymbolizer(a))},addUniqueValueRules:function(a,b,c,d){var e=[],f;for(f in c)e.push(new OpenLayers.Rule({symbolizer:c[f],context:d,filter:new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO,property:b,value:f})}));this.styles[a].addRules(e)},CLASS_NAME:"OpenLayers.StyleMap"});OpenLayers.Layer.Vector=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:!1,isFixed:!1,features:null,filter:null,selectedFeatures:null,unrenderedFeatures:null,reportError:!0,style:null,styleMap:null,strategies:null,protocol:null,renderers:["SVG","VML","Canvas"],renderer:null,rendererOptions:null,geometryType:null,drawn:!1,ratio:1,initialize:function(a,b){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.renderer&&this.renderer.supported()||this.assignRenderer();this.renderer&&this.renderer.supported()||
+(this.renderer=null,this.displayError());this.styleMap||(this.styleMap=new OpenLayers.StyleMap);this.features=[];this.selectedFeatures=[];this.unrenderedFeatures={};if(this.strategies)for(var c=0,d=this.strategies.length;c<d;c++)this.strategies[c].setLayer(this)},destroy:function(){if(this.strategies){var a,b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoDestroy&&a.destroy();this.strategies=null}this.protocol&&(this.protocol.autoDestroy&&this.protocol.destroy(),this.protocol=
+null);this.destroyFeatures();this.unrenderedFeatures=this.selectedFeatures=this.features=null;this.renderer&&this.renderer.destroy();this.drawn=this.geometryType=this.renderer=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.Vector(this.name,this.getOptions()));a=OpenLayers.Layer.prototype.clone.apply(this,[a]);for(var b=this.features,c=b.length,d=Array(c),e=0;e<c;++e)d[e]=b[e].clone();a.features=d;return a},refresh:function(a){this.calculateInRange()&&
+this.visibility&&this.events.triggerEvent("refresh",a)},assignRenderer:function(){for(var a=0,b=this.renderers.length;a<b;a++){var c=this.renderers[a];if((c="function"==typeof c?c:OpenLayers.Renderer[c])&&c.prototype.supported()){this.renderer=new c(this.div,this.rendererOptions);break}}},displayError:function(){this.reportError&&OpenLayers.Console.userError(OpenLayers.i18n("browserNotSupported",{renderers:this.renderers.join("\n")}))},setMap:function(a){OpenLayers.Layer.prototype.setMap.apply(this,
+arguments);if(this.renderer){this.renderer.map=this.map;var b=this.map.getSize();b.w*=this.ratio;b.h*=this.ratio;this.renderer.setSize(b)}else this.map.removeLayer(this)},afterAdd:function(){if(this.strategies){var a,b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoActivate&&a.activate()}},removeMap:function(a){this.drawn=!1;if(this.strategies){var b,c;b=0;for(c=this.strategies.length;b<c;b++)a=this.strategies[b],a.autoActivate&&a.deactivate()}},onMapResize:function(){OpenLayers.Layer.prototype.onMapResize.apply(this,
+arguments);var a=this.map.getSize();a.w*=this.ratio;a.h*=this.ratio;this.renderer.setSize(a)},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,arguments);var d=!0;if(!c){this.renderer.root.style.visibility="hidden";var d=this.map.getSize(),e=d.w,d=d.h,e=e/2*this.ratio-e/2,d=d/2*this.ratio-d/2,e=e+this.map.layerContainerOriginPx.x,e=-Math.round(e),d=d+this.map.layerContainerOriginPx.y,d=-Math.round(d);this.div.style.left=e+"px";this.div.style.top=d+"px";e=this.map.getExtent().scale(this.ratio);
+d=this.renderer.setExtent(e,b);this.renderer.root.style.visibility="visible";!0===OpenLayers.IS_GECKO&&(this.div.scrollLeft=this.div.scrollLeft);if(!b&&d)for(var f in this.unrenderedFeatures)e=this.unrenderedFeatures[f],this.drawFeature(e)}if(!this.drawn||b||!d)for(this.drawn=!0,f=0,d=this.features.length;f<d;f++)this.renderer.locked=f!==d-1,e=this.features[f],this.drawFeature(e)},display:function(a){OpenLayers.Layer.prototype.display.apply(this,arguments);var b=this.div.style.display;b!=this.renderer.root.style.display&&
+(this.renderer.root.style.display=b)},addFeatures:function(a,b){OpenLayers.Util.isArray(a)||(a=[a]);var c=!b||!b.silent;if(c){var d={features:a};if(!1===this.events.triggerEvent("beforefeaturesadded",d))return;a=d.features}for(var d=[],e=0,f=a.length;e<f;e++){this.renderer.locked=e!=a.length-1?!0:!1;var g=a[e];if(this.geometryType&&!(g.geometry instanceof this.geometryType))throw new TypeError("addFeatures: component should be an "+this.geometryType.prototype.CLASS_NAME);g.layer=this;!g.style&&this.style&&
+(g.style=OpenLayers.Util.extend({},this.style));if(c){if(!1===this.events.triggerEvent("beforefeatureadded",{feature:g}))continue;this.preFeatureInsert(g)}d.push(g);this.features.push(g);this.drawFeature(g);c&&(this.events.triggerEvent("featureadded",{feature:g}),this.onFeatureInsert(g))}c&&this.events.triggerEvent("featuresadded",{features:d})},removeFeatures:function(a,b){if(a&&0!==a.length){if(a===this.features)return this.removeAllFeatures(b);OpenLayers.Util.isArray(a)||(a=[a]);a===this.selectedFeatures&&
+(a=a.slice());var c=!b||!b.silent;c&&this.events.triggerEvent("beforefeaturesremoved",{features:a});for(var d=a.length-1;0<=d;d--){this.renderer.locked=0!=d&&a[d-1].geometry?!0:!1;var e=a[d];delete this.unrenderedFeatures[e.id];c&&this.events.triggerEvent("beforefeatureremoved",{feature:e});this.features=OpenLayers.Util.removeItem(this.features,e);e.layer=null;e.geometry&&this.renderer.eraseFeatures(e);-1!=OpenLayers.Util.indexOf(this.selectedFeatures,e)&&OpenLayers.Util.removeItem(this.selectedFeatures,
+e);c&&this.events.triggerEvent("featureremoved",{feature:e})}c&&this.events.triggerEvent("featuresremoved",{features:a})}},removeAllFeatures:function(a){a=!a||!a.silent;var b=this.features;a&&this.events.triggerEvent("beforefeaturesremoved",{features:b});for(var c,d=b.length-1;0<=d;d--)c=b[d],a&&this.events.triggerEvent("beforefeatureremoved",{feature:c}),c.layer=null,a&&this.events.triggerEvent("featureremoved",{feature:c});this.renderer.clear();this.features=[];this.unrenderedFeatures={};this.selectedFeatures=
+[];a&&this.events.triggerEvent("featuresremoved",{features:b})},destroyFeatures:function(a,b){void 0==a&&(a=this.features);if(a){this.removeFeatures(a,b);for(var c=a.length-1;0<=c;c--)a[c].destroy()}},drawFeature:function(a,b){if(this.drawn){if("object"!=typeof b){b||a.state!==OpenLayers.State.DELETE||(b="delete");var c=b||a.renderIntent;(b=a.style||this.style)||(b=this.styleMap.createSymbolizer(a,c))}c=this.renderer.drawFeature(a,b);!1===c||null===c?this.unrenderedFeatures[a.id]=a:delete this.unrenderedFeatures[a.id]}},
+eraseFeatures:function(a){this.renderer.eraseFeatures(a)},getFeatureFromEvent:function(a){if(!this.renderer)throw Error("getFeatureFromEvent called on layer with no renderer. This usually means you destroyed a layer, but not some handler which is associated with it.");var b=null;(a=this.renderer.getFeatureIdFromEvent(a))&&(b="string"===typeof a?this.getFeatureById(a):a);return b},getFeatureBy:function(a,b){for(var c=null,d=0,e=this.features.length;d<e;++d)if(this.features[d][a]==b){c=this.features[d];
+break}return c},getFeatureById:function(a){return this.getFeatureBy("id",a)},getFeatureByFid:function(a){return this.getFeatureBy("fid",a)},getFeaturesByAttribute:function(a,b){var c,d,e=this.features.length,f=[];for(c=0;c<e;c++)(d=this.features[c])&&d.attributes&&d.attributes[a]===b&&f.push(d);return f},onFeatureInsert:function(a){},preFeatureInsert:function(a){},getDataExtent:function(){var a=null,b=this.features;if(b&&0<b.length)for(var c=null,d=0,e=b.length;d<e;d++)if(c=b[d].geometry)null===a&&
+(a=new OpenLayers.Bounds),a.extend(c.getBounds());return a},CLASS_NAME:"OpenLayers.Layer.Vector"});OpenLayers.Layer.PointGrid=OpenLayers.Class(OpenLayers.Layer.Vector,{dx:null,dy:null,ratio:1.5,maxFeatures:250,rotation:0,origin:null,gridBounds:null,initialize:function(a){a=a||{};OpenLayers.Layer.Vector.prototype.initialize.apply(this,[a.name,a])},setMap:function(a){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);a.events.register("moveend",this,this.onMoveEnd)},removeMap:function(a){a.events.unregister("moveend",this,this.onMoveEnd);OpenLayers.Layer.Vector.prototype.removeMap.apply(this,
+arguments)},setRatio:function(a){this.ratio=a;this.updateGrid(!0)},setMaxFeatures:function(a){this.maxFeatures=a;this.updateGrid(!0)},setSpacing:function(a,b){this.dx=a;this.dy=b||a;this.updateGrid(!0)},setOrigin:function(a){this.origin=a;this.updateGrid(!0)},getOrigin:function(){this.origin||(this.origin=this.map.getExtent().getCenterLonLat());return this.origin},setRotation:function(a){this.rotation=a;this.updateGrid(!0)},onMoveEnd:function(){this.updateGrid()},getViewBounds:function(){var a=this.map.getExtent();
+if(this.rotation){var b=this.getOrigin(),b=new OpenLayers.Geometry.Point(b.lon,b.lat),a=a.toGeometry();a.rotate(-this.rotation,b);a=a.getBounds()}return a},updateGrid:function(a){if(a||this.invalidBounds()){var b=this.getViewBounds(),c=this.getOrigin();a=new OpenLayers.Geometry.Point(c.lon,c.lat);var d=b.getWidth(),e=b.getHeight(),f=d/e,g=Math.sqrt(this.dx*this.dy*this.maxFeatures/f),d=Math.min(d*this.ratio,g*f),e=Math.min(e*this.ratio,g),b=b.getCenterLonLat();this.gridBounds=new OpenLayers.Bounds(b.lon-
+d/2,b.lat-e/2,b.lon+d/2,b.lat+e/2);for(var b=Math.floor(e/this.dy),d=Math.floor(d/this.dx),e=c.lon+this.dx*Math.ceil((this.gridBounds.left-c.lon)/this.dx),c=c.lat+this.dy*Math.ceil((this.gridBounds.bottom-c.lat)/this.dy),g=Array(b*d),h,k=0;k<d;++k)for(var f=e+k*this.dx,l=0;l<b;++l)h=c+l*this.dy,h=new OpenLayers.Geometry.Point(f,h),this.rotation&&h.rotate(this.rotation,a),g[k*b+l]=new OpenLayers.Feature.Vector(h);this.destroyFeatures(this.features,{silent:!0});this.addFeatures(g,{silent:!0})}},invalidBounds:function(){return!this.gridBounds||
+!this.gridBounds.containsBounds(this.getViewBounds())},CLASS_NAME:"OpenLayers.Layer.PointGrid"});OpenLayers.Handler.MouseWheel=OpenLayers.Class(OpenLayers.Handler,{wheelListener:null,interval:0,maxDelta:Number.POSITIVE_INFINITY,delta:0,cumulative:!0,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.wheelListener=OpenLayers.Function.bindAsEventListener(this.onWheelEvent,this)},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.wheelListener=null},onWheelEvent:function(a){if(this.map&&this.checkModifiers(a)){for(var b=
+!1,c=!1,d=!1,e=OpenLayers.Event.element(a);null!=e&&!d&&!b;){if(!b)try{var f,b=(f=e.currentStyle?e.currentStyle.overflow:document.defaultView.getComputedStyle(e,null).getPropertyValue("overflow"))&&"auto"==f||"scroll"==f}catch(g){}if(!c&&(c=OpenLayers.Element.hasClass(e,"olScrollable"),!c))for(var d=0,h=this.map.layers.length;d<h;d++){var k=this.map.layers[d];if(e==k.div||e==k.pane){c=!0;break}}d=e==this.map.div;e=e.parentNode}if(!b&&d){if(c)if(b=0,a.wheelDelta?(b=a.wheelDelta,0===b%160&&(b*=0.75),
+b/=120):a.detail&&(b=-(a.detail/Math.abs(a.detail))),this.delta+=b,window.clearTimeout(this._timeoutId),this.interval&&Math.abs(this.delta)<this.maxDelta){var l=OpenLayers.Util.extend({},a);this._timeoutId=window.setTimeout(OpenLayers.Function.bind(function(){this.wheelZoom(l)},this),this.interval)}else this.wheelZoom(a);OpenLayers.Event.stop(a)}}},wheelZoom:function(a){var b=this.delta;this.delta=0;b&&(a.xy=this.map.events.getMousePosition(a),0>b?this.callback("down",[a,this.cumulative?Math.max(-this.maxDelta,
+b):-1]):this.callback("up",[a,this.cumulative?Math.min(this.maxDelta,b):1]))},activate:function(a){if(OpenLayers.Handler.prototype.activate.apply(this,arguments)){var b=this.wheelListener;OpenLayers.Event.observe(window,"DOMMouseScroll",b);OpenLayers.Event.observe(window,"mousewheel",b);OpenLayers.Event.observe(document,"mousewheel",b);return!0}return!1},deactivate:function(a){if(OpenLayers.Handler.prototype.deactivate.apply(this,arguments)){var b=this.wheelListener;OpenLayers.Event.stopObserving(window,
+"DOMMouseScroll",b);OpenLayers.Event.stopObserving(window,"mousewheel",b);OpenLayers.Event.stopObserving(document,"mousewheel",b);return!0}return!1},CLASS_NAME:"OpenLayers.Handler.MouseWheel"});OpenLayers.Symbolizer=OpenLayers.Class({zIndex:0,initialize:function(a){OpenLayers.Util.extend(this,a)},clone:function(){return new (eval(this.CLASS_NAME))(OpenLayers.Util.extend({},this))},CLASS_NAME:"OpenLayers.Symbolizer"});OpenLayers.Symbolizer.Raster=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Raster"});OpenLayers.Rule=OpenLayers.Class({id:null,name:null,title:null,description:null,context:null,filter:null,elseFilter:!1,symbolizer:null,symbolizers:null,minScaleDenominator:null,maxScaleDenominator:null,initialize:function(a){this.symbolizer={};OpenLayers.Util.extend(this,a);this.symbolizers&&delete this.symbolizer;this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){for(var a in this.symbolizer)this.symbolizer[a]=null;this.symbolizer=null;delete this.symbolizers},evaluate:function(a){var b=
+this.getContext(a),c=!0;if(this.minScaleDenominator||this.maxScaleDenominator)var d=a.layer.map.getScale();this.minScaleDenominator&&(c=d>=OpenLayers.Style.createLiteral(this.minScaleDenominator,b));c&&this.maxScaleDenominator&&(c=d<OpenLayers.Style.createLiteral(this.maxScaleDenominator,b));c&&this.filter&&(c="OpenLayers.Filter.FeatureId"==this.filter.CLASS_NAME?this.filter.evaluate(a):this.filter.evaluate(b));return c},getContext:function(a){var b=this.context;b||(b=a.attributes||a.data);"function"==
+typeof this.context&&(b=this.context(a));return b},clone:function(){var a=OpenLayers.Util.extend({},this);if(this.symbolizers){var b=this.symbolizers.length;a.symbolizers=Array(b);for(var c=0;c<b;++c)a.symbolizers[c]=this.symbolizers[c].clone()}else{a.symbolizer={};for(var d in this.symbolizer)b=this.symbolizer[d],c=typeof b,"object"===c?a.symbolizer[d]=OpenLayers.Util.extend({},b):"string"===c&&(a.symbolizer[d]=b)}a.filter=this.filter&&this.filter.clone();a.context=this.context&&OpenLayers.Util.extend({},
+this.context);return new OpenLayers.Rule(a)},CLASS_NAME:"OpenLayers.Rule"});OpenLayers.Format.SLD=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{profile:null,defaultVersion:"1.0.0",stringifyOutput:!0,namedLayersAsArray:!1,CLASS_NAME:"OpenLayers.Format.SLD"});OpenLayers.Symbolizer.Polygon=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Polygon"});OpenLayers.Format.GML.v2=OpenLayers.Class(OpenLayers.Format.GML.Base,{schemaLocation:"http://www.opengis.net/gml http://schemas.opengis.net/gml/2.1.2/feature.xsd",initialize:function(a){OpenLayers.Format.GML.Base.prototype.initialize.apply(this,[a])},readers:{gml:OpenLayers.Util.applyDefaults({outerBoundaryIs:function(a,b){var c={};this.readChildNodes(a,c);b.outer=c.components[0]},innerBoundaryIs:function(a,b){var c={};this.readChildNodes(a,c);b.inner.push(c.components[0])},Box:function(a,b){var c=
+{};this.readChildNodes(a,c);b.components||(b.components=[]);var d=c.points[0],c=c.points[1];b.components.push(new OpenLayers.Bounds(d.x,d.y,c.x,c.y))}},OpenLayers.Format.GML.Base.prototype.readers.gml),feature:OpenLayers.Format.GML.Base.prototype.readers.feature,wfs:OpenLayers.Format.GML.Base.prototype.readers.wfs},write:function(a){var b;b=OpenLayers.Util.isArray(a)?"wfs:FeatureCollection":"gml:featureMember";a=this.writeNode(b,a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);
+return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{gml:OpenLayers.Util.applyDefaults({Point:function(a){var b=this.createElementNSPlus("gml:Point");this.writeNode("coordinates",[a],b);return b},coordinates:function(a){for(var b=a.length,c=Array(b),d,e=0;e<b;++e)d=a[e],c[e]=this.xy?d.x+","+d.y:d.y+","+d.x,void 0!=d.z&&(c[e]+=","+d.z);return this.createElementNSPlus("gml:coordinates",{attributes:{decimal:".",cs:",",ts:" "},value:1==b?c[0]:c.join(" ")})},LineString:function(a){var b=
+this.createElementNSPlus("gml:LineString");this.writeNode("coordinates",a.components,b);return b},Polygon:function(a){var b=this.createElementNSPlus("gml:Polygon");this.writeNode("outerBoundaryIs",a.components[0],b);for(var c=1;c<a.components.length;++c)this.writeNode("innerBoundaryIs",a.components[c],b);return b},outerBoundaryIs:function(a){var b=this.createElementNSPlus("gml:outerBoundaryIs");this.writeNode("LinearRing",a,b);return b},innerBoundaryIs:function(a){var b=this.createElementNSPlus("gml:innerBoundaryIs");
+this.writeNode("LinearRing",a,b);return b},LinearRing:function(a){var b=this.createElementNSPlus("gml:LinearRing");this.writeNode("coordinates",a.components,b);return b},Box:function(a){var b=this.createElementNSPlus("gml:Box");this.writeNode("coordinates",[{x:a.left,y:a.bottom},{x:a.right,y:a.top}],b);this.srsName&&b.setAttribute("srsName",this.srsName);return b}},OpenLayers.Format.GML.Base.prototype.writers.gml),feature:OpenLayers.Format.GML.Base.prototype.writers.feature,wfs:OpenLayers.Format.GML.Base.prototype.writers.wfs},
+CLASS_NAME:"OpenLayers.Format.GML.v2"});OpenLayers.Format.Filter.v1_0_0=OpenLayers.Class(OpenLayers.Format.GML.v2,OpenLayers.Format.Filter.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/ogc/filter/1.0.0/filter.xsd",initialize:function(a){OpenLayers.Format.GML.v2.prototype.initialize.apply(this,[a])},readers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsNotEqualTo:function(a,
+b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.NOT_EQUAL_TO});this.readChildNodes(a,c);b.filters.push(c)},PropertyIsLike:function(a,b){var c=new OpenLayers.Filter.Comparison({type:OpenLayers.Filter.Comparison.LIKE});this.readChildNodes(a,c);var d=a.getAttribute("wildCard"),e=a.getAttribute("singleChar"),f=a.getAttribute("escape");c.value2regex(d,e,f);b.filters.push(c)}},OpenLayers.Format.Filter.v1.prototype.readers.ogc),gml:OpenLayers.Format.GML.v2.prototype.readers.gml,
+feature:OpenLayers.Format.GML.v2.prototype.readers.feature},writers:{ogc:OpenLayers.Util.applyDefaults({PropertyIsEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsNotEqualTo:function(a){var b=this.createElementNSPlus("ogc:PropertyIsNotEqualTo");this.writeNode("PropertyName",a,b);this.writeOgcExpression(a.value,b);return b},PropertyIsLike:function(a){var b=this.createElementNSPlus("ogc:PropertyIsLike",
+{attributes:{wildCard:"*",singleChar:".",escape:"!"}});this.writeNode("PropertyName",a,b);this.writeNode("Literal",a.regex2value(),b);return b},BBOX:function(a){var b=this.createElementNSPlus("ogc:BBOX");a.property&&this.writeNode("PropertyName",a,b);var c=this.writeNode("gml:Box",a.value,b);a.projection&&c.setAttribute("srsName",a.projection);return b}},OpenLayers.Format.Filter.v1.prototype.writers.ogc),gml:OpenLayers.Format.GML.v2.prototype.writers.gml,feature:OpenLayers.Format.GML.v2.prototype.writers.feature},
+writeSpatial:function(a,b){var c=this.createElementNSPlus("ogc:"+b);this.writeNode("PropertyName",a,c);if(a.value instanceof OpenLayers.Filter.Function)this.writeNode("Function",a.value,c);else{var d;d=a.value instanceof OpenLayers.Geometry?this.writeNode("feature:_geometry",a.value).firstChild:this.writeNode("gml:Box",a.value);a.projection&&d.setAttribute("srsName",a.projection);c.appendChild(d)}return c},CLASS_NAME:"OpenLayers.Format.Filter.v1_0_0"});OpenLayers.Format.WFST.v1_0_0=OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0,OpenLayers.Format.WFST.v1,{version:"1.0.0",srsNameInQuery:!1,schemaLocations:{wfs:"http://schemas.opengis.net/wfs/1.0.0/WFS-transaction.xsd"},initialize:function(a){OpenLayers.Format.Filter.v1_0_0.prototype.initialize.apply(this,[a]);OpenLayers.Format.WFST.v1.prototype.initialize.apply(this,[a])},readNode:function(a,b,c){return OpenLayers.Format.GML.v2.prototype.readNode.apply(this,arguments)},readers:{wfs:OpenLayers.Util.applyDefaults({WFS_TransactionResponse:function(a,
+b){b.insertIds=[];b.success=!1;this.readChildNodes(a,b)},InsertResult:function(a,b){var c={fids:[]};this.readChildNodes(a,c);b.insertIds=b.insertIds.concat(c.fids)},TransactionResult:function(a,b){this.readChildNodes(a,b)},Status:function(a,b){this.readChildNodes(a,b)},SUCCESS:function(a,b){b.success=!0}},OpenLayers.Format.WFST.v1.prototype.readers.wfs),gml:OpenLayers.Format.GML.v2.prototype.readers.gml,feature:OpenLayers.Format.GML.v2.prototype.readers.feature,ogc:OpenLayers.Format.Filter.v1_0_0.prototype.readers.ogc},
+writers:{wfs:OpenLayers.Util.applyDefaults({Query:function(a){a=OpenLayers.Util.extend({featureNS:this.featureNS,featurePrefix:this.featurePrefix,featureType:this.featureType,srsName:this.srsName,srsNameInQuery:this.srsNameInQuery},a);var b=a.featurePrefix,c=this.createElementNSPlus("wfs:Query",{attributes:{typeName:(b?b+":":"")+a.featureType}});a.srsNameInQuery&&a.srsName&&c.setAttribute("srsName",a.srsName);a.featureNS&&c.setAttribute("xmlns:"+b,a.featureNS);if(a.propertyNames)for(var b=0,d=a.propertyNames.length;b<
+d;b++)this.writeNode("ogc:PropertyName",{property:a.propertyNames[b]},c);a.filter&&(this.setFilterProperty(a.filter),this.writeNode("ogc:Filter",a.filter,c));return c}},OpenLayers.Format.WFST.v1.prototype.writers.wfs),gml:OpenLayers.Format.GML.v2.prototype.writers.gml,feature:OpenLayers.Format.GML.v2.prototype.writers.feature,ogc:OpenLayers.Format.Filter.v1_0_0.prototype.writers.ogc},CLASS_NAME:"OpenLayers.Format.WFST.v1_0_0"});OpenLayers.ElementsIndexer=OpenLayers.Class({maxZIndex:null,order:null,indices:null,compare:null,initialize:function(a){this.compare=a?OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_Y_ORDER:OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER_DRAWING_ORDER;this.clear()},insert:function(a){this.exists(a)&&this.remove(a);var b=a.id;this.determineZIndex(a);for(var c=-1,d=this.order.length,e;1<d-c;)e=parseInt((c+d)/2),0<this.compare(this,a,OpenLayers.Util.getElement(this.order[e]))?c=e:d=e;this.order.splice(d,
+0,b);this.indices[b]=this.getZIndex(a);return this.getNextElement(d)},remove:function(a){a=a.id;var b=OpenLayers.Util.indexOf(this.order,a);0<=b&&(this.order.splice(b,1),delete this.indices[a],this.maxZIndex=0<this.order.length?this.indices[this.order[this.order.length-1]]:0)},clear:function(){this.order=[];this.indices={};this.maxZIndex=0},exists:function(a){return null!=this.indices[a.id]},getZIndex:function(a){return a._style.graphicZIndex},determineZIndex:function(a){var b=a._style.graphicZIndex;
+null==b?(b=this.maxZIndex,a._style.graphicZIndex=b):b>this.maxZIndex&&(this.maxZIndex=b)},getNextElement:function(a){a+=1;if(a<this.order.length){var b=OpenLayers.Util.getElement(this.order[a]);void 0==b&&(b=this.getNextElement(a));return b}return null},CLASS_NAME:"OpenLayers.ElementsIndexer"});
+OpenLayers.ElementsIndexer.IndexingMethods={Z_ORDER:function(a,b,c){b=a.getZIndex(b);var d=0;c&&(a=a.getZIndex(c),d=b-a);return d},Z_ORDER_DRAWING_ORDER:function(a,b,c){a=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(a,b,c);c&&0==a&&(a=1);return a},Z_ORDER_Y_ORDER:function(a,b,c){a=OpenLayers.ElementsIndexer.IndexingMethods.Z_ORDER(a,b,c);c&&0===a&&(b=c._boundsBottom-b._boundsBottom,a=0===b?1:b);return a}};
+OpenLayers.Renderer.Elements=OpenLayers.Class(OpenLayers.Renderer,{rendererRoot:null,root:null,vectorRoot:null,textRoot:null,xmlns:null,xOffset:0,indexer:null,BACKGROUND_ID_SUFFIX:"_background",LABEL_ID_SUFFIX:"_label",LABEL_OUTLINE_SUFFIX:"_outline",initialize:function(a,b){OpenLayers.Renderer.prototype.initialize.apply(this,arguments);this.rendererRoot=this.createRenderRoot();this.root=this.createRoot("_root");this.vectorRoot=this.createRoot("_vroot");this.textRoot=this.createRoot("_troot");this.root.appendChild(this.vectorRoot);
+this.root.appendChild(this.textRoot);this.rendererRoot.appendChild(this.root);this.container.appendChild(this.rendererRoot);b&&(b.zIndexing||b.yOrdering)&&(this.indexer=new OpenLayers.ElementsIndexer(b.yOrdering))},destroy:function(){this.clear();this.xmlns=this.root=this.rendererRoot=null;OpenLayers.Renderer.prototype.destroy.apply(this,arguments)},clear:function(){var a,b=this.vectorRoot;if(b)for(;a=b.firstChild;)b.removeChild(a);if(b=this.textRoot)for(;a=b.firstChild;)b.removeChild(a);this.indexer&&
+this.indexer.clear()},setExtent:function(a,b){var c=OpenLayers.Renderer.prototype.setExtent.apply(this,arguments),d=this.getResolution();if(this.map.baseLayer&&this.map.baseLayer.wrapDateLine){var e,f=a.getWidth()/this.map.getExtent().getWidth();a=a.scale(1/f);f=this.map.getMaxExtent();f.right>a.left&&f.right<a.right?e=!0:f.left>a.left&&f.left<a.right&&(e=!1);if(e!==this.rightOfDateLine||b)c=!1,this.xOffset=!0===e?f.getWidth()/d:0;this.rightOfDateLine=e}return c},getNodeType:function(a,b){},drawGeometry:function(a,
+b,c){var d=a.CLASS_NAME,e=!0;if("OpenLayers.Geometry.Collection"==d||"OpenLayers.Geometry.MultiPoint"==d||"OpenLayers.Geometry.MultiLineString"==d||"OpenLayers.Geometry.MultiPolygon"==d){for(var d=0,f=a.components.length;d<f;d++)e=this.drawGeometry(a.components[d],b,c)&&e;return e}d=e=!1;"none"!=b.display&&(b.backgroundGraphic?this.redrawBackgroundNode(a.id,a,b,c):d=!0,e=this.redrawNode(a.id,a,b,c));!1==e&&(b=document.getElementById(a.id))&&(b._style.backgroundGraphic&&(d=!0),b.parentNode.removeChild(b));
+d&&(b=document.getElementById(a.id+this.BACKGROUND_ID_SUFFIX))&&b.parentNode.removeChild(b);return e},redrawNode:function(a,b,c,d){c=this.applyDefaultSymbolizer(c);a=this.nodeFactory(a,this.getNodeType(b,c));a._featureId=d;a._boundsBottom=b.getBounds().bottom;a._geometryClass=b.CLASS_NAME;a._style=c;b=this.drawGeometryNode(a,b,c);if(!1===b)return!1;a=b.node;this.indexer?(c=this.indexer.insert(a))?this.vectorRoot.insertBefore(a,c):this.vectorRoot.appendChild(a):a.parentNode!==this.vectorRoot&&this.vectorRoot.appendChild(a);
+this.postDraw(a);return b.complete},redrawBackgroundNode:function(a,b,c,d){c=OpenLayers.Util.extend({},c);c.externalGraphic=c.backgroundGraphic;c.graphicXOffset=c.backgroundXOffset;c.graphicYOffset=c.backgroundYOffset;c.graphicZIndex=c.backgroundGraphicZIndex;c.graphicWidth=c.backgroundWidth||c.graphicWidth;c.graphicHeight=c.backgroundHeight||c.graphicHeight;c.backgroundGraphic=null;c.backgroundXOffset=null;c.backgroundYOffset=null;c.backgroundGraphicZIndex=null;return this.redrawNode(a+this.BACKGROUND_ID_SUFFIX,
+b,c,null)},drawGeometryNode:function(a,b,c){c=c||a._style;var d={isFilled:void 0===c.fill?!0:c.fill,isStroked:void 0===c.stroke?!!c.strokeWidth:c.stroke},e;switch(b.CLASS_NAME){case "OpenLayers.Geometry.Point":!1===c.graphic&&(d.isFilled=!1,d.isStroked=!1);e=this.drawPoint(a,b);break;case "OpenLayers.Geometry.LineString":d.isFilled=!1;e=this.drawLineString(a,b);break;case "OpenLayers.Geometry.LinearRing":e=this.drawLinearRing(a,b);break;case "OpenLayers.Geometry.Polygon":e=this.drawPolygon(a,b);break;
+case "OpenLayers.Geometry.Rectangle":e=this.drawRectangle(a,b)}a._options=d;return!1!=e?{node:this.setStyle(a,c,d,b),complete:e}:!1},postDraw:function(a){},drawPoint:function(a,b){},drawLineString:function(a,b){},drawLinearRing:function(a,b){},drawPolygon:function(a,b){},drawRectangle:function(a,b){},drawCircle:function(a,b){},removeText:function(a){var b=document.getElementById(a+this.LABEL_ID_SUFFIX);b&&this.textRoot.removeChild(b);(a=document.getElementById(a+this.LABEL_OUTLINE_SUFFIX))&&this.textRoot.removeChild(a)},
+getFeatureIdFromEvent:function(a){var b=a.target,c=b&&b.correspondingUseElement;return(c?c:b||a.srcElement)._featureId},eraseGeometry:function(a,b){if("OpenLayers.Geometry.MultiPoint"==a.CLASS_NAME||"OpenLayers.Geometry.MultiLineString"==a.CLASS_NAME||"OpenLayers.Geometry.MultiPolygon"==a.CLASS_NAME||"OpenLayers.Geometry.Collection"==a.CLASS_NAME)for(var c=0,d=a.components.length;c<d;c++)this.eraseGeometry(a.components[c],b);else(c=OpenLayers.Util.getElement(a.id))&&c.parentNode&&(c.geometry&&(c.geometry.destroy(),
+c.geometry=null),c.parentNode.removeChild(c),this.indexer&&this.indexer.remove(c),c._style.backgroundGraphic&&(c=OpenLayers.Util.getElement(a.id+this.BACKGROUND_ID_SUFFIX))&&c.parentNode&&c.parentNode.removeChild(c))},nodeFactory:function(a,b){var c=OpenLayers.Util.getElement(a);c?this.nodeTypeCompare(c,b)||(c.parentNode.removeChild(c),c=this.nodeFactory(a,b)):c=this.createNode(b,a);return c},nodeTypeCompare:function(a,b){},createNode:function(a,b){},moveRoot:function(a){var b=this.root;a.root.parentNode==
+this.rendererRoot&&(b=a.root);b.parentNode.removeChild(b);a.rendererRoot.appendChild(b)},getRenderLayerId:function(){return this.root.parentNode.parentNode.id},isComplexSymbol:function(a){return"circle"!=a&&!!a},CLASS_NAME:"OpenLayers.Renderer.Elements"});OpenLayers.Control.ArgParser=OpenLayers.Class(OpenLayers.Control,{center:null,zoom:null,layers:null,displayProjection:null,getParameters:function(a){a=a||window.location.href;var b=OpenLayers.Util.getParameters(a),c=a.indexOf("#");0<c&&(a="?"+a.substring(c+1,a.length),OpenLayers.Util.extend(b,OpenLayers.Util.getParameters(a)));return b},setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var b=0,c=this.map.controls.length;b<c;b++){var d=this.map.controls[b];if(d!=this&&
+"OpenLayers.Control.ArgParser"==d.CLASS_NAME){d.displayProjection!=this.displayProjection&&(this.displayProjection=d.displayProjection);break}}b==this.map.controls.length&&(b=this.getParameters(),b.layers&&(this.layers=b.layers,this.map.events.register("addlayer",this,this.configureLayers),this.configureLayers()),b.lat&&b.lon&&(this.center=new OpenLayers.LonLat(parseFloat(b.lon),parseFloat(b.lat)),b.zoom&&(this.zoom=parseFloat(b.zoom)),this.map.events.register("changebaselayer",this,this.setCenter),
+this.setCenter()))},setCenter:function(){this.map.baseLayer&&(this.map.events.unregister("changebaselayer",this,this.setCenter),this.displayProjection&&this.center.transform(this.displayProjection,this.map.getProjectionObject()),this.map.setCenter(this.center,this.zoom))},configureLayers:function(){if(this.layers.length==this.map.layers.length){this.map.events.unregister("addlayer",this,this.configureLayers);for(var a=0,b=this.layers.length;a<b;a++){var c=this.map.layers[a],d=this.layers.charAt(a);
+"B"==d?this.map.setBaseLayer(c):"T"!=d&&"F"!=d||c.setVisibility("T"==d)}}},CLASS_NAME:"OpenLayers.Control.ArgParser"});OpenLayers.Control.Permalink=OpenLayers.Class(OpenLayers.Control,{argParserClass:OpenLayers.Control.ArgParser,element:null,anchor:!1,base:"",displayProjection:null,initialize:function(a,b,c){null===a||"object"!=typeof a||OpenLayers.Util.isElement(a)?(OpenLayers.Control.prototype.initialize.apply(this,[c]),this.element=OpenLayers.Util.getElement(a),this.base=b||document.location.href):(this.base=document.location.href,OpenLayers.Control.prototype.initialize.apply(this,[a]),null!=this.element&&(this.element=
+OpenLayers.Util.getElement(this.element)))},destroy:function(){this.element&&this.element.parentNode==this.div&&(this.div.removeChild(this.element),this.element=null);this.map&&this.map.events.unregister("moveend",this,this.updateLink);OpenLayers.Control.prototype.destroy.apply(this,arguments)},setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);for(var b=0,c=this.map.controls.length;b<c;b++){var d=this.map.controls[b];if(d.CLASS_NAME==this.argParserClass.CLASS_NAME){d.displayProjection!=
+this.displayProjection&&(this.displayProjection=d.displayProjection);break}}b==this.map.controls.length&&this.map.addControl(new this.argParserClass({displayProjection:this.displayProjection}))},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.element||this.anchor||(this.element=document.createElement("a"),this.element.innerHTML=OpenLayers.i18n("Permalink"),this.element.href="",this.div.appendChild(this.element));this.map.events.on({moveend:this.updateLink,changelayer:this.updateLink,
+changebaselayer:this.updateLink,scope:this});this.updateLink();return this.div},updateLink:function(){var a=this.anchor?"#":"?",b=this.base,c=null;-1!=b.indexOf("#")&&!1==this.anchor&&(c=b.substring(b.indexOf("#"),b.length));-1!=b.indexOf(a)&&(b=b.substring(0,b.indexOf(a)));b=b.split("#")[0]+a+OpenLayers.Util.getParameterString(this.createParams());c&&(b+=c);this.anchor&&!this.element?window.location.href=b:this.element.href=b},createParams:function(a,b,c){a=a||this.map.getCenter();var d=OpenLayers.Util.getParameters(this.base);
+if(a)for(d.zoom=b||this.map.getZoom(),b=a.lat,a=a.lon,this.displayProjection&&(b=OpenLayers.Projection.transform({x:a,y:b},this.map.getProjectionObject(),this.displayProjection),a=b.x,b=b.y),d.lat=Math.round(1E5*b)/1E5,d.lon=Math.round(1E5*a)/1E5,c=c||this.map.layers,d.layers="",a=0,b=c.length;a<b;a++){var e=c[a];d.layers=e.isBaseLayer?d.layers+(e==this.map.baseLayer?"B":"0"):d.layers+(e.getVisibility()?"T":"F")}return d},CLASS_NAME:"OpenLayers.Control.Permalink"});OpenLayers.Layer.TMS=OpenLayers.Class(OpenLayers.Layer.Grid,{serviceVersion:"1.0.0",layername:null,type:null,isBaseLayer:!0,tileOrigin:null,serverResolutions:null,zoomOffset:0,initialize:function(a,b,c){var d=[];d.push(a,b,{},c);OpenLayers.Layer.Grid.prototype.initialize.apply(this,d)},clone:function(a){null==a&&(a=new OpenLayers.Layer.TMS(this.name,this.url,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){a=this.adjustBounds(a);var b=this.getServerResolution(),
+c=Math.round((a.left-this.tileOrigin.lon)/(b*this.tileSize.w));a=Math.round((a.bottom-this.tileOrigin.lat)/(b*this.tileSize.h));b=this.getServerZoom();c=this.serviceVersion+"/"+this.layername+"/"+b+"/"+c+"/"+a+"."+this.type;a=this.url;OpenLayers.Util.isArray(a)&&(a=this.selectUrl(c,a));return a+c},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);this.tileOrigin||(this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,this.map.maxExtent.bottom))},CLASS_NAME:"OpenLayers.Layer.TMS"});OpenLayers.Format.WCSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",CLASS_NAME:"OpenLayers.Format.WCSCapabilities"});OpenLayers.Format.WCSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:/^\s*|\s*$/g,splitSpace:/\s+/},defaultPrefix:"wcs",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},CLASS_NAME:"OpenLayers.Format.WCSCapabilities.v1"});OpenLayers.Format.WCSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.WCSCapabilities.v1,{namespaces:{wcs:"http://www.opengis.net/wcs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",ows:"http://www.opengis.net/ows"},errorProperty:"service",readers:{wcs:{WCS_Capabilities:function(a,b){this.readChildNodes(a,b)},Service:function(a,b){b.service={};this.readChildNodes(a,b.service)},name:function(a,b){b.name=this.getChildValue(a)},label:function(a,b){b.label=
+this.getChildValue(a)},keywords:function(a,b){b.keywords=[];this.readChildNodes(a,b.keywords)},keyword:function(a,b){b.push(this.getChildValue(a))},responsibleParty:function(a,b){b.responsibleParty={};this.readChildNodes(a,b.responsibleParty)},individualName:function(a,b){b.individualName=this.getChildValue(a)},organisationName:function(a,b){b.organisationName=this.getChildValue(a)},positionName:function(a,b){b.positionName=this.getChildValue(a)},contactInfo:function(a,b){b.contactInfo={};this.readChildNodes(a,
+b.contactInfo)},phone:function(a,b){b.phone={};this.readChildNodes(a,b.phone)},voice:function(a,b){b.voice=this.getChildValue(a)},facsimile:function(a,b){b.facsimile=this.getChildValue(a)},address:function(a,b){b.address={};this.readChildNodes(a,b.address)},deliveryPoint:function(a,b){b.deliveryPoint=this.getChildValue(a)},city:function(a,b){b.city=this.getChildValue(a)},postalCode:function(a,b){b.postalCode=this.getChildValue(a)},country:function(a,b){b.country=this.getChildValue(a)},electronicMailAddress:function(a,
+b){b.electronicMailAddress=this.getChildValue(a)},fees:function(a,b){b.fees=this.getChildValue(a)},accessConstraints:function(a,b){b.accessConstraints=this.getChildValue(a)},ContentMetadata:function(a,b){b.contentMetadata=[];this.readChildNodes(a,b.contentMetadata)},CoverageOfferingBrief:function(a,b){var c={};this.readChildNodes(a,c);b.push(c)},name:function(a,b){b.name=this.getChildValue(a)},label:function(a,b){b.label=this.getChildValue(a)},lonLatEnvelope:function(a,b){var c=this.getElementsByTagNameNS(a,
+"http://www.opengis.net/gml","pos");if(2==c.length){var d={},e={};OpenLayers.Format.GML.v3.prototype.readers.gml.pos.apply(this,[c[0],d]);OpenLayers.Format.GML.v3.prototype.readers.gml.pos.apply(this,[c[1],e]);b.lonLatEnvelope={};b.lonLatEnvelope.srsName=a.getAttribute("srsName");b.lonLatEnvelope.min=d.points[0];b.lonLatEnvelope.max=e.points[0]}}}},CLASS_NAME:"OpenLayers.Format.WCSCapabilities.v1_0_0"});OpenLayers.Strategy.Fixed=OpenLayers.Class(OpenLayers.Strategy,{preload:!1,activate:function(){var a=OpenLayers.Strategy.prototype.activate.apply(this,arguments);if(a)if(this.layer.events.on({refresh:this.load,scope:this}),!0==this.layer.visibility||this.preload)this.load();else this.layer.events.on({visibilitychanged:this.load,scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&this.layer.events.un({refresh:this.load,visibilitychanged:this.load,
+scope:this});return a},load:function(a){var b=this.layer;b.events.triggerEvent("loadstart",{filter:b.filter});b.protocol.read(OpenLayers.Util.applyDefaults({callback:this.merge,filter:b.filter,scope:this},a));b.events.un({visibilitychanged:this.load,scope:this})},merge:function(a){var b=this.layer;b.destroyFeatures();var c=a.features;if(c&&0<c.length){var d=b.projection,e=b.map.getProjectionObject();if(!e.equals(d))for(var f,g=0,h=c.length;g<h;++g)(f=c[g].geometry)&&f.transform(d,e);b.addFeatures(c)}b.events.triggerEvent("loadend",
+{response:a})},CLASS_NAME:"OpenLayers.Strategy.Fixed"});OpenLayers.Control.Zoom=OpenLayers.Class(OpenLayers.Control,{zoomInText:"+",zoomInId:"olZoomInLink",zoomOutText:"\u2212",zoomOutId:"olZoomOutLink",draw:function(){var a=OpenLayers.Control.prototype.draw.apply(this),b=this.getOrCreateLinks(a),c=b.zoomIn,b=b.zoomOut,d=this.map.events;b.parentNode!==a&&(d=this.events,d.attachToElement(b.parentNode));d.register("buttonclick",this,this.onZoomClick);this.zoomInLink=c;this.zoomOutLink=b;return a},getOrCreateLinks:function(a){var b=document.getElementById(this.zoomInId),
+c=document.getElementById(this.zoomOutId);b||(b=document.createElement("a"),b.href="#zoomIn",b.appendChild(document.createTextNode(this.zoomInText)),b.className="olControlZoomIn",a.appendChild(b));OpenLayers.Element.addClass(b,"olButton");c||(c=document.createElement("a"),c.href="#zoomOut",c.appendChild(document.createTextNode(this.zoomOutText)),c.className="olControlZoomOut",a.appendChild(c));OpenLayers.Element.addClass(c,"olButton");return{zoomIn:b,zoomOut:c}},onZoomClick:function(a){a=a.buttonElement;
+a===this.zoomInLink?this.map.zoomIn():a===this.zoomOutLink&&this.map.zoomOut()},destroy:function(){this.map&&this.map.events.unregister("buttonclick",this,this.onZoomClick);delete this.zoomInLink;delete this.zoomOutLink;OpenLayers.Control.prototype.destroy.apply(this)},CLASS_NAME:"OpenLayers.Control.Zoom"});OpenLayers.Layer.PointTrack=OpenLayers.Class(OpenLayers.Layer.Vector,{dataFrom:null,styleFrom:null,addNodes:function(a,b){if(2>a.length)throw Error("At least two point features have to be added to create a line from");for(var c=Array(a.length-1),d,e,f,g=0,h=a.length;g<h;g++){d=a[g];f=d.geometry;if(!f)f=d.lonlat,f=new OpenLayers.Geometry.Point(f.lon,f.lat);else if("OpenLayers.Geometry.Point"!=f.CLASS_NAME)throw new TypeError("Only features with point geometries are supported.");if(0<g){d=null!=this.dataFrom?
+a[g+this.dataFrom].data||a[g+this.dataFrom].attributes:null;var k=null!=this.styleFrom?a[g+this.styleFrom].style:null;e=new OpenLayers.Geometry.LineString([e,f]);c[g-1]=new OpenLayers.Feature.Vector(e,d,k)}e=f}this.addFeatures(c,b)},CLASS_NAME:"OpenLayers.Layer.PointTrack"});OpenLayers.Layer.PointTrack.SOURCE_NODE=-1;OpenLayers.Layer.PointTrack.TARGET_NODE=0;OpenLayers.Layer.PointTrack.dataFrom={SOURCE_NODE:-1,TARGET_NODE:0};OpenLayers.Protocol.WFS=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Protocol.WFS.DEFAULTS);var b=OpenLayers.Protocol.WFS["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported WFS version: "+a.version;return new b(a)};
+OpenLayers.Protocol.WFS.fromWMSLayer=function(a,b){var c,d;c=a.params.LAYERS;c=(OpenLayers.Util.isArray(c)?c[0]:c).split(":");1<c.length&&(d=c[0]);c=c.pop();d={url:a.url,featureType:c,featurePrefix:d,srsName:a.projection&&a.projection.getCode()||a.map&&a.map.getProjectionObject().getCode(),version:"1.1.0"};return new OpenLayers.Protocol.WFS(OpenLayers.Util.applyDefaults(b,d))};OpenLayers.Protocol.WFS.DEFAULTS={version:"1.0.0"};OpenLayers.Layer.Markers=OpenLayers.Class(OpenLayers.Layer,{isBaseLayer:!1,markers:null,drawn:!1,initialize:function(a,b){OpenLayers.Layer.prototype.initialize.apply(this,arguments);this.markers=[]},destroy:function(){this.clearMarkers();this.markers=null;OpenLayers.Layer.prototype.destroy.apply(this,arguments)},setOpacity:function(a){if(a!=this.opacity){this.opacity=a;a=0;for(var b=this.markers.length;a<b;a++)this.markers[a].setOpacity(this.opacity)}},moveTo:function(a,b,c){OpenLayers.Layer.prototype.moveTo.apply(this,
+arguments);if(b||!this.drawn){for(var d=0,e=this.markers.length;d<e;d++)this.drawMarker(this.markers[d]);this.drawn=!0}},addMarker:function(a){this.markers.push(a);1>this.opacity&&a.setOpacity(this.opacity);this.map&&this.map.getExtent()&&(a.map=this.map,this.drawMarker(a))},removeMarker:function(a){this.markers&&this.markers.length&&(OpenLayers.Util.removeItem(this.markers,a),a.erase())},clearMarkers:function(){if(null!=this.markers)for(;0<this.markers.length;)this.removeMarker(this.markers[0])},
+drawMarker:function(a){var b=this.map.getLayerPxFromLonLat(a.lonlat);null==b?a.display(!1):a.isDrawn()?a.icon&&a.icon.moveTo(b):(a=a.draw(b),this.div.appendChild(a))},getDataExtent:function(){var a=null;if(this.markers&&0<this.markers.length)for(var a=new OpenLayers.Bounds,b=0,c=this.markers.length;b<c;b++)a.extend(this.markers[b].lonlat);return a},CLASS_NAME:"OpenLayers.Layer.Markers"});OpenLayers.Control.Pan=OpenLayers.Class(OpenLayers.Control.Button,{slideFactor:50,slideRatio:null,direction:null,initialize:function(a,b){this.direction=a;this.CLASS_NAME+=this.direction;OpenLayers.Control.prototype.initialize.apply(this,[b])},trigger:function(){if(this.map){var a=OpenLayers.Function.bind(function(a){return this.slideRatio?this.map.getSize()[a]*this.slideRatio:this.slideFactor},this);switch(this.direction){case OpenLayers.Control.Pan.NORTH:this.map.pan(0,-a("h"));break;case OpenLayers.Control.Pan.SOUTH:this.map.pan(0,
+a("h"));break;case OpenLayers.Control.Pan.WEST:this.map.pan(-a("w"),0);break;case OpenLayers.Control.Pan.EAST:this.map.pan(a("w"),0)}}},CLASS_NAME:"OpenLayers.Control.Pan"});OpenLayers.Control.Pan.NORTH="North";OpenLayers.Control.Pan.SOUTH="South";OpenLayers.Control.Pan.EAST="East";OpenLayers.Control.Pan.WEST="West";OpenLayers.Format.CSWGetDomain=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Format.CSWGetDomain.DEFAULTS);var b=OpenLayers.Format.CSWGetDomain["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported CSWGetDomain version: "+a.version;return new b(a)};OpenLayers.Format.CSWGetDomain.DEFAULTS={version:"2.0.2"};OpenLayers.Format.CSWGetDomain.v2_0_2=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",csw:"http://www.opengis.net/cat/csw/2.0.2"},defaultPrefix:"csw",version:"2.0.2",schemaLocation:"http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd",PropertyName:null,ParameterName:null,read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==
+a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{csw:{GetDomainResponse:function(a,b){this.readChildNodes(a,b)},DomainValues:function(a,b){OpenLayers.Util.isArray(b.DomainValues)||(b.DomainValues=[]);for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]=c[e].nodeValue;this.readChildNodes(a,d);b.DomainValues.push(d)},PropertyName:function(a,b){b.PropertyName=this.getChildValue(a)},ParameterName:function(a,b){b.ParameterName=this.getChildValue(a)},ListOfValues:function(a,
+b){OpenLayers.Util.isArray(b.ListOfValues)||(b.ListOfValues=[]);this.readChildNodes(a,b.ListOfValues)},Value:function(a,b){for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]=c[e].nodeValue;d.value=this.getChildValue(a);b.push({Value:d})},ConceptualScheme:function(a,b){b.ConceptualScheme={};this.readChildNodes(a,b.ConceptualScheme)},Name:function(a,b){b.Name=this.getChildValue(a)},Document:function(a,b){b.Document=this.getChildValue(a)},Authority:function(a,b){b.Authority=this.getChildValue(a)},
+RangeOfValues:function(a,b){b.RangeOfValues={};this.readChildNodes(a,b.RangeOfValues)},MinValue:function(a,b){for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]=c[e].nodeValue;d.value=this.getChildValue(a);b.MinValue=d},MaxValue:function(a,b){for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]=c[e].nodeValue;d.value=this.getChildValue(a);b.MaxValue=d}}},write:function(a){a=this.writeNode("csw:GetDomain",a);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{csw:{GetDomain:function(a){var b=
+this.createElementNSPlus("csw:GetDomain",{attributes:{service:"CSW",version:this.version}});a.PropertyName||this.PropertyName?this.writeNode("csw:PropertyName",a.PropertyName||this.PropertyName,b):(a.ParameterName||this.ParameterName)&&this.writeNode("csw:ParameterName",a.ParameterName||this.ParameterName,b);this.readChildNodes(b,a);return b},PropertyName:function(a){return this.createElementNSPlus("csw:PropertyName",{value:a})},ParameterName:function(a){return this.createElementNSPlus("csw:ParameterName",
+{value:a})}}},CLASS_NAME:"OpenLayers.Format.CSWGetDomain.v2_0_2"});OpenLayers.Format.ArcXML.Features=OpenLayers.Class(OpenLayers.Format.XML,{read:function(a){return(new OpenLayers.Format.ArcXML).read(a).features.feature}});OpenLayers.Control.Snapping=OpenLayers.Class(OpenLayers.Control,{DEFAULTS:{tolerance:10,node:!0,edge:!0,vertex:!0},greedy:!0,precedence:["node","vertex","edge"],resolution:null,geoToleranceCache:null,layer:null,feature:null,point:null,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,[a]);this.options=a||{};this.options.layer&&this.setLayer(this.options.layer);a=OpenLayers.Util.extend({},this.options.defaults);this.defaults=OpenLayers.Util.applyDefaults(a,this.DEFAULTS);this.setTargets(this.options.targets);
+0===this.targets.length&&this.layer&&this.addTargetLayer(this.layer);this.geoToleranceCache={}},setLayer:function(a){this.active?(this.deactivate(),this.layer=a,this.activate()):this.layer=a},setTargets:function(a){this.targets=[];if(a&&a.length)for(var b,c=0,d=a.length;c<d;++c)b=a[c],b instanceof OpenLayers.Layer.Vector?this.addTargetLayer(b):this.addTarget(b)},addTargetLayer:function(a){this.addTarget({layer:a})},addTarget:function(a){a=OpenLayers.Util.applyDefaults(a,this.defaults);a.nodeTolerance=
+a.nodeTolerance||a.tolerance;a.vertexTolerance=a.vertexTolerance||a.tolerance;a.edgeTolerance=a.edgeTolerance||a.tolerance;this.targets.push(a)},removeTargetLayer:function(a){for(var b,c=this.targets.length-1;0<=c;--c)b=this.targets[c],b.layer===a&&this.removeTarget(b)},removeTarget:function(a){return OpenLayers.Util.removeItem(this.targets,a)},activate:function(){var a=OpenLayers.Control.prototype.activate.call(this);if(a&&this.layer&&this.layer.events)this.layer.events.on({sketchstarted:this.onSketchModified,
+sketchmodified:this.onSketchModified,vertexmodified:this.onVertexModified,scope:this});return a},deactivate:function(){var a=OpenLayers.Control.prototype.deactivate.call(this);a&&this.layer&&this.layer.events&&this.layer.events.un({sketchstarted:this.onSketchModified,sketchmodified:this.onSketchModified,vertexmodified:this.onVertexModified,scope:this});this.point=this.feature=null;return a},onSketchModified:function(a){this.feature=a.feature;this.considerSnapping(a.vertex,a.vertex)},onVertexModified:function(a){this.feature=
+a.feature;var b=this.layer.map.getLonLatFromViewPortPx(a.pixel);this.considerSnapping(a.vertex,new OpenLayers.Geometry.Point(b.lon,b.lat))},considerSnapping:function(a,b){for(var c={rank:Number.POSITIVE_INFINITY,dist:Number.POSITIVE_INFINITY,x:null,y:null},d=!1,e,f,g=0,h=this.targets.length;g<h;++g)if(f=this.targets[g],e=this.testTarget(f,b))if(this.greedy){c=e;c.target=f;d=!0;break}else if(e.rank<c.rank||e.rank===c.rank&&e.dist<c.dist)c=e,c.target=f,d=!0;d&&(!1!==this.events.triggerEvent("beforesnap",
+{point:a,x:c.x,y:c.y,distance:c.dist,layer:c.target.layer,snapType:this.precedence[c.rank]})?(a.x=c.x,a.y=c.y,this.point=a,this.events.triggerEvent("snap",{point:a,snapType:this.precedence[c.rank],layer:c.target.layer,distance:c.dist})):d=!1);this.point&&!d&&(a.x=b.x,a.y=b.y,this.point=null,this.events.triggerEvent("unsnap",{point:a}))},testTarget:function(a,b){var c=this.layer.map.getResolution();if("minResolution"in a&&c<a.minResolution||"maxResolution"in a&&c>=a.maxResolution)return null;for(var c=
+{node:this.getGeoTolerance(a.nodeTolerance,c),vertex:this.getGeoTolerance(a.vertexTolerance,c),edge:this.getGeoTolerance(a.edgeTolerance,c)},d=Math.max(c.node,c.vertex,c.edge),e={rank:Number.POSITIVE_INFINITY,dist:Number.POSITIVE_INFINITY},f=!1,g=a.layer.features,h,k,l,m,n,p,q=this.precedence.length,r=new OpenLayers.LonLat(b.x,b.y),s=0,t=g.length;s<t;++s)if(h=g[s],h!==this.feature&&(!h._sketch&&h.state!==OpenLayers.State.DELETE&&(!a.filter||a.filter.evaluate(h)))&&h.atPoint(r,d,d))for(var u=0,v=Math.min(e.rank+
+1,q);u<v;++u)if(k=this.precedence[u],a[k])if("edge"===k){if(l=h.geometry.distanceTo(b,{details:!0}),n=l.distance,n<=c[k]&&n<e.dist){e={rank:u,dist:n,x:l.x0,y:l.y0};f=!0;break}}else{l=h.geometry.getVertices("node"===k);p=!1;for(var w=0,x=l.length;w<x;++w)m=l[w],n=m.distanceTo(b),n<=c[k]&&(u<e.rank||u===e.rank&&n<e.dist)&&(e={rank:u,dist:n,x:m.x,y:m.y},p=f=!0);if(p)break}return f?e:null},getGeoTolerance:function(a,b){b!==this.resolution&&(this.resolution=b,this.geoToleranceCache={});var c=this.geoToleranceCache[a];
+void 0===c&&(c=a*b,this.geoToleranceCache[a]=c);return c},destroy:function(){this.active&&this.deactivate();delete this.layer;delete this.targets;OpenLayers.Control.prototype.destroy.call(this)},CLASS_NAME:"OpenLayers.Control.Snapping"});OpenLayers.Format.OWSCommon.v1_1_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1,{namespaces:{ows:"http://www.opengis.net/ows/1.1",xlink:"http://www.w3.org/1999/xlink"},readers:{ows:OpenLayers.Util.applyDefaults({ExceptionReport:function(a,b){b.exceptionReport={version:a.getAttribute("version"),language:a.getAttribute("xml:lang"),exceptions:[]};this.readChildNodes(a,b.exceptionReport)},AllowedValues:function(a,b){b.allowedValues={};this.readChildNodes(a,b.allowedValues)},AnyValue:function(a,b){b.anyValue=
+!0},DataType:function(a,b){b.dataType=this.getChildValue(a)},Range:function(a,b){b.range={};this.readChildNodes(a,b.range)},MinimumValue:function(a,b){b.minValue=this.getChildValue(a)},MaximumValue:function(a,b){b.maxValue=this.getChildValue(a)},Identifier:function(a,b){b.identifier=this.getChildValue(a)},SupportedCRS:function(a,b){b.supportedCRS=this.getChildValue(a)}},OpenLayers.Format.OWSCommon.v1.prototype.readers.ows)},writers:{ows:OpenLayers.Util.applyDefaults({Range:function(a){var b=this.createElementNSPlus("ows:Range",
+{attributes:{"ows:rangeClosure":a.closure}});this.writeNode("ows:MinimumValue",a.minValue,b);this.writeNode("ows:MaximumValue",a.maxValue,b);return b},MinimumValue:function(a){return this.createElementNSPlus("ows:MinimumValue",{value:a})},MaximumValue:function(a){return this.createElementNSPlus("ows:MaximumValue",{value:a})},Value:function(a){return this.createElementNSPlus("ows:Value",{value:a})}},OpenLayers.Format.OWSCommon.v1.prototype.writers.ows)},CLASS_NAME:"OpenLayers.Format.OWSCommon.v1_1_0"});OpenLayers.Format.WCSGetCoverage=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows/1.1",wcs:"http://www.opengis.net/wcs/1.1",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},VERSION:"1.1.2",schemaLocation:"http://www.opengis.net/wcs/1.1 http://schemas.opengis.net/wcs/1.1/wcsGetCoverage.xsd",write:function(a){a=this.writeNode("wcs:GetCoverage",
+a);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},writers:{wcs:{GetCoverage:function(a){var b=this.createElementNSPlus("wcs:GetCoverage",{attributes:{version:a.version||this.VERSION,service:"WCS"}});this.writeNode("ows:Identifier",a.identifier,b);this.writeNode("wcs:DomainSubset",a.domainSubset,b);this.writeNode("wcs:Output",a.output,b);return b},DomainSubset:function(a){var b=this.createElementNSPlus("wcs:DomainSubset",
+{});this.writeNode("ows:BoundingBox",a.boundingBox,b);a.temporalSubset&&this.writeNode("wcs:TemporalSubset",a.temporalSubset,b);return b},TemporalSubset:function(a){for(var b=this.createElementNSPlus("wcs:TemporalSubset",{}),c=0,d=a.timePeriods.length;c<d;++c)this.writeNode("wcs:TimePeriod",a.timePeriods[c],b);return b},TimePeriod:function(a){var b=this.createElementNSPlus("wcs:TimePeriod",{});this.writeNode("wcs:BeginPosition",a.begin,b);this.writeNode("wcs:EndPosition",a.end,b);a.resolution&&this.writeNode("wcs:TimeResolution",
+a.resolution,b);return b},BeginPosition:function(a){return this.createElementNSPlus("wcs:BeginPosition",{value:a})},EndPosition:function(a){return this.createElementNSPlus("wcs:EndPosition",{value:a})},TimeResolution:function(a){return this.createElementNSPlus("wcs:TimeResolution",{value:a})},Output:function(a){var b=this.createElementNSPlus("wcs:Output",{attributes:{format:a.format,store:a.store}});a.gridCRS&&this.writeNode("wcs:GridCRS",a.gridCRS,b);return b},GridCRS:function(a){var b=this.createElementNSPlus("wcs:GridCRS",
+{});this.writeNode("wcs:GridBaseCRS",a.baseCRS,b);a.type&&this.writeNode("wcs:GridType",a.type,b);a.origin&&this.writeNode("wcs:GridOrigin",a.origin,b);this.writeNode("wcs:GridOffsets",a.offsets,b);a.CS&&this.writeNode("wcs:GridCS",a.CS,b);return b},GridBaseCRS:function(a){return this.createElementNSPlus("wcs:GridBaseCRS",{value:a})},GridOrigin:function(a){return this.createElementNSPlus("wcs:GridOrigin",{value:a})},GridType:function(a){return this.createElementNSPlus("wcs:GridType",{value:a})},GridOffsets:function(a){return this.createElementNSPlus("wcs:GridOffsets",
+{value:a})},GridCS:function(a){return this.createElementNSPlus("wcs:GridCS",{value:a})}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows},CLASS_NAME:"OpenLayers.Format.WCSGetCoverage"});OpenLayers.Format.KML=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{kml:"http://www.opengis.net/kml/2.2",gx:"http://www.google.com/kml/ext/2.2"},kmlns:"http://earth.google.com/kml/2.0",placemarksDesc:"No description available",foldersName:"OpenLayers export",foldersDesc:"Exported on "+new Date,extractAttributes:!0,kvpAttributes:!1,extractStyles:!1,extractTracks:!1,trackAttributes:null,internalns:null,features:null,styles:null,styleBaseUrl:"",fetched:null,maxDepth:0,initialize:function(a){this.regExes=
+{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g,kmlColor:/(\w{2})(\w{2})(\w{2})(\w{2})/,kmlIconPalette:/root:\/\/icons\/palette-(\d+)(\.\w+)/,straightBracket:/\$\[(.*?)\]/g};this.externalProjection=new OpenLayers.Projection("EPSG:4326");OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){this.features=[];this.styles={};this.fetched={};return this.parseData(a,{depth:0,styleBaseUrl:this.styleBaseUrl})},parseData:function(a,b){"string"==typeof a&&
+(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));for(var c=["Link","NetworkLink","Style","StyleMap","Placemark"],d=0,e=c.length;d<e;++d){var f=c[d],g=this.getElementsByTagNameNS(a,"*",f);if(0!=g.length)switch(f.toLowerCase()){case "link":case "networklink":this.parseLinks(g,b);break;case "style":this.extractStyles&&this.parseStyles(g,b);break;case "stylemap":this.extractStyles&&this.parseStyleMaps(g,b);break;case "placemark":this.parseFeatures(g,b)}}return this.features},parseLinks:function(a,
+b){if(b.depth>=this.maxDepth)return!1;var c=OpenLayers.Util.extend({},b);c.depth++;for(var d=0,e=a.length;d<e;d++){var f=this.parseProperty(a[d],"*","href");f&&!this.fetched[f]&&(this.fetched[f]=!0,(f=this.fetchLink(f))&&this.parseData(f,c))}},fetchLink:function(a){if(a=OpenLayers.Request.GET({url:a,async:!1}))return a.responseText},parseStyles:function(a,b){for(var c=0,d=a.length;c<d;c++){var e=this.parseStyle(a[c]);e&&(this.styles[(b.styleBaseUrl||"")+"#"+e.id]=e)}},parseKmlColor:function(a){var b=
+null;a&&(a=a.match(this.regExes.kmlColor))&&(b={color:"#"+a[4]+a[3]+a[2],opacity:parseInt(a[1],16)/255});return b},parseStyle:function(a){for(var b={},c=["LineStyle","PolyStyle","IconStyle","BalloonStyle","LabelStyle"],d,e,f=0,g=c.length;f<g;++f)if(d=c[f],e=this.getElementsByTagNameNS(a,"*",d)[0])switch(d.toLowerCase()){case "linestyle":d=this.parseProperty(e,"*","color");if(d=this.parseKmlColor(d))b.strokeColor=d.color,b.strokeOpacity=d.opacity;(d=this.parseProperty(e,"*","width"))&&(b.strokeWidth=
+d);break;case "polystyle":d=this.parseProperty(e,"*","color");if(d=this.parseKmlColor(d))b.fillOpacity=d.opacity,b.fillColor=d.color;"0"==this.parseProperty(e,"*","fill")&&(b.fillColor="none");"0"==this.parseProperty(e,"*","outline")&&(b.strokeWidth="0");break;case "iconstyle":var h=parseFloat(this.parseProperty(e,"*","scale")||1);d=32*h;var k=32*h,l=this.getElementsByTagNameNS(e,"*","Icon")[0];if(l){var m=this.parseProperty(l,"*","href");if(m){var n=this.parseProperty(l,"*","w"),p=this.parseProperty(l,
+"*","h");!OpenLayers.String.startsWith(m,"http://maps.google.com/mapfiles/kml")||(n||p)||(p=n=64,h/=2);n=n||p;p=p||n;n&&(d=parseInt(n)*h);p&&(k=parseInt(p)*h);if(p=m.match(this.regExes.kmlIconPalette))n=p[1],p=p[2],m=this.parseProperty(l,"*","x"),l=this.parseProperty(l,"*","y"),m="http://maps.google.com/mapfiles/kml/pal"+n+"/icon"+(8*(l?7-l/32:7)+(m?m/32:0))+p;b.graphicOpacity=1;b.externalGraphic=m}}if(e=this.getElementsByTagNameNS(e,"*","hotSpot")[0])m=parseFloat(e.getAttribute("x")),l=parseFloat(e.getAttribute("y")),
+n=e.getAttribute("xunits"),"pixels"==n?b.graphicXOffset=-m*h:"insetPixels"==n?b.graphicXOffset=-d+m*h:"fraction"==n&&(b.graphicXOffset=-d*m),e=e.getAttribute("yunits"),"pixels"==e?b.graphicYOffset=-k+l*h+1:"insetPixels"==e?b.graphicYOffset=-(l*h)+1:"fraction"==e&&(b.graphicYOffset=-k*(1-l)+1);b.graphicWidth=d;b.graphicHeight=k;break;case "balloonstyle":(e=OpenLayers.Util.getXmlNodeValue(e))&&(b.balloonStyle=e.replace(this.regExes.straightBracket,"${$1}"));break;case "labelstyle":if(d=this.parseProperty(e,
+"*","color"),d=this.parseKmlColor(d))b.fontColor=d.color,b.fontOpacity=d.opacity}!b.strokeColor&&b.fillColor&&(b.strokeColor=b.fillColor);(a=a.getAttribute("id"))&&b&&(b.id=a);return b},parseStyleMaps:function(a,b){for(var c=0,d=a.length;c<d;c++)for(var e=a[c],f=this.getElementsByTagNameNS(e,"*","Pair"),e=e.getAttribute("id"),g=0,h=f.length;g<h;g++){var k=f[g],l=this.parseProperty(k,"*","key");(k=this.parseProperty(k,"*","styleUrl"))&&"normal"==l&&(this.styles[(b.styleBaseUrl||"")+"#"+e]=this.styles[(b.styleBaseUrl||
+"")+k])}},parseFeatures:function(a,b){for(var c=[],d=0,e=a.length;d<e;d++){var f=a[d],g=this.parseFeature.apply(this,[f]);if(g){this.extractStyles&&(g.attributes&&g.attributes.styleUrl)&&(g.style=this.getStyle(g.attributes.styleUrl,b));if(this.extractStyles){var h=this.getElementsByTagNameNS(f,"*","Style")[0];h&&(h=this.parseStyle(h))&&(g.style=OpenLayers.Util.extend(g.style,h))}this.extractTracks?(f=this.getElementsByTagNameNS(f,this.namespaces.gx,"Track"))&&0<f.length&&(g={features:[],feature:g},
+this.readNode(f[0],g),0<g.features.length&&c.push.apply(c,g.features)):c.push(g)}else throw"Bad Placemark: "+d;}this.features=this.features.concat(c)},readers:{kml:{when:function(a,b){b.whens.push(OpenLayers.Date.parse(this.getChildValue(a)))},_trackPointAttribute:function(a,b){var c=a.nodeName.split(":").pop();b.attributes[c].push(this.getChildValue(a))}},gx:{Track:function(a,b){var c={whens:[],points:[],angles:[]};if(this.trackAttributes){var d;c.attributes={};for(var e=0,f=this.trackAttributes.length;e<
+f;++e)d=this.trackAttributes[e],c.attributes[d]=[],d in this.readers.kml||(this.readers.kml[d]=this.readers.kml._trackPointAttribute)}this.readChildNodes(a,c);if(c.whens.length!==c.points.length)throw Error("gx:Track with unequal number of when ("+c.whens.length+") and gx:coord ("+c.points.length+") elements.");var g=0<c.angles.length;if(g&&c.whens.length!==c.angles.length)throw Error("gx:Track with unequal number of when ("+c.whens.length+") and gx:angles ("+c.angles.length+") elements.");for(var h,
+e=0,f=c.whens.length;e<f;++e){h=b.feature.clone();h.fid=b.feature.fid||b.feature.id;d=c.points[e];h.geometry=d;"z"in d&&(h.attributes.altitude=d.z);this.internalProjection&&this.externalProjection&&h.geometry.transform(this.externalProjection,this.internalProjection);if(this.trackAttributes)for(var k=0,l=this.trackAttributes.length;k<l;++k)d=this.trackAttributes[k],h.attributes[d]=c.attributes[d][e];h.attributes.when=c.whens[e];h.attributes.trackId=b.feature.id;g&&(d=c.angles[e],h.attributes.heading=
+parseFloat(d[0]),h.attributes.tilt=parseFloat(d[1]),h.attributes.roll=parseFloat(d[2]));b.features.push(h)}},coord:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(/\s+/),d=new OpenLayers.Geometry.Point(c[0],c[1]);2<c.length&&(d.z=parseFloat(c[2]));b.points.push(d)},angles:function(a,b){var c=this.getChildValue(a).replace(this.regExes.trimSpace,"").split(/\s+/);b.angles.push(c)}}},parseFeature:function(a){for(var b=["MultiGeometry","Polygon","LineString","Point"],
+c,d,e,f=0,g=b.length;f<g;++f)if(c=b[f],this.internalns=a.namespaceURI?a.namespaceURI:this.kmlns,d=this.getElementsByTagNameNS(a,this.internalns,c),0<d.length){if(b=this.parseGeometry[c.toLowerCase()])e=b.apply(this,[d[0]]),this.internalProjection&&this.externalProjection&&e.transform(this.externalProjection,this.internalProjection);else throw new TypeError("Unsupported geometry type: "+c);break}var h;this.extractAttributes&&(h=this.parseAttributes(a));c=new OpenLayers.Feature.Vector(e,h);a=a.getAttribute("id")||
+a.getAttribute("name");null!=a&&(c.fid=a);return c},getStyle:function(a,b){var c=OpenLayers.Util.removeTail(a),d=OpenLayers.Util.extend({},b);d.depth++;d.styleBaseUrl=c;!this.styles[a]&&!OpenLayers.String.startsWith(a,"#")&&d.depth<=this.maxDepth&&!this.fetched[c]&&(c=this.fetchLink(c))&&this.parseData(c,d);return OpenLayers.Util.extend({},this.styles[a])},parseGeometry:{point:function(a){var b=this.getElementsByTagNameNS(a,this.internalns,"coordinates");a=[];if(0<b.length){var c=b[0].firstChild.nodeValue,
+c=c.replace(this.regExes.removeSpace,"");a=c.split(",")}b=null;if(1<a.length)2==a.length&&(a[2]=null),b=new OpenLayers.Geometry.Point(a[0],a[1],a[2]);else throw"Bad coordinate string: "+c;return b},linestring:function(a,b){var c=this.getElementsByTagNameNS(a,this.internalns,"coordinates"),d=null;if(0<c.length){for(var c=this.getChildValue(c[0]),c=c.replace(this.regExes.trimSpace,""),c=c.replace(this.regExes.trimComma,","),d=c.split(this.regExes.splitSpace),e=d.length,f=Array(e),g,h,k=0;k<e;++k)if(g=
+d[k].split(","),h=g.length,1<h)2==g.length&&(g[2]=null),f[k]=new OpenLayers.Geometry.Point(g[0],g[1],g[2]);else throw"Bad LineString point coordinates: "+d[k];if(e)d=b?new OpenLayers.Geometry.LinearRing(f):new OpenLayers.Geometry.LineString(f);else throw"Bad LineString coordinates: "+c;}return d},polygon:function(a){a=this.getElementsByTagNameNS(a,this.internalns,"LinearRing");var b=a.length,c=Array(b);if(0<b)for(var d=0,e=a.length;d<e;++d)if(b=this.parseGeometry.linestring.apply(this,[a[d],!0]))c[d]=
+b;else throw"Bad LinearRing geometry: "+d;return new OpenLayers.Geometry.Polygon(c)},multigeometry:function(a){for(var b,c=[],d=a.childNodes,e=0,f=d.length;e<f;++e)a=d[e],1==a.nodeType&&(b=a.prefix?a.nodeName.split(":")[1]:a.nodeName,(b=this.parseGeometry[b.toLowerCase()])&&c.push(b.apply(this,[a])));return new OpenLayers.Geometry.Collection(c)}},parseAttributes:function(a){var b={},c=a.getElementsByTagName("ExtendedData");c.length&&(b=this.parseExtendedData(c[0]));var d,e,f;a=a.childNodes;for(var c=
+0,g=a.length;c<g;++c)if(d=a[c],1==d.nodeType&&(e=d.childNodes,1<=e.length&&3>=e.length)){switch(e.length){case 1:f=e[0];break;case 2:f=e[0];e=e[1];f=3==f.nodeType||4==f.nodeType?f:e;break;default:f=e[1]}if(3==f.nodeType||4==f.nodeType)if(d=d.prefix?d.nodeName.split(":")[1]:d.nodeName,f=OpenLayers.Util.getXmlNodeValue(f))f=f.replace(this.regExes.trimSpace,""),b[d]=f}return b},parseExtendedData:function(a){var b={},c,d,e,f,g=a.getElementsByTagName("Data");c=0;for(d=g.length;c<d;c++){e=g[c];f=e.getAttribute("name");
+var h={},k=e.getElementsByTagName("value");k.length&&(h.value=this.getChildValue(k[0]));this.kvpAttributes?b[f]=h.value:(e=e.getElementsByTagName("displayName"),e.length&&(h.displayName=this.getChildValue(e[0])),b[f]=h)}a=a.getElementsByTagName("SimpleData");c=0;for(d=a.length;c<d;c++)h={},e=a[c],f=e.getAttribute("name"),h.value=this.getChildValue(e),this.kvpAttributes?b[f]=h.value:(h.displayName=f,b[f]=h);return b},parseProperty:function(a,b,c){var d;a=this.getElementsByTagNameNS(a,b,c);try{d=OpenLayers.Util.getXmlNodeValue(a[0])}catch(e){d=
+null}return d},write:function(a){OpenLayers.Util.isArray(a)||(a=[a]);for(var b=this.createElementNS(this.kmlns,"kml"),c=this.createFolderXML(),d=0,e=a.length;d<e;++d)c.appendChild(this.createPlacemarkXML(a[d]));b.appendChild(c);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFolderXML:function(){var a=this.createElementNS(this.kmlns,"Folder");if(this.foldersName){var b=this.createElementNS(this.kmlns,"name"),c=this.createTextNode(this.foldersName);b.appendChild(c);a.appendChild(b)}this.foldersDesc&&
+(b=this.createElementNS(this.kmlns,"description"),c=this.createTextNode(this.foldersDesc),b.appendChild(c),a.appendChild(b));return a},createPlacemarkXML:function(a){var b=this.createElementNS(this.kmlns,"name"),c=a.style&&a.style.label?a.style.label:a.id;b.appendChild(this.createTextNode(a.attributes.name||c));var d=this.createElementNS(this.kmlns,"description");d.appendChild(this.createTextNode(a.attributes.description||this.placemarksDesc));c=this.createElementNS(this.kmlns,"Placemark");null!=
+a.fid&&c.setAttribute("id",a.fid);c.appendChild(b);c.appendChild(d);b=this.buildGeometryNode(a.geometry);c.appendChild(b);a.attributes&&(a=this.buildExtendedData(a.attributes))&&c.appendChild(a);return c},buildGeometryNode:function(a){var b=a.CLASS_NAME,b=b.substring(b.lastIndexOf(".")+1),b=this.buildGeometry[b.toLowerCase()],c=null;b&&(c=b.apply(this,[a]));return c},buildGeometry:{point:function(a){var b=this.createElementNS(this.kmlns,"Point");b.appendChild(this.buildCoordinatesNode(a));return b},
+multipoint:function(a){return this.buildGeometry.collection.apply(this,[a])},linestring:function(a){var b=this.createElementNS(this.kmlns,"LineString");b.appendChild(this.buildCoordinatesNode(a));return b},multilinestring:function(a){return this.buildGeometry.collection.apply(this,[a])},linearring:function(a){var b=this.createElementNS(this.kmlns,"LinearRing");b.appendChild(this.buildCoordinatesNode(a));return b},polygon:function(a){var b=this.createElementNS(this.kmlns,"Polygon");a=a.components;
+for(var c,d,e=0,f=a.length;e<f;++e)c=0==e?"outerBoundaryIs":"innerBoundaryIs",c=this.createElementNS(this.kmlns,c),d=this.buildGeometry.linearring.apply(this,[a[e]]),c.appendChild(d),b.appendChild(c);return b},multipolygon:function(a){return this.buildGeometry.collection.apply(this,[a])},collection:function(a){for(var b=this.createElementNS(this.kmlns,"MultiGeometry"),c,d=0,e=a.components.length;d<e;++d)(c=this.buildGeometryNode.apply(this,[a.components[d]]))&&b.appendChild(c);return b}},buildCoordinatesNode:function(a){var b=
+this.createElementNS(this.kmlns,"coordinates"),c;if(c=a.components){for(var d=c.length,e=Array(d),f=0;f<d;++f)a=c[f],e[f]=this.buildCoordinates(a);c=e.join(" ")}else c=this.buildCoordinates(a);c=this.createTextNode(c);b.appendChild(c);return b},buildCoordinates:function(a){this.internalProjection&&this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));return a.x+","+a.y},buildExtendedData:function(a){var b=this.createElementNS(this.kmlns,"ExtendedData"),
+c;for(c in a)if(a[c]&&"name"!=c&&"description"!=c&&"styleUrl"!=c){var d=this.createElementNS(this.kmlns,"Data");d.setAttribute("name",c);var e=this.createElementNS(this.kmlns,"value");if("object"==typeof a[c]){if(a[c].value&&e.appendChild(this.createTextNode(a[c].value)),a[c].displayName){var f=this.createElementNS(this.kmlns,"displayName");f.appendChild(this.getXMLDoc().createCDATASection(a[c].displayName));d.appendChild(f)}}else e.appendChild(this.createTextNode(a[c]));d.appendChild(e);b.appendChild(d)}return this.isSimpleContent(b)?
+null:b},CLASS_NAME:"OpenLayers.Format.KML"});OpenLayers.Format.WMSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.1",profile:null,CLASS_NAME:"OpenLayers.Format.WMSCapabilities"});OpenLayers.Format.WMSCapabilities.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{wms:"http://www.opengis.net/wms",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"wms",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=a;a&&9==a.nodeType&&(a=a.documentElement);var c={};this.readNode(a,c);void 0===c.service&&(a=new OpenLayers.Format.OGCExceptionReport,c.error=a.read(b));return c},readers:{wms:{Service:function(a,
+b){b.service={};this.readChildNodes(a,b.service)},Name:function(a,b){b.name=this.getChildValue(a)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b["abstract"]=this.getChildValue(a)},BoundingBox:function(a,b){var c={};c.bbox=[parseFloat(a.getAttribute("minx")),parseFloat(a.getAttribute("miny")),parseFloat(a.getAttribute("maxx")),parseFloat(a.getAttribute("maxy"))];var d={x:parseFloat(a.getAttribute("resx")),y:parseFloat(a.getAttribute("resy"))};isNaN(d.x)&&isNaN(d.y)||(c.res=
+d);return c},OnlineResource:function(a,b){b.href=this.getAttributeNS(a,this.namespaces.xlink,"href")},ContactInformation:function(a,b){b.contactInformation={};this.readChildNodes(a,b.contactInformation)},ContactPersonPrimary:function(a,b){b.personPrimary={};this.readChildNodes(a,b.personPrimary)},ContactPerson:function(a,b){b.person=this.getChildValue(a)},ContactOrganization:function(a,b){b.organization=this.getChildValue(a)},ContactPosition:function(a,b){b.position=this.getChildValue(a)},ContactAddress:function(a,
+b){b.contactAddress={};this.readChildNodes(a,b.contactAddress)},AddressType:function(a,b){b.type=this.getChildValue(a)},Address:function(a,b){b.address=this.getChildValue(a)},City:function(a,b){b.city=this.getChildValue(a)},StateOrProvince:function(a,b){b.stateOrProvince=this.getChildValue(a)},PostCode:function(a,b){b.postcode=this.getChildValue(a)},Country:function(a,b){b.country=this.getChildValue(a)},ContactVoiceTelephone:function(a,b){b.phone=this.getChildValue(a)},ContactFacsimileTelephone:function(a,
+b){b.fax=this.getChildValue(a)},ContactElectronicMailAddress:function(a,b){b.email=this.getChildValue(a)},Fees:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.fees=c)},AccessConstraints:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.accessConstraints=c)},Capability:function(a,b){b.capability={nestedLayers:[],layers:[]};this.readChildNodes(a,b.capability)},Request:function(a,b){b.request={};this.readChildNodes(a,b.request)},GetCapabilities:function(a,
+b){b.getcapabilities={formats:[]};this.readChildNodes(a,b.getcapabilities)},Format:function(a,b){OpenLayers.Util.isArray(b.formats)?b.formats.push(this.getChildValue(a)):b.format=this.getChildValue(a)},DCPType:function(a,b){this.readChildNodes(a,b)},HTTP:function(a,b){this.readChildNodes(a,b)},Get:function(a,b){b.get={};this.readChildNodes(a,b.get);b.href||(b.href=b.get.href)},Post:function(a,b){b.post={};this.readChildNodes(a,b.post);b.href||(b.href=b.get.href)},GetMap:function(a,b){b.getmap={formats:[]};
+this.readChildNodes(a,b.getmap)},GetFeatureInfo:function(a,b){b.getfeatureinfo={formats:[]};this.readChildNodes(a,b.getfeatureinfo)},Exception:function(a,b){b.exception={formats:[]};this.readChildNodes(a,b.exception)},Layer:function(a,b){var c,d;b.capability?(d=b.capability,c=b):d=b;var e=a.getAttributeNode("queryable"),f=e&&e.specified?a.getAttribute("queryable"):null,g=(e=a.getAttributeNode("cascaded"))&&e.specified?a.getAttribute("cascaded"):null,e=(e=a.getAttributeNode("opaque"))&&e.specified?
+a.getAttribute("opaque"):null,h=a.getAttribute("noSubsets"),k=a.getAttribute("fixedWidth"),l=a.getAttribute("fixedHeight"),m=c||{},n=OpenLayers.Util.extend;c={nestedLayers:[],styles:c?[].concat(c.styles):[],srs:c?n({},m.srs):{},metadataURLs:[],bbox:c?n({},m.bbox):{},llbbox:m.llbbox,dimensions:c?n({},m.dimensions):{},authorityURLs:c?n({},m.authorityURLs):{},identifiers:{},keywords:[],queryable:f&&""!==f?"1"===f||"true"===f:m.queryable||!1,cascaded:null!==g?parseInt(g):m.cascaded||0,opaque:e?"1"===
+e||"true"===e:m.opaque||!1,noSubsets:null!==h?"1"===h||"true"===h:m.noSubsets||!1,fixedWidth:null!=k?parseInt(k):m.fixedWidth||0,fixedHeight:null!=l?parseInt(l):m.fixedHeight||0,minScale:m.minScale,maxScale:m.maxScale,attribution:m.attribution};b.nestedLayers.push(c);c.capability=d;this.readChildNodes(a,c);delete c.capability;c.name&&(f=c.name.split(":"),g=d.request,e=g.getfeatureinfo,0<f.length&&(c.prefix=f[0]),d.layers.push(c),void 0===c.formats&&(c.formats=g.getmap.formats),void 0===c.infoFormats&&
+e&&(c.infoFormats=e.formats))},Attribution:function(a,b){b.attribution={};this.readChildNodes(a,b.attribution)},LogoURL:function(a,b){b.logo={width:a.getAttribute("width"),height:a.getAttribute("height")};this.readChildNodes(a,b.logo)},Style:function(a,b){var c={};b.styles.push(c);this.readChildNodes(a,c)},LegendURL:function(a,b){var c={width:a.getAttribute("width"),height:a.getAttribute("height")};b.legend=c;this.readChildNodes(a,c)},MetadataURL:function(a,b){var c={type:a.getAttribute("type")};
+b.metadataURLs.push(c);this.readChildNodes(a,c)},DataURL:function(a,b){b.dataURL={};this.readChildNodes(a,b.dataURL)},FeatureListURL:function(a,b){b.featureListURL={};this.readChildNodes(a,b.featureListURL)},AuthorityURL:function(a,b){var c=a.getAttribute("name"),d={};this.readChildNodes(a,d);b.authorityURLs[c]=d.href},Identifier:function(a,b){var c=a.getAttribute("authority");b.identifiers[c]=this.getChildValue(a)},KeywordList:function(a,b){this.readChildNodes(a,b)},SRS:function(a,b){b.srs[this.getChildValue(a)]=
+!0}}},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1"});OpenLayers.Format.WMSCapabilities.v1_1=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1,{readers:{wms:OpenLayers.Util.applyDefaults({WMT_MS_Capabilities:function(a,b){this.readChildNodes(a,b)},Keyword:function(a,b){b.keywords&&b.keywords.push(this.getChildValue(a))},DescribeLayer:function(a,b){b.describelayer={formats:[]};this.readChildNodes(a,b.describelayer)},GetLegendGraphic:function(a,b){b.getlegendgraphic={formats:[]};this.readChildNodes(a,b.getlegendgraphic)},GetStyles:function(a,b){b.getstyles=
+{formats:[]};this.readChildNodes(a,b.getstyles)},PutStyles:function(a,b){b.putstyles={formats:[]};this.readChildNodes(a,b.putstyles)},UserDefinedSymbolization:function(a,b){var c={supportSLD:1==parseInt(a.getAttribute("SupportSLD")),userLayer:1==parseInt(a.getAttribute("UserLayer")),userStyle:1==parseInt(a.getAttribute("UserStyle")),remoteWFS:1==parseInt(a.getAttribute("RemoteWFS"))};b.userSymbols=c},LatLonBoundingBox:function(a,b){b.llbbox=[parseFloat(a.getAttribute("minx")),parseFloat(a.getAttribute("miny")),
+parseFloat(a.getAttribute("maxx")),parseFloat(a.getAttribute("maxy"))]},BoundingBox:function(a,b){var c=OpenLayers.Format.WMSCapabilities.v1.prototype.readers.wms.BoundingBox.apply(this,[a,b]);c.srs=a.getAttribute("SRS");b.bbox[c.srs]=c},ScaleHint:function(a,b){var c=a.getAttribute("min"),d=a.getAttribute("max"),e=Math.pow(2,0.5),f=OpenLayers.INCHES_PER_UNIT.m;0!=c&&(b.maxScale=parseFloat((c/e*f*OpenLayers.DOTS_PER_INCH).toPrecision(13)));d!=Number.POSITIVE_INFINITY&&(b.minScale=parseFloat((d/e*f*
+OpenLayers.DOTS_PER_INCH).toPrecision(13)))},Dimension:function(a,b){var c={name:a.getAttribute("name").toLowerCase(),units:a.getAttribute("units"),unitsymbol:a.getAttribute("unitSymbol")};b.dimensions[c.name]=c},Extent:function(a,b){var c=a.getAttribute("name").toLowerCase();if(c in b.dimensions){c=b.dimensions[c];c.nearestVal="1"===a.getAttribute("nearestValue");c.multipleVal="1"===a.getAttribute("multipleValues");c.current="1"===a.getAttribute("current");c["default"]=a.getAttribute("default")||
+"";var d=this.getChildValue(a);c.values=d.split(",")}}},OpenLayers.Format.WMSCapabilities.v1.prototype.readers.wms)},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1"});OpenLayers.Format.WMSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1,{version:"1.1.0",readers:{wms:OpenLayers.Util.applyDefaults({SRS:function(a,b){for(var c=this.getChildValue(a).split(/ +/),d=0,e=c.length;d<e;d++)b.srs[c[d]]=!0}},OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers.wms)},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_0"});OpenLayers.Protocol.WFS.v1=OpenLayers.Class(OpenLayers.Protocol,{version:null,srsName:"EPSG:4326",featureType:null,featureNS:null,geometryName:"the_geom",schema:null,featurePrefix:"feature",formatOptions:null,readFormat:null,readOptions:null,initialize:function(a){OpenLayers.Protocol.prototype.initialize.apply(this,[a]);a.format||(this.format=OpenLayers.Format.WFST(OpenLayers.Util.extend({version:this.version,featureType:this.featureType,featureNS:this.featureNS,featurePrefix:this.featurePrefix,geometryName:this.geometryName,
+srsName:this.srsName,schema:this.schema},this.formatOptions)));!a.geometryName&&1<parseFloat(this.format.version)&&this.setGeometryName(null)},destroy:function(){this.options&&!this.options.format&&this.format.destroy();this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=OpenLayers.Util.extend({},a);OpenLayers.Util.applyDefaults(a,this.options||{});var b=new OpenLayers.Protocol.Response({requestType:"read"}),
+c=OpenLayers.Format.XML.prototype.write.apply(this.format,[this.format.writeNode("wfs:GetFeature",a)]);b.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,b,a),params:a.params,headers:a.headers,data:c});return b},setFeatureType:function(a){this.featureType=a;this.format.featureType=a},setGeometryName:function(a){this.geometryName=a;this.format.geometryName=a},handleRead:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);if(b.callback){var c=
+a.priv;200<=c.status&&300>c.status?(c=this.parseResponse(c,b.readOptions))&&!1!==c.success?(b.readOptions&&"object"==b.readOptions.output?OpenLayers.Util.extend(a,c):a.features=c,a.code=OpenLayers.Protocol.Response.SUCCESS):(a.code=OpenLayers.Protocol.Response.FAILURE,a.error=c):a.code=OpenLayers.Protocol.Response.FAILURE;b.callback.call(b.scope,a)}},parseResponse:function(a,b){var c=a.responseXML;c&&c.documentElement||(c=a.responseText);if(!c||0>=c.length)return null;c=null!==this.readFormat?this.readFormat.read(c):
+this.format.read(c,b);if(!this.featureNS){var d=this.readFormat||this.format;this.featureNS=d.featureNS;d.autoConfig=!1;this.geometryName||this.setGeometryName(d.geometryName)}return c},commit:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);var c=new OpenLayers.Protocol.Response({requestType:"commit",reqFeatures:a});c.priv=OpenLayers.Request.POST({url:b.url,headers:b.headers,data:this.format.write(a,b),callback:this.createCallback(this.handleCommit,c,b)});
+return c},handleCommit:function(a,b){if(b.callback){var c=a.priv,d=c.responseXML;d&&d.documentElement||(d=c.responseText);c=this.format.read(d)||{};a.insertIds=c.insertIds||[];c.success?a.code=OpenLayers.Protocol.Response.SUCCESS:(a.code=OpenLayers.Protocol.Response.FAILURE,a.error=c);b.callback.call(b.scope,a)}},filterDelete:function(a,b){b=OpenLayers.Util.extend({},b);OpenLayers.Util.applyDefaults(b,this.options);new OpenLayers.Protocol.Response({requestType:"commit"});var c=this.format.createElementNSPlus("wfs:Transaction",
+{attributes:{service:"WFS",version:this.version}}),d=this.format.createElementNSPlus("wfs:Delete",{attributes:{typeName:(b.featureNS?this.featurePrefix+":":"")+b.featureType}});b.featureNS&&d.setAttribute("xmlns:"+this.featurePrefix,b.featureNS);var e=this.format.writeNode("ogc:Filter",a);d.appendChild(e);c.appendChild(d);c=OpenLayers.Format.XML.prototype.write.apply(this.format,[c]);return OpenLayers.Request.POST({url:this.url,callback:b.callback||function(){},data:c})},abort:function(a){a&&a.priv.abort()},
+CLASS_NAME:"OpenLayers.Protocol.WFS.v1"});OpenLayers.Handler.Feature=OpenLayers.Class(OpenLayers.Handler,{EVENTMAP:{click:{"in":"click",out:"clickout"},mousemove:{"in":"over",out:"out"},dblclick:{"in":"dblclick",out:null},mousedown:{"in":null,out:null},mouseup:{"in":null,out:null},touchstart:{"in":"click",out:"clickout"}},feature:null,lastFeature:null,down:null,up:null,clickTolerance:4,geometryTypes:null,stopClick:!0,stopDown:!0,stopUp:!1,initialize:function(a,b,c,d){OpenLayers.Handler.prototype.initialize.apply(this,[a,c,d]);this.layer=
+b},touchstart:function(a){this.startTouch();return OpenLayers.Event.isMultiTouch(a)?!0:this.mousedown(a)},touchmove:function(a){OpenLayers.Event.preventDefault(a)},mousedown:function(a){if(OpenLayers.Event.isLeftClick(a)||OpenLayers.Event.isSingleTouch(a))this.down=a.xy;return this.handle(a)?!this.stopDown:!0},mouseup:function(a){this.up=a.xy;return this.handle(a)?!this.stopUp:!0},click:function(a){return this.handle(a)?!this.stopClick:!0},mousemove:function(a){if(!this.callbacks.over&&!this.callbacks.out)return!0;
+this.handle(a);return!0},dblclick:function(a){return!this.handle(a)},geometryTypeMatches:function(a){return null==this.geometryTypes||-1<OpenLayers.Util.indexOf(this.geometryTypes,a.geometry.CLASS_NAME)},handle:function(a){this.feature&&!this.feature.layer&&(this.feature=null);var b=a.type,c=!1,d=!!this.feature,e="click"==b||"dblclick"==b||"touchstart"==b;(this.feature=this.layer.getFeatureFromEvent(a))&&!this.feature.layer&&(this.feature=null);this.lastFeature&&!this.lastFeature.layer&&(this.lastFeature=
+null);this.feature?("touchstart"===b&&OpenLayers.Event.preventDefault(a),a=this.feature!=this.lastFeature,this.geometryTypeMatches(this.feature)?(d&&a?(this.lastFeature&&this.triggerCallback(b,"out",[this.lastFeature]),this.triggerCallback(b,"in",[this.feature])):d&&!e||this.triggerCallback(b,"in",[this.feature]),this.lastFeature=this.feature,c=!0):(this.lastFeature&&(d&&a||e)&&this.triggerCallback(b,"out",[this.lastFeature]),this.feature=null)):this.lastFeature&&(d||e)&&this.triggerCallback(b,"out",
+[this.lastFeature]);return c},triggerCallback:function(a,b,c){if(b=this.EVENTMAP[a][b])"click"==a&&this.up&&this.down?(Math.sqrt(Math.pow(this.up.x-this.down.x,2)+Math.pow(this.up.y-this.down.y,2))<=this.clickTolerance&&this.callback(b,c),this.up=this.down=null):this.callback(b,c)},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.moveLayerToTop(),this.map.events.on({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this}),a=!0);
+return a},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.moveLayerBack(),this.up=this.down=this.lastFeature=this.feature=null,this.map.events.un({removelayer:this.handleMapEvents,changelayer:this.handleMapEvents,scope:this}),a=!0);return a},handleMapEvents:function(a){"removelayer"!=a.type&&"order"!=a.property||this.moveLayerToTop()},moveLayerToTop:function(){var a=Math.max(this.map.Z_INDEX_BASE.Feature-1,this.layer.getZIndex())+1;this.layer.setZIndex(a)},
+moveLayerBack:function(){var a=this.layer.getZIndex()-1;a>=this.map.Z_INDEX_BASE.Feature?this.layer.setZIndex(a):this.map.setLayerZIndex(this.layer,this.map.getLayerIndex(this.layer))},CLASS_NAME:"OpenLayers.Handler.Feature"});OpenLayers.Layer.Vector.RootContainer=OpenLayers.Class(OpenLayers.Layer.Vector,{displayInLayerSwitcher:!1,layers:null,display:function(){},getFeatureFromEvent:function(a){for(var b=this.layers,c,d=0;d<b.length;d++)if(c=b[d].getFeatureFromEvent(a))return c},setMap:function(a){OpenLayers.Layer.Vector.prototype.setMap.apply(this,arguments);this.collectRoots();a.events.register("changelayer",this,this.handleChangeLayer)},removeMap:function(a){a.events.unregister("changelayer",this,this.handleChangeLayer);
+this.resetRoots();OpenLayers.Layer.Vector.prototype.removeMap.apply(this,arguments)},collectRoots:function(){for(var a,b=0;b<this.map.layers.length;++b)a=this.map.layers[b],-1!=OpenLayers.Util.indexOf(this.layers,a)&&a.renderer.moveRoot(this.renderer)},resetRoots:function(){for(var a,b=0;b<this.layers.length;++b)a=this.layers[b],this.renderer&&a.renderer.getRenderLayerId()==this.id&&this.renderer.moveRoot(a.renderer)},handleChangeLayer:function(a){var b=a.layer;"order"==a.property&&-1!=OpenLayers.Util.indexOf(this.layers,
+b)&&(this.resetRoots(),this.collectRoots())},CLASS_NAME:"OpenLayers.Layer.Vector.RootContainer"});OpenLayers.Control.SelectFeature=OpenLayers.Class(OpenLayers.Control,{multipleKey:null,toggleKey:null,multiple:!1,clickout:!0,toggle:!1,hover:!1,highlightOnly:!1,box:!1,onBeforeSelect:function(){},onSelect:function(){},onUnselect:function(){},scope:null,geometryTypes:null,layer:null,layers:null,callbacks:null,selectStyle:null,renderIntent:"select",handlers:null,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);null===this.scope&&(this.scope=this);this.initLayer(a);var c=
+{click:this.clickFeature,clickout:this.clickoutFeature};this.hover&&(c.over=this.overFeature,c.out=this.outFeature);this.callbacks=OpenLayers.Util.extend(c,this.callbacks);this.handlers={feature:new OpenLayers.Handler.Feature(this,this.layer,this.callbacks,{geometryTypes:this.geometryTypes})};this.box&&(this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},{boxDivClassName:"olHandlerBoxSelectFeature"}))},initLayer:function(a){OpenLayers.Util.isArray(a)?(this.layers=a,this.layer=
+new OpenLayers.Layer.Vector.RootContainer(this.id+"_container",{layers:a})):this.layer=a},destroy:function(){this.active&&this.layers&&this.map.removeLayer(this.layer);OpenLayers.Control.prototype.destroy.apply(this,arguments);this.layers&&this.layer.destroy()},activate:function(){this.active||(this.layers&&this.map.addLayer(this.layer),this.handlers.feature.activate(),this.box&&this.handlers.box&&this.handlers.box.activate());return OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.active&&
+(this.handlers.feature.deactivate(),this.handlers.box&&this.handlers.box.deactivate(),this.layers&&this.map.removeLayer(this.layer));return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},unselectAll:function(a){var b=this.layers||[this.layer],c,d,e,f;for(e=0;e<b.length;++e)if(c=b[e],f=0,null!=c.selectedFeatures)for(;c.selectedFeatures.length>f;)d=c.selectedFeatures[f],a&&a.except==d?++f:this.unselect(d)},clickFeature:function(a){this.hover||(-1<OpenLayers.Util.indexOf(a.layer.selectedFeatures,
+a)?this.toggleSelect()?this.unselect(a):this.multipleSelect()||this.unselectAll({except:a}):(this.multipleSelect()||this.unselectAll({except:a}),this.select(a)))},multipleSelect:function(){return this.multiple||this.handlers.feature.evt&&this.handlers.feature.evt[this.multipleKey]},toggleSelect:function(){return this.toggle||this.handlers.feature.evt&&this.handlers.feature.evt[this.toggleKey]},clickoutFeature:function(a){!this.hover&&this.clickout&&this.unselectAll()},overFeature:function(a){var b=
+a.layer;this.hover&&(this.highlightOnly?this.highlight(a):-1==OpenLayers.Util.indexOf(b.selectedFeatures,a)&&this.select(a))},outFeature:function(a){if(this.hover)if(this.highlightOnly){if(a._lastHighlighter==this.id)if(a._prevHighlighter&&a._prevHighlighter!=this.id){delete a._lastHighlighter;var b=this.map.getControl(a._prevHighlighter);b&&b.highlight(a)}else this.unhighlight(a)}else this.unselect(a)},highlight:function(a){var b=a.layer;!1!==this.events.triggerEvent("beforefeaturehighlighted",{feature:a})&&
+(a._prevHighlighter=a._lastHighlighter,a._lastHighlighter=this.id,b.drawFeature(a,this.selectStyle||this.renderIntent),this.events.triggerEvent("featurehighlighted",{feature:a}))},unhighlight:function(a){var b=a.layer;void 0==a._prevHighlighter?delete a._lastHighlighter:(a._prevHighlighter!=this.id&&(a._lastHighlighter=a._prevHighlighter),delete a._prevHighlighter);b.drawFeature(a,a.style||a.layer.style||"default");this.events.triggerEvent("featureunhighlighted",{feature:a})},select:function(a){var b=
+this.onBeforeSelect.call(this.scope,a),c=a.layer;!1!==b&&(b=c.events.triggerEvent("beforefeatureselected",{feature:a}),!1!==b&&(c.selectedFeatures.push(a),this.highlight(a),this.handlers.feature.lastFeature||(this.handlers.feature.lastFeature=c.selectedFeatures[0]),c.events.triggerEvent("featureselected",{feature:a}),this.onSelect.call(this.scope,a)))},unselect:function(a){var b=a.layer;this.unhighlight(a);OpenLayers.Util.removeItem(b.selectedFeatures,a);b.events.triggerEvent("featureunselected",
+{feature:a});this.onUnselect.call(this.scope,a)},selectBox:function(a){if(a instanceof OpenLayers.Bounds){var b=this.map.getLonLatFromPixel({x:a.left,y:a.bottom});a=this.map.getLonLatFromPixel({x:a.right,y:a.top});b=new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat);this.multipleSelect()||this.unselectAll();a=this.multiple;this.multiple=!0;var c=this.layers||[this.layer];this.events.triggerEvent("boxselectionstart",{layers:c});for(var d,e=0;e<c.length;++e){d=c[e];for(var f=0,g=d.features.length;f<g;++f){var h=
+d.features[f];h.getVisibility()&&(null==this.geometryTypes||-1<OpenLayers.Util.indexOf(this.geometryTypes,h.geometry.CLASS_NAME))&&b.toGeometry().intersects(h.geometry)&&-1==OpenLayers.Util.indexOf(d.selectedFeatures,h)&&this.select(h)}}this.multiple=a;this.events.triggerEvent("boxselectionend",{layers:c})}},setMap:function(a){this.handlers.feature.setMap(a);this.box&&this.handlers.box.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},setLayer:function(a){var b=this.active;this.unselectAll();
+this.deactivate();this.layers&&(this.layer.destroy(),this.layers=null);this.initLayer(a);this.handlers.feature.layer=this.layer;b&&this.activate()},CLASS_NAME:"OpenLayers.Control.SelectFeature"});OpenLayers.Handler.Point=OpenLayers.Class(OpenLayers.Handler,{point:null,layer:null,multi:!1,citeCompliant:!1,mouseDown:!1,stoppedDown:null,lastDown:null,lastUp:null,persist:!1,stopDown:!1,stopUp:!1,layerOptions:null,pixelTolerance:5,lastTouchPx:null,initialize:function(a,b,c){c&&c.layerOptions&&c.layerOptions.styleMap||(this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style["default"],{}));OpenLayers.Handler.prototype.initialize.apply(this,arguments)},activate:function(){if(!OpenLayers.Handler.prototype.activate.apply(this,
+arguments))return!1;var a=OpenLayers.Util.extend({displayInLayerSwitcher:!1,calculateInRange:OpenLayers.Function.True,wrapDateLine:this.citeCompliant},this.layerOptions);this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,a);this.map.addLayer(this.layer);return!0},createFeature:function(a){a=this.layer.getLonLatFromViewPortPx(a);a=new OpenLayers.Geometry.Point(a.lon,a.lat);this.point=new OpenLayers.Feature.Vector(a);this.callback("create",[this.point.geometry,this.point]);this.point.geometry.clearBounds();
+this.layer.addFeatures([this.point],{silent:!0})},deactivate:function(){if(!OpenLayers.Handler.prototype.deactivate.apply(this,arguments))return!1;this.cancel();null!=this.layer.map&&(this.destroyFeature(!0),this.layer.destroy(!1));this.layer=null;return!0},destroyFeature:function(a){!this.layer||!a&&this.persist||this.layer.destroyFeatures();this.point=null},destroyPersistedFeature:function(){var a=this.layer;a&&1<a.features.length&&this.layer.features[0].destroy()},finalize:function(a){this.mouseDown=
+!1;this.lastTouchPx=this.lastUp=this.lastDown=null;this.callback(a?"cancel":"done",[this.geometryClone()]);this.destroyFeature(a)},cancel:function(){this.finalize(!0)},click:function(a){OpenLayers.Event.stop(a);return!1},dblclick:function(a){OpenLayers.Event.stop(a);return!1},modifyFeature:function(a){this.point||this.createFeature(a);a=this.layer.getLonLatFromViewPortPx(a);this.point.geometry.x=a.lon;this.point.geometry.y=a.lat;this.callback("modify",[this.point.geometry,this.point,!1]);this.point.geometry.clearBounds();
+this.drawFeature()},drawFeature:function(){this.layer.drawFeature(this.point,this.style)},getGeometry:function(){var a=this.point&&this.point.geometry;a&&this.multi&&(a=new OpenLayers.Geometry.MultiPoint([a]));return a},geometryClone:function(){var a=this.getGeometry();return a&&a.clone()},mousedown:function(a){return this.down(a)},touchstart:function(a){this.startTouch();this.lastTouchPx=a.xy;return this.down(a)},mousemove:function(a){return this.move(a)},touchmove:function(a){this.lastTouchPx=a.xy;
+return this.move(a)},mouseup:function(a){return this.up(a)},touchend:function(a){a.xy=this.lastTouchPx;return this.up(a)},down:function(a){this.mouseDown=!0;this.lastDown=a.xy;this.touch||this.modifyFeature(a.xy);this.stoppedDown=this.stopDown;return!this.stopDown},move:function(a){this.touch||this.mouseDown&&!this.stoppedDown||this.modifyFeature(a.xy);return!0},up:function(a){this.mouseDown=!1;this.stoppedDown=this.stopDown;if(!this.checkModifiers(a)||this.lastUp&&this.lastUp.equals(a.xy)||!this.lastDown||
+!this.passesTolerance(this.lastDown,a.xy,this.pixelTolerance))return!0;this.touch&&this.modifyFeature(a.xy);this.persist&&this.destroyPersistedFeature();this.lastUp=a.xy;this.finalize();return!this.stopUp},mouseout:function(a){OpenLayers.Util.mouseLeft(a,this.map.viewPortDiv)&&(this.stoppedDown=this.stopDown,this.mouseDown=!1)},passesTolerance:function(a,b,c){var d=!0;null!=c&&a&&b&&a.distanceTo(b)>c&&(d=!1);return d},CLASS_NAME:"OpenLayers.Handler.Point"});OpenLayers.Handler.Path=OpenLayers.Class(OpenLayers.Handler.Point,{line:null,maxVertices:null,doubleTouchTolerance:20,freehand:!1,freehandToggle:"shiftKey",timerId:null,redoStack:null,createFeature:function(a){a=this.layer.getLonLatFromViewPortPx(a);a=new OpenLayers.Geometry.Point(a.lon,a.lat);this.point=new OpenLayers.Feature.Vector(a);this.line=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([this.point.geometry]));this.callback("create",[this.point.geometry,this.getSketch()]);
+this.point.geometry.clearBounds();this.layer.addFeatures([this.line,this.point],{silent:!0})},destroyFeature:function(a){OpenLayers.Handler.Point.prototype.destroyFeature.call(this,a);this.line=null},destroyPersistedFeature:function(){var a=this.layer;a&&2<a.features.length&&this.layer.features[0].destroy()},removePoint:function(){this.point&&this.layer.removeFeatures([this.point])},addPoint:function(a){this.layer.removeFeatures([this.point]);a=this.layer.getLonLatFromViewPortPx(a);this.point=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(a.lon,
+a.lat));this.line.geometry.addComponent(this.point.geometry,this.line.geometry.components.length);this.layer.addFeatures([this.point]);this.callback("point",[this.point.geometry,this.getGeometry()]);this.callback("modify",[this.point.geometry,this.getSketch()]);this.drawFeature();delete this.redoStack},insertXY:function(a,b){this.line.geometry.addComponent(new OpenLayers.Geometry.Point(a,b),this.getCurrentPointIndex());this.drawFeature();delete this.redoStack},insertDeltaXY:function(a,b){var c=this.getCurrentPointIndex()-
+1,c=this.line.geometry.components[c];!c||(isNaN(c.x)||isNaN(c.y))||this.insertXY(c.x+a,c.y+b)},insertDirectionLength:function(a,b){a*=Math.PI/180;var c=b*Math.cos(a),d=b*Math.sin(a);this.insertDeltaXY(c,d)},insertDeflectionLength:function(a,b){var c=this.getCurrentPointIndex()-1;if(0<c){var d=this.line.geometry.components[c],c=this.line.geometry.components[c-1],d=Math.atan2(d.y-c.y,d.x-c.x);this.insertDirectionLength(180*d/Math.PI+a,b)}},getCurrentPointIndex:function(){return this.line.geometry.components.length-
+1},undo:function(){var a=this.line.geometry,b=a.components,c=this.getCurrentPointIndex()-1,d=b[c],e=a.removeComponent(d);e&&(this.touch&&0<c&&(b=a.components,a=b[c-1],c=this.getCurrentPointIndex(),b=b[c],b.x=a.x,b.y=a.y),this.redoStack||(this.redoStack=[]),this.redoStack.push(d),this.drawFeature());return e},redo:function(){var a=this.redoStack&&this.redoStack.pop();a&&(this.line.geometry.addComponent(a,this.getCurrentPointIndex()),this.drawFeature());return!!a},freehandMode:function(a){return this.freehandToggle&&
+a[this.freehandToggle]?!this.freehand:this.freehand},modifyFeature:function(a,b){this.line||this.createFeature(a);var c=this.layer.getLonLatFromViewPortPx(a);this.point.geometry.x=c.lon;this.point.geometry.y=c.lat;this.callback("modify",[this.point.geometry,this.getSketch(),b]);this.point.geometry.clearBounds();this.drawFeature()},drawFeature:function(){this.layer.drawFeature(this.line,this.style);this.layer.drawFeature(this.point,this.style)},getSketch:function(){return this.line},getGeometry:function(){var a=
+this.line&&this.line.geometry;a&&this.multi&&(a=new OpenLayers.Geometry.MultiLineString([a]));return a},touchstart:function(a){if(this.timerId&&this.passesTolerance(this.lastTouchPx,a.xy,this.doubleTouchTolerance))return this.finishGeometry(),window.clearTimeout(this.timerId),this.timerId=null,!1;this.timerId&&(window.clearTimeout(this.timerId),this.timerId=null);this.timerId=window.setTimeout(OpenLayers.Function.bind(function(){this.timerId=null},this),300);return OpenLayers.Handler.Point.prototype.touchstart.call(this,
+a)},down:function(a){var b=this.stopDown;this.freehandMode(a)&&(b=!0,this.touch&&(this.modifyFeature(a.xy,!!this.lastUp),OpenLayers.Event.stop(a)));this.touch||this.lastDown&&this.passesTolerance(this.lastDown,a.xy,this.pixelTolerance)||this.modifyFeature(a.xy,!!this.lastUp);this.mouseDown=!0;this.lastDown=a.xy;this.stoppedDown=b;return!b},move:function(a){if(this.stoppedDown&&this.freehandMode(a))return this.persist&&this.destroyPersistedFeature(),this.maxVertices&&this.line&&this.line.geometry.components.length===
+this.maxVertices?(this.removePoint(),this.finalize()):this.addPoint(a.xy),!1;this.touch||this.mouseDown&&!this.stoppedDown||this.modifyFeature(a.xy,!!this.lastUp);return!0},up:function(a){!this.mouseDown||this.lastUp&&this.lastUp.equals(a.xy)||(this.stoppedDown&&this.freehandMode(a)?(this.persist&&this.destroyPersistedFeature(),this.removePoint(),this.finalize()):this.passesTolerance(this.lastDown,a.xy,this.pixelTolerance)&&(this.touch&&this.modifyFeature(a.xy),null==this.lastUp&&this.persist&&this.destroyPersistedFeature(),
+this.addPoint(a.xy),this.lastUp=a.xy,this.line.geometry.components.length===this.maxVertices+1&&this.finishGeometry()));this.stoppedDown=this.stopDown;this.mouseDown=!1;return!this.stopUp},finishGeometry:function(){this.line.geometry.removeComponent(this.line.geometry.components[this.line.geometry.components.length-1]);this.removePoint();this.finalize()},dblclick:function(a){this.freehandMode(a)||this.finishGeometry();return!1},CLASS_NAME:"OpenLayers.Handler.Path"});OpenLayers.Spherical=OpenLayers.Spherical||{};OpenLayers.Spherical.DEFAULT_RADIUS=6378137;OpenLayers.Spherical.computeDistanceBetween=function(a,b,c){c=c||OpenLayers.Spherical.DEFAULT_RADIUS;var d=Math.sin(Math.PI*(b.lon-a.lon)/360),e=Math.sin(Math.PI*(b.lat-a.lat)/360);a=e*e+d*d*Math.cos(Math.PI*a.lat/180)*Math.cos(Math.PI*b.lat/180);return 2*c*Math.atan2(Math.sqrt(a),Math.sqrt(1-a))};
+OpenLayers.Spherical.computeHeading=function(a,b){var c=Math.sin(Math.PI*(a.lon-b.lon)/180)*Math.cos(Math.PI*b.lat/180),d=Math.cos(Math.PI*a.lat/180)*Math.sin(Math.PI*b.lat/180)-Math.sin(Math.PI*a.lat/180)*Math.cos(Math.PI*b.lat/180)*Math.cos(Math.PI*(a.lon-b.lon)/180);return 180*Math.atan2(c,d)/Math.PI};OpenLayers.Control.CacheWrite=OpenLayers.Class(OpenLayers.Control,{layers:null,imageFormat:"image/png",quotaRegEx:/quota/i,setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);var b,c=this.layers||a.layers;for(b=c.length-1;0<=b;--b)this.addLayer({layer:c[b]});if(!this.layers)a.events.on({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this})},addLayer:function(a){a.layer.events.on({tileloadstart:this.makeSameOrigin,tileloaded:this.onTileLoaded,scope:this})},removeLayer:function(a){a.layer.events.un({tileloadstart:this.makeSameOrigin,
+tileloaded:this.onTileLoaded,scope:this})},makeSameOrigin:function(a){if(this.active&&(a=a.tile,a instanceof OpenLayers.Tile.Image&&!a.crossOriginKeyword&&"data:"!==a.url.substr(0,5))){var b=OpenLayers.Request.makeSameOrigin(a.url,OpenLayers.ProxyHost);OpenLayers.Control.CacheWrite.urlMap[b]=a.url;a.url=b}},onTileLoaded:function(a){this.active&&(!a.aborted&&a.tile instanceof OpenLayers.Tile.Image&&"data:"!==a.tile.url.substr(0,5))&&(this.cache({tile:a.tile}),delete OpenLayers.Control.CacheWrite.urlMap[a.tile.url])},
+cache:function(a){if(window.localStorage){a=a.tile;try{var b=a.getCanvasContext();b&&window.localStorage.setItem("olCache_"+(OpenLayers.Control.CacheWrite.urlMap[a.url]||a.url),b.canvas.toDataURL(this.imageFormat))}catch(c){(b=c.name||c.message)&&this.quotaRegEx.test(b)?this.events.triggerEvent("cachefull",{tile:a}):OpenLayers.Console.error(c.toString())}}},destroy:function(){if(this.layers||this.map){var a,b=this.layers||this.map.layers;for(a=b.length-1;0<=a;--a)this.removeLayer({layer:b[a]})}this.map&&
+this.map.events.un({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.CacheWrite"});OpenLayers.Control.CacheWrite.clearCache=function(){if(window.localStorage){var a,b;for(a=window.localStorage.length-1;0<=a;--a)b=window.localStorage.key(a),"olCache_"===b.substr(0,8)&&window.localStorage.removeItem(b)}};OpenLayers.Control.CacheWrite.urlMap={};OpenLayers.Format.Context=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{layerOptions:null,layerParams:null,read:function(a,b){var c=OpenLayers.Format.XML.VersionedOGC.prototype.read.apply(this,arguments);if(b&&b.map)if(this.context=c,b.map instanceof OpenLayers.Map)c=this.mergeContextToMap(c,b.map);else{var d=b.map;if(OpenLayers.Util.isElement(d)||"string"==typeof d)d={div:d};c=this.contextToMap(c,d)}return c},getLayerFromContext:function(a){var b,c,d={queryable:a.queryable,visibility:a.visibility,
+maxExtent:a.maxExtent,metadata:OpenLayers.Util.applyDefaults(a.metadata,{styles:a.styles,formats:a.formats,"abstract":a["abstract"],dataURL:a.dataURL}),numZoomLevels:a.numZoomLevels,units:a.units,isBaseLayer:a.isBaseLayer,opacity:a.opacity,displayInLayerSwitcher:a.displayInLayerSwitcher,singleTile:a.singleTile,tileSize:a.tileSize?new OpenLayers.Size(a.tileSize.width,a.tileSize.height):void 0,minScale:a.minScale||a.maxScaleDenominator,maxScale:a.maxScale||a.minScaleDenominator,srs:a.srs,dimensions:a.dimensions,
+metadataURL:a.metadataURL};this.layerOptions&&OpenLayers.Util.applyDefaults(d,this.layerOptions);var e={layers:a.name,transparent:a.transparent,version:a.version};if(a.formats&&0<a.formats.length)for(e.format=a.formats[0].value,b=0,c=a.formats.length;b<c;b++){var f=a.formats[b];if(!0==f.current){e.format=f.value;break}}if(a.styles&&0<a.styles.length)for(b=0,c=a.styles.length;b<c;b++)if(f=a.styles[b],!0==f.current){f.href?e.sld=f.href:f.body?e.sld_body=f.body:e.styles=f.name;break}this.layerParams&&
+OpenLayers.Util.applyDefaults(e,this.layerParams);b=null;c=a.service;c==OpenLayers.Format.Context.serviceTypes.WFS?(d.strategies=[new OpenLayers.Strategy.BBOX],d.protocol=new OpenLayers.Protocol.WFS({url:a.url,featurePrefix:a.name.split(":")[0],featureType:a.name.split(":").pop()}),b=new OpenLayers.Layer.Vector(a.title||a.name,d)):c==OpenLayers.Format.Context.serviceTypes.KML?(d.strategies=[new OpenLayers.Strategy.Fixed],d.protocol=new OpenLayers.Protocol.HTTP({url:a.url,format:new OpenLayers.Format.KML}),
+b=new OpenLayers.Layer.Vector(a.title||a.name,d)):c==OpenLayers.Format.Context.serviceTypes.GML?(d.strategies=[new OpenLayers.Strategy.Fixed],d.protocol=new OpenLayers.Protocol.HTTP({url:a.url,format:new OpenLayers.Format.GML}),b=new OpenLayers.Layer.Vector(a.title||a.name,d)):a.features?(b=new OpenLayers.Layer.Vector(a.title||a.name,d),b.addFeatures(a.features)):!0!==a.categoryLayer&&(b=new OpenLayers.Layer.WMS(a.title||a.name,a.url,e,d));return b},getLayersFromContext:function(a){for(var b=[],c=
+0,d=a.length;c<d;c++){var e=this.getLayerFromContext(a[c]);null!==e&&b.push(e)}return b},contextToMap:function(a,b){b=OpenLayers.Util.applyDefaults({maxExtent:a.maxExtent,projection:a.projection,units:a.units},b);b.maxExtent&&(b.maxResolution=b.maxExtent.getWidth()/OpenLayers.Map.TILE_WIDTH);b.metadata={contactInformation:a.contactInformation,"abstract":a["abstract"],keywords:a.keywords,logo:a.logo,descriptionURL:a.descriptionURL};var c=new OpenLayers.Map(b);c.addLayers(this.getLayersFromContext(a.layersContext));
+c.setCenter(a.bounds.getCenterLonLat(),c.getZoomForExtent(a.bounds,!0));return c},mergeContextToMap:function(a,b){b.addLayers(this.getLayersFromContext(a.layersContext));return b},write:function(a,b){a=this.toContext(a);return OpenLayers.Format.XML.VersionedOGC.prototype.write.apply(this,arguments)},CLASS_NAME:"OpenLayers.Format.Context"});
+OpenLayers.Format.Context.serviceTypes={WMS:"urn:ogc:serviceType:WMS",WFS:"urn:ogc:serviceType:WFS",WCS:"urn:ogc:serviceType:WCS",GML:"urn:ogc:serviceType:GML",SLD:"urn:ogc:serviceType:SLD",FES:"urn:ogc:serviceType:FES",KML:"urn:ogc:serviceType:KML"};OpenLayers.Format.WMC=OpenLayers.Class(OpenLayers.Format.Context,{defaultVersion:"1.1.0",layerToContext:function(a){var b=this.getParser(),c={queryable:a.queryable,visibility:a.visibility,name:a.params.LAYERS,title:a.name,"abstract":a.metadata["abstract"],dataURL:a.metadata.dataURL,metadataURL:a.metadataURL,server:{version:a.params.VERSION,url:a.url},maxExtent:a.maxExtent,transparent:a.params.TRANSPARENT,numZoomLevels:a.numZoomLevels,units:a.units,isBaseLayer:a.isBaseLayer,opacity:1==a.opacity?void 0:
+a.opacity,displayInLayerSwitcher:a.displayInLayerSwitcher,singleTile:a.singleTile,tileSize:a.singleTile||!a.tileSize?void 0:{width:a.tileSize.w,height:a.tileSize.h},minScale:a.options.resolutions||a.options.scales||a.options.maxResolution||a.options.minScale?a.minScale:void 0,maxScale:a.options.resolutions||a.options.scales||a.options.minResolution||a.options.maxScale?a.maxScale:void 0,formats:[],styles:[],srs:a.srs,dimensions:a.dimensions};a.metadata.servertitle&&(c.server.title=a.metadata.servertitle);
+if(a.metadata.formats&&0<a.metadata.formats.length)for(var d=0,e=a.metadata.formats.length;d<e;d++){var f=a.metadata.formats[d];c.formats.push({value:f.value,current:f.value==a.params.FORMAT})}else c.formats.push({value:a.params.FORMAT,current:!0});if(a.metadata.styles&&0<a.metadata.styles.length)for(d=0,e=a.metadata.styles.length;d<e;d++)b=a.metadata.styles[d],b.current=b.href==a.params.SLD||b.body==a.params.SLD_BODY||b.name==a.params.STYLES?!0:!1,c.styles.push(b);else c.styles.push({href:a.params.SLD,
+body:a.params.SLD_BODY,name:a.params.STYLES||b.defaultStyleName,title:b.defaultStyleTitle,current:!0});return c},toContext:function(a){var b={},c=a.layers;if("OpenLayers.Map"==a.CLASS_NAME){var d=a.metadata||{};b.size=a.getSize();b.bounds=a.getExtent();b.projection=a.projection;b.title=a.title;b.keywords=d.keywords;b["abstract"]=d["abstract"];b.logo=d.logo;b.descriptionURL=d.descriptionURL;b.contactInformation=d.contactInformation;b.maxExtent=a.maxExtent}else OpenLayers.Util.applyDefaults(b,a),void 0!=
+b.layers&&delete b.layers;void 0==b.layersContext&&(b.layersContext=[]);if(void 0!=c&&OpenLayers.Util.isArray(c))for(a=0,d=c.length;a<d;a++){var e=c[a];e instanceof OpenLayers.Layer.WMS&&b.layersContext.push(this.layerToContext(e))}return b},CLASS_NAME:"OpenLayers.Format.WMC"});OpenLayers.Format.WMC.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ol:"http://openlayers.org/context",wmc:"http://www.opengis.net/context",sld:"http://www.opengis.net/sld",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"",getNamespacePrefix:function(a){var b=null;if(null==a)b=this.namespaces[this.defaultPrefix];else for(b in this.namespaces)if(this.namespaces[b]==a)break;return b},defaultPrefix:"wmc",rootPrefix:null,defaultStyleName:"",
+defaultStyleTitle:"Default",initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a=a.documentElement;this.rootPrefix=a.prefix;var b={version:a.getAttribute("version")};this.runChildNodes(b,a);return b},runChildNodes:function(a,b){for(var c=b.childNodes,d,e,f,g=0,h=c.length;g<h;++g)d=c[g],1==d.nodeType&&(e=this.getNamespacePrefix(d.namespaceURI),f=d.nodeName.split(":").pop(),
+(e=this["read_"+e+"_"+f])&&e.apply(this,[a,d]))},read_wmc_General:function(a,b){this.runChildNodes(a,b)},read_wmc_BoundingBox:function(a,b){a.projection=b.getAttribute("SRS");a.bounds=new OpenLayers.Bounds(b.getAttribute("minx"),b.getAttribute("miny"),b.getAttribute("maxx"),b.getAttribute("maxy"))},read_wmc_LayerList:function(a,b){a.layersContext=[];this.runChildNodes(a,b)},read_wmc_Layer:function(a,b){var c={visibility:"1"!=b.getAttribute("hidden"),queryable:"1"==b.getAttribute("queryable"),formats:[],
+styles:[],metadata:{}};this.runChildNodes(c,b);a.layersContext.push(c)},read_wmc_Extension:function(a,b){this.runChildNodes(a,b)},read_ol_units:function(a,b){a.units=this.getChildValue(b)},read_ol_maxExtent:function(a,b){var c=new OpenLayers.Bounds(b.getAttribute("minx"),b.getAttribute("miny"),b.getAttribute("maxx"),b.getAttribute("maxy"));a.maxExtent=c},read_ol_transparent:function(a,b){a.transparent=this.getChildValue(b)},read_ol_numZoomLevels:function(a,b){a.numZoomLevels=parseInt(this.getChildValue(b))},
+read_ol_opacity:function(a,b){a.opacity=parseFloat(this.getChildValue(b))},read_ol_singleTile:function(a,b){a.singleTile="true"==this.getChildValue(b)},read_ol_tileSize:function(a,b){var c={width:b.getAttribute("width"),height:b.getAttribute("height")};a.tileSize=c},read_ol_isBaseLayer:function(a,b){a.isBaseLayer="true"==this.getChildValue(b)},read_ol_displayInLayerSwitcher:function(a,b){a.displayInLayerSwitcher="true"==this.getChildValue(b)},read_wmc_Server:function(a,b){a.version=b.getAttribute("version");
+a.url=this.getOnlineResource_href(b);a.metadata.servertitle=b.getAttribute("title")},read_wmc_FormatList:function(a,b){this.runChildNodes(a,b)},read_wmc_Format:function(a,b){var c={value:this.getChildValue(b)};"1"==b.getAttribute("current")&&(c.current=!0);a.formats.push(c)},read_wmc_StyleList:function(a,b){this.runChildNodes(a,b)},read_wmc_Style:function(a,b){var c={};this.runChildNodes(c,b);"1"==b.getAttribute("current")&&(c.current=!0);a.styles.push(c)},read_wmc_SLD:function(a,b){this.runChildNodes(a,
+b)},read_sld_StyledLayerDescriptor:function(a,b){var c=OpenLayers.Format.XML.prototype.write.apply(this,[b]);a.body=c},read_sld_FeatureTypeStyle:function(a,b){var c=OpenLayers.Format.XML.prototype.write.apply(this,[b]);a.body=c},read_wmc_OnlineResource:function(a,b){a.href=this.getAttributeNS(b,this.namespaces.xlink,"href")},read_wmc_Name:function(a,b){var c=this.getChildValue(b);c&&(a.name=c)},read_wmc_Title:function(a,b){var c=this.getChildValue(b);c&&(a.title=c)},read_wmc_MetadataURL:function(a,
+b){a.metadataURL=this.getOnlineResource_href(b)},read_wmc_KeywordList:function(a,b){a.keywords=[];this.runChildNodes(a.keywords,b)},read_wmc_Keyword:function(a,b){a.push(this.getChildValue(b))},read_wmc_Abstract:function(a,b){var c=this.getChildValue(b);c&&(a["abstract"]=c)},read_wmc_LogoURL:function(a,b){a.logo={width:b.getAttribute("width"),height:b.getAttribute("height"),format:b.getAttribute("format"),href:this.getOnlineResource_href(b)}},read_wmc_DescriptionURL:function(a,b){a.descriptionURL=
+this.getOnlineResource_href(b)},read_wmc_ContactInformation:function(a,b){var c={};this.runChildNodes(c,b);a.contactInformation=c},read_wmc_ContactPersonPrimary:function(a,b){var c={};this.runChildNodes(c,b);a.personPrimary=c},read_wmc_ContactPerson:function(a,b){var c=this.getChildValue(b);c&&(a.person=c)},read_wmc_ContactOrganization:function(a,b){var c=this.getChildValue(b);c&&(a.organization=c)},read_wmc_ContactPosition:function(a,b){var c=this.getChildValue(b);c&&(a.position=c)},read_wmc_ContactAddress:function(a,
+b){var c={};this.runChildNodes(c,b);a.contactAddress=c},read_wmc_AddressType:function(a,b){var c=this.getChildValue(b);c&&(a.type=c)},read_wmc_Address:function(a,b){var c=this.getChildValue(b);c&&(a.address=c)},read_wmc_City:function(a,b){var c=this.getChildValue(b);c&&(a.city=c)},read_wmc_StateOrProvince:function(a,b){var c=this.getChildValue(b);c&&(a.stateOrProvince=c)},read_wmc_PostCode:function(a,b){var c=this.getChildValue(b);c&&(a.postcode=c)},read_wmc_Country:function(a,b){var c=this.getChildValue(b);
+c&&(a.country=c)},read_wmc_ContactVoiceTelephone:function(a,b){var c=this.getChildValue(b);c&&(a.phone=c)},read_wmc_ContactFacsimileTelephone:function(a,b){var c=this.getChildValue(b);c&&(a.fax=c)},read_wmc_ContactElectronicMailAddress:function(a,b){var c=this.getChildValue(b);c&&(a.email=c)},read_wmc_DataURL:function(a,b){a.dataURL=this.getOnlineResource_href(b)},read_wmc_LegendURL:function(a,b){var c={width:b.getAttribute("width"),height:b.getAttribute("height"),format:b.getAttribute("format"),
+href:this.getOnlineResource_href(b)};a.legend=c},read_wmc_DimensionList:function(a,b){a.dimensions={};this.runChildNodes(a.dimensions,b)},read_wmc_Dimension:function(a,b){var c={name:b.getAttribute("name").toLowerCase(),units:b.getAttribute("units")||"",unitSymbol:b.getAttribute("unitSymbol")||"",userValue:b.getAttribute("userValue")||"",nearestValue:"1"===b.getAttribute("nearestValue"),multipleValues:"1"===b.getAttribute("multipleValues"),current:"1"===b.getAttribute("current"),"default":b.getAttribute("default")||
+""},d=this.getChildValue(b);c.values=d.split(",");a[c.name]=c},write:function(a,b){var c=this.createElementDefaultNS("ViewContext");this.setAttributes(c,{version:this.VERSION,id:b&&"string"==typeof b.id?b.id:OpenLayers.Util.createUniqueID("OpenLayers_Context_")});this.setAttributeNS(c,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);c.appendChild(this.write_wmc_General(a));c.appendChild(this.write_wmc_LayerList(a));return OpenLayers.Format.XML.prototype.write.apply(this,[c])},createElementDefaultNS:function(a,
+b,c){a=this.createElementNS(this.namespaces[this.defaultPrefix],a);b&&a.appendChild(this.createTextNode(b));c&&this.setAttributes(a,c);return a},setAttributes:function(a,b){var c,d;for(d in b)c=b[d].toString(),c.match(/[A-Z]/)?this.setAttributeNS(a,null,d,c):a.setAttribute(d,c)},write_wmc_General:function(a){var b=this.createElementDefaultNS("General");a.size&&b.appendChild(this.createElementDefaultNS("Window",null,{width:a.size.w,height:a.size.h}));var c=a.bounds;b.appendChild(this.createElementDefaultNS("BoundingBox",
+null,{minx:c.left.toPrecision(18),miny:c.bottom.toPrecision(18),maxx:c.right.toPrecision(18),maxy:c.top.toPrecision(18),SRS:a.projection}));b.appendChild(this.createElementDefaultNS("Title",a.title));a.keywords&&b.appendChild(this.write_wmc_KeywordList(a.keywords));a["abstract"]&&b.appendChild(this.createElementDefaultNS("Abstract",a["abstract"]));a.logo&&b.appendChild(this.write_wmc_URLType("LogoURL",a.logo.href,a.logo));a.descriptionURL&&b.appendChild(this.write_wmc_URLType("DescriptionURL",a.descriptionURL));
+a.contactInformation&&b.appendChild(this.write_wmc_ContactInformation(a.contactInformation));b.appendChild(this.write_ol_MapExtension(a));return b},write_wmc_KeywordList:function(a){for(var b=this.createElementDefaultNS("KeywordList"),c=0,d=a.length;c<d;c++)b.appendChild(this.createElementDefaultNS("Keyword",a[c]));return b},write_wmc_ContactInformation:function(a){var b=this.createElementDefaultNS("ContactInformation");a.personPrimary&&b.appendChild(this.write_wmc_ContactPersonPrimary(a.personPrimary));
+a.position&&b.appendChild(this.createElementDefaultNS("ContactPosition",a.position));a.contactAddress&&b.appendChild(this.write_wmc_ContactAddress(a.contactAddress));a.phone&&b.appendChild(this.createElementDefaultNS("ContactVoiceTelephone",a.phone));a.fax&&b.appendChild(this.createElementDefaultNS("ContactFacsimileTelephone",a.fax));a.email&&b.appendChild(this.createElementDefaultNS("ContactElectronicMailAddress",a.email));return b},write_wmc_ContactPersonPrimary:function(a){var b=this.createElementDefaultNS("ContactPersonPrimary");
+a.person&&b.appendChild(this.createElementDefaultNS("ContactPerson",a.person));a.organization&&b.appendChild(this.createElementDefaultNS("ContactOrganization",a.organization));return b},write_wmc_ContactAddress:function(a){var b=this.createElementDefaultNS("ContactAddress");a.type&&b.appendChild(this.createElementDefaultNS("AddressType",a.type));a.address&&b.appendChild(this.createElementDefaultNS("Address",a.address));a.city&&b.appendChild(this.createElementDefaultNS("City",a.city));a.stateOrProvince&&
+b.appendChild(this.createElementDefaultNS("StateOrProvince",a.stateOrProvince));a.postcode&&b.appendChild(this.createElementDefaultNS("PostCode",a.postcode));a.country&&b.appendChild(this.createElementDefaultNS("Country",a.country));return b},write_ol_MapExtension:function(a){var b=this.createElementDefaultNS("Extension");if(a=a.maxExtent){var c=this.createElementNS(this.namespaces.ol,"ol:maxExtent");this.setAttributes(c,{minx:a.left.toPrecision(18),miny:a.bottom.toPrecision(18),maxx:a.right.toPrecision(18),
+maxy:a.top.toPrecision(18)});b.appendChild(c)}return b},write_wmc_LayerList:function(a){for(var b=this.createElementDefaultNS("LayerList"),c=0,d=a.layersContext.length;c<d;++c)b.appendChild(this.write_wmc_Layer(a.layersContext[c]));return b},write_wmc_Layer:function(a){var b=this.createElementDefaultNS("Layer",null,{queryable:a.queryable?"1":"0",hidden:a.visibility?"0":"1"});b.appendChild(this.write_wmc_Server(a));b.appendChild(this.createElementDefaultNS("Name",a.name));b.appendChild(this.createElementDefaultNS("Title",
+a.title));a["abstract"]&&b.appendChild(this.createElementDefaultNS("Abstract",a["abstract"]));a.dataURL&&b.appendChild(this.write_wmc_URLType("DataURL",a.dataURL));a.metadataURL&&b.appendChild(this.write_wmc_URLType("MetadataURL",a.metadataURL));return b},write_wmc_LayerExtension:function(a){var b=this.createElementDefaultNS("Extension"),c=a.maxExtent,d=this.createElementNS(this.namespaces.ol,"ol:maxExtent");this.setAttributes(d,{minx:c.left.toPrecision(18),miny:c.bottom.toPrecision(18),maxx:c.right.toPrecision(18),
+maxy:c.top.toPrecision(18)});b.appendChild(d);a.tileSize&&!a.singleTile&&(c=this.createElementNS(this.namespaces.ol,"ol:tileSize"),this.setAttributes(c,a.tileSize),b.appendChild(c));for(var c="transparent numZoomLevels units isBaseLayer opacity displayInLayerSwitcher singleTile".split(" "),e=0,f=c.length;e<f;++e)(d=this.createOLPropertyNode(a,c[e]))&&b.appendChild(d);return b},createOLPropertyNode:function(a,b){var c=null;null!=a[b]&&(c=this.createElementNS(this.namespaces.ol,"ol:"+b),c.appendChild(this.createTextNode(a[b].toString())));
+return c},write_wmc_Server:function(a){a=a.server;var b=this.createElementDefaultNS("Server"),c={service:"OGC:WMS",version:a.version};a.title&&(c.title=a.title);this.setAttributes(b,c);b.appendChild(this.write_wmc_OnlineResource(a.url));return b},write_wmc_URLType:function(a,b,c){a=this.createElementDefaultNS(a);a.appendChild(this.write_wmc_OnlineResource(b));if(c){b=["width","height","format"];for(var d=0;d<b.length;d++)b[d]in c&&a.setAttribute(b[d],c[b[d]])}return a},write_wmc_DimensionList:function(a){var b=
+this.createElementDefaultNS("DimensionList"),c;for(c in a.dimensions){var d={},e=a.dimensions[c],f;for(f in e)d[f]="boolean"==typeof e[f]?Number(e[f]):e[f];e="";d.values&&(e=d.values.join(","),delete d.values);b.appendChild(this.createElementDefaultNS("Dimension",e,d))}return b},write_wmc_FormatList:function(a){for(var b=this.createElementDefaultNS("FormatList"),c=0,d=a.formats.length;c<d;c++){var e=a.formats[c];b.appendChild(this.createElementDefaultNS("Format",e.value,e.current&&!0==e.current?{current:"1"}:
+null))}return b},write_wmc_StyleList:function(a){var b=this.createElementDefaultNS("StyleList");if((a=a.styles)&&OpenLayers.Util.isArray(a))for(var c,d=0,e=a.length;d<e;d++){var f=a[d],g=this.createElementDefaultNS("Style",null,f.current&&!0==f.current?{current:"1"}:null);f.href?(c=this.createElementDefaultNS("SLD"),f.name&&c.appendChild(this.createElementDefaultNS("Name",f.name)),f.title&&c.appendChild(this.createElementDefaultNS("Title",f.title)),f.legend&&c.appendChild(this.write_wmc_URLType("LegendURL",
+f.legend.href,f.legend)),f=this.write_wmc_OnlineResource(f.href),c.appendChild(f),g.appendChild(c)):f.body?(c=this.createElementDefaultNS("SLD"),f.name&&c.appendChild(this.createElementDefaultNS("Name",f.name)),f.title&&c.appendChild(this.createElementDefaultNS("Title",f.title)),f.legend&&c.appendChild(this.write_wmc_URLType("LegendURL",f.legend.href,f.legend)),f=OpenLayers.Format.XML.prototype.read.apply(this,[f.body]).documentElement,c.ownerDocument&&c.ownerDocument.importNode&&(f=c.ownerDocument.importNode(f,
+!0)),c.appendChild(f),g.appendChild(c)):(g.appendChild(this.createElementDefaultNS("Name",f.name)),g.appendChild(this.createElementDefaultNS("Title",f.title)),f["abstract"]&&g.appendChild(this.createElementDefaultNS("Abstract",f["abstract"])),f.legend&&g.appendChild(this.write_wmc_URLType("LegendURL",f.legend.href,f.legend)));b.appendChild(g)}return b},write_wmc_OnlineResource:function(a){var b=this.createElementDefaultNS("OnlineResource");this.setAttributeNS(b,this.namespaces.xlink,"xlink:type",
+"simple");this.setAttributeNS(b,this.namespaces.xlink,"xlink:href",a);return b},getOnlineResource_href:function(a){var b={};a=a.getElementsByTagName("OnlineResource");0<a.length&&this.read_wmc_OnlineResource(b,a[0]);return b.href},CLASS_NAME:"OpenLayers.Format.WMC.v1"});OpenLayers.Control.PanPanel=OpenLayers.Class(OpenLayers.Control.Panel,{slideFactor:50,slideRatio:null,initialize:function(a){OpenLayers.Control.Panel.prototype.initialize.apply(this,[a]);a={slideFactor:this.slideFactor,slideRatio:this.slideRatio};this.addControls([new OpenLayers.Control.Pan(OpenLayers.Control.Pan.NORTH,a),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.SOUTH,a),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.EAST,a),new OpenLayers.Control.Pan(OpenLayers.Control.Pan.WEST,a)])},
+CLASS_NAME:"OpenLayers.Control.PanPanel"});OpenLayers.Control.Attribution=OpenLayers.Class(OpenLayers.Control,{separator:", ",template:"${layers}",destroy:function(){this.map.events.un({removelayer:this.updateAttribution,addlayer:this.updateAttribution,changelayer:this.updateAttribution,changebaselayer:this.updateAttribution,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.map.events.on({changebaselayer:this.updateAttribution,changelayer:this.updateAttribution,
+addlayer:this.updateAttribution,removelayer:this.updateAttribution,scope:this});this.updateAttribution();return this.div},updateAttribution:function(){var a=[];if(this.map&&this.map.layers){for(var b=0,c=this.map.layers.length;b<c;b++){var d=this.map.layers[b];d.attribution&&d.getVisibility()&&-1===OpenLayers.Util.indexOf(a,d.attribution)&&a.push(d.attribution)}this.div.innerHTML=OpenLayers.String.format(this.template,{layers:a.join(this.separator)})}},CLASS_NAME:"OpenLayers.Control.Attribution"});OpenLayers.Kinetic=OpenLayers.Class({threshold:0,deceleration:0.0035,nbPoints:100,delay:200,points:void 0,timerId:void 0,initialize:function(a){OpenLayers.Util.extend(this,a)},begin:function(){OpenLayers.Animation.stop(this.timerId);this.timerId=void 0;this.points=[]},update:function(a){this.points.unshift({xy:a,tick:(new Date).getTime()});this.points.length>this.nbPoints&&this.points.pop()},end:function(a){for(var b,c=(new Date).getTime(),d=0,e=this.points.length,f;d<e;d++){f=this.points[d];if(c-
+f.tick>this.delay)break;b=f}if(b&&(d=(new Date).getTime()-b.tick,c=Math.sqrt(Math.pow(a.x-b.xy.x,2)+Math.pow(a.y-b.xy.y,2)),d=c/d,!(0==d||d<this.threshold)))return c=Math.asin((a.y-b.xy.y)/c),b.xy.x<=a.x&&(c=Math.PI-c),{speed:d,theta:c}},move:function(a,b){var c=a.speed,d=Math.cos(a.theta),e=-Math.sin(a.theta),f=(new Date).getTime(),g=0,h=0;this.timerId=OpenLayers.Animation.start(OpenLayers.Function.bind(function(){if(null!=this.timerId){var a=(new Date).getTime()-f,l=-this.deceleration*Math.pow(a,
+2)/2+c*a,m=l*d,l=l*e,n,p;n=!1;0>=-this.deceleration*a+c&&(OpenLayers.Animation.stop(this.timerId),this.timerId=null,n=!0);a=m-g;p=l-h;g=m;h=l;b(a,p,n)}},this))},CLASS_NAME:"OpenLayers.Kinetic"});OpenLayers.Format.WPSExecute=OpenLayers.Class(OpenLayers.Format.XML,OpenLayers.Format.Filter.v1_1_0,{namespaces:{ows:"http://www.opengis.net/ows/1.1",gml:"http://www.opengis.net/gml",wps:"http://www.opengis.net/wps/1.0.0",wfs:"http://www.opengis.net/wfs",ogc:"http://www.opengis.net/ogc",wcs:"http://www.opengis.net/wcs",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},VERSION:"1.0.0",
+schemaLocation:"http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd",schemaLocationAttr:function(a){},write:function(a){var b;window.ActiveXObject?this.xmldom=b=new ActiveXObject("Microsoft.XMLDOM"):b=document.implementation.createDocument("","",null);a=this.writeNode("wps:Execute",a,b);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[a])},read:function(a){"string"==typeof a&&(a=
+OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},writers:{wps:{Execute:function(a){var b=this.createElementNSPlus("wps:Execute",{attributes:{version:this.VERSION,service:"WPS"}});this.writeNode("ows:Identifier",a.identifier,b);this.writeNode("wps:DataInputs",a.dataInputs,b);this.writeNode("wps:ResponseForm",a.responseForm,b);return b},ResponseForm:function(a){var b=this.createElementNSPlus("wps:ResponseForm",{});a.rawDataOutput&&
+this.writeNode("wps:RawDataOutput",a.rawDataOutput,b);a.responseDocument&&this.writeNode("wps:ResponseDocument",a.responseDocument,b);return b},ResponseDocument:function(a){var b=this.createElementNSPlus("wps:ResponseDocument",{attributes:{storeExecuteResponse:a.storeExecuteResponse,lineage:a.lineage,status:a.status}});if(a.outputs)for(var c=0,d=a.outputs.length;c<d;c++)this.writeNode("wps:Output",a.outputs[c],b);return b},Output:function(a){var b=this.createElementNSPlus("wps:Output",{attributes:{asReference:a.asReference,
+mimeType:a.mimeType,encoding:a.encoding,schema:a.schema}});this.writeNode("ows:Identifier",a.identifier,b);this.writeNode("ows:Title",a.title,b);this.writeNode("ows:Abstract",a["abstract"],b);return b},RawDataOutput:function(a){var b=this.createElementNSPlus("wps:RawDataOutput",{attributes:{mimeType:a.mimeType,encoding:a.encoding,schema:a.schema}});this.writeNode("ows:Identifier",a.identifier,b);return b},DataInputs:function(a){for(var b=this.createElementNSPlus("wps:DataInputs",{}),c=0,d=a.length;c<
+d;++c)this.writeNode("wps:Input",a[c],b);return b},Input:function(a){var b=this.createElementNSPlus("wps:Input",{});this.writeNode("ows:Identifier",a.identifier,b);a.title&&this.writeNode("ows:Title",a.title,b);a.data&&this.writeNode("wps:Data",a.data,b);a.reference&&this.writeNode("wps:Reference",a.reference,b);a.boundingBoxData&&this.writeNode("wps:BoundingBoxData",a.boundingBoxData,b);return b},Data:function(a){var b=this.createElementNSPlus("wps:Data",{});a.literalData?this.writeNode("wps:LiteralData",
+a.literalData,b):a.complexData?this.writeNode("wps:ComplexData",a.complexData,b):a.boundingBoxData&&this.writeNode("ows:BoundingBox",a.boundingBoxData,b);return b},LiteralData:function(a){return this.createElementNSPlus("wps:LiteralData",{attributes:{uom:a.uom},value:a.value})},ComplexData:function(a){var b=this.createElementNSPlus("wps:ComplexData",{attributes:{mimeType:a.mimeType,encoding:a.encoding,schema:a.schema}}),c=a.value;"string"===typeof c?b.appendChild(this.getXMLDoc().createCDATASection(a.value)):
+b.appendChild(c);return b},Reference:function(a){var b=this.createElementNSPlus("wps:Reference",{attributes:{mimeType:a.mimeType,"xlink:href":a.href,method:a.method,encoding:a.encoding,schema:a.schema}});a.body&&this.writeNode("wps:Body",a.body,b);return b},BoundingBoxData:function(a,b){this.writers.ows.BoundingBox.apply(this,[a,b,"wps:BoundingBoxData"])},Body:function(a){var b=this.createElementNSPlus("wps:Body",{});a.wcs?this.writeNode("wcs:GetCoverage",a.wcs,b):a.wfs?(this.featureType=a.wfs.featureType,
+this.version=a.wfs.version,this.writeNode("wfs:GetFeature",a.wfs,b)):this.writeNode("wps:Execute",a,b);return b}},wcs:OpenLayers.Format.WCSGetCoverage.prototype.writers.wcs,wfs:OpenLayers.Format.WFST.v1_1_0.prototype.writers.wfs,ogc:OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc,ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.writers.ows},readers:{wps:{ExecuteResponse:function(a,b){b.executeResponse={lang:a.getAttribute("lang"),statusLocation:a.getAttribute("statusLocation"),serviceInstance:a.getAttribute("serviceInstance"),
+service:a.getAttribute("service")};this.readChildNodes(a,b.executeResponse)},Process:function(a,b){b.process={};this.readChildNodes(a,b.process)},Status:function(a,b){b.status={creationTime:a.getAttribute("creationTime")};this.readChildNodes(a,b.status)},ProcessSucceeded:function(a,b){b.processSucceeded=!0},ProcessOutputs:function(a,b){b.processOutputs=[];this.readChildNodes(a,b.processOutputs)},Output:function(a,b){var c={};this.readChildNodes(a,c);b.push(c)},Reference:function(a,b){b.reference=
+{href:a.getAttribute("href"),mimeType:a.getAttribute("mimeType"),encoding:a.getAttribute("encoding"),schema:a.getAttribute("schema")}},Data:function(a,b){b.data={};this.readChildNodes(a,b)},LiteralData:function(a,b){b.literalData={dataType:a.getAttribute("dataType"),uom:a.getAttribute("uom"),value:this.getChildValue(a)}},ComplexData:function(a,b){b.complexData={mimeType:a.getAttribute("mimeType"),schema:a.getAttribute("schema"),encoding:a.getAttribute("encoding"),value:""};if(this.isSimpleContent(a)){var c;
+for(c=a.firstChild;c;c=c.nextSibling)switch(c.nodeType){case 3:case 4:b.complexData.value+=c.nodeValue}}else for(c=a.firstChild;c;c=c.nextSibling)1==c.nodeType&&(b.complexData.value=c)},BoundingBox:function(a,b){b.boundingBoxData={dimensions:a.getAttribute("dimensions"),crs:a.getAttribute("crs")};this.readChildNodes(a,b.boundingBoxData)}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WPSExecute"});OpenLayers.Layer.GeoRSS=OpenLayers.Class(OpenLayers.Layer.Markers,{location:null,features:null,formatOptions:null,selectedFeature:null,icon:null,popupSize:null,useFeedTitle:!0,initialize:function(a,b,c){OpenLayers.Layer.Markers.prototype.initialize.apply(this,[a,c]);this.location=b;this.features=[]},destroy:function(){OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);this.clearFeatures();this.features=null},loadRSS:function(){this.loaded||(this.events.triggerEvent("loadstart"),OpenLayers.Request.GET({url:this.location,
+success:this.parseData,scope:this}),this.loaded=!0)},moveTo:function(a,b,c){OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);this.visibility&&!this.loaded&&this.loadRSS()},parseData:function(a){var b=a.responseXML;b&&b.documentElement||(b=OpenLayers.Format.XML.prototype.read(a.responseText));if(this.useFeedTitle){a=null;try{a=b.getElementsByTagNameNS("*","title")[0].firstChild.nodeValue}catch(c){a=b.getElementsByTagName("title")[0].firstChild.nodeValue}a&&this.setName(a)}a={};OpenLayers.Util.extend(a,
+this.formatOptions);this.map&&!this.projection.equals(this.map.getProjectionObject())&&(a.externalProjection=this.projection,a.internalProjection=this.map.getProjectionObject());b=(new OpenLayers.Format.GeoRSS(a)).read(b);a=0;for(var d=b.length;a<d;a++){var e={},f=b[a];if(f.geometry){var g=f.attributes.title?f.attributes.title:"Untitled",h=f.attributes.description?f.attributes.description:"No description.",k=f.attributes.link?f.attributes.link:"",f=f.geometry.getBounds().getCenterLonLat();e.icon=
+null==this.icon?OpenLayers.Marker.defaultIcon():this.icon.clone();e.popupSize=this.popupSize?this.popupSize.clone():new OpenLayers.Size(250,120);if(g||h){e.title=g;e.description=h;var l='<div class="olLayerGeoRSSClose">[x]</div>',l=l+'<div class="olLayerGeoRSSTitle">';k&&(l+='<a class="link" href="'+k+'" target="_blank">');l+=g;k&&(l+="</a>");l+="</div>";l+='<div style="" class="olLayerGeoRSSDescription">';l+=h;l+="</div>";e.popupContentHTML=l}f=new OpenLayers.Feature(this,f,e);this.features.push(f);
+e=f.createMarker();e.events.register("click",f,this.markerClick);this.addMarker(e)}}this.events.triggerEvent("loadend")},markerClick:function(a){var b=this==this.layer.selectedFeature;this.layer.selectedFeature=b?null:this;for(var c=0,d=this.layer.map.popups.length;c<d;c++)this.layer.map.removePopup(this.layer.map.popups[c]);b||(b=this.createPopup(),OpenLayers.Event.observe(b.div,"click",OpenLayers.Function.bind(function(){for(var a=0,b=this.layer.map.popups.length;a<b;a++)this.layer.map.removePopup(this.layer.map.popups[a])},
+this)),this.layer.map.addPopup(b));OpenLayers.Event.stop(a)},clearFeatures:function(){if(null!=this.features)for(;0<this.features.length;){var a=this.features[0];OpenLayers.Util.removeItem(this.features,a);a.destroy()}},CLASS_NAME:"OpenLayers.Layer.GeoRSS"});OpenLayers.Symbolizer.Point=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Point"});OpenLayers.Symbolizer.Line=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Line"});OpenLayers.Symbolizer.Text=OpenLayers.Class(OpenLayers.Symbolizer,{initialize:function(a){OpenLayers.Symbolizer.prototype.initialize.apply(this,arguments)},CLASS_NAME:"OpenLayers.Symbolizer.Text"});OpenLayers.Format.SLD.v1=OpenLayers.Class(OpenLayers.Format.Filter.v1_0_0,{namespaces:{sld:"http://www.opengis.net/sld",ogc:"http://www.opengis.net/ogc",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"sld",schemaLocation:null,multipleSymbolizers:!1,featureTypeCounter:null,defaultSymbolizer:{fillColor:"#808080",fillOpacity:1,strokeColor:"#000000",strokeOpacity:1,strokeWidth:1,strokeDashstyle:"solid",pointRadius:3,
+graphicName:"square"},read:function(a,b){b=OpenLayers.Util.applyDefaults(b,this.options);var c={namedLayers:!0===b.namedLayersAsArray?[]:{}};this.readChildNodes(a,c);return c},readers:OpenLayers.Util.applyDefaults({sld:{StyledLayerDescriptor:function(a,b){b.version=a.getAttribute("version");this.readChildNodes(a,b)},Name:function(a,b){b.name=this.getChildValue(a)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b.description=this.getChildValue(a)},NamedLayer:function(a,b){var c=
+{userStyles:[],namedStyles:[]};this.readChildNodes(a,c);for(var d=0,e=c.userStyles.length;d<e;++d)c.userStyles[d].layerName=c.name;OpenLayers.Util.isArray(b.namedLayers)?b.namedLayers.push(c):b.namedLayers[c.name]=c},NamedStyle:function(a,b){b.namedStyles.push(this.getChildName(a.firstChild))},UserStyle:function(a,b){var c={defaultsPerSymbolizer:!0,rules:[]};this.featureTypeCounter=-1;this.readChildNodes(a,c);this.multipleSymbolizers?(delete c.defaultsPerSymbolizer,c=new OpenLayers.Style2(c)):c=new OpenLayers.Style(this.defaultSymbolizer,
+c);b.userStyles.push(c)},IsDefault:function(a,b){"1"==this.getChildValue(a)&&(b.isDefault=!0)},FeatureTypeStyle:function(a,b){++this.featureTypeCounter;var c={rules:this.multipleSymbolizers?b.rules:[]};this.readChildNodes(a,c);this.multipleSymbolizers||(b.rules=c.rules)},Rule:function(a,b){var c;this.multipleSymbolizers&&(c={symbolizers:[]});c=new OpenLayers.Rule(c);this.readChildNodes(a,c);b.rules.push(c)},ElseFilter:function(a,b){b.elseFilter=!0},MinScaleDenominator:function(a,b){b.minScaleDenominator=
+parseFloat(this.getChildValue(a))},MaxScaleDenominator:function(a,b){b.maxScaleDenominator=parseFloat(this.getChildValue(a))},TextSymbolizer:function(a,b){var c={};this.readChildNodes(a,c);this.multipleSymbolizers?(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Text(c))):b.symbolizer.Text=OpenLayers.Util.applyDefaults(c,b.symbolizer.Text)},LabelPlacement:function(a,b){this.readChildNodes(a,b)},PointPlacement:function(a,b){var c={};this.readChildNodes(a,c);c.labelRotation=
+c.rotation;delete c.rotation;var d,e=b.labelAnchorPointX,f=b.labelAnchorPointY;e<=1/3?d="l":e>1/3&&e<2/3?d="c":e>=2/3&&(d="r");f<=1/3?d+="b":f>1/3&&f<2/3?d+="m":f>=2/3&&(d+="t");c.labelAlign=d;OpenLayers.Util.applyDefaults(b,c)},AnchorPoint:function(a,b){this.readChildNodes(a,b)},AnchorPointX:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelAnchorPointX=c)},AnchorPointY:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelAnchorPointY=c)},Displacement:function(a,
+b){this.readChildNodes(a,b)},DisplacementX:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelXOffset=c)},DisplacementY:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelYOffset=c)},LinePlacement:function(a,b){this.readChildNodes(a,b)},PerpendicularOffset:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.labelPerpendicularOffset=c)},Label:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.label=c)},Font:function(a,b){this.readChildNodes(a,
+b)},Halo:function(a,b){var c={};this.readChildNodes(a,c);b.haloRadius=c.haloRadius;b.haloColor=c.fillColor;b.haloOpacity=c.fillOpacity},Radius:function(a,b){var c=this.readers.ogc._expression.call(this,a);null!=c&&(b.haloRadius=c)},RasterSymbolizer:function(a,b){var c={};this.readChildNodes(a,c);this.multipleSymbolizers?(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Raster(c))):b.symbolizer.Raster=OpenLayers.Util.applyDefaults(c,b.symbolizer.Raster)},Geometry:function(a,
+b){b.geometry={};this.readChildNodes(a,b.geometry)},ColorMap:function(a,b){b.colorMap=[];this.readChildNodes(a,b.colorMap)},ColorMapEntry:function(a,b){var c=a.getAttribute("quantity"),d=a.getAttribute("opacity");b.push({color:a.getAttribute("color"),quantity:null!==c?parseFloat(c):void 0,label:a.getAttribute("label")||void 0,opacity:null!==d?parseFloat(d):void 0})},LineSymbolizer:function(a,b){var c={};this.readChildNodes(a,c);this.multipleSymbolizers?(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Line(c))):
+b.symbolizer.Line=OpenLayers.Util.applyDefaults(c,b.symbolizer.Line)},PolygonSymbolizer:function(a,b){var c={fill:!1,stroke:!1};this.multipleSymbolizers||(c=b.symbolizer.Polygon||c);this.readChildNodes(a,c);this.multipleSymbolizers?(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Polygon(c))):b.symbolizer.Polygon=c},PointSymbolizer:function(a,b){var c={fill:!1,stroke:!1,graphic:!1};this.multipleSymbolizers||(c=b.symbolizer.Point||c);this.readChildNodes(a,c);this.multipleSymbolizers?
+(c.zIndex=this.featureTypeCounter,b.symbolizers.push(new OpenLayers.Symbolizer.Point(c))):b.symbolizer.Point=c},Stroke:function(a,b){b.stroke=!0;this.readChildNodes(a,b)},Fill:function(a,b){b.fill=!0;this.readChildNodes(a,b)},CssParameter:function(a,b){var c=a.getAttribute("name"),d=this.cssMap[c];b.label&&("fill"===c?d="fontColor":"fill-opacity"===c&&(d="fontOpacity"));d&&(c=this.readers.ogc._expression.call(this,a))&&(b[d]=c)},Graphic:function(a,b){b.graphic=!0;var c={};this.readChildNodes(a,c);
+for(var d="stroke strokeColor strokeWidth strokeOpacity strokeLinecap fill fillColor fillOpacity graphicName rotation graphicFormat".split(" "),e,f,g=0,h=d.length;g<h;++g)e=d[g],f=c[e],void 0!=f&&(b[e]=f);void 0!=c.opacity&&(b.graphicOpacity=c.opacity);void 0!=c.size&&(isNaN(c.size/2)?b.graphicWidth=c.size:b.pointRadius=c.size/2);void 0!=c.href&&(b.externalGraphic=c.href);void 0!=c.rotation&&(b.rotation=c.rotation)},ExternalGraphic:function(a,b){this.readChildNodes(a,b)},Mark:function(a,b){this.readChildNodes(a,
+b)},WellKnownName:function(a,b){b.graphicName=this.getChildValue(a)},Opacity:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.opacity=c)},Size:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.size=c)},Rotation:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.rotation=c)},OnlineResource:function(a,b){b.href=this.getAttributeNS(a,this.namespaces.xlink,"href")},Format:function(a,b){b.graphicFormat=this.getChildValue(a)}}},OpenLayers.Format.Filter.v1_0_0.prototype.readers),
+cssMap:{stroke:"strokeColor","stroke-opacity":"strokeOpacity","stroke-width":"strokeWidth","stroke-linecap":"strokeLinecap","stroke-dasharray":"strokeDashstyle",fill:"fillColor","fill-opacity":"fillOpacity","font-family":"fontFamily","font-size":"fontSize","font-weight":"fontWeight","font-style":"fontStyle"},getCssProperty:function(a){var b=null,c;for(c in this.cssMap)if(this.cssMap[c]==a){b=c;break}return b},getGraphicFormat:function(a){var b,c;for(c in this.graphicFormats)if(this.graphicFormats[c].test(a)){b=
+c;break}return b||this.defaultGraphicFormat},defaultGraphicFormat:"image/png",graphicFormats:{"image/jpeg":/\.jpe?g$/i,"image/gif":/\.gif$/i,"image/png":/\.png$/i},write:function(a){return this.writers.sld.StyledLayerDescriptor.apply(this,[a])},writers:OpenLayers.Util.applyDefaults({sld:{_OGCExpression:function(a,b){var c=this.createElementNSPlus(a),d="string"==typeof b?b.split("${"):[b];c.appendChild(this.createTextNode(d[0]));for(var e,f,g=1,h=d.length;g<h;g++)e=d[g],f=e.indexOf("}"),0<f?(this.writeNode("ogc:PropertyName",
+{property:e.substring(0,f)},c),c.appendChild(this.createTextNode(e.substring(++f)))):c.appendChild(this.createTextNode("${"+e));return c},StyledLayerDescriptor:function(a){var b=this.createElementNSPlus("sld:StyledLayerDescriptor",{attributes:{version:this.VERSION,"xsi:schemaLocation":this.schemaLocation}});b.setAttribute("xmlns:ogc",this.namespaces.ogc);b.setAttribute("xmlns:gml",this.namespaces.gml);a.name&&this.writeNode("Name",a.name,b);a.title&&this.writeNode("Title",a.title,b);a.description&&
+this.writeNode("Abstract",a.description,b);if(OpenLayers.Util.isArray(a.namedLayers))for(var c=0,d=a.namedLayers.length;c<d;++c)this.writeNode("NamedLayer",a.namedLayers[c],b);else for(c in a.namedLayers)this.writeNode("NamedLayer",a.namedLayers[c],b);return b},Name:function(a){return this.createElementNSPlus("sld:Name",{value:a})},Title:function(a){return this.createElementNSPlus("sld:Title",{value:a})},Abstract:function(a){return this.createElementNSPlus("sld:Abstract",{value:a})},NamedLayer:function(a){var b=
+this.createElementNSPlus("sld:NamedLayer");this.writeNode("Name",a.name,b);if(a.namedStyles)for(var c=0,d=a.namedStyles.length;c<d;++c)this.writeNode("NamedStyle",a.namedStyles[c],b);if(a.userStyles)for(c=0,d=a.userStyles.length;c<d;++c)this.writeNode("UserStyle",a.userStyles[c],b);return b},NamedStyle:function(a){var b=this.createElementNSPlus("sld:NamedStyle");this.writeNode("Name",a,b);return b},UserStyle:function(a){var b=this.createElementNSPlus("sld:UserStyle");a.name&&this.writeNode("Name",
+a.name,b);a.title&&this.writeNode("Title",a.title,b);a.description&&this.writeNode("Abstract",a.description,b);a.isDefault&&this.writeNode("IsDefault",a.isDefault,b);if(this.multipleSymbolizers&&a.rules){for(var c={0:[]},d=[0],e,f,g,h,k,l=0,m=a.rules.length;l<m;++l)if(e=a.rules[l],e.symbolizers){f={};for(var n=0,p=e.symbolizers.length;n<p;++n)g=e.symbolizers[n],h=g.zIndex,h in f||(k=e.clone(),k.symbolizers=[],f[h]=k),f[h].symbolizers.push(g.clone());for(h in f)h in c||(d.push(h),c[h]=[]),c[h].push(f[h])}else c[0].push(e.clone());
+d.sort();l=0;for(m=d.length;l<m;++l)e=c[d[l]],0<e.length&&(k=a.clone(),k.rules=c[d[l]],this.writeNode("FeatureTypeStyle",k,b))}else this.writeNode("FeatureTypeStyle",a,b);return b},IsDefault:function(a){return this.createElementNSPlus("sld:IsDefault",{value:a?"1":"0"})},FeatureTypeStyle:function(a){for(var b=this.createElementNSPlus("sld:FeatureTypeStyle"),c=0,d=a.rules.length;c<d;++c)this.writeNode("Rule",a.rules[c],b);return b},Rule:function(a){var b=this.createElementNSPlus("sld:Rule");a.name&&
+this.writeNode("Name",a.name,b);a.title&&this.writeNode("Title",a.title,b);a.description&&this.writeNode("Abstract",a.description,b);a.elseFilter?this.writeNode("ElseFilter",null,b):a.filter&&this.writeNode("ogc:Filter",a.filter,b);void 0!=a.minScaleDenominator&&this.writeNode("MinScaleDenominator",a.minScaleDenominator,b);void 0!=a.maxScaleDenominator&&this.writeNode("MaxScaleDenominator",a.maxScaleDenominator,b);var c,d;if(this.multipleSymbolizers&&a.symbolizers)for(var e=0,f=a.symbolizers.length;e<
+f;++e)d=a.symbolizers[e],c=d.CLASS_NAME.split(".").pop(),this.writeNode(c+"Symbolizer",d,b);else for(var f=OpenLayers.Style.SYMBOLIZER_PREFIXES,e=0,g=f.length;e<g;++e)c=f[e],(d=a.symbolizer[c])&&this.writeNode(c+"Symbolizer",d,b);return b},ElseFilter:function(){return this.createElementNSPlus("sld:ElseFilter")},MinScaleDenominator:function(a){return this.createElementNSPlus("sld:MinScaleDenominator",{value:a})},MaxScaleDenominator:function(a){return this.createElementNSPlus("sld:MaxScaleDenominator",
+{value:a})},LineSymbolizer:function(a){var b=this.createElementNSPlus("sld:LineSymbolizer");this.writeNode("Stroke",a,b);return b},Stroke:function(a){var b=this.createElementNSPlus("sld:Stroke");void 0!=a.strokeColor&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeColor"},b);void 0!=a.strokeOpacity&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeOpacity"},b);void 0!=a.strokeWidth&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeWidth"},b);void 0!=a.strokeDashstyle&&"solid"!==
+a.strokeDashstyle&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeDashstyle"},b);void 0!=a.strokeLinecap&&this.writeNode("CssParameter",{symbolizer:a,key:"strokeLinecap"},b);return b},CssParameter:function(a){return this.createElementNSPlus("sld:CssParameter",{attributes:{name:this.getCssProperty(a.key)},value:a.symbolizer[a.key]})},TextSymbolizer:function(a){var b=this.createElementNSPlus("sld:TextSymbolizer");null!=a.label&&this.writeNode("Label",a.label,b);null==a.fontFamily&&null==a.fontSize&&
+null==a.fontWeight&&null==a.fontStyle||this.writeNode("Font",a,b);null==a.labelAnchorPointX&&null==a.labelAnchorPointY&&null==a.labelAlign&&null==a.labelXOffset&&null==a.labelYOffset&&null==a.labelRotation&&null==a.labelPerpendicularOffset||this.writeNode("LabelPlacement",a,b);null==a.haloRadius&&null==a.haloColor&&null==a.haloOpacity||this.writeNode("Halo",a,b);null==a.fontColor&&null==a.fontOpacity||this.writeNode("Fill",{fillColor:a.fontColor,fillOpacity:a.fontOpacity},b);return b},LabelPlacement:function(a){var b=
+this.createElementNSPlus("sld:LabelPlacement");null==a.labelAnchorPointX&&null==a.labelAnchorPointY&&null==a.labelAlign&&null==a.labelXOffset&&null==a.labelYOffset&&null==a.labelRotation||null!=a.labelPerpendicularOffset||this.writeNode("PointPlacement",a,b);null!=a.labelPerpendicularOffset&&this.writeNode("LinePlacement",a,b);return b},LinePlacement:function(a){var b=this.createElementNSPlus("sld:LinePlacement");this.writeNode("PerpendicularOffset",a.labelPerpendicularOffset,b);return b},PerpendicularOffset:function(a){return this.createElementNSPlus("sld:PerpendicularOffset",
+{value:a})},PointPlacement:function(a){var b=this.createElementNSPlus("sld:PointPlacement");null==a.labelAnchorPointX&&null==a.labelAnchorPointY&&null==a.labelAlign||this.writeNode("AnchorPoint",a,b);null==a.labelXOffset&&null==a.labelYOffset||this.writeNode("Displacement",a,b);null!=a.labelRotation&&this.writeNode("Rotation",a.labelRotation,b);return b},AnchorPoint:function(a){var b=this.createElementNSPlus("sld:AnchorPoint"),c=a.labelAnchorPointX,d=a.labelAnchorPointY;null!=c&&this.writeNode("AnchorPointX",
+c,b);null!=d&&this.writeNode("AnchorPointY",d,b);if(null==c&&null==d){var e=a.labelAlign.substr(0,1);a=a.labelAlign.substr(1,1);"l"===e?c=0:"c"===e?c=0.5:"r"===e&&(c=1);"b"===a?d=0:"m"===a?d=0.5:"t"===a&&(d=1);this.writeNode("AnchorPointX",c,b);this.writeNode("AnchorPointY",d,b)}return b},AnchorPointX:function(a){return this.createElementNSPlus("sld:AnchorPointX",{value:a})},AnchorPointY:function(a){return this.createElementNSPlus("sld:AnchorPointY",{value:a})},Displacement:function(a){var b=this.createElementNSPlus("sld:Displacement");
+null!=a.labelXOffset&&this.writeNode("DisplacementX",a.labelXOffset,b);null!=a.labelYOffset&&this.writeNode("DisplacementY",a.labelYOffset,b);return b},DisplacementX:function(a){return this.createElementNSPlus("sld:DisplacementX",{value:a})},DisplacementY:function(a){return this.createElementNSPlus("sld:DisplacementY",{value:a})},Font:function(a){var b=this.createElementNSPlus("sld:Font");a.fontFamily&&this.writeNode("CssParameter",{symbolizer:a,key:"fontFamily"},b);a.fontSize&&this.writeNode("CssParameter",
+{symbolizer:a,key:"fontSize"},b);a.fontWeight&&this.writeNode("CssParameter",{symbolizer:a,key:"fontWeight"},b);a.fontStyle&&this.writeNode("CssParameter",{symbolizer:a,key:"fontStyle"},b);return b},Label:function(a){return this.writers.sld._OGCExpression.call(this,"sld:Label",a)},Halo:function(a){var b=this.createElementNSPlus("sld:Halo");a.haloRadius&&this.writeNode("Radius",a.haloRadius,b);(a.haloColor||a.haloOpacity)&&this.writeNode("Fill",{fillColor:a.haloColor,fillOpacity:a.haloOpacity},b);
+return b},Radius:function(a){return this.createElementNSPlus("sld:Radius",{value:a})},RasterSymbolizer:function(a){var b=this.createElementNSPlus("sld:RasterSymbolizer");a.geometry&&this.writeNode("Geometry",a.geometry,b);a.opacity&&this.writeNode("Opacity",a.opacity,b);a.colorMap&&this.writeNode("ColorMap",a.colorMap,b);return b},Geometry:function(a){var b=this.createElementNSPlus("sld:Geometry");a.property&&this.writeNode("ogc:PropertyName",a,b);return b},ColorMap:function(a){for(var b=this.createElementNSPlus("sld:ColorMap"),
+c=0,d=a.length;c<d;++c)this.writeNode("ColorMapEntry",a[c],b);return b},ColorMapEntry:function(a){var b=this.createElementNSPlus("sld:ColorMapEntry");b.setAttribute("color",a.color);void 0!==a.opacity&&b.setAttribute("opacity",parseFloat(a.opacity));void 0!==a.quantity&&b.setAttribute("quantity",parseFloat(a.quantity));void 0!==a.label&&b.setAttribute("label",a.label);return b},PolygonSymbolizer:function(a){var b=this.createElementNSPlus("sld:PolygonSymbolizer");!1!==a.fill&&this.writeNode("Fill",
+a,b);!1!==a.stroke&&this.writeNode("Stroke",a,b);return b},Fill:function(a){var b=this.createElementNSPlus("sld:Fill");a.fillColor&&this.writeNode("CssParameter",{symbolizer:a,key:"fillColor"},b);null!=a.fillOpacity&&this.writeNode("CssParameter",{symbolizer:a,key:"fillOpacity"},b);return b},PointSymbolizer:function(a){var b=this.createElementNSPlus("sld:PointSymbolizer");this.writeNode("Graphic",a,b);return b},Graphic:function(a){var b=this.createElementNSPlus("sld:Graphic");void 0!=a.externalGraphic?
+this.writeNode("ExternalGraphic",a,b):this.writeNode("Mark",a,b);void 0!=a.graphicOpacity&&this.writeNode("Opacity",a.graphicOpacity,b);void 0!=a.pointRadius?this.writeNode("Size",2*a.pointRadius,b):void 0!=a.graphicWidth&&this.writeNode("Size",a.graphicWidth,b);void 0!=a.rotation&&this.writeNode("Rotation",a.rotation,b);return b},ExternalGraphic:function(a){var b=this.createElementNSPlus("sld:ExternalGraphic");this.writeNode("OnlineResource",a.externalGraphic,b);a=a.graphicFormat||this.getGraphicFormat(a.externalGraphic);
+this.writeNode("Format",a,b);return b},Mark:function(a){var b=this.createElementNSPlus("sld:Mark");a.graphicName&&this.writeNode("WellKnownName",a.graphicName,b);!1!==a.fill&&this.writeNode("Fill",a,b);!1!==a.stroke&&this.writeNode("Stroke",a,b);return b},WellKnownName:function(a){return this.createElementNSPlus("sld:WellKnownName",{value:a})},Opacity:function(a){return this.createElementNSPlus("sld:Opacity",{value:a})},Size:function(a){return this.writers.sld._OGCExpression.call(this,"sld:Size",
+a)},Rotation:function(a){return this.createElementNSPlus("sld:Rotation",{value:a})},OnlineResource:function(a){return this.createElementNSPlus("sld:OnlineResource",{attributes:{"xlink:type":"simple","xlink:href":a}})},Format:function(a){return this.createElementNSPlus("sld:Format",{value:a})}}},OpenLayers.Format.Filter.v1_0_0.prototype.writers),CLASS_NAME:"OpenLayers.Format.SLD.v1"});OpenLayers.Layer.WMS=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{service:"WMS",version:"1.1.1",request:"GetMap",styles:"",format:"image/jpeg"},isBaseLayer:!0,encodeBBOX:!1,noMagic:!1,yx:{},initialize:function(a,b,c,d){var e=[];c=OpenLayers.Util.upperCaseObject(c);1.3<=parseFloat(c.VERSION)&&!c.EXCEPTIONS&&(c.EXCEPTIONS="INIMAGE");e.push(a,b,c,d);OpenLayers.Layer.Grid.prototype.initialize.apply(this,e);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));
+!this.noMagic&&(this.params.TRANSPARENT&&"true"==this.params.TRANSPARENT.toString().toLowerCase())&&(null!=d&&d.isBaseLayer||(this.isBaseLayer=!1),"image/jpeg"==this.params.FORMAT&&(this.params.FORMAT=OpenLayers.Util.alphaHack()?"image/gif":"image/png"))},clone:function(a){null==a&&(a=new OpenLayers.Layer.WMS(this.name,this.url,this.params,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},reverseAxisOrder:function(){var a=this.projection.getCode();return 1.3<=parseFloat(this.params.VERSION)&&
+!!(this.yx[a]||OpenLayers.Projection.defaults[a]&&OpenLayers.Projection.defaults[a].yx)},getURL:function(a){a=this.adjustBounds(a);var b=this.getImageSize(),c={},d=this.reverseAxisOrder();c.BBOX=this.encodeBBOX?a.toBBOX(null,d):a.toArray(d);c.WIDTH=b.w;c.HEIGHT=b.h;return this.getFullRequestString(c)},mergeNewParams:function(a){a=[OpenLayers.Util.upperCaseObject(a)];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,a)},getFullRequestString:function(a,b){var c=this.map.getProjectionObject(),
+c=this.projection&&this.projection.equals(c)?this.projection.getCode():c.getCode(),c="none"==c?null:c;1.3<=parseFloat(this.params.VERSION)?this.params.CRS=c:this.params.SRS=c;"boolean"==typeof this.params.TRANSPARENT&&(a.TRANSPARENT=this.params.TRANSPARENT?"TRUE":"FALSE");return OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,arguments)},CLASS_NAME:"OpenLayers.Layer.WMS"});OpenLayers.Layer.KaMap=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,DEFAULT_PARAMS:{i:"jpeg",map:""},initialize:function(a,b,c,d){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS)},getURL:function(a){a=this.adjustBounds(a);var b=this.map.getResolution(),c=Math.round(1E4*this.map.getScale())/1E4,d=Math.round(a.left/b);a=-Math.round(a.top/b);return this.getFullRequestString({t:a,l:d,s:c})},calculateGridLayout:function(a,
+b,c){b=c*this.tileSize.w;c*=this.tileSize.h;return{tilelon:b,tilelat:c,startcol:Math.floor(a.left/b)-this.buffer,startrow:Math.floor(a.top/c)+this.buffer}},getTileBoundsForGridIndex:function(a,b){this.getTileOrigin();var c=this.gridLayout,d=c.tilelon,e=c.tilelat,f=(c.startcol+b)*d,c=(c.startrow-a)*e;return new OpenLayers.Bounds(f,c,f+d,c+e)},clone:function(a){null==a&&(a=new OpenLayers.Layer.KaMap(this.name,this.url,this.params,this.getOptions()));a=OpenLayers.Layer.Grid.prototype.clone.apply(this,
+[a]);null!=this.tileSize&&(a.tileSize=this.tileSize.clone());a.grid=[];return a},getTileBounds:function(a){var b=this.getResolution(),c=b*this.tileSize.w,b=b*this.tileSize.h,d=this.getLonLatFromViewPortPx(a);a=c*Math.floor(d.lon/c);d=b*Math.floor(d.lat/b);return new OpenLayers.Bounds(a,d,a+c,d+b)},CLASS_NAME:"OpenLayers.Layer.KaMap"});OpenLayers.Format.WMC.v1_1_0=OpenLayers.Class(OpenLayers.Format.WMC.v1,{VERSION:"1.1.0",schemaLocation:"http://www.opengis.net/context http://schemas.opengis.net/context/1.1.0/context.xsd",initialize:function(a){OpenLayers.Format.WMC.v1.prototype.initialize.apply(this,[a])},read_sld_MinScaleDenominator:function(a,b){var c=parseFloat(this.getChildValue(b));0<c&&(a.maxScale=c)},read_sld_MaxScaleDenominator:function(a,b){a.minScale=parseFloat(this.getChildValue(b))},read_wmc_SRS:function(a,b){"srs"in
+a||(a.srs={});a.srs[this.getChildValue(b)]=!0},write_wmc_Layer:function(a){var b=OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(this,[a]);if(a.maxScale){var c=this.createElementNS(this.namespaces.sld,"sld:MinScaleDenominator");c.appendChild(this.createTextNode(a.maxScale.toPrecision(16)));b.appendChild(c)}a.minScale&&(c=this.createElementNS(this.namespaces.sld,"sld:MaxScaleDenominator"),c.appendChild(this.createTextNode(a.minScale.toPrecision(16))),b.appendChild(c));if(a.srs)for(var d in a.srs)b.appendChild(this.createElementDefaultNS("SRS",
+d));b.appendChild(this.write_wmc_FormatList(a));b.appendChild(this.write_wmc_StyleList(a));a.dimensions&&b.appendChild(this.write_wmc_DimensionList(a));b.appendChild(this.write_wmc_LayerExtension(a));return b},CLASS_NAME:"OpenLayers.Format.WMC.v1_1_0"});OpenLayers.Format.XLS=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.1.0",stringifyOutput:!0,CLASS_NAME:"OpenLayers.Format.XLS"});OpenLayers.Format.XLS.v1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{xls:"http://www.opengis.net/xls",gml:"http://www.opengis.net/gml",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},xy:!0,defaultPrefix:"xls",schemaLocation:null,read:function(a,b){OpenLayers.Util.applyDefaults(b,this.options);var c={};this.readChildNodes(a,c);return c},readers:{xls:{XLS:function(a,b){b.version=a.getAttribute("version");
+this.readChildNodes(a,b)},Response:function(a,b){this.readChildNodes(a,b)},GeocodeResponse:function(a,b){b.responseLists=[];this.readChildNodes(a,b)},GeocodeResponseList:function(a,b){var c={features:[],numberOfGeocodedAddresses:parseInt(a.getAttribute("numberOfGeocodedAddresses"))};b.responseLists.push(c);this.readChildNodes(a,c)},GeocodedAddress:function(a,b){var c=new OpenLayers.Feature.Vector;b.features.push(c);this.readChildNodes(a,c);c.geometry=c.components[0]},GeocodeMatchCode:function(a,b){b.attributes.matchCode=
+{accuracy:parseFloat(a.getAttribute("accuracy")),matchType:a.getAttribute("matchType")}},Address:function(a,b){var c={countryCode:a.getAttribute("countryCode"),addressee:a.getAttribute("addressee"),street:[],place:[]};b.attributes.address=c;this.readChildNodes(a,c)},freeFormAddress:function(a,b){b.freeFormAddress=this.getChildValue(a)},StreetAddress:function(a,b){this.readChildNodes(a,b)},Building:function(a,b){b.building={number:a.getAttribute("number"),subdivision:a.getAttribute("subdivision"),
+buildingName:a.getAttribute("buildingName")}},Street:function(a,b){b.street.push(this.getChildValue(a))},Place:function(a,b){b.place[a.getAttribute("type")]=this.getChildValue(a)},PostalCode:function(a,b){b.postalCode=this.getChildValue(a)}},gml:OpenLayers.Format.GML.v3.prototype.readers.gml},write:function(a){return this.writers.xls.XLS.apply(this,[a])},writers:{xls:{XLS:function(a){var b=this.createElementNSPlus("xls:XLS",{attributes:{version:this.VERSION,"xsi:schemaLocation":this.schemaLocation}});
+this.writeNode("RequestHeader",a.header,b);this.writeNode("Request",a,b);return b},RequestHeader:function(a){return this.createElementNSPlus("xls:RequestHeader")},Request:function(a){var b=this.createElementNSPlus("xls:Request",{attributes:{methodName:"GeocodeRequest",requestID:a.requestID||"",version:this.VERSION}});this.writeNode("GeocodeRequest",a.addresses,b);return b},GeocodeRequest:function(a){for(var b=this.createElementNSPlus("xls:GeocodeRequest"),c=0,d=a.length;c<d;c++)this.writeNode("Address",
+a[c],b);return b},Address:function(a){var b=this.createElementNSPlus("xls:Address",{attributes:{countryCode:a.countryCode}});a.freeFormAddress?this.writeNode("freeFormAddress",a.freeFormAddress,b):(a.street&&this.writeNode("StreetAddress",a,b),a.municipality&&this.writeNode("Municipality",a.municipality,b),a.countrySubdivision&&this.writeNode("CountrySubdivision",a.countrySubdivision,b),a.postalCode&&this.writeNode("PostalCode",a.postalCode,b));return b},freeFormAddress:function(a){return this.createElementNSPlus("freeFormAddress",
+{value:a})},StreetAddress:function(a){var b=this.createElementNSPlus("xls:StreetAddress");a.building&&this.writeNode(b,"Building",a.building);a=a.street;OpenLayers.Util.isArray(a)||(a=[a]);for(var c=0,d=a.length;c<d;c++)this.writeNode("Street",a[c],b);return b},Building:function(a){return this.createElementNSPlus("xls:Building",{attributes:{number:a.number,subdivision:a.subdivision,buildingName:a.buildingName}})},Street:function(a){return this.createElementNSPlus("xls:Street",{value:a})},Municipality:function(a){return this.createElementNSPlus("xls:Place",
+{attributes:{type:"Municipality"},value:a})},CountrySubdivision:function(a){return this.createElementNSPlus("xls:Place",{attributes:{type:"CountrySubdivision"},value:a})},PostalCode:function(a){return this.createElementNSPlus("xls:PostalCode",{value:a})}}},CLASS_NAME:"OpenLayers.Format.XLS.v1"});OpenLayers.Format.XLS.v1_1_0=OpenLayers.Class(OpenLayers.Format.XLS.v1,{VERSION:"1.1",schemaLocation:"http://www.opengis.net/xls http://schemas.opengis.net/ols/1.1.0/LocationUtilityService.xsd",CLASS_NAME:"OpenLayers.Format.XLS.v1_1_0"});OpenLayers.Format.XLS.v1_1=OpenLayers.Format.XLS.v1_1_0;OpenLayers.Renderer.SVG=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"http://www.w3.org/2000/svg",xlinkns:"http://www.w3.org/1999/xlink",MAX_PIXEL:15E3,translationParameters:null,symbolMetrics:null,initialize:function(a){this.supported()&&(OpenLayers.Renderer.Elements.prototype.initialize.apply(this,arguments),this.translationParameters={x:0,y:0},this.symbolMetrics={})},supported:function(){return document.implementation&&(document.implementation.hasFeature("org.w3c.svg","1.0")||document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#SVG",
+"1.1")||document.implementation.hasFeature("http://www.w3.org/TR/SVG11/feature#BasicStructure","1.1"))},inValidRange:function(a,b,c){a+=c?0:this.translationParameters.x;b+=c?0:this.translationParameters.y;return a>=-this.MAX_PIXEL&&a<=this.MAX_PIXEL&&b>=-this.MAX_PIXEL&&b<=this.MAX_PIXEL},setExtent:function(a,b){var c=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments),d=this.getResolution(),e=-a.left/d,d=a.top/d;if(b)return this.left=e,this.top=d,this.rendererRoot.setAttributeNS(null,
+"viewBox","0 0 "+this.size.w+" "+this.size.h),this.translate(this.xOffset,0),!0;(e=this.translate(e-this.left+this.xOffset,d-this.top))||this.setExtent(a,!0);return c&&e},translate:function(a,b){if(this.inValidRange(a,b,!0)){var c="";if(a||b)c="translate("+a+","+b+")";this.root.setAttributeNS(null,"transform",c);this.translationParameters={x:a,y:b};return!0}return!1},setSize:function(a){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);this.rendererRoot.setAttributeNS(null,"width",this.size.w);
+this.rendererRoot.setAttributeNS(null,"height",this.size.h)},getNodeType:function(a,b){var c=null;switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":c=b.externalGraphic?"image":this.isComplexSymbol(b.graphicName)?"svg":"circle";break;case "OpenLayers.Geometry.Rectangle":c="rect";break;case "OpenLayers.Geometry.LineString":c="polyline";break;case "OpenLayers.Geometry.LinearRing":c="polygon";break;case "OpenLayers.Geometry.Polygon":case "OpenLayers.Geometry.Curve":c="path"}return c},setStyle:function(a,
+b,c){b=b||a._style;c=c||a._options;var d=b.title||b.graphicTitle;if(d){a.setAttributeNS(null,"title",d);var e=a.getElementsByTagName("title");0<e.length?e[0].firstChild.textContent=d:(e=this.nodeFactory(null,"title"),e.textContent=d,a.appendChild(e))}var e=parseFloat(a.getAttributeNS(null,"r")),d=1,f;if("OpenLayers.Geometry.Point"==a._geometryClass&&e){a.style.visibility="";if(!1===b.graphic)a.style.visibility="hidden";else if(b.externalGraphic){f=this.getPosition(a);b.graphicWidth&&b.graphicHeight&&
+a.setAttributeNS(null,"preserveAspectRatio","none");var e=b.graphicWidth||b.graphicHeight,g=b.graphicHeight||b.graphicWidth,e=e?e:2*b.pointRadius,g=g?g:2*b.pointRadius,h=void 0!=b.graphicYOffset?b.graphicYOffset:-(0.5*g),k=b.graphicOpacity||b.fillOpacity;a.setAttributeNS(null,"x",(f.x+(void 0!=b.graphicXOffset?b.graphicXOffset:-(0.5*e))).toFixed());a.setAttributeNS(null,"y",(f.y+h).toFixed());a.setAttributeNS(null,"width",e);a.setAttributeNS(null,"height",g);a.setAttributeNS(this.xlinkns,"xlink:href",
+b.externalGraphic);a.setAttributeNS(null,"style","opacity: "+k);a.onclick=OpenLayers.Event.preventDefault}else if(this.isComplexSymbol(b.graphicName)){var e=3*b.pointRadius,g=2*e,l=this.importSymbol(b.graphicName);f=this.getPosition(a);d=3*this.symbolMetrics[l.id][0]/g;h=a.parentNode;k=a.nextSibling;h&&h.removeChild(a);a.firstChild&&a.removeChild(a.firstChild);a.appendChild(l.firstChild.cloneNode(!0));a.setAttributeNS(null,"viewBox",l.getAttributeNS(null,"viewBox"));a.setAttributeNS(null,"width",
+g);a.setAttributeNS(null,"height",g);a.setAttributeNS(null,"x",f.x-e);a.setAttributeNS(null,"y",f.y-e);k?h.insertBefore(a,k):h&&h.appendChild(a)}else a.setAttributeNS(null,"r",b.pointRadius);e=b.rotation;void 0===e&&void 0===a._rotation||!f||(a._rotation=e,e|=0,"svg"!==a.nodeName?a.setAttributeNS(null,"transform","rotate("+e+" "+f.x+" "+f.y+")"):(f=this.symbolMetrics[l.id],a.firstChild.setAttributeNS(null,"transform","rotate("+e+" "+f[1]+" "+f[2]+")")))}c.isFilled?(a.setAttributeNS(null,"fill",b.fillColor),
+a.setAttributeNS(null,"fill-opacity",b.fillOpacity)):a.setAttributeNS(null,"fill","none");c.isStroked?(a.setAttributeNS(null,"stroke",b.strokeColor),a.setAttributeNS(null,"stroke-opacity",b.strokeOpacity),a.setAttributeNS(null,"stroke-width",b.strokeWidth*d),a.setAttributeNS(null,"stroke-linecap",b.strokeLinecap||"round"),a.setAttributeNS(null,"stroke-linejoin","round"),b.strokeDashstyle&&a.setAttributeNS(null,"stroke-dasharray",this.dashStyle(b,d))):a.setAttributeNS(null,"stroke","none");b.pointerEvents&&
+a.setAttributeNS(null,"pointer-events",b.pointerEvents);null!=b.cursor&&a.setAttributeNS(null,"cursor",b.cursor);return a},dashStyle:function(a,b){var c=a.strokeWidth*b,d=a.strokeDashstyle;switch(d){case "solid":return"none";case "dot":return[1,4*c].join();case "dash":return[4*c,4*c].join();case "dashdot":return[4*c,4*c,1,4*c].join();case "longdash":return[8*c,4*c].join();case "longdashdot":return[8*c,4*c,1,4*c].join();default:return OpenLayers.String.trim(d).replace(/\s+/g,",")}},createNode:function(a,
+b){var c=document.createElementNS(this.xmlns,a);b&&c.setAttributeNS(null,"id",b);return c},nodeTypeCompare:function(a,b){return b==a.nodeName},createRenderRoot:function(){var a=this.nodeFactory(this.container.id+"_svgRoot","svg");a.style.display="block";return a},createRoot:function(a){return this.nodeFactory(this.container.id+a,"g")},createDefs:function(){var a=this.nodeFactory(this.container.id+"_defs","defs");this.rendererRoot.appendChild(a);return a},drawPoint:function(a,b){return this.drawCircle(a,
+b,1)},drawCircle:function(a,b,c){var d=this.getResolution(),e=(b.x-this.featureDx)/d+this.left;b=this.top-b.y/d;return this.inValidRange(e,b)?(a.setAttributeNS(null,"cx",e),a.setAttributeNS(null,"cy",b),a.setAttributeNS(null,"r",c),a):!1},drawLineString:function(a,b){var c=this.getComponentsString(b.components);return c.path?(a.setAttributeNS(null,"points",c.path),c.complete?a:null):!1},drawLinearRing:function(a,b){var c=this.getComponentsString(b.components);return c.path?(a.setAttributeNS(null,
+"points",c.path),c.complete?a:null):!1},drawPolygon:function(a,b){for(var c="",d=!0,e=!0,f,g,h=0,k=b.components.length;h<k;h++)c+=" M",f=this.getComponentsString(b.components[h].components," "),(g=f.path)?(c+=" "+g,e=f.complete&&e):d=!1;return d?(a.setAttributeNS(null,"d",c+" z"),a.setAttributeNS(null,"fill-rule","evenodd"),e?a:null):!1},drawRectangle:function(a,b){var c=this.getResolution(),d=(b.x-this.featureDx)/c+this.left,e=this.top-b.y/c;return this.inValidRange(d,e)?(a.setAttributeNS(null,"x",
+d),a.setAttributeNS(null,"y",e),a.setAttributeNS(null,"width",b.width/c),a.setAttributeNS(null,"height",b.height/c),a):!1},drawText:function(a,b,c){var d=!!b.labelOutlineWidth;if(d){var e=OpenLayers.Util.extend({},b);e.fontColor=e.labelOutlineColor;e.fontStrokeColor=e.labelOutlineColor;e.fontStrokeWidth=b.labelOutlineWidth;b.labelOutlineOpacity&&(e.fontOpacity=b.labelOutlineOpacity);delete e.labelOutlineWidth;this.drawText(a,e,c)}var f=this.getResolution(),e=(c.x-this.featureDx)/f+this.left,g=c.y/
+f-this.top,d=d?this.LABEL_OUTLINE_SUFFIX:this.LABEL_ID_SUFFIX,f=this.nodeFactory(a+d,"text");f.setAttributeNS(null,"x",e);f.setAttributeNS(null,"y",-g);b.fontColor&&f.setAttributeNS(null,"fill",b.fontColor);b.fontStrokeColor&&f.setAttributeNS(null,"stroke",b.fontStrokeColor);b.fontStrokeWidth&&f.setAttributeNS(null,"stroke-width",b.fontStrokeWidth);b.fontOpacity&&f.setAttributeNS(null,"opacity",b.fontOpacity);b.fontFamily&&f.setAttributeNS(null,"font-family",b.fontFamily);b.fontSize&&f.setAttributeNS(null,
+"font-size",b.fontSize);b.fontWeight&&f.setAttributeNS(null,"font-weight",b.fontWeight);b.fontStyle&&f.setAttributeNS(null,"font-style",b.fontStyle);!0===b.labelSelect?(f.setAttributeNS(null,"pointer-events","visible"),f._featureId=a):f.setAttributeNS(null,"pointer-events","none");g=b.labelAlign||OpenLayers.Renderer.defaultSymbolizer.labelAlign;f.setAttributeNS(null,"text-anchor",OpenLayers.Renderer.SVG.LABEL_ALIGN[g[0]]||"middle");!0===OpenLayers.IS_GECKO&&f.setAttributeNS(null,"dominant-baseline",
+OpenLayers.Renderer.SVG.LABEL_ALIGN[g[1]]||"central");for(var h=b.label.split("\n"),k=h.length;f.childNodes.length>k;)f.removeChild(f.lastChild);for(var l=0;l<k;l++){var m=this.nodeFactory(a+d+"_tspan_"+l,"tspan");!0===b.labelSelect&&(m._featureId=a,m._geometry=c,m._geometryClass=c.CLASS_NAME);!1===OpenLayers.IS_GECKO&&m.setAttributeNS(null,"baseline-shift",OpenLayers.Renderer.SVG.LABEL_VSHIFT[g[1]]||"-35%");m.setAttribute("x",e);if(0==l){var n=OpenLayers.Renderer.SVG.LABEL_VFACTOR[g[1]];null==n&&
+(n=-0.5);m.setAttribute("dy",n*(k-1)+"em")}else m.setAttribute("dy","1em");m.textContent=""===h[l]?" ":h[l];m.parentNode||f.appendChild(m)}f.parentNode||this.textRoot.appendChild(f)},getComponentsString:function(a,b){for(var c=[],d=!0,e=a.length,f=[],g,h=0;h<e;h++)g=a[h],c.push(g),(g=this.getShortString(g))?f.push(g):(0<h&&this.getShortString(a[h-1])&&f.push(this.clipLine(a[h],a[h-1])),h<e-1&&this.getShortString(a[h+1])&&f.push(this.clipLine(a[h],a[h+1])),d=!1);return{path:f.join(b||","),complete:d}},
+clipLine:function(a,b){if(b.equals(a))return"";var c=this.getResolution(),d=this.MAX_PIXEL-this.translationParameters.x,e=this.MAX_PIXEL-this.translationParameters.y,f=(b.x-this.featureDx)/c+this.left,g=this.top-b.y/c,h=(a.x-this.featureDx)/c+this.left,c=this.top-a.y/c,k;if(h<-d||h>d)k=(c-g)/(h-f),h=0>h?-d:d,c=g+(h-f)*k;if(c<-e||c>e)k=(h-f)/(c-g),c=0>c?-e:e,h=f+(c-g)*k;return h+","+c},getShortString:function(a){var b=this.getResolution(),c=(a.x-this.featureDx)/b+this.left;a=this.top-a.y/b;return this.inValidRange(c,
+a)?c+","+a:!1},getPosition:function(a){return{x:parseFloat(a.getAttributeNS(null,"cx")),y:parseFloat(a.getAttributeNS(null,"cy"))}},importSymbol:function(a){this.defs||(this.defs=this.createDefs());var b=this.container.id+"-"+a,c=document.getElementById(b);if(null!=c)return c;var d=OpenLayers.Renderer.symbol[a];if(!d)throw Error(a+" is not a valid symbol name");a=this.nodeFactory(b,"symbol");var e=this.nodeFactory(null,"polygon");a.appendChild(e);for(var c=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,
+0,0),f=[],g,h,k=0;k<d.length;k+=2)g=d[k],h=d[k+1],c.left=Math.min(c.left,g),c.bottom=Math.min(c.bottom,h),c.right=Math.max(c.right,g),c.top=Math.max(c.top,h),f.push(g,",",h);e.setAttributeNS(null,"points",f.join(" "));d=c.getWidth();e=c.getHeight();a.setAttributeNS(null,"viewBox",[c.left-d,c.bottom-e,3*d,3*e].join(" "));this.symbolMetrics[b]=[Math.max(d,e),c.getCenterLonLat().lon,c.getCenterLonLat().lat];this.defs.appendChild(a);return a},getFeatureIdFromEvent:function(a){var b=OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this,
+arguments);b||(b=a.target,b=b.parentNode&&b!=this.rendererRoot?b.parentNode._featureId:void 0);return b},CLASS_NAME:"OpenLayers.Renderer.SVG"});OpenLayers.Renderer.SVG.LABEL_ALIGN={l:"start",r:"end",b:"bottom",t:"hanging"};OpenLayers.Renderer.SVG.LABEL_VSHIFT={t:"-70%",b:"0"};OpenLayers.Renderer.SVG.LABEL_VFACTOR={t:0,b:-1};OpenLayers.Renderer.SVG.preventDefault=function(a){OpenLayers.Event.preventDefault(a)};OpenLayers.Format.SLD.v1_0_0=OpenLayers.Class(OpenLayers.Format.SLD.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sld http://schemas.opengis.net/sld/1.0.0/StyledLayerDescriptor.xsd",CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0"});OpenLayers.Format.OWSContext=OpenLayers.Class(OpenLayers.Format.Context,{defaultVersion:"0.3.1",getVersion:function(a,b){var c=OpenLayers.Format.XML.VersionedOGC.prototype.getVersion.apply(this,arguments);"0.3.0"===c&&(c=this.defaultVersion);return c},toContext:function(a){var b={};"OpenLayers.Map"==a.CLASS_NAME&&(b.bounds=a.getExtent(),b.maxExtent=a.maxExtent,b.projection=a.projection,b.size=a.getSize(),b.layers=a.layers);return b},CLASS_NAME:"OpenLayers.Format.OWSContext"});OpenLayers.Format.OWSContext.v0_3_1=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{owc:"http://www.opengis.net/ows-context",gml:"http://www.opengis.net/gml",kml:"http://www.opengis.net/kml/2.2",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows",sld:"http://www.opengis.net/sld",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},VERSION:"0.3.1",schemaLocation:"http://www.opengis.net/ows-context http://www.ogcnetwork.net/schemas/owc/0.3.1/owsContext.xsd",
+defaultPrefix:"owc",extractAttributes:!0,xy:!0,regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},featureNS:"http://mapserver.gis.umn.edu/mapserver",featureType:"vector",geometryName:"geometry",nestingLayerLookup:null,initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);OpenLayers.Format.GML.v2.prototype.setGeometryTypes.call(this)},setNestingPath:function(a){if(a.layersContext)for(var b=0,c=a.layersContext.length;b<c;b++){var d=
+a.layersContext[b],e=[],f=a.title||"";a.metadata&&a.metadata.nestingPath&&(e=a.metadata.nestingPath.slice());""!=f&&e.push(f);d.metadata.nestingPath=e;d.layersContext&&this.setNestingPath(d)}},decomposeNestingPath:function(a){var b=[];if(OpenLayers.Util.isArray(a)){for(a=a.slice();0<a.length;)b.push(a.slice()),a.pop();b.reverse()}return b},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,
+b);this.setNestingPath({layersContext:b.layersContext});a=[];this.processLayer(a,b);delete b.layersContext;b.layersContext=a;return b},processLayer:function(a,b){if(b.layersContext)for(var c=0,d=b.layersContext.length;c<d;c++){var e=b.layersContext[c];a.push(e);e.layersContext&&this.processLayer(a,e)}},write:function(a,b){this.nestingLayerLookup={};b=b||{};OpenLayers.Util.applyDefaults(b,a);var c=this.writeNode("OWSContext",b);this.nestingLayerLookup=null;this.setAttributeNS(c,this.namespaces.xsi,
+"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,[c])},readers:{kml:{Document:function(a,b){b.features=(new OpenLayers.Format.KML({kmlns:this.namespaces.kml,extractStyles:!0})).read(a)}},owc:{OWSContext:function(a,b){this.readChildNodes(a,b)},General:function(a,b){this.readChildNodes(a,b)},ResourceList:function(a,b){this.readChildNodes(a,b)},Layer:function(a,b){var c={metadata:{},visibility:"1"!=a.getAttribute("hidden"),queryable:"1"==a.getAttribute("queryable"),
+opacity:null!=a.getAttribute("opacity")?parseFloat(a.getAttribute("opacity")):null,name:a.getAttribute("name"),categoryLayer:null==a.getAttribute("name"),formats:[],styles:[]};b.layersContext||(b.layersContext=[]);b.layersContext.push(c);this.readChildNodes(a,c)},InlineGeometry:function(a,b){b.features=[];var c=this.getElementsByTagNameNS(a,this.namespaces.gml,"featureMember"),d;1<=c.length&&(d=c[0]);d&&d.firstChild&&(c=d.firstChild.nextSibling?d.firstChild.nextSibling:d.firstChild,this.setNamespace("feature",
+c.namespaceURI),this.featureType=c.localName||c.nodeName.split(":").pop(),this.readChildNodes(a,b))},Server:function(a,b){if(!b.service&&!b.version||b.service!=OpenLayers.Format.Context.serviceTypes.WMS)b.service=a.getAttribute("service"),b.version=a.getAttribute("version"),this.readChildNodes(a,b)},Name:function(a,b){b.name=this.getChildValue(a);this.readChildNodes(a,b)},Title:function(a,b){b.title=this.getChildValue(a);this.readChildNodes(a,b)},StyleList:function(a,b){this.readChildNodes(a,b.styles)},
+Style:function(a,b){var c={};b.push(c);this.readChildNodes(a,c)},LegendURL:function(a,b){var c={};b.legend=c;this.readChildNodes(a,c)},OnlineResource:function(a,b){b.url=this.getAttributeNS(a,this.namespaces.xlink,"href");this.readChildNodes(a,b)}},ows:OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows,gml:OpenLayers.Format.GML.v2.prototype.readers.gml,sld:OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld,feature:OpenLayers.Format.GML.v2.prototype.readers.feature},writers:{owc:{OWSContext:function(a){var b=
+this.createElementNSPlus("OWSContext",{attributes:{version:this.VERSION,id:a.id||OpenLayers.Util.createUniqueID("OpenLayers_OWSContext_")}});this.writeNode("General",a,b);this.writeNode("ResourceList",a,b);return b},General:function(a){var b=this.createElementNSPlus("General");this.writeNode("ows:BoundingBox",a,b);this.writeNode("ows:Title",a.title||"OpenLayers OWSContext",b);return b},ResourceList:function(a){for(var b=this.createElementNSPlus("ResourceList"),c=0,d=a.layers.length;c<d;c++){var e=
+a.layers[c],f=this.decomposeNestingPath(e.metadata.nestingPath);this.writeNode("_Layer",{layer:e,subPaths:f},b)}return b},Server:function(a){var b=this.createElementNSPlus("Server",{attributes:{version:a.version,service:a.service}});this.writeNode("OnlineResource",a,b);return b},OnlineResource:function(a){return this.createElementNSPlus("OnlineResource",{attributes:{"xlink:href":a.url}})},InlineGeometry:function(a){var b=this.createElementNSPlus("InlineGeometry"),c=a.getDataExtent();null!==c&&this.writeNode("gml:boundedBy",
+c,b);for(var c=0,d=a.features.length;c<d;c++)this.writeNode("gml:featureMember",a.features[c],b);return b},StyleList:function(a){for(var b=this.createElementNSPlus("StyleList"),c=0,d=a.length;c<d;c++)this.writeNode("Style",a[c],b);return b},Style:function(a){var b=this.createElementNSPlus("Style");this.writeNode("Name",a,b);this.writeNode("Title",a,b);a.legend&&this.writeNode("LegendURL",a,b);return b},Name:function(a){return this.createElementNSPlus("Name",{value:a.name})},Title:function(a){return this.createElementNSPlus("Title",
+{value:a.title})},LegendURL:function(a){var b=this.createElementNSPlus("LegendURL");this.writeNode("OnlineResource",a.legend,b);return b},_WMS:function(a){var b=this.createElementNSPlus("Layer",{attributes:{name:a.params.LAYERS,queryable:a.queryable?"1":"0",hidden:a.visibility?"0":"1",opacity:a.hasOwnProperty("opacity")?a.opacity:null}});this.writeNode("ows:Title",a.name,b);this.writeNode("ows:OutputFormat",a.params.FORMAT,b);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WMS,
+version:a.params.VERSION,url:a.url},b);a.metadata.styles&&0<a.metadata.styles.length&&this.writeNode("StyleList",a.metadata.styles,b);return b},_Layer:function(a){var b,c,d;b=a.layer;c=a.subPaths;d=null;0<c.length?(b=c[0].join("/"),c=b.lastIndexOf("/"),d=this.nestingLayerLookup[b],c=0<c?b.substring(c+1,b.length):b,d||(d=this.createElementNSPlus("Layer"),this.writeNode("ows:Title",c,d),this.nestingLayerLookup[b]=d),a.subPaths.shift(),this.writeNode("_Layer",a,d)):(b instanceof OpenLayers.Layer.WMS?
+d=this.writeNode("_WMS",b):b instanceof OpenLayers.Layer.Vector&&(b.protocol instanceof OpenLayers.Protocol.WFS.v1?d=this.writeNode("_WFS",b):b.protocol instanceof OpenLayers.Protocol.HTTP?b.protocol.format instanceof OpenLayers.Format.GML?(b.protocol.format.version="2.1.2",d=this.writeNode("_GML",b)):b.protocol.format instanceof OpenLayers.Format.KML&&(b.protocol.format.version="2.2",d=this.writeNode("_KML",b)):(this.setNamespace("feature",this.featureNS),d=this.writeNode("_InlineGeometry",b))),
+b.options.maxScale&&this.writeNode("sld:MinScaleDenominator",b.options.maxScale,d),b.options.minScale&&this.writeNode("sld:MaxScaleDenominator",b.options.minScale,d),this.nestingLayerLookup[b.name]=d);return d},_WFS:function(a){var b=this.createElementNSPlus("Layer",{attributes:{name:a.protocol.featurePrefix+":"+a.protocol.featureType,hidden:a.visibility?"0":"1"}});this.writeNode("ows:Title",a.name,b);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.WFS,version:a.protocol.version,
+url:a.protocol.url},b);return b},_InlineGeometry:function(a){var b=this.createElementNSPlus("Layer",{attributes:{name:this.featureType,hidden:a.visibility?"0":"1"}});this.writeNode("ows:Title",a.name,b);this.writeNode("InlineGeometry",a,b);return b},_GML:function(a){var b=this.createElementNSPlus("Layer");this.writeNode("ows:Title",a.name,b);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.GML,url:a.protocol.url,version:a.protocol.format.version},b);return b},_KML:function(a){var b=
+this.createElementNSPlus("Layer");this.writeNode("ows:Title",a.name,b);this.writeNode("Server",{service:OpenLayers.Format.Context.serviceTypes.KML,version:a.protocol.format.version,url:a.protocol.url},b);return b}},gml:OpenLayers.Util.applyDefaults({boundedBy:function(a){var b=this.createElementNSPlus("gml:boundedBy");this.writeNode("gml:Box",a,b);return b}},OpenLayers.Format.GML.v2.prototype.writers.gml),ows:OpenLayers.Format.OWSCommon.v1_0_0.prototype.writers.ows,sld:OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld,
+feature:OpenLayers.Format.GML.v2.prototype.writers.feature},CLASS_NAME:"OpenLayers.Format.OWSContext.v0_3_1"});OpenLayers.Popup=OpenLayers.Class({events:null,id:"",lonlat:null,div:null,contentSize:null,size:null,contentHTML:null,backgroundColor:"",opacity:"",border:"",contentDiv:null,groupDiv:null,closeDiv:null,autoSize:!1,minSize:null,maxSize:null,displayClass:"olPopup",contentDisplayClass:"olPopupContent",padding:0,disableFirefoxOverflowHack:!1,fixPadding:function(){"number"==typeof this.padding&&(this.padding=new OpenLayers.Bounds(this.padding,this.padding,this.padding,this.padding))},panMapIfOutOfView:!1,
+keepInMap:!1,closeOnMove:!1,map:null,initialize:function(a,b,c,d,e,f){null==a&&(a=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_"));this.id=a;this.lonlat=b;this.contentSize=null!=c?c:new OpenLayers.Size(OpenLayers.Popup.WIDTH,OpenLayers.Popup.HEIGHT);null!=d&&(this.contentHTML=d);this.backgroundColor=OpenLayers.Popup.COLOR;this.opacity=OpenLayers.Popup.OPACITY;this.border=OpenLayers.Popup.BORDER;this.div=OpenLayers.Util.createDiv(this.id,null,null,null,null,null,"hidden");this.div.className=this.displayClass;
+this.groupDiv=OpenLayers.Util.createDiv(this.id+"_GroupDiv",null,null,null,"relative",null,"hidden");a=this.div.id+"_contentDiv";this.contentDiv=OpenLayers.Util.createDiv(a,null,this.contentSize.clone(),null,"relative");this.contentDiv.className=this.contentDisplayClass;this.groupDiv.appendChild(this.contentDiv);this.div.appendChild(this.groupDiv);e&&this.addCloseBox(f);this.registerEvents()},destroy:function(){this.border=this.opacity=this.backgroundColor=this.contentHTML=this.size=this.lonlat=this.id=
+null;this.closeOnMove&&this.map&&this.map.events.unregister("movestart",this,this.hide);this.events.destroy();this.events=null;this.closeDiv&&(OpenLayers.Event.stopObservingElement(this.closeDiv),this.groupDiv.removeChild(this.closeDiv));this.closeDiv=null;this.div.removeChild(this.groupDiv);this.groupDiv=null;null!=this.map&&this.map.removePopup(this);this.panMapIfOutOfView=this.padding=this.maxSize=this.minSize=this.autoSize=this.div=this.map=null},draw:function(a){null==a&&null!=this.lonlat&&null!=
+this.map&&(a=this.map.getLayerPxFromLonLat(this.lonlat));this.closeOnMove&&this.map.events.register("movestart",this,this.hide);this.disableFirefoxOverflowHack||"firefox"!=OpenLayers.BROWSER_NAME||(this.map.events.register("movestart",this,function(){var a=document.defaultView.getComputedStyle(this.contentDiv,null).getPropertyValue("overflow");"hidden"!=a&&(this.contentDiv._oldOverflow=a,this.contentDiv.style.overflow="hidden")}),this.map.events.register("moveend",this,function(){var a=this.contentDiv._oldOverflow;
+a&&(this.contentDiv.style.overflow=a,this.contentDiv._oldOverflow=null)}));this.moveTo(a);this.autoSize||this.size||this.setSize(this.contentSize);this.setBackgroundColor();this.setOpacity();this.setBorder();this.setContentHTML();this.panMapIfOutOfView&&this.panIntoView();return this.div},updatePosition:function(){if(this.lonlat&&this.map){var a=this.map.getLayerPxFromLonLat(this.lonlat);a&&this.moveTo(a)}},moveTo:function(a){null!=a&&null!=this.div&&(this.div.style.left=a.x+"px",this.div.style.top=
+a.y+"px")},visible:function(){return OpenLayers.Element.visible(this.div)},toggle:function(){this.visible()?this.hide():this.show()},show:function(){this.div.style.display="";this.panMapIfOutOfView&&this.panIntoView()},hide:function(){this.div.style.display="none"},setSize:function(a){this.size=a.clone();var b=this.getContentDivPadding(),c=b.left+b.right,d=b.top+b.bottom;this.fixPadding();c+=this.padding.left+this.padding.right;d+=this.padding.top+this.padding.bottom;if(this.closeDiv)var e=parseInt(this.closeDiv.style.width),
+c=c+(e+b.right);this.size.w+=c;this.size.h+=d;"msie"==OpenLayers.BROWSER_NAME&&(this.contentSize.w+=b.left+b.right,this.contentSize.h+=b.bottom+b.top);null!=this.div&&(this.div.style.width=this.size.w+"px",this.div.style.height=this.size.h+"px");null!=this.contentDiv&&(this.contentDiv.style.width=a.w+"px",this.contentDiv.style.height=a.h+"px")},updateSize:function(){var a="<div class='"+this.contentDisplayClass+"'>"+this.contentDiv.innerHTML+"</div>",b=this.map?this.map.div:document.body,c=OpenLayers.Util.getRenderedDimensions(a,
+null,{displayClass:this.displayClass,containerElement:b}),d=this.getSafeContentSize(c),e=null;d.equals(c)?e=c:(c={w:d.w<c.w?d.w:null,h:d.h<c.h?d.h:null},c.w&&c.h?e=d:(a=OpenLayers.Util.getRenderedDimensions(a,c,{displayClass:this.contentDisplayClass,containerElement:b}),"hidden"!=OpenLayers.Element.getStyle(this.contentDiv,"overflow")&&a.equals(d)&&(d=OpenLayers.Util.getScrollbarWidth(),c.w?a.h+=d:a.w+=d),e=this.getSafeContentSize(a)));this.setSize(e)},setBackgroundColor:function(a){void 0!=a&&(this.backgroundColor=
+a);null!=this.div&&(this.div.style.backgroundColor=this.backgroundColor)},setOpacity:function(a){void 0!=a&&(this.opacity=a);null!=this.div&&(this.div.style.opacity=this.opacity,this.div.style.filter="alpha(opacity="+100*this.opacity+")")},setBorder:function(a){void 0!=a&&(this.border=a);null!=this.div&&(this.div.style.border=this.border)},setContentHTML:function(a){null!=a&&(this.contentHTML=a);null!=this.contentDiv&&(null!=this.contentHTML&&this.contentHTML!=this.contentDiv.innerHTML)&&(this.contentDiv.innerHTML=
+this.contentHTML,this.autoSize&&(this.registerImageListeners(),this.updateSize()))},registerImageListeners:function(){for(var a=function(){null!==this.popup.id&&(this.popup.updateSize(),this.popup.visible()&&this.popup.panMapIfOutOfView&&this.popup.panIntoView(),OpenLayers.Event.stopObserving(this.img,"load",this.img._onImgLoad))},b=this.contentDiv.getElementsByTagName("img"),c=0,d=b.length;c<d;c++){var e=b[c];if(0==e.width||0==e.height)e._onImgLoad=OpenLayers.Function.bind(a,{popup:this,img:e}),
+OpenLayers.Event.observe(e,"load",e._onImgLoad)}},getSafeContentSize:function(a){a=a.clone();var b=this.getContentDivPadding(),c=b.left+b.right,d=b.top+b.bottom;this.fixPadding();c+=this.padding.left+this.padding.right;d+=this.padding.top+this.padding.bottom;if(this.closeDiv)var e=parseInt(this.closeDiv.style.width),c=c+(e+b.right);this.minSize&&(a.w=Math.max(a.w,this.minSize.w-c),a.h=Math.max(a.h,this.minSize.h-d));this.maxSize&&(a.w=Math.min(a.w,this.maxSize.w-c),a.h=Math.min(a.h,this.maxSize.h-
+d));if(this.map&&this.map.size){e=b=0;if(this.keepInMap&&!this.panMapIfOutOfView)switch(e=this.map.getPixelFromLonLat(this.lonlat),this.relativePosition){case "tr":b=e.x;e=this.map.size.h-e.y;break;case "tl":b=this.map.size.w-e.x;e=this.map.size.h-e.y;break;case "bl":b=this.map.size.w-e.x;e=e.y;break;case "br":b=e.x;e=e.y;break;default:b=e.x,e=this.map.size.h-e.y}d=this.map.size.h-this.map.paddingForPopups.top-this.map.paddingForPopups.bottom-d-e;a.w=Math.min(a.w,this.map.size.w-this.map.paddingForPopups.left-
+this.map.paddingForPopups.right-c-b);a.h=Math.min(a.h,d)}return a},getContentDivPadding:function(){var a=this._contentDivPadding;a||(null==this.div.parentNode&&(this.div.style.display="none",document.body.appendChild(this.div)),this._contentDivPadding=a=new OpenLayers.Bounds(OpenLayers.Element.getStyle(this.contentDiv,"padding-left"),OpenLayers.Element.getStyle(this.contentDiv,"padding-bottom"),OpenLayers.Element.getStyle(this.contentDiv,"padding-right"),OpenLayers.Element.getStyle(this.contentDiv,
+"padding-top")),this.div.parentNode==document.body&&(document.body.removeChild(this.div),this.div.style.display=""));return a},addCloseBox:function(a){this.closeDiv=OpenLayers.Util.createDiv(this.id+"_close",null,{w:17,h:17});this.closeDiv.className="olPopupCloseBox";var b=this.getContentDivPadding();this.closeDiv.style.right=b.right+"px";this.closeDiv.style.top=b.top+"px";this.groupDiv.appendChild(this.closeDiv);a=a||function(a){this.hide();OpenLayers.Event.stop(a)};OpenLayers.Event.observe(this.closeDiv,
+"touchend",OpenLayers.Function.bindAsEventListener(a,this));OpenLayers.Event.observe(this.closeDiv,"click",OpenLayers.Function.bindAsEventListener(a,this))},panIntoView:function(){var a=this.map.getSize(),b=this.map.getViewPortPxFromLayerPx(new OpenLayers.Pixel(parseInt(this.div.style.left),parseInt(this.div.style.top))),c=b.clone();b.x<this.map.paddingForPopups.left?c.x=this.map.paddingForPopups.left:b.x+this.size.w>a.w-this.map.paddingForPopups.right&&(c.x=a.w-this.map.paddingForPopups.right-this.size.w);
+b.y<this.map.paddingForPopups.top?c.y=this.map.paddingForPopups.top:b.y+this.size.h>a.h-this.map.paddingForPopups.bottom&&(c.y=a.h-this.map.paddingForPopups.bottom-this.size.h);this.map.pan(b.x-c.x,b.y-c.y)},registerEvents:function(){this.events=new OpenLayers.Events(this,this.div,null,!0);this.events.on({mousedown:this.onmousedown,mousemove:this.onmousemove,mouseup:this.onmouseup,click:this.onclick,mouseout:this.onmouseout,dblclick:this.ondblclick,touchstart:function(a){OpenLayers.Event.stop(a,!0)},
+scope:this})},onmousedown:function(a){this.mousedown=!0;OpenLayers.Event.stop(a,!0)},onmousemove:function(a){this.mousedown&&OpenLayers.Event.stop(a,!0)},onmouseup:function(a){this.mousedown&&(this.mousedown=!1,OpenLayers.Event.stop(a,!0))},onclick:function(a){OpenLayers.Event.stop(a,!0)},onmouseout:function(a){this.mousedown=!1},ondblclick:function(a){OpenLayers.Event.stop(a,!0)},CLASS_NAME:"OpenLayers.Popup"});OpenLayers.Popup.WIDTH=200;OpenLayers.Popup.HEIGHT=200;OpenLayers.Popup.COLOR="white";
+OpenLayers.Popup.OPACITY=1;OpenLayers.Popup.BORDER="0px";OpenLayers.Control.ScaleLine=OpenLayers.Class(OpenLayers.Control,{maxWidth:100,topOutUnits:"km",topInUnits:"m",bottomOutUnits:"mi",bottomInUnits:"ft",eTop:null,eBottom:null,geodesic:!1,draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.eTop||(this.eTop=document.createElement("div"),this.eTop.className=this.displayClass+"Top",this.div.appendChild(this.eTop),this.eTop.style.visibility=""==this.topOutUnits||""==this.topInUnits?"hidden":"visible",this.eBottom=document.createElement("div"),
+this.eBottom.className=this.displayClass+"Bottom",this.div.appendChild(this.eBottom),this.eBottom.style.visibility=""==this.bottomOutUnits||""==this.bottomInUnits?"hidden":"visible");this.map.events.register("moveend",this,this.update);this.update();return this.div},getBarLen:function(a){var b=parseInt(Math.log(a)/Math.log(10)),b=Math.pow(10,b);a=parseInt(a/b);return(5<a?5:2<a?2:1)*b},update:function(){var a=this.map.getResolution();if(a){var b=this.map.getUnits(),c=OpenLayers.INCHES_PER_UNIT,d=this.maxWidth*
+a*c[b],e=1;!0===this.geodesic&&(e=(this.map.getGeodesicPixelSize().w||1E-6)*this.maxWidth/(d/c.km),d*=e);var f,g;1E5<d?(f=this.topOutUnits,g=this.bottomOutUnits):(f=this.topInUnits,g=this.bottomInUnits);var h=d/c[f],k=d/c[g],d=this.getBarLen(h),l=this.getBarLen(k),h=d/c[b]*c[f],k=l/c[b]*c[g],b=h/a/e,a=k/a/e;"visible"==this.eBottom.style.visibility&&(this.eBottom.style.width=Math.round(a)+"px",this.eBottom.innerHTML=l+" "+g);"visible"==this.eTop.style.visibility&&(this.eTop.style.width=Math.round(b)+
+"px",this.eTop.innerHTML=d+" "+f)}},CLASS_NAME:"OpenLayers.Control.ScaleLine"});OpenLayers.Icon=OpenLayers.Class({url:null,size:null,offset:null,calculateOffset:null,imageDiv:null,px:null,initialize:function(a,b,c,d){this.url=a;this.size=b||{w:20,h:20};this.offset=c||{x:-(this.size.w/2),y:-(this.size.h/2)};this.calculateOffset=d;a=OpenLayers.Util.createUniqueID("OL_Icon_");this.imageDiv=OpenLayers.Util.createAlphaImageDiv(a)},destroy:function(){this.erase();OpenLayers.Event.stopObservingElement(this.imageDiv.firstChild);this.imageDiv.innerHTML="";this.imageDiv=null},clone:function(){return new OpenLayers.Icon(this.url,
+this.size,this.offset,this.calculateOffset)},setSize:function(a){null!=a&&(this.size=a);this.draw()},setUrl:function(a){null!=a&&(this.url=a);this.draw()},draw:function(a){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,this.size,this.url,"absolute");this.moveTo(a);return this.imageDiv},erase:function(){null!=this.imageDiv&&null!=this.imageDiv.parentNode&&OpenLayers.Element.remove(this.imageDiv)},setOpacity:function(a){OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,null,null,null,
+null,null,null,a)},moveTo:function(a){null!=a&&(this.px=a);null!=this.imageDiv&&(null==this.px?this.display(!1):(this.calculateOffset&&(this.offset=this.calculateOffset(this.size)),OpenLayers.Util.modifyAlphaImageDiv(this.imageDiv,null,{x:this.px.x+this.offset.x,y:this.px.y+this.offset.y})))},display:function(a){this.imageDiv.style.display=a?"":"none"},isDrawn:function(){return this.imageDiv&&this.imageDiv.parentNode&&11!=this.imageDiv.parentNode.nodeType},CLASS_NAME:"OpenLayers.Icon"});OpenLayers.Marker=OpenLayers.Class({icon:null,lonlat:null,events:null,map:null,initialize:function(a,b){this.lonlat=a;var c=b?b:OpenLayers.Marker.defaultIcon();null==this.icon?this.icon=c:(this.icon.url=c.url,this.icon.size=c.size,this.icon.offset=c.offset,this.icon.calculateOffset=c.calculateOffset);this.events=new OpenLayers.Events(this,this.icon.imageDiv)},destroy:function(){this.erase();this.map=null;this.events.destroy();this.events=null;null!=this.icon&&(this.icon.destroy(),this.icon=null)},
+draw:function(a){return this.icon.draw(a)},erase:function(){null!=this.icon&&this.icon.erase()},moveTo:function(a){null!=a&&null!=this.icon&&this.icon.moveTo(a);this.lonlat=this.map.getLonLatFromLayerPx(a)},isDrawn:function(){return this.icon&&this.icon.isDrawn()},onScreen:function(){var a=!1;this.map&&(a=this.map.getExtent().containsLonLat(this.lonlat));return a},inflate:function(a){this.icon&&this.icon.setSize({w:this.icon.size.w*a,h:this.icon.size.h*a})},setOpacity:function(a){this.icon.setOpacity(a)},
+setUrl:function(a){this.icon.setUrl(a)},display:function(a){this.icon.display(a)},CLASS_NAME:"OpenLayers.Marker"});OpenLayers.Marker.defaultIcon=function(){return new OpenLayers.Icon(OpenLayers.Util.getImageLocation("marker.png"),{w:21,h:25},{x:-10.5,y:-25})};OpenLayers.Layer.TileCache=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,format:"image/png",serverResolutions:null,initialize:function(a,b,c,d){this.layername=c;OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a,b,{},d]);this.extension=this.format.split("/")[1].toLowerCase();this.extension="jpg"==this.extension?"jpeg":this.extension},clone:function(a){null==a&&(a=new OpenLayers.Layer.TileCache(this.name,this.url,this.layername,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,
+[a])},getURL:function(a){var b=this.getServerResolution(),c=this.maxExtent,d=this.tileSize,e=Math.round((a.left-c.left)/(b*d.w));a=Math.round((a.bottom-c.bottom)/(b*d.h));b=null!=this.serverResolutions?OpenLayers.Util.indexOf(this.serverResolutions,b):this.map.getZoom();e=[this.layername,OpenLayers.Number.zeroPad(b,2),OpenLayers.Number.zeroPad(parseInt(e/1E6),3),OpenLayers.Number.zeroPad(parseInt(e/1E3)%1E3,3),OpenLayers.Number.zeroPad(parseInt(e)%1E3,3),OpenLayers.Number.zeroPad(parseInt(a/1E6),
+3),OpenLayers.Number.zeroPad(parseInt(a/1E3)%1E3,3),OpenLayers.Number.zeroPad(parseInt(a)%1E3,3)+"."+this.extension].join("/");b=this.url;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(e,b));b="/"==b.charAt(b.length-1)?b:b+"/";return b+e},CLASS_NAME:"OpenLayers.Layer.TileCache"});OpenLayers.Strategy.Paging=OpenLayers.Class(OpenLayers.Strategy,{features:null,length:10,num:null,paging:!1,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);if(a)this.layer.events.on({beforefeaturesadded:this.cacheFeatures,scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&(this.clearCache(),this.layer.events.un({beforefeaturesadded:this.cacheFeatures,scope:this}));return a},cacheFeatures:function(a){this.paging||(this.clearCache(),
+this.features=a.features,this.pageNext(a))},clearCache:function(){if(this.features)for(var a=0;a<this.features.length;++a)this.features[a].destroy();this.num=this.features=null},pageCount:function(){return Math.ceil((this.features?this.features.length:0)/this.length)},pageNum:function(){return this.num},pageLength:function(a){a&&0<a&&(this.length=a);return this.length},pageNext:function(a){var b=!1;this.features&&(null===this.num&&(this.num=-1),b=this.page((this.num+1)*this.length,a));return b},pagePrevious:function(){var a=
+!1;this.features&&(null===this.num&&(this.num=this.pageCount()),a=this.page((this.num-1)*this.length));return a},page:function(a,b){var c=!1;if(this.features&&0<=a&&a<this.features.length){var d=Math.floor(a/this.length);d!=this.num&&(this.paging=!0,c=this.features.slice(a,a+this.length),this.layer.removeFeatures(this.layer.features),this.num=d,b&&b.features?b.features=c:this.layer.addFeatures(c),this.paging=!1,c=!0)}return c},CLASS_NAME:"OpenLayers.Strategy.Paging"});OpenLayers.Control.DragFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,onStart:function(a,b){},onDrag:function(a,b){},onComplete:function(a,b){},onEnter:function(a){},onLeave:function(a){},documentDrag:!1,layer:null,feature:null,dragCallbacks:{},featureCallbacks:{},lastPixel:null,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.layer=a;this.handlers={drag:new OpenLayers.Handler.Drag(this,OpenLayers.Util.extend({down:this.downFeature,move:this.moveFeature,
+up:this.upFeature,out:this.cancel,done:this.doneDragging},this.dragCallbacks),{documentDrag:this.documentDrag}),feature:new OpenLayers.Handler.Feature(this,this.layer,OpenLayers.Util.extend({click:this.clickFeature,clickout:this.clickoutFeature,over:this.overFeature,out:this.outFeature},this.featureCallbacks),{geometryTypes:this.geometryTypes})}},clickFeature:function(a){this.handlers.feature.touch&&(!this.over&&this.overFeature(a))&&(this.handlers.drag.dragstart(this.handlers.feature.evt),this.handlers.drag.stopDown=
+!1)},clickoutFeature:function(a){this.handlers.feature.touch&&this.over&&(this.outFeature(a),this.handlers.drag.stopDown=!0)},destroy:function(){this.layer=null;OpenLayers.Control.prototype.destroy.apply(this,[])},activate:function(){return this.handlers.feature.activate()&&OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.handlers.drag.deactivate();this.handlers.feature.deactivate();this.feature=null;this.dragging=!1;this.lastPixel=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,
+this.displayClass+"Over");return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},overFeature:function(a){var b=!1;this.handlers.drag.dragging?this.over=this.feature.id==a.id?!0:!1:(this.feature=a,this.handlers.drag.activate(),this.over=b=!0,OpenLayers.Element.addClass(this.map.viewPortDiv,this.displayClass+"Over"),this.onEnter(a));return b},downFeature:function(a){this.lastPixel=a;this.onStart(this.feature,a)},moveFeature:function(a){var b=this.map.getResolution();this.feature.geometry.move(b*
+(a.x-this.lastPixel.x),b*(this.lastPixel.y-a.y));this.layer.drawFeature(this.feature);this.lastPixel=a;this.onDrag(this.feature,a)},upFeature:function(a){this.over||this.handlers.drag.deactivate()},doneDragging:function(a){this.onComplete(this.feature,a)},outFeature:function(a){this.handlers.drag.dragging?this.feature.id==a.id&&(this.over=!1):(this.over=!1,this.handlers.drag.deactivate(),OpenLayers.Element.removeClass(this.map.viewPortDiv,this.displayClass+"Over"),this.onLeave(a),this.feature=null)},
+cancel:function(){this.handlers.drag.deactivate();this.over=!1},setMap:function(a){this.handlers.drag.setMap(a);this.handlers.feature.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.DragFeature"});OpenLayers.Control.TransformFeature=OpenLayers.Class(OpenLayers.Control,{geometryTypes:null,layer:null,preserveAspectRatio:!1,rotate:!0,feature:null,renderIntent:"temporary",rotationHandleSymbolizer:null,box:null,center:null,scale:1,ratio:1,rotation:0,handles:null,rotationHandles:null,dragControl:null,irregular:!1,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.layer=a;this.rotationHandleSymbolizer||(this.rotationHandleSymbolizer={stroke:!1,pointRadius:10,fillOpacity:0,
+cursor:"pointer"});this.createBox();this.createControl()},activate:function(){var a=!1;OpenLayers.Control.prototype.activate.apply(this,arguments)&&(this.dragControl.activate(),this.layer.addFeatures([this.box]),this.rotate&&this.layer.addFeatures(this.rotationHandles),this.layer.addFeatures(this.handles),a=!0);return a},deactivate:function(){var a=!1;OpenLayers.Control.prototype.deactivate.apply(this,arguments)&&(this.layer.removeFeatures(this.handles),this.rotate&&this.layer.removeFeatures(this.rotationHandles),
+this.layer.removeFeatures([this.box]),this.dragControl.deactivate(),a=!0);return a},setMap:function(a){this.dragControl.setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},setFeature:function(a,b){b=OpenLayers.Util.applyDefaults(b,{rotation:0,scale:1,ratio:1});var c=this.rotation,d=this.center;OpenLayers.Util.extend(this,b);if(!1!==this.events.triggerEvent("beforesetfeature",{feature:a})){this.feature=a;this.activate();this._setfeature=!0;var e=this.feature.geometry.getBounds();this.box.move(e.getCenterLonLat());
+this.box.geometry.rotate(-c,d);this._angle=0;this.rotation?(c=a.geometry.clone(),c.rotate(-this.rotation,this.center),c=new OpenLayers.Feature.Vector(c.getBounds().toGeometry()),c.geometry.rotate(this.rotation,this.center),this.box.geometry.rotate(this.rotation,this.center),this.box.move(c.geometry.getBounds().getCenterLonLat()),c=c.geometry.components[0].components[0].getBounds().getCenterLonLat()):c=new OpenLayers.LonLat(e.left,e.bottom);this.handles[0].move(c);delete this._setfeature;this.events.triggerEvent("setfeature",
+{feature:a})}},unsetFeature:function(){this.active?this.deactivate():(this.feature=null,this.rotation=0,this.ratio=this.scale=1)},createBox:function(){var a=this;this.center=new OpenLayers.Geometry.Point(0,0);this.box=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString([new OpenLayers.Geometry.Point(-1,-1),new OpenLayers.Geometry.Point(0,-1),new OpenLayers.Geometry.Point(1,-1),new OpenLayers.Geometry.Point(1,0),new OpenLayers.Geometry.Point(1,1),new OpenLayers.Geometry.Point(0,1),new OpenLayers.Geometry.Point(-1,
+1),new OpenLayers.Geometry.Point(-1,0),new OpenLayers.Geometry.Point(-1,-1)]),null,"string"==typeof this.renderIntent?null:this.renderIntent);this.box.geometry.move=function(b,c){a._moving=!0;OpenLayers.Geometry.LineString.prototype.move.apply(this,arguments);a.center.move(b,c);delete a._moving};for(var b=function(a,b){OpenLayers.Geometry.Point.prototype.move.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.move(a,b);this._handle.geometry.move(a,b)},c=function(a,b,c){OpenLayers.Geometry.Point.prototype.resize.apply(this,
+arguments);this._rotationHandle&&this._rotationHandle.geometry.resize(a,b,c);this._handle.geometry.resize(a,b,c)},d=function(a,b){OpenLayers.Geometry.Point.prototype.rotate.apply(this,arguments);this._rotationHandle&&this._rotationHandle.geometry.rotate(a,b);this._handle.geometry.rotate(a,b)},e=function(b,c){var d=this.x,e=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,b,c);if(!a._moving){var f=a.dragControl.handlers.drag.evt,g=!(!a._setfeature&&a.preserveAspectRatio)&&!(f&&f.shiftKey),
+h=new OpenLayers.Geometry.Point(d,e),f=a.center;this.rotate(-a.rotation,f);h.rotate(-a.rotation,f);var k=this.x-f.x,l=this.y-f.y,m=k-(this.x-h.x),n=l-(this.y-h.y);a.irregular&&!a._setfeature&&(k-=(this.x-h.x)/2,l-=(this.y-h.y)/2);this.x=d;this.y=e;h=1;g?(l=1E-5>Math.abs(n)?1:l/n,h=(1E-5>Math.abs(m)?1:k/m)/l):(m=Math.sqrt(m*m+n*n),l=Math.sqrt(k*k+l*l)/m);a._moving=!0;a.box.geometry.rotate(-a.rotation,f);delete a._moving;a.box.geometry.resize(l,f,h);a.box.geometry.rotate(a.rotation,f);a.transformFeature({scale:l,
+ratio:h});a.irregular&&!a._setfeature&&(k=f.clone(),k.x+=1E-5>Math.abs(d-f.x)?0:this.x-d,k.y+=1E-5>Math.abs(e-f.y)?0:this.y-e,a.box.geometry.move(this.x-d,this.y-e),a.transformFeature({center:k}))}},f=function(b,c){var d=this.x,e=this.y;OpenLayers.Geometry.Point.prototype.move.call(this,b,c);if(!a._moving){var f=a.dragControl.handlers.drag.evt,f=f&&f.shiftKey?45:1,g=a.center,h=this.x-g.x,k=this.y-g.y;this.x=d;this.y=e;d=Math.atan2(k-c,h-b);d=Math.atan2(k,h)-d;d*=180/Math.PI;a._angle=(a._angle+d)%
+360;d=a.rotation%f;if(Math.abs(a._angle)>=f||0!==d)d=Math.round(a._angle/f)*f-d,a._angle=0,a.box.geometry.rotate(d,g),a.transformFeature({rotation:d})}},g=Array(8),h=Array(4),k,l,m,n="sw s se e ne n nw w".split(" "),p=0;8>p;++p)k=this.box.geometry.components[p],l=new OpenLayers.Feature.Vector(k.clone(),{role:n[p]+"-resize"},"string"==typeof this.renderIntent?null:this.renderIntent),0==p%2&&(m=new OpenLayers.Feature.Vector(k.clone(),{role:n[p]+"-rotate"},"string"==typeof this.rotationHandleSymbolizer?
+null:this.rotationHandleSymbolizer),m.geometry.move=f,k._rotationHandle=m,h[p/2]=m),k.move=b,k.resize=c,k.rotate=d,l.geometry.move=e,k._handle=l,g[p]=l;this.rotationHandles=h;this.handles=g},createControl:function(){var a=this;this.dragControl=new OpenLayers.Control.DragFeature(this.layer,{documentDrag:!0,moveFeature:function(b){this.feature===a.feature&&(this.feature=a.box);OpenLayers.Control.DragFeature.prototype.moveFeature.apply(this,arguments)},onDrag:function(b,c){b===a.box&&a.transformFeature({center:a.center})},
+onStart:function(b,c){var d=!a.geometryTypes||-1!==OpenLayers.Util.indexOf(a.geometryTypes,b.geometry.CLASS_NAME),e=OpenLayers.Util.indexOf(a.handles,b),e=e+OpenLayers.Util.indexOf(a.rotationHandles,b);b!==a.feature&&(b!==a.box&&-2==e&&d)&&a.setFeature(b)},onComplete:function(b,c){a.events.triggerEvent("transformcomplete",{feature:a.feature})}})},drawHandles:function(){for(var a=this.layer,b=0;8>b;++b)this.rotate&&0===b%2&&a.drawFeature(this.rotationHandles[b/2],this.rotationHandleSymbolizer),a.drawFeature(this.handles[b],
+this.renderIntent)},transformFeature:function(a){if(!this._setfeature){this.scale*=a.scale||1;this.ratio*=a.ratio||1;var b=this.rotation;this.rotation=(this.rotation+(a.rotation||0))%360;if(!1!==this.events.triggerEvent("beforetransform",a)){var c=this.feature,d=c.geometry,e=this.center;d.rotate(-b,e);a.scale||a.ratio?d.resize(a.scale,e,a.ratio):a.center&&c.move(a.center.getBounds().getCenterLonLat());d.rotate(this.rotation,e);this.layer.drawFeature(c);c.toState(OpenLayers.State.UPDATE);this.events.triggerEvent("transform",
+a)}}this.layer.drawFeature(this.box,this.renderIntent);this.drawHandles()},destroy:function(){for(var a,b=0;8>b;++b)a=this.box.geometry.components[b],a._handle.destroy(),a._handle=null,a._rotationHandle&&a._rotationHandle.destroy(),a._rotationHandle=null;this.rotationHandles=this.rotationHandleSymbolizer=this.handles=this.feature=this.center=null;this.box.destroy();this.layer=this.box=null;this.dragControl.destroy();this.dragControl=null;OpenLayers.Control.prototype.destroy.apply(this,arguments)},
+CLASS_NAME:"OpenLayers.Control.TransformFeature"});OpenLayers.Handler.Box=OpenLayers.Class(OpenLayers.Handler,{dragHandler:null,boxDivClassName:"olHandlerBoxZoomBox",boxOffsets:null,initialize:function(a,b,c){OpenLayers.Handler.prototype.initialize.apply(this,arguments);this.dragHandler=new OpenLayers.Handler.Drag(this,{down:this.startBox,move:this.moveBox,out:this.removeBox,up:this.endBox},{keyMask:this.keyMask})},destroy:function(){OpenLayers.Handler.prototype.destroy.apply(this,arguments);this.dragHandler&&(this.dragHandler.destroy(),this.dragHandler=
+null)},setMap:function(a){OpenLayers.Handler.prototype.setMap.apply(this,arguments);this.dragHandler&&this.dragHandler.setMap(a)},startBox:function(a){this.callback("start",[]);this.zoomBox=OpenLayers.Util.createDiv("zoomBox",{x:-9999,y:-9999});this.zoomBox.className=this.boxDivClassName;this.zoomBox.style.zIndex=this.map.Z_INDEX_BASE.Popup-1;this.map.viewPortDiv.appendChild(this.zoomBox);OpenLayers.Element.addClass(this.map.viewPortDiv,"olDrawBox")},moveBox:function(a){var b=this.dragHandler.start.x,
+c=this.dragHandler.start.y,d=Math.abs(b-a.x),e=Math.abs(c-a.y),f=this.getBoxOffsets();this.zoomBox.style.width=d+f.width+1+"px";this.zoomBox.style.height=e+f.height+1+"px";this.zoomBox.style.left=(a.x<b?b-d-f.left:b-f.left)+"px";this.zoomBox.style.top=(a.y<c?c-e-f.top:c-f.top)+"px"},endBox:function(a){var b;if(5<Math.abs(this.dragHandler.start.x-a.x)||5<Math.abs(this.dragHandler.start.y-a.y)){var c=this.dragHandler.start;b=Math.min(c.y,a.y);var d=Math.max(c.y,a.y),e=Math.min(c.x,a.x);a=Math.max(c.x,
+a.x);b=new OpenLayers.Bounds(e,d,a,b)}else b=this.dragHandler.start.clone();this.removeBox();this.callback("done",[b])},removeBox:function(){this.map.viewPortDiv.removeChild(this.zoomBox);this.boxOffsets=this.zoomBox=null;OpenLayers.Element.removeClass(this.map.viewPortDiv,"olDrawBox")},activate:function(){return OpenLayers.Handler.prototype.activate.apply(this,arguments)?(this.dragHandler.activate(),!0):!1},deactivate:function(){return OpenLayers.Handler.prototype.deactivate.apply(this,arguments)?
+(this.dragHandler.deactivate()&&this.zoomBox&&this.removeBox(),!0):!1},getBoxOffsets:function(){if(!this.boxOffsets){var a=document.createElement("div");a.style.position="absolute";a.style.border="1px solid black";a.style.width="3px";document.body.appendChild(a);var b=3==a.clientWidth;document.body.removeChild(a);var a=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-left-width")),c=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-right-width")),d=parseInt(OpenLayers.Element.getStyle(this.zoomBox,
+"border-top-width")),e=parseInt(OpenLayers.Element.getStyle(this.zoomBox,"border-bottom-width"));this.boxOffsets={left:a,right:c,top:d,bottom:e,width:!1===b?a+c:0,height:!1===b?d+e:0}}return this.boxOffsets},CLASS_NAME:"OpenLayers.Handler.Box"});OpenLayers.Control.ZoomBox=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,out:!1,keyMask:null,alwaysZoom:!1,zoomOnClick:!0,draw:function(){this.handler=new OpenLayers.Handler.Box(this,{done:this.zoomBox},{keyMask:this.keyMask})},zoomBox:function(a){if(a instanceof OpenLayers.Bounds){var b,c=a.getCenterPixel();if(this.out){b=Math.min(this.map.size.h/(a.bottom-a.top),this.map.size.w/(a.right-a.left));var d=this.map.getExtent(),e=this.map.getLonLatFromPixel(c),f=e.lon-d.getWidth()/
+2*b;a=e.lon+d.getWidth()/2*b;var g=e.lat-d.getHeight()/2*b;b=e.lat+d.getHeight()/2*b;b=new OpenLayers.Bounds(f,g,a,b)}else f=this.map.getLonLatFromPixel({x:a.left,y:a.bottom}),a=this.map.getLonLatFromPixel({x:a.right,y:a.top}),b=new OpenLayers.Bounds(f.lon,f.lat,a.lon,a.lat);f=this.map.getZoom();g=this.map.getSize();a=g.w/2;g=g.h/2;b=this.map.getZoomForExtent(b);d=this.map.getResolution();e=this.map.getResolutionForZoom(b);d==e?this.map.setCenter(this.map.getLonLatFromPixel(c)):this.map.zoomTo(b,
+{x:(d*c.x-e*a)/(d-e),y:(d*c.y-e*g)/(d-e)});f==this.map.getZoom()&&!0==this.alwaysZoom&&this.map.zoomTo(f+(this.out?-1:1))}else this.zoomOnClick&&(this.out?this.map.zoomTo(this.map.getZoom()-1,a):this.map.zoomTo(this.map.getZoom()+1,a))},CLASS_NAME:"OpenLayers.Control.ZoomBox"});OpenLayers.Control.DragPan=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,panned:!1,interval:0,documentDrag:!1,kinetic:null,enableKinetic:!0,kineticInterval:10,draw:function(){if(this.enableKinetic&&OpenLayers.Kinetic){var a={interval:this.kineticInterval};"object"===typeof this.enableKinetic&&(a=OpenLayers.Util.extend(a,this.enableKinetic));this.kinetic=new OpenLayers.Kinetic(a)}this.handler=new OpenLayers.Handler.Drag(this,{move:this.panMap,done:this.panMapDone,down:this.panMapStart},
+{interval:this.interval,documentDrag:this.documentDrag})},panMapStart:function(){this.kinetic&&this.kinetic.begin()},panMap:function(a){this.kinetic&&this.kinetic.update(a);this.panned=!0;this.map.pan(this.handler.last.x-a.x,this.handler.last.y-a.y,{dragging:!0,animate:!1})},panMapDone:function(a){if(this.panned){var b=null;this.kinetic&&(b=this.kinetic.end(a));this.map.pan(this.handler.last.x-a.x,this.handler.last.y-a.y,{dragging:!!b,animate:!1});if(b){var c=this;this.kinetic.move(b,function(a,b,
+f){c.map.pan(a,b,{dragging:!f,animate:!1})})}this.panned=!1}},CLASS_NAME:"OpenLayers.Control.DragPan"});OpenLayers.Control.Navigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,dragPanOptions:null,pinchZoom:null,pinchZoomOptions:null,documentDrag:!1,zoomBox:null,zoomBoxEnabled:!0,zoomWheelEnabled:!0,mouseWheelOptions:null,handleRightClicks:!1,zoomBoxKeyMask:OpenLayers.Handler.MOD_SHIFT,autoActivate:!0,initialize:function(a){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments)},destroy:function(){this.deactivate();this.dragPan&&this.dragPan.destroy();this.dragPan=null;
+this.zoomBox&&this.zoomBox.destroy();this.zoomBox=null;this.pinchZoom&&this.pinchZoom.destroy();this.pinchZoom=null;OpenLayers.Control.prototype.destroy.apply(this,arguments)},activate:function(){this.dragPan.activate();this.zoomWheelEnabled&&this.handlers.wheel.activate();this.handlers.click.activate();this.zoomBoxEnabled&&this.zoomBox.activate();this.pinchZoom&&this.pinchZoom.activate();return OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){this.pinchZoom&&this.pinchZoom.deactivate();
+this.zoomBox.deactivate();this.dragPan.deactivate();this.handlers.click.deactivate();this.handlers.wheel.deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},draw:function(){this.handleRightClicks&&(this.map.viewPortDiv.oncontextmenu=OpenLayers.Function.False);this.handlers.click=new OpenLayers.Handler.Click(this,{click:this.defaultClick,dblclick:this.defaultDblClick,dblrightclick:this.defaultDblRightClick},{"double":!0,stopDouble:!0});this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map,
+documentDrag:this.documentDrag},this.dragPanOptions));this.zoomBox=new OpenLayers.Control.ZoomBox({map:this.map,keyMask:this.zoomBoxKeyMask});this.dragPan.draw();this.zoomBox.draw();this.handlers.wheel=new OpenLayers.Handler.MouseWheel(this,{up:this.wheelUp,down:this.wheelDown},OpenLayers.Util.extend(this.map.fractionalZoom?{}:{cumulative:!1,interval:50,maxDelta:6},this.mouseWheelOptions));OpenLayers.Control.PinchZoom&&(this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map},
+this.pinchZoomOptions)))},defaultClick:function(a){a.lastTouches&&2==a.lastTouches.length&&this.map.zoomOut()},defaultDblClick:function(a){this.map.zoomTo(this.map.zoom+1,a.xy)},defaultDblRightClick:function(a){this.map.zoomTo(this.map.zoom-1,a.xy)},wheelChange:function(a,b){this.map.fractionalZoom||(b=Math.round(b));var c=this.map.getZoom(),d;d=Math.max(c+b,0);d=Math.min(d,this.map.getNumZoomLevels());d!==c&&this.map.zoomTo(d,a.xy)},wheelUp:function(a,b){this.wheelChange(a,b||1)},wheelDown:function(a,
+b){this.wheelChange(a,b||-1)},disableZoomBox:function(){this.zoomBoxEnabled=!1;this.zoomBox.deactivate()},enableZoomBox:function(){this.zoomBoxEnabled=!0;this.active&&this.zoomBox.activate()},disableZoomWheel:function(){this.zoomWheelEnabled=!1;this.handlers.wheel.deactivate()},enableZoomWheel:function(){this.zoomWheelEnabled=!0;this.active&&this.handlers.wheel.activate()},CLASS_NAME:"OpenLayers.Control.Navigation"});OpenLayers.Control.DrawFeature=OpenLayers.Class(OpenLayers.Control,{layer:null,callbacks:null,multi:!1,featureAdded:function(){},initialize:function(a,b,c){OpenLayers.Control.prototype.initialize.apply(this,[c]);this.callbacks=OpenLayers.Util.extend({done:this.drawFeature,modify:function(a,b){this.layer.events.triggerEvent("sketchmodified",{vertex:a,feature:b})},create:function(a,b){this.layer.events.triggerEvent("sketchstarted",{vertex:a,feature:b})}},this.callbacks);this.layer=a;this.handlerOptions=
+this.handlerOptions||{};this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{renderers:a.renderers,rendererOptions:a.rendererOptions});"multi"in this.handlerOptions||(this.handlerOptions.multi=this.multi);if(a=this.layer.styleMap&&this.layer.styleMap.styles.temporary)this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{styleMap:new OpenLayers.StyleMap({"default":a})});this.handler=new b(this,this.callbacks,this.handlerOptions)},
+drawFeature:function(a){a=new OpenLayers.Feature.Vector(a);!1!==this.layer.events.triggerEvent("sketchcomplete",{feature:a})&&(a.state=OpenLayers.State.INSERT,this.layer.addFeatures([a]),this.featureAdded(a),this.events.triggerEvent("featureadded",{feature:a}))},insertXY:function(a,b){this.handler&&this.handler.line&&this.handler.insertXY(a,b)},insertDeltaXY:function(a,b){this.handler&&this.handler.line&&this.handler.insertDeltaXY(a,b)},insertDirectionLength:function(a,b){this.handler&&this.handler.line&&
+this.handler.insertDirectionLength(a,b)},insertDeflectionLength:function(a,b){this.handler&&this.handler.line&&this.handler.insertDeflectionLength(a,b)},undo:function(){return this.handler.undo&&this.handler.undo()},redo:function(){return this.handler.redo&&this.handler.redo()},finishSketch:function(){this.handler.finishGeometry()},cancel:function(){this.handler.cancel()},CLASS_NAME:"OpenLayers.Control.DrawFeature"});OpenLayers.Handler.Polygon=OpenLayers.Class(OpenLayers.Handler.Path,{holeModifier:null,drawingHole:!1,polygon:null,createFeature:function(a){a=this.layer.getLonLatFromViewPortPx(a);a=new OpenLayers.Geometry.Point(a.lon,a.lat);this.point=new OpenLayers.Feature.Vector(a);this.line=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LinearRing([this.point.geometry]));this.polygon=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon([this.line.geometry]));this.callback("create",[this.point.geometry,
+this.getSketch()]);this.point.geometry.clearBounds();this.layer.addFeatures([this.polygon,this.point],{silent:!0})},addPoint:function(a){if(!this.drawingHole&&this.holeModifier&&this.evt&&this.evt[this.holeModifier])for(var b=this.point.geometry,c=this.control.layer.features,d,e=c.length-1;0<=e;--e)if(d=c[e].geometry,(d instanceof OpenLayers.Geometry.Polygon||d instanceof OpenLayers.Geometry.MultiPolygon)&&d.intersects(b)){b=c[e];this.control.layer.removeFeatures([b],{silent:!0});this.control.layer.events.registerPriority("sketchcomplete",
+this,this.finalizeInteriorRing);this.control.layer.events.registerPriority("sketchmodified",this,this.enforceTopology);b.geometry.addComponent(this.line.geometry);this.polygon=b;this.drawingHole=!0;break}OpenLayers.Handler.Path.prototype.addPoint.apply(this,arguments)},getCurrentPointIndex:function(){return this.line.geometry.components.length-2},enforceTopology:function(a){a=a.vertex;var b=this.line.geometry.components;this.polygon.geometry.intersects(a)||(b=b[b.length-3],a.x=b.x,a.y=b.y)},finishGeometry:function(){this.line.geometry.removeComponent(this.line.geometry.components[this.line.geometry.components.length-
+2]);this.removePoint();this.finalize()},finalizeInteriorRing:function(){var a=this.line.geometry,b=0!==a.getArea();if(b){for(var c=this.polygon.geometry.components,d=c.length-2;0<=d;--d)if(a.intersects(c[d])){b=!1;break}if(b)a:for(d=c.length-2;0<d;--d)for(var e=c[d].components,f=0,g=e.length;f<g;++f)if(a.containsPoint(e[f])){b=!1;break a}}b?this.polygon.state!==OpenLayers.State.INSERT&&(this.polygon.state=OpenLayers.State.UPDATE):this.polygon.geometry.removeComponent(a);this.restoreFeature();return!1},
+cancel:function(){this.drawingHole&&(this.polygon.geometry.removeComponent(this.line.geometry),this.restoreFeature(!0));return OpenLayers.Handler.Path.prototype.cancel.apply(this,arguments)},restoreFeature:function(a){this.control.layer.events.unregister("sketchcomplete",this,this.finalizeInteriorRing);this.control.layer.events.unregister("sketchmodified",this,this.enforceTopology);this.layer.removeFeatures([this.polygon],{silent:!0});this.control.layer.addFeatures([this.polygon],{silent:!0});this.drawingHole=
+!1;a||this.control.layer.events.triggerEvent("sketchcomplete",{feature:this.polygon})},destroyFeature:function(a){OpenLayers.Handler.Path.prototype.destroyFeature.call(this,a);this.polygon=null},drawFeature:function(){this.layer.drawFeature(this.polygon,this.style);this.layer.drawFeature(this.point,this.style)},getSketch:function(){return this.polygon},getGeometry:function(){var a=this.polygon&&this.polygon.geometry;a&&this.multi&&(a=new OpenLayers.Geometry.MultiPolygon([a]));return a},CLASS_NAME:"OpenLayers.Handler.Polygon"});OpenLayers.Control.EditingToolbar=OpenLayers.Class(OpenLayers.Control.Panel,{citeCompliant:!1,initialize:function(a,b){OpenLayers.Control.Panel.prototype.initialize.apply(this,[b]);this.addControls([new OpenLayers.Control.Navigation]);var c=[new OpenLayers.Control.DrawFeature(a,OpenLayers.Handler.Point,{displayClass:"olControlDrawFeaturePoint",handlerOptions:{citeCompliant:this.citeCompliant}}),new OpenLayers.Control.DrawFeature(a,OpenLayers.Handler.Path,{displayClass:"olControlDrawFeaturePath",handlerOptions:{citeCompliant:this.citeCompliant}}),
+new OpenLayers.Control.DrawFeature(a,OpenLayers.Handler.Polygon,{displayClass:"olControlDrawFeaturePolygon",handlerOptions:{citeCompliant:this.citeCompliant}})];this.addControls(c)},draw:function(){var a=OpenLayers.Control.Panel.prototype.draw.apply(this,arguments);null===this.defaultControl&&(this.defaultControl=this.controls[0]);return a},CLASS_NAME:"OpenLayers.Control.EditingToolbar"});OpenLayers.Strategy.BBOX=OpenLayers.Class(OpenLayers.Strategy,{bounds:null,resolution:null,ratio:2,resFactor:null,response:null,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);a&&(this.layer.events.on({moveend:this.update,refresh:this.update,visibilitychanged:this.update,scope:this}),this.update());return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&this.layer.events.un({moveend:this.update,refresh:this.update,visibilitychanged:this.update,
+scope:this});return a},update:function(a){var b=this.getMapBounds();null!==b&&(a&&a.force||this.layer.visibility&&this.layer.calculateInRange()&&this.invalidBounds(b))&&(this.calculateBounds(b),this.resolution=this.layer.map.getResolution(),this.triggerRead(a))},getMapBounds:function(){if(null===this.layer.map)return null;var a=this.layer.map.getExtent();a&&!this.layer.projection.equals(this.layer.map.getProjectionObject())&&(a=a.clone().transform(this.layer.map.getProjectionObject(),this.layer.projection));
+return a},invalidBounds:function(a){a||(a=this.getMapBounds());a=!this.bounds||!this.bounds.containsBounds(a);!a&&this.resFactor&&(a=this.resolution/this.layer.map.getResolution(),a=a>=this.resFactor||a<=1/this.resFactor);return a},calculateBounds:function(a){a||(a=this.getMapBounds());var b=a.getCenterLonLat(),c=a.getWidth()*this.ratio;a=a.getHeight()*this.ratio;this.bounds=new OpenLayers.Bounds(b.lon-c/2,b.lat-a/2,b.lon+c/2,b.lat+a/2)},triggerRead:function(a){!this.response||a&&!0===a.noAbort||
+(this.layer.protocol.abort(this.response),this.layer.events.triggerEvent("loadend"));var b={filter:this.createFilter()};this.layer.events.triggerEvent("loadstart",b);this.response=this.layer.protocol.read(OpenLayers.Util.applyDefaults({filter:b.filter,callback:this.merge,scope:this},a))},createFilter:function(){var a=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,value:this.bounds,projection:this.layer.projection});this.layer.filter&&(a=new OpenLayers.Filter.Logical({type:OpenLayers.Filter.Logical.AND,
+filters:[this.layer.filter,a]}));return a},merge:function(a){this.layer.destroyFeatures();if(a.success()){var b=a.features;if(b&&0<b.length){var c=this.layer.projection,d=this.layer.map.getProjectionObject();if(!d.equals(c))for(var e,f=0,g=b.length;f<g;++f)(e=b[f].geometry)&&e.transform(c,d);this.layer.addFeatures(b)}}else this.bounds=null;this.response=null;this.layer.events.triggerEvent("loadend",{response:a})},CLASS_NAME:"OpenLayers.Strategy.BBOX"});OpenLayers.Layer.WorldWind=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{},isBaseLayer:!0,lzd:null,zoomLevels:null,initialize:function(a,b,c,d,e,f){this.lzd=c;this.zoomLevels=d;c=[];c.push(a,b,e,f);OpenLayers.Layer.Grid.prototype.initialize.apply(this,c);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS)},getZoom:function(){var a=this.map.getZoom();this.map.getMaxExtent();return a-=Math.log(this.maxResolution/(this.lzd/512))/Math.log(2)},getURL:function(a){a=this.adjustBounds(a);
+var b=this.getZoom(),c=this.map.getMaxExtent(),d=this.lzd/Math.pow(2,this.getZoom()),e=Math.floor((a.left-c.left)/d);a=Math.floor((a.bottom-c.bottom)/d);return this.map.getResolution()<=this.lzd/512&&this.getZoom()<=this.zoomLevels?this.getFullRequestString({L:b,X:e,Y:a}):OpenLayers.Util.getImageLocation("blank.gif")},CLASS_NAME:"OpenLayers.Layer.WorldWind"});OpenLayers.Protocol.CSW=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Protocol.CSW.DEFAULTS);var b=OpenLayers.Protocol.CSW["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported CSW version: "+a.version;return new b(a)};OpenLayers.Protocol.CSW.DEFAULTS={version:"2.0.2"};OpenLayers.Format.WMTSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",yx:{"urn:ogc:def:crs:EPSG::4326":!0},createLayer:function(a,b){if(!("layer"in b))throw Error("Missing property 'layer' in configuration.");for(var c=a.contents,d,e=0,f=c.layers.length;e<f;++e)if(c.layers[e].identifier===b.layer){d=c.layers[e];break}if(!d)throw Error("Layer not found");var g=b.format;!g&&(d.formats&&d.formats.length)&&(g=d.formats[0]);var h;b.matrixSet?h=c.tileMatrixSets[b.matrixSet]:
+1<=d.tileMatrixSetLinks.length&&(h=c.tileMatrixSets[d.tileMatrixSetLinks[0].tileMatrixSet]);if(!h)throw Error("matrixSet not found");for(var k,e=0,f=d.styles.length;e<f&&(k=d.styles[e],!k.isDefault);++e);c=b.requestEncoding;if(!c&&(c="KVP",a.operationsMetadata.GetTile.dcp.http)){var l=a.operationsMetadata.GetTile.dcp.http;l.get[0].constraints&&(l=l.get[0].constraints.GetEncoding.allowedValues,l.KVP||!l.REST&&!l.RESTful||(c="REST"))}var l=[],m=b.params||{};delete b.params;for(var n=0,p=d.dimensions.length;n<
+p;n++){var q=d.dimensions[n];l.push(q.identifier);m.hasOwnProperty(q.identifier)||(m[q.identifier]=q["default"])}var n=b.projection||h.supportedCRS.replace(/urn:ogc:def:crs:(\w+):(.*:)?(\w+)$/,"$1:$3"),p=b.units||("EPSG:4326"===n?"degrees":"m"),q=[],r;for(r in h.matrixIds)h.matrixIds.hasOwnProperty(r)&&q.push(2.8E-4*h.matrixIds[r].scaleDenominator/OpenLayers.METERS_PER_INCH/OpenLayers.INCHES_PER_UNIT[p]);if("REST"===c&&d.resourceUrls){r=[];for(var f=0,s=d.resourceUrls.length;f<s;++f)e=d.resourceUrls[f],
+e.format===g&&"tile"===e.resourceType&&r.push(e.template)}else{s=a.operationsMetadata.GetTile.dcp.http.get;r=[];for(var t,e=0,f=s.length;e<f;e++)t=s[e].constraints,(!t||t&&t.GetEncoding.allowedValues[c])&&r.push(s[e].url)}return new OpenLayers.Layer.WMTS(OpenLayers.Util.applyDefaults(b,{url:r,requestEncoding:c,name:d.title,style:k.identifier,format:g,matrixIds:h.matrixIds,matrixSet:h.identifier,projection:n,units:p,resolutions:!1===b.isBaseLayer?void 0:q,serverResolutions:q,tileFullExtent:h.bounds,
+dimensions:l,params:m}))},CLASS_NAME:"OpenLayers.Format.WMTSCapabilities"});OpenLayers.Layer.Google.v3={DEFAULTS:{sphericalMercator:!0,projection:"EPSG:900913"},animationEnabled:!0,loadMapObject:function(){this.type||(this.type=google.maps.MapTypeId.ROADMAP);var a,b=OpenLayers.Layer.Google.cache[this.map.id];b?(a=b.mapObject,++b.count):(a=this.map.getCenter(),b=document.createElement("div"),b.className="olForeignContainer",b.style.width="100%",b.style.height="100%",a=new google.maps.Map(b,{center:a?new google.maps.LatLng(a.lat,a.lon):new google.maps.LatLng(0,0),zoom:this.map.getZoom()||
+0,mapTypeId:this.type,disableDefaultUI:!0,keyboardShortcuts:!1,draggable:!1,disableDoubleClickZoom:!0,scrollwheel:!1,streetViewControl:!1}),b=document.createElement("div"),b.style.width="100%",b.style.height="100%",a.controls[google.maps.ControlPosition.TOP_LEFT].push(b),b={googleControl:b,mapObject:a,count:1},OpenLayers.Layer.Google.cache[this.map.id]=b);this.mapObject=a;this.setGMapVisibility(this.visibility)},onMapResize:function(){this.visibility&&google.maps.event.trigger(this.mapObject,"resize")},
+setGMapVisibility:function(a){var b=OpenLayers.Layer.Google.cache[this.map.id],c=this.map;if(b){for(var d=this.type,e=c.layers,f,g=e.length-1;0<=g;--g)if(f=e[g],f instanceof OpenLayers.Layer.Google&&!0===f.visibility&&!0===f.inRange){d=f.type;a=!0;break}e=this.mapObject.getDiv();if(!0===a){if(e.parentNode!==c.div)if(b.rendered)c.div.appendChild(e),b.googleControl.appendChild(c.viewPortDiv),google.maps.event.trigger(this.mapObject,"resize");else{var h=this;google.maps.event.addListenerOnce(this.mapObject,
+"tilesloaded",function(){b.rendered=!0;h.setGMapVisibility(h.getVisibility());h.moveTo(h.map.getCenter())})}this.mapObject.setMapTypeId(d)}else b.googleControl.hasChildNodes()&&(c.div.appendChild(c.viewPortDiv),c.div.removeChild(e))}},getMapContainer:function(){return this.mapObject.getDiv()},getMapObjectBoundsFromOLBounds:function(a){var b=null;null!=a&&(b=this.sphericalMercator?this.inverseMercator(a.bottom,a.left):new OpenLayers.LonLat(a.bottom,a.left),a=this.sphericalMercator?this.inverseMercator(a.top,
+a.right):new OpenLayers.LonLat(a.top,a.right),b=new google.maps.LatLngBounds(new google.maps.LatLng(b.lat,b.lon),new google.maps.LatLng(a.lat,a.lon)));return b},getMapObjectLonLatFromMapObjectPixel:function(a){var b=this.map.getSize(),c=this.getLongitudeFromMapObjectLonLat(this.mapObject.center),d=this.getLatitudeFromMapObjectLonLat(this.mapObject.center),e=this.map.getResolution();a=new OpenLayers.LonLat(c+(a.x-b.w/2)*e,d-(a.y-b.h/2)*e);this.wrapDateLine&&(a=a.wrapDateLine(this.maxExtent));return this.getMapObjectLonLatFromLonLat(a.lon,
+a.lat)},getMapObjectPixelFromMapObjectLonLat:function(a){var b=this.getLongitudeFromMapObjectLonLat(a);a=this.getLatitudeFromMapObjectLonLat(a);var c=this.map.getResolution(),d=this.map.getExtent();return this.getMapObjectPixelFromXY(1/c*(b-d.left),1/c*(d.top-a))},setMapObjectCenter:function(a,b){if(!1===this.animationEnabled&&b!=this.mapObject.zoom){var c=this.getMapContainer();google.maps.event.addListenerOnce(this.mapObject,"idle",function(){c.style.visibility=""});c.style.visibility="hidden"}this.mapObject.setOptions({center:a,
+zoom:b})},getMapObjectZoomFromMapObjectBounds:function(a){return this.mapObject.getBoundsZoomLevel(a)},getMapObjectLonLatFromLonLat:function(a,b){var c;this.sphericalMercator?(c=this.inverseMercator(a,b),c=new google.maps.LatLng(c.lat,c.lon)):c=new google.maps.LatLng(b,a);return c},getMapObjectPixelFromXY:function(a,b){return new google.maps.Point(a,b)}};OpenLayers.Format.WPSDescribeProcess=OpenLayers.Class(OpenLayers.Format.XML,{VERSION:"1.0.0",namespaces:{wps:"http://www.opengis.net/wps/1.0.0",ows:"http://www.opengis.net/ows/1.1",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.opengis.net/wps/1.0.0 http://schemas.opengis.net/wps/1.0.0/wpsAll.xsd",defaultPrefix:"wps",regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,
+[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{wps:{ProcessDescriptions:function(a,b){b.processDescriptions={};this.readChildNodes(a,b.processDescriptions)},ProcessDescription:function(a,b){var c={processVersion:this.getAttributeNS(a,this.namespaces.wps,"processVersion"),statusSupported:"true"===a.getAttribute("statusSupported"),storeSupported:"true"===a.getAttribute("storeSupported")};this.readChildNodes(a,c);b[c.identifier]=c},DataInputs:function(a,
+b){b.dataInputs=[];this.readChildNodes(a,b.dataInputs)},ProcessOutputs:function(a,b){b.processOutputs=[];this.readChildNodes(a,b.processOutputs)},Output:function(a,b){var c={};this.readChildNodes(a,c);b.push(c)},ComplexOutput:function(a,b){b.complexOutput={};this.readChildNodes(a,b.complexOutput)},LiteralOutput:function(a,b){b.literalOutput={};this.readChildNodes(a,b.literalOutput)},Input:function(a,b){var c={maxOccurs:parseInt(a.getAttribute("maxOccurs")),minOccurs:parseInt(a.getAttribute("minOccurs"))};
+this.readChildNodes(a,c);b.push(c)},BoundingBoxData:function(a,b){b.boundingBoxData={};this.readChildNodes(a,b.boundingBoxData)},CRS:function(a,b){b.CRSs||(b.CRSs={});b.CRSs[this.getChildValue(a)]=!0},LiteralData:function(a,b){b.literalData={};this.readChildNodes(a,b.literalData)},ComplexData:function(a,b){b.complexData={};this.readChildNodes(a,b.complexData)},Default:function(a,b){b["default"]={};this.readChildNodes(a,b["default"])},Supported:function(a,b){b.supported={};this.readChildNodes(a,b.supported)},
+Format:function(a,b){var c={};this.readChildNodes(a,c);b.formats||(b.formats={});b.formats[c.mimeType]=!0},MimeType:function(a,b){b.mimeType=this.getChildValue(a)}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WPSDescribeProcess"});OpenLayers.Format.WKT=OpenLayers.Class(OpenLayers.Format,{initialize:function(a){this.regExes={typeStr:/^\s*(\w+)\s*\(\s*(.*)\s*\)\s*$/,spaces:/\s+/,parenComma:/\)\s*,\s*\(/,doubleParenComma:/\)\s*\)\s*,\s*\(\s*\(/,trimParens:/^\s*\(?(.*?)\)?\s*$/};OpenLayers.Format.prototype.initialize.apply(this,[a])},read:function(a){var b,c;a=a.replace(/[\n\r]/g," ");if(c=this.regExes.typeStr.exec(a))if(a=c[1].toLowerCase(),c=c[2],this.parse[a]&&(b=this.parse[a].apply(this,[c])),this.internalProjection&&this.externalProjection)if(b&&
+"OpenLayers.Feature.Vector"==b.CLASS_NAME)b.geometry.transform(this.externalProjection,this.internalProjection);else if(b&&"geometrycollection"!=a&&"object"==typeof b)for(a=0,c=b.length;a<c;a++)b[a].geometry.transform(this.externalProjection,this.internalProjection);return b},write:function(a){var b,c;a.constructor==Array?c=!0:(a=[a],c=!1);var d=[];c&&d.push("GEOMETRYCOLLECTION(");for(var e=0,f=a.length;e<f;++e)c&&0<e&&d.push(","),b=a[e].geometry,d.push(this.extractGeometry(b));c&&d.push(")");return d.join("")},
+extractGeometry:function(a){var b=a.CLASS_NAME.split(".")[2].toLowerCase();if(!this.extract[b])return null;this.internalProjection&&this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));return("collection"==b?"GEOMETRYCOLLECTION":b.toUpperCase())+"("+this.extract[b].apply(this,[a])+")"},extract:{point:function(a){return a.x+" "+a.y},multipoint:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push("("+this.extract.point.apply(this,[a.components[c]])+
+")");return b.join(",")},linestring:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extract.point.apply(this,[a.components[c]]));return b.join(",")},multilinestring:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push("("+this.extract.linestring.apply(this,[a.components[c]])+")");return b.join(",")},polygon:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push("("+this.extract.linestring.apply(this,[a.components[c]])+")");return b.join(",")},multipolygon:function(a){for(var b=
+[],c=0,d=a.components.length;c<d;++c)b.push("("+this.extract.polygon.apply(this,[a.components[c]])+")");return b.join(",")},collection:function(a){for(var b=[],c=0,d=a.components.length;c<d;++c)b.push(this.extractGeometry.apply(this,[a.components[c]]));return b.join(",")}},parse:{point:function(a){a=OpenLayers.String.trim(a).split(this.regExes.spaces);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(a[0],a[1]))},multipoint:function(a){for(var b=OpenLayers.String.trim(a).split(","),
+c=[],d=0,e=b.length;d<e;++d)a=b[d].replace(this.regExes.trimParens,"$1"),c.push(this.parse.point.apply(this,[a]).geometry);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPoint(c))},linestring:function(a){a=OpenLayers.String.trim(a).split(",");for(var b=[],c=0,d=a.length;c<d;++c)b.push(this.parse.point.apply(this,[a[c]]).geometry);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.LineString(b))},multilinestring:function(a){for(var b=OpenLayers.String.trim(a).split(this.regExes.parenComma),
+c=[],d=0,e=b.length;d<e;++d)a=b[d].replace(this.regExes.trimParens,"$1"),c.push(this.parse.linestring.apply(this,[a]).geometry);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiLineString(c))},polygon:function(a){var b;a=OpenLayers.String.trim(a).split(this.regExes.parenComma);for(var c=[],d=0,e=a.length;d<e;++d)b=a[d].replace(this.regExes.trimParens,"$1"),b=this.parse.linestring.apply(this,[b]).geometry,b=new OpenLayers.Geometry.LinearRing(b.components),c.push(b);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Polygon(c))},
+multipolygon:function(a){for(var b=OpenLayers.String.trim(a).split(this.regExes.doubleParenComma),c=[],d=0,e=b.length;d<e;++d)a=b[d].replace(this.regExes.trimParens,"$1"),c.push(this.parse.polygon.apply(this,[a]).geometry);return new OpenLayers.Feature.Vector(new OpenLayers.Geometry.MultiPolygon(c))},geometrycollection:function(a){a=a.replace(/,\s*([A-Za-z])/g,"|$1");a=OpenLayers.String.trim(a).split("|");for(var b=[],c=0,d=a.length;c<d;++c)b.push(OpenLayers.Format.WKT.prototype.read.apply(this,[a[c]]));
+return b}},CLASS_NAME:"OpenLayers.Format.WKT"});OpenLayers.WPSProcess=OpenLayers.Class({client:null,server:null,identifier:null,description:null,localWPS:"http://geoserver/wps",formats:null,chained:0,executeCallbacks:null,initialize:function(a){OpenLayers.Util.extend(this,a);this.executeCallbacks=[];this.formats={"application/wkt":new OpenLayers.Format.WKT,"application/json":new OpenLayers.Format.GeoJSON}},describe:function(a){a=a||{};if(!this.description)this.client.describeProcess(this.server,this.identifier,function(b){this.description||this.parseDescription(b);
+a.callback&&a.callback.call(a.scope,this.description)},this);else if(a.callback){var b=this.description;window.setTimeout(function(){a.callback.call(a.scope,b)},0)}},configure:function(a){this.describe({callback:function(){var b=this.description,c=a.inputs,d,e,f;e=0;for(f=b.dataInputs.length;e<f;++e)d=b.dataInputs[e],this.setInputData(d,c[d.identifier]);a.callback&&a.callback.call(a.scope)},scope:this});return this},execute:function(a){this.configure({inputs:a.inputs,callback:function(){var b=this,
+c=this.getOutputIndex(b.description.processOutputs,a.output);b.setResponseForm({outputIndex:c});(function e(){OpenLayers.Util.removeItem(b.executeCallbacks,e);0!==b.chained?b.executeCallbacks.push(e):OpenLayers.Request.POST({url:b.client.servers[b.server].url,data:(new OpenLayers.Format.WPSExecute).write(b.description),success:function(e){var g=b.findMimeType(b.description.processOutputs[c].complexOutput.supported.formats);e=b.formats[g].read(e.responseText);e instanceof OpenLayers.Feature.Vector&&
+(e=[e]);a.success&&(g={},g[a.output||"result"]=e,a.success.call(a.scope,g))},scope:b})})()},scope:this})},output:function(a){return new OpenLayers.WPSProcess.ChainLink({process:this,output:a})},parseDescription:function(a){a=this.client.servers[this.server];this.description=(new OpenLayers.Format.WPSDescribeProcess).read(a.processDescription[this.identifier]).processDescriptions[this.identifier]},setInputData:function(a,b){delete a.data;delete a.reference;if(b instanceof OpenLayers.WPSProcess.ChainLink)++this.chained,
+a.reference={method:"POST",href:b.process.server===this.server?this.localWPS:this.client.servers[b.process.server].url},b.process.describe({callback:function(){--this.chained;this.chainProcess(a,b)},scope:this});else{a.data={};var c=a.complexData;c?(c=this.findMimeType(c.supported.formats),a.data.complexData={mimeType:c,value:this.formats[c].write(this.toFeatures(b))}):a.data.literalData={value:b}}},setResponseForm:function(a){a=a||{};var b=this.description.processOutputs[a.outputIndex||0];this.description.responseForm=
+{rawDataOutput:{identifier:b.identifier,mimeType:this.findMimeType(b.complexOutput.supported.formats,a.supportedFormats)}}},getOutputIndex:function(a,b){var c;if(b)for(var d=a.length-1;0<=d;--d){if(a[d].identifier===b){c=d;break}}else c=0;return c},chainProcess:function(a,b){var c=this.getOutputIndex(b.process.description.processOutputs,b.output);a.reference.mimeType=this.findMimeType(a.complexData.supported.formats,b.process.description.processOutputs[c].complexOutput.supported.formats);var d={};
+d[a.reference.mimeType]=!0;b.process.setResponseForm({outputIndex:c,supportedFormats:d});for(a.reference.body=b.process.description;0<this.executeCallbacks.length;)this.executeCallbacks[0]()},toFeatures:function(a){var b=OpenLayers.Util.isArray(a);b||(a=[a]);for(var c=Array(a.length),d,e=0,f=a.length;e<f;++e)d=a[e],c[e]=d instanceof OpenLayers.Feature.Vector?d:new OpenLayers.Feature.Vector(d);return b?c:c[0]},findMimeType:function(a,b){b=b||this.formats;for(var c in a)if(c in b)return c},CLASS_NAME:"OpenLayers.WPSProcess"});
+OpenLayers.WPSProcess.ChainLink=OpenLayers.Class({process:null,output:null,initialize:function(a){OpenLayers.Util.extend(this,a)},CLASS_NAME:"OpenLayers.WPSProcess.ChainLink"});OpenLayers.WPSClient=OpenLayers.Class({servers:null,version:"1.0.0",lazy:!1,events:null,initialize:function(a){OpenLayers.Util.extend(this,a);this.events=new OpenLayers.Events(this);this.servers={};for(var b in a.servers)this.servers[b]="string"==typeof a.servers[b]?{url:a.servers[b],version:this.version,processDescription:{}}:a.servers[b]},execute:function(a){this.getProcess(a.server,a.process).execute({inputs:a.inputs,success:a.success,scope:a.scope})},getProcess:function(a,b){var c=new OpenLayers.WPSProcess({client:this,
+server:a,identifier:b});this.lazy||c.describe();return c},describeProcess:function(a,b,c,d){var e=this.servers[a];e.processDescription[b]?window.setTimeout(function(){c.call(d,e.processDescription[b])},0):b in e.processDescription?this.events.register("describeprocess",this,function g(a){a.identifier===b&&(this.events.unregister("describeprocess",this,g),c.call(d,a.raw))}):(e.processDescription[b]=null,OpenLayers.Request.GET({url:e.url,params:{SERVICE:"WPS",VERSION:e.version,REQUEST:"DescribeProcess",
+IDENTIFIER:b},success:function(a){e.processDescription[b]=a.responseText;this.events.triggerEvent("describeprocess",{identifier:b,raw:a.responseText})},scope:this}))},destroy:function(){this.events.destroy();this.servers=this.events=null},CLASS_NAME:"OpenLayers.WPSClient"});OpenLayers.Format.CSWGetRecords.v2_0_2=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{csw:"http://www.opengis.net/cat/csw/2.0.2",dc:"http://purl.org/dc/elements/1.1/",dct:"http://purl.org/dc/terms/",gmd:"http://www.isotc211.org/2005/gmd",geonet:"http://www.fao.org/geonetwork",ogc:"http://www.opengis.net/ogc",ows:"http://www.opengis.net/ows",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},defaultPrefix:"csw",version:"2.0.2",schemaLocation:"http://www.opengis.net/cat/csw/2.0.2 http://schemas.opengis.net/csw/2.0.2/CSW-discovery.xsd",
+requestId:null,resultType:null,outputFormat:null,outputSchema:null,startPosition:null,maxRecords:null,DistributedSearch:null,ResponseHandler:null,Query:null,regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},
+readers:{csw:{GetRecordsResponse:function(a,b){b.records=[];this.readChildNodes(a,b);var c=this.getAttributeNS(a,"","version");""!=c&&(b.version=c)},RequestId:function(a,b){b.RequestId=this.getChildValue(a)},SearchStatus:function(a,b){b.SearchStatus={};var c=this.getAttributeNS(a,"","timestamp");""!=c&&(b.SearchStatus.timestamp=c)},SearchResults:function(a,b){this.readChildNodes(a,b);for(var c=a.attributes,d={},e=0,f=c.length;e<f;++e)d[c[e].name]="numberOfRecordsMatched"==c[e].name||"numberOfRecordsReturned"==
+c[e].name||"nextRecord"==c[e].name?parseInt(c[e].nodeValue):c[e].nodeValue;b.SearchResults=d},SummaryRecord:function(a,b){var c={type:"SummaryRecord"};this.readChildNodes(a,c);b.records.push(c)},BriefRecord:function(a,b){var c={type:"BriefRecord"};this.readChildNodes(a,c);b.records.push(c)},DCMIRecord:function(a,b){var c={type:"DCMIRecord"};this.readChildNodes(a,c);b.records.push(c)},Record:function(a,b){var c={type:"Record"};this.readChildNodes(a,c);b.records.push(c)},"*":function(a,b){var c=a.localName||
+a.nodeName.split(":").pop();b[c]=this.getChildValue(a)}},geonet:{info:function(a,b){var c={};this.readChildNodes(a,c);b.gninfo=c}},dc:{"*":function(a,b){var c=a.localName||a.nodeName.split(":").pop();OpenLayers.Util.isArray(b[c])||(b[c]=[]);for(var d={},e=a.attributes,f=0,g=e.length;f<g;++f)d[e[f].name]=e[f].nodeValue;d.value=this.getChildValue(a);""!=d.value&&b[c].push(d)}},dct:{"*":function(a,b){var c=a.localName||a.nodeName.split(":").pop();OpenLayers.Util.isArray(b[c])||(b[c]=[]);b[c].push(this.getChildValue(a))}},
+ows:OpenLayers.Util.applyDefaults({BoundingBox:function(a,b){b.bounds&&(b.BoundingBox=[{crs:b.projection,value:[b.bounds.left,b.bounds.bottom,b.bounds.right,b.bounds.top]}],delete b.projection,delete b.bounds);OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows.BoundingBox.apply(this,arguments)}},OpenLayers.Format.OWSCommon.v1_0_0.prototype.readers.ows)},write:function(a){a=this.writeNode("csw:GetRecords",a);a.setAttribute("xmlns:gmd",this.namespaces.gmd);return OpenLayers.Format.XML.prototype.write.apply(this,
+[a])},writers:{csw:{GetRecords:function(a){a||(a={});var b=this.createElementNSPlus("csw:GetRecords",{attributes:{service:"CSW",version:this.version,requestId:a.requestId||this.requestId,resultType:a.resultType||this.resultType,outputFormat:a.outputFormat||this.outputFormat,outputSchema:a.outputSchema||this.outputSchema,startPosition:a.startPosition||this.startPosition,maxRecords:a.maxRecords||this.maxRecords}});(a.DistributedSearch||this.DistributedSearch)&&this.writeNode("csw:DistributedSearch",
+a.DistributedSearch||this.DistributedSearch,b);var c=a.ResponseHandler||this.ResponseHandler;if(OpenLayers.Util.isArray(c)&&0<c.length)for(var d=0,e=c.length;d<e;d++)this.writeNode("csw:ResponseHandler",c[d],b);this.writeNode("Query",a.Query||this.Query,b);return b},DistributedSearch:function(a){return this.createElementNSPlus("csw:DistributedSearch",{attributes:{hopCount:a.hopCount}})},ResponseHandler:function(a){return this.createElementNSPlus("csw:ResponseHandler",{value:a.value})},Query:function(a){a||
+(a={});var b=this.createElementNSPlus("csw:Query",{attributes:{typeNames:a.typeNames||"csw:Record"}}),c=a.ElementName;if(OpenLayers.Util.isArray(c)&&0<c.length)for(var d=0,e=c.length;d<e;d++)this.writeNode("csw:ElementName",c[d],b);else this.writeNode("csw:ElementSetName",a.ElementSetName||{value:"summary"},b);a.Constraint&&this.writeNode("csw:Constraint",a.Constraint,b);a.SortBy&&this.writeNode("ogc:SortBy",a.SortBy,b);return b},ElementName:function(a){return this.createElementNSPlus("csw:ElementName",
+{value:a.value})},ElementSetName:function(a){return this.createElementNSPlus("csw:ElementSetName",{attributes:{typeNames:a.typeNames},value:a.value})},Constraint:function(a){var b=this.createElementNSPlus("csw:Constraint",{attributes:{version:a.version}});if(a.Filter){var c=new OpenLayers.Format.Filter({version:a.version});b.appendChild(c.write(a.Filter))}else a.CqlText&&(a=this.createElementNSPlus("CqlText",{value:a.CqlText.value}),b.appendChild(a));return b}},ogc:OpenLayers.Format.Filter.v1_1_0.prototype.writers.ogc},
+CLASS_NAME:"OpenLayers.Format.CSWGetRecords.v2_0_2"});/*
+ Apache 2
+
+ Contains portions of Rico <http://openrico.org/>
+
+ Copyright 2005 Sabre Airline Solutions
+
+ Licensed under the Apache License, Version 2.0 (the "License"); you
+ may not use this file except in compliance with the License. You
+ may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ permissions and limitations under the License.
+*/
+OpenLayers.Marker.Box=OpenLayers.Class(OpenLayers.Marker,{bounds:null,div:null,initialize:function(a,b,c){this.bounds=a;this.div=OpenLayers.Util.createDiv();this.div.style.overflow="hidden";this.events=new OpenLayers.Events(this,this.div);this.setBorder(b,c)},destroy:function(){this.div=this.bounds=null;OpenLayers.Marker.prototype.destroy.apply(this,arguments)},setBorder:function(a,b){a||(a="red");b||(b=2);this.div.style.border=b+"px solid "+a},draw:function(a,b){OpenLayers.Util.modifyDOMElement(this.div,
+null,a,b);return this.div},onScreen:function(){var a=!1;this.map&&(a=this.map.getExtent().containsBounds(this.bounds,!0,!0));return a},display:function(a){this.div.style.display=a?"":"none"},CLASS_NAME:"OpenLayers.Marker.Box"});OpenLayers.Format.Text=OpenLayers.Class(OpenLayers.Format,{defaultStyle:null,extractStyles:!0,initialize:function(a){a=a||{};!1!==a.extractStyles&&(a.defaultStyle={externalGraphic:OpenLayers.Util.getImageLocation("marker.png"),graphicWidth:21,graphicHeight:25,graphicXOffset:-10.5,graphicYOffset:-12.5});OpenLayers.Format.prototype.initialize.apply(this,[a])},read:function(a){a=a.split("\n");for(var b,c=[],d=0;d<a.length-1;d++){var e=a[d].replace(/^\s*/,"").replace(/\s*$/,"");if("#"!=e.charAt(0))if(b){for(var e=
+e.split("\t"),f=new OpenLayers.Geometry.Point(0,0),g={},h=this.defaultStyle?OpenLayers.Util.applyDefaults({},this.defaultStyle):null,k=!1,l=0;l<e.length;l++)if(e[l])if("point"==b[l])k=e[l].split(","),f.y=parseFloat(k[0]),f.x=parseFloat(k[1]),k=!0;else if("lat"==b[l])f.y=parseFloat(e[l]),k=!0;else if("lon"==b[l])f.x=parseFloat(e[l]),k=!0;else if("title"==b[l])g.title=e[l];else if("image"==b[l]||"icon"==b[l]&&h)h.externalGraphic=e[l];else if("iconSize"==b[l]&&h){var m=e[l].split(",");h.graphicWidth=
+parseFloat(m[0]);h.graphicHeight=parseFloat(m[1])}else"iconOffset"==b[l]&&h?(m=e[l].split(","),h.graphicXOffset=parseFloat(m[0]),h.graphicYOffset=parseFloat(m[1])):"description"==b[l]?g.description=e[l]:"overflow"==b[l]?g.overflow=e[l]:g[b[l]]=e[l];k&&(this.internalProjection&&this.externalProjection&&f.transform(this.externalProjection,this.internalProjection),e=new OpenLayers.Feature.Vector(f,g,h),c.push(e))}else b=e.split("\t")}return c},CLASS_NAME:"OpenLayers.Format.Text"});OpenLayers.Layer.Text=OpenLayers.Class(OpenLayers.Layer.Markers,{location:null,features:null,formatOptions:null,selectedFeature:null,initialize:function(a,b){OpenLayers.Layer.Markers.prototype.initialize.apply(this,arguments);this.features=[]},destroy:function(){OpenLayers.Layer.Markers.prototype.destroy.apply(this,arguments);this.clearFeatures();this.features=null},loadText:function(){this.loaded||null==this.location||(this.events.triggerEvent("loadstart"),OpenLayers.Request.GET({url:this.location,
+success:this.parseData,failure:function(a){this.events.triggerEvent("loadend")},scope:this}),this.loaded=!0)},moveTo:function(a,b,c){OpenLayers.Layer.Markers.prototype.moveTo.apply(this,arguments);this.visibility&&!this.loaded&&this.loadText()},parseData:function(a){a=a.responseText;var b={};OpenLayers.Util.extend(b,this.formatOptions);this.map&&!this.projection.equals(this.map.getProjectionObject())&&(b.externalProjection=this.projection,b.internalProjection=this.map.getProjectionObject());a=(new OpenLayers.Format.Text(b)).read(a);
+for(var b=0,c=a.length;b<c;b++){var d={},e=a[b],f,g,h;f=new OpenLayers.LonLat(e.geometry.x,e.geometry.y);e.style.graphicWidth&&e.style.graphicHeight&&(g=new OpenLayers.Size(e.style.graphicWidth,e.style.graphicHeight));void 0!==e.style.graphicXOffset&&void 0!==e.style.graphicYOffset&&(h=new OpenLayers.Pixel(e.style.graphicXOffset,e.style.graphicYOffset));null!=e.style.externalGraphic?d.icon=new OpenLayers.Icon(e.style.externalGraphic,g,h):(d.icon=OpenLayers.Marker.defaultIcon(),null!=g&&d.icon.setSize(g));
+null!=e.attributes.title&&null!=e.attributes.description&&(d.popupContentHTML="<h2>"+e.attributes.title+"</h2><p>"+e.attributes.description+"</p>");d.overflow=e.attributes.overflow||"auto";d=new OpenLayers.Feature(this,f,d);this.features.push(d);f=d.createMarker();null!=e.attributes.title&&null!=e.attributes.description&&f.events.register("click",d,this.markerClick);this.addMarker(f)}this.events.triggerEvent("loadend")},markerClick:function(a){var b=this==this.layer.selectedFeature;this.layer.selectedFeature=
+b?null:this;for(var c=0,d=this.layer.map.popups.length;c<d;c++)this.layer.map.removePopup(this.layer.map.popups[c]);b||this.layer.map.addPopup(this.createPopup());OpenLayers.Event.stop(a)},clearFeatures:function(){if(null!=this.features)for(;0<this.features.length;){var a=this.features[0];OpenLayers.Util.removeItem(this.features,a);a.destroy()}},CLASS_NAME:"OpenLayers.Layer.Text"});OpenLayers.Handler.RegularPolygon=OpenLayers.Class(OpenLayers.Handler.Drag,{sides:4,radius:null,snapAngle:null,snapToggle:"shiftKey",layerOptions:null,persist:!1,irregular:!1,citeCompliant:!1,angle:null,fixedRadius:!1,feature:null,layer:null,origin:null,initialize:function(a,b,c){c&&c.layerOptions&&c.layerOptions.styleMap||(this.style=OpenLayers.Util.extend(OpenLayers.Feature.Vector.style["default"],{}));OpenLayers.Handler.Drag.prototype.initialize.apply(this,[a,b,c]);this.options=c?c:{}},setOptions:function(a){OpenLayers.Util.extend(this.options,
+a);OpenLayers.Util.extend(this,a)},activate:function(){var a=!1;OpenLayers.Handler.Drag.prototype.activate.apply(this,arguments)&&(a=OpenLayers.Util.extend({displayInLayerSwitcher:!1,calculateInRange:OpenLayers.Function.True,wrapDateLine:this.citeCompliant},this.layerOptions),this.layer=new OpenLayers.Layer.Vector(this.CLASS_NAME,a),this.map.addLayer(this.layer),a=!0);return a},deactivate:function(){var a=!1;OpenLayers.Handler.Drag.prototype.deactivate.apply(this,arguments)&&(this.dragging&&this.cancel(),
+null!=this.layer.map&&(this.layer.destroy(!1),this.feature&&this.feature.destroy()),this.feature=this.layer=null,a=!0);return a},down:function(a){this.fixedRadius=!!this.radius;a=this.layer.getLonLatFromViewPortPx(a.xy);this.origin=new OpenLayers.Geometry.Point(a.lon,a.lat);if(!this.fixedRadius||this.irregular)this.radius=this.map.getResolution();this.persist&&this.clear();this.feature=new OpenLayers.Feature.Vector;this.createGeometry();this.callback("create",[this.origin,this.feature]);this.layer.addFeatures([this.feature],
+{silent:!0});this.layer.drawFeature(this.feature,this.style)},move:function(a){var b=this.layer.getLonLatFromViewPortPx(a.xy),b=new OpenLayers.Geometry.Point(b.lon,b.lat);this.irregular?(a=Math.sqrt(2)*Math.abs(b.y-this.origin.y)/2,this.radius=Math.max(this.map.getResolution()/2,a)):this.fixedRadius?this.origin=b:(this.calculateAngle(b,a),this.radius=Math.max(this.map.getResolution()/2,b.distanceTo(this.origin)));this.modifyGeometry();if(this.irregular){a=b.x-this.origin.x;var b=b.y-this.origin.y,
+c;c=0==b?a/(this.radius*Math.sqrt(2)):a/b;this.feature.geometry.resize(1,this.origin,c);this.feature.geometry.move(a/2,b/2)}this.layer.drawFeature(this.feature,this.style)},up:function(a){this.finalize();this.start==this.last&&this.callback("done",[a.xy])},out:function(a){this.finalize()},createGeometry:function(){this.angle=Math.PI*(1/this.sides-0.5);this.snapAngle&&(this.angle+=this.snapAngle*(Math.PI/180));this.feature.geometry=OpenLayers.Geometry.Polygon.createRegularPolygon(this.origin,this.radius,
+this.sides,this.snapAngle)},modifyGeometry:function(){var a,b,c=this.feature.geometry.components[0];c.components.length!=this.sides+1&&(this.createGeometry(),c=this.feature.geometry.components[0]);for(var d=0;d<this.sides;++d)b=c.components[d],a=this.angle+2*d*Math.PI/this.sides,b.x=this.origin.x+this.radius*Math.cos(a),b.y=this.origin.y+this.radius*Math.sin(a),b.clearBounds()},calculateAngle:function(a,b){var c=Math.atan2(a.y-this.origin.y,a.x-this.origin.x);if(this.snapAngle&&this.snapToggle&&!b[this.snapToggle]){var d=
+Math.PI/180*this.snapAngle;this.angle=Math.round(c/d)*d}else this.angle=c},cancel:function(){this.callback("cancel",null);this.finalize()},finalize:function(){this.origin=null;this.radius=this.options.radius},clear:function(){this.layer&&(this.layer.renderer.clear(),this.layer.destroyFeatures())},callback:function(a,b){this.callbacks[a]&&this.callbacks[a].apply(this.control,[this.feature.geometry.clone()]);this.persist||"done"!=a&&"cancel"!=a||this.clear()},CLASS_NAME:"OpenLayers.Handler.RegularPolygon"});OpenLayers.Control.SLDSelect=OpenLayers.Class(OpenLayers.Control,{clearOnDeactivate:!1,layers:null,callbacks:null,selectionSymbolizer:{Polygon:{fillColor:"#FF0000",stroke:!1},Line:{strokeColor:"#FF0000",strokeWidth:2},Point:{graphicName:"square",fillColor:"#FF0000",pointRadius:5}},layerOptions:null,sketchStyle:null,wfsCache:{},layerCache:{},initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.callbacks=OpenLayers.Util.extend({done:this.select,click:this.select},this.callbacks);
+this.handlerOptions=this.handlerOptions||{};this.layerOptions=OpenLayers.Util.applyDefaults(this.layerOptions,{displayInLayerSwitcher:!1,tileOptions:{maxGetUrlLength:2048}});this.sketchStyle&&(this.handlerOptions.layerOptions=OpenLayers.Util.applyDefaults(this.handlerOptions.layerOptions,{styleMap:new OpenLayers.StyleMap({"default":this.sketchStyle})}));this.handler=new a(this,this.callbacks,this.handlerOptions)},destroy:function(){for(var a in this.layerCache)delete this.layerCache[a];for(a in this.wfsCache)delete this.wfsCache[a];
+OpenLayers.Control.prototype.destroy.apply(this,arguments)},coupleLayerVisiblity:function(a){this.setVisibility(a.object.getVisibility())},createSelectionLayer:function(a){var b;if(this.layerCache[a.id])b=this.layerCache[a.id];else{b=new OpenLayers.Layer.WMS(a.name,a.url,a.params,OpenLayers.Util.applyDefaults(this.layerOptions,a.getOptions()));this.layerCache[a.id]=b;if(!1===this.layerOptions.displayInLayerSwitcher)a.events.on({visibilitychanged:this.coupleLayerVisiblity,scope:b});this.map.addLayer(b)}return b},
+createSLD:function(a,b,c){for(var d={version:"1.0.0",namedLayers:{}},e=(""+a.params.LAYERS).split(","),f=0,g=e.length;f<g;f++){var h=e[f];d.namedLayers[h]={name:h,userStyles:[]};var k=this.selectionSymbolizer,l=c[f];0<=l.type.indexOf("Polygon")?k={Polygon:this.selectionSymbolizer.Polygon}:0<=l.type.indexOf("LineString")?k={Line:this.selectionSymbolizer.Line}:0<=l.type.indexOf("Point")&&(k={Point:this.selectionSymbolizer.Point});d.namedLayers[h].userStyles.push({name:"default",rules:[new OpenLayers.Rule({symbolizer:k,
+filter:b[f],maxScaleDenominator:a.options.minScale})]})}return(new OpenLayers.Format.SLD({srsName:this.map.getProjection()})).write(d)},parseDescribeLayer:function(a){var b=new OpenLayers.Format.WMSDescribeLayer,c=a.responseXML;c&&c.documentElement||(c=a.responseText);a=b.read(c);for(var b=[],c=null,d=0,e=a.length;d<e;d++)"WFS"==a[d].owsType&&(b.push(a[d].typeName),c=a[d].owsURL);OpenLayers.Request.GET({url:c,params:{SERVICE:"WFS",TYPENAME:b.toString(),REQUEST:"DescribeFeatureType",VERSION:"1.0.0"},
+callback:function(a){var b=new OpenLayers.Format.WFSDescribeFeatureType,c=a.responseXML;c&&c.documentElement||(c=a.responseText);a=b.read(c);this.control.wfsCache[this.layer.id]=a;this.control._queue&&this.control.applySelection()},scope:this})},getGeometryAttributes:function(a){var b=[];a=this.wfsCache[a.id];for(var c=0,d=a.featureTypes.length;c<d;c++)for(var e=a.featureTypes[c].properties,f=0,g=e.length;f<g;f++){var h=e[f],k=h.type;(0<=k.indexOf("LineString")||0<=k.indexOf("GeometryAssociationType")||
+0<=k.indexOf("GeometryPropertyType")||0<=k.indexOf("Point")||0<=k.indexOf("Polygon"))&&b.push(h)}return b},activate:function(){var a=OpenLayers.Control.prototype.activate.call(this);if(a)for(var b=0,c=this.layers.length;b<c;b++){var d=this.layers[b];d&&!this.wfsCache[d.id]&&OpenLayers.Request.GET({url:d.url,params:{SERVICE:"WMS",VERSION:d.params.VERSION,LAYERS:d.params.LAYERS,REQUEST:"DescribeLayer"},callback:this.parseDescribeLayer,scope:{layer:d,control:this}})}return a},deactivate:function(){var a=
+OpenLayers.Control.prototype.deactivate.call(this);if(a)for(var b=0,c=this.layers.length;b<c;b++){var d=this.layers[b];if(d&&!0===this.clearOnDeactivate){var e=this.layerCache,f=e[d.id];f&&(d.events.un({visibilitychanged:this.coupleLayerVisiblity,scope:f}),f.destroy(),delete e[d.id])}}return a},setLayers:function(a){this.active?(this.deactivate(),this.layers=a,this.activate()):this.layers=a},createFilter:function(a,b){var c=null;this.handler instanceof OpenLayers.Handler.RegularPolygon?c=!0===this.handler.irregular?
+new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,property:a.name,value:b.getBounds()}):new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:a.name,value:b}):this.handler instanceof OpenLayers.Handler.Polygon?c=new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:a.name,value:b}):this.handler instanceof OpenLayers.Handler.Path?c=0<=a.type.indexOf("Point")?new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,
+property:a.name,distance:0.01*this.map.getExtent().getWidth(),distanceUnits:this.map.getUnits(),value:b}):new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:a.name,value:b}):this.handler instanceof OpenLayers.Handler.Click&&(c=0<=a.type.indexOf("Polygon")?new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:a.name,value:b}):new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,property:a.name,distance:0.01*this.map.getExtent().getWidth(),
+distanceUnits:this.map.getUnits(),value:b}));return c},select:function(a){this._queue=function(){for(var b=0,c=this.layers.length;b<c;b++){for(var d=this.layers[b],e=this.getGeometryAttributes(d),f=[],g=0,h=e.length;g<h;g++){var k=e[g];if(null!==k){if(!(a instanceof OpenLayers.Geometry)){var l=this.map.getLonLatFromPixel(a.xy);a=new OpenLayers.Geometry.Point(l.lon,l.lat)}k=this.createFilter(k,a);null!==k&&f.push(k)}}g=this.createSelectionLayer(d);this.events.triggerEvent("selected",{layer:d,filters:f});
+d=this.createSLD(d,f,e);g.mergeNewParams({SLD_BODY:d});delete this._queue}};this.applySelection()},applySelection:function(){for(var a=!0,b=0,c=this.layers.length;b<c;b++)if(!this.wfsCache[this.layers[b].id]){a=!1;break}a&&this._queue.call(this)},CLASS_NAME:"OpenLayers.Control.SLDSelect"});OpenLayers.Control.Scale=OpenLayers.Class(OpenLayers.Control,{element:null,geodesic:!1,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);this.element=OpenLayers.Util.getElement(a)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.element||(this.element=document.createElement("div"),this.div.appendChild(this.element));this.map.events.register("moveend",this,this.updateScale);this.updateScale();return this.div},updateScale:function(){var a;
+if(!0===this.geodesic){if(!this.map.getUnits())return;a=OpenLayers.INCHES_PER_UNIT;a=(this.map.getGeodesicPixelSize().w||1E-6)*a.km*OpenLayers.DOTS_PER_INCH}else a=this.map.getScale();a&&(a=9500<=a&&95E4>=a?Math.round(a/1E3)+"K":95E4<=a?Math.round(a/1E6)+"M":Math.round(a),this.element.innerHTML=OpenLayers.i18n("Scale = 1 : ${scaleDenom}",{scaleDenom:a}))},CLASS_NAME:"OpenLayers.Control.Scale"});OpenLayers.Layer.MapGuide=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,useHttpTile:!1,singleTile:!1,useOverlay:!1,useAsyncOverlay:!0,TILE_PARAMS:{operation:"GETTILEIMAGE",version:"1.2.0"},SINGLE_TILE_PARAMS:{operation:"GETMAPIMAGE",format:"PNG",locale:"en",clip:"1",version:"1.0.0"},OVERLAY_PARAMS:{operation:"GETDYNAMICMAPOVERLAYIMAGE",format:"PNG",locale:"en",clip:"1",version:"2.0.0"},FOLDER_PARAMS:{tileColumnsPerFolder:30,tileRowsPerFolder:30,format:"png",querystring:null},defaultSize:new OpenLayers.Size(300,
+300),tileOriginCorner:"tl",initialize:function(a,b,c,d){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);if(null==d||null==d.isBaseLayer)this.isBaseLayer="true"!=this.transparent&&!0!=this.transparent;d&&null!=d.useOverlay&&(this.useOverlay=d.useOverlay);this.singleTile?this.useOverlay?(OpenLayers.Util.applyDefaults(this.params,this.OVERLAY_PARAMS),this.useAsyncOverlay||(this.params.version="1.0.0")):OpenLayers.Util.applyDefaults(this.params,this.SINGLE_TILE_PARAMS):(this.useHttpTile?
+OpenLayers.Util.applyDefaults(this.params,this.FOLDER_PARAMS):OpenLayers.Util.applyDefaults(this.params,this.TILE_PARAMS),this.setTileSize(this.defaultSize))},clone:function(a){null==a&&(a=new OpenLayers.Layer.MapGuide(this.name,this.url,this.params,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){var b;b=a.getCenterLonLat();var c=this.map.getSize();this.singleTile?(a={setdisplaydpi:OpenLayers.DOTS_PER_INCH,setdisplayheight:c.h*this.ratio,setdisplaywidth:c.w*
+this.ratio,setviewcenterx:b.lon,setviewcentery:b.lat,setviewscale:this.map.getScale()},this.useOverlay&&!this.useAsyncOverlay&&(b={},b=OpenLayers.Util.extend(b,a),b.operation="GETVISIBLEMAPEXTENT",b.version="1.0.0",b.session=this.params.session,b.mapName=this.params.mapName,b.format="text/xml",b=this.getFullRequestString(b),OpenLayers.Request.GET({url:b,async:!1})),b=this.getFullRequestString(a)):(c=this.map.getResolution(),b=Math.floor((a.left-this.maxExtent.left)/c),b=Math.round(b/this.tileSize.w),
+a=Math.floor((this.maxExtent.top-a.top)/c),a=Math.round(a/this.tileSize.h),b=this.useHttpTile?this.getImageFilePath({tilecol:b,tilerow:a,scaleindex:this.resolutions.length-this.map.zoom-1}):this.getFullRequestString({tilecol:b,tilerow:a,scaleindex:this.resolutions.length-this.map.zoom-1}));return b},getFullRequestString:function(a,b){var c=null==b?this.url:b;"object"==typeof c&&(c=c[Math.floor(Math.random()*c.length)]);var d=c,e=OpenLayers.Util.extend({},this.params),e=OpenLayers.Util.extend(e,a),
+f=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(c)),g;for(g in e)g.toUpperCase()in f&&delete e[g];e=OpenLayers.Util.getParameterString(e);e=e.replace(/,/g,"+");""!=e&&(f=c.charAt(c.length-1),d="&"==f||"?"==f?d+e:-1==c.indexOf("?")?d+("?"+e):d+("&"+e));return d},getImageFilePath:function(a,b){var c=null==b?this.url:b;"object"==typeof c&&(c=c[Math.floor(Math.random()*c.length)]);var d="",e="";0>a.tilerow&&(d="-");d=0==a.tilerow?d+"0":d+Math.floor(Math.abs(a.tilerow/this.params.tileRowsPerFolder))*
+this.params.tileRowsPerFolder;0>a.tilecol&&(e="-");e=0==a.tilecol?e+"0":e+Math.floor(Math.abs(a.tilecol/this.params.tileColumnsPerFolder))*this.params.tileColumnsPerFolder;d="/S"+Math.floor(a.scaleindex)+"/"+this.params.basemaplayergroupname+"/R"+d+"/C"+e+"/"+a.tilerow%this.params.tileRowsPerFolder+"_"+a.tilecol%this.params.tileColumnsPerFolder+"."+this.params.format;this.params.querystring&&(d+="?"+this.params.querystring);return c+d},CLASS_NAME:"OpenLayers.Layer.MapGuide"});OpenLayers.Control.Measure=OpenLayers.Class(OpenLayers.Control,{callbacks:null,displaySystem:"metric",geodesic:!1,displaySystemUnits:{geographic:["dd"],english:["mi","ft","in"],metric:["km","m"]},partialDelay:300,delayedTrigger:null,persist:!1,immediate:!1,initialize:function(a,b){OpenLayers.Control.prototype.initialize.apply(this,[b]);var c={done:this.measureComplete,point:this.measurePartial};this.immediate&&(c.modify=this.measureImmediate);this.callbacks=OpenLayers.Util.extend(c,this.callbacks);
+this.handlerOptions=OpenLayers.Util.extend({persist:this.persist},this.handlerOptions);this.handler=new a(this,this.callbacks,this.handlerOptions)},deactivate:function(){this.cancelDelay();return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},cancel:function(){this.cancelDelay();this.handler.cancel()},setImmediate:function(a){(this.immediate=a)?this.callbacks.modify=this.measureImmediate:delete this.callbacks.modify},updateHandler:function(a,b){var c=this.active;c&&this.deactivate();
+this.handler=new a(this,this.callbacks,b);c&&this.activate()},measureComplete:function(a){this.cancelDelay();this.measure(a,"measure")},measurePartial:function(a,b){this.cancelDelay();b=b.clone();this.handler.freehandMode(this.handler.evt)?this.measure(b,"measurepartial"):this.delayedTrigger=window.setTimeout(OpenLayers.Function.bind(function(){this.delayedTrigger=null;this.measure(b,"measurepartial")},this),this.partialDelay)},measureImmediate:function(a,b,c){c&&!this.handler.freehandMode(this.handler.evt)&&
+(this.cancelDelay(),this.measure(b.geometry,"measurepartial"))},cancelDelay:function(){null!==this.delayedTrigger&&(window.clearTimeout(this.delayedTrigger),this.delayedTrigger=null)},measure:function(a,b){var c,d;-1<a.CLASS_NAME.indexOf("LineString")?(c=this.getBestLength(a),d=1):(c=this.getBestArea(a),d=2);this.events.triggerEvent(b,{measure:c[0],units:c[1],order:d,geometry:a})},getBestArea:function(a){for(var b=this.displaySystemUnits[this.displaySystem],c,d,e=0,f=b.length;e<f&&!(c=b[e],d=this.getArea(a,
+c),1<d);++e);return[d,c]},getArea:function(a,b){var c,d;this.geodesic?(c=a.getGeodesicArea(this.map.getProjectionObject()),d="m"):(c=a.getArea(),d=this.map.getUnits());var e=OpenLayers.INCHES_PER_UNIT[b];e&&(c*=Math.pow(OpenLayers.INCHES_PER_UNIT[d]/e,2));return c},getBestLength:function(a){for(var b=this.displaySystemUnits[this.displaySystem],c,d,e=0,f=b.length;e<f&&!(c=b[e],d=this.getLength(a,c),1<d);++e);return[d,c]},getLength:function(a,b){var c,d;this.geodesic?(c=a.getGeodesicLength(this.map.getProjectionObject()),
+d="m"):(c=a.getLength(),d=this.map.getUnits());var e=OpenLayers.INCHES_PER_UNIT[b];e&&(c*=OpenLayers.INCHES_PER_UNIT[d]/e);return c},CLASS_NAME:"OpenLayers.Control.Measure"});OpenLayers.Format.WMC.v1_0_0=OpenLayers.Class(OpenLayers.Format.WMC.v1,{VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/context http://schemas.opengis.net/context/1.0.0/context.xsd",initialize:function(a){OpenLayers.Format.WMC.v1.prototype.initialize.apply(this,[a])},read_wmc_SRS:function(a,b){var c=this.getChildValue(b);"object"!=typeof a.projections&&(a.projections={});for(var c=c.split(/ +/),d=0,e=c.length;d<e;d++)a.projections[c[d]]=!0},write_wmc_Layer:function(a){var b=OpenLayers.Format.WMC.v1.prototype.write_wmc_Layer.apply(this,
+[a]);if(a.srs){var c=[],d;for(d in a.srs)c.push(d);b.appendChild(this.createElementDefaultNS("SRS",c.join(" ")))}b.appendChild(this.write_wmc_FormatList(a));b.appendChild(this.write_wmc_StyleList(a));a.dimensions&&b.appendChild(this.write_wmc_DimensionList(a));b.appendChild(this.write_wmc_LayerExtension(a))},CLASS_NAME:"OpenLayers.Format.WMC.v1_0_0"});OpenLayers.Popup.Anchored=OpenLayers.Class(OpenLayers.Popup,{relativePosition:null,keepInMap:!0,anchor:null,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.prototype.initialize.apply(this,[a,b,c,d,f,g]);this.anchor=null!=e?e:{size:new OpenLayers.Size(0,0),offset:new OpenLayers.Pixel(0,0)}},destroy:function(){this.relativePosition=this.anchor=null;OpenLayers.Popup.prototype.destroy.apply(this,arguments)},show:function(){this.updatePosition();OpenLayers.Popup.prototype.show.apply(this,arguments)},
+moveTo:function(a){var b=this.relativePosition;this.relativePosition=this.calculateRelativePosition(a);OpenLayers.Popup.prototype.moveTo.call(this,this.calculateNewPx(a));this.relativePosition!=b&&this.updateRelativePosition()},setSize:function(a){OpenLayers.Popup.prototype.setSize.apply(this,arguments);if(this.lonlat&&this.map){var b=this.map.getLayerPxFromLonLat(this.lonlat);this.moveTo(b)}},calculateRelativePosition:function(a){a=this.map.getLonLatFromLayerPx(a);a=this.map.getExtent().determineQuadrant(a);
+return OpenLayers.Bounds.oppositeQuadrant(a)},updateRelativePosition:function(){},calculateNewPx:function(a){a=a.offset(this.anchor.offset);var b=this.size||this.contentSize,c="t"==this.relativePosition.charAt(0);a.y+=c?-b.h:this.anchor.size.h;c="l"==this.relativePosition.charAt(1);a.x+=c?-b.w:this.anchor.size.w;return a},CLASS_NAME:"OpenLayers.Popup.Anchored"});OpenLayers.Popup.Framed=OpenLayers.Class(OpenLayers.Popup.Anchored,{imageSrc:null,imageSize:null,isAlphaImage:!1,positionBlocks:null,blocks:null,fixedRelativePosition:!1,initialize:function(a,b,c,d,e,f,g){OpenLayers.Popup.Anchored.prototype.initialize.apply(this,arguments);this.fixedRelativePosition&&(this.updateRelativePosition(),this.calculateRelativePosition=function(a){return this.relativePosition});this.contentDiv.style.position="absolute";this.contentDiv.style.zIndex=1;f&&(this.closeDiv.style.zIndex=
+1);this.groupDiv.style.position="absolute";this.groupDiv.style.top="0px";this.groupDiv.style.left="0px";this.groupDiv.style.height="100%";this.groupDiv.style.width="100%"},destroy:function(){this.isAlphaImage=this.imageSize=this.imageSrc=null;this.fixedRelativePosition=!1;this.positionBlocks=null;for(var a=0;a<this.blocks.length;a++){var b=this.blocks[a];b.image&&b.div.removeChild(b.image);b.image=null;b.div&&this.groupDiv.removeChild(b.div);b.div=null}this.blocks=null;OpenLayers.Popup.Anchored.prototype.destroy.apply(this,
+arguments)},setBackgroundColor:function(a){},setBorder:function(){},setOpacity:function(a){},setSize:function(a){OpenLayers.Popup.Anchored.prototype.setSize.apply(this,arguments);this.updateBlocks()},updateRelativePosition:function(){this.padding=this.positionBlocks[this.relativePosition].padding;if(this.closeDiv){var a=this.getContentDivPadding();this.closeDiv.style.right=a.right+this.padding.right+"px";this.closeDiv.style.top=a.top+this.padding.top+"px"}this.updateBlocks()},calculateNewPx:function(a){var b=
+OpenLayers.Popup.Anchored.prototype.calculateNewPx.apply(this,arguments);return b=b.offset(this.positionBlocks[this.relativePosition].offset)},createBlocks:function(){this.blocks=[];var a=null,b;for(b in this.positionBlocks){a=b;break}a=this.positionBlocks[a];for(b=0;b<a.blocks.length;b++){var c={};this.blocks.push(c);c.div=OpenLayers.Util.createDiv(this.id+"_FrameDecorationDiv_"+b,null,null,null,"absolute",null,"hidden",null);c.image=(this.isAlphaImage?OpenLayers.Util.createAlphaImageDiv:OpenLayers.Util.createImage)(this.id+
+"_FrameDecorationImg_"+b,null,this.imageSize,this.imageSrc,"absolute",null,null,null);c.div.appendChild(c.image);this.groupDiv.appendChild(c.div)}},updateBlocks:function(){this.blocks||this.createBlocks();if(this.size&&this.relativePosition){for(var a=this.positionBlocks[this.relativePosition],b=0;b<a.blocks.length;b++){var c=a.blocks[b],d=this.blocks[b],e=c.anchor.left,f=c.anchor.bottom,g=c.anchor.right,h=c.anchor.top,k=isNaN(c.size.w)?this.size.w-(g+e):c.size.w,l=isNaN(c.size.h)?this.size.h-(f+
+h):c.size.h;d.div.style.width=(0>k?0:k)+"px";d.div.style.height=(0>l?0:l)+"px";d.div.style.left=null!=e?e+"px":"";d.div.style.bottom=null!=f?f+"px":"";d.div.style.right=null!=g?g+"px":"";d.div.style.top=null!=h?h+"px":"";d.image.style.left=c.position.x+"px";d.image.style.top=c.position.y+"px"}this.contentDiv.style.left=this.padding.left+"px";this.contentDiv.style.top=this.padding.top+"px"}},CLASS_NAME:"OpenLayers.Popup.Framed"});OpenLayers.Popup.FramedCloud=OpenLayers.Class(OpenLayers.Popup.Framed,{contentDisplayClass:"olFramedCloudPopupContent",autoSize:!0,panMapIfOutOfView:!0,imageSize:new OpenLayers.Size(1276,736),isAlphaImage:!1,fixedRelativePosition:!1,positionBlocks:{tl:{offset:new OpenLayers.Pixel(44,0),padding:new OpenLayers.Bounds(8,40,8,9),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,
+50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,18),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-632)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(0,-688)}]},tr:{offset:new OpenLayers.Pixel(-45,0),padding:new OpenLayers.Bounds(8,40,8,9),blocks:[{size:new OpenLayers.Size("auto",
+"auto"),anchor:new OpenLayers.Bounds(0,51,22,0),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,50,0,0),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",19),anchor:new OpenLayers.Bounds(0,32,22,null),position:new OpenLayers.Pixel(0,-631)},{size:new OpenLayers.Size(22,19),anchor:new OpenLayers.Bounds(null,32,0,null),position:new OpenLayers.Pixel(-1238,-631)},{size:new OpenLayers.Size(81,35),anchor:new OpenLayers.Bounds(0,
+0,null,null),position:new OpenLayers.Pixel(-215,-687)}]},bl:{offset:new OpenLayers.Pixel(45,0),padding:new OpenLayers.Bounds(8,9,8,40),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,0)},{size:new OpenLayers.Size("auto",21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,
+21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(null,null,0,0),position:new OpenLayers.Pixel(-101,-674)}]},br:{offset:new OpenLayers.Pixel(-44,0),padding:new OpenLayers.Bounds(8,9,8,40),blocks:[{size:new OpenLayers.Size("auto","auto"),anchor:new OpenLayers.Bounds(0,21,22,32),position:new OpenLayers.Pixel(0,0)},{size:new OpenLayers.Size(22,"auto"),anchor:new OpenLayers.Bounds(null,21,0,32),position:new OpenLayers.Pixel(-1238,
+0)},{size:new OpenLayers.Size("auto",21),anchor:new OpenLayers.Bounds(0,0,22,null),position:new OpenLayers.Pixel(0,-629)},{size:new OpenLayers.Size(22,21),anchor:new OpenLayers.Bounds(null,0,0,null),position:new OpenLayers.Pixel(-1238,-629)},{size:new OpenLayers.Size(81,33),anchor:new OpenLayers.Bounds(0,null,null,0),position:new OpenLayers.Pixel(-311,-674)}]}},minSize:new OpenLayers.Size(105,10),maxSize:new OpenLayers.Size(1200,660),initialize:function(a,b,c,d,e,f,g){this.imageSrc=OpenLayers.Util.getImageLocation("cloud-popup-relative.png");
+OpenLayers.Popup.Framed.prototype.initialize.apply(this,arguments);this.contentDiv.className=this.contentDisplayClass},CLASS_NAME:"OpenLayers.Popup.FramedCloud"});OpenLayers.Tile.Image.IFrame={useIFrame:null,blankImageUrl:"data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAQAIBRAA7",draw:function(){if(OpenLayers.Tile.Image.prototype.shouldDraw.call(this)){var a=this.layer.getURL(this.bounds),b=this.useIFrame;this.useIFrame=null!==this.maxGetUrlLength&&!this.layer.async&&a.length>this.maxGetUrlLength;a=b&&!this.useIFrame;b=!b&&this.useIFrame;if(a||b)this.imgDiv&&this.imgDiv.parentNode===this.frame&&this.frame.removeChild(this.imgDiv),this.imgDiv=
+null,a&&this.frame.removeChild(this.frame.firstChild)}return OpenLayers.Tile.Image.prototype.draw.apply(this,arguments)},getImage:function(){if(!0===this.useIFrame){if(!this.frame.childNodes.length){var a=document.createElement("div"),b=a.style;b.position="absolute";b.width="100%";b.height="100%";b.zIndex=1;b.backgroundImage="url("+this.blankImageUrl+")";this.frame.appendChild(a)}a=this.id+"_iFrame";9>parseFloat(navigator.appVersion.split("MSIE")[1])?(b=document.createElement('<iframe name="'+a+'">'),
+b.style.backgroundColor="#FFFFFF",b.style.filter="chroma(color=#FFFFFF)"):(b=document.createElement("iframe"),b.style.backgroundColor="transparent",b.name=a);b.scrolling="no";b.marginWidth="0px";b.marginHeight="0px";b.frameBorder="0";b.style.position="absolute";b.style.width="100%";b.style.height="100%";1>this.layer.opacity&&OpenLayers.Util.modifyDOMElement(b,null,null,null,null,null,null,this.layer.opacity);this.frame.appendChild(b);return this.imgDiv=b}return OpenLayers.Tile.Image.prototype.getImage.apply(this,
+arguments)},createRequestForm:function(){var a=document.createElement("form");a.method="POST";var b=this.layer.params._OLSALT,b=(b?b+"_":"")+this.bounds.toBBOX();a.action=OpenLayers.Util.urlAppend(this.layer.url,b);a.target=this.id+"_iFrame";this.layer.getImageSize();var b=OpenLayers.Util.getParameters(this.url),c,d;for(d in b)c=document.createElement("input"),c.type="hidden",c.name=d,c.value=b[d],a.appendChild(c);return a},setImgSrc:function(a){if(!0===this.useIFrame)if(a){var b=this.createRequestForm();
+this.frame.appendChild(b);b.submit();this.frame.removeChild(b)}else this.imgDiv.parentNode===this.frame&&(this.frame.removeChild(this.imgDiv),this.imgDiv=null);else OpenLayers.Tile.Image.prototype.setImgSrc.apply(this,arguments)},onImageLoad:function(){OpenLayers.Tile.Image.prototype.onImageLoad.apply(this,arguments);!0===this.useIFrame&&(this.imgDiv.style.opacity=1,this.frame.style.opacity=this.layer.opacity)},createBackBuffer:function(){var a;!1===this.useIFrame&&(a=OpenLayers.Tile.Image.prototype.createBackBuffer.call(this));
+return a}};OpenLayers.Format.SOSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.SOSCapabilities"});OpenLayers.Format.SOSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.SOSCapabilities,{namespaces:{ows:"http://www.opengis.net/ows/1.1",sos:"http://www.opengis.net/sos/1.0",gml:"http://www.opengis.net/gml",xlink:"http://www.w3.org/1999/xlink"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);this.options=a},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,
+[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);return b},readers:{gml:OpenLayers.Util.applyDefaults({name:function(a,b){b.name=this.getChildValue(a)},TimePeriod:function(a,b){b.timePeriod={};this.readChildNodes(a,b.timePeriod)},beginPosition:function(a,b){b.beginPosition=this.getChildValue(a)},endPosition:function(a,b){b.endPosition=this.getChildValue(a)}},OpenLayers.Format.GML.v3.prototype.readers.gml),sos:{Capabilities:function(a,b){this.readChildNodes(a,b)},Contents:function(a,
+b){b.contents={};this.readChildNodes(a,b.contents)},ObservationOfferingList:function(a,b){b.offeringList={};this.readChildNodes(a,b.offeringList)},ObservationOffering:function(a,b){var c=this.getAttributeNS(a,this.namespaces.gml,"id");b[c]={procedures:[],observedProperties:[],featureOfInterestIds:[],responseFormats:[],resultModels:[],responseModes:[]};this.readChildNodes(a,b[c])},time:function(a,b){b.time={};this.readChildNodes(a,b.time)},procedure:function(a,b){b.procedures.push(this.getAttributeNS(a,
+this.namespaces.xlink,"href"))},observedProperty:function(a,b){b.observedProperties.push(this.getAttributeNS(a,this.namespaces.xlink,"href"))},featureOfInterest:function(a,b){b.featureOfInterestIds.push(this.getAttributeNS(a,this.namespaces.xlink,"href"))},responseFormat:function(a,b){b.responseFormats.push(this.getChildValue(a))},resultModel:function(a,b){b.resultModels.push(this.getChildValue(a))},responseMode:function(a,b){b.responseModes.push(this.getChildValue(a))}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},
+CLASS_NAME:"OpenLayers.Format.SOSCapabilities.v1_0_0"});OpenLayers.Handler.Pinch=OpenLayers.Class(OpenLayers.Handler,{started:!1,stopDown:!1,pinching:!1,last:null,start:null,touchstart:function(a){var b=!0;this.pinching=!1;if(OpenLayers.Event.isMultiTouch(a))this.started=!0,this.last=this.start={distance:this.getDistance(a.touches),delta:0,scale:1},this.callback("start",[a,this.start]),b=!this.stopDown;else{if(this.started)return!1;this.started=!1;this.last=this.start=null}OpenLayers.Event.preventDefault(a);return b},touchmove:function(a){if(this.started&&
+OpenLayers.Event.isMultiTouch(a)){this.pinching=!0;var b=this.getPinchData(a);this.callback("move",[a,b]);this.last=b;OpenLayers.Event.stop(a)}else if(this.started)return!1;return!0},touchend:function(a){return this.started&&!OpenLayers.Event.isMultiTouch(a)?(this.pinching=this.started=!1,this.callback("done",[a,this.start,this.last]),this.last=this.start=null,!1):!0},activate:function(){var a=!1;OpenLayers.Handler.prototype.activate.apply(this,arguments)&&(this.pinching=!1,a=!0);return a},deactivate:function(){var a=
+!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.pinching=this.started=!1,this.last=this.start=null,a=!0);return a},getDistance:function(a){var b=a[0];a=a[1];return Math.sqrt(Math.pow(b.olClientX-a.olClientX,2)+Math.pow(b.olClientY-a.olClientY,2))},getPinchData:function(a){a=this.getDistance(a.touches);return{distance:a,delta:this.last.distance-a,scale:a/this.start.distance}},CLASS_NAME:"OpenLayers.Handler.Pinch"});OpenLayers.Control.NavToolbar=OpenLayers.Class(OpenLayers.Control.Panel,{initialize:function(a){OpenLayers.Control.Panel.prototype.initialize.apply(this,[a]);this.addControls([new OpenLayers.Control.Navigation,new OpenLayers.Control.ZoomBox])},draw:function(){var a=OpenLayers.Control.Panel.prototype.draw.apply(this,arguments);null===this.defaultControl&&(this.defaultControl=this.controls[0]);return a},CLASS_NAME:"OpenLayers.Control.NavToolbar"});OpenLayers.Strategy.Refresh=OpenLayers.Class(OpenLayers.Strategy,{force:!1,interval:0,timer:null,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);a&&(!0===this.layer.visibility&&this.start(),this.layer.events.on({visibilitychanged:this.reset,scope:this}));return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&(this.stop(),this.layer.events.un({visibilitychanged:this.reset,scope:this}));return a},reset:function(){!0===this.layer.visibility?
+this.start():this.stop()},start:function(){this.interval&&("number"===typeof this.interval&&0<this.interval)&&(this.timer=window.setInterval(OpenLayers.Function.bind(this.refresh,this),this.interval))},refresh:function(){this.layer&&(this.layer.refresh&&"function"==typeof this.layer.refresh)&&this.layer.refresh({force:this.force})},stop:function(){null!==this.timer&&(window.clearInterval(this.timer),this.timer=null)},CLASS_NAME:"OpenLayers.Strategy.Refresh"});OpenLayers.Layer.ArcGIS93Rest=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{format:"png"},isBaseLayer:!0,initialize:function(a,b,c,d){var e=[];c=OpenLayers.Util.upperCaseObject(c);e.push(a,b,c,d);OpenLayers.Layer.Grid.prototype.initialize.apply(this,e);OpenLayers.Util.applyDefaults(this.params,OpenLayers.Util.upperCaseObject(this.DEFAULT_PARAMS));this.params.TRANSPARENT&&"true"==this.params.TRANSPARENT.toString().toLowerCase()&&(null!=d&&d.isBaseLayer||(this.isBaseLayer=!1),"jpg"==this.params.FORMAT&&
+(this.params.FORMAT=OpenLayers.Util.alphaHack()?"gif":"png"))},clone:function(a){null==a&&(a=new OpenLayers.Layer.ArcGIS93Rest(this.name,this.url,this.params,this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){a=this.adjustBounds(a);var b=this.projection.getCode().split(":"),b=b[b.length-1],c=this.getImageSize();a={BBOX:a.toBBOX(),SIZE:c.w+","+c.h,F:"image",BBOXSR:b,IMAGESR:b};if(this.layerDefs){var b=[],d;for(d in this.layerDefs)this.layerDefs.hasOwnProperty(d)&&
+this.layerDefs[d]&&(b.push(d),b.push(":"),b.push(this.layerDefs[d]),b.push(";"));0<b.length&&(a.LAYERDEFS=b.join(""))}return this.getFullRequestString(a)},setLayerFilter:function(a,b){this.layerDefs||(this.layerDefs={});b?this.layerDefs[a]=b:delete this.layerDefs[a]},clearLayerFilter:function(a){a?delete this.layerDefs[a]:delete this.layerDefs},mergeNewParams:function(a){a=[OpenLayers.Util.upperCaseObject(a)];return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,a)},CLASS_NAME:"OpenLayers.Layer.ArcGIS93Rest"});OpenLayers.Handler.Hover=OpenLayers.Class(OpenLayers.Handler,{delay:500,pixelTolerance:null,stopMove:!1,px:null,timerId:null,mousemove:function(a){this.passesTolerance(a.xy)&&(this.clearTimer(),this.callback("move",[a]),this.px=a.xy,a=OpenLayers.Util.extend({},a),this.timerId=window.setTimeout(OpenLayers.Function.bind(this.delayedCall,this,a),this.delay));return!this.stopMove},mouseout:function(a){OpenLayers.Util.mouseLeft(a,this.map.viewPortDiv)&&(this.clearTimer(),this.callback("move",[a]));return!0},
+passesTolerance:function(a){var b=!0;this.pixelTolerance&&this.px&&Math.sqrt(Math.pow(this.px.x-a.x,2)+Math.pow(this.px.y-a.y,2))<this.pixelTolerance&&(b=!1);return b},clearTimer:function(){null!=this.timerId&&(window.clearTimeout(this.timerId),this.timerId=null)},delayedCall:function(a){this.callback("pause",[a])},deactivate:function(){var a=!1;OpenLayers.Handler.prototype.deactivate.apply(this,arguments)&&(this.clearTimer(),a=!0);return a},CLASS_NAME:"OpenLayers.Handler.Hover"});OpenLayers.Control.GetFeature=OpenLayers.Class(OpenLayers.Control,{protocol:null,multipleKey:null,toggleKey:null,modifiers:null,multiple:!1,click:!0,single:!0,clickout:!0,toggle:!1,clickTolerance:5,hover:!1,box:!1,maxFeatures:10,features:null,hoverFeature:null,handlers:null,hoverResponse:null,filterType:OpenLayers.Filter.Spatial.BBOX,initialize:function(a){a.handlerOptions=a.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[a]);this.features={};this.handlers={};this.click&&(this.handlers.click=
+new OpenLayers.Handler.Click(this,{click:this.selectClick},this.handlerOptions.click||{}));this.box&&(this.handlers.box=new OpenLayers.Handler.Box(this,{done:this.selectBox},OpenLayers.Util.extend(this.handlerOptions.box,{boxDivClassName:"olHandlerBoxSelectFeature"})));this.hover&&(this.handlers.hover=new OpenLayers.Handler.Hover(this,{move:this.cancelHover,pause:this.selectHover},OpenLayers.Util.extend(this.handlerOptions.hover,{delay:250,pixelTolerance:2})))},activate:function(){if(!this.active)for(var a in this.handlers)this.handlers[a].activate();
+return OpenLayers.Control.prototype.activate.apply(this,arguments)},deactivate:function(){if(this.active)for(var a in this.handlers)this.handlers[a].deactivate();return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},selectClick:function(a){var b=this.pixelToBounds(a.xy);this.setModifiers(a);this.request(b,{single:this.single})},selectBox:function(a){var b;if(a instanceof OpenLayers.Bounds)b=this.map.getLonLatFromPixel({x:a.left,y:a.bottom}),a=this.map.getLonLatFromPixel({x:a.right,
+y:a.top}),b=new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat);else{if(this.click)return;b=this.pixelToBounds(a)}this.setModifiers(this.handlers.box.dragHandler.evt);this.request(b)},selectHover:function(a){a=this.pixelToBounds(a.xy);this.request(a,{single:!0,hover:!0})},cancelHover:function(){this.hoverResponse&&(this.protocol.abort(this.hoverResponse),this.hoverResponse=null,OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait"))},request:function(a,b){b=b||{};var c=new OpenLayers.Filter.Spatial({type:this.filterType,
+value:a});OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait");c=this.protocol.read({maxFeatures:!0==b.single?this.maxFeatures:void 0,filter:c,callback:function(c){c.success()&&(c.features.length?!0==b.single?this.selectBestFeature(c.features,a.getCenterLonLat(),b):this.select(c.features):b.hover?this.hoverSelect():(this.events.triggerEvent("clickout"),this.clickout&&this.unselectAll()));OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait")},scope:this});!0==b.hover&&(this.hoverResponse=
+c)},selectBestFeature:function(a,b,c){c=c||{};if(a.length){b=new OpenLayers.Geometry.Point(b.lon,b.lat);for(var d,e,f,g=Number.MAX_VALUE,h=0;h<a.length&&!(d=a[h],d.geometry&&(f=b.distanceTo(d.geometry,{edge:!1}),f<g&&(g=f,e=d,0==g)));++h);!0==c.hover?this.hoverSelect(e):this.select(e||a)}},setModifiers:function(a){this.modifiers={multiple:this.multiple||this.multipleKey&&a[this.multipleKey],toggle:this.toggle||this.toggleKey&&a[this.toggleKey]}},select:function(a){this.modifiers.multiple||this.modifiers.toggle||
+this.unselectAll();OpenLayers.Util.isArray(a)||(a=[a]);var b=this.events.triggerEvent("beforefeaturesselected",{features:a});if(!1!==b){for(var c=[],d,e=0,f=a.length;e<f;++e)d=a[e],this.features[d.fid||d.id]?this.modifiers.toggle&&this.unselect(this.features[d.fid||d.id]):(b=this.events.triggerEvent("beforefeatureselected",{feature:d}),!1!==b&&(this.features[d.fid||d.id]=d,c.push(d),this.events.triggerEvent("featureselected",{feature:d})));this.events.triggerEvent("featuresselected",{features:c})}},
+hoverSelect:function(a){var b=a?a.fid||a.id:null,c=this.hoverFeature?this.hoverFeature.fid||this.hoverFeature.id:null;c&&c!=b&&(this.events.triggerEvent("outfeature",{feature:this.hoverFeature}),this.hoverFeature=null);b&&b!=c&&(this.events.triggerEvent("hoverfeature",{feature:a}),this.hoverFeature=a)},unselect:function(a){delete this.features[a.fid||a.id];this.events.triggerEvent("featureunselected",{feature:a})},unselectAll:function(){for(var a in this.features)this.unselect(this.features[a])},
+setMap:function(a){for(var b in this.handlers)this.handlers[b].setMap(a);OpenLayers.Control.prototype.setMap.apply(this,arguments)},pixelToBounds:function(a){var b=a.add(-this.clickTolerance/2,this.clickTolerance/2);a=a.add(this.clickTolerance/2,-this.clickTolerance/2);b=this.map.getLonLatFromPixel(b);a=this.map.getLonLatFromPixel(a);return new OpenLayers.Bounds(b.lon,b.lat,a.lon,a.lat)},CLASS_NAME:"OpenLayers.Control.GetFeature"});OpenLayers.Format.QueryStringFilter=function(){function a(a){a=a.replace(/%/g,"\\%");a=a.replace(/\\\\\.(\*)?/g,function(a,b){return b?a:"\\\\_"});a=a.replace(/\\\\\.\*/g,"\\\\%");a=a.replace(/(\\)?\.(\*)?/g,function(a,b,c){return b||c?a:"_"});a=a.replace(/(\\)?\.\*/g,function(a,b){return b?a:"%"});a=a.replace(/\\\./g,".");return a=a.replace(/(\\)?\\\*/g,function(a,b){return b?a:"*"})}var b={};b[OpenLayers.Filter.Comparison.EQUAL_TO]="eq";b[OpenLayers.Filter.Comparison.NOT_EQUAL_TO]="ne";b[OpenLayers.Filter.Comparison.LESS_THAN]=
+"lt";b[OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO]="lte";b[OpenLayers.Filter.Comparison.GREATER_THAN]="gt";b[OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO]="gte";b[OpenLayers.Filter.Comparison.LIKE]="ilike";return OpenLayers.Class(OpenLayers.Format,{wildcarded:!1,srsInBBOX:!1,write:function(c,d){d=d||{};var e=c.CLASS_NAME,e=e.substring(e.lastIndexOf(".")+1);switch(e){case "Spatial":switch(c.type){case OpenLayers.Filter.Spatial.BBOX:d.bbox=c.value.toArray();this.srsInBBOX&&c.projection&&
+d.bbox.push(c.projection.getCode());break;case OpenLayers.Filter.Spatial.DWITHIN:d.tolerance=c.distance;case OpenLayers.Filter.Spatial.WITHIN:d.lon=c.value.x;d.lat=c.value.y;break;default:OpenLayers.Console.warn("Unknown spatial filter type "+c.type)}break;case "Comparison":e=b[c.type];if(void 0!==e){var f=c.value;c.type==OpenLayers.Filter.Comparison.LIKE&&(f=a(f),this.wildcarded&&(f="%"+f+"%"));d[c.property+"__"+e]=f;d.queryable=d.queryable||[];d.queryable.push(c.property)}else OpenLayers.Console.warn("Unknown comparison filter type "+
+c.type);break;case "Logical":if(c.type===OpenLayers.Filter.Logical.AND)for(e=0,f=c.filters.length;e<f;e++)d=this.write(c.filters[e],d);else OpenLayers.Console.warn("Unsupported logical filter type "+c.type);break;default:OpenLayers.Console.warn("Unknown filter type "+e)}return d},CLASS_NAME:"OpenLayers.Format.QueryStringFilter"})}();OpenLayers.Control.MousePosition=OpenLayers.Class(OpenLayers.Control,{autoActivate:!0,element:null,prefix:"",separator:", ",suffix:"",numDigits:5,granularity:10,emptyString:null,lastXy:null,displayProjection:null,destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments)},activate:function(){return OpenLayers.Control.prototype.activate.apply(this,arguments)?(this.map.events.register("mousemove",this,this.redraw),this.map.events.register("mouseout",this,this.reset),
+this.redraw(),!0):!1},deactivate:function(){return OpenLayers.Control.prototype.deactivate.apply(this,arguments)?(this.map.events.unregister("mousemove",this,this.redraw),this.map.events.unregister("mouseout",this,this.reset),this.element.innerHTML="",!0):!1},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.element||(this.div.left="",this.div.top="",this.element=this.div);return this.div},redraw:function(a){var b;if(null==a)this.reset();else if(null==this.lastXy||Math.abs(a.xy.x-
+this.lastXy.x)>this.granularity||Math.abs(a.xy.y-this.lastXy.y)>this.granularity)this.lastXy=a.xy;else if(b=this.map.getLonLatFromPixel(a.xy))this.displayProjection&&b.transform(this.map.getProjectionObject(),this.displayProjection),this.lastXy=a.xy,a=this.formatOutput(b),a!=this.element.innerHTML&&(this.element.innerHTML=a)},reset:function(a){null!=this.emptyString&&(this.element.innerHTML=this.emptyString)},formatOutput:function(a){var b=parseInt(this.numDigits);return this.prefix+a.lon.toFixed(b)+
+this.separator+a.lat.toFixed(b)+this.suffix},CLASS_NAME:"OpenLayers.Control.MousePosition"});OpenLayers.Control.Geolocate=OpenLayers.Class(OpenLayers.Control,{geolocation:null,available:"geolocation"in navigator,bind:!0,watch:!1,geolocationOptions:null,destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments)},activate:function(){this.available&&!this.geolocation&&(this.geolocation=navigator.geolocation);return this.geolocation?OpenLayers.Control.prototype.activate.apply(this,arguments)?(this.watch?this.watchId=this.geolocation.watchPosition(OpenLayers.Function.bind(this.geolocate,
+this),OpenLayers.Function.bind(this.failure,this),this.geolocationOptions):this.getCurrentLocation(),!0):!1:(this.events.triggerEvent("locationuncapable"),!1)},deactivate:function(){this.active&&null!==this.watchId&&this.geolocation.clearWatch(this.watchId);return OpenLayers.Control.prototype.deactivate.apply(this,arguments)},geolocate:function(a){var b=(new OpenLayers.LonLat(a.coords.longitude,a.coords.latitude)).transform(new OpenLayers.Projection("EPSG:4326"),this.map.getProjectionObject());this.bind&&
+this.map.setCenter(b);this.events.triggerEvent("locationupdated",{position:a,point:new OpenLayers.Geometry.Point(b.lon,b.lat)})},getCurrentLocation:function(){if(!this.active||this.watch)return!1;this.geolocation.getCurrentPosition(OpenLayers.Function.bind(this.geolocate,this),OpenLayers.Function.bind(this.failure,this),this.geolocationOptions);return!0},failure:function(a){this.events.triggerEvent("locationfailed",{error:a})},CLASS_NAME:"OpenLayers.Control.Geolocate"});OpenLayers.Tile.UTFGrid=OpenLayers.Class(OpenLayers.Tile,{url:null,utfgridResolution:2,json:null,format:null,destroy:function(){this.clear();OpenLayers.Tile.prototype.destroy.apply(this,arguments)},draw:function(){var a=OpenLayers.Tile.prototype.draw.apply(this,arguments);if(a)if(this.isLoading?(this.abortLoading(),this.events.triggerEvent("reload")):(this.isLoading=!0,this.events.triggerEvent("loadstart")),this.url=this.layer.getURL(this.bounds),this.layer.useJSONP){var b=new OpenLayers.Protocol.Script({url:this.url,
+callback:function(a){this.isLoading=!1;this.events.triggerEvent("loadend");this.json=a.data},scope:this});b.read();this.request=b}else this.request=OpenLayers.Request.GET({url:this.url,callback:function(a){this.isLoading=!1;this.events.triggerEvent("loadend");200===a.status&&this.parseData(a.responseText)},scope:this});else this.unload();return a},abortLoading:function(){this.request&&(this.request.abort(),delete this.request);this.isLoading=!1},getFeatureInfo:function(a,b){var c=null;if(this.json){var d=
+this.getFeatureId(a,b);null!==d&&(c={id:d,data:this.json.data[d]})}return c},getFeatureId:function(a,b){var c=null;if(this.json){var d=this.utfgridResolution,d=this.json.grid[Math.floor(b/d)].charCodeAt(Math.floor(a/d)),d=this.indexFromCharCode(d),e=this.json.keys;!isNaN(d)&&d in e&&(c=e[d])}return c},indexFromCharCode:function(a){93<=a&&a--;35<=a&&a--;return a-32},parseData:function(a){this.format||(this.format=new OpenLayers.Format.JSON);this.json=this.format.read(a)},clear:function(){this.json=
+null},CLASS_NAME:"OpenLayers.Tile.UTFGrid"});OpenLayers.Protocol.HTTP=OpenLayers.Class(OpenLayers.Protocol,{url:null,headers:null,params:null,callback:null,scope:null,readWithPOST:!1,updateWithPOST:!1,deleteWithPOST:!1,wildcarded:!1,srsInBBOX:!1,initialize:function(a){a=a||{};this.params={};this.headers={};OpenLayers.Protocol.prototype.initialize.apply(this,arguments);if(!this.filterToParams&&OpenLayers.Format.QueryStringFilter){var b=new OpenLayers.Format.QueryStringFilter({wildcarded:this.wildcarded,srsInBBOX:this.srsInBBOX});this.filterToParams=
+function(a,d){return b.write(a,d)}}},destroy:function(){this.headers=this.params=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){OpenLayers.Protocol.prototype.read.apply(this,arguments);a=a||{};a.params=OpenLayers.Util.applyDefaults(a.params,this.options.params);a=OpenLayers.Util.applyDefaults(a,this.options);a.filter&&this.filterToParams&&(a.params=this.filterToParams(a.filter,a.params));var b=void 0!==a.readWithPOST?a.readWithPOST:this.readWithPOST,c=new OpenLayers.Protocol.Response({requestType:"read"});
+b?(b=a.headers||{},b["Content-Type"]="application/x-www-form-urlencoded",c.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,c,a),data:OpenLayers.Util.getParameterString(a.params),headers:b})):c.priv=OpenLayers.Request.GET({url:a.url,callback:this.createCallback(this.handleRead,c,a),params:a.params,headers:a.headers});return c},handleRead:function(a,b){this.handleResponse(a,b)},create:function(a,b){b=OpenLayers.Util.applyDefaults(b,this.options);var c=new OpenLayers.Protocol.Response({reqFeatures:a,
+requestType:"create"});c.priv=OpenLayers.Request.POST({url:b.url,callback:this.createCallback(this.handleCreate,c,b),headers:b.headers,data:this.format.write(a)});return c},handleCreate:function(a,b){this.handleResponse(a,b)},update:function(a,b){b=b||{};var c=b.url||a.url||this.options.url+"/"+a.fid;b=OpenLayers.Util.applyDefaults(b,this.options);var d=new OpenLayers.Protocol.Response({reqFeatures:a,requestType:"update"});d.priv=OpenLayers.Request[this.updateWithPOST?"POST":"PUT"]({url:c,callback:this.createCallback(this.handleUpdate,
+d,b),headers:b.headers,data:this.format.write(a)});return d},handleUpdate:function(a,b){this.handleResponse(a,b)},"delete":function(a,b){b=b||{};var c=b.url||a.url||this.options.url+"/"+a.fid;b=OpenLayers.Util.applyDefaults(b,this.options);var d=new OpenLayers.Protocol.Response({reqFeatures:a,requestType:"delete"}),e=this.deleteWithPOST?"POST":"DELETE",c={url:c,callback:this.createCallback(this.handleDelete,d,b),headers:b.headers};this.deleteWithPOST&&(c.data=this.format.write(a));d.priv=OpenLayers.Request[e](c);
+return d},handleDelete:function(a,b){this.handleResponse(a,b)},handleResponse:function(a,b){var c=a.priv;b.callback&&(200<=c.status&&300>c.status?("delete"!=a.requestType&&(a.features=this.parseFeatures(c)),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE,b.callback.call(b.scope,a))},parseFeatures:function(a){var b=a.responseXML;b&&b.documentElement||(b=a.responseText);return!b||0>=b.length?null:this.format.read(b)},commit:function(a,b){function c(a){for(var b=
+a.features?a.features.length:0,c=Array(b),e=0;e<b;++e)c[e]=a.features[e].fid;r.insertIds=c;d.apply(this,[a])}function d(a){this.callUserCallback(a,b);q=q&&a.success();f++;f>=p&&b.callback&&(r.code=q?OpenLayers.Protocol.Response.SUCCESS:OpenLayers.Protocol.Response.FAILURE,b.callback.apply(b.scope,[r]))}b=OpenLayers.Util.applyDefaults(b,this.options);var e=[],f=0,g={};g[OpenLayers.State.INSERT]=[];g[OpenLayers.State.UPDATE]=[];g[OpenLayers.State.DELETE]=[];for(var h,k,l=[],m=0,n=a.length;m<n;++m)if(h=
+a[m],k=g[h.state])k.push(h),l.push(h);var p=(0<g[OpenLayers.State.INSERT].length?1:0)+g[OpenLayers.State.UPDATE].length+g[OpenLayers.State.DELETE].length,q=!0,r=new OpenLayers.Protocol.Response({reqFeatures:l});h=g[OpenLayers.State.INSERT];0<h.length&&e.push(this.create(h,OpenLayers.Util.applyDefaults({callback:c,scope:this},b.create)));h=g[OpenLayers.State.UPDATE];for(m=h.length-1;0<=m;--m)e.push(this.update(h[m],OpenLayers.Util.applyDefaults({callback:d,scope:this},b.update)));h=g[OpenLayers.State.DELETE];
+for(m=h.length-1;0<=m;--m)e.push(this["delete"](h[m],OpenLayers.Util.applyDefaults({callback:d,scope:this},b["delete"])));return e},abort:function(a){a&&a.priv.abort()},callUserCallback:function(a,b){var c=b[a.requestType];c&&c.callback&&c.callback.call(c.scope,a)},CLASS_NAME:"OpenLayers.Protocol.HTTP"});OpenLayers.Strategy.Cluster=OpenLayers.Class(OpenLayers.Strategy,{distance:20,threshold:null,features:null,clusters:null,clustering:!1,resolution:null,activate:function(){var a=OpenLayers.Strategy.prototype.activate.call(this);if(a)this.layer.events.on({beforefeaturesadded:this.cacheFeatures,featuresremoved:this.clearCache,moveend:this.cluster,scope:this});return a},deactivate:function(){var a=OpenLayers.Strategy.prototype.deactivate.call(this);a&&(this.clearCache(),this.layer.events.un({beforefeaturesadded:this.cacheFeatures,
+featuresremoved:this.clearCache,moveend:this.cluster,scope:this}));return a},cacheFeatures:function(a){var b=!0;this.clustering||(this.clearCache(),this.features=a.features,this.cluster(),b=!1);return b},clearCache:function(){this.clustering||(this.features=null)},cluster:function(a){if((!a||a.zoomChanged)&&this.features&&(a=this.layer.map.getResolution(),a!=this.resolution||!this.clustersExist())){this.resolution=a;a=[];for(var b,c,d,e=0;e<this.features.length;++e)if(b=this.features[e],b.geometry){c=
+!1;for(var f=a.length-1;0<=f;--f)if(d=a[f],this.shouldCluster(d,b)){this.addToCluster(d,b);c=!0;break}c||a.push(this.createCluster(this.features[e]))}this.clustering=!0;this.layer.removeAllFeatures();this.clustering=!1;if(0<a.length){if(1<this.threshold)for(b=a.slice(),a=[],e=0,d=b.length;e<d;++e)c=b[e],c.attributes.count<this.threshold?Array.prototype.push.apply(a,c.cluster):a.push(c);this.clustering=!0;this.layer.addFeatures(a);this.clustering=!1}this.clusters=a}},clustersExist:function(){var a=
+!1;if(this.clusters&&0<this.clusters.length&&this.clusters.length==this.layer.features.length)for(var a=!0,b=0;b<this.clusters.length;++b)if(this.clusters[b]!=this.layer.features[b]){a=!1;break}return a},shouldCluster:function(a,b){var c=a.geometry.getBounds().getCenterLonLat(),d=b.geometry.getBounds().getCenterLonLat();return Math.sqrt(Math.pow(c.lon-d.lon,2)+Math.pow(c.lat-d.lat,2))/this.resolution<=this.distance},addToCluster:function(a,b){a.cluster.push(b);a.attributes.count+=1},createCluster:function(a){var b=
+a.geometry.getBounds().getCenterLonLat(),b=new OpenLayers.Feature.Vector(new OpenLayers.Geometry.Point(b.lon,b.lat),{count:1});b.cluster=[a];return b},CLASS_NAME:"OpenLayers.Strategy.Cluster"});OpenLayers.Strategy.Filter=OpenLayers.Class(OpenLayers.Strategy,{filter:null,cache:null,caching:!1,activate:function(){var a=OpenLayers.Strategy.prototype.activate.apply(this,arguments);a&&(this.cache=[],this.layer.events.on({beforefeaturesadded:this.handleAdd,beforefeaturesremoved:this.handleRemove,scope:this}));return a},deactivate:function(){this.cache=null;this.layer&&this.layer.events&&this.layer.events.un({beforefeaturesadded:this.handleAdd,beforefeaturesremoved:this.handleRemove,scope:this});
+return OpenLayers.Strategy.prototype.deactivate.apply(this,arguments)},handleAdd:function(a){if(!this.caching&&this.filter){var b=a.features;a.features=[];for(var c,d=0,e=b.length;d<e;++d)c=b[d],this.filter.evaluate(c)?a.features.push(c):this.cache.push(c)}},handleRemove:function(a){this.caching||(this.cache=[])},setFilter:function(a){this.filter=a;a=this.cache;this.cache=[];this.handleAdd({features:this.layer.features});0<this.cache.length&&(this.caching=!0,this.layer.removeFeatures(this.cache.slice()),
+this.caching=!1);0<a.length&&(a={features:a},this.handleAdd(a),0<a.features.length&&(this.caching=!0,this.layer.addFeatures(a.features),this.caching=!1))},CLASS_NAME:"OpenLayers.Strategy.Filter"});OpenLayers.Protocol.SOS=function(a){a=OpenLayers.Util.applyDefaults(a,OpenLayers.Protocol.SOS.DEFAULTS);var b=OpenLayers.Protocol.SOS["v"+a.version.replace(/\./g,"_")];if(!b)throw"Unsupported SOS version: "+a.version;return new b(a)};OpenLayers.Protocol.SOS.DEFAULTS={version:"1.0.0"};OpenLayers.Format.WFSDescribeFeatureType=OpenLayers.Class(OpenLayers.Format.XML,{regExes:{trimSpace:/^\s*|\s*$/g},namespaces:{xsd:"http://www.w3.org/2001/XMLSchema"},readers:{xsd:{schema:function(a,b){var c=[],d={},e,f;this.readChildNodes(a,{complexTypes:c,customTypes:d});var g=a.attributes,h,k;e=0;for(f=g.length;e<f;++e)h=g[e],k=h.name,0===k.indexOf("xmlns")?this.setNamespace(k.split(":")[1]||"",h.value):b[k]=h.value;b.featureTypes=c;b.targetPrefix=this.namespaceAlias[b.targetNamespace];e=0;for(f=
+c.length;e<f;++e)g=c[e],h=d[g.typeName],d[g.typeName]&&(g.typeName=h.name)},complexType:function(a,b){var c={typeName:a.getAttribute("name")};this.readChildNodes(a,c);b.complexTypes.push(c)},complexContent:function(a,b){this.readChildNodes(a,b)},extension:function(a,b){this.readChildNodes(a,b)},sequence:function(a,b){var c={elements:[]};this.readChildNodes(a,c);b.properties=c.elements},element:function(a,b){var c;if(b.elements){var d={};c=a.attributes;for(var e,f=0,g=c.length;f<g;++f)e=c[f],d[e.name]=
+e.value;c=d.type;c||(c={},this.readChildNodes(a,c),d.restriction=c,d.type=c.base);d.localType=(c.base||c).split(":").pop();b.elements.push(d);this.readChildNodes(a,d)}b.complexTypes&&(c=a.getAttribute("type"),d=c.split(":").pop(),b.customTypes[d]={name:a.getAttribute("name"),type:c})},annotation:function(a,b){b.annotation={};this.readChildNodes(a,b.annotation)},appinfo:function(a,b){b.appinfo||(b.appinfo=[]);b.appinfo.push(this.getChildValue(a))},documentation:function(a,b){b.documentation||(b.documentation=
+[]);var c=this.getChildValue(a);b.documentation.push({lang:a.getAttribute("xml:lang"),textContent:c.replace(this.regExes.trimSpace,"")})},simpleType:function(a,b){this.readChildNodes(a,b)},restriction:function(a,b){b.base=a.getAttribute("base");this.readRestriction(a,b)}}},readRestriction:function(a,b){for(var c=a.childNodes,d,e,f=0,g=c.length;f<g;++f)d=c[f],1==d.nodeType&&(e=d.nodeName.split(":").pop(),d=d.getAttribute("value"),b[e]?("string"==typeof b[e]&&(b[e]=[b[e]]),b[e].push(d)):b[e]=d)},read:function(a){"string"==
+typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};if("ExceptionReport"===a.nodeName.split(":").pop()){var c=new OpenLayers.Format.OGCExceptionReport;b.error=c.read(a)}else this.readNode(a,b);return b},CLASS_NAME:"OpenLayers.Format.WFSDescribeFeatureType"});OpenLayers.Format.GeoRSS=OpenLayers.Class(OpenLayers.Format.XML,{rssns:"http://backend.userland.com/rss2",featureNS:"http://mapserver.gis.umn.edu/mapserver",georssns:"http://www.georss.org/georss",geons:"http://www.w3.org/2003/01/geo/wgs84_pos#",featureTitle:"Untitled",featureDescription:"No Description",gmlParser:null,xy:!1,createGeometryFromItem:function(a){var b=this.getElementsByTagNameNS(a,this.georssns,"point"),c=this.getElementsByTagNameNS(a,this.geons,"lat"),d=this.getElementsByTagNameNS(a,
+this.geons,"long"),e=this.getElementsByTagNameNS(a,this.georssns,"line"),f=this.getElementsByTagNameNS(a,this.georssns,"polygon"),g=this.getElementsByTagNameNS(a,this.georssns,"where");a=this.getElementsByTagNameNS(a,this.georssns,"box");if(0<b.length||0<c.length&&0<d.length){0<b.length?(c=OpenLayers.String.trim(b[0].firstChild.nodeValue).split(/\s+/),2!=c.length&&(c=OpenLayers.String.trim(b[0].firstChild.nodeValue).split(/\s*,\s*/))):c=[parseFloat(c[0].firstChild.nodeValue),parseFloat(d[0].firstChild.nodeValue)];
+var h=new OpenLayers.Geometry.Point(c[1],c[0])}else if(0<e.length){c=OpenLayers.String.trim(this.getChildValue(e[0])).split(/\s+/);d=[];e=0;for(f=c.length;e<f;e+=2)b=new OpenLayers.Geometry.Point(c[e+1],c[e]),d.push(b);h=new OpenLayers.Geometry.LineString(d)}else if(0<f.length){c=OpenLayers.String.trim(this.getChildValue(f[0])).split(/\s+/);d=[];e=0;for(f=c.length;e<f;e+=2)b=new OpenLayers.Geometry.Point(c[e+1],c[e]),d.push(b);h=new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(d)])}else 0<
+g.length?(this.gmlParser||(this.gmlParser=new OpenLayers.Format.GML({xy:this.xy})),h=this.gmlParser.parseFeature(g[0]).geometry):0<a.length&&(c=OpenLayers.String.trim(a[0].firstChild.nodeValue).split(/\s+/),d=[],3<c.length&&(b=new OpenLayers.Geometry.Point(c[1],c[0]),d.push(b),b=new OpenLayers.Geometry.Point(c[1],c[2]),d.push(b),b=new OpenLayers.Geometry.Point(c[3],c[2]),d.push(b),b=new OpenLayers.Geometry.Point(c[3],c[0]),d.push(b),b=new OpenLayers.Geometry.Point(c[1],c[0]),d.push(b)),h=new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(d)]));
+h&&(this.internalProjection&&this.externalProjection)&&h.transform(this.externalProjection,this.internalProjection);return h},createFeatureFromItem:function(a){var b=this.createGeometryFromItem(a),c=this._getChildValue(a,"*","title",this.featureTitle),d=this._getChildValue(a,"*","description",this._getChildValue(a,"*","content",this._getChildValue(a,"*","summary",this.featureDescription))),e=this._getChildValue(a,"*","link");if(!e)try{e=this.getElementsByTagNameNS(a,"*","link")[0].getAttribute("href")}catch(f){e=
+null}a=this._getChildValue(a,"*","id",null);b=new OpenLayers.Feature.Vector(b,{title:c,description:d,link:e});b.fid=a;return b},_getChildValue:function(a,b,c,d){return(a=this.getElementsByTagNameNS(a,b,c))&&a[0]&&a[0].firstChild&&a[0].firstChild.nodeValue?this.getChildValue(a[0]):void 0==d?"":d},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=null,b=this.getElementsByTagNameNS(a,"*","item");0==b.length&&(b=this.getElementsByTagNameNS(a,"*","entry"));
+a=b.length;for(var c=Array(a),d=0;d<a;d++)c[d]=this.createFeatureFromItem(b[d]);return c},write:function(a){var b;if(OpenLayers.Util.isArray(a)){b=this.createElementNS(this.rssns,"rss");for(var c=0,d=a.length;c<d;c++)b.appendChild(this.createFeatureXML(a[c]))}else b=this.createFeatureXML(a);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFeatureXML:function(a){var b=this.buildGeometryNode(a.geometry),c=this.createElementNS(this.rssns,"item"),d=this.createElementNS(this.rssns,"title");
+d.appendChild(this.createTextNode(a.attributes.title?a.attributes.title:""));var e=this.createElementNS(this.rssns,"description");e.appendChild(this.createTextNode(a.attributes.description?a.attributes.description:""));c.appendChild(d);c.appendChild(e);a.attributes.link&&(d=this.createElementNS(this.rssns,"link"),d.appendChild(this.createTextNode(a.attributes.link)),c.appendChild(d));for(var f in a.attributes)"link"!=f&&("title"!=f&&"description"!=f)&&(d=this.createTextNode(a.attributes[f]),e=f,-1!=
+f.search(":")&&(e=f.split(":")[1]),e=this.createElementNS(this.featureNS,"feature:"+e),e.appendChild(d),c.appendChild(e));c.appendChild(b);return c},buildGeometryNode:function(a){this.internalProjection&&this.externalProjection&&(a=a.clone(),a.transform(this.internalProjection,this.externalProjection));var b;if("OpenLayers.Geometry.Polygon"==a.CLASS_NAME)b=this.createElementNS(this.georssns,"georss:polygon"),b.appendChild(this.buildCoordinatesNode(a.components[0]));else if("OpenLayers.Geometry.LineString"==
+a.CLASS_NAME)b=this.createElementNS(this.georssns,"georss:line"),b.appendChild(this.buildCoordinatesNode(a));else if("OpenLayers.Geometry.Point"==a.CLASS_NAME)b=this.createElementNS(this.georssns,"georss:point"),b.appendChild(this.buildCoordinatesNode(a));else throw"Couldn't parse "+a.CLASS_NAME;return b},buildCoordinatesNode:function(a){var b=null;a.components&&(b=a.components);if(b){a=b.length;for(var c=Array(a),d=0;d<a;d++)c[d]=b[d].y+" "+b[d].x;b=c.join(" ")}else b=a.y+" "+a.x;return this.createTextNode(b)},
+CLASS_NAME:"OpenLayers.Format.GeoRSS"});OpenLayers.Format.WPSCapabilities=OpenLayers.Class(OpenLayers.Format.XML.VersionedOGC,{defaultVersion:"1.0.0",CLASS_NAME:"OpenLayers.Format.WPSCapabilities"});OpenLayers.Format.WPSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows/1.1",wps:"http://www.opengis.net/wps/1.0.0",xlink:"http://www.w3.org/1999/xlink"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a])},read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);
+var b={};this.readNode(a,b);return b},readers:{wps:{Capabilities:function(a,b){this.readChildNodes(a,b)},ProcessOfferings:function(a,b){b.processOfferings={};this.readChildNodes(a,b.processOfferings)},Process:function(a,b){var c={processVersion:this.getAttributeNS(a,this.namespaces.wps,"processVersion")};this.readChildNodes(a,c);b[c.identifier]=c},Languages:function(a,b){b.languages=[];this.readChildNodes(a,b.languages)},Default:function(a,b){var c={isDefault:!0};this.readChildNodes(a,c);b.push(c)},
+Supported:function(a,b){var c={};this.readChildNodes(a,c);b.push(c)}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WPSCapabilities.v1_0_0"});OpenLayers.Control.PinchZoom=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOOL,pinchOrigin:null,currentCenter:null,autoActivate:!0,preserveCenter:!1,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.handler=new OpenLayers.Handler.Pinch(this,{start:this.pinchStart,move:this.pinchMove,done:this.pinchDone},this.handlerOptions)},pinchStart:function(a,b){var c=this.preserveCenter?this.map.getPixelFromLonLat(this.map.getCenter()):a.xy;this.currentCenter=
+this.pinchOrigin=c},pinchMove:function(a,b){var c=b.scale,d=this.map.layerContainerOriginPx,e=this.pinchOrigin,f=this.preserveCenter?this.map.getPixelFromLonLat(this.map.getCenter()):a.xy,g=Math.round(d.x+f.x-e.x+(c-1)*(d.x-e.x)),d=Math.round(d.y+f.y-e.y+(c-1)*(d.y-e.y));this.map.applyTransform(g,d,c);this.currentCenter=f},pinchDone:function(a,b,c){this.map.applyTransform();a=this.map.getZoomForResolution(this.map.getResolution()/c.scale,!0);if(a!==this.map.getZoom()||!this.currentCenter.equals(this.pinchOrigin)){b=
+this.map.getResolutionForZoom(a);c=this.map.getLonLatFromPixel(this.pinchOrigin);var d=this.currentCenter,e=this.map.getSize();c.lon+=b*(e.w/2-d.x);c.lat-=b*(e.h/2-d.y);this.map.div.clientWidth=this.map.div.clientWidth;this.map.setCenter(c,a)}},CLASS_NAME:"OpenLayers.Control.PinchZoom"});OpenLayers.Control.TouchNavigation=OpenLayers.Class(OpenLayers.Control,{dragPan:null,dragPanOptions:null,pinchZoom:null,pinchZoomOptions:null,clickHandlerOptions:null,documentDrag:!1,autoActivate:!0,initialize:function(a){this.handlers={};OpenLayers.Control.prototype.initialize.apply(this,arguments)},destroy:function(){this.deactivate();this.dragPan&&this.dragPan.destroy();this.dragPan=null;this.pinchZoom&&(this.pinchZoom.destroy(),delete this.pinchZoom);OpenLayers.Control.prototype.destroy.apply(this,
+arguments)},activate:function(){return OpenLayers.Control.prototype.activate.apply(this,arguments)?(this.dragPan.activate(),this.handlers.click.activate(),this.pinchZoom.activate(),!0):!1},deactivate:function(){return OpenLayers.Control.prototype.deactivate.apply(this,arguments)?(this.dragPan.deactivate(),this.handlers.click.deactivate(),this.pinchZoom.deactivate(),!0):!1},draw:function(){var a={click:this.defaultClick,dblclick:this.defaultDblClick},b=OpenLayers.Util.extend({"double":!0,stopDouble:!0,
+pixelTolerance:2},this.clickHandlerOptions);this.handlers.click=new OpenLayers.Handler.Click(this,a,b);this.dragPan=new OpenLayers.Control.DragPan(OpenLayers.Util.extend({map:this.map,documentDrag:this.documentDrag},this.dragPanOptions));this.dragPan.draw();this.pinchZoom=new OpenLayers.Control.PinchZoom(OpenLayers.Util.extend({map:this.map},this.pinchZoomOptions))},defaultClick:function(a){a.lastTouches&&2==a.lastTouches.length&&this.map.zoomOut()},defaultDblClick:function(a){this.map.zoomTo(this.map.zoom+
+1,a.xy)},CLASS_NAME:"OpenLayers.Control.TouchNavigation"});OpenLayers.Console.warn("OpenLayers.Rico is deprecated");OpenLayers.Rico=OpenLayers.Rico||{};
+OpenLayers.Rico.Color=OpenLayers.Class({initialize:function(a,b,c){this.rgb={r:a,g:b,b:c}},setRed:function(a){this.rgb.r=a},setGreen:function(a){this.rgb.g=a},setBlue:function(a){this.rgb.b=a},setHue:function(a){var b=this.asHSB();b.h=a;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,b.b)},setSaturation:function(a){var b=this.asHSB();b.s=a;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,b.b)},setBrightness:function(a){var b=this.asHSB();b.b=a;this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,b.b)},
+darken:function(a){var b=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,Math.max(b.b-a,0))},brighten:function(a){var b=this.asHSB();this.rgb=OpenLayers.Rico.Color.HSBtoRGB(b.h,b.s,Math.min(b.b+a,1))},blend:function(a){this.rgb.r=Math.floor((this.rgb.r+a.rgb.r)/2);this.rgb.g=Math.floor((this.rgb.g+a.rgb.g)/2);this.rgb.b=Math.floor((this.rgb.b+a.rgb.b)/2)},isBright:function(){this.asHSB();return 0.5<this.asHSB().b},isDark:function(){return!this.isBright()},asRGB:function(){return"rgb("+
+this.rgb.r+","+this.rgb.g+","+this.rgb.b+")"},asHex:function(){return"#"+this.rgb.r.toColorPart()+this.rgb.g.toColorPart()+this.rgb.b.toColorPart()},asHSB:function(){return OpenLayers.Rico.Color.RGBtoHSB(this.rgb.r,this.rgb.g,this.rgb.b)},toString:function(){return this.asHex()}});
+OpenLayers.Rico.Color.createFromHex=function(a){if(4==a.length){var b=a;a="#";for(var c=1;4>c;c++)a+=b.charAt(c)+b.charAt(c)}0==a.indexOf("#")&&(a=a.substring(1));b=a.substring(0,2);c=a.substring(2,4);a=a.substring(4,6);return new OpenLayers.Rico.Color(parseInt(b,16),parseInt(c,16),parseInt(a,16))};
+OpenLayers.Rico.Color.createColorFromBackground=function(a){var b=OpenLayers.Element.getStyle(OpenLayers.Util.getElement(a),"backgroundColor");return"transparent"==b&&a.parentNode?OpenLayers.Rico.Color.createColorFromBackground(a.parentNode):null==b?new OpenLayers.Rico.Color(255,255,255):0==b.indexOf("rgb(")?(a=b.substring(4,b.length-1).split(","),new OpenLayers.Rico.Color(parseInt(a[0]),parseInt(a[1]),parseInt(a[2]))):0==b.indexOf("#")?OpenLayers.Rico.Color.createFromHex(b):new OpenLayers.Rico.Color(255,
+255,255)};
+OpenLayers.Rico.Color.HSBtoRGB=function(a,b,c){var d=0,e=0,f=0;if(0==b)f=e=d=parseInt(255*c+0.5);else{a=6*(a-Math.floor(a));var g=a-Math.floor(a),h=c*(1-b),k=c*(1-b*g);b=c*(1-b*(1-g));switch(parseInt(a)){case 0:d=255*c+0.5;e=255*b+0.5;f=255*h+0.5;break;case 1:d=255*k+0.5;e=255*c+0.5;f=255*h+0.5;break;case 2:d=255*h+0.5;e=255*c+0.5;f=255*b+0.5;break;case 3:d=255*h+0.5;e=255*k+0.5;f=255*c+0.5;break;case 4:d=255*b+0.5;e=255*h+0.5;f=255*c+0.5;break;case 5:d=255*c+0.5,e=255*h+0.5,f=255*k+0.5}}return{r:parseInt(d),g:parseInt(e),
+b:parseInt(f)}};OpenLayers.Rico.Color.RGBtoHSB=function(a,b,c){var d,e=a>b?a:b;c>e&&(e=c);var f=a<b?a:b;c<f&&(f=c);d=0!=e?(e-f)/e:0;if(0==d)a=0;else{var g=(e-a)/(e-f),h=(e-b)/(e-f);c=(e-c)/(e-f);a=(a==e?c-h:b==e?2+g-c:4+h-g)/6;0>a&&(a+=1)}return{h:a,s:d,b:e/255}};OpenLayers.Style2=OpenLayers.Class({id:null,name:null,title:null,description:null,layerName:null,isDefault:!1,rules:null,initialize:function(a){OpenLayers.Util.extend(this,a);this.id=OpenLayers.Util.createUniqueID(this.CLASS_NAME+"_")},destroy:function(){for(var a=0,b=this.rules.length;a<b;a++)this.rules[a].destroy();delete this.rules},clone:function(){var a=OpenLayers.Util.extend({},this);if(this.rules){a.rules=[];for(var b=0,c=this.rules.length;b<c;++b)a.rules.push(this.rules[b].clone())}return new OpenLayers.Style2(a)},
+CLASS_NAME:"OpenLayers.Style2"});OpenLayers.Format.WFS=OpenLayers.Class(OpenLayers.Format.GML,{layer:null,wfsns:"http://www.opengis.net/wfs",ogcns:"http://www.opengis.net/ogc",initialize:function(a,b){OpenLayers.Format.GML.prototype.initialize.apply(this,[a]);this.layer=b;this.layer.featureNS&&(this.featureNS=this.layer.featureNS);this.layer.options.geometry_column&&(this.geometryName=this.layer.options.geometry_column);this.layer.options.typename&&(this.featureName=this.layer.options.typename)},write:function(a){var b=this.createElementNS(this.wfsns,
+"wfs:Transaction");b.setAttribute("version","1.0.0");b.setAttribute("service","WFS");for(var c=0;c<a.length;c++)switch(a[c].state){case OpenLayers.State.INSERT:b.appendChild(this.insert(a[c]));break;case OpenLayers.State.UPDATE:b.appendChild(this.update(a[c]));break;case OpenLayers.State.DELETE:b.appendChild(this.remove(a[c]))}return OpenLayers.Format.XML.prototype.write.apply(this,[b])},createFeatureXML:function(a){var b=this.buildGeometryNode(a.geometry),c=this.createElementNS(this.featureNS,"feature:"+
+this.geometryName);c.appendChild(b);b=this.createElementNS(this.featureNS,"feature:"+this.featureName);b.appendChild(c);for(var d in a.attributes){var c=this.createTextNode(a.attributes[d]),e=d;-1!=d.search(":")&&(e=d.split(":")[1]);e=this.createElementNS(this.featureNS,"feature:"+e);e.appendChild(c);b.appendChild(e)}return b},insert:function(a){var b=this.createElementNS(this.wfsns,"wfs:Insert");b.appendChild(this.createFeatureXML(a));return b},update:function(a){a.fid||OpenLayers.Console.userError(OpenLayers.i18n("noFID"));
+var b=this.createElementNS(this.wfsns,"wfs:Update");b.setAttribute("typeName",this.featurePrefix+":"+this.featureName);b.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);var c=this.createElementNS(this.wfsns,"wfs:Property"),d=this.createElementNS(this.wfsns,"wfs:Name"),e=this.createTextNode(this.geometryName);d.appendChild(e);c.appendChild(d);d=this.createElementNS(this.wfsns,"wfs:Value");e=this.buildGeometryNode(a.geometry);a.layer&&e.setAttribute("srsName",a.layer.projection.getCode());
+d.appendChild(e);c.appendChild(d);b.appendChild(c);for(var f in a.attributes)c=this.createElementNS(this.wfsns,"wfs:Property"),d=this.createElementNS(this.wfsns,"wfs:Name"),d.appendChild(this.createTextNode(f)),c.appendChild(d),d=this.createElementNS(this.wfsns,"wfs:Value"),d.appendChild(this.createTextNode(a.attributes[f])),c.appendChild(d),b.appendChild(c);c=this.createElementNS(this.ogcns,"ogc:Filter");f=this.createElementNS(this.ogcns,"ogc:FeatureId");f.setAttribute("fid",a.fid);c.appendChild(f);
+b.appendChild(c);return b},remove:function(a){if(!a.fid)return OpenLayers.Console.userError(OpenLayers.i18n("noFID")),!1;var b=this.createElementNS(this.wfsns,"wfs:Delete");b.setAttribute("typeName",this.featurePrefix+":"+this.featureName);b.setAttribute("xmlns:"+this.featurePrefix,this.featureNS);var c=this.createElementNS(this.ogcns,"ogc:Filter"),d=this.createElementNS(this.ogcns,"ogc:FeatureId");d.setAttribute("fid",a.fid);c.appendChild(d);b.appendChild(c);return b},destroy:function(){this.layer=
+null},CLASS_NAME:"OpenLayers.Format.WFS"});OpenLayers.Format.SLD.v1_0_0_GeoServer=OpenLayers.Class(OpenLayers.Format.SLD.v1_0_0,{version:"1.0.0",profile:"GeoServer",readers:OpenLayers.Util.applyDefaults({sld:OpenLayers.Util.applyDefaults({Priority:function(a,b){var c=this.readers.ogc._expression.call(this,a);c&&(b.priority=c)},VendorOption:function(a,b){b.vendorOptions||(b.vendorOptions={});b.vendorOptions[a.getAttribute("name")]=this.getChildValue(a)},TextSymbolizer:function(a,b){OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld.TextSymbolizer.apply(this,
+arguments);var c=this.multipleSymbolizers?b.symbolizers[b.symbolizers.length-1]:b.symbolizer.Text;void 0===c.graphic&&(c.graphic=!1)}},OpenLayers.Format.SLD.v1_0_0.prototype.readers.sld)},OpenLayers.Format.SLD.v1_0_0.prototype.readers),writers:OpenLayers.Util.applyDefaults({sld:OpenLayers.Util.applyDefaults({Priority:function(a){return this.writers.sld._OGCExpression.call(this,"sld:Priority",a)},VendorOption:function(a){return this.createElementNSPlus("sld:VendorOption",{attributes:{name:a.name},
+value:a.value})},TextSymbolizer:function(a){var b=OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld.TextSymbolizer.apply(this,arguments);!1!==a.graphic&&(a.externalGraphic||a.graphicName)&&this.writeNode("Graphic",a,b);"priority"in a&&this.writeNode("Priority",a.priority,b);return this.addVendorOptions(b,a)},PointSymbolizer:function(a){var b=OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld.PointSymbolizer.apply(this,arguments);return this.addVendorOptions(b,a)},LineSymbolizer:function(a){var b=
+OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld.LineSymbolizer.apply(this,arguments);return this.addVendorOptions(b,a)},PolygonSymbolizer:function(a){var b=OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld.PolygonSymbolizer.apply(this,arguments);return this.addVendorOptions(b,a)}},OpenLayers.Format.SLD.v1_0_0.prototype.writers.sld)},OpenLayers.Format.SLD.v1_0_0.prototype.writers),addVendorOptions:function(a,b){if(b.vendorOptions)for(var c in b.vendorOptions)this.writeNode("VendorOption",{name:c,
+value:b.vendorOptions[c]},a);return a},CLASS_NAME:"OpenLayers.Format.SLD.v1_0_0_GeoServer"});OpenLayers.Layer.Boxes=OpenLayers.Class(OpenLayers.Layer.Markers,{drawMarker:function(a){var b=this.map.getLayerPxFromLonLat({lon:a.bounds.left,lat:a.bounds.top}),c=this.map.getLayerPxFromLonLat({lon:a.bounds.right,lat:a.bounds.bottom});null==c||null==b?a.display(!1):(b=a.draw(b,{w:Math.max(1,c.x-b.x),h:Math.max(1,c.y-b.y)}),a.drawn||(this.div.appendChild(b),a.drawn=!0))},removeMarker:function(a){OpenLayers.Util.removeItem(this.markers,a);null!=a.div&&a.div.parentNode==this.div&&this.div.removeChild(a.div)},
+CLASS_NAME:"OpenLayers.Layer.Boxes"});OpenLayers.Format.WFSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.WFSCapabilities.v1,{readers:{wfs:OpenLayers.Util.applyDefaults({Service:function(a,b){b.service={};this.readChildNodes(a,b.service)},Fees:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.fees=c)},AccessConstraints:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.accessConstraints=c)},OnlineResource:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.onlineResource=
+c)},Keywords:function(a,b){var c=this.getChildValue(a);c&&"none"!=c.toLowerCase()&&(b.keywords=c.split(", "))},Capability:function(a,b){b.capability={};this.readChildNodes(a,b.capability)},Request:function(a,b){b.request={};this.readChildNodes(a,b.request)},GetFeature:function(a,b){b.getfeature={href:{},formats:[]};this.readChildNodes(a,b.getfeature)},ResultFormat:function(a,b){for(var c=a.childNodes,d,e=0;e<c.length;e++)d=c[e],1==d.nodeType&&b.formats.push(d.nodeName)},DCPType:function(a,b){this.readChildNodes(a,
+b)},HTTP:function(a,b){this.readChildNodes(a,b.href)},Get:function(a,b){b.get=a.getAttribute("onlineResource")},Post:function(a,b){b.post=a.getAttribute("onlineResource")},SRS:function(a,b){var c=this.getChildValue(a);c&&(b.srs=c)}},OpenLayers.Format.WFSCapabilities.v1.prototype.readers.wfs)},CLASS_NAME:"OpenLayers.Format.WFSCapabilities.v1_0_0"});OpenLayers.Format.WMSCapabilities.v1_3=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1,{readers:{wms:OpenLayers.Util.applyDefaults({WMS_Capabilities:function(a,b){this.readChildNodes(a,b)},LayerLimit:function(a,b){b.layerLimit=parseInt(this.getChildValue(a))},MaxWidth:function(a,b){b.maxWidth=parseInt(this.getChildValue(a))},MaxHeight:function(a,b){b.maxHeight=parseInt(this.getChildValue(a))},BoundingBox:function(a,b){var c=OpenLayers.Format.WMSCapabilities.v1.prototype.readers.wms.BoundingBox.apply(this,
+[a,b]);c.srs=a.getAttribute("CRS");b.bbox[c.srs]=c},CRS:function(a,b){this.readers.wms.SRS.apply(this,[a,b])},EX_GeographicBoundingBox:function(a,b){b.llbbox=[];this.readChildNodes(a,b.llbbox)},westBoundLongitude:function(a,b){b[0]=this.getChildValue(a)},eastBoundLongitude:function(a,b){b[2]=this.getChildValue(a)},southBoundLatitude:function(a,b){b[1]=this.getChildValue(a)},northBoundLatitude:function(a,b){b[3]=this.getChildValue(a)},MinScaleDenominator:function(a,b){b.maxScale=parseFloat(this.getChildValue(a)).toPrecision(16)},
+MaxScaleDenominator:function(a,b){b.minScale=parseFloat(this.getChildValue(a)).toPrecision(16)},Dimension:function(a,b){var c={name:a.getAttribute("name").toLowerCase(),units:a.getAttribute("units"),unitsymbol:a.getAttribute("unitSymbol"),nearestVal:"1"===a.getAttribute("nearestValue"),multipleVal:"1"===a.getAttribute("multipleValues"),"default":a.getAttribute("default")||"",current:"1"===a.getAttribute("current"),values:this.getChildValue(a).split(",")};b.dimensions[c.name]=c},Keyword:function(a,
+b){var c={value:this.getChildValue(a),vocabulary:a.getAttribute("vocabulary")};b.keywords&&b.keywords.push(c)}},OpenLayers.Format.WMSCapabilities.v1.prototype.readers.wms),sld:{UserDefinedSymbolization:function(a,b){this.readers.wms.UserDefinedSymbolization.apply(this,[a,b]);b.userSymbols.inlineFeature=1==parseInt(a.getAttribute("InlineFeature"));b.userSymbols.remoteWCS=1==parseInt(a.getAttribute("RemoteWCS"))},DescribeLayer:function(a,b){this.readers.wms.DescribeLayer.apply(this,[a,b])},GetLegendGraphic:function(a,
+b){this.readers.wms.GetLegendGraphic.apply(this,[a,b])}}},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_3"});OpenLayers.Layer.Zoomify=OpenLayers.Class(OpenLayers.Layer.Grid,{size:null,isBaseLayer:!0,standardTileSize:256,tileOriginCorner:"tl",numberOfTiers:0,tileCountUpToTier:null,tierSizeInTiles:null,tierImageSize:null,initialize:function(a,b,c,d){this.initializeZoomify(c);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a,b,c,{},d])},initializeZoomify:function(a){var b=a.clone();this.size=a.clone();a=new OpenLayers.Size(Math.ceil(b.w/this.standardTileSize),Math.ceil(b.h/this.standardTileSize));this.tierSizeInTiles=
+[a];for(this.tierImageSize=[b];b.w>this.standardTileSize||b.h>this.standardTileSize;)b=new OpenLayers.Size(Math.floor(b.w/2),Math.floor(b.h/2)),a=new OpenLayers.Size(Math.ceil(b.w/this.standardTileSize),Math.ceil(b.h/this.standardTileSize)),this.tierSizeInTiles.push(a),this.tierImageSize.push(b);this.tierSizeInTiles.reverse();this.tierImageSize.reverse();this.numberOfTiers=this.tierSizeInTiles.length;b=[1];this.tileCountUpToTier=[0];for(a=1;a<this.numberOfTiers;a++)b.unshift(Math.pow(2,a)),this.tileCountUpToTier.push(this.tierSizeInTiles[a-
+1].w*this.tierSizeInTiles[a-1].h+this.tileCountUpToTier[a-1]);this.serverResolutions||(this.serverResolutions=b)},destroy:function(){OpenLayers.Layer.Grid.prototype.destroy.apply(this,arguments);this.tileCountUpToTier.length=0;this.tierSizeInTiles.length=0;this.tierImageSize.length=0},clone:function(a){null==a&&(a=new OpenLayers.Layer.Zoomify(this.name,this.url,this.size,this.options));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){a=this.adjustBounds(a);var b=
+this.getServerResolution(),c=Math.round((a.left-this.tileOrigin.lon)/(b*this.tileSize.w));a=Math.round((this.tileOrigin.lat-a.top)/(b*this.tileSize.h));b=this.getZoomForResolution(b);c="TileGroup"+Math.floor((c+a*this.tierSizeInTiles[b].w+this.tileCountUpToTier[b])/256)+"/"+b+"-"+c+"-"+a+".jpg";b=this.url;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(c,b));return b+c},getImageSize:function(){if(0<arguments.length){var a=this.adjustBounds(arguments[0]),b=this.getServerResolution(),c=Math.round((a.left-
+this.tileOrigin.lon)/(b*this.tileSize.w)),a=Math.round((this.tileOrigin.lat-a.top)/(b*this.tileSize.h)),b=this.getZoomForResolution(b),d=this.standardTileSize,e=this.standardTileSize;c==this.tierSizeInTiles[b].w-1&&(d=this.tierImageSize[b].w%this.standardTileSize);a==this.tierSizeInTiles[b].h-1&&(e=this.tierImageSize[b].h%this.standardTileSize);return new OpenLayers.Size(d,e)}return this.tileSize},setMap:function(a){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments);this.tileOrigin=new OpenLayers.LonLat(this.map.maxExtent.left,
+this.map.maxExtent.top)},CLASS_NAME:"OpenLayers.Layer.Zoomify"});OpenLayers.Layer.MapServer=OpenLayers.Class(OpenLayers.Layer.Grid,{DEFAULT_PARAMS:{mode:"map",map_imagetype:"png"},initialize:function(a,b,c,d){OpenLayers.Layer.Grid.prototype.initialize.apply(this,arguments);this.params=OpenLayers.Util.applyDefaults(this.params,this.DEFAULT_PARAMS);if(null==d||null==d.isBaseLayer)this.isBaseLayer="true"!=this.params.transparent&&!0!=this.params.transparent},clone:function(a){null==a&&(a=new OpenLayers.Layer.MapServer(this.name,this.url,this.params,this.getOptions()));
+return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getURL:function(a){a=this.adjustBounds(a);a=[a.left,a.bottom,a.right,a.top];var b=this.getImageSize();return this.getFullRequestString({mapext:a,imgext:a,map_size:[b.w,b.h],imgx:b.w/2,imgy:b.h/2,imgxy:[b.w,b.h]})},getFullRequestString:function(a,b){var c=null==b?this.url:b,d=OpenLayers.Util.extend({},this.params),d=OpenLayers.Util.extend(d,a),e=OpenLayers.Util.getParameterString(d);OpenLayers.Util.isArray(c)&&(c=this.selectUrl(e,c));
+var e=OpenLayers.Util.upperCaseObject(OpenLayers.Util.getParameters(c)),f;for(f in d)f.toUpperCase()in e&&delete d[f];e=OpenLayers.Util.getParameterString(d);d=c;e=e.replace(/,/g,"+");""!=e&&(f=c.charAt(c.length-1),d="&"==f||"?"==f?d+e:-1==c.indexOf("?")?d+("?"+e):d+("&"+e));return d},CLASS_NAME:"OpenLayers.Layer.MapServer"});OpenLayers.Renderer.VML=OpenLayers.Class(OpenLayers.Renderer.Elements,{xmlns:"urn:schemas-microsoft-com:vml",symbolCache:{},offset:null,initialize:function(a){if(this.supported()){if(!document.namespaces.olv){document.namespaces.add("olv",this.xmlns);for(var b=document.createStyleSheet(),c="shape rect oval fill stroke imagedata group textbox".split(" "),d=0,e=c.length;d<e;d++)b.addRule("olv\\:"+c[d],"behavior: url(#default#VML); position: absolute; display: inline-block;")}OpenLayers.Renderer.Elements.prototype.initialize.apply(this,
+arguments)}},supported:function(){return!!document.namespaces},setExtent:function(a,b){var c=OpenLayers.Renderer.Elements.prototype.setExtent.apply(this,arguments),d=this.getResolution(),e=a.left/d|0,d=a.top/d-this.size.h|0;b||!this.offset?(this.offset={x:e,y:d},d=e=0):(e-=this.offset.x,d-=this.offset.y);this.root.coordorigin=e-this.xOffset+" "+d;for(var e=[this.root,this.vectorRoot,this.textRoot],f=0,g=e.length;f<g;++f)d=e[f],d.coordsize=this.size.w+" "+this.size.h;this.root.style.flip="y";return c},
+setSize:function(a){OpenLayers.Renderer.prototype.setSize.apply(this,arguments);for(var b=[this.rendererRoot,this.root,this.vectorRoot,this.textRoot],c=this.size.w+"px",d=this.size.h+"px",e,f=0,g=b.length;f<g;++f)e=b[f],e.style.width=c,e.style.height=d},getNodeType:function(a,b){var c=null;switch(a.CLASS_NAME){case "OpenLayers.Geometry.Point":c=b.externalGraphic?"olv:rect":this.isComplexSymbol(b.graphicName)?"olv:shape":"olv:oval";break;case "OpenLayers.Geometry.Rectangle":c="olv:rect";break;case "OpenLayers.Geometry.LineString":case "OpenLayers.Geometry.LinearRing":case "OpenLayers.Geometry.Polygon":case "OpenLayers.Geometry.Curve":c=
+"olv:shape"}return c},setStyle:function(a,b,c,d){b=b||a._style;c=c||a._options;var e=b.fillColor,f=b.title||b.graphicTitle;f&&(a.title=f);if("OpenLayers.Geometry.Point"===a._geometryClass)if(b.externalGraphic){c.isFilled=!0;var e=b.graphicWidth||b.graphicHeight,f=b.graphicHeight||b.graphicWidth,e=e?e:2*b.pointRadius,f=f?f:2*b.pointRadius,g=this.getResolution(),h=void 0!=b.graphicXOffset?b.graphicXOffset:-(0.5*e),k=void 0!=b.graphicYOffset?b.graphicYOffset:-(0.5*f);a.style.left=((d.x-this.featureDx)/
+g-this.offset.x+h|0)+"px";a.style.top=(d.y/g-this.offset.y-(k+f)|0)+"px";a.style.width=e+"px";a.style.height=f+"px";a.style.flip="y";e="none";c.isStroked=!1}else this.isComplexSymbol(b.graphicName)?(f=this.importSymbol(b.graphicName),a.path=f.path,a.coordorigin=f.left+","+f.bottom,f=f.size,a.coordsize=f+","+f,this.drawCircle(a,d,b.pointRadius),a.style.flip="y"):this.drawCircle(a,d,b.pointRadius);c.isFilled?a.fillcolor=e:a.filled="false";d=a.getElementsByTagName("fill");d=0==d.length?null:d[0];c.isFilled?
+(d||(d=this.createNode("olv:fill",a.id+"_fill")),d.opacity=b.fillOpacity,"OpenLayers.Geometry.Point"===a._geometryClass&&b.externalGraphic&&(b.graphicOpacity&&(d.opacity=b.graphicOpacity),d.src=b.externalGraphic,d.type="frame",b.graphicWidth&&b.graphicHeight||(d.aspect="atmost")),d.parentNode!=a&&a.appendChild(d)):d&&a.removeChild(d);e=b.rotation;if(void 0!==e||void 0!==a._rotation)a._rotation=e,b.externalGraphic?(this.graphicRotate(a,h,k,b),d.opacity=0):"OpenLayers.Geometry.Point"===a._geometryClass&&
+(a.style.rotation=e||0);h=a.getElementsByTagName("stroke");h=0==h.length?null:h[0];c.isStroked?(h||(h=this.createNode("olv:stroke",a.id+"_stroke"),a.appendChild(h)),h.on=!0,h.color=b.strokeColor,h.weight=b.strokeWidth+"px",h.opacity=b.strokeOpacity,h.endcap="butt"==b.strokeLinecap?"flat":b.strokeLinecap||"round",b.strokeDashstyle&&(h.dashstyle=this.dashStyle(b))):(a.stroked=!1,h&&(h.on=!1));"inherit"!=b.cursor&&null!=b.cursor&&(a.style.cursor=b.cursor);return a},graphicRotate:function(a,b,c,d){d=
+d||a._style;var e=d.rotation||0,f,g;if(d.graphicWidth&&d.graphicHeight){g=Math.max(d.graphicWidth,d.graphicHeight);f=d.graphicWidth/d.graphicHeight;var h=Math.round(d.graphicWidth||g*f),k=Math.round(d.graphicHeight||g);a.style.width=h+"px";a.style.height=k+"px";var l=document.getElementById(a.id+"_image");l||(l=this.createNode("olv:imagedata",a.id+"_image"),a.appendChild(l));l.style.width=h+"px";l.style.height=k+"px";l.src=d.externalGraphic;l.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='', sizingMethod='scale')";
+l=e*Math.PI/180;e=Math.sin(l);l=Math.cos(l);e="progid:DXImageTransform.Microsoft.Matrix(M11="+l+",M12="+-e+",M21="+e+",M22="+l+",SizingMethod='auto expand')\n";(l=d.graphicOpacity||d.fillOpacity)&&1!=l&&(e+="progid:DXImageTransform.Microsoft.BasicImage(opacity="+l+")\n");a.style.filter=e;e=new OpenLayers.Geometry.Point(-b,-c);h=(new OpenLayers.Bounds(0,0,h,k)).toGeometry();h.rotate(d.rotation,e);h=h.getBounds();a.style.left=Math.round(parseInt(a.style.left)+h.left)+"px";a.style.top=Math.round(parseInt(a.style.top)-
+h.bottom)+"px"}else{var m=new Image;m.onreadystatechange=OpenLayers.Function.bind(function(){if("complete"==m.readyState||"interactive"==m.readyState)f=m.width/m.height,g=Math.max(2*d.pointRadius,d.graphicWidth||0,d.graphicHeight||0),b*=f,d.graphicWidth=g*f,d.graphicHeight=g,this.graphicRotate(a,b,c,d)},this);m.src=d.externalGraphic}},postDraw:function(a){a.style.visibility="visible";var b=a._style.fillColor,c=a._style.strokeColor;"none"==b&&a.fillcolor!=b&&(a.fillcolor=b);"none"==c&&a.strokecolor!=
+c&&(a.strokecolor=c)},setNodeDimension:function(a,b){var c=b.getBounds();if(c){var d=this.getResolution(),c=new OpenLayers.Bounds((c.left-this.featureDx)/d-this.offset.x|0,c.bottom/d-this.offset.y|0,(c.right-this.featureDx)/d-this.offset.x|0,c.top/d-this.offset.y|0);a.style.left=c.left+"px";a.style.top=c.top+"px";a.style.width=c.getWidth()+"px";a.style.height=c.getHeight()+"px";a.coordorigin=c.left+" "+c.top;a.coordsize=c.getWidth()+" "+c.getHeight()}},dashStyle:function(a){a=a.strokeDashstyle;switch(a){case "solid":case "dot":case "dash":case "dashdot":case "longdash":case "longdashdot":return a;
+default:return a=a.split(/[ ,]/),2==a.length?1*a[0]>=2*a[1]?"longdash":1==a[0]||1==a[1]?"dot":"dash":4==a.length?1*a[0]>=2*a[1]?"longdashdot":"dashdot":"solid"}},createNode:function(a,b){var c=document.createElement(a);b&&(c.id=b);c.unselectable="on";c.onselectstart=OpenLayers.Function.False;return c},nodeTypeCompare:function(a,b){var c=b,d=c.indexOf(":");-1!=d&&(c=c.substr(d+1));var e=a.nodeName,d=e.indexOf(":");-1!=d&&(e=e.substr(d+1));return c==e},createRenderRoot:function(){return this.nodeFactory(this.container.id+
+"_vmlRoot","div")},createRoot:function(a){return this.nodeFactory(this.container.id+a,"olv:group")},drawPoint:function(a,b){return this.drawCircle(a,b,1)},drawCircle:function(a,b,c){if(!isNaN(b.x)&&!isNaN(b.y)){var d=this.getResolution();a.style.left=((b.x-this.featureDx)/d-this.offset.x|0)-c+"px";a.style.top=(b.y/d-this.offset.y|0)-c+"px";b=2*c;a.style.width=b+"px";a.style.height=b+"px";return a}return!1},drawLineString:function(a,b){return this.drawLine(a,b,!1)},drawLinearRing:function(a,b){return this.drawLine(a,
+b,!0)},drawLine:function(a,b,c){this.setNodeDimension(a,b);for(var d=this.getResolution(),e=b.components.length,f=Array(e),g,h,k=0;k<e;k++)g=b.components[k],h=(g.x-this.featureDx)/d-this.offset.x|0,g=g.y/d-this.offset.y|0,f[k]=" "+h+","+g+" l ";b=c?" x e":" e";a.path="m"+f.join("")+b;return a},drawPolygon:function(a,b){this.setNodeDimension(a,b);var c=this.getResolution(),d=[],e,f,g,h,k,l,m,n,p,q;e=0;for(f=b.components.length;e<f;e++){d.push("m");g=b.components[e].components;h=0===e;l=k=null;m=0;
+for(n=g.length;m<n;m++)p=g[m],q=(p.x-this.featureDx)/c-this.offset.x|0,p=p.y/c-this.offset.y|0,q=" "+q+","+p,d.push(q),0==m&&d.push(" l"),h||(k?k!=q&&(l?l!=q&&(h=!0):l=q):k=q);d.push(h?" x ":" ")}d.push("e");a.path=d.join("");return a},drawRectangle:function(a,b){var c=this.getResolution();a.style.left=((b.x-this.featureDx)/c-this.offset.x|0)+"px";a.style.top=(b.y/c-this.offset.y|0)+"px";a.style.width=(b.width/c|0)+"px";a.style.height=(b.height/c|0)+"px";return a},drawText:function(a,b,c){var d=this.nodeFactory(a+
+this.LABEL_ID_SUFFIX,"olv:rect"),e=this.nodeFactory(a+this.LABEL_ID_SUFFIX+"_textbox","olv:textbox"),f=this.getResolution();d.style.left=((c.x-this.featureDx)/f-this.offset.x|0)+"px";d.style.top=(c.y/f-this.offset.y|0)+"px";d.style.flip="y";e.innerText=b.label;"inherit"!=b.cursor&&null!=b.cursor&&(e.style.cursor=b.cursor);b.fontColor&&(e.style.color=b.fontColor);b.fontOpacity&&(e.style.filter="alpha(opacity="+100*b.fontOpacity+")");b.fontFamily&&(e.style.fontFamily=b.fontFamily);b.fontSize&&(e.style.fontSize=
+b.fontSize);b.fontWeight&&(e.style.fontWeight=b.fontWeight);b.fontStyle&&(e.style.fontStyle=b.fontStyle);!0===b.labelSelect&&(d._featureId=a,e._featureId=a,e._geometry=c,e._geometryClass=c.CLASS_NAME);e.style.whiteSpace="nowrap";e.inset="1px,0px,0px,0px";d.parentNode||(d.appendChild(e),this.textRoot.appendChild(d));b=b.labelAlign||"cm";1==b.length&&(b+="m");a=e.clientWidth*OpenLayers.Renderer.VML.LABEL_SHIFT[b.substr(0,1)];e=e.clientHeight*OpenLayers.Renderer.VML.LABEL_SHIFT[b.substr(1,1)];d.style.left=
+parseInt(d.style.left)-a-1+"px";d.style.top=parseInt(d.style.top)+e+"px"},moveRoot:function(a){var b=this.map.getLayer(a.container.id);b instanceof OpenLayers.Layer.Vector.RootContainer&&(b=this.map.getLayer(this.container.id));b&&b.renderer.clear();OpenLayers.Renderer.Elements.prototype.moveRoot.apply(this,arguments);b&&b.redraw()},importSymbol:function(a){var b=this.container.id+"-"+a,c=this.symbolCache[b];if(c)return c;c=OpenLayers.Renderer.symbol[a];if(!c)throw Error(a+" is not a valid symbol name");
+a=new OpenLayers.Bounds(Number.MAX_VALUE,Number.MAX_VALUE,0,0);for(var d=["m"],e=0;e<c.length;e+=2){var f=c[e],g=c[e+1];a.left=Math.min(a.left,f);a.bottom=Math.min(a.bottom,g);a.right=Math.max(a.right,f);a.top=Math.max(a.top,g);d.push(f);d.push(g);0==e&&d.push("l")}d.push("x e");c=d.join(" ");d=(a.getWidth()-a.getHeight())/2;0<d?(a.bottom-=d,a.top+=d):(a.left+=d,a.right-=d);c={path:c,size:a.getWidth(),left:a.left,bottom:a.bottom};return this.symbolCache[b]=c},CLASS_NAME:"OpenLayers.Renderer.VML"});
+OpenLayers.Renderer.VML.LABEL_SHIFT={l:0,c:0.5,r:1,t:0,m:0.5,b:1};OpenLayers.Control.CacheRead=OpenLayers.Class(OpenLayers.Control,{fetchEvent:"tileloadstart",layers:null,autoActivate:!0,setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);var b,c=this.layers||a.layers;for(b=c.length-1;0<=b;--b)this.addLayer({layer:c[b]});if(!this.layers)a.events.on({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this})},addLayer:function(a){a.layer.events.register(this.fetchEvent,this,this.fetch)},removeLayer:function(a){a.layer.events.unregister(this.fetchEvent,
+this,this.fetch)},fetch:function(a){if(this.active&&window.localStorage&&a.tile instanceof OpenLayers.Tile.Image){var b=a.tile,c=b.url;!b.layer.crossOriginKeyword&&(OpenLayers.ProxyHost&&0===c.indexOf(OpenLayers.ProxyHost))&&(c=OpenLayers.Control.CacheWrite.urlMap[c]);if(c=window.localStorage.getItem("olCache_"+c))b.url=c,"tileerror"===a.type&&b.setImgSrc(c)}},destroy:function(){if(this.layers||this.map){var a,b=this.layers||this.map.layers;for(a=b.length-1;0<=a;--a)this.removeLayer({layer:b[a]})}this.map&&
+this.map.events.un({addlayer:this.addLayer,removeLayer:this.removeLayer,scope:this});OpenLayers.Control.prototype.destroy.apply(this,arguments)},CLASS_NAME:"OpenLayers.Control.CacheRead"});OpenLayers.Protocol.WFS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.0.0",CLASS_NAME:"OpenLayers.Protocol.WFS.v1_0_0"});OpenLayers.Format.WMSGetFeatureInfo=OpenLayers.Class(OpenLayers.Format.XML,{layerIdentifier:"_layer",featureIdentifier:"_feature",regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},gmlFormat:null,read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));var b=a.documentElement;if(b){var c=this["read_"+b.nodeName];a=c?c.call(this,b):(new OpenLayers.Format.GML(this.options?this.options:{})).read(a)}return a},read_msGMLOutput:function(a){var b=
+[];if(a=this.getSiblingNodesByTagCriteria(a,this.layerIdentifier))for(var c=0,d=a.length;c<d;++c){var e=a[c],f=e.nodeName;e.prefix&&(f=f.split(":")[1]);f=f.replace(this.layerIdentifier,"");if(e=this.getSiblingNodesByTagCriteria(e,this.featureIdentifier))for(var g=0;g<e.length;g++){var h=e[g],k=this.parseGeometry(h),h=this.parseAttributes(h),h=new OpenLayers.Feature.Vector(k.geometry,h,null);h.bounds=k.bounds;h.type=f;b.push(h)}}return b},read_FeatureInfoResponse:function(a){var b=[];a=this.getElementsByTagNameNS(a,
+"*","FIELDS");for(var c=0,d=a.length;c<d;c++){var e=a[c],f={},g,h=e.attributes.length;if(0<h)for(g=0;g<h;g++){var k=e.attributes[g];f[k.nodeName]=k.nodeValue}else for(e=e.childNodes,g=0,h=e.length;g<h;++g)k=e[g],3!=k.nodeType&&(f[k.getAttribute("name")]=k.getAttribute("value"));b.push(new OpenLayers.Feature.Vector(null,f,null))}return b},getSiblingNodesByTagCriteria:function(a,b){var c=[],d,e,f,g;if(a&&a.hasChildNodes()){d=a.childNodes;f=d.length;for(var h=0;h<f;h++){for(g=d[h];g&&1!=g.nodeType;)g=
+g.nextSibling,h++;e=g?g.nodeName:"";0<e.length&&-1<e.indexOf(b)?c.push(g):(e=this.getSiblingNodesByTagCriteria(g,b),0<e.length&&(0==c.length?c=e:c.push(e)))}}return c},parseAttributes:function(a){var b={};if(1==a.nodeType){a=a.childNodes;for(var c=a.length,d=0;d<c;++d){var e=a[d];if(1==e.nodeType){var f=e.childNodes,e=e.prefix?e.nodeName.split(":")[1]:e.nodeName;0==f.length?b[e]=null:1==f.length&&(f=f[0],3==f.nodeType||4==f.nodeType)&&(f=f.nodeValue.replace(this.regExes.trimSpace,""),b[e]=f)}}}return b},
+parseGeometry:function(a){this.gmlFormat||(this.gmlFormat=new OpenLayers.Format.GML);a=this.gmlFormat.parseFeature(a);var b,c=null;a&&(b=a.geometry&&a.geometry.clone(),c=a.bounds&&a.bounds.clone(),a.destroy());return{geometry:b,bounds:c}},CLASS_NAME:"OpenLayers.Format.WMSGetFeatureInfo"});OpenLayers.Control.WMTSGetFeatureInfo=OpenLayers.Class(OpenLayers.Control,{hover:!1,requestEncoding:"KVP",drillDown:!1,maxFeatures:10,clickCallback:"click",layers:null,queryVisible:!0,infoFormat:"text/html",vendorParams:{},format:null,formatOptions:null,handler:null,hoverRequest:null,pending:0,initialize:function(a){a=a||{};a.handlerOptions=a.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[a]);this.format||(this.format=new OpenLayers.Format.WMSGetFeatureInfo(a.formatOptions));
+!0===this.drillDown&&(this.hover=!1);this.hover?this.handler=new OpenLayers.Handler.Hover(this,{move:this.cancelHover,pause:this.getInfoForHover},OpenLayers.Util.extend(this.handlerOptions.hover||{},{delay:250})):(a={},a[this.clickCallback]=this.getInfoForClick,this.handler=new OpenLayers.Handler.Click(this,a,this.handlerOptions.click||{}))},getInfoForClick:function(a){this.request(a.xy,{})},getInfoForHover:function(a){this.request(a.xy,{hover:!0})},cancelHover:function(){this.hoverRequest&&(--this.pending,
+0>=this.pending&&(OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait"),this.pending=0),this.hoverRequest.abort(),this.hoverRequest=null)},findLayers:function(){for(var a=this.layers||this.map.layers,b=[],c,d=a.length-1;0<=d&&(c=a[d],!(c instanceof OpenLayers.Layer.WMTS)||(c.requestEncoding!==this.requestEncoding||this.queryVisible&&!c.getVisibility())||(b.push(c),this.drillDown&&!this.hover));--d);return b},buildRequestOptions:function(a,b){var c=this.map.getLonLatFromPixel(b),d=a.getURL(new OpenLayers.Bounds(c.lon,
+c.lat,c.lon,c.lat)),d=OpenLayers.Util.getParameters(d),c=a.getTileInfo(c);OpenLayers.Util.extend(d,{service:"WMTS",version:a.version,request:"GetFeatureInfo",infoFormat:this.infoFormat,i:c.i,j:c.j});OpenLayers.Util.applyDefaults(d,this.vendorParams);return{url:OpenLayers.Util.isArray(a.url)?a.url[0]:a.url,params:OpenLayers.Util.upperCaseObject(d),callback:function(c){this.handleResponse(b,c,a)},scope:this}},request:function(a,b){b=b||{};var c=this.findLayers();if(0<c.length){for(var d,e,f=0,g=c.length;f<
+g;f++)e=c[f],d=this.events.triggerEvent("beforegetfeatureinfo",{xy:a,layer:e}),!1!==d&&(++this.pending,d=this.buildRequestOptions(e,a),d=OpenLayers.Request.GET(d),!0===b.hover&&(this.hoverRequest=d));0<this.pending&&OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait")}},handleResponse:function(a,b,c){--this.pending;0>=this.pending&&(OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait"),this.pending=0);if(b.status&&(200>b.status||300<=b.status))this.events.triggerEvent("exception",
+{xy:a,request:b,layer:c});else{var d=b.responseXML;d&&d.documentElement||(d=b.responseText);var e,f;try{e=this.format.read(d)}catch(g){f=!0,this.events.triggerEvent("exception",{xy:a,request:b,error:g,layer:c})}f||this.events.triggerEvent("getfeatureinfo",{text:b.responseText,features:e,request:b,xy:a,layer:c})}},CLASS_NAME:"OpenLayers.Control.WMTSGetFeatureInfo"});OpenLayers.Protocol.CSW.v2_0_2=OpenLayers.Class(OpenLayers.Protocol,{formatOptions:null,initialize:function(a){OpenLayers.Protocol.prototype.initialize.apply(this,[a]);a.format||(this.format=new OpenLayers.Format.CSWGetRecords.v2_0_2(OpenLayers.Util.extend({},this.formatOptions)))},destroy:function(){this.options&&!this.options.format&&this.format.destroy();this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){a=OpenLayers.Util.extend({},a);OpenLayers.Util.applyDefaults(a,
+this.options||{});var b=new OpenLayers.Protocol.Response({requestType:"read"}),c=this.format.write(a.params||a);b.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,b,a),params:a.params,headers:a.headers,data:c});return b},handleRead:function(a,b){if(b.callback){var c=a.priv;200<=c.status&&300>c.status?(a.data=this.parseData(c),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE;b.callback.call(b.scope,a)}},parseData:function(a){var b=
+a.responseXML;b&&b.documentElement||(b=a.responseText);return!b||0>=b.length?null:this.format.read(b)},CLASS_NAME:"OpenLayers.Protocol.CSW.v2_0_2"});OpenLayers.Format.WCSCapabilities.v1_1_0=OpenLayers.Class(OpenLayers.Format.WCSCapabilities.v1,{namespaces:{wcs:"http://www.opengis.net/wcs/1.1",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance",ows:"http://www.opengis.net/ows/1.1"},errorProperty:"operationsMetadata",readers:{wcs:OpenLayers.Util.applyDefaults({Capabilities:function(a,b){this.readChildNodes(a,b)},Contents:function(a,b){b.contentMetadata=[];this.readChildNodes(a,b.contentMetadata)},CoverageSummary:function(a,
+b){var c={};this.readChildNodes(a,c);b.push(c)},Identifier:function(a,b){b.identifier=this.getChildValue(a)},Title:function(a,b){b.title=this.getChildValue(a)},Abstract:function(a,b){b["abstract"]=this.getChildValue(a)},SupportedCRS:function(a,b){var c=this.getChildValue(a);c&&(b.supportedCRS||(b.supportedCRS=[]),b.supportedCRS.push(c))},SupportedFormat:function(a,b){var c=this.getChildValue(a);c&&(b.supportedFormat||(b.supportedFormat=[]),b.supportedFormat.push(c))}},OpenLayers.Format.WCSCapabilities.v1.prototype.readers.wcs),
+ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WCSCapabilities.v1_1_0"});OpenLayers.Control.Graticule=OpenLayers.Class(OpenLayers.Control,{autoActivate:!0,intervals:[45,30,20,10,5,2,1,0.5,0.2,0.1,0.05,0.01,0.005,0.002,0.001],displayInLayerSwitcher:!0,visible:!0,numPoints:50,targetSize:200,layerName:null,labelled:!0,labelFormat:"dm",lineSymbolizer:{strokeColor:"#333",strokeWidth:1,strokeOpacity:0.5},labelSymbolizer:{},gratLayer:null,initialize:function(a){a=a||{};a.layerName=a.layerName||OpenLayers.i18n("Graticule");OpenLayers.Control.prototype.initialize.apply(this,[a]);
+this.labelSymbolizer.stroke=!1;this.labelSymbolizer.fill=!1;this.labelSymbolizer.label="${label}";this.labelSymbolizer.labelAlign="${labelAlign}";this.labelSymbolizer.labelXOffset="${xOffset}";this.labelSymbolizer.labelYOffset="${yOffset}"},destroy:function(){this.deactivate();OpenLayers.Control.prototype.destroy.apply(this,arguments);this.gratLayer&&(this.gratLayer.destroy(),this.gratLayer=null)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);if(!this.gratLayer){var a=new OpenLayers.Style({},
+{rules:[new OpenLayers.Rule({symbolizer:{Point:this.labelSymbolizer,Line:this.lineSymbolizer}})]});this.gratLayer=new OpenLayers.Layer.Vector(this.layerName,{styleMap:new OpenLayers.StyleMap({"default":a}),visibility:this.visible,displayInLayerSwitcher:this.displayInLayerSwitcher})}return this.div},activate:function(){return OpenLayers.Control.prototype.activate.apply(this,arguments)?(this.map.addLayer(this.gratLayer),this.map.events.register("moveend",this,this.update),this.update(),!0):!1},deactivate:function(){return OpenLayers.Control.prototype.deactivate.apply(this,
+arguments)?(this.map.events.unregister("moveend",this,this.update),this.map.removeLayer(this.gratLayer),!0):!1},update:function(){var a=this.map.getExtent();if(a){this.gratLayer.destroyFeatures();var b=new OpenLayers.Projection("EPSG:4326"),c=this.map.getProjectionObject(),d=this.map.getResolution();c.proj&&"longlat"==c.proj.projName&&(this.numPoints=1);var e=this.map.getCenter(),f=new OpenLayers.Pixel(e.lon,e.lat);OpenLayers.Projection.transform(f,c,b);for(var e=this.targetSize*d,e=e*e,g,d=0;d<this.intervals.length;++d){g=
+this.intervals[d];var h=g/2,k=f.offset({x:-h,y:-h}),h=f.offset({x:h,y:h});OpenLayers.Projection.transform(k,b,c);OpenLayers.Projection.transform(h,b,c);if((k.x-h.x)*(k.x-h.x)+(k.y-h.y)*(k.y-h.y)<=e)break}f.x=Math.floor(f.x/g)*g;f.y=Math.floor(f.y/g)*g;var d=0,e=[f.clone()],h=f.clone(),l;do h=h.offset({x:0,y:g}),l=OpenLayers.Projection.transform(h.clone(),b,c),e.unshift(h);while(a.containsPixel(l)&&1E3>++d);h=f.clone();do h=h.offset({x:0,y:-g}),l=OpenLayers.Projection.transform(h.clone(),b,c),e.push(h);
+while(a.containsPixel(l)&&1E3>++d);d=0;k=[f.clone()];h=f.clone();do h=h.offset({x:-g,y:0}),l=OpenLayers.Projection.transform(h.clone(),b,c),k.unshift(h);while(a.containsPixel(l)&&1E3>++d);h=f.clone();do h=h.offset({x:g,y:0}),l=OpenLayers.Projection.transform(h.clone(),b,c),k.push(h);while(a.containsPixel(l)&&1E3>++d);g=[];for(d=0;d<k.length;++d){l=k[d].x;for(var f=[],m=null,n=Math.min(e[0].y,90),h=Math.max(e[e.length-1].y,-90),p=(n-h)/this.numPoints,n=h,h=0;h<=this.numPoints;++h){var q=new OpenLayers.Geometry.Point(l,
+n);q.transform(b,c);f.push(q);n+=p;q.y>=a.bottom&&!m&&(m=q)}this.labelled&&(m=new OpenLayers.Geometry.Point(m.x,a.bottom),l={value:l,label:this.labelled?OpenLayers.Util.getFormattedLonLat(l,"lon",this.labelFormat):"",labelAlign:"cb",xOffset:0,yOffset:2},this.gratLayer.addFeatures(new OpenLayers.Feature.Vector(m,l)));f=new OpenLayers.Geometry.LineString(f);g.push(new OpenLayers.Feature.Vector(f))}for(h=0;h<e.length;++h)if(n=e[h].y,!(-90>n||90<n)){f=[];d=k[0].x;p=(k[k.length-1].x-d)/this.numPoints;
+l=d;m=null;for(d=0;d<=this.numPoints;++d)q=new OpenLayers.Geometry.Point(l,n),q.transform(b,c),f.push(q),l+=p,q.x<a.right&&(m=q);this.labelled&&(m=new OpenLayers.Geometry.Point(a.right,m.y),l={value:n,label:this.labelled?OpenLayers.Util.getFormattedLonLat(n,"lat",this.labelFormat):"",labelAlign:"rb",xOffset:-2,yOffset:2},this.gratLayer.addFeatures(new OpenLayers.Feature.Vector(m,l)));f=new OpenLayers.Geometry.LineString(f);g.push(new OpenLayers.Feature.Vector(f))}this.gratLayer.addFeatures(g)}},CLASS_NAME:"OpenLayers.Control.Graticule"});OpenLayers.Console.warn("OpenLayers.Rico is deprecated");OpenLayers.Rico=OpenLayers.Rico||{};
+OpenLayers.Rico.Corner={round:function(a,b){a=OpenLayers.Util.getElement(a);this._setOptions(b);var c=this.options.color;"fromElement"==this.options.color&&(c=this._background(a));var d=this.options.bgColor;"fromParent"==this.options.bgColor&&(d=this._background(a.offsetParent));this._roundCornersImpl(a,c,d)},changeColor:function(a,b){a.style.backgroundColor=b;for(var c=a.parentNode.getElementsByTagName("span"),d=0;d<c.length;d++)c[d].style.backgroundColor=b},changeOpacity:function(a,b){var c="alpha(opacity="+
+100*b+")";a.style.opacity=b;a.style.filter=c;for(var d=a.parentNode.getElementsByTagName("span"),e=0;e<d.length;e++)d[e].style.opacity=b,d[e].style.filter=c},reRound:function(a,b){var c=a.parentNode.childNodes[2];a.parentNode.removeChild(a.parentNode.childNodes[0]);a.parentNode.removeChild(c);this.round(a.parentNode,b)},_roundCornersImpl:function(a,b,c){this.options.border&&this._renderBorder(a,c);this._isTopRounded()&&this._roundTopCorners(a,b,c);this._isBottomRounded()&&this._roundBottomCorners(a,
+b,c)},_renderBorder:function(a,b){var c="1px solid "+this._borderColor(b);a.innerHTML="<div "+("style='border-left: "+c+";"+("border-right: "+c)+"'")+">"+a.innerHTML+"</div>"},_roundTopCorners:function(a,b,c){for(var d=this._createCorner(c),e=0;e<this.options.numSlices;e++)d.appendChild(this._createCornerSlice(b,c,e,"top"));a.style.paddingTop=0;a.insertBefore(d,a.firstChild)},_roundBottomCorners:function(a,b,c){for(var d=this._createCorner(c),e=this.options.numSlices-1;0<=e;e--)d.appendChild(this._createCornerSlice(b,
+c,e,"bottom"));a.style.paddingBottom=0;a.appendChild(d)},_createCorner:function(a){var b=document.createElement("div");b.style.backgroundColor=this._isTransparent()?"transparent":a;return b},_createCornerSlice:function(a,b,c,d){var e=document.createElement("span"),f=e.style;f.backgroundColor=a;f.display="block";f.height="1px";f.overflow="hidden";f.fontSize="1px";a=this._borderColor(a,b);this.options.border&&0==c?(f.borderTopStyle="solid",f.borderTopWidth="1px",f.borderLeftWidth="0px",f.borderRightWidth=
+"0px",f.borderBottomWidth="0px",f.height="0px",f.borderColor=a):a&&(f.borderColor=a,f.borderStyle="solid",f.borderWidth="0px 1px");this.options.compact||c!=this.options.numSlices-1||(f.height="2px");this._setMargin(e,c,d);this._setBorder(e,c,d);return e},_setOptions:function(a){this.options={corners:"all",color:"fromElement",bgColor:"fromParent",blend:!0,border:!1,compact:!1};OpenLayers.Util.extend(this.options,a||{});this.options.numSlices=this.options.compact?2:4;this._isTransparent()&&(this.options.blend=
+!1)},_whichSideTop:function(){return this._hasString(this.options.corners,"all","top")||0<=this.options.corners.indexOf("tl")&&0<=this.options.corners.indexOf("tr")?"":0<=this.options.corners.indexOf("tl")?"left":0<=this.options.corners.indexOf("tr")?"right":""},_whichSideBottom:function(){return this._hasString(this.options.corners,"all","bottom")||0<=this.options.corners.indexOf("bl")&&0<=this.options.corners.indexOf("br")?"":0<=this.options.corners.indexOf("bl")?"left":0<=this.options.corners.indexOf("br")?
+"right":""},_borderColor:function(a,b){return"transparent"==a?b:this.options.border?this.options.border:this.options.blend?this._blend(b,a):""},_setMargin:function(a,b,c){b=this._marginSize(b);c="top"==c?this._whichSideTop():this._whichSideBottom();"left"==c?(a.style.marginLeft=b+"px",a.style.marginRight="0px"):"right"==c?(a.style.marginRight=b+"px",a.style.marginLeft="0px"):(a.style.marginLeft=b+"px",a.style.marginRight=b+"px")},_setBorder:function(a,b,c){b=this._borderSize(b);c="top"==c?this._whichSideTop():
+this._whichSideBottom();"left"==c?(a.style.borderLeftWidth=b+"px",a.style.borderRightWidth="0px"):"right"==c?(a.style.borderRightWidth=b+"px",a.style.borderLeftWidth="0px"):(a.style.borderLeftWidth=b+"px",a.style.borderRightWidth=b+"px");!1!=this.options.border&&(a.style.borderLeftWidth=b+"px",a.style.borderRightWidth=b+"px")},_marginSize:function(a){if(this._isTransparent())return 0;var b=[5,3,2,1],c=[3,2,1,0],d=[2,1],e=[1,0];return this.options.compact&&this.options.blend?e[a]:this.options.compact?
+d[a]:this.options.blend?c[a]:b[a]},_borderSize:function(a){var b=[5,3,2,1],c=[2,1,1,1],d=[1,0],e=[0,2,0,0];return this.options.compact&&(this.options.blend||this._isTransparent())?1:this.options.compact?d[a]:this.options.blend?c[a]:this.options.border?e[a]:this._isTransparent()?b[a]:0},_hasString:function(a){for(var b=1;b<arguments.length;b++)if(0<=a.indexOf(arguments[b]))return!0;return!1},_blend:function(a,b){var c=OpenLayers.Rico.Color.createFromHex(a);c.blend(OpenLayers.Rico.Color.createFromHex(b));
+return c},_background:function(a){try{return OpenLayers.Rico.Color.createColorFromBackground(a).asHex()}catch(b){return"#ffffff"}},_isTransparent:function(){return"transparent"==this.options.color},_isTopRounded:function(){return this._hasString(this.options.corners,"all","top","tl","tr")},_isBottomRounded:function(){return this._hasString(this.options.corners,"all","bottom","bl","br")},_hasSingleTextChild:function(a){return 1==a.childNodes.length&&3==a.childNodes[0].nodeType}};OpenLayers.Control.NavigationHistory=OpenLayers.Class(OpenLayers.Control,{type:OpenLayers.Control.TYPE_TOGGLE,previous:null,previousOptions:null,next:null,nextOptions:null,limit:50,autoActivate:!0,clearOnDeactivate:!1,registry:null,nextStack:null,previousStack:null,listeners:null,restoring:!1,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,[a]);this.registry=OpenLayers.Util.extend({moveend:this.getState},this.registry);a={trigger:OpenLayers.Function.bind(this.previousTrigger,
+this),displayClass:this.displayClass+" "+this.displayClass+"Previous"};OpenLayers.Util.extend(a,this.previousOptions);this.previous=new OpenLayers.Control.Button(a);a={trigger:OpenLayers.Function.bind(this.nextTrigger,this),displayClass:this.displayClass+" "+this.displayClass+"Next"};OpenLayers.Util.extend(a,this.nextOptions);this.next=new OpenLayers.Control.Button(a);this.clear()},onPreviousChange:function(a,b){a&&!this.previous.active?this.previous.activate():!a&&this.previous.active&&this.previous.deactivate()},
+onNextChange:function(a,b){a&&!this.next.active?this.next.activate():!a&&this.next.active&&this.next.deactivate()},destroy:function(){OpenLayers.Control.prototype.destroy.apply(this);this.previous.destroy();this.next.destroy();this.deactivate();for(var a in this)this[a]=null},setMap:function(a){this.map=a;this.next.setMap(a);this.previous.setMap(a)},draw:function(){OpenLayers.Control.prototype.draw.apply(this,arguments);this.next.draw();this.previous.draw()},previousTrigger:function(){var a=this.previousStack.shift(),
+b=this.previousStack.shift();void 0!=b?(this.nextStack.unshift(a),this.previousStack.unshift(b),this.restoring=!0,this.restore(b),this.restoring=!1,this.onNextChange(this.nextStack[0],this.nextStack.length),this.onPreviousChange(this.previousStack[1],this.previousStack.length-1)):this.previousStack.unshift(a);return b},nextTrigger:function(){var a=this.nextStack.shift();void 0!=a&&(this.previousStack.unshift(a),this.restoring=!0,this.restore(a),this.restoring=!1,this.onNextChange(this.nextStack[0],
+this.nextStack.length),this.onPreviousChange(this.previousStack[1],this.previousStack.length-1));return a},clear:function(){this.previousStack=[];this.previous.deactivate();this.nextStack=[];this.next.deactivate()},getState:function(){return{center:this.map.getCenter(),resolution:this.map.getResolution(),projection:this.map.getProjectionObject(),units:this.map.getProjectionObject().getUnits()||this.map.units||this.map.baseLayer.units}},restore:function(a){var b,c;if(this.map.getProjectionObject()==
+a.projection)c=this.map.getZoomForResolution(a.resolution),b=a.center;else{b=a.center.clone();b.transform(a.projection,this.map.getProjectionObject());c=a.units;var d=this.map.getProjectionObject().getUnits()||this.map.units||this.map.baseLayer.units;c=this.map.getZoomForResolution((c&&d?OpenLayers.INCHES_PER_UNIT[c]/OpenLayers.INCHES_PER_UNIT[d]:1)*a.resolution)}this.map.setCenter(b,c)},setListeners:function(){this.listeners={};for(var a in this.registry)this.listeners[a]=OpenLayers.Function.bind(function(){if(!this.restoring){var b=
+this.registry[a].apply(this,arguments);this.previousStack.unshift(b);if(1<this.previousStack.length)this.onPreviousChange(this.previousStack[1],this.previousStack.length-1);this.previousStack.length>this.limit+1&&this.previousStack.pop();0<this.nextStack.length&&(this.nextStack=[],this.onNextChange(null,0))}return!0},this)},activate:function(){var a=!1;if(this.map&&OpenLayers.Control.prototype.activate.apply(this)){null==this.listeners&&this.setListeners();for(var b in this.listeners)this.map.events.register(b,
+this,this.listeners[b]);a=!0;0==this.previousStack.length&&this.initStack()}return a},initStack:function(){this.map.getCenter()&&this.listeners.moveend()},deactivate:function(){var a=!1;if(this.map&&OpenLayers.Control.prototype.deactivate.apply(this)){for(var b in this.listeners)this.map.events.unregister(b,this,this.listeners[b]);this.clearOnDeactivate&&this.clear();a=!0}return a},CLASS_NAME:"OpenLayers.Control.NavigationHistory"});OpenLayers.Layer.UTFGrid=OpenLayers.Class(OpenLayers.Layer.XYZ,{isBaseLayer:!1,projection:new OpenLayers.Projection("EPSG:900913"),useJSONP:!1,tileClass:OpenLayers.Tile.UTFGrid,initialize:function(a){OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a.name,a.url,{},a]);this.tileOptions=OpenLayers.Util.extend({utfgridResolution:this.utfgridResolution},this.tileOptions)},createBackBuffer:function(){},clone:function(a){null==a&&(a=new OpenLayers.Layer.UTFGrid(this.getOptions()));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,
+[a])},getFeatureInfo:function(a){var b=null;(a=this.getTileData(a))&&a.tile&&(b=a.tile.getFeatureInfo(a.i,a.j));return b},getFeatureId:function(a){var b=null;a=this.getTileData(a);a.tile&&(b=a.tile.getFeatureId(a.i,a.j));return b},CLASS_NAME:"OpenLayers.Layer.UTFGrid"});OpenLayers.TileManager=OpenLayers.Class({cacheSize:256,tilesPerFrame:2,frameDelay:16,moveDelay:100,zoomDelay:200,maps:null,tileQueueId:null,tileQueue:null,tileCache:null,tileCacheIndex:null,initialize:function(a){OpenLayers.Util.extend(this,a);this.maps=[];this.tileQueueId={};this.tileQueue={};this.tileCache={};this.tileCacheIndex=[]},addMap:function(a){if(!this._destroyed&&OpenLayers.Layer.Grid){this.maps.push(a);this.tileQueue[a.id]=[];for(var b=0,c=a.layers.length;b<c;++b)this.addLayer({layer:a.layers[b]});
+a.events.on({move:this.move,zoomend:this.zoomEnd,changelayer:this.changeLayer,addlayer:this.addLayer,preremovelayer:this.removeLayer,scope:this})}},removeMap:function(a){if(!this._destroyed&&OpenLayers.Layer.Grid){window.clearTimeout(this.tileQueueId[a.id]);if(a.layers)for(var b=0,c=a.layers.length;b<c;++b)this.removeLayer({layer:a.layers[b]});a.events&&a.events.un({move:this.move,zoomend:this.zoomEnd,changelayer:this.changeLayer,addlayer:this.addLayer,preremovelayer:this.removeLayer,scope:this});
+delete this.tileQueue[a.id];delete this.tileQueueId[a.id];OpenLayers.Util.removeItem(this.maps,a)}},move:function(a){this.updateTimeout(a.object,this.moveDelay,!0)},zoomEnd:function(a){this.updateTimeout(a.object,this.zoomDelay)},changeLayer:function(a){"visibility"!==a.property&&"params"!==a.property||this.updateTimeout(a.object,0)},addLayer:function(a){a=a.layer;if(a instanceof OpenLayers.Layer.Grid){a.events.on({addtile:this.addTile,retile:this.clearTileQueue,scope:this});var b,c,d;for(b=a.grid.length-
+1;0<=b;--b)for(c=a.grid[b].length-1;0<=c;--c)d=a.grid[b][c],this.addTile({tile:d}),d.url&&this.manageTileCache({object:d})}},removeLayer:function(a){a=a.layer;if(a instanceof OpenLayers.Layer.Grid&&(this.clearTileQueue({object:a}),a.events&&a.events.un({addtile:this.addTile,retile:this.clearTileQueue,scope:this}),a.grid)){var b,c,d;for(b=a.grid.length-1;0<=b;--b)for(c=a.grid[b].length-1;0<=c;--c)d=a.grid[b][c],this.unloadTile({object:d}),d.url&&this.manageTileCache({object:d})}},updateTimeout:function(a,
+b,c){window.clearTimeout(this.tileQueueId[a.id]);var d=this.tileQueue[a.id];if(!c||d.length)this.tileQueueId[a.id]=window.setTimeout(OpenLayers.Function.bind(function(){this.drawTilesFromQueue(a);d.length&&this.updateTimeout(a,this.frameDelay)},this),b)},addTile:function(a){a.tile.events.on({beforedraw:this.queueTileDraw,beforeload:this.manageTileCache,loadend:this.addToCache,unload:this.unloadTile,scope:this})},unloadTile:function(a){a=a.object;a.events.un({beforedraw:this.queueTileDraw,beforeload:this.manageTileCache,
+loadend:this.addToCache,unload:this.unloadTile,scope:this});OpenLayers.Util.removeItem(this.tileQueue[a.layer.map.id],a)},queueTileDraw:function(a){a=a.object;var b=!1,c=a.layer,d=c.getURL(a.bounds),e=this.tileCache[d];e&&"olTileImage"!==e.className&&(delete this.tileCache[d],OpenLayers.Util.removeItem(this.tileCacheIndex,d),e=null);!c.url||!c.async&&e||(b=this.tileQueue[c.map.id],~OpenLayers.Util.indexOf(b,a)||b.push(a),b=!0);return!b},drawTilesFromQueue:function(a){var b=this.tileQueue[a.id],c=
+this.tilesPerFrame;for(a=a.zoomTween&&a.zoomTween.playing;!a&&b.length&&c;)b.shift().draw(!0),--c},manageTileCache:function(a){a=a.object;var b=this.tileCache[a.url];if(b&&(!b.parentNode||OpenLayers.Element.hasClass(b.parentNode,"olBackBuffer"))){if(a.layer.backBuffer){if(a.layer.backBuffer===b.parentNode)return;b.style.opacity=0;b.style.visibility="hidden"}b.id=null;a.setImage(b);OpenLayers.Util.removeItem(this.tileCacheIndex,a.url);this.tileCacheIndex.push(a.url)}},addToCache:function(a){a=a.object;
+this.tileCache[a.url]||OpenLayers.Element.hasClass(a.imgDiv,"olImageLoadError")||(this.tileCacheIndex.length>=this.cacheSize&&(delete this.tileCache[this.tileCacheIndex[0]],this.tileCacheIndex.shift()),this.tileCache[a.url]=a.imgDiv,this.tileCacheIndex.push(a.url))},clearTileQueue:function(a){a=a.object;for(var b=this.tileQueue[a.map.id],c=b.length-1;0<=c;--c)b[c].layer===a&&b.splice(c,1)},destroy:function(){for(var a=this.maps.length-1;0<=a;--a)this.removeMap(this.maps[a]);this.tileCacheIndex=this.tileCache=
+this.tileQueueId=this.tileQueue=this.maps=null;this._destroyed=!0}});OpenLayers.Layer.ArcGISCache=OpenLayers.Class(OpenLayers.Layer.XYZ,{url:null,tileOrigin:null,tileSize:new OpenLayers.Size(256,256),useArcGISServer:!0,type:"png",useScales:!1,overrideDPI:!1,initialize:function(a,b,c){OpenLayers.Layer.XYZ.prototype.initialize.apply(this,arguments);this.resolutions&&(this.serverResolutions=this.resolutions,this.maxExtent=this.getMaxExtentForResolution(this.resolutions[0]));if(this.layerInfo){var d=this.layerInfo,e=new OpenLayers.Bounds(d.fullExtent.xmin,d.fullExtent.ymin,
+d.fullExtent.xmax,d.fullExtent.ymax);this.projection="EPSG:"+d.spatialReference.wkid;this.sphericalMercator=102100==d.spatialReference.wkid;this.units="esriFeet"==d.units?"ft":"m";if(d.tileInfo){this.tileSize=new OpenLayers.Size(d.tileInfo.width||d.tileInfo.cols,d.tileInfo.height||d.tileInfo.rows);this.tileOrigin=new OpenLayers.LonLat(d.tileInfo.origin.x,d.tileInfo.origin.y);var f=new OpenLayers.Geometry.Point(e.left,e.top),e=new OpenLayers.Geometry.Point(e.right,e.bottom);this.useScales?this.scales=
+[]:this.resolutions=[];this.lods=[];for(var g in d.tileInfo.lods)if(d.tileInfo.lods.hasOwnProperty(g)){var h=d.tileInfo.lods[g];this.useScales?this.scales.push(h.scale):this.resolutions.push(h.resolution);var k=this.getContainingTileCoords(f,h.resolution);h.startTileCol=k.x;h.startTileRow=k.y;k=this.getContainingTileCoords(e,h.resolution);h.endTileCol=k.x;h.endTileRow=k.y;this.lods.push(h)}this.maxExtent=this.calculateMaxExtentWithLOD(this.lods[0]);this.serverResolutions=this.resolutions;this.overrideDPI&&
+d.tileInfo.dpi&&(OpenLayers.DOTS_PER_INCH=d.tileInfo.dpi)}}},getContainingTileCoords:function(a,b){return new OpenLayers.Pixel(Math.max(Math.floor((a.x-this.tileOrigin.lon)/(this.tileSize.w*b)),0),Math.max(Math.floor((this.tileOrigin.lat-a.y)/(this.tileSize.h*b)),0))},calculateMaxExtentWithLOD:function(a){var b=this.tileOrigin.lon+a.startTileCol*this.tileSize.w*a.resolution,c=this.tileOrigin.lat-a.startTileRow*this.tileSize.h*a.resolution;return new OpenLayers.Bounds(b,c-(a.endTileRow-a.startTileRow+
+1)*this.tileSize.h*a.resolution,b+(a.endTileCol-a.startTileCol+1)*this.tileSize.w*a.resolution,c)},calculateMaxExtentWithExtent:function(a,b){var c=new OpenLayers.Geometry.Point(a.left,a.top),d=new OpenLayers.Geometry.Point(a.right,a.bottom),c=this.getContainingTileCoords(c,b),d=this.getContainingTileCoords(d,b);return this.calculateMaxExtentWithLOD({resolution:b,startTileCol:c.x,startTileRow:c.y,endTileCol:d.x,endTileRow:d.y})},getUpperLeftTileCoord:function(a){var b=new OpenLayers.Geometry.Point(this.maxExtent.left,
+this.maxExtent.top);return this.getContainingTileCoords(b,a)},getLowerRightTileCoord:function(a){var b=new OpenLayers.Geometry.Point(this.maxExtent.right,this.maxExtent.bottom);return this.getContainingTileCoords(b,a)},getMaxExtentForResolution:function(a){var b=this.getUpperLeftTileCoord(a),c=this.getLowerRightTileCoord(a),d=this.tileOrigin.lon+b.x*this.tileSize.w*a,e=this.tileOrigin.lat-b.y*this.tileSize.h*a;return new OpenLayers.Bounds(d,e-(c.y-b.y+1)*this.tileSize.h*a,d+(c.x-b.x+1)*this.tileSize.w*
+a,e)},clone:function(a){null==a&&(a=new OpenLayers.Layer.ArcGISCache(this.name,this.url,this.options));return OpenLayers.Layer.XYZ.prototype.clone.apply(this,[a])},initGriddedTiles:function(a){delete this._tileOrigin;OpenLayers.Layer.XYZ.prototype.initGriddedTiles.apply(this,arguments)},getMaxExtent:function(){var a=this.map.getResolution();return this.maxExtent=this.getMaxExtentForResolution(a)},getTileOrigin:function(){if(!this._tileOrigin){var a=this.getMaxExtent();this._tileOrigin=new OpenLayers.LonLat(a.left,
+a.bottom)}return this._tileOrigin},getURL:function(a){var b=this.getResolution(),c=this.tileOrigin.lon+b*this.tileSize.w/2,d=this.tileOrigin.lat-b*this.tileSize.h/2;a=a.getCenterLonLat();c=Math.round(Math.abs((a.lon-c)/(b*this.tileSize.w)));d=Math.round(Math.abs((d-a.lat)/(b*this.tileSize.h)));a=this.map.getZoom();if(this.lods){if(b=this.lods[this.map.getZoom()],c<b.startTileCol||c>b.endTileCol||d<b.startTileRow||d>b.endTileRow)return null}else{var e=this.getUpperLeftTileCoord(b),b=this.getLowerRightTileCoord(b);
+if(c<e.x||c>=b.x||d<e.y||d>=b.y)return null}b=this.url;e=""+c+d+a;OpenLayers.Util.isArray(b)&&(b=this.selectUrl(e,b));this.useArcGISServer?b+="/tile/${z}/${y}/${x}":(c="C"+OpenLayers.Number.zeroPad(c,8,16),d="R"+OpenLayers.Number.zeroPad(d,8,16),a="L"+OpenLayers.Number.zeroPad(a,2,10),b=b+"/${z}/${y}/${x}."+this.type);b=OpenLayers.String.format(b,{x:c,y:d,z:a});return OpenLayers.Util.urlAppend(b,OpenLayers.Util.getParameterString(this.params))},CLASS_NAME:"OpenLayers.Layer.ArcGISCache"});OpenLayers.Control.WMSGetFeatureInfo=OpenLayers.Class(OpenLayers.Control,{hover:!1,drillDown:!1,maxFeatures:10,clickCallback:"click",output:"features",layers:null,queryVisible:!1,url:null,layerUrls:null,infoFormat:"text/html",vendorParams:{},format:null,formatOptions:null,handler:null,hoverRequest:null,initialize:function(a){a=a||{};a.handlerOptions=a.handlerOptions||{};OpenLayers.Control.prototype.initialize.apply(this,[a]);this.format||(this.format=new OpenLayers.Format.WMSGetFeatureInfo(a.formatOptions));
+!0===this.drillDown&&(this.hover=!1);this.hover?this.handler=new OpenLayers.Handler.Hover(this,{move:this.cancelHover,pause:this.getInfoForHover},OpenLayers.Util.extend(this.handlerOptions.hover||{},{delay:250})):(a={},a[this.clickCallback]=this.getInfoForClick,this.handler=new OpenLayers.Handler.Click(this,a,this.handlerOptions.click||{}))},getInfoForClick:function(a){this.events.triggerEvent("beforegetfeatureinfo",{xy:a.xy});OpenLayers.Element.addClass(this.map.viewPortDiv,"olCursorWait");this.request(a.xy,
+{})},getInfoForHover:function(a){this.events.triggerEvent("beforegetfeatureinfo",{xy:a.xy});this.request(a.xy,{hover:!0})},cancelHover:function(){this.hoverRequest&&(this.hoverRequest.abort(),this.hoverRequest=null)},findLayers:function(){for(var a=this.layers||this.map.layers,b=[],c,d,e=a.length-1;0<=e;--e)c=a[e],c instanceof OpenLayers.Layer.WMS&&(!this.queryVisible||c.getVisibility())&&(d=OpenLayers.Util.isArray(c.url)?c.url[0]:c.url,!1!==this.drillDown||this.url||(this.url=d),(!0===this.drillDown||
+this.urlMatches(d))&&b.push(c));return b},urlMatches:function(a){var b=OpenLayers.Util.isEquivalentUrl(this.url,a);if(!b&&this.layerUrls)for(var c=0,d=this.layerUrls.length;c<d;++c)if(OpenLayers.Util.isEquivalentUrl(this.layerUrls[c],a)){b=!0;break}return b},buildWMSOptions:function(a,b,c,d){for(var e=[],f=[],g=0,h=b.length;g<h;g++)null!=b[g].params.LAYERS&&(e=e.concat(b[g].params.LAYERS),f=f.concat(this.getStyleNames(b[g])));b=b[0];g=this.map.getProjection();(h=b.projection)&&h.equals(this.map.getProjectionObject())&&
+(g=h.getCode());d=OpenLayers.Util.extend({service:"WMS",version:b.params.VERSION,request:"GetFeatureInfo",exceptions:b.params.EXCEPTIONS,bbox:this.map.getExtent().toBBOX(null,b.reverseAxisOrder()),feature_count:this.maxFeatures,height:this.map.getSize().h,width:this.map.getSize().w,format:d,info_format:b.params.INFO_FORMAT||this.infoFormat},1.3<=parseFloat(b.params.VERSION)?{crs:g,i:parseInt(c.x),j:parseInt(c.y)}:{srs:g,x:parseInt(c.x),y:parseInt(c.y)});0!=e.length&&(d=OpenLayers.Util.extend({layers:e,
+query_layers:e,styles:f},d));OpenLayers.Util.applyDefaults(d,this.vendorParams);return{url:a,params:OpenLayers.Util.upperCaseObject(d),callback:function(b){this.handleResponse(c,b,a)},scope:this}},getStyleNames:function(a){return a.params.STYLES?a.params.STYLES:OpenLayers.Util.isArray(a.params.LAYERS)?Array(a.params.LAYERS.length):a.params.LAYERS.replace(/[^,]/g,"")},request:function(a,b){var c=this.findLayers();if(0==c.length)this.events.triggerEvent("nogetfeatureinfo"),OpenLayers.Element.removeClass(this.map.viewPortDiv,
+"olCursorWait");else if(b=b||{},!1===this.drillDown){var c=this.buildWMSOptions(this.url,c,a,c[0].params.FORMAT),d=OpenLayers.Request.GET(c);!0===b.hover&&(this.hoverRequest=d)}else{this._numRequests=this._requestCount=0;this.features=[];for(var d={},e,f=0,g=c.length;f<g;f++){var h=c[f];e=OpenLayers.Util.isArray(h.url)?h.url[0]:h.url;e in d?d[e].push(h):(this._numRequests++,d[e]=[h])}for(e in d)c=d[e],c=this.buildWMSOptions(e,c,a,c[0].params.FORMAT),OpenLayers.Request.GET(c)}},triggerGetFeatureInfo:function(a,
+b,c){this.events.triggerEvent("getfeatureinfo",{text:a.responseText,features:c,request:a,xy:b});OpenLayers.Element.removeClass(this.map.viewPortDiv,"olCursorWait")},handleResponse:function(a,b,c){var d=b.responseXML;d&&d.documentElement||(d=b.responseText);d=this.format.read(d);!1===this.drillDown?this.triggerGetFeatureInfo(b,a,d):(this._requestCount++,this._features="object"===this.output?(this._features||[]).concat({url:c,features:d}):(this._features||[]).concat(d),this._requestCount===this._numRequests&&
+(this.triggerGetFeatureInfo(b,a,this._features.concat()),delete this._features,delete this._requestCount,delete this._numRequests))},CLASS_NAME:"OpenLayers.Control.WMSGetFeatureInfo"});OpenLayers.Format.WMSCapabilities.v1_3_0=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_3,{version:"1.3.0",CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_3_0"});OpenLayers.Format.SOSGetFeatureOfInterest=OpenLayers.Class(OpenLayers.Format.XML,{VERSION:"1.0.0",namespaces:{sos:"http://www.opengis.net/sos/1.0",gml:"http://www.opengis.net/gml",sa:"http://www.opengis.net/sampling/1.0",xsi:"http://www.w3.org/2001/XMLSchema-instance"},schemaLocation:"http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosAll.xsd",defaultPrefix:"sos",regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},read:function(a){"string"==
+typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={features:[]};this.readNode(a,b);a=[];for(var c=0,d=b.features.length;c<d;c++){var e=b.features[c];this.internalProjection&&(this.externalProjection&&e.components[0])&&e.components[0].transform(this.externalProjection,this.internalProjection);e=new OpenLayers.Feature.Vector(e.components[0],e.attributes);a.push(e)}return a},readers:{sa:{SamplingPoint:function(a,b){if(!b.attributes){var c=
+{attributes:{}};b.features.push(c);b=c}b.attributes.id=this.getAttributeNS(a,this.namespaces.gml,"id");this.readChildNodes(a,b)},position:function(a,b){this.readChildNodes(a,b)}},gml:OpenLayers.Util.applyDefaults({FeatureCollection:function(a,b){this.readChildNodes(a,b)},featureMember:function(a,b){var c={attributes:{}};b.features.push(c);this.readChildNodes(a,c)},name:function(a,b){b.attributes.name=this.getChildValue(a)},pos:function(a,b){this.externalProjection||(this.externalProjection=new OpenLayers.Projection(a.getAttribute("srsName")));
+OpenLayers.Format.GML.v3.prototype.readers.gml.pos.apply(this,[a,b])}},OpenLayers.Format.GML.v3.prototype.readers.gml)},writers:{sos:{GetFeatureOfInterest:function(a){for(var b=this.createElementNSPlus("GetFeatureOfInterest",{attributes:{version:this.VERSION,service:"SOS","xsi:schemaLocation":this.schemaLocation}}),c=0,d=a.fois.length;c<d;c++)this.writeNode("FeatureOfInterestId",{foi:a.fois[c]},b);return b},FeatureOfInterestId:function(a){return this.createElementNSPlus("FeatureOfInterestId",{value:a.foi})}}},
+CLASS_NAME:"OpenLayers.Format.SOSGetFeatureOfInterest"});OpenLayers.Format.SOSGetObservation=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{ows:"http://www.opengis.net/ows",gml:"http://www.opengis.net/gml",sos:"http://www.opengis.net/sos/1.0",ogc:"http://www.opengis.net/ogc",om:"http://www.opengis.net/om/1.0",sa:"http://www.opengis.net/sampling/1.0",xlink:"http://www.w3.org/1999/xlink",xsi:"http://www.w3.org/2001/XMLSchema-instance"},regExes:{trimSpace:/^\s*|\s*$/g,removeSpace:/\s*/g,splitSpace:/\s+/,trimComma:/\s*,\s*/g},VERSION:"1.0.0",schemaLocation:"http://www.opengis.net/sos/1.0 http://schemas.opengis.net/sos/1.0.0/sosGetObservation.xsd",
+defaultPrefix:"sos",read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={measurements:[],observations:[]};this.readNode(a,b);return b},write:function(a){a=this.writeNode("sos:GetObservation",a);a.setAttribute("xmlns:om",this.namespaces.om);a.setAttribute("xmlns:ogc",this.namespaces.ogc);this.setAttributeNS(a,this.namespaces.xsi,"xsi:schemaLocation",this.schemaLocation);return OpenLayers.Format.XML.prototype.write.apply(this,
+[a])},readers:{om:{ObservationCollection:function(a,b){b.id=this.getAttributeNS(a,this.namespaces.gml,"id");this.readChildNodes(a,b)},member:function(a,b){this.readChildNodes(a,b)},Measurement:function(a,b){var c={};b.measurements.push(c);this.readChildNodes(a,c)},Observation:function(a,b){var c={};b.observations.push(c);this.readChildNodes(a,c)},samplingTime:function(a,b){var c={};b.samplingTime=c;this.readChildNodes(a,c)},observedProperty:function(a,b){b.observedProperty=this.getAttributeNS(a,this.namespaces.xlink,
+"href");this.readChildNodes(a,b)},procedure:function(a,b){b.procedure=this.getAttributeNS(a,this.namespaces.xlink,"href");this.readChildNodes(a,b)},featureOfInterest:function(a,b){var c={features:[]};b.fois=[];b.fois.push(c);this.readChildNodes(a,c);for(var d=[],e=0,f=c.features.length;e<f;e++){var g=c.features[e];d.push(new OpenLayers.Feature.Vector(g.components[0],g.attributes))}c.features=d},result:function(a,b){var c={};b.result=c;""!==this.getChildValue(a)?(c.value=this.getChildValue(a),c.uom=
+a.getAttribute("uom")):this.readChildNodes(a,c)}},sa:OpenLayers.Format.SOSGetFeatureOfInterest.prototype.readers.sa,gml:OpenLayers.Util.applyDefaults({TimeInstant:function(a,b){var c={};b.timeInstant=c;this.readChildNodes(a,c)},timePosition:function(a,b){b.timePosition=this.getChildValue(a)}},OpenLayers.Format.SOSGetFeatureOfInterest.prototype.readers.gml)},writers:{sos:{GetObservation:function(a){var b=this.createElementNSPlus("GetObservation",{attributes:{version:this.VERSION,service:"SOS"}});this.writeNode("offering",
+a,b);a.eventTime&&this.writeNode("eventTime",a,b);for(var c in a.procedures)this.writeNode("procedure",a.procedures[c],b);for(var d in a.observedProperties)this.writeNode("observedProperty",a.observedProperties[d],b);a.foi&&this.writeNode("featureOfInterest",a.foi,b);this.writeNode("responseFormat",a,b);a.resultModel&&this.writeNode("resultModel",a,b);a.responseMode&&this.writeNode("responseMode",a,b);return b},featureOfInterest:function(a){var b=this.createElementNSPlus("featureOfInterest");this.writeNode("ObjectID",
+a.objectId,b);return b},ObjectID:function(a){return this.createElementNSPlus("ObjectID",{value:a})},responseFormat:function(a){return this.createElementNSPlus("responseFormat",{value:a.responseFormat})},procedure:function(a){return this.createElementNSPlus("procedure",{value:a})},offering:function(a){return this.createElementNSPlus("offering",{value:a.offering})},observedProperty:function(a){return this.createElementNSPlus("observedProperty",{value:a})},eventTime:function(a){var b=this.createElementNSPlus("eventTime");
+"latest"===a.eventTime&&this.writeNode("ogc:TM_Equals",a,b);return b},resultModel:function(a){return this.createElementNSPlus("resultModel",{value:a.resultModel})},responseMode:function(a){return this.createElementNSPlus("responseMode",{value:a.responseMode})}},ogc:{TM_Equals:function(a){var b=this.createElementNSPlus("ogc:TM_Equals");this.writeNode("ogc:PropertyName",{property:"urn:ogc:data:time:iso8601"},b);"latest"===a.eventTime&&this.writeNode("gml:TimeInstant",{value:"latest"},b);return b},PropertyName:function(a){return this.createElementNSPlus("ogc:PropertyName",
+{value:a.property})}},gml:{TimeInstant:function(a){var b=this.createElementNSPlus("gml:TimeInstant");this.writeNode("gml:timePosition",a,b);return b},timePosition:function(a){return this.createElementNSPlus("gml:timePosition",{value:a.value})}}},CLASS_NAME:"OpenLayers.Format.SOSGetObservation"});OpenLayers.Control.UTFGrid=OpenLayers.Class(OpenLayers.Control,{autoActivate:!0,layers:null,defaultHandlerOptions:{delay:300,pixelTolerance:4,stopMove:!1,single:!0,"double":!1,stopSingle:!1,stopDouble:!1},handlerMode:"click",setHandler:function(a){this.handlerMode=a;this.resetHandler()},resetHandler:function(){this.handler&&(this.handler.deactivate(),this.handler.destroy(),this.handler=null);"hover"==this.handlerMode?this.handler=new OpenLayers.Handler.Hover(this,{pause:this.handleEvent,move:this.reset},
+this.handlerOptions):"click"==this.handlerMode?this.handler=new OpenLayers.Handler.Click(this,{click:this.handleEvent},this.handlerOptions):"move"==this.handlerMode&&(this.handler=new OpenLayers.Handler.Hover(this,{pause:this.handleEvent,move:this.handleEvent},this.handlerOptions));return this.handler?!0:!1},initialize:function(a){a=a||{};a.handlerOptions=a.handlerOptions||this.defaultHandlerOptions;OpenLayers.Control.prototype.initialize.apply(this,[a]);this.resetHandler()},handleEvent:function(a){if(null==
+a)this.reset();else{var b=this.map.getLonLatFromPixel(a.xy);if(b){var c=this.findLayers();if(0<c.length){for(var d={},e,f,g=0,h=c.length;g<h;g++)e=c[g],f=OpenLayers.Util.indexOf(this.map.layers,e),d[f]=e.getFeatureInfo(b);this.callback(d,b,a.xy)}}}},callback:function(a){},reset:function(a){this.callback(null)},findLayers:function(){for(var a=this.layers||this.map.layers,b=[],c,d=a.length-1;0<=d;--d)c=a[d],c instanceof OpenLayers.Layer.UTFGrid&&b.push(c);return b},CLASS_NAME:"OpenLayers.Control.UTFGrid"});OpenLayers.Format.CQL=function(){function a(a){function b(){var a=e.pop();switch(a.type){case "LOGICAL":var c=b(),g=b();return new OpenLayers.Filter.Logical({filters:[g,c],type:f[a.text.toUpperCase()]});case "NOT":return a=b(),new OpenLayers.Filter.Logical({filters:[a],type:OpenLayers.Filter.Logical.NOT});case "BETWEEN":return e.pop(),g=b(),a=b(),c=b(),new OpenLayers.Filter.Comparison({property:c,lowerBoundary:a,upperBoundary:g,type:OpenLayers.Filter.Comparison.BETWEEN});case "COMPARISON":return g=
+b(),c=b(),new OpenLayers.Filter.Comparison({property:c,value:g,type:d[a.text.toUpperCase()]});case "IS_NULL":return c=b(),new OpenLayers.Filter.Comparison({property:c,type:d[a.text.toUpperCase()]});case "VALUE":return(c=a.text.match(/^'(.*)'$/))?c[1].replace(/''/g,"'"):Number(a.text);case "SPATIAL":switch(a.text.toUpperCase()){case "BBOX":var a=b(),c=b(),g=b(),h=b(),k=b();return new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.BBOX,property:k,value:OpenLayers.Bounds.fromArray([h,g,c,
+a])});case "INTERSECTS":return g=b(),c=b(),new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.INTERSECTS,property:c,value:g});case "WITHIN":return g=b(),c=b(),new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.WITHIN,property:c,value:g});case "CONTAINS":return g=b(),c=b(),new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.CONTAINS,property:c,value:g});case "DWITHIN":return a=b(),g=b(),c=b(),new OpenLayers.Filter.Spatial({type:OpenLayers.Filter.Spatial.DWITHIN,value:g,
+property:c,distance:Number(a)})}case "GEOMETRY":return OpenLayers.Geometry.fromWKT(a.text);default:return a.text}}for(var c=[],e=[];a.length;){var g=a.shift();switch(g.type){case "PROPERTY":case "GEOMETRY":case "VALUE":e.push(g);break;case "COMPARISON":case "BETWEEN":case "IS_NULL":case "LOGICAL":for(var k=h[g.type];0<c.length&&h[c[c.length-1].type]<=k;)e.push(c.pop());c.push(g);break;case "SPATIAL":case "NOT":case "LPAREN":c.push(g);break;case "RPAREN":for(;0<c.length&&"LPAREN"!=c[c.length-1].type;)e.push(c.pop());
+c.pop();0<c.length&&"SPATIAL"==c[c.length-1].type&&e.push(c.pop());case "COMMA":case "END":break;default:throw Error("Unknown token type "+g.type);}}for(;0<c.length;)e.push(c.pop());a=b();if(0<e.length){a="Remaining tokens after building AST: \n";for(c=e.length-1;0<=c;c--)a+=e[c].type+": "+e[c].text+"\n";throw Error(a);}return a}var b={PROPERTY:/^[_a-zA-Z]\w*/,COMPARISON:/^(=|<>|<=|<|>=|>|LIKE)/i,IS_NULL:/^IS NULL/i,COMMA:/^,/,LOGICAL:/^(AND|OR)/i,VALUE:/^('([^']|'')*'|\d+(\.\d*)?|\.\d+)/,LPAREN:/^\(/,
+RPAREN:/^\)/,SPATIAL:/^(BBOX|INTERSECTS|DWITHIN|WITHIN|CONTAINS)/i,NOT:/^NOT/i,BETWEEN:/^BETWEEN/i,GEOMETRY:function(a){var b=/^(POINT|LINESTRING|POLYGON|MULTIPOINT|MULTILINESTRING|MULTIPOLYGON|GEOMETRYCOLLECTION)/.exec(a);if(b){var c=a.length,b=a.indexOf("(",b[0].length);if(-1<b)for(var d=1;b<c&&0<d;)switch(b++,a.charAt(b)){case "(":d++;break;case ")":d--}return[a.substr(0,b+1)]}},END:/^$/},c={LPAREN:["GEOMETRY","SPATIAL","PROPERTY","VALUE","LPAREN"],RPAREN:["NOT","LOGICAL","END","RPAREN"],PROPERTY:["COMPARISON",
+"BETWEEN","COMMA","IS_NULL"],BETWEEN:["VALUE"],IS_NULL:["END"],COMPARISON:["VALUE"],COMMA:["GEOMETRY","VALUE","PROPERTY"],VALUE:["LOGICAL","COMMA","RPAREN","END"],SPATIAL:["LPAREN"],LOGICAL:["NOT","VALUE","SPATIAL","PROPERTY","LPAREN"],NOT:["PROPERTY","LPAREN"],GEOMETRY:["COMMA","RPAREN"]},d={"=":OpenLayers.Filter.Comparison.EQUAL_TO,"<>":OpenLayers.Filter.Comparison.NOT_EQUAL_TO,"<":OpenLayers.Filter.Comparison.LESS_THAN,"<=":OpenLayers.Filter.Comparison.LESS_THAN_OR_EQUAL_TO,">":OpenLayers.Filter.Comparison.GREATER_THAN,
+">=":OpenLayers.Filter.Comparison.GREATER_THAN_OR_EQUAL_TO,LIKE:OpenLayers.Filter.Comparison.LIKE,BETWEEN:OpenLayers.Filter.Comparison.BETWEEN,"IS NULL":OpenLayers.Filter.Comparison.IS_NULL},e={},f={AND:OpenLayers.Filter.Logical.AND,OR:OpenLayers.Filter.Logical.OR},g={},h={RPAREN:3,LOGICAL:2,COMPARISON:1},k;for(k in d)d.hasOwnProperty(k)&&(e[d[k]]=k);for(k in f)f.hasOwnProperty(k)&&(g[f[k]]=k);return OpenLayers.Class(OpenLayers.Format,{read:function(d){var e=d;d=[];var f,g=["NOT","GEOMETRY","SPATIAL",
+"PROPERTY","LPAREN"];do{a:{f=g;for(var h=void 0,g=void 0,k=f.length,h=0;h<k;h++){var g=f[h],s=b[g]instanceof RegExp?b[g].exec(e):(0,b[g])(e);if(s){f=s[0];e=e.substr(f.length).replace(/^\s*/,"");f={type:g,text:f,remainder:e};break a}}d="ERROR: In parsing: ["+e+"], expected one of: ";for(h=0;h<k;h++)g=f[h],d+="\n    "+g+": "+b[g];throw Error(d);}e=f.remainder;g=c[f.type];if("END"!=f.type&&!g)throw Error("No follows list for "+f.type);d.push(f)}while("END"!=f.type);d=a(d);this.keepData&&(this.data=d);
+return d},write:function(a){if(a instanceof OpenLayers.Geometry)return a.toString();switch(a.CLASS_NAME){case "OpenLayers.Filter.Spatial":switch(a.type){case OpenLayers.Filter.Spatial.BBOX:return"BBOX("+a.property+","+a.value.toBBOX()+")";case OpenLayers.Filter.Spatial.DWITHIN:return"DWITHIN("+a.property+", "+this.write(a.value)+", "+a.distance+")";case OpenLayers.Filter.Spatial.WITHIN:return"WITHIN("+a.property+", "+this.write(a.value)+")";case OpenLayers.Filter.Spatial.INTERSECTS:return"INTERSECTS("+
+a.property+", "+this.write(a.value)+")";case OpenLayers.Filter.Spatial.CONTAINS:return"CONTAINS("+a.property+", "+this.write(a.value)+")";default:throw Error("Unknown spatial filter type: "+a.type);}case "OpenLayers.Filter.Logical":if(a.type==OpenLayers.Filter.Logical.NOT)return"NOT ("+this.write(a.filters[0])+")";for(var b="(",c=!0,d=0;d<a.filters.length;d++)c?c=!1:b+=") "+g[a.type]+" (",b+=this.write(a.filters[d]);return b+")";case "OpenLayers.Filter.Comparison":return a.type==OpenLayers.Filter.Comparison.BETWEEN?
+a.property+" BETWEEN "+this.write(a.lowerBoundary)+" AND "+this.write(a.upperBoundary):null!==a.value?a.property+" "+e[a.type]+" "+this.write(a.value):a.property+" "+e[a.type];case void 0:if("string"===typeof a)return"'"+a.replace(/'/g,"''")+"'";if("number"===typeof a)return String(a);default:throw Error("Can't encode: "+a.CLASS_NAME+" "+a);}},CLASS_NAME:"OpenLayers.Format.CQL"})}();OpenLayers.Control.Split=OpenLayers.Class(OpenLayers.Control,{layer:null,source:null,sourceOptions:null,tolerance:null,edge:!0,deferDelete:!1,mutual:!0,targetFilter:null,sourceFilter:null,handler:null,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,[a]);this.options=a||{};this.options.source&&this.setSource(this.options.source)},setSource:function(a){this.active?(this.deactivate(),this.handler&&(this.handler.destroy(),delete this.handler),this.source=a,this.activate()):this.source=
+a},activate:function(){var a=OpenLayers.Control.prototype.activate.call(this);if(a)if(!this.source)this.handler||(this.handler=new OpenLayers.Handler.Path(this,{done:function(a){this.onSketchComplete({feature:new OpenLayers.Feature.Vector(a)})}},{layerOptions:this.sourceOptions})),this.handler.activate();else if(this.source.events)this.source.events.on({sketchcomplete:this.onSketchComplete,afterfeaturemodified:this.afterFeatureModified,scope:this});return a},deactivate:function(){var a=OpenLayers.Control.prototype.deactivate.call(this);
+a&&this.source&&this.source.events&&this.source.events.un({sketchcomplete:this.onSketchComplete,afterfeaturemodified:this.afterFeatureModified,scope:this});return a},onSketchComplete:function(a){this.feature=null;return!this.considerSplit(a.feature)},afterFeatureModified:function(a){a.modified&&"function"===typeof a.feature.geometry.split&&(this.feature=a.feature,this.considerSplit(a.feature))},removeByGeometry:function(a,b){for(var c=0,d=a.length;c<d;++c)if(a[c].geometry===b){a.splice(c,1);break}},
+isEligible:function(a){return a.geometry?a.state!==OpenLayers.State.DELETE&&"function"===typeof a.geometry.split&&this.feature!==a&&(!this.targetFilter||this.targetFilter.evaluate(a.attributes)):!1},considerSplit:function(a){var b=!1,c=!1;if(!this.sourceFilter||this.sourceFilter.evaluate(a.attributes)){for(var d=this.layer&&this.layer.features||[],e,f,g=[],h=[],k=this.layer===this.source&&this.mutual,l={edge:this.edge,tolerance:this.tolerance,mutual:k},m=[a.geometry],n,p,q,r=0,s=d.length;r<s;++r)if(n=
+d[r],this.isEligible(n)){p=[n.geometry];for(var t=0;t<m.length;++t){q=m[t];for(var u=0;u<p.length;++u)if(e=p[u],q.getBounds().intersectsBounds(e.getBounds())&&(e=q.split(e,l)))f=this.events.triggerEvent("beforesplit",{source:a,target:n}),!1!==f&&(k&&(f=e[0],1<f.length&&(f.unshift(t,1),Array.prototype.splice.apply(m,f),t+=f.length-3),e=e[1]),1<e.length&&(e.unshift(u,1),Array.prototype.splice.apply(p,e),u+=e.length-3))}p&&1<p.length&&(this.geomsToFeatures(n,p),this.events.triggerEvent("split",{original:n,
+features:p}),Array.prototype.push.apply(g,p),h.push(n),c=!0)}m&&1<m.length&&(this.geomsToFeatures(a,m),this.events.triggerEvent("split",{original:a,features:m}),Array.prototype.push.apply(g,m),h.push(a),b=!0);if(b||c){if(this.deferDelete){d=[];r=0;for(s=h.length;r<s;++r)c=h[r],c.state===OpenLayers.State.INSERT?d.push(c):(c.state=OpenLayers.State.DELETE,this.layer.drawFeature(c));this.layer.destroyFeatures(d,{silent:!0});r=0;for(s=g.length;r<s;++r)g[r].state=OpenLayers.State.INSERT}else this.layer.destroyFeatures(h,
+{silent:!0});this.layer.addFeatures(g,{silent:!0});this.events.triggerEvent("aftersplit",{source:a,features:g})}}return b},geomsToFeatures:function(a,b){var c=a.clone();delete c.geometry;for(var d,e=0,f=b.length;e<f;++e)d=c.clone(),d.geometry=b[e],d.state=OpenLayers.State.INSERT,b[e]=d},destroy:function(){this.active&&this.deactivate();OpenLayers.Control.prototype.destroy.call(this)},CLASS_NAME:"OpenLayers.Control.Split"});OpenLayers.Layer.WMTS=OpenLayers.Class(OpenLayers.Layer.Grid,{isBaseLayer:!0,version:"1.0.0",requestEncoding:"KVP",url:null,layer:null,matrixSet:null,style:null,format:"image/jpeg",tileOrigin:null,tileFullExtent:null,formatSuffix:null,matrixIds:null,dimensions:null,params:null,zoomOffset:0,serverResolutions:null,formatSuffixMap:{"image/png":"png","image/png8":"png","image/png24":"png","image/png32":"png",png:"png","image/jpeg":"jpg","image/jpg":"jpg",jpeg:"jpg",jpg:"jpg"},matrix:null,initialize:function(a){var b=
+{url:!0,layer:!0,style:!0,matrixSet:!0},c;for(c in b)if(!(c in a))throw Error("Missing property '"+c+"' in layer configuration.");a.params=OpenLayers.Util.upperCaseObject(a.params);OpenLayers.Layer.Grid.prototype.initialize.apply(this,[a.name,a.url,a.params,a]);this.formatSuffix||(this.formatSuffix=this.formatSuffixMap[this.format]||this.format.split("/").pop());if(this.matrixIds&&(a=this.matrixIds.length)&&"string"===typeof this.matrixIds[0])for(b=this.matrixIds,this.matrixIds=Array(a),c=0;c<a;++c)this.matrixIds[c]=
+{identifier:b[c]}},setMap:function(){OpenLayers.Layer.Grid.prototype.setMap.apply(this,arguments)},updateMatrixProperties:function(){if(this.matrix=this.getMatrix())this.matrix.topLeftCorner&&(this.tileOrigin=this.matrix.topLeftCorner),this.matrix.tileWidth&&this.matrix.tileHeight&&(this.tileSize=new OpenLayers.Size(this.matrix.tileWidth,this.matrix.tileHeight)),this.tileOrigin||(this.tileOrigin=new OpenLayers.LonLat(this.maxExtent.left,this.maxExtent.top)),this.tileFullExtent||(this.tileFullExtent=
+this.maxExtent)},moveTo:function(a,b,c){!b&&this.matrix||this.updateMatrixProperties();return OpenLayers.Layer.Grid.prototype.moveTo.apply(this,arguments)},clone:function(a){null==a&&(a=new OpenLayers.Layer.WMTS(this.options));return a=OpenLayers.Layer.Grid.prototype.clone.apply(this,[a])},getIdentifier:function(){return this.getServerZoom()},getMatrix:function(){var a;if(this.matrixIds&&0!==this.matrixIds.length)if("scaleDenominator"in this.matrixIds[0])for(var b=OpenLayers.METERS_PER_INCH*OpenLayers.INCHES_PER_UNIT[this.units]*
+this.getServerResolution()/2.8E-4,c=Number.POSITIVE_INFINITY,d,e=0,f=this.matrixIds.length;e<f;++e)d=Math.abs(1-this.matrixIds[e].scaleDenominator/b),d<c&&(c=d,a=this.matrixIds[e]);else a=this.matrixIds[this.getIdentifier()];else a={identifier:this.getIdentifier()};return a},getTileInfo:function(a){var b=this.getServerResolution(),c=(a.lon-this.tileOrigin.lon)/(b*this.tileSize.w);a=(this.tileOrigin.lat-a.lat)/(b*this.tileSize.h);var b=Math.floor(c),d=Math.floor(a);return{col:b,row:d,i:Math.floor((c-
+b)*this.tileSize.w),j:Math.floor((a-d)*this.tileSize.h)}},getURL:function(a){a=this.adjustBounds(a);var b="";if(!this.tileFullExtent||this.tileFullExtent.intersectsBounds(a)){a=a.getCenterLonLat();var c=this.getTileInfo(a);a=this.dimensions;var d,b=OpenLayers.Util.isArray(this.url)?this.selectUrl([this.version,this.style,this.matrixSet,this.matrix.identifier,c.row,c.col].join(),this.url):this.url;if("REST"===this.requestEncoding.toUpperCase())if(d=this.params,-1!==b.indexOf("{")){b=b.replace(/\{/g,
+"${");c={style:this.style,Style:this.style,TileMatrixSet:this.matrixSet,TileMatrix:this.matrix.identifier,TileRow:c.row,TileCol:c.col};if(a){var e,f;for(f=a.length-1;0<=f;--f)e=a[f],c[e]=d[e.toUpperCase()]}b=OpenLayers.String.format(b,c)}else{e=this.version+"/"+this.layer+"/"+this.style+"/";if(a)for(f=0;f<a.length;f++)d[a[f]]&&(e=e+d[a[f]]+"/");e=e+this.matrixSet+"/"+this.matrix.identifier+"/"+c.row+"/"+c.col+"."+this.formatSuffix;b.match(/\/$/)||(b+="/");b+=e}else"KVP"===this.requestEncoding.toUpperCase()&&
+(d={SERVICE:"WMTS",REQUEST:"GetTile",VERSION:this.version,LAYER:this.layer,STYLE:this.style,TILEMATRIXSET:this.matrixSet,TILEMATRIX:this.matrix.identifier,TILEROW:c.row,TILECOL:c.col,FORMAT:this.format},b=OpenLayers.Layer.Grid.prototype.getFullRequestString.apply(this,[d]))}return b},mergeNewParams:function(a){if("KVP"===this.requestEncoding.toUpperCase())return OpenLayers.Layer.Grid.prototype.mergeNewParams.apply(this,[OpenLayers.Util.upperCaseObject(a)])},CLASS_NAME:"OpenLayers.Layer.WMTS"});OpenLayers.Protocol.SOS.v1_0_0=OpenLayers.Class(OpenLayers.Protocol,{fois:null,formatOptions:null,initialize:function(a){OpenLayers.Protocol.prototype.initialize.apply(this,[a]);a.format||(this.format=new OpenLayers.Format.SOSGetFeatureOfInterest(this.formatOptions))},destroy:function(){this.options&&!this.options.format&&this.format.destroy();this.format=null;OpenLayers.Protocol.prototype.destroy.apply(this)},read:function(a){a=OpenLayers.Util.extend({},a);OpenLayers.Util.applyDefaults(a,this.options||
+{});var b=new OpenLayers.Protocol.Response({requestType:"read"}),c=this.format,c=OpenLayers.Format.XML.prototype.write.apply(c,[c.writeNode("sos:GetFeatureOfInterest",{fois:this.fois})]);b.priv=OpenLayers.Request.POST({url:a.url,callback:this.createCallback(this.handleRead,b,a),data:c});return b},handleRead:function(a,b){if(b.callback){var c=a.priv;200<=c.status&&300>c.status?(a.features=this.parseFeatures(c),a.code=OpenLayers.Protocol.Response.SUCCESS):a.code=OpenLayers.Protocol.Response.FAILURE;
+b.callback.call(b.scope,a)}},parseFeatures:function(a){var b=a.responseXML;b&&b.documentElement||(b=a.responseText);return!b||0>=b.length?null:this.format.read(b)},CLASS_NAME:"OpenLayers.Protocol.SOS.v1_0_0"});OpenLayers.Layer.KaMapCache=OpenLayers.Class(OpenLayers.Layer.KaMap,{IMAGE_EXTENSIONS:{jpeg:"jpg",gif:"gif",png:"png",png8:"png",png24:"png",dithered:"png"},DEFAULT_FORMAT:"jpeg",initialize:function(a,b,c,d){OpenLayers.Layer.KaMap.prototype.initialize.apply(this,arguments);this.extension=this.IMAGE_EXTENSIONS[this.params.i.toLowerCase()||this.DEFAULT_FORMAT]},getURL:function(a){a=this.adjustBounds(a);var b=this.map.getResolution(),c=Math.round(1E4*this.map.getScale())/1E4,d=Math.round(a.left/b);a=
+-Math.round(a.top/b);var b=Math.floor(d/this.tileSize.w/this.params.metaTileSize.w)*this.tileSize.w*this.params.metaTileSize.w,e=Math.floor(a/this.tileSize.h/this.params.metaTileSize.h)*this.tileSize.h*this.params.metaTileSize.h,c=["/",this.params.map,"/",c,"/",this.params.g.replace(/\s/g,"_"),"/def/t",e,"/l",b,"/t",a,"l",d,".",this.extension],d=this.url;OpenLayers.Util.isArray(d)&&(d=this.selectUrl(c.join(""),d));return d+c.join("")},CLASS_NAME:"OpenLayers.Layer.KaMapCache"});OpenLayers.Protocol.WFS.v1_1_0=OpenLayers.Class(OpenLayers.Protocol.WFS.v1,{version:"1.1.0",initialize:function(a){OpenLayers.Protocol.WFS.v1.prototype.initialize.apply(this,arguments);this.outputFormat&&!this.readFormat&&("gml2"==this.outputFormat.toLowerCase()?this.readFormat=new OpenLayers.Format.GML.v2({featureType:this.featureType,featureNS:this.featureNS,geometryName:this.geometryName}):"json"==this.outputFormat.toLowerCase()&&(this.readFormat=new OpenLayers.Format.GeoJSON))},CLASS_NAME:"OpenLayers.Protocol.WFS.v1_1_0"});OpenLayers.Format.WMSCapabilities.v1_1_1=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1,{version:"1.1.1",readers:{wms:OpenLayers.Util.applyDefaults({SRS:function(a,b){b.srs[this.getChildValue(a)]=!0}},OpenLayers.Format.WMSCapabilities.v1_1.prototype.readers.wms)},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_1"});OpenLayers.Format.WMSCapabilities.v1_1_1_WMSC=OpenLayers.Class(OpenLayers.Format.WMSCapabilities.v1_1_1,{version:"1.1.1",profile:"WMSC",readers:{wms:OpenLayers.Util.applyDefaults({VendorSpecificCapabilities:function(a,b){b.vendorSpecific={tileSets:[]};this.readChildNodes(a,b.vendorSpecific)},TileSet:function(a,b){var c={srs:{},bbox:{},resolutions:[]};this.readChildNodes(a,c);b.tileSets.push(c)},Resolutions:function(a,b){for(var c=this.getChildValue(a).split(" "),d=0,e=c.length;d<e;d++)""!=c[d]&&b.resolutions.push(parseFloat(c[d]))},
+Width:function(a,b){b.width=parseInt(this.getChildValue(a))},Height:function(a,b){b.height=parseInt(this.getChildValue(a))},Layers:function(a,b){b.layers=this.getChildValue(a)},Styles:function(a,b){b.styles=this.getChildValue(a)}},OpenLayers.Format.WMSCapabilities.v1_1_1.prototype.readers.wms)},CLASS_NAME:"OpenLayers.Format.WMSCapabilities.v1_1_1_WMSC"});OpenLayers.Control.LayerSwitcher=OpenLayers.Class(OpenLayers.Control,{layerStates:null,layersDiv:null,baseLayersDiv:null,baseLayers:null,dataLbl:null,dataLayersDiv:null,dataLayers:null,minimizeDiv:null,maximizeDiv:null,ascending:!0,initialize:function(a){OpenLayers.Control.prototype.initialize.apply(this,arguments);this.layerStates=[]},destroy:function(){this.clearLayersArray("base");this.clearLayersArray("data");this.map.events.un({buttonclick:this.onButtonClick,addlayer:this.redraw,changelayer:this.redraw,
+removelayer:this.redraw,changebaselayer:this.redraw,scope:this});this.events.unregister("buttonclick",this,this.onButtonClick);OpenLayers.Control.prototype.destroy.apply(this,arguments)},setMap:function(a){OpenLayers.Control.prototype.setMap.apply(this,arguments);this.map.events.on({addlayer:this.redraw,changelayer:this.redraw,removelayer:this.redraw,changebaselayer:this.redraw,scope:this});this.outsideViewport?(this.events.attachToElement(this.div),this.events.register("buttonclick",this,this.onButtonClick)):
+this.map.events.register("buttonclick",this,this.onButtonClick)},draw:function(){OpenLayers.Control.prototype.draw.apply(this);this.loadContents();this.outsideViewport||this.minimizeControl();this.redraw();return this.div},onButtonClick:function(a){a=a.buttonElement;a===this.minimizeDiv?this.minimizeControl():a===this.maximizeDiv?this.maximizeControl():a._layerSwitcher===this.id&&(a["for"]&&(a=document.getElementById(a["for"])),a.disabled||("radio"==a.type?(a.checked=!0,this.map.setBaseLayer(this.map.getLayer(a._layer))):
+(a.checked=!a.checked,this.updateMap())))},clearLayersArray:function(a){this[a+"LayersDiv"].innerHTML="";this[a+"Layers"]=[]},checkRedraw:function(){if(!this.layerStates.length||this.map.layers.length!=this.layerStates.length)return!0;for(var a=0,b=this.layerStates.length;a<b;a++){var c=this.layerStates[a],d=this.map.layers[a];if(c.name!=d.name||c.inRange!=d.inRange||c.id!=d.id||c.visibility!=d.visibility)return!0}return!1},redraw:function(){if(!this.checkRedraw())return this.div;this.clearLayersArray("base");
+this.clearLayersArray("data");var a=!1,b=!1,c=this.map.layers.length;this.layerStates=Array(c);for(var d=0;d<c;d++){var e=this.map.layers[d];this.layerStates[d]={name:e.name,visibility:e.visibility,inRange:e.inRange,id:e.id}}var f=this.map.layers.slice();this.ascending||f.reverse();d=0;for(c=f.length;d<c;d++){var e=f[d],g=e.isBaseLayer;if(e.displayInLayerSwitcher){g?b=!0:a=!0;var h=g?e==this.map.baseLayer:e.getVisibility(),k=document.createElement("input"),l=OpenLayers.Util.createUniqueID(this.id+
+"_input_");k.id=l;k.name=g?this.id+"_baseLayers":e.name;k.type=g?"radio":"checkbox";k.value=e.name;k.checked=h;k.defaultChecked=h;k.className="olButton";k._layer=e.id;k._layerSwitcher=this.id;g||e.inRange||(k.disabled=!0);h=document.createElement("label");h["for"]=k.id;OpenLayers.Element.addClass(h,"labelSpan olButton");h._layer=e.id;h._layerSwitcher=this.id;g||e.inRange||(h.style.color="gray");h.innerHTML=e.name;h.style.verticalAlign=g?"bottom":"baseline";l=document.createElement("br");(g?this.baseLayers:
+this.dataLayers).push({layer:e,inputElem:k,labelSpan:h});e=g?this.baseLayersDiv:this.dataLayersDiv;e.appendChild(k);e.appendChild(h);e.appendChild(l)}}this.dataLbl.style.display=a?"":"none";this.baseLbl.style.display=b?"":"none";return this.div},updateMap:function(){for(var a=0,b=this.baseLayers.length;a<b;a++){var c=this.baseLayers[a];c.inputElem.checked&&this.map.setBaseLayer(c.layer,!1)}a=0;for(b=this.dataLayers.length;a<b;a++)c=this.dataLayers[a],c.layer.setVisibility(c.inputElem.checked)},maximizeControl:function(a){this.div.style.width=
+"";this.div.style.height="";this.showControls(!1);null!=a&&OpenLayers.Event.stop(a)},minimizeControl:function(a){this.div.style.width="0px";this.div.style.height="0px";this.showControls(!0);null!=a&&OpenLayers.Event.stop(a)},showControls:function(a){this.maximizeDiv.style.display=a?"":"none";this.minimizeDiv.style.display=a?"none":"";this.layersDiv.style.display=a?"none":""},loadContents:function(){this.layersDiv=document.createElement("div");this.layersDiv.id=this.id+"_layersDiv";OpenLayers.Element.addClass(this.layersDiv,
+"layersDiv");this.baseLbl=document.createElement("div");this.baseLbl.innerHTML=OpenLayers.i18n("Base Layer");OpenLayers.Element.addClass(this.baseLbl,"baseLbl");this.baseLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.baseLayersDiv,"baseLayersDiv");this.dataLbl=document.createElement("div");this.dataLbl.innerHTML=OpenLayers.i18n("Overlays");OpenLayers.Element.addClass(this.dataLbl,"dataLbl");this.dataLayersDiv=document.createElement("div");OpenLayers.Element.addClass(this.dataLayersDiv,
+"dataLayersDiv");this.ascending?(this.layersDiv.appendChild(this.baseLbl),this.layersDiv.appendChild(this.baseLayersDiv),this.layersDiv.appendChild(this.dataLbl),this.layersDiv.appendChild(this.dataLayersDiv)):(this.layersDiv.appendChild(this.dataLbl),this.layersDiv.appendChild(this.dataLayersDiv),this.layersDiv.appendChild(this.baseLbl),this.layersDiv.appendChild(this.baseLayersDiv));this.div.appendChild(this.layersDiv);var a=OpenLayers.Util.getImageLocation("layer-switcher-maximize.png");this.maximizeDiv=
+OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MaximizeDiv",null,null,a,"absolute");OpenLayers.Element.addClass(this.maximizeDiv,"maximizeDiv olButton");this.maximizeDiv.style.display="none";this.div.appendChild(this.maximizeDiv);a=OpenLayers.Util.getImageLocation("layer-switcher-minimize.png");this.minimizeDiv=OpenLayers.Util.createAlphaImageDiv("OpenLayers_Control_MinimizeDiv",null,null,a,"absolute");OpenLayers.Element.addClass(this.minimizeDiv,"minimizeDiv olButton");this.minimizeDiv.style.display=
+"none";this.div.appendChild(this.minimizeDiv)},CLASS_NAME:"OpenLayers.Control.LayerSwitcher"});OpenLayers.Format.Atom=OpenLayers.Class(OpenLayers.Format.XML,{namespaces:{atom:"http://www.w3.org/2005/Atom",georss:"http://www.georss.org/georss"},feedTitle:"untitled",defaultEntryTitle:"untitled",gmlParser:null,xy:!1,read:function(a){"string"==typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));return this.parseFeatures(a)},write:function(a){var b;if(OpenLayers.Util.isArray(a)){b=this.createElementNSPlus("atom:feed");b.appendChild(this.createElementNSPlus("atom:title",{value:this.feedTitle}));
+for(var c=0,d=a.length;c<d;c++)b.appendChild(this.buildEntryNode(a[c]))}else b=this.buildEntryNode(a);return OpenLayers.Format.XML.prototype.write.apply(this,[b])},buildContentNode:function(a){var b=this.createElementNSPlus("atom:content",{attributes:{type:a.type||null}});if(a.src)b.setAttribute("src",a.src);else if("text"==a.type||null==a.type)b.appendChild(this.createTextNode(a.value));else if("html"==a.type){if("string"!=typeof a.value)throw"HTML content must be in form of an escaped string";b.appendChild(this.createTextNode(a.value))}else"xhtml"==
+a.type?b.appendChild(a.value):"xhtml"==a.type||a.type.match(/(\+|\/)xml$/)?b.appendChild(a.value):b.appendChild(this.createTextNode(a.value));return b},buildEntryNode:function(a){var b=a.attributes,c=b.atom||{},d=this.createElementNSPlus("atom:entry");if(c.authors)for(var e=OpenLayers.Util.isArray(c.authors)?c.authors:[c.authors],f=0,g=e.length;f<g;f++)d.appendChild(this.buildPersonConstructNode("author",e[f]));if(c.categories)for(var e=OpenLayers.Util.isArray(c.categories)?c.categories:[c.categories],
+h,f=0,g=e.length;f<g;f++)h=e[f],d.appendChild(this.createElementNSPlus("atom:category",{attributes:{term:h.term,scheme:h.scheme||null,label:h.label||null}}));c.content&&d.appendChild(this.buildContentNode(c.content));if(c.contributors)for(e=OpenLayers.Util.isArray(c.contributors)?c.contributors:[c.contributors],f=0,g=e.length;f<g;f++)d.appendChild(this.buildPersonConstructNode("contributor",e[f]));a.fid&&d.appendChild(this.createElementNSPlus("atom:id",{value:a.fid}));if(c.links)for(e=OpenLayers.Util.isArray(c.links)?
+c.links:[c.links],f=0,g=e.length;f<g;f++)h=e[f],d.appendChild(this.createElementNSPlus("atom:link",{attributes:{href:h.href,rel:h.rel||null,type:h.type||null,hreflang:h.hreflang||null,title:h.title||null,length:h.length||null}}));c.published&&d.appendChild(this.createElementNSPlus("atom:published",{value:c.published}));c.rights&&d.appendChild(this.createElementNSPlus("atom:rights",{value:c.rights}));(c.summary||b.description)&&d.appendChild(this.createElementNSPlus("atom:summary",{value:c.summary||
+b.description}));d.appendChild(this.createElementNSPlus("atom:title",{value:c.title||b.title||this.defaultEntryTitle}));c.updated&&d.appendChild(this.createElementNSPlus("atom:updated",{value:c.updated}));a.geometry&&(b=this.createElementNSPlus("georss:where"),b.appendChild(this.buildGeometryNode(a.geometry)),d.appendChild(b));return d},initGmlParser:function(){this.gmlParser=new OpenLayers.Format.GML.v3({xy:this.xy,featureNS:"http://example.com#feature",internalProjection:this.internalProjection,
+externalProjection:this.externalProjection})},buildGeometryNode:function(a){this.gmlParser||this.initGmlParser();return this.gmlParser.writeNode("feature:_geometry",a).firstChild},buildPersonConstructNode:function(a,b){var c=["uri","email"],d=this.createElementNSPlus("atom:"+a);d.appendChild(this.createElementNSPlus("atom:name",{value:b.name}));for(var e=0,f=c.length;e<f;e++)b[c[e]]&&d.appendChild(this.createElementNSPlus("atom:"+c[e],{value:b[c[e]]}));return d},getFirstChildValue:function(a,b,c,
+d){return(a=this.getElementsByTagNameNS(a,b,c))&&0<a.length?this.getChildValue(a[0],d):d},parseFeature:function(a){var b={},c=null,d=null,e=null,f=this.namespaces.atom;this.parsePersonConstructs(a,"author",b);d=this.getElementsByTagNameNS(a,f,"category");0<d.length&&(b.categories=[]);for(var g=0,h=d.length;g<h;g++){c={};c.term=d[g].getAttribute("term");if(e=d[g].getAttribute("scheme"))c.scheme=e;if(e=d[g].getAttribute("label"))c.label=e;b.categories.push(c)}d=this.getElementsByTagNameNS(a,f,"content");
+if(0<d.length){c={};if(e=d[0].getAttribute("type"))c.type=e;(e=d[0].getAttribute("src"))?c.src=e:("text"==c.type||"html"==c.type||null==c.type?c.value=this.getFirstChildValue(a,f,"content",null):"xhtml"==c.type||c.type.match(/(\+|\/)xml$/)?c.value=this.getChildEl(d[0]):c.value=this.getFirstChildValue(a,f,"content",null),b.content=c)}this.parsePersonConstructs(a,"contributor",b);b.id=this.getFirstChildValue(a,f,"id",null);d=this.getElementsByTagNameNS(a,f,"link");0<d.length&&(b.links=Array(d.length));
+for(var k=["rel","type","hreflang","title","length"],g=0,h=d.length;g<h;g++){c={};c.href=d[g].getAttribute("href");for(var l=0,m=k.length;l<m;l++)(e=d[g].getAttribute(k[l]))&&(c[k[l]]=e);b.links[g]=c}if(c=this.getFirstChildValue(a,f,"published",null))b.published=c;if(c=this.getFirstChildValue(a,f,"rights",null))b.rights=c;if(c=this.getFirstChildValue(a,f,"summary",null))b.summary=c;b.title=this.getFirstChildValue(a,f,"title",null);b.updated=this.getFirstChildValue(a,f,"updated",null);c={title:b.title,
+description:b.summary,atom:b};a=this.parseLocations(a)[0];a=new OpenLayers.Feature.Vector(a,c);a.fid=b.id;return a},parseFeatures:function(a){var b=[],c=this.getElementsByTagNameNS(a,this.namespaces.atom,"entry");0==c.length&&(c=[a]);a=0;for(var d=c.length;a<d;a++)b.push(this.parseFeature(c[a]));return b},parseLocations:function(a){var b=this.namespaces.georss,c={components:[]},d=this.getElementsByTagNameNS(a,b,"where");if(d&&0<d.length){this.gmlParser||this.initGmlParser();for(var e=0,f=d.length;e<
+f;e++)this.gmlParser.readChildNodes(d[e],c)}c=c.components;if((d=this.getElementsByTagNameNS(a,b,"point"))&&0<d.length)for(e=0,f=d.length;e<f;e++){var g=OpenLayers.String.trim(d[e].firstChild.nodeValue).split(/\s+/);2!=g.length&&(g=OpenLayers.String.trim(d[e].firstChild.nodeValue).split(/\s*,\s*/));c.push(new OpenLayers.Geometry.Point(g[1],g[0]))}var h=this.getElementsByTagNameNS(a,b,"line");if(h&&0<h.length)for(var k,e=0,f=h.length;e<f;e++){d=OpenLayers.String.trim(h[e].firstChild.nodeValue).split(/\s+/);
+k=[];for(var l=0,m=d.length;l<m;l+=2)g=new OpenLayers.Geometry.Point(d[l+1],d[l]),k.push(g);c.push(new OpenLayers.Geometry.LineString(k))}if((a=this.getElementsByTagNameNS(a,b,"polygon"))&&0<a.length)for(e=0,f=a.length;e<f;e++){d=OpenLayers.String.trim(a[e].firstChild.nodeValue).split(/\s+/);k=[];l=0;for(m=d.length;l<m;l+=2)g=new OpenLayers.Geometry.Point(d[l+1],d[l]),k.push(g);c.push(new OpenLayers.Geometry.Polygon([new OpenLayers.Geometry.LinearRing(k)]))}if(this.internalProjection&&this.externalProjection)for(e=
+0,f=c.length;e<f;e++)c[e]&&c[e].transform(this.externalProjection,this.internalProjection);return c},parsePersonConstructs:function(a,b,c){var d=[],e=this.namespaces.atom;a=this.getElementsByTagNameNS(a,e,b);for(var f=["uri","email"],g=0,h=a.length;g<h;g++){var k={};k.name=this.getFirstChildValue(a[g],e,"name",null);for(var l=0,m=f.length;l<m;l++){var n=this.getFirstChildValue(a[g],e,f[l],null);n&&(k[f[l]]=n)}d.push(k)}0<d.length&&(c[b+"s"]=d)},CLASS_NAME:"OpenLayers.Format.Atom"});OpenLayers.Control.KeyboardDefaults=OpenLayers.Class(OpenLayers.Control,{autoActivate:!0,slideFactor:75,observeElement:null,draw:function(){this.handler=new OpenLayers.Handler.Keyboard(this,{keydown:this.defaultKeyPress},{observeElement:this.observeElement||document})},defaultKeyPress:function(a){var b,c=!0;b=OpenLayers.Event.element(a);if(!b||"INPUT"!=b.tagName&&"TEXTAREA"!=b.tagName&&"SELECT"!=b.tagName){switch(a.keyCode){case OpenLayers.Event.KEY_LEFT:this.map.pan(-this.slideFactor,0);break;case OpenLayers.Event.KEY_RIGHT:this.map.pan(this.slideFactor,
+0);break;case OpenLayers.Event.KEY_UP:this.map.pan(0,-this.slideFactor);break;case OpenLayers.Event.KEY_DOWN:this.map.pan(0,this.slideFactor);break;case 33:b=this.map.getSize();this.map.pan(0,-0.75*b.h);break;case 34:b=this.map.getSize();this.map.pan(0,0.75*b.h);break;case 35:b=this.map.getSize();this.map.pan(0.75*b.w,0);break;case 36:b=this.map.getSize();this.map.pan(-0.75*b.w,0);break;case 43:case 61:case 187:case 107:this.map.zoomIn();break;case 45:case 109:case 189:case 95:this.map.zoomOut();
+break;default:c=!1}c&&OpenLayers.Event.stop(a)}},CLASS_NAME:"OpenLayers.Control.KeyboardDefaults"});OpenLayers.Format.WMTSCapabilities.v1_0_0=OpenLayers.Class(OpenLayers.Format.OWSCommon.v1_1_0,{version:"1.0.0",namespaces:{ows:"http://www.opengis.net/ows/1.1",wmts:"http://www.opengis.net/wmts/1.0",xlink:"http://www.w3.org/1999/xlink"},yx:null,defaultPrefix:"wmts",initialize:function(a){OpenLayers.Format.XML.prototype.initialize.apply(this,[a]);this.options=a;a=OpenLayers.Util.extend({},OpenLayers.Format.WMTSCapabilities.prototype.yx);this.yx=OpenLayers.Util.extend(a,this.yx)},read:function(a){"string"==
+typeof a&&(a=OpenLayers.Format.XML.prototype.read.apply(this,[a]));a&&9==a.nodeType&&(a=a.documentElement);var b={};this.readNode(a,b);b.version=this.version;return b},readers:{wmts:{Capabilities:function(a,b){this.readChildNodes(a,b)},Contents:function(a,b){b.contents={};b.contents.layers=[];b.contents.tileMatrixSets={};this.readChildNodes(a,b.contents)},Layer:function(a,b){var c={styles:[],formats:[],dimensions:[],tileMatrixSetLinks:[],layers:[]};this.readChildNodes(a,c);b.layers.push(c)},Style:function(a,
+b){var c={};c.isDefault="true"===a.getAttribute("isDefault");this.readChildNodes(a,c);b.styles.push(c)},Format:function(a,b){b.formats.push(this.getChildValue(a))},TileMatrixSetLink:function(a,b){var c={};this.readChildNodes(a,c);b.tileMatrixSetLinks.push(c)},TileMatrixSet:function(a,b){if(b.layers){var c={matrixIds:[]};this.readChildNodes(a,c);b.tileMatrixSets[c.identifier]=c}else b.tileMatrixSet=this.getChildValue(a)},TileMatrix:function(a,b){var c={supportedCRS:b.supportedCRS};this.readChildNodes(a,
+c);b.matrixIds.push(c)},ScaleDenominator:function(a,b){b.scaleDenominator=parseFloat(this.getChildValue(a))},TopLeftCorner:function(a,b){var c=this.getChildValue(a).split(" "),d;b.supportedCRS&&(d=b.supportedCRS.replace(/urn:ogc:def:crs:(\w+):.+:(\w+)$/,"urn:ogc:def:crs:$1::$2"),d=!!this.yx[d]);b.topLeftCorner=d?new OpenLayers.LonLat(c[1],c[0]):new OpenLayers.LonLat(c[0],c[1])},TileWidth:function(a,b){b.tileWidth=parseInt(this.getChildValue(a))},TileHeight:function(a,b){b.tileHeight=parseInt(this.getChildValue(a))},
+MatrixWidth:function(a,b){b.matrixWidth=parseInt(this.getChildValue(a))},MatrixHeight:function(a,b){b.matrixHeight=parseInt(this.getChildValue(a))},ResourceURL:function(a,b){b.resourceUrl=b.resourceUrl||{};var c=a.getAttribute("resourceType");b.resourceUrls||(b.resourceUrls=[]);c=b.resourceUrl[c]={format:a.getAttribute("format"),template:a.getAttribute("template"),resourceType:c};b.resourceUrls.push(c)},WSDL:function(a,b){b.wsdl={};b.wsdl.href=a.getAttribute("xlink:href")},ServiceMetadataURL:function(a,
+b){b.serviceMetadataUrl={};b.serviceMetadataUrl.href=a.getAttribute("xlink:href")},LegendURL:function(a,b){b.legend={};b.legend.href=a.getAttribute("xlink:href");b.legend.format=a.getAttribute("format")},Dimension:function(a,b){var c={values:[]};this.readChildNodes(a,c);b.dimensions.push(c)},Default:function(a,b){b["default"]=this.getChildValue(a)},Value:function(a,b){b.values.push(this.getChildValue(a))}},ows:OpenLayers.Format.OWSCommon.v1_1_0.prototype.readers.ows},CLASS_NAME:"OpenLayers.Format.WMTSCapabilities.v1_0_0"});
diff --git a/Web/content/js/bootstrap-contextmenu.js b/Web/content/js/bootstrap-contextmenu.js
new file mode 100644
index 00000000..b7d1f49e
--- /dev/null
+++ b/Web/content/js/bootstrap-contextmenu.js
@@ -0,0 +1,184 @@
+/*!
+ * Bootstrap Context Menu
+ * Version: 2.1
+ * A small variation of the dropdown plugin by @sydcanem
+ * https://github.com/sydcanem/bootstrap-contextmenu
+ *
+ * New options added by @jeremyhubble for javascript launching
+ *  $('#elem').contextmenu({target:'#menu',before:function(e) { return true; } });
+ *
+ *
+ * Twitter Bootstrap (http://twitter.github.com/bootstrap).
+ */
+
+/* =========================================================
+ * bootstrap-contextmenu.js
+ * =========================================================
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+!(function($) {
+
+	"use strict"; // jshint ;_;
+
+	/* CONTEXTMENU CLASS DEFINITION
+	 * ============================ */
+
+	var ContextMenu = function (elements, options) {
+			this.$elements = $(elements)
+			this.options = options
+			this.before = this.options.before || this.before
+			this.onItem = this.options.onItem || this.onItem
+			if (this.options.target)
+				this.$elements.attr('data-target',this.options.target)
+
+			this.listen()
+		}
+
+	ContextMenu.prototype = {
+
+		constructor: ContextMenu
+		,show: function(e) {
+
+			var $this = $(this)
+				, $menu
+				, $contextmenu
+				, evt;
+
+
+			if ($this.is('.disabled, :disabled')) return;
+
+			evt = $.Event('context');
+			if (!this.before.call(this,e,$(e.currentTarget))) return;
+			this.$elements.trigger(evt);
+
+			$menu = this.getMenu();
+
+			var tp = this.getPosition(e, $menu);
+			$menu.attr('style', '')
+				.css(tp)
+				.addClass('open');
+
+
+			return false;
+		}
+
+		,closemenu: function(e) {
+			this.getMenu().removeClass('open');
+		}
+
+		,before: function(e) {
+			return true;
+		}
+
+		,onItem: function(e, context) {
+			return true;
+		}
+
+		,listen: function () {
+			var _this = this;
+			this.$elements
+					.on('contextmenu.context.data-api', $.proxy(this.show, this));
+			$('html')
+					.on('click.context.data-api', $.proxy(this.closemenu, this));
+
+			var $target = $(this.$elements.attr('data-target'));
+
+			$target.on('click.context.data-api', function (e) {
+				_this.onItem.call(this,e,$(e.target));
+			});
+
+			$('html').on('click.context.data-api', function (e) {
+				if (!e.ctrlKey) {
+					$target.removeClass('open');
+				}
+			});
+		}
+
+		,getMenu: function () {
+			var selector = this.$elements.attr('data-target')
+				, $menu;
+
+			if (!selector) {
+				selector = this.$elements.attr('href')
+				selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+			}
+
+			$menu = $(selector);
+
+			return $menu;
+		}
+
+		,getPosition: function(e, $menu) {
+			var mouseX = e.clientX
+				, mouseY = e.clientY
+				, boundsX = $(window).width()
+				, boundsY = $(window).height()
+				, menuWidth = $menu.find('.dropdown-menu').outerWidth()
+				, menuHeight = $menu.find('.dropdown-menu').outerHeight()
+				, tp = {"position":"fixed"}
+				, Y, X;
+
+			if (mouseY + menuHeight > boundsY) {
+				Y = {"top": mouseY - menuHeight};
+			} else {
+				Y = {"top": mouseY};
+			}
+
+			if ((mouseX + menuWidth > boundsX) && ((mouseX - menuWidth) > 0)) {
+				X = {"left": mouseX - menuWidth};
+			} else {
+				X = {"left": mouseX};
+			}
+
+			return $.extend(tp, Y, X);
+		}
+
+		,clearMenus: function(e) {
+			if (!e.ctrlKey) {
+				$('[data-toggle=context]').each(function() {
+					this.getMenu()
+						.removeClass('open');
+				});
+			}
+		}
+	}
+
+	/* CONTEXT MENU PLUGIN DEFINITION
+	 * ========================== */
+
+	$.fn.contextmenu = function (option,e) {
+		var $this = this;
+		return (function () {
+			var data = $this.data('context')
+				, options = typeof option == 'object' && option
+
+			if (!data) $this.data('context', (data = new ContextMenu($this, options)));
+			// "show" method must also be passed the event for positioning
+			if (typeof option == 'string') data[option].call(data,e);
+		})();
+	}
+
+	$.fn.contextmenu.Constructor = ContextMenu;
+
+	/* APPLY TO STANDARD CONTEXT MENU ELEMENTS
+	 * =================================== */
+
+	$(document)
+		.on('contextmenu.context.data-api', '[data-toggle=context]', function(e) {
+				$(this).contextmenu('show',e);
+				e.preventDefault();
+		});
+
+}(window.jQuery));
diff --git a/Web/content/js/bootstrap.js b/Web/content/js/bootstrap.js
new file mode 100644
index 00000000..c298ee42
--- /dev/null
+++ b/Web/content/js/bootstrap.js
@@ -0,0 +1,2276 @@
+/* ===================================================
+ * bootstrap-transition.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#transitions
+ * ===================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
+   * ======================================================= */
+
+  $(function () {
+
+    $.support.transition = (function () {
+
+      var transitionEnd = (function () {
+
+        var el = document.createElement('bootstrap')
+          , transEndEventNames = {
+               'WebkitTransition' : 'webkitTransitionEnd'
+            ,  'MozTransition'    : 'transitionend'
+            ,  'OTransition'      : 'oTransitionEnd otransitionend'
+            ,  'transition'       : 'transitionend'
+            }
+          , name
+
+        for (name in transEndEventNames){
+          if (el.style[name] !== undefined) {
+            return transEndEventNames[name]
+          }
+        }
+
+      }())
+
+      return transitionEnd && {
+        end: transitionEnd
+      }
+
+    })()
+
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-alert.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#alerts
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* ALERT CLASS DEFINITION
+  * ====================== */
+
+  var dismiss = '[data-dismiss="alert"]'
+    , Alert = function (el) {
+        $(el).on('click', dismiss, this.close)
+      }
+
+  Alert.prototype.close = function (e) {
+    var $this = $(this)
+      , selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = $(selector)
+
+    e && e.preventDefault()
+
+    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+
+    $parent.trigger(e = $.Event('close'))
+
+    if (e.isDefaultPrevented()) return
+
+    $parent.removeClass('in')
+
+    function removeElement() {
+      $parent
+        .trigger('closed')
+        .remove()
+    }
+
+    $.support.transition && $parent.hasClass('fade') ?
+      $parent.on($.support.transition.end, removeElement) :
+      removeElement()
+  }
+
+
+ /* ALERT PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.alert
+
+  $.fn.alert = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('alert')
+      if (!data) $this.data('alert', (data = new Alert(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.alert.Constructor = Alert
+
+
+ /* ALERT NO CONFLICT
+  * ================= */
+
+  $.fn.alert.noConflict = function () {
+    $.fn.alert = old
+    return this
+  }
+
+
+ /* ALERT DATA-API
+  * ============== */
+
+  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-button.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#buttons
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* BUTTON PUBLIC CLASS DEFINITION
+  * ============================== */
+
+  var Button = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.button.defaults, options)
+  }
+
+  Button.prototype.setState = function (state) {
+    var d = 'disabled'
+      , $el = this.$element
+      , data = $el.data()
+      , val = $el.is('input') ? 'val' : 'html'
+
+    state = state + 'Text'
+    data.resetText || $el.data('resetText', $el[val]())
+
+    $el[val](data[state] || this.options[state])
+
+    // push to event loop to allow forms to submit
+    setTimeout(function () {
+      state == 'loadingText' ?
+        $el.addClass(d).attr(d, d) :
+        $el.removeClass(d).removeAttr(d)
+    }, 0)
+  }
+
+  Button.prototype.toggle = function () {
+    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
+
+    $parent && $parent
+      .find('.active')
+      .removeClass('active')
+
+    this.$element.toggleClass('active')
+  }
+
+
+ /* BUTTON PLUGIN DEFINITION
+  * ======================== */
+
+  var old = $.fn.button
+
+  $.fn.button = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('button')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('button', (data = new Button(this, options)))
+      if (option == 'toggle') data.toggle()
+      else if (option) data.setState(option)
+    })
+  }
+
+  $.fn.button.defaults = {
+    loadingText: 'loading...'
+  }
+
+  $.fn.button.Constructor = Button
+
+
+ /* BUTTON NO CONFLICT
+  * ================== */
+
+  $.fn.button.noConflict = function () {
+    $.fn.button = old
+    return this
+  }
+
+
+ /* BUTTON DATA-API
+  * =============== */
+
+  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
+    var $btn = $(e.target)
+    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+    $btn.button('toggle')
+  })
+
+}(window.jQuery);/* ==========================================================
+ * bootstrap-carousel.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#carousel
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* CAROUSEL CLASS DEFINITION
+  * ========================= */
+
+  var Carousel = function (element, options) {
+    this.$element = $(element)
+    this.$indicators = this.$element.find('.carousel-indicators')
+    this.options = options
+    this.options.pause == 'hover' && this.$element
+      .on('mouseenter', $.proxy(this.pause, this))
+      .on('mouseleave', $.proxy(this.cycle, this))
+  }
+
+  Carousel.prototype = {
+
+    cycle: function (e) {
+      if (!e) this.paused = false
+      if (this.interval) clearInterval(this.interval);
+      this.options.interval
+        && !this.paused
+        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+      return this
+    }
+
+  , getActiveIndex: function () {
+      this.$active = this.$element.find('.item.active')
+      this.$items = this.$active.parent().children()
+      return this.$items.index(this.$active)
+    }
+
+  , to: function (pos) {
+      var activeIndex = this.getActiveIndex()
+        , that = this
+
+      if (pos > (this.$items.length - 1) || pos < 0) return
+
+      if (this.sliding) {
+        return this.$element.one('slid', function () {
+          that.to(pos)
+        })
+      }
+
+      if (activeIndex == pos) {
+        return this.pause().cycle()
+      }
+
+      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+    }
+
+  , pause: function (e) {
+      if (!e) this.paused = true
+      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
+        this.$element.trigger($.support.transition.end)
+        this.cycle(true)
+      }
+      clearInterval(this.interval)
+      this.interval = null
+      return this
+    }
+
+  , next: function () {
+      if (this.sliding) return
+      return this.slide('next')
+    }
+
+  , prev: function () {
+      if (this.sliding) return
+      return this.slide('prev')
+    }
+
+  , slide: function (type, next) {
+      var $active = this.$element.find('.item.active')
+        , $next = next || $active[type]()
+        , isCycling = this.interval
+        , direction = type == 'next' ? 'left' : 'right'
+        , fallback  = type == 'next' ? 'first' : 'last'
+        , that = this
+        , e
+
+      this.sliding = true
+
+      isCycling && this.pause()
+
+      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+
+      e = $.Event('slide', {
+        relatedTarget: $next[0]
+      , direction: direction
+      })
+
+      if ($next.hasClass('active')) return
+
+      if (this.$indicators.length) {
+        this.$indicators.find('.active').removeClass('active')
+        this.$element.one('slid', function () {
+          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
+          $nextIndicator && $nextIndicator.addClass('active')
+        })
+      }
+
+      if ($.support.transition && this.$element.hasClass('slide')) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $next.addClass(type)
+        $next[0].offsetWidth // force reflow
+        $active.addClass(direction)
+        $next.addClass(direction)
+        this.$element.one($.support.transition.end, function () {
+          $next.removeClass([type, direction].join(' ')).addClass('active')
+          $active.removeClass(['active', direction].join(' '))
+          that.sliding = false
+          setTimeout(function () { that.$element.trigger('slid') }, 0)
+        })
+      } else {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $active.removeClass('active')
+        $next.addClass('active')
+        this.sliding = false
+        this.$element.trigger('slid')
+      }
+
+      isCycling && this.cycle()
+
+      return this
+    }
+
+  }
+
+
+ /* CAROUSEL PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.carousel
+
+  $.fn.carousel = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('carousel')
+        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
+        , action = typeof option == 'string' ? option : options.slide
+      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      if (typeof option == 'number') data.to(option)
+      else if (action) data[action]()
+      else if (options.interval) data.pause().cycle()
+    })
+  }
+
+  $.fn.carousel.defaults = {
+    interval: 5000
+  , pause: 'hover'
+  }
+
+  $.fn.carousel.Constructor = Carousel
+
+
+ /* CAROUSEL NO CONFLICT
+  * ==================== */
+
+  $.fn.carousel.noConflict = function () {
+    $.fn.carousel = old
+    return this
+  }
+
+ /* CAROUSEL DATA-API
+  * ================= */
+
+  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var $this = $(this), href
+      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      , options = $.extend({}, $target.data(), $this.data())
+      , slideIndex
+
+    $target.carousel(options)
+
+    if (slideIndex = $this.attr('data-slide-to')) {
+      $target.data('carousel').pause().to(slideIndex).cycle()
+    }
+
+    e.preventDefault()
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-collapse.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning || this.$element.hasClass('in')) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      $.support.transition && this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning || !this.$element.hasClass('in')) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSE PLUGIN DEFINITION
+  * ========================== */
+
+  var old = $.fn.collapse
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSE NO CONFLICT
+  * ==================== */
+
+  $.fn.collapse.noConflict = function () {
+    $.fn.collapse = old
+    return this
+  }
+
+
+ /* COLLAPSE DATA-API
+  * ================= */
+
+  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
+    var $this = $(this), href
+      , target = $this.attr('data-target')
+        || e.preventDefault()
+        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+      , option = $(target).data('collapse') ? 'toggle' : $this.data()
+    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    $(target).collapse(option)
+  })
+
+}(window.jQuery);/* ============================================================
+ * bootstrap-dropdown.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle=dropdown]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      var $this = $(this)
+        , $parent
+        , isActive
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) {
+        $parent.toggleClass('open')
+      }
+
+      $this.focus()
+
+      return false
+    }
+
+  , keydown: function (e) {
+      var $this
+        , $items
+        , $active
+        , $parent
+        , isActive
+        , index
+
+      if (!/(38|40|27)/.test(e.keyCode)) return
+
+      $this = $(this)
+
+      e.preventDefault()
+      e.stopPropagation()
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      if (!isActive || (isActive && e.keyCode == 27)) {
+        if (e.which == 27) $parent.find(toggle).focus()
+        return $this.click()
+      }
+
+      $items = $('[role=menu] li:not(.divider):visible a', $parent)
+
+      if (!$items.length) return
+
+      index = $items.index($items.filter(':focus'))
+
+      if (e.keyCode == 38 && index > 0) index--                                        // up
+      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+      if (!~index) index = 0
+
+      $items
+        .eq(index)
+        .focus()
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).each(function () {
+      getParent($(this)).removeClass('open')
+    })
+  }
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = selector && $(selector)
+
+    if (!$parent || !$parent.length) $parent = $this.parent()
+
+    return $parent
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  var old = $.fn.dropdown
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+ /* DROPDOWN NO CONFLICT
+  * ==================== */
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(document)
+    .on('click.dropdown.data-api', clearMenus)
+    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.dropdown-menu', function (e) { e.stopPropagation() })
+    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+
+}(window.jQuery);
+/* =========================================================
+ * bootstrap-modal.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function (element, options) {
+    this.options = options
+    this.$element = $(element)
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+          , e = $.Event('show')
+
+        this.$element.trigger(e)
+
+        if (this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = true
+
+        this.escape()
+
+        this.backdrop(function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
+
+          that.$element.show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element
+            .addClass('in')
+            .attr('aria-hidden', false)
+
+          that.enforceFocus()
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
+            that.$element.focus().trigger('shown')
+
+        })
+      }
+
+    , hide: function (e) {
+        e && e.preventDefault()
+
+        var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
+        this.isShown = false
+
+        this.escape()
+
+        $(document).off('focusin.modal')
+
+        this.$element
+          .removeClass('in')
+          .attr('aria-hidden', true)
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          this.hideWithTransition() :
+          this.hideModal()
+      }
+
+    , enforceFocus: function () {
+        var that = this
+        $(document).on('focusin.modal', function (e) {
+          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
+            that.$element.focus()
+          }
+        })
+      }
+
+    , escape: function () {
+        var that = this
+        if (this.isShown && this.options.keyboard) {
+          this.$element.on('keyup.dismiss.modal', function ( e ) {
+            e.which == 27 && that.hide()
+          })
+        } else if (!this.isShown) {
+          this.$element.off('keyup.dismiss.modal')
+        }
+      }
+
+    , hideWithTransition: function () {
+        var that = this
+          , timeout = setTimeout(function () {
+              that.$element.off($.support.transition.end)
+              that.hideModal()
+            }, 500)
+
+        this.$element.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          that.hideModal()
+        })
+      }
+
+    , hideModal: function () {
+        var that = this
+        this.$element.hide()
+        this.backdrop(function () {
+          that.removeBackdrop()
+          that.$element.trigger('hidden')
+        })
+      }
+
+    , removeBackdrop: function () {
+        this.$backdrop && this.$backdrop.remove()
+        this.$backdrop = null
+      }
+
+    , backdrop: function (callback) {
+        var that = this
+          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+        if (this.isShown && this.options.backdrop) {
+          var doAnimate = $.support.transition && animate
+
+          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+            .appendTo(document.body)
+
+          this.$backdrop.click(
+            this.options.backdrop == 'static' ?
+              $.proxy(this.$element[0].focus, this.$element[0])
+            : $.proxy(this.hide, this)
+          )
+
+          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+          this.$backdrop.addClass('in')
+
+          if (!callback) return
+
+          doAnimate ?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (!this.isShown && this.$backdrop) {
+          this.$backdrop.removeClass('in')
+
+          $.support.transition && this.$element.hasClass('fade')?
+            this.$backdrop.one($.support.transition.end, callback) :
+            callback()
+
+        } else if (callback) {
+          callback()
+        }
+      }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.modal
+
+  $.fn.modal = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL NO CONFLICT
+  * ================= */
+
+  $.fn.modal.noConflict = function () {
+    $.fn.modal = old
+    return this
+  }
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this = $(this)
+      , href = $this.attr('href')
+      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
+      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+
+    e.preventDefault()
+
+    $target
+      .modal(option)
+      .one('hide', function () {
+        $this.focus()
+      })
+  })
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-tooltip.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function (type, element, options) {
+      var eventIn
+        , eventOut
+        , triggers
+        , trigger
+        , i
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      triggers = this.options.trigger.split(' ')
+
+      for (i = triggers.length; i--;) {
+        trigger = triggers[i]
+        if (trigger == 'click') {
+          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+        } else if (trigger != 'manual') {
+          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
+          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
+          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+        }
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function (options) {
+      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function (e) {
+      var defaults = $.fn[this.type].defaults
+        , options = {}
+        , self
+
+      this._options && $.each(this._options, function (key, value) {
+        if (defaults[key] != value) options[key] = value
+      }, this)
+
+      self = $(e.currentTarget)[this.type](options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) return self.show()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'in'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'in') self.show()
+      }, self.options.delay.show)
+    }
+
+  , leave: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (this.timeout) clearTimeout(this.timeout)
+      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+      self.hoverState = 'out'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'out') self.hide()
+      }, self.options.delay.hide)
+    }
+
+  , show: function () {
+      var $tip
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+        , e = $.Event('show')
+
+      if (this.hasContent() && this.enabled) {
+        this.$element.trigger(e)
+        if (e.isDefaultPrevented()) return
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        $tip
+          .detach()
+          .css({ top: 0, left: 0, display: 'block' })
+
+        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
+
+        pos = this.getPosition()
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        this.applyPlacement(tp, placement)
+        this.$element.trigger('shown')
+      }
+    }
+
+  , applyPlacement: function(offset, placement){
+      var $tip = this.tip()
+        , width = $tip[0].offsetWidth
+        , height = $tip[0].offsetHeight
+        , actualWidth
+        , actualHeight
+        , delta
+        , replace
+
+      $tip
+        .offset(offset)
+        .addClass(placement)
+        .addClass('in')
+
+      actualWidth = $tip[0].offsetWidth
+      actualHeight = $tip[0].offsetHeight
+
+      if (placement == 'top' && actualHeight != height) {
+        offset.top = offset.top + height - actualHeight
+        replace = true
+      }
+
+      if (placement == 'bottom' || placement == 'top') {
+        delta = 0
+
+        if (offset.left < 0){
+          delta = offset.left * -2
+          offset.left = 0
+          $tip.offset(offset)
+          actualWidth = $tip[0].offsetWidth
+          actualHeight = $tip[0].offsetHeight
+        }
+
+        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
+      } else {
+        this.replaceArrow(actualHeight - height, actualHeight, 'top')
+      }
+
+      if (replace) $tip.offset(offset)
+    }
+
+  , replaceArrow: function(delta, dimension, position){
+      this
+        .arrow()
+        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+
+      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+        , e = $.Event('hide')
+
+      this.$element.trigger(e)
+      if (e.isDefaultPrevented()) return
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).detach()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.detach()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.detach()
+
+      this.$element.trigger('hidden')
+
+      return this
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function () {
+      var el = this.$element[0]
+      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
+        width: el.offsetWidth
+      , height: el.offsetHeight
+      }, this.$element.offset())
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , arrow: function(){
+      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function (e) {
+      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
+      self.tip().hasClass('in') ? self.hide() : self.show()
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  var old = $.fn.tooltip
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover focus'
+  , title: ''
+  , delay: 0
+  , html: false
+  , container: false
+  }
+
+
+ /* TOOLTIP NO CONFLICT
+  * =================== */
+
+  $.fn.tooltip.noConflict = function () {
+    $.fn.tooltip = old
+    return this
+  }
+
+}(window.jQuery);
+/* ===========================================================
+ * bootstrap-popover.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#popovers
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * =========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* POPOVER PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Popover = function (element, options) {
+    this.init('popover', element, options)
+  }
+
+
+  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
+     ========================================== */
+
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+
+    constructor: Popover
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+        , content = this.getContent()
+
+      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
+
+      $tip.removeClass('fade top bottom left right in')
+    }
+
+  , hasContent: function () {
+      return this.getTitle() || this.getContent()
+    }
+
+  , getContent: function () {
+      var content
+        , $e = this.$element
+        , o = this.options
+
+      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
+        || $e.attr('data-content')
+
+      return content
+    }
+
+  , tip: function () {
+      if (!this.$tip) {
+        this.$tip = $(this.options.template)
+      }
+      return this.$tip
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  })
+
+
+ /* POPOVER PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.popover
+
+  $.fn.popover = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('popover')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.popover.Constructor = Popover
+
+  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
+    placement: 'right'
+  , trigger: 'click'
+  , content: ''
+  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
+
+
+ /* POPOVER NO CONFLICT
+  * =================== */
+
+  $.fn.popover.noConflict = function () {
+    $.fn.popover = old
+    return this
+  }
+
+}(window.jQuery);
+/* =============================================================
+ * bootstrap-scrollspy.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#scrollspy
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* SCROLLSPY CLASS DEFINITION
+  * ========================== */
+
+  function ScrollSpy(element, options) {
+    var process = $.proxy(this.process, this)
+      , $element = $(element).is('body') ? $(window) : $(element)
+      , href
+    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
+    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
+    this.selector = (this.options.target
+      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+      || '') + ' .nav li > a'
+    this.$body = $('body')
+    this.refresh()
+    this.process()
+  }
+
+  ScrollSpy.prototype = {
+
+      constructor: ScrollSpy
+
+    , refresh: function () {
+        var self = this
+          , $targets
+
+        this.offsets = $([])
+        this.targets = $([])
+
+        $targets = this.$body
+          .find(this.selector)
+          .map(function () {
+            var $el = $(this)
+              , href = $el.data('target') || $el.attr('href')
+              , $href = /^#\w/.test(href) && $(href)
+            return ( $href
+              && $href.length
+              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
+          })
+          .sort(function (a, b) { return a[0] - b[0] })
+          .each(function () {
+            self.offsets.push(this[0])
+            self.targets.push(this[1])
+          })
+      }
+
+    , process: function () {
+        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
+          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
+          , maxScroll = scrollHeight - this.$scrollElement.height()
+          , offsets = this.offsets
+          , targets = this.targets
+          , activeTarget = this.activeTarget
+          , i
+
+        if (scrollTop >= maxScroll) {
+          return activeTarget != (i = targets.last()[0])
+            && this.activate ( i )
+        }
+
+        for (i = offsets.length; i--;) {
+          activeTarget != targets[i]
+            && scrollTop >= offsets[i]
+            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+            && this.activate( targets[i] )
+        }
+      }
+
+    , activate: function (target) {
+        var active
+          , selector
+
+        this.activeTarget = target
+
+        $(this.selector)
+          .parent('.active')
+          .removeClass('active')
+
+        selector = this.selector
+          + '[data-target="' + target + '"],'
+          + this.selector + '[href="' + target + '"]'
+
+        active = $(selector)
+          .parent('li')
+          .addClass('active')
+
+        if (active.parent('.dropdown-menu').length)  {
+          active = active.closest('li.dropdown').addClass('active')
+        }
+
+        active.trigger('activate')
+      }
+
+  }
+
+
+ /* SCROLLSPY PLUGIN DEFINITION
+  * =========================== */
+
+  var old = $.fn.scrollspy
+
+  $.fn.scrollspy = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('scrollspy')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.scrollspy.Constructor = ScrollSpy
+
+  $.fn.scrollspy.defaults = {
+    offset: 10
+  }
+
+
+ /* SCROLLSPY NO CONFLICT
+  * ===================== */
+
+  $.fn.scrollspy.noConflict = function () {
+    $.fn.scrollspy = old
+    return this
+  }
+
+
+ /* SCROLLSPY DATA-API
+  * ================== */
+
+  $(window).on('load', function () {
+    $('[data-spy="scroll"]').each(function () {
+      var $spy = $(this)
+      $spy.scrollspy($spy.data())
+    })
+  })
+
+}(window.jQuery);/* ========================================================
+ * bootstrap-tab.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#tabs
+ * ========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ======================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TAB CLASS DEFINITION
+  * ==================== */
+
+  var Tab = function (element) {
+    this.element = $(element)
+  }
+
+  Tab.prototype = {
+
+    constructor: Tab
+
+  , show: function () {
+      var $this = this.element
+        , $ul = $this.closest('ul:not(.dropdown-menu)')
+        , selector = $this.attr('data-target')
+        , previous
+        , $target
+        , e
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      if ( $this.parent('li').hasClass('active') ) return
+
+      previous = $ul.find('.active:last a')[0]
+
+      e = $.Event('show', {
+        relatedTarget: previous
+      })
+
+      $this.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
+      $target = $(selector)
+
+      this.activate($this.parent('li'), $ul)
+      this.activate($target, $target.parent(), function () {
+        $this.trigger({
+          type: 'shown'
+        , relatedTarget: previous
+        })
+      })
+    }
+
+  , activate: function ( element, container, callback) {
+      var $active = container.find('> .active')
+        , transition = callback
+            && $.support.transition
+            && $active.hasClass('fade')
+
+      function next() {
+        $active
+          .removeClass('active')
+          .find('> .dropdown-menu > .active')
+          .removeClass('active')
+
+        element.addClass('active')
+
+        if (transition) {
+          element[0].offsetWidth // reflow for transition
+          element.addClass('in')
+        } else {
+          element.removeClass('fade')
+        }
+
+        if ( element.parent('.dropdown-menu') ) {
+          element.closest('li.dropdown').addClass('active')
+        }
+
+        callback && callback()
+      }
+
+      transition ?
+        $active.one($.support.transition.end, next) :
+        next()
+
+      $active.removeClass('in')
+    }
+  }
+
+
+ /* TAB PLUGIN DEFINITION
+  * ===================== */
+
+  var old = $.fn.tab
+
+  $.fn.tab = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tab')
+      if (!data) $this.data('tab', (data = new Tab(this)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tab.Constructor = Tab
+
+
+ /* TAB NO CONFLICT
+  * =============== */
+
+  $.fn.tab.noConflict = function () {
+    $.fn.tab = old
+    return this
+  }
+
+
+ /* TAB DATA-API
+  * ============ */
+
+  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+    e.preventDefault()
+    $(this).tab('show')
+  })
+
+}(window.jQuery);/* =============================================================
+ * bootstrap-typeahead.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#typeahead
+ * =============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function($){
+
+  "use strict"; // jshint ;_;
+
+
+ /* TYPEAHEAD PUBLIC CLASS DEFINITION
+  * ================================= */
+
+  var Typeahead = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.typeahead.defaults, options)
+    this.matcher = this.options.matcher || this.matcher
+    this.sorter = this.options.sorter || this.sorter
+    this.highlighter = this.options.highlighter || this.highlighter
+    this.updater = this.options.updater || this.updater
+    this.source = this.options.source
+    this.$menu = $(this.options.menu)
+    this.shown = false
+    this.listen()
+  }
+
+  Typeahead.prototype = {
+
+    constructor: Typeahead
+
+  , select: function () {
+      var val = this.$menu.find('.active').attr('data-value')
+      this.$element
+        .val(this.updater(val))
+        .change()
+      return this.hide()
+    }
+
+  , updater: function (item) {
+      return item
+    }
+
+  , show: function () {
+      var pos = $.extend({}, this.$element.position(), {
+        height: this.$element[0].offsetHeight
+      })
+
+      this.$menu
+        .insertAfter(this.$element)
+        .css({
+          top: pos.top + pos.height
+        , left: pos.left
+        })
+        .show()
+
+      this.shown = true
+      return this
+    }
+
+  , hide: function () {
+      this.$menu.hide()
+      this.shown = false
+      return this
+    }
+
+  , lookup: function (event) {
+      var items
+
+      this.query = this.$element.val()
+
+      if (!this.query || this.query.length < this.options.minLength) {
+        return this.shown ? this.hide() : this
+      }
+
+      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
+
+      return items ? this.process(items) : this
+    }
+
+  , process: function (items) {
+      var that = this
+
+      items = $.grep(items, function (item) {
+        return that.matcher(item)
+      })
+
+      items = this.sorter(items)
+
+      if (!items.length) {
+        return this.shown ? this.hide() : this
+      }
+
+      return this.render(items.slice(0, this.options.items)).show()
+    }
+
+  , matcher: function (item) {
+      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
+    }
+
+  , sorter: function (items) {
+      var beginswith = []
+        , caseSensitive = []
+        , caseInsensitive = []
+        , item
+
+      while (item = items.shift()) {
+        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
+        else if (~item.indexOf(this.query)) caseSensitive.push(item)
+        else caseInsensitive.push(item)
+      }
+
+      return beginswith.concat(caseSensitive, caseInsensitive)
+    }
+
+  , highlighter: function (item) {
+      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
+      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
+        return '<strong>' + match + '</strong>'
+      })
+    }
+
+  , render: function (items) {
+      var that = this
+
+      items = $(items).map(function (i, item) {
+        i = $(that.options.item).attr('data-value', item)
+        i.find('a').html(that.highlighter(item))
+        return i[0]
+      })
+
+      items.first().addClass('active')
+      this.$menu.html(items)
+      return this
+    }
+
+  , next: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , next = active.next()
+
+      if (!next.length) {
+        next = $(this.$menu.find('li')[0])
+      }
+
+      next.addClass('active')
+    }
+
+  , prev: function (event) {
+      var active = this.$menu.find('.active').removeClass('active')
+        , prev = active.prev()
+
+      if (!prev.length) {
+        prev = this.$menu.find('li').last()
+      }
+
+      prev.addClass('active')
+    }
+
+  , listen: function () {
+      this.$element
+        .on('focus',    $.proxy(this.focus, this))
+        .on('blur',     $.proxy(this.blur, this))
+        .on('keypress', $.proxy(this.keypress, this))
+        .on('keyup',    $.proxy(this.keyup, this))
+
+      if (this.eventSupported('keydown')) {
+        this.$element.on('keydown', $.proxy(this.keydown, this))
+      }
+
+      this.$menu
+        .on('click', $.proxy(this.click, this))
+        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
+        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
+    }
+
+  , eventSupported: function(eventName) {
+      var isSupported = eventName in this.$element
+      if (!isSupported) {
+        this.$element.setAttribute(eventName, 'return;')
+        isSupported = typeof this.$element[eventName] === 'function'
+      }
+      return isSupported
+    }
+
+  , move: function (e) {
+      if (!this.shown) return
+
+      switch(e.keyCode) {
+        case 9: // tab
+        case 13: // enter
+        case 27: // escape
+          e.preventDefault()
+          break
+
+        case 38: // up arrow
+          e.preventDefault()
+          this.prev()
+          break
+
+        case 40: // down arrow
+          e.preventDefault()
+          this.next()
+          break
+      }
+
+      e.stopPropagation()
+    }
+
+  , keydown: function (e) {
+      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
+      this.move(e)
+    }
+
+  , keypress: function (e) {
+      if (this.suppressKeyPressRepeat) return
+      this.move(e)
+    }
+
+  , keyup: function (e) {
+      switch(e.keyCode) {
+        case 40: // down arrow
+        case 38: // up arrow
+        case 16: // shift
+        case 17: // ctrl
+        case 18: // alt
+          break
+
+        case 9: // tab
+        case 13: // enter
+          if (!this.shown) return
+          this.select()
+          break
+
+        case 27: // escape
+          if (!this.shown) return
+          this.hide()
+          break
+
+        default:
+          this.lookup()
+      }
+
+      e.stopPropagation()
+      e.preventDefault()
+  }
+
+  , focus: function (e) {
+      this.focused = true
+    }
+
+  , blur: function (e) {
+      this.focused = false
+      if (!this.mousedover && this.shown) this.hide()
+    }
+
+  , click: function (e) {
+      e.stopPropagation()
+      e.preventDefault()
+      this.select()
+      this.$element.focus()
+    }
+
+  , mouseenter: function (e) {
+      this.mousedover = true
+      this.$menu.find('.active').removeClass('active')
+      $(e.currentTarget).addClass('active')
+    }
+
+  , mouseleave: function (e) {
+      this.mousedover = false
+      if (!this.focused && this.shown) this.hide()
+    }
+
+  }
+
+
+  /* TYPEAHEAD PLUGIN DEFINITION
+   * =========================== */
+
+  var old = $.fn.typeahead
+
+  $.fn.typeahead = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('typeahead')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.typeahead.defaults = {
+    source: []
+  , items: 8
+  , menu: '<ul class="typeahead dropdown-menu"></ul>'
+  , item: '<li><a href="#"></a></li>'
+  , minLength: 1
+  }
+
+  $.fn.typeahead.Constructor = Typeahead
+
+
+ /* TYPEAHEAD NO CONFLICT
+  * =================== */
+
+  $.fn.typeahead.noConflict = function () {
+    $.fn.typeahead = old
+    return this
+  }
+
+
+ /* TYPEAHEAD DATA-API
+  * ================== */
+
+  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
+    var $this = $(this)
+    if ($this.data('typeahead')) return
+    $this.typeahead($this.data())
+  })
+
+}(window.jQuery);
+/* ==========================================================
+ * bootstrap-affix.js v2.3.1
+ * http://twitter.github.com/bootstrap/javascript.html#affix
+ * ==========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* AFFIX CLASS DEFINITION
+  * ====================== */
+
+  var Affix = function (element, options) {
+    this.options = $.extend({}, $.fn.affix.defaults, options)
+    this.$window = $(window)
+      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
+    this.$element = $(element)
+    this.checkPosition()
+  }
+
+  Affix.prototype.checkPosition = function () {
+    if (!this.$element.is(':visible')) return
+
+    var scrollHeight = $(document).height()
+      , scrollTop = this.$window.scrollTop()
+      , position = this.$element.offset()
+      , offset = this.options.offset
+      , offsetBottom = offset.bottom
+      , offsetTop = offset.top
+      , reset = 'affix affix-top affix-bottom'
+      , affix
+
+    if (typeof offset != 'object') offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function') offsetTop = offset.top()
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
+
+    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
+      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
+      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
+      'top'    : false
+
+    if (this.affixed === affix) return
+
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
+
+    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
+  }
+
+
+ /* AFFIX PLUGIN DEFINITION
+  * ======================= */
+
+  var old = $.fn.affix
+
+  $.fn.affix = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('affix')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('affix', (data = new Affix(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.affix.Constructor = Affix
+
+  $.fn.affix.defaults = {
+    offset: 0
+  }
+
+
+ /* AFFIX NO CONFLICT
+  * ================= */
+
+  $.fn.affix.noConflict = function () {
+    $.fn.affix = old
+    return this
+  }
+
+
+ /* AFFIX DATA-API
+  * ============== */
+
+  $(window).on('load', function () {
+    $('[data-spy="affix"]').each(function () {
+      var $spy = $(this)
+        , data = $spy.data()
+
+      data.offset = data.offset || {}
+
+      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
+      data.offsetTop && (data.offset.top = data.offsetTop)
+
+      $spy.affix(data)
+    })
+  })
+
+
+}(window.jQuery);
\ No newline at end of file
diff --git a/Web/content/js/bootstrap.min.js b/Web/content/js/bootstrap.min.js
new file mode 100644
index 00000000..95c5ac5e
--- /dev/null
+++ b/Web/content/js/bootstrap.min.js
@@ -0,0 +1,6 @@
+/*!
+* Bootstrap.js by @fat & @mdo
+* Copyright 2012 Twitter, Inc.
+* http://www.apache.org/licenses/LICENSE-2.0.txt
+*/
+!function(e){"use strict";e(function(){e.support.transition=function(){var e=function(){var e=document.createElement("bootstrap"),t={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:"oTransitionEnd otransitionend",transition:"transitionend"},n;for(n in t)if(e.style[n]!==undefined)return t[n]}();return e&&{end:e}}()})}(window.jQuery),!function(e){"use strict";var t='[data-dismiss="alert"]',n=function(n){e(n).on("click",t,this.close)};n.prototype.close=function(t){function s(){i.trigger("closed").remove()}var n=e(this),r=n.attr("data-target"),i;r||(r=n.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,"")),i=e(r),t&&t.preventDefault(),i.length||(i=n.hasClass("alert")?n:n.parent()),i.trigger(t=e.Event("close"));if(t.isDefaultPrevented())return;i.removeClass("in"),e.support.transition&&i.hasClass("fade")?i.on(e.support.transition.end,s):s()};var r=e.fn.alert;e.fn.alert=function(t){return this.each(function(){var r=e(this),i=r.data("alert");i||r.data("alert",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.alert.Constructor=n,e.fn.alert.noConflict=function(){return e.fn.alert=r,this},e(document).on("click.alert.data-api",t,n.prototype.close)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.button.defaults,n)};t.prototype.setState=function(e){var t="disabled",n=this.$element,r=n.data(),i=n.is("input")?"val":"html";e+="Text",r.resetText||n.data("resetText",n[i]()),n[i](r[e]||this.options[e]),setTimeout(function(){e=="loadingText"?n.addClass(t).attr(t,t):n.removeClass(t).removeAttr(t)},0)},t.prototype.toggle=function(){var e=this.$element.closest('[data-toggle="buttons-radio"]');e&&e.find(".active").removeClass("active"),this.$element.toggleClass("active")};var n=e.fn.button;e.fn.button=function(n){return this.each(function(){var r=e(this),i=r.data("button"),s=typeof n=="object"&&n;i||r.data("button",i=new t(this,s)),n=="toggle"?i.toggle():n&&i.setState(n)})},e.fn.button.defaults={loadingText:"loading..."},e.fn.button.Constructor=t,e.fn.button.noConflict=function(){return e.fn.button=n,this},e(document).on("click.button.data-api","[data-toggle^=button]",function(t){var n=e(t.target);n.hasClass("btn")||(n=n.closest(".btn")),n.button("toggle")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.$indicators=this.$element.find(".carousel-indicators"),this.options=n,this.options.pause=="hover"&&this.$element.on("mouseenter",e.proxy(this.pause,this)).on("mouseleave",e.proxy(this.cycle,this))};t.prototype={cycle:function(t){return t||(this.paused=!1),this.interval&&clearInterval(this.interval),this.options.interval&&!this.paused&&(this.interval=setInterval(e.proxy(this.next,this),this.options.interval)),this},getActiveIndex:function(){return this.$active=this.$element.find(".item.active"),this.$items=this.$active.parent().children(),this.$items.index(this.$active)},to:function(t){var n=this.getActiveIndex(),r=this;if(t>this.$items.length-1||t<0)return;return this.sliding?this.$element.one("slid",function(){r.to(t)}):n==t?this.pause().cycle():this.slide(t>n?"next":"prev",e(this.$items[t]))},pause:function(t){return t||(this.paused=!0),this.$element.find(".next, .prev").length&&e.support.transition.end&&(this.$element.trigger(e.support.transition.end),this.cycle(!0)),clearInterval(this.interval),this.interval=null,this},next:function(){if(this.sliding)return;return this.slide("next")},prev:function(){if(this.sliding)return;return this.slide("prev")},slide:function(t,n){var r=this.$element.find(".item.active"),i=n||r[t](),s=this.interval,o=t=="next"?"left":"right",u=t=="next"?"first":"last",a=this,f;this.sliding=!0,s&&this.pause(),i=i.length?i:this.$element.find(".item")[u](),f=e.Event("slide",{relatedTarget:i[0],direction:o});if(i.hasClass("active"))return;this.$indicators.length&&(this.$indicators.find(".active").removeClass("active"),this.$element.one("slid",function(){var t=e(a.$indicators.children()[a.getActiveIndex()]);t&&t.addClass("active")}));if(e.support.transition&&this.$element.hasClass("slide")){this.$element.trigger(f);if(f.isDefaultPrevented())return;i.addClass(t),i[0].offsetWidth,r.addClass(o),i.addClass(o),this.$element.one(e.support.transition.end,function(){i.removeClass([t,o].join(" ")).addClass("active"),r.removeClass(["active",o].join(" ")),a.sliding=!1,setTimeout(function(){a.$element.trigger("slid")},0)})}else{this.$element.trigger(f);if(f.isDefaultPrevented())return;r.removeClass("active"),i.addClass("active"),this.sliding=!1,this.$element.trigger("slid")}return s&&this.cycle(),this}};var n=e.fn.carousel;e.fn.carousel=function(n){return this.each(function(){var r=e(this),i=r.data("carousel"),s=e.extend({},e.fn.carousel.defaults,typeof n=="object"&&n),o=typeof n=="string"?n:s.slide;i||r.data("carousel",i=new t(this,s)),typeof n=="number"?i.to(n):o?i[o]():s.interval&&i.pause().cycle()})},e.fn.carousel.defaults={interval:5e3,pause:"hover"},e.fn.carousel.Constructor=t,e.fn.carousel.noConflict=function(){return e.fn.carousel=n,this},e(document).on("click.carousel.data-api","[data-slide], [data-slide-to]",function(t){var n=e(this),r,i=e(n.attr("data-target")||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,"")),s=e.extend({},i.data(),n.data()),o;i.carousel(s),(o=n.attr("data-slide-to"))&&i.data("carousel").pause().to(o).cycle(),t.preventDefault()})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.collapse.defaults,n),this.options.parent&&(this.$parent=e(this.options.parent)),this.options.toggle&&this.toggle()};t.prototype={constructor:t,dimension:function(){var e=this.$element.hasClass("width");return e?"width":"height"},show:function(){var t,n,r,i;if(this.transitioning||this.$element.hasClass("in"))return;t=this.dimension(),n=e.camelCase(["scroll",t].join("-")),r=this.$parent&&this.$parent.find("> .accordion-group > .in");if(r&&r.length){i=r.data("collapse");if(i&&i.transitioning)return;r.collapse("hide"),i||r.data("collapse",null)}this.$element[t](0),this.transition("addClass",e.Event("show"),"shown"),e.support.transition&&this.$element[t](this.$element[0][n])},hide:function(){var t;if(this.transitioning||!this.$element.hasClass("in"))return;t=this.dimension(),this.reset(this.$element[t]()),this.transition("removeClass",e.Event("hide"),"hidden"),this.$element[t](0)},reset:function(e){var t=this.dimension();return this.$element.removeClass("collapse")[t](e||"auto")[0].offsetWidth,this.$element[e!==null?"addClass":"removeClass"]("collapse"),this},transition:function(t,n,r){var i=this,s=function(){n.type=="show"&&i.reset(),i.transitioning=0,i.$element.trigger(r)};this.$element.trigger(n);if(n.isDefaultPrevented())return;this.transitioning=1,this.$element[t]("in"),e.support.transition&&this.$element.hasClass("collapse")?this.$element.one(e.support.transition.end,s):s()},toggle:function(){this[this.$element.hasClass("in")?"hide":"show"]()}};var n=e.fn.collapse;e.fn.collapse=function(n){return this.each(function(){var r=e(this),i=r.data("collapse"),s=e.extend({},e.fn.collapse.defaults,r.data(),typeof n=="object"&&n);i||r.data("collapse",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.collapse.defaults={toggle:!0},e.fn.collapse.Constructor=t,e.fn.collapse.noConflict=function(){return e.fn.collapse=n,this},e(document).on("click.collapse.data-api","[data-toggle=collapse]",function(t){var n=e(this),r,i=n.attr("data-target")||t.preventDefault()||(r=n.attr("href"))&&r.replace(/.*(?=#[^\s]+$)/,""),s=e(i).data("collapse")?"toggle":n.data();n[e(i).hasClass("in")?"addClass":"removeClass"]("collapsed"),e(i).collapse(s)})}(window.jQuery),!function(e){"use strict";function r(){e(t).each(function(){i(e(this)).removeClass("open")})}function i(t){var n=t.attr("data-target"),r;n||(n=t.attr("href"),n=n&&/#/.test(n)&&n.replace(/.*(?=#[^\s]*$)/,"")),r=n&&e(n);if(!r||!r.length)r=t.parent();return r}var t="[data-toggle=dropdown]",n=function(t){var n=e(t).on("click.dropdown.data-api",this.toggle);e("html").on("click.dropdown.data-api",function(){n.parent().removeClass("open")})};n.prototype={constructor:n,toggle:function(t){var n=e(this),s,o;if(n.is(".disabled, :disabled"))return;return s=i(n),o=s.hasClass("open"),r(),o||s.toggleClass("open"),n.focus(),!1},keydown:function(n){var r,s,o,u,a,f;if(!/(38|40|27)/.test(n.keyCode))return;r=e(this),n.preventDefault(),n.stopPropagation();if(r.is(".disabled, :disabled"))return;u=i(r),a=u.hasClass("open");if(!a||a&&n.keyCode==27)return n.which==27&&u.find(t).focus(),r.click();s=e("[role=menu] li:not(.divider):visible a",u);if(!s.length)return;f=s.index(s.filter(":focus")),n.keyCode==38&&f>0&&f--,n.keyCode==40&&f<s.length-1&&f++,~f||(f=0),s.eq(f).focus()}};var s=e.fn.dropdown;e.fn.dropdown=function(t){return this.each(function(){var r=e(this),i=r.data("dropdown");i||r.data("dropdown",i=new n(this)),typeof t=="string"&&i[t].call(r)})},e.fn.dropdown.Constructor=n,e.fn.dropdown.noConflict=function(){return e.fn.dropdown=s,this},e(document).on("click.dropdown.data-api",r).on("click.dropdown.data-api",".dropdown form",function(e){e.stopPropagation()}).on("click.dropdown-menu",function(e){e.stopPropagation()}).on("click.dropdown.data-api",t,n.prototype.toggle).on("keydown.dropdown.data-api",t+", [role=menu]",n.prototype.keydown)}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=n,this.$element=e(t).delegate('[data-dismiss="modal"]',"click.dismiss.modal",e.proxy(this.hide,this)),this.options.remote&&this.$element.find(".modal-body").load(this.options.remote)};t.prototype={constructor:t,toggle:function(){return this[this.isShown?"hide":"show"]()},show:function(){var t=this,n=e.Event("show");this.$element.trigger(n);if(this.isShown||n.isDefaultPrevented())return;this.isShown=!0,this.escape(),this.backdrop(function(){var n=e.support.transition&&t.$element.hasClass("fade");t.$element.parent().length||t.$element.appendTo(document.body),t.$element.show(),n&&t.$element[0].offsetWidth,t.$element.addClass("in").attr("aria-hidden",!1),t.enforceFocus(),n?t.$element.one(e.support.transition.end,function(){t.$element.focus().trigger("shown")}):t.$element.focus().trigger("shown")})},hide:function(t){t&&t.preventDefault();var n=this;t=e.Event("hide"),this.$element.trigger(t);if(!this.isShown||t.isDefaultPrevented())return;this.isShown=!1,this.escape(),e(document).off("focusin.modal"),this.$element.removeClass("in").attr("aria-hidden",!0),e.support.transition&&this.$element.hasClass("fade")?this.hideWithTransition():this.hideModal()},enforceFocus:function(){var t=this;e(document).on("focusin.modal",function(e){t.$element[0]!==e.target&&!t.$element.has(e.target).length&&t.$element.focus()})},escape:function(){var e=this;this.isShown&&this.options.keyboard?this.$element.on("keyup.dismiss.modal",function(t){t.which==27&&e.hide()}):this.isShown||this.$element.off("keyup.dismiss.modal")},hideWithTransition:function(){var t=this,n=setTimeout(function(){t.$element.off(e.support.transition.end),t.hideModal()},500);this.$element.one(e.support.transition.end,function(){clearTimeout(n),t.hideModal()})},hideModal:function(){var e=this;this.$element.hide(),this.backdrop(function(){e.removeBackdrop(),e.$element.trigger("hidden")})},removeBackdrop:function(){this.$backdrop&&this.$backdrop.remove(),this.$backdrop=null},backdrop:function(t){var n=this,r=this.$element.hasClass("fade")?"fade":"";if(this.isShown&&this.options.backdrop){var i=e.support.transition&&r;this.$backdrop=e('<div class="modal-backdrop '+r+'" />').appendTo(document.body),this.$backdrop.click(this.options.backdrop=="static"?e.proxy(this.$element[0].focus,this.$element[0]):e.proxy(this.hide,this)),i&&this.$backdrop[0].offsetWidth,this.$backdrop.addClass("in");if(!t)return;i?this.$backdrop.one(e.support.transition.end,t):t()}else!this.isShown&&this.$backdrop?(this.$backdrop.removeClass("in"),e.support.transition&&this.$element.hasClass("fade")?this.$backdrop.one(e.support.transition.end,t):t()):t&&t()}};var n=e.fn.modal;e.fn.modal=function(n){return this.each(function(){var r=e(this),i=r.data("modal"),s=e.extend({},e.fn.modal.defaults,r.data(),typeof n=="object"&&n);i||r.data("modal",i=new t(this,s)),typeof n=="string"?i[n]():s.show&&i.show()})},e.fn.modal.defaults={backdrop:!0,keyboard:!0,show:!0},e.fn.modal.Constructor=t,e.fn.modal.noConflict=function(){return e.fn.modal=n,this},e(document).on("click.modal.data-api",'[data-toggle="modal"]',function(t){var n=e(this),r=n.attr("href"),i=e(n.attr("data-target")||r&&r.replace(/.*(?=#[^\s]+$)/,"")),s=i.data("modal")?"toggle":e.extend({remote:!/#/.test(r)&&r},i.data(),n.data());t.preventDefault(),i.modal(s).one("hide",function(){n.focus()})})}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("tooltip",e,t)};t.prototype={constructor:t,init:function(t,n,r){var i,s,o,u,a;this.type=t,this.$element=e(n),this.options=this.getOptions(r),this.enabled=!0,o=this.options.trigger.split(" ");for(a=o.length;a--;)u=o[a],u=="click"?this.$element.on("click."+this.type,this.options.selector,e.proxy(this.toggle,this)):u!="manual"&&(i=u=="hover"?"mouseenter":"focus",s=u=="hover"?"mouseleave":"blur",this.$element.on(i+"."+this.type,this.options.selector,e.proxy(this.enter,this)),this.$element.on(s+"."+this.type,this.options.selector,e.proxy(this.leave,this)));this.options.selector?this._options=e.extend({},this.options,{trigger:"manual",selector:""}):this.fixTitle()},getOptions:function(t){return t=e.extend({},e.fn[this.type].defaults,this.$element.data(),t),t.delay&&typeof t.delay=="number"&&(t.delay={show:t.delay,hide:t.delay}),t},enter:function(t){var n=e.fn[this.type].defaults,r={},i;this._options&&e.each(this._options,function(e,t){n[e]!=t&&(r[e]=t)},this),i=e(t.currentTarget)[this.type](r).data(this.type);if(!i.options.delay||!i.options.delay.show)return i.show();clearTimeout(this.timeout),i.hoverState="in",this.timeout=setTimeout(function(){i.hoverState=="in"&&i.show()},i.options.delay.show)},leave:function(t){var n=e(t.currentTarget)[this.type](this._options).data(this.type);this.timeout&&clearTimeout(this.timeout);if(!n.options.delay||!n.options.delay.hide)return n.hide();n.hoverState="out",this.timeout=setTimeout(function(){n.hoverState=="out"&&n.hide()},n.options.delay.hide)},show:function(){var t,n,r,i,s,o,u=e.Event("show");if(this.hasContent()&&this.enabled){this.$element.trigger(u);if(u.isDefaultPrevented())return;t=this.tip(),this.setContent(),this.options.animation&&t.addClass("fade"),s=typeof this.options.placement=="function"?this.options.placement.call(this,t[0],this.$element[0]):this.options.placement,t.detach().css({top:0,left:0,display:"block"}),this.options.container?t.appendTo(this.options.container):t.insertAfter(this.$element),n=this.getPosition(),r=t[0].offsetWidth,i=t[0].offsetHeight;switch(s){case"bottom":o={top:n.top+n.height,left:n.left+n.width/2-r/2};break;case"top":o={top:n.top-i,left:n.left+n.width/2-r/2};break;case"left":o={top:n.top+n.height/2-i/2,left:n.left-r};break;case"right":o={top:n.top+n.height/2-i/2,left:n.left+n.width}}this.applyPlacement(o,s),this.$element.trigger("shown")}},applyPlacement:function(e,t){var n=this.tip(),r=n[0].offsetWidth,i=n[0].offsetHeight,s,o,u,a;n.offset(e).addClass(t).addClass("in"),s=n[0].offsetWidth,o=n[0].offsetHeight,t=="top"&&o!=i&&(e.top=e.top+i-o,a=!0),t=="bottom"||t=="top"?(u=0,e.left<0&&(u=e.left*-2,e.left=0,n.offset(e),s=n[0].offsetWidth,o=n[0].offsetHeight),this.replaceArrow(u-r+s,s,"left")):this.replaceArrow(o-i,o,"top"),a&&n.offset(e)},replaceArrow:function(e,t,n){this.arrow().css(n,e?50*(1-e/t)+"%":"")},setContent:function(){var e=this.tip(),t=this.getTitle();e.find(".tooltip-inner")[this.options.html?"html":"text"](t),e.removeClass("fade in top bottom left right")},hide:function(){function i(){var t=setTimeout(function(){n.off(e.support.transition.end).detach()},500);n.one(e.support.transition.end,function(){clearTimeout(t),n.detach()})}var t=this,n=this.tip(),r=e.Event("hide");this.$element.trigger(r);if(r.isDefaultPrevented())return;return n.removeClass("in"),e.support.transition&&this.$tip.hasClass("fade")?i():n.detach(),this.$element.trigger("hidden"),this},fixTitle:function(){var e=this.$element;(e.attr("title")||typeof e.attr("data-original-title")!="string")&&e.attr("data-original-title",e.attr("title")||"").attr("title","")},hasContent:function(){return this.getTitle()},getPosition:function(){var t=this.$element[0];return e.extend({},typeof t.getBoundingClientRect=="function"?t.getBoundingClientRect():{width:t.offsetWidth,height:t.offsetHeight},this.$element.offset())},getTitle:function(){var e,t=this.$element,n=this.options;return e=t.attr("data-original-title")||(typeof n.title=="function"?n.title.call(t[0]):n.title),e},tip:function(){return this.$tip=this.$tip||e(this.options.template)},arrow:function(){return this.$arrow=this.$arrow||this.tip().find(".tooltip-arrow")},validate:function(){this.$element[0].parentNode||(this.hide(),this.$element=null,this.options=null)},enable:function(){this.enabled=!0},disable:function(){this.enabled=!1},toggleEnabled:function(){this.enabled=!this.enabled},toggle:function(t){var n=t?e(t.currentTarget)[this.type](this._options).data(this.type):this;n.tip().hasClass("in")?n.hide():n.show()},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}};var n=e.fn.tooltip;e.fn.tooltip=function(n){return this.each(function(){var r=e(this),i=r.data("tooltip"),s=typeof n=="object"&&n;i||r.data("tooltip",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.tooltip.Constructor=t,e.fn.tooltip.defaults={animation:!0,placement:"top",selector:!1,template:'<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',trigger:"hover focus",title:"",delay:0,html:!1,container:!1},e.fn.tooltip.noConflict=function(){return e.fn.tooltip=n,this}}(window.jQuery),!function(e){"use strict";var t=function(e,t){this.init("popover",e,t)};t.prototype=e.extend({},e.fn.tooltip.Constructor.prototype,{constructor:t,setContent:function(){var e=this.tip(),t=this.getTitle(),n=this.getContent();e.find(".popover-title")[this.options.html?"html":"text"](t),e.find(".popover-content")[this.options.html?"html":"text"](n),e.removeClass("fade top bottom left right in")},hasContent:function(){return this.getTitle()||this.getContent()},getContent:function(){var e,t=this.$element,n=this.options;return e=(typeof n.content=="function"?n.content.call(t[0]):n.content)||t.attr("data-content"),e},tip:function(){return this.$tip||(this.$tip=e(this.options.template)),this.$tip},destroy:function(){this.hide().$element.off("."+this.type).removeData(this.type)}});var n=e.fn.popover;e.fn.popover=function(n){return this.each(function(){var r=e(this),i=r.data("popover"),s=typeof n=="object"&&n;i||r.data("popover",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.popover.Constructor=t,e.fn.popover.defaults=e.extend({},e.fn.tooltip.defaults,{placement:"right",trigger:"click",content:"",template:'<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'}),e.fn.popover.noConflict=function(){return e.fn.popover=n,this}}(window.jQuery),!function(e){"use strict";function t(t,n){var r=e.proxy(this.process,this),i=e(t).is("body")?e(window):e(t),s;this.options=e.extend({},e.fn.scrollspy.defaults,n),this.$scrollElement=i.on("scroll.scroll-spy.data-api",r),this.selector=(this.options.target||(s=e(t).attr("href"))&&s.replace(/.*(?=#[^\s]+$)/,"")||"")+" .nav li > a",this.$body=e("body"),this.refresh(),this.process()}t.prototype={constructor:t,refresh:function(){var t=this,n;this.offsets=e([]),this.targets=e([]),n=this.$body.find(this.selector).map(function(){var n=e(this),r=n.data("target")||n.attr("href"),i=/^#\w/.test(r)&&e(r);return i&&i.length&&[[i.position().top+(!e.isWindow(t.$scrollElement.get(0))&&t.$scrollElement.scrollTop()),r]]||null}).sort(function(e,t){return e[0]-t[0]}).each(function(){t.offsets.push(this[0]),t.targets.push(this[1])})},process:function(){var e=this.$scrollElement.scrollTop()+this.options.offset,t=this.$scrollElement[0].scrollHeight||this.$body[0].scrollHeight,n=t-this.$scrollElement.height(),r=this.offsets,i=this.targets,s=this.activeTarget,o;if(e>=n)return s!=(o=i.last()[0])&&this.activate(o);for(o=r.length;o--;)s!=i[o]&&e>=r[o]&&(!r[o+1]||e<=r[o+1])&&this.activate(i[o])},activate:function(t){var n,r;this.activeTarget=t,e(this.selector).parent(".active").removeClass("active"),r=this.selector+'[data-target="'+t+'"],'+this.selector+'[href="'+t+'"]',n=e(r).parent("li").addClass("active"),n.parent(".dropdown-menu").length&&(n=n.closest("li.dropdown").addClass("active")),n.trigger("activate")}};var n=e.fn.scrollspy;e.fn.scrollspy=function(n){return this.each(function(){var r=e(this),i=r.data("scrollspy"),s=typeof n=="object"&&n;i||r.data("scrollspy",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.scrollspy.Constructor=t,e.fn.scrollspy.defaults={offset:10},e.fn.scrollspy.noConflict=function(){return e.fn.scrollspy=n,this},e(window).on("load",function(){e('[data-spy="scroll"]').each(function(){var t=e(this);t.scrollspy(t.data())})})}(window.jQuery),!function(e){"use strict";var t=function(t){this.element=e(t)};t.prototype={constructor:t,show:function(){var t=this.element,n=t.closest("ul:not(.dropdown-menu)"),r=t.attr("data-target"),i,s,o;r||(r=t.attr("href"),r=r&&r.replace(/.*(?=#[^\s]*$)/,""));if(t.parent("li").hasClass("active"))return;i=n.find(".active:last a")[0],o=e.Event("show",{relatedTarget:i}),t.trigger(o);if(o.isDefaultPrevented())return;s=e(r),this.activate(t.parent("li"),n),this.activate(s,s.parent(),function(){t.trigger({type:"shown",relatedTarget:i})})},activate:function(t,n,r){function o(){i.removeClass("active").find("> .dropdown-menu > .active").removeClass("active"),t.addClass("active"),s?(t[0].offsetWidth,t.addClass("in")):t.removeClass("fade"),t.parent(".dropdown-menu")&&t.closest("li.dropdown").addClass("active"),r&&r()}var i=n.find("> .active"),s=r&&e.support.transition&&i.hasClass("fade");s?i.one(e.support.transition.end,o):o(),i.removeClass("in")}};var n=e.fn.tab;e.fn.tab=function(n){return this.each(function(){var r=e(this),i=r.data("tab");i||r.data("tab",i=new t(this)),typeof n=="string"&&i[n]()})},e.fn.tab.Constructor=t,e.fn.tab.noConflict=function(){return e.fn.tab=n,this},e(document).on("click.tab.data-api",'[data-toggle="tab"], [data-toggle="pill"]',function(t){t.preventDefault(),e(this).tab("show")})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.$element=e(t),this.options=e.extend({},e.fn.typeahead.defaults,n),this.matcher=this.options.matcher||this.matcher,this.sorter=this.options.sorter||this.sorter,this.highlighter=this.options.highlighter||this.highlighter,this.updater=this.options.updater||this.updater,this.source=this.options.source,this.$menu=e(this.options.menu),this.shown=!1,this.listen()};t.prototype={constructor:t,select:function(){var e=this.$menu.find(".active").attr("data-value");return this.$element.val(this.updater(e)).change(),this.hide()},updater:function(e){return e},show:function(){var t=e.extend({},this.$element.position(),{height:this.$element[0].offsetHeight});return this.$menu.insertAfter(this.$element).css({top:t.top+t.height,left:t.left}).show(),this.shown=!0,this},hide:function(){return this.$menu.hide(),this.shown=!1,this},lookup:function(t){var n;return this.query=this.$element.val(),!this.query||this.query.length<this.options.minLength?this.shown?this.hide():this:(n=e.isFunction(this.source)?this.source(this.query,e.proxy(this.process,this)):this.source,n?this.process(n):this)},process:function(t){var n=this;return t=e.grep(t,function(e){return n.matcher(e)}),t=this.sorter(t),t.length?this.render(t.slice(0,this.options.items)).show():this.shown?this.hide():this},matcher:function(e){return~e.toLowerCase().indexOf(this.query.toLowerCase())},sorter:function(e){var t=[],n=[],r=[],i;while(i=e.shift())i.toLowerCase().indexOf(this.query.toLowerCase())?~i.indexOf(this.query)?n.push(i):r.push(i):t.push(i);return t.concat(n,r)},highlighter:function(e){var t=this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&");return e.replace(new RegExp("("+t+")","ig"),function(e,t){return"<strong>"+t+"</strong>"})},render:function(t){var n=this;return t=e(t).map(function(t,r){return t=e(n.options.item).attr("data-value",r),t.find("a").html(n.highlighter(r)),t[0]}),t.first().addClass("active"),this.$menu.html(t),this},next:function(t){var n=this.$menu.find(".active").removeClass("active"),r=n.next();r.length||(r=e(this.$menu.find("li")[0])),r.addClass("active")},prev:function(e){var t=this.$menu.find(".active").removeClass("active"),n=t.prev();n.length||(n=this.$menu.find("li").last()),n.addClass("active")},listen:function(){this.$element.on("focus",e.proxy(this.focus,this)).on("blur",e.proxy(this.blur,this)).on("keypress",e.proxy(this.keypress,this)).on("keyup",e.proxy(this.keyup,this)),this.eventSupported("keydown")&&this.$element.on("keydown",e.proxy(this.keydown,this)),this.$menu.on("click",e.proxy(this.click,this)).on("mouseenter","li",e.proxy(this.mouseenter,this)).on("mouseleave","li",e.proxy(this.mouseleave,this))},eventSupported:function(e){var t=e in this.$element;return t||(this.$element.setAttribute(e,"return;"),t=typeof this.$element[e]=="function"),t},move:function(e){if(!this.shown)return;switch(e.keyCode){case 9:case 13:case 27:e.preventDefault();break;case 38:e.preventDefault(),this.prev();break;case 40:e.preventDefault(),this.next()}e.stopPropagation()},keydown:function(t){this.suppressKeyPressRepeat=~e.inArray(t.keyCode,[40,38,9,13,27]),this.move(t)},keypress:function(e){if(this.suppressKeyPressRepeat)return;this.move(e)},keyup:function(e){switch(e.keyCode){case 40:case 38:case 16:case 17:case 18:break;case 9:case 13:if(!this.shown)return;this.select();break;case 27:if(!this.shown)return;this.hide();break;default:this.lookup()}e.stopPropagation(),e.preventDefault()},focus:function(e){this.focused=!0},blur:function(e){this.focused=!1,!this.mousedover&&this.shown&&this.hide()},click:function(e){e.stopPropagation(),e.preventDefault(),this.select(),this.$element.focus()},mouseenter:function(t){this.mousedover=!0,this.$menu.find(".active").removeClass("active"),e(t.currentTarget).addClass("active")},mouseleave:function(e){this.mousedover=!1,!this.focused&&this.shown&&this.hide()}};var n=e.fn.typeahead;e.fn.typeahead=function(n){return this.each(function(){var r=e(this),i=r.data("typeahead"),s=typeof n=="object"&&n;i||r.data("typeahead",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.typeahead.defaults={source:[],items:8,menu:'<ul class="typeahead dropdown-menu"></ul>',item:'<li><a href="#"></a></li>',minLength:1},e.fn.typeahead.Constructor=t,e.fn.typeahead.noConflict=function(){return e.fn.typeahead=n,this},e(document).on("focus.typeahead.data-api",'[data-provide="typeahead"]',function(t){var n=e(this);if(n.data("typeahead"))return;n.typeahead(n.data())})}(window.jQuery),!function(e){"use strict";var t=function(t,n){this.options=e.extend({},e.fn.affix.defaults,n),this.$window=e(window).on("scroll.affix.data-api",e.proxy(this.checkPosition,this)).on("click.affix.data-api",e.proxy(function(){setTimeout(e.proxy(this.checkPosition,this),1)},this)),this.$element=e(t),this.checkPosition()};t.prototype.checkPosition=function(){if(!this.$element.is(":visible"))return;var t=e(document).height(),n=this.$window.scrollTop(),r=this.$element.offset(),i=this.options.offset,s=i.bottom,o=i.top,u="affix affix-top affix-bottom",a;typeof i!="object"&&(s=o=i),typeof o=="function"&&(o=i.top()),typeof s=="function"&&(s=i.bottom()),a=this.unpin!=null&&n+this.unpin<=r.top?!1:s!=null&&r.top+this.$element.height()>=t-s?"bottom":o!=null&&n<=o?"top":!1;if(this.affixed===a)return;this.affixed=a,this.unpin=a=="bottom"?r.top-n:null,this.$element.removeClass(u).addClass("affix"+(a?"-"+a:""))};var n=e.fn.affix;e.fn.affix=function(n){return this.each(function(){var r=e(this),i=r.data("affix"),s=typeof n=="object"&&n;i||r.data("affix",i=new t(this,s)),typeof n=="string"&&i[n]()})},e.fn.affix.Constructor=t,e.fn.affix.defaults={offset:0},e.fn.affix.noConflict=function(){return e.fn.affix=n,this},e(window).on("load",function(){e('[data-spy="affix"]').each(function(){var t=e(this),n=t.data();n.offset=n.offset||{},n.offsetBottom&&(n.offset.bottom=n.offsetBottom),n.offsetTop&&(n.offset.top=n.offsetTop),t.affix(n)})})}(window.jQuery);
\ No newline at end of file
diff --git a/Web/content/js/visgui.js b/Web/content/js/visgui.js
new file mode 100644
index 00000000..a17cb9d3
--- /dev/null
+++ b/Web/content/js/visgui.js
@@ -0,0 +1,1003 @@
+/*ckwg +5
+ * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to
+ * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,
+ * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065.
+ */
+
+var IqrClassification = {
+  PositiveExample: 0,
+  NegativeExample: 1,
+  UnclassifiedExample: 2
+};
+
+/******************************************************************************
+ * Helper method: does nothing.
+ * @private
+ *****************************************************************************/
+var noop = function () {};
+
+/******************************************************************************
+ * vgWeb prototype object.
+ * @class vgWeb
+ * @constructor
+ *****************************************************************************/
+var vgWeb = function () {
+  var pv = {},
+      timeoutInstance = null,
+      shouldRunAnimation = false,
+      serviceURL = location.protocol + "//" +
+                   location.hostname + ":" + location.port + "/paraview",
+      refreshIntervalIds = [],
+      config = {
+        sessionManagerURL: serviceURL,
+        name: "File loader viz",
+        description: "3D visualization with ParaViewWeb 2.0",
+        application: "loader"
+      },
+      viewportId = ".videoPlayer",
+      viewport = $(viewportId),
+      videoPlayerId = null,
+      map,
+      markers = null,
+      markerCollection = {},
+      // Transform from WGS 1984
+      fromProjection = new OpenLayers.Projection("EPSG:4326"),
+      // to target projection (which depends on map type)
+      toProjection = null,
+      tracksMetadataMap = {},
+      that = null,
+      colorStops = [
+        {value: 0.97,
+         color: 'green'},
+        {value: 0.34,
+         color: 'yellow'},
+        {value: 0,
+         color: 'red'}
+      ],
+      currentStartTime = -1,
+      currentEndTime = -1,
+      currentRow = null;
+
+  /****************************************************************************
+   * Set state of 'busy' indicator.
+   * @private
+   * @param {boolean} state True to show busy indicator, false to hide it.
+   ***************************************************************************/
+  function setBusy (state) {
+    if (state) {
+      // $(".loading").show(); TODO?
+    } else {
+      // $(".loading").hide(); TODO?
+    }
+  }
+
+  /****************************************************************************
+   * Sort the result ID list in-place by the given field(s).
+   * @param {array} ids The result ID list to be sorted
+   * @param {array} results The result list
+   * @param {array} [field=["rank"]] The field(s) to sort on
+   * @param {boolean} [descending=false] Sort descending (rather than ascending)
+   * @private
+   ***************************************************************************/
+  function sortResults (ids, results, fields, descending) {
+    fields = fields || ['rank'];
+    descending = descending || [false];
+
+
+    ids.sort(function (a, b) {
+      var i, key, val;
+      for (i in fields) {
+        key = fields[i];
+        val = descending[i] ? -1 : 1;
+        if (results[a][key] != results[b][key]) {
+          return results[a][key] > results[b][key] ? val : -val;
+        }
+      }
+      return 0;
+    });
+  }
+
+  /****************************************************************************
+   * Construct a generic error callback.
+   * @private
+   * @param {string} msg Message to show in console on each error callback.
+   ***************************************************************************/
+  function createErrorCallback (msg) {
+    return function(e) {
+      console.log(msg);
+      if (e !== null) {
+        for (line in e.detail) {
+          console.log(e.detail[line]);
+        }
+      }
+    }
+  }
+
+  /****************************************************************************
+   * ParaView session error callback.
+   * @private
+   * @param code This parameter is ignored.
+   * @param reason This parameter is written to the console.
+   ***************************************************************************/
+  function pvErrorCallback(code, reason) {
+    setBusy(false);
+    console.log(reason);
+  }
+
+  /****************************************************************************
+   * ParaView session connect callback, called when the ParaView session is
+   * connected and ready.
+   * @private
+   * @param connection The connection configuration object.
+   ***************************************************************************/
+  function pvConnectCallback (connection) {
+    setBusy(false);
+
+    // Save session for later
+    pv.session = connection.session;
+
+    // Create viewport
+    pv.viewport = paraview.createViewport({ session: connection.session });
+    pv.viewport.bind(viewportId);
+
+    // Initialize visualization
+    pv.session.call("pv:createVideoPlayer").then(
+      vpCreateCallback,
+      createErrorCallback('Failed to create video player'));
+  }
+
+  /****************************************************************************
+   * ParaView session start callback.
+   * @private
+   * @param connection The connection configuration object.
+   ***************************************************************************/
+  function pvStartCallback (connection) {
+    pv.connection = connection;
+    if(connection.error) {
+      alert(connection.error);
+      window.close(); /// @todo don't kill browser on error
+      return;
+    }
+
+    console.log('start: connecting session');
+    pvConnectSession();
+  }
+
+  /****************************************************************************
+   * ParaView session start error callback. If an error occurs trying to start
+   * the session, retry with the embedded URL.
+   * @private
+   ***************************************************************************/
+  function pvRetryCallback () {
+    console.log(
+      "The remote session did not properly start. Trying embedded URL.");
+
+    pv.connection = {
+      sessionURL: "ws://" + location.hostname + ":" + location.port + "/ws"
+    };
+    console.log('connect session ', this, pv);
+    pvConnectSession();
+  }
+
+  /****************************************************************************
+   * Connect ParaView session.
+   * @private
+   ***************************************************************************/
+  function pvConnectSession () {
+    if(location.protocol == "http:") {
+      pv.connection.sessionURL =
+        pv.connection.sessionURL.replace("wss:", "ws:");
+    }
+
+    setBusy(true);
+    console.log('connect session ', this, pv);
+    paraview.connect(pv.connection, pvConnectCallback, pvErrorCallback);
+  }
+
+  /****************************************************************************
+   * Video player create callback. This stores the handle of the successfully
+   * created video player.
+   * @private
+   * @param vpId The id of the video player.
+   ***************************************************************************/
+  function vpCreateCallback (vpId) {
+    videoPlayerId = vpId;
+  }
+
+  /****************************************************************************
+   * Video player set data callback.
+   * @private
+   * @param {string} err Error message, if an error occurred.
+   ***************************************************************************/
+  function vpSetVideoDataCallback (err) {
+    if (err !== null) {
+      console.log('Failed to set video data: ', err);
+    }
+
+    pv.viewport.render();
+  }
+
+  /****************************************************************************
+   * Format a date string from Unix time.
+   * @private
+   * @param {integer} microseconds Number of microseconds since epoch.
+   * @param {boolean} longForm Whether to return long or short form.
+   ***************************************************************************/
+  function formatDate (microseconds, longForm) {
+    if (!microseconds) {
+        return '-';
+    }
+    var date = new Date(microseconds / 1000);
+    var dayStr = date.getFullYear() + '-' +
+                ('0' + (date.getMonth()+1)).slice(-2) + '-' +
+                ('0' + date.getDate()).slice(-2);
+    var timeStr = ('0' + date.getHours()).slice(-2) + ':' +
+                  ('0' + date.getMinutes()).slice(-2) + ':' +
+                  ('0' + date.getSeconds()).slice(-2);
+    if (longForm) {
+      var subsecStr = date.getMilliseconds() + (microseconds % 1000);
+      return dayStr + ' ' + timeStr + '.' + subsecStr;
+    } else {
+      return timeStr;
+    }
+  }
+
+  /****************************************************************************
+   * Window resize callback. Refreshes the render view from the server.
+   * @private
+   ***************************************************************************/
+  function windowResizeCallback () {
+    if(pv.viewport) {
+      pv.viewport.render();
+    }
+    // Resize the Google Maps viewport to fit the window height
+    var winHeight = $(window).height();
+    $('#map-canvas').height(winHeight - 90);
+
+    var activeTab = $('.query-results .tab-pane.active');
+
+    // Set max height on the query results view so it stays in the window
+    var desiredHeight = winHeight - activeTab.offset().top - 70;
+    var h = Math.max(desiredHeight, 80) + 'px';
+    $('#active-results').css('max-height', h);
+    $('#active-feedback-requests').css('max-height', h);
+  }
+
+  /****************************************************************************
+   * Make specified result 'selected'. This is called as a callback when a
+   * result tr element is clicked.
+   * @private
+   ***************************************************************************/
+  function selectResult (event) {
+    var $selectedRow = $(this);
+
+    if ($selectedRow.hasClass('highlight')) {
+      undoSelectResult();
+      event.stopPropagation();
+      return;
+    }
+
+    $('div.visgui-result-row.highlight').removeClass('highlight');
+    $selectedRow.addClass('highlight');
+
+    var iid = parseInt($selectedRow.attr('result-instance-id'), 10);
+
+    currentStartTime = parseInt($selectedRow.attr('start-time'), 10);
+    currentEndTime = parseInt($selectedRow.attr('end-time'), 10);
+    $('div#video-scrubber').slider('option', {
+                              disabled: false,
+                              min: currentStartTime,
+                              max: currentEndTime
+                            });
+    updateTimestampDisplay(currentStartTime);
+
+    undoHighlightMarkers();
+    highlightMarker(markerCollection[iid]);
+
+    that.displayTracksMetadata(tracksMetadataMap[iid]);
+    pv.session.call("pv:setVideoData", videoPlayerId, iid).then(
+      vpSetVideoDataCallback,
+      createErrorCallback('Failed to set video data'));
+
+    event.stopPropagation();
+  }
+
+  /****************************************************************************
+   * Undo mark selection action previously performed.
+   * @private
+   ***************************************************************************/
+  function undoSelectResult() {
+    $('div.visgui-result-row.highlight').removeClass('highlight');
+    for (markerId in markerCollection) {
+      if (markerCollection.hasOwnProperty(markerId)) {
+        undoHighlightMarker(markerCollection[markerId]);
+      }
+    }
+   }
+
+  /****************************************************************************
+   * Get the css color for a result swatch. For now, simply colors by score.
+   * @param result The result object.
+   * @private
+   ***************************************************************************/
+  function getResultColor (result) {
+    for (var i = 0; i < colorStops.length; i++) {
+      if (result.relevancyScore > colorStops[i].value) {
+        return colorStops[i].color;
+      }
+    }
+    return 'gray';
+  }
+
+  /****************************************************************************
+   * Call this whenever the video timestamp changes. This will update the
+   * relevant view components accordingly.
+   * @param timestamp The raw timestamp value.
+   * @private
+   ***************************************************************************/
+  function updateTimestampDisplay (timestamp) {
+    if (timestamp >= currentStartTime && timestamp <= currentEndTime) {
+      $('div#video-scrubber').slider('option', 'value', timestamp);
+      $('div.video-timestamp').text(formatDate(timestamp));
+    }
+  }
+
+  /****************************************************************************
+   * Update the video render view.
+   * @private
+   ***************************************************************************/
+  function render () {
+    pv.session.call("pv:render");
+    pv.viewport.render();
+  }
+
+  /****************************************************************************
+   * Show a generic indeterminate loading dialog.
+   * @param message The message to display next to the loading icon.
+   * @private
+   ***************************************************************************/
+  function showLoadingDialog (message) {
+    $('div#loading-dialog').modal().find('span.loading-message').text(message);
+  }
+
+  function hideLoadingDialog () {
+    $('div#loading-dialog').modal('hide');
+  }
+
+  /****************************************************************************
+   * Video play callback.
+   * @timestamp The current timestamp of the video.
+   * @private
+   ***************************************************************************/
+  function vpPlayCallback (timestamp) {
+    updateTimestampDisplay(timestamp);
+    render();
+    if (shouldRunAnimation) {
+      timeoutInstance = setTimeout(vpAnimateCallback, 1);
+    }
+  }
+
+  /****************************************************************************
+   * Video stop callback.
+   * @private
+   ***************************************************************************/
+  function vpStopCallback () {
+    timeoutInstance = null;
+  }
+
+  /****************************************************************************
+   * Video animation ('tick') callback.
+   * @private
+   ***************************************************************************/
+  function vpAnimateCallback () {
+    pv.session.call("pv:videoPlayer:play", videoPlayerId).then(
+      vpPlayCallback, createErrorCallback('Failed to play video'));
+  }
+
+  /****************************************************************************
+   * Stop the video playback.
+   * @private
+   ***************************************************************************/
+  function stopVideo () {
+    pv.session.call("pv:videoPlayer:stop", videoPlayerId).then(
+      vpStopCallback, createErrorCallback('Failed to stop video playback'));
+  }
+
+  /****************************************************************************
+   * Callback from the video scrubber slider being changed. Note that this
+   * is called in both the case of programmatic value updates as well as
+   * manual user-controlled changes.  We want to ignore the programmatic ones
+   * and only update the video when manual changes are made.
+   * @param event The update event
+   * @param ui The slider widget object.
+   * @private
+   ***************************************************************************/
+  function videoSliderChanged (event, ui) {
+    if (event.originalEvent) { // test if this is a manual slider change
+      var pos = parseInt(ui.value, 10);
+      pv.session.call("pv:videoPlayer:seek", videoPlayerId, pos).then(
+        vpPlayCallback, createErrorCallback('Failed to seek video'));
+    }
+  }
+
+  /****************************************************************************
+   * Set a rating on a result for IQR.
+   * @param row The jQuerified result row DOM element.
+   * @param {int} value IqrClassification enum value.
+   * @private
+   ***************************************************************************/
+  function setRating (row, value) {
+    var iid = parseInt(row.attr('result-instance-id')),
+        rows = $('.visgui-result-row[result-instance-id=' + iid + ']');
+
+    var cols = rows.find('.col-number');
+
+    if (value == IqrClassification.PositiveExample) {
+      cols.removeClass('not-relevant').addClass('relevant');
+    }
+    else if (value == IqrClassification.NegativeExample) {
+      cols.removeClass('relevant').addClass('not-relevant');
+    }
+    else {
+      cols.removeClass('relevant not-relevant');
+    }
+    pv.session.call("pv:query:setResultFeedback", iid, value).then(
+      noop, createErrorCallback('Failed to set result feedback'));
+  }
+
+  // Initial page loading behavior should go here.
+  $(document).ready(function () {
+    $('div#video-scrubber').slider({
+      disabled: true,
+      change: videoSliderChanged
+    });
+
+    // Bind these actions here since the context menu is a singleton
+    $('#result-context-menu .rate-relevant-action').click(function () {
+      setRating(currentRow, IqrClassification.PositiveExample);
+    });
+    $('#result-context-menu .rate-not-relevant-action').click(function () {
+      setRating(currentRow, IqrClassification.NegativeExample);
+    });
+    $('#result-context-menu .remove-rating-action').click(function () {
+      setRating(currentRow, IqrClassification.UnclassifiedExample);
+    });
+  });
+
+  /****************************************************************************
+   * Initialize openstreetmap view.
+   * @private
+   ***************************************************************************/
+  function initializeOsmMap (nodeId, mapConfig) {
+    var layerConfigs = mapConfig["osm_map_layers"] || [];
+
+    map = new OpenLayers.Map(nodeId);
+    var layer = null, i = 0;
+    for (i = 0; i < layerConfigs.length; ++i) {
+      layer = layerConfigs[i];
+      var layerType = layer["type"] || "OSM";
+      if (layerType == "OSM") {
+        map.addLayer(
+          new OpenLayers.Layer.OSM(layer["name"], layer["urls"]));
+        // Spherical Mercator Projection
+        toProjection = new OpenLayers.Projection("EPSG:900913")
+      }
+      else if (layerType == "WMS") {
+        map.addLayer(
+          new OpenLayers.Layer.WMS(layer["name"], layer["url"],
+                                   layer["params"]));
+        // WGS 1984
+        toProjection = new OpenLayers.Projection("EPSG:4326")
+      }
+      else {
+        console.log('unknown map layer type ' + layerType);
+      }
+    }
+
+    map.zoomToMaxExtent();
+  }
+
+  /****************************************************************************
+   * Fade-out a marker.
+   * @param marker Marker instance.
+   * @param value {number} Opacity [0-1] for the marker. Default is 0.2.
+   * @private
+   ***************************************************************************/
+  function fadeOutMarker(marker, value) {
+    if (!marker) {
+      return;
+    }
+
+    // Default is 0.2
+    var val = 0.2;
+    if (typeof value !== 'undefined' && value !== null) {
+      val = value;
+    }
+    marker.setOpacity(val);
+  }
+
+  /****************************************************************************
+   * Fade-out markers.
+   * @param value {number} Opacity [0-1] for the markers.
+   * @private
+   ***************************************************************************/
+  function fadeOutMarkers(value) {
+    var markerId = null;
+    for (markerId in markerCollection) {
+      if (markerCollection.hasOwnProperty(markerId)) {
+        fadeOutMarker(markerCollection[markerId], value);
+      }
+    }
+  }
+
+  /****************************************************************************
+   * Fade-in a marker.
+   * @param marker Marker instance.
+   * @param value {number} Opacity [0-1] for the marker. Default is 1.0.
+   * @private
+   ***************************************************************************/
+  function fadeInMarker(marker, value) {
+    if (!marker) {
+      return;
+    }
+    var val = 1.0;
+    if (typeof value !== 'undefined' && value !== null) {
+      val = value;
+    }
+    marker.setOpacity(val);
+  }
+
+  /****************************************************************************
+   * Fade-in markers.
+   * @param value {number} Opacity [0-1] for the markers.
+   * @private
+   ***************************************************************************/
+  function fadeInMarkers(value) {
+    var markerId = null;
+    for (markerId in markerCollection) {
+      if (markerCollection.hasOwnProperty(markerId)) {
+        fadeInMarker(markerCollection[markerId], value);
+      }
+    }
+  }
+
+  /****************************************************************************
+   * Highlight selected marker.
+   * @param marker Marker instance.
+   * @private
+   ***************************************************************************/
+  function highlightMarker (marker) {
+    fadeOutMarkers(0.0);
+    if (marker) {
+      marker.setUrl('/images/icons/marker-gold.png');
+      fadeInMarker(marker, 1.0);
+    }
+  }
+
+  /****************************************************************************
+   * Undo highlight marker.
+   * @param marker Marker instance.
+   * @private
+   ***************************************************************************/
+  function undoHighlightMarker (marker) {
+    if (marker) {
+      marker.setUrl('/images/icons/marker-blue.png');
+      fadeInMarker(marker, 1.0);
+    }
+  }
+
+  /****************************************************************************
+   * Undo highlight for all markers.
+   * @param value Opacity [0-1] for the markers.
+   * @private
+   ***************************************************************************/
+  function undoHighlightMarkers (value) {
+    var markerId = null;
+    for (markerId in markerCollection) {
+      if (markerCollection.hasOwnProperty(markerId)) {
+        undoHighlightMarker(markerCollection[markerId], value);
+      }
+    }
+  }
+
+  /****************************************************************************
+   * Clear cached data for visualization purpose.
+   * @private
+   ***************************************************************************/
+  function clearCache () {
+    markerCollection = {};
+  }
+
+  /****************************************************************************
+   * Helper function to create the DOM element for each result row.
+   * @param result The result object.
+   * @param row The DOM element to instantiate.
+   * @private
+   ***************************************************************************/
+  function makeResultRow (result, row, scoreField) {
+    scoreField = scoreField || 'relevancyScore';
+    row.addClass('visgui-result-row')
+       .attr('result-instance-id', result.instanceId)
+       .attr('start-time', result.startTime)
+       .attr('end-time', result.endTime);
+
+    row.find('.col-number').html(result.instanceId);
+    row.find('.col-rank').html(result.rank);
+    row.find('.col-score').html(result[scoreField].toFixed(3)).tooltip({
+      title: result[scoreField],
+      animation: false
+    });
+    row.find('.col-start-time').html(formatDate(result.startTime)).tooltip({
+      title: formatDate(result.startTime, true),
+      animation: false
+    });
+    row.find('.col-end-time').html(formatDate(result.endTime)).tooltip({
+      title: formatDate(result.endTime, true),
+      animation: false
+    });
+    row.find('.visgui-color-swatch').css('background-color',
+                                          getResultColor(result));
+
+    if (result.userScore == IqrClassification.PositiveExample) {
+      row.find('.col-number').addClass('relevant');
+    }
+    else if (result.userScore == IqrClassification.NegativeExample) {
+      row.find('.col-number').addClass('not-relevant');
+    }
+
+    // Add ability to select results, fade them in, and add context menu
+    row.click(selectResult)
+       .fadeIn('slow')
+       .contextmenu({ // put this last as $.fn.contextmenu() doesn't chain
+         target: '#result-context-menu',
+         before: function (e, target) {
+           currentRow = target;
+           return true;
+         }
+       });
+
+    return row;
+  }
+
+  /**************************************************************************
+   * Add result markers layer to the map.
+   *************************************************************************/
+  function addResultMarkersLayer() {
+    markers = new OpenLayers.Layer.Markers("Markers");
+    map.addLayer(markers);
+  }
+
+  /**************************************************************************
+   * Remove result markers layer from the map.
+   *************************************************************************/
+  function removeResultMarkersLayer() {
+    if (markers) {
+      markers.destroy();
+      markers = null;
+    }
+  }
+
+  return {
+    /**************************************************************************
+     * Return a key-value store containing the configuration option contained
+     * in the inputfile.
+     *************************************************************************/
+    parseConfig : function (configUrl, callback) {
+      $.get(configUrl, function (data) {
+        if ( !data || data === "") {
+          // error
+          return;
+        }
+
+        var json;
+        try {
+          json = jQuery.parseJSON(data);
+        }
+        catch (e) {
+          console.log("error parsing configuration: " + e)
+          return;
+        }
+        callback(json || {});
+      }, "text");
+    },
+
+    /**************************************************************************
+     * Start a paraview session.
+     *************************************************************************/
+    startSession: function () {
+      if(!$('body').hasClass("initialized")) {
+        $('body').addClass("initialized");
+
+        setBusy(true);
+        console.log('starting session');
+        paraview.start(config, pvStartCallback, pvRetryCallback);
+      }
+    },
+
+    /**************************************************************************
+     * Initialize view.
+     *************************************************************************/
+    initializeView: function (mapConfig) {
+      // Bind events to actions
+      $('#results').click(vgweb.undoSelectResult);
+
+      // Make the viewport be full screen
+      $(window).resize(windowResizeCallback).trigger('resize');
+
+      // Default is openstreetmap
+      initializeOsmMap('map-canvas', mapConfig);
+    },
+
+    /**************************************************************************
+     * Force a refresh of the ParaView render window on the client.
+     *************************************************************************/
+    updateView: function () {
+      if(pv.viewport) {
+        pv.viewport.invalidateScene();
+      }
+    },
+
+    /**************************************************************************
+     * Close ParaView session. This should be called when the application is
+     * about to close.
+     *************************************************************************/
+    endSession: function () {
+      if(pv.session) {
+        pv.viewport.unbind();
+        paraview.stop(pv.connection);
+        pv = {};
+      }
+    },
+
+    /**************************************************************************
+     * Call this when a query file has been chosen. The chosen file
+     * must reside in a file input element with id "query-file-input".
+     *************************************************************************/
+    querySelected: function () {
+      var file = $('#query-file-input').get(0).files[0];
+      if (file) {
+        this.uploadAndExecuteQuery();
+      }
+    },
+
+    /**************************************************************************
+     * IQR: refine results.
+     *************************************************************************/
+    refineResults: function () {
+      that = this;
+
+      showLoadingDialog('Refining results...');
+      pv.session.call("pv:query:refine").then(function (okay) {
+        if (okay) {
+          refreshIntervalIds.push(
+            setInterval(function() { that.checkIfCompleted(); }, 1000));
+        } else {
+          console.log('Failed to refine query');
+          hideLoadingDialog();
+        }
+      },
+      function (err) {
+        hideLoadingDialog();
+        createErrorCallback('Failed to refine query')(err);
+      });
+    },
+
+    /**************************************************************************
+     * This should be called after a query has been selected in the
+     * $('#query-input-file') input element. Uploads and executes the
+     * selected query.
+     *************************************************************************/
+    uploadAndExecuteQuery: function () {
+      var file = $('#query-file-input').get(0).files[0];
+      var reader = new FileReader();
+      that = this;
+
+      reader.onload = function (e) { that.executeQuery(e.target.result); };
+      reader.readAsText(file);
+    },
+
+    /**************************************************************************
+     * Execute a query from a file loaded previously.
+     * @param queryPlan
+     *************************************************************************/
+    executeQuery: function (queryPlan) {
+      that = this;
+      pv.session.call("pv:getQueryUrl").then(function (queryUrl) {
+        if (queryUrl === '') {
+          console.log('invalid query url');
+          return;
+        }
+        pv.session.call("pv:executeQuery", queryUrl, queryPlan, 1500).then(
+          function(reply) {
+            if (reply === false) {
+              // Query failed to execute
+              pv.session.call("pv:query:getStatus").then(function(status) {
+                console.log('Failed to execute query: ' + status);
+              });
+              return;
+            }
+            // Query is executing; wait for it to finish
+            showLoadingDialog('Executing query...');
+            refreshIntervalIds.push(
+              setInterval(function() { that.checkIfCompleted(); }, 1000));
+          }, function (error) {
+            hideLoadingDialog();
+            createErrorCallback('Failed to execute query')(error);
+          });
+      });
+    },
+
+    /**************************************************************************
+     * Check if the last executed query is completed, and display the results
+     * if it is.
+     *************************************************************************/
+    checkIfCompleted: function () {
+      that = this;
+      var i = 0;
+      pv.session.call("pv:query:isCompleted").then(function(reply) {
+        if (reply === true) {
+          for (i = 0; i < refreshIntervalIds.length; ++i) {
+            clearInterval(refreshIntervalIds[i]);
+          }
+          pv.session.call("pv:query:getAllResults", 0, 100).then(
+            function (resp) {
+              hideLoadingDialog();
+              that.displayResults(resp.resultIds, resp.feedbackIds,
+                                  resp.results);
+            },
+            createErrorCallback('Failed to retrieve results'));
+        }
+      });
+    },
+
+    /**************************************************************************
+     * Display results returned by query execution.
+     * @param results The serialized result set
+     * @param feedbackIds The iid's of results with feedback requests
+     *************************************************************************/
+    displayResults: function (resultIds, feedbackIds, results) {
+      that = this;
+      var activeResults = $("#active-results"),
+          feedbackRequests = $("#active-feedback-requests"),
+          data = {},
+          center = [0.0, 0.0],
+          locationCount = 0;
+
+      // Clear any previous results
+      activeResults.find('div.visgui-result-row').remove();
+      feedbackRequests.find('div.visgui-result-row').remove();
+      tracksMetadataMap = {};
+
+      // Clear cache
+      clearCache();
+
+      // Remove layers that are no longer valid
+      removeResultMarkersLayer();
+
+      // Iterate through all results and display them on the map
+      $.each(results, function(idx, result) {
+        tracksMetadataMap[result.instanceId] = result.tracks;
+
+        // Draw locations on the map
+        if (result.location) {
+          if (!markers) {
+            addResultMarkersLayer();
+          }
+          lat = result.location.northing;
+          lon = result.location.easting;
+
+          center[0] += lat;
+          center[1] += lon;
+          locationCount++;
+
+          var size = new OpenLayers.Size(21, 25);
+          var offset = new OpenLayers.Pixel(-(size.w/2), -size.h);
+          var icon = new OpenLayers.Icon('/images/icons/marker-blue.png',
+                                         size, offset);
+          var xf = new OpenLayers.LonLat(lon, lat).transform(fromProjection,
+                                                             toProjection)
+          var marker = new OpenLayers.Marker(xf, icon)
+          markers.addMarker(marker);
+          markerCollection[result.instanceId] =  marker;
+        }
+      });
+
+      // Iterate through sorted result ID list and add to the result list
+      sortResults(resultIds, results);
+      $.each(resultIds, function(idx, iid) {
+        var row = $('div#template-result-row').clone().removeAttr('id'),
+            result = results[iid];
+        activeResults.append(makeResultRow(result, row));
+      });
+
+      // Iterate through sorted feedback request IDs and add to the feedback
+      // requests list
+      sortResults(feedbackIds, results,
+                  ['preferenceScore', 'instanceId'], [true, false]);
+      $.each(feedbackIds, function(idx, iid) {
+        var row = $('div#template-feedback-row').clone().removeAttr('id'),
+            result = results[iid];
+        feedbackRequests.append(makeResultRow(result, row, 'preferenceScore'));
+      });
+
+      // Compute center location of results
+      if (locationCount > 0) {
+        center[0] /= locationCount;
+        center[1] /= locationCount;
+
+        // Set new center and zoom for map
+        map.setCenter(new OpenLayers.LonLat(center[1], center[0]).transform(
+          fromProjection, toProjection), 10, false, false);
+      }
+    },
+
+    /**************************************************************************
+     * Display tracks meta data.
+     * @param tracksMetadata
+     *************************************************************************/
+    displayTracksMetadata: function (tracksMetadata) {
+      var tableVideoMetadata = $('#table-videometadata'),
+          i = null;
+
+      // Clear previous display
+      $('#table-videometadata tbody tr').remove();
+
+      for (i = 0; i < tracksMetadata.length; ++i) {
+        var row = $(document.createElement('tr'));
+        row.append('<td><label class="checkbox">' +
+                   '<input type="checkbox">' +
+                   'Track-' + tracksMetadata[i].id.serialNumber +
+                   '</label></td>');
+        row.append('<td>' + tracksMetadata[i].id.source + '</td>');
+        row.append('<td>' + '' + '</td>');
+        row.append('<td>' + '' + '</td>');
+        tableVideoMetadata.append(row);
+      }
+    },
+
+    /**************************************************************************
+     * Toggle display of trails in video.
+     *************************************************************************/
+    toggleTrails: function () {
+      // Get state; it is opposite because the change hasn't been applied yet
+      // when we are called
+      var state = !$('#toggle_trails').hasClass('active');
+      pv.session.call("pv:videoPlayer:setTrailsVisible",
+                      videoPlayerId, state).then(
+        render, createErrorCallback('Failed to set trail visibility'));
+    },
+
+    /**************************************************************************
+     * Undo all selections
+     *************************************************************************/
+    undoSelectResult: function () {
+      undoSelectResult();
+    },
+
+    /**************************************************************************
+     * Begin video playback. If video is running already, restarts it.
+     *************************************************************************/
+    runAnimation: function () {
+      if (timeoutInstance) {
+        clearTimeout(timeoutInstance);
+        timeoutInstance = null;
+        pv.session.call("pv:videoPlayer:stop", videoPlayerId).then(
+          this.runAnimation,
+          createErrorCallback('Failed to restart video playback'));
+      }
+      else {
+        shouldRunAnimation = true;
+        timeoutInstance = setTimeout(vpAnimateCallback, 1);
+      }
+    },
+
+    /**************************************************************************
+     * Stop video playback.
+     *************************************************************************/
+    stopAnimation: function () {
+      shouldRunAnimation = false;
+      clearTimeout(timeoutInstance);
+      stopVideo();
+    }
+  };
+};
diff --git a/Web/vgweb.sh.in b/Web/vgweb.sh.in
new file mode 100755
index 00000000..970900c4
--- /dev/null
+++ b/Web/vgweb.sh.in
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+prefix=$(cd "${BASH_SOURCE%/*}/.."; pwd)
+
+LD_LIBRARY_PATH=$prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=$prefix/lib@LIB_SUFFIX@:$LD_LIBRARY_PATH
+
+PYTHONPATH=$prefix/lib@LIB_SUFFIX@${PYTHONPATH:+:$PYTHONPATH}
+PYTHONPATH=$prefix/lib@LIB_SUFFIX@/@PYTHON_SHORT@/site-packages:$PYTHONPATH
+PYTHONPATH=$prefix/lib/@PYTHON_SHORT@/site-packages:$PYTHONPATH
+
+PATH=$prefix/bin:$PATH
+export PYTHONPATH LD_LIBRARY_PATH PATH
+
+data=$prefix/share/VisGUI/www
+common_content=$data/content
+app_data=$data/apps/@APPLICATION@
+app_content=$app_data/content
+script=$app_data/bin/@SERVER_PYTHON_SCRIPT@
+
+exec pvpython $script \
+  --port ${PORT:-8080} \
+  --content $common_content \
+  --app-content $app_content \
+  "$@"
diff --git a/setupDevel.sh.in b/setupDevel.sh.in
new file mode 100755
index 00000000..44f90374
--- /dev/null
+++ b/setupDevel.sh.in
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+add_library_path() {
+  if [ -n "$1" ]; then
+    dir="$(dirname "$1")"
+
+    LD_LIBRARY_PATH="$dir:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+    export LD_LIBRARY_PATH
+  fi
+}
+
+add_library_path "@LIBJSON_LIBRARY@"
+add_library_path "@GeographicLib_LIBRARY@"
+add_library_path "@GDAL_LIBRARY@"
+add_library_path "@PROJ4_LIBRARY@"
diff --git a/vgExport.cmake b/vgExport.cmake
new file mode 100644
index 00000000..97eaba9b
--- /dev/null
+++ b/vgExport.cmake
@@ -0,0 +1,41 @@
+set(PROJECT VISGUI)
+set(INCLUDE_GUARD __vgExport_h)
+
+set(CONTENT_HEADER
+"/*ckwg +5"
+" * Copyright 2013 by Kitware, Inc. All Rights Reserved. Please refer to"
+" * KITWARE_LICENSE.TXT for licensing information, or contact General Counsel,"
+" * Kitware, Inc., 28 Corporate Drive, Clifton Park, NY 12065."
+" */"
+)
+
+set(CONTENT_PRE_EXPORTS
+"// Disable warning caused from static VTK and shared visgui"
+"#ifdef _MSC_VER"
+"#  pragma warning (disable:4275) /* non-DLL-interface base class used */"
+"#endif"
+)
+
+add_export(qtTestingSupport QT_TESTINGSUPPORT)
+add_export(qtExtensions     QTE)
+add_export(qtVgCommon       QTVG_COMMON)
+add_export(qtVgWidgets      QTVG_WIDGETS)
+add_export(vgCommon         VG_COMMON)
+add_export(vgVideo          VG_VIDEO)
+add_export(vgVtkVideo       VG_VTKVIDEO)
+add_export(vgDataFramework  VG_DATA_FRAMEWORK)
+add_export(vspData          VSP_DATA)
+add_export(vspSourceUtil    VSP_SOURCEUTIL)
+add_export(vspUserInterface VSP_USERINTERFACE)
+add_export(vtkVgCore        VTKVG_CORE)
+add_export(vtkVgIO          VTKVG_IO)
+add_export(vtkVgModelView   VTKVG_MODELVIEW)
+add_export(vtkVgSceneGraph  VTKVG_SCENEGRAPH)
+add_export(vtkVgVideo       VTKVG_VIDEO)
+add_export(vtkVgQtUtil      VTKVGQT_UTIL)
+add_export(vtkVgQtWidgets   VTKVGQT_WIDGETS)
+add_export(vtkVwCore        VTKVW_CORE)
+add_export(vvIO             VV_IO)
+add_export(vvVidtk          VV_VIDTK)
+add_export(vvVtkWidgets     VV_VTKWIDGETS)
+add_export(vvWidgets        VV_WIDGETS)
diff --git a/vgVersion.cmake b/vgVersion.cmake
new file mode 100644
index 00000000..6518a744
--- /dev/null
+++ b/vgVersion.cmake
@@ -0,0 +1,8 @@
+set(VISGUI_VERSION_MAJOR 1)
+set(VISGUI_VERSION_MINOR 17)
+set(VISGUI_VERSION_PATCH 0)
+set(VISGUI_VERSION_BUILD "master")
+
+set(VISGUI_VERSION_STR "${VISGUI_VERSION_MAJOR}.${VISGUI_VERSION_MINOR}.${VISGUI_VERSION_PATCH}")
+
+string(TIMESTAMP VISGUI_COPY_YEAR "%Y")